Changeset 5 for conseil.py

Timestamp:

07/03/06 16:46:20 (3 years ago)

Author:

ploum

Message:

clicking in the list works !

Files:

• conseil.py (modified) (5 diffs)

conseil.py

@@ -16 +16 @@
 
 from protocol_dummy import protocol
+from bug import bug
 
 class MainWindow :
@@ -23 +24 @@
                 #Set the Glade file
                 self.gladefile = "conseil.glade"  
-                self.wTree = gtk.glade.XML(self.gladefile)
+                self.wTree = gtk.glade.XML(self.gladefile)
                 self.bugs_tabs= self.wTree.get_widget("bugs_tabs") 
                 #Create our dictionay and connect it
@@ -31 +32 @@
                 #Wich BTS are we using ?
                 self.bts = protocol()
+
+        def __isint(self,x):
+                try:
+                        x = int(x)
+                        return 1
+                except:
+                        return 0
 
         # This function initialize an empty result tree
@@ -51 +59 @@
                 return tree
         
+        def closeTab(self, widget):
+                # 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())
+        
         def simpleSearch_clicked(self, widget):
                 searchString = self.wTree.get_widget("simple_search_entry").get_text()
-                array = string.split(searchString,' ',1)
-                if self.bts.packageExist(array[0]) :
-                        tab = self.__searchDisplay(self.bts.packageSearch(array[0],array[1]))
+                # Have we a single bug number ?
+                if self.__isint(searchString) :
+                        self.__bugDisplay(self.bts.retrieveBug(int(searchString)))
+                # no, we have a search.
                 else :
-                        tab = self.__searchDisplay(self.bts.genericSearch(searchString))
-                self.bugs_tabs.insert_page(tab, None)
+                        array = string.split(searchString,' ',1)
+                        if self.bts.packageExist(array[0]) :
+                                self.__searchDisplay(self.bts.packageSearch(array[0],array[1]))
+                        else :
+                                self.__searchDisplay(self.bts.genericSearch(searchString))
+                        #TODO : remplacer le none par un widget digne de ce nom
+                        
+                        #self.bugs_tabs.insert_page(tab, None)
 
         #We did a simple search
@@ -64 +85 @@
                 #First, we ask for the result as it can takes some times                        
                 tree=self.__treeInit__()
+                handler = tree.connect("row-activated", self.__row_clicked, tree.get_selection())
+                tree.set_headers_clickable(1)
+                tree.set_rules_hint(1)
                 tree.set_model(store)
-                return tree
-                        
-        #package search
+                self.insertTab(tree,"résultat")
+
+        #Callback for the row_activated in a search view
+        def __row_clicked(widget, path, view_column, user_param1,data) :
+                zetuple = data.get_selected()
+                bug_nbr = zetuple[0].get_value(zetuple[1],0)
+                print "opening bug #"+str(bug_nbr)
+                widget.__bugDisplay(widget.bts.retrieveBug(bug_nbr))
+        
+
+        # This function takes a bug Object and then display it nicely
+        # (it will be nicely one day, I swear...)
+        def __bugDisplay(self, zebug) :
+                bugtemplate = "bug_template.glade"
+                bugwidget = gtk.glade.XML(bugtemplate)
+                widget_nbr = bugwidget.get_widget("number") 
+                widget_nbr.set_text(str(zebug.getNbr()))
+                widget_title = bugwidget.get_widget("title") 
+                widget_title.set_text(zebug.getTitle())
+                widget_description = bugwidget.get_widget("description") 
+                widget_description.set_text(zebug.getDescription())
+
+                #We take the vbox to insert it
+                main_widget = bugwidget.get_widget("bug_main")
+                self.insertTab(main_widget,"bug #XXX")
+                #self.bugs_tabs.insert_page(main_widget, None)
+
+        # Adding a tab
+        def insertTab(self, widget, name) :
+                #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}
+                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)
+                
+                
 
 if __name__ == "__main__":