X-Git-Url: https://vcs.maemo.org/git/?a=blobdiff_plain;ds=sidebyside;f=src%2Fselectremotedlg.cpp;h=cc73668ed2e58bcd445f7a810f67014465159d78;hb=HEAD;hp=b6fefb247be8fce3e17d5134995afbce20232121;hpb=52249707de038363a57bdb9bfed18d2da04e4aaf;p=irwi

diff --git a/src/selectremotedlg.cpp b/src/selectremotedlg.cpp
index b6fefb2..cc73668 100644
--- a/src/selectremotedlg.cpp
+++ b/src/selectremotedlg.cpp
@@ -1,7 +1,6 @@
 #include "selectremotedlg.h"
 
 #include "remote.h"
-#include "remotelistwidgetitem.h"
 #include "onlinepollerthread.h"
 #include "remotetable.h"
 
@@ -26,7 +25,7 @@ SelectRemoteDlg::SelectRemoteDlg(QWidget *parent)
     layout = new QHBoxLayout(this);
 
     alphabetList = new QListWidget(this);
-    alphabetList->setMaximumWidth(96);
+    alphabetList->setMaximumWidth(64);
     layout->addWidget(alphabetList);
     connect(alphabetList,
             SIGNAL(currentItemChanged(QListWidgetItem*, QListWidgetItem*)),
@@ -34,6 +33,7 @@ SelectRemoteDlg::SelectRemoteDlg(QWidget *parent)
             SLOT(alphabetItemChanged(QListWidgetItem*, QListWidgetItem*)));
     
     mfgList = new QListWidget(this);
+    mfgList->setMaximumWidth(192);
     layout->addWidget(mfgList);
     connect(mfgList,
             SIGNAL(currentItemChanged(QListWidgetItem*, QListWidgetItem*)),
@@ -51,6 +51,8 @@ SelectRemoteDlg::SelectRemoteDlg(QWidget *parent)
     this->setLayout(layout);
     connect(&remoteDBMgr, SIGNAL(dbReady(RemoteDB*)),
             this, SLOT(setDB(RemoteDB*)));
+    connect(&remoteDBMgr, SIGNAL(downloadFailed(int)),
+            this, SLOT(onDBError(int)));
 }
 
 SelectRemoteDlg::~SelectRemoteDlg()
@@ -71,7 +73,9 @@ void SelectRemoteDlg::setDB(RemoteDB *db)
 
 void SelectRemoteDlg::setBusy(bool busy)
 {
+#ifdef Q_WS_MAEMO_5
     setAttribute(Qt::WA_Maemo5ShowProgressIndicator, busy);
+#endif
     setEnabled(!busy);
 }
 
@@ -80,8 +84,7 @@ void SelectRemoteDlg::alphabetItemChanged(QListWidgetItem *current,
 {
     mfgList->clear();
     modelList->removeAllRows();
-    if (current)
-    {
+    if (current) {
         mfgList->addItems((*remoteDB)[current->text()].keys());
     }
 }
@@ -90,8 +93,7 @@ void SelectRemoteDlg::mfgItemChanged(QListWidgetItem *current,
                                      QListWidgetItem * /*previous*/)
 {
     modelList->removeAllRows();
-    if (current)
-    {
+    if (current) {
         RemoteList remotes =
             (*remoteDB)[alphabetList->currentItem()->text()][current->text()];
         foreach(Remote *remote, remotes) {
@@ -103,8 +105,8 @@ void SelectRemoteDlg::mfgItemChanged(QListWidgetItem *current,
 void SelectRemoteDlg::downloadRemote()
 {
     Remote *currentModel = modelList->selected();
-    if (currentModel)
-    {
+    if (currentModel) {
+        setResult(QDialog::Accepted);
         setBusy();
         connect(currentModel, SIGNAL(saveFinished()),
                 this, SLOT(close()));
@@ -142,3 +144,10 @@ void SelectRemoteDlg::showEvent(QShowEvent *event)
     QDialog::showEvent(event);
 }
 
+void SelectRemoteDlg::onDBError(int error)
+{
+    this->setWindowTitle(tr("Network error") + " " + QString::number(error));
+    setBusy(false);
+    downloadBtn->setVisible(false);
+}
+