print menu command (print_preview_cmd): ditto for print preview

2001-06-20  JP Rosevear  <jpr@ximian.com>

	* gui/dialogs/comp-editor.c (print_cmd): print menu command
	(print_preview_cmd): ditto for print preview
	(print_setup_cmd): ditto for print setup
	(comp_editor_set_cal_client): listen for updated and removed
	signals
	(obj_updated_cb): if the item changes else where, query the user
	for the course of action
	(obj_removed_cb): ditto for removal

	* gui/print.c (print_setup): rudimentary page setup support
	(print_comp): rudimentary individual event/task printing support

	* gui/print.h: new protos

	* gui/dialogs/changed-comp.[hc]: dialog to query the user about
	what to do when a item is changed elsewhere

	* gui/dialogs/Makefile.am: build new files

	* gui/dialogs/send-comp.c (send_component_dialog): remove useless
	assignment

svn path=/trunk/; revision=10338

8 files changed, 526 insertions, 6 deletions

diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index b4f169e2cd..4eacedf2b2 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,27 @@
+2001-06-20  JP Rosevear  <jpr@ximian.com>
+
+	* gui/dialogs/comp-editor.c (print_cmd): print menu command
+	(print_preview_cmd): ditto for print preview
+	(print_setup_cmd): ditto for print setup
+	(comp_editor_set_cal_client): listen for updated and removed
+	signals
+	(obj_updated_cb): if the item changes else where, query the user
+	for the course of action
+	(obj_removed_cb): ditto for removal
+
+	* gui/print.c (print_setup): rudimentary page setup support
+	(print_comp): rudimentary individual event/task printing support
+
+	* gui/print.h: new protos
+
+	* gui/dialogs/changed-comp.[hc]: dialog to query the user about
+	what to do when a item is changed elsewhere
+
+	* gui/dialogs/Makefile.am: build new files
+
+	* gui/dialogs/send-comp.c (send_component_dialog): remove useless
+	assignment
+	
 2001-06-20  Rodrigo Moya <rodrigo@ximian.com>
 
 	* idl/evolution-calendar.idl: added getFreeBusy method
diff --git a/calendar/gui/dialogs/Makefile.am b/calendar/gui/dialogs/Makefile.am
index 1bd4b5034e..e9d21d726a 100644
--- a/calendar/gui/dialogs/Makefile.am
+++ b/calendar/gui/dialogs/Makefile.am
@@ -26,6 +26,8 @@ libcal_dialogs_a_SOURCES =	\
 	cal-prefs-dialog.h	\
 	cancel-comp.c		\
 	cancel-comp.h		\
+	changed-comp.c		\
+	changed-comp.h		\
 	comp-editor.c		\
 	comp-editor.h		\
 	comp-editor-page.c	\
