Add menu and toolbar UI for calendars, memos and tasks.

svn path=/branches/kill-bonobo/; revision=36299

1 files changed, 212 insertions, 175 deletions

diff --git a/calendar/gui/Makefile.am b/calendar/gui/Makefile.am
index a6908118da..df9485d139 100644
--- a/calendar/gui/Makefile.am
+++ b/calendar/gui/Makefile.am
@@ -2,34 +2,12 @@ if OS_WIN32
 WIN32_BOOTSTRAP_LIBS = $(top_builddir)/win32/libevolution-mail.la
 endif
 
-## CORBA stuff
-
-IDLS =								\
-	$(top_srcdir)/calendar/idl/evolution-calendar.idl
-
-CALENDAR_IDL_GENERATED_H =		\
-	evolution-calendar.h
-CALENDAR_IDL_GENERATED_C =		\
-	evolution-calendar-common.c	\
-	evolution-calendar-skels.c	\
-	evolution-calendar-stubs.c
-CALENDAR_IDL_GENERATED = $(CALENDAR_IDL_GENERATED_C) $(CALENDAR_IDL_GENERATED_H)
-
-$(CALENDAR_IDL_GENERATED_H): $(IDLS)
-	$(ORBIT_IDL) -I $(srcdir) $(IDL_INCLUDES)   \
-                $(top_srcdir)/calendar/idl/evolution-calendar.idl
-$(CALENDAR_IDL_GENERATED_C): $(CALENDAR_IDL_GENERATED_H)
-
-IDL_GENERATED = $(CALENDAR_IDL_GENERATED)
-
 # The marshallers
 MARSHAL_GENERATED = e-calendar-marshal.c e-calendar-marshal.h
 @EVO_MARSHAL_RULE@
 
 SUBDIRS = alarm-notify dialogs
 
-component_LTLIBRARIES = libevolution-calendar.la
-
 ecalendarincludedir = $(privincludedir)/calendar/gui
 
 ecalendarinclude_HEADERS =	\
@@ -60,6 +38,38 @@ INCLUDES =						\
 	$(LIBSOUP_CFLAGS)				\
 	$(EVOLUTION_CALENDAR_CFLAGS)
 
+module_LTLIBRARIES =					\
+	libevolution-calendar.la			\
+	libevolution-memos.la				\
+	libevolution-tasks.la
+
+libevolution_calendar_la_SOURCES =			\
+	e-cal-shell-module.c				\
+	e-cal-shell-view.c				\
+	e-cal-shell-view.h				\
+	e-cal-shell-view-actions.c			\
+	e-cal-shell-view-actions.h			\
+	e-cal-shell-view-private.c			\
+	e-cal-shell-view-private.h
+
+libevolution_memos_la_SOURCES =				\
+	e-memo-shell-module.c				\
+	e-memo-shell-view.c				\
+	e-memo-shell-view.h				\
+	e-memo-shell-view-actions.c			\
+	e-memo-shell-view-actions.h			\
+	e-memo-shell-view-private.c			\
+	e-memo-shell-view-private.h
+
+libevolution_tasks_la_SOURCES =				\
+	e-task-shell-module.c				\
+	e-task-shell-view.c				\
+	e-task-shell-view.h				\
+	e-task-shell-view-actions.c			\
+	e-task-shell-view-actions.h			\
+	e-task-shell-view-private.c			\
+	e-task-shell-view-private.h
+
 glade_DATA = 					\
 	e-itip-control.glade			\
 	goto-dialog.glade
@@ -70,153 +80,152 @@ etspec_DATA =				\
 	e-cal-list-view.etspec		\
 	e-memo-table.etspec
 
