Ignore:
Timestamp:
Mar 21, 2018 2:17:04 AM (6 years ago)
Author:
Piotr Rozyczko <rozyczko@…>
Branches:
ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc
Children:
8b480d27
Parents:
e4c475b7
git-author:
Piotr Rozyczko <rozyczko@…> (02/08/18 02:19:04)
git-committer:
Piotr Rozyczko <rozyczko@…> (03/21/18 02:17:04)
Message:

Merging feature branches

File:
1 edited

Legend:

Unmodified
Added
Removed
  • src/sas/qtgui/MainWindow/UI/MainWindowUI.ui

    r1543f0c r3b3b40b  
    88    <y>0</y> 
    99    <width>915</width> 
    10     <height>527</height> 
     10    <height>762</height> 
    1111   </rect> 
    1212  </property> 
     
    2525     <y>0</y> 
    2626     <width>915</width> 
    27      <height>21</height> 
     27     <height>26</height> 
    2828    </rect> 
    2929   </property> 
     
    108108    <addaction name="actionChain_Fitting"/> 
    109109    <addaction name="separator"/> 
     110    <addaction name="actionAdd_Custom_Model"/> 
    110111    <addaction name="actionEdit_Custom_Model"/> 
     112    <addaction name="actionManage_Custom_Models"/> 
    111113   </widget> 
    112114   <widget class="QMenu" name="menuWindow"> 
     
    505507   </property> 
    506508  </action> 
     509  <action name="actionAdd_Custom_Model"> 
     510   <property name="text"> 
     511    <string>Add Custom Model</string> 
     512   </property> 
     513  </action> 
     514  <action name="actionManage_Custom_Models"> 
     515   <property name="text"> 
     516    <string>Manage Custom Models</string> 
     517   </property> 
     518  </action> 
    507519 </widget> 
    508520 <resources/> 
Note: See TracChangeset for help on using the changeset viewer.