Changeset f7bead2 in sasview

Timestamp:

Apr 4, 2014 11:49:57 AM (11 years ago)

Author:

Mathieu Doucet <doucetm@…>

Branches:

master, ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc, costrafo411, magnetic_scatt, release-4.1.1, release-4.1.2, release-4.2.2, release_4.0.1, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

eacf6a8c

Parents:

f87dc4c

Message:

Re #212 Fix default-view dialog.

Location:

src/sans/guiframe

Files:

• gui_manager.py (modified) (1 diff)
• startup_configuration.py (modified) (2 diffs)

src/sans/guiframe/gui_manager.py

@@ -1451 +1451 @@
         Build a panel to allow to edit Mask
         """
-        
         from sans.guiframe.startup_configuration \
         import StartupConfiguration as ConfDialog
         
-        self.panel = ConfDialog(parent=self, gui=self.__gui_style)
-        self.panel.ShowModal()
-
-                
+        dialog = ConfDialog(parent=self, gui=self.__gui_style)
+        result = dialog.ShowModal()
+        if result == wx.ID_OK:
+            dialog.write_custom_config()
+            # post event for info
+            wx.PostEvent(self, StatusEvent(status="Wrote custom configuration", info='info'))
+        dialog.Destroy()
+        
     def _add_menu_application(self):
         """

src/sans/guiframe/startup_configuration.py

@@ -93 +93 @@
         note_txt.SetForegroundColour("black")
         hbox = wx.BoxSizer(wx.HORIZONTAL)
-        cancelButton = wx.Button(self, -1, 'Cancel', size=(70, 25))
-        hbox.Add(cancelButton, 1, wx.RIGHT, 5)
-        cancelButton.Bind(wx.EVT_BUTTON, self.OnCancel)
-        okButton = wx.Button(self, -1, 'OK', size=(70, 25))
+        
+        okButton = wx.Button(self, wx.ID_OK, 'Set', size=(70, 25))
+        closeButton = wx.Button(self,wx.ID_CANCEL, 'Cancel', size=(70, 25))
+        hbox.Add(closeButton, 1, wx.RIGHT, 5)
         hbox.Add(okButton, 1, wx.RIGHT, 5)
-        okButton.Bind(wx.EVT_BUTTON, self.OnClose)
-        vbox.Add(panel)
-
-        vbox.Add(hbox, 1, wx.ALIGN_CENTER | wx.RIGHT | wx.BOTTOM, 5)
+        vbox.Add(panel, 1, wx.ALIGN_CENTER | wx.BOTTOM, 5)
+        vbox.Add(hbox, 1, wx.ALIGN_CENTER | wx.BOTTOM, 5)
         # set sizer
         self.SetSizer(vbox)
@@ -192 +190 @@
         self.return_string = self.current_string
         return self.return_string
-
-    def OnCancel(self, event):
-        """
-        Close event
-        """
-        # clear event
-        event.Skip()
-        self.return_string = {}
-        self.Destroy()
-    
-    def OnClose(self, event):
-        """
-        Close event
-        """
-        # clear event
-        event.Skip()
+    
+    def write_custom_config(self):
+        """
+            Write custom configuration
+        """
         fname = os.path.join(self.path, 'custom_config.py')
         self.write_string(fname, self.return_string)
-        self.Destroy()
 
     def write_string(self, fname, strings):