Skip to content

Commit

Permalink
re #10772 try to decrease conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
@NickDraper
NickDraper committed Dec 16, 2014
1 parent 861f008 commit 96a26db
Showing 1 changed file with 68 additions and 12 deletions.
80 changes: 68 additions & 12 deletions Code/Mantid/MantidPlot/src/Mantid/FirstTimeSetup.ui
View file
Expand Up @@ -37,8 +37,31 @@
<string>Welcome to Mantid</string>
</property>
<property name="styleSheet">
<string notr="true">QDialog#FirstTimeSetup{background-image: url(:/First_use_Background.png);}
</string>
<string notr="true">QDialog#FirstTimeSetup{
background-image: url(:/First_use_Background.png);
}
QDialog#FirstTimeSetup QLabel{
font: 12px &quot;Segoe UI&quot;;
font-weight: bold;
}
QDialog#FirstTimeSetup QCheckbox{
font: 12px&quot;Segoe UI&quot;;
font-weight: bold;
}
QDialog#FirstTimeSetup QGroupBox{
font: 12px &quot;Segoe UI&quot;;
font-weight: bold;
}
QDialog#FirstTimeSetup QPushButton{
font: 12px&quot;Segoe UI&quot;;
}
QDialog#FirstTimeSetup QComboBox{
font: 12px &quot;Segoe UI&quot;;
}
QDialog#FirstTimeSetup QCommandLinkButton{
font: 28px &quot;Segoe UI&quot;;
font-weight: bold;
}</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_3">
<property name="leftMargin">
Expand Down Expand Up @@ -66,8 +89,9 @@
<property name="font">
<font>
<family>Segoe UI</family>
<pointsize>18</pointsize>
<pointsize>-1</pointsize>
<weight>75</weight>
<italic>false</italic>
<bold>true</bold>
</font>
</property>
Expand Down Expand Up @@ -100,8 +124,9 @@
<property name="font">
<font>
<family>Segoe UI</family>
<pointsize>18</pointsize>
<pointsize>-1</pointsize>
<weight>75</weight>
<italic>false</italic>
<bold>true</bold>
</font>
</property>
Expand Down Expand Up @@ -134,8 +159,9 @@
<property name="font">
<font>
<family>Segoe UI</family>
<pointsize>18</pointsize>
<pointsize>-1</pointsize>
<weight>75</weight>
<italic>false</italic>
<bold>true</bold>
</font>
</property>
Expand Down Expand Up @@ -168,8 +194,9 @@
<property name="font">
<font>
<family>Segoe UI</family>
<pointsize>18</pointsize>
<pointsize>-1</pointsize>
<weight>75</weight>
<italic>false</italic>
<bold>true</bold>
</font>
</property>
Expand Down Expand Up @@ -202,13 +229,16 @@
<property name="font">
<font>
<family>Segoe UI</family>
<pointsize>24</pointsize>
<pointsize>-1</pointsize>
<weight>75</weight>
<italic>false</italic>
<bold>true</bold>
</font>
</property>
<property name="styleSheet">
<string notr="true">color: rgb(0, 105, 0);</string>
<string notr="true">color: rgb(0, 105, 0);
font: 28px &quot;Segoe UI&quot;;
font-weight: bold;</string>
</property>
<property name="text">
<string>Tutorials</string>
Expand All @@ -220,13 +250,16 @@
<property name="font">
<font>
<family>Segoe UI</family>
<pointsize>24</pointsize>
<pointsize>-1</pointsize>
<weight>75</weight>
<italic>false</italic>
<bold>true</bold>
</font>
</property>
<property name="styleSheet">
<string notr="true">color: rgb(0, 105, 0);</string>
<string notr="true">color: rgb(0, 105, 0);
font: 28px &quot;Segoe UI&quot;;
font-weight: bold;</string>
</property>
<property name="text">
<string>Version </string>
Expand All @@ -238,8 +271,9 @@
<property name="font">
<font>
<family>Segoe UI</family>
<pointsize>18</pointsize>
<pointsize>-1</pointsize>
<weight>75</weight>
<italic>false</italic>
<bold>true</bold>
</font>
</property>
Expand Down Expand Up @@ -273,8 +307,9 @@ color: rgb(0, 0, 0);</string>
<property name="font">
<font>
<family>Segoe UI</family>
<pointsize>18</pointsize>
<pointsize>-1</pointsize>
<weight>75</weight>
<italic>false</italic>
<bold>true</bold>
</font>
</property>
Expand Down Expand Up @@ -321,6 +356,9 @@ color: rgb(0, 0, 0);</string>
<layout class="QHBoxLayout" name="horizontalLayout_2">
<item>
<layout class="QVBoxLayout" name="verticalLayout_2">
<property name="spacing">
<number>2</number>
</property>
<item>
<widget class="QLabel" name="lbUpdate">
<property name="minimumSize">
Expand All @@ -332,7 +370,9 @@ color: rgb(0, 0, 0);</string>
<property name="font">
<font>
<family>Segoe UI</family>
<pointsize>-1</pointsize>
<weight>75</weight>
<italic>false</italic>
<bold>true</bold>
</font>
</property>
Expand Down Expand Up @@ -387,12 +427,17 @@ color: rgb(0, 0, 0);</string>
</item>
<item>
<layout class="QVBoxLayout" name="verticalLayout">
<property name="spacing">
<number>3</number>
</property>
<item>
<widget class="QGroupBox" name="grpPersonalSetup">
<property name="font">
<font>
<family>Segoe UI</family>
<pointsize>-1</pointsize>
<weight>75</weight>
<italic>false</italic>
<bold>true</bold>
</font>
</property>
Expand All @@ -413,6 +458,9 @@ color: rgb(0, 0, 0);</string>
<property name="fieldGrowthPolicy">
<enum>QFormLayout::AllNonFixedFieldsGrow</enum>
</property>
<property name="verticalSpacing">
<number>4</number>
</property>
<property name="topMargin">
<number>18</number>
</property>
Expand All @@ -424,7 +472,9 @@ color: rgb(0, 0, 0);</string>
<property name="font">
<font>
<family>Segoe UI</family>
<pointsize>-1</pointsize>
<weight>75</weight>
<italic>false</italic>
<bold>true</bold>
</font>
</property>
Expand All @@ -451,7 +501,9 @@ color: rgb(0, 0, 0);</string>
<property name="font">
<font>
<family>Segoe UI</family>
<pointsize>-1</pointsize>
<weight>75</weight>
<italic>false</italic>
<bold>true</bold>
</font>
</property>
Expand All @@ -475,7 +527,9 @@ color: rgb(0, 0, 0);</string>
<property name="font">
<font>
<family>Segoe UI</family>
<pointsize>-1</pointsize>
<weight>75</weight>
<italic>false</italic>
<bold>true</bold>
</font>
</property>
Expand Down Expand Up @@ -512,7 +566,9 @@ color: rgb(0, 0, 0);</string>
<property name="font">
<font>
<family>Segoe UI</family>
<pointsize>-1</pointsize>
<weight>75</weight>
<italic>false</italic>
<bold>true</bold>
</font>
</property>
Expand Down

0 comments on commit 96a26db

Please sign in to comment.