Bugfix to settingsdlg progress indicator

[irwi] / src / settingsdlg.cpp

diff --git a/src/settingsdlg.cpp b/src/settingsdlg.cpp
index c88da36..f7b4cfa 100644 (file)
--- a/src/settingsdlg.cpp
+++ b/src/settingsdlg.cpp
@@ -10,9 +10,13 @@
 #include <QPushButton>
 #include <QLabel>
 #include <QDebug>
+#include <QNetworkConfiguration>
+#include <QShowEvent>
 
 SettingsDlg::SettingsDlg(QWidget *parent)
     : QDialog(parent)
+    , m_busy(false)
+    , m_netConfMan(NULL)
 {
     QSettings settings(this);
     m_layout = new QVBoxLayout(this);
@@ -61,13 +65,23 @@ SettingsDlg::SettingsDlg(QWidget *parent)
     m_layout->addLayout(m_btnLayout);
     this->setLayout(m_layout);
 
-    QString selectedRemote = QSettings(this).value("remoteName", "").toString();
+    QString selectedRemote = settings.value("remoteName", "").toString();
     if (selectedRemote == "") {
-        m_remoteNameLabel->setText("No remote selected");
+        m_remoteNameLabel->setText(tr("No remote selected"));
         enableRateBtns(false);
     } else {
-        setRemote(selectedRemote);
-        setBusy();
+        // Create remote by name and update it's info if online
+        m_busy = true;
+        m_remote = Remote(selectedRemote);
+        connect(&m_remote, SIGNAL(infoUpdated()),
+                this, SLOT(updateRemoteInfo()));
+        m_remoteNameLabel->setText(selectedRemote);
+        m_netConfMan = new QTM_PREPEND_NAMESPACE(
+                QNetworkConfigurationManager)(this);
+        connect(m_netConfMan, SIGNAL(updateCompleted()),
+                this, SLOT(onNetworkStatusUpdate()));
+        m_netConfMan->updateConfigurations();
+        enableRateBtns(false);
     }
 }
 
@@ -83,12 +97,13 @@ SettingsDlg::~SettingsDlg()
     delete m_btnLayout;
     delete m_remoteNameLayout;
     delete m_layout;
+    delete m_netConfMan;
 }
 
 void SettingsDlg::setBusy(bool busy)
 {
     setAttribute(Qt::WA_Maemo5ShowProgressIndicator, busy);
-    setEnabled(!busy);
+    m_busy = busy;
 }
 
 void SettingsDlg::showAdvSettingsDlg()
@@ -103,6 +118,7 @@ void SettingsDlg::showSelectRemoteDlg()
     connect(&dlg, SIGNAL(remoteChanged(Remote)),
             this, SLOT(setRemote(Remote)));
     dlg.exec();
+    onNetworkStatusUpdate();
 }
 
 void SettingsDlg::showAboutDlg()
@@ -114,23 +130,22 @@ void SettingsDlg::showAboutDlg()
 void SettingsDlg::setRemote(Remote r)
 {
     m_remote = r;
-    processRemoteChange();
+    connect(&m_remote, SIGNAL(infoUpdated()),
+            this, SLOT(updateRemoteInfo()));
     updateRemoteInfo();
+    enableRateBtns();
 }
 
-void SettingsDlg::setRemote(const QString &name)
-{
-    setBusy();
-    m_remote = Remote(name);
-    processRemoteChange();
-    m_remote.updateInfo();  // request update from server
-}
-
-void SettingsDlg::processRemoteChange()
+void SettingsDlg::onNetworkStatusUpdate()
 {
-    connect(&m_remote, SIGNAL(infoUpdated()),
-            this, SLOT(updateRemoteInfo()));
-    enableRateBtns();
+    if (m_netConfMan->isOnline()) {
+        setBusy();
+        m_remote.updateInfo();
+        enableRateBtns();
+    } else {
+        m_ratingLabel->setText(tr("Offline"));
+        setBusy(false);
+    }
 }
 
 void SettingsDlg::updateRemoteInfo()
@@ -143,20 +158,20 @@ void SettingsDlg::updateRemoteInfo()
 
 void SettingsDlg::rateUpClicked()
 {
-    m_remote.sendRating(Rating::Up);
     processRatingSent();
+    m_remote.sendRating(Rating::Up);
 }
 
 void SettingsDlg::rateDownClicked()
 {
-    m_remote.sendRating(Rating::Down);
     processRatingSent();
+    m_remote.sendRating(Rating::Down);
 }
 
 void SettingsDlg::processRatingSent()
 {
+    setBusy();
     enableRateBtns(false);
-    m_remote.updateInfo();
 }
 
 void SettingsDlg::enableRateBtns(bool enable)
@@ -165,4 +180,11 @@ void SettingsDlg::enableRateBtns(bool enable)
     m_rateDownBtn->setEnabled(enable);
 }
 
+void SettingsDlg::showEvent(QShowEvent *event)
+{
+    setBusy(m_busy);
+    QDialog::showEvent(event);
+}
+
+