diff --git a/calendar/gui/dialogs/changed-comp.c b/calendar/gui/dialogs/changed-comp.c
new file mode 100644
index 0000000000..a9be39c008
--- /dev/null
+++ b/calendar/gui/dialogs/changed-comp.c
@@ -0,0 +1,112 @@
+/* Evolution calendar - Send calendar component dialog
+ *
+ * Copyright (C) 2001 Ximian, Inc.
+ *
+ * Author: JP Rosevear <jpr@ximian.com>
+ *
+ * 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.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <glib.h>
+#include <libgnome/gnome-defs.h>
+#include <libgnome/gnome-i18n.h>
+#include <libgnomeui/gnome-dialog.h>
+#include <libgnomeui/gnome-dialog-util.h>
+#include <libgnomeui/gnome-uidefs.h>
+#include <gal/widgets/e-unicode.h>
+#include "changed-comp.h"
+
+
+
+/**
+ * changed_component_dialog:
+ * @comp: A calendar component
+ * @deleted: Whether the object is being deleted or updated
+ * @changed: Whether or not the user has made changes
+ * 
+ * Pops up a dialog box asking the user whether changes made (if any)
+ * should be thrown away because the item has been updated elsewhere
+ * 
+ * Return value: TRUE if the user clicked Yes, FALSE otherwise.
+ **/
+gboolean
+changed_component_dialog (CalComponent *comp, gboolean deleted, gboolean changed)
+{
+	GtkWidget *dialog;
+	CalComponentVType vtype;
+	char *str;
+
+	vtype = cal_component_get_vtype (comp);
+
+	if (deleted) {
+		switch (vtype) {
+		case CAL_COMPONENT_EVENT:
+			str = _("This event has been deleted.");
+			break;
+
+		case CAL_COMPONENT_TODO:
+			str = _("This task has been deleted.");
+			break;
+
+		case CAL_COMPONENT_JOURNAL:
+			str = _("This journal entry has been deleted.");
+			break;
+
+		default:
+			g_message ("changed_component_dialog(): "
+				   "Cannot handle object of type %d", vtype);
+			return FALSE;
+		}
+		if (changed)
+			str = g_strdup_printf (_("%s  You have made changes. Forget those changes and close the editor?"), str);
+		else
+			str = g_strdup_printf (_("%s  You have made no changes, close the editor?"), str); 
+
+	} else {
+		switch (vtype) {
+		case CAL_COMPONENT_EVENT:
+			str = _("This event has been changed.");
+			break;
+
+		case CAL_COMPONENT_TODO:
+			str = _("This task has been changed.");
+			break;
+
+		case CAL_COMPONENT_JOURNAL:
+			str = _("This journal entry has been changed.");
+			break;
+
+		default:
+			g_message ("changed_component_dialog(): "
+				   "Cannot handle object of type %d", vtype);
+			return FALSE;
+		}
+		if (changed)
+			str = g_strdup_printf (_("%s  You have made changes. Forget those changes and update the editor?"), str);
+		else
+			str = g_strdup_printf (_("%s  You have made no changes, update the editor?"), str); 
+	}
+	
+	dialog = gnome_question_dialog_modal (str, NULL, NULL);
+
+	if (gnome_dialog_run (GNOME_DIALOG (dialog)) == GNOME_YES)
+		return TRUE;
+	else
+		return FALSE;
+}
diff --git a/calendar/gui/dialogs/changed-comp.h b/calendar/gui/dialogs/changed-comp.h
new file mode 100644
index 0000000000..7a1cb3e151
--- /dev/null
+++ b/calendar/gui/dialogs/changed-comp.h
@@ -0,0 +1,30 @@
+/* Evolution calendar - Changed calendar component dialog
+ *
+ * Copyright (C) 2001 Ximian, Inc.
+ *
+ * Author: JP Rosevear <jpr@ximian.com>
+ *
+ * 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.
+ */
+
+#ifndef CHANGED_COMP_H
+#define CHANGED_COMP_H
+
+#include <glib.h>
+#include <cal-util/cal-component.h>
+
+gboolean changed_component_dialog (CalComponent *comp, gboolean deleted, gboolean changed);
+
+#endif
diff --git a/calendar/gui/dialogs/comp-editor.c b/calendar/gui/dialogs/comp-editor.c
index bdf5c39737..f0fdf837a5 100644
--- a/calendar/gui/dialogs/comp-editor.c
+++ b/calendar/gui/dialogs/comp-editor.c
@@ -33,9 +33,13 @@
 #include <bonobo/bonobo-ui-container.h>
 #include <bonobo/bonobo-ui-util.h>
 #include <gal/widgets/e-unicode.h>
+#include <libgnomeui/gnome-dialog.h>
+#include <libgnomeui/gnome-dialog-util.h>
+#include "../print.h"
 #include "save-comp.h"
 #include "delete-comp.h"
 #include "send-comp.h"
+#include "changed-comp.h"
 #include "comp-editor.h"
 
 
@@ -62,6 +66,7 @@ struct _CompEditorPrivate {
 	
 	gboolean changed;
 	gboolean needs_send;
+	gboolean updating;
 };
 
 
@@ -80,9 +85,15 @@ static void page_needs_send_cb (GtkWidget *widget, gpointer data);
 static void page_summary_changed_cb (GtkWidget *widget, const char *summary, gpointer data);
 static void page_dates_changed_cb (GtkWidget *widget, CompEditorPageDates *dates, gpointer data);
 
+static void obj_updated_cb (CalClient *client, const char *uid, gpointer data);
+static void obj_removed_cb (CalClient *client, const char *uid, gpointer data);
+
 static void save_close_cmd (GtkWidget *widget, gpointer data);
 static void save_as_cmd (GtkWidget *widget, gpointer data);
 static void delete_cmd (GtkWidget *widget, gpointer data);
