Skip to content

Commit

Permalink
Re #5071 Fix UI layout to align widgets
Browse files Browse the repository at this point in the history
  • Loading branch information
@mdoucet
mdoucet committed Apr 11, 2012
1 parent 7e25c34 commit bb5163a
Show file tree
Hide file tree
Showing 3 changed files with 101 additions and 56 deletions.
10 changes: 5 additions & 5 deletions Code/Mantid/scripts/Interface/setup.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,15 @@
try:

# Common widgets
os.system("pyuic4 -o ui/ui_reduction_main.py ui/reduction_main.ui")
os.system("pyuic4 -o ui/ui_hfir_output.py ui/hfir_output.ui")
os.system("pyuic4 -o ui/ui_instrument_dialog.py ui/instrument_dialog.ui")
#os.system("pyuic4 -o ui/ui_reduction_main.py ui/reduction_main.ui")
#os.system("pyuic4 -o ui/ui_hfir_output.py ui/hfir_output.ui")
#os.system("pyuic4 -o ui/ui_instrument_dialog.py ui/instrument_dialog.ui")

# REF
os.system("pyuic4 -o ui/reflectometer/ui_data_refl_simple.py ui/reflectometer/data_refl_simple.ui")
os.system("pyuic4 -o ui/reflectometer/ui_refm_reduction.py ui/reflectometer/refm_reduction.ui")
#os.system("pyuic4 -o ui/reflectometer/ui_refm_reduction.py ui/reflectometer/refm_reduction.ui")
os.system("pyuic4 -o ui/reflectometer/ui_refl_sf_calculator.py ui/reflectometer/refl_sf_calculator.ui")
os.system("pyuic4 -o ui/reflectometer/ui_refl_stitching.py ui/reflectometer/refl_stitching.ui")
#os.system("pyuic4 -o ui/reflectometer/ui_refl_stitching.py ui/reflectometer/refl_stitching.ui")

except:
print "Could not compile resource file"
89 changes: 63 additions & 26 deletions Code/Mantid/scripts/Interface/ui/reflectometer/refl_sf_calculator.ui
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<rect>
<x>0</x>
<y>0</y>
<width>1140</width>
<width>1023</width>
<height>880</height>
</rect>
</property>
Expand Down Expand Up @@ -36,8 +36,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>1116</width>
<height>856</height>
<width>1005</width>
<height>862</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_7">
Expand Down Expand Up @@ -208,7 +208,7 @@ p, li { white-space: pre-wrap; }
<widget class="QLabel" name="label">
<property name="minimumSize">
<size>
<width>100</width>
<width>150</width>
<height>0</height>
</size>
</property>
Expand Down Expand Up @@ -272,22 +272,34 @@ p, li { white-space: pre-wrap; }
</property>
<item>
<widget class="QLabel" name="label_16">
<property name="minimumSize">
<size>
<width>150</width>
<height>0</height>
</size>
</property>
<property name="text">
<string>Incident medium </string>
</property>
</widget>
</item>
<item>
<widget class="QComboBox" name="incident_medium_combobox">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>600</width>
<width>200</width>
<height>0</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>600</width>
<width>16777215</width>
<height>16777215</height>
</size>
</property>
Expand Down Expand Up @@ -316,6 +328,9 @@ p, li { white-space: pre-wrap; }
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Fixed</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
Expand Down Expand Up @@ -526,7 +541,7 @@ p, li { white-space: pre-wrap; }
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Fixed</enum>
<enum>QSizePolicy::Expanding</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
Expand Down Expand Up @@ -563,6 +578,9 @@ p, li { white-space: pre-wrap; }
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Fixed</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
Expand All @@ -582,7 +600,7 @@ p, li { white-space: pre-wrap; }
<widget class="QCheckBox" name="data_background_switch">
<property name="minimumSize">
<size>
<width>160</width>
<width>150</width>
<height>0</height>
</size>
</property>
Expand Down Expand Up @@ -721,7 +739,7 @@ p, li { white-space: pre-wrap; }
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Fixed</enum>
<enum>QSizePolicy::Expanding</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
Expand Down Expand Up @@ -755,6 +773,9 @@ p, li { white-space: pre-wrap; }
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Fixed</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
Expand Down Expand Up @@ -799,7 +820,7 @@ p, li { white-space: pre-wrap; }
<widget class="QLabel" name="lambda_request">
<property name="minimumSize">
<size>
<width>50</width>
<width>100</width>
<height>0</height>
</size>
</property>
Expand Down Expand Up @@ -860,7 +881,7 @@ p, li { white-space: pre-wrap; }
<widget class="QLabel" name="label_3">
<property name="minimumSize">
<size>
<width>50</width>
<width>150</width>
<height>0</height>
</size>
</property>
Expand All @@ -887,7 +908,7 @@ p, li { white-space: pre-wrap; }
<string>N/A</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
</property>
</widget>
</item>
Expand Down Expand Up @@ -941,7 +962,7 @@ p, li { white-space: pre-wrap; }
<string>N/A</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
</property>
</widget>
</item>
Expand Down Expand Up @@ -988,7 +1009,7 @@ p, li { white-space: pre-wrap; }
<widget class="QLabel" name="label_7">
<property name="minimumSize">
<size>
<width>50</width>
<width>150</width>
<height>0</height>
</size>
</property>
Expand All @@ -1015,7 +1036,7 @@ p, li { white-space: pre-wrap; }
<string>N/A</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
</property>
</widget>
</item>
Expand Down Expand Up @@ -1075,7 +1096,7 @@ p, li { white-space: pre-wrap; }
<string>N/A</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
</property>
</widget>
</item>
Expand Down Expand Up @@ -1232,6 +1253,22 @@ p, li { white-space: pre-wrap; }
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer_14">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Fixed</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<spacer name="horizontalSpacer_24">
<property name="orientation">
Expand Down Expand Up @@ -1281,16 +1318,6 @@ p, li { white-space: pre-wrap; }
</item>
</layout>
</item>
<item>
<widget class="QTextBrowser" name="textBrowser">
<property name="minimumSize">
<size>
<width>0</width>
<height>400</height>
</size>
</property>
</widget>
</item>
<item>
<spacer name="verticalSpacer">
<property name="orientation">
Expand All @@ -1307,6 +1334,16 @@ p, li { white-space: pre-wrap; }
</property>
</spacer>
</item>
<item>
<widget class="QTextBrowser" name="textBrowser">
<property name="minimumSize">
<size>
<width>0</width>
<height>400</height>
</size>
</property>
</widget>
</item>
</layout>
</item>
</layout>
Expand Down

0 comments on commit bb5163a

Please sign in to comment.