Refs #3882: Added 1 icon and a qrc for the slice viewer. Icon shows u…

…p in MantidPlot too.
mantidproject · Nov 2, 2011 · fc81dda · fc81dda
1 parent 344853c
commit fc81dda
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 1 deletion.
diff --git a/Code/Mantid/MantidPlot/CMakeLists.txt b/Code/Mantid/MantidPlot/CMakeLists.txt
@@ -693,10 +693,15 @@ set ( ALL_SRC ${SRC_FILES} ${MOCCED_FILES} )
 ADD_PRECOMPILED_HEADER( src/PrecompiledHeader.h "" src/PrecompiledHeader.cpp ALL_SRC INC_FILES )
 
 qt4_wrap_ui ( UI_HDRS ${UI_FILES} )
+
 # The generated ui headers will go here:
 include_directories ( ${CMAKE_CURRENT_BINARY_DIR} )
+
+###########################################################################
 # Internal icon links
+###########################################################################
 qt4_add_resources ( RES_FILES ${PROJECT_SOURCE_DIR}/Images/images.qrc )
+qt4_add_resources ( RES_FILES ${PROJECT_SOURCE_DIR}/MantidQt/SliceViewer/icons/SliceViewerIcons.qrc )
 
 ###########################################################################
 # Add the dependencies

diff --git a/Code/Mantid/MantidQt/SliceViewer/CMakeLists.txt b/Code/Mantid/MantidQt/SliceViewer/CMakeLists.txt
@@ -37,6 +37,9 @@ include_directories ( ../../QtPropertyBrowser/src )
 
 qt4_wrap_cpp ( MOCCED_FILES ${MOC_FILES} )
 
+# --- Add icons qrc ------
+qt4_add_resources ( RES_FILES icons/SliceViewerIcons.qrc )
+
 
 set ( ALL_SRC ${SRC_FILES} ${MOCCED_FILES} )
 

diff --git a/Code/Mantid/MantidQt/SliceViewer/icons/SliceViewerIcons.qrc b/Code/Mantid/MantidQt/SliceViewer/icons/SliceViewerIcons.qrc
@@ -0,0 +1,5 @@
+<RCC>
+    <qresource prefix="/SliceViewer/icons">
+        <file>view-fullscreen.png</file>
+    </qresource>
+</RCC>
diff --git a/Code/Mantid/MantidQt/SliceViewer/icons/view-fullscreen.png b/Code/Mantid/MantidQt/SliceViewer/icons/view-fullscreen.png
diff --git a/Code/Mantid/MantidQt/SliceViewer/inc/MantidQtSliceViewer/SliceViewer.ui b/Code/Mantid/MantidQt/SliceViewer/inc/MantidQtSliceViewer/SliceViewer.ui
@@ -91,6 +91,16 @@
             <property name="text">
              <string>Reset</string>
             </property>
+            <property name="icon">
+             <iconset resource="../../icons/SliceViewerIcons.qrc">
+              <normaloff>:/SliceViewer/icons/view-fullscreen.png</normaloff>:/SliceViewer/icons/view-fullscreen.png</iconset>
+            </property>
+            <property name="iconSize">
+             <size>
+              <width>16</width>
+              <height>16</height>
+             </size>
+            </property>
            </widget>
           </item>
           <item>
@@ -235,7 +245,9 @@
   </layout>
  </widget>
  <layoutdefault spacing="6" margin="11"/>
- <resources/>
+ <resources>
+  <include location="../../icons/SliceViewerIcons.qrc"/>
+ </resources>
  <connections>
   <connection>
    <sender>btnResetZoom</sender>