pass meeting boolean for gnome_calendar_edit_object and

2002-02-07  JP Rosevear  <jpr@ximian.com>

	* gui/e-day-view.c: pass meeting boolean for
	gnome_calendar_edit_object and gnome_calendar_new_appointment_for

	* gui/e-week-view-event-item.c: ditto

	* gui/e-week-view.c: ditto

	* gui/tasks-control.c (confirm_expunge): kill warning

	* gui/calendar-commands.c (new_meeting_cb): show a new meeting
	dialog
	(new_event_cb): pass new param

	* gui/gnome-cal.c (gnome_calendar_edit_object): take meeting
	boolean and show meeting page if true
	(gnome_calendar_new_appointment_for): takeing meeting param and
	pass to above
	(gnome_calendar_new_appointment): add new param

	* gui/gnome-cal.h: update proto

	* gui/component-factory.c (create_component): take a comp editor
	mode, determine vtype
	(sc_user_create_new_item_cb): check for meeting user creatable
	item
	(create_object): add meeting as user creatable item

	* gui/comp-editor-factory.c (edit_new): get a comp editor mode
	now, determine vtype and show meeting page if required
	(queue_edit_new): get comp editor mode
	(impl_editNew): ditto, plus queue the mode directly instead of
	determining the vtype

	* gui/dialogs/event-editor.c (show_meeting): new internal util
	function to show meeting page
	(event_editor_show_meeting): show the meeting
	(schedule_meeting_cmd): use show_meeting

	* gui/dialogs/event-editor.h: new proto

	* idl/evolution-calendar.idl: editNew takes a mode rather than a
	type now

	* cal-util/Makefile.am: fix includes

svn path=/trunk/; revision=15595

1 files changed, 15 insertions, 1 deletions

diff --git a/calendar/gui/calendar-commands.c b/calendar/gui/calendar-commands.c
index 0b079f8df7..ffa81de654 100644
--- a/calendar/gui/calendar-commands.c
+++ b/calendar/gui/calendar-commands.c
@@ -81,6 +81,17 @@ new_appointment_cb (BonoboUIComponent *uic, gpointer data, const char *path)
 }
 
 static void
+new_meeting_cb (BonoboUIComponent *uic, gpointer data, const char *path)
+{
+	GnomeCalendar *gcal;
+	time_t dtstart, dtend;
+
+	gcal = GNOME_CALENDAR (data);
+	gnome_calendar_get_current_time_range (gcal, &dtstart, &dtend);
+	gnome_calendar_new_appointment_for (gcal, dtstart, dtend, FALSE, TRUE);
+}
+
+static void
 new_event_cb (BonoboUIComponent *uic, gpointer data, const char *path)
 {
 	GnomeCalendar *gcal;
@@ -88,7 +99,7 @@ new_event_cb (BonoboUIComponent *uic, gpointer data, const char *path)
 
 	gcal = GNOME_CALENDAR (data);
 	gnome_calendar_get_current_time_range (gcal, &dtstart, &dtend);
-	gnome_calendar_new_appointment_for (gcal, dtstart, dtend, TRUE);
+	gnome_calendar_new_appointment_for (gcal, dtstart, dtend, TRUE, FALSE);
 }
 
 static void
@@ -669,6 +680,7 @@ static BonoboUIVerb verbs [] = {
 	BONOBO_UI_VERB ("CalendarPrintPreview", file_print_preview_cb),
 
 	BONOBO_UI_VERB ("CalendarNewAppointment", new_appointment_cb),
+	BONOBO_UI_VERB ("CalendarNewMeeting", new_meeting_cb),
 	BONOBO_UI_VERB ("CalendarNewEvent", new_event_cb),
 	BONOBO_UI_VERB ("CalendarNewTask", new_task_cb),
 
@@ -697,6 +709,7 @@ static BonoboUIVerb verbs [] = {
 static EPixmap pixmaps [] =
 {
 	E_PIXMAP ("/menu/File/New/NewFirstItem/NewAppointment",	              "new_appointment.xpm"),
+	E_PIXMAP ("/menu/File/New/NewFirstItem/NewMeeting",	              "meeting.xpm"),
 	E_PIXMAP ("/menu/File/New/NewFirstItem/NewTask",	              "new_task-16.png"),
 	E_PIXMAP ("/menu/EditPlaceholder/Edit/Cut",			      "16_cut.png"),
 	E_PIXMAP ("/menu/EditPlaceholder/Edit/Copy",			      "16_copy.png"),
@@ -706,6 +719,7 @@ static EPixmap pixmaps [] =
 	E_PIXMAP ("/menu/File/Print/PrintPreview",			      "print-preview.xpm"),
 	E_PIXMAP ("/menu/ComponentActionsPlaceholder/Actions/NewAppointment", "new_appointment.xpm"),
 	E_PIXMAP ("/menu/ComponentActionsPlaceholder/Actions/NewEvent",       "new_appointment.xpm"),
+	E_PIXMAP ("/menu/ComponentActionsPlaceholder/Actions/NewMeeting",     "meeting.xpm"),
 	E_PIXMAP ("/menu/ComponentActionsPlaceholder/Actions/NewTask",        "new_task-16.png"),
 	E_PIXMAP ("/menu/Tools/ComponentPlaceholder/CalendarSettings",        "configure_16_calendar.xpm"),
 	E_PIXMAP ("/menu/View/ViewBegin/Goto",				      "goto-16.png"),