[Xfce4-commits] <xfce4-settings:master> Don't hide the tab and set better label.

[Nick Schermer]

Updating branch refs/heads/master
         to 171bf0e20b75ae4578e55c5540459cfdeaef14d8 (commit)
       from 77f2f3aae93ce6c42a984565db2fa66fbadd5514 (commit)

commit 171bf0e20b75ae4578e55c5540459cfdeaef14d8
Author: Nick Schermer <nick at xfce.org>
Date:   Sun Jan 15 17:24:40 2012 +0100

    Don't hide the tab and set better label.
    
    Hiding the notebook completely feels a bit strange.

 dialogs/mouse-settings/main.c             |    1 -
 dialogs/mouse-settings/mouse-dialog.glade |    6 +++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/dialogs/mouse-settings/main.c b/dialogs/mouse-settings/main.c
index 5354794..2a567a9 100644
--- a/dialogs/mouse-settings/main.c
+++ b/dialogs/mouse-settings/main.c
@@ -1102,7 +1102,6 @@ mouse_settings_device_selection_changed (GtkBuilder *builder)
     gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (object), is_enabled > 0);
 
     object = gtk_builder_get_object (builder, "device-notebook");
-    gtk_notebook_set_show_tabs (GTK_NOTEBOOK (object), is_synaptics || is_wacom);
     gtk_widget_set_sensitive (GTK_WIDGET (object), is_enabled == 1);
 
     /* synaptics options */
diff --git a/dialogs/mouse-settings/mouse-dialog.glade b/dialogs/mouse-settings/mouse-dialog.glade
index f25b613..d67efcb 100644
--- a/dialogs/mouse-settings/mouse-dialog.glade
+++ b/dialogs/mouse-settings/mouse-dialog.glade
@@ -409,7 +409,7 @@
                       <object class="GtkLabel" id="label4">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">_General</property>
+                        <property name="label" translatable="yes">B_uttons and Feedback</property>
                         <property name="use_underline">True</property>
                       </object>
                       <packing>
@@ -618,7 +618,7 @@
                       </packing>
                     </child>
                     <child type="tab">
-                      <object class="GtkLabel" id="label5">
+                      <object class="GtkLabel" id="synaptics-label">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="label" translatable="yes">T_ouchpad</property>
@@ -747,7 +747,7 @@
                       </packing>
                     </child>
                     <child type="tab">
-                      <object class="GtkLabel" id="label13">
+                      <object class="GtkLabel" id="wacom-label">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="label" translatable="yes">Table_t</property>