Preliminaries for new UI handler.

svn path=/trunk/; revision=5245

8 files changed, 441 insertions, 5 deletions

diff --git a/addressbook/gui/component/Makefile.am b/addressbook/gui/component/Makefile.am
index d531c420ac..6837984d93 100644
--- a/addressbook/gui/component/Makefile.am
+++ b/addressbook/gui/component/Makefile.am
@@ -72,7 +72,7 @@ glade_DATA = ldap-server-dialog.glade ldap-server-dialog.glade.h alphabet.glade
 EXTRA_DIST = 			\
 	$(glade_DATA)		\
 	$(oaf_DATA)		\
-	alphabet.glade.h
+	alphabet.glade.h ui.xml
 
 if ENABLE_PURIFY
 PLINK = $(LIBTOOL) --mode=link $(PURIFY) $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
@@ -84,3 +84,6 @@ evolution-addressbook.pure: evolution-addressbook
 	$(PLINK) $(evolution_addressbook_LDFLAGS) $(evolution_addressbook_OBJECTS) $(evolution_addressbook_LDADD) $(LIBS)
 
 endif
+
+uidir = $(datadir)/evolution/addressbook
+ui_DATA = ui.xml
diff --git a/addressbook/gui/component/ui.xml b/addressbook/gui/component/ui.xml
new file mode 100644
index 0000000000..13f86d4874
--- /dev/null
+++ b/addressbook/gui/component/ui.xml
@@ -0,0 +1,62 @@
+<Root>
+
+	<menu>
+		<submenu name="File" _label="_File">
+
+			<placeholder name="Print">
+
+				<menuitem name="Print" verb="ContactsPrint"
+				_label="_Print Contacts..."
+				pixtype="stock" pixname="Menu_Print"/>
+				
+			</placeholder>
+
+		</submenu>
+
+		<submenu name="View" _label="_View">
+
+			<menuitem name="AsTable" _label="As _Table"
+			verb="ViewAsTable"/>
+
+			<menuitem name="ViewNewContact" verb=""
+			_label="_New Contact"/>
+
+		</submenu>
+
+		<placeholder name="Component">
+
+			<submenu name="Tools" _label="_Tools">
+
+				<menuitem name="Search" verb="ToolSearch"
+				_label="_Search for contacts"
+				pixtype="stock" pixname="Menu_Search"/>
+
+			</submenu>
+
+		</placeholder>
+	</menu>
+
+	<dockitem name="Toolbar">
+		<toolitem name="New" _label="New"
+		_decr="Create a new contact" verb="ContactNew"
+		pixtype="stock" pixname="New"/>
+
+		<toolitem type="separator"/>
+
+		<toolitem name="Find" _label="Find"
+		_descr="Find a contact" verb="ContactFind"
+		pixtype="stock" pixname="Search"/>
+
+		<toolitem name="Print" _label="Print"
+		_descr="Print contacts" verb="ContactsPrint"
+		pixtype="stock" pixname="Print"/>
+
+		<toolitem name="Delete" label="Delete"
+		_descr="Delete a contact" verb="ContactDelete"
+		pixtype="stock" pixname="Trash"/>
+
+		<toolitem type="separator"/>
+
+	</dockitem>
+
+</Root>
\ No newline at end of file
diff --git a/calendar/gui/Makefile.am b/calendar/gui/Makefile.am
index ae66b3f442..ac072c0b0c 100644
--- a/calendar/gui/Makefile.am
+++ b/calendar/gui/Makefile.am
@@ -134,3 +134,8 @@ evolution-calendar.pure: evolution-calendar
 	$(PLINK) $(evolution_calendar_LDFLAGS) $(evolution_calendar_OBJECTS) $(evolution_calendar_LDADD) $(LIBS)
 
 endif
