Pull up from 0.9 branch

2001-02-08  JP Rosevear  <jpr@ximian.com>

	* gui/event-editor.c: Remove assorted menu/bonobo stuff

	* gui/dialogs/task-editor.c: Remove assorted menu/bonobo stuff
	(task_editor_construct): no longer suck out the glade contents
	into a bonobo win, listen for apply and close signals
	(tedit_apply_event_cb): listen for apply signal and save object
	(tedit_close_event_cb): listen for close signal and prompt to save
	if need be
	(task_editor_focus): new function to bring the dialog to the front

	* gui/dialogs/task-editor.h: new prototype

	* gui/e-meeting-edit.c (schedule_button_clicked_cb): no need to
	update widgets in the event editor since the event editor won't be
	open
	(e_meeting_editor_new): don't need the event editor reference any
	more

	* gui/e-meeting-edit.h: Change prototype

	* gui/e-day-view.c (e_day_view_on_event_right_click): Make
	schedule meeting a new contextual menu item
	(e_day_view_on_schedule_meet): new routine to schedule a meeting
	from the contextual menu

	* gui/e-calendar-table.c (e_calendar_table_open_task): Call
	task_editor_focus

	* gui/event-editor-dialog.glade: Update to be a property box

	* gui/dialogs/task-editor-dialog.glade: Update to be a property
	box

svn path=/trunk/; revision=8115

1 files changed, 35 insertions, 6 deletions

diff --git a/calendar/gui/e-day-view.c b/calendar/gui/e-day-view.c
index b84ce99157..bbf0732122 100644
--- a/calendar/gui/e-day-view.c
+++ b/calendar/gui/e-day-view.c
@@ -42,6 +42,7 @@
 #include <gal/widgets/e-canvas.h>
 #include <gal/e-text/e-text.h>
 #include <gal/widgets/e-canvas-utils.h>
+#include "e-meeting-edit.h"
 
 /* Images */
 #include "bell.xpm"
@@ -324,6 +325,8 @@ static void e_day_view_on_delete_occurrence (GtkWidget *widget,
 					     gpointer data);
 static void e_day_view_on_delete_appointment (GtkWidget *widget,
 					      gpointer data);
+static void e_day_view_on_schedule_meet (GtkWidget *widget,
+					 gpointer data);
 static void e_day_view_on_unrecur_appointment (GtkWidget *widget,
 					       gpointer data);
 static EDayViewEvent* e_day_view_get_popup_menu_event (EDayView *day_view);
@@ -3008,6 +3011,10 @@ e_day_view_on_event_right_click (EDayView *day_view,
 	};
 
 	static struct menu_item child_items[] = {
+		{ N_("Schedule meeting"), (GtkSignalFunc) e_day_view_on_schedule_meet, NULL, TRUE },
+
+		{ NULL, NULL, NULL, TRUE},
+
 		{ N_("Edit this appointment..."), (GtkSignalFunc) e_day_view_on_edit_appointment, NULL, TRUE },
 		{ N_("Delete this appointment"), (GtkSignalFunc) e_day_view_on_delete_appointment, NULL, TRUE },
 
@@ -3018,6 +3025,7 @@ e_day_view_on_event_right_click (EDayView *day_view,
 
 	static struct menu_item recur_child_items[] = {
 		{ N_("Make this appointment movable"), (GtkSignalFunc) e_day_view_on_unrecur_appointment, NULL, TRUE },
+		{ N_("Schedule meeting"), (GtkSignalFunc) e_day_view_on_schedule_meet, NULL, TRUE },
 
 		{ NULL, NULL, NULL, TRUE},
 
@@ -3051,19 +3059,21 @@ e_day_view_on_event_right_click (EDayView *day_view,
 		not_being_edited = TRUE;
 
 		if (cal_component_has_recurrences (event->comp)) {
-			items = 7;
+			items = 8;
 			context_menu = &recur_child_items[0];
 			context_menu[0].sensitive = not_being_edited;
-			context_menu[2].sensitive = not_being_edited;
+			context_menu[1].sensitive = not_being_edited;
 			context_menu[3].sensitive = not_being_edited;
 			context_menu[4].sensitive = not_being_edited;
-			context_menu[6].sensitive = have_selection;
+			context_menu[5].sensitive = not_being_edited;
+			context_menu[7].sensitive = have_selection;
 		} else {
-			items = 4;
+			items = 6;
 			context_menu = &child_items[0];
 			context_menu[0].sensitive = not_being_edited;
-			context_menu[1].sensitive = not_being_edited;
-			context_menu[3].sensitive = have_selection;
+			context_menu[2].sensitive = not_being_edited;
+			context_menu[3].sensitive = not_being_edited;
+			context_menu[5].sensitive = have_selection;
 		}
 	}
 
@@ -3184,6 +3194,25 @@ e_day_view_on_delete_appointment (GtkWidget *widget, gpointer data)
 
 
 static void
+e_day_view_on_schedule_meet (GtkWidget *widget, gpointer data)
+{
+	EDayView *day_view;
+	EDayViewEvent *event;
+	EMeetingEditor *editor;
+	
+	day_view = E_DAY_VIEW (data);
+
+	event = e_day_view_get_popup_menu_event (day_view);
+	if (event == NULL)
+		return;
+
+	editor = e_meeting_editor_new (event->comp, day_view->client);
+
+	e_meeting_edit (editor);
+	e_meeting_editor_free (editor);
+}
+
+static void
 e_day_view_on_unrecur_appointment (GtkWidget *widget, gpointer data)
 {
 	EDayView *day_view;