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, 22 insertions, 5 deletions

diff --git a/calendar/gui/gnome-cal.h b/calendar/gui/gnome-cal.h
index 75406e1c71..a512bbc9b4 100644
--- a/calendar/gui/gnome-cal.h
+++ b/calendar/gui/gnome-cal.h
@@ -12,7 +12,7 @@
 #include <time.h>
 #include <libgnome/gnome-defs.h>
 #include <gtk/gtkcalendar.h>
-#include <libgnomeui/gnome-app.h>
+#include <gtk/gtkvbox.h>
 #include <cal-client/cal-client.h>
 #include <bonobo.h>
 
@@ -25,24 +25,37 @@ BEGIN_GNOME_DECLS
 #define GNOME_IS_CALENDAR(obj)      GTK_CHECK_TYPE(obj, gnome_calendar_get_type())
 
 typedef struct {
-	GnomeApp    gnome_app;
+	GtkVBox      vbox;
+
 	CalClient   *client;
-	time_t      current_display;
 
         BonoboPropertyBag *properties;
 	BonoboControl *control;
 
-	GtkWidget   *notebook;
+	time_t      selection_start_time;
+	time_t      selection_end_time;
+
+	GtkWidget   *main_notebook;
+	GtkWidget   *sub_notebook;
+	GtkWidget   *hpane;
+	GtkCalendar *gtk_calendar;
+	GtkWidget   *todo;
+
 	GtkWidget   *day_view;
+	GtkWidget   *work_week_view;
 	GtkWidget   *week_view;
 	GtkWidget   *month_view;
 	GtkWidget   *year_view;
 	GtkWidget   *year_view_sw;
+
 	void        *event_editor;
+
+	/* The signal handler id for our GtkCalendar "day_selected" handler. */
+	guint	     day_selected_id;
 } GnomeCalendar;
 
 typedef struct {
-	GnomeAppClass parent_class;
+	GtkVBoxClass parent_class;
 } GnomeCalendarClass;
 
 
@@ -78,6 +91,10 @@ char      *gnome_calendar_get_current_view_name (GnomeCalendar *gcal);
 void       gnome_calendar_set_view              (GnomeCalendar *gcal,
 						 char *page_name);
 
+void	   gnome_calendar_set_selected_time_range (GnomeCalendar *gcal,
+						   time_t	  start_time,
+						   time_t	  end_time);
+
 /* Flags is a bitmask of CalObjectChange values */
 void       gnome_calendar_object_changed        (GnomeCalendar *gcal,
 						 iCalObject *obj,