Federated_Computer/federated-calendar
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Implemented ::set_date method.

Browse Source 
Implemented set_date method, moving update of ::date attribute to another call
outside the construction process. The method can be used to set or update the
GcalView::active-date property
Implemented changes from GcalView API
Integrated GcalWeekView into application flow.
This commit is contained in:
Erick Pérez Castellanos
2012-07-11 10:50:29 -04:00
parent 89a941ec36
commit 63c7b1a91c
4 changed files with 359 additions and 240 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gcal-month-view.c
+183 -117
View File
@@ -30,7 +30,7 @@
enum enum
{ {
PROP_0, PROP_0,
PROP_DATE PROP_DATE //active-date inherited property
}; };
struct _GcalViewChild struct _GcalViewChild
@@ -56,79 +56,86 @@ struct _GcalMonthViewPrivate
gint clicked_cell; gint clicked_cell;
gint selected_cell; gint selected_cell;
icaltimetype *date;
gint days_delay; gint days_delay;
gint header_size; gint header_size;
gint grid_header_size; gint grid_header_size;
gdouble vertical_step; gdouble vertical_step;
gdouble horizontal_step; gdouble horizontal_step;
/* property */
icaltimetype *date;
}; };
static void gcal_view_interface_init (GcalViewIface *iface); static void gcal_view_interface_init (GcalViewIface *iface);
static void gcal_month_view_constructed (GObject *object); static void gcal_month_view_set_property (GObject *object,
static void gcal_month_view_set_property (GObject *object,
guint property_id, guint property_id,
const GValue *value, const GValue *value,
GParamSpec *pspec); GParamSpec *pspec);
static void gcal_month_view_get_property (GObject *object, static void gcal_month_view_get_property (GObject *object,
guint property_id, guint property_id,
GValue *value, GValue *value,
GParamSpec *pspec); GParamSpec *pspec);
static void gcal_month_view_finalize (GObject *object); static void gcal_month_view_finalize (GObject *object);
static void gcal_month_view_realize (GtkWidget *widget); static void gcal_month_view_realize (GtkWidget *widget);
static void gcal_month_view_unrealize (GtkWidget *widget); static void gcal_month_view_unrealize (GtkWidget *widget);
static void gcal_month_view_map (GtkWidget *widget); static void gcal_month_view_map (GtkWidget *widget);
static void gcal_month_view_unmap (GtkWidget *widget); static void gcal_month_view_unmap (GtkWidget *widget);
static void gcal_month_view_size_allocate (GtkWidget *widget, static void gcal_month_view_size_allocate (GtkWidget *widget,
GtkAllocation *allocation); GtkAllocation *allocation);
static gboolean gcal_month_view_draw (GtkWidget *widget, static gboolean gcal_month_view_draw (GtkWidget *widget,
cairo_t *cr); cairo_t *cr);
static gboolean gcal_month_view_button_press (GtkWidget *widget, static gboolean gcal_month_view_button_press (GtkWidget *widget,
GdkEventButton *event); GdkEventButton *event);
static gboolean gcal_month_view_button_release (GtkWidget *widget, static gboolean gcal_month_view_button_release (GtkWidget *widget,
GdkEventButton *event); GdkEventButton *event);
static void gcal_month_view_add (GtkContainer *constainer, static void gcal_month_view_add (GtkContainer *constainer,
GtkWidget *widget); GtkWidget *widget);
static void gcal_month_view_remove (GtkContainer *constainer, static void gcal_month_view_remove (GtkContainer *constainer,
GtkWidget *widget); GtkWidget *widget);
static void gcal_month_view_forall (GtkContainer *container, static void gcal_month_view_forall (GtkContainer *container,
gboolean include_internals, gboolean include_internals,
GtkCallback callback, GtkCallback callback,
gpointer callback_data); gpointer callback_data);
static void gcal_month_view_draw_header (GcalMonthView *view, static void gcal_month_view_set_date (GcalMonthView *view,
cairo_t *cr,
GtkAllocation *alloc,
GtkBorder *padding);
static void gcal_month_view_draw_grid (GcalMonthView *view,
cairo_t *cr,
GtkAllocation *alloc,
GtkBorder *padding);
static gboolean gcal_month_view_is_in_range (GcalView *view,
icaltimetype *date); icaltimetype *date);
static void gcal_month_view_remove_by_uuid (GcalView *view, static void gcal_month_view_draw_header (GcalMonthView *view,
cairo_t *cr,
GtkAllocation *alloc,
GtkBorder *padding);
static void gcal_month_view_draw_grid (GcalMonthView *view,
cairo_t *cr,
GtkAllocation *alloc,
GtkBorder *padding);
static icaltimetype* gcal_month_view_get_initial_date (GcalView *view);
static icaltimetype* gcal_month_view_get_final_date (GcalView *view);
static gboolean gcal_month_view_contains (GcalView *view,
icaltimetype *date);
static void gcal_month_view_remove_by_uuid (GcalView *view,
const gchar *uuid); const gchar *uuid);
static GtkWidget* gcal_month_view_get_by_uuid (GcalView *view, static GtkWidget* gcal_month_view_get_by_uuid (GcalView *view,
const gchar *uuid); const gchar *uuid);
G_DEFINE_TYPE_WITH_CODE (GcalMonthView, G_DEFINE_TYPE_WITH_CODE (GcalMonthView,
@@ -161,19 +168,11 @@ gcal_month_view_class_init (GcalMonthViewClass *klass)
widget_class->button_release_event = gcal_month_view_button_release; widget_class->button_release_event = gcal_month_view_button_release;
object_class = G_OBJECT_CLASS (klass); object_class = G_OBJECT_CLASS (klass);
object_class->constructed = gcal_month_view_constructed;
object_class->set_property = gcal_month_view_set_property; object_class->set_property = gcal_month_view_set_property;
object_class->get_property = gcal_month_view_get_property; object_class->get_property = gcal_month_view_get_property;
object_class->finalize = gcal_month_view_finalize; object_class->finalize = gcal_month_view_finalize;
g_object_class_install_property (object_class, g_object_class_override_property (object_class, PROP_DATE, "active-date");
PROP_DATE,
g_param_spec_boxed ("date",
"Date",
_("Date"),
ICAL_TIME_TYPE,
G_PARAM_CONSTRUCT |
G_PARAM_READWRITE));
g_type_class_add_private ((gpointer)klass, sizeof (GcalMonthViewPrivate)); g_type_class_add_private ((gpointer)klass, sizeof (GcalMonthViewPrivate));
} }
@@ -206,45 +205,28 @@ gcal_month_view_init (GcalMonthView *self)
static void static void
gcal_view_interface_init (GcalViewIface *iface) gcal_view_interface_init (GcalViewIface *iface)
{ {
iface->is_in_range = gcal_month_view_is_in_range; iface->get_initial_date = gcal_month_view_get_initial_date;
iface->get_final_date = gcal_month_view_get_final_date;
iface->contains = gcal_month_view_contains;
iface->remove_by_uuid = gcal_month_view_remove_by_uuid; iface->remove_by_uuid = gcal_month_view_remove_by_uuid;
iface->get_by_uuid = gcal_month_view_get_by_uuid; iface->get_by_uuid = gcal_month_view_get_by_uuid;
} }
static void
gcal_month_view_constructed (GObject *object)
{
GcalMonthViewPrivate *priv;
priv = GCAL_MONTH_VIEW (object)->priv;
priv->selected_cell = priv->date->day + ( - priv->days_delay);
}
static void static void
gcal_month_view_set_property (GObject *object, gcal_month_view_set_property (GObject *object,
guint property_id, guint property_id,
const GValue *value, const GValue *value,
GParamSpec *pspec) GParamSpec *pspec)
{ {
GcalMonthViewPrivate *priv = GCAL_MONTH_VIEW (object)->priv; g_return_if_fail (GCAL_IS_MONTH_VIEW (object));
switch (property_id) switch (property_id)
{ {
case PROP_DATE: case PROP_DATE:
{ gcal_month_view_set_date (GCAL_MONTH_VIEW (object),
icaltimetype *first_of_month; g_value_dup_boxed (value));
break;
if (priv->date != NULL)
g_free (priv->date);
priv->date = g_value_dup_boxed (value);
first_of_month = gcal_dup_icaltime (priv->date);
first_of_month->day = 1;
priv->days_delay = - icaltime_day_of_week (*first_of_month) + 2;
g_free (first_of_month);
break;
}
default: default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
break; break;
@@ -257,7 +239,10 @@ gcal_month_view_get_property (GObject *object,
GValue *value, GValue *value,
GParamSpec *pspec) GParamSpec *pspec)
{ {
GcalMonthViewPrivate *priv = GCAL_MONTH_VIEW (object)->priv; GcalMonthViewPrivate *priv;
g_return_if_fail (GCAL_IS_MONTH_VIEW (object));
priv = GCAL_MONTH_VIEW (object)->priv;
switch (property_id) switch (property_id)
{ {
@@ -539,6 +524,8 @@ gcal_month_view_button_release (GtkWidget *widget,
gint x, y; gint x, y;
gint released; gint released;
icaltimetype *new_date;
priv = GCAL_MONTH_VIEW (widget)->priv; priv = GCAL_MONTH_VIEW (widget)->priv;
context = gtk_widget_get_style_context (widget); context = gtk_widget_get_style_context (widget);
state = gtk_widget_get_state_flags (widget); state = gtk_widget_get_state_flags (widget);
@@ -567,7 +554,12 @@ gcal_month_view_button_release (GtkWidget *widget,
{ {
priv->selected_cell = priv->clicked_cell; priv->selected_cell = priv->clicked_cell;
priv->clicked_cell = -1; priv->clicked_cell = -1;
gtk_widget_queue_draw (widget); gtk_widget_queue_resize (widget);
new_date = gcal_dup_icaltime (priv->date);
new_date->day = priv->selected_cell + priv->days_delay;
gcal_view_set_date (GCAL_VIEW (widget), new_date);
g_free (new_date);
} }
return TRUE; return TRUE;
} }
@@ -671,6 +663,60 @@ gcal_month_view_forall (GtkContainer *container,
} }
} }
static void
gcal_month_view_set_date (GcalMonthView *view,
icaltimetype *date)
{
GcalMonthViewPrivate *priv;
gboolean will_resize;
icaltimetype *first_of_month;
gint i;
GList *l;
GList *to_remove;
priv = view->priv;
will_resize = FALSE;
/* if span_updated: queue_resize */
will_resize = ! gcal_view_contains (GCAL_VIEW (view), date);
if (priv->date != NULL)
g_free (priv->date);
priv->date = date;
first_of_month = gcal_dup_icaltime (priv->date);
first_of_month->day = 1;
priv->days_delay = - icaltime_day_of_week (*first_of_month) + 2;
g_free (first_of_month);
/* if have_selection: yes this one have */
priv->selected_cell = priv->date->day - priv->days_delay;
if (will_resize)
{
to_remove = NULL;
for (i = 0; i < 34; i++)
{
for (l = priv->days[i]; l != NULL; l = l->next)
{
GcalViewChild *child;
icaltimetype *child_date;
child = (GcalViewChild*) l->data;
child_date = gcal_event_widget_get_date (GCAL_EVENT_WIDGET (child->widget));
if (! gcal_view_contains (GCAL_VIEW (view), child_date))
to_remove = g_list_append (to_remove, child->widget);
}
}
g_list_foreach (to_remove, (GFunc) gtk_widget_destroy, NULL);
gtk_widget_queue_resize (GTK_WIDGET (view));
}
}
static void static void
gcal_month_view_draw_header (GcalMonthView *view, gcal_month_view_draw_header (GcalMonthView *view,
cairo_t *cr, cairo_t *cr,
@@ -774,9 +820,11 @@ gcal_month_view_draw_grid (GcalMonthView *view,
context = gtk_widget_get_style_context (widget); context = gtk_widget_get_style_context (widget);
state = gtk_widget_get_state_flags (widget); state = gtk_widget_get_state_flags (widget);
/* drawing selected_cell */
//FIXME: to draw date in the selected cell if it's not in the month
state |= GTK_STATE_FLAG_SELECTED; state |= GTK_STATE_FLAG_SELECTED;
gtk_style_context_get_background_color (context, state, &color); gtk_style_context_get_background_color (context, state, &color);
cairo_set_source_rgba (cr, color.red, color.green, color.blue, 0.8); cairo_set_source_rgba (cr, color.red, color.green, color.blue, 0.6);
cairo_rectangle (cr, cairo_rectangle (cr,
start_grid_x + priv->horizontal_step * ( priv->selected_cell % 7), start_grid_x + priv->horizontal_step * ( priv->selected_cell % 7),
start_grid_y + priv->vertical_step * ( priv->selected_cell / 7), start_grid_y + priv->vertical_step * ( priv->selected_cell / 7),
@@ -784,6 +832,7 @@ gcal_month_view_draw_grid (GcalMonthView *view,
priv->vertical_step); priv->vertical_step);
cairo_fill (cr); cairo_fill (cr);
/* drawing grid */
state = gtk_widget_get_state_flags (widget); state = gtk_widget_get_state_flags (widget);
gtk_style_context_get_color (context, state, &color); gtk_style_context_get_color (context, state, &color);
cairo_set_source_rgba (cr, color.red, color.green, color.blue, color.alpha); cairo_set_source_rgba (cr, color.red, color.green, color.blue, color.alpha);
@@ -847,13 +896,70 @@ gcal_month_view_draw_grid (GcalMonthView *view,
cairo_stroke (cr); cairo_stroke (cr);
} }
static gboolean /* GcalView Interface API */
gcal_month_view_is_in_range (GcalView *view, /**
icaltimetype *date) * gcal_month_view_get_initial_date:
*
* Since: 0.1
* Return value: the first day of the month
* Returns: (transfer full): Release with g_free
**/
static icaltimetype*
gcal_month_view_get_initial_date (GcalView *view)
{ {
//FIXME: Add implementation here. //FIXME to retrieve the 35 days range
// as it should return TRUE all the time. GcalMonthViewPrivate *priv;
return TRUE; icaltimetype *new_date;
g_return_val_if_fail (GCAL_IS_MONTH_VIEW (view), NULL);
priv = GCAL_MONTH_VIEW (view)->priv;
new_date = gcal_dup_icaltime (priv->date);
new_date->day = 1;
return new_date;
}
/**
* gcal_month_view_get_final_date:
*
* Since: 0.1
* Return value: the last day of the month
* Returns: (transfer full): Release with g_free
**/
static icaltimetype*
gcal_month_view_get_final_date (GcalView *view)
{
//FIXME to retrieve the 35 days range
GcalMonthViewPrivate *priv;
icaltimetype *new_date;
g_return_val_if_fail (GCAL_IS_MONTH_VIEW (view), NULL);
priv = GCAL_MONTH_VIEW (view)->priv;
new_date = gcal_dup_icaltime (priv->date);
new_date->day = icaltime_days_in_month (priv->date->month, priv->date->year);
return new_date;
}
static gboolean
gcal_month_view_contains (GcalView *view,
icaltimetype *date)
{
GcalMonthViewPrivate *priv;
g_return_val_if_fail (GCAL_IS_MONTH_VIEW (view), FALSE);
priv = GCAL_MONTH_VIEW (view)->priv;
if (priv->date == NULL)
return FALSE;
if (priv->date->month == date->month
|| priv->date->year == date->year)
{
return TRUE;
}
else
{
return FALSE;
}
} }
static void static void
@@ -916,53 +1022,13 @@ gcal_month_view_get_by_uuid (GcalView *view,
/* Public API */ /* Public API */
/** /**
* gcal_month_view_new: * gcal_month_view_new:
* @date:
* *
* Since: 0.1 * Since: 0.1
* Return value: the new month view widget * Return value: the new month view widget
* Returns: (transfer full): * Returns: (transfer full):
**/ **/
GtkWidget* GtkWidget*
gcal_month_view_new (icaltimetype *date) gcal_month_view_new (void)
{ {
return g_object_new (GCAL_TYPE_MONTH_VIEW, "date", date, NULL); return g_object_new (GCAL_TYPE_MONTH_VIEW, NULL);
}
/**
* gcal_month_view_get_initial_date:
*
* Since: 0.1
* Return value: the first day of the month
* Returns: (transfer full): Release with g_free
**/
icaltimetype*
gcal_month_view_get_initial_date (GcalMonthView *view)
{
GcalMonthViewPrivate *priv;
icaltimetype *new_date;
priv = view->priv;
new_date = gcal_dup_icaltime (priv->date);
new_date->day = 1;
return new_date;
}
/**
* gcal_month_view_get_final_date:
*
* Since: 0.1
* Return value: the last day of the month
* Returns: (transfer full): Release with g_free
**/
icaltimetype*
gcal_month_view_get_final_date (GcalMonthView *view)
{
GcalMonthViewPrivate *priv;
icaltimetype *new_date;
priv = view->priv;
new_date = gcal_dup_icaltime (priv->date);
new_date->day = icaltime_days_in_month (priv->date->month, priv->date->year);
return new_date;
} }
src/gcal-month-view.h
+1 -5
View File
@@ -52,11 +52,7 @@ struct _GcalMonthViewClass
GType gcal_month_view_get_type (void); GType gcal_month_view_get_type (void);
GtkWidget* gcal_month_view_new (icaltimetype *date); GtkWidget* gcal_month_view_new (void);
icaltimetype* gcal_month_view_get_initial_date (GcalMonthView *view);
icaltimetype* gcal_month_view_get_final_date (GcalMonthView *view);
G_END_DECLS G_END_DECLS
src/gcal-week-view.c
+174 -113
View File
@@ -56,8 +56,6 @@ struct _GcalWeekViewPrivate
GdkWindow *event_window; GdkWindow *event_window;
icaltimetype *date;
gint days_delay; gint days_delay;
gint header_size; gint header_size;
gint grid_header_size; gint grid_header_size;
@@ -67,64 +65,74 @@ struct _GcalWeekViewPrivate
gint hours_steps; gint hours_steps;
gdouble vertical_step; gdouble vertical_step;
gdouble horizontal_step; gdouble horizontal_step;
/* property */
icaltimetype *date;
}; };
static void gcal_view_interface_init (GcalViewIface *iface); static void gcal_view_interface_init (GcalViewIface *iface);
static void gcal_week_view_set_property (GObject *object, static void gcal_week_view_set_property (GObject *object,
guint property_id, guint property_id,
const GValue *value, const GValue *value,
GParamSpec *pspec); GParamSpec *pspec);
static void gcal_week_view_get_property (GObject *object, static void gcal_week_view_get_property (GObject *object,
guint property_id, guint property_id,
GValue *value, GValue *value,
GParamSpec *pspec); GParamSpec *pspec);
static void gcal_week_view_finalize (GObject *object); static void gcal_week_view_finalize (GObject *object);
static void gcal_week_view_realize (GtkWidget *widget); static void gcal_week_view_realize (GtkWidget *widget);
static void gcal_week_view_unrealize (GtkWidget *widget); static void gcal_week_view_unrealize (GtkWidget *widget);
static void gcal_week_view_map (GtkWidget *widget); static void gcal_week_view_map (GtkWidget *widget);
static void gcal_week_view_unmap (GtkWidget *widget); static void gcal_week_view_unmap (GtkWidget *widget);
static void gcal_week_view_size_allocate (GtkWidget *widget, static void gcal_week_view_size_allocate (GtkWidget *widget,
GtkAllocation *allocation); GtkAllocation *allocation);
static gboolean gcal_week_view_draw (GtkWidget *widget, static gboolean gcal_week_view_draw (GtkWidget *widget,
cairo_t *cr); cairo_t *cr);
static void gcal_week_view_add (GtkContainer *constainer, static void gcal_week_view_add (GtkContainer *constainer,
GtkWidget *widget); GtkWidget *widget);
static void gcal_week_view_remove (GtkContainer *constainer, static void gcal_week_view_remove (GtkContainer *constainer,
GtkWidget *widget); GtkWidget *widget);
static void gcal_week_view_forall (GtkContainer *container, static void gcal_week_view_forall (GtkContainer *container,
gboolean include_internals, gboolean include_internals,
GtkCallback callback, GtkCallback callback,
gpointer callback_data); gpointer callback_data);
static void gcal_week_view_draw_header (GcalWeekView *view, static void gcal_week_view_set_date (GcalWeekView *view,
cairo_t *cr,
GtkAllocation *alloc,
GtkBorder *padding);
static void gcal_week_view_draw_grid (GcalWeekView *view,
cairo_t *cr,
GtkAllocation *alloc,
GtkBorder *padding);
static gboolean gcal_week_view_is_in_range (GcalView *view,
icaltimetype *date); icaltimetype *date);
static void gcal_week_view_remove_by_uuid (GcalView *view, static void gcal_week_view_draw_header (GcalWeekView *view,
cairo_t *cr,
GtkAllocation *alloc,
GtkBorder *padding);
static void gcal_week_view_draw_grid (GcalWeekView *view,
cairo_t *cr,
GtkAllocation *alloc,
GtkBorder *padding);
static icaltimetype* gcal_week_view_get_initial_date (GcalView *view);
static icaltimetype* gcal_week_view_get_final_date (GcalView *view);
static gboolean gcal_week_view_contains (GcalView *view,
icaltimetype *date);
static void gcal_week_view_remove_by_uuid (GcalView *view,
const gchar *uuid); const gchar *uuid);
static GtkWidget* gcal_week_view_get_by_uuid (GcalView *view, static GtkWidget* gcal_week_view_get_by_uuid (GcalView *view,
const gchar *uuid); const gchar *uuid);
G_DEFINE_TYPE_WITH_CODE (GcalWeekView, G_DEFINE_TYPE_WITH_CODE (GcalWeekView,
@@ -159,14 +167,7 @@ gcal_week_view_class_init (GcalWeekViewClass *klass)
object_class->get_property = gcal_week_view_get_property; object_class->get_property = gcal_week_view_get_property;
object_class->finalize = gcal_week_view_finalize; object_class->finalize = gcal_week_view_finalize;
g_object_class_install_property (object_class, g_object_class_override_property (object_class, PROP_DATE, "active-date");
PROP_DATE,
g_param_spec_boxed ("date",
"Date",
_("Date"),
ICAL_TIME_TYPE,
G_PARAM_CONSTRUCT |
G_PARAM_READWRITE));
g_type_class_add_private ((gpointer)klass, sizeof (GcalWeekViewPrivate)); g_type_class_add_private ((gpointer)klass, sizeof (GcalWeekViewPrivate));
} }
@@ -199,36 +200,29 @@ gcal_week_view_init (GcalWeekView *self)
static void static void
gcal_view_interface_init (GcalViewIface *iface) gcal_view_interface_init (GcalViewIface *iface)
{ {
iface->is_in_range = gcal_week_view_is_in_range; iface->get_initial_date = gcal_week_view_get_initial_date;
iface->get_final_date = gcal_week_view_get_final_date;
iface->contains = gcal_week_view_contains;
iface->remove_by_uuid = gcal_week_view_remove_by_uuid; iface->remove_by_uuid = gcal_week_view_remove_by_uuid;
iface->get_by_uuid = gcal_week_view_get_by_uuid; iface->get_by_uuid = gcal_week_view_get_by_uuid;
} }
static void static void
gcal_week_view_set_property (GObject *object, gcal_week_view_set_property (GObject *object,
guint property_id, guint property_id,
const GValue *value, const GValue *value,
GParamSpec *pspec) GParamSpec *pspec)
{ {
GcalWeekViewPrivate *priv = GCAL_WEEK_VIEW (object)->priv; g_return_if_fail (GCAL_IS_WEEK_VIEW (object));
switch (property_id) switch (property_id)
{ {
case PROP_DATE: case PROP_DATE:
{ gcal_week_view_set_date (
icaltimetype *first_of_month; GCAL_WEEK_VIEW (object),
g_value_dup_boxed (value));
if (priv->date != NULL) break;
g_free (priv->date);
priv->date = g_value_dup_boxed (value);
first_of_month = gcal_dup_icaltime (priv->date);
first_of_month->day = 1;
priv->days_delay = - icaltime_day_of_week (*first_of_month) + 2;
g_free (first_of_month);
break;
}
default: default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
break; break;
@@ -241,7 +235,10 @@ gcal_week_view_get_property (GObject *object,
GValue *value, GValue *value,
GParamSpec *pspec) GParamSpec *pspec)
{ {
GcalWeekViewPrivate *priv = GCAL_WEEK_VIEW (object)->priv; GcalWeekViewPrivate *priv;
g_return_if_fail (GCAL_IS_WEEK_VIEW (object));
priv = GCAL_WEEK_VIEW (object)->priv;
switch (property_id) switch (property_id)
{ {
@@ -416,11 +413,12 @@ gcal_week_view_size_allocate (GtkWidget *widget,
for (i = 0; i < 7; i++) for (i = 0; i < 7; i++)
{ {
gdouble *added_height;
added_height = g_malloc0 (sizeof (gdouble) * 11);
for (l = priv->days[i]; l != NULL; l = l->next) for (l = priv->days[i]; l != NULL; l = l->next)
{ {
GcalViewChild *child; GcalViewChild *child;
gdouble added_height [11];
gint pos_x; gint pos_x;
gint pos_y; gint pos_y;
gint min_height; gint min_height;
@@ -428,6 +426,7 @@ gcal_week_view_size_allocate (GtkWidget *widget,
GtkAllocation child_allocation; GtkAllocation child_allocation;
child = (GcalViewChild*) l->data; child = (GcalViewChild*) l->data;
pos_x = i * priv->horizontal_step; pos_x = i * priv->horizontal_step;
pos_y = ((child->index + (priv->hours_steps - 1)) / (priv->hours_steps)) * priv->vertical_step; pos_y = ((child->index + (priv->hours_steps - 1)) / (priv->hours_steps)) * priv->vertical_step;
@@ -445,7 +444,7 @@ gcal_week_view_size_allocate (GtkWidget *widget,
child_allocation.width = priv->horizontal_step; child_allocation.width = priv->horizontal_step;
child_allocation.height = MIN (natural_height, priv->vertical_step); child_allocation.height = MIN (natural_height, priv->vertical_step);
if (added_height[child->index] + child_allocation.height if (added_height[child->index] + child_allocation.height
> priv->vertical_step) > priv->vertical_step || child->index > 10)
{ {
gtk_widget_hide (child->widget); gtk_widget_hide (child->widget);
child->hidden_by_me = TRUE; child->hidden_by_me = TRUE;
@@ -459,6 +458,7 @@ gcal_week_view_size_allocate (GtkWidget *widget,
added_height[child->index] += child_allocation.height; added_height[child->index] += child_allocation.height;
} }
} }
g_free (added_height);
} }
} }
@@ -596,6 +596,51 @@ gcal_week_view_forall (GtkContainer *container,
} }
} }
static void
gcal_week_view_set_date (GcalWeekView *view,
icaltimetype *date)
{
GcalWeekViewPrivate *priv;
gboolean will_resize;
gint i;
GList *l;
GList *to_remove;
priv = view->priv;
will_resize = FALSE;
/* if span_updated: queue_resize */
will_resize = ! gcal_view_contains (GCAL_VIEW (view), date);
if (priv->date != NULL)
g_free (priv->date);
priv->date = date;
if (will_resize)
{
to_remove = NULL;
for (i = 0; i < 7; i++)
{
for (l = priv->days[i]; l != NULL; l = l->next)
{
GcalViewChild *child;
icaltimetype *child_date;
child = (GcalViewChild*) l->data;
child_date = gcal_event_widget_get_date (GCAL_EVENT_WIDGET (child->widget));
if (! gcal_view_contains (GCAL_VIEW (view), child_date))
to_remove = g_list_append (to_remove, child->widget);
}
}
g_list_foreach (to_remove, (GFunc) gtk_widget_destroy, NULL);
gtk_widget_queue_resize (GTK_WIDGET (view));
}
}
static void static void
gcal_week_view_draw_header (GcalWeekView *view, gcal_week_view_draw_header (GcalWeekView *view,
cairo_t *cr, cairo_t *cr,
@@ -634,7 +679,7 @@ gcal_week_view_draw_header (GcalWeekView *view,
gtk_style_context_remove_region (context, "header"); gtk_style_context_remove_region (context, "header");
gtk_style_context_restore (context); gtk_style_context_restore (context);
start_of_week = gcal_week_view_get_initial_date (view); start_of_week = gcal_week_view_get_initial_date (GCAL_VIEW (view));
tm_date = icaltimetype_to_tm (start_of_week); tm_date = icaltimetype_to_tm (start_of_week);
e_utf8_strftime_fix_am_pm (str_date, 64, "%B %d", &tm_date); e_utf8_strftime_fix_am_pm (str_date, 64, "%B %d", &tm_date);
@@ -704,7 +749,7 @@ gcal_week_view_draw_grid (GcalWeekView *view,
gtk_style_context_get_font (context, gtk_style_context_get_font (context,
state)); state));
start_of_week = gcal_week_view_get_initial_date (view); start_of_week = gcal_week_view_get_initial_date (GCAL_VIEW (view));
for (i = 0; i < 7; i++) for (i = 0; i < 7; i++)
{ {
gchar *weekday_header; gchar *weekday_header;
@@ -787,13 +832,73 @@ gcal_week_view_draw_grid (GcalWeekView *view,
g_object_unref (layout); g_object_unref (layout);
} }
static gboolean /* GcalView Interface API */
gcal_week_view_is_in_range (GcalView *view, /**
icaltimetype *date) * gcal_week_view_get_initial_date:
*
* Since: 0.1
* Return value: the first day of the month
* Returns: (transfer full): Release with g_free
**/
static icaltimetype*
gcal_week_view_get_initial_date (GcalView *view)
{ {
//FIXME: Add implementation here. GcalWeekViewPrivate *priv;
// as it should return TRUE all the time. icaltimetype *new_date;
return TRUE;
g_return_val_if_fail (GCAL_IS_WEEK_VIEW (view), NULL);
priv = GCAL_WEEK_VIEW (view)->priv;
new_date = g_new0 (icaltimetype, 1);
*new_date = icaltime_from_day_of_year (
icaltime_day_of_year (*(priv->date)) - icaltime_day_of_week (*(priv->date)) + 1,
priv->date->year);
return new_date;
}
/**
* gcal_week_view_get_final_date:
*
* Since: 0.1
* Return value: the last day of the month
* Returns: (transfer full): Release with g_free
**/
static icaltimetype*
gcal_week_view_get_final_date (GcalView *view)
{
GcalWeekViewPrivate *priv;
icaltimetype *new_date;
g_return_val_if_fail (GCAL_IS_WEEK_VIEW (view), NULL);
priv = GCAL_WEEK_VIEW (view)->priv;
new_date = g_new0 (icaltimetype, 1);
*new_date = icaltime_from_day_of_year (
icaltime_day_of_year (*(priv->date)) + 7 - icaltime_day_of_week (*(priv->date)),
priv->date->year);
return new_date;
}
static gboolean
gcal_week_view_contains (GcalView *view,
icaltimetype *date)
{
GcalWeekViewPrivate *priv;
g_return_val_if_fail (GCAL_IS_WEEK_VIEW (view), FALSE);
priv = GCAL_WEEK_VIEW (view)->priv;
if (priv->date == NULL)
return FALSE;
if (icaltime_week_number (*(priv->date)) == icaltime_week_number (*date)
&& priv->date->year == date->year)
{
return TRUE;
}
else
{
return FALSE;
}
} }
static void static void
@@ -863,51 +968,7 @@ gcal_week_view_get_by_uuid (GcalView *view,
* Returns: (transfer full): * Returns: (transfer full):
**/ **/
GtkWidget* GtkWidget*
gcal_week_view_new (icaltimetype *date) gcal_week_view_new (void)
{ {
return g_object_new (GCAL_TYPE_WEEK_VIEW, "date", date, NULL); return g_object_new (GCAL_TYPE_WEEK_VIEW, NULL);
}
/**
* gcal_week_view_get_initial_date:
*
* Since: 0.1
* Return value: the first day of the month
* Returns: (transfer full): Release with g_free
**/
icaltimetype*
gcal_week_view_get_initial_date (GcalWeekView *view)
{
GcalWeekViewPrivate *priv;
icaltimetype *new_date;
priv = view->priv;
new_date = g_new0 (icaltimetype, 1);
*new_date = icaltime_from_day_of_year (
icaltime_day_of_year (*(priv->date)) - icaltime_day_of_week (*(priv->date)) + 1,
priv->date->year);
return new_date;
}
/**
* gcal_week_view_get_final_date:
*
* Since: 0.1
* Return value: the last day of the month
* Returns: (transfer full): Release with g_free
**/
icaltimetype*
gcal_week_view_get_final_date (GcalWeekView *view)
{
GcalWeekViewPrivate *priv;
icaltimetype *new_date;
priv = view->priv;
new_date = g_new0 (icaltimetype, 1);
*new_date = icaltime_from_day_of_year (
icaltime_day_of_year (*(priv->date)) + 7 - icaltime_day_of_week (*(priv->date)),
priv->date->year);
return new_date;
} }
src/gcal-week-view.h
+1 -5
View File
@@ -52,11 +52,7 @@ struct _GcalWeekViewClass
GType gcal_week_view_get_type (void); GType gcal_week_view_get_type (void);
GtkWidget* gcal_week_view_new (icaltimetype *date); GtkWidget* gcal_week_view_new (void);
icaltimetype* gcal_week_view_get_initial_date (GcalWeekView *view);
icaltimetype* gcal_week_view_get_final_date (GcalWeekView *view);
G_END_DECLS G_END_DECLS