Accessibility: add proper mnemonic relations and labelling

4 files changed, 45 insertions, 0 deletions

diff --git a/data/eog-image-properties-dialog.ui b/data/eog-image-properties-dialog.ui
index 63d1e7ff..786c3d64 100644
--- a/data/eog-image-properties-dialog.ui
+++ b/data/eog-image-properties-dialog.ui
@@ -113,6 +113,7 @@
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
                         <property name="label" translatable="yes">Name:</property>
+                        <property name="mnemonic-widget">name_label</property>
                         <property name="justify">right</property>
                         <attributes>
                           <attribute name="weight" value="bold"/>
@@ -129,6 +130,7 @@
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
                         <property name="label" translatable="yes">Width:</property>
+                        <property name="mnemonic-widget">width_label</property>
                         <attributes>
                           <attribute name="weight" value="bold"/>
                         </attributes>
@@ -144,6 +146,7 @@
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
                         <property name="label" translatable="yes">Height:</property>
+                        <property name="mnemonic-widget">height_label</property>
                         <attributes>
                           <attribute name="weight" value="bold"/>
                         </attributes>
@@ -159,6 +162,7 @@
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
                         <property name="label" translatable="yes">Type:</property>
+                        <property name="mnemonic-widget">type_label</property>
                         <attributes>
                           <attribute name="weight" value="bold"/>
                         </attributes>
@@ -174,6 +178,7 @@
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
                         <property name="label" translatable="yes">Bytes:</property>
+                        <property name="mnemonic-widget">bytes_label</property>
                         <attributes>
                           <attribute name="weight" value="bold"/>
                         </attributes>
@@ -189,6 +194,7 @@
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
                         <property name="label" translatable="yes">Folder:</property>
+                        <property name="mnemonic-widget">folder_button</property>
                         <attributes>
                           <attribute name="weight" value="bold"/>
                         </attributes>
@@ -319,6 +325,7 @@
                                 <property name="can_focus">False</property>
                                 <property name="xalign">0</property>
                                 <property name="label" translatable="yes">Aperture Value:</property>
+                                <property name="mnemonic-widget">exif_aperture_label</property>
                                 <attributes>
                                   <attribute name="weight" value="bold"/>
                                 </attributes>
@@ -335,6 +342,7 @@
                                 <property name="can_focus">False</property>
                                 <property name="xalign">0</property>
                                 <property name="label" translatable="yes">Exposure Time:</property>
+                                <property name="mnemonic-widget">exif_exposure_label</property>
                                 <attributes>
                                   <attribute name="weight" value="bold"/>
                                 </attributes>
@@ -351,6 +359,7 @@
                                 <property name="can_focus">False</property>
                                 <property name="xalign">0</property>
                                 <property name="label" translatable="yes">Focal Length:</property>
+                                <property name="mnemonic-widget">exif_focal_label</property>
                                 <attributes>
                                   <attribute name="weight" value="bold"/>
                                 </attributes>
@@ -367,6 +376,7 @@
                                 <property name="can_focus">False</property>
                                 <property name="xalign">0</property>
                                 <property name="label" translatable="yes">Flash:</property>
+                                <property name="mnemonic-widget">exif_flash_label</property>
                                 <attributes>
                                   <attribute name="weight" value="bold"/>
                                 </attributes>
@@ -383,6 +393,7 @@
                                 <property name="can_focus">False</property>
                                 <property name="xalign">0</property>
                                 <property name="label" translatable="yes">ISO Speed Rating:</property>
+                                <property name="mnemonic-widget">exif_iso_label</property>
                                 <attributes>
                                   <attribute name="weight" value="bold"/>
                                 </attributes>
@@ -399,6 +410,7 @@
                                 <property name="can_focus">False</property>
                                 <property name="xalign">0</property>
                                 <property name="label" translatable="yes">Metering Mode:</property>
+                                <property name="mnemonic-widget">exif_metering_label</property>
                                 <attributes>
                                   <attribute name="weight" value="bold"/>
                                 </attributes>
@@ -415,6 +427,7 @@
                                 <property name="can_focus">False</property>
                                 <property name="xalign">0</property>
                                 <property name="label" translatable="yes">Camera Model:</property>
