a11y tests: Update dialog-related output

There was a change in internal dialog structure that
is reflected in this output.

diff --git a/testsuite/a11y/about.txt b/testsuite/a11y/about.txt
index 43a1a873c1f266af4dcd89d6b7a44dcf4e884ca3..5dd586cc954379dca2bf49cf519027805bf8830e 100644 (file)
--- a/testsuite/a11y/about.txt
+++ b/testsuite/a11y/about.txt
@@ -8,7 +8,7 @@ window1
   <AtkComponent>
   layer: window
   alpha: 1
-  dialog-vbox1
+  ___object_1___
     "filler"
     parent: window1
     index: 0
@@ -17,317 +17,326 @@ window1
     <AtkComponent>
     layer: widget
     alpha: 1
-    box
+    ___object_1___
       "filler"
-      parent: dialog-vbox1
+      parent: ___object_1___
       index: 0
       state: enabled sensitive showing vertical visible
       toolkit: gtk
       <AtkComponent>
       layer: widget
       alpha: 1
-      logo_image
-        "icon"
-        parent: box
+      box
+        "filler"
+        parent: ___object_1___
         index: 0
-        state: enabled sensitive showing visible
-        toolkit: gtk
-        <AtkComponent>
-        layer: widget
-        alpha: 1
-        <AtkImage>
-        image size: 16 x 16
-        image description: (null)
-      name_label
-        "label"
-        parent: box
-        index: 1
-        name: FancyPants
-        state: enabled focusable multi-line sensitive showing visible
+        state: enabled sensitive showing vertical visible
         toolkit: gtk
         <AtkComponent>
         layer: widget
         alpha: 1
-        <AtkText>
-        text: FancyPants
-        character count: 10
-        caret offset: 10
-        selection 0: (0, 10) FancyPants
-        default attributes: bg-color: <omitted>
-                            bg-full-height: 0
-                            direction: <omitted>
-                            editable: false
-                            family-name: <omitted>
-                            fg-color: <omitted>
-                            indent: 0
-                            invisible: false
-                            justification: center
-                            language: <omitted>
-                            left-margin: 0
-                            pixels-above-lines: 0
-                            pixels-below-lines: 0
-                            pixels-inside-wrap: 0
-                            right-margin: 0
-                            rise: 0
-                            scale: 1
-                            size: <omitted>
-                            stretch: <omitted>
-                            strikethrough: false
-                            style: <omitted>
-                            underline: none
-                            variant: <omitted>
-                            weight: <omitted>
-                            wrap-mode: word
-        <AtkHypertext>
-      stack
-        "panel"
-        parent: box
-        index: 2
-        state: enabled sensitive showing visible
-        toolkit: gtk
-        <AtkComponent>
-        layer: widget
-        alpha: 1
-        page_vbox
-          "filler"
-          parent: stack
+        logo_image
+          "icon"
+          parent: box
           index: 0
-          state: enabled sensitive showing vertical visible
+          state: enabled sensitive showing visible
           toolkit: gtk
           <AtkComponent>
           layer: widget
           alpha: 1
-          version_label
-            "label"
-            parent: page_vbox
+          <AtkImage>
+          image size: 16 x 16
+          image description: (null)
+        name_label
+          "label"
+          parent: box
+          index: 1
+          name: FancyPants
+          state: enabled focusable multi-line sensitive showing visible
+          toolkit: gtk
+          <AtkComponent>
+          layer: widget
+          alpha: 1
+          <AtkText>
+          text: FancyPants
+          character count: 10
+          caret offset: 10
+          selection 0: (0, 10) FancyPants
+          default attributes: bg-color: <omitted>
+                              bg-full-height: 0
+                              direction: <omitted>
+                              editable: false
+                              family-name: <omitted>
+                              fg-color: <omitted>
+                              indent: 0
+                              invisible: false
+                              justification: center
+                              language: <omitted>
+                              left-margin: 0
+                              pixels-above-lines: 0
+                              pixels-below-lines: 0
+                              pixels-inside-wrap: 0
+                              right-margin: 0
+                              rise: 0
+                              scale: 1
+                              size: <omitted>
+                              stretch: <omitted>
+                              strikethrough: false
+                              style: <omitted>
+                              underline: none
+                              variant: <omitted>
+                              weight: <omitted>
+                              wrap-mode: word
+          <AtkHypertext>
+        stack
+          "panel"
+          parent: box
+          index: 2
+          state: enabled sensitive showing visible
+          toolkit: gtk
+          <AtkComponent>
+          layer: widget
+          alpha: 1
+          page_vbox
+            "filler"
+            parent: stack
             index: 0
-            name: 0.99
-            state: enabled focusable multi-line sensitive showing visible
-            toolkit: gtk
-            <AtkComponent>
-            layer: widget
-            alpha: 1
-            <AtkText>
-            text: 0.99
-            character count: 4
-            caret offset: 0
-            default attributes: bg-color: <omitted>
-                                bg-full-height: 0
-                                direction: <omitted>
-                                editable: false
-                                family-name: <omitted>
-                                fg-color: <omitted>
-                                indent: 0
-                                invisible: false
-                                justification: center
-                                language: <omitted>
-                                left-margin: 0
-                                pixels-above-lines: 0
-                                pixels-below-lines: 0
-                                pixels-inside-wrap: 0
-                                right-margin: 0
-                                rise: 0
-                                scale: 1
-                                size: <omitted>
-                                stretch: <omitted>
-                                strikethrough: false
-                                style: <omitted>
-                                underline: none
-                                variant: <omitted>
-                                weight: <omitted>
-                                wrap-mode: word
-            <AtkHypertext>
-          comments_label
-            "label"
-            parent: page_vbox
-            index: 1
-            name: comments
-            state: enabled focusable multi-line sensitive showing visible
-            toolkit: gtk
-            <AtkComponent>
-            layer: widget
-            alpha: 1
-            <AtkText>
-            text: comments
-            character count: 8
-            caret offset: 0
-            default attributes: bg-color: <omitted>
-                                bg-full-height: 0
-                                direction: <omitted>
-                                editable: false
-                                family-name: <omitted>
-                                fg-color: <omitted>
-                                indent: 0
-                                invisible: false
-                                justification: center
-                                language: <omitted>
-                                left-margin: 0
-                                pixels-above-lines: 0
-                                pixels-below-lines: 0
-                                pixels-inside-wrap: 0
-                                right-margin: 0
-                                rise: 0
-                                scale: 1
-                                size: <omitted>
-                                stretch: <omitted>
-                                strikethrough: false
-                                style: <omitted>
-                                underline: none
-                                variant: <omitted>
-                                weight: <omitted>
-                                wrap-mode: word
-            <AtkHypertext>
-          website_label
-            "label"
-            parent: page_vbox
-            index: 2
-            name: Website
-            state: enabled focusable multi-line sensitive showing visible
+            state: enabled sensitive showing vertical visible
             toolkit: gtk
             <AtkComponent>
             layer: widget
             alpha: 1
