add component button view items

2005-01-04  JP Rosevear  <jpr@novell.com>

	* evolution.xml: add component button view items

	* evolution.xml: set the toolbar look to "system" everywhere

	* evolution-signature-editor.xml: ditto

	* evolution-message-composer.xml: ditto

svn path=/trunk/; revision=28238

5 files changed, 38 insertions, 5 deletions

diff --git a/ui/ChangeLog b/ui/ChangeLog
index 9be10e25fe..6a9c24f2dc 100644
--- a/ui/ChangeLog
+++ b/ui/ChangeLog
@@ -1,5 +1,15 @@
 2005-01-04  JP Rosevear  <jpr@novell.com>
 
+	* evolution.xml: add component button view items
+	
+	* evolution.xml: set the toolbar look to "system" everywhere
+	
+	* evolution-signature-editor.xml: ditto
+
+	* evolution-message-composer.xml: ditto
+
+2005-01-04  JP Rosevear  <jpr@novell.com>
+	
 	* Makefile.am: remove dead files
 
 2004-12-16  Rodney Dawes  <dobey@novell.com>
diff --git a/ui/evolution-mail-message.xml b/ui/evolution-mail-message.xml
index 7f575399f8..26cc026b84 100644
--- a/ui/evolution-mail-message.xml
+++ b/ui/evolution-mail-message.xml
@@ -119,7 +119,8 @@
 
     <cmd name="MessageOpen"
      _tip="Open the selected message in a new window"
-     accel="*Control*o"/>
+     accel="*Control*o"
+     pixtype="pixbuf"/>
 
     <cmd name="MessagePostReply"
      _tip="Post a reply to a message in a Public folder"
diff --git a/ui/evolution-message-composer.xml b/ui/evolution-message-composer.xml
index 19d4365fe7..f8c0f1cc8a 100644
--- a/ui/evolution-message-composer.xml
+++ b/ui/evolution-message-composer.xml
@@ -143,7 +143,7 @@
 		
 	</menu>
 	
-	<dockitem name="Toolbar" behavior="exclusive" hlook="system" vlook="icon">
+	<dockitem name="Toolbar" behavior="exclusive" look="system">
 		<toolitem name="FileSend" verb="" pixtype="pixbuf" priority="1"/>
 		<toolitem name="FileAttach" verb="" pixtype="pixbuf" priority="1"/>	
 
diff --git a/ui/evolution-signature-editor.xml b/ui/evolution-signature-editor.xml
index 2b7ae371b6..9175a3d27c 100644
--- a/ui/evolution-signature-editor.xml
+++ b/ui/evolution-signature-editor.xml
@@ -66,7 +66,7 @@
 		<placeholder name="Component"/>
 	</menu>
 
-	<dockitem name="Toolbar" behavior="exclusive" hlook="system" vlook="icon">
+	<dockitem name="Toolbar" behavior="exclusive" look="system">
 		<toolitem name="FileSaveClose" verb=""/>
 	</dockitem>
 
diff --git a/ui/evolution.xml b/ui/evolution.xml
index b024dd785f..d8ab6065a5 100644
--- a/ui/evolution.xml
+++ b/ui/evolution.xml
@@ -10,6 +10,21 @@
     <cmd name="FileExit" _label="E_xit" _tip="Exit the program"
       pixtype="stock" pixname="gtk-quit" accel="*Control*q"/>
 
+    <cmd name="ViewButtonsIconText" _label="Icons _and text" 
+      type="radio" group="button_display" _tip="Display window buttons with icons and text"/>
+
+    <cmd name="ViewButtonsIcon" _label="_Icons only" 
+      type="radio" group="button_display" _tip="Display window buttons with icons only"/>
+
+    <cmd name="ViewButtonsText" _label="_Text only" 
+      type="radio" group="button_display" _tip="Display window buttons with text only"/>
+
+    <cmd name="ViewButtonsToolbar" _label="Tool_bar style" 
+      type="radio" group="button_display" _tip="Display window buttons using the desktop toolbar setting"/>
+
+    <cmd name="ViewButtonsHide" _label="_Hide buttons" 
+      type="toggle" _tip="Hide window buttons"/>
+
     <cmd name="ViewToolbar" _label="Tool_bar" type="toggle"
       _tip="Change the visibility of the toolbar" state="1"/>
 
@@ -76,6 +91,14 @@
     <submenu name="View" _label="_View">
       <placeholder name="ViewBegin"/>
       <submenu name="Window" _label="_Window"/>
+      <submenu name="Buttons" _label="Window B_uttons">
+            <menuitem name="ViewButtonsIconText" id="ViewButtonsIconText" verb=""/>
+            <menuitem name="ViewButtonsIcon" id="ViewButtonsIcon" verb=""/>
+            <menuitem name="ViewButtonsText" id="ViewButtonsText" verb=""/>
+            <menuitem name="ViewButtonsGnome" id="ViewButtonsToolbar" verb=""/>
+            <separator/>
+            <menuitem name="ViewButtonsHide" id="ViewButtonsHide" verb=""/>
+      </submenu>
       <menuitem name="ViewToolbar" id="ViewToolbar" verb="" accel="*Control**Shift*o"/>
       <placeholder name="ViewAfterControl"/>
     </submenu>
@@ -119,8 +142,7 @@
     </submenu>
   </menu>
 
-  <dockitem name="Toolbar" relief="none" behavior="exclusive" config="0" _tip="Main toolbar"
-            hlook="system" vlook="icon">
+  <dockitem name="Toolbar" relief="none" behavior="exclusive" config="0" _tip="Main toolbar" look="system">
     <control name="NewComboButton"/>
     <separator f="" name="eshell4"/>