Changeset 10 for conseil.py

Timestamp:

07/04/06 14:14:49 (3 years ago)

Author:

ploum

Message:

You can add bookmarks (but still not remove them)

#bug5 solved

Files:

• conseil.py (modified) (7 diffs)

conseil.py

@@ -28 +28 @@
                 dic = { "on_btnSimplesearch_clicked" : self.simpleSearch_clicked, 
                         "on_window1_destroy" : gtk.main_quit,
-                        "on_bookmarks_row_activated": self.bookmarkClicked }
+                        "on_bookmarks_row_activated": self.bookmarkClicked,
+                        "on_addBookmark_clicked" : self.addBookmark_clicked }
                 self.wTree.signal_autoconnect(dic)
                 #Wich BTS are we using ?
@@ -81 +82 @@
                 treeV.append_column(column)
                 treeV.show()
-                return treeV
+                return listing
 
+        
         def bookmarkClicked(widget, path, view_column,user_param1):
                 zetuple = path.get_selection().get_selected()
@@ -89 +91 @@
                         # besoin de programmation défensive ici FIXME
                         bug_nbr = int(zetuple[0].get_value(zetuple[1],2))
-                        widget.__bugDisplay(widget.bts.retrieveBug(bug_nbr))
+                        widget.__bugDisplay(widget.bts.retrieveBug(bug_nbr),1,str(bug_nbr))
                 elif method == 2:
                         searchString = zetuple[0].get_value(zetuple[1],2)
-                        widget.__searchDisplay(widget.bts.genericSearch(searchString))
+                        widget.__searchDisplay(widget.bts.genericSearch(searchString),2,searchString)
                 elif method == 3:
                         string = zetuple[0].get_value(zetuple[1],2)
                         array = string.split(None,1)
-                        widget.__searchDisplay(widget.bts.packageSearch(array[0],array[1]))
+                        args = "%s\n%s"%(array[0],array[1])
+                        widget.__searchDisplay(widget.bts.packageSearch(array[0],array[1]),3,args)
+
+        def addBookmark_clicked(self, widget):
+                tab = self.bugs_tabs.get_nth_page(self.bugs_tabs.get_current_page())
+                #Naughty hack : informations about a tab are stored in the wigdet name
+                array=tab.get_name().split("\n\n",2)
+                self.addBookmark(array[0],int(array[1]),array[2])
+
+        def addBookmark(self,title,searchMethod, args) :
+                self.bookmarks.insert_before(None, [title, searchMethod, args])
         
         def closeTab(self, widget):
@@ -113 +125 @@
                         array = string.split(searchString,' ',1)
                         if self.bts.packageExist(array[0]) :
-                                self.__searchDisplay(self.bts.packageSearch(array[0],array[1]))
+                                args="%s\n%s"%(array[0],array[1])
+                                self.__searchDisplay(self.bts.packageSearch(array[0],array[1]),3,args)
                         else :
-                                self.__searchDisplay(self.bts.genericSearch(searchString))
+                                self.__searchDisplay(self.bts.genericSearch(searchString),2,searchString)
                         #TODO : remplacer le none par un widget digne de ce nom
                         
@@ -121 +134 @@
 
         #We did a simple search
-        def __searchDisplay(self, store):
+        def __searchDisplay(self, store,search_type,args):
                 #First, we ask for the result as it can takes some times                        
                 tree=self.__treeInit__()
                 handler = tree.connect("row-activated", self.__row_clicked, tree.get_selection())
+                if search_type == 3 :
+                        array= args.split("\n",1)
+                        title = "(%s) %s"%(array[0],array[1])
+                        zename = "%s\n\n3\n\n%s"%(title,args)
+                else :
+                        title = "%s" %args
+                        zename = "%s\n\n2\n\n%s"%(title,args)
+                tree.set_name(zename) 
                 tree.set_headers_clickable(1)
                 tree.set_rules_hint(1)
                 tree.set_model(store)
-                self.insertTab(tree,"résultat")
+                self.insertTab(tree,title)
 
         #Callback for the row_activated in a search view
@@ -141 +162 @@
         # (it will be nicely one day, I swear...)
         def __bugDisplay(self, zebug) :
+                bugnbr=str(zebug.getNbr())
                 bugtemplate = "bug_template.glade"
                 bugwidget = gtk.glade.XML(bugtemplate)
                 widget_nbr = bugwidget.get_widget("number") 
-                widget_nbr.set_text(str(zebug.getNbr()))
+                widget_nbr.set_text(bugnbr)
                 widget_title = bugwidget.get_widget("title") 
                 widget_title.set_text(zebug.getTitle())
@@ -152 +174 @@
                 #We take the vbox to insert it
                 main_widget = bugwidget.get_widget("bug_main")
-                self.insertTab(main_widget,"bug #XXX")
+                title = "bug #%s"%bugnbr
+                zename= "%s\n\n1\n\n%s" %(title,bugnbr)
+                main_widget.set_name(zename)
+                self.insertTab(main_widget,title)
                 #self.bugs_tabs.insert_page(main_widget, None)