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

More updates so that Mig can test it - Federico

Browse Source 
svn path=/trunk/; revision=91
This commit is contained in:
Arturo Espinosa
1998-04-02 07:25:44 +00:00
parent 23463e22bc
commit 0b8a6756ac
6 changed files with 64 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
calendar/gncal-day-view.c
View File

@ -285,7 +285,7 @@ gncal_day_view_update (GncalDayView *dview)
if (dview->day_str)
g_free (dview->day_str);
tm = *localtime_r (&dview->lower);
tm = *localtime (&dview->lower);
strftime (buf, 256, "%A %d", &tm);
dview->day_str = g_strdup (buf);

32
calendar/gncal-week-view.c
View File

@ -5,6 +5,7 @@
* Author: Federico Mena <federico@nuclecu.unam.mx>
*/
#include <string.h>
#include "gncal-week-view.h"
@ -43,6 +44,8 @@ gncal_week_view_init (GncalWeekView *wview)
for (i = 0; i < 7; i++)
wview->days[i] = NULL;
wview->gtk_calendar = NULL;
}
GtkWidget *
@ -80,6 +83,22 @@ gncal_week_view_new (Calendar *calendar, time_t start_of_week)
gtk_widget_show (GTK_WIDGET (wview->days[i]));
}
/* FIXME: for now this is a plain calendar (for not having anything better to put
* there). In the final version it should be a nice days/hours matrix with
* "event density" display as in Sun's "cm" program.
*/
wview->gtk_calendar = GTK_CALENDAR (gtk_calendar_new ());
gtk_calendar_display_options (wview->gtk_calendar,
GTK_CALENDAR_SHOW_HEADING | GTK_CALENDAR_SHOW_DAY_NAMES);
gtk_table_attach (GTK_TABLE (wview), GTK_WIDGET (wview->gtk_calendar),
0, 3,
1, 2,
GTK_EXPAND | GTK_FILL | GTK_SHRINK,
GTK_EXPAND | GTK_FILL | GTK_SHRINK,
4, 4);
gtk_widget_show (GTK_WIDGET (wview->gtk_calendar));
gncal_week_view_set (wview, start_of_week);
return GTK_WIDGET (wview);
@ -111,15 +130,16 @@ gncal_week_view_set (GncalWeekView *wview, time_t start_of_week)
{
struct tm tm;
time_t day_start, day_end;
int i;
g_return_if_fail (wview != NULL);
g_return_if_fail (GNCAL_IS_WEEK_VIEW (wview));
tm = *localtime (&start_of_week);
/* back up to start of week */
/* back up to start of week (Monday) */
tm.tm_mday -= tm.tm_wday;
tm.tm_mday -= (tm.tm_wday == 0) ? 6 : (tm.tm_wday - 1);
/* Start of day */
@ -129,11 +149,17 @@ gncal_week_view_set (GncalWeekView *wview, time_t start_of_week)
day_start = mktime (&tm);
/* Calendar */
gtk_calendar_select_month (wview->gtk_calendar, tm.tm_mon + 1, tm.tm_year + 1900);
/* Day views */
for (i = 0; i < 7; i++) { /* rest of days */
tm.tm_mday++;
day_end = mktime (&tm);
gncal_day_view_set_bounds (days[i], day_start, day_end - 1);
gncal_day_view_set_bounds (wview->days[i], day_start, day_end - 1);
day_start = day_end;
}

2
calendar/gncal-week-view.h
View File

@ -11,6 +11,7 @@
#include <gtk/gtktable.h>
#include <libgnome/gnome-defs.h>
#include <libgnomeui/gtkcalendar.h>
#include "gncal-day-view.h"
@ -33,6 +34,7 @@ struct _GncalWeekView {
struct tm start_of_week;
GncalDayView *days[7]; /* the day view widgets */
GtkCalendar *gtk_calendar; /* At least for now; see the FIXME comments in the .c file */
};
struct _GncalWeekViewClass {

2
calendar/gui/gncal-day-view.c
View File

@ -285,7 +285,7 @@ gncal_day_view_update (GncalDayView *dview)
if (dview->day_str)
g_free (dview->day_str);
tm = *localtime_r (&dview->lower);
tm = *localtime (&dview->lower);
strftime (buf, 256, "%A %d", &tm);
dview->day_str = g_strdup (buf);

32
calendar/gui/gncal-week-view.c
View File

@ -5,6 +5,7 @@
* Author: Federico Mena <federico@nuclecu.unam.mx>
*/
#include <string.h>
#include "gncal-week-view.h"
@ -43,6 +44,8 @@ gncal_week_view_init (GncalWeekView *wview)
for (i = 0; i < 7; i++)
wview->days[i] = NULL;
wview->gtk_calendar = NULL;
}
GtkWidget *
@ -80,6 +83,22 @@ gncal_week_view_new (Calendar *calendar, time_t start_of_week)
gtk_widget_show (GTK_WIDGET (wview->days[i]));
}
/* FIXME: for now this is a plain calendar (for not having anything better to put
* there). In the final version it should be a nice days/hours matrix with
* "event density" display as in Sun's "cm" program.
*/
wview->gtk_calendar = GTK_CALENDAR (gtk_calendar_new ());
gtk_calendar_display_options (wview->gtk_calendar,
GTK_CALENDAR_SHOW_HEADING | GTK_CALENDAR_SHOW_DAY_NAMES);
gtk_table_attach (GTK_TABLE (wview), GTK_WIDGET (wview->gtk_calendar),
0, 3,
1, 2,
GTK_EXPAND | GTK_FILL | GTK_SHRINK,
GTK_EXPAND | GTK_FILL | GTK_SHRINK,
4, 4);
gtk_widget_show (GTK_WIDGET (wview->gtk_calendar));
gncal_week_view_set (wview, start_of_week);
return GTK_WIDGET (wview);
@ -111,15 +130,16 @@ gncal_week_view_set (GncalWeekView *wview, time_t start_of_week)
{
struct tm tm;
time_t day_start, day_end;
int i;
g_return_if_fail (wview != NULL);
g_return_if_fail (GNCAL_IS_WEEK_VIEW (wview));
tm = *localtime (&start_of_week);
/* back up to start of week */
/* back up to start of week (Monday) */
tm.tm_mday -= tm.tm_wday;
tm.tm_mday -= (tm.tm_wday == 0) ? 6 : (tm.tm_wday - 1);
/* Start of day */
@ -129,11 +149,17 @@ gncal_week_view_set (GncalWeekView *wview, time_t start_of_week)
day_start = mktime (&tm);
/* Calendar */
gtk_calendar_select_month (wview->gtk_calendar, tm.tm_mon + 1, tm.tm_year + 1900);
/* Day views */
for (i = 0; i < 7; i++) { /* rest of days */
tm.tm_mday++;
day_end = mktime (&tm);
gncal_day_view_set_bounds (days[i], day_start, day_end - 1);
gncal_day_view_set_bounds (wview->days[i], day_start, day_end - 1);
day_start = day_end;
}

2
calendar/gui/gncal-week-view.h
View File

@ -11,6 +11,7 @@
#include <gtk/gtktable.h>
#include <libgnome/gnome-defs.h>
#include <libgnomeui/gtkcalendar.h>
#include "gncal-day-view.h"
@ -33,6 +34,7 @@ struct _GncalWeekView {
struct tm start_of_week;
GncalDayView *days[7]; /* the day view widgets */
GtkCalendar *gtk_calendar; /* At least for now; see the FIXME comments in the .c file */
};
struct _GncalWeekViewClass {