diff options
author | Federico Mena Quintero <federico@nuclecu.unam.mx> | 1998-04-03 14:03:18 +0800 |
---|---|---|
committer | Arturo Espinosa <unammx@src.gnome.org> | 1998-04-03 14:03:18 +0800 |
commit | 197ca7ac5bd990427d8c5e7683b6408ffc23f261 (patch) | |
tree | 5cef7014f10dbdd45e2a8be3b1a7a205b80b664c | |
parent | dc90ad6b4302059c79a95d535c8363829faed7df (diff) | |
download | gsoc2013-evolution-197ca7ac5bd990427d8c5e7683b6408ffc23f261.tar.gz gsoc2013-evolution-197ca7ac5bd990427d8c5e7683b6408ffc23f261.tar.zst gsoc2013-evolution-197ca7ac5bd990427d8c5e7683b6408ffc23f261.zip |
New full-day widget. It is still a work in progress. It will be similar to
1998-04-02 Federico Mena Quintero <federico@nuclecu.unam.mx>
* gncal-full-day.c: New full-day widget. It is still a work in
progress. It will be similar to M$ Schedule's nifty full day view
widget, but with Gtk's elegance :-)
* Makefile.am (gnomecal_SOURCES): Added gncal-full-day.[ch] to the sources.
svn path=/trunk/; revision=99
-rw-r--r-- | calendar/ChangeLog | 8 | ||||
-rw-r--r-- | calendar/Makefile.am | 6 | ||||
-rw-r--r-- | calendar/gncal-full-day.c | 320 | ||||
-rw-r--r-- | calendar/gncal-full-day.h | 52 | ||||
-rw-r--r-- | calendar/gncal.c | 21 | ||||
-rw-r--r-- | calendar/gnome-cal.c | 7 | ||||
-rw-r--r-- | calendar/gui/Makefile.am | 6 | ||||
-rw-r--r-- | calendar/gui/gncal-full-day.c | 320 | ||||
-rw-r--r-- | calendar/gui/gncal-full-day.h | 52 | ||||
-rw-r--r-- | calendar/gui/gnome-cal.c | 7 |
10 files changed, 792 insertions, 7 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog index de3d419d36..b8a405c64f 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -1,3 +1,11 @@ +1998-04-02 Federico Mena Quintero <federico@nuclecu.unam.mx> + + * gncal-full-day.c: New full-day widget. It is still a work in + progress. It will be similar to M$ Schedule's nifty full day view + widget, but with Gtk's elegance :-) + + * Makefile.am (gnomecal_SOURCES): Added gncal-full-day.[ch] to the sources. + 1998-04-02 Miguel de Icaza <miguel@nuclecu.unam.mx> * eventedit.c: Object editor widget. We dropped ObjEdit. diff --git a/calendar/Makefile.am b/calendar/Makefile.am index 0b715efa5e..283e46e1c2 100644 --- a/calendar/Makefile.am +++ b/calendar/Makefile.am @@ -13,10 +13,12 @@ gnomecal_SOURCES = \ calendar.h \ calobj.c \ calobj.h \ - gncal-week-view.c \ - gncal-week-view.h \ gncal-day-view.c \ gncal-day-view.h \ + gncal-full-day.c \ + gncal-full-day.h \ + gncal-week-view.c \ + gncal-week-view.h \ gnome-cal.c \ gnome-cal.h \ main.c \ diff --git a/calendar/gncal-full-day.c b/calendar/gncal-full-day.c new file mode 100644 index 0000000000..4b4820417a --- /dev/null +++ b/calendar/gncal-full-day.c @@ -0,0 +1,320 @@ +/* Full day widget for gncal + * + * Copyright (C) 1998 The Free Software Foundation + * + * Author: Federico Mena <federico@nuclecu.unam.mx> + */ + +#include <gtk/gtkdrawingarea.h> +#include "gncal-full-day.h" + + +#define TEXT_BORDER 2 +#define MIN_WIDTH 200 + + +static void gncal_full_day_class_init (GncalFullDayClass *class); +static void gncal_full_day_init (GncalFullDay *fullday); +static void gncal_full_day_realize (GtkWidget *widget); +static void gncal_full_day_size_request (GtkWidget *widget, + GtkRequisition *requisition); +static void gncal_full_day_size_allocate (GtkWidget *widget, + GtkAllocation *allocation); +static gint gncal_full_day_expose (GtkWidget *widget, + GdkEventExpose *event); + + +static GtkContainerClass *parent_class; + + +guint +gncal_full_day_get_type (void) +{ + static guint full_day_type = 0; + + if (!full_day_type) { + GtkTypeInfo full_day_info = { + "GncalFullDay", + sizeof (GncalFullDay), + sizeof (GncalFullDayClass), + (GtkClassInitFunc) gncal_full_day_class_init, + (GtkObjectInitFunc) gncal_full_day_init, + (GtkArgSetFunc) NULL, + (GtkArgGetFunc) NULL + }; + + full_day_type = gtk_type_unique (gtk_container_get_type (), &full_day_info); + } + + return full_day_type; +} + +static void +gncal_full_day_class_init (GncalFullDayClass *class) +{ + GtkWidgetClass *widget_class; + GtkContainerClass *container_class; + + widget_class = (GtkWidgetClass *) class; + container_class = (GtkContainerClass *) class; + + parent_class = gtk_type_class (gtk_container_get_type ()); + + widget_class->realize = gncal_full_day_realize; + widget_class->size_request = gncal_full_day_size_request; + widget_class->size_allocate = gncal_full_day_size_allocate; + widget_class->expose_event = gncal_full_day_expose; +} + +static void +gncal_full_day_init (GncalFullDay *fullday) +{ + GTK_WIDGET_UNSET_FLAGS (fullday, GTK_NO_WINDOW); + + fullday->calendar = NULL; + + fullday->lower = 0; + fullday->upper = 0; + fullday->interval = 30; /* 30 minutes by default */ +} + +GtkWidget * +gncal_full_day_new (GnomeCalendar *calendar, time_t lower, time_t upper) +{ + GncalFullDay *fullday; + + g_return_val_if_fail (calendar != NULL, NULL); + + fullday = gtk_type_new (gncal_full_day_get_type ()); + + fullday->calendar = calendar; + + gncal_full_day_set_bounds (fullday, lower, upper); + + return GTK_WIDGET (fullday); +} + +static void +gncal_full_day_realize (GtkWidget *widget) +{ + GdkWindowAttr attributes; + gint attributes_mask; + + g_return_if_fail (widget != NULL); + g_return_if_fail (GNCAL_IS_FULL_DAY (widget)); + + GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED); + + attributes.window_type = GDK_WINDOW_CHILD; + attributes.x = widget->allocation.x; + attributes.y = widget->allocation.y; + attributes.width = widget->allocation.width; + attributes.height = widget->allocation.height; + attributes.wclass = GDK_INPUT_OUTPUT; + attributes.visual = gtk_widget_get_visual (widget); + attributes.colormap = gtk_widget_get_colormap (widget); + attributes.event_mask = (gtk_widget_get_events (widget) + | GDK_EXPOSURE_MASK); + + attributes_mask = GDK_WA_X | GDK_WA_Y | GDK_WA_VISUAL | GDK_WA_COLORMAP; + + widget->window = gdk_window_new (gtk_widget_get_parent_window (widget), &attributes, attributes_mask); + gdk_window_set_user_data (widget->window, widget); + + widget->style = gtk_style_attach (widget->style, widget->window); + gdk_window_set_background (widget->window, &widget->style->bg[GTK_STATE_PRELIGHT]); +} + +static int +get_tm_bounds (GncalFullDay *fullday, struct tm *lower, struct tm *upper) +{ + struct tm tm_lower, tm_upper; + int lmin, umin; + + /* Lower */ + + tm_lower = *localtime (&fullday->lower); + + if ((tm_lower.tm_min % fullday->interval) != 0) { + tm_lower.tm_min -= tm_lower.tm_min % fullday->interval; /* round down */ + mktime (&tm_lower); + } + + /* Upper */ + + tm_upper = *localtime (&fullday->upper); + + if ((tm_upper.tm_min % fullday->interval) != 0) { + tm_upper.tm_min += fullday->interval - (tm_upper.tm_min % fullday->interval); /* round up */ + mktime (&tm_upper); + } + + if (lower) + *lower = tm_lower; + + if (upper) + *upper = tm_upper; + + lmin = 60 * tm_lower.tm_hour + tm_lower.tm_min; + umin = 60 * tm_upper.tm_hour + tm_upper.tm_min; + + return (umin - lmin) / fullday->interval; /* number of rows in view */ +} + +static int +calc_labels_width (GncalFullDay *fullday) +{ + struct tm cur, upper; + time_t tim, time_upper; + int width, max_w; + char buf[256]; + + get_tm_bounds (fullday, &cur, &upper); + + max_w = 0; + + tim = mktime (&cur); + time_upper = mktime (&upper); + + while (tim < time_upper) { + strftime (buf, 256, "%R%p", &cur); + + width = gdk_string_width (GTK_WIDGET (fullday)->style->font, buf); + + if (width > max_w) + max_w = width; + + cur.tm_min += fullday->interval; + tim = mktime (&cur); + } + + return max_w; +} + +static void +gncal_full_day_size_request (GtkWidget *widget, GtkRequisition *requisition) +{ + GncalFullDay *fullday; + int labels_width; + int rows; + + g_return_if_fail (widget != NULL); + g_return_if_fail (GNCAL_IS_FULL_DAY (widget)); + g_return_if_fail (requisition != NULL); + + fullday = GNCAL_FULL_DAY (widget); + + /* Border and min width */ + + labels_width = calc_labels_width (fullday); + + requisition->width = 2 * widget->style->klass->xthickness + 4 * TEXT_BORDER + labels_width + MIN_WIDTH; + requisition->height = 2 * widget->style->klass->ythickness; + + /* Rows */ + + rows = get_tm_bounds (fullday, NULL, NULL); + + requisition->height += (rows * (2 * TEXT_BORDER + widget->style->font->ascent + widget->style->font->descent) + + (rows - 1)); /* division lines */ +} + +static void +gncal_full_day_size_allocate (GtkWidget *widget, GtkAllocation *allocation) +{ + g_return_if_fail (widget != NULL); + g_return_if_fail (GNCAL_IS_FULL_DAY (widget)); + g_return_if_fail (allocation != NULL); + + widget->allocation = *allocation; + + if (GTK_WIDGET_REALIZED (widget)) + gdk_window_move_resize (widget->window, + allocation->x, allocation->y, + allocation->width, allocation->height); + + /* FIXME: adjust children */ +} + +static void +paint_back (GncalFullDay *fullday, GdkRectangle *area) +{ + GtkWidget *widget; + GdkRectangle rect; + int x1, y1, width, height; + int labels_width, division_x; + + widget = GTK_WIDGET (fullday); + + x1 = widget->style->klass->xthickness; + y1 = widget->style->klass->ythickness; + width = widget->allocation.width - 2 * x1; + height = widget->allocation.height - 2 * y1; + + /* Clear and paint frame shadow */ + + gdk_window_clear_area (widget->window, area->x, area->y, area->width, area->height); + + gtk_draw_shadow (widget->style, widget->window, + GTK_STATE_NORMAL, GTK_SHADOW_ETCHED_IN, + 0, 0, + widget->allocation.width, + widget->allocation.height); + + /* Vertical division */ + + labels_width = calc_labels_width (fullday); + + division_x = x1 + 2 * TEXT_BORDER + labels_width; + + gtk_draw_vline (widget->style, widget->window, + GTK_STATE_NORMAL, + y1, + y1 + height - 1, + division_x); +} + +static gint +gncal_full_day_expose (GtkWidget *widget, GdkEventExpose *event) +{ + GncalFullDay *fullday; + + g_return_val_if_fail (widget != NULL, FALSE); + g_return_val_if_fail (GNCAL_IS_FULL_DAY (widget), FALSE); + g_return_val_if_fail (event != NULL, FALSE); + + if (!GTK_WIDGET_DRAWABLE (widget)) + return FALSE; + + fullday = GNCAL_FULL_DAY (widget); + + if (event->window == widget->window) + paint_back (fullday, &event->area); + + /* FIXME: paint handles in windows if event->window == blah blah */ + + return FALSE; +} + +void +gncal_full_day_update (GncalFullDay *fullday) +{ + g_return_if_fail (fullday != NULL); + g_return_if_fail (GNCAL_IS_FULL_DAY (fullday)); + + /* FIXME */ +} + +void +gncal_full_day_set_bounds (GncalFullDay *fullday, time_t lower, time_t upper) +{ + g_return_if_fail (fullday != NULL); + g_return_if_fail (GNCAL_IS_FULL_DAY (fullday)); + + if ((lower != fullday->lower) || (upper != fullday->upper)) { + fullday->lower = lower; + fullday->upper = upper; + + gncal_full_day_update (fullday); + } +} diff --git a/calendar/gncal-full-day.h b/calendar/gncal-full-day.h new file mode 100644 index 0000000000..e482e8b63d --- /dev/null +++ b/calendar/gncal-full-day.h @@ -0,0 +1,52 @@ +/* Full day widget for gncal + * + * Copyright (C) 1998 The Free Software Foundation + * + * Author: Federico Mena <federico@nuclecu.unam.mx> + */ + +#ifndef GNCAL_FULL_DAY_H +#define GNCAL_FULL_DAY_H + + +#include <gtk/gtkcontainer.h> +#include <libgnome/gnome-defs.h> +#include "calendar.h" +#include "gnome-cal.h" + + +BEGIN_GNOME_DECLS + + +#define GNCAL_FULL_DAY(obj) GTK_CHECK_CAST (obj, gncal_full_day_get_type (), GncalFullDay) +#define GNCAL_FULL_DAY_CLASS(klass) GTK_CHECK_CLASS_CAST (klass, gncal_full_day_get_type (), GncalFullDayClass) +#define GNCAL_IS_FULL_DAY(obj) GTK_CHECK_TYPE (obj, gncal_full_day_get_type ()) + + +typedef struct _GncalFullDay GncalFullDay; +typedef struct _GncalFullDayClass GncalFullDayClass; + +struct _GncalFullDay { + GtkContainer container; + + GnomeCalendar *calendar; /* the calendar we are associated to */ + + time_t lower; /* lower time to display */ + time_t upper; /* upper time to display */ + int interval; /* interval between rows in minutes */ +}; + +struct _GncalFullDayClass { + GtkContainerClass *parent_class; +}; + + +guint gncal_full_day_get_type (void); +GtkWidget *gncal_full_day_new (GnomeCalendar *calendar, time_t lower, time_t upper); + +void gncal_full_day_update (GncalFullDay *fullday); +void gncal_full_day_set_bounds (GncalFullDay *fullday, time_t lower, time_t upper); + +END_GNOME_DECLS + +#endif diff --git a/calendar/gncal.c b/calendar/gncal.c index 5aa911aed9..8d595a49dc 100644 --- a/calendar/gncal.c +++ b/calendar/gncal.c @@ -17,7 +17,24 @@ #include "gncal.h" #include "calcs.h" #include "clist.h" -#include "gtkcalendar.h" +#include "gncal-week-view.h" + +void +prueba (void) +{ + GtkWidget *window; + GtkWidget *wview; + + window = gtk_window_new (GTK_WINDOW_TOPLEVEL); + gtk_window_set_policy (GTK_WINDOW (window), TRUE, TRUE, FALSE); + gtk_container_border_width (GTK_CONTAINER (window), 6); + + wview = gncal_week_view_new (NULL, time (NULL)); + gtk_container_add (GTK_CONTAINER (window), wview); + gtk_widget_show (wview); + + gtk_widget_show (window); +} /* Function declarations */ void parse_args(int argc, char *argv[]); @@ -535,6 +552,8 @@ main(int argc, char *argv[]) get_system_date(&curr_day, &curr_month, &curr_year); update_today(); + prueba (); + gtk_main(); return 0; diff --git a/calendar/gnome-cal.c b/calendar/gnome-cal.c index 7e3755b0dc..07fb3b03fa 100644 --- a/calendar/gnome-cal.c +++ b/calendar/gnome-cal.c @@ -8,6 +8,7 @@ #include <gnome.h> #include "calendar.h" #include "gnome-cal.h" +#include "gncal-full-day.h" #include "gncal-week-view.h" #include "views.h" @@ -49,7 +50,11 @@ setup_widgets (GnomeCalendar *gcal) gcal->week_view = gncal_week_view_new (gcal, now); year_view = year_view_create (gcal); task_view = tasks_create (gcal); - + + { + day_view = gncal_full_day_new (gcal, time (NULL), time (NULL) + 86400); + } + gtk_notebook_append_page (GTK_NOTEBOOK (notebook), day_view, gtk_label_new (_("Day View"))); gtk_notebook_append_page (GTK_NOTEBOOK (notebook), gcal->week_view, gtk_label_new (_("Week View"))); gtk_notebook_append_page (GTK_NOTEBOOK (notebook), year_view, gtk_label_new (_("Year View"))); diff --git a/calendar/gui/Makefile.am b/calendar/gui/Makefile.am index 0b715efa5e..283e46e1c2 100644 --- a/calendar/gui/Makefile.am +++ b/calendar/gui/Makefile.am @@ -13,10 +13,12 @@ gnomecal_SOURCES = \ calendar.h \ calobj.c \ calobj.h \ - gncal-week-view.c \ - gncal-week-view.h \ gncal-day-view.c \ gncal-day-view.h \ + gncal-full-day.c \ + gncal-full-day.h \ + gncal-week-view.c \ + gncal-week-view.h \ gnome-cal.c \ gnome-cal.h \ main.c \ diff --git a/calendar/gui/gncal-full-day.c b/calendar/gui/gncal-full-day.c new file mode 100644 index 0000000000..4b4820417a --- /dev/null +++ b/calendar/gui/gncal-full-day.c @@ -0,0 +1,320 @@ +/* Full day widget for gncal + * + * Copyright (C) 1998 The Free Software Foundation + * + * Author: Federico Mena <federico@nuclecu.unam.mx> + */ + +#include <gtk/gtkdrawingarea.h> +#include "gncal-full-day.h" + + +#define TEXT_BORDER 2 +#define MIN_WIDTH 200 + + +static void gncal_full_day_class_init (GncalFullDayClass *class); +static void gncal_full_day_init (GncalFullDay *fullday); +static void gncal_full_day_realize (GtkWidget *widget); +static void gncal_full_day_size_request (GtkWidget *widget, + GtkRequisition *requisition); +static void gncal_full_day_size_allocate (GtkWidget *widget, + GtkAllocation *allocation); +static gint gncal_full_day_expose (GtkWidget *widget, + GdkEventExpose *event); + + +static GtkContainerClass *parent_class; + + +guint +gncal_full_day_get_type (void) +{ + static guint full_day_type = 0; + + if (!full_day_type) { + GtkTypeInfo full_day_info = { + "GncalFullDay", + sizeof (GncalFullDay), + sizeof (GncalFullDayClass), + (GtkClassInitFunc) gncal_full_day_class_init, + (GtkObjectInitFunc) gncal_full_day_init, + (GtkArgSetFunc) NULL, + (GtkArgGetFunc) NULL + }; + + full_day_type = gtk_type_unique (gtk_container_get_type (), &full_day_info); + } + + return full_day_type; +} + +static void +gncal_full_day_class_init (GncalFullDayClass *class) +{ + GtkWidgetClass *widget_class; + GtkContainerClass *container_class; + + widget_class = (GtkWidgetClass *) class; + container_class = (GtkContainerClass *) class; + + parent_class = gtk_type_class (gtk_container_get_type ()); + + widget_class->realize = gncal_full_day_realize; + widget_class->size_request = gncal_full_day_size_request; + widget_class->size_allocate = gncal_full_day_size_allocate; + widget_class->expose_event = gncal_full_day_expose; +} + +static void +gncal_full_day_init (GncalFullDay *fullday) +{ + GTK_WIDGET_UNSET_FLAGS (fullday, GTK_NO_WINDOW); + + fullday->calendar = NULL; + + fullday->lower = 0; + fullday->upper = 0; + fullday->interval = 30; /* 30 minutes by default */ +} + +GtkWidget * +gncal_full_day_new (GnomeCalendar *calendar, time_t lower, time_t upper) +{ + GncalFullDay *fullday; + + g_return_val_if_fail (calendar != NULL, NULL); + + fullday = gtk_type_new (gncal_full_day_get_type ()); + + fullday->calendar = calendar; + + gncal_full_day_set_bounds (fullday, lower, upper); + + return GTK_WIDGET (fullday); +} + +static void +gncal_full_day_realize (GtkWidget *widget) +{ + GdkWindowAttr attributes; + gint attributes_mask; + + g_return_if_fail (widget != NULL); + g_return_if_fail (GNCAL_IS_FULL_DAY (widget)); + + GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED); + + attributes.window_type = GDK_WINDOW_CHILD; + attributes.x = widget->allocation.x; + attributes.y = widget->allocation.y; + attributes.width = widget->allocation.width; + attributes.height = widget->allocation.height; + attributes.wclass = GDK_INPUT_OUTPUT; + attributes.visual = gtk_widget_get_visual (widget); + attributes.colormap = gtk_widget_get_colormap (widget); + attributes.event_mask = (gtk_widget_get_events (widget) + | GDK_EXPOSURE_MASK); + + attributes_mask = GDK_WA_X | GDK_WA_Y | GDK_WA_VISUAL | GDK_WA_COLORMAP; + + widget->window = gdk_window_new (gtk_widget_get_parent_window (widget), &attributes, attributes_mask); + gdk_window_set_user_data (widget->window, widget); + + widget->style = gtk_style_attach (widget->style, widget->window); + gdk_window_set_background (widget->window, &widget->style->bg[GTK_STATE_PRELIGHT]); +} + +static int +get_tm_bounds (GncalFullDay *fullday, struct tm *lower, struct tm *upper) +{ + struct tm tm_lower, tm_upper; + int lmin, umin; + + /* Lower */ + + tm_lower = *localtime (&fullday->lower); + + if ((tm_lower.tm_min % fullday->interval) != 0) { + tm_lower.tm_min -= tm_lower.tm_min % fullday->interval; /* round down */ + mktime (&tm_lower); + } + + /* Upper */ + + tm_upper = *localtime (&fullday->upper); + + if ((tm_upper.tm_min % fullday->interval) != 0) { + tm_upper.tm_min += fullday->interval - (tm_upper.tm_min % fullday->interval); /* round up */ + mktime (&tm_upper); + } + + if (lower) + *lower = tm_lower; + + if (upper) + *upper = tm_upper; + + lmin = 60 * tm_lower.tm_hour + tm_lower.tm_min; + umin = 60 * tm_upper.tm_hour + tm_upper.tm_min; + + return (umin - lmin) / fullday->interval; /* number of rows in view */ +} + +static int +calc_labels_width (GncalFullDay *fullday) +{ + struct tm cur, upper; + time_t tim, time_upper; + int width, max_w; + char buf[256]; + + get_tm_bounds (fullday, &cur, &upper); + + max_w = 0; + + tim = mktime (&cur); + time_upper = mktime (&upper); + + while (tim < time_upper) { + strftime (buf, 256, "%R%p", &cur); + + width = gdk_string_width (GTK_WIDGET (fullday)->style->font, buf); + + if (width > max_w) + max_w = width; + + cur.tm_min += fullday->interval; + tim = mktime (&cur); + } + + return max_w; +} + +static void +gncal_full_day_size_request (GtkWidget *widget, GtkRequisition *requisition) +{ + GncalFullDay *fullday; + int labels_width; + int rows; + + g_return_if_fail (widget != NULL); + g_return_if_fail (GNCAL_IS_FULL_DAY (widget)); + g_return_if_fail (requisition != NULL); + + fullday = GNCAL_FULL_DAY (widget); + + /* Border and min width */ + + labels_width = calc_labels_width (fullday); + + requisition->width = 2 * widget->style->klass->xthickness + 4 * TEXT_BORDER + labels_width + MIN_WIDTH; + requisition->height = 2 * widget->style->klass->ythickness; + + /* Rows */ + + rows = get_tm_bounds (fullday, NULL, NULL); + + requisition->height += (rows * (2 * TEXT_BORDER + widget->style->font->ascent + widget->style->font->descent) + + (rows - 1)); /* division lines */ +} + +static void +gncal_full_day_size_allocate (GtkWidget *widget, GtkAllocation *allocation) +{ + g_return_if_fail (widget != NULL); + g_return_if_fail (GNCAL_IS_FULL_DAY (widget)); + g_return_if_fail (allocation != NULL); + + widget->allocation = *allocation; + + if (GTK_WIDGET_REALIZED (widget)) + gdk_window_move_resize (widget->window, + allocation->x, allocation->y, + allocation->width, allocation->height); + + /* FIXME: adjust children */ +} + +static void +paint_back (GncalFullDay *fullday, GdkRectangle *area) +{ + GtkWidget *widget; + GdkRectangle rect; + int x1, y1, width, height; + int labels_width, division_x; + + widget = GTK_WIDGET (fullday); + + x1 = widget->style->klass->xthickness; + y1 = widget->style->klass->ythickness; + width = widget->allocation.width - 2 * x1; + height = widget->allocation.height - 2 * y1; + + /* Clear and paint frame shadow */ + + gdk_window_clear_area (widget->window, area->x, area->y, area->width, area->height); + + gtk_draw_shadow (widget->style, widget->window, + GTK_STATE_NORMAL, GTK_SHADOW_ETCHED_IN, + 0, 0, + widget->allocation.width, + widget->allocation.height); + + /* Vertical division */ + + labels_width = calc_labels_width (fullday); + + division_x = x1 + 2 * TEXT_BORDER + labels_width; + + gtk_draw_vline (widget->style, widget->window, + GTK_STATE_NORMAL, + y1, + y1 + height - 1, + division_x); +} + +static gint +gncal_full_day_expose (GtkWidget *widget, GdkEventExpose *event) +{ + GncalFullDay *fullday; + + g_return_val_if_fail (widget != NULL, FALSE); + g_return_val_if_fail (GNCAL_IS_FULL_DAY (widget), FALSE); + g_return_val_if_fail (event != NULL, FALSE); + + if (!GTK_WIDGET_DRAWABLE (widget)) + return FALSE; + + fullday = GNCAL_FULL_DAY (widget); + + if (event->window == widget->window) + paint_back (fullday, &event->area); + + /* FIXME: paint handles in windows if event->window == blah blah */ + + return FALSE; +} + +void +gncal_full_day_update (GncalFullDay *fullday) +{ + g_return_if_fail (fullday != NULL); + g_return_if_fail (GNCAL_IS_FULL_DAY (fullday)); + + /* FIXME */ +} + +void +gncal_full_day_set_bounds (GncalFullDay *fullday, time_t lower, time_t upper) +{ + g_return_if_fail (fullday != NULL); + g_return_if_fail (GNCAL_IS_FULL_DAY (fullday)); + + if ((lower != fullday->lower) || (upper != fullday->upper)) { + fullday->lower = lower; + fullday->upper = upper; + + gncal_full_day_update (fullday); + } +} diff --git a/calendar/gui/gncal-full-day.h b/calendar/gui/gncal-full-day.h new file mode 100644 index 0000000000..e482e8b63d --- /dev/null +++ b/calendar/gui/gncal-full-day.h @@ -0,0 +1,52 @@ +/* Full day widget for gncal + * + * Copyright (C) 1998 The Free Software Foundation + * + * Author: Federico Mena <federico@nuclecu.unam.mx> + */ + +#ifndef GNCAL_FULL_DAY_H +#define GNCAL_FULL_DAY_H + + +#include <gtk/gtkcontainer.h> +#include <libgnome/gnome-defs.h> +#include "calendar.h" +#include "gnome-cal.h" + + +BEGIN_GNOME_DECLS + + +#define GNCAL_FULL_DAY(obj) GTK_CHECK_CAST (obj, gncal_full_day_get_type (), GncalFullDay) +#define GNCAL_FULL_DAY_CLASS(klass) GTK_CHECK_CLASS_CAST (klass, gncal_full_day_get_type (), GncalFullDayClass) +#define GNCAL_IS_FULL_DAY(obj) GTK_CHECK_TYPE (obj, gncal_full_day_get_type ()) + + +typedef struct _GncalFullDay GncalFullDay; +typedef struct _GncalFullDayClass GncalFullDayClass; + +struct _GncalFullDay { + GtkContainer container; + + GnomeCalendar *calendar; /* the calendar we are associated to */ + + time_t lower; /* lower time to display */ + time_t upper; /* upper time to display */ + int interval; /* interval between rows in minutes */ +}; + +struct _GncalFullDayClass { + GtkContainerClass *parent_class; +}; + + +guint gncal_full_day_get_type (void); +GtkWidget *gncal_full_day_new (GnomeCalendar *calendar, time_t lower, time_t upper); + +void gncal_full_day_update (GncalFullDay *fullday); +void gncal_full_day_set_bounds (GncalFullDay *fullday, time_t lower, time_t upper); + +END_GNOME_DECLS + +#endif diff --git a/calendar/gui/gnome-cal.c b/calendar/gui/gnome-cal.c index 7e3755b0dc..07fb3b03fa 100644 --- a/calendar/gui/gnome-cal.c +++ b/calendar/gui/gnome-cal.c @@ -8,6 +8,7 @@ #include <gnome.h> #include "calendar.h" #include "gnome-cal.h" +#include "gncal-full-day.h" #include "gncal-week-view.h" #include "views.h" @@ -49,7 +50,11 @@ setup_widgets (GnomeCalendar *gcal) gcal->week_view = gncal_week_view_new (gcal, now); year_view = year_view_create (gcal); task_view = tasks_create (gcal); - + + { + day_view = gncal_full_day_new (gcal, time (NULL), time (NULL) + 86400); + } + gtk_notebook_append_page (GTK_NOTEBOOK (notebook), day_view, gtk_label_new (_("Day View"))); gtk_notebook_append_page (GTK_NOTEBOOK (notebook), gcal->week_view, gtk_label_new (_("Week View"))); gtk_notebook_append_page (GTK_NOTEBOOK (notebook), year_view, gtk_label_new (_("Year View"))); |