Changeset 25b3d53 in sasview for src/sas/qtgui/MainWindow

Timestamp:

Aug 7, 2018 12:47:09 AM (6 years ago)

Author:

wojciech

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:

8a518285

Parents:

bc8750eb (diff), 03e04a4 (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 'ESS_GUI' of ​https://github.com/SasView/sasview into ESS_GUI

Location:

src/sas/qtgui/MainWindow

Files:

• CategoryManager.py (added)
• GuiManager.py (modified) (4 diffs)
• MainWindow.py (modified) (1 diff)
• UI/CategoryManagerUI.ui (added)
• UI/ChangeCategoryUI.ui (added)
• UI/MainWindowUI.ui (modified) (2 diffs)

src/sas/qtgui/MainWindow/GuiManager.py

@@ -27 +27 @@
 from sas.qtgui.MainWindow.AboutBox import AboutBox
 from sas.qtgui.MainWindow.WelcomePanel import WelcomePanel
+from sas.qtgui.MainWindow.CategoryManager import CategoryManager
 
 from sas.qtgui.MainWindow.DataManager import DataManager
@@ -134 +135 @@
         self.ackWidget = Acknowledgements()
         self.aboutWidget = AboutBox()
+        self.categoryManagerWidget = CategoryManager(self._parent, manager=self)
         self.welcomePanel = WelcomePanel()
         self.grid_window = None
@@ -419 +421 @@
         self._workspace.actionHide_Toolbar.triggered.connect(self.actionHide_Toolbar)
         self._workspace.actionStartup_Settings.triggered.connect(self.actionStartup_Settings)
-        self._workspace.actionCategry_Manager.triggered.connect(self.actionCategry_Manager)
+        self._workspace.actionCategory_Manager.triggered.connect(self.actionCategory_Manager)
         # Tools
         self._workspace.actionData_Operation.triggered.connect(self.actionData_Operation)
@@ -611 +613 @@
         pass
 
-    def actionCategry_Manager(self):
-        """
-        """
-        print("actionCategry_Manager TRIGGERED")
-        pass
+    def actionCategory_Manager(self):
+        """
+        """
+        self.categoryManagerWidget.show()
 
     #============ TOOLS =================

src/sas/qtgui/MainWindow/MainWindow.py

@@ -27 +27 @@
         except Exception as ex:
             import logging
-            logging.error("Application failed with: " + str(ex))
-            print("Application failed with: ", ex)
+            logging.error("Application failed with: "+str(ex))
+            print("Application failed with: ", str(ex))
 
     def closeEvent(self, event):

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

@@ -75 +75 @@
     <addaction name="actionStartup_Settings"/>
     <addaction name="separator"/>
-    <addaction name="actionCategry_Manager"/>
+    <addaction name="actionCategory_Manager"/>
    </widget>
    <widget class="QMenu" name="menuTool">
@@ -324 +324 @@
    </property>
   </action>
-  <action name="actionCategry_Manager">
+  <action name="actionCategory_Manager">
    <property name="text">
     <string>Category Manager</string>