From 72278de44bf664b3670527db25c6d373a2690fd0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Erick=20P=C3=A9rez=20Castellanos?= Date: Mon, 26 Nov 2012 11:12:44 -0500 Subject: [PATCH] Format and documentation changes. --- doc/Internals | 2 +- doc/Views | 12 +++--- src/gcal-view.h | 49 +++++++++++----------- src/gcal-year-view.c | 96 ++++++++++++++++++++++---------------------- 4 files changed, 81 insertions(+), 78 deletions(-) diff --git a/doc/Internals b/doc/Internals index 348ea854..e08d6844 100644 --- a/doc/Internals +++ b/doc/Internals @@ -68,7 +68,7 @@ Description of some internals of Gnome Calendar Application ... * Has icaltimetype attribute - For keeping actual date + For keeping current date * Has `set_view/update_view` method For updating the view content by talking to GcalManager diff --git a/doc/Views b/doc/Views index 40973a72..551fedf8 100644 --- a/doc/Views +++ b/doc/Views @@ -3,14 +3,14 @@ Here, I'll place some notes about views - For the creation of new events: - Views will provide one date or two, in both cases the event created from + Views will provide one date or two (a range), in both cases the event created from views are all day event, so the date passed by the views to GcalEventOverlay should be marked as is_date views - - For marking actual unit: - View will provide a two pixels mark for the actual unit in every view. + - For marking current unit: + View will provide a two pixels mark for the current unit in every view. So: - week-view will mark the day of week of the actual date, no matters + week-view will mark the day of week of the current date, no matters which week we are seeing. - month-view will mark the day of the month of the actual date. - year-view will mark as actual unit the month we're living today. + month-view will mark the day of the month of the current date. + year-view will mark as current unit the month we're living today. diff --git a/src/gcal-view.h b/src/gcal-view.h index 6faaea3f..76b259a2 100644 --- a/src/gcal-view.h +++ b/src/gcal-view.h @@ -48,46 +48,47 @@ struct _GcalViewIface GTypeInterface parent_iface; /* signals */ - void (*create_event) (GcalView *view, icaltimetype *start_span, icaltimetype *end_span, gdouble x, gdouble y); - void (*updated) (GcalView *view, icaltimetype *date); + void (*create_event) (GcalView *view, icaltimetype *start_span, icaltimetype *end_span, gdouble x, gdouble y); + void (*updated) (GcalView *view, icaltimetype *date); /* pure virtual methods */ - icaltimetype* (*get_initial_date) (GcalView *view); - icaltimetype* (*get_final_date) (GcalView *view); + icaltimetype* (*get_initial_date) (GcalView *view); + icaltimetype* (*get_final_date) (GcalView *view); - gboolean (*contains) (GcalView *view, icaltimetype *date); - void (*remove_by_uuid) (GcalView *view, const gchar *uuid); - GtkWidget* (*get_by_uuid) (GcalView *view, const gchar *uuid); - void (*reposition_child) (GcalView *view, const gchar *uuid); + gboolean (*contains) (GcalView *view, icaltimetype *date); + void (*remove_by_uuid) (GcalView *view, const gchar *uuid); + GtkWidget* (*get_by_uuid) (GcalView *view, const gchar *uuid); + void (*reposition_child) (GcalView *view, const gchar *uuid); - void (*clear_selection) (GcalView *view); + void (*clear_selection) (GcalView *view); }; -GType gcal_view_get_type (void); +GType gcal_view_get_type (void); -void gcal_view_set_date (GcalView *view, - icaltimetype *date); +void gcal_view_set_date (GcalView *view, + icaltimetype *date); -icaltimetype* gcal_view_get_date (GcalView *view); +icaltimetype* gcal_view_get_date (GcalView *view); -icaltimetype* gcal_view_get_initial_date (GcalView *view); +icaltimetype* gcal_view_get_initial_date (GcalView *view); -icaltimetype* gcal_view_get_final_date (GcalView *view); +icaltimetype* gcal_view_get_final_date (GcalView *view); -gboolean gcal_view_contains (GcalView *view, - icaltimetype *date); +gboolean gcal_view_contains (GcalView *view, + icaltimetype *date); -void gcal_view_remove_by_uuid (GcalView *view, - const gchar *uuid); +void gcal_view_remove_by_uuid (GcalView *view, + const gchar *uuid); -GtkWidget* gcal_view_get_by_uuid (GcalView *view, - const gchar *uuid); +GtkWidget* gcal_view_get_by_uuid (GcalView *view, + const gchar *uuid); -void gcal_view_reposition_child (GcalView *view, - const gchar *uuid); +void gcal_view_reposition_child (GcalView *view, + const gchar *uuid); + +void gcal_view_clear_selection (GcalView *view); -void gcal_view_clear_selection (GcalView *view); G_END_DECLS diff --git a/src/gcal-year-view.c b/src/gcal-year-view.c index b781b702..ab4bca27 100644 --- a/src/gcal-year-view.c +++ b/src/gcal-year-view.c @@ -56,75 +56,77 @@ enum PROP_DATE //active-date inherited property }; -static void gcal_view_interface_init (GcalViewIface *iface); +static void gcal_view_interface_init (GcalViewIface *iface); -static void gcal_year_view_set_property (GObject *object, - guint property_id, - const GValue *value, - GParamSpec *pspec); +static void gcal_year_view_set_property (GObject *object, + guint property_id, + const GValue *value, + GParamSpec *pspec); -static void gcal_year_view_get_property (GObject *object, - guint property_id, - GValue *value, - GParamSpec *pspec); +static void gcal_year_view_get_property (GObject *object, + guint property_id, + GValue *value, + GParamSpec *pspec); -static void gcal_year_view_finalize (GObject *object); +static void gcal_year_view_finalize (GObject *object); -static void gcal_year_view_realize (GtkWidget *widget); +static void gcal_year_view_realize (GtkWidget *widget); -static void gcal_year_view_unrealize (GtkWidget *widget); +static void gcal_year_view_unrealize (GtkWidget *widget); -static void gcal_year_view_map (GtkWidget *widget); +static void gcal_year_view_map (GtkWidget *widget); -static void gcal_year_view_unmap (GtkWidget *widget); +static void gcal_year_view_unmap (GtkWidget *widget); -static void gcal_year_view_size_allocate (GtkWidget *widget, - GtkAllocation *allocation); +static void gcal_year_view_size_allocate (GtkWidget *widget, + GtkAllocation *allocation); -static gboolean gcal_year_view_draw (GtkWidget *widget, - cairo_t *cr); +static gboolean gcal_year_view_draw (GtkWidget *widget, + cairo_t *cr); -static void gcal_year_view_add (GtkContainer *constainer, - GtkWidget *widget); +static void gcal_year_view_add (GtkContainer *constainer, + GtkWidget *widget); -static void gcal_year_view_remove (GtkContainer *constainer, - GtkWidget *widget); +static void gcal_year_view_remove (GtkContainer *constainer, + GtkWidget *widget); -static void gcal_year_view_forall (GtkContainer *container, - gboolean include_internals, - GtkCallback callback, - gpointer callback_data); +static void gcal_year_view_forall (GtkContainer *container, + gboolean include_internals, + GtkCallback callback, + gpointer callback_data); -static void gcal_year_view_set_date (GcalYearView *view, - icaltimetype *date); +static void gcal_year_view_set_date (GcalYearView *view, + icaltimetype *date); -static void gcal_year_view_draw_header (GcalYearView *view, - cairo_t *cr, - GtkAllocation *alloc, - GtkBorder *padding); +static void gcal_year_view_draw_header (GcalYearView *view, + cairo_t *cr, + GtkAllocation *alloc, + GtkBorder *padding); -static void gcal_year_view_draw_grid (GcalYearView *view, - cairo_t *cr, - GtkAllocation *alloc, - GtkBorder *padding); +static void gcal_year_view_draw_grid (GcalYearView *view, + cairo_t *cr, + GtkAllocation *alloc, + GtkBorder *padding); -static gdouble gcal_year_view_get_start_grid_y (GtkWidget *widget); +static gdouble gcal_year_view_get_start_grid_y (GtkWidget *widget); -static icaltimetype* gcal_year_view_get_initial_date (GcalView *view); +static icaltimetype* gcal_year_view_get_initial_date (GcalView *view); -static icaltimetype* gcal_year_view_get_final_date (GcalView *view); +static icaltimetype* gcal_year_view_get_final_date (GcalView *view); -static gboolean gcal_year_view_contains (GcalView *view, - icaltimetype *date); +static gboolean gcal_year_view_contains (GcalView *view, + icaltimetype *date); -static void gcal_year_view_remove_by_uuid (GcalView *view, - const gchar *uuid); +static void gcal_year_view_remove_by_uuid (GcalView *view, + const gchar *uuid); -static GtkWidget* gcal_year_view_get_by_uuid (GcalView *view, - const gchar *uuid); +static GtkWidget* gcal_year_view_get_by_uuid (GcalView *view, + const gchar *uuid); -static void gcal_year_view_reposition_child (GcalView *view, - const gchar *uuid); +static void gcal_year_view_reposition_child (GcalView *view, + const gchar *uuid); + +static void gcal_year_view_clear_selection (GcalView *view); G_DEFINE_TYPE_WITH_CODE (GcalYearView, gcal_year_view,