summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTomaž Vajngerl <tomaz.vajngerl@collabora.co.uk>2019-01-22 21:12:40 +0100
committerTomaž Vajngerl <quikee@gmail.com>2019-03-04 12:29:16 +0100
commit4a4a63a126e566d3fb34dd968677456acdbc97ec (patch)
tree3e65b75ad2caff864aa5c3b99ba10f5a0d216f1c
parentWidgetDrawInterface impl. to draw widgets from file definitions (diff)
downloadcore-4a4a63a126e566d3fb34dd968677456acdbc97ec.tar.gz
core-4a4a63a126e566d3fb34dd968677456acdbc97ec.zip
Add definition.xml to share LO folder (theme_definitions subfolder)
Change-Id: Ie5830b1b2675d1254fc0b489cff5646ede6f72dc Reviewed-on: https://gerrit.libreoffice.org/68647 Tested-by: Jenkins Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
-rw-r--r--Repository.mk1
-rw-r--r--vcl/Module_vcl.mk3
-rw-r--r--vcl/Package_theme_definitions.mk16
-rw-r--r--vcl/source/gdi/FileDefinitionWidgetDraw.cxx7
-rw-r--r--vcl/uiconfig/theme_definitions/definition.xml56
5 files changed, 78 insertions, 5 deletions
diff --git a/Repository.mk b/Repository.mk
index 4d8389b1ba19..c0e797b7106b 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -945,6 +945,7 @@ $(eval $(call gb_Helper_register_packages_for_install,ooo,\
wizards_properties \
wizards_wizardshare \
vcl_opengl_shader \
+ vcl_theme_definitions \
$(if $(filter WNT,$(OS)), \
vcl_opengl_blacklist \
) \
diff --git a/vcl/Module_vcl.mk b/vcl/Module_vcl.mk
index 71db1571c20e..c3b491e23088 100644
--- a/vcl/Module_vcl.mk
+++ b/vcl/Module_vcl.mk
@@ -21,7 +21,8 @@ $(eval $(call gb_Module_Module,vcl))
$(eval $(call gb_Module_add_targets,vcl,\
Library_vcl \
- Package_opengl \
+ Package_opengl \
+ Package_theme_definitions \
UIConfig_vcl \
$(if $(filter WNT,$(OS)), \
Package_opengl_blacklist ) \
diff --git a/vcl/Package_theme_definitions.mk b/vcl/Package_theme_definitions.mk
new file mode 100644
index 000000000000..ad5321ce8c4f
--- /dev/null
+++ b/vcl/Package_theme_definitions.mk
@@ -0,0 +1,16 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(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 \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/vcl/source/gdi/FileDefinitionWidgetDraw.cxx b/vcl/source/gdi/FileDefinitionWidgetDraw.cxx
index 9c6dbdaa206a..d9ffc93e92ad 100644
--- a/vcl/source/gdi/FileDefinitionWidgetDraw.cxx
+++ b/vcl/source/gdi/FileDefinitionWidgetDraw.cxx
@@ -19,10 +19,9 @@ namespace vcl
{
namespace
{
-OUString lcl_getClassificationUserPath()
+OUString lcl_getThemeDefinitionPath()
{
- OUString sPath("${$BRAND_BASE_DIR/" LIBO_ETC_FOLDER
- "/" SAL_CONFIGFILE("bootstrap") ":UserInstallation}/user/");
+ OUString sPath("$BRAND_BASE_DIR/" LIBO_SHARE_FOLDER "/theme_definitions/");
rtl::Bootstrap::expandMacros(sPath);
return sPath;
}
@@ -31,7 +30,7 @@ OUString lcl_getClassificationUserPath()
FileDefinitionWidgetDraw::FileDefinitionWidgetDraw(SalGraphics& rGraphics)
: m_rGraphics(rGraphics)
- , m_WidgetDefinitionReader(lcl_getClassificationUserPath() + "definition.xml")
+ , m_WidgetDefinitionReader(lcl_getThemeDefinitionPath() + "definition.xml")
{
m_WidgetDefinitionReader.read();
diff --git a/vcl/uiconfig/theme_definitions/definition.xml b/vcl/uiconfig/theme_definitions/definition.xml
new file mode 100644
index 000000000000..d19db6043a7c
--- /dev/null
+++ b/vcl/uiconfig/theme_definitions/definition.xml
@@ -0,0 +1,56 @@
+ <?xml version="1.0" encoding="UTF-8"?>
+
+<widgets>
+ <style>
+ <faceColor value="#F7F7F7"/>
+ <checkedColor value="#C0C0C0"/>
+ <lightColor value="#FFFFFF"/>
+ <lightBorderColor value="#F7F7F7"/>
+ <shadowColor value="#808080"/>
+ <darkShadowColor value="#000000"/>
+ <buttonTextColor value="#007AFF"/>
+ <buttonRolloverTextColor value="#FFFFFF"/>
+ <radioCheckTextColor value="#000000"/>
+ <groupTextColor value="#000000"/>
+ <labelTextColor value="#000000"/>
+ <windowColor value="#FFFFFF"/>
+ <windowTextColor value="#000000"/>
+ <dialogColor value="#FFFFFF"/>
+ <dialogTextColor value="#000000"/>
+ <workspaceColor value="#F7F7F7"/>
+ <monoColor value="#000000"/>
+ <fieldColor value="#FFFFFF"/>
+ <fieldTextColor value="#000000"/>
+ <fieldRolloverTextColor value="#000000"/>
+ <activeColor value="#007AFF"/>
+ <activeTextColor value="#FFFFFF"/>
+ <activeBorderColor value="#C0C0C0"/>
+ <deactiveColor value="#808080"/>
+ <deactiveTextColor value="#C0C0C0"/>
+ <deactiveBorderColor value="#C0C0C0"/>
+ <menuColor value="#FFFFFF"/>
+ <menuBarColor value="#FFFFFF"/>
+ <menuBarRolloverColor value="#007AFF"/>
+ <menuBorderColor value="#C0C0C0"/>
+ <menuTextColor value="#000000"/>
+ <menuBarTextColor value="#000000"/>
+ <menuBarRolloverTextColor value="#000000"/>
+ <menuBarHighlightTextColor value="#000000"/>
+ <menuHighlightColor value="#007AFF"/>
+ <menuHighlightTextColor value="#FFFFFF"/>
+ <highlightColor value="#007AFF"/>
+ <highlightTextColor value="#FFFFFF"/>
+ <activeTabColor value="#FFFFFF"/>
+ <inactiveTabColor value="#C0C0C0"/>
+ <tabTextColor value="#000000"/>
+ <tabRolloverTextColor value="#000000"/>
+ <tabHighlightTextColor value="#000000"/>
+ <disableColor value="#808080"/>
+ <helpColor value="#FFFFE0"/>
+ <helpTextColor value="#000000"/>
+ <linkColor value="#007AFF"/>
+ <visitedLinkColor value="#0464AA"/>
+ <toolTextColor value="#000000"/>
+ <fontColor value="#000000"/>
+ </style>
+</widgets>