From 1f17dab6b0d9c5413dea38dcc95e7a7bb5b4bd9b Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Tue, 2 Nov 2010 11:49:38 -0400 Subject: Move calendar preferences to the calendar module. Continue replacing the use of calendar-config functions with GObject property bindings to EShellSettings properties. --- calendar/gui/e-cal-model.h | 47 +++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 46 insertions(+), 1 deletion(-) (limited to 'calendar/gui/e-cal-model.h') diff --git a/calendar/gui/e-cal-model.h b/calendar/gui/e-cal-model.h index ec883a7df2..db744d3d32 100644 --- a/calendar/gui/e-cal-model.h +++ b/calendar/gui/e-cal-model.h @@ -26,6 +26,7 @@ #ifndef E_CAL_MODEL_H #define E_CAL_MODEL_H +#include #include #include #include "e-cell-date-edit-text.h" @@ -185,22 +186,66 @@ icalcomponent_kind e_cal_model_get_component_kind (ECalModel *model); void e_cal_model_set_component_kind (ECalModel *model, icalcomponent_kind kind); +gboolean e_cal_model_get_confirm_delete (ECalModel *model); +void e_cal_model_set_confirm_delete (ECalModel *model, + gboolean confirm_delete); ECalModelFlags e_cal_model_get_flags (ECalModel *model); void e_cal_model_set_flags (ECalModel *model, ECalModelFlags flags); icaltimezone * e_cal_model_get_timezone (ECalModel *model); void e_cal_model_set_timezone (ECalModel *model, icaltimezone *zone); -void e_cal_model_set_default_category (ECalModel *model, +gboolean e_cal_model_get_compress_weekend + (ECalModel *model); +void e_cal_model_set_compress_weekend + (ECalModel *model, + gboolean compress_weekend); +void e_cal_model_set_default_category + (ECalModel *model, const gchar *default_cat); +gint e_cal_model_get_default_reminder_interval + (ECalModel *model); +void e_cal_model_set_default_reminder_interval + (ECalModel *model, + gint def_reminder_interval); +EDurationType e_cal_model_get_default_reminder_units + (ECalModel *model); +void e_cal_model_set_default_reminder_units + (ECalModel *model, + EDurationType def_reminder_units); gboolean e_cal_model_get_use_24_hour_format (ECalModel *model); void e_cal_model_set_use_24_hour_format (ECalModel *model, gboolean use24); +gboolean e_cal_model_get_use_default_reminder + (ECalModel *model); +void e_cal_model_set_use_default_reminder + (ECalModel *model, + gboolean use_def_reminder); gint e_cal_model_get_week_start_day (ECalModel *model); void e_cal_model_set_week_start_day (ECalModel *model, gint week_start_day); +gint e_cal_model_get_work_day_end_hour + (ECalModel *model); +void e_cal_model_set_work_day_end_hour + (ECalModel *model, + gint work_day_end_hour); +gint e_cal_model_get_work_day_end_minute + (ECalModel *model); +void e_cal_model_set_work_day_end_minute + (ECalModel *model, + gint work_day_end_minute); +gint e_cal_model_get_work_day_start_hour + (ECalModel *model); +void e_cal_model_set_work_day_start_hour + (ECalModel *model, + gint work_day_start_hour); +gint e_cal_model_get_work_day_start_minute + (ECalModel *model); +void e_cal_model_set_work_day_start_minute + (ECalModel *model, + gint work_day_start_minute); ECal * e_cal_model_get_default_client (ECalModel *model); void e_cal_model_set_default_client (ECalModel *model, ECal *client); -- cgit v1.2.3 From 38790d8478e906a5c59d0c4a5216f297f305bfeb Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Tue, 14 Jun 2011 08:54:20 +0200 Subject: Do not use deprecated EBook/ECal API --- calendar/gui/e-cal-model.h | 26 ++++++++++---------------- 1 file changed, 10 insertions(+), 16 deletions(-) (limited to 'calendar/gui/e-cal-model.h') diff --git a/calendar/gui/e-cal-model.h b/calendar/gui/e-cal-model.h index db744d3d32..766fd6286f 100644 --- a/calendar/gui/e-cal-model.h +++ b/calendar/gui/e-cal-model.h @@ -28,7 +28,7 @@ #include #include
-#include +#include #include "e-cell-date-edit-text.h" /* Standard GObject macros */ @@ -105,7 +105,7 @@ typedef struct _ECalModelComponentPrivate ECalModelComponentPrivate; struct _ECalModelComponent { GObject object; - ECal *client; + ECalClient *client; icalcomponent *icalcomp; time_t instance_start; time_t instance_end; @@ -160,16 +160,10 @@ struct _ECalModelClass { void (*cal_view_progress) (ECalModel *model, const gchar *message, gint progress, - ECalSourceType type); - #ifndef E_CAL_DISABLE_DEPRECATED - void (*cal_view_done) (ECalModel *model, - ECalendarStatus status, - ECalSourceType type); - #endif + ECalClientSourceType type); void (*cal_view_complete) (ECalModel *model, - ECalendarStatus status, - const gchar *error_msg, - ECalSourceType type); + const GError *error, + ECalClientSourceType type); void (*status_message) (ECalModel *model, const gchar *message, gdouble percent); @@ -246,16 +240,16 @@ gint e_cal_model_get_work_day_start_minute void e_cal_model_set_work_day_start_minute (ECalModel *model, gint work_day_start_minute); -ECal * e_cal_model_get_default_client (ECalModel *model); +ECalClient * e_cal_model_get_default_client (ECalModel *model); void e_cal_model_set_default_client (ECalModel *model, - ECal *client); + ECalClient *client); GList * e_cal_model_get_client_list (ECalModel *model); -ECal * e_cal_model_get_client_for_uri (ECalModel *model, +ECalClient * e_cal_model_get_client_for_uri (ECalModel *model, const gchar *uri); void e_cal_model_add_client (ECalModel *model, - ECal *client); + ECalClient *cal_client); void e_cal_model_remove_client (ECalModel *model, - ECal *client); + ECalClient *cal_client); void e_cal_model_remove_all_clients (ECalModel *model); void e_cal_model_get_time_range (ECalModel *model, time_t *start, -- cgit v1.2.3 From 5da21ceee424eb238278bdec258b0c6d8725ae21 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Tue, 2 Aug 2011 15:23:52 +0200 Subject: Bug #655190 - Sluggish performance interacting with calendar/tasks --- calendar/gui/e-cal-model.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'calendar/gui/e-cal-model.h') diff --git a/calendar/gui/e-cal-model.h b/calendar/gui/e-cal-model.h index 766fd6286f..33ffcff52d 100644 --- a/calendar/gui/e-cal-model.h +++ b/calendar/gui/e-cal-model.h @@ -281,7 +281,8 @@ ECalModelComponent * const ECalComponentId *id); gchar * e_cal_model_date_value_to_string (ECalModel *model, gconstpointer value); -void e_cal_model_generate_instances (ECalModel *model, +void e_cal_model_generate_instances_sync + (ECalModel *model, time_t start, time_t end, ECalRecurInstanceFn cb, -- cgit v1.2.3 From fcbbdfbd18e15b4ee8322a0217cf03a689a5e033 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Tue, 16 Aug 2011 11:25:56 -0400 Subject: Coding style and whitespace cleanup. --- calendar/gui/e-cal-model.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'calendar/gui/e-cal-model.h') diff --git a/calendar/gui/e-cal-model.h b/calendar/gui/e-cal-model.h index 33ffcff52d..a514c95ab2 100644 --- a/calendar/gui/e-cal-model.h +++ b/calendar/gui/e-cal-model.h @@ -73,7 +73,7 @@ G_BEGIN_DECLS typedef enum { /* If you add new items here or reorder them, you have to update the - .etspec files for the tables using this model */ + * .etspec files for the tables using this model */ E_CAL_MODEL_FIELD_CATEGORIES, E_CAL_MODEL_FIELD_CLASSIFICATION, E_CAL_MODEL_FIELD_COLOR, /* not a real field */ -- cgit v1.2.3 From e2b6ff7a6c1e1580c26ee0719b349151e8dad6fd Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Tue, 27 Sep 2011 01:13:42 -0400 Subject: Miscellaneous cleanups from the account-mgmt branch. Reducing diff noise so I can see important changes easier when comparing branches. A few API changes, but nothing that affects functionality. --- calendar/gui/e-cal-model.h | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'calendar/gui/e-cal-model.h') diff --git a/calendar/gui/e-cal-model.h b/calendar/gui/e-cal-model.h index a514c95ab2..6dd04675ed 100644 --- a/calendar/gui/e-cal-model.h +++ b/calendar/gui/e-cal-model.h @@ -263,6 +263,10 @@ void e_cal_model_set_search_query (ECalModel *model, icalcomponent * e_cal_model_create_component_with_defaults (ECalModel *model, gboolean all_day); +gchar * e_cal_model_get_attendees_status_info + (ECalModel *model, + ECalComponent *comp, + ECalClient *cal_client); const gchar * e_cal_model_get_color_for_component (ECalModel *model, ECalModelComponent *comp_data); -- cgit v1.2.3