From a14545ff1cdf8a5b82073bf9f6315ae0fa5ed680 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Krier?= <ced@b2ck.com>
Date: Tue, 10 Jun 2008 15:47:06 +0200
Subject: [PATCH] Set default style for menubar by default

---
 share/tryton/tryton.glade | 13 +++++++++++--
 tryton/gui/main.py        |  7 +++++--
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/share/tryton/tryton.glade b/share/tryton/tryton.glade
index e75f8115f8..bff407c45e 100644
--- a/share/tryton/tryton.glade
+++ b/share/tryton/tryton.glade
@@ -820,11 +820,20 @@
                             <signal name="activate" handler="on_menubar_activate"/>
                             <child>
                               <widget class="GtkMenu" id="menubar_menu">
+                                <child>
+                                  <widget class="GtkRadioMenuItem" id="menubar_default">
+                                    <property name="visible">True</property>
+                                    <property name="label" translatable="yes">_Default</property>
+                                    <property name="use_underline">True</property>
+                                    <signal name="activate" handler="on_menubar_default_activate"/>
+                                  </widget>
+                                </child>
                                 <child>
                                   <widget class="GtkRadioMenuItem" id="menubar_both">
                                     <property name="visible">True</property>
                                     <property name="label" translatable="yes">Text _and Icons</property>
                                     <property name="use_underline">True</property>
+                                    <property name="group">menubar_default</property>
                                     <signal name="activate" handler="on_menubar_both_activate"/>
                                   </widget>
                                 </child>
@@ -833,7 +842,7 @@
                                     <property name="visible">True</property>
                                     <property name="label" translatable="yes">_Icons only</property>
                                     <property name="use_underline">True</property>
-                                    <property name="group">menubar_both</property>
+                                    <property name="group">menubar_default</property>
                                     <signal name="activate" handler="on_menubar_icons_activate"/>
                                   </widget>
                                 </child>
@@ -842,7 +851,7 @@
                                     <property name="visible">True</property>
                                     <property name="label" translatable="yes">_Text only</property>
                                     <property name="use_underline">True</property>
-                                    <property name="group">menubar_both</property>
+                                    <property name="group">menubar_default</property>
                                     <signal name="activate" handler="on_menubar_text_activate"/>
                                   </widget>
                                 </child>
diff --git a/tryton/gui/main.py b/tryton/gui/main.py
index 3e60d8abc0..d7bead8ccd 100644
--- a/tryton/gui/main.py
+++ b/tryton/gui/main.py
@@ -443,6 +443,7 @@ class Main(object):
             'on_send_request_activate': self.sig_request_new,
             'on_request_wait_activate': self.sig_request_wait,
             'on_opt_save_activate': lambda x: CONFIG.save(),
+            'on_menubar_default_activate': lambda x: self.sig_menubar('default'),
             'on_menubar_icons_activate': lambda x: self.sig_menubar('icons'),
             'on_menubar_text_activate': lambda x: self.sig_menubar('text'),
             'on_menubar_both_activate': lambda x: self.sig_menubar('both'),
@@ -524,7 +525,7 @@ class Main(object):
         }
         self.glade.get_widget('menubar_'+(CONFIG['client.toolbar'] or \
                 'both')).set_active(True)
-        self.sig_menubar(CONFIG['client.toolbar'] or 'both')
+        self.sig_menubar(CONFIG['client.toolbar'] or 'default')
         self.glade.get_widget('opt_form_tab_' + (CONFIG['client.form_tab'] or \
                 'left')).set_active(True)
         Main.sig_form_tab(CONFIG['client.form_tab'] or 'left')
@@ -594,7 +595,9 @@ class Main(object):
 
     def sig_menubar(self, option):
         CONFIG['client.toolbar'] = option
-        if option == 'both':
+        if option == 'default':
+            self.toolbar.set_style(False)
+        elif option == 'both':
             self.toolbar.set_style(gtk.TOOLBAR_BOTH)
         elif option == 'text':
             self.toolbar.set_style(gtk.TOOLBAR_TEXT)