Added unread cyan colour/Fix unread tracking

diff --git a/src/FeedingIt.py b/src/FeedingIt.py
index 8231faf..b1227a2 100644 (file)
--- a/src/FeedingIt.py
+++ b/src/FeedingIt.py
@@ -556,9 +556,11 @@ class DisplayFeed(hildon.StackableWindow):
             if self.feed.isEntryRead(id):
                 #label.modify_font(pango.FontDescription("sans 16"))
                 label.modify_font(pango.FontDescription(self.config.getReadFont()))
+                label.modify_fg(gtk.STATE_NORMAL, gtk.gdk.color_parse("white"))
             else:
                 #print self.listing.getFont() + " bold"
                 label.modify_font(pango.FontDescription(self.config.getUnreadFont()))
+                label.modify_fg(gtk.STATE_NORMAL, gtk.gdk.color_parse("SkyBlue"))
                 #label.modify_font(pango.FontDescription("sans bold 23"))
                 #"sans bold 16"
             label.set_line_wrap(True)
@@ -619,18 +621,21 @@ class DisplayFeed(hildon.StackableWindow):
     def nextArticle(self, object, index):
         label = self.buttons[index].child
         label.modify_font(pango.FontDescription(self.config.getReadFont()))
+        label.modify_fg(gtk.STATE_NORMAL, gtk.gdk.color_parse("white"))
         id = self.feed.getNextId(index)
         self.button_clicked(object, id, next=True)
 
     def previousArticle(self, object, index):
         label = self.buttons[index].child
         label.modify_font(pango.FontDescription(self.config.getReadFont()))
+        label.modify_fg(gtk.STATE_NORMAL, gtk.gdk.color_parse("white"))
         id = self.feed.getPreviousId(index)
         self.button_clicked(object, id, previous=True)
 
     def onArticleClosed(self, object, index):
         label = self.buttons[index].child
         label.modify_font(pango.FontDescription(self.config.getReadFont()))
+        label.modify_fg(gtk.STATE_NORMAL, gtk.gdk.color_parse("white"))
         self.buttons[index].show()
 
     def button_update_clicked(self, button):
@@ -657,6 +662,7 @@ class DisplayFeed(hildon.StackableWindow):
             self.feed.setEntryRead(index)
             label = self.buttons[index].child
             label.modify_font(pango.FontDescription(self.config.getReadFont()))
+            label.modify_fg(gtk.STATE_NORMAL, gtk.gdk.color_parse("white"))
             self.buttons[index].show()
 
 

diff --git a/src/rss.py b/src/rss.py
index 4fea77e..4dc3b78 100644 (file)
--- a/src/rss.py
+++ b/src/rss.py
@@ -74,6 +74,33 @@ class ImageHandler:
             os.remove(filename)
             del self.images[url]
 
+class UnreadTracker:
+    def __init__(self):
+        self.readItems = {}
+        self.countUnread
+        
+    def setEntryUnread(self, id):
+        if self.readItems.has_key(id):
+            if self.readItems[id]==True:
+                self.countUnread = self.countUnread + 1
+                self.readItems[id] = False
+        else:
+            self.readItems[id] = False
+            self.countUnread = self.countUnread + 1
+    
+    def setEntryRead(self, id):
+        if self.readItems[id]==False:
+            self.countUnread = self.countUnread - 1
+            self.readItems[id] = True
+
+    def isRead(self, id):
+        return self.readItems[id]
+    
+    def removeEntry(self, id):
+        if self.readItems[id]==False:
+            self.countUnread = self.countUnread - 1
+        del self.readItems[id]
+
 class Feed:
     def __init__(self, uniqueId, name, url, imageHandler):
         self.titles = []
@@ -454,7 +481,7 @@ class Listing:
             self.listOfFeeds[key]["updateTime"] = feed.getUpdateTime()
             
     def updateFeed(self, key, expiryTime=24):
-        feed = self.loadFeed(key)
+        feed = self.getFeed(key)
         feed.updateFeed(self.configdir, expiryTime)
         self.listOfFeeds[key]["unread"] = feed.getNumberOfUnreadItems()
         self.listOfFeeds[key]["updateTime"] = feed.getUpdateTime()