From c2ee47d180f472cdcc2c9c35e6e7d9400ab2d6c1 Mon Sep 17 00:00:00 2001 From: Christopher James Lahey Date: Wed, 17 Apr 2002 22:29:56 +0000 Subject: Bumped required gal version number to 0.19.99.11. 2002-04-17 Christopher James Lahey * configure.in: Bumped required gal version number to 0.19.99.11. From addressbook/ChangeLog: 2002-04-17 Christopher James Lahey * gui/component/select-names/e-select-names.c (e_select_names_create_categories): Changed this to use ECategoriesMasterListOptionMenu. * gui/component/select-names/e-select-names.c (section_right_click_cb), gui/widgets/e-addressbook-reflow-adapter.c, gui/widgets/e-addressbook-view.c: Updated these to match the new EPopupMenu. From calendar/ChangeLog: 2002-04-17 Christopher James Lahey * gui/e-calendar-table.c, gui/e-day-view.c, gui/e-week-view.c, gui/dialogs/meeting-page.c: Updated these to match the new EPopupMenu. From mail/ChangeLog: 2002-04-17 Christopher James Lahey * folder-browser.c, mail-display.c: Updated these to match the new EPopupMenu. From shell/ChangeLog: 2002-04-17 Christopher James Lahey * e-activity-handler.c: Updated this to match the new EPopupMenu. svn path=/trunk/; revision=16498 --- calendar/gui/dialogs/meeting-page.c | 8 ++-- calendar/gui/e-calendar-table.c | 36 ++++++----------- calendar/gui/e-day-view.c | 78 ++++++++++++++++--------------------- calendar/gui/e-week-view.c | 68 +++++++++++--------------------- 4 files changed, 71 insertions(+), 119 deletions(-) (limited to 'calendar/gui') diff --git a/calendar/gui/dialogs/meeting-page.c b/calendar/gui/dialogs/meeting-page.c index 9358b40c8b..2504ed3993 100644 --- a/calendar/gui/dialogs/meeting-page.c +++ b/calendar/gui/dialogs/meeting-page.c @@ -698,14 +698,12 @@ enum { static EPopupMenu context_menu[] = { #if 0 - { N_("_Delegate To..."), NULL, - GTK_SIGNAL_FUNC (popup_delegate_cb), NULL, NULL, CAN_DELEGATE }, + E_POPUP_ITEM (N_("_Delegate To..."), GTK_SIGNAL_FUNC (popup_delegate_cb), CAN_DELEGATE), E_POPUP_SEPARATOR, #endif - { N_("_Delete"), NULL, - GTK_SIGNAL_FUNC (popup_delete_cb), NULL, NULL, CAN_DELETE }, + E_POPUP_ITEM (N_("_Delete"), GTK_SIGNAL_FUNC (popup_delete_cb), CAN_DELETE), E_POPUP_TERMINATOR }; @@ -725,7 +723,7 @@ right_click_cb (ETable *etable, gint row, gint col, GdkEvent *event, gpointer da priv->row = e_meeting_model_etable_view_to_model_row (etable, priv->model, view_row); /* FIXME: if you enable Delegate, then change index to '1' */ - context_menu[0].pixmap = gnome_stock_new_with_icon (GNOME_STOCK_MENU_TRASH); + context_menu[0].pixmap_widget = gnome_stock_new_with_icon (GNOME_STOCK_MENU_TRASH); menu = e_popup_menu_create (context_menu, enable_mask, hide_mask, data); e_auto_kill_popup_menu_on_hide (menu); diff --git a/calendar/gui/e-calendar-table.c b/calendar/gui/e-calendar-table.c index 2f56f2b11d..8a7d3dd631 100644 --- a/calendar/gui/e-calendar-table.c +++ b/calendar/gui/e-calendar-table.c @@ -969,39 +969,27 @@ enum { static EPopupMenu tasks_popup_menu [] = { - { N_("_Open"), NULL, - e_calendar_table_on_open_task, NULL, NULL, MASK_SINGLE }, - { N_("_Save as..."), NULL, - e_calendar_table_on_save_as, NULL, NULL, MASK_SINGLE }, - { N_("_Print..."), NULL, - e_calendar_table_on_print_task, NULL, NULL, MASK_SINGLE }, + E_POPUP_ITEM (N_("_Open"), e_calendar_table_on_open_task, MASK_SINGLE), + E_POPUP_ITEM (N_("_Save as..."), e_calendar_table_on_save_as, MASK_SINGLE), + E_POPUP_ITEM (N_("_Print..."), e_calendar_table_on_print_task, MASK_SINGLE), E_POPUP_SEPARATOR, - { N_("C_ut"), NULL, - e_calendar_table_on_cut, NULL, NULL, 0 }, - { N_("_Copy"), NULL, - e_calendar_table_on_copy, NULL, NULL, 0 }, - { N_("_Paste"), NULL, - e_calendar_table_on_paste, NULL, NULL, 0 }, + E_POPUP_ITEM (N_("C_ut"), e_calendar_table_on_cut, 0), + E_POPUP_ITEM (N_("_Copy"), e_calendar_table_on_copy, 0), + E_POPUP_ITEM (N_("_Paste"), e_calendar_table_on_paste, 0), E_POPUP_SEPARATOR, - { N_("_Assign Task"), NULL, - e_calendar_table_on_assign, NULL, NULL, MASK_SINGLE }, - { N_("_Forward as iCalendar"), NULL, - e_calendar_table_on_forward, NULL, NULL, MASK_SINGLE }, - { N_("_Mark as Complete"), NULL, - mark_as_complete_cb, NULL, NULL, MASK_SINGLE }, - { N_("_Mark Selected Tasks as Complete"), NULL, - mark_as_complete_cb, NULL, NULL, MASK_MULTIPLE }, + E_POPUP_ITEM (N_("_Assign Task"), e_calendar_table_on_assign, MASK_SINGLE), + E_POPUP_ITEM (N_("_Forward as iCalendar"), e_calendar_table_on_forward, MASK_SINGLE), + E_POPUP_ITEM (N_("_Mark as Complete"), mark_as_complete_cb, MASK_SINGLE), + E_POPUP_ITEM (N_("_Mark Selected Tasks as Complete"), mark_as_complete_cb, MASK_MULTIPLE), E_POPUP_SEPARATOR, - { N_("_Delete"), NULL, - delete_cb, NULL, NULL, MASK_SINGLE }, - { N_("_Delete Selected Tasks"), NULL, - delete_cb, NULL, NULL, MASK_MULTIPLE }, + E_POPUP_ITEM (N_("_Delete"), delete_cb, MASK_SINGLE), + E_POPUP_ITEM (N_("_Delete Selected Tasks"), delete_cb, MASK_MULTIPLE), E_POPUP_TERMINATOR }; diff --git a/calendar/gui/e-day-view.c b/calendar/gui/e-day-view.c index 3dede7fa96..29d7c97393 100644 --- a/calendar/gui/e-day-view.c +++ b/calendar/gui/e-day-view.c @@ -3540,80 +3540,68 @@ enum { }; static EPopupMenu main_items [] = { - { N_("New _Appointment"), NULL, - e_day_view_on_new_appointment, NULL, NULL, 0 }, - { N_("New All Day _Event"), NULL, - e_day_view_on_new_event, NULL, NULL, 0 }, - { N_("New Meeting"), NULL, - e_day_view_on_new_meeting, NULL, NULL, 0 }, - { N_("New Task"), NULL, - e_day_view_on_new_task, NULL, NULL, 0 }, + E_POPUP_ITEM (N_("New _Appointment"), + e_day_view_on_new_appointment, 0), + E_POPUP_ITEM (N_("New All Day _Event"), + e_day_view_on_new_event, 0), + E_POPUP_ITEM (N_("New Meeting"), + e_day_view_on_new_meeting, 0), + E_POPUP_ITEM (N_("New Task"), + e_day_view_on_new_task, 0), E_POPUP_SEPARATOR, - { N_("Print..."), NULL, - e_day_view_on_print, NULL, NULL, 0 }, + E_POPUP_ITEM (N_("Print..."), + e_day_view_on_print, 0), E_POPUP_SEPARATOR, - { N_("_Paste"), NULL, - e_day_view_on_paste, NULL, NULL, 0 }, + E_POPUP_ITEM (N_("_Paste"), + e_day_view_on_paste, 0), E_POPUP_SEPARATOR, - { N_("Go to _Today"), NULL, - e_day_view_on_goto_today, NULL, NULL, 0 }, - { N_("_Go to Date..."), NULL, - e_day_view_on_goto_date, NULL, NULL, 0 }, + E_POPUP_ITEM (N_("Go to _Today"), + e_day_view_on_goto_today, 0), + E_POPUP_ITEM (N_("_Go to Date..."), + e_day_view_on_goto_date, 0), E_POPUP_SEPARATOR, - { N_("_Publish Free/Busy Information"), NULL, - e_day_view_on_publish, NULL, NULL, 0 }, + E_POPUP_ITEM (N_("_Publish Free/Busy Information"), + e_day_view_on_publish, 0), E_POPUP_SEPARATOR, - { N_("_Configure..."), NULL, - e_day_view_on_paste, NULL, NULL, 0 }, + E_POPUP_ITEM (N_("_Configure..."), + e_day_view_on_paste, 0), E_POPUP_TERMINATOR }; static EPopupMenu child_items [] = { - { N_("_Open"), NULL, - e_day_view_on_edit_appointment, NULL, NULL, MASK_EDITABLE | MASK_EDITING }, - { N_("_Save As..."), NULL, - e_day_view_on_save_as, NULL, NULL, MASK_EDITABLE | MASK_SINGLE | MASK_EDITING }, - { N_("_Print..."), NULL, - e_day_view_on_print_event, NULL, NULL, MASK_EDITABLE | MASK_SINGLE | MASK_EDITING }, + E_POPUP_ITEM (N_("_Open"), e_day_view_on_edit_appointment, MASK_EDITABLE | MASK_EDITING), + E_POPUP_ITEM (N_("_Save As..."), e_day_view_on_save_as, MASK_EDITABLE | MASK_SINGLE | MASK_EDITING), + E_POPUP_ITEM (N_("_Print..."), e_day_view_on_print_event, MASK_EDITABLE | MASK_SINGLE | MASK_EDITING), /* Only show this separator if one of the above is shown. */ - { "", NULL, NULL, NULL, NULL, MASK_EDITABLE | MASK_EDITING }, + E_POPUP_SEPARATOR, - { N_("C_ut"), NULL, - e_day_view_on_cut, NULL, NULL, MASK_EDITABLE | MASK_EDITING }, - { N_("_Copy"), NULL, - e_day_view_on_copy, NULL, NULL, 0 }, - { N_("_Paste"), NULL, - e_day_view_on_paste, NULL, NULL, 0 }, + E_POPUP_ITEM (N_("C_ut"), e_day_view_on_cut, MASK_EDITABLE | MASK_EDITING), + E_POPUP_ITEM (N_("_Copy"), e_day_view_on_copy, 0), + E_POPUP_ITEM (N_("_Paste"), e_day_view_on_paste, 0), E_POPUP_SEPARATOR, - { N_("_Schedule Meeting..."), NULL, - e_day_view_on_meeting, NULL, NULL, MASK_EDITABLE | MASK_SINGLE | MASK_EDITING }, - { N_("_Forward as iCalendar..."), NULL, - e_day_view_on_forward, NULL, NULL, MASK_EDITABLE | MASK_SINGLE | MASK_EDITING }, + E_POPUP_ITEM (N_("_Schedule Meeting..."), e_day_view_on_meeting, MASK_EDITABLE | MASK_SINGLE | MASK_EDITING), + E_POPUP_ITEM (N_("_Forward as iCalendar..."), e_day_view_on_forward, MASK_EDITABLE | MASK_SINGLE | MASK_EDITING), E_POPUP_SEPARATOR, - { N_("_Delete"), NULL, - e_day_view_on_delete_appointment, NULL, NULL, MASK_EDITABLE | MASK_SINGLE | MASK_EDITING }, - { N_("Make this Occurrence _Movable"), NULL, - e_day_view_on_unrecur_appointment, NULL, NULL, MASK_RECURRING | MASK_EDITING }, - { N_("Delete this _Occurrence"), NULL, - e_day_view_on_delete_occurrence, NULL, NULL, MASK_RECURRING | MASK_EDITING }, - { N_("Delete _All Occurrences"), NULL, - e_day_view_on_delete_appointment, NULL, NULL, MASK_RECURRING | MASK_EDITING }, + E_POPUP_ITEM (N_("_Delete"), e_day_view_on_delete_appointment, MASK_EDITABLE | MASK_SINGLE | MASK_EDITING), + E_POPUP_ITEM (N_("Make this Occurrence _Movable"), e_day_view_on_unrecur_appointment, MASK_RECURRING | MASK_EDITING), + E_POPUP_ITEM (N_("Delete this _Occurrence"), e_day_view_on_delete_occurrence, MASK_RECURRING | MASK_EDITING), + E_POPUP_ITEM (N_("Delete _All Occurrences"), e_day_view_on_delete_appointment, MASK_RECURRING | MASK_EDITING), E_POPUP_TERMINATOR }; diff --git a/calendar/gui/e-week-view.c b/calendar/gui/e-week-view.c index ce8bba0635..f7eb62d56b 100644 --- a/calendar/gui/e-week-view.c +++ b/calendar/gui/e-week-view.c @@ -3428,80 +3428,58 @@ enum { }; static EPopupMenu main_items [] = { - { N_("New _Appointment..."), NULL, - e_week_view_on_new_appointment, NULL, NULL, 0 }, - { N_("New All Day _Event"), NULL, - e_week_view_on_new_event, NULL, NULL, 0 }, - { N_("New Meeting"), NULL, - e_week_view_on_new_meeting, NULL, NULL, 0 }, - { N_("New Task"), NULL, - e_week_view_on_new_task, NULL, NULL, 0 }, + E_POPUP_ITEM (N_("New _Appointment..."), e_week_view_on_new_appointment, 0), + E_POPUP_ITEM (N_("New All Day _Event"), e_week_view_on_new_event, 0), + E_POPUP_ITEM (N_("New Meeting"), e_week_view_on_new_meeting, 0), + E_POPUP_ITEM (N_("New Task"), e_week_view_on_new_task, 0), E_POPUP_SEPARATOR, - { N_("_Print..."), NULL, - e_week_view_on_print, NULL, NULL, 0 }, + E_POPUP_ITEM (N_("_Print..."), e_week_view_on_print, 0), E_POPUP_SEPARATOR, - { N_("_Paste"), NULL, - e_week_view_on_paste, NULL, NULL, 0 }, + E_POPUP_ITEM (N_("_Paste"), e_week_view_on_paste, 0), E_POPUP_SEPARATOR, - { N_("Go to _Today"), NULL, - e_week_view_on_goto_today, NULL, NULL, 0 }, - { N_("_Go to Date..."), NULL, - e_week_view_on_goto_date, NULL, NULL, 0 }, + E_POPUP_ITEM (N_("Go to _Today"), e_week_view_on_goto_today, 0), + E_POPUP_ITEM (N_("_Go to Date..."), e_week_view_on_goto_date, 0), E_POPUP_SEPARATOR, - { N_("_Publish Free/Busy Information"), NULL, - e_week_view_on_publish, NULL, NULL, 0 }, + E_POPUP_ITEM (N_("_Publish Free/Busy Information"), e_week_view_on_publish, 0), E_POPUP_SEPARATOR, - { N_("_Configure..."), NULL, - e_week_view_on_paste, NULL, NULL, 0 }, + E_POPUP_ITEM (N_("_Configure..."), e_week_view_on_paste, 0), E_POPUP_TERMINATOR }; static EPopupMenu child_items [] = { - { N_("_Open"), NULL, - e_week_view_on_edit_appointment, NULL, NULL, MASK_EDITABLE | MASK_EDITING }, - { N_("_Save As..."), NULL, - e_week_view_on_save_as, NULL, NULL, MASK_EDITABLE | MASK_SINGLE | MASK_EDITING }, - { N_("_Print..."), NULL, - e_week_view_on_print_event, NULL, NULL, MASK_EDITABLE | MASK_SINGLE | MASK_EDITING }, + E_POPUP_ITEM (N_("_Open"), e_week_view_on_edit_appointment, MASK_EDITABLE | MASK_EDITING), + E_POPUP_ITEM (N_("_Save As..."), e_week_view_on_save_as, MASK_EDITABLE | MASK_SINGLE | MASK_EDITING), + E_POPUP_ITEM (N_("_Print..."), e_week_view_on_print_event, MASK_EDITABLE | MASK_SINGLE | MASK_EDITING), /* Only show this separator if one of the above is shown. */ - { "", NULL, NULL, NULL, NULL, MASK_EDITABLE | MASK_EDITING }, + E_POPUP_SEPARATOR, - { N_("C_ut"), NULL, - e_week_view_on_cut, NULL, NULL, MASK_EDITING | MASK_EDITABLE }, - { N_("_Copy"), NULL, - e_week_view_on_copy, NULL, NULL, MASK_EDITING | MASK_EDITABLE }, - { N_("_Paste"), NULL, - e_week_view_on_paste, NULL, NULL, 0 }, + E_POPUP_ITEM (N_("C_ut"), e_week_view_on_cut, MASK_EDITING | MASK_EDITABLE), + E_POPUP_ITEM (N_("_Copy"), e_week_view_on_copy, MASK_EDITING | MASK_EDITABLE), + E_POPUP_ITEM (N_("_Paste"), e_week_view_on_paste, 0), E_POPUP_SEPARATOR, - { N_("_Schedule Meeting..."), NULL, - e_week_view_on_meeting, NULL, NULL, MASK_EDITABLE | MASK_SINGLE | MASK_EDITING }, - { N_("_Forward as iCalendar..."), NULL, - e_week_view_on_forward, NULL, NULL, MASK_EDITABLE | MASK_SINGLE | MASK_EDITING }, + E_POPUP_ITEM (N_("_Schedule Meeting..."), e_week_view_on_meeting, MASK_EDITABLE | MASK_SINGLE | MASK_EDITING), + E_POPUP_ITEM (N_("_Forward as iCalendar..."), e_week_view_on_forward, MASK_EDITABLE | MASK_SINGLE | MASK_EDITING), E_POPUP_SEPARATOR, - { N_("_Delete this Appointment"), NULL, - e_week_view_on_delete_appointment, NULL, NULL, MASK_EDITABLE | MASK_SINGLE | MASK_EDITING }, - { N_("Make this Occurrence _Movable"), NULL, - e_week_view_on_unrecur_appointment, NULL, NULL, MASK_RECURRING | MASK_EDITING }, - { N_("Delete this _Occurrence"), NULL, - e_week_view_on_delete_occurrence, NULL, NULL, MASK_RECURRING | MASK_EDITING }, - { N_("Delete _All Occurrences"), NULL, - e_week_view_on_delete_appointment, NULL, NULL, MASK_RECURRING | MASK_EDITING }, + E_POPUP_ITEM (N_("_Delete this Appointment"), e_week_view_on_delete_appointment, MASK_EDITABLE | MASK_SINGLE | MASK_EDITING), + E_POPUP_ITEM (N_("Make this Occurrence _Movable"), e_week_view_on_unrecur_appointment, MASK_RECURRING | MASK_EDITING), + E_POPUP_ITEM (N_("Delete this _Occurrence"), e_week_view_on_delete_occurrence, MASK_RECURRING | MASK_EDITING), + E_POPUP_ITEM (N_("Delete _All Occurrences"), e_week_view_on_delete_appointment, MASK_RECURRING | MASK_EDITING), E_POPUP_TERMINATOR }; -- cgit v1.2.3