improve mnemonic handling

src/form.c

@@ -912,7 +912,7 @@ form_create_widget (GtkWidget * dlg)
             case YAD_FIELD_FULL_BUTTON:
               e = gtk_button_new ();
               g_signal_connect (G_OBJECT (e), "clicked", G_CALLBACK (button_clicked_cb), NULL);
-              gtk_container_add (GTK_CONTAINER (e), get_label (fld->name, 2));
+              gtk_container_add (GTK_CONTAINER (e), get_label (fld->name, 2, e));
               gtk_widget_set_name (e, "yad-form-button");
               if (fld->type == YAD_FIELD_BUTTON)
                 gtk_button_set_relief (GTK_BUTTON (e), GTK_RELIEF_NONE);

src/main.c

@@ -434,7 +434,7 @@ create_dialog (void)
               YadButton *b = (YadButton *) tmp->data;
 
               btn = gtk_button_new ();
-              gtk_container_add (GTK_CONTAINER (btn), get_label (b->name, 2));
+              gtk_container_add (GTK_CONTAINER (btn), get_label (b->name, 2, btn));
               //gtk_widget_set_halign (btn, GTK_ALIGN_FILL);
               //gtk_widget_set_valign (btn, GTK_ALIGN_FILL);
               g_object_set_data (G_OBJECT (btn), "resp", GINT_TO_POINTER (b->response));
@@ -452,9 +452,9 @@ create_dialog (void)
             {
               /* add close button */
               btn = gtk_button_new ();
-              gtk_container_add (GTK_CONTAINER (btn), get_label ("yad-close", 2));
+              gtk_container_add (GTK_CONTAINER (btn), get_label ("yad-close", 2, btn));
               //gtk_widget_set_halign (btn, GTK_ALIGN_FILL);
-              //gtk_widget_set_valign (btn, GTK_ALIGN_FILL);              
+              //gtk_widget_set_valign (btn, GTK_ALIGN_FILL);
               g_object_set_data (G_OBJECT (btn), "resp", GINT_TO_POINTER (YAD_RESPONSE_OK));
               g_signal_connect (G_OBJECT (btn), "clicked", G_CALLBACK (btn_cb), NULL);
               gtk_box_pack_start (GTK_BOX (bbox), btn, TRUE, TRUE, 0);
@@ -464,7 +464,7 @@ create_dialog (void)
             {
               /* add cancel button */
               btn = gtk_button_new ();
-              gtk_container_add (GTK_CONTAINER (btn), get_label ("yad-cancel", 2));
+              gtk_container_add (GTK_CONTAINER (btn), get_label ("yad-cancel", 2, btn));
               //gtk_widget_set_halign (btn, GTK_ALIGN_FILL);
               //gtk_widget_set_valign (btn, GTK_ALIGN_FILL);
               g_object_set_data (G_OBJECT (btn), "resp", GINT_TO_POINTER (YAD_RESPONSE_CANCEL));
@@ -473,7 +473,7 @@ create_dialog (void)
 
               /*add ok button */
               btn = gtk_button_new ();
-              gtk_container_add (GTK_CONTAINER (btn), get_label ("yad-ok", 2));
+              gtk_container_add (GTK_CONTAINER (btn), get_label ("yad-ok", 2, btn));
               //gtk_widget_set_halign (btn, GTK_ALIGN_FILL);
               //gtk_widget_set_valign (btn, GTK_ALIGN_FILL);
               g_object_set_data (G_OBJECT (btn), "resp", GINT_TO_POINTER (YAD_RESPONSE_OK));

src/notebook.c

@@ -63,7 +63,7 @@ notebook_create_widget (GtkWidget * dlg)
       gtk_widget_set_margin_top (s, options.notebook_data.borders);
       gtk_widget_set_margin_bottom (s, options.notebook_data.borders);
 
-      gtk_notebook_append_page (GTK_NOTEBOOK (w), s, get_label ((gchar *) tab->data, 0));
+      gtk_notebook_append_page (GTK_NOTEBOOK (w), s, get_label ((gchar *) tab->data, 0, s));
       gtk_container_child_set (GTK_CONTAINER (w), s, "tab-expand", options.notebook_data.expand, NULL);
     }
 

src/util.c

@@ -381,7 +381,7 @@ get_tabs (key_t key, gboolean create)
 }
 
 GtkWidget *
-get_label (gchar *str, guint border)
+get_label (gchar *str, guint border, GtkWidget *w)
 {
   GtkWidget *t, *i, *l;
   YadStock it;
@@ -394,7 +394,7 @@ get_label (gchar *str, guint border)
 
   t = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
   gtk_container_set_border_width (GTK_CONTAINER (t), border);
-  
+
   gtk_widget_set_halign (t, GTK_ALIGN_CENTER);
   gtk_widget_set_valign (t, GTK_ALIGN_CENTER);
 
@@ -424,6 +424,8 @@ get_label (gchar *str, guint border)
 
   if (l)
     {
+      if (w)
+        gtk_label_set_mnemonic_widget (GTK_LABEL (l), w);
       gtk_label_set_xalign (GTK_LABEL (l), 0.0);
       gtk_box_pack_start (GTK_BOX (t), l, FALSE, FALSE, 1);
     }

src/yad.h

@@ -621,7 +621,7 @@ gchar **split_arg (const gchar *str);
 
 YadNTabs *get_tabs (key_t key, gboolean create);
 
-GtkWidget *get_label (gchar *str, guint border);
+GtkWidget *get_label (gchar *str, guint border, GtkWidget *w);
 
 gchar *escape_str (gchar *str);
 gchar *escape_char (gchar *str, gchar ch);