re #10667 update ornl logo

mantidproject · Dec 4, 2014 · 85fd312 · 85fd312
1 parent 8dcaa9d
commit 85fd312
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 8 deletions.
diff --git a/Code/Mantid/Images/MantidSplashScreen.png b/Code/Mantid/Images/MantidSplashScreen.png
diff --git a/Code/Mantid/Images/Ornl_hfir_sns_logo_small.png b/Code/Mantid/Images/Ornl_hfir_sns_logo_small.png
diff --git a/Code/Mantid/Images/images.qrc b/Code/Mantid/Images/images.qrc
@@ -10,6 +10,7 @@
         <file>ISIS_Logo_Transparent.gif</file>
         <file>ess_logo_transparent_small.png</file>
         <file>Mantid_Logo_Transparent.png</file>
+        <file>Ornl_hfir_sns_logo_small.png</file>
         <file>data_replace.png</file>
         <file>panning.png</file>
         <file>history.png</file>

diff --git a/Code/Mantid/MantidPlot/src/Mantid/MantidAbout.ui b/Code/Mantid/MantidPlot/src/Mantid/MantidAbout.ui
@@ -214,7 +214,7 @@
          </widget>
         </item>
         <item row="1" column="3">
-         <widget class="QLabel" name="tessellaLogo">
+         <widget class="QLabel" name="ornlLogo">
           <property name="sizePolicy">
            <sizepolicy hsizetype="Preferred" vsizetype="Maximum">
             <horstretch>0</horstretch>
@@ -223,15 +223,15 @@
           </property>
           <property name="maximumSize">
            <size>
-            <width>151</width>
-            <height>80</height>
+            <width>200</width>
+            <height>30</height>
            </size>
           </property>
           <property name="text">
            <string/>
           </property>
           <property name="pixmap">
-           <pixmap resource="../../../Images/images.qrc">:/ess_logo_transparent_small.png</pixmap>
+           <pixmap resource="../../../Images/images.qrc">:/Ornl_hfir_sns_logo_small.png</pixmap>
           </property>
           <property name="scaledContents">
            <bool>true</bool>
@@ -289,7 +289,7 @@
          </widget>
         </item>
         <item row="3" column="1">
-         <widget class="QLabel" name="snsLogo">
+         <widget class="QLabel" name="essLogo">
           <property name="sizePolicy">
            <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
             <horstretch>0</horstretch>
@@ -298,15 +298,15 @@
           </property>
           <property name="maximumSize">
            <size>
-            <width>110</width>
-            <height>75</height>
+            <width>151</width>
+            <height>62</height>
            </size>
           </property>
           <property name="text">
            <string/>
           </property>
           <property name="pixmap">
-           <pixmap resource="../../../Images/images.qrc">:/SNS_logo_trans_back.gif</pixmap>
+           <pixmap resource="../../../Images/images.qrc">:/ess_logo_transparent_small.png</pixmap>
           </property>
           <property name="scaledContents">
            <bool>true</bool>