+
+uidir = $(datadir)/evolution/calendar
+ui_DATA = ui.xml
+
+EXTRA_DIST = ui.xml
diff --git a/calendar/gui/ui.xml b/calendar/gui/ui.xml
new file mode 100644
index 0000000000..bbf73ef340
--- /dev/null
+++ b/calendar/gui/ui.xml
@@ -0,0 +1,87 @@
+<Root>
+
+	<menu>
+		<submenu name="File" _label="_File">
+
+			<submenu name="New" _label="_New">
+
+				<menuitem name="CalendarNew" verb=""
+				_label="New Ca_lendar" _descr="Create a new calendar"/>
+
+			</submenu>
+
+			<submenu name="Open" _label="_Open">
+
+				<menuitem name="CalendarOpen" verb=""
+				_label="_Open Calendar" _descr="Open a calendar"/>
+
+			</submenu>
+
+			<menuitem name="CalendarSaveAs" verb=""
+				_label="_Save Calendar As" _descr="Save calendar As something else"/>
+
+			<placeholder name="Print">
+
+				<menuitem name="Print" verb="CalendarPrint"
+				_label="_Print this calendar"
+				pixtype="stock" pixname="Menu_Print"
+				accel="&lt;Control&gt;p"/>
+				
+			</placeholder>
+
+		</submenu>
+
+		<submenu name="Edit" _label="_Edit">
+
+			<menuitem name="Appointment" _label="_New appointment..."
+			verb="EditNewAppointment" _descr="Create a new appointment"/>
+
+			<menuitem name="Preferences" _label="Preferences"
+			verb="CalendarPreferences" _descr="Alter preferences"/>
+
+		</submenu>
+
+		<submenu name="Help" _label="_Help">
+
+			<menuitem name="Calendar" _label="About Calendar"
+			_descr="All about the calendar" verb="AboutCalendar"/>
+
+		</submenu>
+	</menu>
+
+	<dockitem name="Toolbar">
+		<toolitem name="New" _label="New"
+		_decr="Create a new appointment" verb="EditNewAppointment"
+		pixtype="stock" pixname="New"/>
+
+		<toolitem type="separator"/>
+
+		<toolitem name="Print" _label="Print"
+		_descr="Print this calendar" verb="CalendarPrint"
+		pixtype="stock" pixname="Print"/>
+
+		<toolitem type="separator"/>
+
+		<toolitem name="Prev" label="Prev"
+		_descr="Go back in time" verb="CalendarPrev"
+		pixtype="stock" pixname="Back"/>
+
+		<toolitem name="Today" label="Today"
+		_descr="Go to present time" verb="CalendarToday"
+		pixtype="stock" pixname="Home"/>
+
+		<toolitem name="Next" label="Next"
+		_descr="Go forward in time" verb="CalendarNext"
+		pixtype="stock" pixname="Forward"/>
+
+		<toolitem type="separator"/>
+
+		<toolitem name="Goto" label="Go to"
+		_descr="Go to a specific data" verb="CalendarGoto"
+		pixtype="stock" pixname="Jump To"/>
+		
+		<toolitem type="separator"/>
+
+	</dockitem>
+
+</Root>
\ No newline at end of file
diff --git a/mail/Makefile.am b/mail/Makefile.am
index ab80b0589c..db70087f38 100644
--- a/mail/Makefile.am
+++ b/mail/Makefile.am
@@ -123,7 +123,7 @@ iconsdir = $(datadir)/images/evolution
 $(EVOLUTION_MAIL_CORBA_GENERATED): Mail.idl 
 	$(ORBIT_IDL) -I$(datadir)/idl -I`$(GNOME_CONFIG) --cflags idl` -I`$(GNOME_CONFIG) --datadir`/idl -I$(srcdir) $(srcdir)/Mail.idl
 
-EXTRA_DIST = Mail.idl $(glade_DATA) $(oaf_DATA)
+EXTRA_DIST = Mail.idl $(glade_DATA) $(oaf_DATA) ui.xml
 
 if ENABLE_PURIFY
 PLINK = $(LIBTOOL) --mode=link $(PURIFY) $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
@@ -135,3 +135,6 @@ evolution-mail.pure: evolution-mail
 	$(PLINK) $(evolution_mail_LDFLAGS) $(evolution_mail_OBJECTS) $(evolution_mail_LDADD) $(LIBS)
 
 endif
