From c6401251e0d3e957f1eb15bab97f5150eac7fe65 Mon Sep 17 00:00:00 2001
From: Nick Draper <nick.draper@stfc.ac.uk>
Date: Tue, 12 May 2015 15:22:06 +0100
Subject: [PATCH] re #11741 formatting changes for windows, try again on mac
---
.../inc/MantidQtSliceViewer/SliceViewer.ui | 59 +++++--------------
1 file changed, 16 insertions(+), 43 deletions(-)
diff --git a/Code/Mantid/MantidQt/SliceViewer/inc/MantidQtSliceViewer/SliceViewer.ui b/Code/Mantid/MantidQt/SliceViewer/inc/MantidQtSliceViewer/SliceViewer.ui
index 3958ba8a8c3..6704f59c1c3 100644
--- a/Code/Mantid/MantidQt/SliceViewer/inc/MantidQtSliceViewer/SliceViewer.ui
+++ b/Code/Mantid/MantidQt/SliceViewer/inc/MantidQtSliceViewer/SliceViewer.ui
@@ -17,16 +17,7 @@
<property name="spacing">
<number>3</number>
</property>
- <property name="leftMargin">
- <number>0</number>
- </property>
- <property name="topMargin">
- <number>0</number>
- </property>
- <property name="rightMargin">
- <number>0</number>
- </property>
- <property name="bottomMargin">
+ <property name="margin">
<number>0</number>
</property>
<item>
@@ -62,16 +53,7 @@
<property name="sizeConstraint">
<enum>QLayout::SetMinimumSize</enum>
</property>
- <property name="leftMargin">
- <number>0</number>
- </property>
- <property name="topMargin">
- <number>0</number>
- </property>
- <property name="rightMargin">
- <number>0</number>
- </property>
- <property name="bottomMargin">
+ <property name="margin">
<number>0</number>
</property>
</layout>
@@ -87,16 +69,7 @@
<property name="spacing">
<number>2</number>
</property>
- <property name="leftMargin">
- <number>0</number>
- </property>
- <property name="topMargin">
- <number>0</number>
- </property>
- <property name="rightMargin">
- <number>0</number>
- </property>
- <property name="bottomMargin">
+ <property name="margin">
<number>0</number>
</property>
<item>
@@ -663,6 +636,7 @@
<string notr="true">QLabel {
background-color : rgb(255, 255, 186);
color : black;
+ font: 8pt;
}</string>
</property>
<property name="frameShape">
@@ -701,6 +675,7 @@
<string notr="true">QLabel {
background-color : rgb(255, 255, 186);
color : black;
+ font: 8pt;
}</string>
</property>
<property name="frameShape">
@@ -742,6 +717,7 @@
<string notr="true">QLabel {
background-color : rgb(255, 255, 186);
color : black;
+ font: 8pt;
}</string>
</property>
<property name="frameShape">
@@ -765,25 +741,31 @@
<item row="3" column="1">
<widget class="QComboBox" name="comboNormalization">
<property name="sizePolicy">
- <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+ <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
- <width>80</width>
+ <width>70</width>
<height>0</height>
</size>
</property>
<property name="font">
<font>
- <pointsize>13</pointsize>
+ <pointsize>8</pointsize>
+ <weight>50</weight>
+ <italic>false</italic>
+ <bold>false</bold>
</font>
</property>
<property name="toolTip">
<string>Normalization option</string>
</property>
+ <property name="styleSheet">
+ <string notr="true">font: 8pt;</string>
+ </property>
</widget>
</item>
</layout>
@@ -803,16 +785,7 @@
<property name="spacing">
<number>4</number>
</property>
- <property name="leftMargin">
- <number>2</number>
- </property>
- <property name="topMargin">
- <number>2</number>
- </property>
- <property name="rightMargin">
- <number>2</number>
- </property>
- <property name="bottomMargin">
+ <property name="margin">
<number>2</number>
</property>
<item>
--
GitLab