-            <AtkText>
-            text: Website
-            character count: 7
-            caret offset: 0
-            default attributes: bg-color: <omitted>
-                                bg-full-height: 0
-                                direction: <omitted>
-                                editable: false
-                                family-name: <omitted>
-                                fg-color: <omitted>
-                                indent: 0
-                                invisible: false
-                                justification: left
-                                language: <omitted>
-                                left-margin: 0
-                                pixels-above-lines: 0
-                                pixels-below-lines: 0
-                                pixels-inside-wrap: 0
-                                right-margin: 0
-                                rise: 0
-                                scale: 1
-                                size: <omitted>
-                                stretch: <omitted>
-                                strikethrough: false
-                                style: <omitted>
-                                underline: none
-                                variant: <omitted>
-                                weight: <omitted>
-                                wrap-mode: word
-            <AtkHypertext>
-              <AtkHyperlink>
-              start index: 0
-              end index: 7
-              anchors: http://www.gtk.org
-            unnamed-GtkLabelAccessibleLinkImpl-0
-              "link"
-              parent: website_label
-              state: enabled focusable focused multi-line sensitive showing visible
-              <AtkHyperlinkImpl>
+            version_label
+              "label"
+              parent: page_vbox
+              index: 0
+              name: 0.99
+              state: enabled focusable multi-line sensitive showing visible
+              toolkit: gtk
+              <AtkComponent>
+              layer: widget
+              alpha: 1
+              <AtkText>
+              text: 0.99
+              character count: 4
+              caret offset: 0
+              default attributes: bg-color: <omitted>
+                                  bg-full-height: 0
+                                  direction: <omitted>
+                                  editable: false
+                                  family-name: <omitted>
+                                  fg-color: <omitted>
+                                  indent: 0
+                                  invisible: false
+                                  justification: center
+                                  language: <omitted>
+                                  left-margin: 0
+                                  pixels-above-lines: 0
+                                  pixels-below-lines: 0
+                                  pixels-inside-wrap: 0
+                                  right-margin: 0
+                                  rise: 0
+                                  scale: 1
+                                  size: <omitted>
+                                  stretch: <omitted>
+                                  strikethrough: false
+                                  style: <omitted>
+                                  underline: none
+                                  variant: <omitted>
+                                  weight: <omitted>
+                                  wrap-mode: word
+              <AtkHypertext>
+            comments_label
+              "label"
+              parent: page_vbox
+              index: 1
+              name: comments
+              state: enabled focusable multi-line sensitive showing visible
+              toolkit: gtk
+              <AtkComponent>
+              layer: widget
+              alpha: 1
+              <AtkText>
+              text: comments
+              character count: 8
+              caret offset: 0
+              default attributes: bg-color: <omitted>
+                                  bg-full-height: 0
+                                  direction: <omitted>
+                                  editable: false
+                                  family-name: <omitted>
+                                  fg-color: <omitted>
+                                  indent: 0
+                                  invisible: false
+                                  justification: center
+                                  language: <omitted>
+                                  left-margin: 0
+                                  pixels-above-lines: 0
+                                  pixels-below-lines: 0
+                                  pixels-inside-wrap: 0
+                                  right-margin: 0
+                                  rise: 0
+                                  scale: 1
+                                  size: <omitted>
+                                  stretch: <omitted>
+                                  strikethrough: false
+                                  style: <omitted>
+                                  underline: none
+                                  variant: <omitted>
+                                  weight: <omitted>
+                                  wrap-mode: word
+              <AtkHypertext>
+            website_label
+              "label"
+              parent: page_vbox
+              index: 2
+              name: Website
+              state: enabled focusable multi-line sensitive showing visible
+              toolkit: gtk
+              <AtkComponent>
+              layer: widget
+              alpha: 1
+              <AtkText>
+              text: Website
+              character count: 7
+              caret offset: 0
+              default attributes: bg-color: <omitted>
+                                  bg-full-height: 0
+                                  direction: <omitted>
+                                  editable: false
+                                  family-name: <omitted>
+                                  fg-color: <omitted>
+                                  indent: 0
+                                  invisible: false
+                                  justification: left
+                                  language: <omitted>
+                                  left-margin: 0
+                                  pixels-above-lines: 0
+                                  pixels-below-lines: 0
+                                  pixels-inside-wrap: 0
+                                  right-margin: 0
+                                  rise: 0
+                                  scale: 1
+                                  size: <omitted>
+                                  stretch: <omitted>
+                                  strikethrough: false
+                                  style: <omitted>
+                                  underline: none
+                                  variant: <omitted>
+                                  weight: <omitted>
+                                  wrap-mode: word
+              <AtkHypertext>
                 <AtkHyperlink>
                 start index: 0
                 end index: 7
                 anchors: http://www.gtk.org
-          copyright_label
-            "label"
-            parent: page_vbox
-            index: 3
-            name: no comments
-            state: enabled focusable multi-line sensitive showing visible
-            toolkit: gtk
-            <AtkComponent>
-            layer: widget
-            alpha: 1
-            <AtkText>
-            text: no comments
-            character count: 11
-            caret offset: 0
-            default attributes: bg-color: <omitted>
-                                bg-full-height: 0
-                                direction: <omitted>
-                                editable: false
-                                family-name: <omitted>
-                                fg-color: <omitted>
-                                indent: 0
-                                invisible: false
-                                justification: center
-                                language: <omitted>
-                                left-margin: 0
-                                pixels-above-lines: 0
-                                pixels-below-lines: 0
-                                pixels-inside-wrap: 0
-                                right-margin: 0
-                                rise: 0
-                                scale: 1
-                                size: <omitted>
-                                stretch: <omitted>
-                                strikethrough: false
-                                style: <omitted>
-                                underline: none
-                                variant: <omitted>
-                                weight: <omitted>
-                                wrap-mode: word
-            <AtkHypertext>
-          license_label
-            "label"
-            parent: page_vbox
-            index: 4
-            name: This program comes with absolutely no warranty.
+              unnamed-GtkLabelAccessibleLinkImpl-0
+                "link"
+                parent: website_label
+                state: enabled focusable focused multi-line sensitive showing visible
+                <AtkHyperlinkImpl>
+                  <AtkHyperlink>
+                  start index: 0
+                  end index: 7
+                  anchors: http://www.gtk.org
+            copyright_label
+              "label"
+              parent: page_vbox
+              index: 3
+              name: no comments
+              state: enabled focusable multi-line sensitive showing visible
+              toolkit: gtk
+              <AtkComponent>
+              layer: widget
+              alpha: 1
+              <AtkText>
+              text: no comments
+              character count: 11
+              caret offset: 0
+              default attributes: bg-color: <omitted>
+                                  bg-full-height: 0
+                                  direction: <omitted>
+                                  editable: false
+                                  family-name: <omitted>
+                                  fg-color: <omitted>
+                                  indent: 0
+                                  invisible: false
+                                  justification: center
+                                  language: <omitted>
+                                  left-margin: 0
+                                  pixels-above-lines: 0
+                                  pixels-below-lines: 0
+                                  pixels-inside-wrap: 0
+                                  right-margin: 0
+                                  rise: 0
+                                  scale: 1
+                                  size: <omitted>
+                                  stretch: <omitted>
+                                  strikethrough: false
+                                  style: <omitted>
+                                  underline: none
+                                  variant: <omitted>
+                                  weight: <omitted>
+                                  wrap-mode: word
+              <AtkHypertext>
+            license_label
+              "label"
+              parent: page_vbox
+              index: 4
+              name: This program comes with absolutely no warranty.
 See the GNU General Public License, version 3 or later for details.
-            state: enabled focusable multi-line sensitive showing visible
-            toolkit: gtk
-            <AtkComponent>
-            layer: widget
-            alpha: 1
-            <AtkText>
-            text: This program comes with absolutely no warranty.
+              state: enabled focusable multi-line sensitive showing visible
+              toolkit: gtk
+              <AtkComponent>
+              layer: widget
+              alpha: 1
+              <AtkText>
+              text: This program comes with absolutely no warranty.
 See the GNU General Public License, version 3 or later for details.
-            character count: 115
-            caret offset: 56
-            default attributes: bg-color: <omitted>
-                                bg-full-height: 0
-                                direction: <omitted>
-                                editable: false
-                                family-name: <omitted>
-                                fg-color: <omitted>
-                                indent: 0
-                                invisible: false
-                                justification: center
-                                language: <omitted>
-                                left-margin: 0
-                                pixels-above-lines: 0
-                                pixels-below-lines: 0
-                                pixels-inside-wrap: 0
-                                right-margin: 0
-                                rise: 0
-                                scale: 1
-                                size: <omitted>
-                                stretch: <omitted>
-                                strikethrough: false
-                                style: <omitted>
-                                underline: none
-                                variant: <omitted>
-                                weight: <omitted>
-                                wrap-mode: word
-            <AtkHypertext>
-              <AtkHyperlink>
-              start index: 56
-              end index: 102
-              anchors: https://www.gnu.org/licenses/gpl-3.0.html
-            unnamed-GtkLabelAccessibleLinkImpl-1
-              "link"
-              parent: license_label
-              state: enabled focusable focused multi-line sensitive showing visible
-              <AtkHyperlinkImpl>
+              character count: 115
+              caret offset: 56
+              default attributes: bg-color: <omitted>
+                                  bg-full-height: 0
+                                  direction: <omitted>
+                                  editable: false
+                                  family-name: <omitted>
+                                  fg-color: <omitted>
+                                  indent: 0
+                                  invisible: false
+                                  justification: center
+                                  language: <omitted>
+                                  left-margin: 0
+                                  pixels-above-lines: 0
+                                  pixels-below-lines: 0
+                                  pixels-inside-wrap: 0
+                                  right-margin: 0
+                                  rise: 0
+                                  scale: 1
+                                  size: <omitted>
+                                  stretch: <omitted>
+                                  strikethrough: false
+                                  style: <omitted>
+                                  underline: none
+                                  variant: <omitted>
+                                  weight: <omitted>
+                                  wrap-mode: word
+              <AtkHypertext>
                 <AtkHyperlink>
                 start index: 56
                 end index: 102
                 anchors: https://www.gnu.org/licenses/gpl-3.0.html
+              unnamed-GtkLabelAccessibleLinkImpl-1
+                "link"
+                parent: license_label
+                state: enabled focusable focused multi-line sensitive showing visible
+                <AtkHyperlinkImpl>
+                  <AtkHyperlink>
+                  start index: 56
+                  end index: 102
+                  anchors: https://www.gnu.org/licenses/gpl-3.0.html
     action_box
       "filler"
-      parent: dialog-vbox1
+      parent: ___object_1___
       index: 1
       state: enabled horizontal sensitive
       toolkit: gtk

diff --git a/testsuite/a11y/colorchooser.txt b/testsuite/a11y/colorchooser.txt
index de2dd67a2935245c8545ec231b5661d7299cc2b5..d1dc6adce65eb161fbebb317e6891924a251d3e4 100644 (file)
--- a/testsuite/a11y/colorchooser.txt
+++ b/testsuite/a11y/colorchooser.txt
@@ -8,7 +8,7 @@ window1
   <AtkComponent>
   layer: window
   alpha: 1
-  dialog-vbox1
+  ___object_1___
     "filler"
     parent: window1
     index: 0
@@ -17,940 +17,811 @@ window1
     <AtkComponent>
     layer: widget
     alpha: 1
-    chooser
+    dialog-vbox1
       "filler"
