Reformat a bit and add the folder context menu definition.

svn path=/trunk/; revision=9866

2 files changed, 173 insertions, 149 deletions

diff --git a/ui/ChangeLog b/ui/ChangeLog
index 46261c4f49..d1c29b2dfc 100644
--- a/ui/ChangeLog
+++ b/ui/ChangeLog
@@ -1,3 +1,8 @@
+2001-05-17  Ettore Perazzoli  <ettore@ximian.com>
+
+	* evolution.xml: Added a "FolderPopup" element and reformatted
+	lots of it.
+
 2001-05-16  Jeffrey Stedfast  <fejj@ximian.com>
 
 	* evolution-message-composer.xml: Added S/MIME menu items.
diff --git a/ui/evolution.xml b/ui/evolution.xml
index b44786a1c4..cea4f900ce 100644
--- a/ui/evolution.xml
+++ b/ui/evolution.xml
@@ -1,178 +1,197 @@
 <Root>
-	<commands>
-		<cmd name="FileClose" _label="Close" _tip="Close this window"
-			pixtype="stock" pixname="Close" accel="*Control*w"/>
-
-	        <cmd name="FileExit" _label="E_xit" _tip="Exit the program"
-			pixtype="stock" pixname="Quit" accel="*Control*q"/>
-
-		<cmd name="ViewShortcutBar" type="toggle"
-			_label="_Shortcut Bar"
-			_tip="Toggle whether to show the shortcut bar"/>
-
-		<cmd name="ViewFolderBar" type="toggle"
-			_label="_Folder Bar"
-			_tip="Toggle whether to show the folder bar"/>
-
-		<cmd name="HelpSubmitBug" _label="Submit Bug Report"
-			_tip="Submit bug report using Bug Buddy."/>
-
-                <cmd name="ToggleOffline" _type="Toggle"
-		        _label="_Work Offline"
-		        _tip="Toggle whether we are working offline."/>
-
-		<cmd name="HelpAbout" _label="About Evolution..."
-			_tip="Show information about Evolution"
-			pixtype="stock" pixname="About"/>
-
-		<cmd name="BonoboCustomize" _label="Customize"
-			_tip="Customize toolbars"
-			pixtype="stock" pixname="Preferences"/>
-	</commands>
-
-	<menu>
-		<submenu name="File" _label="_File">
-			<submenu name="New" _label="_New">
-	                        <placeholder name="NewFirstItem">
-	                        </placeholder>
+  <commands>
+    <cmd name="FileClose" _label="Close" _tip="Close this window"
+	 pixtype="stock" pixname="Close" accel="*Control*w"/>
+
+    <cmd name="FileExit" _label="E_xit" _tip="Exit the program"
+	 pixtype="stock" pixname="Quit" accel="*Control*q"/>
+
+    <cmd name="ViewShortcutBar" type="toggle"
+	 _label="_Shortcut Bar"
+	 _tip="Toggle whether to show the shortcut bar"/>
+
+    <cmd name="ViewFolderBar" type="toggle"
+	 _label="_Folder Bar"
+	 _tip="Toggle whether to show the folder bar"/>
+
+    <cmd name="HelpSubmitBug" _label="Submit Bug Report"
+	 _tip="Submit bug report using Bug Buddy."/>
+
+    <cmd name="ToggleOffline" _type="Toggle"
+	 _label="_Work Offline"
+	 _tip="Toggle whether we are working offline."/>
+
+    <cmd name="HelpAbout" _label="About Evolution..."
+	 _tip="Show information about Evolution"
+	 pixtype="stock" pixname="About"/>
+
+    <cmd name="BonoboCustomize" _label="Customize"
+	 _tip="Customize toolbars"
+	 pixtype="stock" pixname="Preferences"/>
+  </commands>
+
+  <menu>
+    <submenu name="File" _label="_File">
+      <submenu name="New" _label="_New">
+	<placeholder name="NewFirstItem">
+	</placeholder>
 	
