X-Git-Url: http://vcs.maemo.org/git/?a=blobdiff_plain;f=psa_harmattan%2Ffeedingit%2Fdeb_dist%2Ffeedingit-0.1.0%2Fdebian%2Ffeedingit%2Fusr%2Fshare%2Ffeedingit%2Fqml%2Fmain.qml;h=6e3457313dc8f6561b41d1e49739f3dfd4aacd73;hb=bc13488024ea46d077e3d8e43d6de64731ef7292;hp=0ade188c61a43088e8843c6e42e9d26ccaf9914a;hpb=31600f9948716e7833d92c4f4abadf6bdc9e1b01;p=feedingit

diff --git a/psa_harmattan/feedingit/deb_dist/feedingit-0.1.0/debian/feedingit/usr/share/feedingit/qml/main.qml b/psa_harmattan/feedingit/deb_dist/feedingit-0.1.0/debian/feedingit/usr/share/feedingit/qml/main.qml
index 0ade188..6e34573 100644
--- a/psa_harmattan/feedingit/deb_dist/feedingit-0.1.0/debian/feedingit/usr/share/feedingit/qml/main.qml
+++ b/psa_harmattan/feedingit/deb_dist/feedingit-0.1.0/debian/feedingit/usr/share/feedingit/qml/main.qml
@@ -9,21 +9,38 @@ PageStackWindow {
     signal longPressFeed(string key)
     signal categoryReloadRequest()
     signal feedReloadRequest()
+    signal articlesReloadRequest()
     signal addFileSignal(string fullname, string filename)
 
     property string feedid
     property string catid
 
+    property bool isUpdateInProgress: false
+    property int updateProgressValue: 0
+
     function addFileNotification(fullname, filename) {
         window.addFileSignal(fullname,filename)
     }
 
     function updateStarted() {
         banner.show(qsTr("Update Started"))
+        updateProgressValue = 0
+        isUpdateInProgress = true
     }
 
     function updateFinished() {
+        categoryReloadRequest()
+        feedReloadRequest()
         banner.show(qsTr("Updated Completed"))
+        isUpdateInProgress = false
+    }
+
+    function updateProgress(total, completed) {
+        if (total>0) {
+            updateProgressValue = Math.round(100*completed/total);
+        } else {
+            updateProgressValue = 0
+        }
     }
 
     onLongPressFeed: {
@@ -72,7 +89,11 @@ PageStackWindow {
         id: myArticlesMenu
         visualParent: pageStack
         MenuLayout {
-            MenuItem { text: qsTr("Mark All As Read"); onClicked: controller.markAllAsRead(feedid); }
+            MenuItem { text: qsTr("Mark All As Read"); onClicked: {
+                    controller.markAllAsRead(feedid);
+                    articlesReloadRequest()
+                }
+            }
             MenuItem { text: qsTr("Update Feed"); onClicked: controller.updateFeed(feedid); }
             //MenuItem { text: qsTr("About FeedingIt"); onClicked: query.open(); }
         }
@@ -136,7 +157,7 @@ PageStackWindow {
         id: query
         icon: "common/images/feedingit.png"
         titleText: "Feedingit RSS Reader"
-        message: "Version: 0.0.9"
+        message: "Version: n9-0.1.0"
         +"<br><br>FeedingIt RSS Reader.<br>"
         +"<br>&copy; 2011 feedingit.marcoz.org"
         +"<br>http://feedingit.marcoz.org"
@@ -219,8 +240,8 @@ PageStackWindow {
                     onClicked: {
                         myArticlesMenu.close();
                         if (flipper.articleShown) {
-                            flipper.articleShown = false;
                             flipper.reload()
+                            flipper.articleShown = false;
                         } else {
                             window.feedReloadRequest();
                             pageStack.pop();
@@ -236,6 +257,15 @@ PageStackWindow {
                 }
 
                 ToolIcon {
+                    platformIconId: "toolbar-share"
+                    visible: flipper.articleShown
+                    //anchors.right: (parent === undefined) ? undefined : parent.right
+                    onClicked: {
+                        controller.share(window.feedid, flipper.getCurrentArticleId());
+                    }
+                }
+
+                ToolIcon {
                     platformIconId: "toolbar-next"
                     visible: flipper.articleShown
                     //anchors.right: (parent === undefined) ? undefined : parent.right
@@ -248,6 +278,10 @@ PageStackWindow {
                     onClicked: (myArticlesMenu.status == DialogStatus.Closed) ? myArticlesMenu.open() : myArticlesMenu.close()
                 }
             }
+            Connections {
+                 target: window
+                 onArticlesReloadRequest: flipper.reload()
+             }
         }
     }