X-Git-Url: http://vcs.maemo.org/git/?a=blobdiff_plain;f=bookmarksdialog.cpp;h=f125ed99fc633240bcd06ed8c336dc003b26d595;hb=6c8d9bb19213aee37517232ef889409200e53ac1;hp=a14bb4961cde440669634d692dbc46be9fb6b11a;hpb=d2608e0cdb570fb69833de60b1ce7b473faaf5f3;p=dorian

diff --git a/bookmarksdialog.cpp b/bookmarksdialog.cpp
index a14bb49..f125ed9 100644
--- a/bookmarksdialog.cpp
+++ b/bookmarksdialog.cpp
@@ -3,23 +3,17 @@
 #include "bookmarksdialog.h"
 #include "book.h"
 #include "bookmarkinfodialog.h"
-#include "listview.h"
+#include "trace.h"
 
 BookmarksDialog::BookmarksDialog(Book *book_, QWidget *parent):
-    ListWindow(parent), book(book_)
+    ListWindow(tr("(No bookmarks)\n"), parent), book(book_)
 {
     setWindowTitle(tr("Bookmarks"));
     if (!book) {
         return;
     }
 
-    addAction(tr("Add bookmark"), this, SLOT(onAdd()), ":/icons/add.png");
-#ifndef Q_WS_MAEMO_5
-    addItemAction(tr("Go to"), this, SLOT(onGo()));
-    addItemAction(tr("Delete"), this, SLOT(onDelete()));
-#endif // ! Q_WS_MAEMO_5
-
-    // Build bookmark list
+    // Build and set bookmark model
     // FIXME: Localize me
     foreach (Book::Bookmark bookmark, book_->bookmarks()) {
         QString label("At ");
@@ -36,21 +30,19 @@ BookmarksDialog::BookmarksDialog(Book *book_, QWidget *parent):
         }
         data.append(label);
     }
-
-    // Create bookmark list view
     QStringListModel *model = new QStringListModel(data, this);
-    list = new ListView;
-    list->setSelectionMode(QAbstractItemView::SingleSelection);
-    list->setModel(model);
-    addList(list);
-    connect(list, SIGNAL(activated(const QModelIndex &)),
+    setModel(model);
+
+    addButton(tr("Add bookmark"), this, SLOT(onAdd()), "add");
+
+    connect(this, SIGNAL(activated(const QModelIndex &)),
             this, SLOT(onItemActivated(const QModelIndex &)));
-    addList(list);
 }
 
 void BookmarksDialog::onGo()
 {
-    QModelIndex current = list->currentIndex();
+    TRACE;
+    QModelIndex current = currentItem();
     if (current.isValid()) {
         emit goToBookmark(current.row());
         close();
@@ -84,7 +76,7 @@ void BookmarksDialog::onAdd()
 
 void BookmarksDialog::onDelete(bool really)
 {
-    QModelIndex current = list->currentIndex();
+    QModelIndex current = currentItem();
     if (!current.isValid()) {
         return;
     }
@@ -96,6 +88,6 @@ void BookmarksDialog::onDelete(bool really)
         }
     }
     int row = current.row();
-    list->model()->removeRow(row);
+    model()->removeRow(row);
     book->deleteBookmark(row);
 }