Changeset 3b3b40b in sasview for src/sas/qtgui/MainWindow/UI

Timestamp:

Mar 21, 2018 4:17:04 AM (7 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 04:19:04)

git-committer:

Piotr Rozyczko <rozyczko@…> (03/21/18 04:17:04)

Message:

Merging feature branches

File:

• src/sas/qtgui/MainWindow/UI/MainWindowUI.ui (modified) (4 diffs)

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

@@ -8 +8 @@
     <y>0</y>
     <width>915</width>
-    <height>527</height>
+    <height>762</height>
    </rect>
   </property>
@@ -25 +25 @@
      <y>0</y>
      <width>915</width>
-     <height>21</height>
+     <height>26</height>
     </rect>
    </property>
@@ -108 +108 @@
     <addaction name="actionChain_Fitting"/>
     <addaction name="separator"/>
+    <addaction name="actionAdd_Custom_Model"/>
     <addaction name="actionEdit_Custom_Model"/>
+    <addaction name="actionManage_Custom_Models"/>
    </widget>
    <widget class="QMenu" name="menuWindow">
@@ -505 +507 @@
    </property>
   </action>
+  <action name="actionAdd_Custom_Model">
+   <property name="text">
+    <string>Add Custom Model</string>
+   </property>
+  </action>
+  <action name="actionManage_Custom_Models">
+   <property name="text">
+    <string>Manage Custom Models</string>
+   </property>
+  </action>
  </widget>
  <resources/>