psa: new icon, increased listing font size

[feedingit] / psa_harmattan / feedingit / deb_dist / feedingit-0.1.0 / debian / feedingit / usr / share / feedingit / qml / ArticleViewer.qml

diff --git a/psa_harmattan/feedingit/deb_dist/feedingit-0.1.0/debian/feedingit/usr/share/feedingit/qml/ArticleViewer.qml b/psa_harmattan/feedingit/deb_dist/feedingit-0.1.0/debian/feedingit/usr/share/feedingit/qml/ArticleViewer.qml
index 9bb29b4..7e58501 100644 (file)
--- a/psa_harmattan/feedingit/deb_dist/feedingit-0.1.0/debian/feedingit/usr/share/feedingit/qml/ArticleViewer.qml
+++ b/psa_harmattan/feedingit/deb_dist/feedingit-0.1.0/debian/feedingit/usr/share/feedingit/qml/ArticleViewer.qml
@@ -43,14 +43,9 @@ Item {
         }
     }
 
-    function viewArticle(articleid) {
-        var index = 0;
-        for (var i=0; i<articleList.count; ++i) {
-            if (articles.get(0).articleid==articleid) {
-                index = i;
-            }
-        }
-        articleView.positionViewAtIndex(index, ListView.Contain); articleView.visible = true;
+    function getCurrentArticleId() {
+        var object = articleView.model.get(articleView.currentIndex)
+        return object.articleid
     }
 
     ListView {
@@ -58,11 +53,12 @@ Item {
         model: articles
         delegate: listing
         width: parent.width;
-        height: updateBarFeeds.visible? parent.height-updateBarFeeds.height : parent.height;
+        height: updateBarArticles.visible? parent.height-updateBarArticles.height : parent.height;
         /*x: 0;*/
         cacheBuffer: 100;
         flickDeceleration: 1500
         visible: articles.status==XmlListModel.Ready
+        clip: true
     }
 
     ListView {
@@ -71,7 +67,7 @@ Item {
         delegate: viewer
         orientation: ListView.Horizontal
         width: parent.width;
-        height: updateBarFeeds.visible? parent.height-updateBarFeeds.height : parent.height;
+        height: updateBarArticles.visible? parent.height-updateBarArticles.height : parent.height;
         visible: false; z:8
         //onCurrentIndexChanged: photosGridView.positionViewAtIndex(currentIndex, GridView.Contain)
         highlightRangeMode: ListView.StrictlyEnforceRange; snapMode: ListView.SnapOneItem
@@ -79,10 +75,11 @@ Item {
         onMovementStarted: articleViewer.vertPanningEnabled=false;
         onMovementEnded: articleViewer.vertPanningEnabled=true;
         highlightMoveDuration: 300;
+        clip: true
     }
 
     ProgressBar {
-        id: updateBar
+        id: updateBarArticles
         minimumValue: 0
         maximumValue: 100
         value: window.updateProgressValue
@@ -165,7 +162,7 @@ Item {
                     color: (unread=="True") ? settings.mainTextColour : settings.secondaryTextColour;
 
                      wrapMode: Text.WordWrap; font.bold: false;
-                    font.pixelSize: settings.mainTextSize
+                    font.pointSize: settings.articleListingTextSize
                 }
                 MouseArea { anchors.fill: listItem;
                     onClicked: { articleView.positionViewAtIndex(index, ListView.Contain); articleView.visible = true; }