-				<menuitem name="EvolutionWindow" verb="NewView" _label="Evolution _Window"
-				accel="*Control**Shift*w"/>
-
-				<menuitem name="Folder" verb="NewFolder"
-				_label="_Folder"
-				accel="*Control**Shift*e"
-				pixtype="pixbuf"/>
-
-				<menuitem name="Shortcut" verb="NewBarShortcut"
-				_label="Evolution bar _shortcut"
-				accel="*Control**Shift*s"/>
-
-				<separator/>
-
-				<menuitem name="Mail" verb="NewMailMessage"
-				_label="_Mail message"
-				accel="*Control**Shift*m"/>
-
-				<menuitem name="Appointment" verb="NewAppointment"
-				_label="_Appointment (FIXME)"
-				accel="*Control**Shift*a"/>
-
-				<menuitem name="Contact" verb="NewContact"
-				_label="_Contact (FIXME)"
-				accel="*Control**Shift*c"/>
-
-				<menuitem name="Task" verb="NewTask"
-				_label="_Task (FIXME)"
-				accel="*Control**Shift*t"/>
-			
-				<placeholder name="NewItems"/>
-			</submenu>
-
-			<placeholder name="FileOps"/>
-
-			<separator/>
-
-	                <submenu name="Folder" _label="_Folder">
-				<menuitem name="Folder" verb="NewFolder"
-				_label="_New Folder"
-				accel="*Control**Shift*e"
-				pixtype="pixbuf"/>
-	                </submenu>
-	  
-			<menuitem name="FileGoToFolder" verb=""
-			_label="_Go to Folder..."
-			_tip="Display a different folder" accel="*Control*g"/>
-
-                        <separator/>
+	<menuitem name="EvolutionWindow" verb="NewView" _label="Evolution _Window"
+		  accel="*Control**Shift*w"/>
+
+	<menuitem name="Folder" verb="NewFolder"
+		  _label="_Folder"
+		  accel="*Control**Shift*e"
+		  pixtype="pixbuf"/>
+
+	<menuitem name="Shortcut" verb="NewBarShortcut"
+		  _label="Evolution bar _shortcut"
+		  accel="*Control**Shift*s"/>
+
+	<separator/>
+
+	<menuitem name="Mail" verb="NewMailMessage"
+		  _label="_Mail message"
+		  accel="*Control**Shift*m"/>
+
+	<menuitem name="Appointment" verb="NewAppointment"
+		  _label="_Appointment (FIXME)"
+		  accel="*Control**Shift*a"/>
+
+	<menuitem name="Contact" verb="NewContact"
+		  _label="_Contact (FIXME)"
+		  accel="*Control**Shift*c"/>
+
+	<menuitem name="Task" verb="NewTask"
+		  _label="_Task (FIXME)"
+		  accel="*Control**Shift*t"/>
 	
-			<menuitem name="FileImporter" verb=""
-			_label="_Import file..."
-			_tip="Import an external file format" accel="*Control*i"
-			pixtype="pixbuf"/>
+	<placeholder name="NewItems"/>
+      </submenu>
+
+      <placeholder name="FileOps"/>
+
+      <separator/>
+
+      <submenu name="Folder" _label="_Folder">
+	<menuitem name="Folder" verb="NewFolder"
+		  _label="_New Folder"
+		  accel="*Control**Shift*e"
+		  pixtype="pixbuf"/>
+      </submenu>
+      
+      <menuitem name="FileGoToFolder" verb=""
+		_label="_Go to Folder..."
+		_tip="Display a different folder" accel="*Control*g"/>
+
+      <separator/>
+      
+      <menuitem name="FileImporter" verb=""
+		_label="_Import file..."
+		_tip="Import an external file format" accel="*Control*i"
+		pixtype="pixbuf"/>
+
+      <placeholder name="Print" delimit="top"/>
+
+      <separator/>
+
+      <menuitem name="ToggleOffline" verb=""
+		_label="Work Offline"
+		pixtype="pixbuf"/>
+      
+      <menuitem name="FileClose" verb=""
+		_label="_Close"/>
 
-			<placeholder name="Print" delimit="top"/>
+      <menuitem name="FileExit" verb="FileExit"/>
+    </submenu>
 
-			<separator/>
+    <submenu name="Edit" _label="_Edit">
+    </submenu>
 
-	                <menuitem name="ToggleOffline" verb=""
-	                _label="Work Offline"
-			pixtype="pixbuf"/>
-	      
-			<menuitem name="FileClose" verb=""
-			_label="_Close"/>
+    <submenu name="View" _label="_View">
+      <placeholder name="ViewBegin"/>
+      <menuitem name="ShortcutBar" id="ViewShortcutBar"/>
+      <menuitem name="FolderBar" id="ViewFolderBar"/>
+      <placeholder name="ViewAfterControl"/>
+    </submenu>
 
