Website updated.

[irwi] / src / settingsdlg.cpp

diff --git a/src/settingsdlg.cpp b/src/settingsdlg.cpp
index 443c37b..84c72ea 100644 (file)
--- a/src/settingsdlg.cpp
+++ b/src/settingsdlg.cpp
@@ -27,14 +27,14 @@ SettingsDlg::SettingsDlg(QWidget *parent)
     m_selectRemoteBtn = new QPushButton(tr("Select remote"), this);
     m_aboutBtn = new QPushButton(tr("About"), this);
     m_rateUpBtn = new QPushButton(
-            QIcon(settings.value("rateUpIcon",
-                "/usr/share/icons/hicolor/48x48/hildon/chat_smiley_happy.png").
-                toString()),
+            QIcon(settings.value("symbolPath",
+                "/usr/share/irwi/symbols/").
+                toString() + "symbol_thumbs_up.png"),
             "", this);
     m_rateDownBtn = new QPushButton(
-            QIcon(settings.value("rateDownIcon",
-                "/usr/share/icons/hicolor/48x48/hildon/chat_smiley_sad.png").
-                toString()),
+            QIcon(settings.value("symbolPath",
+                "/usr/share/irwi/symbols/").
+                toString() + "symbol_thumbs_down.png"),
             "", this);
     m_rateUpBtn->setMaximumSize(72, 72);
     m_rateDownBtn->setMaximumSize(72, 72);
@@ -101,7 +101,9 @@ SettingsDlg::~SettingsDlg()
 
 void SettingsDlg::setBusy(bool busy)
 {
+#ifdef Q_WS_MAEMO_5
     setAttribute(Qt::WA_Maemo5ShowProgressIndicator, busy);
+#endif
     m_busy = busy;
 }
 
@@ -121,7 +123,9 @@ void SettingsDlg::showSelectRemoteDlg()
     SelectRemoteDlg dlg;
     connect(&dlg, SIGNAL(remoteChanged(Remote)),
             this, SLOT(setRemote(Remote)));
-    dlg.exec();
+    if (dlg.exec() == QDialog::Rejected) {
+        onNetworkStatusUpdate();
+    }
 }
 
 void SettingsDlg::showAboutDlg()