improvements, make it look more like the event editor.

2001-08-08  Chris Toshok  <toshok@ximian.com>

	* evolution-contact-list-editor.xml: improvements, make it look
	more like the event editor.

	* evolution-contact-editor.xml: same.

	* evolution-addressbook.xml: Contact Group => Contact List.

svn path=/trunk/; revision=11796

4 files changed, 39 insertions, 198 deletions

diff --git a/ui/ChangeLog b/ui/ChangeLog
index 46da1f30d1..d102dc0a7c 100644
--- a/ui/ChangeLog
+++ b/ui/ChangeLog
@@ -1,3 +1,12 @@
+2001-08-08  Chris Toshok  <toshok@ximian.com>
+
+	* evolution-contact-list-editor.xml: improvements, make it look
+	more like the event editor.
+
+	* evolution-contact-editor.xml: same.
+
+	* evolution-addressbook.xml: Contact Group => Contact List.
+
 2001-08-08  Nat Friedman  <nat@ximian.com>
 
 	* evolution-contact-editor.xml: Removed Print Envelope since it's
diff --git a/ui/evolution-addressbook.xml b/ui/evolution-addressbook.xml
index fd6ac7d530..e38a778391 100644
--- a/ui/evolution-addressbook.xml
+++ b/ui/evolution-addressbook.xml
@@ -66,7 +66,7 @@
 	                        	 _label="_Contact"
 					 pixtype="pixbuf"/>
 	                        	<menuitem name="ContactNewList" verb=""
-	                        	 _label="_Contact Group"
+	                        	 _label="_Contact List"
 					 pixtype="pixbuf"/>
 	                                <separator/>
 	                        </placeholder>
diff --git a/ui/evolution-contact-editor.xml b/ui/evolution-contact-editor.xml
index 12e9e0ce33..cc8e8596dc 100644
--- a/ui/evolution-contact-editor.xml
+++ b/ui/evolution-contact-editor.xml
@@ -1,173 +1,4 @@
 <Root>
