Changeset 28 for conseil.py

Timestamp:

07/08/06 21:03:17 (3 years ago)

Author:

ploum

Message:

Big big big refactorization.

The really nasty description_in_the_widget_name hack is now in page.py only,
allowing an easy change

Files:

• conseil.py (modified) (7 diffs)

conseil.py

@@ -20 +20 @@
 from bug import bug
 from bookmarks_store import *
+from page import *
 
 class MainWindow :
@@ -129 +130 @@
                         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)
-
+                                widget.__searchDisplay(widget.bts.packageSearch(array[0],None),3,array[0])
+                        else :  
+                                widget.__searchDisplay(widget.bts.packageSearch(array[0],array[1]),3,string)
+
+        #when the "add bookmark button is clicked
         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
                 if tab != None :
-                        array=tab.get_name().split("\n\n",2)
+                        #tab_descr function is part of page
+                        array = tab_descr(tab)
                         self.bookmarks.add(array[0],int(array[1]),array[2])
         
+        #main search button pressed
         def simpleSearch_clicked(self, widget):
                 searchString = self.wTree.get_widget("simple_search_entry").get_text()
@@ -151 +154 @@
                                 #this is only to avoid an error when searching on a lonely package
                                 if len(array) < 2 :
-                                        args="%s\n%s"%(array[0],'')
-                                        self.__searchDisplay(self.bts.packageSearch(array[0],None),3,args)
+                                        self.__searchDisplay(self.bts.packageSearch(array[0],None),3,array[0])
                                         #array.append('')
                                 else :
@@ -165 +167 @@
                 tree=self.__treeInit__()
                 tree.connect("row-activated", self.__row_clicked, tree.get_selection())
-                zename = self.bookmarks.makeTitle(search_type, args)
                 tree.set_headers_clickable(1)
                 tree.set_rules_hint(1)
                 tree.set_model(store)
                 tab = gtk.ScrolledWindow()
-                tab.set_name(zename[1]) 
                 tab.show()
                 tab.add(tree)
-                self.insertTab(tab,zename[0])
-                
+                zepage = page(tab, search_type, args)
+                self.insertTab(zepage)          
 
         #Callback for the row_activated in a search view
@@ -190 +190 @@
                 bugwidget = gtk.glade.XML(bugtemplate)
                 widget_comments_nbr = bugwidget.get_widget("comments_nbr")
-                # TODO : handle nicely plurals
-                com_text = "%d comment(s) : "%zebug.comNbr()
+                # handle nicely plurals
+                bugtotal = zebug.comNbr()
+                if bugtotal > 1 :
+                        com_text = "%d comments : "%bugtotal
+                else :
+                        com_text = "%d comment : "%bugtotal
                 widget_comments_nbr.set_text(com_text)
                 widget_comments = bugwidget.get_widget("com_frame")
@@ -210 +214 @@
                 widget_package= bugwidget.get_widget("package")
                 widget_package.set_text(zebug.getPackage())
-
                 #inserting comments
                 hbox = gtk.VBox(spacing=2)
@@ -225 +228 @@
                 widget_comments.remove(to_remove)
                 widget_comments.add(hbox)
-
-
                 #We take the vbox to insert it
                 main_widget = bugwidget.get_widget("bug_main")
-                zename = self.bookmarks.makeTitle(1,bugnbr)
-                main_widget.set_name(zename[1])
-                self.insertTab(main_widget,zename[0])
+                zepage = page(main_widget, 1, bugnbr)
+                self.insertTab(zepage)
 
 
         # Adding a tab
-        def insertTab(self, widget, name) :
+        # we receive as arguments an objet page
+        def insertTab(self, tab_page) :
                 #close tab button callback
-                def closeTab(widget, data):
-                        page = self.bugs_tabs.page_num(data)
+                tab = tab_page.get_widget()
+                name = tab_page.get_title()
+                def closeTab(tab):
+                        page = self.bugs_tabs.page_num(tab)
                         self.bugs_tabs.remove_page(page)
-                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" : lambda tab: closeTab(tab, widget) }
+                dic = {"on_close_tab_clicked" : lambda tab: closeTab(tab) }
                 label_widget.signal_autoconnect(dic)
                 label=label_widget.get_widget("label1")
                 label.set_text(name)
                 top=label_widget.get_widget("hbox1")
-                tabid = self.bugs_tabs.insert_page(widget, top)
+                tabid = self.bugs_tabs.insert_page(tab, top)