+static void print_cmd (GtkWidget *widget, gpointer data);
+static void print_preview_cmd (GtkWidget *widget, gpointer data);
+static void print_setup_cmd (GtkWidget *widget, gpointer data);
 static void close_cmd (GtkWidget *widget, gpointer data);
 
 static void save_clicked_cb (GtkWidget *widget, gpointer data);
@@ -94,6 +105,9 @@ static BonoboUIVerb verbs [] = {
 	BONOBO_UI_UNSAFE_VERB ("FileSaveAndClose", save_close_cmd), 
 	BONOBO_UI_UNSAFE_VERB ("FileSaveAs", save_as_cmd),
 	BONOBO_UI_UNSAFE_VERB ("FileDelete", delete_cmd), 
+	BONOBO_UI_UNSAFE_VERB ("FilePrint", print_cmd),
+	BONOBO_UI_UNSAFE_VERB ("FilePrintPreview", print_preview_cmd),
+	BONOBO_UI_UNSAFE_VERB ("FilePrintSetup", print_setup_cmd),
 	BONOBO_UI_UNSAFE_VERB ("FileClose", close_cmd), 
 	
 	BONOBO_UI_VERB_END
@@ -233,9 +247,11 @@ comp_editor_destroy (GtkObject *object)
 		priv->window = NULL;
 	}
 
+	gtk_signal_disconnect_by_data (GTK_OBJECT (priv->client), editor);
+	
 	g_free (priv);
 	editor->priv = NULL;
-
+	
 	if (GTK_OBJECT_CLASS (parent_class)->destroy)
 		(* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
 }
@@ -382,6 +398,12 @@ comp_editor_set_cal_client (CompEditor *editor, CalClient *client)
 	}
 
 	priv->client = client;
