UI|Client: Polished About dialog contents

skyjake · Oct 8, 2013 · 11284da · 11284da
1 parent 7743378
commit 11284da
Showing 1 changed file with 26 additions and 18 deletions.
diff --git a/doomsday/client/src/ui/dialogs/aboutdialog.cpp b/doomsday/client/src/ui/dialogs/aboutdialog.cpp
@@ -68,35 +68,42 @@ AboutDialog::AboutDialog() : DialogWidget("about"), d(new Instance(this))
     logo->setImage(style().images().image("logo.px256"));
     logo->setSizePolicy(ui::Fixed, ui::Expand);
 
+    VersionInfo version;
+    de::Version ver2;
+
     // Set up the contents of the widget.
-    LabelWidget *title = LabelWidget::newWithText(DOOMSDAY_NICENAME);
+    LabelWidget *title = LabelWidget::newWithText(String("%1 %2.%3")
+                                                  .arg(DOOMSDAY_NICENAME)
+                                                  .arg(version.major)
+                                                  .arg(version.minor));
     title->margins().set("");
     title->setFont("title");
+    title->setTextColor("accent");
     title->setSizePolicy(ui::Fixed, ui::Expand);
 
-    VersionInfo version;
-    de::Version ver2;
-
     LabelWidget *info = new LabelWidget;
-    String txt = String(_E(D)_E(b) "%3 %1" _E(.) " #%2\n" _E(.) "%4-bit %5%6\n\n%7")
+    String txt = String("%1 (%2-%8)%3\n\n" _E(b) "%4 %5 #%6" _E(.) "\n%7") //)%3 %1" _E(.) " #%2\n" _E(.) "%4-bit %5%6\n\n%7")
+            .arg(ver2.operatingSystem() == "windows"? tr("Windows") :
+                 ver2.operatingSystem() == "macx"? tr("Mac OS X") : tr("Unix"))
+            .arg(ver2.cpuBits())
+            .arg(ver2.isDebugBuild()? tr(" Debug") : "")
+            .arg(DOOMSDAY_RELEASE_TYPE)
             .arg(version.base())
             .arg(ver2.build)
-            .arg(DOOMSDAY_RELEASE_TYPE)
-            .arg(ver2.cpuBits())
-            .arg(ver2.operatingSystem())
-            .arg(ver2.isDebugBuild()? " debug" : "")
-            .arg(__DATE__ " " __TIME__);
+            .arg(Time::fromText(__DATE__ " " __TIME__, Time::CompilerDateTime)
+                 .asDateTime().toString("MMMM d, yyyy HH:MM"))
+            .arg(tr("bit"));
     info->setText(txt);
     info->setSizePolicy(ui::Fixed, ui::Expand);
 
-    ButtonWidget *homepage = new ButtonWidget;
-    homepage->setText(tr("Go to Homepage"));
-    homepage->setAction(new SignalAction(&ClientApp::app(), SLOT(openHomepageInBrowser())));
+    //ButtonWidget *homepage = new ButtonWidget;
+    //homepage->setText(tr("Go to Homepage"));
+    //homepage->setAction();
 
     area().add(logo);
     area().add(title);
     area().add(info);
-    area().add(homepage);
+    //area().add(homepage);
 
     // Layout.
     RuleRectangle const &cont = area().contentRule();
@@ -105,18 +112,19 @@ AboutDialog::AboutDialog() : DialogWidget("about"), d(new Instance(this))
     layout << *logo << *title << *info;
 
     // Center the button.
-    homepage->rule()
+    /*homepage->rule()
             .setInput(Rule::AnchorX, cont.left() + layout.width() / 2)
             .setInput(Rule::Top, info->rule().bottom())
-            .setAnchorPoint(Vector2f(.5f, 0));
+            .setAnchorPoint(Vector2f(.5f, 0));*/
 
     // Total size of the dialog's content.
-    area().setContentSize(layout.width(), layout.height() + homepage->rule().height());
+    area().setContentSize(layout.width(), layout.height()/* + homepage->rule().height()*/);
 
     buttons()
             << new DialogButtonItem(DialogWidget::Accept | DialogWidget::Default, tr("Close"))
             << new DialogButtonItem(DialogWidget::Action, tr("GL"), new SignalAction(this, SLOT(showGLInfo())))
-            << new DialogButtonItem(DialogWidget::Action, tr("Audio"), new SignalAction(this, SLOT(showAudioInfo())));
+            << new DialogButtonItem(DialogWidget::Action, tr("Audio"), new SignalAction(this, SLOT(showAudioInfo())))
+            << new DialogButtonItem(DialogWidget::Action, tr("Homepage..."), new SignalAction(&ClientApp::app(), SLOT(openHomepageInBrowser())));
 
     // The popups are anchored to their button.
     d->glPopup->setAnchorAndOpeningDirection(buttonWidget(tr("GL")).rule(), ui::Up);