[Rapier-commits] r167 - trunk/src

[This list send mail when a change occurs on the subversion repository]

Author: stevenrwalter
Date: 2007-12-02 22:58:32 +0200 (Sun, 02 Dec 2007)
New Revision: 167

Modified:
   trunk/src/rapier
Log:
Convert "Manage" to a gtk.Dialog()


Modified: trunk/src/rapier
===================================================================
--- trunk/src/rapier	2007-12-02 20:58:18 UTC (rev 166)
+++ trunk/src/rapier	2007-12-02 20:58:32 UTC (rev 167)
@@ -682,11 +682,10 @@
     def displayManageModuleWindow(self,widget):
         self.fill_mgModLocalModel()
         self.refresh_remote_modules_tv()
-        self.mgModWindow.show_all()
 
-        #self.mgModLocalTv.show()
-
-    def hideManageModuleWindow(self,widget):
+        resp = self.mgModWindow.run()
+        if resp == gtk.RESPONSE_OK:
+            self.mgModOk_b_clicked()
         self.mgModWindow.hide()
 
     def mgModRemoteInstallCell_toggled(self,cell,path):
@@ -816,7 +815,7 @@
         self.waitingWindow.show_all()
 
 
-    def mgModOk_b_clicked(self,widget):
+    def mgModOk_b_clicked(self):
         mod_to_remove=[]
         idx_to_remove=[]
         idx_to_build=[]
@@ -886,15 +885,14 @@
         self.waitingWindow.show_all()
 
     def prepareManageModuleWindow(self):
-        self.mgModWindow=hildon.Window()
+        self.mgModWindow = gtk.Dialog()
         self.mgModWindow.set_title("Manage Modules")
         self.mgModWindow.set_modal(True)
         self.mgModWindow.set_transient_for(self.mainWindow)
-        #self.mgModWindow.set_type(gtk.gdk.WINDOW_POPUP)
-        self.mgModWindow.set_type_hint(gtk.gdk.WINDOW_TYPE_HINT_DIALOG)
         self.mgModWindow.set_default_size(750,300)
-        self.mgModVBox=gtk.VBox(False,0)
+        self.mgModVBox = self.mgModWindow.vbox
         self.mgModNotebook=gtk.Notebook()
+        self.mgModVBox.pack_start(self.mgModNotebook)
 
         #Local Modules
         self.mgModLocalTab=gtk.VBox(False,0)
@@ -938,19 +936,9 @@
                                           self.mgModRemoteRefresh_b_clicked)
         self.mgModRemoteTab.pack_start(self.mgModRemoteRefresh_b,False,False)
         
-        
-        self.mgModVBox.pack_start(self.mgModNotebook,True,True)
-        self.mgModHBox=gtk.HBox(False,0)
-        self.mgModOk_b=gtk.Button("Ok")
-        self.mgModOk_b.connect('clicked',self.mgModOk_b_clicked)
-        self.mgModHBox.pack_start(self.mgModOk_b,False,False)
-        self.mgModCancel_b=gtk.Button("Cancel")
-        self.mgModCancel_b.connect("clicked",self.hideManageModuleWindow)
-        self.mgModHBox.pack_start(self.mgModCancel_b,False,False)
-        
-        self.mgModVBox.pack_start(self.mgModHBox,False,False)
-        self.mgModWindow.add(self.mgModVBox)
-        self.mgModHBox.show()
+        self.mgModWindow.add_button("OK", gtk.RESPONSE_OK)
+        self.mgModWindow.add_button("Cancel", gtk.RESPONSE_CANCEL)
+        self.mgModVBox.show_all()
 
 
     def mgModRemoteInstallCell_data_func(self,column,renderer,model,iter):