+
+	gtk_signal_connect (GTK_OBJECT (priv->client), "obj_updated",
+			    GTK_SIGNAL_FUNC (obj_updated_cb), editor);
+
+	gtk_signal_connect (GTK_OBJECT (priv->client), "obj_removed",
+			    GTK_SIGNAL_FUNC (obj_removed_cb), editor);
 }
 
 /**
@@ -653,10 +675,14 @@ save_comp (CompEditor *editor)
 		itip_send_comp (CAL_COMPONENT_METHOD_REQUEST, priv->comp);
 	}
 	
+	priv->updating = TRUE;
+
 	if (!cal_client_update_object (priv->client, priv->comp))
 		g_message ("save_comp (): Could not update the object!");
 	else
 		priv->changed = FALSE;
+
+	priv->updating = FALSE;
 }
 
 static void
@@ -668,7 +694,9 @@ delete_comp (CompEditor *editor)
 	priv = editor->priv;
 
 	cal_component_get_uid (priv->comp, &uid);
+	priv->updating = TRUE;
 	cal_client_remove_object (priv->client, uid);
+	priv->updating = FALSE;
 	close_dialog (editor);
 }
 
@@ -838,6 +866,39 @@ delete_cmd (GtkWidget *widget, gpointer data)
 }
 
 static void
+print_cmd (GtkWidget *widget, gpointer data)
+{
+	CompEditor *editor = COMP_EDITOR (data);
+	CalComponent *comp;
+	
+	comp = comp_editor_get_current_comp (editor);
+	print_comp (comp, FALSE);
+	gtk_object_unref (GTK_OBJECT (comp));
+}
+
+static void
+print_preview_cmd (GtkWidget *widget, gpointer data)
+{
+	CompEditor *editor = COMP_EDITOR (data);
+	CalComponent *comp;
+	
+	comp = comp_editor_get_current_comp (editor);
+	print_comp (comp, TRUE);
+	gtk_object_unref (GTK_OBJECT (comp));
+}
+
+static void
+print_setup_cmd (GtkWidget *widget, gpointer data)
+{
+	CompEditor *editor = COMP_EDITOR (data);
+	CompEditorPrivate *priv;
+
+	priv = editor->priv;
+
+	print_setup ();
+}
+
+static void
 close_cmd (GtkWidget *widget, gpointer data)
 {
 	CompEditor *editor = COMP_EDITOR (data);
@@ -925,6 +986,52 @@ page_dates_changed_cb (GtkWidget *widget,
 	priv->changed = TRUE;
 }
 
+static void
+obj_updated_cb (CalClient *client, const char *uid, gpointer data)
+{
+	CompEditor *editor = COMP_EDITOR (data);
+	CompEditorPrivate *priv;
+	CalComponent *comp = NULL;
+	CalClientGetStatus status;
+	const char *edit_uid;
+
+	priv = editor->priv;
+
+	cal_component_get_uid (priv->comp, &edit_uid);
+
+	if (!strcmp (uid, edit_uid) && !priv->updating) {
+		if (changed_component_dialog (priv->comp, FALSE, priv->changed)) {
+			status = cal_client_get_object (priv->client, uid, &comp);
+			if (status == CAL_CLIENT_GET_SUCCESS) {
+				comp_editor_edit_comp (editor, comp);
+				gtk_object_unref (GTK_OBJECT (comp));
+			} else {
+				GtkWidget *dlg;
+				
+				dlg = gnome_error_dialog (_("Unable to obtain current version!"));
+				gnome_dialog_run_and_close (GNOME_DIALOG (dlg));
+			}
+		}
+	}	
+}
+
+static void
+obj_removed_cb (CalClient *client, const char *uid, gpointer data)
+{
+	CompEditor *editor = COMP_EDITOR (data);
+	CompEditorPrivate *priv;
+	const char *edit_uid;
+	
+	priv = editor->priv;
+
+	cal_component_get_uid (priv->comp, &edit_uid);
+	
+	if (!strcmp (uid, edit_uid) && !priv->updating) {
+		if (changed_component_dialog (priv->comp, TRUE, priv->changed))
+			close_dialog (editor);
+	}
+}
+
 static gint
 delete_event_cb (GtkWidget *widget, GdkEvent *event, gpointer data)
 {
diff --git a/calendar/gui/dialogs/send-comp.c b/calendar/gui/dialogs/send-comp.c
index 8b1824866c..7f7874fa41 100644
--- a/calendar/gui/dialogs/send-comp.c
+++ b/calendar/gui/dialogs/send-comp.c
@@ -49,8 +49,6 @@ send_component_dialog (CalComponent *comp)
 	CalComponentVType vtype;
 	char *str;
 
-	str = _("The meeting status has changed. Send an updated version?");
-
 	vtype = cal_component_get_vtype (comp);
 
 	switch (vtype) {
diff --git a/calendar/gui/print.c b/calendar/gui/print.c
index f6f798b88b..f0e1b89fce 100644
--- a/calendar/gui/print.c
+++ b/calendar/gui/print.c
@@ -33,6 +33,8 @@
 #include <libgnome/gnome-paper.h>
 #include <libgnomeui/gnome-dialog.h>
 #include <libgnomeui/gnome-uidefs.h>
+#include <libgnomeui/gnome-paper-selector.h>
+#include <libgnomeui/gnome-stock.h>
 #include <libgnomeprint/gnome-print.h>
 #include <libgnomeprint/gnome-print-copies.h>
 #include <libgnomeprint/gnome-print-master.h>
@@ -171,6 +173,7 @@ struct einfo
 	int count;
 };
 
+static const GnomePaper *paper_info = NULL;
 
 /* Returns the number of leap years since year 1 up to (but not including) the specified year */
 static int
