Qml support for harmattan version improved
authorYves Marcoz <yves@marcoz.org>
Wed, 26 Oct 2011 05:37:37 +0000 (22:37 -0700)
committerYves Marcoz <yves@marcoz.org>
Wed, 26 Oct 2011 05:37:37 +0000 (22:37 -0700)
32 files changed:
psa_harmattan/feedingit/build-deb.log
psa_harmattan/feedingit/deb_dist/feedingit-0.1.0/debian/changelog
psa_harmattan/feedingit/deb_dist/feedingit-0.1.0/debian/feedingit/DEBIAN/md5sums
psa_harmattan/feedingit/deb_dist/feedingit-0.1.0/debian/feedingit/usr/share/doc/feedingit/changelog.Debian.gz
psa_harmattan/feedingit/deb_dist/feedingit-0.1.0/debian/feedingit/usr/share/feedingit/feedingit.py
psa_harmattan/feedingit/deb_dist/feedingit-0.1.0/debian/feedingit/usr/share/feedingit/qml/ArticleViewer.qml
psa_harmattan/feedingit/deb_dist/feedingit-0.1.0/debian/feedingit/usr/share/feedingit/qml/Categories.qml
psa_harmattan/feedingit/deb_dist/feedingit-0.1.0/debian/feedingit/usr/share/feedingit/qml/Feeds.qml
psa_harmattan/feedingit/deb_dist/feedingit-0.1.0/debian/feedingit/usr/share/feedingit/qml/main.qml
psa_harmattan/feedingit/deb_dist/feedingit-0.1.0/debian/feedingit/usr/share/feedingit/rss_sqlite.py
psa_harmattan/feedingit/deb_dist/feedingit-0.1.0/debian/feedingit/usr/share/feedingit/wc.py
psa_harmattan/feedingit/deb_dist/feedingit-0.1.0/debian/rules
psa_harmattan/feedingit/deb_dist/feedingit-0.1.0/deploy.sh [deleted file]
psa_harmattan/feedingit/deb_dist/feedingit-0.1.0/feedingit.base64
psa_harmattan/feedingit/deb_dist/feedingit-0.1.0/pysrc/feedingit.py
psa_harmattan/feedingit/deb_dist/feedingit-0.1.0/pysrc/rss_sqlite.py
psa_harmattan/feedingit/deb_dist/feedingit-0.1.0/pysrc/wc.py
psa_harmattan/feedingit/deb_dist/feedingit-0.1.0/qml/ArticleViewer.qml
psa_harmattan/feedingit/deb_dist/feedingit-0.1.0/qml/Categories.qml
psa_harmattan/feedingit/deb_dist/feedingit-0.1.0/qml/Feeds.qml
psa_harmattan/feedingit/deb_dist/feedingit-0.1.0/qml/main.qml
psa_harmattan/feedingit/deb_dist/feedingit_0.1.0-1.debian.tar.gz
psa_harmattan/feedingit/deb_dist/feedingit_0.1.0-1.dsc
psa_harmattan/feedingit/deb_dist/feedingit_0.1.0-1_all.deb
psa_harmattan/feedingit/deb_dist/feedingit_0.1.0-1_i386.changes
psa_harmattan/feedingit/deb_dist/feedingit_0.1.0.orig.tar.gz
psa_harmattan/feedingit/feedingit.base64
psa_harmattan/feedingit/pysrc/feedingit.py
psa_harmattan/feedingit/qml/ArticleViewer.qml
psa_harmattan/feedingit/qml/Categories.qml
psa_harmattan/feedingit/qml/Feeds.qml
psa_harmattan/feedingit/qml/main.qml

index 939f92b..e8b3652 100644 (file)
@@ -50,86 +50,86 @@ running install
 running build
 running build_scripts
 running install_scripts
-creating /scratchbox/users/ymarcoz/home/ymarcoz/workspace/feedingit-pyside/psa/feedingit/deb_dist/feedingit-0.1.0/debian/feedingit/usr
-creating /scratchbox/users/ymarcoz/home/ymarcoz/workspace/feedingit-pyside/psa/feedingit/deb_dist/feedingit-0.1.0/debian/feedingit/usr/bin
-copying build/scripts-2.6/feedingit -> /scratchbox/users/ymarcoz/home/ymarcoz/workspace/feedingit-pyside/psa/feedingit/deb_dist/feedingit-0.1.0/debian/feedingit/usr/bin
-changing mode of /scratchbox/users/ymarcoz/home/ymarcoz/workspace/feedingit-pyside/psa/feedingit/deb_dist/feedingit-0.1.0/debian/feedingit/usr/bin/feedingit to 755
+creating /scratchbox/users/ymarcoz/home/ymarcoz/workspace/feedingit/psa_harmattan/feedingit/deb_dist/feedingit-0.1.0/debian/feedingit/usr
+creating /scratchbox/users/ymarcoz/home/ymarcoz/workspace/feedingit/psa_harmattan/feedingit/deb_dist/feedingit-0.1.0/debian/feedingit/usr/bin
+copying build/scripts-2.6/feedingit -> /scratchbox/users/ymarcoz/home/ymarcoz/workspace/feedingit/psa_harmattan/feedingit/deb_dist/feedingit-0.1.0/debian/feedingit/usr/bin
+changing mode of /scratchbox/users/ymarcoz/home/ymarcoz/workspace/feedingit/psa_harmattan/feedingit/deb_dist/feedingit-0.1.0/debian/feedingit/usr/bin/feedingit to 755
 running install_data
