From 2e1364d3c947ab7c04e8fcd22235d8077f05e80f Mon Sep 17 00:00:00 2001
From: Roman Tolchenov <roman.tolchenov@stfc.ac.uk>
Date: Wed, 2 Aug 2017 15:19:10 +0100
Subject: [PATCH] Moved resources.
---
MantidPlot/CMakeLists.txt | 2 -
.../VatesSimpleGui/ViewWidgets/CMakeLists.txt | 5 +-
.../ViewWidgets/icons/ViewWidgetsIcons.qrc | 61 ------------------
.../icons/Colour zoom-select.pdn | Bin
.../icons/MultiDatasetFitIcons.qrc} | 0
.../icons/Nonorthogonal 32x32.png | Bin
.../icons/Peak List 32x32.png | Bin
.../icons/Peak List on 32x32.png | Bin
.../icons/Peak List on.png | Bin
.../icons/Peak List.pdn | Bin
.../icons/Peak List.png | Bin
.../icons/Scale colour to visible 32x32.png | Bin
.../icons/SliceViewerIcons.qrc | 0
.../icons/SliceViewerWindow_icon.png | Bin
.../icons/SliceViewerWindow_icon_old.png | Bin
qt/resources/icons/ViewWidgetsIcons.qrc | 61 ++++++++++++++++++
.../icons/auto_rebin.png | Bin
.../icons/color-pallette-part.png | Bin
.../icons/color-pallette.png | Bin
.../icons/colour zoom minus scale 32x32.png | Bin
.../icons/colour zoom plus scale 32x32.png | Bin
.../icons/colour zoom-select scale.pdn | Bin
.../sliceviewer => resources}/icons/cross.png | Bin
.../icons/cursor-crosshair-small.png | Bin
.../icons/cursor-crosshair.png | Bin
.../icons/cut 32x32.png | Bin
.../icons/cut on 32x32.png | Bin
.../icons/cut remove 32x32.png | Bin
.../icons/cut remove.pdn | Bin
.../icons/document-new.png | Bin
.../icons/export-all-plots.png | Bin
.../icons/export-plot.png | Bin
.../icons/grid 32x32.png | Bin
.../icons/grid on 32x32.png | Bin
.../icons/grid on 48x48.pdn | Bin
.../sliceviewer => resources}/icons/grid.png | Bin
.../icons/letter_x.png | Bin
.../icons/letter_x.xcf | Bin
.../icons/letter_y.png | Bin
.../icons/letter_y.xcf | Bin
.../icons/panning.png | Bin
.../icons/parallel_projection.png | Bin
.../icons/peak-cross-faded.png | Bin
.../icons/peak-cross-small.png | Bin
.../icons/peak-cross.png | Bin
.../sliceviewer => resources}/icons/peak.png | Bin
.../icons/peak_cross.png | Bin
.../icons/peak_disabled.png | Bin
.../icons/peak_ellipsoid.png | Bin
.../icons/peak_sphere.png | Bin
.../icons/pqEditColor24.png | Bin
.../icons}/pqResetCamera.png | Bin
.../icons}/pqResetCamera16.png | Bin
.../icons}/pqResetCamera24.png | Bin
.../icons}/pqResetCamera32.png | Bin
.../icons}/pqResetCamera@2x.png | Bin
.../icons/pqResetCenterToData24.png | Bin
.../icons/pqResetCenterToPoint24.png | Bin
.../icons}/pqRotateCameraCCW.png | Bin
.../icons}/pqRotateCameraCCW24.png | Bin
.../icons}/pqRotateCameraCCW@2x.png | Bin
.../icons}/pqRotateCameraCW.png | Bin
.../icons}/pqRotateCameraCW24.png | Bin
.../icons}/pqRotateCameraCW@2x.png | Bin
.../icons/pqSlice24.png | Bin
.../icons/pqThreshold24.png | Bin
.../Icons => resources/icons}/pqXMinus.png | Bin
.../Icons => resources/icons}/pqXMinus16.png | Bin
.../Icons => resources/icons}/pqXMinus24.png | Bin
.../Icons => resources/icons}/pqXMinus32.png | Bin
.../Icons => resources/icons}/pqXMinus@2x.png | Bin
.../Icons => resources/icons}/pqXPlus.png | Bin
.../Icons => resources/icons}/pqXPlus16.png | Bin
.../Icons => resources/icons}/pqXPlus24.png | Bin
.../Icons => resources/icons}/pqXPlus32.png | Bin
.../Icons => resources/icons}/pqXPlus@2x.png | Bin
.../Icons => resources/icons}/pqYMinus.png | Bin
.../Icons => resources/icons}/pqYMinus16.png | Bin
.../Icons => resources/icons}/pqYMinus24.png | Bin
.../Icons => resources/icons}/pqYMinus32.png | Bin
.../Icons => resources/icons}/pqYMinus@2x.png | Bin
.../Icons => resources/icons}/pqYPlus.png | Bin
.../Icons => resources/icons}/pqYPlus16.png | Bin
.../Icons => resources/icons}/pqYPlus24.png | Bin
.../Icons => resources/icons}/pqYPlus32.png | Bin
.../Icons => resources/icons}/pqYPlus@2x.png | Bin
.../Icons => resources/icons}/pqZMinus.png | Bin
.../Icons => resources/icons}/pqZMinus16.png | Bin
.../Icons => resources/icons}/pqZMinus24.png | Bin
.../Icons => resources/icons}/pqZMinus32.png | Bin
.../Icons => resources/icons}/pqZMinus@2x.png | Bin
.../Icons => resources/icons}/pqZPlus.png | Bin
.../Icons => resources/icons}/pqZPlus16.png | Bin
.../Icons => resources/icons}/pqZPlus24.png | Bin
.../Icons => resources/icons}/pqZPlus32.png | Bin
.../Icons => resources/icons}/pqZPlus@2x.png | Bin
.../icons}/pqZoomToData.png | Bin
.../icons}/pqZoomToData24.png | Bin
.../icons}/pqZoomToData@2x.png | Bin
.../icons}/pqZoomToSelection.png | Bin
.../icons}/pqZoomToSelection24.png | Bin
.../icons}/pqZoomToSelection@2x.png | Bin
.../icons/pvIcon.png | Bin
.../icons/range.png | Bin
.../icons/rebin 32x32.png | Bin
.../icons/rebin auto 32x32.png | Bin
.../icons/rebin finer 32x32.png | Bin
.../icons/rebin on 32x32.png | Bin
.../sliceviewer => resources}/icons/rebin.pdn | Bin
.../icons/refresh.png | Bin
.../icons/resetViewToAll24.png | Bin
.../icons/scale colour to visible.pdn | Bin
.../icons/stock-lock.png | Bin
.../icons/stock-tool-pencil-16.png | Bin
.../icons/stock-tool-pencil-22.png | Bin
.../icons/view-fullscreen-24x24.png | Bin
.../icons/view-fullscreen.png | Bin
.../icons/zoom to all 32x32.png | Bin
.../icons/zoom-in 32x32.png | Bin
.../icons/zoom-out 32x32.png | Bin
.../icons/zoom-select 32x32.png | Bin
.../icons/zoom.png | Bin
.../MultiDatasetFit/CMakeLists.txt | 2 +-
qt/widgets/CMakeLists.txt | 3 -
qt/widgets/sliceviewer/CMakeLists.txt | 4 +-
125 files changed, 65 insertions(+), 73 deletions(-)
delete mode 100644 qt/paraview_ext/VatesSimpleGui/ViewWidgets/icons/ViewWidgetsIcons.qrc
rename qt/{widgets/sliceviewer => resources}/icons/Colour zoom-select.pdn (100%)
rename qt/{scientific_interfaces/icons/CustomInterfacesIcons.qrc => resources/icons/MultiDatasetFitIcons.qrc} (100%)
rename qt/{widgets/sliceviewer => resources}/icons/Nonorthogonal 32x32.png (100%)
rename qt/{widgets/sliceviewer => resources}/icons/Peak List 32x32.png (100%)
rename qt/{widgets/sliceviewer => resources}/icons/Peak List on 32x32.png (100%)
rename qt/{widgets/sliceviewer => resources}/icons/Peak List on.png (100%)
rename qt/{widgets/sliceviewer => resources}/icons/Peak List.pdn (100%)
rename qt/{widgets/sliceviewer => resources}/icons/Peak List.png (100%)
rename qt/{widgets/sliceviewer => resources}/icons/Scale colour to visible 32x32.png (100%)
rename qt/{widgets/sliceviewer => resources}/icons/SliceViewerIcons.qrc (100%)
rename qt/{widgets/sliceviewer => resources}/icons/SliceViewerWindow_icon.png (100%)
rename qt/{widgets/sliceviewer => resources}/icons/SliceViewerWindow_icon_old.png (100%)
create mode 100644 qt/resources/icons/ViewWidgetsIcons.qrc
rename qt/{widgets/sliceviewer => resources}/icons/auto_rebin.png (100%)
rename qt/{widgets/sliceviewer => resources}/icons/color-pallette-part.png (100%)
rename qt/{widgets/sliceviewer => resources}/icons/color-pallette.png (100%)
rename qt/{widgets/sliceviewer => resources}/icons/colour zoom minus scale 32x32.png (100%)
rename qt/{widgets/sliceviewer => resources}/icons/colour zoom plus scale 32x32.png (100%)
rename qt/{widgets/sliceviewer => resources}/icons/colour zoom-select scale.pdn (100%)
rename qt/{widgets/sliceviewer => resources}/icons/cross.png (100%)
rename qt/{widgets/sliceviewer => resources}/icons/cursor-crosshair-small.png (100%)
rename qt/{widgets/sliceviewer => resources}/icons/cursor-crosshair.png (100%)
rename qt/{widgets/sliceviewer => resources}/icons/cut 32x32.png (100%)
rename qt/{widgets/sliceviewer => resources}/icons/cut on 32x32.png (100%)
rename qt/{widgets/sliceviewer => resources}/icons/cut remove 32x32.png (100%)
rename qt/{widgets/sliceviewer => resources}/icons/cut remove.pdn (100%)
rename qt/{widgets/sliceviewer => resources}/icons/document-new.png (100%)
rename qt/{scientific_interfaces => resources}/icons/export-all-plots.png (100%)
rename qt/{scientific_interfaces => resources}/icons/export-plot.png (100%)
rename qt/{widgets/sliceviewer => resources}/icons/grid 32x32.png (100%)
rename qt/{widgets/sliceviewer => resources}/icons/grid on 32x32.png (100%)
rename qt/{widgets/sliceviewer => resources}/icons/grid on 48x48.pdn (100%)
rename qt/{widgets/sliceviewer => resources}/icons/grid.png (100%)
rename qt/{widgets/sliceviewer => resources}/icons/letter_x.png (100%)
rename qt/{widgets/sliceviewer => resources}/icons/letter_x.xcf (100%)
rename qt/{widgets/sliceviewer => resources}/icons/letter_y.png (100%)
rename qt/{widgets/sliceviewer => resources}/icons/letter_y.xcf (100%)
rename qt/{scientific_interfaces => resources}/icons/panning.png (100%)
rename qt/{paraview_ext/VatesSimpleGui/ViewWidgets => resources}/icons/parallel_projection.png (100%)
rename qt/{widgets/sliceviewer => resources}/icons/peak-cross-faded.png (100%)
rename qt/{widgets/sliceviewer => resources}/icons/peak-cross-small.png (100%)
rename qt/{widgets/sliceviewer => resources}/icons/peak-cross.png (100%)
rename qt/{widgets/sliceviewer => resources}/icons/peak.png (100%)
rename qt/{widgets/sliceviewer => resources}/icons/peak_cross.png (100%)
rename qt/{widgets/sliceviewer => resources}/icons/peak_disabled.png (100%)
rename qt/{widgets/sliceviewer => resources}/icons/peak_ellipsoid.png (100%)
rename qt/{widgets/sliceviewer => resources}/icons/peak_sphere.png (100%)
rename qt/{paraview_ext/VatesSimpleGui/ViewWidgets => resources}/icons/pqEditColor24.png (100%)
rename qt/{paraview_ext/VatesSimpleGui/ViewWidgets/icons/pqWidgets/Icons => resources/icons}/pqResetCamera.png (100%)
rename qt/{paraview_ext/VatesSimpleGui/ViewWidgets/icons/pqWidgets/Icons => resources/icons}/pqResetCamera16.png (100%)
rename qt/{paraview_ext/VatesSimpleGui/ViewWidgets/icons/pqWidgets/Icons => resources/icons}/pqResetCamera24.png (100%)
rename qt/{paraview_ext/VatesSimpleGui/ViewWidgets/icons/pqWidgets/Icons => resources/icons}/pqResetCamera32.png (100%)
rename qt/{paraview_ext/VatesSimpleGui/ViewWidgets/icons/pqWidgets/Icons => resources/icons}/pqResetCamera@2x.png (100%)
rename qt/{paraview_ext/VatesSimpleGui/ViewWidgets => resources}/icons/pqResetCenterToData24.png (100%)
rename qt/{paraview_ext/VatesSimpleGui/ViewWidgets => resources}/icons/pqResetCenterToPoint24.png (100%)
rename qt/{paraview_ext/VatesSimpleGui/ViewWidgets/icons/pqWidgets/Icons => resources/icons}/pqRotateCameraCCW.png (100%)
rename qt/{paraview_ext/VatesSimpleGui/ViewWidgets/icons/pqWidgets/Icons => resources/icons}/pqRotateCameraCCW24.png (100%)
rename qt/{paraview_ext/VatesSimpleGui/ViewWidgets/icons/pqWidgets/Icons => resources/icons}/pqRotateCameraCCW@2x.png (100%)
rename qt/{paraview_ext/VatesSimpleGui/ViewWidgets/icons/pqWidgets/Icons => resources/icons}/pqRotateCameraCW.png (100%)
rename qt/{paraview_ext/VatesSimpleGui/ViewWidgets/icons/pqWidgets/Icons => resources/icons}/pqRotateCameraCW24.png (100%)
rename qt/{paraview_ext/VatesSimpleGui/ViewWidgets/icons/pqWidgets/Icons => resources/icons}/pqRotateCameraCW@2x.png (100%)
rename qt/{paraview_ext/VatesSimpleGui/ViewWidgets => resources}/icons/pqSlice24.png (100%)
rename qt/{paraview_ext/VatesSimpleGui/ViewWidgets => resources}/icons/pqThreshold24.png (100%)
rename qt/{paraview_ext/VatesSimpleGui/ViewWidgets/icons/pqWidgets/Icons => resources/icons}/pqXMinus.png (100%)
rename qt/{paraview_ext/VatesSimpleGui/ViewWidgets/icons/pqWidgets/Icons => resources/icons}/pqXMinus16.png (100%)
rename qt/{paraview_ext/VatesSimpleGui/ViewWidgets/icons/pqWidgets/Icons => resources/icons}/pqXMinus24.png (100%)
rename qt/{paraview_ext/VatesSimpleGui/ViewWidgets/icons/pqWidgets/Icons => resources/icons}/pqXMinus32.png (100%)
rename qt/{paraview_ext/VatesSimpleGui/ViewWidgets/icons/pqWidgets/Icons => resources/icons}/pqXMinus@2x.png (100%)
rename qt/{paraview_ext/VatesSimpleGui/ViewWidgets/icons/pqWidgets/Icons => resources/icons}/pqXPlus.png (100%)
rename qt/{paraview_ext/VatesSimpleGui/ViewWidgets/icons/pqWidgets/Icons => resources/icons}/pqXPlus16.png (100%)
rename qt/{paraview_ext/VatesSimpleGui/ViewWidgets/icons/pqWidgets/Icons => resources/icons}/pqXPlus24.png (100%)
rename qt/{paraview_ext/VatesSimpleGui/ViewWidgets/icons/pqWidgets/Icons => resources/icons}/pqXPlus32.png (100%)
rename qt/{paraview_ext/VatesSimpleGui/ViewWidgets/icons/pqWidgets/Icons => resources/icons}/pqXPlus@2x.png (100%)
rename qt/{paraview_ext/VatesSimpleGui/ViewWidgets/icons/pqWidgets/Icons => resources/icons}/pqYMinus.png (100%)
rename qt/{paraview_ext/VatesSimpleGui/ViewWidgets/icons/pqWidgets/Icons => resources/icons}/pqYMinus16.png (100%)
rename qt/{paraview_ext/VatesSimpleGui/ViewWidgets/icons/pqWidgets/Icons => resources/icons}/pqYMinus24.png (100%)
rename qt/{paraview_ext/VatesSimpleGui/ViewWidgets/icons/pqWidgets/Icons => resources/icons}/pqYMinus32.png (100%)
rename qt/{paraview_ext/VatesSimpleGui/ViewWidgets/icons/pqWidgets/Icons => resources/icons}/pqYMinus@2x.png (100%)
rename qt/{paraview_ext/VatesSimpleGui/ViewWidgets/icons/pqWidgets/Icons => resources/icons}/pqYPlus.png (100%)
rename qt/{paraview_ext/VatesSimpleGui/ViewWidgets/icons/pqWidgets/Icons => resources/icons}/pqYPlus16.png (100%)
rename qt/{paraview_ext/VatesSimpleGui/ViewWidgets/icons/pqWidgets/Icons => resources/icons}/pqYPlus24.png (100%)
rename qt/{paraview_ext/VatesSimpleGui/ViewWidgets/icons/pqWidgets/Icons => resources/icons}/pqYPlus32.png (100%)
rename qt/{paraview_ext/VatesSimpleGui/ViewWidgets/icons/pqWidgets/Icons => resources/icons}/pqYPlus@2x.png (100%)
rename qt/{paraview_ext/VatesSimpleGui/ViewWidgets/icons/pqWidgets/Icons => resources/icons}/pqZMinus.png (100%)
rename qt/{paraview_ext/VatesSimpleGui/ViewWidgets/icons/pqWidgets/Icons => resources/icons}/pqZMinus16.png (100%)
rename qt/{paraview_ext/VatesSimpleGui/ViewWidgets/icons/pqWidgets/Icons => resources/icons}/pqZMinus24.png (100%)
rename qt/{paraview_ext/VatesSimpleGui/ViewWidgets/icons/pqWidgets/Icons => resources/icons}/pqZMinus32.png (100%)
rename qt/{paraview_ext/VatesSimpleGui/ViewWidgets/icons/pqWidgets/Icons => resources/icons}/pqZMinus@2x.png (100%)
rename qt/{paraview_ext/VatesSimpleGui/ViewWidgets/icons/pqWidgets/Icons => resources/icons}/pqZPlus.png (100%)
rename qt/{paraview_ext/VatesSimpleGui/ViewWidgets/icons/pqWidgets/Icons => resources/icons}/pqZPlus16.png (100%)
rename qt/{paraview_ext/VatesSimpleGui/ViewWidgets/icons/pqWidgets/Icons => resources/icons}/pqZPlus24.png (100%)
rename qt/{paraview_ext/VatesSimpleGui/ViewWidgets/icons/pqWidgets/Icons => resources/icons}/pqZPlus32.png (100%)
rename qt/{paraview_ext/VatesSimpleGui/ViewWidgets/icons/pqWidgets/Icons => resources/icons}/pqZPlus@2x.png (100%)
rename qt/{paraview_ext/VatesSimpleGui/ViewWidgets/icons/pqWidgets/Icons => resources/icons}/pqZoomToData.png (100%)
rename qt/{paraview_ext/VatesSimpleGui/ViewWidgets/icons/pqWidgets/Icons => resources/icons}/pqZoomToData24.png (100%)
rename qt/{paraview_ext/VatesSimpleGui/ViewWidgets/icons/pqWidgets/Icons => resources/icons}/pqZoomToData@2x.png (100%)
rename qt/{paraview_ext/VatesSimpleGui/ViewWidgets/icons/pqWidgets/Icons => resources/icons}/pqZoomToSelection.png (100%)
rename qt/{paraview_ext/VatesSimpleGui/ViewWidgets/icons/pqWidgets/Icons => resources/icons}/pqZoomToSelection24.png (100%)
rename qt/{paraview_ext/VatesSimpleGui/ViewWidgets/icons/pqWidgets/Icons => resources/icons}/pqZoomToSelection@2x.png (100%)
rename qt/{paraview_ext/VatesSimpleGui/ViewWidgets => resources}/icons/pvIcon.png (100%)
rename qt/{scientific_interfaces => resources}/icons/range.png (100%)
rename qt/{widgets/sliceviewer => resources}/icons/rebin 32x32.png (100%)
rename qt/{widgets/sliceviewer => resources}/icons/rebin auto 32x32.png (100%)
rename qt/{widgets/sliceviewer => resources}/icons/rebin finer 32x32.png (100%)
rename qt/{widgets/sliceviewer => resources}/icons/rebin on 32x32.png (100%)
rename qt/{widgets/sliceviewer => resources}/icons/rebin.pdn (100%)
rename qt/{widgets/sliceviewer => resources}/icons/refresh.png (100%)
rename qt/{paraview_ext/VatesSimpleGui/ViewWidgets => resources}/icons/resetViewToAll24.png (100%)
rename qt/{widgets/sliceviewer => resources}/icons/scale colour to visible.pdn (100%)
rename qt/{widgets/sliceviewer => resources}/icons/stock-lock.png (100%)
rename qt/{widgets/sliceviewer => resources}/icons/stock-tool-pencil-16.png (100%)
rename qt/{widgets/sliceviewer => resources}/icons/stock-tool-pencil-22.png (100%)
rename qt/{widgets/sliceviewer => resources}/icons/view-fullscreen-24x24.png (100%)
rename qt/{widgets/sliceviewer => resources}/icons/view-fullscreen.png (100%)
rename qt/{widgets/sliceviewer => resources}/icons/zoom to all 32x32.png (100%)
rename qt/{widgets/sliceviewer => resources}/icons/zoom-in 32x32.png (100%)
rename qt/{widgets/sliceviewer => resources}/icons/zoom-out 32x32.png (100%)
rename qt/{widgets/sliceviewer => resources}/icons/zoom-select 32x32.png (100%)
rename qt/{scientific_interfaces => resources}/icons/zoom.png (100%)
diff --git a/MantidPlot/CMakeLists.txt b/MantidPlot/CMakeLists.txt
index 65264fb961d..26ab5f9aa70 100644
--- 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
diff --git a/qt/paraview_ext/VatesSimpleGui/ViewWidgets/CMakeLists.txt b/qt/paraview_ext/VatesSimpleGui/ViewWidgets/CMakeLists.txt
index 3c87c5f03f5..1624ae32b3a 100644
--- 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
diff --git a/qt/paraview_ext/VatesSimpleGui/ViewWidgets/icons/ViewWidgetsIcons.qrc b/qt/paraview_ext/VatesSimpleGui/ViewWidgets/icons/ViewWidgetsIcons.qrc
deleted file mode 100644
index f36928170a5..00000000000
--- a/qt/paraview_ext/VatesSimpleGui/ViewWidgets/icons/ViewWidgetsIcons.qrc
+++ /dev/null
@@ -1,61 +0,0 @@
-<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>
diff --git a/qt/widgets/sliceviewer/icons/Colour zoom-select.pdn b/qt/resources/icons/Colour zoom-select.pdn
similarity index 100%
rename from qt/widgets/sliceviewer/icons/Colour zoom-select.pdn
rename to qt/resources/icons/Colour zoom-select.pdn
diff --git a/qt/scientific_interfaces/icons/CustomInterfacesIcons.qrc b/qt/resources/icons/MultiDatasetFitIcons.qrc
similarity index 100%
rename from qt/scientific_interfaces/icons/CustomInterfacesIcons.qrc
rename to qt/resources/icons/MultiDatasetFitIcons.qrc
diff --git a/qt/widgets/sliceviewer/icons/Nonorthogonal 32x32.png b/qt/resources/icons/Nonorthogonal 32x32.png
similarity index 100%
rename from qt/widgets/sliceviewer/icons/Nonorthogonal 32x32.png
rename to qt/resources/icons/Nonorthogonal 32x32.png
diff --git a/qt/widgets/sliceviewer/icons/Peak List 32x32.png b/qt/resources/icons/Peak List 32x32.png
similarity index 100%
rename from qt/widgets/sliceviewer/icons/Peak List 32x32.png
rename to qt/resources/icons/Peak List 32x32.png
diff --git a/qt/widgets/sliceviewer/icons/Peak List on 32x32.png b/qt/resources/icons/Peak List on 32x32.png
similarity index 100%
rename from qt/widgets/sliceviewer/icons/Peak List on 32x32.png
rename to qt/resources/icons/Peak List on 32x32.png
diff --git a/qt/widgets/sliceviewer/icons/Peak List on.png b/qt/resources/icons/Peak List on.png
similarity index 100%
rename from qt/widgets/sliceviewer/icons/Peak List on.png
rename to qt/resources/icons/Peak List on.png
diff --git a/qt/widgets/sliceviewer/icons/Peak List.pdn b/qt/resources/icons/Peak List.pdn
similarity index 100%
rename from qt/widgets/sliceviewer/icons/Peak List.pdn
rename to qt/resources/icons/Peak List.pdn
diff --git a/qt/widgets/sliceviewer/icons/Peak List.png b/qt/resources/icons/Peak List.png
similarity index 100%
rename from qt/widgets/sliceviewer/icons/Peak List.png
rename to qt/resources/icons/Peak List.png
diff --git a/qt/widgets/sliceviewer/icons/Scale colour to visible 32x32.png b/qt/resources/icons/Scale colour to visible 32x32.png
similarity index 100%
rename from qt/widgets/sliceviewer/icons/Scale colour to visible 32x32.png
rename to qt/resources/icons/Scale colour to visible 32x32.png
diff --git a/qt/widgets/sliceviewer/icons/SliceViewerIcons.qrc b/qt/resources/icons/SliceViewerIcons.qrc
similarity index 100%
rename from qt/widgets/sliceviewer/icons/SliceViewerIcons.qrc
rename to qt/resources/icons/SliceViewerIcons.qrc
diff --git a/qt/widgets/sliceviewer/icons/SliceViewerWindow_icon.png b/qt/resources/icons/SliceViewerWindow_icon.png
similarity index 100%
rename from qt/widgets/sliceviewer/icons/SliceViewerWindow_icon.png
rename to qt/resources/icons/SliceViewerWindow_icon.png
diff --git a/qt/widgets/sliceviewer/icons/SliceViewerWindow_icon_old.png b/qt/resources/icons/SliceViewerWindow_icon_old.png
similarity index 100%
rename from qt/widgets/sliceviewer/icons/SliceViewerWindow_icon_old.png
rename to qt/resources/icons/SliceViewerWindow_icon_old.png
diff --git a/qt/resources/icons/ViewWidgetsIcons.qrc b/qt/resources/icons/ViewWidgetsIcons.qrc
new file mode 100644
index 00000000000..3673299e77c
--- /dev/null
+++ b/qt/resources/icons/ViewWidgetsIcons.qrc
@@ -0,0 +1,61 @@
+<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>
diff --git a/qt/widgets/sliceviewer/icons/auto_rebin.png b/qt/resources/icons/auto_rebin.png
similarity index 100%
rename from qt/widgets/sliceviewer/icons/auto_rebin.png
rename to qt/resources/icons/auto_rebin.png
diff --git a/qt/widgets/sliceviewer/icons/color-pallette-part.png b/qt/resources/icons/color-pallette-part.png
similarity index 100%
rename from qt/widgets/sliceviewer/icons/color-pallette-part.png
rename to qt/resources/icons/color-pallette-part.png
diff --git a/qt/widgets/sliceviewer/icons/color-pallette.png b/qt/resources/icons/color-pallette.png
similarity index 100%
rename from qt/widgets/sliceviewer/icons/color-pallette.png
rename to qt/resources/icons/color-pallette.png
diff --git a/qt/widgets/sliceviewer/icons/colour zoom minus scale 32x32.png b/qt/resources/icons/colour zoom minus scale 32x32.png
similarity index 100%
rename from qt/widgets/sliceviewer/icons/colour zoom minus scale 32x32.png
rename to qt/resources/icons/colour zoom minus scale 32x32.png
diff --git a/qt/widgets/sliceviewer/icons/colour zoom plus scale 32x32.png b/qt/resources/icons/colour zoom plus scale 32x32.png
similarity index 100%
rename from qt/widgets/sliceviewer/icons/colour zoom plus scale 32x32.png
rename to qt/resources/icons/colour zoom plus scale 32x32.png
diff --git a/qt/widgets/sliceviewer/icons/colour zoom-select scale.pdn b/qt/resources/icons/colour zoom-select scale.pdn
similarity index 100%
rename from qt/widgets/sliceviewer/icons/colour zoom-select scale.pdn
rename to qt/resources/icons/colour zoom-select scale.pdn
diff --git a/qt/widgets/sliceviewer/icons/cross.png b/qt/resources/icons/cross.png
similarity index 100%
rename from qt/widgets/sliceviewer/icons/cross.png
rename to qt/resources/icons/cross.png
diff --git a/qt/widgets/sliceviewer/icons/cursor-crosshair-small.png b/qt/resources/icons/cursor-crosshair-small.png
similarity index 100%
rename from qt/widgets/sliceviewer/icons/cursor-crosshair-small.png
rename to qt/resources/icons/cursor-crosshair-small.png
diff --git a/qt/widgets/sliceviewer/icons/cursor-crosshair.png b/qt/resources/icons/cursor-crosshair.png
similarity index 100%
rename from qt/widgets/sliceviewer/icons/cursor-crosshair.png
rename to qt/resources/icons/cursor-crosshair.png
diff --git a/qt/widgets/sliceviewer/icons/cut 32x32.png b/qt/resources/icons/cut 32x32.png
similarity index 100%
rename from qt/widgets/sliceviewer/icons/cut 32x32.png
rename to qt/resources/icons/cut 32x32.png
diff --git a/qt/widgets/sliceviewer/icons/cut on 32x32.png b/qt/resources/icons/cut on 32x32.png
similarity index 100%
rename from qt/widgets/sliceviewer/icons/cut on 32x32.png
rename to qt/resources/icons/cut on 32x32.png
diff --git a/qt/widgets/sliceviewer/icons/cut remove 32x32.png b/qt/resources/icons/cut remove 32x32.png
similarity index 100%
rename from qt/widgets/sliceviewer/icons/cut remove 32x32.png
rename to qt/resources/icons/cut remove 32x32.png
diff --git a/qt/widgets/sliceviewer/icons/cut remove.pdn b/qt/resources/icons/cut remove.pdn
similarity index 100%
rename from qt/widgets/sliceviewer/icons/cut remove.pdn
rename to qt/resources/icons/cut remove.pdn
diff --git a/qt/widgets/sliceviewer/icons/document-new.png b/qt/resources/icons/document-new.png
similarity index 100%
rename from qt/widgets/sliceviewer/icons/document-new.png
rename to qt/resources/icons/document-new.png
diff --git a/qt/scientific_interfaces/icons/export-all-plots.png b/qt/resources/icons/export-all-plots.png
similarity index 100%
rename from qt/scientific_interfaces/icons/export-all-plots.png
rename to qt/resources/icons/export-all-plots.png
diff --git a/qt/scientific_interfaces/icons/export-plot.png b/qt/resources/icons/export-plot.png
similarity index 100%
rename from qt/scientific_interfaces/icons/export-plot.png
rename to qt/resources/icons/export-plot.png
diff --git a/qt/widgets/sliceviewer/icons/grid 32x32.png b/qt/resources/icons/grid 32x32.png
similarity index 100%
rename from qt/widgets/sliceviewer/icons/grid 32x32.png
rename to qt/resources/icons/grid 32x32.png
diff --git a/qt/widgets/sliceviewer/icons/grid on 32x32.png b/qt/resources/icons/grid on 32x32.png
similarity index 100%
rename from qt/widgets/sliceviewer/icons/grid on 32x32.png
rename to qt/resources/icons/grid on 32x32.png
diff --git a/qt/widgets/sliceviewer/icons/grid on 48x48.pdn b/qt/resources/icons/grid on 48x48.pdn
similarity index 100%
rename from qt/widgets/sliceviewer/icons/grid on 48x48.pdn
rename to qt/resources/icons/grid on 48x48.pdn
diff --git a/qt/widgets/sliceviewer/icons/grid.png b/qt/resources/icons/grid.png
similarity index 100%
rename from qt/widgets/sliceviewer/icons/grid.png
rename to qt/resources/icons/grid.png
diff --git a/qt/widgets/sliceviewer/icons/letter_x.png b/qt/resources/icons/letter_x.png
similarity index 100%
rename from qt/widgets/sliceviewer/icons/letter_x.png
rename to qt/resources/icons/letter_x.png
diff --git a/qt/widgets/sliceviewer/icons/letter_x.xcf b/qt/resources/icons/letter_x.xcf
similarity index 100%
rename from qt/widgets/sliceviewer/icons/letter_x.xcf
rename to qt/resources/icons/letter_x.xcf
diff --git a/qt/widgets/sliceviewer/icons/letter_y.png b/qt/resources/icons/letter_y.png
similarity index 100%
rename from qt/widgets/sliceviewer/icons/letter_y.png
rename to qt/resources/icons/letter_y.png
diff --git a/qt/widgets/sliceviewer/icons/letter_y.xcf b/qt/resources/icons/letter_y.xcf
similarity index 100%
rename from qt/widgets/sliceviewer/icons/letter_y.xcf
rename to qt/resources/icons/letter_y.xcf
diff --git a/qt/scientific_interfaces/icons/panning.png b/qt/resources/icons/panning.png
similarity index 100%
rename from qt/scientific_interfaces/icons/panning.png
rename to qt/resources/icons/panning.png
diff --git a/qt/paraview_ext/VatesSimpleGui/ViewWidgets/icons/parallel_projection.png b/qt/resources/icons/parallel_projection.png
similarity index 100%
rename from qt/paraview_ext/VatesSimpleGui/ViewWidgets/icons/parallel_projection.png
rename to qt/resources/icons/parallel_projection.png
diff --git a/qt/widgets/sliceviewer/icons/peak-cross-faded.png b/qt/resources/icons/peak-cross-faded.png
similarity index 100%
rename from qt/widgets/sliceviewer/icons/peak-cross-faded.png
rename to qt/resources/icons/peak-cross-faded.png
diff --git a/qt/widgets/sliceviewer/icons/peak-cross-small.png b/qt/resources/icons/peak-cross-small.png
similarity index 100%
rename from qt/widgets/sliceviewer/icons/peak-cross-small.png
rename to qt/resources/icons/peak-cross-small.png
diff --git a/qt/widgets/sliceviewer/icons/peak-cross.png b/qt/resources/icons/peak-cross.png
similarity index 100%
rename from qt/widgets/sliceviewer/icons/peak-cross.png
rename to qt/resources/icons/peak-cross.png
diff --git a/qt/widgets/sliceviewer/icons/peak.png b/qt/resources/icons/peak.png
similarity index 100%
rename from qt/widgets/sliceviewer/icons/peak.png
rename to qt/resources/icons/peak.png
diff --git a/qt/widgets/sliceviewer/icons/peak_cross.png b/qt/resources/icons/peak_cross.png
similarity index 100%
rename from qt/widgets/sliceviewer/icons/peak_cross.png
rename to qt/resources/icons/peak_cross.png
diff --git a/qt/widgets/sliceviewer/icons/peak_disabled.png b/qt/resources/icons/peak_disabled.png
similarity index 100%
rename from qt/widgets/sliceviewer/icons/peak_disabled.png
rename to qt/resources/icons/peak_disabled.png
diff --git a/qt/widgets/sliceviewer/icons/peak_ellipsoid.png b/qt/resources/icons/peak_ellipsoid.png
similarity index 100%
rename from qt/widgets/sliceviewer/icons/peak_ellipsoid.png
rename to qt/resources/icons/peak_ellipsoid.png
diff --git a/qt/widgets/sliceviewer/icons/peak_sphere.png b/qt/resources/icons/peak_sphere.png
similarity index 100%
rename from qt/widgets/sliceviewer/icons/peak_sphere.png
rename to qt/resources/icons/peak_sphere.png
diff --git a/qt/paraview_ext/VatesSimpleGui/ViewWidgets/icons/pqEditColor24.png b/qt/resources/icons/pqEditColor24.png
similarity index 100%
rename from qt/paraview_ext/VatesSimpleGui/ViewWidgets/icons/pqEditColor24.png
rename to qt/resources/icons/pqEditColor24.png
diff --git a/qt/paraview_ext/VatesSimpleGui/ViewWidgets/icons/pqWidgets/Icons/pqResetCamera.png b/qt/resources/icons/pqResetCamera.png
similarity index 100%
rename from qt/paraview_ext/VatesSimpleGui/ViewWidgets/icons/pqWidgets/Icons/pqResetCamera.png
rename to qt/resources/icons/pqResetCamera.png
diff --git a/qt/paraview_ext/VatesSimpleGui/ViewWidgets/icons/pqWidgets/Icons/pqResetCamera16.png b/qt/resources/icons/pqResetCamera16.png
similarity index 100%
rename from qt/paraview_ext/VatesSimpleGui/ViewWidgets/icons/pqWidgets/Icons/pqResetCamera16.png
rename to qt/resources/icons/pqResetCamera16.png
diff --git a/qt/paraview_ext/VatesSimpleGui/ViewWidgets/icons/pqWidgets/Icons/pqResetCamera24.png b/qt/resources/icons/pqResetCamera24.png
similarity index 100%
rename from qt/paraview_ext/VatesSimpleGui/ViewWidgets/icons/pqWidgets/Icons/pqResetCamera24.png
rename to qt/resources/icons/pqResetCamera24.png
diff --git a/qt/paraview_ext/VatesSimpleGui/ViewWidgets/icons/pqWidgets/Icons/pqResetCamera32.png b/qt/resources/icons/pqResetCamera32.png
similarity index 100%
rename from qt/paraview_ext/VatesSimpleGui/ViewWidgets/icons/pqWidgets/Icons/pqResetCamera32.png
rename to qt/resources/icons/pqResetCamera32.png
diff --git a/qt/paraview_ext/VatesSimpleGui/ViewWidgets/icons/pqWidgets/Icons/pqResetCamera@2x.png b/qt/resources/icons/pqResetCamera@2x.png
similarity index 100%
rename from qt/paraview_ext/VatesSimpleGui/ViewWidgets/icons/pqWidgets/Icons/pqResetCamera@2x.png
rename to qt/resources/icons/pqResetCamera@2x.png
diff --git a/qt/paraview_ext/VatesSimpleGui/ViewWidgets/icons/pqResetCenterToData24.png b/qt/resources/icons/pqResetCenterToData24.png
similarity index 100%
rename from qt/paraview_ext/VatesSimpleGui/ViewWidgets/icons/pqResetCenterToData24.png
rename to qt/resources/icons/pqResetCenterToData24.png
diff --git a/qt/paraview_ext/VatesSimpleGui/ViewWidgets/icons/pqResetCenterToPoint24.png b/qt/resources/icons/pqResetCenterToPoint24.png
similarity index 100%
rename from qt/paraview_ext/VatesSimpleGui/ViewWidgets/icons/pqResetCenterToPoint24.png
rename to qt/resources/icons/pqResetCenterToPoint24.png
diff --git a/qt/paraview_ext/VatesSimpleGui/ViewWidgets/icons/pqWidgets/Icons/pqRotateCameraCCW.png b/qt/resources/icons/pqRotateCameraCCW.png
similarity index 100%
rename from qt/paraview_ext/VatesSimpleGui/ViewWidgets/icons/pqWidgets/Icons/pqRotateCameraCCW.png
rename to qt/resources/icons/pqRotateCameraCCW.png
diff --git a/qt/paraview_ext/VatesSimpleGui/ViewWidgets/icons/pqWidgets/Icons/pqRotateCameraCCW24.png b/qt/resources/icons/pqRotateCameraCCW24.png
similarity index 100%
rename from qt/paraview_ext/VatesSimpleGui/ViewWidgets/icons/pqWidgets/Icons/pqRotateCameraCCW24.png
rename to qt/resources/icons/pqRotateCameraCCW24.png
diff --git a/qt/paraview_ext/VatesSimpleGui/ViewWidgets/icons/pqWidgets/Icons/pqRotateCameraCCW@2x.png b/qt/resources/icons/pqRotateCameraCCW@2x.png
similarity index 100%
rename from qt/paraview_ext/VatesSimpleGui/ViewWidgets/icons/pqWidgets/Icons/pqRotateCameraCCW@2x.png
rename to qt/resources/icons/pqRotateCameraCCW@2x.png
diff --git a/qt/paraview_ext/VatesSimpleGui/ViewWidgets/icons/pqWidgets/Icons/pqRotateCameraCW.png b/qt/resources/icons/pqRotateCameraCW.png
similarity index 100%
rename from qt/paraview_ext/VatesSimpleGui/ViewWidgets/icons/pqWidgets/Icons/pqRotateCameraCW.png
rename to qt/resources/icons/pqRotateCameraCW.png
diff --git a/qt/paraview_ext/VatesSimpleGui/ViewWidgets/icons/pqWidgets/Icons/pqRotateCameraCW24.png b/qt/resources/icons/pqRotateCameraCW24.png
similarity index 100%
rename from qt/paraview_ext/VatesSimpleGui/ViewWidgets/icons/pqWidgets/Icons/pqRotateCameraCW24.png
rename to qt/resources/icons/pqRotateCameraCW24.png
diff --git a/qt/paraview_ext/VatesSimpleGui/ViewWidgets/icons/pqWidgets/Icons/pqRotateCameraCW@2x.png b/qt/resources/icons/pqRotateCameraCW@2x.png
similarity index 100%
rename from qt/paraview_ext/VatesSimpleGui/ViewWidgets/icons/pqWidgets/Icons/pqRotateCameraCW@2x.png
rename to qt/resources/icons/pqRotateCameraCW@2x.png
diff --git a/qt/paraview_ext/VatesSimpleGui/ViewWidgets/icons/pqSlice24.png b/qt/resources/icons/pqSlice24.png
similarity index 100%
rename from qt/paraview_ext/VatesSimpleGui/ViewWidgets/icons/pqSlice24.png
rename to qt/resources/icons/pqSlice24.png
diff --git a/qt/paraview_ext/VatesSimpleGui/ViewWidgets/icons/pqThreshold24.png b/qt/resources/icons/pqThreshold24.png
similarity index 100%
rename from qt/paraview_ext/VatesSimpleGui/ViewWidgets/icons/pqThreshold24.png
rename to qt/resources/icons/pqThreshold24.png
diff --git a/qt/paraview_ext/VatesSimpleGui/ViewWidgets/icons/pqWidgets/Icons/pqXMinus.png b/qt/resources/icons/pqXMinus.png
similarity index 100%
rename from qt/paraview_ext/VatesSimpleGui/ViewWidgets/icons/pqWidgets/Icons/pqXMinus.png
rename to qt/resources/icons/pqXMinus.png
diff --git a/qt/paraview_ext/VatesSimpleGui/ViewWidgets/icons/pqWidgets/Icons/pqXMinus16.png b/qt/resources/icons/pqXMinus16.png
similarity index 100%
rename from qt/paraview_ext/VatesSimpleGui/ViewWidgets/icons/pqWidgets/Icons/pqXMinus16.png
rename to qt/resources/icons/pqXMinus16.png
diff --git a/qt/paraview_ext/VatesSimpleGui/ViewWidgets/icons/pqWidgets/Icons/pqXMinus24.png b/qt/resources/icons/pqXMinus24.png
similarity index 100%
rename from qt/paraview_ext/VatesSimpleGui/ViewWidgets/icons/pqWidgets/Icons/pqXMinus24.png
rename to qt/resources/icons/pqXMinus24.png
diff --git a/qt/paraview_ext/VatesSimpleGui/ViewWidgets/icons/pqWidgets/Icons/pqXMinus32.png b/qt/resources/icons/pqXMinus32.png
similarity index 100%
rename from qt/paraview_ext/VatesSimpleGui/ViewWidgets/icons/pqWidgets/Icons/pqXMinus32.png
rename to qt/resources/icons/pqXMinus32.png
diff --git a/qt/paraview_ext/VatesSimpleGui/ViewWidgets/icons/pqWidgets/Icons/pqXMinus@2x.png b/qt/resources/icons/pqXMinus@2x.png
similarity index 100%
rename from qt/paraview_ext/VatesSimpleGui/ViewWidgets/icons/pqWidgets/Icons/pqXMinus@2x.png
rename to qt/resources/icons/pqXMinus@2x.png
diff --git a/qt/paraview_ext/VatesSimpleGui/ViewWidgets/icons/pqWidgets/Icons/pqXPlus.png b/qt/resources/icons/pqXPlus.png
similarity index 100%
rename from qt/paraview_ext/VatesSimpleGui/ViewWidgets/icons/pqWidgets/Icons/pqXPlus.png
rename to qt/resources/icons/pqXPlus.png
diff --git a/qt/paraview_ext/VatesSimpleGui/ViewWidgets/icons/pqWidgets/Icons/pqXPlus16.png b/qt/resources/icons/pqXPlus16.png
similarity index 100%
rename from qt/paraview_ext/VatesSimpleGui/ViewWidgets/icons/pqWidgets/Icons/pqXPlus16.png
rename to qt/resources/icons/pqXPlus16.png
diff --git a/qt/paraview_ext/VatesSimpleGui/ViewWidgets/icons/pqWidgets/Icons/pqXPlus24.png b/qt/resources/icons/pqXPlus24.png
similarity index 100%
rename from qt/paraview_ext/VatesSimpleGui/ViewWidgets/icons/pqWidgets/Icons/pqXPlus24.png
rename to qt/resources/icons/pqXPlus24.png
diff --git a/qt/paraview_ext/VatesSimpleGui/ViewWidgets/icons/pqWidgets/Icons/pqXPlus32.png b/qt/resources/icons/pqXPlus32.png
similarity index 100%
rename from qt/paraview_ext/VatesSimpleGui/ViewWidgets/icons/pqWidgets/Icons/pqXPlus32.png
rename to qt/resources/icons/pqXPlus32.png
diff --git a/qt/paraview_ext/VatesSimpleGui/ViewWidgets/icons/pqWidgets/Icons/pqXPlus@2x.png b/qt/resources/icons/pqXPlus@2x.png
similarity index 100%
rename from qt/paraview_ext/VatesSimpleGui/ViewWidgets/icons/pqWidgets/Icons/pqXPlus@2x.png
rename to qt/resources/icons/pqXPlus@2x.png
diff --git a/qt/paraview_ext/VatesSimpleGui/ViewWidgets/icons/pqWidgets/Icons/pqYMinus.png b/qt/resources/icons/pqYMinus.png
similarity index 100%
rename from qt/paraview_ext/VatesSimpleGui/ViewWidgets/icons/pqWidgets/Icons/pqYMinus.png
rename to qt/resources/icons/pqYMinus.png
diff --git a/qt/paraview_ext/VatesSimpleGui/ViewWidgets/icons/pqWidgets/Icons/pqYMinus16.png b/qt/resources/icons/pqYMinus16.png
similarity index 100%
rename from qt/paraview_ext/VatesSimpleGui/ViewWidgets/icons/pqWidgets/Icons/pqYMinus16.png
rename to qt/resources/icons/pqYMinus16.png
diff --git a/qt/paraview_ext/VatesSimpleGui/ViewWidgets/icons/pqWidgets/Icons/pqYMinus24.png b/qt/resources/icons/pqYMinus24.png
similarity index 100%
rename from qt/paraview_ext/VatesSimpleGui/ViewWidgets/icons/pqWidgets/Icons/pqYMinus24.png
rename to qt/resources/icons/pqYMinus24.png
diff --git a/qt/paraview_ext/VatesSimpleGui/ViewWidgets/icons/pqWidgets/Icons/pqYMinus32.png b/qt/resources/icons/pqYMinus32.png
similarity index 100%
rename from qt/paraview_ext/VatesSimpleGui/ViewWidgets/icons/pqWidgets/Icons/pqYMinus32.png
rename to qt/resources/icons/pqYMinus32.png
diff --git a/qt/paraview_ext/VatesSimpleGui/ViewWidgets/icons/pqWidgets/Icons/pqYMinus@2x.png b/qt/resources/icons/pqYMinus@2x.png
similarity index 100%
rename from qt/paraview_ext/VatesSimpleGui/ViewWidgets/icons/pqWidgets/Icons/pqYMinus@2x.png
rename to qt/resources/icons/pqYMinus@2x.png
diff --git a/qt/paraview_ext/VatesSimpleGui/ViewWidgets/icons/pqWidgets/Icons/pqYPlus.png b/qt/resources/icons/pqYPlus.png
similarity index 100%
rename from qt/paraview_ext/VatesSimpleGui/ViewWidgets/icons/pqWidgets/Icons/pqYPlus.png
rename to qt/resources/icons/pqYPlus.png
diff --git a/qt/paraview_ext/VatesSimpleGui/ViewWidgets/icons/pqWidgets/Icons/pqYPlus16.png b/qt/resources/icons/pqYPlus16.png
similarity index 100%
rename from qt/paraview_ext/VatesSimpleGui/ViewWidgets/icons/pqWidgets/Icons/pqYPlus16.png
rename to qt/resources/icons/pqYPlus16.png
diff --git a/qt/paraview_ext/VatesSimpleGui/ViewWidgets/icons/pqWidgets/Icons/pqYPlus24.png b/qt/resources/icons/pqYPlus24.png
similarity index 100%
rename from qt/paraview_ext/VatesSimpleGui/ViewWidgets/icons/pqWidgets/Icons/pqYPlus24.png
rename to qt/resources/icons/pqYPlus24.png
diff --git a/qt/paraview_ext/VatesSimpleGui/ViewWidgets/icons/pqWidgets/Icons/pqYPlus32.png b/qt/resources/icons/pqYPlus32.png
similarity index 100%
rename from qt/paraview_ext/VatesSimpleGui/ViewWidgets/icons/pqWidgets/Icons/pqYPlus32.png
rename to qt/resources/icons/pqYPlus32.png
diff --git a/qt/paraview_ext/VatesSimpleGui/ViewWidgets/icons/pqWidgets/Icons/pqYPlus@2x.png b/qt/resources/icons/pqYPlus@2x.png
similarity index 100%
rename from qt/paraview_ext/VatesSimpleGui/ViewWidgets/icons/pqWidgets/Icons/pqYPlus@2x.png
rename to qt/resources/icons/pqYPlus@2x.png
diff --git a/qt/paraview_ext/VatesSimpleGui/ViewWidgets/icons/pqWidgets/Icons/pqZMinus.png b/qt/resources/icons/pqZMinus.png
similarity index 100%
rename from qt/paraview_ext/VatesSimpleGui/ViewWidgets/icons/pqWidgets/Icons/pqZMinus.png
rename to qt/resources/icons/pqZMinus.png
diff --git a/qt/paraview_ext/VatesSimpleGui/ViewWidgets/icons/pqWidgets/Icons/pqZMinus16.png b/qt/resources/icons/pqZMinus16.png
similarity index 100%
rename from qt/paraview_ext/VatesSimpleGui/ViewWidgets/icons/pqWidgets/Icons/pqZMinus16.png
rename to qt/resources/icons/pqZMinus16.png
diff --git a/qt/paraview_ext/VatesSimpleGui/ViewWidgets/icons/pqWidgets/Icons/pqZMinus24.png b/qt/resources/icons/pqZMinus24.png
similarity index 100%
rename from qt/paraview_ext/VatesSimpleGui/ViewWidgets/icons/pqWidgets/Icons/pqZMinus24.png
rename to qt/resources/icons/pqZMinus24.png
diff --git a/qt/paraview_ext/VatesSimpleGui/ViewWidgets/icons/pqWidgets/Icons/pqZMinus32.png b/qt/resources/icons/pqZMinus32.png
similarity index 100%
rename from qt/paraview_ext/VatesSimpleGui/ViewWidgets/icons/pqWidgets/Icons/pqZMinus32.png
rename to qt/resources/icons/pqZMinus32.png
diff --git a/qt/paraview_ext/VatesSimpleGui/ViewWidgets/icons/pqWidgets/Icons/pqZMinus@2x.png b/qt/resources/icons/pqZMinus@2x.png
similarity index 100%
rename from qt/paraview_ext/VatesSimpleGui/ViewWidgets/icons/pqWidgets/Icons/pqZMinus@2x.png
rename to qt/resources/icons/pqZMinus@2x.png
diff --git a/qt/paraview_ext/VatesSimpleGui/ViewWidgets/icons/pqWidgets/Icons/pqZPlus.png b/qt/resources/icons/pqZPlus.png
similarity index 100%
rename from qt/paraview_ext/VatesSimpleGui/ViewWidgets/icons/pqWidgets/Icons/pqZPlus.png
rename to qt/resources/icons/pqZPlus.png
diff --git a/qt/paraview_ext/VatesSimpleGui/ViewWidgets/icons/pqWidgets/Icons/pqZPlus16.png b/qt/resources/icons/pqZPlus16.png
similarity index 100%
rename from qt/paraview_ext/VatesSimpleGui/ViewWidgets/icons/pqWidgets/Icons/pqZPlus16.png
rename to qt/resources/icons/pqZPlus16.png
diff --git a/qt/paraview_ext/VatesSimpleGui/ViewWidgets/icons/pqWidgets/Icons/pqZPlus24.png b/qt/resources/icons/pqZPlus24.png
similarity index 100%
rename from qt/paraview_ext/VatesSimpleGui/ViewWidgets/icons/pqWidgets/Icons/pqZPlus24.png
rename to qt/resources/icons/pqZPlus24.png
diff --git a/qt/paraview_ext/VatesSimpleGui/ViewWidgets/icons/pqWidgets/Icons/pqZPlus32.png b/qt/resources/icons/pqZPlus32.png
similarity index 100%
rename from qt/paraview_ext/VatesSimpleGui/ViewWidgets/icons/pqWidgets/Icons/pqZPlus32.png
rename to qt/resources/icons/pqZPlus32.png
diff --git a/qt/paraview_ext/VatesSimpleGui/ViewWidgets/icons/pqWidgets/Icons/pqZPlus@2x.png b/qt/resources/icons/pqZPlus@2x.png
similarity index 100%
rename from qt/paraview_ext/VatesSimpleGui/ViewWidgets/icons/pqWidgets/Icons/pqZPlus@2x.png
rename to qt/resources/icons/pqZPlus@2x.png
diff --git a/qt/paraview_ext/VatesSimpleGui/ViewWidgets/icons/pqWidgets/Icons/pqZoomToData.png b/qt/resources/icons/pqZoomToData.png
similarity index 100%
rename from qt/paraview_ext/VatesSimpleGui/ViewWidgets/icons/pqWidgets/Icons/pqZoomToData.png
rename to qt/resources/icons/pqZoomToData.png
diff --git a/qt/paraview_ext/VatesSimpleGui/ViewWidgets/icons/pqWidgets/Icons/pqZoomToData24.png b/qt/resources/icons/pqZoomToData24.png
similarity index 100%
rename from qt/paraview_ext/VatesSimpleGui/ViewWidgets/icons/pqWidgets/Icons/pqZoomToData24.png
rename to qt/resources/icons/pqZoomToData24.png
diff --git a/qt/paraview_ext/VatesSimpleGui/ViewWidgets/icons/pqWidgets/Icons/pqZoomToData@2x.png b/qt/resources/icons/pqZoomToData@2x.png
similarity index 100%
rename from qt/paraview_ext/VatesSimpleGui/ViewWidgets/icons/pqWidgets/Icons/pqZoomToData@2x.png
rename to qt/resources/icons/pqZoomToData@2x.png
diff --git a/qt/paraview_ext/VatesSimpleGui/ViewWidgets/icons/pqWidgets/Icons/pqZoomToSelection.png b/qt/resources/icons/pqZoomToSelection.png
similarity index 100%
rename from qt/paraview_ext/VatesSimpleGui/ViewWidgets/icons/pqWidgets/Icons/pqZoomToSelection.png
rename to qt/resources/icons/pqZoomToSelection.png
diff --git a/qt/paraview_ext/VatesSimpleGui/ViewWidgets/icons/pqWidgets/Icons/pqZoomToSelection24.png b/qt/resources/icons/pqZoomToSelection24.png
similarity index 100%
rename from qt/paraview_ext/VatesSimpleGui/ViewWidgets/icons/pqWidgets/Icons/pqZoomToSelection24.png
rename to qt/resources/icons/pqZoomToSelection24.png
diff --git a/qt/paraview_ext/VatesSimpleGui/ViewWidgets/icons/pqWidgets/Icons/pqZoomToSelection@2x.png b/qt/resources/icons/pqZoomToSelection@2x.png
similarity index 100%
rename from qt/paraview_ext/VatesSimpleGui/ViewWidgets/icons/pqWidgets/Icons/pqZoomToSelection@2x.png
rename to qt/resources/icons/pqZoomToSelection@2x.png
diff --git a/qt/paraview_ext/VatesSimpleGui/ViewWidgets/icons/pvIcon.png b/qt/resources/icons/pvIcon.png
similarity index 100%
rename from qt/paraview_ext/VatesSimpleGui/ViewWidgets/icons/pvIcon.png
rename to qt/resources/icons/pvIcon.png
diff --git a/qt/scientific_interfaces/icons/range.png b/qt/resources/icons/range.png
similarity index 100%
rename from qt/scientific_interfaces/icons/range.png
rename to qt/resources/icons/range.png
diff --git a/qt/widgets/sliceviewer/icons/rebin 32x32.png b/qt/resources/icons/rebin 32x32.png
similarity index 100%
rename from qt/widgets/sliceviewer/icons/rebin 32x32.png
rename to qt/resources/icons/rebin 32x32.png
diff --git a/qt/widgets/sliceviewer/icons/rebin auto 32x32.png b/qt/resources/icons/rebin auto 32x32.png
similarity index 100%
rename from qt/widgets/sliceviewer/icons/rebin auto 32x32.png
rename to qt/resources/icons/rebin auto 32x32.png
diff --git a/qt/widgets/sliceviewer/icons/rebin finer 32x32.png b/qt/resources/icons/rebin finer 32x32.png
similarity index 100%
rename from qt/widgets/sliceviewer/icons/rebin finer 32x32.png
rename to qt/resources/icons/rebin finer 32x32.png
diff --git a/qt/widgets/sliceviewer/icons/rebin on 32x32.png b/qt/resources/icons/rebin on 32x32.png
similarity index 100%
rename from qt/widgets/sliceviewer/icons/rebin on 32x32.png
rename to qt/resources/icons/rebin on 32x32.png
diff --git a/qt/widgets/sliceviewer/icons/rebin.pdn b/qt/resources/icons/rebin.pdn
similarity index 100%
rename from qt/widgets/sliceviewer/icons/rebin.pdn
rename to qt/resources/icons/rebin.pdn
diff --git a/qt/widgets/sliceviewer/icons/refresh.png b/qt/resources/icons/refresh.png
similarity index 100%
rename from qt/widgets/sliceviewer/icons/refresh.png
rename to qt/resources/icons/refresh.png
diff --git a/qt/paraview_ext/VatesSimpleGui/ViewWidgets/icons/resetViewToAll24.png b/qt/resources/icons/resetViewToAll24.png
similarity index 100%
rename from qt/paraview_ext/VatesSimpleGui/ViewWidgets/icons/resetViewToAll24.png
rename to qt/resources/icons/resetViewToAll24.png
diff --git a/qt/widgets/sliceviewer/icons/scale colour to visible.pdn b/qt/resources/icons/scale colour to visible.pdn
similarity index 100%
rename from qt/widgets/sliceviewer/icons/scale colour to visible.pdn
rename to qt/resources/icons/scale colour to visible.pdn
diff --git a/qt/widgets/sliceviewer/icons/stock-lock.png b/qt/resources/icons/stock-lock.png
similarity index 100%
rename from qt/widgets/sliceviewer/icons/stock-lock.png
rename to qt/resources/icons/stock-lock.png
diff --git a/qt/widgets/sliceviewer/icons/stock-tool-pencil-16.png b/qt/resources/icons/stock-tool-pencil-16.png
similarity index 100%
rename from qt/widgets/sliceviewer/icons/stock-tool-pencil-16.png
rename to qt/resources/icons/stock-tool-pencil-16.png
diff --git a/qt/widgets/sliceviewer/icons/stock-tool-pencil-22.png b/qt/resources/icons/stock-tool-pencil-22.png
similarity index 100%
rename from qt/widgets/sliceviewer/icons/stock-tool-pencil-22.png
rename to qt/resources/icons/stock-tool-pencil-22.png
diff --git a/qt/widgets/sliceviewer/icons/view-fullscreen-24x24.png b/qt/resources/icons/view-fullscreen-24x24.png
similarity index 100%
rename from qt/widgets/sliceviewer/icons/view-fullscreen-24x24.png
rename to qt/resources/icons/view-fullscreen-24x24.png
diff --git a/qt/widgets/sliceviewer/icons/view-fullscreen.png b/qt/resources/icons/view-fullscreen.png
similarity index 100%
rename from qt/widgets/sliceviewer/icons/view-fullscreen.png
rename to qt/resources/icons/view-fullscreen.png
diff --git a/qt/widgets/sliceviewer/icons/zoom to all 32x32.png b/qt/resources/icons/zoom to all 32x32.png
similarity index 100%
rename from qt/widgets/sliceviewer/icons/zoom to all 32x32.png
rename to qt/resources/icons/zoom to all 32x32.png
diff --git a/qt/widgets/sliceviewer/icons/zoom-in 32x32.png b/qt/resources/icons/zoom-in 32x32.png
similarity index 100%
rename from qt/widgets/sliceviewer/icons/zoom-in 32x32.png
rename to qt/resources/icons/zoom-in 32x32.png
diff --git a/qt/widgets/sliceviewer/icons/zoom-out 32x32.png b/qt/resources/icons/zoom-out 32x32.png
similarity index 100%
rename from qt/widgets/sliceviewer/icons/zoom-out 32x32.png
rename to qt/resources/icons/zoom-out 32x32.png
diff --git a/qt/widgets/sliceviewer/icons/zoom-select 32x32.png b/qt/resources/icons/zoom-select 32x32.png
similarity index 100%
rename from qt/widgets/sliceviewer/icons/zoom-select 32x32.png
rename to qt/resources/icons/zoom-select 32x32.png
diff --git a/qt/scientific_interfaces/icons/zoom.png b/qt/resources/icons/zoom.png
similarity index 100%
rename from qt/scientific_interfaces/icons/zoom.png
rename to qt/resources/icons/zoom.png
diff --git a/qt/scientific_interfaces/MultiDatasetFit/CMakeLists.txt b/qt/scientific_interfaces/MultiDatasetFit/CMakeLists.txt
index ae1b85fd54e..21fba0601c0 100644
--- a/qt/scientific_interfaces/MultiDatasetFit/CMakeLists.txt
+++ b/qt/scientific_interfaces/MultiDatasetFit/CMakeLists.txt
@@ -46,7 +46,7 @@ set ( UI_FILES
include_directories ( ../../qt/widgets/common/inc )
qt4_wrap_cpp ( MOCCED_FILES ${MOC_FILES} OPTIONS ${extra_options} )
-qt4_add_resources ( RES_FILES_MULTIDATASETFIT ../icons/CustomInterfacesIcons.qrc )
+qt4_add_resources ( RES_FILES_MULTIDATASETFIT ../../resources/icons/MultiDatasetFitIcons.qrc )
set ( ALL_SRC ${SRC_FILES} ${MOCCED_FILES} ${RES_FILES_MULTIDATASETFIT})
diff --git a/qt/widgets/CMakeLists.txt b/qt/widgets/CMakeLists.txt
index cd1becd19f2..b770c31663d 100644
--- a/qt/widgets/CMakeLists.txt
+++ b/qt/widgets/CMakeLists.txt
@@ -8,6 +8,3 @@ add_subdirectory ( spectrumviewer )
add_subdirectory ( refdetectorview)
add_subdirectory ( factory )
add_subdirectory ( plugins )
-
-#add_subdirectory ( CustomInterfaces )
-
diff --git a/qt/widgets/sliceviewer/CMakeLists.txt b/qt/widgets/sliceviewer/CMakeLists.txt
index 58d145e2813..70c884bca75 100644
--- a/qt/widgets/sliceviewer/CMakeLists.txt
+++ b/qt/widgets/sliceviewer/CMakeLists.txt
@@ -140,9 +140,9 @@ include_directories ( inc )
qt4_wrap_cpp ( MOCCED_FILES ${MOC_FILES} )
# --- Add icons qrc ------
-qt4_add_resources ( RES_FILES icons/SliceViewerIcons.qrc )
+qt4_add_resources ( RES_FILES_SLICEVIEWER ../../resources/icons/SliceViewerIcons.qrc )
-set ( ALL_SRC ${SRC_FILES} ${MOCCED_FILES} )
+set ( ALL_SRC ${SRC_FILES} ${MOCCED_FILES} ${RES_FILES_SLICEVIEWER})
qt4_wrap_ui ( UI_HDRS ${UI_FILES} )
--
GitLab