Moved resources.

2e1364d3 · Roman Tolchenov · e2519474 · 2e1364d3 · 2e1364d3 · e2519474
Commit 2e1364d3 authored 7 years ago by Roman Tolchenov
--- a/MantidPlot/CMakeLists.txt
+++ b/MantidPlot/CMakeLists.txt
@@ -661,8 +661,6 @@ qt4_add_resources ( RES_FILES ${PROJECT_SOURCE_DIR}/images/images.qrc )
 qt4_add_resources ( RES_FILES ${PROJECT_SOURCE_DIR}/images/MantidWidgets.qrc )
 qt4_add_resources ( RES_FILES ${PROJECT_SOURCE_DIR}/images//fonts/fonts.qrc )
 qt4_add_resources ( RES_FILES ${CMAKE_CURRENT_SOURCE_DIR}/icons/icons.qrc )
-qt4_add_resources ( RES_FILES ${PROJECT_SOURCE_DIR}/qt/widgets/sliceviewer/icons/SliceViewerIcons.qrc )
-qt4_add_resources ( RES_FILES ${PROJECT_SOURCE_DIR}/qt/paraview_ext/VatesSimpleGui/ViewWidgets/icons/ViewWidgetsIcons.qrc )

 ###########################################################################
 # Add the dependencies

--- a/qt/paraview_ext/VatesSimpleGui/ViewWidgets/CMakeLists.txt
+++ b/qt/paraview_ext/VatesSimpleGui/ViewWidgets/CMakeLists.txt
@@ -99,7 +99,7 @@ qt4_wrap_ui( UI_BUILT_SOURCES
 )

 # Add the QtWidgets icons
-qt4_add_resources( RES_FILES icons/ViewWidgetsIcons.qrc )
+qt4_add_resources ( RES_FILES ../../../resources/icons/ViewWidgetsIcons.qrc )

 # Setup the include locations.
 include_directories(
@@ -107,9 +107,6 @@ include_directories(
  ${CMAKE_SOURCE_DIR}/qt/widgets/sliceviewer/inc
  ${CMAKE_BINARY_DIR}/qt/widgets/sliceviewer
  ${CMAKE_SOURCE_DIR}/qt/widgets/factory/inc
-#  ${CMAKE_SOURCE_DIR}/MantidQt/API/inc
-#  ${CMAKE_SOURCE_DIR}/MantidQt/MantidWidgets/inc
-#  ${CMAKE_BINARY_DIR}/MantidQt/MantidWidgets
  ${CMAKE_CURRENT_BINARY_DIR}
  ${CMAKE_CURRENT_BINARY_DIR}/../QtWidgets
  ${CMAKE_SOURCE_DIR}/MantidPlot/src

--- a/qt/paraview_ext/VatesSimpleGui/ViewWidgets/icons/ViewWidgetsIcons.qrc
+++ b/qt/paraview_ext/VatesSimpleGui/ViewWidgets/icons/ViewWidgetsIcons.qrc
-<RCC>
-    <qresource prefix="/VatesSimpleGuiViewWidgets/icons">
-        <file>pqResetCenterToData24.png</file>
-        <file>pqResetCenterToPoint24.png</file>
-        <file>parallel_projection.png</file>
-        <file>pvIcon.png</file>
-        <file>pqEditColor24.png</file>
-        <file>resetViewToAll24.png</file>
-        <file>pqSlice24.png</file>
-        <file>pqThreshold24.png</file>
-    </qresource>
-    <qresource prefix="/VatesSimpleGuiViewWidgets/icons">
-        <file>pqWidgets/Icons/pqResetCamera.png</file>
-        <file>pqWidgets/Icons/pqResetCamera@2x.png</file>
-        <file>pqWidgets/Icons/pqResetCamera16.png</file>
-        <file>pqWidgets/Icons/pqResetCamera24.png</file>
-        <file>pqWidgets/Icons/pqResetCamera32.png</file>
-        <file>pqWidgets/Icons/pqRotateCameraCCW.png</file>
-        <file>pqWidgets/Icons/pqRotateCameraCCW@2x.png</file>
-        <file>pqWidgets/Icons/pqRotateCameraCCW24.png</file>
-        <file>pqWidgets/Icons/pqRotateCameraCW.png</file>
-        <file>pqWidgets/Icons/pqRotateCameraCW@2x.png</file>
-        <file>pqWidgets/Icons/pqRotateCameraCW24.png</file>
-        <file>pqWidgets/Icons/pqXMinus.png</file>
-        <file>pqWidgets/Icons/pqXMinus@2x.png</file>
-        <file>pqWidgets/Icons/pqXMinus16.png</file>
-        <file>pqWidgets/Icons/pqXMinus24.png</file>
-        <file>pqWidgets/Icons/pqXMinus32.png</file>
-        <file>pqWidgets/Icons/pqXPlus.png</file>
-        <file>pqWidgets/Icons/pqXPlus@2x.png</file>
-        <file>pqWidgets/Icons/pqXPlus16.png</file>
-        <file>pqWidgets/Icons/pqXPlus24.png</file>
-        <file>pqWidgets/Icons/pqXPlus32.png</file>
-        <file>pqWidgets/Icons/pqYMinus.png</file>
-        <file>pqWidgets/Icons/pqYMinus@2x.png</file>
-        <file>pqWidgets/Icons/pqYMinus16.png</file>
-        <file>pqWidgets/Icons/pqYMinus24.png</file>
-        <file>pqWidgets/Icons/pqYMinus32.png</file>
-        <file>pqWidgets/Icons/pqYPlus.png</file>
-        <file>pqWidgets/Icons/pqYPlus@2x.png</file>
-        <file>pqWidgets/Icons/pqYPlus16.png</file>
-        <file>pqWidgets/Icons/pqYPlus24.png</file>
-        <file>pqWidgets/Icons/pqYPlus32.png</file>
-        <file>pqWidgets/Icons/pqZMinus.png</file>
-        <file>pqWidgets/Icons/pqZMinus@2x.png</file>
-        <file>pqWidgets/Icons/pqZMinus16.png</file>
-        <file>pqWidgets/Icons/pqZMinus24.png</file>
-        <file>pqWidgets/Icons/pqZMinus32.png</file>
-        <file>pqWidgets/Icons/pqZoomToData.png</file>
-        <file>pqWidgets/Icons/pqZoomToData@2x.png</file>
-        <file>pqWidgets/Icons/pqZoomToData24.png</file>
-        <file>pqWidgets/Icons/pqZoomToSelection.png</file>
-        <file>pqWidgets/Icons/pqZoomToSelection@2x.png</file>
-        <file>pqWidgets/Icons/pqZoomToSelection24.png</file>
-        <file>pqWidgets/Icons/pqZPlus.png</file>
-        <file>pqWidgets/Icons/pqZPlus@2x.png</file>
-        <file>pqWidgets/Icons/pqZPlus16.png</file>
-        <file>pqWidgets/Icons/pqZPlus24.png</file>
-        <file>pqWidgets/Icons/pqZPlus32.png</file>
-    </qresource>
-</RCC>
--- a/qt/widgets/sliceviewer/icons/Colour zoom-select.pdn
+++ b/qt/widgets/sliceviewer/icons/Colour zoom-select.pdn
--- a/qt/scientific_interfaces/icons/CustomInterfacesIcons.qrc
+++ b/qt/scientific_interfaces/icons/CustomInterfacesIcons.qrc
--- a/qt/widgets/sliceviewer/icons/Nonorthogonal 32x32.png
+++ b/qt/widgets/sliceviewer/icons/Nonorthogonal 32x32.png
--- a/qt/widgets/sliceviewer/icons/Peak List 32x32.png
+++ b/qt/widgets/sliceviewer/icons/Peak List 32x32.png
--- a/qt/widgets/sliceviewer/icons/Peak List on 32x32.png
+++ b/qt/widgets/sliceviewer/icons/Peak List on 32x32.png
--- a/qt/widgets/sliceviewer/icons/Peak List on.png
+++ b/qt/widgets/sliceviewer/icons/Peak List on.png
--- a/qt/widgets/sliceviewer/icons/Peak List.pdn
+++ b/qt/widgets/sliceviewer/icons/Peak List.pdn
--- a/qt/widgets/sliceviewer/icons/Peak List.png
+++ b/qt/widgets/sliceviewer/icons/Peak List.png
--- a/qt/widgets/sliceviewer/icons/Scale colour to visible 32x32.png
+++ b/qt/widgets/sliceviewer/icons/Scale colour to visible 32x32.png
--- a/qt/widgets/sliceviewer/icons/SliceViewerIcons.qrc
+++ b/qt/widgets/sliceviewer/icons/SliceViewerIcons.qrc
--- a/qt/widgets/sliceviewer/icons/SliceViewerWindow_icon.png
+++ b/qt/widgets/sliceviewer/icons/SliceViewerWindow_icon.png
--- a/qt/widgets/sliceviewer/icons/SliceViewerWindow_icon_old.png
+++ b/qt/widgets/sliceviewer/icons/SliceViewerWindow_icon_old.png
--- a/qt/resources/icons/ViewWidgetsIcons.qrc
+++ b/qt/resources/icons/ViewWidgetsIcons.qrc
+<RCC>
+    <qresource prefix="/VatesSimpleGuiViewWidgets/icons">
+        <file>pqResetCenterToData24.png</file>
+        <file>pqResetCenterToPoint24.png</file>
+        <file>parallel_projection.png</file>
+        <file>pvIcon.png</file>
+        <file>pqEditColor24.png</file>
+        <file>resetViewToAll24.png</file>
+        <file>pqSlice24.png</file>
+        <file>pqThreshold24.png</file>
+    </qresource>
+    <qresource prefix="/VatesSimpleGuiViewWidgets/icons">
+        <file>pqResetCamera.png</file>
+        <file>pqResetCamera@2x.png</file>
+        <file>pqResetCamera16.png</file>
+        <file>pqResetCamera24.png</file>
+        <file>pqResetCamera32.png</file>
+        <file>pqRotateCameraCCW.png</file>
+        <file>pqRotateCameraCCW@2x.png</file>
+        <file>pqRotateCameraCCW24.png</file>
+        <file>pqRotateCameraCW.png</file>
+        <file>pqRotateCameraCW@2x.png</file>
+        <file>pqRotateCameraCW24.png</file>
+        <file>pqXMinus.png</file>
+        <file>pqXMinus@2x.png</file>
+        <file>pqXMinus16.png</file>
+        <file>pqXMinus24.png</file>
+        <file>pqXMinus32.png</file>
+        <file>pqXPlus.png</file>
+        <file>pqXPlus@2x.png</file>
+        <file>pqXPlus16.png</file>
+        <file>pqXPlus24.png</file>
+        <file>pqXPlus32.png</file>
+        <file>pqYMinus.png</file>
+        <file>pqYMinus@2x.png</file>
+        <file>pqYMinus16.png</file>
+        <file>pqYMinus24.png</file>
+        <file>pqYMinus32.png</file>
+        <file>pqYPlus.png</file>
+        <file>pqYPlus@2x.png</file>
+        <file>pqYPlus16.png</file>
+        <file>pqYPlus24.png</file>
+        <file>pqYPlus32.png</file>
+        <file>pqZMinus.png</file>
+        <file>pqZMinus@2x.png</file>
+        <file>pqZMinus16.png</file>
+        <file>pqZMinus24.png</file>
+        <file>pqZMinus32.png</file>
+        <file>pqZoomToData.png</file>
+        <file>pqZoomToData@2x.png</file>
+        <file>pqZoomToData24.png</file>
+        <file>pqZoomToSelection.png</file>
+        <file>pqZoomToSelection@2x.png</file>
+        <file>pqZoomToSelection24.png</file>
+        <file>pqZPlus.png</file>
+        <file>pqZPlus@2x.png</file>
+        <file>pqZPlus16.png</file>
+        <file>pqZPlus24.png</file>
+        <file>pqZPlus32.png</file>
+    </qresource>
+</RCC>
--- a/qt/widgets/sliceviewer/icons/auto_rebin.png
+++ b/qt/widgets/sliceviewer/icons/auto_rebin.png
--- a/qt/widgets/sliceviewer/icons/color-pallette-part.png
+++ b/qt/widgets/sliceviewer/icons/color-pallette-part.png
--- a/qt/widgets/sliceviewer/icons/color-pallette.png
+++ b/qt/widgets/sliceviewer/icons/color-pallette.png
--- a/qt/widgets/sliceviewer/icons/colour zoom minus scale 32x32.png
+++ b/qt/widgets/sliceviewer/icons/colour zoom minus scale 32x32.png