Changeset c91ef7e in sasview

Timestamp:

May 10, 2011 5:06:37 PM (14 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:

ad1e49c

Parents:

25c1576

Message:

trying to fix MAC active Show/Hide/On/Off? menu

Location:

guiframe

Files:

• gui_manager.py (modified) (2 diffs)
• local_perspectives/plotting/plotting.py (modified) (3 diffs)

guiframe/gui_manager.py

@@ -74 +74 @@
     PLUGINS_WLIST = ''
 APPLICATION_WLIST = config.APPLICATION_WLIST
-
+if sys.platform.count("darwin")==0:
+    IS_WIN = True
+else:
+    IS_WIN = False
+    
 class ViewerFrame(wx.Frame):
     """
@@ -503 +507 @@
                               Left().
                               MinimizeButton().
-                              CloseButton(True).
+                              CloseButton(IS_WIN).
                               TopDockable(False).
                               BottomDockable(False).

guiframe/local_perspectives/plotting/plotting.py

@@ -24 +24 @@
 
 if sys.platform.count("darwin")==0:
-    IS_MAC = False
+    IS_WIN = True
 else:
-    IS_MAC = True
+    IS_WIN = False
 
 class Plugin(PluginBase):
@@ -158 +158 @@
         self.menu.AppendCheckItem(event_id, new_panel.window_caption, 
                          "Show %s plot panel" % new_panel.window_caption)
-        self.menu.Check(event_id, True)
+        self.menu.Check(event_id, IS_WIN)
         wx.EVT_MENU(self.parent, event_id, self._on_check_menu)
-        
-        if IS_MAC:
-            wx.EVT_CLOSE(new_panel, self._on_close_panel)
-        else:
-            wx.EVT_SHOW(new_panel, self._on_close_panel)
+
+        wx.EVT_SHOW(new_panel, self._on_close_panel)
         
         # Set UID to allow us to reference the panel later
@@ -305 +302 @@
         if self.menu.IsChecked(event_id):
             self.parent.on_view(event)
-            self.menu.Check(event_id, True)
+            self.menu.Check(event_id, IS_WIN)
         else:
             self.parent.hide_panel(event_id)