callisto-debian/gtk2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Changes to support week_start values other than 0 and 1, e.g. 6 will let

Browse Source 
Fri Jan  2 02:50:11 2004  Matthias Clasen  <maclas@gmx.de>

	* gtk/gtkcalendar.c (gtk_calendar_compute_days):
	* gtk/gtkcalendar.c (gtk_calendar_paint_day_names):
	* gtk/gtkcalendar.c (gtk_calendar_init): Changes to support
	week_start values other than 0 and 1, e.g. 6 will let weeks start
	on Saturday.  (#130353, Roozbeh Pournader)
This commit is contained in:
Matthias Clasen
2004-01-02 01:52:04 +00:00
committed by Matthias Clasen
parent dfcf1818c7
commit 194c2550f6
6 changed files with 59 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,11 @@
Fri Jan 2 02:50:11 2004 Matthias Clasen <maclas@gmx.de>
* gtk/gtkcalendar.c (gtk_calendar_compute_days):
* gtk/gtkcalendar.c (gtk_calendar_paint_day_names):
* gtk/gtkcalendar.c (gtk_calendar_init): Changes to support
week_start values other than 0 and 1, e.g. 6 will let weeks start
on Saturday. (#130353, Roozbeh Pournader)
2003-12-31 13:49 Daniel Rogers <dsrogers@phasevelocity.org> 2003-12-31 13:49 Daniel Rogers <dsrogers@phasevelocity.org>
* gdk/x11/gdkinput-x11.c: (gdk_input_translate_coordinates) * gdk/x11/gdkinput-x11.c: (gdk_input_translate_coordinates)

8
ChangeLog.pre-2-10
View File

@ -1,3 +1,11 @@
Fri Jan 2 02:50:11 2004 Matthias Clasen <maclas@gmx.de>
* gtk/gtkcalendar.c (gtk_calendar_compute_days):
* gtk/gtkcalendar.c (gtk_calendar_paint_day_names):
* gtk/gtkcalendar.c (gtk_calendar_init): Changes to support
week_start values other than 0 and 1, e.g. 6 will let weeks start
on Saturday. (#130353, Roozbeh Pournader)
2003-12-31 13:49 Daniel Rogers <dsrogers@phasevelocity.org> 2003-12-31 13:49 Daniel Rogers <dsrogers@phasevelocity.org>
* gdk/x11/gdkinput-x11.c: (gdk_input_translate_coordinates) * gdk/x11/gdkinput-x11.c: (gdk_input_translate_coordinates)

8
ChangeLog.pre-2-4
View File

@ -1,3 +1,11 @@
Fri Jan 2 02:50:11 2004 Matthias Clasen <maclas@gmx.de>
* gtk/gtkcalendar.c (gtk_calendar_compute_days):
* gtk/gtkcalendar.c (gtk_calendar_paint_day_names):
* gtk/gtkcalendar.c (gtk_calendar_init): Changes to support
week_start values other than 0 and 1, e.g. 6 will let weeks start
on Saturday. (#130353, Roozbeh Pournader)
2003-12-31 13:49 Daniel Rogers <dsrogers@phasevelocity.org> 2003-12-31 13:49 Daniel Rogers <dsrogers@phasevelocity.org>
* gdk/x11/gdkinput-x11.c: (gdk_input_translate_coordinates) * gdk/x11/gdkinput-x11.c: (gdk_input_translate_coordinates)

8
ChangeLog.pre-2-6
View File

@ -1,3 +1,11 @@
Fri Jan 2 02:50:11 2004 Matthias Clasen <maclas@gmx.de>
* gtk/gtkcalendar.c (gtk_calendar_compute_days):
* gtk/gtkcalendar.c (gtk_calendar_paint_day_names):
* gtk/gtkcalendar.c (gtk_calendar_init): Changes to support
week_start values other than 0 and 1, e.g. 6 will let weeks start
on Saturday. (#130353, Roozbeh Pournader)
2003-12-31 13:49 Daniel Rogers <dsrogers@phasevelocity.org> 2003-12-31 13:49 Daniel Rogers <dsrogers@phasevelocity.org>
* gdk/x11/gdkinput-x11.c: (gdk_input_translate_coordinates) * gdk/x11/gdkinput-x11.c: (gdk_input_translate_coordinates)

8
ChangeLog.pre-2-8
View File

@ -1,3 +1,11 @@
Fri Jan 2 02:50:11 2004 Matthias Clasen <maclas@gmx.de>
* gtk/gtkcalendar.c (gtk_calendar_compute_days):
* gtk/gtkcalendar.c (gtk_calendar_paint_day_names):
* gtk/gtkcalendar.c (gtk_calendar_init): Changes to support
week_start values other than 0 and 1, e.g. 6 will let weeks start
on Saturday. (#130353, Roozbeh Pournader)
2003-12-31 13:49 Daniel Rogers <dsrogers@phasevelocity.org> 2003-12-31 13:49 Daniel Rogers <dsrogers@phasevelocity.org>
* gdk/x11/gdkinput-x11.c: (gdk_input_translate_coordinates) * gdk/x11/gdkinput-x11.c: (gdk_input_translate_coordinates)

30
gtk/gtkcalendar.c
View File

@ -712,18 +712,22 @@ gtk_calendar_init (GtkCalendar *calendar)
else if (strcmp (year_before, "calendar:MY") != 0) else if (strcmp (year_before, "calendar:MY") != 0)
g_warning ("Whoever translated calendar:MY did so wrongly.\n"); g_warning ("Whoever translated calendar:MY did so wrongly.\n");
/* Translate to calendar:week_start:1 if you want Monday to be the /* Translate to calendar:week_start:0 if you want Sunday to be the
* first day of the week; otherwise translate to calendar:week_start:0. * first day of the week to calendar:week_start:1 if you want Monday
* Do *not* translate it to anything else, if it isn't calendar:week_start:1 * to be the first day of the week, and so on.
* or calendar:week_start:0 it will not work.
*/ */
week_start = _("calendar:week_start:0"); week_start = _("calendar:week_start:0");
if (strcmp (week_start, "calendar:week_start:1") == 0)
private_data->week_start = 1; if (strncmp (week_start, "calendar:week_start:", 20) == 0)
else if (strcmp (week_start, "calendar:week_start:0") == 0) private_data->week_start = *(week_start + 20) - '0';
private_data->week_start = 0;
else else
private_data->week_start = -1;
if (private_data->week_start < 0 || private_data->week_start > 6)
{
g_warning ("Whoever translated calendar:week_start:0 did so wrongly.\n"); g_warning ("Whoever translated calendar:week_start:0 did so wrongly.\n");
private_data->week_start = 0;
}
} }
GtkWidget* GtkWidget*
@ -1915,8 +1919,7 @@ gtk_calendar_paint_day_names (GtkWidget *widget)
day = 6 - i; day = 6 - i;
else else
day = i; day = i;
if (private_data->week_start == 1) day = (day + private_data->week_start) % 7;
day= (day+1)%7;
g_snprintf (buffer, sizeof (buffer), "%s", default_abbreviated_dayname[day]); g_snprintf (buffer, sizeof (buffer), "%s", default_abbreviated_dayname[day]);
pango_layout_set_text (layout, buffer, -1); pango_layout_set_text (layout, buffer, -1);
@ -2240,12 +2243,7 @@ gtk_calendar_compute_days (GtkCalendar *calendar)
ndays_in_month = month_length[leap (year)][month]; ndays_in_month = month_length[leap (year)][month];
first_day = day_of_week (year, month, 1); first_day = day_of_week (year, month, 1);
first_day = (first_day + 7 - private_data->week_start) % 7;
if (private_data->week_start == 1)
first_day--;
else
first_day %= 7;
/* Compute days of previous month */ /* Compute days of previous month */
if (month > 1) if (month > 1)