-      parent: dialog-vbox1
+      parent: ___object_1___
       index: 0
       state: enabled sensitive showing vertical visible
       toolkit: gtk
       <AtkComponent>
       layer: widget
       alpha: 1
-      unnamed-GtkContainerAccessible-0
+      chooser
         "filler"
-        parent: chooser
+        parent: dialog-vbox1
         index: 0
         state: enabled sensitive showing vertical visible
         toolkit: gtk
         <AtkComponent>
         layer: widget
         alpha: 1
-        unnamed-GtkContainerAccessible-1
-          "panel"
-          parent: unnamed-GtkContainerAccessible-0
+        unnamed-GtkContainerAccessible-0
+          "filler"
+          parent: chooser
           index: 0
-          state: enabled horizontal sensitive showing visible
+          state: enabled sensitive showing vertical visible
           toolkit: gtk
           <AtkComponent>
           layer: widget
           alpha: 1
-          unnamed-GtkColorSwatchAccessible-2
-            "radio button"
-            parent: unnamed-GtkContainerAccessible-1
-            index: 0
-            name: Light Scarlet Red
-            state: enabled focusable sensitive showing visible
-            toolkit: gtk
-            <AtkComponent>
-            layer: widget
-            alpha: 1
-            <AtkAction>
-            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
-          unnamed-GtkColorSwatchAccessible-3
-            "radio button"
-            parent: unnamed-GtkContainerAccessible-1
-            index: 1
-            name: Scarlet Red
-            state: enabled focusable sensitive showing visible
-            toolkit: gtk
-            <AtkComponent>
-            layer: widget
-            alpha: 1
-            <AtkAction>
-            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
-          unnamed-GtkColorSwatchAccessible-4
-            "radio button"
-            parent: unnamed-GtkContainerAccessible-1
-            index: 2
-            name: Dark Scarlet Red
-            state: enabled focusable sensitive showing visible
-            toolkit: gtk
-            <AtkComponent>
-            layer: widget
-            alpha: 1
-            <AtkAction>
-            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
-          unnamed-GtkColorSwatchAccessible-5
-            "radio button"
-            parent: unnamed-GtkContainerAccessible-1
-            index: 3
-            name: Light Orange
-            state: enabled focusable sensitive showing visible
-            toolkit: gtk
-            <AtkComponent>
-            layer: widget
-            alpha: 1
-            <AtkAction>
-            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
-          unnamed-GtkColorSwatchAccessible-6
-            "radio button"
-            parent: unnamed-GtkContainerAccessible-1
-            index: 4
-            name: Orange
-            state: enabled focusable sensitive showing visible
-            toolkit: gtk
-            <AtkComponent>
-            layer: widget
-            alpha: 1
-            <AtkAction>
-            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
-          unnamed-GtkColorSwatchAccessible-7
-            "radio button"
-            parent: unnamed-GtkContainerAccessible-1
-            index: 5
-            name: Dark Orange
-            state: enabled focusable sensitive showing visible
-            toolkit: gtk
-            <AtkComponent>
-            layer: widget
-            alpha: 1
-            <AtkAction>
-            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
-          unnamed-GtkColorSwatchAccessible-8
-            "radio button"
-            parent: unnamed-GtkContainerAccessible-1
-            index: 6
-            name: Light Butter
-            state: enabled focusable sensitive showing visible
-            toolkit: gtk
-            <AtkComponent>
-            layer: widget
-            alpha: 1
-            <AtkAction>
-            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
-          unnamed-GtkColorSwatchAccessible-9
-            "radio button"
-            parent: unnamed-GtkContainerAccessible-1
-            index: 7
-            name: Butter
-            state: enabled focusable sensitive showing visible
-            toolkit: gtk
-            <AtkComponent>
-            layer: widget
-            alpha: 1
-            <AtkAction>
-            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
-          unnamed-GtkColorSwatchAccessible-10
-            "radio button"
-            parent: unnamed-GtkContainerAccessible-1
-            index: 8
-            name: Dark Butter
-            state: enabled focusable sensitive showing visible
-            toolkit: gtk
-            <AtkComponent>
-            layer: widget
-            alpha: 1
-            <AtkAction>
-            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
-          unnamed-GtkColorSwatchAccessible-11
-            "radio button"
-            parent: unnamed-GtkContainerAccessible-1
-            index: 9
-            name: Light Chameleon
-            state: enabled focusable sensitive showing visible
-            toolkit: gtk
-            <AtkComponent>
-            layer: widget
-            alpha: 1
-            <AtkAction>
-            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
-          unnamed-GtkColorSwatchAccessible-12
-            "radio button"
-            parent: unnamed-GtkContainerAccessible-1
-            index: 10
-            name: Chameleon
-            state: enabled focusable sensitive showing visible
-            toolkit: gtk
-            <AtkComponent>
-            layer: widget
-            alpha: 1
-            <AtkAction>
-            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
-          unnamed-GtkColorSwatchAccessible-13
-            "radio button"
-            parent: unnamed-GtkContainerAccessible-1
-            index: 11
-            name: Dark Chameleon
-            state: enabled focusable sensitive showing visible
-            toolkit: gtk
-            <AtkComponent>
-            layer: widget
-            alpha: 1
-            <AtkAction>
-            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
-          unnamed-GtkColorSwatchAccessible-14
-            "radio button"
-            parent: unnamed-GtkContainerAccessible-1
-            index: 12
-            name: Light Sky Blue
-            state: enabled focusable sensitive showing visible
-            toolkit: gtk
-            <AtkComponent>
-            layer: widget
-            alpha: 1
-            <AtkAction>
-            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
-          unnamed-GtkColorSwatchAccessible-15
-            "radio button"
-            parent: unnamed-GtkContainerAccessible-1
-            index: 13
-            name: Sky Blue
-            state: enabled focusable sensitive showing visible
-            toolkit: gtk
-            <AtkComponent>
-            layer: widget
-            alpha: 1
-            <AtkAction>
-            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
-          unnamed-GtkColorSwatchAccessible-16
-            "radio button"
-            parent: unnamed-GtkContainerAccessible-1
-            index: 14
-            name: Dark Sky Blue
-            state: enabled focusable sensitive showing visible
-            toolkit: gtk
-            <AtkComponent>
-            layer: widget
-            alpha: 1
-            <AtkAction>
-            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
-          unnamed-GtkColorSwatchAccessible-17
-            "radio button"
-            parent: unnamed-GtkContainerAccessible-1
-            index: 15
-            name: Light Plum
-            state: enabled focusable sensitive showing visible
-            toolkit: gtk
-            <AtkComponent>
-            layer: widget
-            alpha: 1
-            <AtkAction>
-            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
-          unnamed-GtkColorSwatchAccessible-18
-            "radio button"
-            parent: unnamed-GtkContainerAccessible-1
-            index: 16
-            name: Plum
-            state: enabled focusable sensitive showing visible
-            toolkit: gtk
-            <AtkComponent>
-            layer: widget
-            alpha: 1
-            <AtkAction>
-            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
-          unnamed-GtkColorSwatchAccessible-19
-            "radio button"
-            parent: unnamed-GtkContainerAccessible-1
-            index: 17
-            name: Dark Plum
-            state: enabled focusable sensitive showing visible
-            toolkit: gtk
-            <AtkComponent>
-            layer: widget
-            alpha: 1
-            <AtkAction>
-            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
-          unnamed-GtkColorSwatchAccessible-20
-            "radio button"
-            parent: unnamed-GtkContainerAccessible-1
-            index: 18
-            name: Light Chocolate
-            state: enabled focusable sensitive showing visible
-            toolkit: gtk
-            <AtkComponent>
-            layer: widget
-            alpha: 1
-            <AtkAction>
-            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
-          unnamed-GtkColorSwatchAccessible-21
-            "radio button"
-            parent: unnamed-GtkContainerAccessible-1
-            index: 19
-            name: Chocolate
-            state: enabled focusable sensitive showing visible
-            toolkit: gtk
-            <AtkComponent>
-            layer: widget
-            alpha: 1
-            <AtkAction>
-            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
-          unnamed-GtkColorSwatchAccessible-22
-            "radio button"
-            parent: unnamed-GtkContainerAccessible-1
-            index: 20
-            name: Dark Chocolate
-            state: enabled focusable sensitive showing visible
-            toolkit: gtk
-            <AtkComponent>
-            layer: widget
-            alpha: 1
-            <AtkAction>
-            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
-          unnamed-GtkColorSwatchAccessible-23
-            "radio button"
-            parent: unnamed-GtkContainerAccessible-1
-            index: 21
-            name: Light Aluminum 1
-            state: enabled focusable sensitive showing visible
-            toolkit: gtk
-            <AtkComponent>
-            layer: widget
-            alpha: 1
-            <AtkAction>
-            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
-          unnamed-GtkColorSwatchAccessible-24
-            "radio button"
-            parent: unnamed-GtkContainerAccessible-1
-            index: 22
-            name: Aluminum 1
-            state: enabled focusable sensitive showing visible
-            toolkit: gtk
-            <AtkComponent>
-            layer: widget
-            alpha: 1
-            <AtkAction>
-            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
-          unnamed-GtkColorSwatchAccessible-25
-            "radio button"
-            parent: unnamed-GtkContainerAccessible-1
-            index: 23
-            name: Dark Aluminum 1
-            state: enabled focusable sensitive showing visible
-            toolkit: gtk
-            <AtkComponent>
-            layer: widget
-            alpha: 1
-            <AtkAction>
-            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
-          unnamed-GtkColorSwatchAccessible-26
-            "radio button"
-            parent: unnamed-GtkContainerAccessible-1
-            index: 24
-            name: Light Aluminum 2
-            state: enabled focusable sensitive showing visible
-            toolkit: gtk
-            <AtkComponent>
-            layer: widget
-            alpha: 1
-            <AtkAction>
-            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
-          unnamed-GtkColorSwatchAccessible-27
-            "radio button"
-            parent: unnamed-GtkContainerAccessible-1
-            index: 25
-            name: Aluminum 2
-            state: enabled focusable sensitive showing visible
-            toolkit: gtk
-            <AtkComponent>
-            layer: widget
-            alpha: 1
-            <AtkAction>
-            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
-          unnamed-GtkColorSwatchAccessible-28
-            "radio button"
-            parent: unnamed-GtkContainerAccessible-1
-            index: 26
-            name: Dark Aluminum 2
-            state: enabled focusable sensitive showing visible
-            toolkit: gtk
-            <AtkComponent>
-            layer: widget
-            alpha: 1
-            <AtkAction>
-            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
-        unnamed-GtkContainerAccessible-29
-          "panel"
-          parent: unnamed-GtkContainerAccessible-0
-          index: 1
-          state: enabled horizontal sensitive showing visible
-          toolkit: gtk
-          <AtkComponent>
-          layer: widget
-          alpha: 1
-          unnamed-GtkColorSwatchAccessible-30
-            "radio button"
-            parent: unnamed-GtkContainerAccessible-29
+          unnamed-GtkContainerAccessible-1
+            "panel"
+            parent: unnamed-GtkContainerAccessible-0
             index: 0
