The SVGs for the 2nd-gen consumer "Intuos" devices appear to have been just copy/pasted from the first generation, despite differences in apparenace. This updates the SVGs to appear correctly.
Signed-off-by: Jason Gerecke <jason.gere...@wacom.com> --- data/layouts/intuos-m-p2.svg | 51 +++++++++++++++++------------------------ data/layouts/intuos-m-pt2.svg | 51 +++++++++++++++++------------------------ data/layouts/intuos-s-p2.svg | 53 ++++++++++++++++++------------------------- data/layouts/intuos-s-pt2.svg | 53 ++++++++++++++++++------------------------- 4 files changed, 86 insertions(+), 122 deletions(-) diff --git a/data/layouts/intuos-m-p2.svg b/data/layouts/intuos-m-p2.svg index dbd8809..75e391f 100644 --- a/data/layouts/intuos-m-p2.svg +++ b/data/layouts/intuos-m-p2.svg @@ -2,35 +2,26 @@ <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd";> <!-- --> -<svg xmlns="http://www.w3.org/2000/svg"; version="1.1" style="color:#000000;stroke:#7f7f7f;fill:none;stroke-width:.25;font-size:8" id="intuos-m-p2" width="275" height="222"> +<svg xmlns="http://www.w3.org/2000/svg"; version="1.1" style="color:#000000;stroke:#7f7f7f;fill:none;stroke-width:.25;font-size:8" id="intuos-s-pt" width="281" height="212"> <title id="title">Wacom Intuos Pen Medium (CTL-690)</title> - <g> - <path id="ButtonA" class="A Button" d="M 35 35 a 8 8 0 0 1 9 -9 l 14 0 l 0 20 l -23 0 z"/> - <circle id="DotA" cx="47" cy="36" r=".5"/> - <path id="LeaderA" class="A Leader" d="M 65 35 l 20 0"/> - <text id="LabelA" class="A Label" x="87" y="40" style="text-anchor:start;">A</text> - </g> - - <g> - <path id="ButtonB" class="B Button" d="M 35 47.5 l 23 0 l 0 20 l -23 0 z"/> - <circle id="DotB" cx="47" cy="57.5" r=".5"/> - <path id="LeaderB" class="B Leader" d="M 65 59 l 20 0"/> - <text id="LabelB" class="B Label" x="87" y="64" style="text-anchor:start;">B</text> - </g> - - <g> - <path id="ButtonC" class="C Button" d="M 185 26 l 14 0 a 8 -8 0 0 1 9 9 l 0 11 l -23 0 z"/> - <circle id="DotC" cx="197" cy="36" r=".5"/> - <path id="LeaderC" class="C Leader" d="M 160 35 l 20 0"/> - <text id="LabelC" class="C Label" x="158" y="40" style="text-anchor:end;">C</text> - </g> - - - <g> - <path id="ButtonD" class="D Button" d="M 185 47.5 l 23 0 l 0 20 l -23 0 z"/> - <circle id="DotD" cx="197" cy="57.5" r=".5"/> - <path id="LeaderD" class="D Leader" d="M 160 59 l 20 0"/> - <text id="LabelD" class="D Label" x="158" y="64" style="text-anchor:end;">D</text> - </g> - + <g> + <path id="ButtonA" class="A Button" d="m 13.0,25.25 12.25,-12.25 -4.75,-4.75 C 12.75,0.5 0.25,12.5 8.25,20.75 Z" /> + <path id="LeaderA" class="A Leader" d="M 40,11.5 l 20,0"/> + <text id="LabelA" class="A Label" x="62" y="11.5" style="text-anchor:start;">A</text> + </g> + <g> + <path id="ButtonB" class="B Button" d="m 25.75,13.5 -12.25,12.25 4.75,4.75 c 8.0,8.0 20.5,-4.25 12.25,-12.25 z" /> + <path id="LeaderB" class="B Leader" d="M 40,31.5 l 20,0"/> + <text id="LabelB" class="B Label" x="62" y="31.5" style="text-anchor:start;">B</text> + </g> + <g> + <path id="ButtonC" class="C Button" d="m 268.0,25.25 -12.25,-12.25 4.75,-4.75 c 8.0,-8.0 20.5,4.25 12.25,12.25 z" /> + <path id="LeaderC" class="C Leader" d="M 233,11.5 l -20,0"/> + <text id="LabelC" class="C Label" x="211" y="11.5" style="text-anchor:end;">C</text> + </g> + <g> + <path id="ButtonD" class="D Button" d="m 255.25,13.75 12.25,12.25 -4.75,4.75 c -8.0,8.0 -20.5,-4.25 -12.25,-12.25 z" /> + <path id="LeaderD" class="D Leader" d="M 233,31.5 l -20,0"/> + <text id="LabelD" class="D Label" x="211" y="31.5" style="text-anchor:end;">D</text> + </g> </svg> diff --git a/data/layouts/intuos-m-pt2.svg b/data/layouts/intuos-m-pt2.svg index a16e4b3..4412799 100644 --- a/data/layouts/intuos-m-pt2.svg +++ b/data/layouts/intuos-m-pt2.svg @@ -2,35 +2,26 @@ <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd";> <!-- --> -<svg xmlns="http://www.w3.org/2000/svg"; version="1.1" style="color:#000000;stroke:#7f7f7f;fill:none;stroke-width:.25;font-size:8" id="intuos-m-pt2" width="275" height="222"> +<svg xmlns="http://www.w3.org/2000/svg"; version="1.1" style="color:#000000;stroke:#7f7f7f;fill:none;stroke-width:.25;font-size:8" id="intuos-s-pt" width="281" height="212"> <title id="title">Wacom Intuos PT Medium (CTH-690)</title> - <g> - <path id="ButtonA" class="A Button" d="M 35 35 a 8 8 0 0 1 9 -9 l 14 0 l 0 20 l -23 0 z"/> - <circle id="DotA" cx="47" cy="36" r=".5"/> - <path id="LeaderA" class="A Leader" d="M 65 35 l 20 0"/> - <text id="LabelA" class="A Label" x="87" y="40" style="text-anchor:start;">A</text> - </g> - - <g> - <path id="ButtonB" class="B Button" d="M 35 47.5 l 23 0 l 0 20 l -23 0 z"/> - <circle id="DotB" cx="47" cy="57.5" r=".5"/> - <path id="LeaderB" class="B Leader" d="M 65 59 l 20 0"/> - <text id="LabelB" class="B Label" x="87" y="64" style="text-anchor:start;">B</text> - </g> - - <g> - <path id="ButtonC" class="C Button" d="M 185 26 l 14 0 a 8 -8 0 0 1 9 9 l 0 11 l -23 0 z"/> - <circle id="DotC" cx="197" cy="36" r=".5"/> - <path id="LeaderC" class="C Leader" d="M 160 35 l 20 0"/> - <text id="LabelC" class="C Label" x="158" y="40" style="text-anchor:end;">C</text> - </g> - - - <g> - <path id="ButtonD" class="D Button" d="M 185 47.5 l 23 0 l 0 20 l -23 0 z"/> - <circle id="DotD" cx="197" cy="57.5" r=".5"/> - <path id="LeaderD" class="D Leader" d="M 160 59 l 20 0"/> - <text id="LabelD" class="D Label" x="158" y="64" style="text-anchor:end;">D</text> - </g> - + <g> + <path id="ButtonA" class="A Button" d="m 13.0,25.25 12.25,-12.25 -4.75,-4.75 C 12.75,0.5 0.25,12.5 8.25,20.75 Z" /> + <path id="LeaderA" class="A Leader" d="M 40,11.5 l 20,0"/> + <text id="LabelA" class="A Label" x="62" y="11.5" style="text-anchor:start;">A</text> + </g> + <g> + <path id="ButtonB" class="B Button" d="m 25.75,13.5 -12.25,12.25 4.75,4.75 c 8.0,8.0 20.5,-4.25 12.25,-12.25 z" /> + <path id="LeaderB" class="B Leader" d="M 40,31.5 l 20,0"/> + <text id="LabelB" class="B Label" x="62" y="31.5" style="text-anchor:start;">B</text> + </g> + <g> + <path id="ButtonC" class="C Button" d="m 268.0,25.25 -12.25,-12.25 4.75,-4.75 c 8.0,-8.0 20.5,4.25 12.25,12.25 z" /> + <path id="LeaderC" class="C Leader" d="M 233,11.5 l -20,0"/> + <text id="LabelC" class="C Label" x="211" y="11.5" style="text-anchor:end;">C</text> + </g> + <g> + <path id="ButtonD" class="D Button" d="m 255.25,13.75 12.25,12.25 -4.75,4.75 c -8.0,8.0 -20.5,-4.25 -12.25,-12.25 z" /> + <path id="LeaderD" class="D Leader" d="M 233,31.5 l -20,0"/> + <text id="LabelD" class="D Label" x="211" y="31.5" style="text-anchor:end;">D</text> + </g> </svg> diff --git a/data/layouts/intuos-s-p2.svg b/data/layouts/intuos-s-p2.svg index d3d5549..03d1426 100644 --- a/data/layouts/intuos-s-p2.svg +++ b/data/layouts/intuos-s-p2.svg @@ -2,35 +2,26 @@ <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd";> <!-- --> -<svg xmlns="http://www.w3.org/2000/svg"; version="1.1" style="color:#000000;stroke:#7f7f7f;fill:none;stroke-width:.25;font-size:8" id="intuos-s-p2" width="275" height="222"> +<svg xmlns="http://www.w3.org/2000/svg"; version="1.1" style="color:#000000;stroke:#7f7f7f;fill:none;stroke-width:.25;font-size:8" id="intuos-s-pt" width="209" height="168"> <title id="title">Wacom Intuos Pen Small (CTL-490)</title> - <g> - <path id="ButtonA" class="A Button" d="M 35 35 a 8 8 0 0 1 9 -9 l 14 0 l 0 20 l -23 0 z"/> - <circle id="DotA" cx="47" cy="36" r=".5"/> - <path id="LeaderA" class="A Leader" d="M 65 35 l 20 0"/> - <text id="LabelA" class="A Label" x="87" y="40" style="text-anchor:start;">A</text> - </g> - - <g> - <path id="ButtonB" class="B Button" d="M 35 47.5 l 23 0 l 0 20 l -23 0 z"/> - <circle id="DotB" cx="47" cy="57.5" r=".5"/> - <path id="LeaderB" class="B Leader" d="M 65 59 l 20 0"/> - <text id="LabelB" class="B Label" x="87" y="64" style="text-anchor:start;">B</text> - </g> - - <g> - <path id="ButtonC" class="C Button" d="M 185 26 l 14 0 a 8 -8 0 0 1 9 9 l 0 11 l -23 0 z"/> - <circle id="DotC" cx="197" cy="36" r=".5"/> - <path id="LeaderC" class="C Leader" d="M 160 35 l 20 0"/> - <text id="LabelC" class="C Label" x="158" y="40" style="text-anchor:end;">C</text> - </g> - - - <g> - <path id="ButtonD" class="D Button" d="M 185 47.5 l 23 0 l 0 20 l -23 0 z"/> - <circle id="DotD" cx="197" cy="57.5" r=".5"/> - <path id="LeaderD" class="D Leader" d="M 160 59 l 20 0"/> - <text id="LabelD" class="D Label" x="158" y="64" style="text-anchor:end;">D</text> - </g> - -</svg> + <g> + <path id="ButtonA" class="A Button" d="m 13.0,25.25 12.25,-12.25 -4.75,-4.75 C 12.75,0.5 0.25,12.5 8.25,20.75 Z" /> + <path id="LeaderA" class="A Leader" d="M 40,11.5 l 20,0"/> + <text id="LabelA" class="A Label" x="62" y="11.5" style="text-anchor:start;">A</text> + </g> + <g> + <path id="ButtonB" class="B Button" d="m 25.75,13.5 -12.25,12.25 4.75,4.75 c 8.0,8.0 20.5,-4.25 12.25,-12.25 z" /> + <path id="LeaderB" class="B Leader" d="M 40,31.5 l 20,0"/> + <text id="LabelB" class="B Label" x="62" y="31.5" style="text-anchor:start;">B</text> + </g> + <g> + <path id="ButtonC" class="C Button" d="m 196.0,25.25 -12.25,-12.25 4.75,-4.75 c 8.0,-8.0 20.5,4.25 12.25,12.25 z" /> + <path id="LeaderC" class="C Leader" d="M 168,11.5 l -20,0"/> + <text id="LabelC" class="C Label" x="146" y="11.5" style="text-anchor:end;">C</text> + </g> + <g> + <path id="ButtonD" class="D Button" d="m 183.25,13.75 12.25,12.25 -4.75,4.75 c -8.0,8.0 -20.5,-4.25 -12.25,-12.25 z" /> + <path id="LeaderD" class="D Leader" d="M 168,31.5 l -20,0"/> + <text id="LabelD" class="D Label" x="146" y="31.5" style="text-anchor:end;">D</text> + </g> +</svg> \ No newline at end of file diff --git a/data/layouts/intuos-s-pt2.svg b/data/layouts/intuos-s-pt2.svg index 45b6298..59ce84a 100644 --- a/data/layouts/intuos-s-pt2.svg +++ b/data/layouts/intuos-s-pt2.svg @@ -2,35 +2,26 @@ <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd";> <!-- --> -<svg xmlns="http://www.w3.org/2000/svg"; version="1.1" style="color:#000000;stroke:#7f7f7f;fill:none;stroke-width:.25;font-size:8" id="intuos-s-pt2" width="275" height="222"> +<svg xmlns="http://www.w3.org/2000/svg"; version="1.1" style="color:#000000;stroke:#7f7f7f;fill:none;stroke-width:.25;font-size:8" id="intuos-s-pt" width="209" height="168"> <title id="title">Wacom Intuos PT Small (CTH-490)</title> - <g> - <path id="ButtonA" class="A Button" d="M 35 35 a 8 8 0 0 1 9 -9 l 14 0 l 0 20 l -23 0 z"/> - <circle id="DotA" cx="47" cy="36" r=".5"/> - <path id="LeaderA" class="A Leader" d="M 65 35 l 20 0"/> - <text id="LabelA" class="A Label" x="87" y="40" style="text-anchor:start;">A</text> - </g> - - <g> - <path id="ButtonB" class="B Button" d="M 35 47.5 l 23 0 l 0 20 l -23 0 z"/> - <circle id="DotB" cx="47" cy="57.5" r=".5"/> - <path id="LeaderB" class="B Leader" d="M 65 59 l 20 0"/> - <text id="LabelB" class="B Label" x="87" y="64" style="text-anchor:start;">B</text> - </g> - - <g> - <path id="ButtonC" class="C Button" d="M 185 26 l 14 0 a 8 -8 0 0 1 9 9 l 0 11 l -23 0 z"/> - <circle id="DotC" cx="197" cy="36" r=".5"/> - <path id="LeaderC" class="C Leader" d="M 160 35 l 20 0"/> - <text id="LabelC" class="C Label" x="158" y="40" style="text-anchor:end;">C</text> - </g> - - - <g> - <path id="ButtonD" class="D Button" d="M 185 47.5 l 23 0 l 0 20 l -23 0 z"/> - <circle id="DotD" cx="197" cy="57.5" r=".5"/> - <path id="LeaderD" class="D Leader" d="M 160 59 l 20 0"/> - <text id="LabelD" class="D Label" x="158" y="64" style="text-anchor:end;">D</text> - </g> - -</svg> + <g> + <path id="ButtonA" class="A Button" d="m 13.0,25.25 12.25,-12.25 -4.75,-4.75 C 12.75,0.5 0.25,12.5 8.25,20.75 Z" /> + <path id="LeaderA" class="A Leader" d="M 40,11.5 l 20,0"/> + <text id="LabelA" class="A Label" x="62" y="11.5" style="text-anchor:start;">A</text> + </g> + <g> + <path id="ButtonB" class="B Button" d="m 25.75,13.5 -12.25,12.25 4.75,4.75 c 8.0,8.0 20.5,-4.25 12.25,-12.25 z" /> + <path id="LeaderB" class="B Leader" d="M 40,31.5 l 20,0"/> + <text id="LabelB" class="B Label" x="62" y="31.5" style="text-anchor:start;">B</text> + </g> + <g> + <path id="ButtonC" class="C Button" d="m 196.0,25.25 -12.25,-12.25 4.75,-4.75 c 8.0,-8.0 20.5,4.25 12.25,12.25 z" /> + <path id="LeaderC" class="C Leader" d="M 168,11.5 l -20,0"/> + <text id="LabelC" class="C Label" x="146" y="11.5" style="text-anchor:end;">C</text> + </g> + <g> + <path id="ButtonD" class="D Button" d="m 183.25,13.75 12.25,12.25 -4.75,4.75 c -8.0,8.0 -20.5,-4.25 -12.25,-12.25 z" /> + <path id="LeaderD" class="D Leader" d="M 168,31.5 l -20,0"/> + <text id="LabelD" class="D Label" x="146" y="31.5" style="text-anchor:end;">D</text> + </g> +</svg> \ No newline at end of file -- 2.8.3 ------------------------------------------------------------------------------ Attend Shape: An AT&T Tech Expo July 15-16. Meet us at AT&T Park in San Francisco, CA to explore cutting-edge tech and listen to tech luminaries present their vision of the future. This family event has something for everyone, including kids. Get more information and register today. http://sdm.link/attshape _______________________________________________ Linuxwacom-devel mailing list Linuxwacom-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/linuxwacom-devel