-creating /scratchbox/users/ymarcoz/home/ymarcoz/workspace/feedingit-pyside/psa/feedingit/deb_dist/feedingit-0.1.0/debian/feedingit/usr/share
-creating /scratchbox/users/ymarcoz/home/ymarcoz/workspace/feedingit-pyside/psa/feedingit/deb_dist/feedingit-0.1.0/debian/feedingit/usr/share/applications
-copying feedingit.desktop -> /scratchbox/users/ymarcoz/home/ymarcoz/workspace/feedingit-pyside/psa/feedingit/deb_dist/feedingit-0.1.0/debian/feedingit/usr/share/applications
-creating /scratchbox/users/ymarcoz/home/ymarcoz/workspace/feedingit-pyside/psa/feedingit/deb_dist/feedingit-0.1.0/debian/feedingit/usr/share/icons
-creating /scratchbox/users/ymarcoz/home/ymarcoz/workspace/feedingit-pyside/psa/feedingit/deb_dist/feedingit-0.1.0/debian/feedingit/usr/share/icons/hicolor
-creating /scratchbox/users/ymarcoz/home/ymarcoz/workspace/feedingit-pyside/psa/feedingit/deb_dist/feedingit-0.1.0/debian/feedingit/usr/share/icons/hicolor/64x64
-creating /scratchbox/users/ymarcoz/home/ymarcoz/workspace/feedingit-pyside/psa/feedingit/deb_dist/feedingit-0.1.0/debian/feedingit/usr/share/icons/hicolor/64x64/apps
-copying feedingit.png -> /scratchbox/users/ymarcoz/home/ymarcoz/workspace/feedingit-pyside/psa/feedingit/deb_dist/feedingit-0.1.0/debian/feedingit/usr/share/icons/hicolor/64x64/apps
-creating /scratchbox/users/ymarcoz/home/ymarcoz/workspace/feedingit-pyside/psa/feedingit/deb_dist/feedingit-0.1.0/debian/feedingit/usr/share/feedingit
-creating /scratchbox/users/ymarcoz/home/ymarcoz/workspace/feedingit-pyside/psa/feedingit/deb_dist/feedingit-0.1.0/debian/feedingit/usr/share/feedingit/qml
-copying qml/Feeds.qml -> /scratchbox/users/ymarcoz/home/ymarcoz/workspace/feedingit-pyside/psa/feedingit/deb_dist/feedingit-0.1.0/debian/feedingit/usr/share/feedingit/qml
-copying qml/Articles.qml -> /scratchbox/users/ymarcoz/home/ymarcoz/workspace/feedingit-pyside/psa/feedingit/deb_dist/feedingit-0.1.0/debian/feedingit/usr/share/feedingit/qml
-copying qml/TestWebview.qml -> /scratchbox/users/ymarcoz/home/ymarcoz/workspace/feedingit-pyside/psa/feedingit/deb_dist/feedingit-0.1.0/debian/feedingit/usr/share/feedingit/qml
-copying qml/FeedingIt.qml -> /scratchbox/users/ymarcoz/home/ymarcoz/workspace/feedingit-pyside/psa/feedingit/deb_dist/feedingit-0.1.0/debian/feedingit/usr/share/feedingit/qml
-copying qml/Categories.qml -> /scratchbox/users/ymarcoz/home/ymarcoz/workspace/feedingit-pyside/psa/feedingit/deb_dist/feedingit-0.1.0/debian/feedingit/usr/share/feedingit/qml
-copying qml/ArticleViewer.qml -> /scratchbox/users/ymarcoz/home/ymarcoz/workspace/feedingit-pyside/psa/feedingit/deb_dist/feedingit-0.1.0/debian/feedingit/usr/share/feedingit/qml
-copying qml/MainPage.qml -> /scratchbox/users/ymarcoz/home/ymarcoz/workspace/feedingit-pyside/psa/feedingit/deb_dist/feedingit-0.1.0/debian/feedingit/usr/share/feedingit/qml
-copying qml/main.qml -> /scratchbox/users/ymarcoz/home/ymarcoz/workspace/feedingit-pyside/psa/feedingit/deb_dist/feedingit-0.1.0/debian/feedingit/usr/share/feedingit/qml
-copying qml/ArticleDisplay.qml -> /scratchbox/users/ymarcoz/home/ymarcoz/workspace/feedingit-pyside/psa/feedingit/deb_dist/feedingit-0.1.0/debian/feedingit/usr/share/feedingit/qml
-creating /scratchbox/users/ymarcoz/home/ymarcoz/workspace/feedingit-pyside/psa/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-pyside/psa/feedingit/deb_dist/feedingit-0.1.0/debian/feedingit/usr/share/feedingit/qml/common
-copying qml/common/ConfirmationMessage.qml -> /scratchbox/users/ymarcoz/home/ymarcoz/workspace/feedingit-pyside/psa/feedingit/deb_dist/feedingit-0.1.0/debian/feedingit/usr/share/feedingit/qml/common
-copying qml/common/Switch.qml -> /scratchbox/users/ymarcoz/home/ymarcoz/workspace/feedingit-pyside/psa/feedingit/deb_dist/feedingit-0.1.0/debian/feedingit/usr/share/feedingit/qml/common
-copying qml/common/Button.qml -> /scratchbox/users/ymarcoz/home/ymarcoz/workspace/feedingit-pyside/psa/feedingit/deb_dist/feedingit-0.1.0/debian/feedingit/usr/share/feedingit/qml/common
-copying qml/common/Menu.qml -> /scratchbox/users/ymarcoz/home/ymarcoz/workspace/feedingit-pyside/psa/feedingit/deb_dist/feedingit-0.1.0/debian/feedingit/usr/share/feedingit/qml/common
-copying qml/common/ManageSubs.qml -> /scratchbox/users/ymarcoz/home/ymarcoz/workspace/feedingit-pyside/psa/feedingit/deb_dist/feedingit-0.1.0/debian/feedingit/usr/share/feedingit/qml/common
-copying qml/common/LineInput.qml -> /scratchbox/users/ymarcoz/home/ymarcoz/workspace/feedingit-pyside/psa/feedingit/deb_dist/feedingit-0.1.0/debian/feedingit/usr/share/feedingit/qml/common
-copying qml/common/ToolBar.qml -> /scratchbox/users/ymarcoz/home/ymarcoz/workspace/feedingit-pyside/psa/feedingit/deb_dist/feedingit-0.1.0/debian/feedingit/usr/share/feedingit/qml/common
-copying qml/common/AddFeed.qml -> /scratchbox/users/ymarcoz/home/ymarcoz/workspace/feedingit-pyside/psa/feedingit/deb_dist/feedingit-0.1.0/debian/feedingit/usr/share/feedingit/qml/common
-copying qml/common/Slider.qml -> /scratchbox/users/ymarcoz/home/ymarcoz/workspace/feedingit-pyside/psa/feedingit/deb_dist/feedingit-0.1.0/debian/feedingit/usr/share/feedingit/qml/common
-creating /scratchbox/users/ymarcoz/home/ymarcoz/workspace/feedingit-pyside/psa/feedingit/deb_dist/feedingit-0.1.0/debian/feedingit/usr/share/feedingit/qml/common/images
-copying qml/common/images/AppletCloseButton.png -> /scratchbox/users/ymarcoz/home/ymarcoz/workspace/feedingit-pyside/psa/feedingit/deb_dist/feedingit-0.1.0/debian/feedingit/usr/share/feedingit/qml/common/images
-copying qml/common/images/toolbutton.sci -> /scratchbox/users/ymarcoz/home/ymarcoz/workspace/feedingit-pyside/psa/feedingit/deb_dist/feedingit-0.1.0/debian/feedingit/usr/share/feedingit/qml/common/images
-copying qml/common/images/delete.png -> /scratchbox/users/ymarcoz/home/ymarcoz/workspace/feedingit-pyside/psa/feedingit/deb_dist/feedingit-0.1.0/debian/feedingit/usr/share/feedingit/qml/common/images
-copying qml/common/images/loading2.png -> /scratchbox/users/ymarcoz/home/ymarcoz/workspace/feedingit-pyside/psa/feedingit/deb_dist/feedingit-0.1.0/debian/feedingit/usr/share/feedingit/qml/common/images
-copying qml/common/images/wmBackIcon.png -> /scratchbox/users/ymarcoz/home/ymarcoz/workspace/feedingit-pyside/psa/feedingit/deb_dist/feedingit-0.1.0/debian/feedingit/usr/share/feedingit/qml/common/images
-copying qml/common/images/toolbutton.png -> /scratchbox/users/ymarcoz/home/ymarcoz/workspace/feedingit-pyside/psa/feedingit/deb_dist/feedingit-0.1.0/debian/feedingit/usr/share/feedingit/qml/common/images
-copying qml/common/images/plus.png -> /scratchbox/users/ymarcoz/home/ymarcoz/workspace/feedingit-pyside/psa/feedingit/deb_dist/feedingit-0.1.0/debian/feedingit/usr/share/feedingit/qml/common/images
-copying qml/common/images/loading.png -> /scratchbox/users/ymarcoz/home/ymarcoz/workspace/feedingit-pyside/psa/feedingit/deb_dist/feedingit-0.1.0/debian/feedingit/usr/share/feedingit/qml/common/images
-copying qml/common/images/wmTaskLauncherIcon.png -> /scratchbox/users/ymarcoz/home/ymarcoz/workspace/feedingit-pyside/psa/feedingit/deb_dist/feedingit-0.1.0/debian/feedingit/usr/share/feedingit/qml/common/images
-copying qml/common/images/feedingit.png -> /scratchbox/users/ymarcoz/home/ymarcoz/workspace/feedingit-pyside/psa/feedingit/deb_dist/feedingit-0.1.0/debian/feedingit/usr/share/feedingit/qml/common/images
-copying qml/common/images/checkmark.png -> /scratchbox/users/ymarcoz/home/ymarcoz/workspace/feedingit-pyside/psa/feedingit/deb_dist/feedingit-0.1.0/debian/feedingit/usr/share/feedingit/qml/common/images
-copying qml/common/images/wmCloseIcon.png -> /scratchbox/users/ymarcoz/home/ymarcoz/workspace/feedingit-pyside/psa/feedingit/deb_dist/feedingit-0.1.0/debian/feedingit/usr/share/feedingit/qml/common/images
-copying qml/common/images/lineedit.png -> /scratchbox/users/ymarcoz/home/ymarcoz/workspace/feedingit-pyside/psa/feedingit/deb_dist/feedingit-0.1.0/debian/feedingit/usr/share/feedingit/qml/common/images
-copying qml/common/images/Zoom-In-icon.png -> /scratchbox/users/ymarcoz/home/ymarcoz/workspace/feedingit-pyside/psa/feedingit/deb_dist/feedingit-0.1.0/debian/feedingit/usr/share/feedingit/qml/common/images
-copying qml/common/images/wmEditIcon.png -> /scratchbox/users/ymarcoz/home/ymarcoz/workspace/feedingit-pyside/psa/feedingit/deb_dist/feedingit-0.1.0/debian/feedingit/usr/share/feedingit/qml/common/images
-copying qml/common/images/rotate.png -> /scratchbox/users/ymarcoz/home/ymarcoz/workspace/feedingit-pyside/psa/feedingit/deb_dist/feedingit-0.1.0/debian/feedingit/usr/share/feedingit/qml/common/images
-copying qml/common/images/lineedit.sci -> /scratchbox/users/ymarcoz/home/ymarcoz/workspace/feedingit-pyside/psa/feedingit/deb_dist/feedingit-0.1.0/debian/feedingit/usr/share/feedingit/qml/common/images
-copying qml/common/images/InputMethodShiftButtonNormal.png -> /scratchbox/users/ymarcoz/home/ymarcoz/workspace/feedingit-pyside/psa/feedingit/deb_dist/feedingit-0.1.0/debian/feedingit/usr/share/feedingit/qml/common/images
-creating /scratchbox/users/ymarcoz/home/ymarcoz/workspace/feedingit-pyside/psa/feedingit/deb_dist/feedingit-0.1.0/debian/feedingit/usr/share/feedingit/qml/i18n
-copying qml/i18n/qml_en.ts -> /scratchbox/users/ymarcoz/home/ymarcoz/workspace/feedingit-pyside/psa/feedingit/deb_dist/feedingit-0.1.0/debian/feedingit/usr/share/feedingit/qml/i18n
-copying qml/i18n/FeedingIt.ts -> /scratchbox/users/ymarcoz/home/ymarcoz/workspace/feedingit-pyside/psa/feedingit/deb_dist/feedingit-0.1.0/debian/feedingit/usr/share/feedingit/qml/i18n
-copying qml/i18n/qml_en.qm -> /scratchbox/users/ymarcoz/home/ymarcoz/workspace/feedingit-pyside/psa/feedingit/deb_dist/feedingit-0.1.0/debian/feedingit/usr/share/feedingit/qml/i18n
-creating /scratchbox/users/ymarcoz/home/ymarcoz/workspace/feedingit-pyside/psa/feedingit/deb_dist/feedingit-0.1.0/debian/feedingit/usr/share/dbus-1
-creating /scratchbox/users/ymarcoz/home/ymarcoz/workspace/feedingit-pyside/psa/feedingit/deb_dist/feedingit-0.1.0/debian/feedingit/usr/share/dbus-1/services
-copying feedingit_status.service -> /scratchbox/users/ymarcoz/home/ymarcoz/workspace/feedingit-pyside/psa/feedingit/deb_dist/feedingit-0.1.0/debian/feedingit/usr/share/dbus-1/services
-copying pysrc/config.py -> /scratchbox/users/ymarcoz/home/ymarcoz/workspace/feedingit-pyside/psa/feedingit/deb_dist/feedingit-0.1.0/debian/feedingit/usr/share/feedingit
-copying pysrc/update_feeds.py -> /scratchbox/users/ymarcoz/home/ymarcoz/workspace/feedingit-pyside/psa/feedingit/deb_dist/feedingit-0.1.0/debian/feedingit/usr/share/feedingit
-copying pysrc/jobmanager.py -> /scratchbox/users/ymarcoz/home/ymarcoz/workspace/feedingit-pyside/psa/feedingit/deb_dist/feedingit-0.1.0/debian/feedingit/usr/share/feedingit
-copying pysrc/__init__.py -> /scratchbox/users/ymarcoz/home/ymarcoz/workspace/feedingit-pyside/psa/feedingit/deb_dist/feedingit-0.1.0/debian/feedingit/usr/share/feedingit
-copying pysrc/debugging.py -> /scratchbox/users/ymarcoz/home/ymarcoz/workspace/feedingit-pyside/psa/feedingit/deb_dist/feedingit-0.1.0/debian/feedingit/usr/share/feedingit
-copying pysrc/rss_sqlite.py -> /scratchbox/users/ymarcoz/home/ymarcoz/workspace/feedingit-pyside/psa/feedingit/deb_dist/feedingit-0.1.0/debian/feedingit/usr/share/feedingit
-copying pysrc/wc.py -> /scratchbox/users/ymarcoz/home/ymarcoz/workspace/feedingit-pyside/psa/feedingit/deb_dist/feedingit-0.1.0/debian/feedingit/usr/share/feedingit
-copying pysrc/feedingit.py -> /scratchbox/users/ymarcoz/home/ymarcoz/workspace/feedingit-pyside/psa/feedingit/deb_dist/feedingit-0.1.0/debian/feedingit/usr/share/feedingit
-copying pysrc/feedparser.py -> /scratchbox/users/ymarcoz/home/ymarcoz/workspace/feedingit-pyside/psa/feedingit/deb_dist/feedingit-0.1.0/debian/feedingit/usr/share/feedingit
-copying pysrc/opml.py -> /scratchbox/users/ymarcoz/home/ymarcoz/workspace/feedingit-pyside/psa/feedingit/deb_dist/feedingit-0.1.0/debian/feedingit/usr/share/feedingit
-copying pysrc/XmlHandler.py -> /scratchbox/users/ymarcoz/home/ymarcoz/workspace/feedingit-pyside/psa/feedingit/deb_dist/feedingit-0.1.0/debian/feedingit/usr/share/feedingit
-copying pysrc/download.py -> /scratchbox/users/ymarcoz/home/ymarcoz/workspace/feedingit-pyside/psa/feedingit/deb_dist/feedingit-0.1.0/debian/feedingit/usr/share/feedingit
-copying pysrc/mainthread.py -> /scratchbox/users/ymarcoz/home/ymarcoz/workspace/feedingit-pyside/psa/feedingit/deb_dist/feedingit-0.1.0/debian/feedingit/usr/share/feedingit
-copying pysrc/updatedbus.py -> /scratchbox/users/ymarcoz/home/ymarcoz/workspace/feedingit-pyside/psa/feedingit/deb_dist/feedingit-0.1.0/debian/feedingit/usr/share/feedingit
-copying pysrc/httpprogresshandler.py -> /scratchbox/users/ymarcoz/home/ymarcoz/workspace/feedingit-pyside/psa/feedingit/deb_dist/feedingit-0.1.0/debian/feedingit/usr/share/feedingit
-copying pysrc/BeautifulSoup.py -> /scratchbox/users/ymarcoz/home/ymarcoz/workspace/feedingit-pyside/psa/feedingit/deb_dist/feedingit-0.1.0/debian/feedingit/usr/share/feedingit
+creating /scratchbox/users/ymarcoz/home/ymarcoz/workspace/feedingit/psa_harmattan/feedingit/deb_dist/feedingit-0.1.0/debian/feedingit/usr/share
+creating /scratchbox/users/ymarcoz/home/ymarcoz/workspace/feedingit/psa_harmattan/feedingit/deb_dist/feedingit-0.1.0/debian/feedingit/usr/share/applications
+copying feedingit.desktop -> /scratchbox/users/ymarcoz/home/ymarcoz/workspace/feedingit/psa_harmattan/feedingit/deb_dist/feedingit-0.1.0/debian/feedingit/usr/share/applications
+creating /scratchbox/users/ymarcoz/home/ymarcoz/workspace/feedingit/psa_harmattan/feedingit/deb_dist/feedingit-0.1.0/debian/feedingit/usr/share/icons
+creating /scratchbox/users/ymarcoz/home/ymarcoz/workspace/feedingit/psa_harmattan/feedingit/deb_dist/feedingit-0.1.0/debian/feedingit/usr/share/icons/hicolor
+creating /scratchbox/users/ymarcoz/home/ymarcoz/workspace/feedingit/psa_harmattan/feedingit/deb_dist/feedingit-0.1.0/debian/feedingit/usr/share/icons/hicolor/64x64
+creating /scratchbox/users/ymarcoz/home/ymarcoz/workspace/feedingit/psa_harmattan/feedingit/deb_dist/feedingit-0.1.0/debian/feedingit/usr/share/icons/hicolor/64x64/apps
+copying feedingit.png -> /scratchbox/users/ymarcoz/home/ymarcoz/workspace/feedingit/psa_harmattan/feedingit/deb_dist/feedingit-0.1.0/debian/feedingit/usr/share/icons/hicolor/64x64/apps
+creating /scratchbox/users/ymarcoz/home/ymarcoz/workspace/feedingit/psa_harmattan/feedingit/deb_dist/feedingit-0.1.0/debian/feedingit/usr/share/feedingit
+creating /scratchbox/users/ymarcoz/home/ymarcoz/workspace/feedingit/psa_harmattan/feedingit/deb_dist/feedingit-0.1.0/debian/feedingit/usr/share/feedingit/qml
+copying qml/Feeds.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/Articles.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/TestWebview.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/FeedingIt.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/Categories.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/ArticleViewer.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/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/ArticleDisplay.qml -> /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
+copying qml/common/ConfirmationMessage.qml -> /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/Switch.qml -> /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/Button.qml -> /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/Menu.qml -> /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/ManageSubs.qml -> /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/LineInput.qml -> /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/ToolBar.qml -> /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/AddFeed.qml -> /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/Slider.qml -> /scratchbox/users/ymarcoz/home/ymarcoz/workspace/feedingit/psa_harmattan/feedingit/deb_dist/feedingit-0.1.0/debian/feedingit/usr/share/feedingit/qml/common
+creating /scratchbox/users/ymarcoz/home/ymarcoz/workspace/feedingit/psa_harmattan/feedingit/deb_dist/feedingit-0.1.0/debian/feedingit/usr/share/feedingit/qml/common/images
+copying qml/common/images/AppletCloseButton.png -> /scratchbox/users/ymarcoz/home/ymarcoz/workspace/feedingit/psa_harmattan/feedingit/deb_dist/feedingit-0.1.0/debian/feedingit/usr/share/feedingit/qml/common/images
+copying qml/common/images/toolbutton.sci -> /scratchbox/users/ymarcoz/home/ymarcoz/workspace/feedingit/psa_harmattan/feedingit/deb_dist/feedingit-0.1.0/debian/feedingit/usr/share/feedingit/qml/common/images
+copying qml/common/images/delete.png -> /scratchbox/users/ymarcoz/home/ymarcoz/workspace/feedingit/psa_harmattan/feedingit/deb_dist/feedingit-0.1.0/debian/feedingit/usr/share/feedingit/qml/common/images
+copying qml/common/images/loading2.png -> /scratchbox/users/ymarcoz/home/ymarcoz/workspace/feedingit/psa_harmattan/feedingit/deb_dist/feedingit-0.1.0/debian/feedingit/usr/share/feedingit/qml/common/images
+copying qml/common/images/wmBackIcon.png -> /scratchbox/users/ymarcoz/home/ymarcoz/workspace/feedingit/psa_harmattan/feedingit/deb_dist/feedingit-0.1.0/debian/feedingit/usr/share/feedingit/qml/common/images
+copying qml/common/images/toolbutton.png -> /scratchbox/users/ymarcoz/home/ymarcoz/workspace/feedingit/psa_harmattan/feedingit/deb_dist/feedingit-0.1.0/debian/feedingit/usr/share/feedingit/qml/common/images
+copying qml/common/images/plus.png -> /scratchbox/users/ymarcoz/home/ymarcoz/workspace/feedingit/psa_harmattan/feedingit/deb_dist/feedingit-0.1.0/debian/feedingit/usr/share/feedingit/qml/common/images
+copying qml/common/images/loading.png -> /scratchbox/users/ymarcoz/home/ymarcoz/workspace/feedingit/psa_harmattan/feedingit/deb_dist/feedingit-0.1.0/debian/feedingit/usr/share/feedingit/qml/common/images
+copying qml/common/images/wmTaskLauncherIcon.png -> /scratchbox/users/ymarcoz/home/ymarcoz/workspace/feedingit/psa_harmattan/feedingit/deb_dist/feedingit-0.1.0/debian/feedingit/usr/share/feedingit/qml/common/images
+copying qml/common/images/feedingit.png -> /scratchbox/users/ymarcoz/home/ymarcoz/workspace/feedingit/psa_harmattan/feedingit/deb_dist/feedingit-0.1.0/debian/feedingit/usr/share/feedingit/qml/common/images
+copying qml/common/images/checkmark.png -> /scratchbox/users/ymarcoz/home/ymarcoz/workspace/feedingit/psa_harmattan/feedingit/deb_dist/feedingit-0.1.0/debian/feedingit/usr/share/feedingit/qml/common/images
+copying qml/common/images/wmCloseIcon.png -> /scratchbox/users/ymarcoz/home/ymarcoz/workspace/feedingit/psa_harmattan/feedingit/deb_dist/feedingit-0.1.0/debian/feedingit/usr/share/feedingit/qml/common/images
+copying qml/common/images/lineedit.png -> /scratchbox/users/ymarcoz/home/ymarcoz/workspace/feedingit/psa_harmattan/feedingit/deb_dist/feedingit-0.1.0/debian/feedingit/usr/share/feedingit/qml/common/images
+copying qml/common/images/Zoom-In-icon.png -> /scratchbox/users/ymarcoz/home/ymarcoz/workspace/feedingit/psa_harmattan/feedingit/deb_dist/feedingit-0.1.0/debian/feedingit/usr/share/feedingit/qml/common/images
+copying qml/common/images/wmEditIcon.png -> /scratchbox/users/ymarcoz/home/ymarcoz/workspace/feedingit/psa_harmattan/feedingit/deb_dist/feedingit-0.1.0/debian/feedingit/usr/share/feedingit/qml/common/images
+copying qml/common/images/rotate.png -> /scratchbox/users/ymarcoz/home/ymarcoz/workspace/feedingit/psa_harmattan/feedingit/deb_dist/feedingit-0.1.0/debian/feedingit/usr/share/feedingit/qml/common/images
+copying qml/common/images/lineedit.sci -> /scratchbox/users/ymarcoz/home/ymarcoz/workspace/feedingit/psa_harmattan/feedingit/deb_dist/feedingit-0.1.0/debian/feedingit/usr/share/feedingit/qml/common/images
+copying qml/common/images/InputMethodShiftButtonNormal.png -> /scratchbox/users/ymarcoz/home/ymarcoz/workspace/feedingit/psa_harmattan/feedingit/deb_dist/feedingit-0.1.0/debian/feedingit/usr/share/feedingit/qml/common/images
+creating /scratchbox/users/ymarcoz/home/ymarcoz/workspace/feedingit/psa_harmattan/feedingit/deb_dist/feedingit-0.1.0/debian/feedingit/usr/share/feedingit/qml/i18n
+copying qml/i18n/qml_en.ts -> /scratchbox/users/ymarcoz/home/ymarcoz/workspace/feedingit/psa_harmattan/feedingit/deb_dist/feedingit-0.1.0/debian/feedingit/usr/share/feedingit/qml/i18n
+copying qml/i18n/FeedingIt.ts -> /scratchbox/users/ymarcoz/home/ymarcoz/workspace/feedingit/psa_harmattan/feedingit/deb_dist/feedingit-0.1.0/debian/feedingit/usr/share/feedingit/qml/i18n
+copying qml/i18n/qml_en.qm -> /scratchbox/users/ymarcoz/home/ymarcoz/workspace/feedingit/psa_harmattan/feedingit/deb_dist/feedingit-0.1.0/debian/feedingit/usr/share/feedingit/qml/i18n
+creating /scratchbox/users/ymarcoz/home/ymarcoz/workspace/feedingit/psa_harmattan/feedingit/deb_dist/feedingit-0.1.0/debian/feedingit/usr/share/dbus-1
+creating /scratchbox/users/ymarcoz/home/ymarcoz/workspace/feedingit/psa_harmattan/feedingit/deb_dist/feedingit-0.1.0/debian/feedingit/usr/share/dbus-1/services
+copying feedingit_status.service -> /scratchbox/users/ymarcoz/home/ymarcoz/workspace/feedingit/psa_harmattan/feedingit/deb_dist/feedingit-0.1.0/debian/feedingit/usr/share/dbus-1/services
+copying pysrc/config.py -> /scratchbox/users/ymarcoz/home/ymarcoz/workspace/feedingit/psa_harmattan/feedingit/deb_dist/feedingit-0.1.0/debian/feedingit/usr/share/feedingit
+copying pysrc/update_feeds.py -> /scratchbox/users/ymarcoz/home/ymarcoz/workspace/feedingit/psa_harmattan/feedingit/deb_dist/feedingit-0.1.0/debian/feedingit/usr/share/feedingit
+copying pysrc/jobmanager.py -> /scratchbox/users/ymarcoz/home/ymarcoz/workspace/feedingit/psa_harmattan/feedingit/deb_dist/feedingit-0.1.0/debian/feedingit/usr/share/feedingit
+copying pysrc/__init__.py -> /scratchbox/users/ymarcoz/home/ymarcoz/workspace/feedingit/psa_harmattan/feedingit/deb_dist/feedingit-0.1.0/debian/feedingit/usr/share/feedingit
+copying pysrc/debugging.py -> /scratchbox/users/ymarcoz/home/ymarcoz/workspace/feedingit/psa_harmattan/feedingit/deb_dist/feedingit-0.1.0/debian/feedingit/usr/share/feedingit
+copying pysrc/rss_sqlite.py -> /scratchbox/users/ymarcoz/home/ymarcoz/workspace/feedingit/psa_harmattan/feedingit/deb_dist/feedingit-0.1.0/debian/feedingit/usr/share/feedingit
+copying pysrc/wc.py -> /scratchbox/users/ymarcoz/home/ymarcoz/workspace/feedingit/psa_harmattan/feedingit/deb_dist/feedingit-0.1.0/debian/feedingit/usr/share/feedingit
+copying pysrc/feedingit.py -> /scratchbox/users/ymarcoz/home/ymarcoz/workspace/feedingit/psa_harmattan/feedingit/deb_dist/feedingit-0.1.0/debian/feedingit/usr/share/feedingit
+copying pysrc/feedparser.py -> /scratchbox/users/ymarcoz/home/ymarcoz/workspace/feedingit/psa_harmattan/feedingit/deb_dist/feedingit-0.1.0/debian/feedingit/usr/share/feedingit
+copying pysrc/opml.py -> /scratchbox/users/ymarcoz/home/ymarcoz/workspace/feedingit/psa_harmattan/feedingit/deb_dist/feedingit-0.1.0/debian/feedingit/usr/share/feedingit
+copying pysrc/XmlHandler.py -> /scratchbox/users/ymarcoz/home/ymarcoz/workspace/feedingit/psa_harmattan/feedingit/deb_dist/feedingit-0.1.0/debian/feedingit/usr/share/feedingit
+copying pysrc/download.py -> /scratchbox/users/ymarcoz/home/ymarcoz/workspace/feedingit/psa_harmattan/feedingit/deb_dist/feedingit-0.1.0/debian/feedingit/usr/share/feedingit
+copying pysrc/mainthread.py -> /scratchbox/users/ymarcoz/home/ymarcoz/workspace/feedingit/psa_harmattan/feedingit/deb_dist/feedingit-0.1.0/debian/feedingit/usr/share/feedingit
+copying pysrc/updatedbus.py -> /scratchbox/users/ymarcoz/home/ymarcoz/workspace/feedingit/psa_harmattan/feedingit/deb_dist/feedingit-0.1.0/debian/feedingit/usr/share/feedingit
+copying pysrc/httpprogresshandler.py -> /scratchbox/users/ymarcoz/home/ymarcoz/workspace/feedingit/psa_harmattan/feedingit/deb_dist/feedingit-0.1.0/debian/feedingit/usr/share/feedingit
+copying pysrc/BeautifulSoup.py -> /scratchbox/users/ymarcoz/home/ymarcoz/workspace/feedingit/psa_harmattan/feedingit/deb_dist/feedingit-0.1.0/debian/feedingit/usr/share/feedingit
 running install_egg_info
