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

diff --combined src/selectremotedlg.cpp
index 16926fa,9c8b009..28e13b0
--- 1/src/selectremotedlg.cpp
--- 2/src/selectremotedlg.cpp
+++ b/src/selectremotedlg.cpp
@@@ -26,7 -26,7 +26,7 @@@ SelectRemoteDlg::SelectRemoteDlg(QWidge
      layout = new QHBoxLayout(this);
  
      alphabetList = new QListWidget(this);
 -    alphabetList->setMaximumWidth(96);
 +    alphabetList->setMaximumWidth(64);
      layout->addWidget(alphabetList);
      connect(alphabetList,
              SIGNAL(currentItemChanged(QListWidgetItem*, QListWidgetItem*)),
@@@ -34,7 -34,6 +34,7 @@@
              SLOT(alphabetItemChanged(QListWidgetItem*, QListWidgetItem*)));
      
      mfgList = new QListWidget(this);
 +    mfgList->setMaximumWidth(192);
      layout->addWidget(mfgList);
      connect(mfgList,
              SIGNAL(currentItemChanged(QListWidgetItem*, QListWidgetItem*)),
@@@ -81,8 -80,7 +81,7 @@@ void SelectRemoteDlg::alphabetItemChang
  {
      mfgList->clear();
      modelList->removeAllRows();
-     if (current)
-     {
+     if (current) {
          mfgList->addItems((*remoteDB)[current->text()].keys());
      }
  }
@@@ -91,8 -89,7 +90,7 @@@ void SelectRemoteDlg::mfgItemChanged(QL
                                       QListWidgetItem * /*previous*/)
  {
      modelList->removeAllRows();
-     if (current)
-     {
+     if (current) {
          RemoteList remotes =
              (*remoteDB)[alphabetList->currentItem()->text()][current->text()];
          foreach(Remote *remote, remotes) {
@@@ -104,8 -101,8 +102,8 @@@
  void SelectRemoteDlg::downloadRemote()
  {
      Remote *currentModel = modelList->selected();
-     if (currentModel)
-     {
+     if (currentModel) {
+         setResult(QDialog::Accepted);
          setBusy();
          connect(currentModel, SIGNAL(saveFinished()),
                  this, SLOT(close()));

diff --combined src/settingsdlg.cpp
index 42ec42b,4e0ae61..e9b9b11
--- 1/src/settingsdlg.cpp
--- 2/src/settingsdlg.cpp
+++ b/src/settingsdlg.cpp
@@@ -27,14 -27,14 +27,14 @@@ SettingsDlg::SettingsDlg(QWidget *paren
      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);
@@@ -121,7 -121,9 +121,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()