Changeset 12 for conseil.py

Timestamp:

07/04/06 16:43:14 (3 years ago)

Author:

ploum

Message:

bug#1 : close tab close the focused tab, not the clicked one (thanks to
kikidonk)
bug#2 : searching for a package only doesn't work

Files:

• conseil.py (modified) (7 diffs)

conseil.py

@@ -91 +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),1,str(bug_nbr))
+                        widget.__bugDisplay(widget.bts.retrieveBug(bug_nbr))
                 elif method == 2:
                         searchString = zetuple[0].get_value(zetuple[1],2)
@@ -98 +98 @@
                         string = zetuple[0].get_value(zetuple[1],2)
                         array = string.split(None,1)
+                        if len(array) < 2 :
+                                array.append('')
                         args = "%s\n%s"%(array[0],array[1])
                         widget.__searchDisplay(widget.bts.packageSearch(array[0],array[1]),3,args)
@@ -111 +113 @@
                 self.bookmarks.insert_before(None, [title, searchMethod, args])
         
-        def closeTab(self, widget):
+        def closeTab(self, widget, data):
                 # FIXME
                 # This is ugly as we don't close the clicked tab
                 # temporary ugliness
-                self.bugs_tabs.remove_page(self.bugs_tabs.get_current_page())
+                #child = widget.get_parent()
+                page = self.bugs_tabs.page_num(data)
+                #page = int(child.get_name())
+                #page = self.bugs_tabs.page_num(child)
+                print page
+                self.bugs_tabs.remove_page(page)
         
         def simpleSearch_clicked(self, widget):
@@ -126 +133 @@
                         array = string.split(searchString,' ',1)
                         if self.bts.packageExist(array[0]) :
+                                if len(array) < 2 :
+                                        array.append('')
                                 args="%s\n%s"%(array[0],array[1])
                                 self.__searchDisplay(self.bts.packageSearch(array[0],array[1]),3,args)
@@ -151 +160 @@
                 tree.set_model(store)
                 self.insertTab(tree,title)
+                
 
         #Callback for the row_activated in a search view
@@ -183 +193 @@
         # Adding a tab
         def insertTab(self, widget, name) :
+                tab = widget
                 #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" : self.closeTab}
+                #dic = {"on_close_tab_clicked" : self.closeTab(tab) }
+                dic = {"on_close_tab_clicked" : lambda tab: self.closeTab(tab, widget) }
                 label_widget.signal_autoconnect(dic)
+                #handler = label_widget.connect("on_close_tab_clicked", self.closeTab, widget)
                 label=label_widget.get_widget("label1")
                 label.set_text(name)
@@ -192 +205 @@
                 tabid = self.bugs_tabs.insert_page(widget, top)
                 
-                
 
 if __name__ == "__main__":