-            name: Black
-            state: enabled focusable sensitive showing visible
+            state: enabled horizontal sensitive showing visible
             toolkit: gtk
             <AtkComponent>
             layer: widget
             alpha: 1
-            <AtkAction>
-            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
-          unnamed-GtkColorSwatchAccessible-31
-            "radio button"
-            parent: unnamed-GtkContainerAccessible-29
+            unnamed-GtkColorSwatchAccessible-2
+              "radio button"
+              parent: unnamed-GtkContainerAccessible-1
+              index: 0
+              name: Light Scarlet Red
+              state: enabled focusable sensitive showing visible
+              toolkit: gtk
+              <AtkComponent>
+              layer: widget
+              alpha: 1
+              <AtkAction>
+              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
+            unnamed-GtkColorSwatchAccessible-3
+              "radio button"
+              parent: unnamed-GtkContainerAccessible-1
+              index: 1
+              name: Scarlet Red
+              state: enabled focusable sensitive showing visible
+              toolkit: gtk
+              <AtkComponent>
+              layer: widget
+              alpha: 1
+              <AtkAction>
+              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
+            unnamed-GtkColorSwatchAccessible-4
+              "radio button"
+              parent: unnamed-GtkContainerAccessible-1
+              index: 2
+              name: Dark Scarlet Red
+              state: enabled focusable sensitive showing visible
+              toolkit: gtk
+              <AtkComponent>
+              layer: widget
+              alpha: 1
+              <AtkAction>
+              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
+            unnamed-GtkColorSwatchAccessible-5
+              "radio button"
+              parent: unnamed-GtkContainerAccessible-1
+              index: 3
+              name: Light Orange
+              state: enabled focusable sensitive showing visible
+              toolkit: gtk
+              <AtkComponent>
+              layer: widget
+              alpha: 1
+              <AtkAction>
+              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
+            unnamed-GtkColorSwatchAccessible-6
+              "radio button"
+              parent: unnamed-GtkContainerAccessible-1
+              index: 4
+              name: Orange
+              state: enabled focusable sensitive showing visible
+              toolkit: gtk
+              <AtkComponent>
+              layer: widget
+              alpha: 1
+              <AtkAction>
+              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
+            unnamed-GtkColorSwatchAccessible-7
+              "radio button"
+              parent: unnamed-GtkContainerAccessible-1
+              index: 5
+              name: Dark Orange
+              state: enabled focusable sensitive showing visible
+              toolkit: gtk
+              <AtkComponent>
+              layer: widget
+              alpha: 1
+              <AtkAction>
+              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
+            unnamed-GtkColorSwatchAccessible-8
+              "radio button"
+              parent: unnamed-GtkContainerAccessible-1
+              index: 6
+              name: Light Butter
+              state: enabled focusable sensitive showing visible
+              toolkit: gtk
+              <AtkComponent>
+              layer: widget
+              alpha: 1
+              <AtkAction>
+              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
+            unnamed-GtkColorSwatchAccessible-9
+              "radio button"
+              parent: unnamed-GtkContainerAccessible-1
+              index: 7
+              name: Butter
+              state: enabled focusable sensitive showing visible
+              toolkit: gtk
+              <AtkComponent>
+              layer: widget
+              alpha: 1
+              <AtkAction>
+              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
+            unnamed-GtkColorSwatchAccessible-10
+              "radio button"
+              parent: unnamed-GtkContainerAccessible-1
+              index: 8
+              name: Dark Butter
+              state: enabled focusable sensitive showing visible
+              toolkit: gtk
+              <AtkComponent>
+              layer: widget
+              alpha: 1
+              <AtkAction>
+              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
+            unnamed-GtkColorSwatchAccessible-11
+              "radio button"
+              parent: unnamed-GtkContainerAccessible-1
+              index: 9
+              name: Light Chameleon
+              state: enabled focusable sensitive showing visible
+              toolkit: gtk
+              <AtkComponent>
+              layer: widget
+              alpha: 1
+              <AtkAction>
+              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
+            unnamed-GtkColorSwatchAccessible-12
+              "radio button"
+              parent: unnamed-GtkContainerAccessible-1
+              index: 10
+              name: Chameleon
+              state: enabled focusable sensitive showing visible
+              toolkit: gtk
+              <AtkComponent>
+              layer: widget
+              alpha: 1
+              <AtkAction>
+              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
+            unnamed-GtkColorSwatchAccessible-13
+              "radio button"
+              parent: unnamed-GtkContainerAccessible-1
+              index: 11
+              name: Dark Chameleon
+              state: enabled focusable sensitive showing visible
+              toolkit: gtk
+              <AtkComponent>
+              layer: widget
+              alpha: 1
+              <AtkAction>
+              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
+            unnamed-GtkColorSwatchAccessible-14
+              "radio button"
+              parent: unnamed-GtkContainerAccessible-1
+              index: 12
+              name: Light Sky Blue
+              state: enabled focusable sensitive showing visible
+              toolkit: gtk
+              <AtkComponent>
+              layer: widget
+              alpha: 1
+              <AtkAction>
+              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
+            unnamed-GtkColorSwatchAccessible-15
+              "radio button"
+              parent: unnamed-GtkContainerAccessible-1
+              index: 13
+              name: Sky Blue
+              state: enabled focusable sensitive showing visible
+              toolkit: gtk
+              <AtkComponent>
+              layer: widget
+              alpha: 1
+              <AtkAction>
+              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
+            unnamed-GtkColorSwatchAccessible-16
+              "radio button"
+              parent: unnamed-GtkContainerAccessible-1
+              index: 14
+              name: Dark Sky Blue
+              state: enabled focusable sensitive showing visible
+              toolkit: gtk
+              <AtkComponent>
+              layer: widget
+              alpha: 1
+              <AtkAction>
+              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
+            unnamed-GtkColorSwatchAccessible-17
+              "radio button"
+              parent: unnamed-GtkContainerAccessible-1
+              index: 15
+              name: Light Plum
+              state: enabled focusable sensitive showing visible
+              toolkit: gtk
+              <AtkComponent>
+              layer: widget
+              alpha: 1
+              <AtkAction>
+              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
+            unnamed-GtkColorSwatchAccessible-18
+              "radio button"
+              parent: unnamed-GtkContainerAccessible-1
+              index: 16
+              name: Plum
+              state: enabled focusable sensitive showing visible
+              toolkit: gtk
+              <AtkComponent>
+              layer: widget
+              alpha: 1
+              <AtkAction>
+              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
+            unnamed-GtkColorSwatchAccessible-19
+              "radio button"
+              parent: unnamed-GtkContainerAccessible-1
+              index: 17
+              name: Dark Plum
+              state: enabled focusable sensitive showing visible
+              toolkit: gtk
+              <AtkComponent>
+              layer: widget
+              alpha: 1
+              <AtkAction>
+              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
+            unnamed-GtkColorSwatchAccessible-20
+              "radio button"
+              parent: unnamed-GtkContainerAccessible-1
+              index: 18
+              name: Light Chocolate
+              state: enabled focusable sensitive showing visible
+              toolkit: gtk
+              <AtkComponent>
+              layer: widget
+              alpha: 1
+              <AtkAction>
+              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
+            unnamed-GtkColorSwatchAccessible-21
+              "radio button"
+              parent: unnamed-GtkContainerAccessible-1
+              index: 19
+              name: Chocolate
+              state: enabled focusable sensitive showing visible
+              toolkit: gtk
+              <AtkComponent>
+              layer: widget
+              alpha: 1
+              <AtkAction>
+              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
+            unnamed-GtkColorSwatchAccessible-22
+              "radio button"
+              parent: unnamed-GtkContainerAccessible-1
+              index: 20
+              name: Dark Chocolate
+              state: enabled focusable sensitive showing visible
+              toolkit: gtk
+              <AtkComponent>
+              layer: widget
+              alpha: 1
+              <AtkAction>
+              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
+            unnamed-GtkColorSwatchAccessible-23
+              "radio button"
+              parent: unnamed-GtkContainerAccessible-1
+              index: 21
+              name: Light Aluminum 1
+              state: enabled focusable sensitive showing visible
+              toolkit: gtk
+              <AtkComponent>
+              layer: widget
+              alpha: 1
+              <AtkAction>
+              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
+            unnamed-GtkColorSwatchAccessible-24
+              "radio button"
+              parent: unnamed-GtkContainerAccessible-1
+              index: 22
+              name: Aluminum 1
+              state: enabled focusable sensitive showing visible
+              toolkit: gtk
+              <AtkComponent>
+              layer: widget
+              alpha: 1
+              <AtkAction>
+              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
+            unnamed-GtkColorSwatchAccessible-25
+              "radio button"
+              parent: unnamed-GtkContainerAccessible-1
+              index: 23
+              name: Dark Aluminum 1
+              state: enabled focusable sensitive showing visible
+              toolkit: gtk
+              <AtkComponent>
+              layer: widget
+              alpha: 1
+              <AtkAction>
+              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
+            unnamed-GtkColorSwatchAccessible-26
+              "radio button"
+              parent: unnamed-GtkContainerAccessible-1
+              index: 24
+              name: Light Aluminum 2
+              state: enabled focusable sensitive showing visible
+              toolkit: gtk
+              <AtkComponent>
+              layer: widget
+              alpha: 1
+              <AtkAction>
+              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
+            unnamed-GtkColorSwatchAccessible-27
+              "radio button"
+              parent: unnamed-GtkContainerAccessible-1
+              index: 25
+              name: Aluminum 2
+              state: enabled focusable sensitive showing visible
+              toolkit: gtk
+              <AtkComponent>
+              layer: widget
+              alpha: 1
+              <AtkAction>
+              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
+            unnamed-GtkColorSwatchAccessible-28
+              "radio button"
+              parent: unnamed-GtkContainerAccessible-1
+              index: 26
+              name: Dark Aluminum 2
+              state: enabled focusable sensitive showing visible
+              toolkit: gtk
+              <AtkComponent>
+              layer: widget
+              alpha: 1
+              <AtkAction>
+              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
+          unnamed-GtkContainerAccessible-29
+            "panel"
+            parent: unnamed-GtkContainerAccessible-0
             index: 1
