Changeset 04669d3 in sasview


Ignore:
Timestamp:
Oct 27, 2017 4:35:49 AM (9 months ago)
Author:
wojciech
Branches:
ESS_GUI_CategroyManager
Children:
674bc4d
Parents:
16afe01
Message:

Initial category manager design

Location:
src/sas/qtgui/MainWindow
Files:
2 added
2 edited

Legend:

Unmodified
Added
Removed
  • src/sas/qtgui/MainWindow/GuiManager.py

    rf0bb711 r04669d3  
    2222from sas.qtgui.MainWindow.AboutBox import AboutBox 
    2323from sas.qtgui.MainWindow.WelcomePanel import WelcomePanel 
     24from sas.qtgui.MainWindow.CategoryManager import CategoryManager 
    2425 
    2526from sas.qtgui.MainWindow.DataManager import DataManager 
     
    135136        self.ackWidget = Acknowledgements() 
    136137        self.aboutWidget = AboutBox() 
     138        self.categoryManagerWidget = CategoryManager() 
    137139 
    138140        # Add calculators - floating for usability 
     
    367369        self._workspace.actionHide_Toolbar.triggered.connect(self.actionHide_Toolbar) 
    368370        self._workspace.actionStartup_Settings.triggered.connect(self.actionStartup_Settings) 
    369         self._workspace.actionCategry_Manager.triggered.connect(self.actionCategry_Manager) 
     371        self._workspace.actionCategory_Manager.triggered.connect(self.actionCategory_Manager) 
    370372        # Tools 
    371373        self._workspace.actionData_Operation.triggered.connect(self.actionData_Operation) 
     
    524526        pass 
    525527 
    526     def actionCategry_Manager(self): 
    527         """ 
    528         """ 
    529         print("actionCategry_Manager TRIGGERED") 
    530         pass 
    531  
     528    def actionCategory_Manager(self): 
     529        """ 
     530        """ 
     531        self.categoryManagerWidget.show() 
    532532    #============ TOOLS ================= 
    533533    def actionData_Operation(self): 
  • src/sas/qtgui/MainWindow/UI/MainWindowUI.ui

    rb00414d r04669d3  
    2525     <y>0</y> 
    2626     <width>915</width> 
    27      <height>21</height> 
     27     <height>22</height> 
    2828    </rect> 
    2929   </property> 
     
    7575    <addaction name="actionStartup_Settings"/> 
    7676    <addaction name="separator"/> 
    77     <addaction name="actionCategry_Manager"/> 
     77    <addaction name="actionCategory_Manager"/> 
    7878   </widget> 
    7979   <widget class="QMenu" name="menuTool"> 
     
    322322   </property> 
    323323  </action> 
    324   <action name="actionCategry_Manager"> 
     324  <action name="actionCategory_Manager"> 
    325325   <property name="text"> 
    326326    <string>Category Manager</string> 
Note: See TracChangeset for help on using the changeset viewer.