move the content of theme_definitons to ios subdir

As we want more widget themes added in the future, add the content
of theme_definitions to its own "ios" folder (as it is a theme
mimicking ios look&feel).

Change-Id: Ie435263c3861aaa324e02cfe955b8288211b2888
Reviewed-on: https://gerrit.libreoffice.org/69313
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
Tested-by: Tomaž Vajngerl <quikee@gmail.com>
(cherry picked from commit b3c6665de2206a922d1a058bb1f5e9f76f792335)

41 files changed, 43 insertions, 42 deletions

diff --git a/vcl/Package_theme_definitions.mk b/vcl/Package_theme_definitions.mk
index a30ca8179850..c68e312e2bca 100644
--- a/vcl/Package_theme_definitions.mk
+++ b/vcl/Package_theme_definitions.mk
@@ -9,46 +9,46 @@
 
 $(eval $(call gb_Package_Package,vcl_theme_definitions,$(SRCDIR)/vcl/uiconfig/theme_definitions))
 
-$(eval $(call gb_Package_add_files,vcl_theme_definitions,$(LIBO_SHARE_FOLDER)/theme_definitions,\
-	definition.xml \
-	switch-off.svgx \
-	switch-off-disabled.svgx \
-	switch-off-pressed.svgx \
-	switch-on.svgx \
-	switch-on-pressed.svgx \
-	switch-on-disabled.svgx \
-	tick-off.svgx \
-	tick-off-disabled.svgx \
-	tick-off-pressed.svgx \
-	tick-on.svgx \
-	tick-on-pressed.svgx \
-	tick-on-disabled.svgx \
-	spinbox-left.svgx \
-	spinbox-left-pressed.svgx \
-	spinbox-left-rollover.svgx \
-	spinbox-left-disabled.svgx \
-	spinbox-right.svgx \
-	spinbox-right-pressed.svgx \
-	spinbox-right-rollover.svgx \
-	spinbox-right-disabled.svgx \
-	common-rect.svgx \
-	common-rect-disabled.svgx \
-	pushbutton-default.svgx \
-	pushbutton-rollover.svgx \
-	pushbutton-disabled.svgx \
-	tabitem-first.svgx \
-	tabitem-middle.svgx \
-	tabitem-last.svgx \
-	tabitem-first-selected.svgx \
-	tabitem-middle-selected.svgx \
-	tabitem-last-selected.svgx \
-	scrollbar-horizontal.svgx \
-	scrollbar-vertical.svgx \
-	combobox.svgx \
-	combobox-disabled.svgx \
-	arrow-up.svgx \
-	arrow-down.svgx \
-	slider-button.svgx \
+$(eval $(call gb_Package_add_files_with_dir,vcl_theme_definitions,$(LIBO_SHARE_FOLDER)/theme_definitions,\
+	ios/definition.xml \
+	ios/switch-off.svgx \
+	ios/switch-off-disabled.svgx \
+	ios/switch-off-pressed.svgx \
+	ios/switch-on.svgx \
+	ios/switch-on-pressed.svgx \
+	ios/switch-on-disabled.svgx \
+	ios/tick-off.svgx \
+	ios/tick-off-disabled.svgx \
+	ios/tick-off-pressed.svgx \
+	ios/tick-on.svgx \
+	ios/tick-on-pressed.svgx \
+	ios/tick-on-disabled.svgx \
+	ios/spinbox-left.svgx \
+	ios/spinbox-left-pressed.svgx \
+	ios/spinbox-left-rollover.svgx \
+	ios/spinbox-left-disabled.svgx \
+	ios/spinbox-right.svgx \
+	ios/spinbox-right-pressed.svgx \
+	ios/spinbox-right-rollover.svgx \
+	ios/spinbox-right-disabled.svgx \
+	ios/common-rect.svgx \
+	ios/common-rect-disabled.svgx \
+	ios/pushbutton-default.svgx \
+	ios/pushbutton-rollover.svgx \
+	ios/pushbutton-disabled.svgx \
+	ios/tabitem-first.svgx \
+	ios/tabitem-middle.svgx \
+	ios/tabitem-last.svgx \
+	ios/tabitem-first-selected.svgx \
+	ios/tabitem-middle-selected.svgx \
+	ios/tabitem-last-selected.svgx \
+	ios/scrollbar-horizontal.svgx \
+	ios/scrollbar-vertical.svgx \
+	ios/combobox.svgx \
+	ios/combobox-disabled.svgx \
+	ios/arrow-up.svgx \
+	ios/arrow-down.svgx \
+	ios/slider-button.svgx \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/vcl/source/gdi/FileDefinitionWidgetDraw.cxx b/vcl/source/gdi/FileDefinitionWidgetDraw.cxx
index d4ee5a1d6dd7..638f7872c50a 100644
--- a/vcl/source/gdi/FileDefinitionWidgetDraw.cxx
+++ b/vcl/source/gdi/FileDefinitionWidgetDraw.cxx
@@ -67,9 +67,10 @@ FileDefinitionWidgetDraw::FileDefinitionWidgetDraw(SalGraphics& rGraphics)
     : m_rGraphics(rGraphics)
 {
     OUString sDefinitionBasePath = lcl_getThemeDefinitionPath();
+    OUString sThemeName = "ios";
+    OUString sThemeFolder = sDefinitionBasePath + sThemeName + "/";
 
-    m_pWidgetDefinition
-        = setWidgetDefinition(sDefinitionBasePath + "definition.xml", sDefinitionBasePath);
+    m_pWidgetDefinition = setWidgetDefinition(sThemeFolder + "definition.xml", sThemeFolder);
 
     ImplSVData* pSVData = ImplGetSVData();
     pSVData->maNWFData.mbNoFocusRects = true;
diff --git a/vcl/uiconfig/theme_definitions/arrow-down.svgx b/vcl/uiconfig/theme_definitions/ios/arrow-down.svgx
index 032df3df64b9..032df3df64b9 100644
--- a/vcl/uiconfig/theme_definitions/arrow-down.svgx
+++ b/vcl/uiconfig/theme_definitions/ios/arrow-down.svgx
diff --git a/vcl/uiconfig/theme_definitions/arrow-up.svgx b/vcl/uiconfig/theme_definitions/ios/arrow-up.svgx
index 524906f31018..524906f31018 100644
--- a/vcl/uiconfig/theme_definitions/arrow-up.svgx
+++ b/vcl/uiconfig/theme_definitions/ios/arrow-up.svgx
diff --git a/vcl/uiconfig/theme_definitions/combobox-disabled.svgx b/vcl/uiconfig/theme_definitions/ios/combobox-disabled.svgx
index ccb892d77f90..ccb892d77f90 100644
--- a/vcl/uiconfig/theme_definitions/combobox-disabled.svgx
+++ b/vcl/uiconfig/theme_definitions/ios/combobox-disabled.svgx
diff --git a/vcl/uiconfig/theme_definitions/combobox.svgx b/vcl/uiconfig/theme_definitions/ios/combobox.svgx
index b4a1627f3882..b4a1627f3882 100644
--- a/vcl/uiconfig/theme_definitions/combobox.svgx
+++ b/vcl/uiconfig/theme_definitions/ios/combobox.svgx
diff --git a/vcl/uiconfig/theme_definitions/common-rect-disabled.svgx b/vcl/uiconfig/theme_definitions/ios/common-rect-disabled.svgx
index e4c1f63599d7..e4c1f63599d7 100644
--- a/vcl/uiconfig/theme_definitions/common-rect-disabled.svgx
+++ b/vcl/uiconfig/theme_definitions/ios/common-rect-disabled.svgx
diff --git a/vcl/uiconfig/theme_definitions/common-rect.svgx b/vcl/uiconfig/theme_definitions/ios/common-rect.svgx
index 24a3b12c2d58..24a3b12c2d58 100644
--- a/vcl/uiconfig/theme_definitions/common-rect.svgx
+++ b/vcl/uiconfig/theme_definitions/ios/common-rect.svgx
diff --git a/vcl/uiconfig/theme_definitions/definition.xml b/vcl/uiconfig/theme_definitions/ios/definition.xml
index 5a4be114ea97..5a4be114ea97 100644
--- a/vcl/uiconfig/theme_definitions/definition.xml
+++ b/vcl/uiconfig/theme_definitions/ios/definition.xml
diff --git a/vcl/uiconfig/theme_definitions/pushbutton-default.svgx b/vcl/uiconfig/theme_definitions/ios/pushbutton-default.svgx
index 24a3b12c2d58..24a3b12c2d58 100644
--- a/vcl/uiconfig/theme_definitions/pushbutton-default.svgx
+++ b/vcl/uiconfig/theme_definitions/ios/pushbutton-default.svgx
diff --git a/vcl/uiconfig/theme_definitions/pushbutton-disabled.svgx b/vcl/uiconfig/theme_definitions/ios/pushbutton-disabled.svgx
index e4c1f63599d7..e4c1f63599d7 100644
--- a/vcl/uiconfig/theme_definitions/pushbutton-disabled.svgx
+++ b/vcl/uiconfig/theme_definitions/ios/pushbutton-disabled.svgx
diff --git a/vcl/uiconfig/theme_definitions/pushbutton-rollover.svgx b/vcl/uiconfig/theme_definitions/ios/pushbutton-rollover.svgx
index 6dbaf3278146..6dbaf3278146 100644
--- a/vcl/uiconfig/theme_definitions/pushbutton-rollover.svgx
+++ b/vcl/uiconfig/theme_definitions/ios/pushbutton-rollover.svgx
diff --git a/vcl/uiconfig/theme_definitions/scrollbar-horizontal.svgx b/vcl/uiconfig/theme_definitions/ios/scrollbar-horizontal.svgx
index 4bdcd409dc20..4bdcd409dc20 100644
--- a/vcl/uiconfig/theme_definitions/scrollbar-horizontal.svgx
+++ b/vcl/uiconfig/theme_definitions/ios/scrollbar-horizontal.svgx
diff --git a/vcl/uiconfig/theme_definitions/scrollbar-vertical.svgx b/vcl/uiconfig/theme_definitions/ios/scrollbar-vertical.svgx
index b4a885d9138d..b4a885d9138d 100644
--- a/vcl/uiconfig/theme_definitions/scrollbar-vertical.svgx
+++ b/vcl/uiconfig/theme_definitions/ios/scrollbar-vertical.svgx
diff --git a/vcl/uiconfig/theme_definitions/slider-button.svgx b/vcl/uiconfig/theme_definitions/ios/slider-button.svgx
index 66772c7521e6..66772c7521e6 100644
--- a/vcl/uiconfig/theme_definitions/slider-button.svgx
+++ b/vcl/uiconfig/theme_definitions/ios/slider-button.svgx
diff --git a/vcl/uiconfig/theme_definitions/spinbox-left-disabled.svgx b/vcl/uiconfig/theme_definitions/ios/spinbox-left-disabled.svgx
index 52c4bcd09433..52c4bcd09433 100644
--- a/vcl/uiconfig/theme_definitions/spinbox-left-disabled.svgx
+++ b/vcl/uiconfig/theme_definitions/ios/spinbox-left-disabled.svgx
diff --git a/vcl/uiconfig/theme_definitions/spinbox-left-pressed.svgx b/vcl/uiconfig/theme_definitions/ios/spinbox-left-pressed.svgx
index 141f805774eb..141f805774eb 100644
--- a/vcl/uiconfig/theme_definitions/spinbox-left-pressed.svgx
+++ b/vcl/uiconfig/theme_definitions/ios/spinbox-left-pressed.svgx
diff --git a/vcl/uiconfig/theme_definitions/spinbox-left-rollover.svgx b/vcl/uiconfig/theme_definitions/ios/spinbox-left-rollover.svgx
index 72498116188d..72498116188d 100644
--- a/vcl/uiconfig/theme_definitions/spinbox-left-rollover.svgx
+++ b/vcl/uiconfig/theme_definitions/ios/spinbox-left-rollover.svgx
diff --git a/vcl/uiconfig/theme_definitions/spinbox-left.svgx b/vcl/uiconfig/theme_definitions/ios/spinbox-left.svgx
index b928309791c9..b928309791c9 100644
--- a/vcl/uiconfig/theme_definitions/spinbox-left.svgx
+++ b/vcl/uiconfig/theme_definitions/ios/spinbox-left.svgx
diff --git a/vcl/uiconfig/theme_definitions/spinbox-right-disabled.svgx b/vcl/uiconfig/theme_definitions/ios/spinbox-right-disabled.svgx
index 9ca695d5ba77..9ca695d5ba77 100644
--- a/vcl/uiconfig/theme_definitions/spinbox-right-disabled.svgx
+++ b/vcl/uiconfig/theme_definitions/ios/spinbox-right-disabled.svgx
diff --git a/vcl/uiconfig/theme_definitions/spinbox-right-pressed.svgx b/vcl/uiconfig/theme_definitions/ios/spinbox-right-pressed.svgx
index 29bb2561e202..29bb2561e202 100644
--- a/vcl/uiconfig/theme_definitions/spinbox-right-pressed.svgx
+++ b/vcl/uiconfig/theme_definitions/ios/spinbox-right-pressed.svgx
diff --git a/vcl/uiconfig/theme_definitions/spinbox-right-rollover.svgx b/vcl/uiconfig/theme_definitions/ios/spinbox-right-rollover.svgx
index ab01dc59dd20..ab01dc59dd20 100644
--- a/vcl/uiconfig/theme_definitions/spinbox-right-rollover.svgx
+++ b/vcl/uiconfig/theme_definitions/ios/spinbox-right-rollover.svgx
diff --git a/vcl/uiconfig/theme_definitions/spinbox-right.svgx b/vcl/uiconfig/theme_definitions/ios/spinbox-right.svgx
index 9ff29f642f39..9ff29f642f39 100644
--- a/vcl/uiconfig/theme_definitions/spinbox-right.svgx
+++ b/vcl/uiconfig/theme_definitions/ios/spinbox-right.svgx
diff --git a/vcl/uiconfig/theme_definitions/switch-off-disabled.svgx b/vcl/uiconfig/theme_definitions/ios/switch-off-disabled.svgx
index 7fb674b79c44..7fb674b79c44 100644
--- a/vcl/uiconfig/theme_definitions/switch-off-disabled.svgx
+++ b/vcl/uiconfig/theme_definitions/ios/switch-off-disabled.svgx
diff --git a/vcl/uiconfig/theme_definitions/switch-off-pressed.svgx b/vcl/uiconfig/theme_definitions/ios/switch-off-pressed.svgx
index 964f42cd7a16..964f42cd7a16 100644
--- a/vcl/uiconfig/theme_definitions/switch-off-pressed.svgx
+++ b/vcl/uiconfig/theme_definitions/ios/switch-off-pressed.svgx
diff --git a/vcl/uiconfig/theme_definitions/switch-off.svgx b/vcl/uiconfig/theme_definitions/ios/switch-off.svgx
index 9531df0bdbbd..9531df0bdbbd 100644
--- a/vcl/uiconfig/theme_definitions/switch-off.svgx
+++ b/vcl/uiconfig/theme_definitions/ios/switch-off.svgx
diff --git a/vcl/uiconfig/theme_definitions/switch-on-disabled.svgx b/vcl/uiconfig/theme_definitions/ios/switch-on-disabled.svgx
index ac03c80b2538..ac03c80b2538 100644
--- a/vcl/uiconfig/theme_definitions/switch-on-disabled.svgx
+++ b/vcl/uiconfig/theme_definitions/ios/switch-on-disabled.svgx
diff --git a/vcl/uiconfig/theme_definitions/switch-on-pressed.svgx b/vcl/uiconfig/theme_definitions/ios/switch-on-pressed.svgx
index d4cf9e764118..d4cf9e764118 100644
--- a/vcl/uiconfig/theme_definitions/switch-on-pressed.svgx
+++ b/vcl/uiconfig/theme_definitions/ios/switch-on-pressed.svgx
diff --git a/vcl/uiconfig/theme_definitions/switch-on.svgx b/vcl/uiconfig/theme_definitions/ios/switch-on.svgx
index c84dff5272da..c84dff5272da 100644
--- a/vcl/uiconfig/theme_definitions/switch-on.svgx
+++ b/vcl/uiconfig/theme_definitions/ios/switch-on.svgx
diff --git a/vcl/uiconfig/theme_definitions/tabitem-first-selected.svgx b/vcl/uiconfig/theme_definitions/ios/tabitem-first-selected.svgx
index 771a2df046e0..771a2df046e0 100644
--- a/vcl/uiconfig/theme_definitions/tabitem-first-selected.svgx
+++ b/vcl/uiconfig/theme_definitions/ios/tabitem-first-selected.svgx
diff --git a/vcl/uiconfig/theme_definitions/tabitem-first.svgx b/vcl/uiconfig/theme_definitions/ios/tabitem-first.svgx
index f21ed6818380..f21ed6818380 100644
--- a/vcl/uiconfig/theme_definitions/tabitem-first.svgx
+++ b/vcl/uiconfig/theme_definitions/ios/tabitem-first.svgx
diff --git a/vcl/uiconfig/theme_definitions/tabitem-last-selected.svgx b/vcl/uiconfig/theme_definitions/ios/tabitem-last-selected.svgx
index 8b3c7b57cf26..8b3c7b57cf26 100644
--- a/vcl/uiconfig/theme_definitions/tabitem-last-selected.svgx
+++ b/vcl/uiconfig/theme_definitions/ios/tabitem-last-selected.svgx
diff --git a/vcl/uiconfig/theme_definitions/tabitem-last.svgx b/vcl/uiconfig/theme_definitions/ios/tabitem-last.svgx
index 494fd20907ad..494fd20907ad 100644
--- a/vcl/uiconfig/theme_definitions/tabitem-last.svgx
+++ b/vcl/uiconfig/theme_definitions/ios/tabitem-last.svgx
diff --git a/vcl/uiconfig/theme_definitions/tabitem-middle-selected.svgx b/vcl/uiconfig/theme_definitions/ios/tabitem-middle-selected.svgx
index b1877520eb39..b1877520eb39 100644
--- a/vcl/uiconfig/theme_definitions/tabitem-middle-selected.svgx
+++ b/vcl/uiconfig/theme_definitions/ios/tabitem-middle-selected.svgx
diff --git a/vcl/uiconfig/theme_definitions/tabitem-middle.svgx b/vcl/uiconfig/theme_definitions/ios/tabitem-middle.svgx
index 309d850eb830..309d850eb830 100644
--- a/vcl/uiconfig/theme_definitions/tabitem-middle.svgx
+++ b/vcl/uiconfig/theme_definitions/ios/tabitem-middle.svgx
diff --git a/vcl/uiconfig/theme_definitions/tick-off-disabled.svgx b/vcl/uiconfig/theme_definitions/ios/tick-off-disabled.svgx
index 4890906c9f67..4890906c9f67 100644
--- a/vcl/uiconfig/theme_definitions/tick-off-disabled.svgx
+++ b/vcl/uiconfig/theme_definitions/ios/tick-off-disabled.svgx
diff --git a/vcl/uiconfig/theme_definitions/tick-off-pressed.svgx b/vcl/uiconfig/theme_definitions/ios/tick-off-pressed.svgx
index f01d94aaaafe..f01d94aaaafe 100644
--- a/vcl/uiconfig/theme_definitions/tick-off-pressed.svgx
+++ b/vcl/uiconfig/theme_definitions/ios/tick-off-pressed.svgx
diff --git a/vcl/uiconfig/theme_definitions/tick-off.svgx b/vcl/uiconfig/theme_definitions/ios/tick-off.svgx
index ca8d2d8daf5d..ca8d2d8daf5d 100644
--- a/vcl/uiconfig/theme_definitions/tick-off.svgx
+++ b/vcl/uiconfig/theme_definitions/ios/tick-off.svgx
diff --git a/vcl/uiconfig/theme_definitions/tick-on-disabled.svgx b/vcl/uiconfig/theme_definitions/ios/tick-on-disabled.svgx
index 855129df44fa..855129df44fa 100644
--- a/vcl/uiconfig/theme_definitions/tick-on-disabled.svgx
+++ b/vcl/uiconfig/theme_definitions/ios/tick-on-disabled.svgx
diff --git a/vcl/uiconfig/theme_definitions/tick-on-pressed.svgx b/vcl/uiconfig/theme_definitions/ios/tick-on-pressed.svgx
index 4cb2a79575aa..4cb2a79575aa 100644
--- a/vcl/uiconfig/theme_definitions/tick-on-pressed.svgx
+++ b/vcl/uiconfig/theme_definitions/ios/tick-on-pressed.svgx
diff --git a/vcl/uiconfig/theme_definitions/tick-on.svgx b/vcl/uiconfig/theme_definitions/ios/tick-on.svgx
index 75675ab608b5..75675ab608b5 100644
--- a/vcl/uiconfig/theme_definitions/tick-on.svgx
+++ b/vcl/uiconfig/theme_definitions/ios/tick-on.svgx