Changeset marienz@gentoo.org-20061201212649-082ys3jqfumeo9mz in marienz/pgui

Timestamp:

12/01/06 21:26:49 (4 years ago)

Author:

Marien Zwart <marienz@…>

branch-nick:

pgui

Message:

Cleanup.

Location:

pgui

Files:

• main.py (modified) (6 diffs)
• pgui.glade (modified) (3 diffs)

pgui/main.py

@@ -68 +68 @@
         searchbox.pack_start(self.restriction, False, True)
         searchbox.show_all()
-        self.searchrepocombo = self['searchrepocombo']
         self.search_task = None
-        self.search_button = self['searchbutton']
+        self['searchbutton'].connect(
+            'clicked', self.find, self['stopsearchbutton'], search_repo_combo)
+        self['stopsearchbutton'].connect(
+            'clicked', self.stop_search, self['searchbutton'])
 
         searchtree = self['searchtreeview']
         searchtree.insert_column_with_attributes(
             0, 'Name', text_rend, text=0)
-        self.searchscroller = self['searchscroller']
         searchtree.get_selection().connect(
             'changed', self.content_selected, self['searchscroller'])
@@ -82 +83 @@
         self.searchstore = gtk.TreeStore(str, int, object)
         searchtree.set_model(self.searchstore)
-        self.stop_search_button = self['stopsearchbutton']
 
     def __getitem__(self, key):
@@ -139 +139 @@
         repocats.set_model(repomodel.RepoModel(repo))
 
-    def find(self, button):
+    def find(self, button, stop_button, combo):
         try:
             restriction = self.restriction.restriction.get_restriction()
@@ -146 +146 @@
             return
         button.props.sensitive = False
-        self.stop_search_button.props.sensitive = True
+        stop_button.props.sensitive = True
         assert self.search_task is None
-        self.search_button = button
-        combo = self.searchrepocombo
         name, repo = combo.props.model[combo.props.active]
         results = gtk.ListStore(object)
@@ -159 +157 @@
         self.search_task = gobject.idle_add(
             self.search, repo.itermatch(restriction, yield_none=True), button,
-            top, cats, results)
-
-    def search(self, search_iter, button, top, cats, results):
+            stop_button, top, cats, results)
+
+    def search(self, search_iter, search_button, stop_button, top, cats,
+               results):
         # Trick: We execute the loop body at most once. Doing it this
         # way is faster than a try/except StopIteration.
-        #print 'Search', search_iter, button, top, cats, results
         for res in search_iter:
             if res is not None:
@@ -185 +183 @@
         else:
             self.search_task = None
-            button.props.sensitive = True
-            self.stop_search_button.props.sensitive = False
+            search_button.props.sensitive = True
+            stop_button.props.sensitive = False
             self['statusbar'].pop(self.search_context)
             self['statusbar'].push(self.search_context, 'Search finished')
             return False
 
-    def stop_search(self, button):
-        button.props.sensitive = False
-        self.search_button.props.sensitive = True
+    def stop_search(self, stop_button, search_button):
+        stop_button.props.sensitive = False
+        search_button.props.sensitive = True
         gobject.source_remove(self.search_task)
         self['statusbar'].pop(self.search_context)

pgui/pgui.glade

@@ -1 +1 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd">
-<!--Generated with glade3 3.0.2 on Fri Dec  1 22:11:31 2006 by marienz@cyclops-->
+<!--Generated with glade3 3.0.2 on Fri Dec  1 22:19:22 2006 by marienz@cyclops-->
 <glade-interface>
   <widget class="GtkWindow" id="main">
@@ -175 +175 @@
                             <property name="label" translatable="yes">gtk-stop</property>
                             <property name="use_stock">True</property>
-                            <signal name="clicked" handler="stop_search"/>
                           </widget>
                           <packing>
@@ -186 +185 @@
                             <property name="label" translatable="yes">gtk-find</property>
                             <property name="use_stock">True</property>
-                            <signal name="clicked" handler="find"/>
-                            <signal name="activate" handler="search"/>
                           </widget>
                           <packing>