added new source files and pixmaps, and removed old source files, which

2000-04-24  Damon Chaplin  <damon@helixcode.com>

	* gui/Makefile.am: added new source files and pixmaps, and removed
	old source files, which can be deleted.

	* gui/e-week-view-titles-item.[hc]:
	* gui/e-week-view-main-item.[hc]:
	* gui/e-week-view-event-item.[hc]:
	* gui/e-week-view.[hc]: new files implementing the week/month views.

	* gui/yearview.xpm:
	* gui/monthview.xpm:
	* gui/weekview.xpm:
	* gui/workweekview.xpm:
	* gui/dayview.xpm: new pixmaps for the toolbar buttons. These aren't
	intended to be the final pixmaps.

	* gui/calendar-commands.c: added radio buttons to the toolbar to
	switch between the calendar views, and moved the am_pm_flag here so we
	can get rid of view-utils.c.

	* gui/gnome-cal.[hc]: made it a subclass of GtkVBox, rearranged the
	widgets into 2 notebooks, and added the	selection_start_time and
	selection_end_time fields.

	* gui/goto.c: updated to use new selection time range.

	* gui/quick-view.c: added '#include <gtk/gtkwindow.h>' so it compiles.

	* gui/e-day-view.[hc]: changed the interface to support the new
	selection time range, got rid of a few debugging messages and changed
	a few bits.

svn path=/trunk/; revision=2583

1 files changed, 300 insertions, 0 deletions