-            name: Very Dark Gray
-            state: enabled focusable sensitive showing visible
+            state: enabled horizontal sensitive showing visible
             toolkit: gtk
             <AtkComponent>
             layer: widget
             alpha: 1
-            <AtkAction>
-            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
-          unnamed-GtkColorSwatchAccessible-32
-            "radio button"
-            parent: unnamed-GtkContainerAccessible-29
+            unnamed-GtkColorSwatchAccessible-30
+              "radio button"
+              parent: unnamed-GtkContainerAccessible-29
+              index: 0
+              name: Black
+              state: enabled focusable sensitive showing visible
+              toolkit: gtk
+              <AtkComponent>
+              layer: widget
+              alpha: 1
+              <AtkAction>
+              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
+            unnamed-GtkColorSwatchAccessible-31
+              "radio button"
+              parent: unnamed-GtkContainerAccessible-29
+              index: 1
+              name: Very Dark Gray
+              state: enabled focusable sensitive showing visible
+              toolkit: gtk
+              <AtkComponent>
+              layer: widget
+              alpha: 1
+              <AtkAction>
+              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
+            unnamed-GtkColorSwatchAccessible-32
+              "radio button"
+              parent: unnamed-GtkContainerAccessible-29
+              index: 2
+              name: Darker Gray
+              state: enabled focusable sensitive showing visible
+              toolkit: gtk
+              <AtkComponent>
+              layer: widget
+              alpha: 1
+              <AtkAction>
+              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
+            unnamed-GtkColorSwatchAccessible-33
+              "radio button"
+              parent: unnamed-GtkContainerAccessible-29
+              index: 3
+              name: Dark Gray
+              state: enabled focusable sensitive showing visible
+              toolkit: gtk
+              <AtkComponent>
+              layer: widget
+              alpha: 1
+              <AtkAction>
+              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
+            unnamed-GtkColorSwatchAccessible-34
+              "radio button"
+              parent: unnamed-GtkContainerAccessible-29
+              index: 4
+              name: Medium Gray
+              state: enabled focusable sensitive showing visible
+              toolkit: gtk
+              <AtkComponent>
+              layer: widget
+              alpha: 1
+              <AtkAction>
+              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
+            unnamed-GtkColorSwatchAccessible-35
+              "radio button"
+              parent: unnamed-GtkContainerAccessible-29
+              index: 5
+              name: Light Gray
+              state: enabled focusable sensitive showing visible
+              toolkit: gtk
+              <AtkComponent>
+              layer: widget
+              alpha: 1
+              <AtkAction>
+              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
+            unnamed-GtkColorSwatchAccessible-36
+              "radio button"
+              parent: unnamed-GtkContainerAccessible-29
+              index: 6
+              name: Lighter Gray
+              state: enabled focusable sensitive showing visible
+              toolkit: gtk
+              <AtkComponent>
+              layer: widget
+              alpha: 1
+              <AtkAction>
+              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
+            unnamed-GtkColorSwatchAccessible-37
+              "radio button"
+              parent: unnamed-GtkContainerAccessible-29
+              index: 7
+              name: Very Light Gray
+              state: enabled focusable sensitive showing visible
+              toolkit: gtk
+              <AtkComponent>
+              layer: widget
+              alpha: 1
+              <AtkAction>
+              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
+            unnamed-GtkColorSwatchAccessible-38
+              "radio button"
+              parent: unnamed-GtkContainerAccessible-29
+              index: 8
+              name: White
+              state: checked enabled focusable sensitive showing visible
+              toolkit: gtk
+              <AtkComponent>
+              layer: widget
+              alpha: 1
+              <AtkAction>
+              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
+          Custom
+            "label"
+            parent: unnamed-GtkContainerAccessible-0
             index: 2
-            name: Darker Gray
-            state: enabled focusable sensitive showing visible
+            name: Custom
+            state: enabled multi-line sensitive showing visible
             toolkit: gtk
             <AtkComponent>
             layer: widget
             alpha: 1
-            <AtkAction>
-            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
-          unnamed-GtkColorSwatchAccessible-33
-            "radio button"
-            parent: unnamed-GtkContainerAccessible-29
+            <AtkText>
+            text: Custom
+            character count: 6
+            caret offset: 0
+            default attributes: bg-color: <omitted>
+                                bg-full-height: 0
+                                direction: <omitted>
+                                editable: false
+                                family-name: <omitted>
+                                fg-color: <omitted>
+                                indent: 0
+                                invisible: false
+                                justification: left
+                                language: <omitted>
+                                left-margin: 0
+                                pixels-above-lines: 0
+                                pixels-below-lines: 0
+                                pixels-inside-wrap: 0
+                                right-margin: 0
+                                rise: 0
+                                scale: 1
+                                size: <omitted>
+                                stretch: <omitted>
+                                strikethrough: false
+                                style: <omitted>
+                                underline: none
+                                variant: <omitted>
+                                weight: <omitted>
+                                wrap-mode: word
+            <AtkHypertext>
+          unnamed-GtkContainerAccessible-39
+            "filler"
+            parent: unnamed-GtkContainerAccessible-0
             index: 3
-            name: Dark Gray
-            state: enabled focusable sensitive showing visible
-            toolkit: gtk
-            <AtkComponent>
-            layer: widget
-            alpha: 1
-            <AtkAction>
-            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
-          unnamed-GtkColorSwatchAccessible-34
-            "radio button"
-            parent: unnamed-GtkContainerAccessible-29
-            index: 4
-            name: Medium Gray
-            state: enabled focusable sensitive showing visible
-            toolkit: gtk
-            <AtkComponent>
-            layer: widget
-            alpha: 1
-            <AtkAction>
-            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
-          unnamed-GtkColorSwatchAccessible-35
-            "radio button"
-            parent: unnamed-GtkContainerAccessible-29
-            index: 5
-            name: Light Gray
-            state: enabled focusable sensitive showing visible
-            toolkit: gtk
-            <AtkComponent>
-            layer: widget
-            alpha: 1
-            <AtkAction>
-            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
-          unnamed-GtkColorSwatchAccessible-36
-            "radio button"
-            parent: unnamed-GtkContainerAccessible-29
-            index: 6
-            name: Lighter Gray
-            state: enabled focusable sensitive showing visible
-            toolkit: gtk
-            <AtkComponent>
-            layer: widget
-            alpha: 1
-            <AtkAction>
-            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
-          unnamed-GtkColorSwatchAccessible-37
-            "radio button"
-            parent: unnamed-GtkContainerAccessible-29
-            index: 7
-            name: Very Light Gray
-            state: enabled focusable sensitive showing visible
+            state: enabled horizontal sensitive showing visible
             toolkit: gtk
             <AtkComponent>
             layer: widget
             alpha: 1
