diff --git a/testsuite/a11y/about.txt b/testsuite/a11y/about.txt index b8f48244c3..4d7917e97c 100644 --- a/testsuite/a11y/about.txt +++ b/testsuite/a11y/about.txt @@ -33,6 +33,7 @@ window1 name: About member-of: unnamed-GtkRadioButtonAccessible-1 unnamed-GtkRadioButtonAccessible-2 + unnamed-GtkRadioButtonAccessible-3 unnamed-GtkRadioButtonAccessible-0 state: checked enabled focusable sensitive visible toolkit: gtk @@ -45,13 +46,34 @@ window1 action 0 name: click action 0 description: Clicks the button + unnamed-GtkRadioButtonAccessible-3 + "radio button" + parent: stack_switcher + index: 1 + name: Credits + member-of: unnamed-GtkRadioButtonAccessible-1 + unnamed-GtkRadioButtonAccessible-2 + unnamed-GtkRadioButtonAccessible-3 + unnamed-GtkRadioButtonAccessible-0 + state: enabled focusable sensitive + toolkit: gtk + + layer: widget + alpha: 1 + + image size: -1 x -1 + image description: (null) + + action 0 name: click + action 0 description: Clicks the button unnamed-GtkRadioButtonAccessible-2 "radio button" parent: stack_switcher - index: 1 - name: Credits + index: 2 + name: License member-of: unnamed-GtkRadioButtonAccessible-1 unnamed-GtkRadioButtonAccessible-2 + unnamed-GtkRadioButtonAccessible-3 unnamed-GtkRadioButtonAccessible-0 state: enabled focusable sensitive toolkit: gtk @@ -67,10 +89,11 @@ window1 unnamed-GtkRadioButtonAccessible-1 "radio button" parent: stack_switcher - index: 2 - name: License + index: 3 + name: System member-of: unnamed-GtkRadioButtonAccessible-1 unnamed-GtkRadioButtonAccessible-2 + unnamed-GtkRadioButtonAccessible-3 unnamed-GtkRadioButtonAccessible-0 state: enabled focusable sensitive toolkit: gtk @@ -252,68 +275,59 @@ window1 weight: wrap-mode: word - hbox - "filler" + website_label + "label" parent: page_vbox index: 2 - state: enabled horizontal sensitive showing visible + name: Website + state: enabled focusable multi-line sensitive showing visible toolkit: gtk layer: widget alpha: 1 - website_label - "label" - parent: hbox - index: 0 - name: Website - state: enabled focusable multi-line sensitive showing visible - toolkit: gtk - - layer: widget - alpha: 1 - - text: Website - character count: 7 - 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 - + + text: Website + character count: 7 + 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 + + + start index: 0 + end index: 7 + anchors: http://www.gtk.org + unnamed-GtkLabelAccessibleLinkImpl-4 + "link" + parent: website_label + state: enabled focusable focused multi-line sensitive showing visible + start index: 0 end index: 7 anchors: http://www.gtk.org - unnamed-GtkLabelAccessibleLinkImpl-3 - "link" - parent: website_label - state: enabled focusable focused multi-line sensitive showing visible - - - start index: 0 - end index: 7 - anchors: http://www.gtk.org copyright_label "label" parent: page_vbox @@ -400,7 +414,7 @@ See the GNU General Public License, version 3 or later for details. start index: 56 end index: 102 anchors: http://www.gnu.org/licenses/gpl-3.0.html - unnamed-GtkLabelAccessibleLinkImpl-4 + unnamed-GtkLabelAccessibleLinkImpl-5 "link" parent: license_label state: enabled focusable focused multi-line sensitive showing visible diff --git a/testsuite/a11y/actionbar.txt b/testsuite/a11y/actionbar.txt index 1530ae7d82..e72b2ca90d 100644 --- a/testsuite/a11y/actionbar.txt +++ b/testsuite/a11y/actionbar.txt @@ -18,7 +18,7 @@ window1 alpha: 1 button1 "push button" - parent: box + parent: unnamed-GtkContainerAccessible-0 index: 0 name: Start 1 state: enabled focusable sensitive showing visible @@ -34,7 +34,7 @@ window1 action 0 description: Clicks the button button2 "push button" - parent: box + parent: unnamed-GtkContainerAccessible-0 index: 1 name: Start 2 state: enabled focusable sensitive showing visible @@ -50,7 +50,7 @@ window1 action 0 description: Clicks the button button5 "push button" - parent: box + parent: unnamed-GtkContainerAccessible-0 index: 2 name: Center state: enabled focusable sensitive showing visible @@ -66,7 +66,7 @@ window1 action 0 description: Clicks the button button4 "push button" - parent: box + parent: unnamed-GtkContainerAccessible-0 index: 3 name: End 2 state: enabled focusable sensitive showing visible @@ -82,7 +82,7 @@ window1 action 0 description: Clicks the button button3 "push button" - parent: box + parent: unnamed-GtkContainerAccessible-0 index: 4 name: End 1 state: enabled focusable sensitive showing visible diff --git a/testsuite/a11y/assistant.txt b/testsuite/a11y/assistant.txt index 9b82566d29..9d64f17f2e 100644 --- a/testsuite/a11y/assistant.txt +++ b/testsuite/a11y/assistant.txt @@ -63,7 +63,7 @@ window1 parent: headerbar index: 0 name: Cancel - state: enabled focusable sensitive showing visible + state: enabled focusable sensitive visible toolkit: gtk layer: widget diff --git a/testsuite/a11y/combos.txt b/testsuite/a11y/combos.txt index bae1ac17da..635ed47318 100644 --- a/testsuite/a11y/combos.txt +++ b/testsuite/a11y/combos.txt @@ -11,7 +11,7 @@ window1 "filler" parent: window1 index: 0 - state: enabled horizontal sensitive + state: enabled horizontal sensitive showing visible toolkit: gtk layer: widget @@ -22,7 +22,7 @@ window1 index: 0 name: Combo: label-for: combo1 - state: enabled multi-line sensitive visible + state: enabled multi-line sensitive showing visible toolkit: gtk layer: widget @@ -62,7 +62,7 @@ window1 parent: box1 index: 1 labelled-by: label1 - state: enabled sensitive visible + state: enabled sensitive showing visible toolkit: gtk layer: widget @@ -72,11 +72,11 @@ window1 action 0 description: Presses the combobox action 0 keybinding: c - unnamed-GtkMenuAccessible-0 + popup_widget "menu" parent: combo1 index: 0 - state: enabled sensitive + state: enabled sensitive visible toolkit: gtk layer: popup @@ -86,7 +86,7 @@ window1 "combo box" parent: box1 index: 2 - state: enabled sensitive visible + state: enabled sensitive showing visible toolkit: gtk layer: widget @@ -95,11 +95,11 @@ window1 action 0 name: press action 0 description: Presses the combobox - unnamed-GtkMenuAccessible-1 + popup_widget "menu" parent: combo2 index: 0 - state: enabled sensitive + state: enabled sensitive visible toolkit: gtk layer: popup @@ -109,7 +109,7 @@ window1 "text" parent: combo2 index: 1 - state: editable enabled focusable sensitive single-line visible + state: editable enabled focusable sensitive showing single-line visible toolkit: gtk layer: widget @@ -150,7 +150,7 @@ window1 "combo box" parent: box1 index: 3 - state: enabled sensitive visible + state: enabled sensitive showing visible toolkit: gtk layer: widget @@ -159,11 +159,11 @@ window1 action 0 name: press action 0 description: Presses the combobox - unnamed-GtkMenuAccessible-2 + popup_widget "menu" parent: combo3 index: 0 - state: enabled sensitive + state: enabled sensitive visible toolkit: gtk layer: popup @@ -173,7 +173,7 @@ window1 "combo box" parent: box1 index: 4 - state: enabled sensitive visible + state: enabled sensitive showing visible toolkit: gtk layer: widget @@ -182,11 +182,11 @@ window1 action 0 name: press action 0 description: Presses the combobox - unnamed-GtkMenuAccessible-3 + popup_widget "menu" parent: combo4 index: 0 - state: enabled sensitive + state: enabled sensitive visible toolkit: gtk layer: popup @@ -196,7 +196,7 @@ window1 "text" parent: combo4 index: 1 - state: editable enabled focusable sensitive single-line visible + state: editable enabled focusable sensitive showing single-line visible toolkit: gtk layer: widget diff --git a/testsuite/a11y/entries.txt b/testsuite/a11y/entries.txt index a7bf15ad77..16f1047a57 100644 --- a/testsuite/a11y/entries.txt +++ b/testsuite/a11y/entries.txt @@ -11,7 +11,7 @@ window1 "filler" parent: window1 index: 0 - state: enabled horizontal sensitive + state: enabled horizontal sensitive showing visible toolkit: gtk layer: widget @@ -22,7 +22,7 @@ window1 index: 0 name: entry: label-for: entry1 - state: enabled multi-line sensitive visible + state: enabled multi-line sensitive showing visible toolkit: gtk layer: widget @@ -63,7 +63,7 @@ window1 index: 1 name: password entry: label-for: entry2 - state: enabled multi-line sensitive visible + state: enabled multi-line sensitive showing visible toolkit: gtk layer: widget @@ -104,7 +104,7 @@ window1 index: 2 name: spinbutton: label-for: spinbutton1 - state: enabled multi-line sensitive visible + state: enabled multi-line sensitive showing visible toolkit: gtk layer: widget @@ -144,7 +144,7 @@ window1 parent: box1 index: 3 labelled-by: label1 - state: editable enabled focusable sensitive single-line visible + state: editable enabled focusable sensitive showing single-line visible toolkit: gtk layer: widget @@ -152,7 +152,8 @@ window1 text: text character count: 4 - caret offset: 0 + caret offset: 4 + selection 0: (0, 4) text default attributes: bg-color: bg-full-height: 0 direction: @@ -187,7 +188,7 @@ window1 parent: box1 index: 4 labelled-by: label2 - state: editable enabled focusable sensitive single-line visible + state: editable enabled focusable sensitive showing single-line visible toolkit: gtk layer: widget @@ -229,7 +230,7 @@ window1 "text" parent: box1 index: 5 - state: editable enabled focusable sensitive single-line visible + state: editable enabled focusable sensitive showing single-line visible toolkit: gtk layer: widget @@ -270,7 +271,7 @@ window1 "icon" parent: entry3 name: edit-undo - state: enabled sensitive visible + state: enabled sensitive showing visible layer: widget alpha: 1 @@ -280,7 +281,7 @@ window1 "icon" parent: entry3 name: edit-redo - state: enabled sensitive visible + state: enabled sensitive showing visible layer: widget alpha: 1 @@ -291,7 +292,7 @@ window1 parent: box1 index: 6 labelled-by: label3 - state: editable enabled focusable horizontal sensitive single-line visible + state: editable enabled focusable horizontal sensitive showing single-line visible toolkit: gtk layer: widget diff --git a/testsuite/a11y/label.txt b/testsuite/a11y/label.txt index 8beda597d2..cf01c56f2f 100644 --- a/testsuite/a11y/label.txt +++ b/testsuite/a11y/label.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/mnemonic.txt b/testsuite/a11y/mnemonic.txt index 445698d4a7..0243d6d37b 100644 --- a/testsuite/a11y/mnemonic.txt +++ b/testsuite/a11y/mnemonic.txt @@ -11,7 +11,7 @@ window1 "filler" parent: window1 index: 0 - state: enabled horizontal sensitive + state: enabled horizontal sensitive showing visible toolkit: gtk layer: widget @@ -22,7 +22,7 @@ window1 index: 0 name: Entry: label-for: entry1 - state: enabled multi-line sensitive visible + state: enabled multi-line sensitive showing visible toolkit: gtk layer: widget @@ -62,7 +62,7 @@ window1 parent: box1 index: 1 labelled-by: label1 - state: editable enabled focusable sensitive single-line visible + state: editable enabled focusable sensitive showing single-line visible toolkit: gtk layer: widget @@ -70,7 +70,8 @@ window1 text: text character count: 4 - caret offset: 0 + caret offset: 4 + selection 0: (0, 4) text default attributes: bg-color: bg-full-height: 0 direction: diff --git a/testsuite/a11y/paned.txt b/testsuite/a11y/paned.txt index 5668d0a08a..3ff964d8a9 100644 --- a/testsuite/a11y/paned.txt +++ b/testsuite/a11y/paned.txt @@ -11,21 +11,21 @@ window1 "split pane" parent: window1 index: 0 - state: enabled focusable horizontal sensitive + state: enabled focusable horizontal sensitive showing visible toolkit: gtk layer: widget alpha: 1 minimum value: 0.000000 - maximum value: 2147483647.000000 - current value: 0.000000 + maximum value: 58.000000 + current value: 25.000000 label1 "label" parent: paned1 index: 0 name: Left - state: enabled multi-line sensitive visible + state: enabled multi-line sensitive showing visible toolkit: gtk layer: widget @@ -65,7 +65,7 @@ window1 parent: paned1 index: 1 name: Right - state: enabled multi-line sensitive visible + state: enabled multi-line sensitive showing visible toolkit: gtk layer: widget diff --git a/testsuite/a11y/pickers.txt b/testsuite/a11y/pickers.txt index d04beb2020..2f25f927d0 100644 --- a/testsuite/a11y/pickers.txt +++ b/testsuite/a11y/pickers.txt @@ -17,36 +17,23 @@ window1 layer: widget alpha: 1 button3 - "push button" + "unknown" parent: grid1 index: 0 - name: Sans Regular - state: enabled focusable sensitive showing visible + state: enabled sensitive 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 button2 - "push button" + "unknown" parent: grid1 index: 1 - state: enabled focusable sensitive showing visible + state: enabled sensitive 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 button1 "combo box" parent: grid1 @@ -60,11 +47,11 @@ window1 action 0 name: press action 0 description: Presses the combobox - unnamed-GtkMenuAccessible-0 + popup_widget "menu" parent: button1 index: 0 - state: enabled sensitive + state: enabled sensitive visible toolkit: gtk layer: popup