-Creating /scratchbox/users/ymarcoz/home/ymarcoz/workspace/feedingit-pyside/psa/feedingit/deb_dist/feedingit-0.1.0/debian/feedingit/usr/lib/python2.6/dist-packages/
-Writing /scratchbox/users/ymarcoz/home/ymarcoz/workspace/feedingit-pyside/psa/feedingit/deb_dist/feedingit-0.1.0/debian/feedingit/usr/lib/python2.6/dist-packages/feedingit-0.1.0.egg-info
+Creating /scratchbox/users/ymarcoz/home/ymarcoz/workspace/feedingit/psa_harmattan/feedingit/deb_dist/feedingit-0.1.0/debian/feedingit/usr/lib/python2.6/dist-packages/
+Writing /scratchbox/users/ymarcoz/home/ymarcoz/workspace/feedingit/psa_harmattan/feedingit/deb_dist/feedingit-0.1.0/debian/feedingit/usr/lib/python2.6/dist-packages/feedingit-0.1.0.egg-info
    dh_install -O--buildsystem=python_distutils
    dh_installdocs -O--buildsystem=python_distutils
    dh_installchangelogs -O--buildsystem=python_distutils
index 166af55..4bab2ac 100644 (file)
@@ -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>  Fri, 07 Oct 2011 20:59:08 -0700
+ -- Yves <yves@marcoz.org>  Tue, 25 Oct 2011 22:22:25 -0700
index 86688c2..7cf4b8d 100644 (file)
@@ -1,25 +1,25 @@
 4420c31f88de68fe6e1b7637abb06196  usr/bin/feedingit
 6a42e9aebedfd157062bd5a9616dc935  usr/share/applications/feedingit.desktop
 eda8cc6ffe8d842d6dfe0244b01b3042  usr/share/dbus-1/services/feedingit_status.service
