This patch fixes bug 39488 and makes most all of the toolbar buttons follow the GNOME setting. The New button isn't following the setting, because it is a custom widget control and code changes are required to make it work. It needs an API addition, a property for whether or not the button should be priority text, and code to listen to the gconf key for the GNOME toolbar style setting, so it can update if it changes. This patch only changes the XML in the ui/ directory, so that the bonobo UI toolbars generally follow the settings. -- dobey
Index: evolution-comp-editor.xml
===================================================================
RCS file: /cvs/gnome/evolution/ui/evolution-comp-editor.xml,v
retrieving revision 1.18
diff -u -r1.18 evolution-comp-editor.xml
--- evolution-comp-editor.xml 6 Aug 2003 02:28:51 -0000 1.18
+++ evolution-comp-editor.xml 5 Jan 2004 19:34:41 -0000
@@ -70,7 +70,7 @@
</menu>
<dockitem name="Toolbar" relief="none" behavior="exclusive"
- _tip="Main toolbar" hlook="both_horiz" vlook="icon">
+ _tip="Main toolbar" hlook="system" vlook="icon">
<toolitem name="FileSaveAndClose" verb="" _label="Save and Close" priority="1"/>
Index: evolution-contact-editor.xml
===================================================================
RCS file: /cvs/gnome/evolution/ui/evolution-contact-editor.xml,v
retrieving revision 1.24
diff -u -r1.24 evolution-contact-editor.xml
--- evolution-contact-editor.xml 12 Sep 2003 13:34:22 -0000 1.24
+++ evolution-contact-editor.xml 5 Jan 2004 19:34:41 -0000
@@ -73,7 +73,7 @@
</menu>
<dockitem name="Toolbar" relief="none" behavior="exclusive"
- hlook="both_horiz" vlook="icon">
+ hlook="system" vlook="icon">
<toolitem name="ContactEditorSaveClose" verb=""
_label="Save and Close" priority="1" pixtype="pixbuf"/>
Index: evolution-contact-list-editor.xml
===================================================================
RCS file: /cvs/gnome/evolution/ui/evolution-contact-list-editor.xml,v
retrieving revision 1.11
diff -u -r1.11 evolution-contact-list-editor.xml
--- evolution-contact-list-editor.xml 12 Sep 2003 13:34:22 -0000 1.11
+++ evolution-contact-list-editor.xml 5 Jan 2004 19:34:41 -0000
@@ -49,7 +49,7 @@
</menu>
<dockitem name="Toolbar" relief="none" behavior="exclusive"
- hlook="both_horiz" vlook="icon">
+ hlook="system" vlook="icon">
<toolitem name="ContactListEditorSaveClose" verb="" _label="Save and Close" priority="1" pixtype="pixbuf"/>
<separator/>
Index: evolution-event-editor.xml
===================================================================
RCS file: /cvs/gnome/evolution/ui/evolution-event-editor.xml,v
retrieving revision 1.13
diff -u -r1.13 evolution-event-editor.xml
--- evolution-event-editor.xml 24 Feb 2003 02:41:45 -0000 1.13
+++ evolution-event-editor.xml 5 Jan 2004 19:34:41 -0000
@@ -39,7 +39,7 @@
</menu>
<dockitem name="Toolbar" relief="none" behavior="exclusive"
- _tip="Main toolbar" hlook="both_horiz" vlook="icon">
+ _tip="Main toolbar" hlook="system" vlook="icon">
<placeholder name="Actions">
<separator f="" name="eventeditor2"/>
Index: evolution-mail-messagedisplay.xml
===================================================================
RCS file: /cvs/gnome/evolution/ui/evolution-mail-messagedisplay.xml,v
retrieving revision 1.11
diff -u -r1.11 evolution-mail-messagedisplay.xml
--- evolution-mail-messagedisplay.xml 18 Dec 2003 16:08:39 -0000 1.11
+++ evolution-mail-messagedisplay.xml 5 Jan 2004 19:34:41 -0000
@@ -47,8 +47,6 @@
relief="none"
behavior="exclusive"
_tip="Main toolbar"
- hlook="both_horiz"
- vlook="icon">
<placeholder name="MailMessageToolbar"/>
<separator f="" name="emailmessage"/>
<placeholder name="MailNextButtons"/>
Index: evolution-message-composer.xml
===================================================================
RCS file: /cvs/gnome/evolution/ui/evolution-message-composer.xml,v
retrieving revision 1.40
diff -u -r1.40 evolution-message-composer.xml
--- evolution-message-composer.xml 20 Nov 2002 22:57:13 -0000 1.40
+++ evolution-message-composer.xml 5 Jan 2004 19:34:41 -0000
@@ -132,7 +132,7 @@
</menu>
- <dockitem name="Toolbar" behavior="exclusive" hlook="both_horiz" vlook="icon">
+ <dockitem name="Toolbar" behavior="exclusive" hlook="system" vlook="icon">
<toolitem name="FileSend" verb="" pixtype="pixbuf" priority="1"/>
<toolitem name="FileAttach" verb="" pixtype="pixbuf" priority="1"/>
Index: evolution-signature-editor.xml
===================================================================
RCS file: /cvs/gnome/evolution/ui/evolution-signature-editor.xml,v
retrieving revision 1.13
diff -u -r1.13 evolution-signature-editor.xml
--- evolution-signature-editor.xml 12 Sep 2003 13:34:22 -0000 1.13
+++ evolution-signature-editor.xml 5 Jan 2004 19:34:41 -0000
@@ -66,7 +66,7 @@
<placeholder name="Component"/>
</menu>
- <dockitem name="Toolbar" behavior="exclusive" hlook="both_horiz" vlook="icon">
+ <dockitem name="Toolbar" behavior="exclusive" hlook="system" vlook="icon">
<toolitem name="FileSaveClose" verb=""/>
</dockitem>
Index: evolution.xml
===================================================================
RCS file: /cvs/gnome/evolution/ui/evolution.xml,v
retrieving revision 1.85
diff -u -r1.85 evolution.xml
--- evolution.xml 17 Nov 2003 20:04:11 -0000 1.85
+++ evolution.xml 5 Jan 2004 19:34:41 -0000
@@ -108,7 +108,7 @@
</menu>
<dockitem name="Toolbar" relief="none" behavior="exclusive" config="0" _tip="Main toolbar"
- hlook="both_horiz" vlook="icon">
+ hlook="system" vlook="icon">
<control name="NewComboButton"/>
<separator f="" name="eshell4"/>
Attachment:
signature.asc
Description: This is a digitally signed message part