-libevolution_calendar_la_SOURCES =		\
-	$(IDL_GENERATED)			\
-	$(MARSHAL_GENERATED)			\
-	cal-search-bar.c			\
-	cal-search-bar.h			\
-	calendar-config.c			\
-	calendar-config.h			\
-	calendar-config-keys.h			\
-	calendar-commands.c			\
-	calendar-commands.h			\
-	calendar-component.c			\
-	calendar-component.h			\
-	calendar-view.c				\
-	calendar-view.h				\
-	calendar-view-factory.c			\
-	calendar-view-factory.h			\
-	comp-editor-factory.c			\
-	comp-editor-factory.h			\
-	comp-util.c				\
-	comp-util.h				\
-	control-factory.c			\
-	control-factory.h			\
-	e-alarm-list.c				\
-	e-alarm-list.h				\
-	e-cal-component-preview.c		\
-	e-cal-component-preview.h		\
-	e-cal-component-memo-preview.c		\
-	e-cal-component-memo-preview.h		\
-	e-cal-config.c				\
-	e-cal-config.h				\
-	e-cal-event.c				\
-	e-cal-event.h				\
-	e-cal-menu.c				\
-	e-cal-menu.h				\
-	e-cal-model-calendar.h			\
-	e-cal-model-calendar.c			\
-	e-cal-model-calendar.h			\
-	e-cal-model-tasks.c			\
-	e-cal-model-tasks.h			\
-	e-cal-model.c				\
-	e-cal-model.h				\
-	e-cal-popup.h				\
-	e-cal-popup.c				\
-	e-calendar-view.c			\
-	e-calendar-view.h			\
-	e-cal-list-view.c			\
-	e-cal-list-view.h			\
-	e-cal-list-view-config.c		\
-	e-cal-list-view-config.h		\
-	e-cal-model-memos.c			\
-	e-cal-model-memos.h			\
-	e-calendar-table.c			\
-	e-calendar-table.h			\
-	e-calendar-table-config.c		\
-	e-calendar-table-config.h		\
-	e-cell-date-edit-config.c		\
-	e-cell-date-edit-config.h		\
-	e-cell-date-edit-text.h			\
-	e-cell-date-edit-text.c			\
-	e-comp-editor-registry.c		\
-	e-comp-editor-registry.h		\
-	e-date-edit-config.c			\
-	e-date-edit-config.h			\
-	e-date-time-list.c                      \
-	e-date-time-list.h                      \
-	e-day-view-config.c			\
-	e-day-view-config.h			\
-	e-day-view-layout.c			\
-	e-day-view-layout.h			\
-	e-day-view-main-item.c			\
-	e-day-view-main-item.h			\
-	e-day-view-time-item.c			\
-	e-day-view-time-item.h			\
-	e-day-view-top-item.c			\
-	e-day-view-top-item.h			\
-	e-day-view.c				\
-	e-day-view.h				\
-	e-itip-control.h			\
-	e-itip-control.c			\
-	e-meeting-attendee.c			\
-	e-meeting-attendee.h			\
-	e-meeting-list-view.c			\
-	e-meeting-list-view.h			\
-	e-meeting-store.c			\
-	e-meeting-store.h			\
-	e-meeting-time-sel.c			\
-	e-meeting-time-sel.h			\
-	e-meeting-time-sel-item.c		\
-	e-meeting-time-sel-item.h		\
-	e-meeting-types.h			\
-	e-meeting-utils.c			\
-	e-meeting-utils.h			\
-	e-memo-table.c				\
-	e-memo-table.h				\
-	e-memo-table-config.c			\
-	e-memo-table-config.h			\
-	e-memos.c				\
-	e-memos.h				\
-	e-mini-calendar-config.c		\
-	e-mini-calendar-config.h		\
-	e-select-names-editable.c		\
-	e-select-names-editable.h		\
-	e-select-names-renderer.c		\
-	e-select-names-renderer.h		\
-	e-week-view-config.c			\
-	e-week-view-config.h			\
-	e-week-view-event-item.c		\
-	e-week-view-event-item.h		\
-	e-week-view-layout.c			\
-	e-week-view-layout.h			\
-	e-week-view-main-item.c			\
-	e-week-view-main-item.h			\
-	e-week-view-titles-item.c		\
-	e-week-view-titles-item.h		\
-	e-week-view.c				\
-	e-week-view.h				\
-	e-tasks.c				\
-	e-tasks.h				\
-	e-timezone-entry.c			\
-	e-timezone-entry.h			\
-	gnome-cal.c				\
-	gnome-cal.h				\
-	goto.c					\
-	goto.h					\
-	itip-bonobo-control.c			\
-	itip-bonobo-control.h			\
-	itip-utils.c				\
-	itip-utils.h				\
-	main.c					\
-	memos-component.c			\
-	memos-component.h			\
-	memos-control.c				\
-	memos-control.h				\
-	migration.c				\
-	migration.h				\
-	misc.c					\
-	misc.h					\
-	print.c					\
-	print.h					\
-	tag-calendar.c				\
-	tag-calendar.h				\
-	tasks-component.c			\
-	tasks-component.h			\
-	tasks-control.c				\
-	tasks-control.h				\
-	weekday-picker.c			\
-	weekday-picker.h
+#libevolution_calendar_la_SOURCES =		\
+#	$(MARSHAL_GENERATED)			\
+#	cal-search-bar.c			\
+#	cal-search-bar.h			\
+#	calendar-config.c			\
+#	calendar-config.h			\
+#	calendar-config-keys.h			\
+#	calendar-commands.c			\
+#	calendar-commands.h			\
+#	calendar-component.c			\
+#	calendar-component.h			\
+#	calendar-view.c				\
+#	calendar-view.h				\
+#	calendar-view-factory.c			\
+#	calendar-view-factory.h			\
+#	comp-editor-factory.c			\
+#	comp-editor-factory.h			\
+#	comp-util.c				\
+#	comp-util.h				\
+#	control-factory.c			\
+#	control-factory.h			\
+#	e-alarm-list.c				\
+#	e-alarm-list.h				\
+#	e-cal-component-preview.c		\
+#	e-cal-component-preview.h		\
+#	e-cal-component-memo-preview.c		\
+#	e-cal-component-memo-preview.h		\
+#	e-cal-config.c				\
+#	e-cal-config.h				\
+#	e-cal-event.c				\
+#	e-cal-event.h				\
+#	e-cal-menu.c				\
+#	e-cal-menu.h				\
+#	e-cal-model-calendar.h			\
+#	e-cal-model-calendar.c			\
+#	e-cal-model-calendar.h			\
+#	e-cal-model-tasks.c			\
+#	e-cal-model-tasks.h			\
+#	e-cal-model.c				\
+#	e-cal-model.h				\
+#	e-cal-popup.h				\
+#	e-cal-popup.c				\
+#	e-calendar-view.c			\
+#	e-calendar-view.h			\
+#	e-cal-list-view.c			\
+#	e-cal-list-view.h			\
+#	e-cal-list-view-config.c		\
+#	e-cal-list-view-config.h		\
+#	e-cal-model-memos.c			\
+#	e-cal-model-memos.h			\
+#	e-calendar-table.c			\
+#	e-calendar-table.h			\
+#	e-calendar-table-config.c		\
+#	e-calendar-table-config.h		\
+#	e-cell-date-edit-config.c		\
+#	e-cell-date-edit-config.h		\
+#	e-cell-date-edit-text.h			\
+#	e-cell-date-edit-text.c			\
+#	e-comp-editor-registry.c		\
+#	e-comp-editor-registry.h		\
+#	e-date-edit-config.c			\
+#	e-date-edit-config.h			\
+#	e-date-time-list.c                      \
+#	e-date-time-list.h                      \
+#	e-day-view-config.c			\
+#	e-day-view-config.h			\
+#	e-day-view-layout.c			\
+#	e-day-view-layout.h			\
+#	e-day-view-main-item.c			\
+#	e-day-view-main-item.h			\
+#	e-day-view-time-item.c			\
+#	e-day-view-time-item.h			\
+#	e-day-view-top-item.c			\
+#	e-day-view-top-item.h			\
+#	e-day-view.c				\
+#	e-day-view.h				\
+#	e-itip-control.h			\
+#	e-itip-control.c			\
+#	e-meeting-attendee.c			\
+#	e-meeting-attendee.h			\
+#	e-meeting-list-view.c			\
+#	e-meeting-list-view.h			\
+#	e-meeting-store.c			\
+#	e-meeting-store.h			\
+#	e-meeting-time-sel.c			\
+#	e-meeting-time-sel.h			\
+#	e-meeting-time-sel-item.c		\
+#	e-meeting-time-sel-item.h		\
+#	e-meeting-types.h			\
+#	e-meeting-utils.c			\
+#	e-meeting-utils.h			\
+#	e-memo-table.c				\
+#	e-memo-table.h				\
+#	e-memo-table-config.c			\
+#	e-memo-table-config.h			\
+#	e-memos.c				\
+#	e-memos.h				\
+#	e-mini-calendar-config.c		\
+#	e-mini-calendar-config.h		\
+#	e-select-names-editable.c		\
+#	e-select-names-editable.h		\
+#	e-select-names-renderer.c		\
+#	e-select-names-renderer.h		\
+#	e-week-view-config.c			\
+#	e-week-view-config.h			\
+#	e-week-view-event-item.c		\
+#	e-week-view-event-item.h		\
+#	e-week-view-layout.c			\
+#	e-week-view-layout.h			\
+#	e-week-view-main-item.c			\
+#	e-week-view-main-item.h			\
+#	e-week-view-titles-item.c		\
+#	e-week-view-titles-item.h		\
+#	e-week-view.c				\
+#	e-week-view.h				\
+#	e-tasks.c				\
+#	e-tasks.h				\
+#	e-timezone-entry.c			\
+#	e-timezone-entry.h			\
+#	gnome-cal.c				\
+#	gnome-cal.h				\
+#	goto.c					\
+#	goto.h					\
+#	itip-bonobo-control.c			\
+#	itip-bonobo-control.h			\
+#	itip-utils.c				\
+#	itip-utils.h				\
+#	main.c					\
+#	memos-component.c			\
+#	memos-component.h			\
+#	memos-control.c				\
+#	memos-control.h				\
+#	migration.c				\
+#	migration.h				\
+#	misc.c					\
+#	misc.h					\
+#	print.c					\
+#	print.h					\
+#	tag-calendar.c				\
+#	tag-calendar.h				\
+#	tasks-component.c			\
+#	tasks-component.h			\
+#	tasks-control.c				\
+#	tasks-control.h				\
+#	weekday-picker.c			\
+#	weekday-picker.h
 
 libevolution_calendar_la_LIBADD =					\
 	$(WIN32_BOOTSTRAP_LIBS)						\
