psa: fix updateBar

diff --git a/psa_harmattan/feedingit/deb_dist/feedingit-0.1.0/debian/changelog b/psa_harmattan/feedingit/deb_dist/feedingit-0.1.0/debian/changelog
index ff07922..f407cdf 100644 (file)
--- a/psa_harmattan/feedingit/deb_dist/feedingit-0.1.0/debian/changelog
+++ b/psa_harmattan/feedingit/deb_dist/feedingit-0.1.0/debian/changelog
@@ -2,4 +2,4 @@ feedingit (0.1.0-1) unstable; urgency=low
 
   * source package automatically created by stdeb 0.6.0+git
 
- -- Yves <yves@marcoz.org>  Sat, 26 Nov 2011 19:02:24 -0800
+ -- Yves <yves@marcoz.org>  Mon, 28 Nov 2011 22:42:25 -0800

diff --git a/psa_harmattan/feedingit/deb_dist/feedingit-0.1.0/debian/feedingit/DEBIAN/md5sums b/psa_harmattan/feedingit/deb_dist/feedingit-0.1.0/debian/feedingit/DEBIAN/md5sums
index ca9f130..c22fc2e 100644 (file)
--- a/psa_harmattan/feedingit/deb_dist/feedingit-0.1.0/debian/feedingit/DEBIAN/md5sums
+++ b/psa_harmattan/feedingit/deb_dist/feedingit-0.1.0/debian/feedingit/DEBIAN/md5sums
@@ -1,14 +1,14 @@
 4420c31f88de68fe6e1b7637abb06196  usr/bin/feedingit
 6a42e9aebedfd157062bd5a9616dc935  usr/share/applications/feedingit.desktop
 eda8cc6ffe8d842d6dfe0244b01b3042  usr/share/dbus-1/services/feedingit_status.service
-02f9471c7bed6d36f056f3a7e29abeef  usr/share/doc/feedingit/changelog.Debian.gz
+24bfb5e3013c1985cf9ca93484b6395e  usr/share/doc/feedingit/changelog.Debian.gz
 bac2be6ae9673ee5096e20e8b714c9cd  usr/share/feedingit/BeautifulSoup.py
 8f6e980f2e1154103a90763be6c00dc4  usr/share/feedingit/XmlHandler.py
 d41d8cd98f00b204e9800998ecf8427e  usr/share/feedingit/__init__.py
 f35343aa0ea95526b6af4ed8193526c2  usr/share/feedingit/config.py
 b4b00de5dccaf56d81a9dab1eeac63e1  usr/share/feedingit/debugging.py
 fae02e730b76761d43a626fe19828d5e  usr/share/feedingit/download.py
-056fe7a92a3fcd6fb404ad4525d55fca  usr/share/feedingit/feedingit.py
+b5e04b9ed64f4c34360e00ab18a40444  usr/share/feedingit/feedingit.py
 afa4f462892136f59beaf96b6bf1cf96  usr/share/feedingit/feedparser.py
 c1a0c0a9ccefd64d1e27bddb817c72a3  usr/share/feedingit/httpprogresshandler.py
 f1e9ba0f44786f513659a7fa3111fc8a  usr/share/feedingit/jobmanager.py
@@ -17,10 +17,10 @@ d9c0665dfdd5cf19f1529ce88af95134  usr/share/feedingit/opml.py
 7c3358bb2e3cba866248e75556a159d3  usr/share/feedingit/opml_lib.py
 4ef0e77dd5685db3a51306fd7ccf585f  usr/share/feedingit/qml/AddFeed.qml
 af27062fdba0bc7a3df92116e8340d19  usr/share/feedingit/qml/ArticleDisplay.qml
-ff581d603af7729c20d031cd68d73f7c  usr/share/feedingit/qml/ArticleViewer.qml
+d59b6b7bb7e35c156e374926cc57c45c  usr/share/feedingit/qml/ArticleViewer.qml
 15083e9a1fac05c8efaaa085dfabcbcb  usr/share/feedingit/qml/Articles.qml
 77bf6a1d2d0f265ee16c492886f96ede  usr/share/feedingit/qml/AutomaticUpdate.qml
