From 7e053ca390b16f8088dae2ca5634c8329d3fa736 Mon Sep 17 00:00:00 2001 From: Yves Date: Wed, 17 Mar 2010 21:01:00 -0700 Subject: [PATCH] 0.5.2-3: fix for unread color from theme. Fix for mark all as read button. --- debian/changelog | 6 ++++++ src/FeedingIt.py | 19 +++++++++---------- src/rss.py | 2 +- 3 files changed, 16 insertions(+), 11 deletions(-) diff --git a/debian/changelog b/debian/changelog index ac13232..b0fce5f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +feedingit (0.5.2-3) unstable; urgency=low + + * Changed theme colour used + + -- Yves Wed, 17 Mar 2010 19:05:19 -0800 + feedingit (0.5.2-2) unstable; urgency=low * Fixed horizontal scrolling diff --git a/src/FeedingIt.py b/src/FeedingIt.py index 727fc2b..2259fd1 100644 --- a/src/FeedingIt.py +++ b/src/FeedingIt.py @@ -19,7 +19,7 @@ # ============================================================================ # Name : FeedingIt.py # Author : Yves Marcoz -# Version : 0.5.0 +# Version : 0.5.2 # Description : Simple RSS Reader # ============================================================================ @@ -55,6 +55,10 @@ import socket timeout = 5 socket.setdefaulttimeout(timeout) +color_style = gtk.rc_get_style_by_paths(gtk.settings_get_default() , 'GtkButton', 'osso-logical-colors', gtk.Button) +fg_colog = color_style.lookup_color('ActiveTextColor') +del color_style + CONFIGDIR="/home/user/.feedingit/" class AddWidgetWizard(hildon.WizardDialog): @@ -565,7 +569,7 @@ class DisplayFeed(hildon.StackableWindow): #print self.listing.getFont() + " bold" label.modify_font(pango.FontDescription(self.config.getUnreadFont())) #label.modify_fg(gtk.STATE_NORMAL, gtk.gdk.color_parse("SkyBlue")) - fg_color = fg_button.child.get_children()[0].get_children()[0].get_children()[1].get_style().fg[gtk.STATE_NORMAL] + #fg_color = fg_button.child.get_children()[0].get_children()[0].get_children()[1].get_style().fg[gtk.STATE_NORMAL] label.modify_fg(gtk.STATE_NORMAL, fg_color) #label.modify_font(pango.FontDescription("sans bold 23")) #"sans bold 16" @@ -739,8 +743,8 @@ class FeedingIt: def button_markAll(self, button): for key in self.listing.getListOfFeeds(): feed = self.listing.getFeed(key) - for index in range(feed.getNumberOfEntries()): - feed.setEntryRead(index) + for id in feed.getIds(): + feed.setEntryRead(id) self.refreshList() def button_export_clicked(self, button): @@ -821,12 +825,7 @@ class FeedingIt: button.connect("clicked", self.buttonFeedClicked, self, self.window, key) self.vboxListing.pack_start(button, expand=False) self.buttons[key] = button - global fg_button - fg_button = button - #fg_color = button.child.get_children()[0].get_children()[0].get_children()[1].get_style().fg[gtk.STATE_NORMAL] - - #if type(self.downloadDialog).__name__=="DownloadBar": - # self.vboxListing.pack_start(self.downloadDialog) + self.mainVbox.pack_start(self.pannableListing) self.window.show_all() diff --git a/src/rss.py b/src/rss.py index 8ac1e9a..0ceb236 100644 --- a/src/rss.py +++ b/src/rss.py @@ -19,7 +19,7 @@ # ============================================================================ # Name : FeedingIt.py # Author : Yves Marcoz -# Version : 0.5.0 +# Version : 0.5.2 # Description : Simple RSS Reader # ============================================================================ -- 1.7.9.5