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

Various bug fixes that were reported:

Browse Source 
Various bug fixes that were reported:

	1. Correct event span computation for some cases.
	2. Correct drawing of events that span more than one day
	3. EventEditor supports 12/24 hour formats.

mguel.

svn path=/trunk/; revision=216
This commit is contained in:
Arturo Espinosa
1998-05-16 01:06:02 +00:00
parent 418f8bfcb5
commit cc2d908a38
6 changed files with 8 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
calendar/eventedit.c
View File

@ -228,7 +228,7 @@ event_editor_setup_time_frame (EventEditor *ee)
ee->ical->dtstart = time (NULL);
ee->ical->dtend = time_add_minutes (ee->ical->dtstart, 30);
}
ee->start_time = start_time = gnome_date_edit_new (ee->ical->dtstart, TRUE);
ee->start_time = start_time = gnome_date_edit_new (ee->ical->dtstart, TRUE, !am_pm_flag);
gnome_date_edit_set_popup_range ((GnomeDateEdit *) start_time, day_begin, day_end);
gtk_signal_connect (GTK_OBJECT (start_time), "date_changed",
GTK_SIGNAL_FUNC (check_dates), ee);
@ -244,7 +244,7 @@ event_editor_setup_time_frame (EventEditor *ee)
0, 0);
/* 2. End time */
ee->end_time = end_time = gnome_date_edit_new (ee->ical->dtend, TRUE);
ee->end_time = end_time = gnome_date_edit_new (ee->ical->dtend, TRUE, !am_pm_flag);
gnome_date_edit_set_popup_range ((GnomeDateEdit *) end_time, day_begin, day_end);
gtk_signal_connect (GTK_OBJECT (end_time), "date_changed",
GTK_SIGNAL_FUNC (check_dates), ee);
@ -1201,7 +1201,7 @@ ee_rp_init_ending_date (EventEditor *ee)
else
enddate = ee->ical->dtend;
ee->recur_ed_end_on = widget = gnome_date_edit_new (enddate, FALSE);
ee->recur_ed_end_on = widget = gnome_date_edit_new (enddate, FALSE, !am_pm_flag);
gtk_box_pack_start (GTK_BOX (ihbox), widget, FALSE, FALSE, 0);
gtk_signal_connect (GTK_OBJECT (radio1), "toggled",
@ -1356,7 +1356,7 @@ ee_rp_init_exceptions (EventEditor *ee)
vbox = gtk_vbox_new (FALSE, 4);
gtk_box_pack_start (GTK_BOX (hbox), vbox, FALSE, FALSE, 0);
ee->recur_ex_date = widget = gnome_date_edit_new (time (NULL), FALSE);
ee->recur_ex_date = widget = gnome_date_edit_new (time (NULL), FALSE, !am_pm_flag);
gtk_box_pack_start (GTK_BOX (vbox), widget, FALSE, FALSE, 0);
widget = gtk_button_new_with_label (_("Add exception"));

1
calendar/gnome-cal.c
View File

@ -336,7 +336,6 @@ mark_gtk_calendar_day (iCalObject *obj, time_t start, time_t end, void *c)
{
GtkCalendar *gtk_cal = c;
struct tm tm_s;
int days, day;
time_t t, day_end;
tm_s = *localtime (&start);

8
calendar/gui/eventedit.c
View File

@ -228,7 +228,7 @@ event_editor_setup_time_frame (EventEditor *ee)
ee->ical->dtstart = time (NULL);
ee->ical->dtend = time_add_minutes (ee->ical->dtstart, 30);
}
ee->start_time = start_time = gnome_date_edit_new (ee->ical->dtstart, TRUE);
ee->start_time = start_time = gnome_date_edit_new (ee->ical->dtstart, TRUE, !am_pm_flag);
gnome_date_edit_set_popup_range ((GnomeDateEdit *) start_time, day_begin, day_end);
gtk_signal_connect (GTK_OBJECT (start_time), "date_changed",
GTK_SIGNAL_FUNC (check_dates), ee);
@ -244,7 +244,7 @@ event_editor_setup_time_frame (EventEditor *ee)
0, 0);
/* 2. End time */
ee->end_time = end_time = gnome_date_edit_new (ee->ical->dtend, TRUE);
ee->end_time = end_time = gnome_date_edit_new (ee->ical->dtend, TRUE, !am_pm_flag);
gnome_date_edit_set_popup_range ((GnomeDateEdit *) end_time, day_begin, day_end);
gtk_signal_connect (GTK_OBJECT (end_time), "date_changed",
GTK_SIGNAL_FUNC (check_dates), ee);
@ -1201,7 +1201,7 @@ ee_rp_init_ending_date (EventEditor *ee)
else
enddate = ee->ical->dtend;
ee->recur_ed_end_on = widget = gnome_date_edit_new (enddate, FALSE);
ee->recur_ed_end_on = widget = gnome_date_edit_new (enddate, FALSE, !am_pm_flag);
gtk_box_pack_start (GTK_BOX (ihbox), widget, FALSE, FALSE, 0);
gtk_signal_connect (GTK_OBJECT (radio1), "toggled",
@ -1356,7 +1356,7 @@ ee_rp_init_exceptions (EventEditor *ee)
vbox = gtk_vbox_new (FALSE, 4);
gtk_box_pack_start (GTK_BOX (hbox), vbox, FALSE, FALSE, 0);
ee->recur_ex_date = widget = gnome_date_edit_new (time (NULL), FALSE);
ee->recur_ex_date = widget = gnome_date_edit_new (time (NULL), FALSE, !am_pm_flag);
gtk_box_pack_start (GTK_BOX (vbox), widget, FALSE, FALSE, 0);
widget = gtk_button_new_with_label (_("Add exception"));

1
calendar/gui/gnome-cal.c
View File

@ -336,7 +336,6 @@ mark_gtk_calendar_day (iCalObject *obj, time_t start, time_t end, void *c)
{
GtkCalendar *gtk_cal = c;
struct tm tm_s;
int days, day;
time_t t, day_end;
tm_s = *localtime (&start);

1
calendar/gui/year-view.c
View File

@ -169,7 +169,6 @@ year_view_mark_day (iCalObject *ical, time_t start, time_t end, void *closure)
{
GncalYearView *yview = (GncalYearView *) closure;
struct tm tm_s;
int days, day;
time_t t, day_end;
tm_s = *localtime (&start);

1
calendar/year-view.c
View File

@ -169,7 +169,6 @@ year_view_mark_day (iCalObject *ical, time_t start, time_t end, void *closure)
{
GncalYearView *yview = (GncalYearView *) closure;
struct tm tm_s;
int days, day;
time_t t, day_end;
tm_s = *localtime (&start);