AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-12-26 13:41:07 +00:00
Code Issues Projects Releases Wiki Activity

When starting a preview from the print dialog, set the action to PREVIEW.

Browse Source 
2006-06-16  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtkprintoperation-unix.c (handle_print_response): When starting
	a preview from the print dialog, set the action to PREVIEW.

	* gtk/gtkprintoperation.c: Cosmetic changes.
This commit is contained in:
Matthias Clasen 2006-06-16 16:36:25 +00:00 committed by Matthias Clasen
parent 0a96ef1cc2
commit 44f85d4769
4 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
2006-06-16 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkprintoperation-unix.c (handle_print_response): When starting
a preview from the print dialog, set the action to PREVIEW.
* gtk/gtkprintoperation.c: Cosmetic changes.
2006-06-16 Matthias Clasens <mclasen@redhat.com> 2006-06-16 Matthias Clasens <mclasen@redhat.com>
* gtk/gtkprintoperation-unix.c: Mark the preview filename * gtk/gtkprintoperation-unix.c: Mark the preview filename

7
ChangeLog.pre-2-10
View File

@ -1,3 +1,10 @@
2006-06-16 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkprintoperation-unix.c (handle_print_response): When starting
a preview from the print dialog, set the action to PREVIEW.
* gtk/gtkprintoperation.c: Cosmetic changes.
2006-06-16 Matthias Clasens <mclasen@redhat.com> 2006-06-16 Matthias Clasens <mclasen@redhat.com>
* gtk/gtkprintoperation-unix.c: Mark the preview filename * gtk/gtkprintoperation-unix.c: Mark the preview filename

2
gtk/gtkprintoperation-unix.c
View File

@ -471,6 +471,8 @@ handle_print_response (GtkWidget *dialog,
rdata->result = GTK_PRINT_OPERATION_RESULT_APPLY; rdata->result = GTK_PRINT_OPERATION_RESULT_APPLY;
rdata->do_preview = TRUE; rdata->do_preview = TRUE;
rdata->do_print = TRUE; rdata->do_print = TRUE;
rdata->op->priv->action = GTK_PRINT_OPERATION_ACTION_PREVIEW;
} }
if (rdata->do_print) if (rdata->do_print)

7
gtk/gtkprintoperation.c
View File

@ -1840,10 +1840,9 @@ typedef struct
gint page, start, end, inc; gint page, start, end, inc;
gboolean initialized;
GtkWidget *progress; GtkWidget *progress;
gboolean initialized;
gboolean is_preview; gboolean is_preview;
} PrintPagesData; } PrintPagesData;
@ -2194,7 +2193,7 @@ print_pages (GtkPrintOperation *op,
data = g_new0 (PrintPagesData, 1); data = g_new0 (PrintPagesData, 1);
data->op = g_object_ref (op); data->op = g_object_ref (op);
data->is_preview = (op->priv->action == GTK_PRINT_OPERATION_ACTION_PREVIEW); data->is_preview = (priv->action == GTK_PRINT_OPERATION_ACTION_PREVIEW);
if (priv->show_progress) if (priv->show_progress)
{ {
@ -2221,7 +2220,7 @@ print_pages (GtkPrintOperation *op,
g_signal_emit_by_name (op, "preview", g_signal_emit_by_name (op, "preview",
GTK_PRINT_OPERATION_PREVIEW (op), GTK_PRINT_OPERATION_PREVIEW (op),
op->priv->print_context, priv->print_context,
parent, parent,
&handled); &handled);