-            <AtkAction>
-            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
-          unnamed-GtkColorSwatchAccessible-38
-            "radio button"
-            parent: unnamed-GtkContainerAccessible-29
-            index: 8
-            name: White
-            state: checked enabled focusable sensitive showing visible
-            toolkit: gtk
-            <AtkComponent>
-            layer: widget
-            alpha: 1
-            <AtkAction>
-            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
-        Custom
-          "label"
-          parent: unnamed-GtkContainerAccessible-0
-          index: 2
-          name: Custom
-          state: enabled multi-line sensitive showing visible
-          toolkit: gtk
-          <AtkComponent>
-          layer: widget
-          alpha: 1
-          <AtkText>
-          text: Custom
-          character count: 6
-          caret offset: 0
-          default attributes: bg-color: <omitted>
-                              bg-full-height: 0
-                              direction: <omitted>
-                              editable: false
-                              family-name: <omitted>
-                              fg-color: <omitted>
-                              indent: 0
-                              invisible: false
-                              justification: left
-                              language: <omitted>
-                              left-margin: 0
-                              pixels-above-lines: 0
-                              pixels-below-lines: 0
-                              pixels-inside-wrap: 0
-                              right-margin: 0
-                              rise: 0
-                              scale: 1
-                              size: <omitted>
-                              stretch: <omitted>
-                              strikethrough: false
-                              style: <omitted>
-                              underline: none
-                              variant: <omitted>
-                              weight: <omitted>
-                              wrap-mode: word
-          <AtkHypertext>
-        unnamed-GtkContainerAccessible-39
+            unnamed-GtkColorSwatchAccessible-40
+              "push button"
+              parent: unnamed-GtkContainerAccessible-39
+              index: 0
+              name: Custom color
+              description: Create a custom color
+              state: enabled focusable sensitive showing visible
+              toolkit: gtk
+              <AtkComponent>
+              layer: widget
+              alpha: 1
+              <AtkAction>
+              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
+        unnamed-GtkContainerAccessible-41
           "filler"
-          parent: unnamed-GtkContainerAccessible-0
-          index: 3
+          parent: chooser
+          index: 1
           state: enabled horizontal sensitive showing visible
           toolkit: gtk
           <AtkComponent>
           layer: widget
           alpha: 1
-          unnamed-GtkColorSwatchAccessible-40
-            "push button"
-            parent: unnamed-GtkContainerAccessible-39
+          GtkColorEditor
+            "filler"
+            parent: unnamed-GtkContainerAccessible-41
             index: 0
-            name: Custom color
-            description: Create a custom color
-            state: enabled focusable sensitive showing visible
+            state: enabled horizontal sensitive
             toolkit: gtk
             <AtkComponent>
             layer: widget
             alpha: 1
-            <AtkAction>
-            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
-      unnamed-GtkContainerAccessible-41
-        "filler"
-        parent: chooser
-        index: 1
-        state: enabled horizontal sensitive showing visible
-        toolkit: gtk
-        <AtkComponent>
-        layer: widget
-        alpha: 1
-        GtkColorEditor
-          "filler"
-          parent: unnamed-GtkContainerAccessible-41
-          index: 0
-          state: enabled horizontal sensitive
-          toolkit: gtk
-          <AtkComponent>
-          layer: widget
-          alpha: 1
-          overlay
-            "panel"
-            parent: GtkColorEditor
-            index: 0
-            state: enabled sensitive visible
-            toolkit: gtk
-            <AtkComponent>
-            layer: widget
-            alpha: 1
-            grid
+            overlay
               "panel"
-              parent: overlay
+              parent: GtkColorEditor
               index: 0
-              state: enabled horizontal sensitive visible
+              state: enabled sensitive visible
               toolkit: gtk
               <AtkComponent>
               layer: widget
               alpha: 1
-              picker_button
-                "push button"
-                parent: grid
-                index: 0
-                description: Pick a color from the screen
-                state: enabled focusable sensitive visible has-tooltip
-                toolkit: gtk
-                <AtkComponent>
-                layer: widget
-                alpha: 1
-                <AtkImage>
-                image size: 16 x 16
-                image description: (null)
-                <AtkAction>
-                action 0 name: click
-                action 0 description: Clicks the button
-              swatch
-                "radio button"
-                parent: grid
-                index: 1
-                state: enabled sensitive visible
-                toolkit: gtk
-                <AtkComponent>
-                layer: widget
-                alpha: 1
-                <AtkAction>
-                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: 2
-                name: Color Name
-                state: editable enabled focusable sensitive single-line visible
-                toolkit: gtk
-                <AtkComponent>
-                layer: widget
-                alpha: 1
-                <AtkText>
-                text: 
-                character count: 0
-                caret offset: 0
-                default attributes: bg-color: <omitted>
-                                    bg-full-height: 0
-                                    direction: <omitted>
-                                    editable: false
-                                    family-name: <omitted>
-                                    fg-color: <omitted>
-                                    indent: 0
-                                    invisible: false
-                                    justification: left
-                                    language: <omitted>
-                                    left-margin: 0
-                                    pixels-above-lines: 0
-                                    pixels-below-lines: 0
-                                    pixels-inside-wrap: 0
-                                    right-margin: 0
-                                    rise: 0
-                                    scale: 1
-                                    size: <omitted>
-                                    stretch: <omitted>
-                                    strikethrough: false
-                                    style: <omitted>
-                                    underline: none
-                                    variant: <omitted>
-                                    weight: <omitted>
-                                    wrap-mode: word
-                <AtkAction>
-                action 0 name: activate
-                action 0 description: Activates the entry
-              h_slider
-                "color chooser"
-                parent: grid
-                index: 3
-                name: Hue
-                state: enabled focusable sensitive vertical visible
-                toolkit: gtk
-                <AtkComponent>
-                layer: widget
-                alpha: 1
-                <AtkValue>
-                minimum value: 0.000000
-                maximum value: 1.000000
-                current value: 0.000000
-              a_slider
-                "color chooser"
-                parent: grid
-                index: 4
-                name: Alpha
-                state: enabled focusable horizontal sensitive visible
-                toolkit: gtk
-                <AtkComponent>
-                layer: widget
-                alpha: 1
-                <AtkValue>
-                minimum value: 0.000000
-                maximum value: 1.000000
-                current value: 0.000000
-              sv_plane
-                "color chooser"
-                parent: grid
-                index: 5
-                name: Color Plane
-                state: enabled focusable sensitive visible
-                toolkit: gtk
-                <AtkComponent>
-                layer: widget
-                alpha: 1
-            sv_popup
-              "filler"
-              parent: overlay
-              index: 1
-              state: enabled horizontal sensitive
-              toolkit: gtk
-              <AtkComponent>
-              layer: widget
-              alpha: 1
-              grid2
+              grid
                 "panel"
-                parent: sv_popup
+                parent: overlay
                 index: 0
                 state: enabled horizontal sensitive visible
                 toolkit: gtk
                 <AtkComponent>
                 layer: widget
                 alpha: 1
-                label1
-                  "label"
-                  parent: grid2
+                picker_button
+                  "push button"
+                  parent: grid
                   index: 0
-                  name: S
-                  state: enabled multi-line sensitive visible
+                  description: Pick a color from the screen
+                  state: enabled focusable sensitive visible has-tooltip
                   toolkit: gtk
                   <AtkComponent>
                   layer: widget
                   alpha: 1
-                  <AtkText>
-                  text: S
-                  character count: 1
-                  caret offset: 0
-                  default attributes: bg-color: <omitted>
-                                      bg-full-height: 0
-                                      direction: <omitted>
-                                      editable: false
-                                      family-name: <omitted>
-                                      fg-color: <omitted>
-                                      indent: 0
-                                      invisible: false
-                                      justification: left
-                                      language: <omitted>
-                                      left-margin: 0
-                                      pixels-above-lines: 0
-                                      pixels-below-lines: 0
-                                      pixels-inside-wrap: 0
-                                      right-margin: 0
-                                      rise: 0
-                                      scale: 1
-                                      size: <omitted>
-                                      stretch: <omitted>
-                                      strikethrough: false
-                                      style: <omitted>
-                                      underline: none
-                                      variant: <omitted>
-                                      weight: <omitted>
-                                      wrap-mode: word
-                  <AtkHypertext>
-                label2
-                  "label"
-                  parent: grid2
+                  <AtkImage>
+                  image size: 16 x 16
+                  image description: (null)
+                  <AtkAction>
+                  action 0 name: click
+                  action 0 description: Clicks the button
+                swatch
+                  "radio button"
+                  parent: grid
                   index: 1
-                  name: V
-                  state: enabled multi-line sensitive visible
+                  state: enabled sensitive visible
+                  toolkit: gtk
+                  <AtkComponent>
+                  layer: widget
+                  alpha: 1
+                  <AtkAction>
+                  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: 2
+                  name: Color Name
+                  state: editable enabled focusable sensitive single-line visible
                   toolkit: gtk
                   <AtkComponent>
                   layer: widget
                   alpha: 1
                   <AtkText>
