Updater: Fully functional updater settings dialog

The settings can be viewed and changed in the dialog.
skyjake · May 27, 2012 · 8f50889 · 8f50889
1 parent 35b3caf
commit 8f50889
Show file tree

Hide file tree

Showing 4 changed files with 55 additions and 25 deletions.
diff --git a/doomsday/engine/portable/src/updater/updatersettings.cpp b/doomsday/engine/portable/src/updater/updatersettings.cpp
@@ -11,11 +11,6 @@
 #define STK_DELETE          "updater/delete"
 #define STK_DOWNLOAD_PATH   "updater/downloadPath"
 
-static de::String defaultDownloadPath()
-{
-    return QDesktopServices::storageLocation(QDesktopServices::TempLocation);
-}
-
 UpdaterSettings::UpdaterSettings()
 {}
 
@@ -61,7 +56,7 @@ void UpdaterSettings::setFrequency(UpdaterSettings::Frequency freq)
     QSettings().setValue(STK_FREQUENCY, int(freq));
 }
 
-void UpdaterSettings::channel(UpdaterSettings::Channel channel)
+void UpdaterSettings::setChannel(UpdaterSettings::Channel channel)
 {
     QSettings().setValue(STK_CHANNEL, int(channel));
 }
@@ -90,3 +85,8 @@ void UpdaterSettings::useDefaultDownloadPath()
 {
     setDownloadPath(defaultDownloadPath());
 }
+
+de::String UpdaterSettings::defaultDownloadPath()
+{
+    return QDesktopServices::storageLocation(QDesktopServices::TempLocation);
+}
diff --git a/doomsday/engine/portable/src/updater/updatersettings.h b/doomsday/engine/portable/src/updater/updatersettings.h
@@ -32,12 +32,14 @@ class UpdaterSettings
     de::String downloadPath() const;
 
     void setFrequency(Frequency freq);
-    void channel(Channel channel);
+    void setChannel(Channel channel);
     void setLastCheckTime(const de::Time& time);
     void setOnlyCheckManually(bool onlyManually);
     void setDeleteAfterUpdate(bool deleteAfter);
     void setDownloadPath(de::String downloadPath);
     void useDefaultDownloadPath();
+
+    static de::String defaultDownloadPath();
 };
 
 #endif // LIBDENG_UPDATERSETTINGS_H
diff --git a/doomsday/engine/portable/src/updater/updatersettingsdialog.cpp b/doomsday/engine/portable/src/updater/updatersettingsdialog.cpp
@@ -27,11 +27,6 @@ struct UpdaterSettingsDialog::Instance
         QFormLayout* form = new QFormLayout;
         mainLayout->addLayout(form);
 
-/*
-    bool deleteAfterUpdate() const;
-    bool isDefaultDownloadPath() const;
-    de::String downloadPath() const;
-*/
         neverCheck = new QCheckBox("Never check for updates automatically");
         form->addRow(neverCheck);
 
@@ -49,7 +44,7 @@ struct UpdaterSettingsDialog::Instance
 
         pathList = new QComboBox;
         pathList->addItem(QDesktopServices::displayName(QDesktopServices::TempLocation),
-                          QDesktopServices::storageLocation(QDesktopServices::TempLocation));
+                          UpdaterSettings::defaultDownloadPath());
         pathList->addItem("Select folder...", "");
         form->addRow("Download location:", pathList);
 
@@ -60,7 +55,6 @@ struct UpdaterSettingsDialog::Instance
         mainLayout->addWidget(bbox);
 
         // Buttons.
-        //QPushButton* apply = bbox->addButton(QDialogButtonBox::Apply);
         QPushButton* ok = bbox->addButton(QDialogButtonBox::Ok);
         QPushButton* cancel = bbox->addButton(QDialogButtonBox::Cancel);
 
@@ -69,26 +63,54 @@ struct UpdaterSettingsDialog::Instance
         // Connections.
         QObject::connect(neverCheck, SIGNAL(toggled(bool)), self, SLOT(neverCheckToggled(bool)));
         QObject::connect(pathList, SIGNAL(activated(int)), self, SLOT(pathActivated(int)));
+        QObject::connect(ok, SIGNAL(clicked()), self, SLOT(accept()));
         QObject::connect(cancel, SIGNAL(clicked()), self, SLOT(reject()));
     }
 
-    ~Instance()
-    {
-
-    }
-
     void fetch()
     {
         neverCheck->setChecked(UpdaterSettings().onlyCheckManually());
         freqList->setEnabled(!UpdaterSettings().onlyCheckManually());
         freqList->setCurrentIndex(freqList->findData(UpdaterSettings().frequency()));
         channelList->setCurrentIndex(channelList->findData(UpdaterSettings().channel()));
+        setDownloadPath(UpdaterSettings().downloadPath());
         deleteAfter->setChecked(UpdaterSettings().deleteAfterUpdate());
     }
 
     void apply()
     {
+        UpdaterSettings st;
+        st.setOnlyCheckManually(neverCheck->isChecked());
+        int sel = freqList->currentIndex();
+        if(sel >= 0)
+        {
+            st.setFrequency(UpdaterSettings::Frequency(freqList->itemData(sel).toInt()));
+        }
+        sel = channelList->currentIndex();
+        if(sel >= 0)
+        {
+            st.setChannel(UpdaterSettings::Channel(channelList->itemData(sel).toInt()));
+        }
+        st.setDownloadPath(pathList->itemData(pathList->currentIndex()).toString());
+        st.setDeleteAfterUpdate(deleteAfter->isChecked());
+    }
 
+    void setDownloadPath(const QString& dir)
+    {
+        if(dir != UpdaterSettings::defaultDownloadPath())
+        {
+            // Remove extra items.
+            while(pathList->count() > 2)
+            {
+                pathList->removeItem(0);
+            }
+            pathList->insertItem(0, QDir(dir).dirName(), dir);
+            pathList->setCurrentIndex(0);
+        }
+        else
+        {
+            pathList->setCurrentIndex(pathList->findData(dir));
+        }
     }
 };
 
@@ -103,6 +125,12 @@ UpdaterSettingsDialog::~UpdaterSettingsDialog()
     delete d;
 }
 
+void UpdaterSettingsDialog::accept()
+{
+    d->apply();
+    QDialog::accept();
+}
+
 void UpdaterSettingsDialog::neverCheckToggled(bool set)
 {
     d->freqList->setEnabled(!set);
@@ -116,12 +144,11 @@ void UpdaterSettingsDialog::pathActivated(int index)
         QString dir = QFileDialog::getExistingDirectory(this, "Download Folder", QDir::homePath());
         if(!dir.isEmpty())
         {
-            // Remove extra items.
-            while(d->pathList->count() > 2)
-                d->pathList->removeItem(0);
-
-            d->pathList->insertItem(0, QDir(dir).dirName(), dir);
-            d->pathList->setCurrentIndex(0);
+            d->setDownloadPath(dir);
+        }
+        else
+        {
+            d->setDownloadPath(UpdaterSettings::defaultDownloadPath());
         }
     }
 }
diff --git a/doomsday/engine/portable/src/updater/updatersettingsdialog.h b/doomsday/engine/portable/src/updater/updatersettingsdialog.h
@@ -14,6 +14,7 @@ class UpdaterSettingsDialog : public QDialog
 signals:
 
 public slots:
+    void accept();
     void neverCheckToggled(bool);
     void pathActivated(int index);