aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--calendar/ChangeLog7
-rw-r--r--calendar/gui/e-week-view.c28
2 files changed, 35 insertions, 0 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index f4b252a734..45e41cf30d 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,5 +1,12 @@
2001-02-08 JP Rosevear <jpr@ximian.com>
+ * gui/e-week-view.c (e_week_view_on_schedule_meet): new routine to
+ throw up the meeting schedule dialog
+ (e_week_view_show_popup_menu): add schedule meeting to the
+ contextual menu where appropriate
+
+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
diff --git a/calendar/gui/e-week-view.c b/calendar/gui/e-week-view.c
index b647dcc4a7..74c0df4f9c 100644
--- a/calendar/gui/e-week-view.c
+++ b/calendar/gui/e-week-view.c
@@ -43,6 +43,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"
@@ -165,6 +166,8 @@ static void e_week_view_on_delete_occurrence (GtkWidget *widget,
gpointer data);
static void e_week_view_on_delete_appointment (GtkWidget *widget,
gpointer data);
+static void e_week_view_on_schedule_meet (GtkWidget *widget,
+ gpointer data);
static void e_week_view_on_unrecur_appointment (GtkWidget *widget,
gpointer data);
@@ -3211,6 +3214,10 @@ e_week_view_show_popup_menu (EWeekView *week_view,
};
static struct menu_item child_items[] = {
+ { N_("Schedule meeting"), (GtkSignalFunc) e_week_view_on_schedule_meet, NULL, TRUE },
+
+ { NULL, NULL, NULL, TRUE},
+
{ N_("Edit this appointment..."), (GtkSignalFunc) e_week_view_on_edit_appointment, NULL, TRUE },
{ N_("Delete this appointment"), (GtkSignalFunc) e_week_view_on_delete_appointment, NULL, TRUE },
@@ -3221,6 +3228,7 @@ e_week_view_show_popup_menu (EWeekView *week_view,
static struct menu_item recur_child_items[] = {
{ N_("Make this appointment movable"), (GtkSignalFunc) e_week_view_on_unrecur_appointment, NULL, TRUE },
+ { N_("Schedule meeting"), (GtkSignalFunc) e_week_view_on_schedule_meet, NULL, TRUE },
{ NULL, NULL, NULL, TRUE },
@@ -3385,6 +3393,26 @@ e_week_view_on_delete_appointment (GtkWidget *widget, gpointer data)
}
}
+static void
+e_week_view_on_schedule_meet (GtkWidget *widget, gpointer data)
+{
+ EWeekView *week_view;
+ EWeekViewEvent *event;
+ EMeetingEditor *editor;
+
+ week_view = E_WEEK_VIEW (data);
+
+ if (week_view->popup_event_num == -1)
+ return;
+
+ event = &g_array_index (week_view->events, EWeekViewEvent,
+ week_view->popup_event_num);
+
+ editor = e_meeting_editor_new (event->comp, week_view->client);
+
+ e_meeting_edit (editor);
+ e_meeting_editor_free (editor);
+}
static void
e_week_view_on_unrecur_appointment (GtkWidget *widget, gpointer data)