X-Git-Url: http://git.tdb.fi/?p=ext%2Fsubsurface.git;a=blobdiff_plain;f=print.c;h=0bd3110a7bc67d4fdab31ac483bc93230e7f1a66;hp=16ac4d2bf07f547252c1caff48a9590465c32ff0;hb=b693bb3fb962c54767f8430058575441df243b13;hpb=b4c4a29a11ff82dacfe3a145fe4eedaae2341151
diff --git a/print.c b/print.c
index 16ac4d2..0bd3110 100644
--- a/print.c
+++ b/print.c
@@ -7,96 +7,133 @@
#include "display.h"
#include "display-gtk.h"
+#define FONT_NORMAL (12)
+#define FONT_SMALL (FONT_NORMAL / 1.2)
+#define FONT_LARGE (FONT_NORMAL * 1.2)
+
+static void set_font(PangoLayout *layout, PangoFontDescription *font, double size, int align)
+{
+ pango_font_description_set_size(font, size * PANGO_SCALE);
+ pango_layout_set_font_description(layout, font);
+ pango_layout_set_ellipsize(layout, PANGO_ELLIPSIZE_END);
+ pango_layout_set_alignment(layout, align);
+
+}
+
/*
* You know what? Maybe somebody can do a real Pango layout thing.
* This is hacky.
*/
static void show_dive_text(struct dive *dive, cairo_t *cr, double w, double h, PangoFontDescription *font)
{
- int len, width, height, maxwidth, maxheight;
+ double depth;
+ const char *unit;
+ 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;
layout = pango_cairo_create_layout(cr);
- pango_layout_set_font_description(layout, font);
pango_layout_set_width(layout, maxwidth);
pango_layout_set_height(layout, maxheight);
- pango_layout_set_wrap(layout, PANGO_WRAP_WORD_CHAR);
*divenr = 0;
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"
- "",
+ "%s%s, %s %d, %d %d:%02d",
divenr,
weekday(tm->tm_wday),
monthname(tm->tm_mon),
tm->tm_mday, tm->tm_year + 1900,
tm->tm_hour, tm->tm_min);
- pango_layout_set_justify(layout, 1);
- pango_layout_set_ellipsize(layout, PANGO_ELLIPSIZE_END);
- pango_layout_set_alignment(layout, PANGO_ALIGN_LEFT);
-
- pango_layout_set_markup(layout, buffer, len);
+ set_font(layout, font, FONT_LARGE, PANGO_ALIGN_LEFT);
+ pango_layout_set_text(layout, buffer, len);
pango_layout_get_size(layout, &width, &height);
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: %d ft\n"
- "Duration: %d:%02d"
- "",
- to_feet(dive->maxdepth),
- dive->duration.seconds / 60,
- dive->duration.seconds % 60);
+ "Max depth: %.*f %s\n"
+ "Duration: %d min\n"
+ "%s",
+ decimals, depth, unit,
+ (dive->duration.seconds+59) / 60,
+ people);
- pango_layout_set_alignment(layout, PANGO_ALIGN_RIGHT);
- pango_layout_set_markup(layout, buffer, -1);
+ set_font(layout, font, FONT_SMALL, PANGO_ALIGN_RIGHT);
+ pango_layout_set_text(layout, buffer, -1);
cairo_move_to(cr, 0, 0);
pango_cairo_show_layout(cr, layout);
- len = snprintf(buffer, sizeof(buffer), "%s\n\n%s",
- dive->location ? : "",
- dive->notes ? : "");
-
+ /*
+ * Show the dive location
+ *
+ * .. or at least a space to get the size.
+ *
+ * Move down by the size of the date, and limit the
+ * width to the same width as the date string.
+ */
+ cairo_translate(cr, 0, height / (double) PANGO_SCALE);
maxheight -= height;
- pango_layout_set_height(layout, maxheight);
- pango_layout_set_attributes(layout, NULL);
- pango_layout_set_alignment(layout, PANGO_ALIGN_LEFT);
- pango_layout_set_text(layout, buffer, len);
+ pango_layout_set_height(layout, 1);
+ pango_layout_set_width(layout, width);
+
+ set_font(layout, font, FONT_NORMAL, PANGO_ALIGN_LEFT);
+ pango_layout_set_text(layout, dive->location ? : " ", -1);
- cairo_move_to(cr, 0, height / (double) PANGO_SCALE);
+ cairo_move_to(cr, 0, 0);
pango_cairo_show_layout(cr, layout);
+ pango_layout_get_size(layout, &width, &height);
+
+ /*
+ * Show the dive notes
+ */
+ if (dive->notes) {
+ /* Move down by the size of the location (x2) */
+ height = height * 2;
+ cairo_translate(cr, 0, height / (double) PANGO_SCALE);
+ maxheight -= height;
+
+ /* Use the full width and remaining height for notes */
+ pango_layout_set_height(layout, maxheight);
+ pango_layout_set_width(layout, maxwidth);
+ pango_layout_set_wrap(layout, PANGO_WRAP_WORD_CHAR);
+ pango_layout_set_justify(layout, 1);
+ pango_layout_set_text(layout, dive->notes, -1);
+
+ cairo_move_to(cr, 0, 0);
+ pango_cairo_show_layout(cr, layout);
+ }
g_object_unref(layout);
}
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);
}
@@ -159,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)
@@ -173,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,