callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add a "Preview" menu item.

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

	* tests/print-editor.c: Add a "Preview" menu item.
This commit is contained in:
Matthias Clasen
2006-06-16 16:39:09 +00:00
committed by Matthias Clasen
parent 44f85d4769
commit d9d210ad23
3 changed files with 26 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -1,5 +1,7 @@
2006-06-16 Matthias Clasen <mclasen@redhat.com> 2006-06-16 Matthias Clasen <mclasen@redhat.com>
* tests/print-editor.c: Add a "Preview" menu item.
* gtk/gtkprintoperation-unix.c (handle_print_response): When starting * gtk/gtkprintoperation-unix.c (handle_print_response): When starting
a preview from the print dialog, set the action to PREVIEW. a preview from the print dialog, set the action to PREVIEW.

2
ChangeLog.pre-2-10
View File

@ -1,5 +1,7 @@
2006-06-16 Matthias Clasen <mclasen@redhat.com> 2006-06-16 Matthias Clasen <mclasen@redhat.com>
* tests/print-editor.c: Add a "Preview" menu item.
* gtk/gtkprintoperation-unix.c (handle_print_response): When starting * gtk/gtkprintoperation-unix.c (handle_print_response): When starting
a preview from the print dialog, set the action to PREVIEW. a preview from the print dialog, set the action to PREVIEW.

27
tests/print-editor.c
View File

@ -531,7 +531,7 @@ preview_destroy (GtkWindow *window,
} }
static gboolean static gboolean
do_preview (GtkPrintOperation *op, preview_cb (GtkPrintOperation *op,
GtkPrintOperationPreview *preview, GtkPrintOperationPreview *preview,
GtkPrintContext *context, GtkPrintContext *context,
GtkWindow *parent, GtkWindow *parent,
@ -650,7 +650,7 @@ print_done (GtkPrintOperation *op,
} }
static void static void
do_print (GtkAction *action) do_print_or_preview (GtkAction *action, GtkPrintOperationAction print_action)
{ {
GtkPrintOperation *print; GtkPrintOperation *print;
PrintData *print_data; PrintData *print_data;
@ -674,7 +674,7 @@ do_print (GtkAction *action)
g_signal_connect (print, "draw_page", G_CALLBACK (draw_page), print_data); g_signal_connect (print, "draw_page", G_CALLBACK (draw_page), print_data);
g_signal_connect (print, "create_custom_widget", G_CALLBACK (create_custom_widget), print_data); g_signal_connect (print, "create_custom_widget", G_CALLBACK (create_custom_widget), print_data);
g_signal_connect (print, "custom_widget_apply", G_CALLBACK (custom_widget_apply), print_data); g_signal_connect (print, "custom_widget_apply", G_CALLBACK (custom_widget_apply), print_data);
g_signal_connect (print, "preview", G_CALLBACK (do_preview), print_data); g_signal_connect (print, "preview", G_CALLBACK (preview_cb), print_data);
g_signal_connect (print, "done", G_CALLBACK (print_done), print_data); g_signal_connect (print, "done", G_CALLBACK (print_done), print_data);
@ -683,11 +683,23 @@ do_print (GtkAction *action)
#if 0 #if 0
gtk_print_operation_set_allow_async (print, TRUE); gtk_print_operation_set_allow_async (print, TRUE);
#endif #endif
gtk_print_operation_run (print, GTK_PRINT_OPERATION_ACTION_PRINT_DIALOG, GTK_WINDOW (main_window), NULL); gtk_print_operation_run (print, print_action, GTK_WINDOW (main_window), NULL);
g_object_unref (print); g_object_unref (print);
} }
static void
do_print (GtkAction *action)
{
do_print_or_preview (action, GTK_PRINT_OPERATION_ACTION_PRINT_DIALOG);
}
static void
do_preview (GtkAction *action)
{
do_print_or_preview (action, GTK_PRINT_OPERATION_ACTION_PREVIEW);
}
static void static void
do_about (GtkAction *action) do_about (GtkAction *action)
{ {
@ -741,10 +753,14 @@ static GtkActionEntry entries[] = {
"Page _Setup", NULL, /* label, accelerator */ "Page _Setup", NULL, /* label, accelerator */
"Set up the page", /* tooltip */ "Set up the page", /* tooltip */
G_CALLBACK (do_page_setup) }, G_CALLBACK (do_page_setup) },
{ "Preview", NULL, /* name, stock id */
"Print Preview", NULL, /* label, accelerator */
"Preview the printed document", /* tooltip */
G_CALLBACK (do_preview) },
{ "Print", GTK_STOCK_PRINT, /* name, stock id */ { "Print", GTK_STOCK_PRINT, /* name, stock id */
NULL, NULL, /* label, accelerator */ NULL, NULL, /* label, accelerator */
"Print the document", /* tooltip */ "Print the document", /* tooltip */
G_CALLBACK (do_print) }, G_CALLBACK (do_print) }
}; };
static guint n_entries = G_N_ELEMENTS (entries); static guint n_entries = G_N_ELEMENTS (entries);
@ -757,6 +773,7 @@ static const gchar *ui_info =
" <menuitem action='Save'/>" " <menuitem action='Save'/>"
" <menuitem action='SaveAs'/>" " <menuitem action='SaveAs'/>"
" <menuitem action='PageSetup'/>" " <menuitem action='PageSetup'/>"
" <menuitem action='Preview'/>"
" <menuitem action='Print'/>" " <menuitem action='Print'/>"
" <separator/>" " <separator/>"
" <menuitem action='Quit'/>" " <menuitem action='Quit'/>"