Merge branch 'master' of mercury.wipsl.com:/var/git/irwi

[irwi] / src / selectremotedlg.h

diff --git a/src/selectremotedlg.h b/src/selectremotedlg.h
index 9685df0..c4821f2 100644 (file)
--- a/src/selectremotedlg.h
+++ b/src/selectremotedlg.h
@@ -5,6 +5,9 @@
 #include <QString>
 #include <QMap>
 
+#include "remotedb.h"
+#include "remotedbmgr.h"
+
 class QHBoxLayout;
 class QListWidget;
 class QListWidgetItem;
@@ -14,42 +17,46 @@ class QNetworkReply;
 class QWidget;
 class QPushButton;
 class QLabel;
-class RemoteList;
+class QShowEvent;
+class OnlinePollerThread;
 
 class SelectRemoteDlg : public QDialog
 {
     Q_OBJECT
+
 public:
     SelectRemoteDlg(QWidget *parent = 0);
     ~SelectRemoteDlg();
 
-signals:
-    void remoteDownloaded();
+public slots:
+    void refreshDB();
+    void getDB();
 
 private slots:
-    void alphabetItemChanged(QListWidgetItem *current, QListWidgetItem *previous);
-    
+    void alphabetItemChanged(QListWidgetItem *current,
+                             QListWidgetItem *previous);
     void mfgItemChanged(QListWidgetItem *current, QListWidgetItem *previous);
-    void listDownloadFinished(QNetworkReply *reply);
-
     void downloadRemote();
-    void remoteDownloadFinished(QNetworkReply *reply);
+    void setDB(RemoteDB *db);
+
+signals:
+    void remoteChanged(Remote);
+
+protected slots:
+    void showEvent(QShowEvent*);
 
 private:
+    RemoteDBMgr remoteDBMgr;
+
+    QLabel *remoteNameLabel;
     QHBoxLayout *layout;
     QListWidget *alphabetList;
     QListWidget *mfgList;
     QListWidget *modelList;
-    QSettings *settings;
-    QNetworkAccessManager *listNetAM;
-    QNetworkAccessManager *remoteNetAM;
-    QMap<QString, QString> *deviceNameMap;
     QPushButton *downloadBtn;
-    QLabel *remoteNameLabel;
-
-    RemoteList *remoteList;
+    RemoteDB *remoteDB;
+    OnlinePollerThread *onlinePollerThread;
 
-    void beginDownload(const QString &url, QNetworkAccessManager *nam);
     void setBusy(bool busy = true);
 };