From ac0c655f3f2a8e47b0cca877aabae66421c58187 Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@src.gnome.org>
Date: Tue, 15 Jul 2008 18:34:59 +0000
Subject: Migrate CompEditor, CompEditorPage, and the various subclasses from
 BonoboUI to GtkUIManager.  See bug #542125.

svn path=/branches/kill-bonobo/; revision=35746
---
 ui/Makefile.am                |  4 --
 ui/evolution-editor.xml       | 66 -----------------------------
 ui/evolution-event-editor.xml | 96 -------------------------------------------
 ui/evolution-memo-editor.xml  | 32 ---------------
 ui/evolution-task-editor.xml  | 73 --------------------------------
 5 files changed, 271 deletions(-)

(limited to 'ui')

diff --git a/ui/Makefile.am b/ui/Makefile.am
index c0f0d8e0fe..80193355f9 100644
--- a/ui/Makefile.am
+++ b/ui/Makefile.am
@@ -7,10 +7,6 @@ XML_FILES =					\
 	evolution-mail-global.xml		\
 	evolution-mail-messagedisplay.xml	\
 	evolution-memos.xml			\
-	evolution-event-editor.xml		\
-	evolution-memo-editor.xml		\
-	evolution-task-editor.xml		\
-	evolution-editor.xml			\
 	evolution-tasks.xml
 
 evolutionui_DATA = $(XML_FILES)