-0cd1fd151889876833e9092d589bbf5d  usr/share/doc/feedingit/changelog.Debian.gz
+fbe1d0b80d7621da7ed1e07717f36981  usr/share/doc/feedingit/changelog.Debian.gz
 bac2be6ae9673ee5096e20e8b714c9cd  usr/share/feedingit/BeautifulSoup.py
 fa5490f2022424a091b36e75f21e6596  usr/share/feedingit/XmlHandler.py
 d41d8cd98f00b204e9800998ecf8427e  usr/share/feedingit/__init__.py
 6b5296119ef6bc859c3e3a8706fa7f0d  usr/share/feedingit/config.py
 9cf859c8297e4b0e8466cb5861eb75e7  usr/share/feedingit/debugging.py
 fae02e730b76761d43a626fe19828d5e  usr/share/feedingit/download.py
-afd1f073710b2306cadf2bf6791c663f  usr/share/feedingit/feedingit.py
+168f0ef91215de84afb9be6c12f27fe5  usr/share/feedingit/feedingit.py
 afa4f462892136f59beaf96b6bf1cf96  usr/share/feedingit/feedparser.py
 c1a0c0a9ccefd64d1e27bddb817c72a3  usr/share/feedingit/httpprogresshandler.py
 f1e9ba0f44786f513659a7fa3111fc8a  usr/share/feedingit/jobmanager.py
 0201faa30d34c58d71f36ab42a7a8233  usr/share/feedingit/mainthread.py
 d9c0665dfdd5cf19f1529ce88af95134  usr/share/feedingit/opml.py
 af27062fdba0bc7a3df92116e8340d19  usr/share/feedingit/qml/ArticleDisplay.qml
-4bf706b4031938cc244172fb2862703a  usr/share/feedingit/qml/ArticleViewer.qml
+94fe6391917002146bb95617b1576e90  usr/share/feedingit/qml/ArticleViewer.qml
 15083e9a1fac05c8efaaa085dfabcbcb  usr/share/feedingit/qml/Articles.qml
-baf2f683f838f1c2abe723dcc428a8c0  usr/share/feedingit/qml/Categories.qml
+b3866ebf5a5547fcc5fe371e91d0f25c  usr/share/feedingit/qml/Categories.qml
 cd30f5eaec0885358261d7a96bfaf8cd  usr/share/feedingit/qml/FeedingIt.qml
-aec9982f0b680ec18188df8b8ab42a9e  usr/share/feedingit/qml/Feeds.qml
+50535c0b4869b8a71cde6d9740d21892  usr/share/feedingit/qml/Feeds.qml
 bec5fe4599a3ad5799ed96d7ed81fb5f  usr/share/feedingit/qml/MainPage.qml
 aa3fc0a4edbd17d93a9dc5c39c433c3d  usr/share/feedingit/qml/TestWebview.qml
 cef5ae4af926a759f4a233336c00f017  usr/share/feedingit/qml/common/AddCat.qml
@@ -53,11 +53,11 @@ 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
-149f0a44d1807ee6cba9a63b11bea700  usr/share/feedingit/qml/main.qml
-61906dedfd0f86cdb8c7e38972ee4d82  usr/share/feedingit/rss_sqlite.py
+629ac99aa342e4a501d6bab96e975196  usr/share/feedingit/qml/main.qml
+7def699001828ea16976de3d5835dd3c  usr/share/feedingit/rss_sqlite.py
 721777a26cd2a5b8466ce2aa2b99fad7  usr/share/feedingit/update_feeds.py
 6ccf12dc4379e91800ae8505b2e86082  usr/share/feedingit/updatedbus.py
-4397d8abcdf0da4eebbd49b1d182388a  usr/share/feedingit/wc.py
+833ff79caab7c1fa89d6ff4a2f3bb3fd  usr/share/feedingit/wc.py
 8d49c002ad8bb98837e2a642eec86fc5  usr/share/icons/hicolor/64x64/apps/feedingit.png
 035a8a90300ae10602a25bd24a8121c7  usr/share/pyshared/feedingit-0.1.0.egg-info
 1ce7b7194658769bb4173134a725d1ce  usr/share/python/runtime.d/feedingit.rtupdate
index 7bd3820..28c6259 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
index 01c7b51..546d043 100644 (file)
@@ -24,99 +24,6 @@ debugging.init(dot_directory=".feedingit", program_name="feedingit-pyside")
 from cgi import escape
 from re import sub
 
-class FeedWrapper(QtCore.QObject):
-    def __init__(self, key):
-        QtCore.QObject.__init__(self)
-        self._key = key
-    def _name(self):
-        return listing.getFeedTitle(self._key)
-    def _unread(self):
-        return listing.getFeedNumberOfUnreadItems(self._key)
-    def _updatedDate(self):
-        return listing.getFeedUpdateTime(self._key)
-    def _icon(self):
-        return listing.getFavicon(self._key)
-    def _feedid(self):
-        return self._key
-    def _updating(self):
-        return false
-    changed = QtCore.Signal()
-    title = QtCore.Property(unicode, _name, notify=changed)
-    feedid = QtCore.Property(unicode, _feedid, notify=changed)
-    unread = QtCore.Property(unicode, _unread, notify=changed)
-    updatedDate= QtCore.Property(unicode, _updatedDate, notify=changed)
-    icon = QtCore.Property(unicode, _icon, notify=changed)
-    updating = QtCore.Property(unicode, _icon, notify=changed)
-
-class FeedsModel(QtCore.QAbstractListModel):
-    COLUMNS = ('feed', )
-    _category = None
-    def __init__(self):
-        QtCore.QAbstractListModel.__init__(self)
-        self._feeds = listing.getListOfFeeds(self._category)
-        self.setRoleNames(dict(enumerate(FeedsModel.COLUMNS)))
-    def rowCount(self, parent=QtCore.QModelIndex()):
-        return len(self._feeds)
-    def data(self, index, role):
-        if index.isValid() and role == FeedsModel.COLUMNS.index('feed'):
-            print self._feeds[index.row()]
-            return FeedWrapper(self._feeds[index.row()])
-        return None
-
-class ArticleWrapper(QtCore.QObject):
-    def __init__(self, feed,  articleid):
-        QtCore.QObject.__init__(self)
-        self._feed = feed
-        self._articleid = articleid
-    def _name(self):
-        return self.fix_title(self._feed.getTitle(self._articleid))
-    def _unread(self):
-        return str(self._feed.isEntryRead(self._articleid))
-    def _getarticleid(self):
-        return self._articleid
-    def _updatedDate(self):
-        return self._feed.getDateStamp(self._articleid)
-    def _path(self):
-        return self._feed.getContentLink(self._articleid)
-    changed = QtCore.Signal()
-    title = QtCore.Property(unicode, _name, notify=changed)
-    articleid = QtCore.Property(unicode, _getarticleid, notify=changed)
-    unread = QtCore.Property(unicode, _unread, notify=changed)
-    updatedDate= QtCore.Property(unicode, _updatedDate, notify=changed)
-    path = QtCore.Property(unicode, _path, notify=changed)
-
-class ArticlesModel(QtCore.QAbstractListModel):
-    COLUMNS = ('article', )
-    _articles = []
-    _key = None
-    _feed = None
-    def __init__(self,):
-        QtCore.QAbstractListModel.__init__(self)
-        self.setRoleNames(dict(enumerate(ArticlesModel.COLUMNS)))
-        
-    def updateModel(self,  key):
-        self._key = key
-        self._feed = listing.getFeed(self._key)
-        self._articles = self._feed.getIds()
-    def rowCount(self, parent=QtCore.QModelIndex()):
-        print "art " + str(len(self._articles))
-        return len(self._articles)
-    def data(self, index, role):
-        print "data" + str(index) + " " + str(role)
-        if index.isValid() and role == ArticlesModel.COLUMNS.index('article'):
-            return ArticleWrapper(self._articles[index.row()])
-        return None
-
 class Controller(QtCore.QObject):
     
     def __init__(self, listing):
@@ -137,6 +44,7 @@ class Controller(QtCore.QObject):
     
     @QtCore.Slot(str, result=str)
     def getFeedsXml(self, catid):
+        print self._handler.generateFeedsXml(catid)
         return self._handler.generateFeedsXml(catid)
     
     @QtCore.Slot(str,result=str)
@@ -156,7 +64,6 @@ class Controller(QtCore.QObject):
         
     @QtCore.Slot(str)
     def updateFeed(self, key):
-        print 'updating feed ',  key
         listing.updateFeed(key)
         
     @QtCore.Slot()
@@ -217,30 +124,28 @@ def main():
     app = QtGui.QApplication(sys.argv)
     view = QtDeclarative.QDeclarativeView()
 
-    global articlesModel
-    feedsModel = FeedsModel()
-    articlesModel = ArticlesModel()
-    
     controller = Controller(listing)
  
     rc = view.rootContext()
  
     rc.setContextProperty('controller', controller)
