From 6145f688cc4154f580c4443f999fd14a027a14d8 Mon Sep 17 00:00:00 2001
From: Miguel de Icaza <miguel@ximian.com>
Date: Thu, 8 Mar 2001 02:06:26 +0000
Subject: New function. Used to store integer values into the configuration
 engine.

2001-03-06  Miguel de Icaza  <miguel@ximian.com>

	* e-msg-composer.c (set_config): New function.  Used to store
	integer values into the configuration engine.  Handles the case of
	Bonobo-conf being installed, or falls back to gnome_config.

	* e-msg-composer-hdrs.c (add_header): Renamed to be
	header_new_recipient().  Now we take care of the other cases in
	create_headers, which is a lot nicer now.

	(create_optionmenu): Removed extra "name" argument which was not
	being used anyways (the only arg passed was From:).
	(init): Removed all the redundant NULL initialization by using
	nice g_new0

	(create_headers): New function, much cleaner.

	Use of Pair structure everywhere instead of individual widgets to
	keep track of which ones are visible and which ones are not.

	* e-msg-composer.c (setup_ui): Handle ViewFrom and ViewBCC
	commands.
	(menu_view_bcc_cb, menu_view_from_cb): New functions that
	implement the features described.

	(menu_format_html_cb): Removed unrequired test, as
	e_msg_composer_set_send_html already optimizes the case of the
	state being the same.
	(menu_security_pgp_encrypt_cb): Remove redundant code.
	(menu_security_pgp_sign_cb): ditto.

2001-03-06  Miguel de Icaza  <miguel@ximian.com>

	* evolution-message-composer.xml: Reorder menus to be File, Edit,
	View, Insert, Format (instead of File, Edit, Format, View, Insert).

	Add View/From Field and View/From BCC

	Add Insert/File.

	Add File/Send menu item.

	Change the look to follow the "mailer" look (thiner display).

svn path=/trunk/; revision=8590
---
 ui/ChangeLog                      | 13 ++++++++++
 ui/evolution-message-composer.xml | 53 ++++++++++++++++++++++++++++-----------
 2 files changed, 52 insertions(+), 14 deletions(-)

(limited to 'ui')

diff --git a/ui/ChangeLog b/ui/ChangeLog
index d1216c94ff..2851194612 100644
--- a/ui/ChangeLog
+++ b/ui/ChangeLog
@@ -1,5 +1,18 @@
 2001-03-06  Miguel de Icaza  <miguel@ximian.com>
 
+	* evolution-message-composer.xml: Reorder menus to be File, Edit,
+	View, Insert, Format (instead of File, Edit, Format, View, Insert).
+
+	Add View/From Field and View/From BCC
+
+	Add Insert/File.
+
+	Add File/Send menu item.
+
+	Change the look to follow the "mailer" look (thiner display).
+
+	
+
 	* evolution-tasks.xml: Added "File/New/Task" as well.
 
 	* evolution-mail.xml: Added "File/New/Mail Message" at the top
diff --git a/ui/evolution-message-composer.xml b/ui/evolution-message-composer.xml
index 06152658fc..1d2707780a 100644
--- a/ui/evolution-message-composer.xml
+++ b/ui/evolution-message-composer.xml
@@ -30,11 +30,22 @@
 		pixtype="stock" pixname="Send Mail"/> 
 
 		<cmd name="FileAttach" _label="Attach" _tip="Attach a file"
-		pixtype="stock" pixname="Attach" accel="*Ctrl**Alt*A"/>
+		pixtype="stock" pixname="Attach"/>
 
 		<cmd name="FormatHtml" _label="HTML" _tip="Send the mail in HTML format"
 		type="toggle" state="0"/> 
 
+		<cmd name="ViewFrom" _label="_From Field"
+		_tip="Toggles whether the From chooser is displayed" type="toggle" state="0"/>
+
+		<cmd name="ViewCC" _label="_Cc Field"
+		_tip="Toggles whether the CC field is displayed"
+		type="toggle" state="0"/>
+			    
+		<cmd name="ViewBCC" _label="_Bcc Field"
+		_tip="Toggles whether the BCC field is displayed"
+		type="toggle" state="0"/>
+
 		<cmd name="ViewAttach" _label="Show attachments" _tip="Show / hide attachments"
 		type="toggle" state="0"/> 
 	
@@ -59,6 +70,12 @@
 
 			<placeholder name="FileOps"/>
 
+			<menuitem name="FileSend" verb="" _label="Send"/>
+
+			<menuitem name="FileSendLater" verb="" _label="Send _Later"/>
+
+			<separator/>
+	    
 			<menuitem name="FileSave" verb="" _label="_Save"/>
 
 			<menuitem name="FileSaveAs" verb="" _label="Save _As..."/>
@@ -74,11 +91,6 @@
 
 			<separator/>
 
-			<menuitem name="FileSend" verb="" _label="Send"/>
-
-			<menuitem name="FileSendLater" verb="" _label="Send _Later"/>
-
-			<separator/>
 
 			<menuitem name="FileClose" verb="" _label="_Close"/>
 
@@ -87,16 +99,29 @@
 
 		<submenu name="Edit" _label="_Edit"/>
               
+		<submenu name="View" _label="_View">
 
-		<submenu name="Format" _label="F_ormat">
-
-			<menuitem name="FormatHtml" verb=""/>
-
+			<menuitem name="ViewAttach" verb=""
+			_label="Show _attachments"/>
+	  
+	                <separator/>
+	    
+	                <menuitem name="ViewFrom" verb=""/>
+	                <menuitem name="ViewCC" verb=""/>
+	                <menuitem name="ViewBCC" verb=""/>
 		</submenu>
 
-		<submenu name="View" _label="_View">
+                <submenu name="Insert" _label="_Insert">
+	                <menuitem name="FileAttach" verb=""
+	                _label="_File"/>
+	  
+                	<placeholder name="Component">
+	                </placeholder>
+                </submenu>
+      
+		<submenu name="Format" _label="F_ormat">
 
-			<menuitem name="ViewAttach" verb="" _label="Show _attachments"/>
+			<menuitem name="FormatHtml" verb=""/>
 
 		</submenu>
 
@@ -126,9 +151,9 @@
 
 	</menu>
 
-	<dockitem name="Toolbar" behavior="exclusive">
+	<dockitem name="Toolbar" behavior="exclusive" hlook="text" vlook="icon">
 
-		<toolitem name="FileSend" verb=""  _tip="Send this message now"/>
+		<toolitem name="FileSend" verb=""  _tip="Send this message now" priority="1"/>
 
 		<toolitem name="FileAttach" verb=""/>
 
-- 
cgit