X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=print.c;h=0bd3110a7bc67d4fdab31ac483bc93230e7f1a66;hb=03eb488dd238bcec4b4758eab4559b3c40e6435c;hp=0346cca74bf48d3addb5f977d343f80970b29bd2;hpb=51486040686592965bd7a70cf52767350cfde5f6;p=ext%2Fsubsurface.git

diff --git a/print.c b/print.c
index 0346cca..0bd3110 100644
--- a/print.c
+++ b/print.c
@@ -31,7 +31,7 @@ static void show_dive_text(struct dive *dive, cairo_t *cr, double w, double h, P
 	int len, decimals, width, height, maxwidth, maxheight;
 	PangoLayout *layout;
 	struct tm *tm;
-	char buffer[1024], divenr[20];
+	char buffer[80], divenr[20], *people;
 
 	maxwidth = w * PANGO_SCALE;
 	maxheight = h * PANGO_SCALE * 0.9;
@@ -44,7 +44,6 @@ static void show_dive_text(struct dive *dive, cairo_t *cr, double w, double h, P
 	if (dive->number)
 		snprintf(divenr, sizeof(divenr), "Dive #%d - ", dive->number);
 
-
 	tm = gmtime(&dive->when);
 	len = snprintf(buffer, sizeof(buffer),
 		"%s%s, %s %d, %d   %d:%02d",
@@ -61,11 +60,13 @@ static void show_dive_text(struct dive *dive, cairo_t *cr, double w, double h, P
 	cairo_move_to(cr, 0, 0);
 	pango_cairo_show_layout(cr, layout);
 
-	/*
-	 * This is still problematic: a long dive location will clash
-	 * with the depth/duration information. Need to mask that or
-	 * create a box or something.
-	 */
+	people = dive->buddy;
+	if (!people || !*people) {
+		people = dive->divemaster;
+		if (!people)
+			people = "";
+	}
+
 	depth = get_depth_units(dive->maxdepth.mm, &decimals, &unit);
 	snprintf(buffer, sizeof(buffer),
 		"Max depth: %.*f %s\n"
@@ -73,7 +74,7 @@ static void show_dive_text(struct dive *dive, cairo_t *cr, double w, double h, P
 		"%s",
 		decimals, depth, unit,
 		(dive->duration.seconds+59) / 60,
-		dive->buddy ? :"");
+		people);
 
 	set_font(layout, font, FONT_SMALL, PANGO_ALIGN_RIGHT);
 	pango_layout_set_text(layout, buffer, -1);
@@ -126,12 +127,13 @@ static void show_dive_text(struct dive *dive, cairo_t *cr, double w, double h, P
 
 static void show_dive_profile(struct dive *dive, cairo_t *cr, double w, double h)
 {
+	cairo_rectangle_int_t drawing_area = { w/20.0, h/20.0, w, h};
 	struct graphics_context gc = {
 		.printer = 1,
 		.cr = cr
 	};
 	cairo_save(cr);
-	plot(&gc, w, h, dive);
+	plot(&gc, &drawing_area, dive);
 	cairo_restore(cr);
 }
 
@@ -194,6 +196,22 @@ static void begin_print(GtkPrintOperation *operation, gpointer user_data)
 {
 }
 
+static GtkWidget *print_dialog(GtkPrintOperation *operation, gpointer user_data)
+{
+	GtkWidget *vbox, *hbox, *label;
+	gtk_print_operation_set_custom_tab_label(operation, "Dive details");
+
+	vbox = gtk_vbox_new(TRUE, 5);
+	label = gtk_label_new("Print Dive details");
+	gtk_box_pack_start(GTK_BOX(vbox), label, TRUE, TRUE, 0);
+	gtk_widget_show_all(vbox);
+	return vbox;
+}
+
+static void print_dialog_apply(GtkPrintOperation *operation, GtkWidget *widget, gpointer user_data)
+{
+}
+
 static GtkPrintSettings *settings = NULL;
 
 void do_print(void)
@@ -208,6 +226,8 @@ void do_print(void)
 		gtk_print_operation_set_print_settings(print, settings);
 	pages = (dive_table.nr + 5) / 6;
 	gtk_print_operation_set_n_pages(print, pages);
+	g_signal_connect(print, "create-custom-widget", G_CALLBACK(print_dialog), NULL);
+	g_signal_connect(print, "custom-widget-apply", G_CALLBACK(print_dialog_apply), NULL);
 	g_signal_connect(print, "begin_print", G_CALLBACK(begin_print), NULL);
 	g_signal_connect(print, "draw_page", G_CALLBACK(draw_page), NULL);
 	res = gtk_print_operation_run(print, GTK_PRINT_OPERATION_ACTION_PRINT_DIALOG,