Changeset 56 for conseil.py

Timestamp:

03/23/07 00:22:02 (22 months ago)

Author:

ploum

Message:

finally closing #66. thanks Étienne for the patch ! Now Conseil is way more prettier...

Files:

• conseil.py (modified) (5 diffs)

conseil.py

@@ -29 +29 @@
         def __init__(self):     
                 #Set the Glade file
-                self.full_glade = gtk.glade.XML("conseil.glade")
-                self.main_window = self.full_glade.get_widget("main_window")
-                self.bugs_tabs= self.full_glade.get_widget("bugs_tabs")
-                self.statusbar = self.full_glade.get_widget("statusbar")
+                self.full_glade         = gtk.glade.XML("conseil.glade")
+                self.main_window        = self.full_glade.get_widget("main_window")
+                self.bugs_tabs          = self.full_glade.get_widget("bugs_notebook")
+                self.statusbar          = self.full_glade.get_widget("statusbar")
+                self.sidebar            = self.full_glade.get_widget("sidebar")
                 #self.display_sidebar_menu = self.full_glade.get_widget("sidebar_display")
                 #hpane = self.full_glade.get_widget("hpaned1")
                 #hpane.set_property("min-position", 100)
-                self.sidebar=self.full_glade.get_widget("sidebar")
                 #We remove directly the first page
                 # we might want to keep it and remove it at the first action 
                 self.bugs_tabs.remove_page(0)
                 #Create our dictionay and connect it
-                dic = { "on_btnSimplesearch_clicked" : self.simpleSearch_clicked, 
-                        "on_window1_destroy" : gtk.main_quit,
+                dic = { "on_simple_search_button_clicked" : self.simpleSearch_clicked, 
+                        "on_main_window_destroy" : gtk.main_quit,
                         "on_bookmarks_row_activated": self.bookmarkClicked,
-                        "on_addBookmark_clicked" : self.addBookmark_clicked,
+                        "on_add_bookmark_button_clicked" : self.addBookmark_clicked,
+                        "on_remove_bookmark_button_clicked" : self.removeBookmark_clicked,
                         "on_bookmarks_button_press_event" : self.bookmarks_button_press,
-                        "on_quitter1_activate": gtk.main_quit,
-                        "on_importer_activate" : self.import_bookmarks, 
-                        "on_ouvrir1_activate" : self.open_bookmarks,
-                        "on_bugs_tabs_switch_page" : self.switch_page,
+                        "on_quit_activate": gtk.main_quit,
+                        "on_import_activate" : self.import_bookmarks,   
+                        "on_open_activate" : self.open_bookmarks,
+                        "on_bugs_notebook_switch_page" : self.switch_page,
                         "on_sidebar_display_activate" : self.show_sidebar,
-                        "on_sidebar_close_released" : lambda close : self.set_sidebar(0) }
+                        "on_sidebar_close_button_clicked" : lambda close : self.set_sidebar(0) }
                 self.full_glade.signal_autoconnect(dic)
                 #self.sidebar_bm.connect("button_press_event", self.bookmarks_button_press)
@@ -60 +61 @@
                 self.bookmarks = bookmarks_store(self.bts.btsName())
                 #construction of the bookmarks widget
-                treeV = self.full_glade.get_widget("bookmarks")
-                treeV.set_model(self.bookmarks.get())
+                self.bookmarksTreeV = self.full_glade.get_widget("bookmarks_list")
+                self.bookmarksTreeV.set_model(self.bookmarks.get())
                 self.renderer = gtk.CellRendererText()
                 self.renderer.set_property('editable', True)
                 self.renderer.connect('edited', self.__edited_callback)
                 column = gtk.TreeViewColumn("title", self.renderer, text=0)
-                treeV.append_column(column)
-                treeV.show()
+                self.bookmarksTreeV.append_column(column)
+                self.bookmarksTreeV.show()
                 #construction of the advanced search widget
                 #with scrollbars
-                #adv_main = self.full_glade.get_widget("advanced_widget")
+                #adv_main = self.full_glade.get_widget("adv_search_scrolled")
                 #or without
-                adv_main = self.full_glade.get_widget("vbox_main_adv")
-                adv_parent = self.full_glade.get_widget("vbox_adv")
+                adv_main = self.full_glade.get_widget("adv_search_box")
+                adv_parent = self.full_glade.get_widget("adv_search_side_box")
                 to_remove = self.full_glade.get_widget("omega13")
 
-                statusbox = self.full_glade.get_widget("status_vbox1")
+                statusbox = self.full_glade.get_widget("adv_search_status_box")
                 for e in self.bts.availableStatus():
                         checkbox = gtk.CheckButton(label=e)
                         checkbox.show()
                         statusbox.pack_start(checkbox,expand=0,padding=1)
-                importancebox = self.full_glade.get_widget("importance_vbox1")
+                importancebox = self.full_glade.get_widget("adv_search_importance_box")
                 for e in self.bts.availableImportance():
                         checkbox = gtk.CheckButton(label=e)
@@ -87 +88 @@
                         importancebox.pack_start(checkbox,expand=0,padding=1)   
                 
-                viewport = self.full_glade.get_widget("viewport_adv")
+                viewport = self.full_glade.get_widget("adv_search_viewport")
                 viewport.remove(adv_main)
                 
@@ -190 +191 @@
                                 #store = zetuple[0]
                                 #path = zetuple[1][0][0]
-                                print "renaming"
+                                print "renaming not implemented for now"
                                 self.renderer.set_property('editable', True)
                         #définition du right click menu
@@ -240 +241 @@
                         descr = tab_descr(tab)
                         self.bookmarks.add(descr)
+        
+        #the "remove bookmark" button is clicked
+        def removeBookmark_clicked(self, widget):
+                to_delete = self.bookmarksTreeV.get_selection().get_selected()[1]       
+                self.bookmarks.delete(to_delete)
         
         #main search button pressed