Changeset 47 for conseil.py

Timestamp:

07/21/06 12:24:01 (2 years ago)

Author:

ploum

Message:

#59 really fixed. tabs are now handled in a good and less hackish way.

Files:

• conseil.py (modified) (2 diffs)

conseil.py

@@ -79 +79 @@
                 if zetype == 2 or zetype == 3 :
                         try :
-                                ztree = widget.get_children()
-                                model= ztree[0].get_model()
+                                ztree = widget.get_children()[0].get_children()[0].get_children()[0]
+                                model= ztree.get_model()
                                 total = str(model.iter_n_children(None))
                                 title = "search for %s  - (%s results)" %(title,total)
                         #eek.. this is ugly, isn't it ?
                         except :
-                                title = "%s" %title
+                                title = "search for %s" %title
                 self.statusbar.pop(0)
                 self.statusbar.push(0,title)
@@ -203 +203 @@
         #main search button pressed
         def simpleSearch_clicked(self, widget):
-                searchString = self.wTree.get_widget("simple_search_entry").get_text()
-                dic = makedict()
-                # Have we a single bug number ?
-                if self.__isint(searchString) :
-                        dic["method"] = 1
-                        dic["bug"] = searchString
-                        self.retriever.display(dic)
-                # no, we have a search.
-                else :
-                        array = string.split(searchString,' ',1)
-                        if self.bts.packageExist(array[0]) :
-                                dic["method"]= 3
-                                dic["product"] = array[0]
-                                if len(array) < 2 :
-                                        dic["search"] = None
+                searchString = self.wTree.get_widget("simple_search_entry").get_text().strip()
+                if searchString != '' :
+                        dic = makedict()
+                        # Have we a single bug number ?
+                        if self.__isint(searchString) :
+                                dic["method"] = 1
+                                dic["bug"] = searchString
+                                self.retriever.display(dic)
+                        # no, we have a search.
+                        else :
+                                array = string.split(searchString,' ',1)
+                                if self.bts.packageExist(array[0]) :
+                                        dic["method"]= 3
+                                        dic["product"] = array[0]
+                                        if len(array) < 2 :
+                                                dic["search"] = None
+                                        else :
+                                                dic["search"] = array[1]        
+                                        self.retriever.display(dic)
                                 else :
-                                        dic["search"] = array[1]        
-                                self.retriever.display(dic)
-                        else :
-                                dic["method"]= 2
-                                dic["search"] = searchString
-                                self.retriever.display(dic)
+                                        dic["method"]= 2
+                                        dic["search"] = searchString
+                                        self.retriever.display(dic)