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

More work in progress, wheeeee - Federico

Browse Source 
svn path=/trunk/; revision=109
This commit is contained in:
Arturo Espinosa
1998-04-07 19:01:42 +00:00
parent eaba896a14
commit b5a61327da
27 changed files with 1804 additions and 173 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
calendar/ChangeLog
View File

@ -1,3 +1,45 @@
1998-04-06 Federico Mena Quintero <federico@nuclecu.unam.mx>
* gncal-week-view.c (gncal_week_view_new): Use the new
gtk_table_set_homogeneous() instead of setting the variable directly.
1998-04-03 Federico Mena Quintero <federico@nuclecu.unam.mx>
* eventedit.c (ee_create_ae): Make it return void.
(ee_alarm_widgets): Remove some unused variables.
(ee_store_alarm): Make it return void.
#include <string.h>
* eventedit.h: #include "gnome-cal.h"
* calobj.c (list_free): Don't use g_free in the g_list_foreach.
* calendar.h: Add prototype for calendar_load().
* timeutil.h: Add prototypes for time_add_*().
* calendar.c:
* calobj.c:
* eventedit.c:
* gnome-cal.c: #include "timeutil.h"
* gncal-day-view.c (gncal_day_view_size_request): Make the minimum
width equal or larger to the title width.
* main.c: #include "eventedit.h"
(main): Add a return statement.
(new_calendar): Show stuff *after* the calendar has been loaded.
* gnome-cal.c (gnome_calendar_load): Update the day view.
(setup_widgets): Hackish setup of a day view widget - will fix later.
(gnome_calendar_init): Initialize all fields.
* gnome-cal.h: Added day_view field. Maybe this should be changed
when the a complete day view panel is complete.
* gncal-day-view.c (gncal_day_view_update): Draw after update, not
before.
1998-04-06 Carsten Schaar <nhadcasc@fs-maphy.uni-hannover.de>
* versit/.cvsignore: New file.

1
calendar/calendar.c
View File

@ -15,6 +15,7 @@
#include <config.h>
#include "calendar.h"
#include "timeutil.h"
#include "versit/vcc.h"
Calendar *

1
calendar/calendar.h
View File

@ -18,6 +18,7 @@ typedef struct {
} Calendar;
Calendar *calendar_new (char *title);
void calendar_load (Calendar *cal, char *fname);
void calendar_add_object (Calendar *cal, iCalObject *obj);
void calendar_remove_object (Calendar *cal, iCalObject *obj);
void calendar_destroy (Calendar *cal);

9
calendar/eventedit.c
View File

