Changeset 5342eb8 in sasview

Timestamp:

Apr 25, 2011 11:17:36 AM (13 years ago)

Author:

Gervaise Alina <gervyh@…>

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:

d09fa370

Parents:

f72b143

Message:

change guistyle for calculator

Location:

guiframe

Files:

• gui_manager.py (modified) (4 diffs)
• gui_style.py (modified) (1 diff)

guiframe/gui_manager.py

@@ -685 +685 @@
         Go through plug-ins and find tools to populate the tools menu
         """
-        style = self.__gui_style & GUIFRAME.TOOL_ON
-        if style == GUIFRAME.TOOL_ON:
+        style = self.__gui_style & GUIFRAME.CALCULATOR_ON
+        if style == GUIFRAME.CALCULATOR_ON:
             self._tool_menu = None
             for item in self.plugins:
@@ -785 +785 @@
         self._view_menu.AppendSeparator()
         id = wx.NewId()
-        style1 = self.__gui_style & GUIFRAME.TOOL_ON
-        if style1 == GUIFRAME.TOOL_ON:
+        style1 = self.__gui_style & GUIFRAME.TOOLBAR_ON
+        if style1 == GUIFRAME.TOOLBAR_ON:
             self._toolbar_menu = self._view_menu.Append(id,'&Hide Toolbar', '')
         else:
@@ -1034 +1034 @@
             self._mgr.Update()
             # Show toolbar
-            style = self.__gui_style & GUIFRAME.TOOL_ON
-            if (style == GUIFRAME.TOOL_ON) & (not self._toolbar.IsShown()):
+            style = self.__gui_style & GUIFRAME.TOOLBAR_ON
+            if (style == GUIFRAME.TOOLBAR_ON) & (not self._toolbar.IsShown()):
                 self._on_toggle_toolbar()
             
@@ -1509 +1509 @@
         :param panels: list of panels
         """
-        style = self.__gui_style & GUIFRAME.TOOL_ON
-        if (style == GUIFRAME.TOOL_ON) & (not self._toolbar.IsShown()):
+        style = self.__gui_style & GUIFRAME.TOOLBAR_ON
+        if (style == GUIFRAME.TOOLBAR_ON) & (not self._toolbar.IsShown()):
             self._on_toggle_toolbar()
         for item in self.panels:

guiframe/gui_style.py

@@ -14 +14 @@
     PLOTTING_ON = 8
     DATALOADER_ON = 16
-    TOOL_ON = 32
+    TOOLBAR_ON = 32
+    CALCULATOR_ON = 256
     SINGLE_APPLICATION = 64
     WELCOME_PANEL_ON = 128