X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;f=libview%2Fev-print-operation.c;h=8c96dae4a225b85dd0b29d8438d901f3ee314704;hb=efec6a4b614de84b8639977f278159aa28c38994;hp=a1a3332d2dc4c9a4a475d8fa0733d3a5daf5d891;hpb=764836d36a1391ed0bc03841c68ed768e7ec94b6;p=evince.git diff --git a/libview/ev-print-operation.c b/libview/ev-print-operation.c index a1a3332d..8c96dae4 100644 --- a/libview/ev-print-operation.c +++ b/libview/ev-print-operation.c @@ -14,7 +14,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ #include @@ -855,33 +855,34 @@ export_print_done (EvPrintOperationExport *export) g_key_file_free (key_file); if (!error) { - gint argc; - gchar **argv; gchar *cmd; gchar *quoted_filename; gchar *quoted_settings_filename; + GAppInfo *app; + GdkAppLaunchContext *ctx; quoted_filename = g_shell_quote (export->temp_file); quoted_settings_filename = g_shell_quote (print_settings_file); cmd = g_strdup_printf ("evince-previewer --unlink-tempfile --print-settings %s %s", quoted_settings_filename, quoted_filename); - g_shell_parse_argv (cmd, &argc, &argv, &error); - g_free (quoted_filename); g_free (quoted_settings_filename); - g_free (cmd); - if (!error) { - gdk_spawn_on_screen (gtk_window_get_screen (export->parent_window), - NULL, argv, NULL, - G_SPAWN_SEARCH_PATH, - NULL, NULL, NULL, - &error); - } + app = g_app_info_create_from_commandline (cmd, NULL, 0, &error); - g_strfreev (argv); - } + if (app != NULL) { + ctx = gdk_display_get_app_launch_context (gtk_widget_get_display (GTK_WIDGET (export->parent_window))); + gdk_app_launch_context_set_screen (ctx, gtk_window_get_screen (export->parent_window)); + + g_app_info_launch (app, NULL, G_APP_LAUNCH_CONTEXT (ctx), &error); + + g_object_unref (app); + g_object_unref (ctx); + } + + g_free (cmd); + } if (error) { if (print_settings_file) @@ -1622,7 +1623,10 @@ ev_print_operation_print_cancel (EvPrintOperation *op) { EvPrintOperationPrint *print = EV_PRINT_OPERATION_PRINT (op); - gtk_print_operation_cancel (print->op); + if (print->job_print) + ev_job_cancel (print->job_print); + else + gtk_print_operation_cancel (print->op); } static void @@ -1679,13 +1683,11 @@ ev_print_operation_print_done (EvPrintOperationPrint *print, static void ev_print_operation_print_status_changed (EvPrintOperationPrint *print) { -#ifdef HAVE_GTK_PRINT_OPERATION_GET_N_PAGES_TO_PRINT GtkPrintStatus status; status = gtk_print_operation_get_status (print->op); if (status == GTK_PRINT_STATUS_GENERATING_DATA) print->n_pages_to_print = gtk_print_operation_get_n_pages_to_print (print->op); -#endif } static void @@ -1695,20 +1697,38 @@ print_job_finished (EvJobPrint *job, EvPrintOperation *op = EV_PRINT_OPERATION (print); gtk_print_operation_draw_page_finish (print->op); -#ifdef HAVE_GTK_PRINT_OPERATION_GET_N_PAGES_TO_PRINT + print->total++; ev_print_operation_update_status (op, print->total, print->n_pages_to_print, print->total / (gdouble)print->n_pages_to_print); -#endif ev_job_print_set_cairo (job, NULL); } +static gboolean +draw_page_finish_idle (EvPrintOperationPrint *print) +{ + if (ev_job_scheduler_get_running_thread_job () == print->job_print) + return TRUE; + + gtk_print_operation_draw_page_finish (print->op); + + return FALSE; +} + static void print_job_cancelled (EvJobPrint *job, - EvPrintOperationPrint *print) + EvPrintOperationPrint *print) { - gtk_print_operation_cancel (print->op); + /* Finish the current page, so that draw-page + * is emitted again and it will cancel the + * print operation. If the job is still + * running, wait until it finishes. + */ + if (ev_job_scheduler_get_running_thread_job () == print->job_print) + g_idle_add ((GSourceFunc)draw_page_finish_idle, print); + else + gtk_print_operation_draw_page_finish (print->op); } static void @@ -1773,10 +1793,14 @@ ev_print_operation_print_draw_page (EvPrintOperationPrint *print, g_signal_connect (G_OBJECT (print->job_print), "finished", G_CALLBACK (print_job_finished), (gpointer)print); - g_signal_connect (G_OBJECT (print->job_print), "cancelled", - G_CALLBACK (print_job_cancelled), - (gpointer)print); - } + g_signal_connect (G_OBJECT (print->job_print), "cancelled", + G_CALLBACK (print_job_cancelled), + (gpointer)print); + } else if (g_cancellable_is_cancelled (print->job_print->cancellable)) { + gtk_print_operation_cancel (print->op); + ev_job_print_set_cairo (EV_JOB_PRINT (print->job_print), NULL); + return; + } ev_job_print_set_page (EV_JOB_PRINT (print->job_print), page); @@ -1849,7 +1873,7 @@ ev_print_operation_print_create_custom_widget (EvPrintOperationPrint *print, gboolean use_source_size; settings = gtk_print_operation_get_print_settings (print->op); - page_scale = gtk_print_settings_get_int_with_default (settings, EV_PRINT_SETTING_PAGE_SCALE, 0); + page_scale = gtk_print_settings_get_int_with_default (settings, EV_PRINT_SETTING_PAGE_SCALE, 1); autorotate = gtk_print_settings_has_key (settings, EV_PRINT_SETTING_AUTOROTATE) ? gtk_print_settings_get_bool (settings, EV_PRINT_SETTING_AUTOROTATE) : TRUE; @@ -1864,10 +1888,10 @@ ev_print_operation_print_create_custom_widget (EvPrintOperationPrint *print, gtk_table_attach (GTK_TABLE (table), label, 0, 1, 0, 1, GTK_FILL, 0, 0, 0); gtk_widget_show (label); - print->scale_combo = gtk_combo_box_new_text (); - gtk_combo_box_append_text (GTK_COMBO_BOX (print->scale_combo), _("None")); - gtk_combo_box_append_text (GTK_COMBO_BOX (print->scale_combo), _("Shrink to Printable Area")); - gtk_combo_box_append_text (GTK_COMBO_BOX (print->scale_combo), _("Fit to Printable Area")); + print->scale_combo = gtk_combo_box_text_new (); + gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (print->scale_combo), _("None")); + gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (print->scale_combo), _("Shrink to Printable Area")); + gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (print->scale_combo), _("Fit to Printable Area")); gtk_combo_box_set_active (GTK_COMBO_BOX (print->scale_combo), page_scale); gtk_widget_set_tooltip_text (print->scale_combo, _("Scale document pages to fit the selected printer page. Select from one of the following:\n"