-<!--
-
-/* Menu bar */
-
-static GnomeUIInfo file_new_menu[] = {
-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: _Appointment"), NULL, NULL),
-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: Meeting Re_quest"), NULL, NULL),
-	GNOMEUIINFO_SEPARATOR,
-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: _Mail Message"), NULL, NULL),
-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: _Contact"), NULL, NULL),
-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: _Task"), NULL, NULL),
-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: Task _Request"), NULL, NULL),
-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: _Journal Entry"), NULL, NULL),
-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: _Note"), NULL, NULL),
-	GNOMEUIINFO_SEPARATOR,
-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: Ch_oose Form..."), NULL, NULL),
-	GNOMEUIINFO_END
-};
-
-static GnomeUIInfo file_page_setup_menu[] = {
-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: _Memo Style"), NULL, NULL),
-	GNOMEUIINFO_SEPARATOR,
-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: Define Print _Styles..."), NULL, NULL),
-	GNOMEUIINFO_END
-};
-
-static GnomeUIInfo file_menu[] = {
-	GNOMEUIINFO_MENU_NEW_SUBTREE (file_new_menu),
-	GNOMEUIINFO_SEPARATOR,
-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: S_end"), NULL, NULL),
-	GNOMEUIINFO_SEPARATOR,
-	GNOMEUIINFO_MENU_SAVE_ITEM (file_save_cb, NULL),
-	GNOMEUIINFO_MENU_SAVE_AS_ITEM (file_save_as_cb, NULL),
-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: Save Attac_hments..."), NULL, NULL),
-	GNOMEUIINFO_SEPARATOR,
-	GNOMEUIINFO_ITEM_NONE (N_("_Delete"), NULL, delete_cb),
-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: _Move to Folder..."), NULL, NULL),
-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: Cop_y to Folder..."), NULL, NULL),
-	GNOMEUIINFO_SEPARATOR,
-	GNOMEUIINFO_SUBTREE (N_("Page Set_up"), file_page_setup_menu),
-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: Print Pre_view"), NULL, NULL),
-	GNOMEUIINFO_MENU_PRINT_ITEM (print_cb, NULL),
-	GNOMEUIINFO_SEPARATOR,
-	GNOMEUIINFO_MENU_PROPERTIES_ITEM (NULL, NULL),
-	GNOMEUIINFO_SEPARATOR,
-	GNOMEUIINFO_MENU_CLOSE_ITEM (file_close_cb, NULL),
-	GNOMEUIINFO_END
-};
-
-static GnomeUIInfo edit_object_menu[] = {
-	GNOMEUIINFO_ITEM_NONE ("FIXME: what goes here?", NULL, NULL),
-	GNOMEUIINFO_END
-};
-
-static GnomeUIInfo edit_menu[] = {
-	GNOMEUIINFO_MENU_UNDO_ITEM (NULL, NULL),
-	GNOMEUIINFO_MENU_REDO_ITEM (NULL, NULL),
-	GNOMEUIINFO_SEPARATOR,
-	GNOMEUIINFO_MENU_CUT_ITEM (NULL, NULL),
-	GNOMEUIINFO_MENU_COPY_ITEM (NULL, NULL),
-	GNOMEUIINFO_MENU_PASTE_ITEM (NULL, NULL),
-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: Paste _Special..."), NULL, NULL),
-	GNOMEUIINFO_SEPARATOR,
-	GNOMEUIINFO_MENU_CLEAR_ITEM (NULL, NULL),
-	GNOMEUIINFO_MENU_SELECT_ALL_ITEM (NULL, NULL),
-	GNOMEUIINFO_SEPARATOR,
-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: Mark as U_nread"), NULL, NULL),
-	GNOMEUIINFO_SEPARATOR,
-	GNOMEUIINFO_MENU_FIND_ITEM (NULL, NULL),
-	GNOMEUIINFO_MENU_FIND_AGAIN_ITEM (NULL, NULL),
-	GNOMEUIINFO_SUBTREE (N_("_Object"), edit_object_menu),
-	GNOMEUIINFO_END
-};
-
-static GnomeUIInfo view_previous_menu[] = {
-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: _Item"), NULL, NULL),
-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: _Unread Item"), NULL, NULL),
-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: Fi_rst Item in Folder"), NULL, NULL),
-	GNOMEUIINFO_END
-};
-
-static GnomeUIInfo view_next_menu[] = {
-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: _Item"), NULL, NULL),
-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: _Unread Item"), NULL, NULL),
-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: _Last Item in Folder"), NULL, NULL),
-	GNOMEUIINFO_END
-};
-
-static GnomeUIInfo view_toolbars_menu[] = {
-	{ GNOME_APP_UI_TOGGLEITEM, N_("FIXME: _Standard"), NULL, NULL, NULL, NULL,
-	  GNOME_APP_PIXMAP_NONE, NULL, 0, 0, NULL },
-	{ GNOME_APP_UI_TOGGLEITEM, N_("FIXME: __Formatting"), NULL, NULL, NULL, NULL,
-	  GNOME_APP_PIXMAP_NONE, NULL, 0, 0, NULL },
-	GNOMEUIINFO_SEPARATOR,
-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: _Customize..."), NULL, NULL),
-	GNOMEUIINFO_END
-};
-
-static GnomeUIInfo view_menu[] = {
-	GNOMEUIINFO_SUBTREE (N_("Pre_vious"), view_previous_menu),
-	GNOMEUIINFO_SUBTREE (N_("Ne_xt"), view_next_menu),
-	GNOMEUIINFO_SEPARATOR,
-	GNOMEUIINFO_SUBTREE (N_("_Toolbars"), view_toolbars_menu),
-	GNOMEUIINFO_END
-};
-
-static GnomeUIInfo insert_menu[] = {
-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: _File..."), NULL, NULL),
-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: It_em..."), NULL, NULL),
-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: _Object..."), NULL, NULL),
-	GNOMEUIINFO_END
-};
-
-static GnomeUIInfo format_menu[] = {
-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: _Font..."), NULL, NULL),
-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: _Paragraph..."), NULL, NULL),
-	GNOMEUIINFO_END
-};
-
-static GnomeUIInfo tools_forms_menu[] = {
-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: Ch_oose Form..."), NULL, NULL),
-	GNOMEUIINFO_SEPARATOR,
-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: Desi_gn This Form"), NULL, NULL),
-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: D_esign a Form..."), NULL, NULL),
-	GNOMEUIINFO_SEPARATOR,
-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: Publish _Form..."), NULL, NULL),
-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: Pu_blish Form As..."), NULL, NULL),
-	GNOMEUIINFO_SEPARATOR,
-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: Script _Debugger"), NULL, NULL),
-	GNOMEUIINFO_END
-};
-
-static GnomeUIInfo tools_menu[] = {
-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: _Spelling..."), NULL, NULL),
-	GNOMEUIINFO_SEPARATOR,
-	GNOMEUIINFO_SUBTREE (N_("_Forms"), tools_forms_menu),
-	GNOMEUIINFO_END
-};
-
-static GnomeUIInfo actions_menu[] = {
-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: _New Contact"), NULL, NULL),
-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: New _Contact from Same Company"), NULL, NULL),
-	GNOMEUIINFO_SEPARATOR,
-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: New _Letter to Contact"), NULL, NULL),
-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: New _Message to Contact"), NULL, NULL),
-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: New Meetin_g with Contact"), NULL, NULL),
-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: _Plan a Meeting..."), NULL, NULL),
-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: New _Task for Contact"), NULL, NULL),
-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: New _Journal Entry for Contact"), NULL, NULL),
-	GNOMEUIINFO_SEPARATOR,
-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: _Flag for Follow Up..."), NULL, NULL),
-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: _Display Map of Address"), NULL, NULL),
-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: _Open Web Page"), NULL, NULL),
-	GNOMEUIINFO_SEPARATOR,
-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: Forward as _vCard"), NULL, NULL),
-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: For_ward"), NULL, NULL)
-};
-
-static GnomeUIInfo main_menu[] = {
-	GNOMEUIINFO_MENU_FILE_TREE (file_menu),
-	GNOMEUIINFO_MENU_EDIT_TREE (edit_menu),
-	GNOMEUIINFO_MENU_VIEW_TREE (view_menu),
-	GNOMEUIINFO_SUBTREE (N_("_Insert"), insert_menu),
-	GNOMEUIINFO_SUBTREE (N_("F_ormat"), format_menu),
-	GNOMEUIINFO_SUBTREE (N_("_Tools"), tools_menu),
-	GNOMEUIINFO_SUBTREE (N_("Actio_ns"), actions_menu),
-	GNOMEUIINFO_END
-};
--->
         <commands>
 		<cmd name="ContactEditorSave" pixtype="pixbuf"/>
 		<cmd name="ContactEditorSaveAs" pixtype="pixbuf"/>
