Changeset 52 for conseil.py

Timestamp:

03/22/07 05:31:23 (22 months ago)

Author:

ploum

Message:

Thanks Etienne !

First steps to a one glade file only Conseil

Files:

• conseil.py (modified) (5 diffs)

conseil.py

@@ -29 +29 @@
         def __init__(self):     
                 #Set the Glade file
-                self.wTree = gtk.glade.XML("conseil.glade")
-                self.bugs_tabs= self.wTree.get_widget("bugs_tabs")
-                self.statusbar = self.wTree.get_widget("statusbar")
-                #self.display_sidebar_menu = self.wTree.get_widget("sidebar_display")
-                #hpane = self.wTree.get_widget("hpaned1")
+                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.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.wTree.get_widget("sidebar")
+                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 
@@ -51 +52 @@
                         "on_sidebar_display_activate" : self.show_sidebar,
                         "on_sidebar_close_released" : lambda close : self.set_sidebar(0) }
-                self.wTree.signal_autoconnect(dic)
+                self.full_glade.signal_autoconnect(dic)
                 #self.sidebar_bm.connect("button_press_event", self.bookmarks_button_press)
                 #Wich BTS are we using ?
                 self.bts = protocol()
-                self.retriever = retriever(self.bts, self.bugs_tabs)
+                self.retriever = retriever(self.bts, self.bugs_tabs, self.full_glade)
                 #bookmarks init
                 self.bookmarks = bookmarks_store(self.bts.btsName())
                 #construction of the bookmarks widget
-                treeV = self.wTree.get_widget("bookmarks")
+                treeV = self.full_glade.get_widget("bookmarks")
                 treeV.set_model(self.bookmarks.get())
                 self.renderer = gtk.CellRendererText()
@@ -68 +69 @@
                 treeV.show()
                 #construction of the advanced search widget
-                adv_glade = gtk.glade.XML("advanced_search.glade")
                 #with scrollbars
-                #adv_main = adv_glade.get_widget("advanced_widget")
+                #adv_main = self.full_glade.get_widget("advanced_widget")
                 #or without
-                adv_main = adv_glade.get_widget("vbox_main")
-                adv_parent = self.wTree.get_widget("vbox_adv")
-                to_remove = self.wTree.get_widget("omega13")
-
-                statusbox = adv_glade.get_widget("status_vbox")
+                adv_main = self.full_glade.get_widget("vbox_main_adv")
+                adv_parent = self.full_glade.get_widget("vbox_adv")
+                to_remove = self.full_glade.get_widget("omega13")
+
+                statusbox = self.full_glade.get_widget("status_vbox1")
                 for e in self.bts.availableStatus():
                         checkbox = gtk.CheckButton(label=e)
                         checkbox.show()
                         statusbox.pack_start(checkbox,expand=0,padding=1)
-                importancebox = adv_glade.get_widget("importance_vbox")
+                importancebox = self.full_glade.get_widget("importance_vbox1")
                 for e in self.bts.availableImportance():
                         checkbox = gtk.CheckButton(label=e)
                         checkbox.show()
-                        importancebox.pack_start(checkbox,expand=0,padding=1)
-
+                        importancebox.pack_start(checkbox,expand=0,padding=1)   
+                
+                viewport = self.full_glade.get_widget("viewport_adv")
+                viewport.remove(adv_main)
+                
                 adv_parent.remove(to_remove)
                 adv_parent.add(adv_main)
@@ -101 +104 @@
 
         def set_sidebar(self,boolean) :
-                menu = self.wTree.get_widget("sidebar_display")
+                menu = self.full_glade.get_widget("sidebar_display")
                 if boolean :
                         self.sidebar.show()
@@ -240 +243 @@
         #main search button pressed
         def simpleSearch_clicked(self, widget):
-                searchString = self.wTree.get_widget("simple_search_entry").get_text().strip()
+                searchString = self.full_glade.get_widget("simple_search_entry").get_text().strip()
                 if searchString != '' :
                         dic = makedict()