Bugfix, two connection dialogs opened when opening select remote dlg

[irwi] / src / settingsdlg.cpp

diff --git a/src/settingsdlg.cpp b/src/settingsdlg.cpp
index 14c0a6c..c88da36 100644 (file)
--- a/src/settingsdlg.cpp
+++ b/src/settingsdlg.cpp
@@ -16,8 +16,8 @@ SettingsDlg::SettingsDlg(QWidget *parent)
 {
     QSettings settings(this);
     m_layout = new QVBoxLayout(this);
-    m_btnLayout = new QHBoxLayout(this);
-    m_remoteNameLayout = new QHBoxLayout(this);
+    m_btnLayout = new QHBoxLayout();
+    m_remoteNameLayout = new QHBoxLayout();
     
     m_advSettingsBtn = new QPushButton(tr("Advanced"), this);
     m_selectRemoteBtn = new QPushButton(tr("Select remote"), this);
@@ -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);
+        setBusy();
+    }
 }
 
 SettingsDlg::~SettingsDlg()
@@ -78,15 +85,21 @@ SettingsDlg::~SettingsDlg()
     delete m_layout;
 }
 
+void SettingsDlg::setBusy(bool busy)
+{
+    setAttribute(Qt::WA_Maemo5ShowProgressIndicator, busy);
+    setEnabled(!busy);
+}
+
 void SettingsDlg::showAdvSettingsDlg()
 {
-    AdvSettingsDlg dlg(this);
+    AdvSettingsDlg dlg;
     dlg.exec();
 }
 
 void SettingsDlg::showSelectRemoteDlg()
 {
-    SelectRemoteDlg dlg(this);
+    SelectRemoteDlg dlg;
     connect(&dlg, SIGNAL(remoteChanged(Remote)),
             this, SLOT(setRemote(Remote)));
     dlg.exec();
@@ -94,34 +107,35 @@ void SettingsDlg::showSelectRemoteDlg()
 
 void SettingsDlg::showAboutDlg()
 {
-    AboutDlg dlg(this);
+    AboutDlg dlg;
     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;
+    setBusy();
+    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()
 {
+    setBusy(false);
     m_remoteNameLabel->setText(m_remote.mfg() + " " + m_remote.name());
     m_ratingLabel->setText(tr("Rating") + ": "
             + QString::number(m_remote.rating()));
@@ -130,13 +144,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)