From 6f8f4c8b3f82af1f0aa811cf190bc4b74678e267 Mon Sep 17 00:00:00 2001
From: Valentin Villenave <vvillenave@hypra.fr>
Date: Wed, 13 Oct 2021 17:39:30 +0200
Subject: Accessibility: add proper mnemonic relations and labelling

---
 src/fr-window.c           | 2 ++
 src/ui/batch-add-files.ui | 1 +
 src/ui/new.ui             | 5 +++++
 src/ui/properties.ui      | 8 ++++++++
 4 files changed, 16 insertions(+)

diff --git a/src/fr-window.c b/src/fr-window.c
index 3cc888f..6023336 100644
--- a/src/fr-window.c
+++ b/src/fr-window.c
@@ -5776,6 +5776,8 @@ fr_window_construct (FrWindow *window)
 	gtk_entry_set_icon_from_icon_name (GTK_ENTRY (window->priv->location_entry),
 				       GTK_ENTRY_ICON_PRIMARY,
 				       "folder");
+	gtk_label_set_mnemonic_widget (window->priv->location_label,
+				       window->priv->location_entry);
 
 	gtk_box_pack_start (GTK_BOX (location_box),
 			    window->priv->location_entry, TRUE, TRUE, 5);
diff --git a/src/ui/batch-add-files.ui b/src/ui/batch-add-files.ui
index 6a4ee5b..c6f6980 100644
--- a/src/ui/batch-add-files.ui
+++ b/src/ui/batch-add-files.ui
@@ -322,6 +322,7 @@
                                     <property name="can_focus">False</property>
                                     <property name="halign">start</property>
                                     <property name="label" translatable="yes">_Password:</property>
+                                    <property name="mnemonic_widget">a_password_entry</property>
                                     <property name="use_underline">True</property>
                                   </object>
                                   <packing>
diff --git a/src/ui/new.ui b/src/ui/new.ui
index 391a3e2..30e869b 100644
--- a/src/ui/new.ui
+++ b/src/ui/new.ui
@@ -160,6 +160,11 @@
                         <property name="climb_rate">1</property>
                         <property name="digits">1</property>
                         <property name="numeric">True</property>
+                        <child internal-child="accessible">
+                          <object class="AtkObject">
+                            <property name="AtkObject::accessible-name" translatable="yes" comments="MB means megabytes">MB</property>
+                          </object>
+                        </child>
                       </object>
                       <packing>
                         <property name="expand">False</property>
diff --git a/src/ui/properties.ui b/src/ui/properties.ui
index 75850c5..78634c7 100644
--- a/src/ui/properties.ui
+++ b/src/ui/properties.ui
@@ -87,6 +87,7 @@
                 <property name="can_focus">False</property>
                 <property name="halign">start</property>
                 <property name="label" translatable="yes" context="File">Name:</property>
+                <property name="mnemonic_widget">p_name_label</property>
                 <property name="justify">center</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
@@ -103,6 +104,7 @@
                 <property name="can_focus">False</property>
                 <property name="halign">start</property>
                 <property name="label" translatable="yes">Archive size:</property>
+                <property name="mnemonic_widget">p_size_label</property>
                 <property name="justify">center</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
@@ -143,6 +145,7 @@
                 <property name="can_focus">False</property>
                 <property name="halign">start</property>
                 <property name="label" translatable="yes">Compression ratio:</property>
+                <property name="mnemonic_widget">p_cratio_label</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
@@ -170,6 +173,7 @@
                 <property name="can_focus">False</property>
                 <property name="halign">start</property>
                 <property name="label" translatable="yes">Content size:</property>
+                <property name="mnemonic_widget">p_uncomp_size_label</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
@@ -209,6 +213,7 @@
                 <property name="can_focus">False</property>
                 <property name="halign">start</property>
                 <property name="label" translatable="yes">Number of files:</property>
+                <property name="mnemonic_widget">p_files_label</property>
                 <property name="justify">center</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
@@ -251,6 +256,7 @@
                 <property name="can_focus">False</property>
                 <property name="halign">start</property>
                 <property name="label" translatable="yes">Location:</property>
+                <property name="mnemonic_widget">p_path_label</property>
                 <property name="justify">center</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
@@ -267,6 +273,7 @@
                 <property name="can_focus">False</property>
                 <property name="halign">start</property>
                 <property name="label" translatable="yes">Last modified:</property>
+                <property name="mnemonic_widget">p_date_label</property>
                 <property name="justify">center</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
@@ -283,6 +290,7 @@
                 <property name="can_focus">False</property>
                 <property name="halign">start</property>
                 <property name="label" translatable="yes">Type:</property>
+                <property name="mnemonic_widget">p_mime_type_label</property>
                 <property name="justify">center</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
-- 
cgit v1.2.1