diff --git a/testsuite/a11y/buttons.txt b/testsuite/a11y/buttons.txt index e39b3a10ba..0a43e143c6 100644 --- a/testsuite/a11y/buttons.txt +++ b/testsuite/a11y/buttons.txt @@ -16,102 +16,11 @@ window1 layer: widget alpha: 1 - button9 - "push button" + button1 + "toggle button" parent: grid1 index: 0 - state: enabled focusable sensitive showing visible - toolkit: gtk - - layer: widget - alpha: 1 - - image size: -1 x -1 - image description: (null) - - action 0 name: click - action 0 description: Clicks the button - button8 - "push button" - parent: grid1 - index: 1 - state: enabled focusable sensitive showing visible - toolkit: gtk - - layer: widget - alpha: 1 - - image size: -1 x -1 - image description: (null) - - action 0 name: click - action 0 description: Clicks the button - button7 - "push button" - parent: grid1 - index: 2 - name: Text Button - state: enabled focusable sensitive showing visible - toolkit: gtk - - layer: widget - alpha: 1 - - image size: -1 x -1 - image description: (null) - - action 0 name: click - action 0 description: Clicks the button - button6 - "toggle button" - parent: grid1 - index: 3 - name: Test switch - state: enabled focusable sensitive showing visible - toolkit: gtk - - layer: widget - alpha: 1 - - action 0 name: toggle - action 0 description: Toggles the switch - button5 - "toggle button" - parent: grid1 - index: 4 - state: checked enabled focusable sensitive showing visible - toolkit: gtk - - layer: widget - alpha: 1 - - action 0 name: toggle - action 0 description: Toggles the switch - button4 - "radio button" - parent: grid1 - index: 5 name: Hello World! - member-of: button4 - button3 - state: enabled focusable sensitive showing visible - toolkit: gtk - - layer: widget - alpha: 1 - - image size: -1 x -1 - image description: (null) - - action 0 name: click - action 0 description: Clicks the button - button3 - "radio button" - parent: grid1 - index: 6 - name: Hello World! - member-of: button4 - button3 state: checked enabled focusable sensitive showing visible toolkit: gtk @@ -126,7 +35,7 @@ window1 button2 "check box" parent: grid1 - index: 7 + index: 1 name: Hello World! state: enabled focusable sensitive showing visible toolkit: gtk @@ -139,11 +48,13 @@ window1 action 0 name: click action 0 description: Clicks the button - button1 - "toggle button" + button3 + "radio button" parent: grid1 - index: 8 + index: 2 name: Hello World! + member-of: button4 + button3 state: checked enabled focusable sensitive showing visible toolkit: gtk @@ -155,3 +66,92 @@ window1 action 0 name: click action 0 description: Clicks the button + button4 + "radio button" + parent: grid1 + index: 3 + name: Hello World! + member-of: button4 + button3 + state: enabled focusable sensitive showing visible + toolkit: gtk + + layer: widget + alpha: 1 + + image size: -1 x -1 + image description: (null) + + action 0 name: click + action 0 description: Clicks the button + button5 + "toggle button" + parent: grid1 + index: 4 + state: checked enabled focusable sensitive showing visible + toolkit: gtk + + layer: widget + alpha: 1 + + action 0 name: toggle + action 0 description: Toggles the switch + button6 + "toggle button" + parent: grid1 + index: 5 + name: Test switch + state: enabled focusable sensitive showing visible + toolkit: gtk + + layer: widget + alpha: 1 + + action 0 name: toggle + action 0 description: Toggles the switch + button7 + "push button" + parent: grid1 + index: 6 + name: Text Button + state: enabled focusable sensitive showing visible + toolkit: gtk + + layer: widget + alpha: 1 + + image size: -1 x -1 + image description: (null) + + action 0 name: click + action 0 description: Clicks the button + button8 + "push button" + parent: grid1 + index: 7 + state: enabled focusable sensitive showing visible + toolkit: gtk + + layer: widget + alpha: 1 + + image size: -1 x -1 + image description: (null) + + action 0 name: click + action 0 description: Clicks the button + button9 + "push button" + parent: grid1 + index: 8 + state: enabled focusable sensitive showing visible + toolkit: gtk + + layer: widget + alpha: 1 + + image size: -1 x -1 + image description: (null) + + action 0 name: click + action 0 description: Clicks the button diff --git a/testsuite/a11y/colorchooser.txt b/testsuite/a11y/colorchooser.txt index bb231b8a77..6a55c0ce1c 100644 --- a/testsuite/a11y/colorchooser.txt +++ b/testsuite/a11y/colorchooser.txt @@ -48,7 +48,7 @@ window1 "radio button" parent: unnamed-GtkContainerAccessible-1 index: 0 - name: Dark Aluminum 2 + name: Light Scarlet Red state: enabled focusable sensitive showing visible toolkit: gtk @@ -65,7 +65,7 @@ window1 "radio button" parent: unnamed-GtkContainerAccessible-1 index: 1 - name: Aluminum 2 + name: Scarlet Red state: enabled focusable sensitive showing visible toolkit: gtk @@ -82,7 +82,7 @@ window1 "radio button" parent: unnamed-GtkContainerAccessible-1 index: 2 - name: Light Aluminum 2 + name: Dark Scarlet Red state: enabled focusable sensitive showing visible toolkit: gtk @@ -99,7 +99,7 @@ window1 "radio button" parent: unnamed-GtkContainerAccessible-1 index: 3 - name: Dark Aluminum 1 + name: Light Orange state: enabled focusable sensitive showing visible toolkit: gtk @@ -116,7 +116,7 @@ window1 "radio button" parent: unnamed-GtkContainerAccessible-1 index: 4 - name: Aluminum 1 + name: Orange state: enabled focusable sensitive showing visible toolkit: gtk @@ -133,7 +133,7 @@ window1 "radio button" parent: unnamed-GtkContainerAccessible-1 index: 5 - name: Light Aluminum 1 + name: Dark Orange state: enabled focusable sensitive showing visible toolkit: gtk @@ -150,7 +150,7 @@ window1 "radio button" parent: unnamed-GtkContainerAccessible-1 index: 6 - name: Dark Chocolate + name: Light Butter state: enabled focusable sensitive showing visible toolkit: gtk @@ -167,7 +167,7 @@ window1 "radio button" parent: unnamed-GtkContainerAccessible-1 index: 7 - name: Chocolate + name: Butter state: enabled focusable sensitive showing visible toolkit: gtk @@ -184,7 +184,7 @@ window1 "radio button" parent: unnamed-GtkContainerAccessible-1 index: 8 - name: Light Chocolate + name: Dark Butter state: enabled focusable sensitive showing visible toolkit: gtk @@ -201,7 +201,7 @@ window1 "radio button" parent: unnamed-GtkContainerAccessible-1 index: 9 - name: Dark Plum + name: Light Chameleon state: enabled focusable sensitive showing visible toolkit: gtk @@ -218,7 +218,7 @@ window1 "radio button" parent: unnamed-GtkContainerAccessible-1 index: 10 - name: Plum + name: Chameleon state: enabled focusable sensitive showing visible toolkit: gtk @@ -235,7 +235,7 @@ window1 "radio button" parent: unnamed-GtkContainerAccessible-1 index: 11 - name: Light Plum + name: Dark Chameleon state: enabled focusable sensitive showing visible toolkit: gtk @@ -252,7 +252,7 @@ window1 "radio button" parent: unnamed-GtkContainerAccessible-1 index: 12 - name: Dark Sky Blue + name: Light Sky Blue state: enabled focusable sensitive showing visible toolkit: gtk @@ -286,7 +286,7 @@ window1 "radio button" parent: unnamed-GtkContainerAccessible-1 index: 14 - name: Light Sky Blue + name: Dark Sky Blue state: enabled focusable sensitive showing visible toolkit: gtk @@ -303,7 +303,7 @@ window1 "radio button" parent: unnamed-GtkContainerAccessible-1 index: 15 - name: Dark Chameleon + name: Light Plum state: enabled focusable sensitive showing visible toolkit: gtk @@ -320,7 +320,7 @@ window1 "radio button" parent: unnamed-GtkContainerAccessible-1 index: 16 - name: Chameleon + name: Plum state: enabled focusable sensitive showing visible toolkit: gtk @@ -337,7 +337,7 @@ window1 "radio button" parent: unnamed-GtkContainerAccessible-1 index: 17 - name: Light Chameleon + name: Dark Plum state: enabled focusable sensitive showing visible toolkit: gtk @@ -354,7 +354,7 @@ window1 "radio button" parent: unnamed-GtkContainerAccessible-1 index: 18 - name: Dark Butter + name: Light Chocolate state: enabled focusable sensitive showing visible toolkit: gtk @@ -371,7 +371,7 @@ window1 "radio button" parent: unnamed-GtkContainerAccessible-1 index: 19 - name: Butter + name: Chocolate state: enabled focusable sensitive showing visible toolkit: gtk @@ -388,7 +388,7 @@ window1 "radio button" parent: unnamed-GtkContainerAccessible-1 index: 20 - name: Light Butter + name: Dark Chocolate state: enabled focusable sensitive showing visible toolkit: gtk @@ -405,7 +405,7 @@ window1 "radio button" parent: unnamed-GtkContainerAccessible-1 index: 21 - name: Dark Orange + name: Light Aluminum 1 state: enabled focusable sensitive showing visible toolkit: gtk @@ -422,7 +422,7 @@ window1 "radio button" parent: unnamed-GtkContainerAccessible-1 index: 22 - name: Orange + name: Aluminum 1 state: enabled focusable sensitive showing visible toolkit: gtk @@ -439,7 +439,7 @@ window1 "radio button" parent: unnamed-GtkContainerAccessible-1 index: 23 - name: Light Orange + name: Dark Aluminum 1 state: enabled focusable sensitive showing visible toolkit: gtk @@ -456,7 +456,7 @@ window1 "radio button" parent: unnamed-GtkContainerAccessible-1 index: 24 - name: Dark Scarlet Red + name: Light Aluminum 2 state: enabled focusable sensitive showing visible toolkit: gtk @@ -473,7 +473,7 @@ window1 "radio button" parent: unnamed-GtkContainerAccessible-1 index: 25 - name: Scarlet Red + name: Aluminum 2 state: enabled focusable sensitive showing visible toolkit: gtk @@ -490,7 +490,7 @@ window1 "radio button" parent: unnamed-GtkContainerAccessible-1 index: 26 - name: Light Scarlet Red + name: Dark Aluminum 2 state: enabled focusable sensitive showing visible toolkit: gtk @@ -516,8 +516,8 @@ window1 "radio button" parent: unnamed-GtkContainerAccessible-29 index: 0 - name: White - state: checked enabled focusable sensitive showing visible + name: Black + state: enabled focusable sensitive showing visible toolkit: gtk layer: widget @@ -533,7 +533,7 @@ window1 "radio button" parent: unnamed-GtkContainerAccessible-29 index: 1 - name: Very Light Gray + name: Very Dark Gray state: enabled focusable sensitive showing visible toolkit: gtk @@ -550,7 +550,7 @@ window1 "radio button" parent: unnamed-GtkContainerAccessible-29 index: 2 - name: Lighter Gray + name: Darker Gray state: enabled focusable sensitive showing visible toolkit: gtk @@ -567,7 +567,7 @@ window1 "radio button" parent: unnamed-GtkContainerAccessible-29 index: 3 - name: Light Gray + name: Dark Gray state: enabled focusable sensitive showing visible toolkit: gtk @@ -601,7 +601,7 @@ window1 "radio button" parent: unnamed-GtkContainerAccessible-29 index: 5 - name: Dark Gray + name: Light Gray state: enabled focusable sensitive showing visible toolkit: gtk @@ -618,7 +618,7 @@ window1 "radio button" parent: unnamed-GtkContainerAccessible-29 index: 6 - name: Darker Gray + name: Lighter Gray state: enabled focusable sensitive showing visible toolkit: gtk @@ -635,7 +635,7 @@ window1 "radio button" parent: unnamed-GtkContainerAccessible-29 index: 7 - name: Very Dark Gray + name: Very Light Gray state: enabled focusable sensitive showing visible toolkit: gtk @@ -652,8 +652,8 @@ window1 "radio button" parent: unnamed-GtkContainerAccessible-29 index: 8 - name: Black - state: enabled focusable sensitive showing visible + name: White + state: checked enabled focusable sensitive showing visible toolkit: gtk layer: widget @@ -768,48 +768,26 @@ window1 layer: widget alpha: 1 - sv_plane - "color chooser" + swatch + "radio button" parent: grid index: 0 - name: Color Plane - state: enabled focusable sensitive visible + state: enabled sensitive visible toolkit: gtk layer: widget alpha: 1 - a_slider - "color chooser" - parent: grid - index: 1 - name: Alpha - state: enabled focusable horizontal sensitive visible - toolkit: gtk - - layer: widget - alpha: 1 - - minimum value: 0.000000 - maximum value: 1.000000 - current value: 0.000000 - h_slider - "color chooser" - parent: grid - index: 2 - name: Hue - state: enabled focusable sensitive vertical visible - toolkit: gtk - - layer: widget - alpha: 1 - - minimum value: 0.000000 - maximum value: 1.000000 - current value: 0.000000 + + action 0 name: select + action 0 description: Selects the color + action 1 name: activate + action 1 description: Activates the color + action 2 name: customize + action 2 description: Customizes the color entry "text" parent: grid - index: 3 + index: 1 name: Color Name state: editable enabled focusable sensitive single-line visible toolkit: gtk @@ -848,22 +826,44 @@ window1 action 0 name: activate action 0 description: Activates the entry - swatch - "radio button" + h_slider + "color chooser" parent: grid - index: 4 - state: enabled sensitive visible + index: 2 + name: Hue + state: enabled focusable sensitive vertical visible + toolkit: gtk + + layer: widget + alpha: 1 + + minimum value: 0.000000 + maximum value: 1.000000 + current value: 0.000000 + a_slider + "color chooser" + parent: grid + index: 3 + name: Alpha + state: enabled focusable horizontal sensitive visible + toolkit: gtk + + layer: widget + alpha: 1 + + minimum value: 0.000000 + maximum value: 1.000000 + current value: 0.000000 + sv_plane + "color chooser" + parent: grid + index: 4 + name: Color Plane + state: enabled focusable sensitive visible toolkit: gtk layer: widget alpha: 1 - - action 0 name: select - action 0 description: Selects the color - action 1 name: activate - action 1 description: Activates the color - action 2 name: customize - action 2 description: Customizes the color sv_popup "filler" parent: overlay @@ -882,78 +882,10 @@ window1 layer: widget alpha: 1 - v_entry - "spin button" - parent: grid2 - index: 0 - name: Value - state: enabled focusable horizontal sensitive visible - toolkit: gtk - - layer: widget - alpha: 1 - - minimum value: 0.000000 - maximum value: 100.000000 - current value: 0.000000 - s_entry - "spin button" - parent: grid2 - index: 1 - name: Saturation - state: enabled focusable horizontal sensitive visible - toolkit: gtk - - layer: widget - alpha: 1 - - minimum value: 0.000000 - maximum value: 100.000000 - current value: 0.000000 - label2 - "label" - parent: grid2 - index: 2 - name: V - state: enabled multi-line sensitive visible - toolkit: gtk - - layer: widget - alpha: 1 - - text: V - character count: 1 - caret offset: 0 - default attributes: bg-color: - bg-full-height: 0 - direction: - editable: false - family-name: - fg-color: - indent: 0 - invisible: false - justification: left - language: - left-margin: 0 - pixels-above-lines: 0 - pixels-below-lines: 0 - pixels-inside-wrap: 0 - right-margin: 0 - rise: 0 - scale: 1 - size: - stretch: - strikethrough: false - style: - underline: none - variant: - weight: - wrap-mode: word - label1 "label" parent: grid2 - index: 3 + index: 0 name: S state: enabled multi-line sensitive visible toolkit: gtk @@ -990,6 +922,74 @@ window1 weight: wrap-mode: word + label2 + "label" + parent: grid2 + index: 1 + name: V + state: enabled multi-line sensitive visible + toolkit: gtk + + layer: widget + alpha: 1 + + text: V + character count: 1 + caret offset: 0 + default attributes: bg-color: + bg-full-height: 0 + direction: + editable: false + family-name: + fg-color: + indent: 0 + invisible: false + justification: left + language: + left-margin: 0 + pixels-above-lines: 0 + pixels-below-lines: 0 + pixels-inside-wrap: 0 + right-margin: 0 + rise: 0 + scale: 1 + size: + stretch: + strikethrough: false + style: + underline: none + variant: + weight: + wrap-mode: word + + s_entry + "spin button" + parent: grid2 + index: 2 + name: Saturation + state: enabled focusable horizontal sensitive visible + toolkit: gtk + + layer: widget + alpha: 1 + + minimum value: 0.000000 + maximum value: 100.000000 + current value: 0.000000 + v_entry + "spin button" + parent: grid2 + index: 3 + name: Value + state: enabled focusable horizontal sensitive visible + toolkit: gtk + + layer: widget + alpha: 1 + + minimum value: 0.000000 + maximum value: 100.000000 + current value: 0.000000 h_popup "filler" parent: overlay @@ -1008,24 +1008,10 @@ window1 layer: widget alpha: 1 - h_entry - "spin button" - parent: grid3 - index: 0 - name: Hue - state: enabled focusable horizontal sensitive visible - toolkit: gtk - - layer: widget - alpha: 1 - - minimum value: 0.000000 - maximum value: 100.000000 - current value: 0.000000 label3 "label" parent: grid3 - index: 1 + index: 0 name: H state: enabled multi-line sensitive visible toolkit: gtk @@ -1062,6 +1048,20 @@ window1 weight: wrap-mode: word + h_entry + "spin button" + parent: grid3 + index: 1 + name: Hue + state: enabled focusable horizontal sensitive visible + toolkit: gtk + + layer: widget + alpha: 1 + + minimum value: 0.000000 + maximum value: 100.000000 + current value: 0.000000 a_popup "filler" parent: overlay @@ -1080,24 +1080,10 @@ window1 layer: widget alpha: 1 - a_entry - "spin button" - parent: grid4 - index: 0 - name: Alpha - state: enabled focusable horizontal sensitive visible - toolkit: gtk - - layer: widget - alpha: 1 - - minimum value: 0.000000 - maximum value: 100.000000 - current value: 0.000000 label4 "label" parent: grid4 - index: 1 + index: 0 name: A state: enabled multi-line sensitive visible toolkit: gtk @@ -1134,6 +1120,20 @@ window1 weight: wrap-mode: word + a_entry + "spin button" + parent: grid4 + index: 1 + name: Alpha + state: enabled focusable horizontal sensitive visible + toolkit: gtk + + layer: widget + alpha: 1 + + minimum value: 0.000000 + maximum value: 100.000000 + current value: 0.000000 action_box "filler" parent: dialog-vbox1 diff --git a/testsuite/a11y/entries.txt b/testsuite/a11y/entries.txt index efbe14e90e..75da91d9d1 100644 --- a/testsuite/a11y/entries.txt +++ b/testsuite/a11y/entries.txt @@ -152,8 +152,7 @@ window1 text: text character count: 4 - caret offset: 4 - selection 0: (0, 4) text + caret offset: 0 default attributes: bg-color: bg-full-height: 0 direction: diff --git a/testsuite/a11y/label-static.txt b/testsuite/a11y/label-static.txt index cfffa4c8ed..eff7a8e47c 100644 --- a/testsuite/a11y/label-static.txt +++ b/testsuite/a11y/label-static.txt @@ -12,7 +12,7 @@ window1 parent: window1 index: 0 name: Go to the GTK+ website or >google it - state: enabled focusable multi-line sensitive has-tooltip + state: enabled focusable multi-line sensitive showing visible has-tooltip toolkit: gtk layer: widget @@ -58,7 +58,7 @@ window1 unnamed-GtkLabelAccessibleLinkImpl-0 "link" parent: label1 - state: enabled focusable multi-line sensitive has-tooltip + state: enabled focusable focused multi-line sensitive showing visible has-tooltip start index: 10 @@ -67,7 +67,7 @@ window1 unnamed-GtkLabelAccessibleLinkImpl-1 "link" parent: label1 - state: enabled focusable multi-line sensitive has-tooltip + state: enabled focusable multi-line sensitive showing visible has-tooltip start index: 27 diff --git a/testsuite/a11y/menus.txt b/testsuite/a11y/menus.txt index ab89b99250..44ca3ddab9 100644 --- a/testsuite/a11y/menus.txt +++ b/testsuite/a11y/menus.txt @@ -7,14 +7,6 @@ window1 layer: window alpha: 1 - unnamed-GtkContainerAccessible-0 - "panel" - parent: window1 - state: enabled sensitive showing visible - toolkit: gtk - - layer: widget - alpha: 1 menubar1 "menu bar" parent: window1 diff --git a/testsuite/a11y/pickers.txt b/testsuite/a11y/pickers.txt index e8164482a6..5e7dbc097c 100644 --- a/testsuite/a11y/pickers.txt +++ b/testsuite/a11y/pickers.txt @@ -16,28 +16,10 @@ window1 layer: widget alpha: 1 - button3 - "unknown" - parent: grid1 - index: 0 - state: enabled sensitive showing visible - toolkit: gtk - - layer: widget - alpha: 1 - button2 - "unknown" - parent: grid1 - index: 1 - state: enabled sensitive showing visible - toolkit: gtk - - layer: widget - alpha: 1 button1 "combo box" parent: grid1 - index: 2 + index: 0 state: enabled sensitive showing visible toolkit: gtk @@ -57,3 +39,21 @@ window1 layer: popup alpha: 1 + button2 + "unknown" + parent: grid1 + index: 1 + state: enabled sensitive showing visible + toolkit: gtk + + layer: widget + alpha: 1 + button3 + "unknown" + parent: grid1 + index: 2 + state: enabled sensitive showing visible + toolkit: gtk + + layer: widget + alpha: 1 diff --git a/testsuite/a11y/range.txt b/testsuite/a11y/range.txt index 0b6d1dc6e4..be18a34fd2 100644 --- a/testsuite/a11y/range.txt +++ b/testsuite/a11y/range.txt @@ -16,19 +16,10 @@ window1 layer: widget alpha: 1 - scrollbar1 - "scroll bar" - parent: grid1 - index: 0 - state: enabled focusable horizontal sensitive showing visible - toolkit: gtk - - layer: widget - alpha: 1 scale1 "slider" parent: grid1 - index: 1 + index: 0 description: 45.5 state: enabled focusable horizontal sensitive showing visible toolkit: gtk @@ -39,3 +30,12 @@ window1 minimum value: 0.500000 maximum value: 99.500000 current value: 45.500000 + scrollbar1 + "scroll bar" + parent: grid1 + index: 1 + state: enabled focusable horizontal sensitive showing visible + toolkit: gtk + + layer: widget + alpha: 1