Changeset 6034e16 in sasview

Timestamp:

Sep 24, 2012 12:01:56 PM (12 years ago)

Author:

Jae Cho <jhjcho@…>

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:

0f382d7

Parents:

2facdb0

Message:

MAC: fixed the remove in cat dial

File:

• sansguiframe/src/sans/guiframe/CategoryManager.py (modified) (4 diffs)

sansguiframe/src/sans/guiframe/CategoryManager.py

@@ -22 +22 @@
 from sans.guiframe.events import ChangeCategoryEvent
 from sans.guiframe.CategoryInstaller import CategoryInstaller
+IS_MAC = (sys.platform == 'darwin')
 
 """ Notes
@@ -254 +255 @@
 
 
-            modify_dialog = ChangeCat(self, 'Change Category: ' + \
-                                          selected_model, 
+            modify_dialog = ChangeCat(self, selected_model, 
                                       self._get_cat_list(),
                                       self.by_model_dict[selected_model])
             
             if modify_dialog.ShowModal() == wx.ID_OK:
-                self.by_model_dict[selected_model] = \
-                    modify_dialog.get_category()
-                self._regenerate_master_dict()
-                self._fill_lists()
-                self._set_enabled()
+                if not IS_MAC:
+                    self.dial_ok(modify_dialog, selected_model)
+
+    def dial_ok(self, dialog=None, model=None):
+        """
+        modify_dialog onclose
+        """
+        self.by_model_dict[model] = dialog.get_category()
+        self._regenerate_master_dict()
+        self._fill_lists()
+        self._set_enabled()
+
 
     def _on_ok(self, event):
@@ -362 +369 @@
         :param current_cats: List of categories applied to current model
         """
-        wx.Dialog.__init__(self, parent, title = title, size=(485, 425))
+        wx.Dialog.__init__(self, parent, title = 'Change Category: '+title, size=(485, 425))
 
         self.current_cats = current_cats
         if str(self.current_cats[0]) == 'Uncategorized':
             self.current_cats = []
-            
+        self.parent = parent
+        self.selcted_model = title
         vbox = wx.BoxSizer(wx.VERTICAL)
         self.add_sb = wx.StaticBox(self, label = "Add Category")
@@ -431 +439 @@
         self.Centre()
         self.Show(True)
+        if IS_MAC:
+            self.ok_button.Bind(wx.EVT_BUTTON, self.on_ok_mac)
+
+    def on_ok_mac(self, event):
+        """
+        On OK pressed (MAC only)
+        """
+        event.Skip()
+        self.parent.dial_ok(self, self.selcted_model)
+        self.Destroy()
 
     def on_add(self, event):