-                  text: V
-                  character count: 1
+                  text: 
+                  character count: 0
                   caret offset: 0
                   default attributes: bg-color: <omitted>
                                       bg-full-height: 0
@@ -977,26 +848,28 @@ window1
                                       variant: <omitted>
                                       weight: <omitted>
                                       wrap-mode: word
-                  <AtkHypertext>
-                s_entry
-                  "spin button"
-                  parent: grid2
-                  index: 2
-                  name: Saturation
-                  state: enabled focusable horizontal sensitive visible
+                  <AtkAction>
+                  action 0 name: activate
+                  action 0 description: Activates the entry
+                h_slider
+                  "color chooser"
+                  parent: grid
+                  index: 3
+                  name: Hue
+                  state: enabled focusable sensitive vertical visible
                   toolkit: gtk
                   <AtkComponent>
                   layer: widget
                   alpha: 1
                   <AtkValue>
                   minimum value: 0.000000
-                  maximum value: 100.000000
+                  maximum value: 1.000000
                   current value: 0.000000
-                v_entry
-                  "spin button"
-                  parent: grid2
-                  index: 3
-                  name: Value
+                a_slider
+                  "color chooser"
+                  parent: grid
+                  index: 4
+                  name: Alpha
                   state: enabled focusable horizontal sensitive visible
                   toolkit: gtk
                   <AtkComponent>
@@ -1004,155 +877,291 @@ window1
                   alpha: 1
                   <AtkValue>
                   minimum value: 0.000000
-                  maximum value: 100.000000
+                  maximum value: 1.000000
                   current value: 0.000000
-            h_popup
-              "filler"
-              parent: overlay
-              index: 2
-              state: enabled horizontal sensitive
-              toolkit: gtk
-              <AtkComponent>
-              layer: widget
-              alpha: 1
-              grid3
-                "panel"
-                parent: h_popup
-                index: 0
-                state: enabled horizontal sensitive visible
+                sv_plane
+                  "color chooser"
+                  parent: grid
+                  index: 5
+                  name: Color Plane
+                  state: enabled focusable sensitive visible
+                  toolkit: gtk
+                  <AtkComponent>
+                  layer: widget
+                  alpha: 1
+              sv_popup
+                "filler"
+                parent: overlay
+                index: 1
+                state: enabled horizontal sensitive
                 toolkit: gtk
                 <AtkComponent>
                 layer: widget
                 alpha: 1
-                label3
-                  "label"
-                  parent: grid3
+                grid2
+                  "panel"
+                  parent: sv_popup
                   index: 0
-                  name: H
-                  state: enabled multi-line sensitive visible
-                  toolkit: gtk
-                  <AtkComponent>
-                  layer: widget
-                  alpha: 1
-                  <AtkText>
-                  text: H
-                  character count: 1
-                  caret offset: 0
-                  default attributes: bg-color: <omitted>
-                                      bg-full-height: 0
-                                      direction: <omitted>
-                                      editable: false
-                                      family-name: <omitted>
-                                      fg-color: <omitted>
-                                      indent: 0
-                                      invisible: false
-                                      justification: left
-                                      language: <omitted>
-                                      left-margin: 0
-                                      pixels-above-lines: 0
-                                      pixels-below-lines: 0
-                                      pixels-inside-wrap: 0
-                                      right-margin: 0
-                                      rise: 0
-                                      scale: 1
-                                      size: <omitted>
-                                      stretch: <omitted>
-                                      strikethrough: false
-                                      style: <omitted>
-                                      underline: none
-                                      variant: <omitted>
-                                      weight: <omitted>
-                                      wrap-mode: word
-                  <AtkHypertext>
-                h_entry
-                  "spin button"
-                  parent: grid3
-                  index: 1
-                  name: Hue
-                  state: enabled focusable horizontal sensitive visible
+                  state: enabled horizontal sensitive visible
                   toolkit: gtk
                   <AtkComponent>
                   layer: widget
                   alpha: 1
-                  <AtkValue>
-                  minimum value: 0.000000
-                  maximum value: 100.000000
-                  current value: 0.000000
-            a_popup
-              "filler"
-              parent: overlay
-              index: 3
-              state: enabled horizontal sensitive
-              toolkit: gtk
-              <AtkComponent>
-              layer: widget
-              alpha: 1
-              grid4
-                "panel"
-                parent: a_popup
-                index: 0
-                state: enabled horizontal sensitive visible
+                  label1
+                    "label"
+                    parent: grid2
+                    index: 0
+                    name: S
+                    state: enabled multi-line sensitive visible
+                    toolkit: gtk
+                    <AtkComponent>
+                    layer: widget
+                    alpha: 1
+                    <AtkText>
+                    text: S
+                    character count: 1
+                    caret offset: 0
+                    default attributes: bg-color: <omitted>
+                                        bg-full-height: 0
+                                        direction: <omitted>
+                                        editable: false
+                                        family-name: <omitted>
+                                        fg-color: <omitted>
+                                        indent: 0
+                                        invisible: false
+                                        justification: left
+                                        language: <omitted>
+                                        left-margin: 0
+                                        pixels-above-lines: 0
+                                        pixels-below-lines: 0
+                                        pixels-inside-wrap: 0
+                                        right-margin: 0
+                                        rise: 0
+                                        scale: 1
+                                        size: <omitted>
+                                        stretch: <omitted>
+                                        strikethrough: false
+                                        style: <omitted>
+                                        underline: none
+                                        variant: <omitted>
+                                        weight: <omitted>
+                                        wrap-mode: word
+                    <AtkHypertext>
+                  label2
+                    "label"
+                    parent: grid2
+                    index: 1
+                    name: V
+                    state: enabled multi-line sensitive visible
+                    toolkit: gtk
+                    <AtkComponent>
+                    layer: widget
+                    alpha: 1
+                    <AtkText>
+                    text: V
+                    character count: 1
+                    caret offset: 0
+                    default attributes: bg-color: <omitted>
+                                        bg-full-height: 0
+                                        direction: <omitted>
+                                        editable: false
+                                        family-name: <omitted>
+                                        fg-color: <omitted>
+                                        indent: 0
+                                        invisible: false
+                                        justification: left
+                                        language: <omitted>
+                                        left-margin: 0
+                                        pixels-above-lines: 0
+                                        pixels-below-lines: 0
+                                        pixels-inside-wrap: 0
+                                        right-margin: 0
+                                        rise: 0
+                                        scale: 1
+                                        size: <omitted>
+                                        stretch: <omitted>
+                                        strikethrough: false
+                                        style: <omitted>
+                                        underline: none
+                                        variant: <omitted>
+                                        weight: <omitted>
+                                        wrap-mode: word
+                    <AtkHypertext>
+                  s_entry
+                    "spin button"
+                    parent: grid2
+                    index: 2
+                    name: Saturation
+                    state: enabled focusable horizontal sensitive visible
+                    toolkit: gtk
+                    <AtkComponent>
+                    layer: widget
+                    alpha: 1
+                    <AtkValue>
+                    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
+                    <AtkComponent>
+                    layer: widget
+                    alpha: 1
+                    <AtkValue>
+                    minimum value: 0.000000
+                    maximum value: 100.000000
+                    current value: 0.000000
+              h_popup
+                "filler"
+                parent: overlay
+                index: 2
+                state: enabled horizontal sensitive
                 toolkit: gtk
                 <AtkComponent>
                 layer: widget
                 alpha: 1
-                label4
-                  "label"
-                  parent: grid4
+                grid3
+                  "panel"
+                  parent: h_popup
                   index: 0
-                  name: A
-                  state: enabled multi-line sensitive visible
+                  state: enabled horizontal sensitive visible
                   toolkit: gtk
                   <AtkComponent>
                   layer: widget
                   alpha: 1
