From 484993b658a4b45c0fd2f6b3d18d9dfca8b4bef9 Mon Sep 17 00:00:00 2001
From: Philip Withnall <withnall@endlessm.com>
Date: Mon, 13 Jan 2020 14:31:39 +0000
Subject: [PATCH] malcontent-control: Add basic accessibility support to g-c-c
 widgets
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Not submitting this upstream as it hasn’t been tested thoroughly enough.

Signed-off-by: Philip Withnall <withnall@endlessm.com>
---
 malcontent-control/carousel.ui      | 10 +++++++++
 malcontent-control/user-controls.ui | 32 ++++++++++++++++++++++++++++-
 2 files changed, 41 insertions(+), 1 deletion(-)

diff --git a/malcontent-control/carousel.ui b/malcontent-control/carousel.ui
index 8b65160..41db014 100644
--- a/malcontent-control/carousel.ui
+++ b/malcontent-control/carousel.ui
@@ -43,6 +43,11 @@
                         <property name="can_focus">False</property>
                         <property name="icon-size">4</property>
                         <property name="icon_name">go-previous-symbolic</property>
+                        <child internal-child="accessible">
+                          <object class="AtkObject">
+                            <property name="accessible-name" translatable="yes">Previous Page</property>
+                          </object>
+                        </child>
                       </object>
                     </child>
                     <signal name="clicked" handler="mct_carousel_goto_previous_page" object="MctCarousel" swapped="no"/>
@@ -64,6 +69,11 @@
                         <property name="can_focus">False</property>
                         <property name="icon-size">4</property>
                         <property name="icon_name">go-next-symbolic</property>
+                        <child internal-child="accessible">
+                          <object class="AtkObject">
+                            <property name="accessible-name" translatable="yes">Next Page</property>
+                          </object>
+                        </child>
                       </object>
                     </child>
                     <signal name="clicked" handler="mct_carousel_goto_next_page" object="MctCarousel" swapped="no"/>
diff --git a/malcontent-control/user-controls.ui b/malcontent-control/user-controls.ui
index 9c0a164..880c207 100644
--- a/malcontent-control/user-controls.ui
+++ b/malcontent-control/user-controls.ui
@@ -18,6 +18,9 @@
         <attributes>
           <attribute name="weight" value="bold" />
         </attributes>
+        <accessibility>
+          <relation target="listbox" type="label-for"/>
+        </accessibility>
       </object>
       <packing>
         <property name="top-attach">0</property>
@@ -36,6 +39,9 @@
         <attributes>
           <attribute name="scale" value="0.83333" />
         </attributes>
+        <accessibility>
+          <relation target="listbox" type="description-for"/>
+        </accessibility>
         <style>
           <class name="dim-label" />
         </style>
@@ -81,6 +87,9 @@
         <attributes>
           <attribute name="weight" value="bold" />
         </attributes>
+        <accessibility>
+          <relation target="allow_web_browsers_switch" type="label-for"/>
+        </accessibility>
       </object>
       <packing>
         <property name="top-attach">3</property>
@@ -100,6 +109,9 @@
         <attributes>
           <attribute name="scale" value="0.83333" />
         </attributes>
+        <accessibility>
+          <relation target="allow_web_browsers_switch" type="description-for"/>
+        </accessibility>
         <style>
           <class name="dim-label" />
         </style>
@@ -126,6 +138,9 @@
             <style>
               <class name="dim-label" />
             </style>
+            <accessibility>
+              <relation target="allow_web_browsers_switch" type="label-for"/>
+            </accessibility>
           </object>
         </child>
 
@@ -179,6 +194,9 @@
             <style>
               <class name="dim-label" />
             </style>
+            <accessibility>
+              <relation target="allow_user_installation_switch" type="label-for"/>
+            </accessibility>
           </object>
         </child>
 
@@ -215,6 +233,9 @@
             <style>
               <class name="dim-label" />
             </style>
+            <accessibility>
+              <relation target="allow_system_installation_switch" type="label-for"/>
+            </accessibility>
           </object>
         </child>
 
@@ -251,6 +272,10 @@
             <style>
               <class name="dim-label" />
             </style>
+            <accessibility>
+              <relation target="restriction_button" type="label-for"/>
+              <relation target="restriction_button" type="flows-to"/>
+            </accessibility>
           </object>
         </child>
 
@@ -274,7 +299,12 @@
 
   </template>
 
-  <object class="GtkPopoverMenu" id="restriction_popover" />
+  <object class="GtkPopoverMenu" id="restriction_popover">
+    <accessibility>
+      <relation target="restriction_button" type="popup-for"/>
+    </accessibility>
+  </object>
+
   <menu id="age_menu" />
 
   <object class="GtkSizeGroup">