From 8f1cd7f07acba5838c9460c2d0a54a49756763be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaakko=20Kera=CC=88nen?= Date: Sun, 23 Aug 2015 13:18:58 +0300 Subject: [PATCH] UI|Client: Added icons to dialog titles --- doomsday/apps/client/src/ui/dialogs/audiosettingsdialog.cpp | 1 + doomsday/apps/client/src/ui/dialogs/inputsettingsdialog.cpp | 1 + .../apps/client/src/ui/dialogs/networksettingsdialog.cpp | 1 + doomsday/apps/client/src/ui/dialogs/packagesdialog.cpp | 1 + .../apps/client/src/ui/dialogs/renderersettingsdialog.cpp | 1 + doomsday/apps/client/src/ui/dialogs/videosettingsdialog.cpp | 5 +++-- doomsday/apps/client/src/ui/dialogs/vrsettingsdialog.cpp | 1 + doomsday/apps/client/src/ui/widgets/busywidget.cpp | 2 +- doomsday/apps/client/src/updater/updateavailabledialog.cpp | 5 +++-- doomsday/apps/client/src/updater/updatersettingsdialog.cpp | 1 + 10 files changed, 14 insertions(+), 5 deletions(-) diff --git a/doomsday/apps/client/src/ui/dialogs/audiosettingsdialog.cpp b/doomsday/apps/client/src/ui/dialogs/audiosettingsdialog.cpp index 44a423c3df..86ee6370de 100644 --- a/doomsday/apps/client/src/ui/dialogs/audiosettingsdialog.cpp +++ b/doomsday/apps/client/src/ui/dialogs/audiosettingsdialog.cpp @@ -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()); diff --git a/doomsday/apps/client/src/ui/dialogs/inputsettingsdialog.cpp b/doomsday/apps/client/src/ui/dialogs/inputsettingsdialog.cpp index 595e012213..c9f820693f 100644 --- a/doomsday/apps/client/src/ui/dialogs/inputsettingsdialog.cpp +++ b/doomsday/apps/client/src/ui/dialogs/inputsettingsdialog.cpp @@ -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")); diff --git a/doomsday/apps/client/src/ui/dialogs/networksettingsdialog.cpp b/doomsday/apps/client/src/ui/dialogs/networksettingsdialog.cpp index aceb9e3ce8..da02c57626 100644 --- a/doomsday/apps/client/src/ui/dialogs/networksettingsdialog.cpp +++ b/doomsday/apps/client/src/ui/dialogs/networksettingsdialog.cpp @@ -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")); diff --git a/doomsday/apps/client/src/ui/dialogs/packagesdialog.cpp b/doomsday/apps/client/src/ui/dialogs/packagesdialog.cpp index d8e32bfe47..1fbde4b66e 100644 --- a/doomsday/apps/client/src/ui/dialogs/packagesdialog.cpp +++ b/doomsday/apps/client/src/ui/dialogs/packagesdialog.cpp @@ -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()); diff --git a/doomsday/apps/client/src/ui/dialogs/renderersettingsdialog.cpp b/doomsday/apps/client/src/ui/dialogs/renderersettingsdialog.cpp index c78d98e801..ac2165b897 100644 --- a/doomsday/apps/client/src/ui/dialogs/renderersettingsdialog.cpp +++ b/doomsday/apps/client/src/ui/dialogs/renderersettingsdialog.cpp @@ -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 diff --git a/doomsday/apps/client/src/ui/dialogs/videosettingsdialog.cpp b/doomsday/apps/client/src/ui/dialogs/videosettingsdialog.cpp index e91da21bf0..d27b5afc8f 100644 --- a/doomsday/apps/client/src/ui/dialogs/videosettingsdialog.cpp +++ b/doomsday/apps/client/src/ui/dialogs/videosettingsdialog.cpp @@ -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 + * http://www.gnu.org/licenses */ #include "ui/dialogs/videosettingsdialog.h" @@ -110,7 +110,7 @@ DENG2_OBSERVES(PersistentCanvasWindow, AttributeChange) inludeAspect->useDefaultItems(); menuAspect->useDefaultItems(); } - + win.audienceForAttributeChange() -= this; } @@ -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")); diff --git a/doomsday/apps/client/src/ui/dialogs/vrsettingsdialog.cpp b/doomsday/apps/client/src/ui/dialogs/vrsettingsdialog.cpp index af3263ceee..80795bfb0e 100644 --- a/doomsday/apps/client/src/ui/dialogs/vrsettingsdialog.cpp +++ b/doomsday/apps/client/src/ui/dialogs/vrsettingsdialog.cpp @@ -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()); diff --git a/doomsday/apps/client/src/ui/widgets/busywidget.cpp b/doomsday/apps/client/src/ui/widgets/busywidget.cpp index 70fcc93751..7f5bc0a3c9 100644 --- a/doomsday/apps/client/src/ui/widgets/busywidget.cpp +++ b/doomsday/apps/client/src/ui/widgets/busywidget.cpp @@ -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 + * http://www.gnu.org/licenses */ #include "de_platform.h" diff --git a/doomsday/apps/client/src/updater/updateavailabledialog.cpp b/doomsday/apps/client/src/updater/updateavailabledialog.cpp index c10211dcf7..32fef66047 100644 --- a/doomsday/apps/client/src/updater/updateavailabledialog.cpp +++ b/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 @@ -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(.)) @@ -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(); diff --git a/doomsday/apps/client/src/updater/updatersettingsdialog.cpp b/doomsday/apps/client/src/updater/updatersettingsdialog.cpp index a316d7b29c..fbfea36e28 100644 --- a/doomsday/apps/client/src/updater/updatersettingsdialog.cpp +++ b/doomsday/apps/client/src/updater/updatersettingsdialog.cpp @@ -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