@ -6,10 +6,11 @@
*/
#include <gnome.h>
#include <string.h>
#include "calendar.h"
#include "gnome-cal.h"
#include "eventedit.h"
#include "main.h"
#include "timeutil.h"
static void event_editor_init (EventEditor *ee);
GtkWindow *parent_class;
@ -202,10 +203,9 @@ alarm_toggle (GtkToggleButton *toggle, CalendarAlarm *alarm)
#define FX GTK_FILL | GTK_EXPAND
#define XCOL 6
static GtkWidget *
static void
ee_create_ae (GtkTable *table, char *str, CalendarAlarm *alarm, enum AlarmType type, int y)
{
GtkWidget *timesel;
char buffer [40];
alarm->w_enabled = gtk_check_button_new_with_label (str);
@ -253,7 +253,7 @@ ee_create_ae (GtkTable *table, char *str, CalendarAlarm *alarm, enum AlarmType t
static GtkWidget *
ee_alarm_widgets (EventEditor *ee)
{
GtkWidget *table, *aalarm, *dalarm, *palarm, *malarm, *mailto, *mailte, *l;
GtkWidget *table, *mailto, *mailte, *l;
l = gtk_frame_new (_("Alarms"));
@ -304,6 +304,7 @@ ee_classification_widgets (EventEditor *ee)
* Retrieves the information from the CalendarAlarm widgets and stores them
* on the CalendarAlarm generic values
*/
void
ee_store_alarm (CalendarAlarm *alarm, enum AlarmType type)
{
GtkWidget *item;

2
calendar/eventedit.h
View File

@ -8,6 +8,8 @@
#ifndef EVENT_EDITOR_H
#define EVENT_EDITOR_H
#include "gnome-cal.h"
BEGIN_GNOME_DECLS
#define EVENT_EDITOR(obj) GTK_CHECK_CAST(obj, event_editor_get_type(), EventEditor)

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

@ -156,6 +156,7 @@ static void
gncal_day_view_size_request (GtkWidget *widget, GtkRequisition *requisition)
{
GncalDayView *dview;
int str_width, width;
g_return_if_fail (widget != NULL);
g_return_if_fail (GNCAL_IS_DAY_VIEW (widget));
@ -165,7 +166,11 @@ gncal_day_view_size_request (GtkWidget *widget, GtkRequisition *requisition)
/* border and min width */
requisition->width = 2 * (widget->style->klass->xthickness + TEXT_BORDER) + MIN_INFO_WIDTH;
str_width = gdk_string_width (widget->style->font, dview->day_str);
width = MAX (MIN_INFO_WIDTH, str_width);
requisition->width = 2 * (widget->style->klass->xthickness + TEXT_BORDER) + width;
requisition->height = 2 * (widget->style->klass->ythickness + TEXT_BORDER);
/* division line */
@ -297,8 +302,6 @@ gncal_day_view_update (GncalDayView *dview)
strftime (buf, sizeof (buf)-1, "%A %d", &tm);
dview->day_str = g_strdup (buf);
gtk_widget_draw (GTK_WIDGET (dview), NULL);
if (dview->events)
g_list_free (dview->events);
@ -306,6 +309,8 @@ gncal_day_view_update (GncalDayView *dview)
dview->lower,
dview->upper,
calendar_compare_by_dtstart);
gtk_widget_draw (GTK_WIDGET (dview), NULL);
}
void

898
calendar/gncal-full-day.c
View File

File diff suppressed because it is too large Load Diff

6
calendar/gncal-full-day.h
View File

@ -34,6 +34,12 @@ struct _GncalFullDay {
time_t lower; /* lower time to display */
time_t upper; /* upper time to display */
int interval; /* interval between rows in minutes */
GList *children; /* container children */
gpointer drag_info; /* internal drag information */
GdkCursor *up_down_cursor; /* for dragging children */
GdkCursor *beam_cursor; /* for the text widgets */
};
struct _GncalFullDayClass {

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

@ -58,7 +58,7 @@ gncal_week_view_new (GnomeCalendar *calendar, time_t start_of_week)
wview = gtk_type_new (gncal_week_view_get_type ());
wview->table.homogeneous = TRUE; /* FIXME: eeeeeeeeeek, GtkTable does not have a function to set this */
gtk_table_set_homogeneous (GTK_TABLE (wview), TRUE);
wview->calendar = calendar;

20
calendar/gnome-cal.c
View File

@ -10,6 +10,7 @@
#include "gnome-cal.h"
#include "gncal-full-day.h"
#include "gncal-week-view.h"
#include "timeutil.h"
#include "views.h"
static void gnome_calendar_init (GnomeCalendar *gcal);
@ -40,21 +41,23 @@ static void
setup_widgets (GnomeCalendar *gcal)
{
time_t now;
GtkWidget *sw;
now = time (NULL);
gcal->notebook = gtk_notebook_new ();
gcal->day_view = day_view_create (gcal);
gcal->day_view = day_view_create (gcal);
gcal->week_view = gncal_week_view_new (gcal, now);
gcal->year_view = year_view_create (gcal);
gcal->task_view = tasks_create (gcal);
if (0)
if (1)
{
struct tm tm;
time_t a, b;
tm = *localtime (&now);
/* tm.tm_mday = 2; */
tm.tm_hour = 0;
tm.tm_min = 0;
tm.tm_sec = 0;
@ -66,9 +69,16 @@ setup_widgets (GnomeCalendar *gcal)
b = mktime (&tm);
gcal->day_view = gncal_full_day_new (gcal, a, b);
sw = gtk_scrolled_window_new (NULL, NULL);
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw),
GTK_POLICY_AUTOMATIC,
GTK_POLICY_AUTOMATIC);
gtk_container_add (GTK_CONTAINER (sw), gcal->day_view);
gtk_widget_show (gcal->day_view);
}
gtk_notebook_append_page (GTK_NOTEBOOK (gcal->notebook), gcal->day_view, gtk_label_new (_("Day View")));
gtk_notebook_append_page (GTK_NOTEBOOK (gcal->notebook), sw, gtk_label_new (_("Day View")));
gtk_notebook_append_page (GTK_NOTEBOOK (gcal->notebook), gcal->week_view, gtk_label_new (_("Week View")));
gtk_notebook_append_page (GTK_NOTEBOOK (gcal->notebook), gcal->year_view, gtk_label_new (_("Year View")));
gtk_notebook_append_page (GTK_NOTEBOOK (gcal->notebook), gcal->task_view, gtk_label_new (_("Todo")));
@ -83,6 +93,9 @@ static void
gnome_calendar_init(GnomeCalendar *gcal)
{
gcal->cal = 0;
gcal->day_view = 0;
gcal->week_view = 0;
gcal->event_editor = 0;
setup_widgets (gcal);
}
@ -164,6 +177,7 @@ gnome_calendar_new (char *title)
void
gnome_calendar_update_all (GnomeCalendar *cal)
{
gncal_full_day_update (GNCAL_FULL_DAY (cal->day_view));
gncal_week_view_update (GNCAL_WEEK_VIEW (cal->week_view));
}

1
calendar/gnome-cal.h
View File

@ -20,7 +20,6 @@ BEGIN_GNOME_DECLS
typedef struct {
GnomeApp gnome_app;
Calendar *cal;
time_t current_display;
GtkWidget *notebook;

1
calendar/gui/calendar.c
View File

@ -15,6 +15,7 @@
#include <config.h>
#include "calendar.h"
#include "timeutil.h"
#include "versit/vcc.h"
Calendar *

1
calendar/gui/calendar.h
View File

@ -18,6 +18,7 @@ typedef struct {
} Calendar;
Calendar *calendar_new (char *title);
void calendar_load (Calendar *cal, char *fname);
void calendar_add_object (Calendar *cal, iCalObject *obj);
void calendar_remove_object (Calendar *cal, iCalObject *obj);
void calendar_destroy (Calendar *cal);

9
calendar/gui/eventedit.c
View File

@ -6,10 +6,11 @@
*/
#include <gnome.h>
#include <string.h>
#include "calendar.h"
#include "gnome-cal.h"
#include "eventedit.h"
#include "main.h"
#include "timeutil.h"
static void event_editor_init (EventEditor *ee);
GtkWindow *parent_class;
@ -202,10 +203,9 @@ alarm_toggle (GtkToggleButton *toggle, CalendarAlarm *alarm)
#define FX GTK_FILL | GTK_EXPAND
#define XCOL 6
static GtkWidget *
static void
ee_create_ae (GtkTable *table, char *str, CalendarAlarm *alarm, enum AlarmType type, int y)
{
GtkWidget *timesel;
char buffer [40];
alarm->w_enabled = gtk_check_button_new_with_label (str);
@ -253,7 +253,7 @@ ee_create_ae (GtkTable *table, char *str, CalendarAlarm *alarm, enum AlarmType t
static GtkWidget *
ee_alarm_widgets (EventEditor *ee)
{
GtkWidget *table, *aalarm, *dalarm, *palarm, *malarm, *mailto, *mailte, *l;
GtkWidget *table, *mailto, *mailte, *l;
l = gtk_frame_new (_("Alarms"));
@ -304,6 +304,7 @@ ee_classification_widgets (EventEditor *ee)
* Retrieves the information from the CalendarAlarm widgets and stores them
* on the CalendarAlarm generic values
*/
void
ee_store_alarm (CalendarAlarm *alarm, enum AlarmType type)
{
GtkWidget *item;

2
calendar/gui/eventedit.h
View File

@ -8,6 +8,8 @@
#ifndef EVENT_EDITOR_H
#define EVENT_EDITOR_H
#include "gnome-cal.h"
BEGIN_GNOME_DECLS
#define EVENT_EDITOR(obj) GTK_CHECK_CAST(obj, event_editor_get_type(), EventEditor)

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

@ -156,6 +156,7 @@ static void
gncal_day_view_size_request (GtkWidget *widget, GtkRequisition *requisition)
{
GncalDayView *dview;
int str_width, width;
g_return_if_fail (widget != NULL);
g_return_if_fail (GNCAL_IS_DAY_VIEW (widget));
@ -165,7 +166,11 @@ gncal_day_view_size_request (GtkWidget *widget, GtkRequisition *requisition)
/* border and min width */
requisition->width = 2 * (widget->style->klass->xthickness + TEXT_BORDER) + MIN_INFO_WIDTH;
str_width = gdk_string_width (widget->style->font, dview->day_str);
width = MAX (MIN_INFO_WIDTH, str_width);
requisition->width = 2 * (widget->style->klass->xthickness + TEXT_BORDER) + width;
requisition->height = 2 * (widget->style->klass->ythickness + TEXT_BORDER);
/* division line */
@ -297,8 +302,6 @@ gncal_day_view_update (GncalDayView *dview)
strftime (buf, sizeof (buf)-1, "%A %d", &tm);
dview->day_str = g_strdup (buf);
gtk_widget_draw (GTK_WIDGET (dview), NULL);
if (dview->events)
g_list_free (dview->events);
@ -306,6 +309,8 @@ gncal_day_view_update (GncalDayView *dview)
dview->lower,
dview->upper,
calendar_compare_by_dtstart);
gtk_widget_draw (GTK_WIDGET (dview), NULL);
}
void

898
calendar/gui/gncal-full-day.c
View File

File diff suppressed because it is too large Load Diff

6
calendar/gui/gncal-full-day.h
View File

@ -34,6 +34,12 @@ struct _GncalFullDay {
time_t lower; /* lower time to display */
time_t upper; /* upper time to display */
int interval; /* interval between rows in minutes */
GList *children; /* container children */
gpointer drag_info; /* internal drag information */
GdkCursor *up_down_cursor; /* for dragging children */
GdkCursor *beam_cursor; /* for the text widgets */
};
struct _GncalFullDayClass {

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

@ -58,7 +58,7 @@ gncal_week_view_new (GnomeCalendar *calendar, time_t start_of_week)
wview = gtk_type_new (gncal_week_view_get_type ());
wview->table.homogeneous = TRUE; /* FIXME: eeeeeeeeeek, GtkTable does not have a function to set this */
gtk_table_set_homogeneous (GTK_TABLE (wview), TRUE);
wview->calendar = calendar;

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

@ -10,6 +10,7 @@
#include "gnome-cal.h"
#include "gncal-full-day.h"
#include "gncal-week-view.h"
#include "timeutil.h"
#include "views.h"
static void gnome_calendar_init (GnomeCalendar *gcal);
@ -40,21 +41,23 @@ static void
setup_widgets (GnomeCalendar *gcal)
{
time_t now;
GtkWidget *sw;
now = time (NULL);
gcal->notebook = gtk_notebook_new ();
gcal->day_view = day_view_create (gcal);
gcal->day_view = day_view_create (gcal);
gcal->week_view = gncal_week_view_new (gcal, now);
gcal->year_view = year_view_create (gcal);
gcal->task_view = tasks_create (gcal);
if (0)
if (1)
{
struct tm tm;
time_t a, b;
tm = *localtime (&now);
/* tm.tm_mday = 2; */
tm.tm_hour = 0;
tm.tm_min = 0;
tm.tm_sec = 0;
@ -66,9 +69,16 @@ setup_widgets (GnomeCalendar *gcal)
b = mktime (&tm);
gcal->day_view = gncal_full_day_new (gcal, a, b);
sw = gtk_scrolled_window_new (NULL, NULL);
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw),
GTK_POLICY_AUTOMATIC,
GTK_POLICY_AUTOMATIC);
gtk_container_add (GTK_CONTAINER (sw), gcal->day_view);
gtk_widget_show (gcal->day_view);
}
gtk_notebook_append_page (GTK_NOTEBOOK (gcal->notebook), gcal->day_view, gtk_label_new (_("Day View")));
gtk_notebook_append_page (GTK_NOTEBOOK (gcal->notebook), sw, gtk_label_new (_("Day View")));
gtk_notebook_append_page (GTK_NOTEBOOK (gcal->notebook), gcal->week_view, gtk_label_new (_("Week View")));
gtk_notebook_append_page (GTK_NOTEBOOK (gcal->notebook), gcal->year_view, gtk_label_new (_("Year View")));
gtk_notebook_append_page (GTK_NOTEBOOK (gcal->notebook), gcal->task_view, gtk_label_new (_("Todo")));
@ -83,6 +93,9 @@ static void
gnome_calendar_init(GnomeCalendar *gcal)
{
gcal->cal = 0;
gcal->day_view = 0;
gcal->week_view = 0;
gcal->event_editor = 0;
setup_widgets (gcal);
}
@ -164,6 +177,7 @@ gnome_calendar_new (char *title)
void
gnome_calendar_update_all (GnomeCalendar *cal)
{
gncal_full_day_update (GNCAL_FULL_DAY (cal->day_view));
gncal_week_view_update (GNCAL_WEEK_VIEW (cal->week_view));
}

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

@ -20,7 +20,6 @@ BEGIN_GNOME_DECLS
typedef struct {
GnomeApp gnome_app;
Calendar *cal;
time_t current_display;
GtkWidget *notebook;

5
calendar/gui/main.c
View File

@ -10,6 +10,7 @@
#include <pwd.h>
#include <sys/types.h>
#include "calendar.h"
#include "eventedit.h"
#include "gnome-cal.h"
#include "main.h"
@ -238,7 +239,6 @@ new_calendar (char *full_name, char *calendar_file)
toplevel = gnome_calendar_new (title);
setup_menu (toplevel);
gtk_widget_show (toplevel);
if (g_file_exists (calendar_file)){
printf ("Trying to load %s\n", calendar_file);
@ -248,6 +248,8 @@ new_calendar (char *full_name, char *calendar_file)
gnome_calendar_load (GNOME_CALENDAR (toplevel), "./test.vcf");
}
active_calendars++;
gtk_widget_show (toplevel);
}
int
@ -267,6 +269,7 @@ main(int argc, char *argv[])
new_calendar (full_name, user_calendar_file);
gtk_main ();
return 0;
}

9
calendar/gui/test.vcf
View File

@ -1,4 +1,5 @@
BEGIN:VCALENDAR
PRODID:-//K Desktop Environment//NONSGML KOrganizer//EN
TZ:-05
VERSION:1.0
@ -7,8 +8,8 @@ DCREATED:19980402T023552
UID:KOrganizer - 1804289383
SEQUENCE:1
LAST-MODIFIED:19980330T225948
DTSTART:19980330T120000
DTEND:19980330T120000
DTSTART:19980407T003000
DTEND:19980407T010000
SUMMARY:asdfasdfasfasdfasdf
STATUS:NEEDS ACTION
CLASS:PUBLIC
@ -24,8 +25,8 @@ DCREATED:19980402T023558
UID:KOrganizer - 846930886
SEQUENCE:1
LAST-MODIFIED:19980402T023558
DTSTART:19980402T120000
DTEND:19980402T120000
DTSTART:19980407T140000
DTEND:19980407T160000
SUMMARY:asdfasfdasfasdfasfd
STATUS:NEEDS ACTION
CLASS:PUBLIC

5
calendar/main.c
View File

@ -10,6 +10,7 @@
#include <pwd.h>
#include <sys/types.h>
#include "calendar.h"
#include "eventedit.h"
#include "gnome-cal.h"
#include "main.h"
@ -238,7 +239,6 @@ new_calendar (char *full_name, char *calendar_file)
toplevel = gnome_calendar_new (title);
setup_menu (toplevel);
gtk_widget_show (toplevel);
if (g_file_exists (calendar_file)){
printf ("Trying to load %s\n", calendar_file);
@ -248,6 +248,8 @@ new_calendar (char *full_name, char *calendar_file)
gnome_calendar_load (GNOME_CALENDAR (toplevel), "./test.vcf");
}
active_calendars++;
gtk_widget_show (toplevel);
}
int
@ -267,6 +269,7 @@ main(int argc, char *argv[])
new_calendar (full_name, user_calendar_file);
gtk_main ();
return 0;
}

9
calendar/test.vcf
View File

@ -1,4 +1,5 @@
BEGIN:VCALENDAR
PRODID:-//K Desktop Environment//NONSGML KOrganizer//EN
TZ:-05
VERSION:1.0
@ -7,8 +8,8 @@ DCREATED:19980402T023552
UID:KOrganizer - 1804289383
SEQUENCE:1
LAST-MODIFIED:19980330T225948
DTSTART:19980330T120000
DTEND:19980330T120000
DTSTART:19980407T003000
DTEND:19980407T010000
SUMMARY:asdfasdfasfasdfasdf
STATUS:NEEDS ACTION
CLASS:PUBLIC
@ -24,8 +25,8 @@ DCREATED:19980402T023558
UID:KOrganizer - 846930886
SEQUENCE:1
LAST-MODIFIED:19980402T023558
DTSTART:19980402T120000
DTEND:19980402T120000
DTSTART:19980407T140000
DTEND:19980407T160000
SUMMARY:asdfasfdasfasdfasfd
STATUS:NEEDS ACTION
CLASS:PUBLIC

1
calendar/timeutil.c
View File

@ -117,4 +117,3 @@ time_add_year (time_t time, int years)
}
return new_time;
}

4
calendar/timeutil.h
View File

@ -18,6 +18,10 @@ time_t time_from_start_duration (time_t start, char *duration);
char *isodate_from_time_t (time_t t);
int get_time_t_hour (time_t t);
time_t time_add_week (time_t time, int weeks);
time_t time_add_day (time_t time, int weeks);
time_t time_add_year (time_t time, int years);
/* Returns pointer to a statically-allocated buffer with a string of the form
* 3am, 4am, 12pm, 08h, 17h, etc.
* The string is internationalized, hopefully correctly.