Changeset 95eef00 in sasview for src/sas/sasgui/guiframe/gui_manager.py

Timestamp:

Oct 7, 2016 4:05:57 PM (8 years ago)

Author:

krzywon

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:

b61bd57

Parents:

e6de6b8 (diff), 48b8f6d (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' into wx_save_simfit

File:

• src/sas/sasgui/guiframe/gui_manager.py (modified) (5 diffs)

src/sas/sasgui/guiframe/gui_manager.py

@@ -1334 +1334 @@
                     self._applications_menu_name = name
 
+    def _on_marketplace_click(self, event):
+        """
+            Click event for the help menu item linking to the Marketplace.
+        """
+        import webbrowser
+        webbrowser.open_new(config.marketplace_url)
+
     def _add_help_menu(self):
         """
@@ -1339 +1346 @@
         tutorial PDF and documentation pages.
         """
-        # Help menu
         self._help_menu = wx.Menu()
-        style = self.__gui_style & GUIFRAME.WELCOME_PANEL_ON
 
         wx_id = wx.NewId()
         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'):
@@ -1352 +1356 @@
             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:
@@ -1359 +1361 @@
             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:
@@ -1367 +1367 @@
             self._help_menu.Append(wx_id, '&About', 'Software information')
             wx.EVT_MENU(self, wx_id, self._onAbout)
-            self._help_menu.AppendSeparator()
-
+
+        if config.marketplace_url:
+            wx_id = wx.NewId()
+            self._help_menu.Append(wx_id, '&Model marketplace', '')
+            wx.EVT_MENU(self, wx_id, self._on_marketplace_click)
 
         # Checking for updates