dnrops
/
gimp
mirror of https://github.com/GNOME/gimp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

plug-ins/print/print-draw-page.c plug-ins/print/print-page-layout.c 

2006-12-25  Sven Neumann  <sven@gimp.org>

	* plug-ins/print/print-draw-page.c
	* plug-ins/print/print-page-layout.c
	* plug-ins/print/print-settings.c
	* plug-ins/print/print.c: formatting, minor cleanups,
untabified.
This commit is contained in:
Sven Neumann 2006-12-25 21:03:27 +00:00 committed by Sven Neumann
parent 59269cf704
commit 18332dc96a
5 changed files with 101 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
2006-12-25 Sven Neumann <sven@gimp.org>
* plug-ins/print/print-draw-page.c
* plug-ins/print/print-page-layout.c
* plug-ins/print/print-settings.c
* plug-ins/print/print.c: formatting, minor cleanups, untabified.
2006-12-25 Michael Natterer <mitch@gimp.org>
* app/widgets/gimplayertreeview.c

18
plug-ins/print/print-draw-page.c
View File

@ -31,17 +31,17 @@
/* In points */
#define HEADER_HEIGHT (20*72/25.4)
#define EPSILON 0.0001
#define HEADER_HEIGHT (20 * 72.0 / 25.4)
#define EPSILON 0.0001
static guchar * get_image_pixels (PrintData *data,
gint *width_ptr,
gint *height_ptr,
gint *rowstride_ptr);
static guchar * get_image_pixels (PrintData *data,
gint *width_ptr,
gint *height_ptr,
gint *rowstride_ptr);
static void draw_info_header (GtkPrintContext *context,
cairo_t *cr,
PrintData *data);
static void draw_info_header (GtkPrintContext *context,
cairo_t *cr,
PrintData *data);
gboolean

8
plug-ins/print/print-page-layout.c
View File

@ -80,8 +80,8 @@ print_page_layout_gui (PrintData *data)
button = gtk_button_new_with_label (_("Page Setup"));
gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, FALSE, 5);
g_signal_connect (G_OBJECT (button), "clicked",
G_CALLBACK (run_page_setup_dialog),
data);
G_CALLBACK (run_page_setup_dialog),
data);
gtk_widget_show (button);
button = gtk_check_button_new_with_label (_("Show image info header"));
@ -89,8 +89,8 @@ print_page_layout_gui (PrintData *data)
data->show_info_header);
gtk_box_pack_end (GTK_BOX (hbox), button, FALSE, FALSE, 5);
g_signal_connect (G_OBJECT (button), "toggled",
G_CALLBACK (gimp_toggle_button_update),
&data->show_info_header);
G_CALLBACK (gimp_toggle_button_update),
&data->show_info_header);
gtk_widget_show (button);
hbox = gtk_hbox_new (FALSE, 0);

42
plug-ins/print/print-settings.c
View File

