Changeset 27 for conseil.py

Timestamp:

07/08/06 13:02:05 (3 years ago)

Author:

ploum

Message:

First steps in the bookmarks store

Files:

• conseil.py (modified) (7 diffs)

conseil.py

@@ -40 +40 @@
                 #Wich BTS are we using ?
                 self.bts = protocol()
-                self.bookmarks = self.__bookmarksInit(self.bts.Name())
-                
+                #bookmarks init
+                self.bookmarks = bookmarks_store(self.bts.btsName())
+                #construction of the bookmarks widget
+                treeV = self.wTree.get_widget("bookmarks")
+                treeV.set_model(self.bookmarks.get())
+                renderer = gtk.CellRendererText()
+                column = gtk.TreeViewColumn("title", renderer, text=0)
+                treeV.append_column(column)
+                treeV.show()
 
         def __isint(self,x):
@@ -79 +86 @@
                 return tree
 
-        # protocol is a string arg. It will be used to have
-        # differents bookmarks for differents protocols.
-        def __bookmarksInit(self, protocol):
-                treeV = self.wTree.get_widget("bookmarks")
-                #listing is : Title of the bookmarks, number of the search method, arguments of the search
-                # search method :
-                # 1- bug number
-                # 2- simple search
-                # 3- package search
-                # 4- advanced search
-                self.bookmarks = bookmarks_store()
-                listing = self.bookmarks.get()
-                treeV.set_model(listing)
-                renderer = gtk.CellRendererText()
-                column = gtk.TreeViewColumn("title", renderer, text=0)
-                treeV.append_column(column)
-                treeV.show()
-                return listing
-
 
         def bookmarks_button_press(self,widget, event) :
@@ -108 +96 @@
                         # callback for delete right click menu
                         def del_callback(menuitem) :
-                                model = widget.get_model()
                                 zetuple = widget.get_selection().get_selected()
-                                model.remove(zetuple[1])
-                                #TODO : do not forget to also remove the bookmarks from
-                                #the stored bookmarks. (sync with storage)
+                                self.bookmarks.delete(zetuple[1])
                         #callback for rename TODO
                         def ren_callback(menuitem) :
@@ -153 +138 @@
                 if tab != None :
                         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])
-                # TODO : do not forget to also add the bookmark in the store !
-        
-        
+                        self.bookmarks.add(array[0],int(array[1]),array[2])
         
         def simpleSearch_clicked(self, widget):
@@ -170 +149 @@
                         array = string.split(searchString,' ',1)
                         if self.bts.packageExist(array[0]) :
+                                #this is only to avoid an error when searching on a lonely package
                                 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)
+                                        args="%s\n%s"%(array[0],'')
+                                        self.__searchDisplay(self.bts.packageSearch(array[0],None),3,args)
+                                        #array.append('')
+                                else :
+                                        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),2,searchString)
@@ -182 +165 @@
                 tree=self.__treeInit__()
                 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) 
+                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,title)
+                self.insertTab(tab,zename[0])
                 
 
@@ -252 +229 @@
                 #We take the vbox to insert it
                 main_widget = bugwidget.get_widget("bug_main")
-                title = "bug #%s"%bugnbr
-                zename= "%s\n\n1\n\n%s" %(title,bugnbr)
-                main_widget.set_name(zename)
-                self.insertTab(main_widget,title)
+                zename = self.bookmarks.makeTitle(1,bugnbr)
+                main_widget.set_name(zename[1])
+                self.insertTab(main_widget,zename[0])