* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
#include "config.h"
#include "gtkpagesetupunixdialog.h"
#include "gtkprintbackend.h"
#include "gtkprinter.h"
-#include "gtkprinter-private.h"
#include "gtkprintjob.h"
#include "gtklabel.h"
#include "gtkintl.h"
-#include "gtkalias.h"
+
typedef struct
{
}
else if (type == CAIRO_SURFACE_TYPE_PDF)
{
+ if (!op->priv->manual_orientation)
+ {
+ w = gtk_page_setup_get_paper_width (page_setup, GTK_UNIT_POINTS);
+ h = gtk_page_setup_get_paper_height (page_setup, GTK_UNIT_POINTS);
+ }
cairo_pdf_surface_set_size (op_unix->surface, w, h);
}
}
GtkWindow *parent,
const gchar *filename)
{
- gint argc;
- gchar **argv;
+ GAppInfo *appinfo;
+ GdkAppLaunchContext *context;
gchar *cmd;
gchar *preview_cmd;
GtkSettings *settings;
quoted_filename = g_shell_quote (filename);
quoted_settings_filename = g_shell_quote (settings_filename);
cmd = shell_command_substitute_file (preview_cmd, quoted_filename, quoted_settings_filename, &filename_used, &settings_used);
- g_shell_parse_argv (cmd, &argc, &argv, &error);
+
+ appinfo = g_app_info_create_from_commandline (cmd,
+ "Print Preview",
+ G_APP_INFO_CREATE_NONE,
+ &error);
g_free (preview_cmd);
g_free (quoted_filename);
if (error != NULL)
goto out;
- gdk_spawn_on_screen (screen, NULL, argv, NULL, G_SPAWN_SEARCH_PATH, NULL, NULL, NULL, &error);
+ context = gdk_display_get_app_launch_context (gdk_screen_get_display (screen));
+ gdk_app_launch_context_set_screen (context, screen);
+ g_app_info_launch (appinfo, NULL, G_APP_LAUNCH_CONTEXT (context), &error);
- g_strfreev (argv);
+ g_object_unref (context);
+ g_object_unref (appinfo);
- out:
if (error != NULL)
{
- GtkWidget *edialog;
- edialog = gtk_message_dialog_new (parent,
- GTK_DIALOG_DESTROY_WITH_PARENT,
- GTK_MESSAGE_ERROR,
- GTK_BUTTONS_CLOSE,
- _("Error launching preview") /* FIXME better text */);
- gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (edialog),
- "%s", error->message);
- g_signal_connect (edialog, "response",
- G_CALLBACK (gtk_widget_destroy), NULL);
-
- gtk_window_present (GTK_WINDOW (edialog));
+ gchar* uri;
+
+ g_warning ("%s %s", _("Error launching preview"), error->message);
g_error_free (error);
+ error = NULL;
+ uri = g_filename_to_uri (filename, NULL, NULL);
+ gtk_show_uri (screen, uri, GDK_CURRENT_TIME, &error);
+ g_free (uri);
+ }
- filename_used = FALSE;
+ out:
+ if (error != NULL)
+ {
+ if (op->priv->error == NULL)
+ op->priv->error = error;
+ else
+ g_error_free (error);
+
+ filename_used = FALSE;
settings_used = FALSE;
- }
+ }
if (!filename_used)
g_unlink (filename);
if (fd > 0)
close (fd);
-
+
if (key_file)
g_key_file_free (key_file);
g_free (data);
}
static void
-unix_finish_send (GtkPrintJob *job,
- gpointer user_data,
- GError *error)
+unix_finish_send (GtkPrintJob *job,
+ gpointer user_data,
+ const GError *error)
{
GtkPrintOperation *op = (GtkPrintOperation *) user_data;
GtkPrintOperationUnix *op_unix = op->priv->platform_data;
- if (error != NULL)
- {
- GtkWidget *edialog;
- edialog = gtk_message_dialog_new (op_unix->parent,
- GTK_DIALOG_DESTROY_WITH_PARENT,
- GTK_MESSAGE_ERROR,
- GTK_BUTTONS_CLOSE,
- _("Error printing") /* FIXME better text */);
- gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (edialog),
- "%s", error->message);
- gtk_window_set_modal (GTK_WINDOW (edialog), TRUE);
- g_signal_connect (edialog, "response",
- G_CALLBACK (gtk_widget_destroy), NULL);
-
- gtk_window_present (GTK_WINDOW (edialog));
- }
+ if (error != NULL && op->priv->error == NULL)
+ op->priv->error = g_error_copy (error);
op_unix->data_sent = TRUE;
g_object_ref (op);
if (!op_unix->data_sent)
{
- GDK_THREADS_LEAVE ();
+ gdk_threads_leave ();
g_main_loop_run (op_unix->loop);
- GDK_THREADS_ENTER ();
+ gdk_threads_enter ();
}
g_main_loop_unref (op_unix->loop);
op_unix->loop = NULL;
GtkPrintOperation *op = rdata->op;
GtkPrintOperationPrivate *priv = op->priv;
GtkPrintJob *job;
+ gdouble top, bottom, left, right;
if (rdata->do_print)
{
gtk_print_operation_set_print_settings (op, settings);
priv->print_context = _gtk_print_context_new (op);
+ if (gtk_print_settings_get_number_up (settings) < 2)
+ {
+ if (printer && gtk_printer_get_hard_margins (printer, &top, &bottom, &left, &right))
+ _gtk_print_context_set_hard_margins (priv->print_context, top, bottom, left, right);
+ }
+ else
+ {
+ /* Pages do not have any unprintable area when printing n-up as each page on the
+ * sheet has been scaled down and translated to a position within the printable
+ * area of the sheet.
+ */
+ _gtk_print_context_set_hard_margins (priv->print_context, 0, 0, 0, 0);
+ }
+
if (page_setup != NULL &&
(gtk_print_operation_get_default_page_setup (op) == NULL ||
page_setup_set))
g_signal_connect (job, "status-changed",
G_CALLBACK (job_status_changed_cb), op);
- priv->print_pages = job->print_pages;
- priv->page_ranges = job->page_ranges;
- priv->num_page_ranges = job->num_page_ranges;
-
- priv->manual_num_copies = job->num_copies;
- priv->manual_collation = job->collate;
- priv->manual_reverse = job->reverse;
- priv->manual_page_set = job->page_set;
- priv->manual_scale = job->scale;
- priv->manual_orientation = job->rotate_to_orientation;
- priv->manual_number_up = job->number_up;
- priv->manual_number_up_layout = job->number_up_layout;
+ priv->print_pages = gtk_print_job_get_pages (job);
+ priv->page_ranges = gtk_print_job_get_page_ranges (job, &priv->num_page_ranges);
+ priv->manual_num_copies = gtk_print_job_get_num_copies (job);
+ priv->manual_collation = gtk_print_job_get_collate (job);
+ priv->manual_reverse = gtk_print_job_get_reverse (job);
+ priv->manual_page_set = gtk_print_job_get_page_set (job);
+ priv->manual_scale = gtk_print_job_get_scale (job);
+ priv->manual_orientation = gtk_print_job_get_rotate (job);
+ priv->manual_number_up = gtk_print_job_get_n_up (job);
+ priv->manual_number_up_layout = gtk_print_job_get_n_up_layout (job);
}
}
out:
settings = gtk_print_unix_dialog_get_settings (GTK_PRINT_UNIX_DIALOG (pd));
page_setup = gtk_print_unix_dialog_get_page_setup (GTK_PRINT_UNIX_DIALOG (pd));
page_setup_set = gtk_print_unix_dialog_get_page_setup_set (GTK_PRINT_UNIX_DIALOG (pd));
-
+
+ /* Set new print settings now so that custom-widget options
+ * can be added to the settings in the callback
+ */
+ gtk_print_operation_set_print_settings (rdata->op, settings);
g_signal_emit_by_name (rdata->op, "custom-widget-apply", rdata->op->priv->custom_widget);
}
GtkPageSetup *page_setup,
cairo_surface_t *surface)
{
- GtkPaperSize *paper_size;
gdouble w, h;
- paper_size = gtk_page_setup_get_paper_size (page_setup);
- w = gtk_paper_size_get_width (paper_size, GTK_UNIT_POINTS);
- h = gtk_paper_size_get_height (paper_size, GTK_UNIT_POINTS);
+ w = gtk_page_setup_get_paper_width (page_setup, GTK_UNIT_POINTS);
+ h = gtk_page_setup_get_paper_height (page_setup, GTK_UNIT_POINTS);
cairo_pdf_surface_set_size (surface, w, h);
}
find_printer (printer_name,
(GFunc) found_printer, &rdata);
- GDK_THREADS_LEAVE ();
+ gdk_threads_leave ();
g_main_loop_run (rdata.loop);
- GDK_THREADS_ENTER ();
+ gdk_threads_enter ();
g_main_loop_unref (rdata.loop);
rdata.loop = NULL;
/**
* gtk_print_run_page_setup_dialog:
- * @parent: transient parent, or %NULL
- * @page_setup: an existing #GtkPageSetup, or %NULL
+ * @parent: (allow-none): transient parent
+ * @page_setup: (allow-none): an existing #GtkPageSetup
* @settings: a #GtkPrintSettings
- *
- * Runs a page setup dialog, letting the user modify the values from
- * @page_setup. If the user cancels the dialog, the returned #GtkPageSetup
+ *
+ * Runs a page setup dialog, letting the user modify the values from
+ * @page_setup. If the user cancels the dialog, the returned #GtkPageSetup
* is identical to the passed in @page_setup, otherwise it contains the
* modifications done in the dialog.
*
* setup dialog. See gtk_print_run_page_setup_dialog_async() if this is
* a problem.
*
- * Return value: a new #GtkPageSetup
+ * Return value: (transfer full): a new #GtkPageSetup
*
* Since: 2.10
*/
/**
* gtk_print_run_page_setup_dialog_async:
- * @parent: transient parent, or %NULL
- * @page_setup: an existing #GtkPageSetup, or %NULL
+ * @parent: (allow-none): transient parent, or %NULL
+ * @page_setup: (allow-none): an existing #GtkPageSetup, or %NULL
* @settings: a #GtkPrintSettings
- * @done_cb: a function to call when the user saves the modified page setup
+ * @done_cb: (scope async): a function to call when the user saves
+ * the modified page setup
* @data: user data to pass to @done_cb
*
* Runs a page setup dialog, letting the user modify the values from @page_setup.
printer_finder_free (finder);
- return FALSE;
+ return G_SOURCE_REMOVE;
}
static void
if (finder->backends == NULL && !finder->found_printer)
g_idle_add (find_printer_idle, finder);
}
-
-#define __GTK_PRINT_OPERATION_UNIX_C__
-#include "gtkaliasdef.c"
projects / ~andy / gtk / blobdiff