vcl/Package_theme_definitions.mk | 80 ++++++++++++++--------------
vcl/source/gdi/FileDefinitionWidgetDraw.cxx | 5 +
2 files changed, 43 insertions(+), 42 deletions(-)
New commits:
commit b3c6665de2206a922d1a058bb1f5e9f76f792335
Author: Tomaž Vajngerl <tomaz.vajng...@collabora.co.uk>
AuthorDate: Fri Mar 15 21:10:03 2019 +0800
Commit: Tomaž Vajngerl <qui...@gmail.com>
CommitDate: Sat Mar 16 00:26:30 2019 +0100
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 <qui...@gmail.com>
Tested-by: Tomaž Vajngerl <qui...@gmail.com>
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 64ef751c7476..1263c1a12aee 100644
--- a/vcl/source/gdi/FileDefinitionWidgetDraw.cxx
+++ b/vcl/source/gdi/FileDefinitionWidgetDraw.cxx
@@ -64,9 +64,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
similarity index 100%
rename from vcl/uiconfig/theme_definitions/arrow-down.svgx
rename to 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
similarity index 100%
rename from vcl/uiconfig/theme_definitions/arrow-up.svgx
rename to 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
similarity index 100%
rename from vcl/uiconfig/theme_definitions/combobox-disabled.svgx
rename to 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
similarity index 100%
rename from vcl/uiconfig/theme_definitions/combobox.svgx
rename to 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
similarity index 100%
rename from vcl/uiconfig/theme_definitions/common-rect-disabled.svgx
rename to 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
similarity index 100%
rename from vcl/uiconfig/theme_definitions/common-rect.svgx
rename to 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
similarity index 100%
rename from vcl/uiconfig/theme_definitions/definition.xml
rename to 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
similarity index 100%
rename from vcl/uiconfig/theme_definitions/pushbutton-default.svgx
rename to 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
similarity index 100%
rename from vcl/uiconfig/theme_definitions/pushbutton-disabled.svgx
rename to 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
similarity index 100%
rename from vcl/uiconfig/theme_definitions/pushbutton-rollover.svgx
rename to 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
similarity index 100%
rename from vcl/uiconfig/theme_definitions/scrollbar-horizontal.svgx
rename to 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
similarity index 100%
rename from vcl/uiconfig/theme_definitions/scrollbar-vertical.svgx
rename to 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
similarity index 100%
rename from vcl/uiconfig/theme_definitions/slider-button.svgx
rename to 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
similarity index 100%
rename from vcl/uiconfig/theme_definitions/spinbox-left-disabled.svgx
rename to 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
similarity index 100%
rename from vcl/uiconfig/theme_definitions/spinbox-left-pressed.svgx
rename to 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
similarity index 100%
rename from vcl/uiconfig/theme_definitions/spinbox-left-rollover.svgx
rename to 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
similarity index 100%
rename from vcl/uiconfig/theme_definitions/spinbox-left.svgx
rename to 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
similarity index 100%
rename from vcl/uiconfig/theme_definitions/spinbox-right-disabled.svgx
rename to 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
similarity index 100%
rename from vcl/uiconfig/theme_definitions/spinbox-right-pressed.svgx
rename to 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
similarity index 100%
rename from vcl/uiconfig/theme_definitions/spinbox-right-rollover.svgx
rename to 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
similarity index 100%
rename from vcl/uiconfig/theme_definitions/spinbox-right.svgx
rename to 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
similarity index 100%
rename from vcl/uiconfig/theme_definitions/switch-off-disabled.svgx
rename to 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
similarity index 100%
rename from vcl/uiconfig/theme_definitions/switch-off-pressed.svgx
rename to 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
similarity index 100%
rename from vcl/uiconfig/theme_definitions/switch-off.svgx
rename to 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
similarity index 100%
rename from vcl/uiconfig/theme_definitions/switch-on-disabled.svgx
rename to 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
similarity index 100%
rename from vcl/uiconfig/theme_definitions/switch-on-pressed.svgx
rename to 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
similarity index 100%
rename from vcl/uiconfig/theme_definitions/switch-on.svgx
rename to 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
similarity index 100%
rename from vcl/uiconfig/theme_definitions/tabitem-first-selected.svgx
rename to 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
similarity index 100%
rename from vcl/uiconfig/theme_definitions/tabitem-first.svgx
rename to 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
similarity index 100%
rename from vcl/uiconfig/theme_definitions/tabitem-last-selected.svgx
rename to 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
similarity index 100%
rename from vcl/uiconfig/theme_definitions/tabitem-last.svgx
rename to 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
similarity index 100%
rename from vcl/uiconfig/theme_definitions/tabitem-middle-selected.svgx
rename to 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
similarity index 100%
rename from vcl/uiconfig/theme_definitions/tabitem-middle.svgx
rename to 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
similarity index 100%
rename from vcl/uiconfig/theme_definitions/tick-off-disabled.svgx
rename to 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
similarity index 100%
rename from vcl/uiconfig/theme_definitions/tick-off-pressed.svgx
rename to 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
similarity index 100%
rename from vcl/uiconfig/theme_definitions/tick-off.svgx
rename to 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
similarity index 100%
rename from vcl/uiconfig/theme_definitions/tick-on-disabled.svgx
rename to 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
similarity index 100%
rename from vcl/uiconfig/theme_definitions/tick-on-pressed.svgx
rename to 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
similarity index 100%
rename from vcl/uiconfig/theme_definitions/tick-on.svgx
rename to vcl/uiconfig/theme_definitions/ios/tick-on.svgx
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