-051dc2769c9bddcafc65cdc26049ba88  usr/share/feedingit/qml/Categories.qml
+bd7579a3d822222caca98684212c4f42  usr/share/feedingit/qml/Categories.qml
 cd30f5eaec0885358261d7a96bfaf8cd  usr/share/feedingit/qml/FeedingIt.qml
 afdb98e07e8b5e066e745a5df9de09b9  usr/share/feedingit/qml/Feeds.qml
 bec5fe4599a3ad5799ed96d7ed81fb5f  usr/share/feedingit/qml/MainPage.qml
@@ -61,7 +61,7 @@ af11b73b195513d08c17723b41db0b04  usr/share/feedingit/qml/common/images/wmBackIc
 1c7751b124aa1bdf4b89ec76cdf815a2  usr/share/feedingit/qml/i18n/FeedingIt.ts
 7790a99425dd7c1046e6ae3b1ee72a03  usr/share/feedingit/qml/i18n/qml_en.qm
 1674fcce45bcf3319e61d19a9adf4fdd  usr/share/feedingit/qml/i18n/qml_en.ts
-6a1fcf3584c62e4817505bee45477b72  usr/share/feedingit/qml/main.qml
+8ff0fbbcf4c674f633346abdba94c5a7  usr/share/feedingit/qml/main.qml
 e3b4184531f29bbf86d812f9b8adacc2  usr/share/feedingit/rss_sqlite.py
 721777a26cd2a5b8466ce2aa2b99fad7  usr/share/feedingit/update_feeds.py
 6ccf12dc4379e91800ae8505b2e86082  usr/share/feedingit/updatedbus.py

diff --git a/psa_harmattan/feedingit/deb_dist/feedingit-0.1.0/debian/feedingit/usr/share/doc/feedingit/changelog.Debian.gz b/psa_harmattan/feedingit/deb_dist/feedingit-0.1.0/debian/feedingit/usr/share/doc/feedingit/changelog.Debian.gz
index 071f1a7..3b0b458 100644 (file)
Binary files a/psa_harmattan/feedingit/deb_dist/feedingit-0.1.0/debian/feedingit/usr/share/doc/feedingit/changelog.Debian.gz and b/psa_harmattan/feedingit/deb_dist/feedingit-0.1.0/debian/feedingit/usr/share/doc/feedingit/changelog.Debian.gz differ

diff --git a/psa_harmattan/feedingit/deb_dist/feedingit-0.1.0/debian/feedingit/usr/share/feedingit/feedingit.py b/psa_harmattan/feedingit/deb_dist/feedingit-0.1.0/debian/feedingit/usr/share/feedingit/feedingit.py
index fbf58ff..374627f 100644 (file)
--- a/psa_harmattan/feedingit/deb_dist/feedingit-0.1.0/debian/feedingit/usr/share/feedingit/feedingit.py
+++ b/psa_harmattan/feedingit/deb_dist/feedingit-0.1.0/debian/feedingit/usr/share/feedingit/feedingit.py
@@ -41,9 +41,11 @@ class Controller(QtCore.QObject):
                         completed, in_progress, queued,
                         bytes_downloaded, bytes_updated, bytes_per_second,
                         feed_updated):
-        logger.info(feed_updated)
         total = completed + in_progress + queued
-        root.updateProgress(total, completed)
+        root.updateProgress(int(total), int(completed))
+        
+    def articleCountUpdated(self):
+        print "article updated"
     
     def update_started(self):
         root.updateStarted()
@@ -194,7 +196,6 @@ class Controller(QtCore.QObject):
         config.saveConfig()
 
 def main():
-
     if not isdir(CONFIGDIR):
         try:
             mkdir(CONFIGDIR)
@@ -223,11 +224,18 @@ def main():
  
     # listen on dbus for download update progress
     bus = dbus.SessionBus()
