#ifdef Q_WS_MAEMO_5
# include <QtMaemo5/QMaemo5InformationBox>
# include <QtDBus>
+# include <QtGui/QX11Info>
+# include <X11/Xlib.h>
+# include <X11/Xatom.h>
# include <mce/mode-names.h>
# include <mce/dbus-names.h>
#endif // Q_WS_MAEMO_5
#include "fullscreenwindow.h"
#include "trace.h"
#include "bookfinder.h"
+#include "progress.h"
+#include "dyalog.h"
+#include "translucentbutton.h"
#ifdef DORIAN_TEST_MODEL
#include "modeltest.h"
# define ICON_PREFIX ":/icons/"
#endif
+const int PROGRESS_HEIGHT = 17;
+const char *DORIAN_VERSION =
+#include "pkg/version.txt"
+;
+
MainWindow::MainWindow(QWidget *parent):
- QMainWindow(parent), view(0), preventBlankingTimer(-1)
+ AdopterWindow(parent), view(0), preventBlankingTimer(-1)
{
Trace t("MainWindow::MainWindow");
#ifdef Q_WS_MAEMO_5
view->show();
layout->addWidget(view);
+ // Progress
+ progress = new Progress(central);
+
// Tool bar
+
setUnifiedTitleAndToolBarOnMac(true);
settings = new QDialog(this);
toolBar = addToolBar("controls");
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");
+ infoAction = addToolBarAction(this, SLOT(showInfo()), "info");
+ libraryAction = addToolBarAction(this, SLOT(showLibrary()), "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"));
connect(devToolsAction, SIGNAL(triggered()), this, SLOT(showDevTools()));
+ 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");
#endif // Q_WS_MAEMO_5
QFrame *frame = new QFrame(toolBar);
frame->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
toolBar->addWidget(frame);
- fullScreenAction = addToolBarAction(this, SLOT(showBig()), "view-fullscreen");
+ fullScreenAction = addToolBarAction(this, SLOT(showBig()),
+ "view-fullscreen");
+
+ // Buttons on top of the book view
+ previousButton = new TranslucentButton("back", this);
+ nextButton = new TranslucentButton("forward", this);
// Handle model changes
connect(Library::instance(), SIGNAL(nowReadingChanged()),
}
}
+ // Handle loading book parts
+ connect(view, SIGNAL(partLoadStart(int)), this, SLOT(onPartLoadStart()));
+ connect(view, SIGNAL(partLoadEnd(int)), this, SLOT(onPartLoadEnd(int)));
+
+ // Handle progress
+ connect(view, SIGNAL(progress(qreal)), progress, SLOT(setProgress(qreal)));
+
+ // Shadow window for full screen reading
+ fullScreenWindow = new FullScreenWindow(this);
+ connect(fullScreenWindow, SIGNAL(restore()), this, SLOT(showRegular()));
+
// Handle settings changes
Settings *settings = Settings::instance();
connect(settings, SIGNAL(valueChanged(const QString &)),
this, SLOT(onSettingsChanged(const QString &)));
settings->setValue("orientation", settings->value("orientation"));
settings->setValue("lightson", settings->value("lightson"));
+ settings->setValue("usevolumekeys", settings->value("usevolumekeys"));
- // Handle loading chapters
- 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()));
-
- // Create thread for finding books in directories
- bookFinder = new BookFinder();
- connect(bookFinder, SIGNAL(add(const QString &)),
- library, SLOT(add(const QString &)));
- connect(bookFinder, SIGNAL(remove(const QString &)),
- library, SLOT(remove(const QString &)));
- bookFinder->moveToThread(&bookFinderThread);
- bookFinderThread.start();
-
-#if 0
- bool ret = QMetaObject::invokeMethod(
- bookFinder,
- "find",
- Q_ARG(QStringList, QStringList(QString("/Users/polster/Books"))),
- Q_ARG(QStringList, library->bookPaths()));
- t.trace(QString("Invoking BookFinder::find ") + (ret?"succeeded":"failed"));
-#endif
+ // 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);
MainWindow::~MainWindow()
{
- bookFinderThread.quit();
- bookFinderThread.wait();
- delete bookFinder;
}
void MainWindow::onCurrentBookChanged()
{
Trace t("MainWindow::showRegular");
fullScreenWindow->hide();
- fullScreenWindow->leaveChild();
- view->setParent(centralWidget());
- centralWidget()->layout()->addWidget(view);
+ fullScreenWindow->leaveChildren();
+
+ QList<QWidget *> otherChildren;
+ otherChildren << progress << previousButton << nextButton;
+ takeChildren(view, otherChildren);
+ QRect geo = geometry();
+ qDebug() << "Geometry" << geo << "toolbar" << toolBar->height();
+ progress->setGeometry(0, 0, geo.width(), PROGRESS_HEIGHT);
+#ifdef 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);
+#else
+ previousButton->setGeometry(0, geo.height() - TranslucentButton::pixels,
+ TranslucentButton::pixels, TranslucentButton::pixels);
+ nextButton->setGeometry(geo.width() - TranslucentButton::pixels,
+ toolBar->height(), TranslucentButton::pixels, TranslucentButton::pixels);
+#endif // Q_WS_MAEMO_5
+ qDebug() << "previousButton geometry" << previousButton->geometry();
+ progress->flash();
+ nextButton->show();
+ previousButton->show();
+ nextButton->flash(1500);
+ previousButton->flash(1500);
}
void MainWindow::showBig()
{
Trace t("MainWindow::showBig");
- centralWidget()->layout()->removeWidget(view);
- fullScreenWindow->takeChild(view);
+ leaveChildren();
+ QList<QWidget *> otherChildren;
+ otherChildren << progress << nextButton << previousButton;
+ QRect screen = QApplication::desktop()->screenGeometry();
+ progress->setGeometry(0, 0, screen.width(), PROGRESS_HEIGHT);
+ nextButton->setGeometry(screen.width() - TranslucentButton::pixels, 0,
+ TranslucentButton::pixels, TranslucentButton::pixels);
+ previousButton->setGeometry(0, screen.height() - TranslucentButton::pixels,
+ TranslucentButton::pixels, TranslucentButton::pixels);
+
+ fullScreenWindow->takeChildren(view, otherChildren);
fullScreenWindow->showFullScreen();
+ progress->flash();
+ nextButton->flash(1500);
+ previousButton->flash(1500);
}
void MainWindow::setCurrentBook(const QModelIndex ¤t)
void MainWindow::showInfo()
{
if (mCurrent.isValid()) {
- (new InfoDialog(Library::instance()->book(mCurrent), this))->exec();
+ (new InfoDialog(Library::instance()->book(mCurrent), this, false))->exec();
}
}
#ifdef Q_WS_MAEMO_5
if (key == "orientation") {
QString value = Settings::instance()->value(key).toString();
- Trace::trace(QString("MainWindow::onSettingsChanged: orientation %1").
- arg(value));
+ qDebug() << "MainWindow::onSettingsChanged: orientation" << value;
if (value == "portrait") {
setAttribute(Qt::WA_Maemo5LandscapeOrientation, false);
setAttribute(Qt::WA_Maemo5PortraitOrientation, true);
}
} else if (key == "lightson") {
bool enable = Settings::instance()->value(key, false).toBool();
- Trace::trace(QString("MainWindow::onSettingsChanged: lightson: %1").
- arg(enable));
+ qDebug() << "MainWindow::onSettingsChanged: lightson:" << enable;
killTimer(preventBlankingTimer);
if (enable) {
preventBlankingTimer = startTimer(29 * 1000);
}
+ } else if (key == "usevolumekeys") {
+ bool value = Settings::instance()->value(key).toBool();
+ qDebug() << "MainWindow::onSettingsChanged: usevolumekeys" << value;
+ grabZoomKeys(value);
+ fullScreenWindow->grabZoomKeys(value);
}
#else
Q_UNUSED(key);
if (index > 0) {
enablePrevious = true;
}
- if (index < (book->toc.size() - 1)) {
+ if (index < (book->parts.size() - 1)) {
enableNext = 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()
Book *book = Library::instance()->book(mCurrent);
if (book) {
- int partIndex = book->tocFromChapter(index);
+ int partIndex = book->partFromChapter(index);
if (partIndex != -1) {
view->goToBookmark(Book::Bookmark(partIndex, 0));
}
MCE_REQUEST_IF, QDBusConnection::systemBus());
mce.call(MCE_PREVENT_BLANK_REQ);
#endif // Q_WS_MAEMO_5
- Trace::trace("MainWindow::timerEvent: Prevent display blanking");
+ qDebug() << "MainWindow::timerEvent: Prevent display blanking";
}
}
+
+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() - 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() - TranslucentButton::pixels,
+ TranslucentButton::pixels, TranslucentButton::pixels);
+ nextButton->setGeometry(e->size().width() - TranslucentButton::pixels,
+ toolBar->height(), TranslucentButton::pixels, TranslucentButton::pixels);
+#endif // Q_WS_MAEMO_5
+ qDebug() << "previousButton geometry" << previousButton->geometry();
+ previousButton->flash(1500);
+ nextButton->flash(1500);
+ QMainWindow::resizeEvent(e);
+}
+
+void MainWindow::about()
+{
+ Dyalog *aboutDialog = new Dyalog(this);
+ 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 "
+ "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->show();
+}
+
+
+void MainWindow::goToNextPage()
+{
+ nextButton->flash(1500);
+ previousButton->flash(1500);
+ view->goNextPage();
+}
+
+void MainWindow::goToPreviousPage()
+{
+ nextButton->flash(1500);
+ previousButton->flash(1500);
+ view->goPreviousPage();
+}
projects / dorian / blobdiff