/*
* Geeqie
* (C) 2004 John Ellis
- * Copyright (C) 2008 - 2010 The Geeqie Team
+ * Copyright (C) 2008 - 2012 The Geeqie Team
*
* Author: John Ellis
*
pixbuf_draw_layout(pixbuf, layout, pw->dialog->dialog, 0, 0, r, g, b, 255);
g_object_unref(G_OBJECT(layout));
- ret = print_job_ps_page_image(pw, pixbuf, x, y,
+ ret = print_job_ps_page_image(pw, pixbuf, x, y,
/* do not allow rescaling of the pixbuf due to rounding errors */
((gdouble)lw + 0.01) / scale_to_max_dpi,
- ((gdouble)lh + 0.01) / scale_to_max_dpi,
+ ((gdouble)lh + 0.01) / scale_to_max_dpi,
0, 0);
g_object_unref(G_OBJECT(pixbuf));
GtkWidget *label;
gchar *buf;
- if (GTK_WIDGET_VISIBLE(pw->dialog->dialog)) parent = pw->dialog->dialog;
+ if (gtk_widget_get_visible(pw->dialog->dialog)) parent = pw->dialog->dialog;
gd = generic_dialog_new(_("Printing error"), "print_warning",
parent, TRUE, NULL, NULL);
gdouble sw, sh;
gdouble dw, dh;
gdouble x, y, w, h;
- gdouble scale;
gdouble offx, offy;
sw = (gdouble)gdk_pixbuf_get_width(pixbuf);
{
w = dw;
h = dw / sw * sh;
- scale = w / sw;
}
else
{
h = dh;
w = dh / sh *sw;
- scale = h / sh;
}
if (pw->image_scale >= 5.0)
gdouble w, h;
gdouble proof_w, proof_h;
gdouble icon_w, icon_h;
- gdouble scale;
gboolean success = TRUE;
if (pw->proof_columns < 1 || pw->proof_rows < 1)
pixbuf = image_loader_get_pixbuf(il);
+ if (options->image.exif_proof_rotate_enable == TRUE) {
+ pixbuf = pixbuf_apply_orientation(pixbuf, il->fd->exif_orientation);
+ }
+
w = gdk_pixbuf_get_width(pixbuf);
h = gdk_pixbuf_get_height(pixbuf);
{
icon_w = pw->proof_width;
icon_h = pw->proof_width / w * h;
- scale = icon_w / w;
}
else
{
icon_h = pw->proof_height;
icon_w = pw->proof_height / h * w;
- scale = icon_h / h;
}
y = pw->proof_position / pw->proof_columns;
pw->job_pixbuf = NULL;
}
- if (pw->dialog && !GTK_WIDGET_VISIBLE(pw->dialog->dialog))
+ if (pw->dialog && !gtk_widget_get_visible(pw->dialog->dialog))
{
g_idle_add_full(G_PRIORITY_HIGH_IDLE, print_job_close_finish_cb, pw, NULL);
}
GtkWidget *combo;
gint i;
- combo = gtk_combo_box_new_text();
+ combo = gtk_combo_box_text_new();
for (i = 0 ; i < count; i++)
{
- gtk_combo_box_append_text(GTK_COMBO_BOX(combo), _(text[i]));
+ gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(combo), _(text[i]));
}
if (preferred >= 0 && preferred < count)
pref_table_label(table, column, row, (_("Format:")), 1.0);
- combo = gtk_combo_box_new_text();
+ combo = gtk_combo_box_text_new();
i = 0;
while (print_paper_sizes[i].description)
{
- gtk_combo_box_append_text(GTK_COMBO_BOX(combo), _(print_paper_sizes[i].description));
+ gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(combo), _(print_paper_sizes[i].description));
i++;
}
work = work->next;
buf = g_strdup_printf(PRINT_LPR_CUSTOM, name);
- gtk_combo_box_append_text(GTK_COMBO_BOX(combo), buf);
+ gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(combo), buf);
g_free(buf);
}
string_list_free(list);
pref_spin_new(group, _("Size:"), _("points"),
8.0, 100.0, 1.0, 0, pw->text_points,
G_CALLBACK(print_text_cb_points), pw);
-
-#if 0
- button = color_selection_new();
- gtk_box_pack_start(GTK_BOX(group), button, FALSE, FALSE, 0);
- gtk_widget_show(button);
-#endif
}
/*