show what letters do what for the button order

diff --git a/src/obconf.glade b/src/obconf.glade
index 20b5d6d73da450ead0b144e24fded4038599dabb..bbef16ea0d5d00960de66652a2aa158863c2ce57 100644 (file)
--- a/src/obconf.glade
+++ b/src/obconf.glade
@@ -614,60 +614,245 @@
                      </child>
 
                      <child>
-                       <widget class="GtkHBox" id="hbox44">
+                       <widget class="GtkVBox" id="vbox83">
                          <property name="visible">True</property>
                          <property name="homogeneous">False</property>
                          <property name="spacing">6</property>
 
                          <child>
-                           <widget class="GtkLabel" id="label90">
+                           <widget class="GtkHBox" id="hbox44">
                              <property name="visible">True</property>
-                             <property name="label" translatable="yes">_Button order:</property>
-                             <property name="use_underline">True</property>
-                             <property name="use_markup">False</property>
-                             <property name="justify">GTK_JUSTIFY_LEFT</property>
-                             <property name="wrap">False</property>
-                             <property name="selectable">False</property>
-                             <property name="xalign">0.5</property>
-                             <property name="yalign">0.5</property>
-                             <property name="xpad">0</property>
-                             <property name="ypad">0</property>
-                             <property name="mnemonic_widget">title_layout</property>
-                             <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                             <property name="width_chars">-1</property>
-                             <property name="single_line_mode">False</property>
-                             <property name="angle">0</property>
+                             <property name="homogeneous">False</property>
+                             <property name="spacing">6</property>
+
+                             <child>
+                               <widget class="GtkLabel" id="label90">
+                                 <property name="visible">True</property>
+                                 <property name="label" translatable="yes">_Button order:</property>
+                                 <property name="use_underline">True</property>
+                                 <property name="use_markup">False</property>
+                                 <property name="justify">GTK_JUSTIFY_LEFT</property>
+                                 <property name="wrap">False</property>
+                                 <property name="selectable">False</property>
+                                 <property name="xalign">0.5</property>
+                                 <property name="yalign">0.5</property>
+                                 <property name="xpad">0</property>
+                                 <property name="ypad">0</property>
+                                 <property name="mnemonic_widget">title_layout</property>
+                                 <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                                 <property name="width_chars">-1</property>
+                                 <property name="single_line_mode">False</property>
+                                 <property name="angle">0</property>
+                               </widget>
+                               <packing>
+                                 <property name="padding">0</property>
+                                 <property name="expand">False</property>
+                                 <property name="fill">False</property>
+                               </packing>
+                             </child>
+
+                             <child>
+                               <widget class="GtkEntry" id="title_layout">
+                                 <property name="visible">True</property>
+                                 <property name="tooltip" translatable="yes">N - The window's icon
+D - The all-desktops (sticky) button
+S - The shade (roll up) button
+L - The label (window title)
+I - The iconify (minimize) button
+M - The maximize button
+C - The close button</property>
+                                 <property name="can_focus">True</property>
+                                 <property name="editable">True</property>
+                                 <property name="visibility">True</property>
+                                 <property name="max_length">0</property>
+                                 <property name="text" translatable="yes"></property>
+                                 <property name="has_frame">True</property>
+                                 <property name="invisible_char">*</property>
+                                 <property name="activates_default">False</property>
+                                 <signal name="changed" handler="on_title_layout_changed" after="yes" last_modification_time="Fri, 25 May 2007 16:02:40 GMT"/>
+                               </widget>
+                               <packing>
+                                 <property name="padding">0</property>
+                                 <property name="expand">False</property>
+                                 <property name="fill">True</property>
+                               </packing>
+                             </child>
                            </widget>
                            <packing>
                              <property name="padding">0</property>
-                             <property name="expand">False</property>
-                             <property name="fill">False</property>
+                             <property name="expand">True</property>
+                             <property name="fill">True</property>
                            </packing>
                          </child>
 
                          <child>
