New version 0.3.3. Fix font scaling on Symbian.

diff --git a/bookview.cpp b/bookview.cpp
index 101f0d1..3d00f9c 100644 (file)
--- a/bookview.cpp
+++ b/bookview.cpp
@@ -15,6 +15,7 @@
 #include "trace.h"
 #include "progress.h"
 #include "progressdialog.h"
+#include "platform.h"
 
 BookView::BookView(QWidget *parent):
     QWebView(parent), contentIndex(-1), mBook(0),
@@ -29,7 +30,8 @@ BookView::BookView(QWidget *parent):
     settings()->setAttribute(QWebSettings::PrivateBrowsingEnabled, true);
     settings()->setAttribute(QWebSettings::JavascriptCanOpenWindows, false);
     settings()->setAttribute(QWebSettings::JavascriptCanAccessClipboard, false);
-    settings()->setAttribute(QWebSettings::OfflineStorageDatabaseEnabled, false);
+    settings()->setAttribute(QWebSettings::OfflineStorageDatabaseEnabled,
+                             false);
     settings()->setAttribute(QWebSettings::OfflineWebApplicationCacheEnabled,
                              false);
     settings()->setAttribute(QWebSettings::LocalStorageEnabled, false);
@@ -60,15 +62,7 @@ BookView::BookView(QWidget *parent):
             this, SLOT(onSettingsChanged(const QString &)));
     Settings *s = Settings::instance();
     s->setValue("zoom", s->value("zoom", 160));
-    s->setValue("font", s->value("font",
-#if defined(Q_WS_MAEMO_5) || defined(Q_WS_X11)
-                                 "Serif"
-#elif defined(Q_WS_MAC)
-                                 "Hoefler Text"
-#else
-                                 "Times New Roman"
-#endif
-                                 ));
+    s->setValue("font", s->value("font", Platform::defaultFont()));
     s->setValue("scheme", s->value("scheme", "default"));
     setBook(0);
 
