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;
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",
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"
- "Duration: %d:%02d\n"
+ "Duration: %d min\n"
"%s",
decimals, depth, unit,
- dive->duration.seconds / 60,
- dive->duration.seconds % 60,
- dive->buddy ? :"");
+ (dive->duration.seconds+59) / 60,
+ people);
set_font(layout, font, FONT_SMALL, PANGO_ALIGN_RIGHT);
pango_layout_set_text(layout, buffer, -1);
* Show the dive notes
*/
if (dive->notes) {
- /* Move down by the size of the location (1.5) */
- height = height * 3 / 2;
+ /* Move down by the size of the location (x2) */
+ height = height * 2;
cairo_translate(cr, 0, height / (double) PANGO_SCALE);
maxheight -= height;
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);
}
{
}
+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)
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,