Version 0.2.0-3

* Removed horizontal scrolling of articles

diff --git a/debian/changelog b/debian/changelog
index bb114c2..0a9d377 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,15 @@
-feedingit (0.2.0-1) unstable; urgency=low
+feedingit (0.2.0-3) unstable; urgency=low
+
+  * Removed horizontal scrolling of articles
+  
+ -- Yves <yves@marcoz.org>  Sun, 10 Jan 2010 10:01:19 -0800
+
+feedingit (0.2.0-2) unstable; urgency=low
 
   * Added support for left/right gestures in articles
   * Added support for sorting the feed list
   
- -- Yves <yves@marcoz.org>  Thu, 09 Jan 2010 22:03:19 -0800
+ -- Yves <yves@marcoz.org>  Sat, 09 Jan 2010 22:03:19 -0800
 
 feedingit (0.1.3-1) unstable; urgency=low
 

diff --git a/src/FeedingIt.py b/src/FeedingIt.py
index ec256b9..9360b50 100644 (file)
--- a/src/FeedingIt.py
+++ b/src/FeedingIt.py
@@ -110,7 +110,7 @@ class Download(threading.Thread):
         
 class DownloadDialog():
     def __init__(self, parent, listing, listOfKeys):
-        self.listOfKeys = listOfKeys
+        self.listOfKeys = listOfKeys[:]
         self.listing = listing
         self.total = len(self.listOfKeys)
         self.current = 0            
@@ -292,7 +292,7 @@ class DisplayArticle(hildon.StackableWindow):
         self.view = gtkhtml2.View()
         self.pannable_article = hildon.PannableArea()
         self.pannable_article.add(self.view)
-        self.pannable_article.set_property("mov-mode", hildon.MOVEMENT_MODE_BOTH)
+        #self.pannable_article.set_property("mov-mode", hildon.MOVEMENT_MODE_BOTH)
         self.pannable_article.connect('horizontal-movement', self.gesture)
         self.document = gtkhtml2.Document()
         self.view.set_document(self.document)
@@ -319,7 +319,7 @@ class DisplayArticle(hildon.StackableWindow):
         self.document.connect("link_clicked", self._signal_link_clicked)
         self.document.connect("request-url", self._signal_request_url)
         self.destroyId = self.connect("destroy", self.destroyWindow)
-        self.timeout_handler_id = gobject.timeout_add(200, self.reloadArticle)
+        self.timeout_handler_id = gobject.timeout_add(300, self.reloadArticle)
         
     def gesture(self, widget, direction, startx, starty):
         #self.disconnect(self.destroyId)
@@ -421,13 +421,13 @@ class DisplayFeed(hildon.StackableWindow):
     def nextArticle(self, object, index):
         label = self.buttons[index].child
         label.modify_font(pango.FontDescription("sans 16"))
-        index = (index+1) % len(self.listing.getListOfFeeds())
+        index = (index+1) % self.feed.getNumberOfEntries()
         self.button_clicked(object, index)
 
     def previousArticle(self, object, index):
         label = self.buttons[index].child
         label.modify_font(pango.FontDescription("sans 16"))
-        index = (index-1) % len(self.listing.getListOfFeeds())
+        index = (index-1) % self.feed.getNumberOfEntries()
         self.button_clicked(object, index)
 
     def onArticleClosed(self, object, index):
@@ -572,11 +572,11 @@ class FeedingIt:
             self.buttons[key] = button
         self.window.add(self.pannableListing)
         self.window.show_all()
-    
+
     def buttonFeedClicked(widget, button, self, window, key):
         disp = DisplayFeed(self.listing, self.listing.getFeed(key), self.listing.getFeedTitle(key), key)
         disp.connect("feed-closed", self.onFeedClosed)
-        
+
     def onFeedClosed(self, object, key):
         self.buttons[key].set_text(self.listing.getFeedTitle(key), self.listing.getFeedUpdateTime(key) + " / " 
                             + str(self.listing.getFeedNumberOfUnreadItems(key)) + " Unread Items")

diff --git a/src/rss.py b/src/rss.py
index 7aa0411..fe91c53 100644 (file)
--- a/src/rss.py
+++ b/src/rss.py
@@ -143,6 +143,7 @@ class Listing:
             file.close()
         else:
             self.listOfFeeds = {getId("Slashdot"):{"title":"Slashdot", "url":"http://rss.slashdot.org/Slashdot/slashdot"}, }
+        print self.listOfFeeds.has_key("feedingit-order")
         if self.listOfFeeds.has_key("feedingit-order"):
             self.sortedKeys = self.listOfFeeds["feedingit-order"]
         else:
@@ -158,8 +159,11 @@ class Listing:
         self.saveConfig()
         
     def updateFeeds(self):
+        print self.sortedKeys
         for key in self.getListOfFeeds():
+            print key, self.sortedKeys
             self.feeds[key].updateFeed()
+        print self.sortedKeys
             
     def updateFeed(self, key):
         self.feeds[key].updateFeed()