UI|Client: Improvements for popup menus and Home Screen

Adjusted style of popup menu labels. Added some labels to the App menu. Moved the game sort order choice to the left side so it doesn't go under the notification area.
skyjake · Jun 25, 2014 · 0e9db90 · 0e9db90
1 parent fc0eadf
commit 0e9db90
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 4 deletions.
diff --git a/doomsday/client/data/defaultstyle.pack/fonts.dei b/doomsday/client/data/defaultstyle.pack/fonts.dei
@@ -113,7 +113,8 @@ group separator {
     font empty inherits default {
         size $: gui.scale(self.size, 0.5)
     }
-    font label inherits small {
+    font label inherits default {
+        size $: gui.scale(self.size, 0.7)
         weight: bold
     }
     font annotation inherits small {}    

diff --git a/doomsday/client/src/ui/widgets/gamefilterwidget.cpp b/doomsday/client/src/ui/widgets/gamefilterwidget.cpp
@@ -52,14 +52,15 @@ DENG2_PIMPL(GameFilterWidget)
                 << new TabItem(tr("All Games"),    AllGames);
 
         sortLabel->setFont("small");
+        sortLabel->margins().setLeft("");
         sortBy->setFont("tab.label");
         sortBy->setOpeningDirection(ui::Down);
         sortBy->items()
                 << new ChoiceItem(tr("Title"),        SortByTitle)
                 << new ChoiceItem(tr("Identity key"), SortByIdentityKey);
 
-        SequentialLayout layout(self.rule().right(), self.rule().top(), ui::Left);
-        layout << *sortBy << *sortLabel;
+        SequentialLayout layout(self.rule().left(), self.rule().top(), ui::Right);
+        layout << *sortLabel << *sortBy;
 
         tabs->rule()
                 .setInput(Rule::Width, self.rule().width())

diff --git a/doomsday/client/src/ui/widgets/taskbarwidget.cpp b/doomsday/client/src/ui/widgets/taskbarwidget.cpp
@@ -427,8 +427,11 @@ TaskBarWidget::TaskBarWidget() : GuiWidget("taskbar"), d(new Instance(this))
             << new ui::ActionItem(tr("Multiplayer Games..."), new SignalAction(this, SLOT(showMultiplayer())))
             << new ui::ActionItem(tr("Connect to Server..."), new SignalAction(this, SLOT(connectToServerManually())))
             << new ui::Item(ui::Item::Separator)
-            << new ui::ActionItem(tr("Check for Updates..."), new CommandAction("updateandnotify"))
+            << new ui::Item(ui::Item::Separator, tr("Help"))
             << new ui::ActionItem(tr("Show Tutorial"), new SignalAction(this, SLOT(showTutorial())))
+            << new ui::Item(ui::Item::Separator)
+            << new ui::Item(ui::Item::Separator, tr("Application"))
+            << new ui::ActionItem(tr("Check for Updates..."), new CommandAction("updateandnotify"))
             << new ui::ActionItem(tr("About Doomsday"), new SignalAction(this, SLOT(showAbout())))
             << new ui::Item(ui::Item::Separator)
             << new ui::ActionItem(tr("Quit Doomsday"), new CommandAction("quit"));

diff --git a/doomsday/libappfw/src/widgets/popupmenuwidget.cpp b/doomsday/libappfw/src/widgets/popupmenuwidget.cpp
@@ -175,6 +175,9 @@ DENG_GUI_PIMPL(PopupMenuWidget)
             }
             else
             {
+                // Make it all caps.
+                widget.as<LabelWidget>().setText(item.label().toUpper());
+
                 widget.margins().set("halfunit").setLeft("unit");
                 widget.setFont("separator.label");
                 /*