Changeset marienz@gentoo.org-20061201211351-frtias63vvrfw6sb in marienz/pgui

Timestamp:

12/01/06 21:13:51 (4 years ago)

Author:

Marien Zwart <marienz@…>

branch-nick:

pgui

Message:

Some cleanup.

Location:

pgui

Files:

• main.py (modified) (7 diffs)
• pgui.glade (modified) (2 diffs)

pgui/main.py

@@ -34 +34 @@
         self.xml.signal_autoconnect(self)
 
-        self.statusbar = self.xml.get_widget('statusbar')
-        self.search_context = self.statusbar.get_context_id('search')
-
-        self.repocats = self.xml.get_widget('pkgtreeview')
+        self.search_context = self['statusbar'].get_context_id('search')
+
+        repocats = self['pkgtreeview']
 
         text_rend = gtk.CellRendererText()
 
         repo_combo = self['repocombo']
+        repo_combo.connect('changed', self.repo_selected, repocats)
         search_repo_combo = self['searchrepocombo']
         repos = gtk.ListStore(str, object)
@@ -59 +59 @@
             combo.add_attribute(text_rend, 'text', 0)
 
-        self.repocats.insert_column_with_attributes(
-            0, 'Name', text_rend, text=0)
-        self.repocats.get_selection().connect(
+        repocats.insert_column_with_attributes(0, 'Name', text_rend, text=0)
+        repocats.get_selection().connect(
             'changed', self.content_selected, self['reposcroller'])
 
@@ -136 +135 @@
         self['about'].hide()
 
-    def repo_selected(self, combo):
+    def repo_selected(self, combo, repocats):
         name, repo = combo.props.model[combo.props.active]
-        self.repocats.set_model(repomodel.RepoModel(repo))
+        repocats.set_model(repomodel.RepoModel(repo))
 
     def find(self, button):
@@ -156 +155 @@
             None, (str(restriction), repomodel.TOP, results))
         cats = {}
-        self.statusbar.pop(self.search_context)
-        self.statusbar.push(self.search_context, 'Search started')
+        self['statusbar'].pop(self.search_context)
+        self['statusbar'].push(self.search_context, 'Search started')
         self.search_task = gobject.idle_add(
             self.search, repo.itermatch(restriction, yield_none=True), button,
@@ -180 +179 @@
                 self.searchstore.append(
                     pkg, (res.fullver, repomodel.VER, res))
-                self.statusbar.pop(self.search_context)
-                self.statusbar.push(
+                self['statusbar'].pop(self.search_context)
+                self['statusbar'].push(
                     self.search_context, '%s results so far' % (len(results),))
             return True
@@ -188 +187 @@
             button.props.sensitive = True
             self.stop_search_button.props.sensitive = False
-            self.statusbar.pop(self.search_context)
-            self.statusbar.push(self.search_context, 'Search finished')
+            self['statusbar'].pop(self.search_context)
+            self['statusbar'].push(self.search_context, 'Search finished')
             return False
 
@@ -196 +195 @@
         self.search_button.props.sensitive = True
         gobject.source_remove(self.search_task)
-        self.statusbar.pop(self.search_context)
-        self.statusbar.push(self.search_context, 'Search aborted')
+        self['statusbar'].pop(self.search_context)
+        self['statusbar'].push(self.search_context, 'Search aborted')
         self.search_task = None
 

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:06:27 2006 by marienz@cyclops-->
+<!--Generated with glade3 3.0.2 on Fri Dec  1 22:11:31 2006 by marienz@cyclops-->
 <glade-interface>
   <widget class="GtkWindow" id="main">
@@ -73 +73 @@
                       <widget class="GtkComboBox" id="repocombo">
                         <property name="visible">True</property>
-                        <signal name="changed" handler="repo_selected"/>
                       </widget>
                       <packing>