Changes in src/sas/qtgui/MainWindow/GuiManager.py [768387e0:dee9e5f] in sasview
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
src/sas/qtgui/MainWindow/GuiManager.py
r768387e0 rdee9e5f 12 12 from twisted.internet import reactor 13 13 # General SAS imports 14 from sas import get_local_config, get_custom_config 14 15 from sas.qtgui.Utilities.ConnectionProxy import ConnectionProxy 15 16 from sas.qtgui.Utilities.SasviewLogger import setup_qt_logging … … 136 137 self.aboutWidget = AboutBox() 137 138 self.categoryManagerWidget = CategoryManager(self._parent, manager=self) 138 self.welcomePanel = WelcomePanel()139 139 self.grid_window = None 140 140 self._workspace.toolBar.setVisible(LocalConfig.TOOLBAR_SHOW) … … 241 241 perspective_width = perspective_size.width() 242 242 self._current_perspective.resize(perspective_width, workspace_height-10) 243 # Resize the mdi area to match the widget within244 subwindow.resize(subwindow.minimumSizeHint())245 243 246 244 self._current_perspective.show() … … 388 386 self.communicate.statusBarUpdateSignal.emit(msg) 389 387 390 def showWelcomeMessage(self):388 def actionWelcome(self): 391 389 """ Show the Welcome panel """ 390 self.welcomePanel = WelcomePanel() 392 391 self._workspace.workspace.addSubWindow(self.welcomePanel) 393 392 self.welcomePanel.show() 393 394 def showWelcomeMessage(self): 395 """ Show the Welcome panel, when required """ 396 # Assure the welcome screen is requested 397 show_welcome_widget = True 398 custom_config = get_custom_config() 399 if hasattr(custom_config, "WELCOME_PANEL_SHOW"): 400 if isinstance(custom_config.WELCOME_PANEL_SHOW, bool): 401 show_welcome_widget = custom_config.WELCOME_PANEL_SHOW 402 else: 403 logging.warning("WELCOME_PANEL_SHOW has invalid value in custom_config.py") 404 if show_welcome_widget: 405 self.actionWelcome() 394 406 395 407 def addCallbacks(self): … … 478 490 self._workspace.actionAcknowledge.triggered.connect(self.actionAcknowledge) 479 491 self._workspace.actionAbout.triggered.connect(self.actionAbout) 492 self._workspace.actionWelcomeWidget.triggered.connect(self.actionWelcome) 480 493 self._workspace.actionCheck_for_update.triggered.connect(self.actionCheck_for_update) 481 494 … … 979 992 When setting a perspective, sets up the menu bar 980 993 """ 994 self._workspace.actionReport.setEnabled(False) 981 995 if isinstance(perspective, Perspectives.PERSPECTIVES["Fitting"]): 982 996 self.checkAnalysisOption(self._workspace.actionFitting) … … 988 1002 self._workspace.menubar.addAction(self._workspace.menuWindow.menuAction()) 989 1003 self._workspace.menubar.addAction(self._workspace.menuHelp.menuAction()) 1004 self._workspace.actionReport.setEnabled(True) 990 1005 991 1006 elif isinstance(perspective, Perspectives.PERSPECTIVES["Invariant"]):
Note: See TracChangeset
for help on using the changeset viewer.