+
+uidir = $(datadir)/evolution/mail
+ui_DATA = ui.xml
diff --git a/mail/ui.xml b/mail/ui.xml
new file mode 100644
index 0000000000..656edda83f
--- /dev/null
+++ b/mail/ui.xml
@@ -0,0 +1,170 @@
+<Root>
+	<menu>
+		<submenu name="File" _label="_File">
+
+			<placeholder name="Print">
+
+				<menuitem name="Print" verb="PrintMessage"
+				_label="Print message..."
+				_descr="Print message to the printer"
+				pixtype="stock" pixname="Menu_Print"/>
+<!-- do we need this separator ? -->
+
+				<menuitem/>
+
+			</placeholder>
+
+		</submenu>
+
+		<submenu name="View" _label="_View">
+
+			<menuitem/>
+
+			<menuitem name="Threaded" verb="ViewThreaded"
+			_label="_Threaded" _descr="Threaded Message list"/>
+
+		</submenu>
+
+		<submenu name="Settings" _label="_Settings">
+
+			<menuitem name="MailFilters" verb="SetMailFilter"
+			_label="Mail _Filters..."/>
+
+			<menuitem name="VFolderEdit" verb="SetVFolder"
+			_label="_Virtual Folder Editor..."/>
+
+			<menuitem name="SetMailConfig" verb=""
+			_label="_Mail Configuration..."/>
+
+			<menuitem name="SetForgetPwd" verb=""
+			_label="Forget _Passwords"/>
+
+		</submenu>
+
+		<placeholder name="Component">
+
+			<submenu name="Message" _label="_Message">
+
+				<menuitem name="MessageOpenNewWnd" verb=""
+				_label="_Open in New Window"
+				accel="&lt;Control&gt;o"/>
+
+				<menuitem name="MessageEdit" verb=""
+				_label="_Edit Message"/>
+
+				<menuitem name="MessagePrint" verb=""
+				_label="_Print Message"/>
+
+				<menuitem/>
+
+				<menuitem name="MessageReplySndr" verb=""
+				_label="Reply to _Sender"/>
+
+				<menuitem name="MessageReplyAll" verb=""
+				_label="Reply to _All"/>
+
+				<menuitem name="MessageForward" verb=""
+				_label="_Forward"/>
+
+				<menuitem/>
+
+				<menuitem name="MessageDelete" verb=""
+				_label="_Delete Message"/>
+
+				<menuitem name="MessageMove" verb=""
+				_label="_Move Message"/>
+
+				<menuitem name="MessageCopy" verb=""
+				_label="_Copy Message"/>
+
+				<menuitem/>
+
+				<menuitem name="MessageVFolderSubj" verb=""
+				_label="_VFolder on Subject"/>
+
+				<menuitem name="MessageVFolderSndr" verb=""
+				_label="VFolder on Se_nder"/>
+
+				<menuitem name="MessageVFolderRecip" verb=""
+				_label="VFolder on _Recipients"/>
+
+				<menuitem/>
+
+				<menuitem name="MessageFilterSubj" verb=""
+				_label="_Filter on Subject"/>
+
+				<menuitem name="MessageFilterSndr" verb=""
+				_label="Fi_lter on Sender"/>
+
+				<menuitem name="MessageFilterRecip" verb=""
+				_label="Filter on Rec_ipients"/>
+
+			</submenu>
+			
+			<submenu name="Folder" _label="F_older">
+
+				<menuitem name="FolderMarkAllRead" verb=""
+				_label="_Mark all as Read"/>
+
+				<menuitem name="FolderDeleteAll" verb=""
+				_label="_Delete all"/>
+
+				<menuitem name="FolderExpunge" verb=""
+				_label="_Expunge"/>
+
+				<menuitem name="FolderConfig" verb=""
+				_label="_Configure Folder"/>
+
+			</submenu>
+
+		</placeholder>
+	</menu>
+
+	<dockitem name="Toolbar">
+
+		<toolitem name="MailGet" verb=""
+		_label="Get Mail" _descr="Send queued mail and retrieve new mail"
+		pixtype="stock" pixname="Receive Mail"/>
+
+		<toolitem name="MailCompose" verb=""
+		_label="Compose" _descr="Compose a new message"
+		pixtype="stock" pixname="New Mail"/>
+
+		<toolitem type="separator"/>
+
+		<toolitem name="Reply" verb="MessageReplySndr"
+		_label="Reply" _descr="Reply to the sender of this message"
+		pixtype="stock" pixname="Reply to Mail"/>
+
+		<toolitem name="ReplyAll" verb="MessageReplyAll"
+		_label="Reply to All" _descr="Reply to all recipients of this message"
+		pixtype="stock" pixname="Reply to Mail"/>
+
+		<toolitem name="Forward" verb="MessageForward"
+		_label="Forward" _descr="Forward this message"
+		pixtype="stock" pixname="Forward Mail"/>
+
+		<toolitem type="separator"/>
+
+		<toolitem name="Move" verb="MessageMove"
+		_label="Move" _descr="Move message to a new folder"
+		pixtype="stock" pixname="Send Mail"/>
+
+		<toolitem name="Copy" verb="MessageCopy"
+		_label="Copy" _descr="Copy message to a new folder"
+		pixtype="stock" pixname="Send Mail"/>
+
+		<toolitem name="Print" verb="MessagePrint"
+		_label="Print" _descr="Print the selected message"
+		pixtype="stock" pixname="Print"/>
+
+		<toolitem name="Copy" verb="MessageCopy"
+		_label="Copy" _descr="Copy message to a new folder"
+		pixtype="stock" pixname="Send Mail"/>
+
+		<toolitem name="Copy" verb="MessageDelete"
+		_label="Delete" _descr="Delete this message"
+		pixtype="stock" pixname="Trash"/>
+
+	</dockitem>
+</Root>
\ No newline at end of file
diff --git a/shell/Makefile.am b/shell/Makefile.am
index f85a7ae14a..aa5a9156ba 100644
--- a/shell/Makefile.am
+++ b/shell/Makefile.am
@@ -12,7 +12,7 @@ INCLUDES = 								\
 	-DEVOLUTION_GLADEDIR=\"$(datadir)/evolution/glade\"		\
 	-DG_LOG_DOMAIN=\"evolution-shell\"
 
