[gthumb] Several mnemonic fixes (bug 575037, bug 575048, bug 575050)



commit e49ac3e0abf612d7a4df46607e9adea71b9a9d4a
Author: Matthias Hawran <matthias hawran net>
Date:   Thu Feb 25 18:39:50 2010 +0100

    Several mnemonic fixes (bug 575037, bug 575048, bug 575050)

 .../edit_metadata/data/ui/edit-comment-page.ui     |   10 ++++++----
 extensions/edit_metadata/gth-edit-comment-page.c   |    2 ++
 extensions/importer/data/ui/import-preferences.ui  |   10 ++++++----
 .../photo_importer/data/ui/photo-importer.ui       |    3 ++-
 gthumb/gth-tags-entry.c                            |   17 ++++++++++++++++-
 5 files changed, 32 insertions(+), 10 deletions(-)
---
diff --git a/extensions/edit_metadata/data/ui/edit-comment-page.ui b/extensions/edit_metadata/data/ui/edit-comment-page.ui
index d72ed60..1e1f073 100644
--- a/extensions/edit_metadata/data/ui/edit-comment-page.ui
+++ b/extensions/edit_metadata/data/ui/edit-comment-page.ui
@@ -15,14 +15,14 @@
         <property name="yalign">0</property>
         <property name="label" translatable="yes">D_escription:</property>
         <property name="use_underline">True</property>
-        <property name="mnemonic_widget">scrolledwindow3</property>
+        <property name="mnemonic_widget">note_text</property>
       </object>
       <packing>
         <property name="x_options">GTK_FILL</property>
       </packing>
     </child>
     <child>
-      <object class="GtkLabel" id="label13">
+      <object class="GtkLabel" id="date_label">
         <property name="visible">True</property>
         <property name="xalign">0</property>
         <property name="label" translatable="yes">_Date:</property>
@@ -110,11 +110,11 @@
         <property name="visible">True</property>
         <property name="top_padding">2</property>
         <child>
-          <object class="GtkLabel" id="label1">
+          <object class="GtkLabel" id="tags_label">
             <property name="visible">True</property>
             <property name="xalign">0</property>
             <property name="yalign">0</property>
-            <property name="label" translatable="yes">_Tags:</property>
+            <property name="label" translatable="yes">T_ags:</property>
             <property name="use_underline">True</property>
           </object>
         </child>
@@ -194,6 +194,7 @@
         <property name="yalign">0.60000002384185791</property>
         <property name="label" translatable="yes">_Rating:</property>
         <property name="use_underline">True</property>
+        <property name="mnemonic_widget">rating_spinbutton</property>
       </object>
       <packing>
         <property name="top_attach">5</property>
@@ -223,6 +224,7 @@
         <property name="yalign">0.60000002384185791</property>
         <property name="label" translatable="yes">_Title:</property>
         <property name="use_underline">True</property>
+        <property name="mnemonic_widget">title_entry</property>
       </object>
       <packing>
         <property name="top_attach">1</property>
diff --git a/extensions/edit_metadata/gth-edit-comment-page.c b/extensions/edit_metadata/gth-edit-comment-page.c
index 90a8342..2f75334 100644
--- a/extensions/edit_metadata/gth-edit-comment-page.c
+++ b/extensions/edit_metadata/gth-edit-comment-page.c
@@ -407,10 +407,12 @@ gth_edit_comment_page_init (GthEditCommentPage *self)
   	self->priv->date_selector = gth_time_selector_new ();
   	gtk_widget_show (self->priv->date_selector);
   	gtk_box_pack_start (GTK_BOX (GET_WIDGET ("date_selector_container")), self->priv->date_selector, FALSE, FALSE, 0);
+	gtk_label_set_mnemonic_widget (GTK_LABEL (GET_WIDGET ("date_label")), self->priv->date_combobox);
 
   	self->priv->tags_entry = gth_tags_entry_new ();
   	gtk_widget_show (self->priv->tags_entry);
   	gtk_box_pack_start (GTK_BOX (GET_WIDGET ("tags_entry_container")), self->priv->tags_entry, FALSE, FALSE, 0);