-    rc.setContextProperty('feedsModel', feedsModel)
-    rc.setContextProperty('articlesModel', articlesModel)
 
     # Comment the two lines below if you don't want to use OpenGL for QML rendering or if it is not supported
-    glw = QtOpenGL.QGLWidget()
-    view.setViewport(glw)
+    #glw = QtOpenGL.QGLWidget()
+    #view.setViewport(glw)
 
     if os.path.exists('/usr/share/feedingit/qml'):
+        glw = QtOpenGL.QGLWidget()
+        view.setViewport(glw)
         view.setSource('/usr/share/feedingit/qml/main.qml')
+        view.showFullScreen()
     else:
-        #view.setSource(os.path.join('qml','main.qml'))
-        view.setSource(os.path.join('qml','FeedingIt.qml'))
+        view.setSource(os.path.join('qml','main.qml'))
+        view.show()
+        #view.setSource(os.path.join('qml','FeedingIt.qml'))
 
     #view.showFullScreen()
-    view.show()
+    #view.show()
     sys.exit(app.exec_())
 
 if __name__ == "__main__":
index a077969..de9cb20 100644 (file)
@@ -4,6 +4,7 @@ Item {
     id: articleViewer
     //width: 480; height: 360;
     width: parent.width; height: parent.height;
+    property string feedid: parent.feedid
     //property string feedid: "61ac1458d761423344998dc76770e36e" //articlesItem.feedid;
     //property string hideReadArticles: "";
     property alias articleShown: articleView.visible;
index 6af2f1e..03d5eda 100644 (file)
@@ -4,7 +4,8 @@ Item {
 //    anchors.fill: parent;
     width: parent.width; height: parent.height;
     //anchors.top: parent.top; anchors.bottom: parent.bottom
-    property bool inEditMode: true
+    property bool inEditMode: false
+    signal categoryClicked(string cat)
 
     function reload() {
         categories.reload();
@@ -66,7 +67,7 @@ Item {
                     visible: inEditMode
                 }
             }
-            MouseArea { enabled: !inEditMode; anchors.fill: wrapper; onClicked: { container.categoryClicked(catid); } }
+            MouseArea { enabled: !inEditMode; anchors.fill: wrapper; onClicked: { categoryClicked(catid); } }
         }
     }
 }
