Skip to content

Commit

Permalink
UI|Task Bar: Added "Packages" to the Config menu
Browse files Browse the repository at this point in the history
Todo: Dialog for browsing, loading, and unloading packages.
  • Loading branch information
skyjake committed Aug 18, 2015
1 parent 6b00f71 commit e3bf29d
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 7 deletions.
16 changes: 14 additions & 2 deletions doomsday/apps/client/src/ui/dialogs/packagesdialog.cpp
Expand Up @@ -17,19 +17,31 @@
*/

#include "ui/dialogs/packagesdialog.h"
#include "clientapp.h"

#include <de/FileSystem>

using namespace de;

DENG_GUI_PIMPL(PackagesDialog)
{
Instance(Public *i) : Base(i)
{}

void populate()
{
StringList packages = App::packageLoader().findAllPackages();
qSort(packages);
qDebug() << "Found packages:" << packages;
}
};

PackagesDialog::PackagesDialog()
: DialogWidget("packages")
: DialogWidget("packages", WithHeading)
, d(new Instance(this))
{
heading().setText(tr("Packages"));
buttons() << new DialogButtonItem(Default | Accept, tr("Close"));

d->populate();
}

12 changes: 7 additions & 5 deletions doomsday/apps/client/src/ui/widgets/taskbarwidget.cpp
Expand Up @@ -29,6 +29,7 @@
#include "ui/dialogs/manualconnectiondialog.h"
#include "ui/dialogs/vrsettingsdialog.h"
#include "ui/dialogs/gamesdialog.h"
#include "ui/dialogs/packagesdialog.h"
#include "updater/updatersettingsdialog.h"
#include "ui/clientwindow.h"
#include "ui/clientrootwidget.h"
Expand Down Expand Up @@ -74,10 +75,10 @@ enum MenuItemPositions
// Config menu:
POS_RENDERER_SETTINGS = 0,
POS_VR_SETTINGS = 1,
POS_CONFIG_SEPARATOR = 2,
POS_CONFIG_SEPARATOR = 3,

POS_AUDIO_SETTINGS = 4,
POS_INPUT_SETTINGS = 5
POS_AUDIO_SETTINGS = 5,
POS_INPUT_SETTINGS = 6
};

DENG_GUI_PIMPL(TaskBarWidget)
Expand Down Expand Up @@ -385,7 +386,7 @@ TaskBarWidget::TaskBarWidget() : GuiWidget("taskbar"), d(new Instance(this))
d->status->set(bg);
d->status->setWidthPolicy(ui::Expand);
d->status->rule().setInput(Rule::Height, rule().height());
add(d->status);
add(d->status);

d->updateStatus();

Expand Down Expand Up @@ -430,6 +431,7 @@ TaskBarWidget::TaskBarWidget() : GuiWidget("taskbar"), d(new Instance(this))
d->configMenu->items()
<< new ui::SubwidgetItem(style().images().image("renderer"), tr("Renderer"), ui::Left, makePopup<RendererSettingsDialog>)
<< new ui::SubwidgetItem(style().images().image("vr"), tr("3D & VR"), ui::Left, makePopup<VRSettingsDialog>)
<< new ui::SubwidgetItem(tr("Packages"), ui::Left, makePopup<PackagesDialog>)
<< new ui::Item(ui::Item::Separator)
<< new ui::SubwidgetItem(style().images().image("display"), tr("Video"), ui::Left, makePopup<VideoSettingsDialog>)
<< new ui::SubwidgetItem(style().images().image("audio"), tr("Audio"), ui::Left, makePopup<AudioSettingsDialog>)
Expand All @@ -442,7 +444,7 @@ TaskBarWidget::TaskBarWidget() : GuiWidget("taskbar"), d(new Instance(this))
<< new ui::ActionItem(tr("Show Tutorial"), new SignalAction(this, SLOT(showTutorial())))
<< new ui::VariableToggleItem(tr("Menu Annotations"), App::config("ui.showAnnotations"))
<< new ui::Item(ui::Item::Annotation, tr("Annotations briefly describe menu functions."));

d->mainMenu->items()
<< new ui::Item(ui::Item::Separator, tr("Games"))
<< new ui::ActionItem(tr("Switch Game..."), new SignalAction(this, SLOT(switchGame())))
Expand Down

0 comments on commit e3bf29d

Please sign in to comment.