[gnome-control-center] wacom: add an icon for stylii without an eraser
- From: Bastien Nocera <hadess src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-control-center] wacom: add an icon for stylii without an eraser
- Date: Wed, 1 Apr 2015 09:17:29 +0000 (UTC)
commit e2a14f4d4ce434b4ade6d9b6fa4185804ae76e83
Author: Benjamin Tissoires <benjamin tissoires redhat com>
Date: Fri Mar 13 17:09:12 2015 -0400
wacom: add an icon for stylii without an eraser
wacom-stylus-no-eraser.svg is an adaptation of wacom-stylus.svg
https://bugzilla.gnome.org/show_bug.cgi?id=746117
panels/wacom/cc-wacom-stylus-page.c | 4 +-
panels/wacom/wacom-stylus-no-eraser.svg | 118 +++++++++++++++++++++++++++++++
panels/wacom/wacom.gresource.xml | 1 +
3 files changed, 120 insertions(+), 3 deletions(-)
---
diff --git a/panels/wacom/cc-wacom-stylus-page.c b/panels/wacom/cc-wacom-stylus-page.c
index d3eeddf..5b8f5b7 100644
--- a/panels/wacom/cc-wacom-stylus-page.c
+++ b/panels/wacom/cc-wacom-stylus-page.c
@@ -420,9 +420,7 @@ update_stylus_ui (CcWacomStylusPage *page,
"top_attach", 2, NULL);
break;
case LAYOUT_GENERIC_2_BUTTONS_NO_ERASER:
- /* Gray out eraser until we have a proper picture */
- gtk_widget_set_sensitive (WID ("eraser-box"), FALSE);
- gtk_widget_set_sensitive (WID ("label-eraser-feel"), FALSE);
+ remove_eraser (page->priv);
break;
case LAYOUT_OTHER:
/* We already warn about it in cc_wacom_stylus_page_new () */
diff --git a/panels/wacom/wacom-stylus-no-eraser.svg b/panels/wacom/wacom-stylus-no-eraser.svg
new file mode 100644
index 0000000..cca7d34
--- /dev/null
+++ b/panels/wacom/wacom-stylus-no-eraser.svg
@@ -0,0 +1,118 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<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:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ id="svg86343"
+ version="1.1"
+ inkscape:version="0.91 r13725"
+ width="148"
+ height="192"
+ sodipodi:docname="wacom-stylus-no-eraser.svg">
+ <metadata
+ id="metadata86349">
+ <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 />
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <defs
+ id="defs86347" />
+ <sodipodi:namedview
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1"
+ objecttolerance="10"
+ gridtolerance="10"
+ guidetolerance="10"
+ inkscape:pageopacity="0"
+ inkscape:pageshadow="2"
+ inkscape:window-width="960"
+ inkscape:window-height="1014"
+ id="namedview86345"
+ showgrid="false"
+ inkscape:snap-nodes="false"
+ inkscape:snap-bbox="true"
+ inkscape:zoom="2.4748737"
+ inkscape:cx="176.8759"
+ inkscape:cy="81.687362"
+ inkscape:window-x="1920"
+ inkscape:window-y="27"
+ inkscape:window-maximized="0"
+ inkscape:current-layer="g10631"
+ borderlayer="true"
+ inkscape:showpageshadow="false">
+ <inkscape:grid
+ type="xygrid"
+ id="grid86802"
+ empspacing="5"
+ visible="true"
+ enabled="true"
+ snapvisiblegridlinesonly="true" />
+ </sodipodi:namedview>
+ <g
+ style="display:inline"
+ transform="translate(592.43375,-287.62088)"
+ id="g10545">
+ <path
+ sodipodi:nodetypes="cscscccccccccccccscscc"
+ inkscape:connector-curvature="0"
+ id="rect10526"
+ transform="translate(-928.4063,-95.84375)"
+ d="m 344.125,384.88832 c -1.9944,0 -3.59375,1.59935 -3.59375,3.59375 L 340.53125,516 338,545.125 c
-0.1873,2.15512 1.62589,3.92035 3.75,4.125 l 4.625,10.90625 1.53125,0 0,2.15625 3.61536,8.57242
1.18546,0.0214 0.44918,3.78119 0.33938,-3.7414 1.14797,-0.0687 3.76265,-8.53366 0,-2.1875 1.53125,0
4.65625,-10.96875 c 1.96694,-0.35188 3.54637,-2.02216 3.40625,-4.0625 L 365.53125,516 l 0,-127.51793 c
0,-1.9944 -1.59935,-3.59375 -3.59375,-3.59375 z"
+
style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#d3d7cf;fill-opacity:1;fill-rule:nonzero;stroke:#babdb6;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
/>
+ <rect
+
style="color:#000000;fill:#eeeeec;fill-opacity:1;fill-rule:nonzero;stroke:#babdb6;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ id="rect10541"
+ width="8.75"
+ height="22"
+ x="-579.65631"
+ y="385.90625"
+ rx="3.25"
+ ry="3.25" />
+ <rect
+ ry="3.2500002"
+ rx="3.25"
+ y="410.90625"
+ x="-579.65631"
+ height="12.25"
+ width="8.75"
+ id="rect10543"
+
style="color:#000000;fill:#eeeeec;fill-opacity:1;fill-rule:nonzero;stroke:#babdb6;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
/>
+ </g>
+ <g
+ style="opacity:0.2;display:inline"
+ id="g10631"
+ transform="translate(592.43375,-302.48416)">
+ <path
+ sodipodi:nodetypes="cccc"
+ transform="translate(-928.4063,-79.84375)"
+ inkscape:connector-curvature="0"
+ id="path3342"
+ d="m 357.25,492.91161 35.28033,0 0,-89.17947 82.46967,0"
+
style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
/>
+ <path
+
style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ d="m -575.4063,492.06786 65.53033,0 0,-85.17947 56.46967,0"
+ id="path10629"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cccc" />
+ <path
+
style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ d="m -571.1563,430.06786 48.28033,0 0,-64.17947 69.46967,0"
+ id="path3344"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cccc" />
+ </g>
+</svg>
diff --git a/panels/wacom/wacom.gresource.xml b/panels/wacom/wacom.gresource.xml
index 7d46190..7683b4d 100644
--- a/panels/wacom/wacom.gresource.xml
+++ b/panels/wacom/wacom.gresource.xml
@@ -6,6 +6,7 @@
<file preprocess="xml-stripblanks">button-mapping.ui</file>
<file>wacom-tablet.svg</file>
<file>wacom-stylus.svg</file>
+ <file>wacom-stylus-no-eraser.svg</file>
<file>wacom-stylus-airbrush.svg</file>
<file>wacom-stylus-inking.svg</file>
<file>wacom-stylus-art-pen.svg</file>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]