index 3aadc56..fa6a6c0 100644 (file)
@@ -1,19 +1,19 @@
 import Qt 4.7
 
 Item {
-    //anchors.fill: parent;
-    width: parent.width;
-    property string catid : ""
-    property bool inEditMode: true
-    x: parent.width; height: parent.height;
-    anchors.top: parent.top; anchors.bottom: parent.bottom
+    property string catid : parent.catid
+    property bool inEditMode: false
+    width: parent.width; height: parent.height;
+
+    signal feedClicked(string feedid)
 
     function reload() {
        feeds.xml = catid == "" ? "" : controller.getFeedsXml(catid);
         //feeds.reload()
+        console.log(feeds.xml)
     }
 
-    //Component.onCompleted: { console.log(x + " /") }
+    Component.onCompleted: { console.log(catid + "/" + parent.catid) }
 
     ListView {
         id: feedList; model: feeds; delegate: feedDelegate; z: 6
@@ -27,7 +27,7 @@ Item {
         id: feeds
 
         //source: catid == "" ? "" : "http://localhost:8000/feeds/" + catid //+ "?onlyUnread=" + parent.hideReadArticles
-        //xml: catid == "" ? "" : controller.getFeedsXml(catid)
+        xml: catid == "" ? "" : controller.getFeedsXml(catid)
         query: "/xml/feed"
 
         XmlRole { name: "title"; query: "feedname/string()" }
@@ -43,6 +43,8 @@ Item {
         id: feedDelegate
 
         Item {
+
+            Component.onCompleted: console.log("item:"+feedid)
             id: wrapper; width: wrapper.ListView.view.width;
             visible: (unread == "0" && feedsItem.hideReadFeeds=="True") ? false : true
             height: (visible) ? 86 : 0
@@ -90,13 +92,13 @@ Item {
             MouseArea { 
                 anchors.fill: wrapper; 
                 onClicked: { 
-                    controller.feedClicked(model.feed)
-                    container.feedClicked(feedid, updating=="True") 
+                    //controller.feedClicked(model.feed)
+                    feedClicked(feedid)
                     
                 }
             }
-        }
 
+        }
     }
 
 }
index a88ebfc..5a6a117 100644 (file)
@@ -3,13 +3,77 @@ import com.nokia.meego 1.0
 
 
 PageStackWindow {
-    initialPage: mainPage
+    initialPage: categoryPage
 
-    Page{
-        id: mainPage
-        Component.onCompleted: {
-            var main = Qt.createComponent("FeedingIt.qml");
-            main.createObject(mainPage);
+    ToolBarLayout {
+        id: commonTools
+        visible: false
+        ToolIcon { iconId: "toolbar-back"; onClicked: { myMenu.close(); pageStack.pop(); }
+            visible: pageStack.depth>1 }
+        ToolIcon {
+            platformIconId: "toolbar-view-menu"
+            anchors.right: (parent === undefined) ? undefined : parent.right
+            onClicked: (myMenu.status == DialogStatus.Closed) ? myMenu.open() : myMenu.close()
+        }
+    }
+
+    Menu {
+        id: myMenu
+        visualParent: pageStack
+        MenuLayout {
+            MenuItem { text: qsTr("About FeedingIt"); onClicked: query.open(); }
+        }
+    }
+
+    QueryDialog {
+        id: query
+        icon: "common/images/feedingit.png"
+        titleText: "Feedingit RSS Reader"
+        message: "Version: 0.0.9"
+        +"<br><br>FeedingIt RSS Reader.<br>"
+        +"<br>&copy; 2011 feedingit.marcoz.org"
+        +"<br>http://feedingit.marcoz.org"
+        acceptButtonText: "OK"
+    }
+
+//    Page{
+//        id: mainPage
+//        Component.onCompleted: {
+//            var main = Qt.createComponent("FeedingIt.qml");
+//            main.createObject(mainPage);
+//        }
+//    }
+
+    Component {
+        id: categoryPage
+        Page {
+            tools: commonTools
+            Categories {
+                onCategoryClicked: pageStack.push(feedsPage, {catid: cat})
+            }
+        }
+    }
+
+    Component {
+        id: feedsPage
+        Page {
+            tools: commonTools
+            property string catid
+            Feeds {
+                id: feedsItem
+                onFeedClicked: pageStack.push(articlesPage, {feedid: feedid})
+            }
+        }
+    }
+
+    Component {
+        id: articlesPage
+        Page {
+            tools: commonTools
+            property string feedid
+            ArticleViewer {
+                id: flipper
+            }
         }
     }
 }
index 77849df..4b4d276 100644 (file)
@@ -522,6 +522,9 @@ class Feed(BaseObject):
                        self.serial_execution_lock.release ()
                        have_serial_execution_lock = False
                        for img in images:
+                           if not 'src' in img:
+                               continue
+
                            filename = self.addImage(
                                configdir, self.key, baseurl, img['src'],
                                opener=opener)
@@ -969,36 +972,39 @@ class Listing(BaseObject):
 
         # Check that Woodchuck's state is up to date with respect our
         # state.
-        updater = os.path.basename(sys.argv[0]) == 'update_feeds.py'
-        wc_init (self, True if updater else False)
-        if wc().available() and updater:
-            # The list of known streams.
-            streams = wc().streams_list ()
-            stream_ids = [s.identifier for s in streams]
-
-            # Register any unknown streams.  Remove known streams from
-            # STREAMS_IDS.
-            for key in self.getListOfFeeds():
-                title = self.getFeedTitle(key)
-                # XXX: We should also check whether the list of
-                # articles/objects in each feed/stream is up to date.
-                if key not in stream_ids:
-                    logger.debug(
-                        "Registering previously unknown channel: %s (%s)"
-                        % (key, title,))
-                    # Use a default refresh interval of 6 hours.
-                    wc().stream_register (key, title, 6 * 60 * 60)
-                else:
-                    # Make sure the human readable name is up to date.
-                    if wc()[key].human_readable_name != title:
-                        wc()[key].human_readable_name = title
-                    stream_ids.remove (key)
-                    
-
-            # Unregister any streams that are no longer subscribed to.
-            for id in stream_ids:
-                logger.debug("Unregistering %s" % (id,))
-                w.stream_unregister (id)
+        try:
+            updater = os.path.basename(sys.argv[0]) == 'update_feeds.py'
+            wc_init (self, True if updater else False)
+            if wc().available() and updater:
+                # The list of known streams.
+                streams = wc().streams_list ()
+                stream_ids = [s.identifier for s in streams]
+    
+                # Register any unknown streams.  Remove known streams from
+                # STREAMS_IDS.
+                for key in self.getListOfFeeds():
+                    title = self.getFeedTitle(key)
+                    # XXX: We should also check whether the list of
+                    # articles/objects in each feed/stream is up to date.
+                    if key not in stream_ids:
+                        logger.debug(
+                            "Registering previously unknown channel: %s (%s)"
+                            % (key, title,))
+                        # Use a default refresh interval of 6 hours.
+                        wc().stream_register (key, title, 6 * 60 * 60)
+                    else:
+                        # Make sure the human readable name is up to date.
+                        if wc()[key].human_readable_name != title:
+                            wc()[key].human_readable_name = title
+                        stream_ids.remove (key)
+                        
+    
+                # Unregister any streams that are no longer subscribed to.
+                for id in stream_ids:
+                    logger.debug("Unregistering %s" % (id,))
+                    w.stream_unregister (id)
+        except Exception:
+            logger.exception("Registering streams with Woodchuck")
 
     def importOldFormatFeeds(self):
         """This function loads feeds that are saved in an outdated format, and converts them to sqlite"""
@@ -1207,7 +1213,7 @@ class Listing(BaseObject):
         return self.lookup('categories', 'title', id)
     
     def getSortedListOfKeys(self, order, onlyUnread=False, category=1):
-        if order == "Most unread":
+        if   order == "Most unread":
             tmp = "ORDER BY unread DESC"
             #keyorder = sorted(feedInfo, key = lambda k: feedInfo[k][1], reverse=True)
         elif order == "Least unread":
index c8fd987..c28d1d7 100644 (file)
@@ -58,7 +58,7 @@ class mywoodchuck (PyWoodchuck):
         return False
 
     # Woodchuck upcalls.
-    def stream_update_cb(self, stream):
+    def stream_update_cb(self, stream, *args, **kwargs):
         logger.debug("stream update called on %s (%s)"
                      % (stream.human_readable_name, stream.identifier,))
 
@@ -71,10 +71,18 @@ class mywoodchuck (PyWoodchuck):
                          % (stream.identifier, traceback.format_exc ()))
 
     def object_transfer_cb(self, stream, object,
-                           version, filename, quality):
-        log ("object transfer called on %s (%s) in stream %s (%s)"
-             % (object.human_readable_name, object.identifier,
-                stream.human_readable_name, stream.identifier))
+                           version, filename, quality,
+                           *args, **kwargs):
+        logger.debug ("object transfer called on %s (%s) in stream %s (%s)"
+                      % (object.human_readable_name, object.identifier,
+                         stream.human_readable_name, stream.identifier))
+        try:
+            self[stream.identifier][object.identifier].dont_transfer = True
+        except Exception, e:
+            logger.warn("Setting '%s'(%s).'%s'(%s).DontTransfer: %s"
+                        % (stream.human_readable_name, stream.identifier,
+                           object.human_readable_name, object.identifier,
+                           str(e)))
 
 _w = None
 def wc_init(listing, request_feedback=False):
index 86592d6..da559bb 100755 (executable)
@@ -1,7 +1,7 @@
 #!/usr/bin/make -f
 
 # This file was automatically generated by stdeb 0.6.0+git at
-# Fri, 07 Oct 2011 20:59:08 -0700
+# Tue, 25 Oct 2011 22:22:25 -0700
 
 %:
        dh $@ --with python2 --buildsystem=python_distutils
diff --git a/psa_harmattan/feedingit/deb_dist/feedingit-0.1.0/deploy.sh b/psa_harmattan/feedingit/deb_dist/feedingit-0.1.0/deploy.sh
deleted file mode 100644 (file)
index 23fc3a7..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-psa build-deb
-#scp /scratchbox/users/ymarcoz/home/ymarcoz/workspace/feedingit_harmattan/feedingit/deb_dist/feedingit_0.1.0-1_all.deb root@192.168.1.136:
-scp /scratchbox/users/ymarcoz/home/ymarcoz/workspace/feedingit-pyside/psa/feedingit/deb_dist/feedingit_0.1.0-1_all.deb root@192.168.1.136:
-ssh root@192.168.1.136 "dpkg -i --force-depends-version feedingit_0.1.0-1_all.deb"
index ee9c3ab..9808218 100644 (file)
@@ -1,4 +1,4 @@
-begin-base64 600 /scratchbox/users/ymarcoz/home/ymarcoz/workspace/feedingit-pyside/psa/feedingit/feedingit.png
+begin-base64 600 /scratchbox/users/ymarcoz/home/ymarcoz/workspace/feedingit/psa_harmattan/feedingit/feedingit.png
 iVBORw0KGgoAAAANSUhEUgAAAEAAAABACAYAAACqaXHeAAAAGXRFWHRTb2Z0
 d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAEptJREFUeNrkWwl0FFXWvlW9
 pLN0kiaEEAiYsAaQNXBYZJmBYfGI/8jyH/k9uCC4/IAMjMgIDDMIItsoKKsH
index 01c7b51..546d043 100644 (file)
@@ -24,99 +24,6 @@ debugging.init(dot_directory=".feedingit", program_name="feedingit-pyside")
 from cgi import escape
 from re import sub
 
-class FeedWrapper(QtCore.QObject):
-    def __init__(self, key):
-        QtCore.QObject.__init__(self)
-        self._key = key
-    def _name(self):
-        return listing.getFeedTitle(self._key)
-    def _unread(self):
-        return listing.getFeedNumberOfUnreadItems(self._key)
-    def _updatedDate(self):
-        return listing.getFeedUpdateTime(self._key)
-    def _icon(self):
-        return listing.getFavicon(self._key)
-    def _feedid(self):
-        return self._key
-    def _updating(self):
-        return false
-    changed = QtCore.Signal()
-    title = QtCore.Property(unicode, _name, notify=changed)
-    feedid = QtCore.Property(unicode, _feedid, notify=changed)
-    unread = QtCore.Property(unicode, _unread, notify=changed)
-    updatedDate= QtCore.Property(unicode, _updatedDate, notify=changed)
-    icon = QtCore.Property(unicode, _icon, notify=changed)
-    updating = QtCore.Property(unicode, _icon, notify=changed)
-
-class FeedsModel(QtCore.QAbstractListModel):
-    COLUMNS = ('feed', )
-    _category = None
-    def __init__(self):
-        QtCore.QAbstractListModel.__init__(self)
-        self._feeds = listing.getListOfFeeds(self._category)
-        self.setRoleNames(dict(enumerate(FeedsModel.COLUMNS)))
-    def rowCount(self, parent=QtCore.QModelIndex()):
-        return len(self._feeds)
-    def data(self, index, role):
-        if index.isValid() and role == FeedsModel.COLUMNS.index('feed'):
-            print self._feeds[index.row()]
-            return FeedWrapper(self._feeds[index.row()])
-        return None
-
-class ArticleWrapper(QtCore.QObject):
-    def __init__(self, feed,  articleid):
-        QtCore.QObject.__init__(self)
-        self._feed = feed
-        self._articleid = articleid
-    def _name(self):
-        return self.fix_title(self._feed.getTitle(self._articleid))
-    def _unread(self):
-        return str(self._feed.isEntryRead(self._articleid))
-    def _getarticleid(self):
-        return self._articleid
-    def _updatedDate(self):
-        return self._feed.getDateStamp(self._articleid)
-    def _path(self):
-        return self._feed.getContentLink(self._articleid)
-    changed = QtCore.Signal()
-    title = QtCore.Property(unicode, _name, notify=changed)
-    articleid = QtCore.Property(unicode, _getarticleid, notify=changed)
-    unread = QtCore.Property(unicode, _unread, notify=changed)
-    updatedDate= QtCore.Property(unicode, _updatedDate, notify=changed)
-    path = QtCore.Property(unicode, _path, notify=changed)
-
-class ArticlesModel(QtCore.QAbstractListModel):
-    COLUMNS = ('article', )
-    _articles = []
-    _key = None
-    _feed = None
-    def __init__(self,):
-        QtCore.QAbstractListModel.__init__(self)
-        self.setRoleNames(dict(enumerate(ArticlesModel.COLUMNS)))
-        
-    def updateModel(self,  key):
-        self._key = key
-        self._feed = listing.getFeed(self._key)
-        self._articles = self._feed.getIds()
-    def rowCount(self, parent=QtCore.QModelIndex()):
-        print "art " + str(len(self._articles))
-        return len(self._articles)
-    def data(self, index, role):
-        print "data" + str(index) + " " + str(role)
-        if index.isValid() and role == ArticlesModel.COLUMNS.index('article'):
-            return ArticleWrapper(self._articles[index.row()])
-        return None
-
 class Controller(QtCore.QObject):
     
     def __init__(self, listing):
@@ -137,6 +44,7 @@ class Controller(QtCore.QObject):
     
     @QtCore.Slot(str, result=str)
     def getFeedsXml(self, catid):
+        print self._handler.generateFeedsXml(catid)
         return self._handler.generateFeedsXml(catid)
     
     @QtCore.Slot(str,result=str)
@@ -156,7 +64,6 @@ class Controller(QtCore.QObject):
         
     @QtCore.Slot(str)
     def updateFeed(self, key):
-        print 'updating feed ',  key
         listing.updateFeed(key)
         
     @QtCore.Slot()
@@ -217,30 +124,28 @@ def main():
     app = QtGui.QApplication(sys.argv)
     view = QtDeclarative.QDeclarativeView()
 
-    global articlesModel
-    feedsModel = FeedsModel()
-    articlesModel = ArticlesModel()
-    
     controller = Controller(listing)
  
     rc = view.rootContext()
  
     rc.setContextProperty('controller', controller)
-    rc.setContextProperty('feedsModel', feedsModel)
-    rc.setContextProperty('articlesModel', articlesModel)
 
     # Comment the two lines below if you don't want to use OpenGL for QML rendering or if it is not supported
-    glw = QtOpenGL.QGLWidget()
-    view.setViewport(glw)
+    #glw = QtOpenGL.QGLWidget()
+    #view.setViewport(glw)
 
     if os.path.exists('/usr/share/feedingit/qml'):
+        glw = QtOpenGL.QGLWidget()
+        view.setViewport(glw)
         view.setSource('/usr/share/feedingit/qml/main.qml')
+        view.showFullScreen()
     else:
-        #view.setSource(os.path.join('qml','main.qml'))
-        view.setSource(os.path.join('qml','FeedingIt.qml'))
+        view.setSource(os.path.join('qml','main.qml'))
+        view.show()
+        #view.setSource(os.path.join('qml','FeedingIt.qml'))
 
     #view.showFullScreen()
-    view.show()
+    #view.show()
     sys.exit(app.exec_())
 
 if __name__ == "__main__":
index 77849df..4b4d276 100644 (file)
@@ -522,6 +522,9 @@ class Feed(BaseObject):
                        self.serial_execution_lock.release ()
                        have_serial_execution_lock = False
                        for img in images:
+                           if not 'src' in img:
+                               continue
+
                            filename = self.addImage(
                                configdir, self.key, baseurl, img['src'],
                                opener=opener)
@@ -969,36 +972,39 @@ class Listing(BaseObject):
 
         # Check that Woodchuck's state is up to date with respect our
         # state.
-        updater = os.path.basename(sys.argv[0]) == 'update_feeds.py'
-        wc_init (self, True if updater else False)
-        if wc().available() and updater:
-            # The list of known streams.
-            streams = wc().streams_list ()
-            stream_ids = [s.identifier for s in streams]
-
-            # Register any unknown streams.  Remove known streams from
-            # STREAMS_IDS.
-            for key in self.getListOfFeeds():
-                title = self.getFeedTitle(key)
-                # XXX: We should also check whether the list of
-                # articles/objects in each feed/stream is up to date.
-                if key not in stream_ids:
-                    logger.debug(
-                        "Registering previously unknown channel: %s (%s)"
-                        % (key, title,))
-                    # Use a default refresh interval of 6 hours.
-                    wc().stream_register (key, title, 6 * 60 * 60)
-                else:
-                    # Make sure the human readable name is up to date.
-                    if wc()[key].human_readable_name != title:
-                        wc()[key].human_readable_name = title
-                    stream_ids.remove (key)
-                    
-
-            # Unregister any streams that are no longer subscribed to.
-            for id in stream_ids:
-                logger.debug("Unregistering %s" % (id,))
-                w.stream_unregister (id)
+        try:
+            updater = os.path.basename(sys.argv[0]) == 'update_feeds.py'
+            wc_init (self, True if updater else False)
+            if wc().available() and updater:
+                # The list of known streams.
+                streams = wc().streams_list ()
+                stream_ids = [s.identifier for s in streams]
+    
+                # Register any unknown streams.  Remove known streams from
+                # STREAMS_IDS.
+                for key in self.getListOfFeeds():
+                    title = self.getFeedTitle(key)
+                    # XXX: We should also check whether the list of
+                    # articles/objects in each feed/stream is up to date.
+                    if key not in stream_ids:
+                        logger.debug(
+                            "Registering previously unknown channel: %s (%s)"
+                            % (key, title,))
+                        # Use a default refresh interval of 6 hours.
+                        wc().stream_register (key, title, 6 * 60 * 60)
+                    else:
+                        # Make sure the human readable name is up to date.
+                        if wc()[key].human_readable_name != title:
+                            wc()[key].human_readable_name = title
+                        stream_ids.remove (key)
+                        
+    
+                # Unregister any streams that are no longer subscribed to.
+                for id in stream_ids:
+                    logger.debug("Unregistering %s" % (id,))
+                    w.stream_unregister (id)
+        except Exception:
+            logger.exception("Registering streams with Woodchuck")
 
     def importOldFormatFeeds(self):
         """This function loads feeds that are saved in an outdated format, and converts them to sqlite"""
@@ -1207,7 +1213,7 @@ class Listing(BaseObject):
         return self.lookup('categories', 'title', id)
     
     def getSortedListOfKeys(self, order, onlyUnread=False, category=1):
-        if order == "Most unread":
+        if   order == "Most unread":
             tmp = "ORDER BY unread DESC"
             #keyorder = sorted(feedInfo, key = lambda k: feedInfo[k][1], reverse=True)
         elif order == "Least unread":
index c8fd987..c28d1d7 100644 (file)
@@ -58,7 +58,7 @@ class mywoodchuck (PyWoodchuck):
         return False
 
     # Woodchuck upcalls.
-    def stream_update_cb(self, stream):
+    def stream_update_cb(self, stream, *args, **kwargs):
         logger.debug("stream update called on %s (%s)"
                      % (stream.human_readable_name, stream.identifier,))
 
@@ -71,10 +71,18 @@ class mywoodchuck (PyWoodchuck):
                          % (stream.identifier, traceback.format_exc ()))
 
     def object_transfer_cb(self, stream, object,
-                           version, filename, quality):
-        log ("object transfer called on %s (%s) in stream %s (%s)"
-             % (object.human_readable_name, object.identifier,
-                stream.human_readable_name, stream.identifier))
+                           version, filename, quality,
+                           *args, **kwargs):
+        logger.debug ("object transfer called on %s (%s) in stream %s (%s)"
+                      % (object.human_readable_name, object.identifier,
+                         stream.human_readable_name, stream.identifier))
+        try:
+            self[stream.identifier][object.identifier].dont_transfer = True
+        except Exception, e:
+            logger.warn("Setting '%s'(%s).'%s'(%s).DontTransfer: %s"
+                        % (stream.human_readable_name, stream.identifier,
+                           object.human_readable_name, object.identifier,
+                           str(e)))
 
 _w = None
 def wc_init(listing, request_feedback=False):
