# HG changeset patch
# User Dirk Olmes <dirk@xanthippe.ping.de>
# Date 1279898962 -7200
# Node ID daa2731967fed02bbc5f9fe34495441a26b442ab
# Parent  dcee24702dd7fc37beccc42335f9ffe83dfac82f
Marking all articles in a feed as read doesn't toggle any more ... it marks all articles as read.

diff -r dcee24702dd7 -r daa2731967fe Feed.py
--- a/Feed.py	Fri Jul 23 17:24:32 2010 +0200
+++ b/Feed.py	Fri Jul 23 17:29:22 2010 +0200
@@ -30,6 +30,6 @@
         delta = timedelta(minutes=self.update_interval)
         self.next_update = datetime.now() + delta
 
-    def toggleRead(self):
+    def markAllEntriesRead(self):
         for entry in self.entries:
-            entry.toggleRead()
\ No newline at end of file
+            entry.markRead()
\ No newline at end of file
diff -r dcee24702dd7 -r daa2731967fe FeedEntry.py
--- a/FeedEntry.py	Fri Jul 23 17:24:32 2010 +0200
+++ b/FeedEntry.py	Fri Jul 23 17:29:22 2010 +0200
@@ -22,6 +22,12 @@
     
     def toggleRead(self):
         if self.read:
-            self.read = 0
+            self.markUnread()
         else:
-            self.read = 1
+            self.markRead()
+            
+    def markRead(self):
+        self.read = 1
+
+    def markUnread(self):
+        self.read = 0
\ No newline at end of file
diff -r dcee24702dd7 -r daa2731967fe MainWindow.py
--- a/MainWindow.py	Fri Jul 23 17:24:32 2010 +0200
+++ b/MainWindow.py	Fri Jul 23 17:29:22 2010 +0200
@@ -69,8 +69,8 @@
         self.session.commit()
         self.ui.feedList.update()
         
-    def toggleReadOnSelectedFeed(self):
-        self.selectedFeed.toggleRead()
+    def markSelectedFeedRead(self):
+        self.selectedFeed.markAllEntriesRead()
         self.session.commit()
         self.ui.feedEntryList.update()
     
diff -r dcee24702dd7 -r daa2731967fe Ui_MainWindow.ui
--- a/Ui_MainWindow.ui	Fri Jul 23 17:24:32 2010 +0200
+++ b/Ui_MainWindow.ui	Fri Jul 23 17:29:22 2010 +0200
@@ -355,7 +355,7 @@
    <sender>actionMarkFeedRead</sender>
    <signal>activated()</signal>
    <receiver>MainWindow</receiver>
-   <slot>toggleReadOnSelectedFeed()</slot>
+   <slot>markSelectedFeedRead()</slot>
    <hints>
     <hint type="sourcelabel">
      <x>-1</x>
@@ -377,6 +377,6 @@
   <slot>openLinkFromSelectedEntry()</slot>
   <slot>showPreferences()</slot>
   <slot>showFeedSettings()</slot>
-  <slot>toggleReadOnSelectedFeed()</slot>
+  <slot>markSelectedFeedRead()</slot>
  </slots>
 </ui>