diff --git a/Code/qtiplot/build.bat b/Code/qtiplot/build.bat
index d4c06fc0586793534a946d47f3604b6c2bdf5e5c..20c0a319c6218a8ca0a1bdd454282feea67612ae 100644
--- a/Code/qtiplot/build.bat
+++ b/Code/qtiplot/build.bat
@@ -1,13 +1,13 @@
-rem @echo off
+@echo off
+setlocal
-SETLOCAL
-if "%1" == "" set ARCH=x86
+if "%1" == "" SET ARCH=x86
-if /i %1 == x86 SET ARCH=x86 && SET QMAKE_ARGS=""
-if /i %1 == amd64 SET ARCH=amd64 && SET QMAKE_ARGS="CONFIG+=build64"
+if /i "%1" == "x86" SET ARCH=x86 && SET QMAKE_ARGS=""
+if /i "%1" == "amd64" SET ARCH=amd64 && SET QMAKE_ARGS="CONFIG+=build64"
-if /i not %1 == x86 (
- if /i not %1 == amd64 (
+if /i not %ARCH% == x86 (
+ if /i not %ARCH% == amd64 (
goto usage
)
)
@@ -53,3 +53,6 @@ EXIT 1
:qtiploterr
echo "MantidPlot build failed."
EXIT 1
+
+:usage
+echo "Use either build x86 or build amd64"
diff --git a/Code/qtiplot/qtiplot/src/Mantid/MantidAbout.cpp b/Code/qtiplot/qtiplot/src/Mantid/MantidAbout.cpp
index 4cffc946379e61061db77348dc5f90710113f6f2..6d63f53160e374d4641a7871eaba80aa71c1ab4a 100644
--- a/Code/qtiplot/qtiplot/src/Mantid/MantidAbout.cpp
+++ b/Code/qtiplot/qtiplot/src/Mantid/MantidAbout.cpp
@@ -43,17 +43,6 @@ MantidAbout::MantidAbout(QWidget *parent) : MantidQt::API::MantidQtDialog(parent
url->setOpenExternalLinks(true);
- QPixmap mantidLogoPixmap(":/Mantid Logo.png");
- QLabel* mantidlogo=m_uiForm.mantidplotlogo;
- mantidlogo->setPixmap(mantidLogoPixmap);
-
- QPixmap isisLogoPixmap(":/ISIS Logo.gif");
- QLabel *isislogo=m_uiForm.isislogo;
- isislogo->setPixmap(isisLogoPixmap);
-
- QPixmap snsLogoPixmap(":/SNS Logo.gif");
- QLabel *snslogo=m_uiForm.snslogo;
- snslogo->setPixmap(snsLogoPixmap);
-
+
}
diff --git a/Code/qtiplot/qtiplot/src/Mantid/MantidAbout.ui b/Code/qtiplot/qtiplot/src/Mantid/MantidAbout.ui
index 7424190a271cb6bbd20551fcadd790d6d71f464f..6d92a64f61e584ecbc5ecf780d908dfd9bf2ebc2 100644
--- a/Code/qtiplot/qtiplot/src/Mantid/MantidAbout.ui
+++ b/Code/qtiplot/qtiplot/src/Mantid/MantidAbout.ui
@@ -5,8 +5,8 @@
<rect>
<x>0</x>
<y>0</y>
- <width>466</width>
- <height>432</height>
+ <width>380</width>
+ <height>477</height>
</rect>
</property>
<property name="font" >
@@ -19,156 +19,424 @@
<string>MantidPlot-About</string>
</property>
<layout class="QGridLayout" name="gridLayout" >
- <item row="0" column="0" colspan="2" >
- <widget class="QLabel" name="mantidplotlogo" >
- <property name="text" >
- <string>TextLabel</string>
- </property>
- <property name="alignment" >
- <set>Qt::AlignCenter</set>
- </property>
- <property name="wordWrap" >
- <bool>true</bool>
- </property>
- </widget>
- </item>
- <item row="1" column="0" colspan="2" >
- <layout class="QFormLayout" name="formLayout" >
- <property name="fieldGrowthPolicy" >
- <enum>QFormLayout::AllNonFixedFieldsGrow</enum>
- </property>
- <item row="0" column="0" >
- <widget class="QLabel" name="mantidPlot_label" >
- <property name="font" >
- <font>
- <pointsize>11</pointsize>
- <weight>75</weight>
- <bold>true</bold>
- </font>
+ <property name="topMargin" >
+ <number>2</number>
+ </property>
+ <property name="bottomMargin" >
+ <number>2</number>
+ </property>
+ <item row="0" column="0" >
+ <layout class="QGridLayout" name="gridLayout_3" >
+ <item row="1" column="0" >
+ <spacer name="horizontalSpacer_2" >
+ <property name="orientation" >
+ <enum>Qt::Horizontal</enum>
</property>
- <property name="text" >
- <string>MantidPlot</string>
+ <property name="sizeHint" stdset="0" >
+ <size>
+ <width>40</width>
+ <height>20</height>
+ </size>
</property>
- </widget>
+ </spacer>
</item>
- <item row="1" column="0" >
- <widget class="QLabel" name="release_datelabel" >
- <property name="font" >
- <font>
- <weight>75</weight>
- <bold>true</bold>
- </font>
+ <item row="1" column="2" >
+ <spacer name="horizontalSpacer_4" >
+ <property name="orientation" >
+ <enum>Qt::Horizontal</enum>
</property>
- <property name="text" >
- <string>Release Date:</string>
+ <property name="sizeHint" stdset="0" >
+ <size>
+ <width>40</width>
+ <height>20</height>
+ </size>
</property>
- </widget>
+ </spacer>
</item>
<item row="1" column="1" >
- <widget class="QLabel" name="release_datevalue" >
- <property name="text" >
- <string>TextLabel</string>
+ <widget class="QLabel" name="mantidPlotLogo" >
+ <property name="minimumSize" >
+ <size>
+ <width>223</width>
+ <height>100</height>
+ </size>
</property>
- </widget>
- </item>
- <item row="2" column="0" >
- <widget class="QLabel" name="release_versionlabel" >
- <property name="font" >
- <font>
- <weight>75</weight>
- <bold>true</bold>
- </font>
+ <property name="maximumSize" >
+ <size>
+ <width>184</width>
+ <height>100</height>
+ </size>
</property>
<property name="text" >
- <string>Version:</string>
+ <string/>
</property>
- </widget>
- </item>
- <item row="2" column="1" >
- <widget class="QLabel" name="release_versionvalue" >
- <property name="text" >
- <string>TextLabel</string>
+ <property name="pixmap" >
+ <pixmap resource="../../../../../Images/images.qrc" >:/Mantid Logo Transparent Cropped.png</pixmap>
</property>
- </widget>
- </item>
- <item row="3" column="0" >
- <widget class="QLabel" name="builitusing_label" >
- <property name="text" >
- <string>Built using</string>
- </property>
- </widget>
- </item>
- <item row="4" column="0" >
- <widget class="QLabel" name="builtusing_labelvalue" >
- <property name="font" >
- <font>
- <pointsize>10</pointsize>
- </font>
- </property>
- <property name="text" >
- <string>TextLabel</string>
- </property>
- </widget>
- </item>
- <item row="5" column="0" >
- <widget class="QLabel" name="mantidlabel" >
- <property name="text" >
- <string>Mantid</string>
- </property>
- </widget>
- </item>
- <item row="6" column="0" >
- <widget class="QLabel" name="mantidurl" >
- <property name="text" >
- <string>TextLabel</string>
+ <property name="scaledContents" >
+ <bool>true</bool>
</property>
</widget>
</item>
</layout>
</item>
- <item row="2" column="0" >
- <widget class="QLabel" name="isislogo" >
- <property name="text" >
- <string>TextLabel</string>
- </property>
- <property name="alignment" >
- <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
+ <item row="4" column="0" >
+ <widget class="QDialogButtonBox" name="buttonBox" >
+ <property name="orientation" >
+ <enum>Qt::Horizontal</enum>
</property>
- <property name="wordWrap" >
- <bool>true</bool>
+ <property name="standardButtons" >
+ <set>QDialogButtonBox::Ok</set>
</property>
</widget>
</item>
- <item row="2" column="1" >
- <widget class="QLabel" name="snslogo" >
- <property name="text" >
- <string>TextLabel</string>
- </property>
- <property name="alignment" >
- <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
- </property>
- <property name="wordWrap" >
- <bool>true</bool>
+ <item row="1" column="0" >
+ <widget class="QGroupBox" name="groupBox" >
+ <property name="title" >
+ <string>Mantid Framework</string>
</property>
+ <layout class="QVBoxLayout" name="verticalLayout" >
+ <property name="margin" >
+ <number>2</number>
+ </property>
+ <item>
+ <layout class="QFormLayout" name="gridLayout_5" >
+ <property name="fieldGrowthPolicy" >
+ <enum>QFormLayout::AllNonFixedFieldsGrow</enum>
+ </property>
+ <item row="1" column="0" >
+ <widget class="QLabel" name="release_datelabel" >
+ <property name="font" >
+ <font>
+ <weight>75</weight>
+ <bold>true</bold>
+ </font>
+ </property>
+ <property name="text" >
+ <string>Release Date:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="1" >
+ <widget class="QLabel" name="release_datevalue" >
+ <property name="text" >
+ <string>TextLabel</string>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="0" >
+ <widget class="QLabel" name="release_versionlabel" >
+ <property name="font" >
+ <font>
+ <weight>75</weight>
+ <bold>true</bold>
+ </font>
+ </property>
+ <property name="text" >
+ <string>Version:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="1" >
+ <widget class="QLabel" name="release_versionvalue" >
+ <property name="text" >
+ <string>TextLabel</string>
+ </property>
+ </widget>
+ </item>
+ <item row="3" column="0" >
+ <widget class="QLabel" name="mantidlabel" >
+ <property name="text" >
+ <string>Homepage</string>
+ </property>
+ </widget>
+ </item>
+ <item row="3" column="1" >
+ <widget class="QLabel" name="mantidurl" >
+ <property name="text" >
+ <string>TextLabel</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ </layout>
</widget>
</item>
- <item row="3" column="0" colspan="2" >
- <widget class="QDialogButtonBox" name="buttonBox" >
- <property name="orientation" >
- <enum>Qt::Horizontal</enum>
+ <item row="2" column="0" >
+ <widget class="QGroupBox" name="groupBox_2" >
+ <property name="title" >
+ <string>MantidPlot</string>
</property>
- <property name="standardButtons" >
- <set>QDialogButtonBox::Ok</set>
+ <layout class="QVBoxLayout" name="verticalLayout_2" >
+ <property name="margin" >
+ <number>2</number>
+ </property>
+ <item>
+ <layout class="QFormLayout" name="gridLayout_4" >
+ <property name="fieldGrowthPolicy" >
+ <enum>QFormLayout::AllNonFixedFieldsGrow</enum>
+ </property>
+ <item row="1" column="0" >
+ <widget class="QLabel" name="builitusing_label" >
+ <property name="text" >
+ <string>Extended from</string>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="1" >
+ <widget class="QLabel" name="builtusing_labelvalue" >
+ <property name="font" >
+ <font>
+ <pointsize>8</pointsize>
+ <weight>50</weight>
+ <bold>false</bold>
+ </font>
+ </property>
+ <property name="text" >
+ <string>TextLabel</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ </layout>
+ </widget>
+ </item>
+ <item row="3" column="0" >
+ <widget class="QGroupBox" name="groupBox_3" >
+ <property name="title" >
+ <string>Contributors</string>
</property>
+ <layout class="QVBoxLayout" name="verticalLayout_3" >
+ <property name="margin" >
+ <number>2</number>
+ </property>
+ <item>
+ <layout class="QGridLayout" name="gridLayout_2" >
+ <item row="0" column="1" >
+ <widget class="QLabel" name="label" >
+ <property name="minimumSize" >
+ <size>
+ <width>0</width>
+ <height>0</height>
+ </size>
+ </property>
+ <property name="maximumSize" >
+ <size>
+ <width>1000</width>
+ <height>1000</height>
+ </size>
+ </property>
+ <property name="text" >
+ <string/>
+ </property>
+ <property name="pixmap" >
+ <pixmap>:/Logos/Images/ISIS Logo.gif</pixmap>
+ </property>
+ <property name="scaledContents" >
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="3" >
+ <widget class="QLabel" name="tessellaLogo" >
+ <property name="sizePolicy" >
+ <sizepolicy vsizetype="Maximum" hsizetype="Preferred" >
+ <horstretch>0</horstretch>
+ <verstretch>100</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="maximumSize" >
+ <size>
+ <width>187</width>
+ <height>75</height>
+ </size>
+ </property>
+ <property name="text" >
+ <string/>
+ </property>
+ <property name="pixmap" >
+ <pixmap resource="../../../../../Images/images.qrc" >:/Tessella_Logo - Transparent.gif</pixmap>
+ </property>
+ <property name="scaledContents" >
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="2" >
+ <spacer name="horizontalSpacer" >
+ <property name="orientation" >
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" stdset="0" >
+ <size>
+ <width>40</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item row="1" column="1" >
+ <widget class="QLabel" name="isislogo" >
+ <property name="sizePolicy" >
+ <sizepolicy vsizetype="Preferred" hsizetype="Preferred" >
+ <horstretch>0</horstretch>
+ <verstretch>100</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="minimumSize" >
+ <size>
+ <width>0</width>
+ <height>0</height>
+ </size>
+ </property>
+ <property name="maximumSize" >
+ <size>
+ <width>169</width>
+ <height>75</height>
+ </size>
+ </property>
+ <property name="text" >
+ <string/>
+ </property>
+ <property name="pixmap" >
+ <pixmap resource="../../../../../Images/images.qrc" >:/ISIS Logo - Transparent.gif</pixmap>
+ </property>
+ <property name="scaledContents" >
+ <bool>true</bool>
+ </property>
+ <property name="alignment" >
+ <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
+ </property>
+ <property name="wordWrap" >
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="1" >
+ <widget class="QLabel" name="snsLogo" >
+ <property name="sizePolicy" >
+ <sizepolicy vsizetype="Preferred" hsizetype="Preferred" >
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="maximumSize" >
+ <size>
+ <width>110</width>
+ <height>75</height>
+ </size>
+ </property>
+ <property name="text" >
+ <string/>
+ </property>
+ <property name="pixmap" >
+ <pixmap resource="../../../../../Images/images.qrc" >:/SNS_logo_trans_back.gif</pixmap>
+ </property>
+ <property name="scaledContents" >
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="2" >
+ <spacer name="horizontalSpacer_3" >
+ <property name="orientation" >
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" stdset="0" >
+ <size>
+ <width>40</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item row="1" column="0" >
+ <spacer name="horizontalSpacer_5" >
+ <property name="orientation" >
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" stdset="0" >
+ <size>
+ <width>40</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item row="1" column="4" >
+ <spacer name="horizontalSpacer_6" >
+ <property name="orientation" >
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" stdset="0" >
+ <size>
+ <width>40</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item row="2" column="0" >
+ <spacer name="horizontalSpacer_7" >
+ <property name="orientation" >
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" stdset="0" >
+ <size>
+ <width>40</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item row="2" column="4" >
+ <spacer name="horizontalSpacer_8" >
+ <property name="orientation" >
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" stdset="0" >
+ <size>
+ <width>40</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item row="2" column="3" >
+ <widget class="QLabel" name="hfirLogo" >
+ <property name="maximumSize" >
+ <size>
+ <width>169</width>
+ <height>75</height>
+ </size>
+ </property>
+ <property name="text" >
+ <string/>
+ </property>
+ <property name="pixmap" >
+ <pixmap resource="../../../../../Images/images.qrc" >:/HFIR_logo_small.png</pixmap>
+ </property>
+ <property name="scaledContents" >
+ <bool>true</bool>
+ </property>
+ <property name="alignment" >
+ <set>Qt::AlignCenter</set>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ </layout>
</widget>
</item>
</layout>
- <zorder>mantidplotlogo</zorder>
- <zorder>isislogo</zorder>
- <zorder>snslogo</zorder>
- <zorder>buttonBox</zorder>
</widget>
- <resources/>
+ <resources>
+ <include location="../../../../../Images/images.qrc" />
+ <include location="../../../../../Images/images.qrc" />
+ </resources>
<connections>
<connection>
<sender>buttonBox</sender>