#ifdef Q_WS_MAEMO_5
setAttribute(Qt::WA_Maemo5StackedWindow, true);
#endif
+
+#ifndef Q_OS_SYMBIAN
setWindowTitle("Dorian");
+#endif
// Central widget. Must be an intermediate, because the book view widget
// can be re-parented later
// Book view
view = new BookView(this);
- view->show();
// Tool bar actions
// Load library, upgrade it if needed
libraryProgress = new ProgressDialog(tr("Upgrading library"), this);
Library *library = Library::instance();
- connect(library, SIGNAL(beginUpgrade(int)), this, SLOT(onBeginUpgrade(int)));
+ 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(next, SIGNAL(triggered()), this, SLOT(goToNextPage()));
connect(prev, SIGNAL(triggered()), this, SLOT(goToPreviousPage()));
- // Adopt view, show window
- showRegular();
-
#ifdef DORIAN_TEST_MODEL
(void)new ModelTest(Library::instance(), this);
#endif
library->setNowReading(sorted.mapToSource(sorted.index(0, 0)));
}
}
+
+ // Show in regular (non full-screen) mode
+ showRegular();
}
void MainWindow::onCurrentBookChanged()
fullScreenWindow->hide();
show();
+
#if defined(Q_OS_SYMBIAN)
activateWindow();
#endif
leaveBookView();
fullScreenWindow->takeBookView(view, prog, prev, next);
-// #ifdef Q_OS_SYMBIAN
+ fullScreenWindow->showFullScreen();
hide();
-// #endif
- fullScreenWindow->showFullScreen();
#ifdef Q_OS_SYMBIAN
fullScreenWindow->activateWindow();
#endif
}
}
-void MainWindow::closeEvent(QCloseEvent *event)
-{
- TRACE;
- view->setLastBookmark();
- AdopterWindow::closeEvent(event);
-}
-
void MainWindow::onSettingsChanged(const QString &key)
{
#if defined(Q_WS_MAEMO_5)