From 33dcf96e8c56a1371951f1e1e004c8787a673329 Mon Sep 17 00:00:00 2001
From: Yves Marcoz <yves@marcoz.org>
Date: Thu, 5 Jan 2012 22:06:38 -0800
Subject: [PATCH] psa: added article list and display font settings

---
 psa_harmattan/feedingit/qml/ArticleDisplay.qml |    2 +-
 psa_harmattan/feedingit/qml/ArticleViewer.qml  |    1 +
 psa_harmattan/feedingit/qml/Settings.qml       |    3 ++-
 psa_harmattan/feedingit/qml/SettingsPage.qml   |   20 +++++++++++++++++
 psa_harmattan/feedingit/qml/SliderSetting.qml  |   28 ++++++++++++++++++++++++
 5 files changed, 52 insertions(+), 2 deletions(-)
 create mode 100644 psa_harmattan/feedingit/qml/SliderSetting.qml

diff --git a/psa_harmattan/feedingit/qml/ArticleDisplay.qml b/psa_harmattan/feedingit/qml/ArticleDisplay.qml
index e014865..9bbc659 100644
--- a/psa_harmattan/feedingit/qml/ArticleDisplay.qml
+++ b/psa_harmattan/feedingit/qml/ArticleDisplay.qml
@@ -32,7 +32,7 @@ Rectangle {
             //scale: 1.25;
             transformOrigin: Item.TopLeft
             scale: slider.value;
-            //settings.defaultFontSize: 24
+            settings.defaultFontSize: articleView.webviewFontSize
         }
 
 //        onFlickStarted: {
diff --git a/psa_harmattan/feedingit/qml/ArticleViewer.qml b/psa_harmattan/feedingit/qml/ArticleViewer.qml
index 7c18550..7cf092f 100644
--- a/psa_harmattan/feedingit/qml/ArticleViewer.qml
+++ b/psa_harmattan/feedingit/qml/ArticleViewer.qml
@@ -63,6 +63,7 @@ Item {
 
     ListView {
         id: articleView;
+        property int webviewFontSize: settings.webviewFontSize
         model: articles;
         delegate: viewer
         orientation: ListView.Horizontal
diff --git a/psa_harmattan/feedingit/qml/Settings.qml b/psa_harmattan/feedingit/qml/Settings.qml
index a19515b..e7e87f2 100644
--- a/psa_harmattan/feedingit/qml/Settings.qml
+++ b/psa_harmattan/feedingit/qml/Settings.qml
@@ -13,7 +13,8 @@ Item {
 
     property bool autoUpdateEnabled: controller.getBooleanSetting("autoupdate")
 
-    property int articleListingTextSize: 16
+    property int articleListingTextSize: controller.getIntSetting("fontSize")
+    property int webviewFontSize: controller.getIntSetting("artFontSize")
 
     Component.onCompleted: {
         theme.inverted = controller.getBooleanSetting("theme")
diff --git a/psa_harmattan/feedingit/qml/SettingsPage.qml b/psa_harmattan/feedingit/qml/SettingsPage.qml
index 4a85b72..b97ae41 100644
--- a/psa_harmattan/feedingit/qml/SettingsPage.qml
+++ b/psa_harmattan/feedingit/qml/SettingsPage.qml
@@ -8,6 +8,7 @@ Page {
 
     Column {
         width: parent.width
+        spacing: 5
 
         SwitchSetting {
             text: qsTr("Use Dark Theme")
@@ -57,6 +58,25 @@ Page {
                 settings.autoUpdateEnabled = checked
             }
         }
+
+        SliderSetting {
+            text: qsTr("Article Listing Font Size")
+            value: settings.articleListingTextSize
+            onValueChanged: {
+                controller.setIntSetting("fontSize", value)
+                settings.articleListingTextSize = value
+
+            }
+        }
+
+        SliderSetting {
+            text: qsTr("Article Font Size")
+            value: settings.webviewFontSize
+            onValueChanged: {
+                controller.setIntSetting("artFontSize", value)
+                settings.webviewFontSize = value
+            }
+         }
     }
 
 }
diff --git a/psa_harmattan/feedingit/qml/SliderSetting.qml b/psa_harmattan/feedingit/qml/SliderSetting.qml
new file mode 100644
index 0000000..1ebc7db
--- /dev/null
+++ b/psa_harmattan/feedingit/qml/SliderSetting.qml
@@ -0,0 +1,28 @@
+import QtQuick 1.0
+import com.nokia.meego 1.0
+
+Row {
+    width: parent.width
+    property alias text: themeText.text
+    property alias value: mySlider.value
+    signal valueChanged()
+
+    Text {
+        id: themeText
+        color: settings.mainTextColour;
+        font.pointSize: settings.mainTextSize
+        width: parent.width - mySlider.width
+        wrapMode: Text.WordWrap;
+    }
+
+    Slider {
+         id:mySlider
+         stepSize:1
+         valueIndicatorVisible: true
+         minimumValue:12
+         maximumValue:30
+         width:300
+         onPressedChanged: if (!pressed) { parent.valueChanged() }
+         orientation: Qt.Horizontal
+     }
+}
-- 
1.7.9.5