-EXTRA_DIST = $(IDLS)
+EXTRA_DIST = $(IDLS) ui.xml
 
 CLEANFILES = $(IDL_GENERATED)
 
@@ -117,6 +117,9 @@ evolution_LDADD =						\
 	$(UNICODE_LIBS)						\
 	$(BONOBO_GNOME_LIBS)
 
+uidir = $(datadir)/evolution/shell
+ui_DATA = ui.xml
+
 # Purify support
 
 if ENABLE_PURIFY
@@ -130,5 +133,3 @@ evolution.pure: evolution
 	$(PLINK) $(evolution_LDFLAGS) $(evolution_OBJECTS) $(evolution_LDADD) $(LIBS)
 
 endif
-
-
diff --git a/shell/ui.xml b/shell/ui.xml
new file mode 100644
index 0000000000..a3127f4874
--- /dev/null
+++ b/shell/ui.xml
@@ -0,0 +1,105 @@
+<Root>
+	<menu>
+		<submenu name="File" _label="_File">
+			<submenu name="New" _label="_New">
+				<menuitem name="View" verb="NewView" _label="_View"
+				accel="&lt;Control&gt;&lt;Shift&gt;v"
+				pixtype="stock" pixname="Menu_New"/>
+
+				<menuitem name="Folder" verb="NewFolder"
+				_label="_Folder"
+				accel="&lt;Control&gt;&lt;Shift&gt;f"/>
+
+				<menuitem name="Shortcut" verb="NewBarShortcut"
+				_label="Evolution bar _shortcut"
+				accel="&lt;Control&gt;&lt;Shift&gt;s"/>
+
+				<menuitem/>
+
+				<menuitem name="Mail" verb="NewMailMessage"
+				_label="_Mail message (FIXME)"
+				accel="&lt;Control&gt;&lt;Shift&gt;m"/>
+
+				<menuitem name="Appointment" verb="NewAppointment"
+				_label="_Appointment (FIXME)"
+				accel="&lt;Control&gt;&lt;Shift&gt;a"/>
+
+				<menuitem name="Contact" verb="NewContact"
+				_label="_Contact (FIXME)"
+				accel="&lt;Control&gt;&lt;Shift&gt;c"/>
+
+				<menuitem name="Task" verb="NewTask"
+				_label="_Task (FIXME)"
+				accel="&lt;Control&gt;&lt;Shift&gt;t"/>
+			</submenu>
+
+			<menuitem/>
+
+			<menuitem name="FileGoToFolder" verb=""
+			_label="_Go to Folder..."
+			_descr="Display a different folder"/>
+
+			<menuitem name="FileCreateFolder" verb=""
+			_label="_Create New Folder..."
+			_descr="Create a new folder"/>
+
+			<placeholder name="Print" delimit="bottom"/>
+
+			<menuitem name="FileExit" verb=""
+			_label="E_xit" _descr="Exit the program"
+			pixtype="stock" pixname="Menu_Quit"
+			accel="&lt;Control&gt;q"/>
+			
+		</submenu>
+
+		<submenu name="Edit" _label="_Edit"/>
+
+		<submenu name="View" _label="_View">
+
+			<menuitem name="ShortcutBar" type="toggle"
+			id="ViewShortcutBar" _label="Show the _Shortcut Bar"
+			_descr="Toggle whether to show the shortcut bar"/>
+
+			<menuitem name="FolderBar" type="toggle"
+			id="ViewFolderBar" _label="Show the _Folder Bar"
+			_descr="Toggle whether to show the folder bar"/>
+
+		</submenu>
+
+		<submenu name="Settings" _label="_Settings"/>
+
+		<placeholder name="Component"/>
+
+		<submenu name="Help" _label="_Help">
+
+			<menuitem name="HelpIndex" verb=""
+			_label="_Index"/>
+
+			<menuitem name="HelpGetStarted" verb=""
+			_label="Getting _Started"/>
+
+			<menuitem name="HelpUsingMail" verb=""
+			_label="Using the _Mailer"/>
+
+			<menuitem name="HelpUsingCalender" verb=""
+			_label="Using the _Calender"/>
+
+			<menuitem name="HelpUsingContact" verb=""
+			_label="Using the C_ontact Manager"/>
+
+			<menuitem/>
+
+			<menuitem name="HelpSubmitBug" verb=""
+			_label="_Submit Bug Report"
+			_descr="Submit bug report using Bug Buddy"/>
+
+			<menuitem/>
+
+			<menuitem name="HelpAbout" verb=""
+			_label="_About Evolution..."
+			_descr="Show information about Evolution"
+			pixtype="stock" pixname="Menu_About"/>
+
+		</submenu>
+	</menu>
+</Root>
\ No newline at end of file