Changeset fc5d2d7f in sasview for src

Timestamp:

Sep 18, 2018 4:59:35 AM (6 years ago)

Author:

Piotr Rozyczko <rozyczko@…>

Branches:

ESS_GUI, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc

Children:

d1e4689, 9d23e4c, c0de493

Parents:

9ce69ec

Message:

Welcome widget shows only when asked (ini file and/or menu item).
Removed initial sizing of perspective windows to help with visibility.

Location:

src/sas/qtgui

Files:

• MainWindow/GuiManager.py (modified) (5 diffs)
• MainWindow/UI/MainWindowUI.ui (modified) (2 diffs)
• Perspectives/Fitting/UI/FittingWidgetUI.ui (modified) (1 diff)

src/sas/qtgui/MainWindow/GuiManager.py

@@ -12 +12 @@
 from twisted.internet import reactor
 # General SAS imports
+from sas import get_local_config, get_custom_config
 from sas.qtgui.Utilities.ConnectionProxy import ConnectionProxy
 from sas.qtgui.Utilities.SasviewLogger import setup_qt_logging
@@ -136 +137 @@
         self.aboutWidget = AboutBox()
         self.categoryManagerWidget = CategoryManager(self._parent, manager=self)
-        self.welcomePanel = WelcomePanel()
         self.grid_window = None
         self._workspace.toolBar.setVisible(LocalConfig.TOOLBAR_SHOW)
@@ -241 +241 @@
         perspective_width = perspective_size.width()
         self._current_perspective.resize(perspective_width, workspace_height-10)
-        # Resize the mdi area to match the widget within
-        subwindow.resize(subwindow.minimumSizeHint())
 
         self._current_perspective.show()
@@ -388 +386 @@
             self.communicate.statusBarUpdateSignal.emit(msg)
 
-    def showWelcomeMessage(self):
+    def actionWelcome(self):
         """ Show the Welcome panel """
+        self.welcomePanel = WelcomePanel()
         self._workspace.workspace.addSubWindow(self.welcomePanel)
         self.welcomePanel.show()
+
+    def showWelcomeMessage(self):
+        """ Show the Welcome panel, when required """
+        # Assure the welcome screen is requested
+        show_welcome_widget = True
+        custom_config = get_custom_config()
+        if hasattr(custom_config, "WELCOME_PANEL_SHOW"):
+            if isinstance(custom_config.WELCOME_PANEL_SHOW, bool):
+                show_welcome_widget = custom_config.WELCOME_PANEL_SHOW
+            else:
+                logging.warning("WELCOME_PANEL_SHOW has invalid value in custom_config.py")
+        if show_welcome_widget:
+            self.actionWelcome()
 
     def addCallbacks(self):
@@ -478 +490 @@
         self._workspace.actionAcknowledge.triggered.connect(self.actionAcknowledge)
         self._workspace.actionAbout.triggered.connect(self.actionAbout)
+        self._workspace.actionWelcomeWidget.triggered.connect(self.actionWelcome)
         self._workspace.actionCheck_for_update.triggered.connect(self.actionCheck_for_update)
 

src/sas/qtgui/MainWindow/UI/MainWindowUI.ui

@@ -148 +148 @@
     <addaction name="separator"/>
     <addaction name="actionAbout"/>
+    <addaction name="actionWelcomeWidget"/>
+    <addaction name="separator"/>
     <addaction name="actionCheck_for_update"/>
    </widget>
@@ -558 +560 @@
    </property>
   </action>
+  <action name="actionWelcomeWidget">
+   <property name="text">
+    <string>Welcome to SasView</string>
+   </property>
+  </action>
  </widget>
  <resources/>

src/sas/qtgui/Perspectives/Fitting/UI/FittingWidgetUI.ui

@@ -7 +7 @@
     <x>0</x>
     <y>0</y>
-    <width>566</width>
+    <width>651</width>
     <height>646</height>
    </rect>