psa: added automatic updates

diff --git a/psa_harmattan/feedingit/build-deb.log b/psa_harmattan/feedingit/build-deb.log
index 8cabead..a006f70 100644 (file)
--- a/psa_harmattan/feedingit/build-deb.log
+++ b/psa_harmattan/feedingit/build-deb.log
@@ -77,6 +77,7 @@ copying qml/ArticleViewer.qml -> /scratchbox/users/ymarcoz/home/ymarcoz/workspac
 copying qml/MainPage.qml -> /scratchbox/users/ymarcoz/home/ymarcoz/workspace/feedingit/psa_harmattan/feedingit/deb_dist/feedingit-0.1.0/debian/feedingit/usr/share/feedingit/qml
 copying qml/main.qml -> /scratchbox/users/ymarcoz/home/ymarcoz/workspace/feedingit/psa_harmattan/feedingit/deb_dist/feedingit-0.1.0/debian/feedingit/usr/share/feedingit/qml
 copying qml/Settings.qml -> /scratchbox/users/ymarcoz/home/ymarcoz/workspace/feedingit/psa_harmattan/feedingit/deb_dist/feedingit-0.1.0/debian/feedingit/usr/share/feedingit/qml
+copying qml/AutomaticUpdate.qml -> /scratchbox/users/ymarcoz/home/ymarcoz/workspace/feedingit/psa_harmattan/feedingit/deb_dist/feedingit-0.1.0/debian/feedingit/usr/share/feedingit/qml
 copying qml/ArticleDisplay.qml -> /scratchbox/users/ymarcoz/home/ymarcoz/workspace/feedingit/psa_harmattan/feedingit/deb_dist/feedingit-0.1.0/debian/feedingit/usr/share/feedingit/qml
 copying qml/AddFeed.qml -> /scratchbox/users/ymarcoz/home/ymarcoz/workspace/feedingit/psa_harmattan/feedingit/deb_dist/feedingit-0.1.0/debian/feedingit/usr/share/feedingit/qml
 copying qml/storage.js -> /scratchbox/users/ymarcoz/home/ymarcoz/workspace/feedingit/psa_harmattan/feedingit/deb_dist/feedingit-0.1.0/debian/feedingit/usr/share/feedingit/qml

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 47705a0..8975983 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>  Mon, 21 Nov 2011 21:11:33 -0800
+ -- Yves <yves@marcoz.org>  Mon, 21 Nov 2011 22:03:04 -0800

diff --git a/psa_harmattan/feedingit/deb_dist/feedingit-0.1.0/debian/feedingit/DEBIAN/control b/psa_harmattan/feedingit/deb_dist/feedingit-0.1.0/debian/feedingit/DEBIAN/control
index 235a7b3..7f47154 100644 (file)
--- a/psa_harmattan/feedingit/deb_dist/feedingit-0.1.0/debian/feedingit/DEBIAN/control
+++ b/psa_harmattan/feedingit/deb_dist/feedingit-0.1.0/debian/feedingit/DEBIAN/control
@@ -2,7 +2,7 @@ Package: feedingit
 Version: 0.1.0-1
 Architecture: all
 Maintainer: Yves <yves@marcoz.org>
-Installed-Size: 796
+Installed-Size: 800
 Depends: python-pyside.qtgui, python-pyside.qtopengl, python-pyside.qtdeclarative, python-dbus, python-gconf
 Breaks: python (<< 2.6)
 Section: user/development

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 ba11d1c..6dcf021 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,7 +1,7 @@
 4420c31f88de68fe6e1b7637abb06196  usr/bin/feedingit
 6a42e9aebedfd157062bd5a9616dc935  usr/share/applications/feedingit.desktop
 eda8cc6ffe8d842d6dfe0244b01b3042  usr/share/dbus-1/services/feedingit_status.service
-5c7f442c0e8c3d7c05597d9684796864  usr/share/doc/feedingit/changelog.Debian.gz
+eeb9ee3e9b4e40ee2319014d2099737e  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
@@ -19,6 +19,7 @@ d9c0665dfdd5cf19f1529ce88af95134  usr/share/feedingit/opml.py
 af27062fdba0bc7a3df92116e8340d19  usr/share/feedingit/qml/ArticleDisplay.qml
 9b095f75f329ce61bd4170b0037dc9c4  usr/share/feedingit/qml/ArticleViewer.qml
 15083e9a1fac05c8efaaa085dfabcbcb  usr/share/feedingit/qml/Articles.qml
