Merge branch 'master' of ssh://mercury/var/git/irwi

Conflicts:
	src/selectremotedlg.cpp

diff --combined src/selectremotedlg.cpp
index e001110,b6fefb2..9c8b009
--- 1/src/selectremotedlg.cpp
--- 2/src/selectremotedlg.cpp
+++ b/src/selectremotedlg.cpp
@@@ -3,6 -3,7 +3,7 @@@
  #include "remote.h"
  #include "remotelistwidgetitem.h"
  #include "onlinepollerthread.h"
+ #include "remotetable.h"
  
  #include <QHBoxLayout>
  #include <QLabel>
@@@ -39,7 -40,7 +40,7 @@@ SelectRemoteDlg::SelectRemoteDlg(QWidge
              this,
              SLOT(mfgItemChanged(QListWidgetItem*, QListWidgetItem*)));
  
-     modelList = new QListWidget(this);
+     modelList = new RemoteTable(this);
      layout->addWidget(modelList);
  
      downloadBtn = new QPushButton(tr("Download"), this);
@@@ -78,8 -79,9 +79,8 @@@ void SelectRemoteDlg::alphabetItemChang
                                        QListWidgetItem * /*previous*/)
  {
      mfgList->clear();
-     modelList->clear();
+     modelList->removeAllRows();
 -    if (current)
 -    {
 +    if (current) {
          mfgList->addItems((*remoteDB)[current->text()].keys());
      }
  }
@@@ -87,28 -89,28 +88,27 @@@
  void SelectRemoteDlg::mfgItemChanged(QListWidgetItem *current,
                                       QListWidgetItem * /*previous*/)
  {
-     modelList->clear();
+     modelList->removeAllRows();
 -    if (current)
 -    {
 +    if (current) {
          RemoteList remotes =
              (*remoteDB)[alphabetList->currentItem()->text()][current->text()];
          foreach(Remote *remote, remotes) {
-             modelList->addItem(new RemoteListWidgetItem(remote));
+             modelList->addItem(remote);
          }
      }
  }
  
  void SelectRemoteDlg::downloadRemote()
  {
-     RemoteListWidgetItem *currentModel =
-         static_cast<RemoteListWidgetItem *>(modelList->currentItem());
+     Remote *currentModel = modelList->selected();
 -    if (currentModel)
 -    {
 +    if (currentModel) {
 +        setResult(QDialog::Accepted);
          setBusy();
-         connect(currentModel->remote(), SIGNAL(saveFinished()),
+         connect(currentModel, SIGNAL(saveFinished()),
                  this, SLOT(close()));
-         currentModel->remote()->saveToFile();
+         currentModel->saveToFile();
  
-         emit remoteChanged(*(currentModel->remote()));
+         emit remoteChanged(*currentModel);
      }
  }