@@ -2182,9 +2185,132 @@ print_year_view (GnomePrintContext *pc, GnomeCalendar *gcal, time_t date,
 	print_text_size (pc, 24, buf, ALIGN_CENTER,
 			 left+3, right, top-3, top - 27);
 
-	gnome_print_showpage(pc);
+	gnome_print_showpage (pc);
+}
+
+static void
+write_label_piece (time_t t, char *buffer, int size, char *stext, char *etext)
+{
+	struct tm *tmp_tm;
+	int len;
+	
+	tmp_tm = localtime (&t);
+	if (stext != NULL)
+		strcat (buffer, stext);
+
+	len = strlen (buffer);
+	e_time_format_date_and_time (tmp_tm,
+				     calendar_config_get_24_hour_format (), 
+				     FALSE, FALSE,
+				     &buffer[len], size - len);
+	if (etext != NULL)
+		strcat (buffer, etext);
+}
+
+static void
+print_date_label (GnomePrintContext *pc, CalComponent *comp,
+		  double left, double right, double top, double bottom)
+{
+	CalComponentDateTime datetime;
+	time_t start = 0, end = 0, complete = 0, due = 0;
+	static char buffer[1024];
+
+	cal_component_get_dtstart (comp, &datetime);
+	if (datetime.value)
+		start = icaltime_as_timet (*datetime.value);
+	cal_component_get_dtend (comp, &datetime);
+	if (datetime.value)
+		end = icaltime_as_timet (*datetime.value);
+	cal_component_get_due (comp, &datetime);
+	if (datetime.value)
+		due = icaltime_as_timet (*datetime.value);
+	cal_component_get_completed (comp, &datetime.value);
+	if (datetime.value)
+		complete = icaltime_as_timet (*datetime.value);
+
+	buffer[0] = '\0';
+
+	if (start > 0)
+		write_label_piece (start, buffer, 1024, NULL, NULL);
+
+	if (end > 0 && start > 0)
+		write_label_piece (end, buffer, 1024, _(" to "), NULL);
+
+	if (complete > 0) {
+		if (start > 0)
+			write_label_piece (complete, buffer, 1024, _(" (Completed "), ")");
+		else
+			write_label_piece (complete, buffer, 1024, _("Completed "), NULL);
+	}
+	
+	if (due > 0 && complete == 0) {
+		if (start > 0)
+			write_label_piece (due, buffer, 1024, _(" (Due "), ")");
+		else
+			write_label_piece (due, buffer, 1024, _("Due "), NULL);
+	}
+
+	print_text_size (pc, 12, buffer, ALIGN_LEFT,
+			 left, right, top, top - 15);
+}
+
+static void
+print_event (GnomePrintContext *pc, CalComponent *comp,
+	     double left, double right, double top, double bottom)
+{
+	CalComponentText text;
+	GSList *desc, *l;
+	
+	/* Summary */
+	cal_component_get_summary (comp, &text);
+	print_text_size (pc, 18, text.value, ALIGN_LEFT,
+			 left+3, right, top-3, top - 21);
+	top -= 21;
+	
+	/* Date information */
+	print_date_label (pc, comp, left+3, right, top-3, top - 15);
+	top -= 15;
+
+	/* Description */
+	cal_component_get_description_list (comp, &desc);
+	for (l = desc; l != NULL; l = l->next) {
+		CalComponentText *text = l->data;
+		
+	}
+	cal_component_free_text_list (desc);
+}
+
+static void
+print_task (GnomePrintContext *pc, CalComponent *comp,
+	    double left, double right, double top, double bottom)
+{
+	CalComponentText text;
+
+	cal_component_get_summary (comp, &text);
+	print_text_size (pc, 24, text.value, ALIGN_CENTER,
+			 left+3, right, top-3, top - 27);
 }
 
