Removed parent from settingdlg

[irwi] / src / selectremotedlg.cpp

diff --git a/src/selectremotedlg.cpp b/src/selectremotedlg.cpp
index 3074d79..9db7533 100644 (file)
--- a/src/selectremotedlg.cpp
+++ b/src/selectremotedlg.cpp
@@ -1,6 +1,7 @@
 #include "selectremotedlg.h"
 
 #include "remote.h"
+#include "remotelistwidgetitem.h"
 
 #include <QHBoxLayout>
 #include <QLabel>
@@ -24,13 +25,17 @@ SelectRemoteDlg::SelectRemoteDlg(QWidget *parent)
     alphabetList = new QListWidget(this);
     alphabetList->setMaximumWidth(96);
     layout->addWidget(alphabetList);
-    connect(alphabetList, SIGNAL(currentItemChanged(QListWidgetItem*, QListWidgetItem*)),
-                this, SLOT(alphabetItemChanged(QListWidgetItem*, QListWidgetItem*)));
+    connect(alphabetList,
+            SIGNAL(currentItemChanged(QListWidgetItem*, QListWidgetItem*)),
+            this,
+            SLOT(alphabetItemChanged(QListWidgetItem*, QListWidgetItem*)));
     
     mfgList = new QListWidget(this);
     layout->addWidget(mfgList);
-    connect(mfgList, SIGNAL(currentItemChanged(QListWidgetItem*, QListWidgetItem*)),
-                this, SLOT(mfgItemChanged(QListWidgetItem*, QListWidgetItem*)));
+    connect(mfgList,
+            SIGNAL(currentItemChanged(QListWidgetItem*, QListWidgetItem*)),
+            this,
+            SLOT(mfgItemChanged(QListWidgetItem*, QListWidgetItem*)));
 
     modelList = new QListWidget(this);
     layout->addWidget(modelList);
@@ -41,9 +46,9 @@ SelectRemoteDlg::SelectRemoteDlg(QWidget *parent)
             this, SLOT(downloadRemote()));
 
     this->setLayout(layout);
-    connect(&remoteDbMgr, SIGNAL(RemoteDBMgr::dbReady(RemoteDB*)),
-            this, SLOT(setDb(RemoteDB*)));
-    remoteDbMgr.getDbAsync();
+    connect(&remoteDBMgr, SIGNAL(dbReady(RemoteDB*)),
+            this, SLOT(setDB(RemoteDB*)));
+    remoteDBMgr.getDBAsync();
     setBusy(true);
 }
 
@@ -53,9 +58,10 @@ SelectRemoteDlg::~SelectRemoteDlg()
     delete layout;
 }
 
-SelectRemoteDlg::setDb(RemoteDB *db)
+void SelectRemoteDlg::setDB(RemoteDB *db)
 {
-    remoteDb = db;
+    remoteDB = db;
+    alphabetList->addItems(remoteDB->keys());
     setBusy(false);
 }
 
@@ -72,7 +78,7 @@ void SelectRemoteDlg::alphabetItemChanged(QListWidgetItem *current,
     modelList->clear();
     if (current)
     {
-        mfgList->addItems(remoteDb[current->text()].keys());
+        mfgList->addItems((*remoteDB)[current->text()].keys());
     }
 }
 
@@ -82,20 +88,26 @@ void SelectRemoteDlg::mfgItemChanged(QListWidgetItem *current,
     modelList->clear();
     if (current)
     {
-        QList <Remote> remotes =
-           remoteDb[alphabetList->currentItem()->text()][current->text()];
-        foreach(Remote remote, remotes) {
-            modelList.addItem(RemoteListWidgetItem(remote));
+        RemoteList remotes =
+            (*remoteDB)[alphabetList->currentItem()->text()][current->text()];
+        foreach(Remote *remote, remotes) {
+            modelList->addItem(new RemoteListWidgetItem(remote));
         }
     }
 }
 
 void SelectRemoteDlg::downloadRemote()
 {
-    RemoteListWidgetItem *currentModel = modelList->currentItem();
+    RemoteListWidgetItem *currentModel =
+        static_cast<RemoteListWidgetItem *>(modelList->currentItem());
     if (currentModel)
     {
-        currentModel->remote().saveFile();
+        setBusy();
+        connect(currentModel->remote(), SIGNAL(saveFinished()),
+                this, SLOT(close()));
+        currentModel->remote()->saveToFile();
+        
+        emit remoteChanged(*(currentModel->remote()));
     }
 }