Changeset 3fac0df in sasview

Timestamp:

Oct 5, 2016 2:34:53 PM (8 years ago)

Author:

ajj

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, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

b9c94fa

Parents:

ca4d985

Message:

Changing wxID for about menu so it appears under Help. It seems that with the current menu construction and wx3.0 the special menu IDs don't work.

Closes #705

File:

• src/sas/sasgui/guiframe/gui_manager.py (modified) (1 diff)

src/sas/sasgui/guiframe/gui_manager.py

@@ -1345 +1345 @@
         self._help_menu.Append(wx_id, '&Documentation', '')
         wx.EVT_MENU(self, wx_id, self._onSphinxDocs)
+        self._help_menu.AppendSeparator()
 
         if config._do_tutorial and (IS_WIN or sys.platform == 'darwin'):
-            self._help_menu.AppendSeparator()
             wx_id = wx.NewId()
             self._help_menu.Append(wx_id, '&Tutorial', 'Software tutorial')
             wx.EVT_MENU(self, wx_id, self._onTutorial)
+            self._help_menu.AppendSeparator()
+
 
         if config._do_acknowledge:
-            self._help_menu.AppendSeparator()
             wx_id = wx.NewId()
             self._help_menu.Append(wx_id, '&Acknowledge', 'Acknowledging SasView')
             wx.EVT_MENU(self, wx_id, self._onAcknowledge)
+            self._help_menu.AppendSeparator()
+
 
         if config._do_aboutbox:
+            logging.info("Doing help menu")
+            wx_id = wx.NewId()
+            self._help_menu.Append(wx_id, '&About', 'Software information')
+            wx.EVT_MENU(self, wx_id, self._onAbout)
             self._help_menu.AppendSeparator()
-            self._help_menu.Append(wx.ID_ABOUT, '&About', 'Software information')
-            wx.EVT_MENU(self, wx.ID_ABOUT, self._onAbout)
+
 
         # Checking for updates