diff --git a/calendar/gui/e-week-view-titles-item.c b/calendar/gui/e-week-view-titles-item.c
new file mode 100644
index 0000000000..14f47e4bcf
--- /dev/null
+++ b/calendar/gui/e-week-view-titles-item.c
@@ -0,0 +1,300 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
+
+/* 
+ * Author : 
+ *  Damon Chaplin <damon@helixcode.com>
+ *
+ * Copyright 1999, Helix Code, Inc.
+ *
+ * This program is free software; you can redistribute it and/or 
+ * modify it under the terms of the GNU General Public License as 
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+ * USA
+ */
+
+/*
+ * EWeekViewTitlesItem - displays the 'Monday', 'Tuesday' etc. at the top of
+ * the Month calendar view.
+ */
+
+#include <config.h>
+#include "e-week-view-titles-item.h"
+
+static void e_week_view_titles_item_class_init	(EWeekViewTitlesItemClass *class);
+static void e_week_view_titles_item_init	(EWeekViewTitlesItem *wvtitem);
+
+static void e_week_view_titles_item_set_arg	(GtkObject	 *o,
+						 GtkArg		 *arg,
+						 guint		  arg_id);
+static void e_week_view_titles_item_update	(GnomeCanvasItem *item,
+						 double		 *affine,
+						 ArtSVP		 *clip_path,
+						 int		  flags);
+static void e_week_view_titles_item_draw	(GnomeCanvasItem *item,
+						 GdkDrawable	 *drawable,
+						 int		  x,
+						 int		  y,
+						 int		  width,
+						 int		  height);
+static double e_week_view_titles_item_point	(GnomeCanvasItem *item,
+						 double		  x,
+						 double		  y,
+						 int		  cx,
+						 int		  cy,
+						 GnomeCanvasItem **actual_item);
+
+
+static GnomeCanvasItemClass *parent_class;
+
+/* The arguments we take */
+enum {
+	ARG_0,
+	ARG_WEEK_VIEW
+};
+
+
+GtkType
+e_week_view_titles_item_get_type (void)
+{
+	static GtkType e_week_view_titles_item_type = 0;
+
+	if (!e_week_view_titles_item_type) {
+		GtkTypeInfo e_week_view_titles_item_info = {
+			"EWeekViewTitlesItem",
+			sizeof (EWeekViewTitlesItem),
+			sizeof (EWeekViewTitlesItemClass),
+			(GtkClassInitFunc) e_week_view_titles_item_class_init,
+			(GtkObjectInitFunc) e_week_view_titles_item_init,
+			NULL, /* reserved_1 */
+			NULL, /* reserved_2 */
+			(GtkClassInitFunc) NULL
+		};
+
+		e_week_view_titles_item_type = gtk_type_unique (gnome_canvas_item_get_type (), &e_week_view_titles_item_info);
+	}
+
+	return e_week_view_titles_item_type;
+}
+
+
+static void
+e_week_view_titles_item_class_init (EWeekViewTitlesItemClass *class)
+{
+	GtkObjectClass  *object_class;
+	GnomeCanvasItemClass *item_class;
+
+	parent_class = gtk_type_class (gnome_canvas_item_get_type());
+
+	object_class = (GtkObjectClass *) class;
+	item_class = (GnomeCanvasItemClass *) class;
+
+	gtk_object_add_arg_type ("EWeekViewTitlesItem::week_view",
+				 GTK_TYPE_POINTER, GTK_ARG_WRITABLE,
+				 ARG_WEEK_VIEW);
+
+	object_class->set_arg = e_week_view_titles_item_set_arg;
+
+	/* GnomeCanvasItem method overrides */
+	item_class->update      = e_week_view_titles_item_update;
+	item_class->draw        = e_week_view_titles_item_draw;
+	item_class->point       = e_week_view_titles_item_point;
+}
+
+
+static void
+e_week_view_titles_item_init (EWeekViewTitlesItem *wvtitem)
+{
+	wvtitem->week_view = NULL;
+}
+
+
+static void
+e_week_view_titles_item_set_arg (GtkObject *o, GtkArg *arg, guint arg_id)
+{
+	GnomeCanvasItem *item;
+	EWeekViewTitlesItem *wvtitem;
+
+	item = GNOME_CANVAS_ITEM (o);
+	wvtitem = E_WEEK_VIEW_TITLES_ITEM (o);
+	
+	switch (arg_id){
+	case ARG_WEEK_VIEW:
+		wvtitem->week_view = GTK_VALUE_POINTER (*arg);
+		break;
+	}
+}
+
+
+static void
+e_week_view_titles_item_update (GnomeCanvasItem *item,
+				double	    *affine,
+				ArtSVP	    *clip_path,
+				int		     flags)
+{
+	if (GNOME_CANVAS_ITEM_CLASS (parent_class)->update)
+		(* GNOME_CANVAS_ITEM_CLASS (parent_class)->update) (item, affine, clip_path, flags);
+
+	/* The item covers the entire canvas area. */
+	item->x1 = 0;
+	item->y1 = 0;
+	item->x2 = INT_MAX;
+	item->y2 = INT_MAX;
+}
+
+
+/*
+ * DRAWING ROUTINES - functions to paint the canvas item.
+ */
+
+static void
+e_week_view_titles_item_draw (GnomeCanvasItem  *canvas_item,
+			      GdkDrawable      *drawable,
+			      int		x,
+			      int		y,
+			      int		width,
+			      int		height)
+{
+	EWeekViewTitlesItem *wvtitem;
+	EWeekView *week_view;
+	GtkStyle *style;
+	GdkGC *fg_gc, *bg_gc, *light_gc, *dark_gc;
+	GdkFont *font;
+	gint canvas_width, canvas_height, col_width, col, date_width, date_x;
+	gchar buffer[128], *date_format;
+	GDate date;
+	GdkRectangle clip_rect;
+	gboolean long_format;
+
+#if 0
+	g_print ("In e_week_view_titles_item_draw %i,%i %ix%i\n",
+		 x, y, width, height);
+#endif
+
+	wvtitem = E_WEEK_VIEW_TITLES_ITEM (canvas_item);
+	week_view = wvtitem->week_view;
+	g_return_if_fail (week_view != NULL);
+
+	style = GTK_WIDGET (week_view)->style;
+	font = style->font;
+	fg_gc = style->fg_gc[GTK_STATE_NORMAL];
+	bg_gc = style->bg_gc[GTK_STATE_NORMAL];
+	light_gc = style->light_gc[GTK_STATE_NORMAL];
+	dark_gc = style->dark_gc[GTK_STATE_NORMAL];
+	canvas_width = GTK_WIDGET (canvas_item->canvas)->allocation.width;
+	canvas_height = GTK_WIDGET (canvas_item->canvas)->allocation.height;
+
+	/* Draw the shadow around the dates. */
+	gdk_draw_line (drawable, light_gc,
+		       1 - x, 1 - y,
+		       canvas_width - 2 - x, 1 - y);
+	gdk_draw_line (drawable, light_gc,
+		       1 - x, 2 - y,
+		       1 - x, canvas_height - 1 - y);
+
+	gdk_draw_rectangle (drawable, dark_gc, FALSE,
+			    0 - x, 0 - y,
+			    canvas_width - 1, canvas_height);
+
+	/* Determine the format to use. */
+	col_width = canvas_width / week_view->columns;
+	if (col_width > week_view->max_day_width + 2) {
+	  date_format = "%A";
+	  long_format = TRUE;
+	} else {
+	  date_format = "%a";
+	  long_format = FALSE;
+	}
+
+	/* Shift right one pixel to account for the shadow around the main
+	   canvas. */
+	x--;
+
+	/* Draw the date. Set a clipping rectangle so we don't draw over the
+	   next day. */
+	g_date_clear (&date, 1);
+	g_date_set_dmy (&date, 27, 3, 2000);	/* Must be a Monday. */
+	for (col = 0; col < week_view->columns; col++) {
+		if (col == 5 && week_view->compress_weekend) {
+			g_date_strftime (buffer, 128, "%a/", &date);
+			g_date_add_days (&date, 1);
+			g_date_strftime (buffer + strlen (buffer), 100,
+					 "%a", &date);
+		} else {
+			g_date_strftime (buffer, 128, date_format, &date);
+		}
+
+		clip_rect.x = week_view->col_offsets[col] - x;
+		clip_rect.y = 2 - y;
+		clip_rect.width = week_view->col_widths[col];
+		clip_rect.height = canvas_height - 2;
+		gdk_gc_set_clip_rectangle (fg_gc, &clip_rect);
+
+		if (col == 5 && week_view->compress_weekend)
+			date_width = week_view->abbr_day_widths[5]
+				+ week_view->slash_width
+				+ week_view->abbr_day_widths[6];
+		else if (long_format)
+			date_width = week_view->day_widths[col];
+		else
+			date_width = week_view->abbr_day_widths[col];
+
+		date_x = week_view->col_offsets[col]
+			+ (week_view->col_widths[col] - date_width) / 2;
+		date_x = MAX (date_x, week_view->col_offsets[col]);
+		gdk_draw_string (drawable, font, fg_gc,
+				 date_x - x, 3 + font->ascent - y, buffer);
+
+		gdk_gc_set_clip_rectangle (fg_gc, NULL);
+
+		/* Draw the lines down the left and right of the date cols. */
+		if (col != 0) {
+			gdk_draw_line (drawable, light_gc,
+				       week_view->col_offsets[col] - x,
+				       4 - y,
+				       week_view->col_offsets[col] - x,
+				       canvas_height - 4 - y);
+
+			gdk_draw_line (drawable, dark_gc,
+				       week_view->col_offsets[col] - 1 - x,
+				       4 - y,
+				       week_view->col_offsets[col] - 1 - x,
+				       canvas_height - 4 - y);
+		}
+
+		/* Draw the lines between each column. */
+		if (col != 0) {
+			gdk_draw_line (drawable, style->black_gc,
+				       week_view->col_offsets[col] - x,
+				       canvas_height - y,
+				       week_view->col_offsets[col] - x,
+				       canvas_height - y);
+		}
+
+		g_date_add_days (&date, 1);
+	}
+}
+
+
+/* This is supposed to return the nearest item the the point and the distance.
+   Since we are the only item we just return ourself and 0 for the distance.
+   This is needed so that we get button/motion events. */
+static double
+e_week_view_titles_item_point (GnomeCanvasItem *item, double x, double y,
+			       int cx, int cy,
+			       GnomeCanvasItem **actual_item)
+{
+	*actual_item = item;
+	return 0.0;
+}
+
+