index a077969..de9cb20 100644 (file)
@@ -4,6 +4,7 @@ Item {
     id: articleViewer
     //width: 480; height: 360;
     width: parent.width; height: parent.height;
+    property string feedid: parent.feedid
     //property string feedid: "61ac1458d761423344998dc76770e36e" //articlesItem.feedid;
     //property string hideReadArticles: "";
     property alias articleShown: articleView.visible;
index 6af2f1e..03d5eda 100644 (file)
@@ -4,7 +4,8 @@ Item {
 //    anchors.fill: parent;
     width: parent.width; height: parent.height;
     //anchors.top: parent.top; anchors.bottom: parent.bottom
-    property bool inEditMode: true
+    property bool inEditMode: false
+    signal categoryClicked(string cat)
 
     function reload() {
         categories.reload();
@@ -66,7 +67,7 @@ Item {
                     visible: inEditMode
                 }
             }
-            MouseArea { enabled: !inEditMode; anchors.fill: wrapper; onClicked: { container.categoryClicked(catid); } }
+            MouseArea { enabled: !inEditMode; anchors.fill: wrapper; onClicked: { categoryClicked(catid); } }
         }
     }
 }
index 3aadc56..fa6a6c0 100644 (file)
@@ -1,19 +1,19 @@
 import Qt 4.7
 
 Item {
-    //anchors.fill: parent;
-    width: parent.width;
-    property string catid : ""
-    property bool inEditMode: true
-    x: parent.width; height: parent.height;
-    anchors.top: parent.top; anchors.bottom: parent.bottom
+    property string catid : parent.catid
+    property bool inEditMode: false
+    width: parent.width; height: parent.height;
+
+    signal feedClicked(string feedid)
 
     function reload() {
        feeds.xml = catid == "" ? "" : controller.getFeedsXml(catid);
         //feeds.reload()
+        console.log(feeds.xml)
     }
 
-    //Component.onCompleted: { console.log(x + " /") }
+    Component.onCompleted: { console.log(catid + "/" + parent.catid) }
 
     ListView {
         id: feedList; model: feeds; delegate: feedDelegate; z: 6
@@ -27,7 +27,7 @@ Item {
         id: feeds
 
         //source: catid == "" ? "" : "http://localhost:8000/feeds/" + catid //+ "?onlyUnread=" + parent.hideReadArticles
-        //xml: catid == "" ? "" : controller.getFeedsXml(catid)
+        xml: catid == "" ? "" : controller.getFeedsXml(catid)
         query: "/xml/feed"
 
         XmlRole { name: "title"; query: "feedname/string()" }
@@ -43,6 +43,8 @@ Item {
         id: feedDelegate
 
         Item {
+
+            Component.onCompleted: console.log("item:"+feedid)
             id: wrapper; width: wrapper.ListView.view.width;
             visible: (unread == "0" && feedsItem.hideReadFeeds=="True") ? false : true
             height: (visible) ? 86 : 0
@@ -90,13 +92,13 @@ Item {
             MouseArea { 
                 anchors.fill: wrapper; 
                 onClicked: { 
-                    controller.feedClicked(model.feed)
-                    container.feedClicked(feedid, updating=="True") 
+                    //controller.feedClicked(model.feed)
+                    feedClicked(feedid)
                     
                 }
             }
-        }
 
+        }
     }
 
 }
index a88ebfc..5a6a117 100644 (file)
@@ -3,13 +3,77 @@ import com.nokia.meego 1.0
 
 
 PageStackWindow {
-    initialPage: mainPage
+    initialPage: categoryPage
 
-    Page{
-        id: mainPage
-        Component.onCompleted: {
-            var main = Qt.createComponent("FeedingIt.qml");
-            main.createObject(mainPage);
+    ToolBarLayout {
+        id: commonTools
+        visible: false
+        ToolIcon { iconId: "toolbar-back"; onClicked: { myMenu.close(); pageStack.pop(); }
+            visible: pageStack.depth>1 }
+        ToolIcon {
+            platformIconId: "toolbar-view-menu"
+            anchors.right: (parent === undefined) ? undefined : parent.right
+            onClicked: (myMenu.status == DialogStatus.Closed) ? myMenu.open() : myMenu.close()
+        }
+    }
+
+    Menu {
+        id: myMenu
+        visualParent: pageStack
+        MenuLayout {
+            MenuItem { text: qsTr("About FeedingIt"); onClicked: query.open(); }
+        }
+    }
+
+    QueryDialog {
+        id: query
+        icon: "common/images/feedingit.png"
+        titleText: "Feedingit RSS Reader"
+        message: "Version: 0.0.9"
+        +"<br><br>FeedingIt RSS Reader.<br>"
+        +"<br>&copy; 2011 feedingit.marcoz.org"
+        +"<br>http://feedingit.marcoz.org"
+        acceptButtonText: "OK"
+    }
+
+//    Page{
+//        id: mainPage
+//        Component.onCompleted: {
+//            var main = Qt.createComponent("FeedingIt.qml");
+//            main.createObject(mainPage);
+//        }
+//    }
+
+    Component {
+        id: categoryPage
+        Page {
+            tools: commonTools
+            Categories {
+                onCategoryClicked: pageStack.push(feedsPage, {catid: cat})
+            }
+        }
+    }
+
+    Component {
+        id: feedsPage
+        Page {
+            tools: commonTools
+            property string catid
+            Feeds {
+                id: feedsItem
+                onFeedClicked: pageStack.push(articlesPage, {feedid: feedid})
+            }
+        }
+    }
+
+    Component {
+        id: articlesPage
+        Page {
+            tools: commonTools
+            property string feedid
+            ArticleViewer {
+                id: flipper
+            }
         }
     }
 }
index 87e09e9..e56d82a 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
index 3144d07..e0b590e 100644 (file)
@@ -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: 
- 941d0754142974dd20314aece5506464c83dfe7c 169288 feedingit_0.1.0.orig.tar.gz
- 91664070662f39656a7ae615429aa01024bb8362 859 feedingit_0.1.0-1.debian.tar.gz
+ 963c808a6e00b215dfe4e3762c91dca86fabf635 172056 feedingit_0.1.0.orig.tar.gz
+ db54f71fc8597299ed888d0d4064643e4735e365 855 feedingit_0.1.0-1.debian.tar.gz
 Checksums-Sha256: 
- 714e1c576c226a0001236dc952db962787f50b8484c0006421c67d9648abf6c2 169288 feedingit_0.1.0.orig.tar.gz
- 3ad60d4661c04b51728eadcdd7a52e6fb9fc974e75978b5766f6b641d7562442 859 feedingit_0.1.0-1.debian.tar.gz
+ d7d3b7c6edd9f7fdb2f072b4ec78828abbbae1200c5b3ee70425f79511eda8af 172056 feedingit_0.1.0.orig.tar.gz
+ 19d1417a29e97c80f378e5d89d1d2d31c64a345b37551f73a5e48c37277c9268 855 feedingit_0.1.0-1.debian.tar.gz
 Files: 
- b21a4a9cd2915faccd2998f0fdb25706 169288 feedingit_0.1.0.orig.tar.gz
- 3cdefa2c1e40af13c690ec7a992f00fe 859 feedingit_0.1.0-1.debian.tar.gz
+ 51d85ab8e47de8d603386319ea568689 172056 feedingit_0.1.0.orig.tar.gz
+ 03aa23d5c3f8bf3aee194129f5b701e5 855 feedingit_0.1.0-1.debian.tar.gz
index 8ff40fe..6d76854 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
index 4bb7a5f..8c609e8 100644 (file)
@@ -1,5 +1,5 @@
 Format: 1.8
-Date: Fri, 07 Oct 2011 20:59:08 -0700
+Date: Tue, 25 Oct 2011 22:22:25 -0700
 Source: feedingit
 Binary: feedingit
 Architecture: source all
@@ -15,17 +15,17 @@ Changes:
  .
    * source package automatically created by stdeb 0.6.0+git
 Checksums-Sha1: 
- 2c2a6756d6048d1822c0a636c661d57497769a31 753 feedingit_0.1.0-1.dsc
- 941d0754142974dd20314aece5506464c83dfe7c 169288 feedingit_0.1.0.orig.tar.gz
- 91664070662f39656a7ae615429aa01024bb8362 859 feedingit_0.1.0-1.debian.tar.gz
- 1744a0ffe2bafd2bda16b1faa9e75dcbfd7ab7cb 163214 feedingit_0.1.0-1_all.deb
+ c6857cfe93d08c917757d5d2bb9716f857dc9b2c 753 feedingit_0.1.0-1.dsc
+ 963c808a6e00b215dfe4e3762c91dca86fabf635 172056 feedingit_0.1.0.orig.tar.gz
+ db54f71fc8597299ed888d0d4064643e4735e365 855 feedingit_0.1.0-1.debian.tar.gz
+ 010d01dea379e177bbbcc1c19be489c8fb9960c9 163346 feedingit_0.1.0-1_all.deb
 Checksums-Sha256: 
- da5ddb46c667c764b9ce1990e5013c7c50329ef552b9a3fdc8a0912861bb3de4 753 feedingit_0.1.0-1.dsc
- 714e1c576c226a0001236dc952db962787f50b8484c0006421c67d9648abf6c2 169288 feedingit_0.1.0.orig.tar.gz
- 3ad60d4661c04b51728eadcdd7a52e6fb9fc974e75978b5766f6b641d7562442 859 feedingit_0.1.0-1.debian.tar.gz
- e4fec5ae33afaab67b452dcf6791fcb4dab50e0ff806d89e94c1f4417c1c47a4 163214 feedingit_0.1.0-1_all.deb
+ 27187054950ef5b7cbc6de9b9bb47380b8b2b9a4b8e677ebd81772a5c48de57b 753 feedingit_0.1.0-1.dsc
+ d7d3b7c6edd9f7fdb2f072b4ec78828abbbae1200c5b3ee70425f79511eda8af 172056 feedingit_0.1.0.orig.tar.gz
+ 19d1417a29e97c80f378e5d89d1d2d31c64a345b37551f73a5e48c37277c9268 855 feedingit_0.1.0-1.debian.tar.gz
+ f87cfc88eb03b3f2eb8a4d66d949133ce7e32ef7d046cd27df83f8af8fb3dd8e 163346 feedingit_0.1.0-1_all.deb
 Files: 
- 5f67a6a88a9f83e7fd790608449c0e71 753 user/development optional feedingit_0.1.0-1.dsc
- b21a4a9cd2915faccd2998f0fdb25706 169288 user/development optional feedingit_0.1.0.orig.tar.gz
- 3cdefa2c1e40af13c690ec7a992f00fe 859 user/development optional feedingit_0.1.0-1.debian.tar.gz
- 3e9380a5029f1d564e92fb997322476e 163214 user/development optional feedingit_0.1.0-1_all.deb
+ c1a3f52eed4a5f5e1213dc5e50fb88a7 753 user/development optional feedingit_0.1.0-1.dsc
+ 51d85ab8e47de8d603386319ea568689 172056 user/development optional feedingit_0.1.0.orig.tar.gz
+ 03aa23d5c3f8bf3aee194129f5b701e5 855 user/development optional feedingit_0.1.0-1.debian.tar.gz
+ d09afd3628650ef3440d52a0966c4aa9 163346 user/development optional feedingit_0.1.0-1_all.deb
index e227d0e..131e7bb 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
index ee9c3ab..9808218 100644 (file)
@@ -1,4 +1,4 @@
-begin-base64 600 /scratchbox/users/ymarcoz/home/ymarcoz/workspace/feedingit-pyside/psa/feedingit/feedingit.png
+begin-base64 600 /scratchbox/users/ymarcoz/home/ymarcoz/workspace/feedingit/psa_harmattan/feedingit/feedingit.png
 iVBORw0KGgoAAAANSUhEUgAAAEAAAABACAYAAACqaXHeAAAAGXRFWHRTb2Z0
 d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAEptJREFUeNrkWwl0FFXWvlW9
 pLN0kiaEEAiYsAaQNXBYZJmBYfGI/8jyH/k9uCC4/IAMjMgIDDMIItsoKKsH
index 01c7b51..546d043 100644 (file)
@@ -24,99 +24,6 @@ debugging.init(dot_directory=".feedingit", program_name="feedingit-pyside")
 from cgi import escape
 from re import sub
 
-class FeedWrapper(QtCore.QObject):
-    def __init__(self, key):
-        QtCore.QObject.__init__(self)
-        self._key = key
-    def _name(self):
-        return listing.getFeedTitle(self._key)
-    def _unread(self):
-        return listing.getFeedNumberOfUnreadItems(self._key)
-    def _updatedDate(self):
-        return listing.getFeedUpdateTime(self._key)
-    def _icon(self):
-        return listing.getFavicon(self._key)
-    def _feedid(self):
-        return self._key
-    def _updating(self):
-        return false
-    changed = QtCore.Signal()
-    title = QtCore.Property(unicode, _name, notify=changed)
-    feedid = QtCore.Property(unicode, _feedid, notify=changed)
-    unread = QtCore.Property(unicode, _unread, notify=changed)
-    updatedDate= QtCore.Property(unicode, _updatedDate, notify=changed)
-    icon = QtCore.Property(unicode, _icon, notify=changed)
-    updating = QtCore.Property(unicode, _icon, notify=changed)
-
-class FeedsModel(QtCore.QAbstractListModel):
-    COLUMNS = ('feed', )
-    _category = None
-    def __init__(self):
-        QtCore.QAbstractListModel.__init__(self)
-        self._feeds = listing.getListOfFeeds(self._category)
-        self.setRoleNames(dict(enumerate(FeedsModel.COLUMNS)))
-    def rowCount(self, parent=QtCore.QModelIndex()):
-        return len(self._feeds)
-    def data(self, index, role):
-        if index.isValid() and role == FeedsModel.COLUMNS.index('feed'):
-            print self._feeds[index.row()]
-            return FeedWrapper(self._feeds[index.row()])
-        return None
-
-class ArticleWrapper(QtCore.QObject):
-    def __init__(self, feed,  articleid):
-        QtCore.QObject.__init__(self)
-        self._feed = feed
-        self._articleid = articleid
-    def _name(self):
-        return self.fix_title(self._feed.getTitle(self._articleid))
-    def _unread(self):
-        return str(self._feed.isEntryRead(self._articleid))
-    def _getarticleid(self):
-        return self._articleid
-    def _updatedDate(self):
-        return self._feed.getDateStamp(self._articleid)
-    def _path(self):
-        return self._feed.getContentLink(self._articleid)
-    changed = QtCore.Signal()
-    title = QtCore.Property(unicode, _name, notify=changed)
-    articleid = QtCore.Property(unicode, _getarticleid, notify=changed)
-    unread = QtCore.Property(unicode, _unread, notify=changed)
-    updatedDate= QtCore.Property(unicode, _updatedDate, notify=changed)
-    path = QtCore.Property(unicode, _path, notify=changed)
-
-class ArticlesModel(QtCore.QAbstractListModel):
-    COLUMNS = ('article', )
-    _articles = []
-    _key = None
-    _feed = None
-    def __init__(self,):
-        QtCore.QAbstractListModel.__init__(self)
-        self.setRoleNames(dict(enumerate(ArticlesModel.COLUMNS)))
-        
-    def updateModel(self,  key):
-        self._key = key
-        self._feed = listing.getFeed(self._key)
-        self._articles = self._feed.getIds()
-    def rowCount(self, parent=QtCore.QModelIndex()):
-        print "art " + str(len(self._articles))
-        return len(self._articles)
-    def data(self, index, role):
-        print "data" + str(index) + " " + str(role)
-        if index.isValid() and role == ArticlesModel.COLUMNS.index('article'):
-            return ArticleWrapper(self._articles[index.row()])
-        return None
-
 class Controller(QtCore.QObject):
     
     def __init__(self, listing):
@@ -137,6 +44,7 @@ class Controller(QtCore.QObject):
     
     @QtCore.Slot(str, result=str)
     def getFeedsXml(self, catid):
+        print self._handler.generateFeedsXml(catid)
         return self._handler.generateFeedsXml(catid)
     
     @QtCore.Slot(str,result=str)
@@ -156,7 +64,6 @@ class Controller(QtCore.QObject):
         
     @QtCore.Slot(str)
     def updateFeed(self, key):
-        print 'updating feed ',  key
         listing.updateFeed(key)
         
     @QtCore.Slot()
@@ -217,30 +124,28 @@ def main():
     app = QtGui.QApplication(sys.argv)
     view = QtDeclarative.QDeclarativeView()
 
-    global articlesModel
-    feedsModel = FeedsModel()
-    articlesModel = ArticlesModel()
-    
     controller = Controller(listing)
  
     rc = view.rootContext()
  
     rc.setContextProperty('controller', controller)
-    rc.setContextProperty('feedsModel', feedsModel)
-    rc.setContextProperty('articlesModel', articlesModel)
 
     # Comment the two lines below if you don't want to use OpenGL for QML rendering or if it is not supported
-    glw = QtOpenGL.QGLWidget()
-    view.setViewport(glw)
+    #glw = QtOpenGL.QGLWidget()
+    #view.setViewport(glw)
 
     if os.path.exists('/usr/share/feedingit/qml'):
+        glw = QtOpenGL.QGLWidget()
+        view.setViewport(glw)
         view.setSource('/usr/share/feedingit/qml/main.qml')
+        view.showFullScreen()
     else:
-        #view.setSource(os.path.join('qml','main.qml'))
-        view.setSource(os.path.join('qml','FeedingIt.qml'))
+        view.setSource(os.path.join('qml','main.qml'))
+        view.show()
+        #view.setSource(os.path.join('qml','FeedingIt.qml'))
 
     #view.showFullScreen()
-    view.show()
+    #view.show()
     sys.exit(app.exec_())
 
 if __name__ == "__main__":
index a077969..809f365 100644 (file)
@@ -4,6 +4,7 @@ Item {
     id: articleViewer
     //width: 480; height: 360;
     width: parent.width; height: parent.height;
+    property string feedid: parent.feedid
     //property string feedid: "61ac1458d761423344998dc76770e36e" //articlesItem.feedid;
     //property string hideReadArticles: "";
     property alias articleShown: articleView.visible;
@@ -154,7 +155,7 @@ Item {
         id: articles
 
         //source: articleViewer.feedid == "" ? "" : "http://localhost:8000/articles/" + feedid + "?onlyUnread=" + hideReadArticles
-        //xml: articleViewer.feedid == "" ? "" : controller.getArticlesXml(articleViewer.feedid)
+        xml: articleViewer.feedid == "" ? "" : controller.getArticlesXml(articleViewer.feedid)
         query: "/xml/article"
 
         XmlRole { name: "title"; query: "title/string()" }
index 6f95bfe..03d5eda 100644 (file)
@@ -4,7 +4,7 @@ Item {
 //    anchors.fill: parent;
     width: parent.width; height: parent.height;
     //anchors.top: parent.top; anchors.bottom: parent.bottom
-    property bool inEditMode: true
+    property bool inEditMode: false
     signal categoryClicked(string cat)
 
     function reload() {
index 874f426..fa6a6c0 100644 (file)
@@ -1,21 +1,19 @@
 import Qt 4.7
 
 Item {
-    //anchors.fill: parent;
-    width: parent.width;
-    property string catid : ""
-    property bool inEditMode: true
-    x: parent.width; height: parent.height;
-    anchors.top: parent.top; anchors.bottom: parent.bottom
+    property string catid : parent.catid
+    property bool inEditMode: false
+    width: parent.width; height: parent.height;
 
     signal feedClicked(string feedid)
 
     function reload() {
        feeds.xml = catid == "" ? "" : controller.getFeedsXml(catid);
         //feeds.reload()
+        console.log(feeds.xml)
     }
 
-    //Component.onCompleted: { console.log(x + " /") }
+    Component.onCompleted: { console.log(catid + "/" + parent.catid) }
 
     ListView {
         id: feedList; model: feeds; delegate: feedDelegate; z: 6
@@ -29,7 +27,7 @@ Item {
         id: feeds
 
         //source: catid == "" ? "" : "http://localhost:8000/feeds/" + catid //+ "?onlyUnread=" + parent.hideReadArticles
-        //xml: catid == "" ? "" : controller.getFeedsXml(catid)
+        xml: catid == "" ? "" : controller.getFeedsXml(catid)
         query: "/xml/feed"
 
         XmlRole { name: "title"; query: "feedname/string()" }
@@ -45,6 +43,8 @@ Item {
         id: feedDelegate
 
         Item {
+
+            Component.onCompleted: console.log("item:"+feedid)
             id: wrapper; width: wrapper.ListView.view.width;
             visible: (unread == "0" && feedsItem.hideReadFeeds=="True") ? false : true
             height: (visible) ? 86 : 0
@@ -97,8 +97,8 @@ Item {
                     
                 }
             }
-        }
 
+        }
     }
 
 }
index 28b4205..c0dd409 100644 (file)
@@ -49,7 +49,7 @@ PageStackWindow {
         Page {
             tools: commonTools
             Categories {
-                onCategoryClicked: pageStack.push(feedsPage, {catid: catid})
+                onCategoryClicked: pageStack.push(feedsPage, {catid: cat})
             }
         }
     }
@@ -58,9 +58,9 @@ PageStackWindow {
         id: feedsPage
         Page {
             tools: commonTools
+            property string catid
             Feeds {
                 id: feedsItem
-
                 onFeedClicked: pageStack.push(articlesPage, {feedid: feedid})
             }
         }
@@ -69,10 +69,32 @@ PageStackWindow {
     Component {
         id: articlesPage
         Page {
-            tools: commonTools
+            tools: articleTools
+            property string feedid
             ArticleViewer {
                 id: flipper
             }
         }
+
+        ToolBarLayout {
+            id: articleTools
+            visible: false
+            ToolIcon { iconId: "toolbar-back"; onClicked: {
+                    myMenu.close();
+                    if (flipper.articleShown) {
+                        flipper.articleShown = false;
+                        flipper.reload()
+                    } else {
+                        pageStack.pop();
+                    }
+                }
+                visible: pageStack.depth>1
+            }
+            ToolIcon {
+                platformIconId: "toolbar-view-menu"
+                anchors.right: (parent === undefined) ? undefined : parent.right
+                onClicked: (myMenu.status == DialogStatus.Closed) ? myMenu.open() : myMenu.close()
+            }
+        }
     }
 }