+static void
+print_comp_item (GnomePrintContext *pc, CalComponent *comp,
+		 double left, double right, double top, double bottom)
+{
+	CalComponentVType vtype;
+	
+	vtype = cal_component_get_vtype (comp);
+	switch (vtype) {
+	case CAL_COMPONENT_EVENT:
+		print_event (pc, comp, left, right, top, bottom);
+		break;
+		
+	case CAL_COMPONENT_TODO:
+		print_task (pc, comp, left, right, top, bottom);
+		break;
+	default:
+	}
+
+	gnome_print_showpage (pc);
+}
 
 void
 print_calendar (GnomeCalendar *gcal, gboolean preview, time_t date,
@@ -2194,7 +2320,6 @@ print_calendar (GnomeCalendar *gcal, gboolean preview, time_t date,
 	GnomePrintMaster *gpm;
 	GnomePrintContext *pc;
 	int copies, collate;
-	const GnomePaper *paper_info;
 	double l, r, t, b;
 
 	g_return_if_fail (gcal != NULL);
@@ -2252,7 +2377,8 @@ print_calendar (GnomeCalendar *gcal, gboolean preview, time_t date,
 
 	gpm = gnome_print_master_new ();
 
-	paper_info = gnome_paper_with_name (gnome_paper_name_default ());
+	if (paper_info == NULL)
+		paper_info = gnome_paper_with_name (gnome_paper_name_default ());
 	gnome_print_master_set_paper (gpm, paper_info);
 
 	if (printer)
@@ -2304,3 +2430,121 @@ print_calendar (GnomeCalendar *gcal, gboolean preview, time_t date,
 
 	gtk_object_unref (GTK_OBJECT (gpm));
 }
+
+
+void
+print_comp (CalComponent *comp, gboolean preview)
+{
+	GnomePrinter *printer;
+	GnomePrintMaster *gpm;
+	GnomePrintContext *pc;
+	int copies, collate;
+	double l, r, t, b;
+
+	g_return_if_fail (comp != NULL);
+	g_return_if_fail (IS_CAL_COMPONENT (comp));
+
+	printer = NULL;
+	copies = 1;
+	collate = FALSE;
+
+	if (!preview) {
+		GtkWidget *gpd;
+
+		gpd = gnome_print_dialog_new (_("Print Item"), 
+					      GNOME_PRINT_DIALOG_COPIES);
+
+		gnome_dialog_set_default (GNOME_DIALOG (gpd),
+					  GNOME_PRINT_PRINT);
+
+		/* Run dialog */
+
+		switch (gnome_dialog_run (GNOME_DIALOG (gpd))) {
+		case GNOME_PRINT_PRINT:
+			break;
+
+		case GNOME_PRINT_PREVIEW:
+			preview = TRUE;
+			break;
+
+		case -1:
+			return;
+
+		default:
+			gnome_dialog_close (GNOME_DIALOG (gpd));
+			return;
+		}
+
+		e_dialog_get_values (gpd);
+
+		gnome_print_dialog_get_copies (GNOME_PRINT_DIALOG (gpd),
+					       &copies, &collate);
+		printer = gnome_print_dialog_get_printer (GNOME_PRINT_DIALOG (gpd));
+
+		gnome_dialog_close (GNOME_DIALOG (gpd));
+	}
+
+	/* FIXME: allow configuration of paper size */
+
+	gpm = gnome_print_master_new ();
+
+	if (paper_info == NULL)
+		paper_info = gnome_paper_with_name (gnome_paper_name_default ());
+	gnome_print_master_set_paper (gpm, paper_info);
+
+	if (printer)
+		gnome_print_master_set_printer (gpm, printer);
+
+	gnome_print_master_set_copies (gpm, copies, collate);
+
+	pc = gnome_print_master_get_context (gpm);
+
+	l = gnome_paper_lmargin (paper_info);
+	r = gnome_paper_pswidth (paper_info)
+		- gnome_paper_rmargin (paper_info);
+	t = gnome_paper_psheight (paper_info)
+		- gnome_paper_tmargin (paper_info);
+	b = gnome_paper_bmargin (paper_info);
+
+	print_comp_item (pc, comp, l, r, t, b);
+
+	gnome_print_master_close (gpm);
+
+	if (preview) {
+		GnomePrintMasterPreview *gpmp;
+
+		gpmp = gnome_print_master_preview_new (gpm,
+						       _("Print Preview"));
+		gtk_widget_show (GTK_WIDGET (gpmp));
+	} else {
+		gnome_print_master_print (gpm);
+	}
+
+	gtk_object_unref (GTK_OBJECT (gpm));
+}
+
+void
+print_setup (void)
+{
+	GtkWidget *dlg, *ps;
+	gint btn;
+	
+	ps = gnome_paper_selector_new ();
+	gtk_widget_show (ps);
+	
+	dlg = gnome_dialog_new (_("Print Setup"), 
+				GNOME_STOCK_BUTTON_OK, 
+				GNOME_STOCK_BUTTON_CANCEL, 
+				NULL);
+	gtk_box_pack_start (GTK_BOX (GNOME_DIALOG (dlg)->vbox), ps, TRUE, TRUE, 2);
+
+	btn = gnome_dialog_run (GNOME_DIALOG (dlg));
+	if (btn == 0) {
+		gchar *name;
+		
+		name  = gnome_paper_selector_get_name (GNOME_PAPER_SELECTOR (ps));
+		paper_info = gnome_paper_with_name (name);
+	}
+	
+	gnome_dialog_close (GNOME_DIALOG (dlg));
+}
diff --git a/calendar/gui/print.h b/calendar/gui/print.h
index e88c4a8e01..1e8fa3b84b 100644
--- a/calendar/gui/print.h
+++ b/calendar/gui/print.h
@@ -35,6 +35,9 @@ typedef enum {
 } PrintView;
 
 void print_calendar (GnomeCalendar *gcal, gboolean preview, time_t at, PrintView default_view);
+void print_comp (CalComponent *comp, gboolean preview);
+
+void print_setup (void);