projects
/
dorian
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Speed up paging through the book. Clean up code for saving/restoring
[dorian]
/
bookmarksdialog.cpp
diff --git
a/bookmarksdialog.cpp
b/bookmarksdialog.cpp
index
37ad543
..
f125ed9
100644
(file)
--- a/
bookmarksdialog.cpp
+++ b/
bookmarksdialog.cpp
@@
-3,23
+3,17
@@
#include "bookmarksdialog.h"
#include "book.h"
#include "bookmarkinfodialog.h"
#include "bookmarksdialog.h"
#include "book.h"
#include "bookmarkinfodialog.h"
-#include "listview.h"
+#include "trace.h"
BookmarksDialog::BookmarksDialog(Book *book_, QWidget *parent):
BookmarksDialog::BookmarksDialog(Book *book_, QWidget *parent):
- ListWindow(parent), book(book_)
+ ListWindow(tr("(No bookmarks)\n"), parent), book(book_)
{
setWindowTitle(tr("Bookmarks"));
if (!book) {
return;
}
{
setWindowTitle(tr("Bookmarks"));
if (!book) {
return;
}
- addAction(tr("Add bookmark"), this, SLOT(onAdd()), "add");
-#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 ");
// 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);
}
}
data.append(label);
}
-
- // Create bookmark list view
QStringListModel *model = new QStringListModel(data, this);
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 &)));
this, SLOT(onItemActivated(const QModelIndex &)));
- addList(list);
}
void BookmarksDialog::onGo()
{
}
void BookmarksDialog::onGo()
{
- QModelIndex current = list->currentIndex();
+ TRACE;
+ QModelIndex current = currentItem();
if (current.isValid()) {
emit goToBookmark(current.row());
close();
if (current.isValid()) {
emit goToBookmark(current.row());
close();
@@
-84,7
+76,7
@@
void BookmarksDialog::onAdd()
void BookmarksDialog::onDelete(bool really)
{
void BookmarksDialog::onDelete(bool really)
{
- QModelIndex current = list->currentIndex();
+ QModelIndex current = currentItem();
if (!current.isValid()) {
return;
}
if (!current.isValid()) {
return;
}
@@
-96,6
+88,6
@@
void BookmarksDialog::onDelete(bool really)
}
}
int row = current.row();
}
}
int row = current.row();
- list->model()->removeRow(row);
+ model()->removeRow(row);
book->deleteBookmark(row);
}
book->deleteBookmark(row);
}