[gnome-calendar] month-view: add first_weekday settings to view
- From: Erick Pérez Castellanos <erickpc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-calendar] month-view: add first_weekday settings to view
- Date: Thu, 4 Dec 2014 22:42:23 +0000 (UTC)
commit a67635bb053e9ddea41cce50e5274e0fd1774e58
Author: Erick Pérez Castellanos <erick red gmail com>
Date: Fri Nov 7 14:50:57 2014 -0500
month-view: add first_weekday settings to view
Bug: https://bugzilla.gnome.org/show_bug.cgi?id=703317
src/gcal-month-view.c | 35 +++++++++++++++++++++++++++++++++--
src/gcal-month-view.h | 3 +++
src/gcal-window.c | 3 +++
3 files changed, 39 insertions(+), 2 deletions(-)
---
diff --git a/src/gcal-month-view.c b/src/gcal-month-view.c
index 17c9621..c7bc33c 100644
--- a/src/gcal-month-view.c
+++ b/src/gcal-month-view.c
@@ -43,6 +43,10 @@ typedef struct
* sun: 0, mon: 1, ... sat = 6 */
gint days_delay;
+ /* first day of the week according to user locale, being
+ * 0 for Sunday, 1 for Monday and so on */
+ gint first_weekday;
+
/* button_down/up flag */
gint clicked_cell;
gint start_mark_cell;
@@ -243,7 +247,7 @@ gcal_month_view_set_property (GObject *object,
priv->date = g_value_dup_boxed (value);
date = gcal_view_get_initial_date (GCAL_VIEW (object));
- priv->days_delay = icaltime_day_of_week (*date) - 1;
+ priv->days_delay = (icaltime_day_of_week (*date) - priv->first_weekday + 6) % 7;
default_zone =
gcal_manager_get_system_timezone (priv->manager);
@@ -601,7 +605,7 @@ gcal_month_view_draw (GtkWidget *widget,
for (i = 0; i < 7; i++)
{
pango_layout_set_font_description (layout, bold_font);
- pango_layout_set_text (layout, gcal_get_weekday (i), -1);
+ pango_layout_set_text (layout, gcal_get_weekday ((i + priv->first_weekday) % 7), -1);
pango_cairo_update_layout (cr, layout);
pango_layout_get_pixel_size (layout, &font_width, &font_height);
@@ -1307,3 +1311,30 @@ gcal_month_view_new (GcalManager *manager)
{
return g_object_new (GCAL_TYPE_MONTH_VIEW, "manager", manager, NULL);
}
+
+/**
+ * gcal_month_view_set_first_weekday:
+ * @view: A #GcalMonthView instance
+ * @day_nr: Integer representing the first day of the week
+ *
+ * Set the first day of the week according to the locale, being
+ * 0 for Sunday, 1 for Monday and so on.
+ **/
+void
+gcal_month_view_set_first_weekday (GcalMonthView *view,
+ gint day_nr)
+{
+ GcalMonthViewPrivate *priv;
+ icaltimetype *date;
+
+ priv = gcal_month_view_get_instance_private (view);
+ priv->first_weekday = day_nr;
+
+ /* update days_delay */
+ if (priv->date != NULL)
+ {
+ date = gcal_month_view_get_initial_date (GCAL_VIEW (view));
+ priv->days_delay = (icaltime_day_of_week (*date) - priv->first_weekday + 6) % 7;
+ g_free (date);
+ }
+}
diff --git a/src/gcal-month-view.h b/src/gcal-month-view.h
index 96c67d8..464f24e 100644
--- a/src/gcal-month-view.h
+++ b/src/gcal-month-view.h
@@ -52,6 +52,9 @@ GType gcal_month_view_get_type (void);
GtkWidget* gcal_month_view_new (GcalManager *manager);
+void gcal_month_view_set_first_weekday (GcalMonthView *view,
+ gint day_nr);
+
G_END_DECLS
#endif /* __GCAL_MONTH_VIEW_H__ */
diff --git a/src/gcal-window.c b/src/gcal-window.c
index 63828c4..a2389fa 100644
--- a/src/gcal-window.c
+++ b/src/gcal-window.c
@@ -1141,6 +1141,9 @@ gcal_window_constructed (GObject *object)
priv->views[GCAL_WINDOW_VIEW_MONTH] =
gcal_month_view_new (priv->manager);
+ gcal_month_view_set_first_weekday (
+ GCAL_MONTH_VIEW (priv->views[GCAL_WINDOW_VIEW_MONTH]),
+ get_first_weekday ());
gtk_stack_add_titled (GTK_STACK (priv->views_stack),
priv->views[GCAL_WINDOW_VIEW_MONTH],
"month", _("Month"));
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]