+                                <property name="mnemonic-widget">exif_model_label</property>
                                 <property name="justify">right</property>
                                 <attributes>
                                   <attribute name="weight" value="bold"/>
@@ -432,6 +445,7 @@
                                 <property name="can_focus">False</property>
                                 <property name="xalign">0</property>
                                 <property name="label" translatable="yes">Date/Time:</property>
+                                <property name="mnemonic-widget">exif_date_label</property>
                                 <attributes>
                                   <attribute name="weight" value="bold"/>
                                 </attributes>
@@ -462,6 +476,7 @@
                                 <property name="can_focus">False</property>
                                 <property name="xalign">0</property>
                                 <property name="label" translatable="yes">Description:</property>
+                                <property name="mnemonic-widget">xmp_description_label</property>
                                 <attributes>
                                   <attribute name="weight" value="bold"/>
                                 </attributes>
@@ -478,6 +493,7 @@
                                 <property name="can_focus">False</property>
                                 <property name="xalign">0</property>
                                 <property name="label" translatable="yes">Location:</property>
+                                <property name="mnemonic-widget">xmp_location_label</property>
                                 <attributes>
                                   <attribute name="weight" value="bold"/>
                                 </attributes>
@@ -494,6 +510,7 @@
                                 <property name="can_focus">False</property>
                                 <property name="xalign">0</property>
                                 <property name="label" translatable="yes">Keywords:</property>
+                                <property name="mnemonic-widget">xmp_keywords_label</property>
                                 <attributes>
                                   <attribute name="weight" value="bold"/>
                                 </attributes>
@@ -510,6 +527,7 @@
                                 <property name="can_focus">False</property>
                                 <property name="xalign">0</property>
                                 <property name="label" translatable="yes">Author:</property>
+                                <property name="mnemonic-widget">xmp_creator_label</property>
                                 <attributes>
                                   <attribute name="weight" value="bold"/>
                                 </attributes>
@@ -526,6 +544,7 @@
                                 <property name="can_focus">False</property>
                                 <property name="xalign">0</property>
                                 <property name="label" translatable="yes">Copyright:</property>
+                                <property name="mnemonic-widget">xmp_rights_label</property>
                                 <attributes>
                                   <attribute name="weight" value="bold"/>
                                 </attributes>
diff --git a/data/eog-preferences-dialog.ui b/data/eog-preferences-dialog.ui
index ecd3331d..f42158bc 100644
--- a/data/eog-preferences-dialog.ui
+++ b/data/eog-preferences-dialog.ui
@@ -191,6 +191,11 @@
                                 <property name="receives_default">True</property>
                                 <property name="title" translatable="yes">Background Color</property>
                                 <property name="rgba">rgb(0,0,0)</property>
+                                <child internal-child="accessible">
+                                  <object class="AtkObject" id="bg_color_accessible">
+                                    <property name="AtkObject::accessible-name" translatable="yes">Background Color</property>
+                                  </object>
+                                </child>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
@@ -292,6 +297,11 @@
                                     <property name="use_alpha">True</property>
                                     <property name="title" translatable="yes">Color for Transparent Areas</property>
                                     <property name="rgba">rgb(0,0,0)</property>
+                                    <child internal-child="accessible">
+                                      <object class="AtkObject" id="transp_color_accessible">
+                                        <property name="AtkObject::accessible-name" translatable="yes">Color for Transparent Areas</property>
+                                      </object>
+                                    </child>
                                   </object>
                                   <packing>
                                     <property name="expand">False</property>
@@ -439,6 +449,7 @@
                                     <property name="can_focus">False</property>
                                     <property name="xalign">0</property>
                                     <property name="label" translatable="yes" comments="I18N: This sentence will be displayed above a horizontal scale to select a number of seconds in eog's preferences dialog.">_Time between images:</property>
+                                    <property name="mnemonic-widget">seconds_scale</property>
                                     <property name="use_underline">True</property>
                                   </object>
                                   <packing>
diff --git a/data/metadata-sidebar.ui b/data/metadata-sidebar.ui
index 39406b6e..3a84bdfe 100644
--- a/data/metadata-sidebar.ui
+++ b/data/metadata-sidebar.ui
@@ -27,6 +27,7 @@
                 <property name="can_focus">False</property>
                 <property name="valign">baseline</property>
                 <property name="label" translatable="yes">Size</property>
