[Libreoffice-commits] core.git: vcl/Package_theme_definitions.mk vcl/source vcl/uiconfig
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Tue Mar 5 13:49:20 UTC 2019
vcl/Package_theme_definitions.mk | 4
vcl/source/gdi/FileDefinitionWidgetDraw.cxx | 2
vcl/uiconfig/theme_definitions/checkbox-off-pressed.svgx | 138 +++++++++++++++
vcl/uiconfig/theme_definitions/checkbox-off.svgx | 138 +++++++++++++++
vcl/uiconfig/theme_definitions/checkbox-on-pressed.svgx | 97 ++++++++++
vcl/uiconfig/theme_definitions/checkbox-on.svgx | 97 ++++++++++
vcl/uiconfig/theme_definitions/definition.xml | 16 +
7 files changed, 485 insertions(+), 7 deletions(-)
New commits:
commit 25709fb43dc49cbc4a2b2cd81f949e91e2e01e7d
Author: Tomaž Vajngerl <tomaz.vajngerl at collabora.co.uk>
AuthorDate: Fri Feb 8 22:13:59 2019 +0100
Commit: Tomaž Vajngerl <quikee at gmail.com>
CommitDate: Tue Mar 5 14:48:52 2019 +0100
Use SVG image to draw the checkbox widget
Change-Id: I559ac167970581477bf9f9a02904b11050e31766
Reviewed-on: https://gerrit.libreoffice.org/68713
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl <quikee at gmail.com>
diff --git a/vcl/Package_theme_definitions.mk b/vcl/Package_theme_definitions.mk
index ad5321ce8c4f..b2276b59248a 100644
--- a/vcl/Package_theme_definitions.mk
+++ b/vcl/Package_theme_definitions.mk
@@ -11,6 +11,10 @@ $(eval $(call gb_Package_Package,vcl_theme_definitions,$(SRCDIR)/vcl/uiconfig/th
$(eval $(call gb_Package_add_files,vcl_theme_definitions,$(LIBO_SHARE_FOLDER)/theme_definitions,\
definition.xml \
+ checkbox-on.svgx \
+ checkbox-off.svgx \
+ checkbox-on-pressed.svgx \
+ checkbox-off-pressed.svgx \
))
# vim: set noet sw=4 ts=4:
diff --git a/vcl/source/gdi/FileDefinitionWidgetDraw.cxx b/vcl/source/gdi/FileDefinitionWidgetDraw.cxx
index a615bd390c81..78ef9a815de8 100644
--- a/vcl/source/gdi/FileDefinitionWidgetDraw.cxx
+++ b/vcl/source/gdi/FileDefinitionWidgetDraw.cxx
@@ -341,7 +341,7 @@ bool FileDefinitionWidgetDraw::getNativeControlRegion(
switch (eType)
{
case ControlType::Checkbox:
- rNativeContentRegion = tools::Rectangle(Point(), Size(48, 32));
+ rNativeContentRegion = tools::Rectangle(Point(), Size(44, 26));
return true;
case ControlType::Radiobutton:
rNativeContentRegion = tools::Rectangle(Point(), Size(32, 32));
diff --git a/vcl/uiconfig/theme_definitions/checkbox-off-pressed.svgx b/vcl/uiconfig/theme_definitions/checkbox-off-pressed.svgx
new file mode 100644
index 000000000000..5fdcd784c29d
--- /dev/null
+++ b/vcl/uiconfig/theme_definitions/checkbox-off-pressed.svgx
@@ -0,0 +1,138 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+ id="svg1344"
+ version="1.1"
+ viewBox="0 0 11.641666 6.8791669"
+ height="26"
+ width="44">
+ <defs
+ id="defs1338">
+ <linearGradient
+ gradientTransform="matrix(0.95999995,0,0,0.95999995,221.81456,-118.9557)"
+ gradientUnits="userSpaceOnUse"
+ y2="77.49472"
+ x2="17.508867"
+ y1="70.76062"
+ x1="24.494602"
+ id="linearGradient1317"
+ xlink:href="#linearGradient1315" />
+ <linearGradient
+ id="linearGradient1315">
+ <stop
+ id="stop1311"
+ offset="0"
+ style="stop-color:#c8c8c8;stop-opacity:1" />
+ <stop
+ id="stop1313"
+ offset="1"
+ style="stop-color:#f5f5f5;stop-opacity:0" />
+ </linearGradient>
+ <radialGradient
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(2.8606398,0.03262669,-0.00495255,0.43422932,-444.76567,-34.699637)"
+ r="5.8247647"
+ fy="-48.005653"
+ fx="238.88559"
+ cy="-48.005653"
+ cx="238.88559"
+ id="radialGradient1984"
+ xlink:href="#linearGradient1982" />
+ <linearGradient
+ id="linearGradient1982">
+ <stop
+ id="stop1978"
+ offset="0"
+ style="stop-color:#e6e6e6;stop-opacity:1" />
+ <stop
+ id="stop1980"
+ offset="1"
+ style="stop-color:#e6e6e6;stop-opacity:0" />
+ </linearGradient>
+ <linearGradient
+ gradientUnits="userSpaceOnUse"
+ y2="74.504791"
+ x2="17.991665"
+ y1="74.504791"
+ x1="12.628486"
+ id="linearGradient1307"
+ xlink:href="#linearGradient1305"
+ gradientTransform="translate(221.11606,-122.19969)" />
+ <linearGradient
+ id="linearGradient1305">
+ <stop
+ id="stop1301"
+ offset="0"
+ style="stop-color:#f0f0f0;stop-opacity:1" />
+ <stop
+ id="stop1303"
+ offset="1"
+ style="stop-color:#ebebeb;stop-opacity:1" />
+ </linearGradient>
+ </defs>
+ <metadata
+ id="metadata1341">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title></dc:title>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ transform="translate(245.45773,51.15387)"
+ id="layer1">
+ <rect
+ transform="scale(-1,1)"
+ ry="5.2916665"
+ rx="3.4395833"
+ y="-51.15387"
+ x="233.81607"
+ height="6.8791666"
+ width="11.641666"
+ id="rect1282"
+ style="opacity:1;fill:url(#linearGradient1307);fill-opacity:1;stroke:none;stroke-width:0.34406587;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ <rect
+ transform="scale(-1,1)"
+ ry="5.0941887"
+ rx="3.3637338"
+ y="-51.025509"
+ x="233.94443"
+ height="6.6224456"
+ width="11.384946"
+ id="rect1996"
+ style="opacity:1;fill:none;fill-opacity:1;stroke:#f0f0f0;stroke-width:0.26458332;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ <rect
+ style="opacity:1;fill:none;fill-opacity:1;stroke:url(#radialGradient1984);stroke-width:0.26458332;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="rect1968"
+ width="11.384946"
+ height="6.6224456"
+ x="233.94443"
+ y="-51.025509"
+ rx="3.3637338"
+ ry="5.0941887"
+ transform="scale(-1,1)" />
+ <circle
+ transform="scale(-1,1)"
+ style="opacity:1;fill:url(#linearGradient1317);fill-opacity:1;stroke:none;stroke-width:0.27212897;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="circle1309"
+ cx="241.75357"
+ cy="-47.449703"
+ r="3.175" />
+ <circle
+ transform="scale(-1,1)"
+ r="3.175"
+ cy="-47.714287"
+ cx="242.01814"
+ id="path1293"
+ style="opacity:1;fill:#f5f5f5;fill-opacity:1;stroke:none;stroke-width:0.27212897;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ </g>
+</svg>
diff --git a/vcl/uiconfig/theme_definitions/checkbox-off.svgx b/vcl/uiconfig/theme_definitions/checkbox-off.svgx
new file mode 100644
index 000000000000..0b044eaedae3
--- /dev/null
+++ b/vcl/uiconfig/theme_definitions/checkbox-off.svgx
@@ -0,0 +1,138 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+ id="svg1344"
+ version="1.1"
+ viewBox="0 0 11.641666 6.8791669"
+ height="26"
+ width="44">
+ <defs
+ id="defs1338">
+ <linearGradient
+ gradientTransform="matrix(0.95999995,0,0,0.95999995,221.81456,-118.9557)"
+ gradientUnits="userSpaceOnUse"
+ y2="77.49472"
+ x2="17.508867"
+ y1="70.76062"
+ x1="24.494602"
+ id="linearGradient1317"
+ xlink:href="#linearGradient1315" />
+ <linearGradient
+ id="linearGradient1315">
+ <stop
+ id="stop1311"
+ offset="0"
+ style="stop-color:#c8c8c8;stop-opacity:1" />
+ <stop
+ id="stop1313"
+ offset="1"
+ style="stop-color:#f5f5f5;stop-opacity:0" />
+ </linearGradient>
+ <radialGradient
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(2.8606398,0.03262669,-0.00495255,0.43422932,-444.76567,-34.699637)"
+ r="5.8247647"
+ fy="-48.005653"
+ fx="238.88559"
+ cy="-48.005653"
+ cx="238.88559"
+ id="radialGradient1984"
+ xlink:href="#linearGradient1982" />
+ <linearGradient
+ id="linearGradient1982">
+ <stop
+ id="stop1978"
+ offset="0"
+ style="stop-color:#e6e6e6;stop-opacity:1" />
+ <stop
+ id="stop1980"
+ offset="1"
+ style="stop-color:#e6e6e6;stop-opacity:0" />
+ </linearGradient>
+ <linearGradient
+ gradientUnits="userSpaceOnUse"
+ y2="74.504791"
+ x2="17.991665"
+ y1="74.504791"
+ x1="12.628486"
+ id="linearGradient1307"
+ xlink:href="#linearGradient1305"
+ gradientTransform="translate(221.11606,-122.19969)" />
+ <linearGradient
+ id="linearGradient1305">
+ <stop
+ id="stop1301"
+ offset="0"
+ style="stop-color:#fafafa;stop-opacity:1" />
+ <stop
+ id="stop1303"
+ offset="1"
+ style="stop-color:#f0f0f0;stop-opacity:1" />
+ </linearGradient>
+ </defs>
+ <metadata
+ id="metadata1341">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title></dc:title>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ transform="translate(245.45773,51.15387)"
+ id="layer1">
+ <rect
+ transform="scale(-1,1)"
+ ry="5.2916665"
+ rx="3.4395833"
+ y="-51.15387"
+ x="233.81607"
+ height="6.8791666"
+ width="11.641666"
+ id="rect1282"
+ style="opacity:1;fill:url(#linearGradient1307);fill-opacity:1;stroke:none;stroke-width:0.34406587;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ <rect
+ transform="scale(-1,1)"
+ ry="5.0941887"
+ rx="3.3637338"
+ y="-51.025509"
+ x="233.94443"
+ height="6.6224456"
+ width="11.384946"
+ id="rect1996"
+ style="opacity:1;fill:none;fill-opacity:1;stroke:#f0f0f0;stroke-width:0.26458332;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ <rect
+ style="opacity:1;fill:none;fill-opacity:1;stroke:url(#radialGradient1984);stroke-width:0.26458332;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="rect1968"
+ width="11.384946"
+ height="6.6224456"
+ x="233.94443"
+ y="-51.025509"
+ rx="3.3637338"
+ ry="5.0941887"
+ transform="scale(-1,1)" />
+ <circle
+ transform="scale(-1,1)"
+ style="opacity:1;fill:url(#linearGradient1317);fill-opacity:1;stroke:none;stroke-width:0.27212897;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="circle1309"
+ cx="241.75357"
+ cy="-47.449703"
+ r="3.175" />
+ <circle
+ transform="scale(-1,1)"
+ r="3.175"
+ cy="-47.714287"
+ cx="242.01814"
+ id="path1293"
+ style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.27212897;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ </g>
+</svg>
diff --git a/vcl/uiconfig/theme_definitions/checkbox-on-pressed.svgx b/vcl/uiconfig/theme_definitions/checkbox-on-pressed.svgx
new file mode 100644
index 000000000000..c261fd6cd59e
--- /dev/null
+++ b/vcl/uiconfig/theme_definitions/checkbox-on-pressed.svgx
@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+ id="svg1344"
+ version="1.1"
+ viewBox="0 0 11.641666 6.8791669"
+ height="26"
+ width="44">
+ <defs
+ id="defs1338">
+ <linearGradient
+ gradientTransform="matrix(0.95999995,0,0,0.95999995,221.81456,-119.22028)"
+ gradientUnits="userSpaceOnUse"
+ y2="74.738647"
+ x2="16.967495"
+ y1="74.738647"
+ x1="22.639814"
+ id="linearGradient1317"
+ xlink:href="#linearGradient1315" />
+ <linearGradient
+ id="linearGradient1315">
+ <stop
+ id="stop1311"
+ offset="0"
+ style="stop-color:#40b654;stop-opacity:1;" />
+ <stop
+ id="stop1313"
+ offset="1"
+ style="stop-color:#40b654;stop-opacity:0;" />
+ </linearGradient>
+ <linearGradient
+ gradientUnits="userSpaceOnUse"
+ y2="74.504791"
+ x2="17.991665"
+ y1="74.504791"
+ x1="12.628486"
+ id="linearGradient1307"
+ xlink:href="#linearGradient1305"
+ gradientTransform="translate(221.11606,-122.19969)" />
+ <linearGradient
+ id="linearGradient1305">
+ <stop
+ id="stop1301"
+ offset="0"
+ style="stop-color:#4cd964;stop-opacity:1" />
+ <stop
+ id="stop1303"
+ offset="1"
+ style="stop-color:#4ad361;stop-opacity:1" />
+ </linearGradient>
+ </defs>
+ <metadata
+ id="metadata1341">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title></dc:title>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ transform="translate(245.45773,51.15387)"
+ id="layer1">
+ <rect
+ transform="scale(-1,1)"
+ ry="5.2916665"
+ rx="3.4395833"
+ y="-51.15387"
+ x="233.81607"
+ height="6.8791666"
+ width="11.641666"
+ id="rect1282"
+ style="opacity:1;fill:url(#linearGradient1307);fill-opacity:1;stroke:none;stroke-width:0.34406587;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ <circle
+ transform="scale(-1,1)"
+ style="opacity:1;fill:url(#linearGradient1317);fill-opacity:1;stroke:none;stroke-width:0.27212897;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="circle1309"
+ cx="241.75357"
+ cy="-47.714287"
+ r="3.175" />
+ <circle
+ transform="scale(-1,1)"
+ r="3.175"
+ cy="-47.714287"
+ cx="242.01814"
+ id="path1293"
+ style="opacity:1;fill:#dff7e3;fill-opacity:1;stroke:none;stroke-width:0.27212897;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ </g>
+</svg>
diff --git a/vcl/uiconfig/theme_definitions/checkbox-on.svgx b/vcl/uiconfig/theme_definitions/checkbox-on.svgx
new file mode 100644
index 000000000000..a3100a64fe62
--- /dev/null
+++ b/vcl/uiconfig/theme_definitions/checkbox-on.svgx
@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+ id="svg1344"
+ version="1.1"
+ viewBox="0 0 11.641666 6.8791669"
+ height="26"
+ width="44">
+ <defs
+ id="defs1338">
+ <linearGradient
+ gradientTransform="matrix(0.95999995,0,0,0.95999995,221.81456,-119.22028)"
+ gradientUnits="userSpaceOnUse"
+ y2="74.738647"
+ x2="16.967495"
+ y1="74.738647"
+ x1="22.639814"
+ id="linearGradient1317"
+ xlink:href="#linearGradient1315" />
+ <linearGradient
+ id="linearGradient1315">
+ <stop
+ id="stop1311"
+ offset="0"
+ style="stop-color:#40b654;stop-opacity:1;" />
+ <stop
+ id="stop1313"
+ offset="1"
+ style="stop-color:#40b654;stop-opacity:0;" />
+ </linearGradient>
+ <linearGradient
+ gradientUnits="userSpaceOnUse"
+ y2="74.504791"
+ x2="17.991665"
+ y1="74.504791"
+ x1="12.628486"
+ id="linearGradient1307"
+ xlink:href="#linearGradient1305"
+ gradientTransform="translate(221.11606,-122.19969)" />
+ <linearGradient
+ id="linearGradient1305">
+ <stop
+ id="stop1301"
+ offset="0"
+ style="stop-color:#4cd964;stop-opacity:1" />
+ <stop
+ id="stop1303"
+ offset="1"
+ style="stop-color:#4ad361;stop-opacity:1" />
+ </linearGradient>
+ </defs>
+ <metadata
+ id="metadata1341">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title></dc:title>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ transform="translate(245.45773,51.15387)"
+ id="layer1">
+ <rect
+ transform="scale(-1,1)"
+ ry="5.2916665"
+ rx="3.4395833"
+ y="-51.15387"
+ x="233.81607"
+ height="6.8791666"
+ width="11.641666"
+ id="rect1282"
+ style="opacity:1;fill:url(#linearGradient1307);fill-opacity:1;stroke:none;stroke-width:0.34406587;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ <circle
+ transform="scale(-1,1)"
+ style="opacity:1;fill:url(#linearGradient1317);fill-opacity:1;stroke:none;stroke-width:0.27212897;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="circle1309"
+ cx="241.75357"
+ cy="-47.714287"
+ r="3.175" />
+ <circle
+ transform="scale(-1,1)"
+ r="3.175"
+ cy="-47.714287"
+ cx="242.01814"
+ id="path1293"
+ style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.27212897;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ </g>
+</svg>
diff --git a/vcl/uiconfig/theme_definitions/definition.xml b/vcl/uiconfig/theme_definitions/definition.xml
index 0cbdebaa078c..59fc6390d392 100644
--- a/vcl/uiconfig/theme_definitions/definition.xml
+++ b/vcl/uiconfig/theme_definitions/definition.xml
@@ -79,13 +79,17 @@
<checkbox>
<part value="Entire">
- <state enabled="any" focused="any" pressed="any" rollover="any" default="any" selected="any" button-value="false">
- <rect stroke="#4CD964" fill="#FFFFFF" stroke-width="1" rx="16" ry="16" />
- <circ stroke="#4CD964" fill="#FFFFFF" stroke-width="1" x1="0.0" y1="0.0" x2="0.66" y2="1.0"/>
+ <state enabled="any" focused="any" pressed="false" rollover="any" default="any" selected="any" button-value="true">
+ <image source="checkbox-on.svgx" />
</state>
- <state enabled="any" focused="any" pressed="any" rollover="any" default="any" selected="any" button-value="true">
- <rect stroke="#4CD964" fill="#4CD964" stroke-width="1" rx="16" ry="16" />
- <circ stroke="#4CD964" fill="#FFFFFF" stroke-width="1" x1="0.33" y1="0.0" x2="1.0" y2="1.0"/>
+ <state enabled="any" focused="any" pressed="true" rollover="any" default="any" selected="any" button-value="true">
+ <image source="checkbox-on-pressed.svgx" />
+ </state>
+ <state enabled="any" focused="any" pressed="false" rollover="any" default="any" selected="any" button-value="false">
+ <image source="checkbox-off.svgx" />
+ </state>
+ <state enabled="any" focused="any" pressed="true" rollover="any" default="any" selected="any" button-value="false">
+ <image source="checkbox-off-pressed.svgx" />
</state>
</part>
</checkbox>
More information about the Libreoffice-commits
mailing list