From: Yves Marcoz Date: Wed, 23 Nov 2011 06:22:54 +0000 (-0800) Subject: psa: fixed configdir value X-Git-Url: http://vcs.maemo.org/git/?a=commitdiff_plain;h=31600f9948716e7833d92c4f4abadf6bdc9e1b01;hp=302b36573fa0f84c2af0461e6c93abefa0b63d4e;p=feedingit psa: fixed configdir value --- diff --git a/psa_harmattan/feedingit/build-deb.log b/psa_harmattan/feedingit/build-deb.log index a006f70..c342093 100644 --- a/psa_harmattan/feedingit/build-deb.log +++ b/psa_harmattan/feedingit/build-deb.log @@ -80,7 +80,6 @@ copying qml/Settings.qml -> /scratchbox/users/ymarcoz/home/ymarcoz/workspace/fee 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 copying qml/feedSearch.js -> /scratchbox/users/ymarcoz/home/ymarcoz/workspace/feedingit/psa_harmattan/feedingit/deb_dist/feedingit-0.1.0/debian/feedingit/usr/share/feedingit/qml creating /scratchbox/users/ymarcoz/home/ymarcoz/workspace/feedingit/psa_harmattan/feedingit/deb_dist/feedingit-0.1.0/debian/feedingit/usr/share/feedingit/qml/common copying qml/common/AddCat.qml -> /scratchbox/users/ymarcoz/home/ymarcoz/workspace/feedingit/psa_harmattan/feedingit/deb_dist/feedingit-0.1.0/debian/feedingit/usr/share/feedingit/qml/common 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 8975983..3de8cca 100644 --- 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 Mon, 21 Nov 2011 22:03:04 -0800 + -- Yves Tue, 22 Nov 2011 22:22:26 -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 7f47154..31c8c9a 100644 --- 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 -Installed-Size: 800 +Installed-Size: 792 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 6dcf021..890272f 100644 --- 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 -eeb9ee3e9b4e40ee2319014d2099737e usr/share/doc/feedingit/changelog.Debian.gz +301a8b27cfd7e30ebab34a41261bbff9 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 -68a56a1175b749024474aa1df2ebf650 usr/share/feedingit/config.py +f35343aa0ea95526b6af4ed8193526c2 usr/share/feedingit/config.py b4b00de5dccaf56d81a9dab1eeac63e1 usr/share/feedingit/debugging.py fae02e730b76761d43a626fe19828d5e usr/share/feedingit/download.py -cc95b9d73b6905e9aa9f16c62bbb60c6 usr/share/feedingit/feedingit.py +2d66e6a5954a47fc2124878c31b199c4 usr/share/feedingit/feedingit.py afa4f462892136f59beaf96b6bf1cf96 usr/share/feedingit/feedparser.py c1a0c0a9ccefd64d1e27bddb817c72a3 usr/share/feedingit/httpprogresshandler.py f1e9ba0f44786f513659a7fa3111fc8a usr/share/feedingit/jobmanager.py @@ -19,14 +19,14 @@ 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 +77bf6a1d2d0f265ee16c492886f96ede 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 bec5fe4599a3ad5799ed96d7ed81fb5f usr/share/feedingit/qml/MainPage.qml -54e67ad61b7d3cdf39fa532caaa73ed8 usr/share/feedingit/qml/Settings.qml -e38d52fab962c2b3afb6d7e17a1f525a usr/share/feedingit/qml/SettingsPage.qml -1ea79be910afd546622a21125d7828ff usr/share/feedingit/qml/SwitchSetting.qml +9b6a3459afcc30b21a641ef0c24deb5c usr/share/feedingit/qml/Settings.qml +c60a530cf5c92c8c08e0a073444172e1 usr/share/feedingit/qml/SettingsPage.qml +8c3766da8556e32346f50795e7421a8e usr/share/feedingit/qml/SwitchSetting.qml aa3fc0a4edbd17d93a9dc5c39c433c3d usr/share/feedingit/qml/TestWebview.qml 508fde19c7bb7bc4892bd6642fbcb7d3 usr/share/feedingit/qml/TextInputClear.qml cef5ae4af926a759f4a233336c00f017 usr/share/feedingit/qml/common/AddCat.qml @@ -61,8 +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 -0674931363ea0b608d98ddec8df1cb22 usr/share/feedingit/qml/main.qml -40606cd0365957b1607a2bf2cf3bc030 usr/share/feedingit/qml/storage.js +2fbe22ed5a06214de3998bbb6f46b30b 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 3aedd7a..9fd6269 100644 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/config.py b/psa_harmattan/feedingit/deb_dist/feedingit-0.1.0/debian/feedingit/usr/share/feedingit/config.py index 47ceaca..3d37d37 100644 --- a/psa_harmattan/feedingit/deb_dist/feedingit-0.1.0/debian/feedingit/usr/share/feedingit/config.py +++ b/psa_harmattan/feedingit/deb_dist/feedingit-0.1.0/debian/feedingit/usr/share/feedingit/config.py @@ -280,6 +280,8 @@ class Config(): self.config["expiry"] = expiry def isAutoUpdateEnabled(self): return self.config["autoupdate"] + def setAutoUpdateEnabled(self, value): + self.config["autoupdate"] = value def getUpdateInterval(self): return float(self.config["updateInterval"]) def getReadFont(self): 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 d2060e8..9755a3d 100644 --- 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 @@ -8,13 +8,15 @@ import os from os import mkdir, remove, stat, environ from os.path import isfile, isdir, exists import codecs -from gconf import client_get_default +import dbus +# import python dbus GLib mainloop support +import dbus.mainloop.glib # Comment the line below if you don't want to use OpenGL for QML rendering or if it is not supported from PySide import QtOpenGL, QtCore from rss_sqlite import Listing -CONFIGDIR = environ.get("HOME", "/home/user") + "/.feedingit" +CONFIGDIR = environ.get("HOME", "/home/user") + "/.feedingit/" #CONFIGDIR = "/home/user/.feedingit" import logging @@ -32,6 +34,18 @@ class Controller(QtCore.QObject): QtCore.QObject.__init__(self) from XmlHandler import XmlHandler self._handler = XmlHandler(listing) + + def update_progress(self, percent_complete, + completed, in_progress, queued, + bytes_downloaded, bytes_updated, bytes_per_second, + feed_updated): + pass + + def update_started(self): + root.updateStarted() + + def update_finished(self): + root.updateFinished() @QtCore.Slot(str,str, result=str) def getArticle(self, key, article): @@ -155,6 +169,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 +184,8 @@ class Controller(QtCore.QObject): config.setHideReadFeeds(value) elif (setting == "hideReadArticles"): config.setHideReadArticles(value) + elif (setting == "autoupdate"): + config.setAutoUpdateEnabled(value) config.saveConfig() def main(): @@ -198,6 +216,25 @@ def main(): controller = Controller(listing) + # listen on dbus for download update progress + dbus.mainloop.glib.DBusGMainLoop(set_as_default=True) + bus = dbus.SessionBus() +# bus.add_signal_receiver(handler_function=self.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.update_started, +# bus_name=None, +# signal_name='UpdateStarted', +# dbus_interface='org.marcoz.feedingit', +# path='/org/marcoz/feedingit/update') +# bus.add_signal_receiver(handler_function=controller.update_finished, +# bus_name=None, +# signal_name='UpdateFinished', +# dbus_interface='org.marcoz.feedingit', +# path='/org/marcoz/feedingit/update') + global root rc = view.rootContext() 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 da92539..0ade188 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 @@ -18,6 +18,14 @@ PageStackWindow { window.addFileSignal(fullname,filename) } + function updateStarted() { + banner.show(qsTr("Update Started")) + } + + function updateFinished() { + banner.show(qsTr("Updated Completed")) + } + onLongPressFeed: { unsubscribeFeedMenu.key = key unsubscribeFeedMenu.open() @@ -314,5 +322,20 @@ PageStackWindow { //text: "This is an info banner with no icon" } - AutomaticUpdate {} + Item { + AutomaticUpdate { + id: autoUpdate + } + + Connections { + target: settings + onAutoUpdateEnabledChanged: { + if (!settings.autoUpdateEnabled) { + autoUpdate.stop(); + } else { + autoUpdate.start(); + } + } + } + } } 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 984662c..c263b26 100755 --- 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 22:03:04 -0800 +# Tue, 22 Nov 2011 22:22:26 -0800 %: dh $@ --with python2 --buildsystem=python_distutils diff --git a/psa_harmattan/feedingit/deb_dist/feedingit-0.1.0/pysrc/config.py b/psa_harmattan/feedingit/deb_dist/feedingit-0.1.0/pysrc/config.py index 47ceaca..3d37d37 100644 --- a/psa_harmattan/feedingit/deb_dist/feedingit-0.1.0/pysrc/config.py +++ b/psa_harmattan/feedingit/deb_dist/feedingit-0.1.0/pysrc/config.py @@ -280,6 +280,8 @@ class Config(): self.config["expiry"] = expiry def isAutoUpdateEnabled(self): return self.config["autoupdate"] + def setAutoUpdateEnabled(self, value): + self.config["autoupdate"] = value def getUpdateInterval(self): return float(self.config["updateInterval"]) def getReadFont(self): 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 d2060e8..9755a3d 100644 --- 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 @@ -8,13 +8,15 @@ import os from os import mkdir, remove, stat, environ from os.path import isfile, isdir, exists import codecs -from gconf import client_get_default +import dbus +# import python dbus GLib mainloop support +import dbus.mainloop.glib # Comment the line below if you don't want to use OpenGL for QML rendering or if it is not supported from PySide import QtOpenGL, QtCore from rss_sqlite import Listing -CONFIGDIR = environ.get("HOME", "/home/user") + "/.feedingit" +CONFIGDIR = environ.get("HOME", "/home/user") + "/.feedingit/" #CONFIGDIR = "/home/user/.feedingit" import logging @@ -32,6 +34,18 @@ class Controller(QtCore.QObject): QtCore.QObject.__init__(self) from XmlHandler import XmlHandler self._handler = XmlHandler(listing) + + def update_progress(self, percent_complete, + completed, in_progress, queued, + bytes_downloaded, bytes_updated, bytes_per_second, + feed_updated): + pass + + def update_started(self): + root.updateStarted() + + def update_finished(self): + root.updateFinished() @QtCore.Slot(str,str, result=str) def getArticle(self, key, article): @@ -155,6 +169,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 +184,8 @@ class Controller(QtCore.QObject): config.setHideReadFeeds(value) elif (setting == "hideReadArticles"): config.setHideReadArticles(value) + elif (setting == "autoupdate"): + config.setAutoUpdateEnabled(value) config.saveConfig() def main(): @@ -198,6 +216,25 @@ def main(): controller = Controller(listing) + # listen on dbus for download update progress + dbus.mainloop.glib.DBusGMainLoop(set_as_default=True) + bus = dbus.SessionBus() +# bus.add_signal_receiver(handler_function=self.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.update_started, +# bus_name=None, +# signal_name='UpdateStarted', +# dbus_interface='org.marcoz.feedingit', +# path='/org/marcoz/feedingit/update') +# bus.add_signal_receiver(handler_function=controller.update_finished, +# bus_name=None, +# signal_name='UpdateFinished', +# dbus_interface='org.marcoz.feedingit', +# path='/org/marcoz/feedingit/update') + global root rc = view.rootContext() 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 da92539..0ade188 100644 --- 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 @@ -18,6 +18,14 @@ PageStackWindow { window.addFileSignal(fullname,filename) } + function updateStarted() { + banner.show(qsTr("Update Started")) + } + + function updateFinished() { + banner.show(qsTr("Updated Completed")) + } + onLongPressFeed: { unsubscribeFeedMenu.key = key unsubscribeFeedMenu.open() @@ -314,5 +322,20 @@ PageStackWindow { //text: "This is an info banner with no icon" } - AutomaticUpdate {} + Item { + AutomaticUpdate { + id: autoUpdate + } + + Connections { + target: settings + onAutoUpdateEnabledChanged: { + if (!settings.autoUpdateEnabled) { + autoUpdate.stop(); + } else { + autoUpdate.start(); + } + } + } + } } 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 ef72c73..7d03c7b 100644 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 5004864..91e403f 100644 --- 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 Standards-Version: 3.9.1 Build-Depends: python-all (>= 2.6.6-3), debhelper (>= 7.4.3) Checksums-Sha1: - 502dff966800b86ec3a2018662a74c7fff13433b 181251 feedingit_0.1.0.orig.tar.gz - bc89359677a4a3dc1ec6c05889b51a4c5c98bc24 894 feedingit_0.1.0-1.debian.tar.gz + e5f65ada2e86e277a6bcaa2b20ea777ba6f4b737 180581 feedingit_0.1.0.orig.tar.gz + 7b771ace5d2d2e3490781f7ac62e3987341d342b 891 feedingit_0.1.0-1.debian.tar.gz Checksums-Sha256: - 61f1d4bf4d4d7edae888950b0751ef445d821a197ecd840dcfb0dc41c283ae04 181251 feedingit_0.1.0.orig.tar.gz - d80c8161bdb483c6f1fc46c3ac71193ea7e2e48e1092c4aa881b79bbe4dfab7f 894 feedingit_0.1.0-1.debian.tar.gz + 0afcdeeab2d42793ec4a00f713c306013713a8774f357af641e6439d14102b9c 180581 feedingit_0.1.0.orig.tar.gz + 0cacff3585e8b42417c2511d2320f4e805c64a05ecb91c792156b04f3e30071a 891 feedingit_0.1.0-1.debian.tar.gz Files: - 7098b6be36b37ed6dccedf8c3d9f4d20 181251 feedingit_0.1.0.orig.tar.gz - 512ffad31ae7b46bc81030c9146404a5 894 feedingit_0.1.0-1.debian.tar.gz + 98f4e91b86fd3a072c36164a110f26a3 180581 feedingit_0.1.0.orig.tar.gz + f5d22be10077603c0e69040ae344e0a5 891 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 97b2e05..e37bc5d 100644 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 b1a5e69..76b6d14 100644 --- 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 22:03:04 -0800 +Date: Tue, 22 Nov 2011 22:22:26 -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: - 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 + 8978b9c334d9b03ce85da487c732570f6bc8e606 753 feedingit_0.1.0-1.dsc + e5f65ada2e86e277a6bcaa2b20ea777ba6f4b737 180581 feedingit_0.1.0.orig.tar.gz + 7b771ace5d2d2e3490781f7ac62e3987341d342b 891 feedingit_0.1.0-1.debian.tar.gz + 9ec99592e16ba5cb4457641ea127e99c406ac525 170420 feedingit_0.1.0-1_all.deb Checksums-Sha256: - 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 + 379e5f42f84d8527581c0dee7e90246c61cf9f37bd2c180fc8e525016218032f 753 feedingit_0.1.0-1.dsc + 0afcdeeab2d42793ec4a00f713c306013713a8774f357af641e6439d14102b9c 180581 feedingit_0.1.0.orig.tar.gz + 0cacff3585e8b42417c2511d2320f4e805c64a05ecb91c792156b04f3e30071a 891 feedingit_0.1.0-1.debian.tar.gz + 123701ee75b629780017100590c77669c85ca9ebf03645b1ccea6364bdacb70f 170420 feedingit_0.1.0-1_all.deb Files: - 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 + 096e3f8e5374b7970439c6b2c8faad5d 753 user/development optional feedingit_0.1.0-1.dsc + 98f4e91b86fd3a072c36164a110f26a3 180581 user/development optional feedingit_0.1.0.orig.tar.gz + f5d22be10077603c0e69040ae344e0a5 891 user/development optional feedingit_0.1.0-1.debian.tar.gz + 0f976c22ff42daa15771094a276ff675 170420 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 4229361..1ce91c5 100644 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 522c181..3d37d37 100644 --- a/psa_harmattan/feedingit/pysrc/config.py +++ b/psa_harmattan/feedingit/pysrc/config.py @@ -280,7 +280,7 @@ class Config(): self.config["expiry"] = expiry def isAutoUpdateEnabled(self): return self.config["autoupdate"] - def setAutoUpdateEnable(self, value): + def setAutoUpdateEnabled(self, value): self.config["autoupdate"] = value def getUpdateInterval(self): return float(self.config["updateInterval"]) diff --git a/psa_harmattan/feedingit/pysrc/feedingit.py b/psa_harmattan/feedingit/pysrc/feedingit.py index 194e1d3..9755a3d 100644 --- a/psa_harmattan/feedingit/pysrc/feedingit.py +++ b/psa_harmattan/feedingit/pysrc/feedingit.py @@ -8,13 +8,15 @@ import os from os import mkdir, remove, stat, environ from os.path import isfile, isdir, exists import codecs -from gconf import client_get_default +import dbus +# import python dbus GLib mainloop support +import dbus.mainloop.glib # Comment the line below if you don't want to use OpenGL for QML rendering or if it is not supported from PySide import QtOpenGL, QtCore from rss_sqlite import Listing -CONFIGDIR = environ.get("HOME", "/home/user") + "/.feedingit" +CONFIGDIR = environ.get("HOME", "/home/user") + "/.feedingit/" #CONFIGDIR = "/home/user/.feedingit" import logging @@ -32,6 +34,18 @@ class Controller(QtCore.QObject): QtCore.QObject.__init__(self) from XmlHandler import XmlHandler self._handler = XmlHandler(listing) + + def update_progress(self, percent_complete, + completed, in_progress, queued, + bytes_downloaded, bytes_updated, bytes_per_second, + feed_updated): + pass + + def update_started(self): + root.updateStarted() + + def update_finished(self): + root.updateFinished() @QtCore.Slot(str,str, result=str) def getArticle(self, key, article): @@ -202,6 +216,25 @@ def main(): controller = Controller(listing) + # listen on dbus for download update progress + dbus.mainloop.glib.DBusGMainLoop(set_as_default=True) + bus = dbus.SessionBus() +# bus.add_signal_receiver(handler_function=self.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.update_started, +# bus_name=None, +# signal_name='UpdateStarted', +# dbus_interface='org.marcoz.feedingit', +# path='/org/marcoz/feedingit/update') +# bus.add_signal_receiver(handler_function=controller.update_finished, +# bus_name=None, +# signal_name='UpdateFinished', +# dbus_interface='org.marcoz.feedingit', +# path='/org/marcoz/feedingit/update') + global root rc = view.rootContext() diff --git a/psa_harmattan/feedingit/qml/main.qml b/psa_harmattan/feedingit/qml/main.qml index 866b44e..0ade188 100644 --- a/psa_harmattan/feedingit/qml/main.qml +++ b/psa_harmattan/feedingit/qml/main.qml @@ -18,6 +18,14 @@ PageStackWindow { window.addFileSignal(fullname,filename) } + function updateStarted() { + banner.show(qsTr("Update Started")) + } + + function updateFinished() { + banner.show(qsTr("Updated Completed")) + } + onLongPressFeed: { unsubscribeFeedMenu.key = key unsubscribeFeedMenu.open() @@ -314,16 +322,18 @@ PageStackWindow { //text: "This is an info banner with no icon" } - AutomaticUpdate { - id: autoUpdate + Item { + AutomaticUpdate { + id: autoUpdate + } Connections { target: settings onAutoUpdateEnabledChanged: { if (!settings.autoUpdateEnabled) { - stop(); + autoUpdate.stop(); } else { - start(); + autoUpdate.start(); } } }