+0ad45bea574a620541e5fd3060920e2a  usr/share/feedingit/qml/AutomaticUpdate.qml
 8f480702a2107a8017fdd94226b9b7d4  usr/share/feedingit/qml/Categories.qml
 cd30f5eaec0885358261d7a96bfaf8cd  usr/share/feedingit/qml/FeedingIt.qml
 3f5a5feca57160c2956a38579a325816  usr/share/feedingit/qml/Feeds.qml
@@ -60,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
-2bbcf082ceb0e97171bab040e8fba0a2  usr/share/feedingit/qml/main.qml
+0674931363ea0b608d98ddec8df1cb22  usr/share/feedingit/qml/main.qml
 40606cd0365957b1607a2bf2cf3bc030  usr/share/feedingit/qml/storage.js
 e3b4184531f29bbf86d812f9b8adacc2  usr/share/feedingit/rss_sqlite.py
 721777a26cd2a5b8466ce2aa2b99fad7  usr/share/feedingit/update_feeds.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 2fbf474..3aedd7a 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/qml/main.qml b/psa_harmattan/feedingit/deb_dist/feedingit-0.1.0/debian/feedingit/usr/share/feedingit/qml/main.qml
index 973bbdb..da92539 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
@@ -313,4 +313,6 @@ PageStackWindow {
 
         //text: "This is an info banner with no icon"
     }
+
+    AutomaticUpdate {}
 }

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 477e834..984662c 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
-# Mon, 21 Nov 2011 21:11:33 -0800
+# Mon, 21 Nov 2011 22:03:04 -0800
 
 %:
        dh $@ --with python2 --buildsystem=python_distutils

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 973bbdb..da92539 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
@@ -313,4 +313,6 @@ PageStackWindow {
 
         //text: "This is an info banner with no icon"
     }
+
+    AutomaticUpdate {}
 }

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 491ee28..ef72c73 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 794a41c..5004864 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: 
- e4330c217f401270d8d72ce61b19738e9bfd2088 181121 feedingit_0.1.0.orig.tar.gz
- 03bbd591b1f8061782cad693c74bd8998d90873d 892 feedingit_0.1.0-1.debian.tar.gz
+ 502dff966800b86ec3a2018662a74c7fff13433b 181251 feedingit_0.1.0.orig.tar.gz
+ bc89359677a4a3dc1ec6c05889b51a4c5c98bc24 894 feedingit_0.1.0-1.debian.tar.gz
 Checksums-Sha256: 
- e0976e4078949e8f90fb5595ad2e0beac46d6ffdd7777540cdfcf6aabc912c0a 181121 feedingit_0.1.0.orig.tar.gz
- 7d0569d259111ec8c692a85684605d19f7ace917d3a602b47a6e3925811ff731 892 feedingit_0.1.0-1.debian.tar.gz
+ 61f1d4bf4d4d7edae888950b0751ef445d821a197ecd840dcfb0dc41c283ae04 181251 feedingit_0.1.0.orig.tar.gz
+ d80c8161bdb483c6f1fc46c3ac71193ea7e2e48e1092c4aa881b79bbe4dfab7f 894 feedingit_0.1.0-1.debian.tar.gz
 Files: 
- a87f884427e09496169d8d45661888e6 181121 feedingit_0.1.0.orig.tar.gz
- b7c8797b89ea548c7d22ac74a9552e5b 892 feedingit_0.1.0-1.debian.tar.gz
+ 7098b6be36b37ed6dccedf8c3d9f4d20 181251 feedingit_0.1.0.orig.tar.gz
+ 512ffad31ae7b46bc81030c9146404a5 894 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 0a7652c..97b2e05 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 70f8061..b1a5e69 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: Mon, 21 Nov 2011 21:11:33 -0800
+Date: Mon, 21 Nov 2011 22:03:04 -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: 
- 4a31204eed5ce466fd01cfbb01421f33e678374f 753 feedingit_0.1.0-1.dsc
- e4330c217f401270d8d72ce61b19738e9bfd2088 181121 feedingit_0.1.0.orig.tar.gz
- 03bbd591b1f8061782cad693c74bd8998d90873d 892 feedingit_0.1.0-1.debian.tar.gz
- 57723377cfd1516d9747e2b49f2e46fb29dcb998 171812 feedingit_0.1.0-1_all.deb
+ 11ab1e4ad8a48da532f16b5cdc160af9f12c5c8d 753 feedingit_0.1.0-1.dsc
+ 502dff966800b86ec3a2018662a74c7fff13433b 181251 feedingit_0.1.0.orig.tar.gz
+ bc89359677a4a3dc1ec6c05889b51a4c5c98bc24 894 feedingit_0.1.0-1.debian.tar.gz
+ 377d8a687f54309ccf0d914abebcbbb4679a741a 171984 feedingit_0.1.0-1_all.deb
 Checksums-Sha256: 
