#include <QApplication>
#include <QFileInfo>
#include <QStringList>
+#include <QWebView>
+#include <QWebFrame>
#ifdef Q_WS_MAEMO_5
# include <QtMaemo5/QMaemo5InformationBox>
# include "modeltest.h"
#endif
-#ifdef Q_WS_MAC
-# define ICON_PREFIX ":/icons/mac/"
-#else
-# define ICON_PREFIX ":/icons/"
-#endif
-
const int PROGRESS_HEIGHT = 17;
static const char *DORIAN_VERSION =
#include "pkg/version.txt"
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));
}
#else
previousButton->setGeometry(0, geo.height() - TranslucentButton::pixels,
TranslucentButton::pixels, TranslucentButton::pixels);
- nextButton->setGeometry(geo.width() - 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();
otherChildren << progress << nextButton << previousButton;
QRect screen = QApplication::desktop()->screenGeometry();
progress->setGeometry(0, 0, screen.width(), PROGRESS_HEIGHT);
+#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);
void MainWindow::showInfo()
{
if (mCurrent.isValid()) {
- (new InfoDialog(Library::instance()->book(mCurrent), this, false))->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);
}
#else
previousButton->setGeometry(0, e->size().height() - TranslucentButton::pixels,
TranslucentButton::pixels, TranslucentButton::pixels);
- nextButton->setGeometry(e->size().width() - 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();
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->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();
}
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();
+}
+