@@ -213,11 +207,13 @@ void BookView::onLoadFinished(bool ok)
 void BookView::onSettingsChanged(const QString &key)
 {
     TRACE;
+    qDebug() << key << Settings::instance()->value(key);
+
     if (key == "zoom") {
         setZoomFactor(Settings::instance()->value(key).toFloat() / 100.);
     }
     else if (key == "font") {
-        QString face = Settings::instance()->value("font").toString();
+        QString face = Settings::instance()->value(key).toString();
         settings()->setFontFamily(QWebSettings::StandardFont, face);
     }
     else if (key == "scheme") {

diff --git a/dorian.pro b/dorian.pro
index 7ff9e19..85e591e 100644 (file)
--- a/dorian.pro
+++ b/dorian.pro
@@ -133,9 +133,8 @@ win32 {
 symbian {
     ICON = $$PWD/pkg/symbian/book.svg
     TARGET.UID3 = 0xEA633557
-    TARGET.CAPABILITY = NetworkServices
+    TARGET.CAPABILITY = NetworkServices ReadUserData WriteUserData
     TARGET.EPOCHEAPSIZE = 0x080000 0x4000000
-    # FIXME: Include path to OpenC ZLIB?
     INCLUDEPATH += $(QTDIR)/src/3rdparty/zlib
     HEADERS += widgets/flickcharm.h
     SOURCES += widgets/flickcharm.cpp

diff --git a/mainwindow.cpp b/mainwindow.cpp
index f99ada6..dcdcf56 100755 (executable)
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -317,7 +317,7 @@ void MainWindow::closeEvent(QCloseEvent *event)
 
 void MainWindow::onSettingsChanged(const QString &key)
 {
-#ifdef Q_WS_MAEMO_5
+#if defined(Q_WS_MAEMO_5)
     if (key == "orientation") {
         QString value = Settings::instance()->value(key).toString();
         qDebug() << "MainWindow::onSettingsChanged: orientation" << value;

diff --git a/pkg/changelog b/pkg/changelog
index 2a51026..253bfdd 100644 (file)
--- a/pkg/changelog
+++ b/pkg/changelog
@@ -1,3 +1,9 @@
+dorian (0.3.3-1) unstable; urgency=low
+
+  * Fix font scaling on Symbian
+
+ -- Akos Polster <akos@pipacs.com>  Wed,  3 Nov 2010 02:00:00 +0100
+
 dorian (0.3.2-1) unstable; urgency=low
 
   * Fix dialog softkeys on Symbian

diff --git a/pkg/version.txt b/pkg/version.txt
index 7a13148..02ed9ef 100644 (file)
--- a/pkg/version.txt
+++ b/pkg/version.txt
@@ -1 +1 @@
-"0.3.2"
+"0.3.3"

diff --git a/platform.cpp b/platform.cpp
index f090489..f96cdda 100644 (file)
--- a/platform.cpp
+++ b/platform.cpp
@@ -2,7 +2,7 @@
 #include <QDir>
 
 #if defined(Q_OS_UNIX) && !defined(Q_OS_SYMBIAN)
-#include <unistd.h>
+#   include <unistd.h>
 #endif
 
 #include "platform.h"
@@ -60,3 +60,16 @@ QString Platform::downloadDir()
 {
     return QDir::home().absoluteFilePath("Books");
 }
+
+QString Platform::defaultFont()
+{
+#if defined(Q_WS_MAEMO_5) || defined(Q_WS_X11)
+    return QString("Serif");
+#elif defined(Q_WS_MAC)
+    return QString("Hoefler Text");
+#elif defined Q_WS_S60
+    return QString("Nokia Sans S60");
+#else
+    return QString("Times New Roman");
+#endif
+}

diff --git a/platform.h b/platform.h
index 5a25b23..1144a5f 100644 (file)
--- a/platform.h
+++ b/platform.h
@@ -12,6 +12,7 @@ public:
     static void restart(char *argv[]);
     static QString version();
     static QString downloadDir();
+    static QString defaultFont();
 };
 
 #endif // PLATFORM_H

diff --git a/settingswindow.cpp b/settingswindow.cpp
index 1150271..7b8c91e 100644 (file)
--- a/settingswindow.cpp
+++ b/settingswindow.cpp
@@ -4,6 +4,7 @@
 #include "settings.h"
 #include "toolbuttonbox.h"
 #include "platform.h"
+#include "trace.h"
 
 #ifdef Q_OS_SYMBIAN
 #include "flickcharm.h"
@@ -210,20 +211,23 @@ void SettingsWindow::onOrientationButtonClicked(int id)
 #endif // Q_WS_MAEMO_5
 }
 
-#ifdef Q_WS_MAEMO_5
+#if defined(Q_WS_MAEMO_5) || defined(Q_OS_SYMBIAN)
 
 void SettingsWindow::closeEvent(QCloseEvent *e)
 {
+    TRACE;
     Settings *settings = Settings::instance();
     settings->setValue("zoom", zoomSlider->value());
     settings->setValue("font", fontButton->currentFont().family());
+#ifndef Q_OS_SYMBIAN
     settings->setValue("orientation",
         (orientationBox->checkedId() == OrientationLandscape)?
         "landscape": "portrait");
+#endif // Q_OS_SYMBIAN
     e->accept();
 }
 
-#endif // Q_WS_MAEMO_5
+#endif // Q_WS_MAEMO_5 || Q_OS_SYMBIAN
 
 void SettingsWindow::onLightsToggled(bool value)
 {

diff --git a/settingswindow.h b/settingswindow.h
index bcead86..5117698 100644 (file)
--- a/settingswindow.h
+++ b/settingswindow.h
@@ -35,7 +35,7 @@ public slots:
     void onGrabVolumeToggled(bool enable);
 
 protected:
-#ifdef Q_WS_MAEMO_5
+#if defined(Q_WS_MAEMO_5) || defined(Q_OS_SYMBIAN)
     void closeEvent(QCloseEvent *e);
 #endif