On Tue, Nov 27, 2012 at 11:25:15AM +0100, Olivier Fourdan wrote:
> Hi,
>
> After review of the proposed on-screen help display window for the
> Wacom plug-in in GNOME settings daemon (aka OSD), the GNOME design
> team came back with some requirements that need an enhancement in
> the layouts definitions.
>
> Basically, what's required is a caption indicator, i.e. a line that
> goes from the button itself to its label so that there is a visual
> link between the two.
>
> As I reckon all placing/drawing/rendering should come from the
> layout, that means we need to amend the proposed definition to add
> those captions to the layout data (given that the layouts can be
> fairly complex, this needs to be done in the SVG rather than
> computed).
>
> The following patch does this:
>
> - Adds the caption indicator definition
> - Adds the caption indicators to the two existing layouts (namely
> Cintiq 12WX and Intuos5 M)
> - Modifies the check to very the presence of the caption indicators
> - Improves the renderer example to show the trip/ring actions and
> all the captions (Screenshots [1] and [2])
>
> Cheers,
> Olivier.
>
> [1]
> http://people.redhat.com/ofourdan/libwacom/misc/Cintiq-12WX-layout-viewer.png
> [2]
> http://people.redhat.com/ofourdan/libwacom/misc/Intuos5-M-layout-viewer.png
>
>
> >From 920b8cdeaf6c7db904a5ba689f11fef431f155b9 Mon Sep 17 00:00:00 2001
> From: Olivier Fourdan
> Date: Tue, 27 Nov 2012 09:52:42 +0100
> Subject: [PATCH] data: Add caption indicators to layouts
>
> To match the buttons with their corresponding labels, the
> layout SVG must also provide a caption indicator for each
> label in the form of a line that links each button and its
> label.
>
> Improves the layout SVG for the Cintiq 12WX and Intuos 5 M
> by adding details and rounded buttons to match the look of
> the real device.
>
> Buttons, labels and indicators are now grouped in the SVG
> layout for better clarity of the SVG.
>
> Adds indicators to the SVG check test so that incomplete
> layouts would be detected.
>
> Improves the SVG layout display sample program to show
> touch ring/touch strips labels and label indocators.
>
> Signed-off-by: Olivier Fourdan
> ---
> data/layouts/README | 55 ++
> data/layouts/cintiq-12wx.svg | 116 ++---
> data/layouts/intuos5-m.svg | 81 ++--
> test/tablet-svg-validity.c | 19 +
> tools/show-svg-image.c | 174
> +--
> 5 files changed, 323 insertions(+), 122 deletions(-)
>
> diff --git a/data/layouts/README b/data/layouts/README
> index 37b644d..570de38 100644
> --- a/data/layouts/README
> +++ b/data/layouts/README
> @@ -71,6 +71,7 @@ Each button's label ID in the SVG is made of the string
> "Label" with ID of the
> button to which it applies, between 'A' and 'Z'.
>
> Class includes both the button ID and the string "Label".
> +
> id="LabelA"
> class="A Label"
>
> @@ -122,3 +123,57 @@ Second touch-strip:
>
> id="LabelRingDown"
> class="Strip2Down Strip2 Label"
> +
> + - Caption indicators
> +
> +To match the buttons with their corresponding labels, the SVG must also
> provide
> +a caption indicator for each label in the form of a line that links each
> button
> +and its label.
I'm honestly not sure if "indicator" is the right word here. Maybe some
native English speakers can chime in here?
Further confusing also by XKB using indicators for LEDs (Caps Lock, etc.)
> +
> +Each caption indicator follows the same naming convention as the labels,
> using
> +the special name "Indicator" in place of "Label", ie:
> +
> +id="IndicatorA"
> +class="A Indicator"
> +
> +Touch-rings and touch-strips have 2 different labels and therefore 2
> indicators.
> +
> +id="IndicatorRingUp"
> +class="RingUp Ring Indicator"
> +
> + and
> +
> +id="IndicatorRingDown"
> +class="RingDown Ring Indicator"
As Ping said, up/down on a ring is ambiguous. we use that terminology in the
driver, but I do think we have the chance here to use CW/CCW instead.
> +
> +The second touch-ring button is identified by "Ring2" in place of "Ring":
> +
> +id="IndicatorRing2Up"
> +class="Ring2Up Ring2 Indicator"
> +
> + and
> +
> +id="IndicatorRingDown"
> +class="Ring2Down Ring2 Indicator"
> +
> +Touchstrips button follow the same naming scheme, using "Strip" and "Strip2"
> +to name the first and second touch-strip.
> +
> +id="IndicatorStripUp"
> +class="StripUp Strip Indicator"
> +
> + and
> +
> +id="IndicatorStripDown"
> +class="StripDown Strip Indicator"
> +
> +Second touch-strip:
> +
> +id="IndicatorStrip2Up"
> +class="Strip2Up Strip2 Indicator"
> +
> + and
> +
> +id="IndicatorRingDown"
> +class="Strip2Down Strip2 Indicator"
> +
> diff --git a/data/layouts/cintiq-12wx.svg b/data/layouts/cintiq-12wx.svg
> index 370283d..ef23c63 100644
> --- a/data/layouts/cintiq-12wx.svg
> +++ b/d
