Changeset b94889a in sasview for src/sas/qtgui/UI

Timestamp:

Dec 2, 2016 8:50:17 AM (8 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:

6d05e1d

Parents:

ef01be4 (diff), 040529d (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_249' into ESS_GUI

Location:

src/sas/qtgui/UI

Files:

• KiessigPanel.ui (added)
• MainWindowUI.ui (modified) (3 diffs)
• ScalePropertiesUI.ui (added)

src/sas/qtgui/UI/MainWindowUI.ui

@@ -25 +25 @@
      <y>0</y>
      <width>915</width>
-     <height>21</height>
+     <height>25</height>
     </rect>
    </property>
@@ -82 +82 @@
     </property>
     <addaction name="actionData_Operation"/>
+    <addaction name="separator"/>
     <addaction name="actionSLD_Calculator"/>
     <addaction name="actionDensity_Volume_Calculator"/>
     <addaction name="actionSlit_Size_Calculator"/>
+    <addaction name="actionKeissig_Calculator"/>
     <addaction name="actionSAS_Resolution_Estimator"/>
     <addaction name="actionGeneric_Scattering_Calculator"/>
@@ -489 +491 @@
    </property>
   </action>
+  <action name="actionKeissig_Calculator">
+   <property name="text">
+    <string>Kiessig Thickness Calculator</string>
+   </property>
+  </action>
  </widget>
  <resources>