Moved timeout constants to appsettings in preparatino for adding to user configuratio...

[vlc-remote] / src / accountdialog.cpp

diff --git a/src/accountdialog.cpp b/src/accountdialog.cpp
index ecdb02f..0cb777b 100644 (file)
--- a/src/accountdialog.cpp
+++ b/src/accountdialog.cpp
@@ -24,6 +24,10 @@
 #include <QTcpSocket>
 #include <QFuture>
 #include <QtConcurrentMap>
+#include "appsettings.h"
+#if defined(Q_WS_S60) || defined(Q_WS_MAEMO_5)
+#include <QMaemo5InformationBox>
+#endif
 
 
 
@@ -111,7 +115,9 @@ void AccountDialog::load()
             item->setFont(font);
         }
         ui->listWidget->addItem(item);
-        asycItems.append(*item);
+        if (AppSettings::isConnected()) {
+            asycItems.append(*item);
+        }
     }
     settings.endGroup();    
 
@@ -121,7 +127,14 @@ void AccountDialog::load()
     //  QFuture<QListWidgetItem> itemFutur = QtConcurrent::mapped(asycItems, asyncTestItem);
 
 
-    mFuturWatcher->setFuture(QtConcurrent::mapped(asycItems, asyncTestItem));
+    if (AppSettings::isConnected()) {
+        mFuturWatcher->setFuture(QtConcurrent::mapped(asycItems, asyncTestItem));
+    }
+    else {
+#if defined(Q_WS_S60) || defined(Q_WS_MAEMO_5)
+        QMaemo5InformationBox::information(this, tr("No network connection available!"), QMaemo5InformationBox::DefaultTimeout);
+#endif
+    }
 }
 
 QListWidgetItem AccountDialog::asyncTestItem(const QListWidgetItem& item)
@@ -144,7 +157,7 @@ QListWidgetItem AccountDialog::asyncTestItem(const QListWidgetItem& item)
     else
         socket->connectToHost(host,8080);
 
-    if (socket->waitForConnected(1000))
+    if (socket->waitForConnected(AppSettings::getPingTimeout()))
         newItem.setIcon(QIcon::fromTheme("widgets_tickmark_list"));
     else
         newItem.setIcon(QIcon::fromTheme("statusarea_presence_busy_error"));