#include <QApplication>
#include <QFileInfo>
#include <QStringList>
+#include <QWebView>
+#include <QWebFrame>
#ifdef Q_WS_MAEMO_5
# include <QtMaemo5/QMaemo5InformationBox>
#include "translucentbutton.h"
#ifdef DORIAN_TEST_MODEL
-#include "modeltest.h"
-#endif
-
-#ifdef Q_WS_MAC
-# define ICON_PREFIX ":/icons/mac/"
-#else
-# define ICON_PREFIX ":/icons/"
+# include "modeltest.h"
#endif
const int PROGRESS_HEIGHT = 17;
-const char *DORIAN_VERSION =
+static const char *DORIAN_VERSION =
#include "pkg/version.txt"
;
MainWindow::MainWindow(QWidget *parent):
- BookWindow(parent), view(0), preventBlankingTimer(-1)
+ AdopterWindow(parent), view(0), preventBlankingTimer(-1)
{
Trace t("MainWindow::MainWindow");
#ifdef Q_WS_MAEMO_5
// Progress
progress = new Progress(central);
- // Tool bar
- setUnifiedTitleAndToolBarOnMac(true);
+ // Settings dialog
settings = new QDialog(this);
- toolBar = addToolBar("controls");
- toolBar->setMovable(false);
- toolBar->setFloatable(false);
- toolBar->toggleViewAction()->setVisible(false);
-#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");
- chaptersAction = addToolBarAction(this, SLOT(showChapters()), "chapters");
- bookmarksAction = addToolBarAction(this, SLOT(showBookmarks()), "bookmarks");
+ // Tool bar actions
+
+ chaptersAction = addToolBarAction(this, SLOT(showChapters()),
+ "chapters", tr("Chapters"));
+ bookmarksAction = addToolBarAction(this, SLOT(showBookmarks()),
+ "bookmarks", tr("Bookmarks"));
+ infoAction = addToolBarAction(this, SLOT(showInfo()),
+ "info", tr("Book info"));
+ libraryAction = addToolBarAction(this, SLOT(showLibrary()),
+ "library", tr("Library"));
#ifdef Q_WS_MAEMO_5
- 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"));
QAction *aboutAction = menuBar()->addAction(tr("About"));
connect(aboutAction, SIGNAL(triggered()), this, SLOT(about()));
#else
- infoAction = addToolBarAction(this, SLOT(showInfo()), "document-properties");
- libraryAction = addToolBarAction(this, SLOT(showLibrary()),
- "system-file-manager");
settingsAction = addToolBarAction(this, SLOT(showSettings()),
- "preferences-system");
- devToolsAction = addToolBarAction(this, SLOT(showDevTools()), "developer");
- addToolBarAction(this, SLOT(about()), "about");
+ "preferences-system", tr("Settings"));
+ devToolsAction = addToolBarAction(this, SLOT(showDevTools()),
+ "developer", tr("Developer"));
+ addToolBarAction(this, SLOT(about()), "about", tr("About"));
#endif // Q_WS_MAEMO_5
- QFrame *frame = new QFrame(toolBar);
- frame->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
- toolBar->addWidget(frame);
-
+ addToolBarSpace();
fullScreenAction = addToolBarAction(this, SLOT(showBig()),
- "view-fullscreen");
+ "view-fullscreen", tr("Full screen"));
- // Buttons for paging
+ // Buttons on top of the book view
previousButton = new TranslucentButton("back", this);
nextButton = new TranslucentButton("forward", this);
connect(Library::instance(), SIGNAL(nowReadingChanged()),
this, SLOT(onCurrentBookChanged()));
- // Load book on command line, or load last read book, or load default book
+ // Load library, upgrade it if needed
+ libraryProgress = new QProgressDialog(tr("Upgrading library"), "", 0, 0, this);
+ libraryProgress->reset();
+ libraryProgress->setMinimumDuration(0);
+ libraryProgress->setWindowModality(Qt::WindowModal);
+ libraryProgress->setCancelButton(0);
Library *library = Library::instance();
+ connect(library, SIGNAL(beginUpgrade(int)), this, SLOT(onBeginUpgrade(int)));
+ connect(library, SIGNAL(upgrading(const QString &)),
+ this, SLOT(onUpgrading(const QString &)));
+ connect(library, SIGNAL(endUpgrade()), this, SLOT(onEndUpgrade()));
+ connect(library, SIGNAL(beginLoad(int)), this, SLOT(onBeginLoad(int)));
+ connect(library, SIGNAL(loading(const QString &)),
+ this, SLOT(onLoading(const QString &)));
+ connect(library, SIGNAL(endLoad()), this, SLOT(onEndLoad()));
+ library->upgrade();
+ library->load();
+
+ // Load book on command line, or load last read book, or load default book
if (QCoreApplication::arguments().size() == 2) {
QString path = QCoreApplication::arguments()[1];
library->add(path);
if (index.isValid()) {
library->setNowReading(index);
}
- }
- else {
+ } else {
QModelIndex index = library->nowReading();
if (index.isValid()) {
library->setNowReading(index);
- }
- else {
+ } else {
if (!library->rowCount()) {
- library->add(":/books/2 B R 0 2 B.epub");
+ library->add(":/books/2BR02B.epub");
}
library->setNowReading(library->index(0));
}
settings->setValue("lightson", settings->value("lightson"));
settings->setValue("usevolumekeys", settings->value("usevolumekeys"));
- // Handle next/previous buttons
- connect(nextButton, SIGNAL(triggered()), view, SLOT(goNextPage()));
- connect(previousButton, SIGNAL(triggered()), view, SLOT(goPreviousPage()));
+ // Handle book view buttons
+ connect(nextButton, SIGNAL(triggered()), this, SLOT(goToNextPage()));
+ connect(previousButton, SIGNAL(triggered()), this, SLOT(goToPreviousPage()));
#ifdef DORIAN_TEST_MODEL
(void)new ModelTest(Library::instance(), this);
Trace t("MainWindow::showRegular");
fullScreenWindow->hide();
fullScreenWindow->leaveChildren();
- QRect geo = geometry();
- qDebug() << "Geometry:" << geo;
- progress->setGeometry(0, 0, geo.width(), PROGRESS_HEIGHT);
-#ifdef Q_WS_MAEMO_5
- previousButton->setGeometry(0,geo.height() - toolBar->height() - 95,
- 95, 95);
- nextButton->setGeometry(geo.width() - 95, 0, 95, 95);
-#else
- previousButton->setGeometry(0, geo.height() - 95, 95, 95);
- nextButton->setGeometry(geo.width() - 95, toolBar->height(), 95, 95);
-#endif // Q_WS_MAEMO_5
QList<QWidget *> otherChildren;
otherChildren << progress << previousButton << nextButton;
takeChildren(view, otherChildren);
+ QRect geo = geometry();
+ progress->setGeometry(0, 0, geo.width(), PROGRESS_HEIGHT);
+#if defined(Q_WS_MAEMO_5)
+ previousButton->setGeometry(0,
+ geo.height() - toolBar->height() - TranslucentButton::pixels,
+ TranslucentButton::pixels, TranslucentButton::pixels);
+ nextButton->setGeometry(geo.width() - TranslucentButton::pixels, 0,
+ TranslucentButton::pixels, TranslucentButton::pixels);
+#elif defined(Q_OS_SYMBIAN)
+ previousButton->setGeometry(0, geo.height() - TranslucentButton::pixels,
+ TranslucentButton::pixels, TranslucentButton::pixels);
+ nextButton->setGeometry(geo.width() - TranslucentButton::pixels,
+ 0, TranslucentButton::pixels, TranslucentButton::pixels);
+#else
+ previousButton->setGeometry(0, geo.height() - TranslucentButton::pixels,
+ TranslucentButton::pixels, TranslucentButton::pixels);
+ nextButton->setGeometry(geo.width() - TranslucentButton::pixels - 25,
+ toolBar->height(), TranslucentButton::pixels, TranslucentButton::pixels);
+#endif // Q_WS_MAEMO_5
+ qDebug() << "previousButton geometry" << previousButton->geometry();
progress->flash();
- nextButton->flash();
- previousButton->flash();
+ nextButton->show();
+ previousButton->show();
+ nextButton->flash(1500);
+ previousButton->flash(1500);
}
void MainWindow::showBig()
otherChildren << progress << nextButton << previousButton;
QRect screen = QApplication::desktop()->screenGeometry();
progress->setGeometry(0, 0, screen.width(), PROGRESS_HEIGHT);
- nextButton->setGeometry(screen.width() - 95, 0, 95, 95);
- previousButton->setGeometry(0, screen.height() - 95, 95, 95);
+#if defined(Q_WS_MAEMO_5)
+ nextButton->setGeometry(screen.width() - TranslucentButton::pixels, 0,
+ TranslucentButton::pixels, TranslucentButton::pixels);
+#else
+ nextButton->setGeometry(screen.width() - TranslucentButton::pixels - 25, 0,
+ TranslucentButton::pixels, TranslucentButton::pixels);
+#endif // Q_WS_MAEMO_5
+ previousButton->setGeometry(0, screen.height() - TranslucentButton::pixels,
+ TranslucentButton::pixels, TranslucentButton::pixels);
fullScreenWindow->takeChildren(view, otherChildren);
fullScreenWindow->showFullScreen();
progress->flash();
- nextButton->flash();
- previousButton->flash();
+ nextButton->flash(1500);
+ previousButton->flash(1500);
}
void MainWindow::setCurrentBook(const QModelIndex ¤t)
setWindowTitle(book? book->shortName(): tr("Dorian"));
}
-QAction *MainWindow::addToolBarAction(const QObject *receiver,
- const char *member,
- const QString &name)
-{
- return toolBar->
- addAction(QIcon(ICON_PREFIX + name + ".png"), "", receiver, member);
-}
-
void MainWindow::showLibrary()
{
(new LibraryDialog(this))->show();
void MainWindow::showInfo()
{
if (mCurrent.isValid()) {
- (new InfoDialog(Library::instance()->book(mCurrent), this))->exec();
+ (new InfoDialog(Library::instance()->book(mCurrent), this, false))->
+ exec();
}
}
if (value == "portrait") {
setAttribute(Qt::WA_Maemo5LandscapeOrientation, false);
setAttribute(Qt::WA_Maemo5PortraitOrientation, true);
- }
- else {
+ } else {
setAttribute(Qt::WA_Maemo5PortraitOrientation, false);
setAttribute(Qt::WA_Maemo5LandscapeOrientation, 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?
- ":/icons/next.png": ":/icons/next-disabled.png"));
#endif // Q_WS_MAEMO_5
- previousAction->setEnabled(enablePrevious);
- nextAction->setEnabled(enableNext);
}
void MainWindow::onAddBookmark()
#endif // Q_WS_MAEMO_5
qDebug() << "MainWindow::timerEvent: Prevent display blanking";
}
+ AdopterWindow::timerEvent(event);
}
void MainWindow::resizeEvent(QResizeEvent *e)
{
Trace t("MainWindow::resizeEvent");
progress->setGeometry(QRect(0, 0, e->size().width(), PROGRESS_HEIGHT));
- qDebug() << "Toolbar height" << toolBar->height();
-#ifdef Q_WS_MAEMO_5
- previousButton->setGeometry(0, e->size().height() - toolBar->height() - 95,
- 95, 95);
- nextButton->setGeometry(e->size().width() - 95, 0, 95, 95);
+#if defined(Q_WS_MAEMO_5)
+ previousButton->setGeometry(0,
+ e->size().height() - toolBar->height() - TranslucentButton::pixels,
+ TranslucentButton::pixels, TranslucentButton::pixels);
+ nextButton->setGeometry(e->size().width() - TranslucentButton::pixels, 0,
+ TranslucentButton::pixels, TranslucentButton::pixels);
+#elif defined(Q_OS_SYMBIAN)
+ previousButton->setGeometry(0, e->size().height() - TranslucentButton::pixels,
+ TranslucentButton::pixels, TranslucentButton::pixels);
+ nextButton->setGeometry(e->size().width() - TranslucentButton::pixels,
+ 0, TranslucentButton::pixels, TranslucentButton::pixels);
#else
- previousButton->setGeometry(0, e->size().height() - 95, 95, 95);
- nextButton->setGeometry(e->size().width() - 95, toolBar->height(), 95, 95);
+ previousButton->setGeometry(0, e->size().height() - TranslucentButton::pixels,
+ TranslucentButton::pixels, TranslucentButton::pixels);
+ nextButton->setGeometry(e->size().width() - TranslucentButton::pixels - 25,
+ toolBar->height(), TranslucentButton::pixels, TranslucentButton::pixels);
#endif // Q_WS_MAEMO_5
- previousButton->flash();
- nextButton->flash();
+ qDebug() << "previousButton geometry" << previousButton->geometry();
+ previousButton->flash(1500);
+ nextButton->flash(1500);
QMainWindow::resizeEvent(e);
}
void MainWindow::about()
{
- Dyalog *aboutDialog = new Dyalog(this);
+ Dyalog *aboutDialog = new Dyalog(this, false);
aboutDialog->setWindowTitle(tr("About Dorian"));
QLabel *label = new QLabel(aboutDialog);
label->setTextFormat(Qt::RichText);
label->setOpenExternalLinks(true);
- label->setText(tr("<b>Dorian %1</b><br><br>Copyright © 2010 by "
+ label->setWordWrap(true);
+ label->setText(tr("<b>Dorian %1</b><br><br>Copyright © 2010 "
"Akos Polster <akos@pipacs.com><br>"
"Licensed under GNU General Public License, Version 3<br>"
"Source code: <a href='https://garage.maemo.org/projects/dorian/'>"
"garage.maemo.org/projects/dorian</a>").arg(DORIAN_VERSION));
aboutDialog->addWidget(label);
+ aboutDialog->addStretch();
aboutDialog->show();
}
+
+
+void MainWindow::goToNextPage()
+{
+ nextButton->flash(1500);
+ previousButton->flash(1500);
+ view->goNextPage();
+}
+
+void MainWindow::goToPreviousPage()
+{
+ nextButton->flash(1500);
+ previousButton->flash(1500);
+ view->goPreviousPage();
+}
+
+void MainWindow::onBeginUpgrade(int total)
+{
+ libraryProgress->setVisible(total > 0);
+ libraryProgress->setWindowTitle(tr("Upgrading library"));
+ libraryProgress->setMaximum(total);
+}
+
+void MainWindow::onUpgrading(const QString &path)
+{
+ libraryProgress->setLabelText(tr("Upgrading %1").
+ arg(QFileInfo(path).fileName()));
+ libraryProgress->setValue(libraryProgress->value() + 1);
+}
+
+void MainWindow::onEndUpgrade()
+{
+ libraryProgress->hide();
+ libraryProgress->reset();
+}
+
+
+void MainWindow::onBeginLoad(int total)
+{
+ libraryProgress->setVisible(total > 0);
+ libraryProgress->setWindowTitle(tr("Loading library"));
+ libraryProgress->setMaximum(total);
+}
+
+void MainWindow::onLoading(const QString &path)
+{
+ libraryProgress->setLabelText(tr("Loading %1").
+ arg(QFileInfo(path).fileName()));
+ libraryProgress->setValue(libraryProgress->value() + 1);
+}
+
+void MainWindow::onEndLoad()
+{
+ libraryProgress->hide();
+ libraryProgress->reset();
+}
+
projects / dorian / blobdiff