+                <property name="mnemonic-widget">size_label</property>
                 <property name="justify">right</property>
                 <property name="xalign">1</property>
                 <style>
@@ -44,6 +45,7 @@
                 <property name="can_focus">False</property>
                 <property name="valign">baseline</property>
                 <property name="label" translatable="yes">Type</property>
+                <property name="mnemonic-widget">type_label</property>
                 <property name="justify">right</property>
                 <property name="xalign">1</property>
                 <property name="yalign">0</property>
@@ -61,6 +63,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="label" translatable="yes">File Size</property>
+                <property name="mnemonic-widget">filesize_label</property>
                 <property name="justify">right</property>
                 <property name="xalign">1</property>
                 <property name="yalign">0</property>
@@ -80,6 +83,7 @@
                 <property name="valign">baseline</property>
                 <property name="margin_bottom">12</property>
                 <property name="label" translatable="yes">Folder</property>
+                <property name="mnemonic-widget">folder_label</property>
                 <property name="justify">right</property>
                 <property name="xalign">1</property>
                 <property name="yalign">0</property>
@@ -97,6 +101,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="label" translatable="yes">Aperture</property>
+                <property name="mnemonic-widget">aperture_label</property>
                 <property name="justify">right</property>
                 <property name="xalign">1</property>
                 <property name="yalign">0</property>
@@ -114,6 +119,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="label" translatable="yes">Exposure</property>
+                <property name="mnemonic-widget">exposure_label</property>
                 <property name="justify">right</property>
                 <property name="xalign">1</property>
                 <property name="yalign">0</property>
@@ -131,6 +137,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="label" translatable="yes">ISO</property>
+                <property name="mnemonic-widget">iso_label</property>
                 <property name="justify">right</property>
                 <property name="lines">0</property>
                 <property name="xalign">1</property>
@@ -149,6 +156,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="label" translatable="yes">Metering</property>
+                <property name="mnemonic-widget">metering_label</property>
                 <property name="justify">right</property>
                 <property name="xalign">1</property>
                 <property name="yalign">0</property>
@@ -167,6 +175,7 @@
                 <property name="can_focus">False</property>
                 <property name="margin_bottom">12</property>
                 <property name="label" translatable="yes">Camera</property>
+                <property name="mnemonic-widget">model_label</property>
                 <property name="justify">right</property>
                 <property name="xalign">1</property>
                 <property name="yalign">0</property>
@@ -185,6 +194,7 @@
                 <property name="can_focus">False</property>
                 <property name="valign">baseline</property>
                 <property name="label" translatable="yes">Date</property>
+                <property name="mnemonic-widget">date_label</property>
                 <property name="justify">right</property>
                 <property name="xalign">1</property>
                 <property name="yalign">0</property>
@@ -202,6 +212,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="label" translatable="yes">Time</property>
+                <property name="mnemonic-widget">time_label</property>
                 <property name="justify">right</property>
                 <property name="xalign">1</property>
                 <property name="yalign">0</property>
@@ -378,6 +389,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="label" translatable="yes">Focal Length</property>
+                <property name="mnemonic-widget">focallen_label</property>
                 <property name="justify">right</property>
                 <property name="xalign">1</property>
                 <property name="yalign">0</property>
diff --git a/src/eog-sidebar.c b/src/eog-sidebar.c
index e07ddca7..05dd1702 100644
--- a/src/eog-sidebar.c
+++ b/src/eog-sidebar.c
@@ -31,6 +31,7 @@
 #include <gdk/gdk.h>
 #include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
+#include <glib/gi18n.h>
 
 #include "eog-sidebar.h"
 
@@ -417,6 +418,8 @@ eog_sidebar_init (EogSidebar *eog_sidebar)
 	g_signal_connect (close_button, "clicked",
 			  G_CALLBACK (eog_sidebar_close_clicked_cb),
 			  eog_sidebar);
+	/* TODO: i18n */
+	gtk_widget_set_tooltip_text (close_button, "Hide sidebar");
 
 	image = gtk_image_new_from_icon_name ("window-close-symbolic",
 					      GTK_ICON_SIZE_MENU);