+    
     bus.add_signal_receiver(handler_function=controller.update_progress,
                             bus_name=None,
                             signal_name='UpdateProgress',
                             dbus_interface='org.marcoz.feedingit',
                             path='/org/marcoz/feedingit/update')
+    
+    bus.add_signal_receiver(handler_function=controller.articleCountUpdated,
+                            bus_name=None,
+                            signal_name='ArticleCountUpdated',
+                            dbus_interface='org.marcoz.feedingit',
+                            path='/org/marcoz/feedingit/update')
     bus.add_signal_receiver(handler_function=controller.update_started,
                             bus_name=None,
                             signal_name='UpdateStarted',
@@ -263,6 +271,5 @@ def main():
     #view.show()
     sys.exit(app.exec_())
 
-if __name__ == "__main__":
-    
+if __name__ == "__main__": 
     main()

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..f2b89aa 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
@@ -58,7 +58,7 @@ 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
@@ -71,7 +71,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
@@ -82,7 +82,7 @@ Item {
     }
 
     ProgressBar {
-        id: updateBar
+        id: updateBarArticles
         minimumValue: 0
         maximumValue: 100
         value: window.updateProgressValue

diff --git a/psa_harmattan/feedingit/deb_dist/feedingit-0.1.0/debian/feedingit/usr/share/feedingit/qml/Categories.qml b/psa_harmattan/feedingit/deb_dist/feedingit-0.1.0/debian/feedingit/usr/share/feedingit/qml/Categories.qml
index be7205e..3ecd3b0 100644 (file)
--- a/psa_harmattan/feedingit/deb_dist/feedingit-0.1.0/debian/feedingit/usr/share/feedingit/qml/Categories.qml
+++ b/psa_harmattan/feedingit/deb_dist/feedingit-0.1.0/debian/feedingit/usr/share/feedingit/qml/Categories.qml
@@ -17,13 +17,13 @@ Item {
     ListView {
         id: categoryList; model: categories; delegate: categoryDelegate; z: 6;
         cacheBuffer: 100; width: parent.width;
-        height: updateBarFeeds.visible? parent.height-updateBarFeeds.height : parent.height;
+        height: updateBarCategories.visible? parent.height-updateBarCategories.height : parent.height;
         clip: true
         /*height: parent.height;*/
     }
 
     ProgressBar {
-        id: updateBar
+        id: updateBarCategories
         minimumValue: 0
         maximumValue: 100
         value: window.updateProgressValue

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 267d1a6..59e8276 100644 (file)
--- 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
@@ -36,6 +36,7 @@ PageStackWindow {
     }
 
     function updateProgress(total, completed) {
+        console.log("Total: "+total)
         if (total>0) {
             updateProgressValue = Math.round(100*completed/total);
         } else {
@@ -240,8 +241,8 @@ PageStackWindow {
                     onClicked: {
                         myArticlesMenu.close();
                         if (flipper.articleShown) {
-                            flipper.articleShown = false;
                             flipper.reload()
+                            flipper.articleShown = false;
                         } else {
                             window.feedReloadRequest();
                             pageStack.pop();

diff --git a/psa_harmattan/feedingit/deb_dist/feedingit-0.1.0/debian/rules b/psa_harmattan/feedingit/deb_dist/feedingit-0.1.0/debian/rules
index d6c6b51..736dba3 100755 (executable)
--- a/psa_harmattan/feedingit/deb_dist/feedingit-0.1.0/debian/rules
+++ b/psa_harmattan/feedingit/deb_dist/feedingit-0.1.0/debian/rules
@@ -1,7 +1,7 @@
 #!/usr/bin/make -f
 
 # This file was automatically generated by stdeb 0.6.0+git at
-# Sat, 26 Nov 2011 19:02:24 -0800
+# Mon, 28 Nov 2011 22:42:25 -0800
 
 %:
        dh $@ --with python2 --buildsystem=python_distutils

diff --git a/psa_harmattan/feedingit/deb_dist/feedingit-0.1.0/pysrc/feedingit.py b/psa_harmattan/feedingit/deb_dist/feedingit-0.1.0/pysrc/feedingit.py
index fbf58ff..374627f 100644 (file)
--- a/psa_harmattan/feedingit/deb_dist/feedingit-0.1.0/pysrc/feedingit.py
+++ b/psa_harmattan/feedingit/deb_dist/feedingit-0.1.0/pysrc/feedingit.py
@@ -41,9 +41,11 @@ class Controller(QtCore.QObject):
                         completed, in_progress, queued,
                         bytes_downloaded, bytes_updated, bytes_per_second,
                         feed_updated):
-        logger.info(feed_updated)
         total = completed + in_progress + queued
-        root.updateProgress(total, completed)
+        root.updateProgress(int(total), int(completed))
+        
+    def articleCountUpdated(self):
+        print "article updated"
     
     def update_started(self):
         root.updateStarted()
@@ -194,7 +196,6 @@ class Controller(QtCore.QObject):
         config.saveConfig()
 
 def main():
-
     if not isdir(CONFIGDIR):
         try:
             mkdir(CONFIGDIR)
@@ -223,11 +224,18 @@ def main():
  
     # listen on dbus for download update progress
     bus = dbus.SessionBus()
+    
     bus.add_signal_receiver(handler_function=controller.update_progress,
                             bus_name=None,
                             signal_name='UpdateProgress',
                             dbus_interface='org.marcoz.feedingit',
                             path='/org/marcoz/feedingit/update')
+    
+    bus.add_signal_receiver(handler_function=controller.articleCountUpdated,
+                            bus_name=None,
+                            signal_name='ArticleCountUpdated',
+                            dbus_interface='org.marcoz.feedingit',
+                            path='/org/marcoz/feedingit/update')
     bus.add_signal_receiver(handler_function=controller.update_started,
                             bus_name=None,
                             signal_name='UpdateStarted',
@@ -263,6 +271,5 @@ def main():
     #view.show()
     sys.exit(app.exec_())
 
-if __name__ == "__main__":
-    
+if __name__ == "__main__": 
     main()

diff --git a/psa_harmattan/feedingit/deb_dist/feedingit-0.1.0/qml/ArticleViewer.qml b/psa_harmattan/feedingit/deb_dist/feedingit-0.1.0/qml/ArticleViewer.qml
index 9bb29b4..f2b89aa 100644 (file)
--- a/psa_harmattan/feedingit/deb_dist/feedingit-0.1.0/qml/ArticleViewer.qml
+++ b/psa_harmattan/feedingit/deb_dist/feedingit-0.1.0/qml/ArticleViewer.qml
@@ -58,7 +58,7 @@ 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
@@ -71,7 +71,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
@@ -82,7 +82,7 @@ Item {
     }
 
     ProgressBar {
-        id: updateBar
+        id: updateBarArticles
         minimumValue: 0
         maximumValue: 100
         value: window.updateProgressValue

diff --git a/psa_harmattan/feedingit/deb_dist/feedingit-0.1.0/qml/Categories.qml b/psa_harmattan/feedingit/deb_dist/feedingit-0.1.0/qml/Categories.qml
index be7205e..3ecd3b0 100644 (file)
--- a/psa_harmattan/feedingit/deb_dist/feedingit-0.1.0/qml/Categories.qml
+++ b/psa_harmattan/feedingit/deb_dist/feedingit-0.1.0/qml/Categories.qml
@@ -17,13 +17,13 @@ Item {
     ListView {
         id: categoryList; model: categories; delegate: categoryDelegate; z: 6;
         cacheBuffer: 100; width: parent.width;
-        height: updateBarFeeds.visible? parent.height-updateBarFeeds.height : parent.height;
+        height: updateBarCategories.visible? parent.height-updateBarCategories.height : parent.height;
         clip: true
         /*height: parent.height;*/
     }
 
     ProgressBar {
-        id: updateBar
+        id: updateBarCategories
         minimumValue: 0
         maximumValue: 100
         value: window.updateProgressValue

diff --git a/psa_harmattan/feedingit/deb_dist/feedingit-0.1.0/qml/main.qml b/psa_harmattan/feedingit/deb_dist/feedingit-0.1.0/qml/main.qml
index 267d1a6..59e8276 100644 (file)
--- a/psa_harmattan/feedingit/deb_dist/feedingit-0.1.0/qml/main.qml
+++ b/psa_harmattan/feedingit/deb_dist/feedingit-0.1.0/qml/main.qml
@@ -36,6 +36,7 @@ PageStackWindow {
     }
 
     function updateProgress(total, completed) {
+        console.log("Total: "+total)
         if (total>0) {
             updateProgressValue = Math.round(100*completed/total);
         } else {
@@ -240,8 +241,8 @@ PageStackWindow {
                     onClicked: {
                         myArticlesMenu.close();
                         if (flipper.articleShown) {
-                            flipper.articleShown = false;
                             flipper.reload()
+                            flipper.articleShown = false;
                         } else {
                             window.feedReloadRequest();
                             pageStack.pop();

diff --git a/psa_harmattan/feedingit/deb_dist/feedingit_0.1.0-1.debian.tar.gz b/psa_harmattan/feedingit/deb_dist/feedingit_0.1.0-1.debian.tar.gz
index 5df8e7b..392f5d7 100644 (file)
Binary files a/psa_harmattan/feedingit/deb_dist/feedingit_0.1.0-1.debian.tar.gz and b/psa_harmattan/feedingit/deb_dist/feedingit_0.1.0-1.debian.tar.gz differ

diff --git a/psa_harmattan/feedingit/deb_dist/feedingit_0.1.0-1.dsc b/psa_harmattan/feedingit/deb_dist/feedingit_0.1.0-1.dsc
index cd5f9d7..ff7b49e 100644 (file)
--- a/psa_harmattan/feedingit/deb_dist/feedingit_0.1.0-1.dsc
+++ b/psa_harmattan/feedingit/deb_dist/feedingit_0.1.0-1.dsc
@@ -7,11 +7,11 @@ Maintainer: Yves <yves@marcoz.org>
 Standards-Version: 3.9.1
 Build-Depends: python-all (>= 2.6.6-3), debhelper (>= 7.4.3)
 Checksums-Sha1: 
- 6d5bc21c6f2417b44a263823878b49a97fc7ea7d 180866 feedingit_0.1.0.orig.tar.gz
- aec80753f27ec09a133bea574b4ba8a3f0c5cb71 928 feedingit_0.1.0-1.debian.tar.gz
+ 89a1be93aa6974d723c870fbedbb563be979f67d 180885 feedingit_0.1.0.orig.tar.gz
+ 7f715049bfda7dc0ae5af61c980ec85f3a5e5ab5 899 feedingit_0.1.0-1.debian.tar.gz
 Checksums-Sha256: 
- a19f03efd945809fe24163dd57b5d4b5dd19b5a9513de35a44fe13034493950a 180866 feedingit_0.1.0.orig.tar.gz
- bd7e95514a57e8c4c8f828173e78e7de591e31ec6faee3e30ca1fc90f7482a08 928 feedingit_0.1.0-1.debian.tar.gz
+ 1bf999449651df0724dde015577b735d90a95a6da8163daf2c9366e38b24fe90 180885 feedingit_0.1.0.orig.tar.gz
+ fff1f23a3348a9479a693c43d3e3a3c2da6260a6d80a48479ca745b63dc77e06 899 feedingit_0.1.0-1.debian.tar.gz
 Files: 
- cce13155ea234f8e40613ad751477553 180866 feedingit_0.1.0.orig.tar.gz
- 6398c006b84d313a600c863cf9718e08 928 feedingit_0.1.0-1.debian.tar.gz
+ a6ec756f268cd0cfdcc8d1b818f40648 180885 feedingit_0.1.0.orig.tar.gz
+ 1fdcd44f9bc6606908bab34833e0155f 899 feedingit_0.1.0-1.debian.tar.gz

diff --git a/psa_harmattan/feedingit/deb_dist/feedingit_0.1.0-1_all.deb b/psa_harmattan/feedingit/deb_dist/feedingit_0.1.0-1_all.deb
index 3154d96..1bc8998 100644 (file)
Binary files a/psa_harmattan/feedingit/deb_dist/feedingit_0.1.0-1_all.deb and b/psa_harmattan/feedingit/deb_dist/feedingit_0.1.0-1_all.deb differ

diff --git a/psa_harmattan/feedingit/deb_dist/feedingit_0.1.0-1_i386.changes b/psa_harmattan/feedingit/deb_dist/feedingit_0.1.0-1_i386.changes
index 6221772..a4c17ac 100644 (file)
--- a/psa_harmattan/feedingit/deb_dist/feedingit_0.1.0-1_i386.changes
+++ b/psa_harmattan/feedingit/deb_dist/feedingit_0.1.0-1_i386.changes
@@ -1,5 +1,5 @@
 Format: 1.8
-Date: Sat, 26 Nov 2011 19:02:24 -0800
+Date: Mon, 28 Nov 2011 22:42:25 -0800
 Source: feedingit
 Binary: feedingit
 Architecture: source all
@@ -15,17 +15,17 @@ Changes:
  .
    * source package automatically created by stdeb 0.6.0+git
 Checksums-Sha1: 
- abbf19fa4a6d3cc7ba6842d9063af44ce3a7f2a3 753 feedingit_0.1.0-1.dsc
- 6d5bc21c6f2417b44a263823878b49a97fc7ea7d 180866 feedingit_0.1.0.orig.tar.gz
- aec80753f27ec09a133bea574b4ba8a3f0c5cb71 928 feedingit_0.1.0-1.debian.tar.gz
- 5315a14980298945cc69c8710a3ce4d3b9b99eab 170828 feedingit_0.1.0-1_all.deb
+ bceb3dda5d1a08fe5037aee451ef324137c1a6a1 753 feedingit_0.1.0-1.dsc
+ 89a1be93aa6974d723c870fbedbb563be979f67d 180885 feedingit_0.1.0.orig.tar.gz
+ 7f715049bfda7dc0ae5af61c980ec85f3a5e5ab5 899 feedingit_0.1.0-1.debian.tar.gz
+ 904a2ba8cd6eb68b0836048ff2853b41f765bbf2 170884 feedingit_0.1.0-1_all.deb
 Checksums-Sha256: 
- ef4bbd119cd3896ef22d344b8ea422eed4ab85d257ff37ed5f5a6b4124d48526 753 feedingit_0.1.0-1.dsc
- a19f03efd945809fe24163dd57b5d4b5dd19b5a9513de35a44fe13034493950a 180866 feedingit_0.1.0.orig.tar.gz
- bd7e95514a57e8c4c8f828173e78e7de591e31ec6faee3e30ca1fc90f7482a08 928 feedingit_0.1.0-1.debian.tar.gz
- fc1193d8de2cd27b4f973b405ca4f1fa354c0b827e63db0b3444690203c278c9 170828 feedingit_0.1.0-1_all.deb
+ 4a6dc1618b2a23725d0a6d8c56b6f9d1613ccf3e30008d027562b0f4b974b741 753 feedingit_0.1.0-1.dsc
+ 1bf999449651df0724dde015577b735d90a95a6da8163daf2c9366e38b24fe90 180885 feedingit_0.1.0.orig.tar.gz
+ fff1f23a3348a9479a693c43d3e3a3c2da6260a6d80a48479ca745b63dc77e06 899 feedingit_0.1.0-1.debian.tar.gz
+ 4c9a578fa63f0512d5d10010b002d4d4fa03e795a23dac83879ef26e4ab1bc12 170884 feedingit_0.1.0-1_all.deb
 Files: 
- ad3dd1da27746027b697f569454e37a1 753 user/development optional feedingit_0.1.0-1.dsc
- cce13155ea234f8e40613ad751477553 180866 user/development optional feedingit_0.1.0.orig.tar.gz
- 6398c006b84d313a600c863cf9718e08 928 user/development optional feedingit_0.1.0-1.debian.tar.gz
- f24d0d88620c2c35b2046f6b75e8519e 170828 user/development optional feedingit_0.1.0-1_all.deb
+ 90cc9d480bfeadce16e3ce9748603fa2 753 user/development optional feedingit_0.1.0-1.dsc
+ a6ec756f268cd0cfdcc8d1b818f40648 180885 user/development optional feedingit_0.1.0.orig.tar.gz
+ 1fdcd44f9bc6606908bab34833e0155f 899 user/development optional feedingit_0.1.0-1.debian.tar.gz
+ 4222bc3dca6cc34a583149dbeb04c239 170884 user/development optional feedingit_0.1.0-1_all.deb

diff --git a/psa_harmattan/feedingit/deb_dist/feedingit_0.1.0.orig.tar.gz b/psa_harmattan/feedingit/deb_dist/feedingit_0.1.0.orig.tar.gz
index 4533e15..ee616ec 100644 (file)
Binary files a/psa_harmattan/feedingit/deb_dist/feedingit_0.1.0.orig.tar.gz and b/psa_harmattan/feedingit/deb_dist/feedingit_0.1.0.orig.tar.gz differ

diff --git a/psa_harmattan/feedingit/pysrc/feedingit.py b/psa_harmattan/feedingit/pysrc/feedingit.py
index fbf58ff..374627f 100644 (file)
--- a/psa_harmattan/feedingit/pysrc/feedingit.py
+++ b/psa_harmattan/feedingit/pysrc/feedingit.py
@@ -41,9 +41,11 @@ class Controller(QtCore.QObject):
                         completed, in_progress, queued,
                         bytes_downloaded, bytes_updated, bytes_per_second,
                         feed_updated):
-        logger.info(feed_updated)
         total = completed + in_progress + queued
-        root.updateProgress(total, completed)
+        root.updateProgress(int(total), int(completed))
+        
+    def articleCountUpdated(self):
+        print "article updated"
     
     def update_started(self):
         root.updateStarted()
@@ -194,7 +196,6 @@ class Controller(QtCore.QObject):
         config.saveConfig()
 
 def main():
-
     if not isdir(CONFIGDIR):
         try:
             mkdir(CONFIGDIR)
@@ -223,11 +224,18 @@ def main():
  
     # listen on dbus for download update progress
     bus = dbus.SessionBus()
+    
     bus.add_signal_receiver(handler_function=controller.update_progress,
                             bus_name=None,
                             signal_name='UpdateProgress',
                             dbus_interface='org.marcoz.feedingit',
                             path='/org/marcoz/feedingit/update')
+    
+    bus.add_signal_receiver(handler_function=controller.articleCountUpdated,
+                            bus_name=None,
+                            signal_name='ArticleCountUpdated',
+                            dbus_interface='org.marcoz.feedingit',
+                            path='/org/marcoz/feedingit/update')
     bus.add_signal_receiver(handler_function=controller.update_started,
                             bus_name=None,
                             signal_name='UpdateStarted',
@@ -263,6 +271,5 @@ def main():
     #view.show()
     sys.exit(app.exec_())
 
-if __name__ == "__main__":
-    
+if __name__ == "__main__": 
     main()

diff --git a/psa_harmattan/feedingit/qml/ArticleViewer.qml b/psa_harmattan/feedingit/qml/ArticleViewer.qml
index 6da3b6e..f2b89aa 100644 (file)
--- a/psa_harmattan/feedingit/qml/ArticleViewer.qml
+++ b/psa_harmattan/feedingit/qml/ArticleViewer.qml
@@ -58,7 +58,7 @@ 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