diff --git a/ui/evolution-editor.xml b/ui/evolution-editor.xml
index e2310a6de8..e69de29bb2 100644
--- a/ui/evolution-editor.xml
+++ b/ui/evolution-editor.xml
@@ -1,66 +0,0 @@
-<Root>
-  <commands>
-	  <cmd name="FileSave" _tip="Click here to save the current window" accel="*Control*s" pixtype="pixbuf"/>
-	  <cmd name="FileClose" _tip="Click here to close the current window" accel="*Control*w" pixtype="pixbuf"/>
-	  
-    	  <cmd name="EditCut" _tip="Cut selected text to the clipboard" accel="*Control*x" pixtype="pixbuf"/>
-	  <cmd name="EditCopy" _tip="Copy selected text to the clipboard" accel="*Control*c" pixtype="pixbuf"/>
-	  <cmd name="EditPaste" _tip="Paste text from the clipboard" accel="*Control*v" pixtype="pixbuf"/>
-	  <cmd name="EditSelectAll" _tip="Select all text" accel="*Control*a"/>
-
-	  <cmd name="InsertAttachments" _tip="Click here to attach a file" accel="*Control*m" pixtype="pixbuf"/>
-	  <cmd name="Help" _tip="Click here to view help available" accel="F1" pixtype="pixbuf"/>
-	  
-	  
-  </commands>
-
-  <menu>
-    <submenu name="File" _label="_File">
-      <placeholder name="FileOps">
-        <menuitem name="FileSave" verb="" _label="_Save"/>
-      </placeholder>
-      <placeholder name="FileWindow">
-	<menuitem name="FileClose" verb="" _label="_Close"/>
-      </placeholder>
-    </submenu>
-
-    <submenu name="Edit" _label="_Edit">
-	<placeholder name="EditCutCopyPaste">
-          <menuitem name="EditCut" verb="" _label="Cu_t"/>
-          <menuitem name="EditCopy" verb="" _label="_Copy"/>
-          <menuitem name="EditPaste" verb="" _label="_Paste"/>
-          <separator/>
-	  <menuitem name="EditSelectAll" verb="" _label="Select _All"/>
-        </placeholder>
-    </submenu>
-
-    <submenu name="View" _label="_View">
-    </submenu>
-
-    <submenu name="Insert" _label="I_nsert">
-      <placeholder name="Attachments">
-	      <menuitem name="InsertAttachments" verb="" _label="_Attachment..."/>
-      </placeholder>
-      <placeholder f="" name="RecentDocsPlaceholder"/>
-     </submenu>
-
-    <submenu name="Options" _label="_Options">
-    </submenu>
-
-    <submenu name="Help" _label="_Help">
-	<menuitem name="Help" verb="" _label="_Help"/>
-    </submenu>
-  </menu>
-
-  <dockitem name="Toolbar">
-  
-    <toolitem name="FileSave" verb="" _label="Save" pixtype="pixbuf"/>
-    <toolitem name="FileClose" verb="" _label="Close" pixtype="pixbuf"/>
-    <separator f="" name="editor1"/>
-
-    <toolitem name="InsertAttachments" verb="" _label="Attach" pixtype="pixbuf"/>
-    <separator f="" name="ecal3"/>
-
-  </dockitem>
-
-</Root>
diff --git a/ui/evolution-event-editor.xml b/ui/evolution-event-editor.xml
index fa43cb56b2..e69de29bb2 100644
--- a/ui/evolution-event-editor.xml
+++ b/ui/evolution-event-editor.xml
@@ -1,96 +0,0 @@
-<Root>
-	<commands>
-                <cmd name="ViewRole" _label="R_ole Field"
-		_tip="Toggles whether the Role field is displayed"
-		type="toggle" state="0"/>
-		
-		<cmd name="ViewRSVP" _label="_RSVP"
-		_tip="Toggles whether the RSVP field is displayed"
-		type="toggle" state="0"/>
-			    
-		<cmd name="ViewType" _label="_Type Field"
-		_tip="Toggles whether the Attendee Type field is displayed"
-		type="toggle" state="0"/>		
-
-		<cmd name="ViewStatus" _label="_Status Field"
-		_tip="Toggles whether the Status field is displayed"
-		type="toggle" state="0"/>
-
-		<cmd name="ViewTimeZone" _label="Time _Zone"
-		_tip="Toggles whether the time zone is displayed"
-		type="toggle" state="0" pixtype="pixbuf"/>	
-	
-		<cmd name="ActionShowTimeBusy" _label="Show time as _busy"
-		_tip="Toggles whether to show time as busy"
-		type="toggle" state="0"/>	
-	
-		<cmd name="ActionAllDayEvent" _label="All _Day Event"
-		_tip="Toggles whether to have All Day Event"
-		type="toggle" state="0" pixtype="pixbuf"/>	
-
-		<cmd name="ViewCategories" _label="_Categories"
-		_tip="Toggles whether to display categories"
-		type="toggle" state="0"/>
-
-    		<cmd name="ActionClassPublic" _label="Pu_blic" 
-      		type="radio" group="class" _tip="Classify as public"/>
-
- 	 	<cmd name="ActionClassPrivate" _label="_Private" 
-      		type="radio" group="class" _tip="Classify as Private"/>
-
-    		<cmd name="ActionClassConfidential" _label="_Confidential" 
-		type="radio" group="class" _tip="Classify as Confidential"/>
-
-		<cmd name="ActionRecurrence" _label="_Recurrence"
-		_tip="Make this a recurring event" pixtype="pixbuf"/>
-
-		<cmd name="ActionFreeBusy" _label="_Free/Busy"
-		_tip="Query free / busy information for the attendees"
-		pixtype="pixbuf"/>
-
-		<cmd name="InsertSendOptions" _label="Send Options"
-		_tip="Insert advanced send options"/>
-
-		<cmd name="ActionAlarm" _label="_Alarms"
-		_tip="Click here to set or unset alarms for this event"
-		pixtype="pixbuf"/>
-	</commands>
-	
-
-  <menu>
-    <submenu name="View">
-      <placeholder name="AttendeeOptions">
-      	<menuitem name="ViewType" verb="" />
-	<menuitem name="ViewStatus" verb="" />
-      	<menuitem name="ViewRole" verb="" />
-	<menuitem name="ViewRSVP" verb="" />
-        <separator f="" name="timezonesep"/>	
-	<menuitem name="ViewTimeZone" verb=""/>
-	<menuitem name="ViewCategories" verb=""/>	
-      </placeholder>
-    </submenu>
-    <submenu  name="Insert">
-	    <menuitem name="InsertSendOptions" verb="" _label="Send _Options"/>	    
-    </submenu>
-    <submenu name="Options">
-	    <menuitem name="ActionAlarm" verb="" _label="_Alarms"/>
-	    <menuitem name="ActionShowTimeBusy" verb="" _label="Show time as _busy"/>
-	    <menuitem name="ActionAllDayEvent" verb="" _label="All _Day Event"/>
-	    <submenu name="Classification" _label="_Classification">
-		    <menuitem name="ActionClassPublic" id="ActionClassPublic" verb=""/>
-		    <menuitem name="ActionClassPrivate" id="ActionClassPrivate" verb=""/>
-		    <menuitem name="ActionClassConfidential" id="ActionClassConfidential" verb=""/>
-	    </submenu>
-	    <menuitem name="ActionRecurrence" verb="" _label="_Recurrence"/>
-	    <menuitem name="ActionFreeBusy" verb="" _label="_Free/Busy"/>	    
-    </submenu>
-  </menu>
-
-  <dockitem name="Toolbar">
-	  <toolitem name="ActionAlarm" verb="" _label="Alarms" pixtype="pixbuf" />
-	  <toolitem name="ActionAllDayEvent" verb="" _label="All Day Event" pixtype="pixbuf"/>
-	  <toolitem name="ActionRecurrence" verb="" _label="Recurrence" pixtype="pixbuf"/>	
-	  <toolitem name="ActionFreeBusy" verb="" _label="Free/Busy" pixtype="pixbuf"/>	  	  	  
-  </dockitem>
-
-</Root>
diff --git a/ui/evolution-memo-editor.xml b/ui/evolution-memo-editor.xml
index 08cbd3f600..e69de29bb2 100644
--- a/ui/evolution-memo-editor.xml
+++ b/ui/evolution-memo-editor.xml
@@ -1,32 +0,0 @@
-<Root>
-	<commands>
-		<cmd name="ViewCategories" _label="_Categories"
-		_tip="Toggles whether to display categories"
-		type="toggle" state="0"/>
-
-    		<cmd name="ActionClassPublic" _label="Pu_blic" 
-      		type="radio" group="class" _tip="Classify as public"/>
-
- 	 	<cmd name="ActionClassPrivate" _label="_Private" 
-      		type="radio" group="class" _tip="Classify as Private"/>
-
-    		<cmd name="ActionClassConfidential" _label="_Confidential" 
-		type="radio" group="class" _tip="Classify as Confidential"/>
-		
-	</commands>
-
-  <menu>
-    <submenu name="View">
-	<menuitem name="ViewCategories" verb=""/>	
-    </submenu>
-    
-    <submenu name="Options">
-	    <submenu name="Classification" _label="_Classification">
-		    <menuitem name="ActionClassPublic" id="ActionClassPublic" verb=""/>
-		    <menuitem name="ActionClassPrivate" id="ActionClassPrivate" verb=""/>
-		    <menuitem name="ActionClassConfidential" id="ActionClassConfidential" verb=""/>
-	    </submenu>
-    </submenu>
-  </menu>
-
-</Root>
diff --git a/ui/evolution-task-editor.xml b/ui/evolution-task-editor.xml
index 7793e018e8..e69de29bb2 100644
--- a/ui/evolution-task-editor.xml
+++ b/ui/evolution-task-editor.xml
@@ -1,73 +0,0 @@
-<Root>
-	<commands>
-                <cmd name="ViewRole" _label="R_ole Field"
-		_tip="Toggles whether the Role field is displayed"
-		type="toggle" state="0"/>
-		
-		<cmd name="ViewRSVP" _label="_RSVP"
-		_tip="Toggles whether the RSVP field is displayed"
-		type="toggle" state="0"/>
-			    
-		<cmd name="ViewType" _label="_Type Field"
-		_tip="Toggles whether the Attendee Type field is displayed"
-		type="toggle" state="0"/>		
-
-		<cmd name="ViewStatus" _label="_Status Field"
-		_tip="Toggles whether the Status field is displayed"
-		type="toggle" state="0"/>
-
-		<cmd name="ViewTimeZone" _label="Time _Zone"
-		_tip="Toggles whether the time zone is displayed"
-		type="toggle" state="0" pixtype="pixbuf"/>
-
-		<cmd name="ViewCategories" _label="_Categories"
-		_tip="Toggles whether to display categories"
-		type="toggle" state="0"/>
-
-    		<cmd name="ActionClassPublic" _label="Pu_blic" 
-      		type="radio" group="class" _tip="Classify as public"/>
-
- 	 	<cmd name="ActionClassPrivate" _label="_Private" 
-      		type="radio" group="class" _tip="Classify as Private"/>
-
-    		<cmd name="ActionClassConfidential" _label="_Confidential" 
-		type="radio" group="class" _tip="Classify as Confidential"/>
-		
-		<cmd name="OptionStatus" 
-			_tip="Click change / view the status details of the task" accel="*Control*t" pixtype="pixbuf"/>
-		<cmd name="InsertSendOptions" _label="_Send Options"
-		_tip="Insert advanced send options"/>
-	
-	</commands>
-
-  <menu>
-    <submenu name="View">
-      <placeholder name="AttendeeOptions">
-      	<menuitem name="ViewType" verb="" />
-	<menuitem name="ViewStatus" verb="" />
-      	<menuitem name="ViewRole" verb="" />
-	<menuitem name="ViewRSVP" verb="" />
-        <separator f="" name="timezonesep"/>	
-	<menuitem name="ViewTimeZone" verb=""/>
-	<menuitem name="ViewCategories" verb=""/>	
-      </placeholder>
-    </submenu>
-    <submenu  name="Insert">
-	    <menuitem name="InsertSendOptions" verb="" _label="Send Options"/>	    
-    </submenu>
-    <submenu name="Options">
-	    <submenu name="Classification" _label="_Classification">
-		    <menuitem name="ActionClassPublic" id="ActionClassPublic" verb=""/>
-		    <menuitem name="ActionClassPrivate" id="ActionClassPrivate" verb=""/>
-		    <menuitem name="ActionClassConfidential" id="ActionClassConfidential" verb=""/>
-	    </submenu>
-	      <menuitem name="OptionStatus" verb="" _label="_Status Details"/>	    
-    </submenu>
-  </menu>
-
-  <dockitem name="Toolbar">
-	  <toolitem name="ViewTimeZone" verb="" _label="Time Zone" pixtype="pixbuf"/>	  
- 	  <toolitem name="OptionStatus" verb="" _label="Status Details" pixtype="pixbuf"/>
-  </dockitem>
-
-</Root>
-- 
cgit