-                           <widget class="GtkEntry" id="title_layout">
+                           <widget class="GtkHBox" id="hbox114">
                              <property name="visible">True</property>
-                             <property name="tooltip" translatable="yes">N - The window's icon
-D - The all-desktops (sticky) button
-S - The shade (roll up) button
-L - The label (window title)
-I - The iconify (minimize) button
-M - The maximize button
-C - The close button</property>
-                             <property name="can_focus">True</property>
-                             <property name="editable">True</property>
-                             <property name="visibility">True</property>
-                             <property name="max_length">0</property>
-                             <property name="text" translatable="yes"></property>
-                             <property name="has_frame">True</property>
-                             <property name="invisible_char">*</property>
-                             <property name="activates_default">False</property>
-                             <signal name="changed" handler="on_title_layout_changed" after="yes" last_modification_time="Fri, 25 May 2007 16:02:40 GMT"/>
+                             <property name="homogeneous">False</property>
+                             <property name="spacing">6</property>
+
+                             <child>
+                               <widget class="GtkLabel" id="label233">
+                                 <property name="visible">True</property>
+                                 <property name="label">    </property>
+                                 <property name="use_underline">False</property>
+                                 <property name="use_markup">False</property>
+                                 <property name="justify">GTK_JUSTIFY_LEFT</property>
+                                 <property name="wrap">False</property>
+                                 <property name="selectable">False</property>
+                                 <property name="xalign">0.5</property>
+                                 <property name="yalign">0.5</property>
+                                 <property name="xpad">0</property>
+                                 <property name="ypad">0</property>
+                                 <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                                 <property name="width_chars">-1</property>
+                                 <property name="single_line_mode">False</property>
+                                 <property name="angle">0</property>
+                               </widget>
+                               <packing>
+                                 <property name="padding">0</property>
+                                 <property name="expand">False</property>
+                                 <property name="fill">False</property>
+                               </packing>
+                             </child>
+
+                             <child>
+                               <widget class="GtkHBox" id="hbox115">
+                                 <property name="visible">True</property>
+                                 <property name="homogeneous">False</property>
+                                 <property name="spacing">6</property>
+
+                                 <child>
+                                   <widget class="GtkLabel" id="label229">
+                                     <property name="visible">True</property>
+                                     <property name="label" translatable="yes">N:
+L:
+I:
+M:</property>
+                                     <property name="use_underline">False</property>
+                                     <property name="use_markup">False</property>
+                                     <property name="justify">GTK_JUSTIFY_LEFT</property>
+                                     <property name="wrap">False</property>
+                                     <property name="selectable">False</property>
+                                     <property name="xalign">0</property>
+                                     <property name="yalign">0</property>
+                                     <property name="xpad">0</property>
+                                     <property name="ypad">0</property>
+                                     <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                                     <property name="width_chars">-1</property>
+                                     <property name="single_line_mode">False</property>
+                                     <property name="angle">0</property>
+                                   </widget>
+                                   <packing>
+                                     <property name="padding">0</property>
+                                     <property name="expand">False</property>
+                                     <property name="fill">False</property>
+                                   </packing>
+                                 </child>
+
+                                 <child>
+                                   <widget class="GtkLabel" id="label230">
+                                     <property name="visible">True</property>
+                                     <property name="label" translatable="yes">Window icon
+Window label (Title)
+Iconify (Minimize)
+Maximize</property>
+                                     <property name="use_underline">False</property>
+                                     <property name="use_markup">False</property>
+                                     <property name="justify">GTK_JUSTIFY_LEFT</property>
+                                     <property name="wrap">False</property>
+                                     <property name="selectable">False</property>
+                                     <property name="xalign">0</property>
+                                     <property name="yalign">0</property>
+                                     <property name="xpad">0</property>
+                                     <property name="ypad">0</property>
+                                     <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                                     <property name="width_chars">-1</property>
+                                     <property name="single_line_mode">False</property>
+                                     <property name="angle">0</property>
+                                   </widget>
+                                   <packing>
+                                     <property name="padding">0</property>
+                                     <property name="expand">False</property>
+                                     <property name="fill">False</property>
+                                   </packing>
+                                 </child>
+
+                                 <child>
+                                   <widget class="GtkVSeparator" id="vseparator1">
+                                     <property name="visible">True</property>
+                                   </widget>
+                                   <packing>
+                                     <property name="padding">0</property>
+                                     <property name="expand">False</property>
+                                     <property name="fill">False</property>
+                                   </packing>
+                                 </child>
+
+                                 <child>
+                                   <widget class="GtkLabel" id="label231">
+                                     <property name="visible">True</property>
+                                     <property name="label" translatable="yes">C:
+S:
+D:</property>
+                                     <property name="use_underline">False</property>
+                                     <property name="use_markup">False</property>
+                                     <property name="justify">GTK_JUSTIFY_LEFT</property>
+                                     <property name="wrap">False</property>
+                                     <property name="selectable">False</property>
+                                     <property name="xalign">0</property>
+                                     <property name="yalign">0</property>
+                                     <property name="xpad">0</property>
+                                     <property name="ypad">0</property>
+                                     <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                                     <property name="width_chars">-1</property>
+                                     <property name="single_line_mode">False</property>
+                                     <property name="angle">0</property>
+                                   </widget>
+                                   <packing>
+                                     <property name="padding">0</property>
+                                     <property name="expand">False</property>
+                                     <property name="fill">False</property>
+                                   </packing>
+                                 </child>
+
+                                 <child>
+                                   <widget class="GtkLabel" id="label232">
+                                     <property name="visible">True</property>
+                                     <property name="label" translatable="yes">Close
+Shade (Roll up/down)
+Omnipresent (On all desktops)</property>
+                                     <property name="use_underline">False</property>
+                                     <property name="use_markup">False</property>
+                                     <property name="justify">GTK_JUSTIFY_LEFT</property>
+                                     <property name="wrap">False</property>
+                                     <property name="selectable">False</property>
+                                     <property name="xalign">0</property>
+                                     <property name="yalign">0</property>
+                                     <property name="xpad">0</property>
+                                     <property name="ypad">0</property>
+                                     <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                                     <property name="width_chars">-1</property>
+                                     <property name="single_line_mode">False</property>
+                                     <property name="angle">0</property>
+                                   </widget>
+                                   <packing>
+                                     <property name="padding">0</property>
+                                     <property name="expand">False</property>
+                                     <property name="fill">False</property>
+                                   </packing>
+                                 </child>
+                               </widget>
+                               <packing>
+                                 <property name="padding">0</property>
+                                 <property name="expand">True</property>
+                                 <property name="fill">True</property>
+                               </packing>
+                             </child>
                            </widget>
                            <packing>
                              <property name="padding">0</property>
-                             <property name="expand">False</property>
+                             <property name="expand">True</property>
                              <property name="fill">True</property>
                            </packing>
                          </child>

diff --git a/src/strings.c b/src/strings.c
index ef7bf790f6660f1dea308bb7f2098a7869dc46a5..7e2bf0c90282bf21fa04308edb32b6355aca8257 100644 (file)
--- a/src/strings.c
+++ b/src/strings.c
@@ -24,6 +24,21 @@ gchar *s = N_("N - The window's icon\n"
               "I - The iconify (minimize) button\n"
               "M - The maximize button\n"
               "C - The close button");
+gchar *s = N_("    ");
+gchar *s = N_("N:\n"
+              "L:\n"
+              "I:\n"
+              "M:");
+gchar *s = N_("Window icon\n"
+              "Window label (Title)\n"
+              "Iconify (Minimize)\n"
+              "Maximize");
+gchar *s = N_("C:\n"
+              "S:\n"
+              "D:");
+gchar *s = N_("Close\n"
+              "Shade (Roll up/down)\n"
+              "Omnipresent (On all desktops)");
 gchar *s = N_("<span weight=\"bold\">Fonts</span>");
 gchar *s = N_("    ");
 gchar *s = N_("_Active window title: ");