Fixing paths to allow themes and icons inside main inkscape instalation not only at home

27 files changed, 7 insertions, 5 deletions

diff --git a/share/CMakeLists.txt b/share/CMakeLists.txt
index b34875502..5d74ff397 100644
--- a/share/CMakeLists.txt
+++ b/share/CMakeLists.txt
@@ -13,5 +13,7 @@ add_subdirectory(patterns)
 add_subdirectory(screens)
 add_subdirectory(symbols)
 add_subdirectory(templates)
+add_subdirectory(themes)
+add_subdirectory(pixmaps)
 add_subdirectory(tutorials)
-add_subdirectory(ui)
\ No newline at end of file
+add_subdirectory(ui)
diff --git a/share/icons/CMakeLists.txt b/share/icons/CMakeLists.txt
index e7465ee22..89bcddf43 100644
--- a/share/icons/CMakeLists.txt
+++ b/share/icons/CMakeLists.txt
@@ -2,7 +2,3 @@ add_subdirectory(application)
 add_subdirectory(hicolor)
 add_subdirectory(Tango)
 
-file(GLOB _FILES "*.svg" "*.jpg" "*.png" "README")
-install(FILES ${_FILES} DESTINATION ${INKSCAPE_SHARE_INSTALL}/icons)
-
-install(FILES ../branding/inkscape.svg DESTINATION ${INKSCAPE_SHARE_INSTALL}/icons)
diff --git a/share/icons/color-management-icon.png b/share/icons/color-management-icon.png
deleted file mode 100644
index 469ccd72a..000000000
--- a/share/icons/color-management-icon.png
+++ /dev/null
diff --git a/share/icons/feBlend-icon.png b/share/icons/feBlend-icon.png
deleted file mode 100644
index 1c1aca849..000000000
--- a/share/icons/feBlend-icon.png
+++ /dev/null
diff --git a/share/icons/feColorMatrix-icon.png b/share/icons/feColorMatrix-icon.png
deleted file mode 100644
index 3199299af..000000000
--- a/share/icons/feColorMatrix-icon.png
+++ /dev/null
diff --git a/share/icons/feComposite-icon.png b/share/icons/feComposite-icon.png
deleted file mode 100644
index 9f19feb57..000000000
--- a/share/icons/feComposite-icon.png
+++ /dev/null
diff --git a/share/icons/feConvolveMatrix-icon.png b/share/icons/feConvolveMatrix-icon.png
deleted file mode 100644
index 63ac6a63e..000000000
--- a/share/icons/feConvolveMatrix-icon.png
+++ /dev/null
diff --git a/share/icons/feDiffuseLighting-icon.png b/share/icons/feDiffuseLighting-icon.png
deleted file mode 100644
index cb4d7978a..000000000
--- a/share/icons/feDiffuseLighting-icon.png
+++ /dev/null
diff --git a/share/icons/feDisplacementMap-icon.png b/share/icons/feDisplacementMap-icon.png
deleted file mode 100644
index 577b21e03..000000000
--- a/share/icons/feDisplacementMap-icon.png
+++ /dev/null
diff --git a/share/icons/feFlood-icon.png b/share/icons/feFlood-icon.png
deleted file mode 100644
index da5da07ec..000000000
--- a/share/icons/feFlood-icon.png
+++ /dev/null
diff --git a/share/icons/feGaussianBlur-icon.png b/share/icons/feGaussianBlur-icon.png
deleted file mode 100644
index 3610a9b17..000000000
--- a/share/icons/feGaussianBlur-icon.png
+++ /dev/null
diff --git a/share/icons/feImage-icon.png b/share/icons/feImage-icon.png
deleted file mode 100644
index d09feb668..000000000
--- a/share/icons/feImage-icon.png
+++ /dev/null
diff --git a/share/icons/feMerge-icon.png b/share/icons/feMerge-icon.png
deleted file mode 100644
index 85e4293d6..000000000
--- a/share/icons/feMerge-icon.png
+++ /dev/null
diff --git a/share/icons/feMorphology-icon.png b/share/icons/feMorphology-icon.png
deleted file mode 100644
index eb095d488..000000000
--- a/share/icons/feMorphology-icon.png
+++ /dev/null
diff --git a/share/icons/feOffset-icon.png b/share/icons/feOffset-icon.png
deleted file mode 100644
index 9adb2efa9..000000000
--- a/share/icons/feOffset-icon.png
+++ /dev/null
diff --git a/share/icons/feSpecularLighting-icon.png b/share/icons/feSpecularLighting-icon.png
deleted file mode 100644
index cb4d7978a..000000000
--- a/share/icons/feSpecularLighting-icon.png
+++ /dev/null
diff --git a/share/icons/feTurbulence-icon.png b/share/icons/feTurbulence-icon.png
deleted file mode 100644
index f3b7b9908..000000000
--- a/share/icons/feTurbulence-icon.png
+++ /dev/null
diff --git a/share/icons/out-of-gamut-icon.png b/share/icons/out-of-gamut-icon.png
deleted file mode 100644
index 1e96a9563..000000000
--- a/share/icons/out-of-gamut-icon.png
+++ /dev/null
diff --git a/share/icons/too-much-ink-icon.png b/share/icons/too-much-ink-icon.png
deleted file mode 100644
index 14fed033d..000000000
--- a/share/icons/too-much-ink-icon.png
+++ /dev/null
diff --git a/share/pixmaps/CMakeLists.txt b/share/pixmaps/CMakeLists.txt
new file mode 100644
index 000000000..4cec1a6f7
--- /dev/null
+++ b/share/pixmaps/CMakeLists.txt
@@ -0,0 +1,4 @@
+file(GLOB _FILES "*.svg" "*.jpg" "*.png" "README")
+install(FILES ${_FILES} DESTINATION ${INKSCAPE_SHARE_INSTALL}/pixmaps)
+
+install(FILES ../branding/inkscape.svg DESTINATION ${INKSCAPE_SHARE_INSTALL}/pixmaps)
diff --git a/share/icons/OCAL.png b/share/pixmaps/OCAL.png
index b77239ba1..b77239ba1 100644
--- a/share/icons/OCAL.png
+++ b/share/pixmaps/OCAL.png
diff --git a/share/icons/README b/share/pixmaps/README
index e07dc4f46..e07dc4f46 100644
--- a/share/icons/README
+++ b/share/pixmaps/README
diff --git a/share/icons/inkscape-logo-icons-sized.svg b/share/pixmaps/inkscape-logo-icons-sized.svg
index 0c5749125..0c5749125 100644
--- a/share/icons/inkscape-logo-icons-sized.svg
+++ b/share/pixmaps/inkscape-logo-icons-sized.svg
diff --git a/share/icons/remove-color.png b/share/pixmaps/remove-color.png
index 87b481b95..87b481b95 100644
--- a/share/icons/remove-color.png
+++ b/share/pixmaps/remove-color.png
diff --git a/share/icons/symbolic_icons.svg b/share/pixmaps/symbolic_icons.svg
index 3ad3785c2..3ad3785c2 100644
--- a/share/icons/symbolic_icons.svg
+++ b/share/pixmaps/symbolic_icons.svg
diff --git a/share/icons/ticotico.jpg b/share/pixmaps/ticotico.jpg
index 405643c7c..405643c7c 100644
--- a/share/icons/ticotico.jpg
+++ b/share/pixmaps/ticotico.jpg
diff --git a/share/themes/CMakeLists.txt b/share/themes/CMakeLists.txt
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/share/themes/CMakeLists.txt