X-Git-Url: http://vcs.maemo.org/git/?a=blobdiff_plain;f=librarydialog.cpp;h=9e985b254507ed20c4d6ee7b1b1c385b3275fab9;hb=HEAD;hp=6d4f5fe64f9d5230bdff64e17ff29c28d08e9741;hpb=397a7decd644e91cf76c292c58e7a03b7481d8f2;p=dorian diff --git a/librarydialog.cpp b/librarydialog.cpp index 6d4f5fe..9e985b2 100644 --- a/librarydialog.cpp +++ b/librarydialog.cpp @@ -1,12 +1,5 @@ -#include -#include -#include #include -#include - -#ifdef Q_WS_MAEMO_5 -#include -#endif +#include #include "librarydialog.h" #include "library.h" @@ -15,64 +8,64 @@ #include "infodialog.h" #include "settings.h" #include "listwindow.h" -#include "listview.h" #include "trace.h" #include "bookfinder.h" #include "searchdialog.h" #include "platform.h" #include "searchresultsdialog.h" #include "progressdialog.h" +#include "settings.h" -LibraryDialog::LibraryDialog(QWidget *parent): ListWindow(parent) +LibraryDialog::LibraryDialog(QWidget *parent): + ListWindow(tr("(No books)"), parent) { + TRACE; setWindowTitle(tr("Library")); + setAttribute(Qt::WA_DeleteOnClose, true); - // Add actions + // Add menu actions + sortByTitle = + addMenuAction(tr("Sort by title"), this, SLOT(onSortByTitle())); + sortByAuthor = + addMenuAction(tr("Sort by author"), this, SLOT(onSortByAuthor())); -#ifndef Q_WS_MAEMO_5 - addItemAction(tr("Details"), this, SLOT(onDetails())); - addItemAction(tr("Read"), this, SLOT(onRead())); - addItemAction(tr("Delete"), this, SLOT(onRemove())); -#endif // ! Q_WS_MAEMO_5 + // Set model + sortedLibrary = new SortedLibrary(this); + setModel(sortedLibrary); - addAction(tr("Add book"), this, SLOT(onAdd()), "add"); - addAction(tr("Add books from folder"), this, SLOT(onAddFolder()), "folder"); - addAction(tr("Search the Web"), this, SLOT(onSearch()), "search"); + // Add action buttons + addButton(tr("Add book"), this, SLOT(onAdd()), "add"); + addButton(tr("Add books from folder"), this, + SLOT(onAddFolder()), "folder"); + addButton(tr("Search the Web"), this, SLOT(onSearch()), "search"); + addItemButton(tr("Delete"), this, SLOT(onDelete()), "delete"); - // Create and add list view - list = new ListView(this); - sortedLibrary = new SortedLibrary(this); - list->setModel(sortedLibrary); - list->setSelectionMode(QAbstractItemView::SingleSelection); - list->setSpacing(1); + // Set selected item Library *library = Library::instance(); QModelIndex current = library->nowReading(); - setSelected(current); - addList(list); + setCurrentItem(sortedLibrary->mapFromSource(current)); - progress = new ProgressDialog(tr("Adding books"), this); - progress->reset(); - progress->setMinimumDuration(0); - progress->setWindowModality(Qt::WindowModal); - progress->setCancelButton(0); -#ifdef Q_WS_S60 - progress->setFixedWidth( - QApplication::desktop()->availableGeometry().width()); -#endif - - connect(Library::instance(), SIGNAL(nowReadingChanged()), - this, SLOT(onCurrentBookChanged())); - connect(Library::instance(), - SIGNAL(rowsInserted(const QModelIndex &, int, int)), - this, - SLOT(onBookAdded())); - connect(list, SIGNAL(activated(const QModelIndex &)), - this, SLOT(onItemActivated(const QModelIndex &))); - - // Create search dialog + // Search dialog box searchDialog = new SearchDialog(this); connect(Search::instance(), SIGNAL(endSearch()), this, SLOT(showSearchResults())); + + // Progress bar + progress = new ProgressDialog(tr("Adding books"), this); + + connect(library, SIGNAL(rowsInserted(const QModelIndex &, int, int)), + this, SLOT(onBookAdded())); + connect(this, SIGNAL(activated(const QModelIndex &)), + this, SLOT(onItemActivated(const QModelIndex &))); + + // Retrieve default sort criteria + switch (Settings::instance()->value("lib/sortby").toInt()) { + case SortedLibrary::SortByAuthor: + onSortByAuthor(); + break; + default: + onSortByTitle(); + } } void LibraryDialog::onAdd() @@ -86,7 +79,7 @@ void LibraryDialog::onAdd() } // Get book file name - QString path = QFileDialog::getOpenFileName(this, tr("Add Book"), + QString path = QFileDialog::getOpenFileName(this, tr("Add book"), lastDir, "Books (*.epub)"); if (path == "") { return; @@ -98,15 +91,9 @@ void LibraryDialog::onAdd() // Add book to library QModelIndex index = library->find(path); if (index.isValid()) { -#ifdef Q_WS_MAEMO_5 - QMaemo5InformationBox::information(this, - tr("This book is already in the library"), - QMaemo5InformationBox::DefaultTimeout); -#else - (void)QMessageBox::information(this, tr("Dorian"), - tr("This book is already in the library"), QMessageBox::Ok); -#endif // Q_WS_MAEMO_5 - setSelected(index); + Platform::instance()->information( + tr("This book is already in the library"), this); + setSelected(sortedLibrary->mapFromSource(index)); } else { library->add(path); @@ -116,54 +103,52 @@ void LibraryDialog::onAdd() void LibraryDialog::onBookAdded() { Library *library = Library::instance(); - setSelected(library->index(library->rowCount() - 1)); + setSelected(sortedLibrary-> + mapFromSource(library->index(library->rowCount() - 1))); } -#ifndef Q_WS_MAEMO_5 - -void LibraryDialog::onRemove() +void LibraryDialog::onItemActivated(const QModelIndex &index) { - QModelIndex current = sortedLibrary->mapToSource(list->currentIndex()); - if (current.isValid()) { - Book *currentBook = Library::instance()->book(current); - QString title = currentBook->name(); - if (QMessageBox::Yes == - QMessageBox::question(this, tr("Delete book"), - tr("Delete book \"%1\" from library?"). - arg(currentBook->shortName()), - QMessageBox::Yes | QMessageBox::No)) { - Library::instance()->remove(current); - } - } -} + TRACE; -void LibraryDialog::onRead() -{ - qDebug() << "LibraryDialog::onRead"; - QModelIndex current = sortedLibrary->mapToSource(list->currentIndex()); - if (current.isValid()) { - Library::instance()->setNowReading(current); + QModelIndex libraryIndex = sortedLibrary->mapToSource(index); + Book *book = Library::instance()->book(libraryIndex); + int ret = (new InfoDialog(book, this))->exec(); + + switch (ret) { + case InfoDialog::Read: + Library::instance()->setNowReading(libraryIndex); + close(); + break; + case InfoDialog::Delete: + Library::instance()->remove(libraryIndex); + break; + default: + ; } } -void LibraryDialog::onDetails() +void LibraryDialog::onDelete() { - onItemActivated(list->currentIndex()); -} - -#endif // Q_WS_MAEMO_5 - -void LibraryDialog::onItemActivated(const QModelIndex &index) -{ - qDebug() << "LibraryDialog::onItemActivated"; - QModelIndex libraryIndex = sortedLibrary->mapToSource(index); + QModelIndex current = currentItem(); + if (!current.isValid()) { + return; + } + QModelIndex libraryIndex = sortedLibrary->mapToSource(current); Book *book = Library::instance()->book(libraryIndex); - (new InfoDialog(book, this))->exec(); + if (QMessageBox::Yes != + QMessageBox::question(this, tr("Delete book"), + tr("Delete book \"%1\"?").arg(book->shortName()), + QMessageBox::Yes | QMessageBox::No)) { + return; + } + Library::instance()->remove(libraryIndex); } -QString LibraryDialog::createItemText(const Book *book) +QString LibraryDialog::createItemText(Book *book) { - QString text = book->title + "\n"; + Q_ASSERT(book); + QString text = book->shortName() + "\n"; if (book->creators.size()) { text += book->creators[0]; for (int i = 1; i < book->creators.size(); i++) { @@ -173,34 +158,17 @@ QString LibraryDialog::createItemText(const Book *book) return text; } -void LibraryDialog::onCurrentBookChanged() -{ - close(); -} - void LibraryDialog::setSelected(const QModelIndex &libraryIndex) { QModelIndex sortedIndex = sortedLibrary->mapFromSource(libraryIndex); - list->selectionModel()->clearSelection(); if (sortedIndex.isValid()) { - list->selectionModel()->select(sortedIndex, - QItemSelectionModel::Select); - list->setCurrentIndex(sortedIndex); - } -} - -QModelIndex LibraryDialog::selected() const -{ - QModelIndexList selectedItems = list->selectionModel()->selectedIndexes(); - if (selectedItems.size()) { - return sortedLibrary->mapToSource(selectedItems[0]); + setCurrentItem(sortedIndex); } - return QModelIndex(); } void LibraryDialog::onAddFolder() { - Trace t("LibraryDialog::onAddFolder"); + TRACE; // Get folder name Settings *settings = Settings::instance(); @@ -240,11 +208,7 @@ void LibraryDialog::onAddFromFolderDone(int added) progress->reset(); qDebug() << "LibraryDialog::onRefreshDone:" << msg; -#ifdef Q_WS_MAEMO_5 - QMaemo5InformationBox::information(this, msg); -#else - // FIXME -#endif + Platform::instance()->information(msg, this); } void LibraryDialog::onAddFromFolder(const QString &path) @@ -255,24 +219,47 @@ void LibraryDialog::onAddFromFolder(const QString &path) void LibraryDialog::onSearch() { + TRACE; int ret = searchDialog->exec(); + qDebug() << "Search dialog returned" << ret; if (ret != QDialog::Accepted) { return; } + progress->setLabelText(tr("Searching Project Gutenberg")); + progress->showWait(); Search::instance()->start(searchDialog->query()); } void LibraryDialog::showSearchResults() { + progress->reset(); QList results = Search::instance()->results(); - if (results.count() == 0) { - QMessageBox::information(this, tr("Search results"), tr("No books found")); + if (results.isEmpty()) { + QMessageBox::information(this, tr("Search results"), + tr("No books found")); return; } SearchResultsDialog *dialog = new SearchResultsDialog(results, this); - // FIXME connect(dialog, SIGNAL(add(const Search::Result &)), this, SLOT(onAddSearchResult(const Search::Result &))); dialog->show(); } + +void LibraryDialog::onSortByAuthor() +{ + TRACE; + sortedLibrary->setSortBy(SortedLibrary::SortByAuthor); + Settings::instance()->setValue("lib/sortby", SortedLibrary::SortByAuthor); + sortByAuthor->setChecked(true); + sortByTitle->setChecked(false); +} + +void LibraryDialog::onSortByTitle() +{ + TRACE; + sortedLibrary->setSortBy(SortedLibrary::SortByTitle); + Settings::instance()->setValue("lib/sortby", SortedLibrary::SortByTitle); + sortByAuthor->setChecked(false); + sortByTitle->setChecked(true); +}