Skip to content

Commit

Permalink
UI|Client: Added icons to dialog titles
Browse files Browse the repository at this point in the history
  • Loading branch information
skyjake committed Aug 23, 2015
1 parent d60f064 commit 8f1cd7f
Show file tree
Hide file tree
Showing 10 changed files with 14 additions and 5 deletions.
Expand Up @@ -97,6 +97,7 @@ AudioSettingsDialog::AudioSettingsDialog(String const &name)
: DialogWidget(name, WithHeading), d(new Instance(this))
{
heading().setText(tr("Audio Settings"));
heading().setImage(style().images().image("audio"));

auto *sfxVolLabel = LabelWidget::newWithText(tr("SFX Volume:"), &area());
auto *musicVolLabel = LabelWidget::newWithText(tr("Music Volume:"), &area());
Expand Down
Expand Up @@ -116,6 +116,7 @@ InputSettingsDialog::InputSettingsDialog(String const &name)
: DialogWidget(name, WithHeading), d(new Instance(this))
{
heading().setText(tr("Input Settings"));
heading().setImage(style().images().image("input"));

d->syncInput->setText(tr("Vanilla 35Hz Input Rate"));
d->syncMouse->setText(tr("Uniform Mouse Axis Sensitivity"));
Expand Down
Expand Up @@ -66,6 +66,7 @@ NetworkSettingsDialog::NetworkSettingsDialog(String const &name)
: DialogWidget(name, WithHeading), d(new Instance(this))
{
heading().setText(tr("Network Settings"));
heading().setImage(style().images().image("network"));

d->devInfo->setText(tr("Developer Info"));

Expand Down
1 change: 1 addition & 0 deletions doomsday/apps/client/src/ui/dialogs/packagesdialog.cpp
Expand Up @@ -271,6 +271,7 @@ PackagesDialog::PackagesDialog()
, d(new Instance(this))
{
heading().setText(tr("Packages"));
heading().setImage(style().images().image("package"));
buttons() << new DialogButtonItem(Default | Accept, tr("Close"));

area().setContentSize(d->menu->rule().width(), d->menu->rule().height());
Expand Down
Expand Up @@ -129,6 +129,7 @@ RendererSettingsDialog::RendererSettingsDialog(String const &name)
: DialogWidget(name, WithHeading), d(new Instance(this))
{
heading().setText(tr("Renderer Settings"));
heading().setImage(style().images().image("renderer"));

LabelWidget *appearLabel = LabelWidget::newWithText(tr("Appearance:"), &area());
appearLabel->setName("appearance-label"); // for lookup from tutorial
Expand Down
5 changes: 3 additions & 2 deletions doomsday/apps/client/src/ui/dialogs/videosettingsdialog.cpp
Expand Up @@ -13,7 +13,7 @@
* of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
* Public License for more details. You should have received a copy of the GNU
* General Public License along with this program; if not, see:
* http://www.gnu.org/licenses</small>
* http://www.gnu.org/licenses</small>
*/

#include "ui/dialogs/videosettingsdialog.h"
Expand Down Expand Up @@ -110,7 +110,7 @@ DENG2_OBSERVES(PersistentCanvasWindow, AttributeChange)
inludeAspect->useDefaultItems();
menuAspect->useDefaultItems();
}

win.audienceForAttributeChange() -= this;
}

Expand Down Expand Up @@ -169,6 +169,7 @@ VideoSettingsDialog::VideoSettingsDialog(String const &name)
bool const gotDisplayMode = DisplayMode_Count() > 0;

heading().setText(tr("Video Settings"));
heading().setImage(style().images().image("display"));

// Toggles for video/window options.
d->fullscreen->setText(tr("Fullscreen"));
Expand Down
1 change: 1 addition & 0 deletions doomsday/apps/client/src/ui/dialogs/vrsettingsdialog.cpp
Expand Up @@ -111,6 +111,7 @@ VRSettingsDialog::VRSettingsDialog(String const &name)
: DialogWidget(name, WithHeading), d(new Instance(this))
{
heading().setText(tr("3D & VR Settings"));
heading().setImage(style().images().image("vr"));

LabelWidget *modeLabel = LabelWidget::newWithText(tr("Stereo Mode:"), &area());
LabelWidget *heightLabel = LabelWidget::newWithText(tr("Height (m):"), &area());
Expand Down
2 changes: 1 addition & 1 deletion doomsday/apps/client/src/ui/widgets/busywidget.cpp
Expand Up @@ -13,7 +13,7 @@
* of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
* Public License for more details. You should have received a copy of the GNU
* General Public License along with this program; if not, see:
* http://www.gnu.org/licenses</small>
* http://www.gnu.org/licenses</small>
*/

#include "de_platform.h"
Expand Down
5 changes: 3 additions & 2 deletions doomsday/apps/client/src/updater/updateavailabledialog.cpp
@@ -1,4 +1,4 @@
/** @file updateavailabledialog.cpp Dialog for notifying the user about available updates.
/** @file updateavailabledialog.cpp Dialog for notifying the user about available updates.
* @ingroup updater
*
* @authors Copyright © 2012-2013 Jaakko Keränen <jaakko.keranen@iki.fi>
Expand Down Expand Up @@ -118,6 +118,7 @@ DENG2_OBSERVES(ToggleWidget, Toggle)
askUpgrade = true;

self.title().setText(tr("Update Available"));
self.title().setImage(style().images().image("updater"));
self.message().setText(tr("There is an update available. The latest %1 release is %2, while you are running %3.")
.arg(channel)
.arg(_E(b) + latestVersion.asText() + _E(.))
Expand Down Expand Up @@ -212,7 +213,7 @@ void UpdateAvailableDialog::editSettings()
st->setAnchorAndOpeningDirection(buttonWidget(DialogWidget::Id1)->rule(), ui::Up);
st->setDeleteAfterDismissed(true);
if(st->exec(root()))
{
{
// The Gear button will soon be deleted, so we'll need to detach from it.
st->detachAnchor();

Expand Down
1 change: 1 addition & 0 deletions doomsday/apps/client/src/updater/updatersettingsdialog.cpp
Expand Up @@ -218,6 +218,7 @@ UpdaterSettingsDialog::UpdaterSettingsDialog(Mode mode, String const &name)
: DialogWidget(name, WithHeading), d(new Instance(this, mode))
{
heading().setText(tr("Updater Settings"));
heading().setImage(style().images().image("updater"));
}

bool UpdaterSettingsDialog::settingsHaveChanged() const
Expand Down

0 comments on commit 8f1cd7f

Please sign in to comment.