- e99828280e4a7a5fe3ac36d30943be2197cd9e56f1c83c24b8f6118179d6158d 753 feedingit_0.1.0-1.dsc
- e0976e4078949e8f90fb5595ad2e0beac46d6ffdd7777540cdfcf6aabc912c0a 181121 feedingit_0.1.0.orig.tar.gz
- 7d0569d259111ec8c692a85684605d19f7ace917d3a602b47a6e3925811ff731 892 feedingit_0.1.0-1.debian.tar.gz
- 3b8879e509aca560d19cb147c6f13140b6630980d30b4c50ed5708277f500b54 171812 feedingit_0.1.0-1_all.deb
+ fc2ceeb82c3ed7eff7a94c87c7f46161fd5e8c971d6a1d76fe1b3bbb542b0068 753 feedingit_0.1.0-1.dsc
+ 61f1d4bf4d4d7edae888950b0751ef445d821a197ecd840dcfb0dc41c283ae04 181251 feedingit_0.1.0.orig.tar.gz
+ d80c8161bdb483c6f1fc46c3ac71193ea7e2e48e1092c4aa881b79bbe4dfab7f 894 feedingit_0.1.0-1.debian.tar.gz
+ 48a5aa4b0d6a473e95ee5b9883663d5bbdc12e9d5e9674f3a9c53616f37e0483 171984 feedingit_0.1.0-1_all.deb
 Files: 
- 8fccb57ce60335a7c8a8a85eb4f4ecb6 753 user/development optional feedingit_0.1.0-1.dsc
- a87f884427e09496169d8d45661888e6 181121 user/development optional feedingit_0.1.0.orig.tar.gz
- b7c8797b89ea548c7d22ac74a9552e5b 892 user/development optional feedingit_0.1.0-1.debian.tar.gz
- f4162b7fec29248b13fc683a1b0c06b0 171812 user/development optional feedingit_0.1.0-1_all.deb
+ 945d1cd97ae48de826c457833d70f683 753 user/development optional feedingit_0.1.0-1.dsc
+ 7098b6be36b37ed6dccedf8c3d9f4d20 181251 user/development optional feedingit_0.1.0.orig.tar.gz
+ 512ffad31ae7b46bc81030c9146404a5 894 user/development optional feedingit_0.1.0-1.debian.tar.gz
+ 973b2756feb79ef773f1e6355c336733 171984 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 3a40cc4..4229361 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/config.py b/psa_harmattan/feedingit/pysrc/config.py
index 47ceaca..522c181 100644 (file)
--- a/psa_harmattan/feedingit/pysrc/config.py
+++ b/psa_harmattan/feedingit/pysrc/config.py
@@ -280,6 +280,8 @@ class Config():
         self.config["expiry"] = expiry
     def isAutoUpdateEnabled(self):
         return self.config["autoupdate"]
+    def setAutoUpdateEnable(self, value):
+        self.config["autoupdate"] = value
     def getUpdateInterval(self):
         return float(self.config["updateInterval"])
     def getReadFont(self):

diff --git a/psa_harmattan/feedingit/pysrc/feedingit.py b/psa_harmattan/feedingit/pysrc/feedingit.py
index d2060e8..194e1d3 100644 (file)
--- a/psa_harmattan/feedingit/pysrc/feedingit.py
+++ b/psa_harmattan/feedingit/pysrc/feedingit.py
@@ -155,6 +155,8 @@ class Controller(QtCore.QObject):
             return config.getHideReadFeeds()
         elif (setting == "hideReadArticles"):
             return config.getHideReadArticles()
+        elif (setting == "autoupdate"):
+            return config.isAutoUpdateEnabled()
         else:
             return 'True'
         
