projects
/
dorian
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add icon to about box.
[dorian]
/
mainwindow.cpp
diff --git
a/mainwindow.cpp
b/mainwindow.cpp
index
583928e
..
82fde67
100755
(executable)
--- a/
mainwindow.cpp
+++ b/
mainwindow.cpp
@@
-81,7
+81,7
@@
MainWindow::MainWindow(QWidget *parent):
rotateAction = addToolBarAction(this, SLOT(rotate()),
"rotate", tr("Rotate"), true);
rotateAction = addToolBarAction(this, SLOT(rotate()),
"rotate", tr("Rotate"), true);
- // addToolBarSpace();
+ addToolBarSpace();
fullScreenAction = addToolBarAction(this, SLOT(showBig()),
"view-fullscreen", tr("Full screen"), true);
fullScreenAction = addToolBarAction(this, SLOT(showBig()),
"view-fullscreen", tr("Full screen"), true);
@@
-143,6
+143,9
@@
void MainWindow::initialize()
TRACE;
Library *library = Library::instance();
TRACE;
Library *library = Library::instance();
+ // Show in regular (non full-screen) mode
+ showRegular();
+
// Upgrade library if needed, then load it
library->upgrade();
library->load();
// Upgrade library if needed, then load it
library->upgrade();
library->load();
@@
-167,9
+170,6
@@
void MainWindow::initialize()
library->setNowReading(sorted.mapToSource(sorted.index(0, 0)));
}
}
library->setNowReading(sorted.mapToSource(sorted.index(0, 0)));
}
}
-
- // Show in regular (non full-screen) mode
- showRegular();
}
void MainWindow::onCurrentBookChanged()
}
void MainWindow::onCurrentBookChanged()
@@
-182,24
+182,30
@@
void MainWindow::showRegular()
{
TRACE;
{
TRACE;
- // Re-parent children
+ view->setLastBookmark();
fullScreenWindow->leaveBookView();
takeBookView(view, prog, prev, next);
fullScreenWindow->hide();
show();
fullScreenWindow->leaveBookView();
takeBookView(view, prog, prev, next);
fullScreenWindow->hide();
show();
+ view->scheduleRestoreLastBookmark();
}
void MainWindow::showBig()
{
TRACE;
}
void MainWindow::showBig()
{
TRACE;
- // Re-parent children
+ view->setLastBookmark();
leaveBookView();
fullScreenWindow->takeBookView(view, prog, prev, next);
leaveBookView();
fullScreenWindow->takeBookView(view, prog, prev, next);
+#ifdef Q_WS_MAEMO_5
+ fullScreenWindow->raise();
+#else
hide();
hide();
+#endif
fullScreenWindow->showFullScreen();
fullScreenWindow->showFullScreen();
+ view->scheduleRestoreLastBookmark();
}
void MainWindow::setCurrentBook(const QModelIndex ¤t)
}
void MainWindow::setCurrentBook(const QModelIndex ¤t)
@@
-225,12
+231,13
@@
void MainWindow::rotate()
QString current = Settings::instance()->value("orientation",
Platform::instance()->defaultOrientation()).toString();
QString target = (current == "landscape")? "portrait": "landscape";
QString current = Settings::instance()->value("orientation",
Platform::instance()->defaultOrientation()).toString();
QString target = (current == "landscape")? "portrait": "landscape";
+ view->setLastBookmark();
Settings::instance()->setValue("orientation", target);
}
void MainWindow::showDevTools()
{
Settings::instance()->setValue("orientation", target);
}
void MainWindow::showDevTools()
{
- (new DevTools())->exec();
+ (new DevTools(this))->exec();
}
void MainWindow::showBookmarks()
}
void MainWindow::showBookmarks()
@@
-252,7
+259,6
@@
void MainWindow::onSettingsChanged(const QString &key)
qDebug() << "Key" << key;
if (key == "orientation") {
qDebug() << "Key" << key;
if (key == "orientation") {
- view->setLastBookmark();
QString value = Settings::instance()->value(key,
Platform::instance()->defaultOrientation()).toString();
qDebug() << "Value: orientation" << value;
QString value = Settings::instance()->value(key,
Platform::instance()->defaultOrientation()).toString();
qDebug() << "Value: orientation" << value;
@@
-351,6
+357,12
@@
void MainWindow::about()
Dyalog *aboutDialog = new Dyalog(this, false);
aboutDialog->setWindowTitle(tr("About Dorian"));
QString version = Platform::instance()->version();
Dyalog *aboutDialog = new Dyalog(this, false);
aboutDialog->setWindowTitle(tr("About Dorian"));
QString version = Platform::instance()->version();
+#if !defined(Q_WS_MAEMO_5) && !defined(Q_OS_SYMBIAN)
+ QLabel *icon = new QLabel(aboutDialog);
+ QPixmap pixmap(Platform::instance()->icon("dorian"));
+ icon->setPixmap(pixmap);
+ aboutDialog->addWidget(icon);
+#endif
QLabel *label = new QLabel(aboutDialog);
label->setTextFormat(Qt::RichText);
label->setOpenExternalLinks(true);
QLabel *label = new QLabel(aboutDialog);
label->setTextFormat(Qt::RichText);
label->setOpenExternalLinks(true);