X-Git-Url: http://vcs.maemo.org/git/?a=blobdiff_plain;f=searchresultsdialog.cpp;h=db0192b8fc0e4da6912b5c539cab09c76a0fcd20;hb=HEAD;hp=f52af1f124eb84d7b9f875deaac387918c94fd4e;hpb=f2571fe854dcae8a8cd8f9216e0f78b51dd0a1a4;p=dorian

diff --git a/searchresultsdialog.cpp b/searchresultsdialog.cpp
index f52af1f..db0192b 100644
--- a/searchresultsdialog.cpp
+++ b/searchresultsdialog.cpp
@@ -5,7 +5,6 @@
 #include <QDir>
 #include <QFile>
 
-#include "listview.h"
 #include "searchresultsdialog.h"
 #include "searchresultinfodialog.h"
 #include "trace.h"
@@ -14,9 +13,9 @@
 #include "platform.h"
 
 SearchResultsDialog::SearchResultsDialog(const QList<Search::Result> results_,
-    QWidget *parent): ListWindow(parent), results(results_)
+    QWidget *parent): ListWindow(tr("(No results)"), parent), results(results_)
 {
-    setWindowTitle(tr("Search Results"));
+    setWindowTitle(tr("Search results"));
 
     foreach (Search::Result result, results) {
         QString author;
@@ -27,13 +26,8 @@ SearchResultsDialog::SearchResultsDialog(const QList<Search::Result> results_,
     }
 
     QStringListModel *model = new QStringListModel(data, this);
-    list = new ListView;
-    list->setSelectionMode(QAbstractItemView::SingleSelection);
-    list->setModel(model);
-    list->setUniformItemSizes(true);
-    addList(list);
-    addItemAction(tr("Download book"), this, SLOT(onDownload()));
-    connect(list, SIGNAL(activated(const QModelIndex &)),
+    setModel(model);
+    connect(this, SIGNAL(activated(const QModelIndex &)),
             this, SLOT(onItemActivated(const QModelIndex &)));
     Search *search = Search::instance();
     connect(search, SIGNAL(beginDownload(int)), this, SLOT(onBeginDownload(int)));
@@ -42,7 +36,7 @@ SearchResultsDialog::SearchResultsDialog(const QList<Search::Result> results_,
             this,
             SLOT(onEndDownload(int, const Search::Result &, const QString &)));
 
-    progress = new ProgressDialog(tr("Downloading Book"), this);
+    progress = new ProgressDialog(tr("Downloading book"), this);
 }
 
 void SearchResultsDialog::onItemActivated(const QModelIndex &index)
@@ -61,15 +55,10 @@ void SearchResultsDialog::onItemActivated(const QModelIndex &index)
     }
 }
 
-void SearchResultsDialog::onDownload()
-{
-    onItemActivated(list->currentIndex());
-}
-
 QString SearchResultsDialog::downloadName() const
 {
     TRACE;
-    QString dir = Platform::downloadDir();
+    QString dir = Platform::instance()->downloadDir();
     QDir().mkpath(dir); // Not sure if this works. QDir API is quiet lame.
     unsigned i = 0;
     QString fileName;
@@ -100,9 +89,11 @@ void SearchResultsDialog::onEndDownload(int status, const Search::Result &result
         Library::instance()->add(fileName);
         int row = results.indexOf(result);
         if (-1 != row) {
-            list->model()->removeRow(row);
+            results.removeAt(row);
+            model()->removeRow(row);
         }
-        Platform::information(tr("Downloaded \"%1\"\nand added to the library").
-                              arg(result.title), this);
+        Platform::instance()->
+            information(tr("Downloaded \"%1\"\nand added to the "
+                           "library").arg(result.title), this);
     }
 }