diff --git a/doomsday/apps/client/src/clientapp.cpp b/doomsday/apps/client/src/clientapp.cpp index 2e48550384..fc77df457b 100644 --- a/doomsday/apps/client/src/clientapp.cpp +++ b/doomsday/apps/client/src/clientapp.cpp @@ -513,7 +513,7 @@ ClientApp::ClientApp(int &argc, char **argv) QPixmap const pixmap(doomsdaySplashXpm); QSplashScreen *splash = new QSplashScreen(pixmap); splash->show(); - splash->showMessage(Version::currentBuild().asText(), + splash->showMessage(Version::currentBuild().asHumanReadableText(), Qt::AlignHCenter | Qt::AlignBottom, QColor(90, 110, 95)); processEvents(); diff --git a/doomsday/apps/client/src/dd_main.cpp b/doomsday/apps/client/src/dd_main.cpp index 2f6f16c415..30a0469b5f 100644 --- a/doomsday/apps/client/src/dd_main.cpp +++ b/doomsday/apps/client/src/dd_main.cpp @@ -2144,7 +2144,7 @@ D_CMD(Version) { DENG2_UNUSED3(src, argc, argv); - LOG_SCR_NOTE(_E(D) DOOMSDAY_NICENAME " %s") << Version::currentBuild().asText(); + LOG_SCR_NOTE(_E(D) DOOMSDAY_NICENAME " %s") << Version::currentBuild().asHumanReadableText(); LOG_SCR_MSG(_E(l) "Homepage: " _E(.) _E(i) DOOMSDAY_HOMEURL _E(.) "\n" _E(l) "Project: " _E(.) _E(i) DENGPROJECT_HOMEURL); @@ -2217,7 +2217,7 @@ D_CMD(Help) #endif */ - LOG_SCR_NOTE(_E(b) DOOMSDAY_NICENAME " %s Console") << Version::currentBuild().asText(); + LOG_SCR_NOTE(_E(b) DOOMSDAY_NICENAME " %s Console") << Version::currentBuild().asHumanReadableText(); #define TABBED(A, B) "\n" _E(Ta) _E(b) " " << A << " " _E(.) _E(Tb) << B diff --git a/doomsday/apps/client/src/dd_pinit.cpp b/doomsday/apps/client/src/dd_pinit.cpp index 0afd3d6728..f9e15fcb90 100644 --- a/doomsday/apps/client/src/dd_pinit.cpp +++ b/doomsday/apps/client/src/dd_pinit.cpp @@ -84,7 +84,7 @@ DENG_DECLARE_API(InternalData) = #ifdef __CLIENT__ de::String DD_ComposeMainWindowTitle() { - de::String title = DOOMSDAY_NICENAME " " + Version::currentBuild().baseNumber(); + de::String title = DOOMSDAY_NICENAME " " + Version::currentBuild().compactNumber(); if(App_GameLoaded() && gx.GetVariable) { diff --git a/doomsday/apps/client/src/ui/dialogs/aboutdialog.cpp b/doomsday/apps/client/src/ui/dialogs/aboutdialog.cpp index ce41f9e92e..269c0ab23c 100644 --- a/doomsday/apps/client/src/ui/dialogs/aboutdialog.cpp +++ b/doomsday/apps/client/src/ui/dialogs/aboutdialog.cpp @@ -81,7 +81,7 @@ AboutDialog::AboutDialog() : DialogWidget("about"), d(new Impl(this)) .arg(version.cpuBits()) .arg(version.isDebugBuild()? tr(" Debug") : "") .arg(DOOMSDAY_RELEASE_TYPE) - .arg(version.baseNumber()) + .arg(version.compactNumber()) .arg(version.build) .arg(Time::fromText(__DATE__ " " __TIME__, Time::CompilerDateTime) .asDateTime().toString(Qt::SystemLocaleShortDate)) diff --git a/doomsday/apps/client/src/ui/dialogs/alertdialog.cpp b/doomsday/apps/client/src/ui/dialogs/alertdialog.cpp index afdf1d3fe2..a687355620 100644 --- a/doomsday/apps/client/src/ui/dialogs/alertdialog.cpp +++ b/doomsday/apps/client/src/ui/dialogs/alertdialog.cpp @@ -102,6 +102,7 @@ DENG_GUI_PIMPL(AlertDialog) , maxCount(100) { notification.reset(new PopupButtonWidget); + notification->setBehavior(Focusable, false); notification->setSizePolicy(ui::Expand, ui::Expand); notification->setImage(style().images().image("alert")); notification->setOverrideImageSize(style().fonts().font("default").height().value()); diff --git a/doomsday/apps/client/src/ui/dialogs/serverinfodialog.cpp b/doomsday/apps/client/src/ui/dialogs/serverinfodialog.cpp index 9f0a042a2f..52fa45c397 100644 --- a/doomsday/apps/client/src/ui/dialogs/serverinfodialog.cpp +++ b/doomsday/apps/client/src/ui/dialogs/serverinfodialog.cpp @@ -279,7 +279,7 @@ DENG_GUI_PIMPL(ServerInfoDialog) _E(Ta)_E(l) "%7:" _E(.)_E(Tb) " %8") .arg(tr("Rules")) .arg(serverInfo.gameConfig()) .arg(tr("Players")).arg(plrDesc) - .arg(tr("Version")).arg(serverInfo.version().asText()) + .arg(tr("Version")).arg(serverInfo.version().asHumanReadableText()) .arg(tr("Ping")) .arg(ping < 0.0? String(DENG2_CHAR_MDASH) : String("%1 ms").arg(ping.asMilliSeconds())); description->setText(msg); @@ -335,7 +335,7 @@ DENG_GUI_PIMPL(ServerInfoDialog) { localVersion = Package::versionForFile(*pkgFile); missing << String("%1 " _E(s) "(you have: %2)" _E(.)) - .arg(pkgId).arg(localVersion.asText()); + .arg(pkgId).arg(localVersion.fullNumber()); continue; } } diff --git a/doomsday/apps/client/src/ui/widgets/packageswidget.cpp b/doomsday/apps/client/src/ui/widgets/packageswidget.cpp index a223f4b8b2..6e4095e95e 100644 --- a/doomsday/apps/client/src/ui/widgets/packageswidget.cpp +++ b/doomsday/apps/client/src/ui/widgets/packageswidget.cpp @@ -304,7 +304,7 @@ DENG_GUI_PIMPL(PackagesWidget) .arg(pkgIdVer.first); if (!isFile && pkgIdVer.second.isValid()) { - labelText += String(_E(C) " %1" _E(.)).arg(pkgIdVer.second.asText()); + labelText += String(_E(C) " %1" _E(.)).arg(pkgIdVer.second.compactNumber()); } label().setText(labelText); diff --git a/doomsday/apps/client/src/ui/widgets/taskbarwidget.cpp b/doomsday/apps/client/src/ui/widgets/taskbarwidget.cpp index 31a3ad57a4..26e0fc20e3 100644 --- a/doomsday/apps/client/src/ui/widgets/taskbarwidget.cpp +++ b/doomsday/apps/client/src/ui/widgets/taskbarwidget.cpp @@ -230,11 +230,11 @@ DENG_GUI_PIMPL(TaskBarWidget) Version const currentVersion = Version::currentBuild(); if (String(DOOMSDAY_RELEASE_TYPE) == "Stable") { - text = _E(b) + currentVersion.baseNumber(); + text = _E(b) + currentVersion.compactNumber(); } else { - text = _E(b) + currentVersion.baseNumber() + " " + + text = _E(b) + currentVersion.compactNumber() + " " + _E(l) + String("#%1").arg(currentVersion.build); } } diff --git a/doomsday/apps/client/src/updater/updateavailabledialog.cpp b/doomsday/apps/client/src/updater/updateavailabledialog.cpp index d8aec7c616..6a85b99133 100644 --- a/doomsday/apps/client/src/updater/updateavailabledialog.cpp +++ b/doomsday/apps/client/src/updater/updateavailabledialog.cpp @@ -120,14 +120,14 @@ DENG2_OBSERVES(ToggleWidget, Toggle) 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(.)) - .arg(currentVersion.asText())); + .arg(_E(b) + latestVersion.asHumanReadableText() + _E(.)) + .arg(currentVersion.asHumanReadableText())); } else if (channel == builtInType) // same release type { self().title().setText(tr("Up to Date")); self().message().setText(tr("The installed %1 is the latest available %2 build.") - .arg(currentVersion.asText()) + .arg(currentVersion.asHumanReadableText()) .arg(_E(b) + channel + _E(.))); } else if (latestVersion < currentVersion) @@ -136,7 +136,7 @@ DENG2_OBSERVES(ToggleWidget, Toggle) self().title().setText(tr("Up to Date")); self().message().setText(tr("The installed %1 is newer than the latest available %2 build.") - .arg(currentVersion.asText()) + .arg(currentVersion.asHumanReadableText()) .arg(_E(b) + channel + _E(.))); } diff --git a/doomsday/apps/client/src/updater/updater.cpp b/doomsday/apps/client/src/updater/updater.cpp index 6085f84f80..6769640833 100644 --- a/doomsday/apps/client/src/updater/updater.cpp +++ b/doomsday/apps/client/src/updater/updater.cpp @@ -347,8 +347,8 @@ DENG2_PIMPL(Updater) Version const currentVersion = Version::currentBuild(); LOG_MSG(_E(b) "Received version information:\n" _E(.) - " - installed version: " _E(>) "%s ") << currentVersion.asText(); - LOG_MSG(" - latest version: " _E(>) "%s") << latestVersion.asText(); + " - installed version: " _E(>) "%s ") << currentVersion.asHumanReadableText(); + LOG_MSG(" - latest version: " _E(>) "%s") << latestVersion.asHumanReadableText(); LOG_MSG(" - package: " _E(>) _E(i) "%s") << latestPackageUri; LOG_MSG(" - change log: " _E(>) _E(i) "%s") << latestLogUri; @@ -364,7 +364,7 @@ DENG2_PIMPL(Updater) // Is this newer than what we're running? if (gotUpdate) { - LOG_NOTE("Found an update: " _E(b)) << latestVersion.asText(); + LOG_NOTE("Found an update: " _E(b)) << latestVersion.asHumanReadableText(); if (!alwaysShowNotification) { @@ -445,7 +445,7 @@ DENG2_PIMPL(Updater) void startInstall(de::String distribPackagePath) { #ifdef MACOSX - de::String volName = "Doomsday Engine " + latestVersion.baseNumber(); + de::String volName = "Doomsday Engine " + latestVersion.compactNumber(); #ifdef DENG2_QT_5_0_OR_NEWER QString scriptPath = QStandardPaths::writableLocation(QStandardPaths::CacheLocation); @@ -458,21 +458,21 @@ DENG2_PIMPL(Updater) if (file.open(QFile::WriteOnly | QFile::Truncate)) { QTextStream out(&file); - out << "tell application \"System Events\" to set visible of process \"Finder\" to false\n" + out << "tell application \"System Events\" to set visible of process \"Finder\" to true\n" "tell application \"Finder\"\n" " open POSIX file \"" << distribPackagePath << "\"\n" " -- Wait for it to get mounted\n" " repeat until name of every disk contains \"" << volName << "\"\n" " delay 1\n" " end repeat\n" - " -- Start the installer\n" + /*" -- Start the installer\n" " open file \"" << volName << ":Doomsday.pkg\"\n" " -- Activate the Installer\n" " repeat until name of every process contains \"Installer\"\n" " delay 2\n" - " end repeat\n" + " end repeat\n"*/ "end tell\n" - "delay 1\n" + /*"delay 1\n" "tell application \"Installer\" to activate\n" "tell application \"Finder\"\n" " -- Wait for it to finish\n" @@ -481,7 +481,7 @@ DENG2_PIMPL(Updater) " end repeat\n" " -- Unmount\n" " eject disk \"" << volName << "\"\n" - "end tell\n"; + "end tell\n"*/; file.close(); } else