[Xfce4-commits] <xfce4-settings:master> Don't use "Both" in comboboxes (bug #9491).

[Jérôme Guelfucci]

Updating branch refs/heads/master
         to 4346168db9aba1a9d4878b6ebe9aca41fd898917 (commit)
       from a04edfc41ab2035383793ca8315e2e61351108c2 (commit)

commit 4346168db9aba1a9d4878b6ebe9aca41fd898917
Author: Jérôme Guelfucci <jeromeg at xfce.org>
Date:   Wed Dec 19 09:27:19 2012 +0100

    Don't use "Both" in comboboxes (bug #9491).

 .../appearance-settings/appearance-dialog.glade    |   16 ++++++++--------
 dialogs/display-settings/main.c                    |    8 ++++----
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/dialogs/appearance-settings/appearance-dialog.glade b/dialogs/appearance-settings/appearance-dialog.glade
index a6c656d..34b975b 100644
--- a/dialogs/appearance-settings/appearance-dialog.glade
+++ b/dialogs/appearance-settings/appearance-dialog.glade
@@ -21,8 +21,8 @@
             <property name="can_focus">False</property>
             <property name="layout_style">end</property>
             <child>
-              <object class="GtkButton" id="button2">
-                <property name="label">gtk-help</property>
+              <object class="GtkButton" id="button1">
+                <property name="label">gtk-close</property>
                 <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
@@ -33,12 +33,11 @@
                 <property name="expand">False</property>
                 <property name="fill">False</property>
                 <property name="position">0</property>
-                <property name="secondary">True</property>
               </packing>
             </child>
             <child>
-              <object class="GtkButton" id="button1">
-                <property name="label">gtk-close</property>
+              <object class="GtkButton" id="button2">
+                <property name="label">gtk-help</property>
                 <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
@@ -49,6 +48,7 @@
                 <property name="expand">False</property>
                 <property name="fill">False</property>
                 <property name="position">0</property>
+                <property name="secondary">True</property>
               </packing>
             </child>
           </object>
@@ -646,8 +646,8 @@
       </object>
     </child>
     <action-widgets>
-      <action-widget response="-11">button2</action-widget>
       <action-widget response="0">button1</action-widget>
+      <action-widget response="-11">button2</action-widget>
     </action-widgets>
   </object>
   <object class="GtkListStore" id="liststore1">
@@ -683,10 +683,10 @@
         <col id="0" translatable="yes">Text</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Both</col>
+        <col id="0" translatable="yes">Text under icons</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Both Horizontal</col>
+        <col id="0" translatable="yes">Text next to icons</col>
       </row>
     </data>
   </object>
diff --git a/dialogs/display-settings/main.c b/dialogs/display-settings/main.c
index 4136542..6dcfc5b 100644
--- a/dialogs/display-settings/main.c
+++ b/dialogs/display-settings/main.c
@@ -114,7 +114,7 @@ static const XfceRotation reflection_names[] =
     { 0,                         N_("None") },
     { RR_Reflect_X,              N_("Horizontal") },
     { RR_Reflect_Y,              N_("Vertical") },
-    { RR_Reflect_X|RR_Reflect_Y, N_("Both") }
+    { RR_Reflect_X|RR_Reflect_Y, N_("Horizontal and Vertical") }
 };
 
 
@@ -1516,7 +1516,7 @@ display_settings_dialog_new (GtkBuilder *builder)
     combobox = gtk_builder_get_object (builder, "randr-rotation");
     display_settings_combo_box_create (GTK_COMBO_BOX (combobox));
     g_signal_connect (G_OBJECT (combobox), "changed", G_CALLBACK (display_setting_rotations_changed), builder);
-    
+
     check = gtk_builder_get_object (builder, "minimal-autoshow");
     xfconf_g_property_bind (display_channel, "/Notify", G_TYPE_BOOLEAN, check,
                             "active");
@@ -1772,8 +1772,8 @@ display_settings_show_main_dialog (GdkDisplay *display)
 }
 
 static gboolean
-display_settings_minimal_dialog_key_press_event(GtkWidget *widget, 
-                                                GdkEventKey *event, 
+display_settings_minimal_dialog_key_press_event(GtkWidget *widget,
+                                                GdkEventKey *event,
                                                 gpointer user_data)
 {
     if (event->keyval == GDK_Escape)