@@ -168,6 +170,8 @@ class Controller(QtCore.QObject):
             config.setHideReadFeeds(value)
         elif (setting == "hideReadArticles"):
             config.setHideReadArticles(value)
+        elif (setting == "autoupdate"):
+            config.setAutoUpdateEnabled(value)
         config.saveConfig()
 
 def main():

diff --git a/psa_harmattan/feedingit/qml/AutomaticUpdate.qml b/psa_harmattan/feedingit/qml/AutomaticUpdate.qml
index 1e29655..a4c2b32 100644 (file)
--- a/psa_harmattan/feedingit/qml/AutomaticUpdate.qml
+++ b/psa_harmattan/feedingit/qml/AutomaticUpdate.qml
@@ -3,12 +3,9 @@ import QtMobility.systeminfo 1.2
 
 AlignedTimer {
     id: heartbeat
-    maximumInterval: 15
-    minimumInterval: 5
+    maximumInterval: 28800
+    minimumInterval: 21600
     onTimeout: {
-        var timestamp = Qt.formatDateTime(new Date(), "hh:mm:ss") + qsTr(" - heartbeat!")
-        console.log(timestamp)
-        prevLabel.text = lastLabel.text
-        lastLabel.text = timestamp
+        controller.updateAll()
     }
 }

diff --git a/psa_harmattan/feedingit/qml/Settings.qml b/psa_harmattan/feedingit/qml/Settings.qml
index 19fde9a..adc56af 100644 (file)
--- a/psa_harmattan/feedingit/qml/Settings.qml
+++ b/psa_harmattan/feedingit/qml/Settings.qml
@@ -11,7 +11,12 @@ Item {
     property bool hideReadFeeds: controller.getBooleanSetting("hideReadFeeds")
     property bool hideReadArticles: controller.getBooleanSetting("hideReadArticles")
 
+    property bool autoUpdateEnabled: controller.getBooleanSetting("autoupdate")
+
     Component.onCompleted: {
         theme.inverted = controller.getBooleanSetting("theme")
+        if (autoUpdateEnabled) {
+            autoUpdate.start()
+        }
     }
 }

diff --git a/psa_harmattan/feedingit/qml/SettingsPage.qml b/psa_harmattan/feedingit/qml/SettingsPage.qml
index 1cc1954..4a85b72 100644 (file)
--- a/psa_harmattan/feedingit/qml/SettingsPage.qml
+++ b/psa_harmattan/feedingit/qml/SettingsPage.qml
@@ -47,6 +47,16 @@ Page {
                 controller.setBooleanSetting("imageCache", checked)
             }
         }
+
+        SwitchSetting {
+            text: qsTr("Auto-update every 6 hours (requires application running)")
+            checked: controller.getBooleanSetting("autoupdate")
+
+            onSwitched: {
+                controller.setBooleanSetting("autoupdate", checked)
+                settings.autoUpdateEnabled = checked
+            }
+        }
     }
 
 }

diff --git a/psa_harmattan/feedingit/qml/SwitchSetting.qml b/psa_harmattan/feedingit/qml/SwitchSetting.qml
index 960be8e..c1c353c 100644 (file)
--- a/psa_harmattan/feedingit/qml/SwitchSetting.qml
+++ b/psa_harmattan/feedingit/qml/SwitchSetting.qml
@@ -12,6 +12,7 @@ Row {
         color: settings.mainTextColour;
         font.pointSize: settings.mainTextSize
         width: parent.width - themeSwitch.width
+        wrapMode: Text.WordWrap;
     }
 
     Switch {

diff --git a/psa_harmattan/feedingit/qml/main.qml b/psa_harmattan/feedingit/qml/main.qml
index 973bbdb..866b44e 100644 (file)
--- a/psa_harmattan/feedingit/qml/main.qml
+++ b/psa_harmattan/feedingit/qml/main.qml
@@ -313,4 +313,19 @@ PageStackWindow {
 
         //text: "This is an info banner with no icon"
     }
+
+    AutomaticUpdate {
+        id: autoUpdate
+
+        Connections {
+            target: settings
+            onAutoUpdateEnabledChanged: {
+                if (!settings.autoUpdateEnabled) {
+                    stop();
+                } else {
+                    start();
+                }
+            }
+        }
+    }
 }