From 22e7726facbffa51a8829359852f18f06e372acf Mon Sep 17 00:00:00 2001 From: DrFrasierCrane Date: Mon, 10 Dec 2007 09:59:07 +0100 Subject: [PATCH] Fix putting new feeds into selected category. --- straw/subscribe.py | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/straw/subscribe.py b/straw/subscribe.py index e3d4a33..2b17049 100644 --- a/straw/subscribe.py +++ b/straw/subscribe.py @@ -66,7 +66,7 @@ class SubscribeView(MVP.GladeView): for node in self.nodes[parent_id]: if node.type == "C": - treeiter = self.category_store.append(parent, [self.category_pixbuf, node.name]) + treeiter = self.category_store.append(parent, [self.category_pixbuf, node.name, node]) if self.nodes.has_key(node.id): self._populate_tree(node.id, treeiter) @@ -154,13 +154,13 @@ class SubscribeView(MVP.GladeView): self.store[path][0] = not self.store[path][0] def setup_category_tree(self): - self.category_store = gtk.TreeStore(gtk.gdk.Pixbuf, str) + self.category_store = gtk.TreeStore(gtk.gdk.Pixbuf, str, gobject.TYPE_PYOBJECT) self.nodes = FeedManager.get_model()[1] self._category_tree.set_model(None) self._category_tree.set_model(self.category_store) - treeiter = self.category_store.append(None, [self.category_pixbuf, "Main category"]) + treeiter = self.category_store.append(None, [self.category_pixbuf, "Main category", None]) self._populate_tree(1, parent = treeiter) self._category_tree.expand_all() @@ -194,8 +194,19 @@ class SubscribeView(MVP.GladeView): if self.state == STATE_FINISH: new_feeds = [] + # Obtain selected category. + + parent = None + iter = self._category_tree.get_selection().get_selected()[1] + + if iter != None: + path = self.category_store.get_path(iter) + parent = self.category_store[path][2] + + # Save selected feeds. + for feed in [row[2] for row in self.store if row[0]]: - feed.parent = None + feed.parent = parent new_feeds.append(feed) FeedManager.save_all(new_feeds) -- 2.11.4.GIT