From 14f54991f36d5d3556af1dde53ddb7a8aceafa3a Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Mon, 27 Oct 2008 20:28:57 +0000 Subject: Disable parts of my previous calendar work, such that all modules now load! svn path=/branches/kill-bonobo/; revision=36690 --- calendar/modules/e-cal-shell-content.c | 44 ++++++++++++---- calendar/modules/e-cal-shell-sidebar.c | 4 +- calendar/modules/e-cal-shell-view-actions.c | 75 +++++++++++++++++++++++++--- calendar/modules/e-cal-shell-view-private.c | 9 +++- calendar/modules/e-cal-shell-view-private.h | 4 +- calendar/modules/e-cal-shell-view.c | 4 +- calendar/modules/e-task-shell-view-actions.c | 1 + calendar/modules/e-task-shell-view-private.h | 1 + 8 files changed, 119 insertions(+), 23 deletions(-) (limited to 'calendar/modules') diff --git a/calendar/modules/e-cal-shell-content.c b/calendar/modules/e-cal-shell-content.c index 8300c657ca..879420a307 100644 --- a/calendar/modules/e-cal-shell-content.c +++ b/calendar/modules/e-cal-shell-content.c @@ -26,6 +26,13 @@ #include "e-util/gconf-bridge.h" #include "calendar/gui/calendar-config.h" +#include "calendar/gui/e-cal-list-view-config.h" +#include "calendar/gui/e-cal-model-calendar.h" +#include "calendar/gui/e-calendar-table.h" +#include "calendar/gui/e-calendar-table-config.h" +#include "calendar/gui/e-day-view-config.h" +#include "calendar/gui/e-memo-table-config.h" +#include "calendar/gui/e-week-view-config.h" #include "widgets/menus/gal-view-etable.h" @@ -95,6 +102,8 @@ cal_shell_content_display_view_cb (ECalShellContent *cal_shell_content, static FocusLocation cal_shell_content_get_focus_location (ECalShellContent *cal_shell_content) { + return FOCUS_OTHER; +#if 0 /* TEMPORARILY DISABLED */ GtkWidget *widget; GnomeCalendar *calendar; ECalendarTable *task_table; @@ -149,6 +158,7 @@ cal_shell_content_get_focus_location (ECalShellContent *cal_shell_content) } return FOCUS_OTHER; +#endif } static void @@ -292,12 +302,12 @@ cal_shell_content_constructed (GObject *object) { ECalShellContentPrivate *priv; ECalModelCalendar *cal_model; - EShellContent *shell-content; + EShellContent *shell_content; EShellModule *shell_module; EShellView *shell_view; EShellViewClass *shell_view_class; GalViewCollection *view_collection; - GalViewInstnace *view_instance; + GalViewInstance *view_instance; GtkWidget *container; GtkWidget *widget; const gchar *config_dir; @@ -348,7 +358,7 @@ cal_shell_content_constructed (GObject *object) * Month view has its own position. */ widget = gtk_vpaned_new (); gtk_paned_pack2 (GTK_PANED (container), widget, TRUE, TRUE); - priv->vpaned = g_object_ref (); + priv->vpaned = g_object_ref (widget); gtk_widget_show (widget); container = priv->notebook; @@ -357,6 +367,7 @@ cal_shell_content_constructed (GObject *object) * that the notebook page number corresponds to the view type. * The assertions below ensure that stays true. */ +#if 0 /* Not so fast... get the memo/task pads working first. */ /* FIXME Need to establish a calendar and timezone first. */ widget = e_day_view_new (E_CAL_MODEL (cal_model)); e_calendar_view_set_calendar ( @@ -420,6 +431,7 @@ cal_shell_content_constructed (GObject *object) g_return_if_fail (page_num == GNOME_CAL_LIST_VIEW); priv->list_view = g_object_ref (widget); gtk_widget_show (widget); +#endif container = priv->vpaned; @@ -440,9 +452,9 @@ cal_shell_content_constructed (GObject *object) gtk_widget_show (widget); g_free (markup); - widget = e_calendar_table_new (); + widget = e_calendar_table_new (shell_view); gtk_box_pack_start (GTK_BOX (container), widget, TRUE, TRUE, 0); - priv->task_table = g_object_ref (); + priv->task_table = g_object_ref (widget); gtk_widget_show (widget); filename = g_build_filename (config_dir, "TaskPad", NULL); @@ -464,9 +476,9 @@ cal_shell_content_constructed (GObject *object) gtk_widget_show (widget); g_free (markup); - widget = e_memo_table_new (); + widget = e_memo_table_new (shell_view); gtk_box_pack_start (GTK_BOX (container), widget, TRUE, TRUE, 0); - priv->memo_table = g_object_ref (); + priv->memo_table = g_object_ref (widget); gtk_widget_show (widget); filename = g_build_filename (config_dir, "MemoPad", NULL); @@ -572,7 +584,9 @@ e_cal_shell_content_get_calendar (ECalShellContent *cal_shell_content) g_return_val_if_fail ( E_IS_CAL_SHELL_CONTENT (cal_shell_content), NULL); - return GNOME_CALENDAR (cal_shell_content->priv->calendar); + /* FIXME */ + /*return GNOME_CALENDAR (cal_shell_content->priv->calendar);*/ + return NULL; } EMemoTable * @@ -599,7 +613,9 @@ e_cal_shell_content_get_timezone (ECalShellContent *cal_shell_content) g_return_val_if_fail ( E_IS_CAL_SHELL_CONTENT (cal_shell_content), NULL); - return cal_shell_content->priv->timezone; + /* FIXME */ + /*return cal_shell_content->priv->timezone;*/ + return NULL; } GalViewInstance * @@ -614,6 +630,7 @@ e_cal_shell_content_get_view_instance (ECalShellContent *cal_shell_content) void e_cal_shell_content_copy_clipboard (ECalShellContent *cal_shell_content) { +#if 0 GnomeCalendar *calendar; EMemoTable *memo_table; ECalendarTable *task_table; @@ -640,11 +657,13 @@ e_cal_shell_content_copy_clipboard (ECalShellContent *cal_shell_content) default: g_return_if_reached (); } +#endif } void e_cal_shell_content_cut_clipboard (ECalShellContent *cal_shell_content) { +#if 0 GnomeCalendar *calendar; EMemoTable *memo_table; ECalendarTable *task_table; @@ -671,11 +690,13 @@ e_cal_shell_content_cut_clipboard (ECalShellContent *cal_shell_content) default: g_return_if_reached (); } +#endif } void e_cal_shell_content_paste_clipboard (ECalShellContent *cal_shell_content) { +#if 0 GnomeCalendar *calendar; EMemoTable *memo_table; ECalendarTable *task_table; @@ -702,11 +723,13 @@ e_cal_shell_content_paste_clipboard (ECalShellContent *cal_shell_content) default: g_return_if_reached (); } +#endif } void e_cal_shell_content_delete_selection (ECalShellContent *cal_shell_content) { +#if 0 GnomeCalendar *calendar; EMemoTable *memo_table; ECalendarTable *task_table; @@ -733,11 +756,13 @@ e_cal_shell_content_delete_selection (ECalShellContent *cal_shell_content) default: g_return_if_reached (); } +#endif } void e_cal_shell_content_delete_selected_occurrence (ECalShellContent *cal_shell_content) { +#if 0 GnomeCalendar *calendar; FocusLocation focus; @@ -748,4 +773,5 @@ e_cal_shell_content_delete_selected_occurrence (ECalShellContent *cal_shell_cont if (focus == FOCUS_CALENDAR) gnome_calendar_delete_selected_occurrence (calendar); +#endif } diff --git a/calendar/modules/e-cal-shell-sidebar.c b/calendar/modules/e-cal-shell-sidebar.c index 707770df81..06d09b07ed 100644 --- a/calendar/modules/e-cal-shell-sidebar.c +++ b/calendar/modules/e-cal-shell-sidebar.c @@ -408,7 +408,6 @@ cal_shell_sidebar_constructed (GObject *object) calitem = E_CALENDAR (widget)->calitem; e_calendar_item_set_days_start_week_sel (calitem, 9); e_calendar_item_set_max_days_sel (calitem, 42); - widget = gnome_calendar_new (shell_view); gtk_paned_add2 (GTK_PANED (container), widget); priv->mini_calendar = g_object_ref (widget); gtk_widget_show (widget); @@ -466,7 +465,8 @@ static void cal_shell_sidebar_client_added (ECalShellSidebar *cal_shell_sidebar, ECal *client) { - cal_shell_sidebar_update_timezone (cal_shell_sidebar); + /* FIXME */ + /*cal_shell_sidebar_update_timezone (cal_shell_sidebar);*/ } static void diff --git a/calendar/modules/e-cal-shell-view-actions.c b/calendar/modules/e-cal-shell-view-actions.c index 4e077b273f..7de429c3e8 100644 --- a/calendar/modules/e-cal-shell-view-actions.c +++ b/calendar/modules/e-cal-shell-view-actions.c @@ -48,6 +48,7 @@ static void action_calendar_delete_cb (GtkAction *action, ECalShellView *cal_shell_view) { +#if 0 ECalShellContent *cal_shell_content; ECalShellSidebar *cal_shell_sidebar; EShellWindow *shell_window; @@ -113,38 +114,44 @@ action_calendar_delete_cb (GtkAction *action, g_warning ("%s", error->message); g_error_free (error); } +#endif } static void action_calendar_go_back_cb (GtkAction *action, ECalShellView *cal_shell_view) { +#if 0 ECalShellContent *cal_shell_content; GnomeCalendar *calendar; cal_shell_content = cal_shell_view->priv->cal_shell_content; - calendar = e_shell_content_get_calendar (cal_shell_content); + calendar = e_cal_shell_content_get_calendar (cal_shell_content); - gnome_claendar_previous (calendar); + gnome_calendar_previous (calendar); +#endif } static void action_calendar_go_forward_cb (GtkAction *action, ECalShellView *cal_shell_view) { +#if 0 ECalShellContent *cal_shell_content; GnomeCalendar *calendar; cal_shell_content = cal_shell_view->priv->cal_shell_content; - calendar = e_shell_content_get_calendar (cal_shell_content); + calendar = e_cal_shell_content_get_calendar (cal_shell_content); gnome_calendar_next (calendar); +#endif } static void action_calendar_go_today_cb (GtkAction *action, ECalShellView *cal_shell_view) { +#if 0 ECalShellContent *cal_shell_content; GnomeCalendar *calendar; @@ -152,12 +159,14 @@ action_calendar_go_today_cb (GtkAction *action, calendar = e_cal_shell_content_get_calendar (cal_shell_content); gnome_calendar_goto_today (calendar); +#endif } static void action_calendar_jump_to_cb (GtkAction *action, ECalShellView *cal_shell_view) { +#if 0 ECalShellContent *cal_shell_content; GnomeCalendar *calendar; @@ -165,24 +174,28 @@ action_calendar_jump_to_cb (GtkAction *action, calendar = e_cal_shell_content_get_calendar (cal_shell_content); goto_dialog (calendar); +#endif } static void action_calendar_new_cb (GtkAction *action, ECalShellView *cal_shell_view) { +#if 0 EShellView *shell_view; EShellWindow *shell_window; shell_view = E_SHELL_VIEW (cal_shell_view); shell_window = e_shell_view_get_shell_window (shell_view); calendar_setup_new_calendar (GTK_WINDOW (shell_window)); +#endif } static void action_calendar_print_cb (GtkAction *action, ECalShellView *cal_shell_view) { +#if 0 ECalShellContent *cal_shell_content; GnomeCalendar *calendar; GtkPrintOperationAction print_action; @@ -206,13 +219,14 @@ action_calendar_print_cb (GtkAction *action, gnome_calendar_get_current_time_range (calendar, &start, NULL); print_calendar (calendar, action, start); } +#endif } static void action_calendar_print_preview_cb (GtkAction *action, ECalShellView *cal_shell_view) { -} +#if 0 ECalShellContent *cal_shell_content; GnomeCalendar *calendar; GtkPrintOperationAction print_action; @@ -236,11 +250,14 @@ action_calendar_print_preview_cb (GtkAction *action, gnome_calendar_get_current_time_range (calendar, &start, NULL); print_calendar (calendar, action, start); } +#endif +} static void action_calendar_properties_cb (GtkAction *action, ECalShellView *cal_shell_view) { +#if 0 ECalShellSidebar *cal_shell_sidebar; EShellView *shell_view; EShellWindow *shell_window; @@ -256,6 +273,7 @@ action_calendar_properties_cb (GtkAction *action, g_return_if_fail (E_IS_SOURCE (source)); calendar_setup_edit_calendar (GTK_WINDOW (shell_window), source); +#endif } static void @@ -305,6 +323,13 @@ action_calendar_view_cb (GtkRadioAction *action, e_shell_view_set_view_id (shell_view, view_id); } +static void +action_event_all_day_new_cb (GtkAction *action, + ECalShellView *cal_shell_view) +{ + /* FIXME */ +} + static void action_event_clipboard_copy_cb (GtkAction *action, ECalShellView *cal_shell_view) @@ -355,7 +380,7 @@ action_event_delete_cb (GtkAction *action, { ECalShellContent *cal_shell_content; - cal_shell_content = cal_shell-view->priv->cal_shell_content; + cal_shell_content = cal_shell_view->priv->cal_shell_content; e_cal_shell_content_delete_selection (cal_shell_content); } @@ -374,7 +399,6 @@ action_event_delete_occurrence_all_cb (GtkAction *action, ECalShellView *cal_shell_view) { ECalShellContent *cal_shell_content; - GnomeCalendar *calendar; /* XXX Same as "event-delete". */ cal_shell_content = cal_shell_view->priv->cal_shell_content; @@ -388,6 +412,13 @@ action_event_forward_cb (GtkAction *action, /* FIXME */ } +static void +action_event_meeting_new_cb (GtkAction *action, + ECalShellView *cal_shell_view) +{ + /* FIXME */ +} + static void action_event_move_cb (GtkAction *action, ECalShellView *cal_shell_view) @@ -395,6 +426,13 @@ action_event_move_cb (GtkAction *action, /* FIXME */ } +static void +action_event_new_cb (GtkAction *action, + ECalShellView *cal_shell_view) +{ + /* FIXME */ +} + static void action_event_occurrence_movable_cb (GtkAction *action, ECalShellView *cal_shell_view) @@ -406,6 +444,7 @@ static void action_event_open_cb (GtkAction *action, ECalShellView *cal_shell_view) { +#if 0 ECalShellContent *cal_shell_content; GnomeCalendar *calendar; GtkWidget *widget; @@ -415,6 +454,7 @@ action_event_open_cb (GtkAction *action, widget = gnome_calendar_get_current_view_widget (calendar); e_calendar_view_open_event (E_CALENDAR_VIEW (widget)); +#endif } static void @@ -476,6 +516,7 @@ static void action_search_execute_cb (GtkAction *action, ECalShellView *cal_shell_view) { +#if 0 EShellView *shell_view; /* All shell views respond to the activation of this action, @@ -486,6 +527,7 @@ action_search_execute_cb (GtkAction *action, return; e_cal_shell_view_execute_search (cal_shell_view); +#endif } static void @@ -493,7 +535,9 @@ action_search_filter_cb (GtkRadioAction *action, GtkRadioAction *current, ECalShellView *cal_shell_view) { +#if 0 e_cal_shell_view_execute_search (cal_shell_view); +#endif } static GtkActionEntry calendar_entries[] = { @@ -643,7 +687,7 @@ static GtkActionEntry calendar_entries[] = { N_("_Forward as iCalendar..."), NULL, NULL, /* XXX Add a tooltip! */ - G_CALLBACK (action_event_forward_new_cb) }, + G_CALLBACK (action_event_forward_cb) }, { "event-meeting-new", NULL, @@ -713,7 +757,16 @@ static GtkActionEntry calendar_entries[] = { N_("_Schedule Meeting..."), NULL, NULL, /* XXX Add a tooltip! */ - G_CALLBACK (action_event_schedule_cb) } + G_CALLBACK (action_event_schedule_cb) }, + + /*** Menus ***/ + + { "calendar-actions-menu", + NULL, + N_("_Actions"), + NULL, + NULL, + NULL } }; static GtkRadioActionEntry calendar_view_entries[] = { @@ -842,6 +895,12 @@ e_cal_shell_view_actions_init (ECalShellView *cal_shell_view) /* Fine tuning. */ + action = ACTION (CALENDAR_GO_TODAY); + g_object_set (action, "short-label", _("Today"), NULL); + + action = ACTION (CALENDAR_JUMP_TO); + g_object_set (action, "short-label", _("Go To"), NULL); + action = ACTION (EVENT_DELETE); g_object_set (action, "short-label", _("Delete"), NULL); diff --git a/calendar/modules/e-cal-shell-view-private.c b/calendar/modules/e-cal-shell-view-private.c index 65be70ae93..d5b15a370f 100644 --- a/calendar/modules/e-cal-shell-view-private.c +++ b/calendar/modules/e-cal-shell-view-private.c @@ -27,6 +27,7 @@ static void cal_shell_view_update_timezone (ECalShellView *cal_shell_view) { +#if 0 ECalShellContent *cal_shell_content; ECalShellSidebar *cal_shell_sidebar; GnomeCalendarViewType view_type; @@ -44,6 +45,7 @@ cal_shell_view_update_timezone (ECalShellView *cal_shell_view) timezone = calendar_config_get_icaltimezone (); e_calendar_view_get_icaltimezone (calendar_view, timezone); +#endif } static void @@ -265,13 +267,15 @@ e_cal_shell_view_private_constructed (ECalShellView *cal_shell_view) /* Listen for configuration changes. */ +#if 0 notification = calendar_config_add_notification_timezone ( cal_shell_view_timezone_changed_cb, cal_shell_view); priv->notifications = g_list_prepend ( priv->notifications, GUINT_TO_POINTER (notification)); cal_shell_view_update_timezone (cal_shell_view); +#endif - e_shell_view_update_actions (shell_view); + e_cal_shell_view_actions_init (shell_view); e_cal_shell_view_update_sidebar (cal_shell_view); } @@ -383,6 +387,7 @@ e_cal_shell_view_set_status_message (ECalShellView *cal_shell_view, void e_cal_shell_view_update_sidebar (ECalShellView *cal_shell_view) { +#if 0 /* KILL-BONOBO */ EShellView *shell_view; EShellSidebar *shell_sidebar; GnomeCalendar *calendar; @@ -503,5 +508,5 @@ e_cal_shell_view_update_sidebar (ECalShellView *cal_shell_view) } e_shell_sidebar_set_secondary_text (shell_sidebar, buffer); +#endif } - diff --git a/calendar/modules/e-cal-shell-view-private.h b/calendar/modules/e-cal-shell-view-private.h index bf246cd4ac..6187e2b749 100644 --- a/calendar/modules/e-cal-shell-view-private.h +++ b/calendar/modules/e-cal-shell-view-private.h @@ -27,16 +27,18 @@ #include #include #include +#include #include #include "e-util/e-dialog-utils.h" #include "e-util/e-util.h" #include "calendar/gui/comp-util.h" +#include "calendar/gui/e-cal-list-view.h" #include "calendar/gui/e-cal-model-tasks.h" #include "calendar/gui/e-calendar-view.h" #include "calendar/gui/gnome-cal.h" -#include "calendar/gui/goto.h" +/*#include "calendar/gui/goto.h"*/ #include "calendar/gui/print.h" #include "calendar/gui/dialogs/copy-source-dialog.h" #include "calendar/gui/dialogs/event-editor.h" diff --git a/calendar/modules/e-cal-shell-view.c b/calendar/modules/e-cal-shell-view.c index 4e966024bd..9100986280 100644 --- a/calendar/modules/e-cal-shell-view.c +++ b/calendar/modules/e-cal-shell-view.c @@ -76,6 +76,7 @@ cal_shell_view_constructed (GObject *object) static void cal_shell_view_update_actions (EShellView *shell_view) { +#if 0 ECalShellViewPrivate *priv; ECalShellContent *cal_shell_content; ECalShellSidebar *cal_shell_sidebar; @@ -166,6 +167,7 @@ cal_shell_view_update_actions (EShellView *shell_view) action = ACTION (EVENT_OPEN); sensitive = (n_selected == 1); gtk_action_set_sensitive (action, sensitive); +#endif } static void @@ -186,7 +188,7 @@ cal_shell_view_class_init (ECalShellViewClass *class, shell_view_class = E_SHELL_VIEW_CLASS (class); shell_view_class->label = _("Calendar"); - shell_view_class->icon_name = "evolution-calendar"; + shell_view_class->icon_name = "x-office-calendar"; shell_view_class->ui_definition = "evolution-calendars.ui"; shell_view_class->search_options = "/calendar-search-options"; shell_view_class->search_rules = "caltypes.xml"; diff --git a/calendar/modules/e-task-shell-view-actions.c b/calendar/modules/e-task-shell-view-actions.c index 805089ea8b..9a5bca34d9 100644 --- a/calendar/modules/e-task-shell-view-actions.c +++ b/calendar/modules/e-task-shell-view-actions.c @@ -588,6 +588,7 @@ action_task_purge_cb (GtkAction *action, purge: /* FIXME */ + ; } static void diff --git a/calendar/modules/e-task-shell-view-private.h b/calendar/modules/e-task-shell-view-private.h index 4d059419cd..dfb5c98d10 100644 --- a/calendar/modules/e-task-shell-view-private.h +++ b/calendar/modules/e-task-shell-view-private.h @@ -36,6 +36,7 @@ #include "e-util/gconf-bridge.h" #include "calendar/common/authentication.h" +#include "calendar/gui/calendar-config.h" #include "calendar/gui/comp-util.h" #include "calendar/gui/e-cal-component-preview.h" #include "calendar/gui/e-cal-model-tasks.h" -- cgit v1.2.3