Refs #3882: more icons

mantidproject · Nov 2, 2011 · b577fb3 · b577fb3
1 parent fc81dda
commit b577fb3
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 8 deletions.
diff --git a/Code/Mantid/MantidQt/SliceViewer/icons/SliceViewerIcons.qrc b/Code/Mantid/MantidQt/SliceViewer/icons/SliceViewerIcons.qrc
@@ -1,5 +1,7 @@
 <RCC>
     <qresource prefix="/SliceViewer/icons">
         <file>view-fullscreen.png</file>
+        <file>color-pallette.png</file>
+        <file>color-pallette-part.png</file>
     </qresource>
 </RCC>
diff --git a/Code/Mantid/MantidQt/SliceViewer/icons/color-pallette-part.png b/Code/Mantid/MantidQt/SliceViewer/icons/color-pallette-part.png
diff --git a/Code/Mantid/MantidQt/SliceViewer/icons/color-pallette.png b/Code/Mantid/MantidQt/SliceViewer/icons/color-pallette.png
diff --git a/Code/Mantid/MantidQt/SliceViewer/inc/MantidQtSliceViewer/SliceViewer.ui b/Code/Mantid/MantidQt/SliceViewer/inc/MantidQtSliceViewer/SliceViewer.ui
@@ -97,8 +97,8 @@
             </property>
             <property name="iconSize">
              <size>
-              <width>16</width>
-              <height>16</height>
+              <width>18</width>
+              <height>18</height>
              </size>
             </property>
            </widget>
@@ -111,6 +111,16 @@
             <property name="text">
              <string>RngFull</string>
             </property>
+            <property name="icon">
+             <iconset resource="../../icons/SliceViewerIcons.qrc">
+              <normaloff>:/SliceViewer/icons/color-pallette.png</normaloff>:/SliceViewer/icons/color-pallette.png</iconset>
+            </property>
+            <property name="iconSize">
+             <size>
+              <width>18</width>
+              <height>18</height>
+             </size>
+            </property>
            </widget>
           </item>
           <item>
@@ -121,12 +131,15 @@
             <property name="text">
              <string>RngSlice</string>
             </property>
-           </widget>
-          </item>
-          <item>
-           <widget class="QPushButton" name="btnColorOptions">
-            <property name="text">
-             <string>Color</string>
+            <property name="icon">
+             <iconset resource="../../icons/SliceViewerIcons.qrc">
+              <normaloff>:/SliceViewer/icons/color-pallette-part.png</normaloff>:/SliceViewer/icons/color-pallette-part.png</iconset>
+            </property>
+            <property name="iconSize">
+             <size>
+              <width>18</width>
+              <height>18</height>
+             </size>
             </property>
            </widget>
           </item>