Changes in src/sas/sasgui/guiframe/gui_manager.py [adb0851:e6de6b8] in sasview

File:

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

src/sas/sasgui/guiframe/gui_manager.py

@@ -1152 +1152 @@
                 self.delete_panel(ID)
                 break
-        self.cpanel_on_focus.SetFocus()
+        if self.cpanel_on_focus is not None:
+            self.cpanel_on_focus.SetFocus()
 
 
@@ -1333 +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):
         """
@@ -1345 +1339 @@
         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'):
@@ -1355 +1352 @@
             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:
@@ -1360 +1359 @@
             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:
@@ -1366 +1367 @@
             self._help_menu.Append(wx_id, '&About', 'Software information')
             wx.EVT_MENU(self, wx_id, self._onAbout)
-
-        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)
+            self._help_menu.AppendSeparator()
+
 
         # Checking for updates
@@ -1907 +1905 @@
         if self._default_save_location == None:
             self._default_save_location = os.getcwd()
-        wx.PostEvent(self, StatusEvent(status="Loading Project file..."))
-        dlg = wx.FileDialog(self,
+        msg = "This operation will set SasView to its freshly opened state "
+        msg += "before loading the project. Do you wish to continue?"
+        if not self._data_panel.on_remove(None, msg):
+            wx.PostEvent(self, StatusEvent(status="Loading Project file..."))
+            dlg = wx.FileDialog(self,
                             "Choose a file",
                             self._default_save_location, "",
                             APPLICATION_WLIST)
-        if dlg.ShowModal() == wx.ID_OK:
-            path = dlg.GetPath()
+            if dlg.ShowModal() == wx.ID_OK:
+                path = dlg.GetPath()
             if path is not None:
                 self._default_save_location = os.path.dirname(path)
-        dlg.Destroy()
-
-        self.load_state(path=path, is_project=True)
+                dlg.Destroy()
+                # Reset to a base state
+                self._on_reset_state()
+                # Load the project file
+                self.load_state(path=path, is_project=True)
+
+    def _on_reset_state(self):
+        """
+        Resets SasView to its freshly opened state.
+        :return: None
+        """
+        # Reset all plugins to their base state
+        self._data_panel.set_panel_on_focus()
+        # Remove all loaded data
+        self._data_panel.selection_cbox.SetValue('Select all Data')
+        self._data_panel._on_selection_type(None)
+        for plugin in self.plugins:
+            plugin.clear_panel()
+        # Reset plot number to 0
+        self.graph_num = 0
 
     def _on_save_application(self, event):
@@ -2066 +2084 @@
             except:
                 logging.info("Failed to connect to www.sasview.org")
-        self._process_version(version_info, standalone=event == None)    
-
-        
-        
-#         
-#         try:
-#             req = urllib2.Request(config.__update_URL__)
-#             res = urllib2.urlopen(req)
-#             content = res.read().strip()
-#             logging.info("Connected to www.sasview.org. Latest version: %s"
-#                          % (content))
-#             version_info = json.loads(content)
-#         except:
-#             logging.info("Failed to connect to www.sasview.org")
-#             version_info = {"version": "0.0.0"}
-#         self._process_version(version_info, standalone=event == None)
+        self._process_version(version_info, standalone=event == None)
 
     def _process_version(self, version_info, standalone=True):