Changeset 09b7da68 in sasview for src


Ignore:
Timestamp:
Dec 13, 2018 7:39:28 AM (6 years ago)
Author:
Piotr Rozyczko <piotr.rozyczko@…>
Branches:
ESS_GUI, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_opencl, ESS_GUI_sync_sascalc
Children:
b96d2e1
Parents:
4cdfa17
Message:

Move menu items around SASVIEW-1220 and trac-941.
Renamed main window name from MainWindow? to SasView?.

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

Legend:

Unmodified
Added
Removed

  • src/sas/qtgui/MainWindow/MainWindow.py

    r33812c3 r09b7da68  
    1111# Local UI 
    1212from sas.qtgui.UI import main_resources_rc 
    13 from .UI.MainWindowUI import Ui_MainWindow 
     13from .UI.MainWindowUI import Ui_SasView 
    1414 
    15 class MainSasViewWindow(QMainWindow, Ui_MainWindow): 
     15class MainSasViewWindow(QMainWindow, Ui_SasView): 
    1616    # Main window of the application 
    1717    def __init__(self, parent=None): 

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

    r0989bad r09b7da68  
    11<?xml version="1.0" encoding="UTF-8"?> 
    22<ui version="4.0"> 
    3  <class>MainWindow</class> 
     3 <class>SasView</class> 
    44 <widget class="QMainWindow" name="SasView"> 
    55  <property name="geometry"> 
    … …  
    7171     <string>View</string> 
    7272    </property> 
    73     <addaction name="actionShow_Grid_Window"/> 
    74     <addaction name="separator"/> 
    7573    <addaction name="actionHide_Toolbar"/> 
    7674    <addaction name="actionHide_DataExplorer"/> 
    7775    <addaction name="actionHide_LogExplorer"/> 
    7876    <addaction name="separator"/> 
     77    <addaction name="actionMinimizePlots"/> 
     78    <addaction name="actionClosePlots"/> 
     79    <addaction name="separator"/> 
    7980    <addaction name="actionStartup_Settings"/> 
    80     <addaction name="separator"/> 
    81     <addaction name="actionCategory_Manager"/> 
    8281   </widget> 
    8382   <widget class="QMenu" name="menuTool"> 
    … …  
    107106    <addaction name="actionCombine_Batch_Fit"/> 
    108107    <addaction name="separator"/> 
     108    <addaction name="actionShow_Grid_Window"/> 
     109    <addaction name="separator"/> 
    109110    <addaction name="actionFit_Options"/> 
    110111    <addaction name="actionGPU_Options"/> 
    111112    <addaction name="actionFit_Results"/> 
    112113    <addaction name="separator"/> 
     114    <addaction name="actionCategory_Manager"/> 
    113115    <addaction name="actionAdd_Custom_Model"/> 
    114116    <addaction name="actionEdit_Custom_Model"/> 
    … …  
    127129    <addaction name="actionNext"/> 
    128130    <addaction name="actionPrevious"/> 
    129     <addaction name="separator"/> 
    130     <addaction name="actionMinimizePlots"/> 
    131     <addaction name="actionClosePlots"/> 
    132131   </widget> 
    133132   <widget class="QMenu" name="menuAnalysis"> 
    … …  
    323322   </property> 
    324323  </action> 
    325   <action name="actionShow_Grid_Window"> 
    326    <property name="text"> 
    327     <string>Show Grid Window</string> 
    328    </property> 
    329   </action> 
    330324  <action name="actionHide_Toolbar"> 
    331325   <property name="text"> 
    … …  
    336330   <property name="text"> 
    337331    <string>Startup Settings</string> 
    338    </property> 
    339   </action> 
    340   <action name="actionCategory_Manager"> 
    341    <property name="text"> 
    342     <string>Category Manager</string> 
    343    </property> 
    344    <property name="toolTip"> 
    345     <string>Category Manager</string> 
    346332   </property> 
    347333  </action> 
    … …  
    573559   </property> 
    574560  </action> 
     561  <action name="actionCategory_Manager"> 
     562   <property name="text"> 
     563    <string>Category Manager</string> 
     564   </property> 
     565  </action> 
     566  <action name="actionShow_Grid_Window"> 
     567   <property name="text"> 
     568    <string>Show Grid Window</string> 
     569   </property> 
     570  </action> 
     571  <action name="actionMinimizePlots"> 
     572   <property name="text"> 
     573    <string>Minimize All Plots</string> 
     574   </property> 
     575  </action> 
    575576  <action name="actionClosePlots"> 
    576577   <property name="text"> 
    577578    <string>Close All Plots</string> 
    578    </property> 
    579   </action> 
    580   <action name="actionMinimizePlots"> 
    581    <property name="text"> 
    582     <string>Minimize All Plots</string> 
    583579   </property> 
    584580  </action> 
Note: See TracChangeset for help on using the changeset viewer.