@@ -206,14 +37,6 @@ static GnomeUIInfo main_menu[] = {
 
 			<separator/>
 
-		        <menuitem name="ContactEditorSendAs" verb="" 
-			_label="Se_nd contact to other..."/>
-
-		        <menuitem name="ContactEditorSendTo" verb=""
-			_label="Send _message to contact..."/>
-
-			<separator/>
-
 		        <menuitem name="ContactEditorDelete" verb=""
 			_label="Delete"/>
 
@@ -238,18 +61,27 @@ static GnomeUIInfo main_menu[] = {
 			_label="Close"/>
 
 		</submenu>
+		<submenu name="Actions" _label="_Actions">
+		        <menuitem name="ContactEditorSendAs" verb="" 
+			_label="Se_nd contact to other..."/>
+
+		        <menuitem name="ContactEditorSendTo" verb=""
+			_label="Send _message to contact..."/>
+		</submenu>
 	</menu>
 
 	<dockitem name="Toolbar" relief="none" behavior="exclusive"
 			hlook="text" vlook="icon">
-	        <toolitem name="ContactEditorSaveClose" verb=""
-		_label="Save and Close"	priority="1"/>
+	        <toolitem name="ContactEditorSave" verb=""
+		_label="Save" priority="1" />
 
 		<separator/>
 
 		<toolitem name="ContactEditorPrint" verb=""
 		_label="Print" priority="1" pixtype="pixbuf"/>
 
+		<separator/>
+
 		<toolitem name="ContactEditorDelete" verb=""
 		_label="Delete" priority="1"/>
 
diff --git a/ui/evolution-contact-list-editor.xml b/ui/evolution-contact-list-editor.xml
index 8ef2b742e5..6bc0484ae1 100644
--- a/ui/evolution-contact-list-editor.xml
+++ b/ui/evolution-contact-list-editor.xml
@@ -1,13 +1,9 @@
 <Root>
         <commands>
-		<cmd name="ContactListEditorSave"
-		 pixtype="stock" pixname="Save"/>
-
-		<cmd name="ContactListEditorSaveAs"
-		 pixtype="stock" pixname="SaveAs"/>
+		<cmd name="ContactListEditorSave" pixtype="pixbuf"/>
+		<cmd name="ContactListEditorSaveAs" pixtype="pixbuf"/>
 
 		<cmd name="ContactListEditorSendAs"/>
-
 		<cmd name="ContactListEditorSendTo"/>
 
 		<cmd name="ContactListEditorDelete"
@@ -19,7 +15,7 @@
 
 		<cmd name="ContactListEditorSaveClose"
 		 _tip="Save the list and close the dialog box"
-		 pixtype="stock" pixname="Save"/>
+		 pixtype="pixbuf"/>
 	</commands>
 
 	<menu>
@@ -34,14 +30,6 @@
 
 			<separator/>
 
-		        <menuitem name="ContactListEditorSendAs" verb=""
-			_label="Se_nd list to other..."/>
-
-		        <menuitem name="ContactListEditorSendTo" verb=""
-			_label="Send _message to list..."/>
-
-			<separator/>
-
 		        <menuitem name="ContactListEditorDelete" verb=""
 			_label="Delete..."/>
 
@@ -51,17 +39,29 @@
 			_label="Close"/>
 
 		</submenu>
+
+		<submenu name="Actions" _label="_Actions">
+		        <menuitem name="ContactListEditorSendAs" verb=""
+			_label="Se_nd list to other..."/>
+
+		        <menuitem name="ContactListEditorSendTo" verb=""
+			_label="Send _message to list..."/>
+		</submenu>
+
 	</menu>
 
 	<dockitem name="Toolbar" relief="none" behavior="exclusive"
 			hlook="text" vlook="icon">
-	        <toolitem name="ContactListEditorSaveClose" verb=""
-		_label="Save and Close"	priority="1"/>
+	        <toolitem name="ContactListEditorSave" verb=""
+		_label="Save" priority="1" />
 
 		<separator/>
 
 		<toolitem name="ContactListEditorDelete" verb=""
-		_label="Delete..." priority="1"/>
+		_label="Delete" priority="1" />
+
+	        <toolitem name="ContactListEditorClose" verb=""
+		_label="Close" priority="1" />
 
 	</dockitem>