#include "librarydialog.h"
#include "devtools.h"
#include "mainwindow.h"
-#include "translucentbutton.h"
#include "settingswindow.h"
#include "bookmarksdialog.h"
#include "settings.h"
+#include "chaptersdialog.h"
+#include "fullscreenwindow.h"
+#include "trace.h"
#ifdef DORIAN_TEST_MODEL
#include "modeltest.h"
# define ICON_PREFIX ":/icons/"
#endif
-const Qt::WindowFlags WIN_BIG_FLAGS =
- Qt::FramelessWindowHint | Qt::WindowStaysOnTopHint;
-const int WIN_BIG_TIMER = 3000;
-
-MainWindow::MainWindow(QWidget *parent):
- QMainWindow(parent), view(0), book(0), isFullscreen(false)
+MainWindow::MainWindow(QWidget *parent): QMainWindow(parent), view(0)
{
#ifdef Q_WS_MAEMO_5
setAttribute(Qt::WA_Maemo5StackedWindow, true);
#endif
setWindowTitle("Dorian");
+ // Central widget. Must be an intermediate because of reparenting the book view
+ QFrame *central = new QFrame(this);
+ QVBoxLayout *layout = new QVBoxLayout(central);
+ layout->setMargin(0);
+ central->setLayout(layout);
+ setCentralWidget(central);
+
// Book view
- view = new BookView(this);
- setCentralWidget(view);
+ view = new BookView(central);
+ view->show();
+ layout->addWidget(view);
// Tool bar
setUnifiedTitleAndToolBarOnMac(true);
#if defined(Q_WS_X11) && !defined(Q_WS_MAEMO_5)
toolBar->setIconSize(QSize(42, 42));
#endif
+
previousAction = addToolBarAction(view, SLOT(goPrevious()), "previous");
nextAction = addToolBarAction(view, SLOT(goNext()), "next");
- bookmarksAction = addToolBarAction(this, SLOT(showBookmarks()),
- "bookmarks");
+ chaptersAction = addToolBarAction(this, SLOT(showChapters()), "chapters");
+ bookmarksAction = addToolBarAction(this, SLOT(showBookmarks()), "bookmarks");
+
#ifdef Q_WS_MAEMO_5
- infoAction = new QAction(this);
+ infoAction = menuBar()->addAction(tr("Book details"));
+ connect(infoAction, SIGNAL(triggered()), this, SLOT(showInfo()));
+ libraryAction = menuBar()->addAction(tr("Library"));
+ connect(libraryAction, SIGNAL(triggered()), this, SLOT(showLibrary()));
+ settingsAction = menuBar()->addAction(tr("Settings"));
+ connect(settingsAction, SIGNAL(triggered()), this, SLOT(showSettings()));
+ devToolsAction = menuBar()->addAction(tr("Developer"));
+ connect(devToolsAction, SIGNAL(triggered()), this, SLOT(showDevTools()));
#else
infoAction = addToolBarAction(this, SLOT(showInfo()), "document-properties");
-#endif
libraryAction = addToolBarAction(this, SLOT(showLibrary()),
"system-file-manager");
settingsAction = addToolBarAction(this, SLOT(showSettings()),
"preferences-system");
-#ifdef Q_WS_MAEMO_5
- devToolsAction = new QAction(this);
-#else
devToolsAction = addToolBarAction(this, SLOT(showDevTools()), "developer");
+#endif // Q_WS_MAEMO_5
+
QFrame *frame = new QFrame(toolBar);
frame->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
toolBar->addWidget(frame);
-#endif
- fullScreenAction = addToolBarAction(this, SLOT(showFullScreen()),
- "view-fullscreen");
+
+ fullScreenAction = addToolBarAction(this, SLOT(showBig()), "view-fullscreen");
// Handle model changes
- connect(Library::instance(), SIGNAL(currentBookChanged()),
+ connect(Library::instance(), SIGNAL(nowReadingChanged()),
this, SLOT(onCurrentBookChanged()));
- normalFlags = windowFlags();
- restoreButton = new TranslucentButton("view-fullscreen", this);
-
// Load book on command line, or load last read book, or load default book
Library *library = Library::instance();
if (QCoreApplication::arguments().size() == 2) {
library->add(path);
QModelIndex index = library->find(path);
if (index.isValid()) {
- library->setCurrent(index);
+ library->setNowReading(index);
}
}
else {
- Book *current = library->current();
- if (current) {
- setCurrentBook(current);
+ QModelIndex index = library->nowReading();
+ if (index.isValid()) {
+ library->setNowReading(index);
}
else {
if (!library->rowCount()) {
library->add(":/books/2 B R 0 2 B.epub");
}
- library->setCurrent(library->index(0));
+ library->setNowReading(library->index(0));
}
}
Settings::instance()->value("orientation"));
// Handle loading chapters
- connect(view, SIGNAL(chapterLoaded(int)), this, SLOT(onChapterLoaded(int)));
+ connect(view, SIGNAL(chapterLoadStart(int)),
+ this, SLOT(onChapterLoadStart()));
+ connect(view, SIGNAL(chapterLoadEnd(int)),
+ this, SLOT(onChapterLoadEnd(int)));
+
+ // Shadow window for full screen
+ fullScreenWindow = new FullScreenWindow(this);
+ connect(fullScreenWindow, SIGNAL(restore()), this, SLOT(showRegular()));
#ifdef DORIAN_TEST_MODEL
(void)new ModelTest(Library::instance(), this);
void MainWindow::onCurrentBookChanged()
{
- setCurrentBook(Library::instance()->current());
+ setCurrentBook(Library::instance()->nowReading());
}
-void MainWindow::showNormal()
+void MainWindow::showRegular()
{
- qDebug() << "MainWindow::showNormal";
- isFullscreen = false;
- setWindowFlags(normalFlags);
- hide();
- setGeometry(normalGeometry);
- toolBar->show();
- restoreButton->hide();
- show();
+ Trace t("MainWindow::showRegular");
+ fullScreenWindow->hide();
+ fullScreenWindow->leaveChild();
+ view->setParent(centralWidget());
+ centralWidget()->layout()->addWidget(view);
}
-void MainWindow::showFullScreen()
+void MainWindow::showBig()
{
- qDebug() << "MainWindow::showFullscreen";
- normalGeometry = geometry();
- isFullscreen = true;
- toolBar->hide();
- setWindowFlags(normalFlags | WIN_BIG_FLAGS);
- showMaximized();
- restoreButton->flash();
+ Trace t("MainWindow::showBig");
+ centralWidget()->layout()->removeWidget(view);
+ fullScreenWindow->takeChild(view);
+ fullScreenWindow->showFullScreen();
}
-void MainWindow::setCurrentBook(Book *current)
+void MainWindow::setCurrentBook(const QModelIndex ¤t)
{
- book = current;
- view->setBook(current);
- setWindowTitle(current? current->title: "Dorian");
+ mCurrent = current;
+ Book *book = Library::instance()->book(current);
+ view->setBook(book);
+ setWindowTitle(book? book->name(): tr("Dorian"));
}
-QAction *MainWindow::addToolBarAction(const QObject *receiver, const char *member,
+QAction *MainWindow::addToolBarAction(const QObject *receiver,
+ const char *member,
const QString &name)
{
return toolBar->
void MainWindow::showLibrary()
{
- LibraryDialog *dialog = new LibraryDialog();
- dialog->exec();
+ LibraryDialog *dialog = new LibraryDialog(this);
+ dialog->show();
}
void MainWindow::showSettings()
void MainWindow::showInfo()
{
- if (book) {
- InfoDialog *info = new InfoDialog(book, this);
+ if (mCurrent.isValid()) {
+ InfoDialog *info =
+ new InfoDialog(Library::instance()->book(mCurrent), this);
info->exec();
}
}
void MainWindow::showBookmarks()
{
+ Book *book = Library::instance()->book(mCurrent);
if (book) {
BookmarksDialog *bookmarks = new BookmarksDialog(book, this);
- int ret = bookmarks->exec();
- if (ret > 0) {
- int index = ret - 1;
- view->goToBookmark(book->bookmarks()[index]);
- }
- else if (ret < 0) {
- view->addBookmark();
- }
+ bookmarks->setWindowModality(Qt::WindowModal);
+ connect(bookmarks, SIGNAL(addBookmark()), this, SLOT(onAddBookmark()));
+ connect(bookmarks, SIGNAL(goToBookmark(int)),
+ this, SLOT(onGoToBookmark(int)));
+ bookmarks->show();
}
}
-void MainWindow::MOUSE_ACTIVATE_EVENT(QMouseEvent *event)
-{
- qDebug() << "MainWindow::mousePress/ReleaseEvent at" << event->pos()
- << "against" << fullScreenZone();
- if (isFullscreen && fullScreenZone().contains(event->x(), event->y())) {
- qDebug() << " In fullScreenZone";
- showNormal();
- }
- QMainWindow::MOUSE_ACTIVATE_EVENT(event);
-}
-
-QRect MainWindow::fullScreenZone() const
-{
- return QRect(width() / 2 - 45, height() - 104, 95, 95);
-}
-
-void MainWindow::resizeEvent(QResizeEvent *event)
-{
- (void)event;
- restoreButton->setGeometry(fullScreenZone());
-}
-
void MainWindow::closeEvent(QCloseEvent *event)
{
- qDebug() << "MainWindow::closeEvent";
+ Trace t("MainWindow::closeEvent");
view->setLastBookmark();
event->accept();
}
void MainWindow::onSettingsChanged(const QString &key)
{
+ Trace t("MainWindow::onSettingsChanged");
#ifdef Q_WS_MAEMO_5
if (key == "orientation") {
QString value = Settings::instance()->value(key).toString();
#endif // Q_WS_MAEMO_5
}
-void MainWindow::onChapterLoaded(int index)
+void MainWindow::onChapterLoadStart()
+{
+ Trace t("MainWindow::onChapterLoadStart");
+#ifdef Q_WS_MAEMO_5
+ setAttribute(Qt::WA_Maemo5ShowProgressIndicator, true);
+#endif
+}
+
+void MainWindow::onChapterLoadEnd(int index)
{
+ Trace t("MainWindow::onChapterLoadEnd");
bool enablePrevious = false;
bool enableNext = false;
+ Book *book = Library::instance()->book(mCurrent);
if (book) {
if (index > 0) {
enablePrevious = true;
}
}
#ifdef Q_WS_MAEMO_5
+ setAttribute(Qt::WA_Maemo5ShowProgressIndicator, false);
previousAction->setIcon(QIcon(enablePrevious?
":/icons/previous.png" : ":/icons/previous-disabled.png"));
nextAction->setIcon(QIcon(enableNext?
previousAction->setEnabled(enablePrevious);
nextAction->setEnabled(enableNext);
}
+
+void MainWindow::onAddBookmark()
+{
+ Trace t("MainWindow:onAddBookmark");
+ view->addBookmark();
+}
+
+void MainWindow::onGoToBookmark(int index)
+{
+ Trace t("MainWindow::onGoToBookmark");
+ Book *book = Library::instance()->book(mCurrent);
+ view->goToBookmark(book->bookmarks()[index]);
+}
+
+void MainWindow::showChapters()
+{
+ Book *book = Library::instance()->book(mCurrent);
+ if (book) {
+ ChaptersDialog *chapters = new ChaptersDialog(book, this);
+ chapters->setWindowModality(Qt::WindowModal);
+ connect(chapters, SIGNAL(goToChapter(int)),
+ this, SLOT(onGoToChapter(int)));
+ chapters->show();
+ }
+}
+
+void MainWindow::onGoToChapter(int index)
+{
+ view->goToBookmark(Book::Bookmark(index, 0));
+}
projects / dorian / blobdiff