[Xfce4-commits] <xfdesktop:master> Fix keyboard navigation in settings app

[Eric Koegel]

Updating branch refs/heads/master
         to 013856d55f3d8576494034d875173660bfec3f71 (commit)
       from c81192e242f2c715ea88602f1434b5c76093aa2b (commit)

commit 013856d55f3d8576494034d875173660bfec3f71
Author: Eric Koegel <eric.koegel at gmail.com>
Date:   Sun Nov 3 09:35:36 2013 +0300

    Fix keyboard navigation in settings app
    
    This also improves the keyboard mnemonics for the controls on the
    background tab.

 settings/main.c                                       |    7 +++++--
 settings/xfdesktop-settings-appearance-frame-ui.glade |   11 ++++++-----
 settings/xfdesktop-settings-ui.glade                  |    2 +-
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/settings/main.c b/settings/main.c
index f5d59dd..050a4d5 100644
--- a/settings/main.c
+++ b/settings/main.c
@@ -1724,8 +1724,11 @@ xfdesktop_settings_dialog_setup_tabs(GtkBuilder *main_gxml,
     panel->frame_image_list = GTK_WIDGET(gtk_builder_get_object(appearance_gxml,
                                                                 "frame_image_list"));
 
-    gtk_table_attach_defaults(GTK_TABLE(appearance_container),
-                             appearance_settings, 0,1,0,1);
+    /* Add the background tab widgets to the main window and don't display the
+     * notebook label/tab */
+    gtk_notebook_append_page(GTK_NOTEBOOK(appearance_container),
+                             appearance_settings, NULL);
+    gtk_notebook_set_show_tabs(GTK_NOTEBOOK(appearance_container), FALSE);
 
     /* icon view area */
     panel->frame_image_list = GTK_WIDGET(gtk_builder_get_object(appearance_gxml,
diff --git a/settings/xfdesktop-settings-appearance-frame-ui.glade b/settings/xfdesktop-settings-appearance-frame-ui.glade
index f992dae..a86ed18 100644
--- a/settings/xfdesktop-settings-appearance-frame-ui.glade
+++ b/settings/xfdesktop-settings-appearance-frame-ui.glade
@@ -78,8 +78,9 @@
                       <object class="GtkLabel" id="label_folder">
                         <property name="visible">True</property>
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                        <property name="label" translatable="yes">Folder:</property>
+                        <property name="label" translatable="yes">_Folder:</property>
                         <property name="use_underline">True</property>
+                        <property name="mnemonic_widget">btn_folder</property>
                       </object>
                       <packing>
                         <property name="left-attach">0</property>
@@ -94,7 +95,6 @@
                       <object class="GtkFileChooserButton" id="btn_folder">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
-                        <property name="receives_default">True</property>
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                         <property name="tooltip-text" translatable="yes">Choose the folder to select wallpapers from</property>
                         <property name="action">GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER</property>
@@ -166,8 +166,9 @@
                       <object class="GtkLabel" id="label_color">
                         <property name="visible">True</property>
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                        <property name="label" translatable="yes">Color:</property>
+                        <property name="label" translatable="yes">C_olor:</property>
                         <property name="use_underline">True</property>
+                        <property name="mnemonic_widget">combo_colors</property>
                       </object>
                       <packing>
                         <property name="left-attach">0</property>
@@ -274,7 +275,7 @@
                         <property name="sensitive">True</property>
                         <property name="can_focus">True</property>
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                        <property name="label" translatable="yes">_Change the background </property>
+                        <property name="label" translatable="yes">Change the _background </property>
                         <property name="tooltip-text" translatable="yes">Automatically select a different background from the current directory.</property>
                         <property name="use_underline">True</property>
                         <property name="draw_indicator">True</property>
@@ -326,7 +327,7 @@
                         <property name="label" translatable="yes">_Random Order</property>
                         <property name="use_underline">True</property>
                         <property name="draw_indicator">True</property>
-                        <property name="tooltip-text" translatable="yes">Randomly selects another image from the same directory when the wallpaper is to cycle. Overrides the Chronological option.</property>
+                        <property name="tooltip-text" translatable="yes">Randomly selects another image from the same directory when the wallpaper is to cycle.</property>
                       </object>
                       <packing>
                         <property name="expand">False</property>
diff --git a/settings/xfdesktop-settings-ui.glade b/settings/xfdesktop-settings-ui.glade
index ff04b37..fa50ac1 100644
--- a/settings/xfdesktop-settings-ui.glade
+++ b/settings/xfdesktop-settings-ui.glade
@@ -136,7 +136,7 @@
                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                 <property name="border_width">6</property>
                 <child>
-                  <object class="GtkTable" id="notebook_screens">
+                  <object class="GtkNotebook" id="notebook_screens">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                   </object>