-                  <AtkText>
-                  text: A
-                  character count: 1
-                  caret offset: 0
-                  default attributes: bg-color: <omitted>
-                                      bg-full-height: 0
-                                      direction: <omitted>
-                                      editable: false
-                                      family-name: <omitted>
-                                      fg-color: <omitted>
-                                      indent: 0
-                                      invisible: false
-                                      justification: left
-                                      language: <omitted>
-                                      left-margin: 0
-                                      pixels-above-lines: 0
-                                      pixels-below-lines: 0
-                                      pixels-inside-wrap: 0
-                                      right-margin: 0
-                                      rise: 0
-                                      scale: 1
-                                      size: <omitted>
-                                      stretch: <omitted>
-                                      strikethrough: false
-                                      style: <omitted>
-                                      underline: none
-                                      variant: <omitted>
-                                      weight: <omitted>
-                                      wrap-mode: word
-                  <AtkHypertext>
-                a_entry
-                  "spin button"
-                  parent: grid4
-                  index: 1
-                  name: Alpha
-                  state: enabled focusable horizontal sensitive visible
+                  label3
+                    "label"
+                    parent: grid3
+                    index: 0
+                    name: H
+                    state: enabled multi-line sensitive visible
+                    toolkit: gtk
+                    <AtkComponent>
+                    layer: widget
+                    alpha: 1
+                    <AtkText>
+                    text: H
+                    character count: 1
+                    caret offset: 0
+                    default attributes: bg-color: <omitted>
+                                        bg-full-height: 0
+                                        direction: <omitted>
+                                        editable: false
+                                        family-name: <omitted>
+                                        fg-color: <omitted>
+                                        indent: 0
+                                        invisible: false
+                                        justification: left
+                                        language: <omitted>
+                                        left-margin: 0
+                                        pixels-above-lines: 0
+                                        pixels-below-lines: 0
+                                        pixels-inside-wrap: 0
+                                        right-margin: 0
+                                        rise: 0
+                                        scale: 1
+                                        size: <omitted>
+                                        stretch: <omitted>
+                                        strikethrough: false
+                                        style: <omitted>
+                                        underline: none
+                                        variant: <omitted>
+                                        weight: <omitted>
+                                        wrap-mode: word
+                    <AtkHypertext>
+                  h_entry
+                    "spin button"
+                    parent: grid3
+                    index: 1
+                    name: Hue
+                    state: enabled focusable horizontal sensitive visible
+                    toolkit: gtk
+                    <AtkComponent>
+                    layer: widget
+                    alpha: 1
+                    <AtkValue>
+                    minimum value: 0.000000
+                    maximum value: 100.000000
+                    current value: 0.000000
+              a_popup
+                "filler"
+                parent: overlay
+                index: 3
+                state: enabled horizontal sensitive
+                toolkit: gtk
+                <AtkComponent>
+                layer: widget
+                alpha: 1
+                grid4
+                  "panel"
+                  parent: a_popup
+                  index: 0
+                  state: enabled horizontal sensitive visible
                   toolkit: gtk
                   <AtkComponent>
                   layer: widget
                   alpha: 1
-                  <AtkValue>
-                  minimum value: 0.000000
-                  maximum value: 100.000000
-                  current value: 0.000000
+                  label4
+                    "label"
+                    parent: grid4
+                    index: 0
+                    name: A
+                    state: enabled multi-line sensitive visible
+                    toolkit: gtk
+                    <AtkComponent>
+                    layer: widget
+                    alpha: 1
+                    <AtkText>
+                    text: A
+                    character count: 1
+                    caret offset: 0
+                    default attributes: bg-color: <omitted>
+                                        bg-full-height: 0
+                                        direction: <omitted>
+                                        editable: false
+                                        family-name: <omitted>
+                                        fg-color: <omitted>
+                                        indent: 0
+                                        invisible: false
+                                        justification: left
+                                        language: <omitted>
+                                        left-margin: 0
+                                        pixels-above-lines: 0
+                                        pixels-below-lines: 0
+                                        pixels-inside-wrap: 0
+                                        right-margin: 0
+                                        rise: 0
+                                        scale: 1
+                                        size: <omitted>
+                                        stretch: <omitted>
+                                        strikethrough: false
+                                        style: <omitted>
+                                        underline: none
+                                        variant: <omitted>
+                                        weight: <omitted>
+                                        wrap-mode: word
+                    <AtkHypertext>
+                  a_entry
+                    "spin button"
+                    parent: grid4
+                    index: 1
+                    name: Alpha
+                    state: enabled focusable horizontal sensitive visible
+                    toolkit: gtk
+                    <AtkComponent>
+                    layer: widget
+                    alpha: 1
+                    <AtkValue>
+                    minimum value: 0.000000
+                    maximum value: 100.000000
+                    current value: 0.000000
     action_box
       "filler"
-      parent: dialog-vbox1
+      parent: ___object_1___
       index: 1
       state: enabled horizontal sensitive
       toolkit: gtk

diff --git a/testsuite/a11y/messagedialog.txt b/testsuite/a11y/messagedialog.txt
index af5abf792e02d7d3a400eca45ce078752021b709..e0bffc601bf3f42dd6c76073ca886f1b6cea6e8d 100644 (file)
--- a/testsuite/a11y/messagedialog.txt
+++ b/testsuite/a11y/messagedialog.txt
@@ -57,7 +57,7 @@ window1
                           weight: <omitted>
                           wrap-mode: word
       <AtkHypertext>
-  dialog-vbox1
+  ___object_1___
     "filler"
     parent: window1
     index: 0
@@ -66,107 +66,116 @@ window1
     <AtkComponent>
     layer: widget
     alpha: 1
-    box
+    dialog-vbox1
       "filler"
-      parent: dialog-vbox1
+      parent: ___object_1___
       index: 0
-      state: enabled horizontal sensitive showing visible
+      state: enabled sensitive showing vertical visible
       toolkit: gtk
       <AtkComponent>
       layer: widget
       alpha: 1
-      message_area
+      box
         "filler"
-        parent: box
+        parent: dialog-vbox1
         index: 0
-        state: enabled sensitive showing vertical visible
+        state: enabled horizontal sensitive showing visible
         toolkit: gtk
         <AtkComponent>
         layer: widget
         alpha: 1
-        label
-          "label"
-          parent: message_area
+        message_area
+          "filler"
+          parent: box
           index: 0
-          name: Information
-          state: enabled multi-line sensitive showing visible
-          toolkit: gtk
-          <AtkComponent>
-          layer: widget
-          alpha: 1
-          <AtkText>
-          text: Information
-          character count: 11
-          caret offset: 0
-          default attributes: bg-color: <omitted>
-                              bg-full-height: 0
-                              direction: <omitted>
-                              editable: false
-                              family-name: <omitted>
-                              fg-color: <omitted>
-                              indent: 0
-                              invisible: false
-                              justification: left
-                              language: <omitted>
-                              left-margin: 0
-                              pixels-above-lines: 0
-                              pixels-below-lines: 0
-                              pixels-inside-wrap: 0
-                              right-margin: 0
-                              rise: 0
-                              scale: 1
-                              size: <omitted>
-                              stretch: <omitted>
-                              strikethrough: false
-                              style: <omitted>
-                              underline: none
-                              variant: <omitted>
-                              weight: <omitted>
-                              wrap-mode: word
-          <AtkHypertext>
-        secondary_label
-          "label"
-          parent: message_area
-          index: 1
-          name: More Information
-          state: enabled multi-line sensitive showing visible
+          state: enabled sensitive showing vertical visible
           toolkit: gtk
           <AtkComponent>
           layer: widget
           alpha: 1
-          <AtkText>
-          text: More Information
-          character count: 16
-          caret offset: 0
-          default attributes: bg-color: <omitted>
-                              bg-full-height: 0
-                              direction: <omitted>
-                              editable: false
-                              family-name: <omitted>
-                              fg-color: <omitted>
-                              indent: 0
-                              invisible: false
-                              justification: left
-                              language: <omitted>
-                              left-margin: 0
-                              pixels-above-lines: 0
-                              pixels-below-lines: 0
-                              pixels-inside-wrap: 0
-                              right-margin: 0
-                              rise: 0
-                              scale: 1
-                              size: <omitted>
-                              stretch: <omitted>
-                              strikethrough: false
-                              style: <omitted>
-                              underline: none
-                              variant: <omitted>
-                              weight: <omitted>
-                              wrap-mode: word
-          <AtkHypertext>
+          label
+            "label"
+            parent: message_area
+            index: 0
+            name: Information
+            state: enabled multi-line sensitive showing visible
+            toolkit: gtk
+            <AtkComponent>
+            layer: widget
+            alpha: 1
+            <AtkText>
+            text: Information
+            character count: 11
+            caret offset: 0
+            default attributes: bg-color: <omitted>
+                                bg-full-height: 0
+                                direction: <omitted>
+                                editable: false
+                                family-name: <omitted>
+                                fg-color: <omitted>
+                                indent: 0
+                                invisible: false
+                                justification: left
+                                language: <omitted>
+                                left-margin: 0
+                                pixels-above-lines: 0
+                                pixels-below-lines: 0
+                                pixels-inside-wrap: 0
+                                right-margin: 0
+                                rise: 0
+                                scale: 1
+                                size: <omitted>
+                                stretch: <omitted>
+                                strikethrough: false
+                                style: <omitted>
+                                underline: none
+                                variant: <omitted>
+                                weight: <omitted>
+                                wrap-mode: word
+            <AtkHypertext>
+          secondary_label
+            "label"
+            parent: message_area
+            index: 1
+            name: More Information
+            state: enabled multi-line sensitive showing visible
+            toolkit: gtk
+            <AtkComponent>
+            layer: widget
+            alpha: 1
+            <AtkText>
+            text: More Information
+            character count: 16
+            caret offset: 0
+            default attributes: bg-color: <omitted>
+                                bg-full-height: 0
+                                direction: <omitted>
+                                editable: false
+                                family-name: <omitted>
+                                fg-color: <omitted>
+                                indent: 0
+                                invisible: false
+                                justification: left
+                                language: <omitted>
+                                left-margin: 0
+                                pixels-above-lines: 0
+                                pixels-below-lines: 0
+                                pixels-inside-wrap: 0
+                                right-margin: 0
+                                rise: 0
+                                scale: 1
+                                size: <omitted>
+                                stretch: <omitted>
+                                strikethrough: false
+                                style: <omitted>
+                                underline: none
+                                variant: <omitted>
+                                weight: <omitted>
+                                wrap-mode: word
+            <AtkHypertext>
     action_box
       "filler"
-      parent: dialog-vbox1
+      parent: ___object_1___
       index: 1
       state: enabled horizontal sensitive showing visible
       toolkit: gtk