Some refactoring in SettingsDlg

diff --git a/src/selectremotedlg.cpp b/src/selectremotedlg.cpp
index 9db7533..e79c950 100644 (file)
--- a/src/selectremotedlg.cpp
+++ b/src/selectremotedlg.cpp
@@ -106,7 +106,7 @@ void SelectRemoteDlg::downloadRemote()
         connect(currentModel->remote(), SIGNAL(saveFinished()),
                 this, SLOT(close()));
         currentModel->remote()->saveToFile();
-        
+
         emit remoteChanged(*(currentModel->remote()));
     }
 }

diff --git a/src/settingsdlg.cpp b/src/settingsdlg.cpp
index 14c0a6c..e92586a 100644 (file)
--- a/src/settingsdlg.cpp
+++ b/src/settingsdlg.cpp
@@ -61,7 +61,14 @@ SettingsDlg::SettingsDlg(QWidget *parent)
     m_layout->addLayout(m_btnLayout);
     this->setLayout(m_layout);
 
-    initRemote();
+    QString selectedRemote = QSettings(this).value("remoteName", "").toString();
+    if (selectedRemote == "") {
+        m_remoteNameLabel->setText("No remote selected");
+        enableRateBtns(false);
+    } else {
+        setRemote(selectedRemote);
+        m_remote.updateInfo();
+    }
 }
 
 SettingsDlg::~SettingsDlg()
@@ -98,26 +105,25 @@ void SettingsDlg::showAboutDlg()
     dlg.exec();
 }
 
-void SettingsDlg::initRemote()
+void SettingsDlg::setRemote(Remote r)
 {
-    QString selectedRemote = QSettings(this).value("remoteName", "").toString();
-    if (selectedRemote == "") {
-        m_remoteNameLabel->setText("No remote selected");
-        enableRateBtns(false);
-    } else {
-        m_remote = Remote(selectedRemote);
-        connect(&m_remote, SIGNAL(infoUpdated()),
-                this, SLOT(updateRemoteInfo()));
-        m_remote.updateInfo();
-        enableRateBtns();
-    }
+    m_remote = r;
+    processRemoteChange();
+    updateRemoteInfo();
 }
 
-void SettingsDlg::setRemote(Remote r)
+void SettingsDlg::setRemote(const QString &name)
 {
-    m_remote = r;
+    m_remote = Remote(name);
+    processRemoteChange();
+    m_remote.updateInfo();  // request update from server
+}
+
+void SettingsDlg::processRemoteChange()
+{
+    connect(&m_remote, SIGNAL(infoUpdated()),
+            this, SLOT(updateRemoteInfo()));
     enableRateBtns();
-    updateRemoteInfo();
 }
 
 void SettingsDlg::updateRemoteInfo()
@@ -130,13 +136,19 @@ void SettingsDlg::updateRemoteInfo()
 void SettingsDlg::rateUpClicked()
 {
     m_remote.sendRating(Rating::Up);
-    enableRateBtns(false);
+    processRatingSent();
 }
 
 void SettingsDlg::rateDownClicked()
 {
     m_remote.sendRating(Rating::Down);
+    processRatingSent();
+}
+
+void SettingsDlg::processRatingSent()
+{
     enableRateBtns(false);
+    m_remote.updateInfo();
 }
 
 void SettingsDlg::enableRateBtns(bool enable)

diff --git a/src/settingsdlg.h b/src/settingsdlg.h
index d583048..6197989 100644 (file)
--- a/src/settingsdlg.h
+++ b/src/settingsdlg.h
@@ -25,13 +25,15 @@ private slots:
     void showSelectRemoteDlg();
     void showAboutDlg();
     void setRemote(Remote);
+    void setRemote(const QString &name);
     void updateRemoteInfo();
     void rateUpClicked();
     void rateDownClicked();
 
 private:
     void enableRateBtns(bool enable = true);
-    void initRemote();
+    void processRemoteChange();
+    void processRatingSent();
 
 private:
     Remote m_remote;