@@ -226,7 +235,38 @@ libevolution_calendar_la_LIBADD =					\
 	$(top_builddir)/calendar/gui/dialogs/libcal-dialogs.la		\
 	$(top_builddir)/calendar/importers/libevolution-calendar-importers.la \
 	$(top_builddir)/widgets/e-timezone-dialog/libetimezonedialog.la	\
-	$(top_builddir)/widgets/misc/libefilterbar.la			\
+	$(top_builddir)/widgets/misc/libemiscwidgets.la			\
+	$(top_builddir)/filter/libfilter.la				\
+	$(top_builddir)/e-util/libeutil.la				\
+	$(top_builddir)/a11y/calendar/libevolution-calendar-a11y.la	\
+	$(LIBSOUP_LIBS)							\
+	$(CAMEL_LIBS)							\
+	$(EVOLUTION_CALENDAR_LIBS)
+
+libevolution_memos_la_LIBADD =						\
+	$(WIN32_BOOTSTRAP_LIBS)						\
+	$(top_builddir)/widgets/menus/libmenus.la			\
+	$(top_builddir)/shell/libeshell.la				\
+	$(top_builddir)/calendar/common/libevolution-calendarprivate.la	\
+	$(top_builddir)/calendar/gui/dialogs/libcal-dialogs.la		\
+	$(top_builddir)/calendar/importers/libevolution-calendar-importers.la \
+	$(top_builddir)/widgets/e-timezone-dialog/libetimezonedialog.la	\
+	$(top_builddir)/widgets/misc/libemiscwidgets.la			\
+	$(top_builddir)/filter/libfilter.la				\
+	$(top_builddir)/e-util/libeutil.la				\
+	$(top_builddir)/a11y/calendar/libevolution-calendar-a11y.la	\
+	$(LIBSOUP_LIBS)							\
+	$(CAMEL_LIBS)							\
+	$(EVOLUTION_CALENDAR_LIBS)
+
+libevolution_tasks_la_LIBADD =						\
+	$(WIN32_BOOTSTRAP_LIBS)						\
+	$(top_builddir)/widgets/menus/libmenus.la			\
+	$(top_builddir)/shell/libeshell.la				\
+	$(top_builddir)/calendar/common/libevolution-calendarprivate.la	\
+	$(top_builddir)/calendar/gui/dialogs/libcal-dialogs.la		\
+	$(top_builddir)/calendar/importers/libevolution-calendar-importers.la \
+	$(top_builddir)/widgets/e-timezone-dialog/libetimezonedialog.la	\
 	$(top_builddir)/widgets/misc/libemiscwidgets.la			\
 	$(top_builddir)/filter/libfilter.la				\
 	$(top_builddir)/e-util/libeutil.la				\
@@ -236,10 +276,9 @@ libevolution_calendar_la_LIBADD =					\
 	$(EVOLUTION_CALENDAR_LIBS)
 
 libevolution_calendar_la_LDFLAGS = -avoid-version -module $(NO_UNDEFINED)
+libevolution_memos_la_LDFLAGS = -avoid-version -module $(NO_UNDEFINED)
+libevolution_tasks_la_LDFLAGS = -avoid-version -module $(NO_UNDEFINED)
 
-server_in_files = GNOME_Evolution_Calendar.server.in.in
-server_DATA = $(server_in_files:.server.in.in=.server)
-@EVO_SERVER_RULE@
 @INTLTOOL_SERVER_RULE@
 
 # GConf schemas
@@ -255,10 +294,8 @@ EXTRA_DIST =	 			\
 	$(glade_DATA)			\
 	$(schema_in_files)              \
 	$(etspec_DATA)			\
-	$(server_in_files)		\
 	$(search_files) 
 
-BUILT_SOURCES = $(IDL_GENERATED) $(server_DATA)
 CLEANFILES = $(BUILT_SOURCES)
 
 DISTCLEANFILES = $(schema_DATA)