On Tue, Dec 9, 2014 at 4:14 PM, Aaron Armstrong Skomra <sko...@gmail.com> wrote: > I thought about the side switch, but because the existing the .svg files in > the > project only only have 2 dimensions (and lack a border), I can't see moving > into the 3rd dimension to represent the touch switch with the way things > are setup now. > > Also I don't see the GNOME control panel having to map/configure the > touch-switch because it should really only turn off touch.
Ok, that sounds sensible. Let's merge this patch and update it when Gnome considers touch configurable features. The patch is Reviewed-by: Ping Cheng <pi...@wacom.com> Thank you Aaron, Ping > On Tue, Dec 9, 2014 at 1:53 PM, Ping Cheng <pingli...@gmail.com> wrote: >> >> On Tue, Dec 9, 2014 at 12:17 PM, Aaron Skomra <sko...@gmail.com> wrote: >> > >> > Signed-off-by: Aaron Skomra <sko...@gmail.com> >> > --- >> > Please note the buttons on these tablets do not associate correctly when >> > using the button mapping interface in GNOME, see my previous commit. >> > >> > data/intuos-m-pt.tablet | 5 +++-- >> > data/intuos-s-p.tablet | 5 +++-- >> > data/intuos-s-pt.tablet | 5 +++-- >> > data/layouts/intuos-m-p.svg | 2 +- >> > data/layouts/intuos-m-pt.svg | 35 +++++++++++++++++++++++++++++++++++ >> > data/layouts/intuos-s-p.svg | 35 +++++++++++++++++++++++++++++++++++ >> > data/layouts/intuos-s-pt.svg | 35 +++++++++++++++++++++++++++++++++++ >> > 7 files changed, 115 insertions(+), 7 deletions(-) >> > create mode 100644 data/layouts/intuos-m-pt.svg >> > create mode 100644 data/layouts/intuos-s-p.svg >> > create mode 100644 data/layouts/intuos-s-pt.svg >> > >> > diff --git a/data/intuos-m-pt.tablet b/data/intuos-m-pt.tablet >> > index 0d5d75c..95beb00 100644 >> > --- a/data/intuos-m-pt.tablet >> > +++ b/data/intuos-m-pt.tablet >> > @@ -39,7 +39,7 @@ DeviceMatch=usb:056a:0303 >> > Class=Bamboo >> > Width=9 >> > Height=5 >> > -#Layout=intuos-m-pt.svg >> > +Layout=intuos-m-pt.svg >> > IntegratedIn= >> > >> > [Features] >> > @@ -50,4 +50,5 @@ Buttons=4 >> > TouchSwitch=true >> >> We defined TouchSwitch in the data file. It also has a layout in its >> comment area: >> >> # Touch Switch Map: >> # (on the edge of top right corner; switch to right: touch off; switch >> to left: touch on) >> # >> # S >> # *-----------------------* >> # | | >> # | | >> # | TABLET | >> # | | >> # | | >> # *-----------------------* >> >> But I don't see it defined in .svg. Should we add it there as well? >> >> > [Buttons] >> > -Top=A;B;C;D >> > +Left=A;B >> > +Right=C;D >> > diff --git a/data/intuos-s-p.tablet b/data/intuos-s-p.tablet >> > index 373b50d..60ce3e2 100644 >> > --- a/data/intuos-s-p.tablet >> > +++ b/data/intuos-s-p.tablet >> > @@ -24,7 +24,7 @@ DeviceMatch=usb:056a:030e >> > Class=Bamboo >> > Width=6 >> > Height=4 >> > -#Layout=intuos-s-p.svg >> > +Layout=intuos-s-p.svg >> > IntegratedIn= >> > >> > [Features] >> > @@ -33,4 +33,5 @@ Reversible=true >> > Buttons=4 >> > >> > [Buttons] >> > -Top=A;B;C;D >> > +Left=A;B >> > +Right=C;D >> > diff --git a/data/intuos-s-pt.tablet b/data/intuos-s-pt.tablet >> > index 0585ed2..f8e691f 100644 >> > --- a/data/intuos-s-pt.tablet >> > +++ b/data/intuos-s-pt.tablet >> > @@ -39,7 +39,7 @@ DeviceMatch=usb:056a:0302 >> > Class=Bamboo >> > Width=6 >> > Height=4 >> > -#Layout=intuos-s-pt.svg >> > +Layout=intuos-s-pt.svg >> > IntegratedIn= >> > >> > [Features] >> > @@ -50,4 +50,5 @@ Buttons=4 >> > TouchSwitch=true >> >> Same here. >> >> > [Buttons] >> > -Top=A;B;C;D >> > +Left=A;B >> > +Right=C;D >> > diff --git a/data/layouts/intuos-m-p.svg b/data/layouts/intuos-m-p.svg >> > index f5495eb..3cf1f9b 100644 >> > --- a/data/layouts/intuos-m-p.svg >> > +++ b/data/layouts/intuos-m-p.svg >> > @@ -2,7 +2,7 @@ >> > <!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-p" 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-m-p" width="275" height="222"> >> > <title id="title">Wacom Intuos Pen Medium (CTL-680)</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"/> >> > diff --git a/data/layouts/intuos-m-pt.svg b/data/layouts/intuos-m-pt.svg >> > new file mode 100644 >> > index 0000000..7951e44 >> > --- /dev/null >> > +++ b/data/layouts/intuos-m-pt.svg >> > @@ -0,0 +1,35 @@ >> > +<?xml version="1.0" encoding="UTF-8" standalone="no"?> >> > +<!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-pt" width="275" height="222"> >> > + <title id="title">Wacom Intuos Pen and Touch Medium (CTH-680)</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="145" y="40" >> > style="text-anchor:start;">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="145" y="64" >> > style="text-anchor:start;">D</text> >> > + </g> >> > + >> > +</svg> >> > diff --git a/data/layouts/intuos-s-p.svg b/data/layouts/intuos-s-p.svg >> > new file mode 100644 >> > index 0000000..404aad0 >> > --- /dev/null >> > +++ b/data/layouts/intuos-s-p.svg >> > @@ -0,0 +1,35 @@ >> > +<?xml version="1.0" encoding="UTF-8" standalone="no"?> >> > +<!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-p" width="210" height="178"> >> > + <title id="title">Wacom Intuos Pen Small (CTL-480)</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="145" y="40" >> > style="text-anchor:start;">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="145" y="64" >> > style="text-anchor:start;">D</text> >> > + </g> >> > + >> > +</svg> >> > diff --git a/data/layouts/intuos-s-pt.svg b/data/layouts/intuos-s-pt.svg >> > new file mode 100644 >> > index 0000000..000f396 >> > --- /dev/null >> > +++ b/data/layouts/intuos-s-pt.svg >> > @@ -0,0 +1,35 @@ >> > +<?xml version="1.0" encoding="UTF-8" standalone="no"?> >> > +<!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-pt" width="210" height="178"> >> > + <title id="title">Intuos Pen and Touch Small (CTH-480)</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="145" y="40" >> > style="text-anchor:start;">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="145" y="64" >> > style="text-anchor:start;">D</text> >> > + </g> >> > + >> > +</svg> >> > -- >> > 1.9.3 >> > >> > >> > >> > ------------------------------------------------------------------------------ >> > Download BIRT iHub F-Type - The Free Enterprise-Grade BIRT Server >> > from Actuate! Instantly Supercharge Your Business Reports and Dashboards >> > with Interactivity, Sharing, Native Excel Exports, App Integration & >> > more >> > Get technology previously reserved for billion-dollar corporations, FREE >> > >> > http://pubads.g.doubleclick.net/gampad/clk?id=164703151&iu=/4140/ostg.clktrk >> > _______________________________________________ >> > Linuxwacom-devel mailing list >> > Linuxwacom-devel@lists.sourceforge.net >> > https://lists.sourceforge.net/lists/listinfo/linuxwacom-devel > > ------------------------------------------------------------------------------ Download BIRT iHub F-Type - The Free Enterprise-Grade BIRT Server from Actuate! Instantly Supercharge Your Business Reports and Dashboards with Interactivity, Sharing, Native Excel Exports, App Integration & more Get technology previously reserved for billion-dollar corporations, FREE http://pubads.g.doubleclick.net/gampad/clk?id=164703151&iu=/4140/ostg.clktrk _______________________________________________ Linuxwacom-devel mailing list Linuxwacom-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/linuxwacom-devel
