[Rapier-commits] r166 - trunk/src

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

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

Modified:
   trunk/src/rapier
Log:
Convert "Preferences" to a gtk.Dialog


Modified: trunk/src/rapier
===================================================================
--- trunk/src/rapier	2007-12-02 10:32:01 UTC (rev 165)
+++ trunk/src/rapier	2007-12-02 20:58:18 UTC (rev 166)
@@ -511,12 +511,11 @@
         self.prefModuleTabDirFileLabel.set_text(devInfo['basename'])
         
     def preparePrefWindow(self):
-        self.prefWindow=hildon.Window()
+        self.prefWindow = gtk.Dialog()
         self.prefWindow.set_title("Preferences")
         #self.prefWindow.set_decorated(False)
         self.prefWindow.set_modal(True)
         self.prefWindow.set_transient_for(self.mainWindow)
-        self.prefWindow.set_type_hint(gtk.gdk.WINDOW_TYPE_HINT_DIALOG)
 
         """
         preference window countain a vbox, a notebook and 2 button in a Hbox
@@ -534,25 +533,13 @@
            ------------------- 
 
         """
-        self.prefVbox=gtk.VBox(False,0)
+        self.prefVbox = self.prefWindow.vbox
         """
         http://www.pygtk.org/docs/pygtk/class-gtknotebook.html
         """
         self.prefNotebook=gtk.Notebook()
         self.prefVbox.pack_start(self.prefNotebook,False,False)
 
-        self.prefHBox=gtk.HBox(False,0)
-        self.prefOk_b=gtk.Button("Apply")
-        self.prefOk_b.connect("clicked",self.changePrefs)
-        self.prefCancel_b=gtk.Button("Cancel")
-        self.prefCancel_b.connect("clicked",self.cancelPrefs)
-        self.prefHBox.pack_start(self.prefOk_b,False,False)
-        self.prefHBox.pack_start(self.prefCancel_b,False,False)
-        self.prefVbox.pack_start(self.prefHBox,False,False)
-
-        self.prefVbox.show()
-        self.prefWindow.add(self.prefVbox)
-
         #Module Page
         self.prefModuleTab=gtk.VBox(False,0)
         #Module: Default.
@@ -630,10 +617,10 @@
         self.prefNotebook.append_page(self.prefDebugTab,None)
         self.prefNotebook.set_tab_label_text(self.prefDebugTab,"Debug")
         
-        
+        self.prefWindow.add_button("Apply", gtk.RESPONSE_OK)
+        self.prefWindow.add_button("Cancel", gtk.RESPONSE_CANCEL)
+        self.prefVbox.show_all()
 
-
-
     def prefModuleTabDirChange_bClicked(self,widget):
         prefModuleTabDirFileSelector=\
                                        hildon.FileChooserDialog(\
@@ -649,7 +636,7 @@
         elif rep==gtk.RESPONSE_CANCEL:
             prefModuleTabDirFileSelector.destroy()
 
-    def changePrefs(self,menuitem):
+    def changePrefs(self):
 
         #Module preferences.
         iter=self.prefModuleTabCombo.get_active_iter()
@@ -669,11 +656,7 @@
         self.gconf.set_bool('/apps/osso/rapier/debug/enabled',\
                               self.prefDebugCheckBox.get_active())
 
-        self.prefWindow.hide()
-
-        
-
-    def cancelPrefs(self,menuitem):
+    def cancelPrefs(self):
         #Let s put all default selection back.
         self.refillPrefModuleList()
         if self.mgr.prefixPath:
@@ -685,13 +668,16 @@
         self.prefDebugCheckBox.set_active(\
             self.gconf.get_bool('/apps/osso/rapier/debug/enabled'))
         
-        self.prefWindow.hide()
-        
     def displayPrefWindow(self,menuitem):
         self.prefDebugCheckBox.set_active(\
             self.gconf.get_bool('/apps/osso/rapier/debug/enabled'))
 
-        self.prefWindow.show_all()
+        resp = self.prefWindow.run()
+        self.prefWindow.hide()
+        if resp == gtk.RESPONSE_OK:
+            self.changePrefs()
+        else:
+            self.cancelPrefs()
 
     def displayManageModuleWindow(self,widget):
         self.fill_mgModLocalModel()