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=f3731bd3bdbcdc18c53e0f74bdaac93311046352;hp=555d4bf982bccf8cea38a144002e1d51b264b64f;hpb=b08dd5d93e1c8dd1b68263e130b73476b766a0cf;p=evince.git diff --git a/libview/ev-print-operation.c b/libview/ev-print-operation.c index 555d4bf9..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 @@ -285,27 +285,21 @@ void ev_print_operation_set_embed_page_setup (EvPrintOperation *op, gboolean embed) { -#if GTK_CHECK_VERSION (2, 17, 4) EvPrintOperationClass *class = EV_PRINT_OPERATION_GET_CLASS (op); g_return_if_fail (EV_IS_PRINT_OPERATION (op)); class->set_embed_page_setup (op, embed); -#endif } gboolean ev_print_operation_get_embed_page_setup (EvPrintOperation *op) { -#if GTK_CHECK_VERSION (2, 17, 4) EvPrintOperationClass *class = EV_PRINT_OPERATION_GET_CLASS (op); g_return_val_if_fail (EV_IS_PRINT_OPERATION (op), FALSE); return class->get_embed_page_setup (op); -#else - return FALSE; -#endif } const gchar * @@ -324,7 +318,6 @@ ev_print_operation_get_progress (EvPrintOperation *op) return op->progress; } -#if GTK_CHECK_VERSION (2, 17, 1) | GTKUNIXPRINT_ENABLED static void ev_print_operation_update_status (EvPrintOperation *op, gint page, @@ -338,11 +331,11 @@ ev_print_operation_update_status (EvPrintOperation *op, if (page == -1) { /* Initial state */ - op->status = g_strdup (_("Preparing to print ...")); + op->status = g_strdup (_("Preparing to print…")); } else if (page > n_pages) { - op->status = g_strdup (_("Finishing...")); + op->status = g_strdup (_("Finishing…")); } else { - op->status = g_strdup_printf (_("Printing page %d of %d..."), + op->status = g_strdup_printf (_("Printing page %d of %d…"), page, n_pages); } @@ -350,7 +343,6 @@ ev_print_operation_update_status (EvPrintOperation *op, g_signal_emit (op, signals[STATUS_CHANGED], 0); } -#endif #if GTKUNIXPRINT_ENABLED @@ -863,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) @@ -1234,7 +1227,7 @@ ev_print_operation_export_print_dialog_response_cb (GtkDialog *dial "%s", _("Invalid page selection")); gtk_window_set_title (GTK_WINDOW (message_dialog), _("Warning")); gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (message_dialog), - "%s", _("Your print range selection does not include any page")); + "%s", _("Your print range selection does not include any pages")); g_signal_connect (message_dialog, "response", G_CALLBACK (gtk_widget_destroy), NULL); @@ -1319,10 +1312,9 @@ ev_print_operation_export_run (EvPrintOperation *op, ev_file_exporter_get_capabilities (EV_FILE_EXPORTER (op->document)); gtk_print_unix_dialog_set_manual_capabilities (GTK_PRINT_UNIX_DIALOG (dialog), capabilities); -#if GTK_CHECK_VERSION (2, 17, 4) + gtk_print_unix_dialog_set_embed_page_setup (GTK_PRINT_UNIX_DIALOG (dialog), export->embed_page_setup); -#endif gtk_print_unix_dialog_set_current_page (GTK_PRINT_UNIX_DIALOG (dialog), export->current_page); @@ -1368,11 +1360,9 @@ static void ev_print_operation_export_set_embed_page_setup (EvPrintOperation *op, gboolean embed) { -#if GTK_CHECK_VERSION (2, 17, 4) EvPrintOperationExport *export = EV_PRINT_OPERATION_EXPORT (op); export->embed_page_setup = embed; -#endif } static gboolean @@ -1502,7 +1492,6 @@ ev_print_operation_export_class_init (EvPrintOperationExportClass *klass) #endif /* GTKUNIXPRINT_ENABLED */ -#if GTK_CHECK_VERSION (2, 17, 1) /* Print to cairo interface */ #define EV_TYPE_PRINT_OPERATION_PRINT (ev_print_operation_print_get_type()) #define EV_PRINT_OPERATION_PRINT(object) (G_TYPE_CHECK_INSTANCE_CAST((object), EV_TYPE_PRINT_OPERATION_PRINT, EvPrintOperationPrint)) @@ -1634,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 @@ -1650,23 +1642,17 @@ static void ev_print_operation_print_set_embed_page_setup (EvPrintOperation *op, gboolean embed) { -#if GTK_CHECK_VERSION (2, 17, 4) EvPrintOperationPrint *print = EV_PRINT_OPERATION_PRINT (op); gtk_print_operation_set_embed_page_setup (print->op, embed); -#endif } static gboolean ev_print_operation_print_get_embed_page_setup (EvPrintOperation *op) { -#if GTK_CHECK_VERSION (2, 17, 4) EvPrintOperationPrint *print = EV_PRINT_OPERATION_PRINT (op); return gtk_print_operation_get_embed_page_setup (print->op); -#else - return FALSE; -#endif } static void @@ -1697,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 @@ -1713,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 @@ -1764,22 +1766,12 @@ _print_context_get_hard_margins (GtkPrintContext *context, gdouble *left, gdouble *right) { -#if GTK_CHECK_VERSION (2, 19, 2) if (!gtk_print_context_get_hard_margins (context, top, bottom, left, right)) { *top = 0; *bottom = 0; *left = 0; *right = 0; } -#else - GtkPageSetup *page_setup; - - page_setup = gtk_print_context_get_page_setup (context); - *top = gtk_page_setup_get_top_margin (page_setup, GTK_UNIT_POINTS); - *bottom = gtk_page_setup_get_bottom_margin (page_setup, GTK_UNIT_POINTS); - *left = gtk_page_setup_get_left_margin (page_setup, GTK_UNIT_POINTS); - *right = gtk_page_setup_get_right_margin (page_setup, GTK_UNIT_POINTS); -#endif } static void @@ -1801,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); @@ -1877,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; @@ -1892,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" @@ -1903,7 +1899,7 @@ ev_print_operation_print_create_custom_widget (EvPrintOperationPrint *print, "• \"None\": No page scaling is performed.\n" "\n" "• \"Shrink to Printable Area\": Document pages larger than the printable area" - " are reduced fit the printable area of the printer page.\n" + " are reduced to fit the printable area of the printer page.\n" "\n" "• \"Fit to Printable Area\": Document pages are enlarged or reduced as" " required to fit the printable area of the printer page.\n")); @@ -2026,22 +2022,14 @@ ev_print_operation_print_class_init (EvPrintOperationPrintClass *klass) g_object_class->finalize = ev_print_operation_print_finalize; } -#endif /* GTK_CHECK_VERSION (2, 17, 1) */ -gboolean ev_print_operation_exists_for_document (EvDocument *document) +gboolean +ev_print_operation_exists_for_document (EvDocument *document) { #if GTKUNIXPRINT_ENABLED -#if GTK_CHECK_VERSION (2, 17, 1) return (EV_IS_FILE_EXPORTER(document) || EV_IS_DOCUMENT_PRINT(document)); #else - return EV_IS_FILE_EXPORTER(document); -#endif -#else /* ! GTKUNIXPRINT_ENABLED */ -#if GTK_CHECK_VERSION (2, 17, 1) return EV_IS_DOCUMENT_PRINT(document); -#else - return FALSE; -#endif #endif /* GTKUNIXPRINT_ENABLED */ } @@ -2053,15 +2041,15 @@ ev_print_operation_new (EvDocument *document) g_return_val_if_fail (ev_print_operation_exists_for_document (document), NULL); -#if GTK_CHECK_VERSION (2, 17, 1) if (EV_IS_DOCUMENT_PRINT (document)) op = EV_PRINT_OPERATION (g_object_new (EV_TYPE_PRINT_OPERATION_PRINT, "document", document, NULL)); else -#endif #if GTKUNIXPRINT_ENABLED op = EV_PRINT_OPERATION (g_object_new (EV_TYPE_PRINT_OPERATION_EXPORT, "document", document, NULL)); +#else + op = NULL; #endif return op; }