Changeset 30 for conseil.py

Timestamp:

07/09/06 11:28:48 (2 years ago)

Author:

ploum

Message:

End of refactorization before XML transition

Files:

• conseil.py (modified) (5 diffs)

conseil.py

@@ -87 +87 @@
                 return tree
 
-
         def bookmarks_button_press(self,widget, event) :
                 #middle click, we open the bug
@@ -117 +116 @@
         
         def bookmarkClicked(widget, path, view_column,user_param1):
-                zetuple = path.get_selection().get_selected()
-                method = zetuple[0].get_value(zetuple[1],1)
+                clicked = bookmark(path)
+                method = clicked.get_method()
+                dic = makedict()
                 if method == 1:
                         # besoin de programmation défensive ici FIXME
-                        bug_nbr = int(zetuple[0].get_value(zetuple[1],2))
+                        bug_nbr = clicked.get_bug()
                         widget.__bugDisplay(widget.bts.retrieveBug(bug_nbr))
                 elif method == 2:
-                        searchString = zetuple[0].get_value(zetuple[1],2)
-                        widget.__searchDisplay(widget.bts.genericSearch(searchString),2,searchString)
+                        dic["method"] = 2
+                        searchString = clicked.get_search()
+                        dic["search"] = searchString
+                        widget.__searchDisplay(widget.bts.genericSearch(searchString),2,dic)
                 elif method == 3:
-                        string = zetuple[0].get_value(zetuple[1],2)
-                        array = string.split(None,1)
-                        if len(array) < 2 :
-                                widget.__searchDisplay(widget.bts.packageSearch(array[0],None),3,array[0])
-                        else :  
-                                widget.__searchDisplay(widget.bts.packageSearch(array[0],array[1]),3,string)
+                        dic["method"] = 3
+                        product = clicked.get_product()
+                        dic["product"] = product
+                        search = clicked.get_search()
+                        dic["search"] = search
+                        widget.__searchDisplay(widget.bts.packageSearch(product,search),3,dic)
 
         #when the "add bookmark button is clicked
@@ -151 +153 @@
                 else :
                         array = string.split(searchString,' ',1)
+                        dic = makedict()
                         if self.bts.packageExist(array[0]) :
+                                dic["method"]= 3
+                                dic["product"] = array[0]
                                 #this is only to avoid an error when searching on a lonely package
                                 if len(array) < 2 :
-                                        self.__searchDisplay(self.bts.packageSearch(array[0],None),3,array[0])
-                                        #array.append('')
+                                        self.__searchDisplay(self.bts.packageSearch(array[0],None),3,dic)
                                 else :
-                                        args="%s\n%s"%(array[0],array[1])
-                                        self.__searchDisplay(self.bts.packageSearch(array[0],array[1]),3,args)
+                                        dic["search"] = array[1]        
+                                        self.__searchDisplay(self.bts.packageSearch(array[0],array[1]),3,dic)
                         else :
-                                self.__searchDisplay(self.bts.genericSearch(searchString),2,searchString)
+                                self.__searchDisplay(self.bts.genericSearch(searchString),2,dic)
 
         #We did a simple search
@@ -240 +244 @@
                 tab = tab_page.get_widget()
                 name = tab_page.get_title()
-                def closeTab(tab):
-                        page = self.bugs_tabs.page_num(tab)
+                def closeTab(widget, data):
+                        page = self.bugs_tabs.page_num(data)
                         self.bugs_tabs.remove_page(page)
                 #this is ugly ! I don't want to use glade for this
                 label_widget=gtk.glade.XML("tab_label.glade")
-                dic = {"on_close_tab_clicked" : lambda tab: closeTab(tab) }
+                dic = {"on_close_tab_clicked" : lambda close: closeTab(close, tab) }
                 label_widget.signal_autoconnect(dic)
                 label=label_widget.get_widget("label1")
@@ -251 +255 @@
                 top=label_widget.get_widget("hbox1")
                 tabid = self.bugs_tabs.insert_page(tab, top)
+
+
+#make a search dictionnary
+#Those dict are passed as argument to __searchDisplay
+def makedict() :
+        return dict([["method",None],["search",None],["product",None]])