Updater: Added "updateandnotify" and better name for the default down…

…load folder The "updaterandnotify" command will always show the GUI update notification dialog even though the engine is up to date.
skyjake · Jun 9, 2012 · 452c570 · 452c570
1 parent 02cbe21
commit 452c570
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 1 deletion.
diff --git a/doomsday/engine/portable/src/dd_main.c b/doomsday/engine/portable/src/dd_main.c
@@ -132,6 +132,14 @@ D_CMD(CheckForUpdates)
     return true;
 }
 
+D_CMD(CheckForUpdatesAndNotify)
+{
+    /// @todo Combine into the same command with CheckForUpdates?
+    Con_Message("Checking for available updates...\n");
+    Updater_CheckNow(true);
+    return true;
+}
+
 D_CMD(ShowUpdateSettings)
 {
     Updater_ShowSettings();
@@ -144,6 +152,7 @@ D_CMD(ShowUpdateSettings)
 void DD_Register(void)
 {
     C_CMD("update", "", CheckForUpdates);
+    C_CMD("updateandnotify", "", CheckForUpdatesAndNotify);
     C_CMD("updatesettings", "", ShowUpdateSettings);
 
     DD_RegisterLoop();

diff --git a/doomsday/engine/portable/src/updater/updatersettingsdialog.cpp b/doomsday/engine/portable/src/updater/updatersettingsdialog.cpp
@@ -11,6 +11,16 @@
 #include <de/Log>
 #include <QDebug>
 
+static QString defaultLocationName()
+{
+    QString name = QDesktopServices::displayName(QDesktopServices::TempLocation);
+    if(name.isEmpty())
+    {
+        name = "Temporary Files";
+    }
+    return name;
+}
+
 struct UpdaterSettingsDialog::Instance
 {
     UpdaterSettingsDialog* self;
@@ -47,7 +57,7 @@ struct UpdaterSettingsDialog::Instance
         form->addRow(tr("&Release type:"), channelList);
 
         pathList = new QComboBox;
-        pathList->addItem(QDesktopServices::displayName(QDesktopServices::TempLocation),
+        pathList->addItem(defaultLocationName(),
                           UpdaterSettings::defaultDownloadPath());
         pathList->addItem(tr("Select folder..."), "");
         form->addRow(tr("&Download location:"), pathList);