Changeset 8289ae3 in sasview for src/sas/qtgui/MainWindow/UI

Timestamp:

Mar 23, 2018 8:24:10 AM (7 years ago)

Author:

krzywon

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:

ba4e3ba

Parents:

304e42f (diff), 8ac3551 (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' into ESS_GUI_Pr

File:

• src/sas/qtgui/MainWindow/UI/MainWindowUI.ui (modified) (5 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">
@@ -126 +128 @@
      <string>Analysis</string>
     </property>
+    <addaction name="actionCorfunc"/>
     <addaction name="actionFitting"/>
+    <addaction name="actionInvariant"/>
     <addaction name="actionInversion"/>
-    <addaction name="actionInvariant"/>
    </widget>
    <widget class="QMenu" name="menuHelp">
@@ -505 +508 @@
    </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>
+  <action name="actionCorfunc">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="text">
+    <string>Correlation Function</string>
+   </property>
+  </action>
  </widget>
  <resources/>