From 52dd99bd77e3237ee3b2a8efc1d0a07862ad22e3 Mon Sep 17 00:00:00 2001
From: DrFrasierCrane <yagood@o2.pl>
Date: Fri, 21 Dec 2007 19:16:17 +0100
Subject: [PATCH] Improved subscription dialog.

---
 straw/subscribe.py | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/straw/subscribe.py b/straw/subscribe.py
index b5dfa4c..38be1f1 100644
--- a/straw/subscribe.py
+++ b/straw/subscribe.py
@@ -130,7 +130,6 @@ class SubscribeView(MVP.GladeView):
         column = gtk.TreeViewColumn(_('Keep'), renderer, active = 0)
         renderer.connect('toggled', self.col1_toggled_cb, self.store)
         self._result_tree.append_column(column)
-        #renderer.connect('toggled', self._sticky_toggled)
 
         renderer2 = gtk.CellRendererText()
         column = gtk.TreeViewColumn(_('_Title'), renderer2, markup = 1)
@@ -150,9 +149,13 @@ class SubscribeView(MVP.GladeView):
 
         self._category_tree.append_column(column)
 
-    def col1_toggled_cb( self, cell, path, model ):
+    def col1_toggled_cb(self, cell, path, model):
         self.store[path][0] = not self.store[path][0]
 
+        # We only enable "Apply" button when at least one discovered feed is selected.
+
+        self._button3.set_sensitive(bool(sum([feed[0] for feed in self.store])))
+
     def setup_category_tree(self):
         self.category_store = gtk.TreeStore(gtk.gdk.Pixbuf, str, gobject.TYPE_PYOBJECT)
         self.nodes = FeedManager.get_model()
@@ -165,6 +168,9 @@ class SubscribeView(MVP.GladeView):
         self._populate_tree(1, parent = treeiter)
         self._category_tree.expand_all()
 
+        selection = self._category_tree.get_selection()
+        selection.select_path("0")
+
     def display_error(self, text):
         self._error_box.set_property('visible',True)
         self._error_text.set_text(text)
@@ -210,7 +216,7 @@ class SubscribeView(MVP.GladeView):
                 new_feeds.append(feed)
 
             FeedManager.save_all(new_feeds)
-            
+
             self._window.hide()
 
     def _discovery_finished(self, handler, feeds):
@@ -219,9 +225,11 @@ class SubscribeView(MVP.GladeView):
         for feed in feeds:
             label = xml.sax.saxutils.escape(feed.title) + '\n<span size="smaller">' + xml.sax.saxutils.escape(feed.location) + '</span>'
             self.store.append([None, label, feed])
+        self.store.append([None, "aaa", "ble"])
 
         self._progress_bar.props.visible = False
         self._button2.set_sensitive(True)
+        self._button3.set_sensitive(False)
         self.progress_destroy()
         self.state = STATE_FINISH
         self.set_state(gtk.STOCK_CLOSE, gtk.STOCK_GO_BACK, gtk.STOCK_APPLY)
-- 
2.11.4.GIT