@ -24,6 +24,8 @@
#include <libgimp/gimp.h>
#include <libgimp/gimpui.h>
#include <glib/gstdio.h>
#include "print.h"
#include "print-settings.h"
@ -53,7 +55,7 @@ static GKeyFile * check_version (GKeyFile
* file of the same name
*/
gboolean
load_print_settings (PrintData *data)
load_print_settings (PrintData *data)
{
GKeyFile *key_file;
@ -77,7 +79,7 @@ load_print_settings (PrintData *data)
* and as an image parasite
*/
void
save_print_settings (PrintData *data)
save_print_settings (PrintData *data)
{
GKeyFile *key_file;
@ -150,15 +152,15 @@ save_print_settings_resource_file (GKeyFile *settings_key_file)
contents = g_key_file_to_data (settings_key_file, &length, &error);
if (error)
{
g_message ("Unable to get contents of settings key file.\n");
g_message ("Unable to get contents of settings key file.");
return;
}
fname = g_strconcat (gimp_directory (), G_DIR_SEPARATOR_S, "print-settings", NULL);
settings_file = fopen (fname, "w");
fname = g_build_filename (gimp_directory (), "print-settings", NULL);
settings_file = g_fopen (fname, "w");
if (! settings_file)
{
g_message ("Unable to create resource file for print settings.\n");
g_message ("Unable to create resource file for print settings.");
return;
}
@ -184,7 +186,7 @@ save_print_settings_as_parasite (GKeyFile *settings_key_file,
contents = g_key_file_to_data (settings_key_file, &length, &error);
if (error)
{
g_message ("Unable to get contents of settings key file.\n");
g_message ("Unable to get contents of settings key file.");
return;
}
@ -199,8 +201,8 @@ save_print_settings_as_parasite (GKeyFile *settings_key_file,
*/
static void
add_print_setting_to_key_file (const gchar *key,
const gchar *value,
gpointer data)
const gchar *value,
gpointer data)
{
GKeyFile *key_file = data;
@ -276,8 +278,8 @@ print_settings_key_file_from_parasite (gint32 image_ID)
}
static gboolean
load_print_settings_from_key_file (PrintData *data,
GKeyFile *key_file)
load_print_settings_from_key_file (PrintData *data,
GKeyFile *key_file)
{
GtkPrintOperation *operation = data->operation;
gchar **keys;
@ -317,8 +319,9 @@ load_print_settings_from_key_file (PrintData *data,
{
GtkPageOrientation orientation;
orientation = g_key_file_get_integer (key_file, "page-setup",
"orientation", &error);
orientation = g_key_file_get_integer (key_file,
"page-setup", "orientation",
&error);
gtk_page_setup_set_orientation (page_setup, orientation);
gtk_print_settings_set_orientation (settings, orientation);
data->orientation = orientation;
@ -329,7 +332,8 @@ load_print_settings_from_key_file (PrintData *data,
/* other settings */
if (g_key_file_has_key (key_file, "other-settings", "show-header", &error))
{
data->show_info_header = g_key_file_get_boolean (key_file, "other-settings",
data->show_info_header = g_key_file_get_boolean (key_file,
"other-settings",
"show-header", &error);
}
else
@ -337,8 +341,8 @@ load_print_settings_from_key_file (PrintData *data,
if (g_key_file_has_key (key_file, "other-settings", "unit", &error))
{
data->unit = g_key_file_get_integer (key_file, "other-settings",
"unit", &error);
data->unit = g_key_file_get_integer (key_file,
"other-settings", "unit", &error);
}
else
data->unit = GIMP_UNIT_INCH;
@ -358,12 +362,14 @@ check_version (GKeyFile *key_file)
if (! g_key_file_has_group (key_file, "meta"))
return NULL;
major_version = g_key_file_get_integer (key_file, "meta", "major-version", &error);
major_version = g_key_file_get_integer (key_file,
"meta", "major-version", &error);
if (major_version != PRINT_SETTINGS_MAJOR_VERSION)
return NULL;
minor_version = g_key_file_get_integer (key_file, "meta", "minor-version", &error);
minor_version = g_key_file_get_integer (key_file,
"meta", "minor-version", &error);
if (minor_version != PRINT_SETTINGS_MINOR_VERSION)
return NULL;

112
plug-ins/print/print.c
View File

@ -49,29 +49,29 @@ static gboolean print_image (gint32 image_ID,
static void begin_print (GtkPrintOperation *operation,
GtkPrintContext *context,
gpointer user_data);
PrintData *data);
static void end_print (GtkPrintOperation *operation,
GtkPrintContext *context,
gpointer user_data);
PrintData *data);
static void draw_page (GtkPrintOperation *print,
GtkPrintContext *context,
int page_nr,
gpointer user_data);
PrintData *data);
static GtkWidget * create_custom_widget (GtkPrintOperation *operation,
gpointer user_data);
PrintData *data);
static void custom_widget_apply (GtkPrintOperation *operation,
GtkWidget *widget,
gpointer user_data);
PrintData *data);
static gboolean print_preview (GtkPrintOperation *operation,
GtkPrintOperationPreview *preview,
GtkPrintContext *context,
GtkWindow *parent,
gpointer user_data);
PrintData *data);
const GimpPlugInInfo PLUG_IN_INFO =
{
@ -100,7 +100,7 @@ query (void)
"Bill Skaggs <weskaggs@primate.ucdavis.edu>",
"2006",
N_("_Print..."),
"GRAY, RGB*",
"GRAY, RGB*",
GIMP_PLUGIN,
G_N_ELEMENTS (print_args), 0,
print_args, NULL);
@ -160,9 +160,9 @@ print_image (gint32 image_ID,
gint32 drawable_ID,
gboolean interactive)
{
GtkPrintOperation *operation = gtk_print_operation_new ();
GError *error = NULL;
PrintData *data;
GtkPrintOperation *operation = gtk_print_operation_new ();
GError *error = NULL;
PrintData *data;
data = g_new0 (PrintData, 1);
data->num_pages = 1;
@ -174,20 +174,29 @@ print_image (gint32 image_ID,
load_print_settings (data);
g_signal_connect (operation, "begin-print", G_CALLBACK (begin_print), data);
g_signal_connect (operation, "draw-page", G_CALLBACK (draw_page), data);
g_signal_connect (operation, "end-print", G_CALLBACK (end_print), data);
g_signal_connect (operation, "begin-print",
G_CALLBACK (begin_print),
data);
g_signal_connect (operation, "draw-page",
G_CALLBACK (draw_page),
data);
g_signal_connect (operation, "end-print",
G_CALLBACK (end_print),
data);
if (interactive)
{
GtkPrintOperationResult res;
g_signal_connect (operation, "create-custom-widget",
G_CALLBACK (create_custom_widget), data);
G_CALLBACK (create_custom_widget),
data);
g_signal_connect (operation, "custom-widget-apply",
G_CALLBACK (custom_widget_apply), data);
G_CALLBACK (custom_widget_apply),
data);
g_signal_connect (operation, "preview",
G_CALLBACK (print_preview), data);
G_CALLBACK (print_preview),
data);
gtk_print_operation_set_custom_tab_label (operation, _("Layout"));
@ -202,9 +211,11 @@ print_image (gint32 image_ID,
}
}
else
gtk_print_operation_run (operation,
GTK_PRINT_OPERATION_ACTION_PRINT,
NULL, &error);
{
gtk_print_operation_run (operation,
GTK_PRINT_OPERATION_ACTION_PRINT,
NULL, &error);
}
g_object_unref (operation);
@ -216,35 +227,31 @@ print_image (gint32 image_ID,
static void
begin_print (GtkPrintOperation *operation,
GtkPrintContext *context,
gpointer user_data)
GtkPrintContext *context,
PrintData *data)
{
PrintData *data = (PrintData *) user_data;
data->num_pages = 1;
gtk_print_operation_set_n_pages (operation, data->num_pages);
}
static void
end_print (GtkPrintOperation *operation,
GtkPrintContext *context,
gpointer user_data)
GtkPrintContext *context,
PrintData *data)
{
GtkPrintSettings *settings;
settings = gtk_print_operation_get_print_settings (operation);
}
static void
draw_page (GtkPrintOperation *operation,
GtkPrintContext *context,
int page_nr,
gpointer user_data)
GtkPrintContext *context,
int page_nr,
PrintData *data)
{
PrintData *data = user_data;
draw_page_cairo (context, data);
}
@ -254,14 +261,9 @@ draw_page (GtkPrintOperation *operation,
*/
static GtkWidget *
create_custom_widget (GtkPrintOperation *operation,
gpointer user_data)
PrintData *data)
{
GtkWidget *vbox;
PrintData *data = user_data;
vbox = print_page_layout_gui (data);
return vbox;
return print_page_layout_gui (data);
}
/*
@ -274,10 +276,8 @@ create_custom_widget (GtkPrintOperation *operation,
static void
custom_widget_apply (GtkPrintOperation *operation,
GtkWidget *widget,
gpointer user_data)
PrintData *data)
{
PrintData *data = user_data;
if (data->print_size_changed)
{
gimp_image_undo_group_start (data->image_id);
@ -298,9 +298,8 @@ print_preview (GtkPrintOperation *operation,
GtkPrintOperationPreview *preview,
GtkPrintContext *context,
GtkWindow *parent,
gpointer user_data)
PrintData *data)
{
PrintData *data = user_data;
GtkPageSetup *page_setup = gtk_print_context_get_page_setup (context);
GtkPaperSize *paper_size;
gdouble paper_width;
@ -315,13 +314,13 @@ print_preview (GtkPrintOperation *operation,
cairo_surface_t *surface;
GtkPageOrientation orientation;
paper_size = gtk_page_setup_get_paper_size (page_setup);
paper_width = gtk_paper_size_get_width (paper_size, GTK_UNIT_INCH);
paper_height = gtk_paper_size_get_height (paper_size, GTK_UNIT_INCH);
top_margin = gtk_page_setup_get_top_margin (page_setup, GTK_UNIT_INCH);
bottom_margin = gtk_page_setup_get_bottom_margin (page_setup, GTK_UNIT_INCH);
left_margin = gtk_page_setup_get_left_margin (page_setup, GTK_UNIT_INCH);
right_margin = gtk_page_setup_get_right_margin (page_setup, GTK_UNIT_INCH);
paper_size = gtk_page_setup_get_paper_size (page_setup);
paper_width = gtk_paper_size_get_width (paper_size, GTK_UNIT_INCH);
paper_height = gtk_paper_size_get_height (paper_size, GTK_UNIT_INCH);
top_margin = gtk_page_setup_get_top_margin (page_setup, GTK_UNIT_INCH);
bottom_margin = gtk_page_setup_get_bottom_margin (page_setup, GTK_UNIT_INCH);
left_margin = gtk_page_setup_get_left_margin (page_setup, GTK_UNIT_INCH);
right_margin = gtk_page_setup_get_right_margin (page_setup, GTK_UNIT_INCH);
/* the print context does not have the page orientation, it is transformed */
orientation = data->orientation;
@ -338,8 +337,8 @@ print_preview (GtkPrintOperation *operation,
preview_height = PREVIEW_SCALE * paper_width;
}
surface = cairo_image_surface_create (CAIRO_FORMAT_RGB24,
preview_width, preview_height);
surface = cairo_image_surface_create (CAIRO_FORMAT_RGB24,
preview_width, preview_height);
if (CAIRO_STATUS_SUCCESS != cairo_surface_status (surface))
{
@ -349,7 +348,8 @@ print_preview (GtkPrintOperation *operation,
cr = cairo_create (surface);
gtk_print_context_set_cairo_context (context, cr, PREVIEW_SCALE, PREVIEW_SCALE);
gtk_print_context_set_cairo_context (context,
cr, PREVIEW_SCALE, PREVIEW_SCALE);
/* fill page with white */
cairo_set_source_rgb (cr, 1, 1, 1);
@ -357,7 +357,8 @@ print_preview (GtkPrintOperation *operation,
cairo_rectangle (cr, 0, 0, preview_width, preview_height);
cairo_fill (cr);
cairo_translate (cr, left_margin * PREVIEW_SCALE, right_margin * PREVIEW_SCALE);
cairo_translate (cr,
left_margin * PREVIEW_SCALE, right_margin * PREVIEW_SCALE);
if (draw_page_cairo (context, data))
{
@ -381,7 +382,8 @@ print_preview (GtkPrintOperation *operation,
g_unlink (fname);
g_free (fname);
gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), image, FALSE, FALSE, 0);
gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox),
image, FALSE, FALSE, 0);
gtk_widget_show (image);
gtk_dialog_run (GTK_DIALOG (dialog));