Show button for full screen mode on Symbian, too.

diff --git a/mainwindow.cpp b/mainwindow.cpp
index e20bf84..ae78ed9 100755 (executable)
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -60,11 +60,6 @@ MainWindow::MainWindow(QWidget *parent):
 
     // Tool bar actions
 
-#ifdef Q_OS_SYMBIAN
-    fullScreenAction = addToolBarAction(this, SLOT(showBig()),
-                                        "view-fullscreen", tr("Full screen"));
-#endif
-
     chaptersAction = addToolBarAction(this, SLOT(showChapters()),
                                       "chapters", tr("Chapters"), true);
     bookmarksAction = addToolBarAction(this, SLOT(showBookmarks()),
@@ -72,30 +67,34 @@ MainWindow::MainWindow(QWidget *parent):
     infoAction = addToolBarAction(this, SLOT(showInfo()),
                                   "info", tr("Book info"), true);
     libraryAction = addToolBarAction(this, SLOT(showLibrary()),
-                                     "library", tr("Library"), true);
+                                     "library", tr("Library"), false);
 
 #ifdef Q_WS_MAEMO_5
     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
     settingsAction = addToolBarAction(this, SLOT(showSettings()),
                                       "preferences-system", tr("Settings"));
     devToolsAction = addToolBarAction(this, SLOT(showDevTools()),
                                       "developer", tr("Developer"));
-    addToolBarAction(this, SLOT(about()), "about", tr("About"));
-#endif // Q_WS_MAEMO_5
+#endif
 
-#ifndef Q_OS_SYMBIAN
     addToolBarSpace();
     fullScreenAction = addToolBarAction(this, SLOT(showBig()),
-                                        "view-fullscreen", tr("Full screen"));
+        "view-fullscreen", tr("Full screen"), true);
+
+#if defined(Q_WS_MAEMO_5)
+    QAction *aboutAction = menuBar()->addAction(tr("About"));
+    connect(aboutAction, SIGNAL(triggered()), this, SLOT(about()));
 #else
-    (void)addToolBarAction(this, SLOT(close()), "", tr("Exit"));
-#endif
+    addToolBarAction(this, SLOT(about()), "about", tr("About"));
+#endif // defined(Q_WS_MAEMO_5)
+
+#if defined(Q_OS_SYMBIAN)
+    (void)addToolBarAction(this, SLOT(close()), "", tr("Exit"), false);
+#endif // defined(Q_OS_SYMBIAN)
 
     // Decorations
     prev = new TranslucentButton("back", this);

diff --git a/pkg/changelog b/pkg/changelog
index 0e3bf68..ab2bd7c 100644 (file)
--- a/pkg/changelog
+++ b/pkg/changelog
@@ -8,6 +8,7 @@ dorian (0.4.4-1) unstable; urgency=low
   * Show presence of extra book parts
   * Allow editing bookmark notes
   * Make orientation switch explicit on Symbian, too
+  * Show button for full screen mode on Symbian, too
 
  -- Akos Polster <akos@pipacs.com>  Sun,  5 Dec 2010 02:00:00 +0100
 

diff --git a/widgets/mainbase.cpp b/widgets/mainbase.cpp
index 4a9b4fb..88c623c 100755 (executable)
--- a/widgets/mainbase.cpp
+++ b/widgets/mainbase.cpp
@@ -51,7 +51,6 @@ QAction *MainBase::addToolBarAction(QObject *receiver,
         if (!toolBar) {\r
             // Create tool bar if needed\r
             toolBar = new QToolBar("", this);\r
-            toolBar->setStyleSheet("margin:0; border:0; padding:0");\r
             addToolBar(Qt::BottomToolBarArea, toolBar);\r
         }\r
         // Add tool bar action\r
@@ -79,11 +78,9 @@ QAction *MainBase::addToolBarAction(QObject *receiver,
 \r
 void MainBase::addToolBarSpace()\r
 {\r
-#ifndef Q_OS_SYMBIAN\r
     QFrame *frame = new QFrame(toolBar);\r
     frame->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);\r
     toolBar->addWidget(frame);\r
-#endif\r
 }\r
 \r
 void MainBase::updateToolBar()\r