-			<menuitem name="FileExit" verb="FileExit"/>
-		</submenu>
+    <placeholder name="Component"/>
 
-		<submenu name="Edit" _label="_Edit">
-		</submenu>
+    <submenu name="Actions" _label="_Actions">
+      <placeholder name="Component"/>
+    </submenu>
 
-		<submenu name="View" _label="_View">
-	                <placeholder name="ViewBegin"/>
-	    		<menuitem name="ShortcutBar" id="ViewShortcutBar"/>
-			<menuitem name="FolderBar" id="ViewFolderBar"/>
-	                <placeholder name="ViewAfterControl"/>
-		</submenu>
+    <submenu name="Tools" _label="_Tools">
+      <placeholder name="Component"/>
 
-		<placeholder name="Component"/>
+      <menuitem name="BonoboCustomize" verb=""
+		_label="Customi_ze Toolbars..." pos="bottom"/>
+    </submenu>
 
-	        <submenu name="Actions" _label="_Actions">
-	                <placeholder name="Component"/>
-	        </submenu>
+    <submenu name="Help" _label="_Help">
 
-	        <submenu name="Tools" _label="_Tools">
-		        <placeholder name="Component"/>
+      <menuitem name="HelpIndex" verb=""
+		_label="_Index"
+		accel="*Control*h"/>
 
-			<menuitem name="BonoboCustomize" verb=""
-			 _label="Customi_ze Toolbars..." pos="bottom"/>
-		</submenu>
+      <menuitem name="HelpGetStarted" verb=""
+		_label="Getting _Started"
+		/>
 
-		<submenu name="Help" _label="_Help">
+      <menuitem name="HelpUsingMail" verb=""
+		_label="Using the _Mailer"
+		/>
 
-			<menuitem name="HelpIndex" verb=""
-			_label="_Index"
-                        accel="*Control*h"/>
+      <menuitem name="HelpUsingCalendar" verb=""
+		_label="Using the _Calendar"
+		/>
 
-			<menuitem name="HelpGetStarted" verb=""
-			_label="Getting _Started"
-			 />
+      <menuitem name="HelpUsingContact" verb=""
+		_label="Using the C_ontact Manager"
+		/>
 
-			<menuitem name="HelpUsingMail" verb=""
-			_label="Using the _Mailer"
-			 />
+      <separator/>
 
-			<menuitem name="HelpUsingCalendar" verb=""
-			_label="Using the _Calendar"
-			 />
+      <menuitem name="HelpFAQ" verb=""
+		_label="Evolution _FAQ"/>
 
-			<menuitem name="HelpUsingContact" verb=""
-			_label="Using the C_ontact Manager"
-			 />
+      <separator/>
 
-			<separator/>
+      <menuitem name="HelpSubmitBug" verb=""
+		_label="Submit _Bug Report"/>
 
-			<menuitem name="HelpFAQ" verb=""
-			_label="Evolution _FAQ"/>
+      <separator/>
 
-			<separator/>
+      <menuitem name="HelpAbout" verb=""
+		_label="_About Evolution..."/>
 
-			<menuitem name="HelpSubmitBug" verb=""
-			_label="Submit _Bug Report"/>
+    </submenu>
+  </menu>
 
-			<separator/>
+  <dockitem name="Toolbar" relief="none" behavior="exclusive"
+	    _tip="Main toolbar" hlook="text" vlook="icon"/>
 
-			<menuitem name="HelpAbout" verb=""
-			_label="_About Evolution..."/>
+  <popups>
+    <popup name="FolderPopup">
+      <submenu name="Folder" _label="Folder">
+	<menuitem name="Activate"
+		  verb="ActivateView"
+		  _label="_View"
+		  _tip="View the selected folder"/>
 
-		</submenu>
-	</menu>
+	<menuitem name="Remove"
+		  verb="RemoveFolder"
+		  _label="_Remove"
+		  _tip="Remove the selected folder"/>
 
-	<dockitem name="Toolbar" relief="none" behavior="exclusive"
-	 _tip="Main toolbar" hlook="text" vlook="icon"/>
+	<placeholder name="ComponentPlaceholder"
+		     delimit="top"/>
+      </submenu>
+    </popup>
+  </popups>
 
-	<status>
-		<item name="main"/>
-		<control name="Progress"/>
-	</status>
+  <status>
+    <item name="main"/>
+    <control name="Progress"/>
+  </status>
 </Root>