+	gtk_label_set_mnemonic_widget (GTK_LABEL (GET_WIDGET ("tags_label")), self->priv->tags_entry);
 }
 
 
diff --git a/extensions/importer/data/ui/import-preferences.ui b/extensions/importer/data/ui/import-preferences.ui
index 6836ed1..2eb912a 100644
--- a/extensions/importer/data/ui/import-preferences.ui
+++ b/extensions/importer/data/ui/import-preferences.ui
@@ -29,9 +29,9 @@
                     <child>
                       <object class="GtkFileChooserButton" id="destination_filechooserbutton">
                         <property name="visible">True</property>
-                        <property name="create_folders">False</property>
-                        <property name="local_only">False</property>
                         <property name="action">select-folder</property>
+                        <property name="local_only">False</property>
+                        <property name="create_folders">False</property>
                       </object>
                       <packing>
                         <property name="position">0</property>
@@ -48,10 +48,12 @@
           </object>
         </child>
         <child type="label">
-          <object class="GtkLabel" id="label1">
+          <object class="GtkLabel" id="destination_label">
             <property name="visible">True</property>
-            <property name="label" translatable="yes">Destination</property>
+            <property name="label" translatable="yes">_Destination</property>
             <property name="use_markup">True</property>
+            <property name="use_underline">True</property>
+            <property name="mnemonic_widget">destination_filechooserbutton</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
diff --git a/extensions/photo_importer/data/ui/photo-importer.ui b/extensions/photo_importer/data/ui/photo-importer.ui
index bceb217..46fa5dd 100644
--- a/extensions/photo_importer/data/ui/photo-importer.ui
+++ b/extensions/photo_importer/data/ui/photo-importer.ui
@@ -175,11 +175,12 @@
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkLabel" id="label4">
+                  <object class="GtkLabel" id="event_label">
                     <property name="visible">True</property>
                     <property name="xalign">0</property>
                     <property name="label" translatable="yes">_Event:</property>
                     <property name="use_underline">True</property>
+                    <property name="mnemonic_widget">event_entry</property>
                   </object>
                   <packing>
                     <property name="x_options">GTK_FILL</property>
diff --git a/gthumb/gth-tags-entry.c b/gthumb/gth-tags-entry.c
index a5cc024..07560a5 100644
--- a/gthumb/gth-tags-entry.c
+++ b/gthumb/gth-tags-entry.c
@@ -95,15 +95,28 @@ gth_tags_entry_finalize (GObject *obj)
 
 
 static void
+gth_tags_entry_grab_focus (GtkWidget *widget)
+{
+	GthTagsEntry *entry = GTH_TAGS_ENTRY (widget);
+
+	gtk_widget_grab_focus (entry->priv->entry);
+}
+
+
+static void
 gth_tags_entry_class_init (GthTagsEntryClass *klass)
 {
-	GObjectClass *object_class;
+	GObjectClass   *object_class;
+	GtkWidgetClass *widget_class;
 
 	parent_class = g_type_class_peek_parent (klass);
 	g_type_class_add_private (klass, sizeof (GthTagsEntryPrivate));
 
 	object_class = (GObjectClass*) (klass);
 	object_class->finalize = gth_tags_entry_finalize;
+
+	widget_class = (GtkWidgetClass *) klass;
+	widget_class->grab_focus = gth_tags_entry_grab_focus;
 }
 
 
@@ -659,6 +672,8 @@ gth_tags_entry_instance_init (GthTagsEntry *self)
 	GtkTreeViewColumn *column;
 	GtkCellRenderer   *renderer;
 
+	GTK_WIDGET_SET_FLAGS (self, GTK_CAN_FOCUS);
+
 	self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, GTH_TYPE_TAGS_ENTRY, GthTagsEntryPrivate);
 	self->priv->expanded_list.last_used = g_new0 (char *, 1);
 



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]