From: Akos Polster <akos@pipacs.com>
Date: Sat, 16 Oct 2010 22:51:09 +0000 (+0200)
Subject: Small Symbian improvements.
X-Git-Url: http://vcs.maemo.org/git/?a=commitdiff_plain;h=05f7d2cfca63c6df1ac410ddf55310accc2802fb;p=dorian

Small Symbian improvements.
---

diff --git a/bookview.cpp b/bookview.cpp
index dbc9ab9..121fa50 100644
--- a/bookview.cpp
+++ b/bookview.cpp
@@ -39,12 +39,12 @@ BookView::BookView(QWidget *parent):
     settings()->setDefaultTextEncoding("utf-8");
     page()->setContentEditable(false);
 
-#if defined(Q_WS_MAEMO_5)
-    // Suppress unwanted text selections on Maemo
+#if defined(Q_WS_MAEMO_5) || defined(Q_OS_SYMBIAN)
+    // Suppress unwanted text selections on Maemo and Symbian
     installEventFilter(this);
 #endif
     QWebFrame *frame = page()->mainFrame();
-#if defined(Q_WS_MAEMO_5)
+#if defined(Q_WS_MAEMO_5) || defined(Q_OS_SYMBIAN)
     frame->setScrollBarPolicy(Qt::Vertical, Qt::ScrollBarAlwaysOff);
 #endif
     frame->setScrollBarPolicy(Qt::Horizontal, Qt::ScrollBarAlwaysOff);
diff --git a/librarydialog.cpp b/librarydialog.cpp
index 9ae3123..0d7eeb4 100644
--- a/librarydialog.cpp
+++ b/librarydialog.cpp
@@ -19,6 +19,7 @@
 #include "trace.h"
 #include "bookfinder.h"
 #include "searchdialog.h"
+#include "platform.h"
 
 LibraryDialog::LibraryDialog(QWidget *parent): ListWindow(parent)
 {
@@ -52,6 +53,10 @@ LibraryDialog::LibraryDialog(QWidget *parent): ListWindow(parent)
     progress->setMinimumDuration(0);
     progress->setWindowModality(Qt::WindowModal);
     progress->setCancelButton(0);
+#ifdef Q_WS_S60
+    progress->setFixedWidth(
+            QApplication::desktop()->availableGeometry().width());
+#endif
 
     connect(Library::instance(), SIGNAL(nowReadingChanged()),
             this, SLOT(onCurrentBookChanged()));
diff --git a/platform.cpp b/platform.cpp
index b86a359..c65bae8 100644
--- a/platform.cpp
+++ b/platform.cpp
@@ -3,6 +3,7 @@
 #endif
 
 #include <QDir>
+#include <QtGui>
 
 #include "platform.h"
 
diff --git a/widgets/fullscreenwindow.cpp b/widgets/fullscreenwindow.cpp
index cc3f0ec..4382ebb 100644
--- a/widgets/fullscreenwindow.cpp
+++ b/widgets/fullscreenwindow.cpp
@@ -11,7 +11,9 @@ FullScreenWindow::FullScreenWindow(QWidget *parent): AdopterWindow(parent)
     setAttribute(Qt::WA_Maemo5StackedWindow, true);
     setAttribute(Qt::WA_Maemo5NonComposited, true);
 #endif // Q_WS_MAEMO_5
+#ifndef Q_OS_SYMBIAN
     toolBar->hide();
+#endif
     QFrame *frame = new QFrame(this);
     QVBoxLayout *layout = new QVBoxLayout(frame);
     layout->setMargin(0);