mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add definition.xml to share LO folder (theme_definitions subfolder)

Browse Source 
Change-Id: Ie5830b1b2675d1254fc0b489cff5646ede6f72dc
Reviewed-on: https://gerrit.libreoffice.org/68647
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
This commit is contained in:
Tomaž Vajngerl
2019-01-22 21:12:40 +01:00
committed by Tomaž Vajngerl
parent ffc0493902
commit 4a4a63a126
5 changed files with 78 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Repository.mk
View File

@@ -945,6 +945,7 @@ $(eval $(call gb_Helper_register_packages_for_install,ooo,\
wizards_properties \ wizards_properties \
wizards_wizardshare \ wizards_wizardshare \
vcl_opengl_shader \ vcl_opengl_shader \
vcl_theme_definitions \
$(if $(filter WNT,$(OS)), \ $(if $(filter WNT,$(OS)), \
vcl_opengl_blacklist \ vcl_opengl_blacklist \
) \ ) \

1
vcl/Module_vcl.mk
View File

@@ -22,6 +22,7 @@ $(eval $(call gb_Module_Module,vcl))
$(eval $(call gb_Module_add_targets,vcl,\ $(eval $(call gb_Module_add_targets,vcl,\
Library_vcl \ Library_vcl \
Package_opengl \ Package_opengl \
Package_theme_definitions \
UIConfig_vcl \ UIConfig_vcl \
$(if $(filter WNT,$(OS)), \ $(if $(filter WNT,$(OS)), \
Package_opengl_blacklist ) \ Package_opengl_blacklist ) \

16
vcl/Package_theme_definitions.mk Normal file
View File

@@ -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:

7
vcl/source/gdi/FileDefinitionWidgetDraw.cxx
View File

@@ -19,10 +19,9 @@ namespace vcl
{ {
namespace namespace
{ {
OUString lcl_getClassificationUserPath() OUString lcl_getThemeDefinitionPath()
{ {
OUString sPath("${$BRAND_BASE_DIR/" LIBO_ETC_FOLDER OUString sPath("$BRAND_BASE_DIR/" LIBO_SHARE_FOLDER "/theme_definitions/");
"/" SAL_CONFIGFILE("bootstrap") ":UserInstallation}/user/");
rtl::Bootstrap::expandMacros(sPath); rtl::Bootstrap::expandMacros(sPath);
return sPath; return sPath;
} }
@@ -31,7 +30,7 @@ OUString lcl_getClassificationUserPath()
FileDefinitionWidgetDraw::FileDefinitionWidgetDraw(SalGraphics& rGraphics) FileDefinitionWidgetDraw::FileDefinitionWidgetDraw(SalGraphics& rGraphics)
: m_rGraphics(rGraphics) : m_rGraphics(rGraphics)
, m_WidgetDefinitionReader(lcl_getClassificationUserPath() + "definition.xml") , m_WidgetDefinitionReader(lcl_getThemeDefinitionPath() + "definition.xml")
{ {
m_WidgetDefinitionReader.read(); m_WidgetDefinitionReader.read();

56
vcl/uiconfig/theme_definitions/definition.xml Normal file
View File

@@ -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>