#include "translucentbutton.h"
#include "platform.h"
#include "progressdialog.h"
+#include "sortedlibrary.h"
#ifdef DORIAN_TEST_MODEL
# include "modeltest.h"
#endif
-const int DORIAN_PROGRESS_HEIGHT = 17;
-
MainWindow::MainWindow(QWidget *parent):
AdopterWindow(parent), view(0), preventBlankingTimer(-1)
{
#endif
setWindowTitle("Dorian");
+#ifdef Q_OS_SYMBIAN
+ // Tool bar
+ toolBar = new QToolBar("", this /*frame*/);
+ toolBar->setFixedWidth(QApplication::desktop()->
+ availableGeometry().width());
+ toolBar->setFixedHeight(65);
+ toolBar->setStyleSheet("margin:0;border:0;padding:0");
+ toolBar->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Maximum);
+ addToolBar(Qt::BottomToolBarArea, toolBar);
+#endif
+
// Central widget. Must be an intermediate, because the book view widget
// can be re-parented later
QFrame *central = new QFrame(this);
view->show();
layout->addWidget(view);
- // Progress
+ // Dialogs
progress = new Progress(this);
- // Settings dialog
- settings = new QDialog(this);
-
// Tool bar actions
#ifdef Q_OS_SYMBIAN
#endif
chaptersAction = addToolBarAction(this, SLOT(showChapters()),
- "chapters", tr("Chapters"));
+ "chapters", tr("Chapters"), true);
bookmarksAction = addToolBarAction(this, SLOT(showBookmarks()),
- "bookmarks", tr("Bookmarks"));
+ "bookmarks", tr("Bookmarks"), true);
infoAction = addToolBarAction(this, SLOT(showInfo()),
- "info", tr("Book info"));
+ "info", tr("Book info"), true);
libraryAction = addToolBarAction(this, SLOT(showLibrary()),
- "library", tr("Library"));
+ "library", tr("Library"), true);
#ifdef Q_WS_MAEMO_5
settingsAction = menuBar()->addAction(tr("Settings"));
if (!library->rowCount()) {
library->add(":/books/2BR02B.epub");
}
- library->setNowReading(library->index(0));
+ SortedLibrary sorted;
+ library->setNowReading(sorted.mapToSource(sorted.index(0, 0)));
}
}
}
takeChildren(view, otherChildren);
// Adjust geometry of decorations
+
QRect geo = geometry();
- progress->setGeometry(0, 0, geo.width(), DORIAN_PROGRESS_HEIGHT);
-#if defined(Q_WS_MAEMO_5)
- previousButton->setGeometry(0,
- geo.height() - toolBar->height() - TranslucentButton::pixels,
- TranslucentButton::pixels, TranslucentButton::pixels);
+ qDebug() << geo;
+ int y = geo.height() - progress->thickness();
+#if defined(Q_WS_MAEMO_5) || defined(Q_OS_SYMBIAN)
+ bool hasToolBar = false;
+# if defined(Q_OS_SYMBIAN)
+ hasToolBar =
+ (QApplication::desktop()->width() < QApplication::desktop()->height());
+ qDebug() << (hasToolBar? "Portrait": "Landscape");
+# endif
+ if (!hasToolBar) {
+ y -= toolBar->height();
+ }
+#endif
+ progress->setGeometry(0, y, geo.width(), y + progress->thickness());
+
+#if defined(Q_WS_MAEMO_5) || defined(Q_OS_SYMBIAN)
+ y = geo.height() - TranslucentButton::pixels;
+ if (!hasToolBar) {
+ y -= toolBar->height();
+ }
+ previousButton->setGeometry(0, y, 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);
// Re-parent children
leaveChildren();
- QList<QWidget *> otherChildren;
- otherChildren << progress << nextButton << previousButton;
- fullScreenWindow->takeChildren(view, otherChildren);
+ fullScreenWindow->takeChildren(view, progress, previousButton, nextButton);
// Adjust geometry of decorations
QRect screen = QApplication::desktop()->screenGeometry();
- progress->setGeometry(0, 0, screen.width(), DORIAN_PROGRESS_HEIGHT);
+ int y = screen.height() - progress->thickness();
+ progress->setGeometry(0, y, screen.width(), y + progress->thickness());
#if defined(Q_WS_MAEMO_5)
nextButton->setGeometry(screen.width() - TranslucentButton::pixels, 0,
TranslucentButton::pixels, TranslucentButton::pixels);
Book *book = Library::instance()->book(mCurrent);
if (book) {
BookmarksDialog *bookmarks = new BookmarksDialog(book, this);
- bookmarks->setWindowModality(Qt::WindowModal);
connect(bookmarks, SIGNAL(addBookmark(const QString &)),
this, SLOT(onAddBookmark(const QString &)));
connect(bookmarks, SIGNAL(goToBookmark(int)),
{
TRACE;
view->setLastBookmark();
- event->accept();
+ AdopterWindow::closeEvent(event);
}
void MainWindow::onSettingsChanged(const QString &key)
if (value == "portrait") {
setAttribute(Qt::WA_Maemo5LandscapeOrientation, false);
setAttribute(Qt::WA_Maemo5PortraitOrientation, true);
+ fullScreenWindow->setAttribute(Qt::WA_Maemo5LandscapeOrientation,
+ false);
+ fullScreenWindow->setAttribute(Qt::WA_Maemo5PortraitOrientation, true);
} else {
setAttribute(Qt::WA_Maemo5PortraitOrientation, false);
setAttribute(Qt::WA_Maemo5LandscapeOrientation, true);
+ fullScreenWindow->setAttribute(Qt::WA_Maemo5PortraitOrientation,
+ false);
+ fullScreenWindow->setAttribute(Qt::WA_Maemo5LandscapeOrientation,
+ true);
}
} else if (key == "lightson") {
bool enable = Settings::instance()->value(key, false).toBool();
preventBlankingTimer = startTimer(29 * 1000);
}
}
+#else
+ Q_UNUSED(key);
#endif // Q_WS_MAEMO_5
}
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::resizeEvent(QResizeEvent *e)
{
TRACE;
- progress->setGeometry(QRect(0, 0, e->size().width(), DORIAN_PROGRESS_HEIGHT));
-#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() - 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
- qDebug() << "previousButton geometry" << previousButton->geometry();
- previousButton->flash();
- nextButton->flash();
+
+ int toolBarHeight = 0;
+
+#ifdef Q_OS_SYMBIAN
+ // Tool bar is only useful in portrait mode
+ bool isPortrait = (e->size().width() < e->size().height());
+ toolBar->setVisible(isPortrait);
+ if (!isPortrait) {
+ toolBarHeight = toolBar->height();
+ }
+#endif // Q_OS_SYMBIAN
+
+ if (bookView) {
+ qDebug() << "BookView geometry" << bookView->geometry();
+ QRect geo = bookView->geometry();
+ progress->setGeometry(geo.x(),
+ geo.y() + geo.height() - progress->thickness() + toolBarHeight,
+ geo.width(), progress->thickness());
+ previousButton->setGeometry(geo.x(),
+ geo.y() + geo.height() - TranslucentButton::pixels + toolBarHeight,
+ TranslucentButton::pixels, TranslucentButton::pixels);
+ nextButton->setGeometry(
+ geo.x() + geo.width() - TranslucentButton::pixels,
+ geo.y(), TranslucentButton::pixels, TranslucentButton::pixels);
+ }
QMainWindow::resizeEvent(e);
}
projects / dorian / blobdiff