X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=gtk%2Fgtkpagesetupunixdialog.c;h=801b2515fa7318e0a7af323026c98827ef532018;hb=b5ee44b419a5daa01605af8cd419b03d9e21926c;hp=ea4733c9da8157ae4dd5b82f34314f3d47aa3404;hpb=6003bcbd96a097de6fdbb06a6ada438cff3de28d;p=~andy%2Fgtk diff --git a/gtk/gtkpagesetupunixdialog.c b/gtk/gtkpagesetupunixdialog.c index ea4733c9d..801b2515f 100644 --- a/gtk/gtkpagesetupunixdialog.c +++ b/gtk/gtkpagesetupunixdialog.c @@ -1,5 +1,6 @@ -/* GtkPageSetupUnixDialog +/* GtkPageSetupUnixDialog * Copyright (C) 2006 Alexander Larsson + * Copyright © 2006, 2007, 2008 Christian Persch * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -8,13 +9,11 @@ * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * 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 . */ @@ -22,10 +21,6 @@ #include #include -#ifdef HAVE__NL_MEASUREMENT_MEASUREMENT -#include -#endif - #include "gtkintl.h" #include "gtkprivate.h" @@ -36,53 +31,55 @@ #include "gtktreemodel.h" #include "gtkbutton.h" #include "gtkscrolledwindow.h" -#include "gtkvbox.h" -#include "gtkhbox.h" -#include "gtkframe.h" -#include "gtkeventbox.h" #include "gtkcombobox.h" #include "gtktogglebutton.h" #include "gtkradiobutton.h" #include "gtklabel.h" -#include "gtktable.h" +#include "gtkgrid.h" #include "gtkcelllayout.h" #include "gtkcellrenderertext.h" -#include "gtkalignment.h" -#include "gtkspinbutton.h" -#include "gtkbbox.h" -#include "gtkhbbox.h" #include "gtkpagesetupunixdialog.h" +#include "gtkcustompaperunixdialog.h" #include "gtkprintbackend.h" -#include "gtkprinter-private.h" #include "gtkpapersize.h" #include "gtkprintutils.h" -#include "gtkalias.h" -#define CUSTOM_PAPER_FILENAME ".gtk-custom-papers" +/** + * SECTION:gtkpagesetupunixdialog + * @Short_description: A page setup dialog + * @Title: GtkPageSetupUnixDialog + * + * #GtkPageSetupUnixDialog implements a page setup dialog for platforms + * which don't provide a native page setup dialog, like Unix. It can + * be used very much like any other GTK+ dialog, at the cost of + * the portability offered by the high-level printing API + * + * Printing support was added in GTK+ 2.10. + */ -struct GtkPageSetupUnixDialogPrivate +struct _GtkPageSetupUnixDialogPrivate { GtkListStore *printer_list; GtkListStore *page_setup_list; GtkListStore *custom_paper_list; - + GList *print_backends; GtkWidget *printer_combo; GtkWidget *paper_size_combo; GtkWidget *paper_size_label; - GtkWidget *paper_size_eventbox; GtkWidget *portrait_radio; GtkWidget *reverse_portrait_radio; GtkWidget *landscape_radio; GtkWidget *reverse_landscape_radio; - guint request_details_tag; + gulong request_details_tag; GtkPrinter *request_details_printer; - + GtkPrintSettings *print_settings; /* Save last setup so we can re-set it after selecting manage custom sizes */ @@ -105,23 +102,19 @@ enum { G_DEFINE_TYPE (GtkPageSetupUnixDialog, gtk_page_setup_unix_dialog, GTK_TYPE_DIALOG) -#define GTK_PAGE_SETUP_UNIX_DIALOG_GET_PRIVATE(o) \ - (G_TYPE_INSTANCE_GET_PRIVATE ((o), GTK_TYPE_PAGE_SETUP_UNIX_DIALOG, GtkPageSetupUnixDialogPrivate)) - static void gtk_page_setup_unix_dialog_finalize (GObject *object); static void populate_dialog (GtkPageSetupUnixDialog *dialog); static void fill_paper_sizes_from_printer (GtkPageSetupUnixDialog *dialog, - GtkPrinter *printer); -static void show_custom_paper_dialog (GtkPageSetupUnixDialog *dialog); + GtkPrinter *printer); static void printer_added_cb (GtkPrintBackend *backend, - GtkPrinter *printer, - GtkPageSetupUnixDialog *dialog); + GtkPrinter *printer, + GtkPageSetupUnixDialog *dialog); static void printer_removed_cb (GtkPrintBackend *backend, - GtkPrinter *printer, - GtkPageSetupUnixDialog *dialog); + GtkPrinter *printer, + GtkPageSetupUnixDialog *dialog); static void printer_status_cb (GtkPrintBackend *backend, - GtkPrinter *printer, - GtkPageSetupUnixDialog *dialog); + GtkPrinter *printer, + GtkPageSetupUnixDialog *dialog); @@ -140,153 +133,17 @@ static const gchar const common_paper_sizes[][16] = { "iso_a3", }; -static GtkUnit -get_default_user_units (void) -{ - /* Translate to the default units to use for presenting - * lengths to the user. Translate to default:inch if you - * want inches, otherwise translate to default:mm. - * Do *not* translate it to "predefinito:mm", if it - * it isn't default:mm or default:inch it will not work - */ - gchar *e = _("default:mm"); - -#ifdef HAVE__NL_MEASUREMENT_MEASUREMENT - gchar *imperial = NULL; - - imperial = nl_langinfo (_NL_MEASUREMENT_MEASUREMENT); - if (imperial && imperial[0] == 2 ) - return GTK_UNIT_INCH; /* imperial */ - if (imperial && imperial[0] == 1 ) - return GTK_UNIT_MM; /* metric */ -#endif - - if (strcmp (e, "default:inch")==0) - return GTK_UNIT_INCH; - else if (strcmp (e, "default:mm")) - g_warning ("Whoever translated default:mm did so wrongly.\n"); - return GTK_UNIT_MM; -} - -static char * -custom_paper_get_filename (void) -{ - gchar *filename; - - filename = g_build_filename (g_get_home_dir (), - CUSTOM_PAPER_FILENAME, NULL); - g_assert (filename != NULL); - return filename; -} - -GList * -_gtk_load_custom_papers (void) -{ - GKeyFile *keyfile; - gchar *filename; - gchar **groups; - gsize n_groups, i; - gboolean load_ok; - GList *result = NULL; - - filename = custom_paper_get_filename (); - - keyfile = g_key_file_new (); - load_ok = g_key_file_load_from_file (keyfile, filename, 0, NULL); - g_free (filename); - if (!load_ok) - { - g_key_file_free (keyfile); - return NULL; - } - - groups = g_key_file_get_groups (keyfile, &n_groups); - for (i = 0; i < n_groups; ++i) - { - GtkPageSetup *page_setup; - - page_setup = gtk_page_setup_new_from_key_file (keyfile, groups[i], NULL); - if (!page_setup) - continue; - - result = g_list_prepend (result, page_setup); - } - - g_strfreev (groups); - g_key_file_free (keyfile); - - return g_list_reverse (result); -} - -static void -load_custom_papers (GtkListStore *store) -{ - GtkTreeIter iter; - GList *papers, *p; - GtkPageSetup *page_setup; - - papers = _gtk_load_custom_papers (); - for (p = papers; p; p = p->next) - { - page_setup = p->data; - gtk_list_store_append (store, &iter); - gtk_list_store_set (store, &iter, - 0, page_setup, - -1); - g_object_unref (page_setup); - } - - g_list_free (papers); -} - -static void -save_custom_papers (GtkListStore *store) -{ - GtkTreeModel *model = GTK_TREE_MODEL (store); - GtkTreeIter iter; - GKeyFile *keyfile; - gchar *filename, *data; - gsize len; - gint i = 0; - - keyfile = g_key_file_new (); - - if (gtk_tree_model_get_iter_first (model, &iter)) - { - do - { - GtkPageSetup *page_setup; - gchar group[32]; - - g_snprintf (group, sizeof (group), "Paper%u", i); - - gtk_tree_model_get (model, &iter, 0, &page_setup, -1); - - gtk_page_setup_to_key_file (page_setup, keyfile, group); - - ++i; - } while (gtk_tree_model_iter_next (model, &iter)); - } - - filename = custom_paper_get_filename (); - data = g_key_file_to_data (keyfile, &len, NULL); - g_file_set_contents (filename, data, len, NULL); - g_free (data); - g_free (filename); -} static void gtk_page_setup_unix_dialog_class_init (GtkPageSetupUnixDialogClass *class) { GObjectClass *object_class; - GtkWidgetClass *widget_class; object_class = (GObjectClass *) class; - widget_class = (GtkWidgetClass *) class; object_class->finalize = gtk_page_setup_unix_dialog_finalize; - g_type_class_add_private (class, sizeof (GtkPageSetupUnixDialogPrivate)); + g_type_class_add_private (class, sizeof (GtkPageSetupUnixDialogPrivate)); } static void @@ -294,38 +151,43 @@ gtk_page_setup_unix_dialog_init (GtkPageSetupUnixDialog *dialog) { GtkPageSetupUnixDialogPrivate *priv; GtkTreeIter iter; + gchar *tmp; - priv = dialog->priv = GTK_PAGE_SETUP_UNIX_DIALOG_GET_PRIVATE (dialog); + priv = dialog->priv = G_TYPE_INSTANCE_GET_PRIVATE (dialog, + GTK_TYPE_PAGE_SETUP_UNIX_DIALOG, + GtkPageSetupUnixDialogPrivate); priv->print_backends = NULL; priv->printer_list = gtk_list_store_new (PRINTER_LIST_N_COLS, - G_TYPE_STRING, - G_TYPE_OBJECT); + G_TYPE_STRING, + G_TYPE_OBJECT); gtk_list_store_append (priv->printer_list, &iter); + tmp = g_strdup_printf ("%s\n%s", _("Any Printer"), _("For portable documents")); gtk_list_store_set (priv->printer_list, &iter, - PRINTER_LIST_COL_NAME, _("Any Printer\nFor portable documents"), + PRINTER_LIST_COL_NAME, tmp, PRINTER_LIST_COL_PRINTER, NULL, -1); - + g_free (tmp); + priv->page_setup_list = gtk_list_store_new (PAGE_SETUP_LIST_N_COLS, - G_TYPE_OBJECT, - G_TYPE_BOOLEAN); + G_TYPE_OBJECT, + G_TYPE_BOOLEAN); priv->custom_paper_list = gtk_list_store_new (1, G_TYPE_OBJECT); - load_custom_papers (priv->custom_paper_list); + _gtk_print_load_custom_papers (priv->custom_paper_list); populate_dialog (dialog); - - gtk_dialog_add_buttons (GTK_DIALOG (dialog), + + gtk_dialog_add_buttons (GTK_DIALOG (dialog), GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, GTK_STOCK_APPLY, GTK_RESPONSE_OK, NULL); gtk_dialog_set_alternative_button_order (GTK_DIALOG (dialog), - GTK_RESPONSE_OK, - GTK_RESPONSE_CANCEL, - -1); + GTK_RESPONSE_OK, + GTK_RESPONSE_CANCEL, + -1); gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK); } @@ -337,16 +199,16 @@ gtk_page_setup_unix_dialog_finalize (GObject *object) GtkPageSetupUnixDialogPrivate *priv = dialog->priv; GtkPrintBackend *backend; GList *node; - + if (priv->request_details_tag) { g_signal_handler_disconnect (priv->request_details_printer, - priv->request_details_tag); + priv->request_details_tag); g_object_unref (priv->request_details_printer); priv->request_details_printer = NULL; priv->request_details_tag = 0; } - + if (priv->printer_list) { g_object_unref (priv->printer_list); @@ -385,7 +247,7 @@ gtk_page_setup_unix_dialog_finalize (GObject *object) gtk_print_backend_destroy (backend); g_object_unref (backend); } - + g_list_free (priv->print_backends); priv->print_backends = NULL; @@ -393,14 +255,14 @@ gtk_page_setup_unix_dialog_finalize (GObject *object) } static void -printer_added_cb (GtkPrintBackend *backend, - GtkPrinter *printer, - GtkPageSetupUnixDialog *dialog) +printer_added_cb (GtkPrintBackend *backend, + GtkPrinter *printer, + GtkPageSetupUnixDialog *dialog) { GtkPageSetupUnixDialogPrivate *priv = dialog->priv; GtkTreeIter iter; gchar *str; - const gchar *location;; + const gchar *location; if (gtk_printer_is_virtual (printer)) return; @@ -409,36 +271,35 @@ printer_added_cb (GtkPrintBackend *backend, if (location == NULL) location = ""; str = g_strdup_printf ("%s\n%s", - gtk_printer_get_name (printer), - location); - + gtk_printer_get_name (printer), + location); + gtk_list_store_append (priv->printer_list, &iter); gtk_list_store_set (priv->printer_list, &iter, PRINTER_LIST_COL_NAME, str, PRINTER_LIST_COL_PRINTER, printer, -1); - g_object_set_data_full (G_OBJECT (printer), - "gtk-print-tree-iter", + g_object_set_data_full (G_OBJECT (printer), + "gtk-print-tree-iter", gtk_tree_iter_copy (&iter), (GDestroyNotify) gtk_tree_iter_free); - g_free (str); if (priv->waiting_for_printer != NULL && strcmp (priv->waiting_for_printer, - gtk_printer_get_name (printer)) == 0) + gtk_printer_get_name (printer)) == 0) { gtk_combo_box_set_active_iter (GTK_COMBO_BOX (priv->printer_combo), - &iter); + &iter); priv->waiting_for_printer = NULL; } } static void -printer_removed_cb (GtkPrintBackend *backend, - GtkPrinter *printer, - GtkPageSetupUnixDialog *dialog) +printer_removed_cb (GtkPrintBackend *backend, + GtkPrinter *printer, + GtkPageSetupUnixDialog *dialog) { GtkPageSetupUnixDialogPrivate *priv = dialog->priv; GtkTreeIter *iter; @@ -449,23 +310,23 @@ printer_removed_cb (GtkPrintBackend *backend, static void -printer_status_cb (GtkPrintBackend *backend, - GtkPrinter *printer, - GtkPageSetupUnixDialog *dialog) +printer_status_cb (GtkPrintBackend *backend, + GtkPrinter *printer, + GtkPageSetupUnixDialog *dialog) { GtkPageSetupUnixDialogPrivate *priv = dialog->priv; GtkTreeIter *iter; gchar *str; - const gchar *location;; - + const gchar *location; + iter = g_object_get_data (G_OBJECT (printer), "gtk-print-tree-iter"); location = gtk_printer_get_location (printer); if (location == NULL) location = ""; str = g_strdup_printf ("%s\n%s", - gtk_printer_get_name (printer), - location); + gtk_printer_get_name (printer), + location); gtk_list_store_set (priv->printer_list, iter, PRINTER_LIST_COL_NAME, str, -1); @@ -474,26 +335,26 @@ printer_status_cb (GtkPrintBackend *backend, static void printer_list_initialize (GtkPageSetupUnixDialog *dialog, - GtkPrintBackend *print_backend) + GtkPrintBackend *print_backend) { GList *list, *node; - + g_return_if_fail (print_backend != NULL); - g_signal_connect_object (print_backend, - "printer-added", - (GCallback) printer_added_cb, - G_OBJECT (dialog), 0); + g_signal_connect_object (print_backend, + "printer-added", + (GCallback) printer_added_cb, + G_OBJECT (dialog), 0); - g_signal_connect_object (print_backend, - "printer-removed", - (GCallback) printer_removed_cb, - G_OBJECT (dialog), 0); + g_signal_connect_object (print_backend, + "printer-removed", + (GCallback) printer_removed_cb, + G_OBJECT (dialog), 0); - g_signal_connect_object (print_backend, - "printer-status-changed", - (GCallback) printer_status_cb, - G_OBJECT (dialog), 0); + g_signal_connect_object (print_backend, + "printer-status-changed", + (GCallback) printer_status_cb, + G_OBJECT (dialog), 0); list = gtk_print_backend_get_printer_list (print_backend); @@ -505,7 +366,7 @@ printer_list_initialize (GtkPageSetupUnixDialog *dialog, } g_list_free (list); - + } static void @@ -523,8 +384,8 @@ load_print_backends (GtkPageSetupUnixDialog *dialog) static gboolean paper_size_row_is_separator (GtkTreeModel *model, - GtkTreeIter *iter, - gpointer data) + GtkTreeIter *iter, + gpointer data) { gboolean separator; @@ -541,11 +402,11 @@ get_current_page_setup (GtkPageSetupUnixDialog *dialog) GtkTreeIter iter; current_page_setup = NULL; - + combo_box = GTK_COMBO_BOX (priv->paper_size_combo); if (gtk_combo_box_get_active_iter (combo_box, &iter)) gtk_tree_model_get (GTK_TREE_MODEL (priv->page_setup_list), &iter, - PAGE_SETUP_LIST_COL_PAGE_SETUP, ¤t_page_setup, -1); + PAGE_SETUP_LIST_COL_PAGE_SETUP, ¤t_page_setup, -1); if (current_page_setup) return current_page_setup; @@ -553,17 +414,17 @@ get_current_page_setup (GtkPageSetupUnixDialog *dialog) /* No selected page size, return the default one. * This is used to set the first page setup when the dialog is created * as there is no selection on the first printer_changed. - */ + */ return gtk_page_setup_new (); } static gboolean -page_setup_is_equal (GtkPageSetup *a, - GtkPageSetup *b) +page_setup_is_equal (GtkPageSetup *a, + GtkPageSetup *b) { return gtk_paper_size_is_equal (gtk_page_setup_get_paper_size (a), - gtk_page_setup_get_paper_size (b)) && + gtk_page_setup_get_paper_size (b)) && gtk_page_setup_get_top_margin (a, GTK_UNIT_MM) == gtk_page_setup_get_top_margin (b, GTK_UNIT_MM) && gtk_page_setup_get_bottom_margin (a, GTK_UNIT_MM) == gtk_page_setup_get_bottom_margin (b, GTK_UNIT_MM) && gtk_page_setup_get_left_margin (a, GTK_UNIT_MM) == gtk_page_setup_get_left_margin (b, GTK_UNIT_MM) && @@ -572,17 +433,17 @@ page_setup_is_equal (GtkPageSetup *a, static gboolean page_setup_is_same_size (GtkPageSetup *a, - GtkPageSetup *b) + GtkPageSetup *b) { return gtk_paper_size_is_equal (gtk_page_setup_get_paper_size (a), - gtk_page_setup_get_paper_size (b)); + gtk_page_setup_get_paper_size (b)); } static gboolean set_paper_size (GtkPageSetupUnixDialog *dialog, - GtkPageSetup *page_setup, - gboolean size_only, - gboolean add_item) + GtkPageSetup *page_setup, + gboolean size_only, + gboolean add_item) { GtkPageSetupUnixDialogPrivate *priv = dialog->priv; GtkTreeModel *model; @@ -594,38 +455,38 @@ set_paper_size (GtkPageSetupUnixDialog *dialog, if (gtk_tree_model_get_iter_first (model, &iter)) { do - { - gtk_tree_model_get (GTK_TREE_MODEL (priv->page_setup_list), &iter, - PAGE_SETUP_LIST_COL_PAGE_SETUP, &list_page_setup, -1); - if (list_page_setup == NULL) - continue; - - if ((size_only && page_setup_is_same_size (page_setup, list_page_setup)) || - (!size_only && page_setup_is_equal (page_setup, list_page_setup))) - { - gtk_combo_box_set_active_iter (GTK_COMBO_BOX (priv->paper_size_combo), - &iter); - g_object_unref (list_page_setup); - return TRUE; - } - - g_object_unref (list_page_setup); - - } while (gtk_tree_model_iter_next (model, &iter)); + { + gtk_tree_model_get (GTK_TREE_MODEL (priv->page_setup_list), &iter, + PAGE_SETUP_LIST_COL_PAGE_SETUP, &list_page_setup, -1); + if (list_page_setup == NULL) + continue; + + if ((size_only && page_setup_is_same_size (page_setup, list_page_setup)) || + (!size_only && page_setup_is_equal (page_setup, list_page_setup))) + { + gtk_combo_box_set_active_iter (GTK_COMBO_BOX (priv->paper_size_combo), + &iter); + g_object_unref (list_page_setup); + return TRUE; + } + + g_object_unref (list_page_setup); + + } while (gtk_tree_model_iter_next (model, &iter)); } if (add_item) { gtk_list_store_append (priv->page_setup_list, &iter); gtk_list_store_set (priv->page_setup_list, &iter, - PAGE_SETUP_LIST_COL_IS_SEPARATOR, TRUE, - -1); + PAGE_SETUP_LIST_COL_IS_SEPARATOR, TRUE, + -1); gtk_list_store_append (priv->page_setup_list, &iter); gtk_list_store_set (priv->page_setup_list, &iter, - PAGE_SETUP_LIST_COL_PAGE_SETUP, page_setup, - -1); + PAGE_SETUP_LIST_COL_PAGE_SETUP, page_setup, + -1); gtk_combo_box_set_active_iter (GTK_COMBO_BOX (priv->paper_size_combo), - &iter); + &iter); return TRUE; } @@ -644,22 +505,22 @@ fill_custom_paper_sizes (GtkPageSetupUnixDialog *dialog) { gtk_list_store_append (priv->page_setup_list, &paper_iter); gtk_list_store_set (priv->page_setup_list, &paper_iter, - PAGE_SETUP_LIST_COL_IS_SEPARATOR, TRUE, - -1); + PAGE_SETUP_LIST_COL_IS_SEPARATOR, TRUE, + -1); do - { - GtkPageSetup *page_setup; - gtk_tree_model_get (model, &iter, 0, &page_setup, -1); + { + GtkPageSetup *page_setup; + gtk_tree_model_get (model, &iter, 0, &page_setup, -1); - gtk_list_store_append (priv->page_setup_list, &paper_iter); - gtk_list_store_set (priv->page_setup_list, &paper_iter, - PAGE_SETUP_LIST_COL_PAGE_SETUP, page_setup, - -1); + gtk_list_store_append (priv->page_setup_list, &paper_iter); + gtk_list_store_set (priv->page_setup_list, &paper_iter, + PAGE_SETUP_LIST_COL_PAGE_SETUP, page_setup, + -1); - g_object_unref (page_setup); - } while (gtk_tree_model_iter_next (model, &iter)); + g_object_unref (page_setup); + } while (gtk_tree_model_iter_next (model, &iter)); } - + gtk_list_store_append (priv->page_setup_list, &paper_iter); gtk_list_store_set (priv->page_setup_list, &paper_iter, PAGE_SETUP_LIST_COL_IS_SEPARATOR, TRUE, @@ -672,7 +533,7 @@ fill_custom_paper_sizes (GtkPageSetupUnixDialog *dialog) static void fill_paper_sizes_from_printer (GtkPageSetupUnixDialog *dialog, - GtkPrinter *printer) + GtkPrinter *printer) { GtkPageSetupUnixDialogPrivate *priv = dialog->priv; GList *list, *l; @@ -681,65 +542,72 @@ fill_paper_sizes_from_printer (GtkPageSetupUnixDialog *dialog, GtkTreeIter iter; gint i; - current_page_setup = get_current_page_setup (dialog); - gtk_list_store_clear (priv->page_setup_list); if (printer == NULL) { for (i = 0; i < G_N_ELEMENTS (common_paper_sizes); i++) - { - page_setup = gtk_page_setup_new (); - paper_size = gtk_paper_size_new (common_paper_sizes[i]); - gtk_page_setup_set_paper_size_and_default_margins (page_setup, paper_size); - gtk_paper_size_free (paper_size); - - gtk_list_store_append (priv->page_setup_list, &iter); - gtk_list_store_set (priv->page_setup_list, &iter, - PAGE_SETUP_LIST_COL_PAGE_SETUP, page_setup, - -1); - g_object_unref (page_setup); - } + { + page_setup = gtk_page_setup_new (); + paper_size = gtk_paper_size_new (common_paper_sizes[i]); + gtk_page_setup_set_paper_size_and_default_margins (page_setup, paper_size); + gtk_paper_size_free (paper_size); + + gtk_list_store_append (priv->page_setup_list, &iter); + gtk_list_store_set (priv->page_setup_list, &iter, + PAGE_SETUP_LIST_COL_PAGE_SETUP, page_setup, + -1); + g_object_unref (page_setup); + } } else { list = gtk_printer_list_papers (printer); /* TODO: We should really sort this list so interesting size - are at the top */ + are at the top */ for (l = list; l != NULL; l = l->next) - { - page_setup = l->data; - gtk_list_store_append (priv->page_setup_list, &iter); - gtk_list_store_set (priv->page_setup_list, &iter, - PAGE_SETUP_LIST_COL_PAGE_SETUP, page_setup, - -1); - g_object_unref (page_setup); - } + { + page_setup = l->data; + gtk_list_store_append (priv->page_setup_list, &iter); + gtk_list_store_set (priv->page_setup_list, &iter, + PAGE_SETUP_LIST_COL_PAGE_SETUP, page_setup, + -1); + g_object_unref (page_setup); + } g_list_free (list); } fill_custom_paper_sizes (dialog); - + + current_page_setup = NULL; + + /* When selecting a different printer, select its default paper size */ + if (printer != NULL) + current_page_setup = gtk_printer_get_default_page_size (printer); + + if (current_page_setup == NULL) + current_page_setup = get_current_page_setup (dialog); + if (!set_paper_size (dialog, current_page_setup, FALSE, FALSE)) set_paper_size (dialog, current_page_setup, TRUE, TRUE); - + if (current_page_setup) g_object_unref (current_page_setup); } static void printer_changed_finished_callback (GtkPrinter *printer, - gboolean success, - GtkPageSetupUnixDialog *dialog) + gboolean success, + GtkPageSetupUnixDialog *dialog) { GtkPageSetupUnixDialogPrivate *priv = dialog->priv; g_signal_handler_disconnect (priv->request_details_printer, - priv->request_details_tag); + priv->request_details_tag); g_object_unref (priv->request_details_printer); priv->request_details_tag = 0; priv->request_details_printer = NULL; - + if (success) fill_paper_sizes_from_printer (dialog, printer); @@ -747,60 +615,60 @@ printer_changed_finished_callback (GtkPrinter *printer, static void printer_changed_callback (GtkComboBox *combo_box, - GtkPageSetupUnixDialog *dialog) + GtkPageSetupUnixDialog *dialog) { GtkPageSetupUnixDialogPrivate *priv = dialog->priv; GtkPrinter *printer; GtkTreeIter iter; /* If we're waiting for a specific printer but the user changed - * to another printer, cancel that wait. + * to another printer, cancel that wait. */ if (priv->waiting_for_printer) { g_free (priv->waiting_for_printer); priv->waiting_for_printer = NULL; } - + if (priv->request_details_tag) { g_signal_handler_disconnect (priv->request_details_printer, - priv->request_details_tag); + priv->request_details_tag); g_object_unref (priv->request_details_printer); priv->request_details_printer = NULL; priv->request_details_tag = 0; } - + if (gtk_combo_box_get_active_iter (combo_box, &iter)) { gtk_tree_model_get (gtk_combo_box_get_model (combo_box), &iter, - PRINTER_LIST_COL_PRINTER, &printer, -1); + PRINTER_LIST_COL_PRINTER, &printer, -1); if (printer == NULL || gtk_printer_has_details (printer)) - fill_paper_sizes_from_printer (dialog, printer); + fill_paper_sizes_from_printer (dialog, printer); else - { - priv->request_details_printer = g_object_ref (printer); - priv->request_details_tag = - g_signal_connect (printer, "details-acquired", - G_CALLBACK (printer_changed_finished_callback), dialog); - gtk_printer_request_details (printer); + { + priv->request_details_printer = g_object_ref (printer); + priv->request_details_tag = + g_signal_connect (printer, "details-acquired", + G_CALLBACK (printer_changed_finished_callback), dialog); + gtk_printer_request_details (printer); - } + } if (printer) - g_object_unref (printer); + g_object_unref (printer); if (priv->print_settings) - { - const char *name = NULL; - - if (printer) - name = gtk_printer_get_name (printer); - - gtk_print_settings_set (priv->print_settings, - "format-for-printer", name); - } + { + const char *name = NULL; + + if (printer) + name = gtk_printer_get_name (printer); + + gtk_print_settings_set (priv->print_settings, + "format-for-printer", name); + } } } @@ -808,8 +676,8 @@ printer_changed_callback (GtkComboBox *combo_box, after the decimal point, and not to many such digits if they are nonzero. I wish printf let you specify max precision for %f... */ static gchar * -double_to_string (gdouble d, - GtkUnit unit) +double_to_string (gdouble d, + GtkUnit unit) { gchar *val, *p; struct lconv *locale_data; @@ -819,7 +687,7 @@ double_to_string (gdouble d, locale_data = localeconv (); decimal_point = locale_data->decimal_point; decimal_point_len = strlen (decimal_point); - + /* Max two decimal digits for inch, max one for mm */ if (unit == GTK_UNIT_INCH) val = g_strdup_printf ("%.2f", d); @@ -832,7 +700,7 @@ double_to_string (gdouble d, while (*p == '0') p--; if (p - val + 1 >= decimal_point_len && - strncmp (p - (decimal_point_len - 1), decimal_point, decimal_point_len) == 0) + strncmp (p - (decimal_point_len - 1), decimal_point, decimal_point_len) == 0) p -= decimal_point_len; p[1] = '\0'; } @@ -840,9 +708,26 @@ double_to_string (gdouble d, return val; } + +static void +custom_paper_dialog_response_cb (GtkDialog *custom_paper_dialog, + gint response_id, + gpointer user_data) +{ + GtkPageSetupUnixDialog *page_setup_dialog = GTK_PAGE_SETUP_UNIX_DIALOG (user_data); + GtkPageSetupUnixDialogPrivate *priv = page_setup_dialog->priv; + + _gtk_print_load_custom_papers (priv->custom_paper_list); + + /* Update printer page list */ + printer_changed_callback (GTK_COMBO_BOX (priv->printer_combo), page_setup_dialog); + + gtk_widget_destroy (GTK_WIDGET (custom_paper_dialog)); +} + static void paper_size_changed (GtkComboBox *combo_box, - GtkPageSetupUnixDialog *dialog) + GtkPageSetupUnixDialog *dialog) { GtkPageSetupUnixDialogPrivate *priv = dialog->priv; GtkTreeIter iter; @@ -854,49 +739,52 @@ paper_size_changed (GtkComboBox *combo_box, const gchar *unit_str; label = GTK_LABEL (priv->paper_size_label); - + if (gtk_combo_box_get_active_iter (combo_box, &iter)) { gtk_tree_model_get (gtk_combo_box_get_model (combo_box), - &iter, PAGE_SETUP_LIST_COL_PAGE_SETUP, &page_setup, -1); + &iter, PAGE_SETUP_LIST_COL_PAGE_SETUP, &page_setup, -1); if (page_setup == NULL) - { + { + GtkWidget *custom_paper_dialog; + /* Change from "manage" menu item to last value */ if (priv->last_setup) last_page_setup = g_object_ref (priv->last_setup); else - last_page_setup = gtk_page_setup_new (); /* "good" default */ - set_paper_size (dialog, last_page_setup, FALSE, TRUE); + last_page_setup = gtk_page_setup_new (); /* "good" default */ + set_paper_size (dialog, last_page_setup, FALSE, TRUE); g_object_unref (last_page_setup); /* And show the custom paper dialog */ - show_custom_paper_dialog (dialog); + custom_paper_dialog = _gtk_custom_paper_unix_dialog_new (GTK_WINDOW (dialog), NULL); + g_signal_connect (custom_paper_dialog, "response", G_CALLBACK (custom_paper_dialog_response_cb), dialog); + gtk_window_present (GTK_WINDOW (custom_paper_dialog)); return; - } + } if (priv->last_setup) - g_object_unref (priv->last_setup); + g_object_unref (priv->last_setup); priv->last_setup = g_object_ref (page_setup); - - unit = get_default_user_units (); + + unit = _gtk_print_get_default_user_units (); if (unit == GTK_UNIT_MM) - unit_str = _("mm"); + unit_str = _("mm"); else - unit_str = _("inch"); - + unit_str = _("inch"); w = double_to_string (gtk_page_setup_get_paper_width (page_setup, unit), - unit); + unit); h = double_to_string (gtk_page_setup_get_paper_height (page_setup, unit), - unit); + unit); str = g_strdup_printf ("%s x %s %s", w, h, unit_str); g_free (w); g_free (h); - + gtk_label_set_text (label, str); g_free (str); @@ -906,47 +794,47 @@ paper_size_changed (GtkComboBox *combo_box, right = double_to_string (gtk_page_setup_get_right_margin (page_setup, unit), unit); str = g_strdup_printf (_("Margins:\n" - " Left: %s %s\n" - " Right: %s %s\n" - " Top: %s %s\n" - " Bottom: %s %s" - ), - left, unit_str, - right, unit_str, - top, unit_str, - bottom, unit_str); + " Left: %s %s\n" + " Right: %s %s\n" + " Top: %s %s\n" + " Bottom: %s %s" + ), + left, unit_str, + right, unit_str, + top, unit_str, + bottom, unit_str); g_free (top); g_free (bottom); g_free (left); g_free (right); - - gtk_widget_set_tooltip_text (priv->paper_size_eventbox, str); + + gtk_widget_set_tooltip_text (priv->paper_size_label, str); g_free (str); - + g_object_unref (page_setup); } else { gtk_label_set_text (label, ""); - gtk_widget_set_tooltip_text (priv->paper_size_eventbox, NULL); + gtk_widget_set_tooltip_text (priv->paper_size_label, NULL); if (priv->last_setup) - g_object_unref (priv->last_setup); + g_object_unref (priv->last_setup); priv->last_setup = NULL; } } static void page_name_func (GtkCellLayout *cell_layout, - GtkCellRenderer *cell, - GtkTreeModel *tree_model, - GtkTreeIter *iter, - gpointer data) + GtkCellRenderer *cell, + GtkTreeModel *tree_model, + GtkTreeIter *iter, + gpointer data) { GtkPageSetup *page_setup; GtkPaperSize *paper_size; - + gtk_tree_model_get (tree_model, iter, - PAGE_SETUP_LIST_COL_PAGE_SETUP, &page_setup, -1); + PAGE_SETUP_LIST_COL_PAGE_SETUP, &page_setup, -1); if (page_setup) { paper_size = gtk_page_setup_get_paper_size (page_setup); @@ -954,13 +842,13 @@ page_name_func (GtkCellLayout *cell_layout, g_object_unref (page_setup); } else - g_object_set (cell, "text", _("Manage Custom Sizes..."), NULL); - + g_object_set (cell, "text", _("Manage Custom Sizes…"), NULL); + } static GtkWidget * create_radio_button (GSList *group, - const gchar *stock_id) + const gchar *stock_id) { GtkWidget *radio_button, *image, *label, *hbox; GtkStockItem item; @@ -969,7 +857,7 @@ create_radio_button (GSList *group, image = gtk_image_new_from_stock (stock_id, GTK_ICON_SIZE_LARGE_TOOLBAR); gtk_stock_lookup (stock_id, &item); label = gtk_label_new (item.label); - hbox = gtk_hbox_new (0, 6); + hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6); gtk_container_add (GTK_CONTAINER (radio_button), hbox); gtk_container_add (GTK_CONTAINER (hbox), image); gtk_container_add (GTK_CONTAINER (hbox), label); @@ -984,28 +872,31 @@ populate_dialog (GtkPageSetupUnixDialog *ps_dialog) { GtkPageSetupUnixDialogPrivate *priv = ps_dialog->priv; GtkDialog *dialog = GTK_DIALOG (ps_dialog); - GtkWidget *table, *label, *combo, *radio_button, *ebox; + GtkWidget *table, *label, *combo, *radio_button; + GtkWidget *action_area, *content_area; GtkCellRenderer *cell; gtk_window_set_resizable (GTK_WINDOW (dialog), FALSE); - gtk_dialog_set_has_separator (dialog, FALSE); + content_area = gtk_dialog_get_content_area (dialog); + action_area = gtk_dialog_get_action_area (dialog); + gtk_container_set_border_width (GTK_CONTAINER (dialog), 5); - gtk_box_set_spacing (GTK_BOX (dialog->vbox), 2); /* 2 * 5 + 2 = 12 */ - gtk_container_set_border_width (GTK_CONTAINER (dialog->action_area), 5); - gtk_box_set_spacing (GTK_BOX (dialog->action_area), 6); + gtk_box_set_spacing (GTK_BOX (content_area), 2); /* 2 * 5 + 2 = 12 */ + gtk_container_set_border_width (GTK_CONTAINER (action_area), 5); + gtk_box_set_spacing (GTK_BOX (action_area), 6); - table = gtk_table_new (5, 4, FALSE); - gtk_table_set_row_spacings (GTK_TABLE (table), 6); - gtk_table_set_col_spacings (GTK_TABLE (table), 12); + table = gtk_grid_new (); + gtk_grid_set_row_spacing (GTK_GRID (table), 6); + gtk_grid_set_column_spacing (GTK_GRID (table), 12); gtk_container_set_border_width (GTK_CONTAINER (table), 5); - gtk_box_pack_start (GTK_BOX (dialog->vbox), table, TRUE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (content_area), table, TRUE, TRUE, 0); gtk_widget_show (table); label = gtk_label_new_with_mnemonic (_("_Format for:")); - gtk_table_attach (GTK_TABLE (table), label, - 0, 1, 0, 1, - GTK_FILL, 0, 0, 0); + gtk_widget_set_halign (label, GTK_ALIGN_START); + gtk_widget_set_valign (label, GTK_ALIGN_CENTER); + gtk_grid_attach (GTK_GRID (table), label, 0, 0, 1, 1); gtk_widget_show (label); combo = gtk_combo_box_new_with_model (GTK_TREE_MODEL (priv->printer_list)); @@ -1017,85 +908,75 @@ populate_dialog (GtkPageSetupUnixDialog *ps_dialog) "markup", PRINTER_LIST_COL_NAME, NULL); - gtk_table_attach (GTK_TABLE (table), combo, - 1, 4, 0, 1, - GTK_FILL | GTK_EXPAND, 0, 0, 0); + gtk_widget_set_halign (combo, GTK_ALIGN_FILL); + gtk_widget_set_hexpand (combo, TRUE); + gtk_grid_attach (GTK_GRID (table), combo, 1, 0, 3, 1); gtk_widget_show (combo); gtk_label_set_mnemonic_widget (GTK_LABEL (label), combo); label = gtk_label_new_with_mnemonic (_("_Paper size:")); - gtk_table_attach (GTK_TABLE (table), label, - 0, 1, 1, 2, - GTK_FILL, 0, 0, 0); + gtk_widget_set_halign (label, GTK_ALIGN_START); + gtk_widget_set_valign (label, GTK_ALIGN_CENTER); + gtk_grid_attach (GTK_GRID (table), label, 0, 1, 1, 1); gtk_widget_show (label); combo = gtk_combo_box_new_with_model (GTK_TREE_MODEL (priv->page_setup_list)); priv->paper_size_combo = combo; - gtk_combo_box_set_row_separator_func (GTK_COMBO_BOX (combo), - paper_size_row_is_separator, NULL, NULL); - + gtk_combo_box_set_row_separator_func (GTK_COMBO_BOX (combo), + paper_size_row_is_separator, NULL, NULL); + cell = gtk_cell_renderer_text_new (); gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (combo), cell, TRUE); gtk_cell_layout_set_cell_data_func (GTK_CELL_LAYOUT (combo), cell, - page_name_func, NULL, NULL); + page_name_func, NULL, NULL); - gtk_table_attach (GTK_TABLE (table), combo, - 1, 4, 1, 2, - GTK_FILL | GTK_EXPAND, 0, 0, 0); + gtk_widget_set_halign (combo, GTK_ALIGN_FILL); + gtk_widget_set_hexpand (combo, TRUE); + gtk_grid_attach (GTK_GRID (table), combo, 1, 1, 3, 1); gtk_widget_show (combo); gtk_label_set_mnemonic_widget (GTK_LABEL (label), combo); - ebox = gtk_event_box_new (); - priv->paper_size_eventbox = ebox; - gtk_event_box_set_visible_window (GTK_EVENT_BOX (ebox), FALSE); - gtk_table_attach (GTK_TABLE (table), ebox, - 1, 4, 2, 3, - GTK_FILL, 0, 0, 0); - gtk_widget_show (ebox); - - label = gtk_label_new (""); + label = gtk_label_new (NULL); priv->paper_size_label = label; - gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); - gtk_container_add (GTK_CONTAINER (ebox), label); + gtk_widget_set_halign (label, GTK_ALIGN_START); + gtk_widget_set_valign (label, GTK_ALIGN_CENTER); + gtk_grid_attach (GTK_GRID (table), label, 1, 2, 3, 1); gtk_widget_show (label); label = gtk_label_new_with_mnemonic (_("_Orientation:")); - gtk_table_attach (GTK_TABLE (table), label, - 0, 1, 3, 4, - GTK_FILL, 0, 0, 0); + gtk_widget_set_halign (label, GTK_ALIGN_START); + gtk_widget_set_valign (label, GTK_ALIGN_CENTER); + gtk_grid_attach (GTK_GRID (table), label, 0, 3, 1, 1); gtk_widget_show (label); radio_button = create_radio_button (NULL, GTK_STOCK_ORIENTATION_PORTRAIT); priv->portrait_radio = radio_button; - gtk_table_attach (GTK_TABLE (table), radio_button, - 1, 2, 3, 4, - GTK_EXPAND|GTK_FILL, 0, 0, 0); + gtk_widget_set_halign (combo, GTK_ALIGN_FILL); + gtk_widget_set_hexpand (combo, TRUE); + gtk_grid_attach (GTK_GRID (table), radio_button, 1, 3, 1, 1); gtk_label_set_mnemonic_widget (GTK_LABEL (label), radio_button); radio_button = create_radio_button (gtk_radio_button_get_group (GTK_RADIO_BUTTON (radio_button)), - GTK_STOCK_ORIENTATION_REVERSE_PORTRAIT); + GTK_STOCK_ORIENTATION_REVERSE_PORTRAIT); priv->reverse_portrait_radio = radio_button; - gtk_table_attach (GTK_TABLE (table), radio_button, - 2, 3, 3, 4, - GTK_EXPAND|GTK_FILL, 0, 0, 0); + gtk_widget_set_halign (combo, GTK_ALIGN_FILL); + gtk_widget_set_hexpand (combo, TRUE); + gtk_grid_attach (GTK_GRID (table), radio_button, 2, 3, 1, 1); radio_button = create_radio_button (gtk_radio_button_get_group (GTK_RADIO_BUTTON (radio_button)), - GTK_STOCK_ORIENTATION_LANDSCAPE); + GTK_STOCK_ORIENTATION_LANDSCAPE); priv->landscape_radio = radio_button; - gtk_table_attach (GTK_TABLE (table), radio_button, - 1, 2, 4, 5, - GTK_EXPAND|GTK_FILL, 0, 0, 0); + gtk_widget_set_halign (combo, GTK_ALIGN_FILL); + gtk_widget_set_hexpand (combo, TRUE); + gtk_grid_attach (GTK_GRID (table), radio_button, 1, 4, 1, 1); gtk_widget_show (radio_button); - gtk_table_set_row_spacing (GTK_TABLE (table), 3, 0); - radio_button = create_radio_button (gtk_radio_button_get_group (GTK_RADIO_BUTTON (radio_button)), - GTK_STOCK_ORIENTATION_REVERSE_LANDSCAPE); + GTK_STOCK_ORIENTATION_REVERSE_LANDSCAPE); priv->reverse_landscape_radio = radio_button; - gtk_table_attach (GTK_TABLE (table), radio_button, - 2, 3, 4, 5, - GTK_EXPAND|GTK_FILL, 0, 0, 0); - + gtk_widget_set_halign (combo, GTK_ALIGN_FILL); + gtk_widget_set_hexpand (combo, TRUE); + gtk_grid_attach (GTK_GRID (table), radio_button, 2, 4, 1, 1); g_signal_connect (priv->paper_size_combo, "changed", G_CALLBACK (paper_size_changed), ps_dialog); g_signal_connect (priv->printer_combo, "changed", G_CALLBACK (printer_changed_callback), ps_dialog); @@ -1106,8 +987,8 @@ populate_dialog (GtkPageSetupUnixDialog *ps_dialog) /** * gtk_page_setup_unix_dialog_new: - * @title: the title of the dialog, or %NULL - * @parent: transient parent of the dialog, or %NULL + * @title: (allow-none): the title of the dialog, or %NULL + * @parent: (allow-none): transient parent of the dialog, or %NULL * * Creates a new page setup dialog. * @@ -1117,13 +998,13 @@ populate_dialog (GtkPageSetupUnixDialog *ps_dialog) */ GtkWidget * gtk_page_setup_unix_dialog_new (const gchar *title, - GtkWindow *parent) + GtkWindow *parent) { GtkWidget *result; if (title == NULL) title = _("Page Setup"); - + result = g_object_new (GTK_TYPE_PAGE_SETUP_UNIX_DIALOG, "title", title, NULL); @@ -1149,8 +1030,8 @@ get_orientation (GtkPageSetupUnixDialog *dialog) } static void -set_orientation (GtkPageSetupUnixDialog *dialog, - GtkPageOrientation orientation) +set_orientation (GtkPageSetupUnixDialog *dialog, + GtkPageOrientation orientation) { GtkPageSetupUnixDialogPrivate *priv = dialog->priv; @@ -1175,7 +1056,7 @@ set_orientation (GtkPageSetupUnixDialog *dialog, * gtk_page_setup_unix_dialog_set_page_setup: * @dialog: a #GtkPageSetupUnixDialog * @page_setup: a #GtkPageSetup - * + * * Sets the #GtkPageSetup from which the page setup * dialog takes its values. * @@ -1183,7 +1064,7 @@ set_orientation (GtkPageSetupUnixDialog *dialog, **/ void gtk_page_setup_unix_dialog_set_page_setup (GtkPageSetupUnixDialog *dialog, - GtkPageSetup *page_setup) + GtkPageSetup *page_setup) { if (page_setup) { @@ -1195,10 +1076,10 @@ gtk_page_setup_unix_dialog_set_page_setup (GtkPageSetupUnixDialog *dialog, /** * gtk_page_setup_unix_dialog_get_page_setup: * @dialog: a #GtkPageSetupUnixDialog - * - * Gets the currently selected page setup from the dialog. - * - * Returns: the current page setup + * + * Gets the currently selected page setup from the dialog. + * + * Returns: (transfer none): the current page setup * * Since: 2.10 **/ @@ -1206,7 +1087,7 @@ GtkPageSetup * gtk_page_setup_unix_dialog_get_page_setup (GtkPageSetupUnixDialog *dialog) { GtkPageSetup *page_setup; - + page_setup = get_current_page_setup (dialog); gtk_page_setup_set_orientation (page_setup, get_orientation (dialog)); @@ -1216,7 +1097,7 @@ gtk_page_setup_unix_dialog_get_page_setup (GtkPageSetupUnixDialog *dialog) static gboolean set_active_printer (GtkPageSetupUnixDialog *dialog, - const gchar *printer_name) + const gchar *printer_name) { GtkPageSetupUnixDialogPrivate *priv = dialog->priv; GtkTreeModel *model; @@ -1228,25 +1109,25 @@ set_active_printer (GtkPageSetupUnixDialog *dialog, if (gtk_tree_model_get_iter_first (model, &iter)) { do - { - gtk_tree_model_get (GTK_TREE_MODEL (priv->printer_list), &iter, - PRINTER_LIST_COL_PRINTER, &printer, -1); - if (printer == NULL) - continue; - - if (strcmp (gtk_printer_get_name (printer), printer_name) == 0) - { - gtk_combo_box_set_active_iter (GTK_COMBO_BOX (priv->printer_combo), - &iter); - g_object_unref (printer); - return TRUE; - } - - g_object_unref (printer); - - } while (gtk_tree_model_iter_next (model, &iter)); + { + gtk_tree_model_get (GTK_TREE_MODEL (priv->printer_list), &iter, + PRINTER_LIST_COL_PRINTER, &printer, -1); + if (printer == NULL) + continue; + + if (strcmp (gtk_printer_get_name (printer), printer_name) == 0) + { + gtk_combo_box_set_active_iter (GTK_COMBO_BOX (priv->printer_combo), + &iter); + g_object_unref (printer); + return TRUE; + } + + g_object_unref (printer); + + } while (gtk_tree_model_iter_next (model, &iter)); } - + return FALSE; } @@ -1254,15 +1135,15 @@ set_active_printer (GtkPageSetupUnixDialog *dialog, * gtk_page_setup_unix_dialog_set_print_settings: * @dialog: a #GtkPageSetupUnixDialog * @print_settings: a #GtkPrintSettings - * + * * Sets the #GtkPrintSettings from which the page setup dialog * takes its values. - * + * * Since: 2.10 **/ void gtk_page_setup_unix_dialog_set_print_settings (GtkPageSetupUnixDialog *dialog, - GtkPrintSettings *print_settings) + GtkPrintSettings *print_settings) { GtkPageSetupUnixDialogPrivate *priv = dialog->priv; const gchar *format_for_printer; @@ -1280,22 +1161,22 @@ gtk_page_setup_unix_dialog_set_print_settings (GtkPageSetupUnixDialog *dialog, format_for_printer = gtk_print_settings_get (print_settings, "format-for-printer"); - /* Set printer if in list, otherwise set when - * that printer is added + /* Set printer if in list, otherwise set when + * that printer is added */ if (format_for_printer && - !set_active_printer (dialog, format_for_printer)) - priv->waiting_for_printer = g_strdup (format_for_printer); + !set_active_printer (dialog, format_for_printer)) + priv->waiting_for_printer = g_strdup (format_for_printer); } } /** * gtk_page_setup_unix_dialog_get_print_settings: * @dialog: a #GtkPageSetupUnixDialog - * + * * Gets the current print settings from the dialog. - * - * Returns: the current print settings + * + * Returns: (transfer none): the current print settings * * Since: 2.10 **/ @@ -1306,756 +1187,3 @@ gtk_page_setup_unix_dialog_get_print_settings (GtkPageSetupUnixDialog *dialog) return priv->print_settings; } - -static GtkWidget * -wrap_in_frame (const gchar *label, - GtkWidget *child) -{ - GtkWidget *frame, *alignment, *label_widget; - gchar *bold_text; - - label_widget = gtk_label_new (""); - gtk_misc_set_alignment (GTK_MISC (label_widget), 0.0, 0.5); - gtk_widget_show (label_widget); - - bold_text = g_markup_printf_escaped ("%s", label); - gtk_label_set_markup (GTK_LABEL (label_widget), bold_text); - g_free (bold_text); - - frame = gtk_vbox_new (FALSE, 6); - gtk_box_pack_start (GTK_BOX (frame), label_widget, FALSE, FALSE, 0); - - alignment = gtk_alignment_new (0.0, 0.0, 1.0, 1.0); - gtk_alignment_set_padding (GTK_ALIGNMENT (alignment), - 0, 0, 12, 0); - gtk_box_pack_start (GTK_BOX (frame), alignment, FALSE, FALSE, 0); - - gtk_container_add (GTK_CONTAINER (alignment), child); - - gtk_widget_show (frame); - gtk_widget_show (alignment); - - return frame; -} - -typedef struct -{ - GtkUnit display_unit; - GtkWidget *spin_button; -} UnitWidget; - -typedef struct -{ - GtkPageSetupUnixDialog *dialog; - GtkWidget *treeview; - GtkTreeViewColumn *text_column; - GtkWidget *values_box; - GtkWidget *printer_combo; - GtkWidget *width_widget; - GtkWidget *height_widget; - GtkWidget *top_widget; - GtkWidget *bottom_widget; - GtkWidget *left_widget; - GtkWidget *right_widget; - gulong printer_inserted_tag; - gulong printer_removed_tag; - guint request_details_tag; - GtkPrinter *request_details_printer; - guint non_user_change : 1; -} CustomPaperDialog; - -static void unit_widget_changed (CustomPaperDialog *data); - -static GtkWidget * -new_unit_widget (CustomPaperDialog *dialog, - GtkUnit unit, - GtkWidget *mnemonic_label) -{ - GtkWidget *hbox, *button, *label; - UnitWidget *data; - - data = g_new0 (UnitWidget, 1); - data->display_unit = unit; - - hbox = gtk_hbox_new (FALSE, 6); - - button = gtk_spin_button_new_with_range (0.0, 9999.0, 1); - if (unit == GTK_UNIT_INCH) - gtk_spin_button_set_digits (GTK_SPIN_BUTTON (button), 2); - else - gtk_spin_button_set_digits (GTK_SPIN_BUTTON (button), 1); - - gtk_box_pack_start (GTK_BOX (hbox), button, TRUE, TRUE, 0); - gtk_widget_show (button); - - data->spin_button = button; - - g_signal_connect_swapped (button, "value-changed", - G_CALLBACK (unit_widget_changed), dialog); - - if (unit == GTK_UNIT_INCH) - label = gtk_label_new (_("inch")); - else - label = gtk_label_new (_("mm")); - - gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0); - gtk_widget_show (label); - gtk_label_set_mnemonic_widget (GTK_LABEL (mnemonic_label), button); - - g_object_set_data_full (G_OBJECT (hbox), "unit-data", data, g_free); - - return hbox; -} - -static double -unit_widget_get (GtkWidget *unit_widget) -{ - UnitWidget *data = g_object_get_data (G_OBJECT (unit_widget), "unit-data"); - return _gtk_print_convert_to_mm (gtk_spin_button_get_value (GTK_SPIN_BUTTON (data->spin_button)), - data->display_unit); -} - -static void -unit_widget_set (GtkWidget *unit_widget, - gdouble value) -{ - UnitWidget *data; - - data = g_object_get_data (G_OBJECT (unit_widget), "unit-data"); - gtk_spin_button_set_value (GTK_SPIN_BUTTON (data->spin_button), - _gtk_print_convert_from_mm (value, data->display_unit)); -} - -static void -custom_paper_printer_data_func (GtkCellLayout *cell_layout, - GtkCellRenderer *cell, - GtkTreeModel *tree_model, - GtkTreeIter *iter, - gpointer data) -{ - GtkPrinter *printer; - - gtk_tree_model_get (tree_model, iter, - PRINTER_LIST_COL_PRINTER, &printer, -1); - - if (printer) - g_object_set (cell, "text", gtk_printer_get_name (printer), NULL); - else - g_object_set (cell, "text", _("Margins from Printer..."), NULL); - - if (printer) - g_object_unref (printer); -} - -static void -update_combo_sensitivity_from_printers (CustomPaperDialog *data) -{ - GtkTreeIter iter; - gboolean sensitive; - GtkTreeSelection *selection; - GtkTreeModel *model; - - sensitive = FALSE; - model = GTK_TREE_MODEL (data->dialog->priv->printer_list); - selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (data->treeview)); - if (gtk_tree_model_get_iter_first (model, &iter) && - gtk_tree_model_iter_next (model, &iter) && - gtk_tree_selection_get_selected (selection, NULL, &iter)) - sensitive = TRUE; - - gtk_widget_set_sensitive (data->printer_combo, sensitive); -} - -static void -update_custom_widgets_from_list (CustomPaperDialog *data) -{ - GtkTreeSelection *selection; - GtkTreeModel *model; - GtkTreeIter iter; - GtkPageSetup *page_setup; - - model = gtk_tree_view_get_model (GTK_TREE_VIEW (data->treeview)); - selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (data->treeview)); - - data->non_user_change = TRUE; - if (gtk_tree_selection_get_selected (selection, NULL, &iter)) - { - gtk_tree_model_get (model, &iter, 0, &page_setup, -1); - - unit_widget_set (data->width_widget, - gtk_page_setup_get_paper_width (page_setup, GTK_UNIT_MM)); - unit_widget_set (data->height_widget, - gtk_page_setup_get_paper_height (page_setup, GTK_UNIT_MM)); - unit_widget_set (data->top_widget, - gtk_page_setup_get_top_margin (page_setup, GTK_UNIT_MM)); - unit_widget_set (data->bottom_widget, - gtk_page_setup_get_bottom_margin (page_setup, GTK_UNIT_MM)); - unit_widget_set (data->left_widget, - gtk_page_setup_get_left_margin (page_setup, GTK_UNIT_MM)); - unit_widget_set (data->right_widget, - gtk_page_setup_get_right_margin (page_setup, GTK_UNIT_MM)); - - gtk_widget_set_sensitive (data->values_box, TRUE); - } - else - { - gtk_widget_set_sensitive (data->values_box, FALSE); - } - - update_combo_sensitivity_from_printers (data); - data->non_user_change = FALSE; -} - -static void -selected_custom_paper_changed (GtkTreeSelection *selection, - CustomPaperDialog *data) -{ - update_custom_widgets_from_list (data); -} - -static void -unit_widget_changed (CustomPaperDialog *data) -{ - gdouble w, h, top, bottom, left, right; - GtkTreeSelection *selection; - GtkTreeIter iter; - GtkPageSetup *page_setup; - GtkPaperSize *paper_size; - - if (data->non_user_change) - return; - - selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (data->treeview)); - - if (gtk_tree_selection_get_selected (selection, NULL, &iter)) - { - gtk_tree_model_get (GTK_TREE_MODEL (data->dialog->priv->custom_paper_list), &iter, 0, &page_setup, -1); - - w = unit_widget_get (data->width_widget); - h = unit_widget_get (data->height_widget); - - paper_size = gtk_page_setup_get_paper_size (page_setup); - gtk_paper_size_set_size (paper_size, w, h, GTK_UNIT_MM); - - top = unit_widget_get (data->top_widget); - bottom = unit_widget_get (data->bottom_widget); - left = unit_widget_get (data->left_widget); - right = unit_widget_get (data->right_widget); - - gtk_page_setup_set_top_margin (page_setup, top, GTK_UNIT_MM); - gtk_page_setup_set_bottom_margin (page_setup, bottom, GTK_UNIT_MM); - gtk_page_setup_set_left_margin (page_setup, left, GTK_UNIT_MM); - gtk_page_setup_set_right_margin (page_setup, right, GTK_UNIT_MM); - - g_object_unref (page_setup); - } -} - -static gboolean -custom_paper_name_used (CustomPaperDialog *data, - const gchar *name) -{ - GtkTreeModel *model; - GtkTreeIter iter; - GtkPageSetup *page_setup; - GtkPaperSize *paper_size; - - model = gtk_tree_view_get_model (GTK_TREE_VIEW (data->treeview)); - - if (gtk_tree_model_get_iter_first (model, &iter)) - { - do - { - gtk_tree_model_get (model, &iter, 0, &page_setup, -1); - paper_size = gtk_page_setup_get_paper_size (page_setup); - if (strcmp (name, - gtk_paper_size_get_name (paper_size)) == 0) - { - g_object_unref (page_setup); - return TRUE; - } - g_object_unref (page_setup); - } while (gtk_tree_model_iter_next (model, &iter)); - } - - return FALSE; -} - -static void -add_custom_paper (CustomPaperDialog *data) -{ - GtkListStore *store; - GtkPageSetup *page_setup; - GtkPaperSize *paper_size; - GtkTreeSelection *selection; - GtkTreePath *path; - GtkTreeIter iter; - gchar *name; - gint i; - - selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (data->treeview)); - store = data->dialog->priv->custom_paper_list; - - i = 1; - name = NULL; - do - { - g_free (name); - name = g_strdup_printf (_("Custom Size %d"), i); - i++; - } while (custom_paper_name_used (data, name)); - - page_setup = gtk_page_setup_new (); - paper_size = gtk_paper_size_new_custom (name, name, - gtk_page_setup_get_paper_width (page_setup, GTK_UNIT_MM), - gtk_page_setup_get_paper_height (page_setup, GTK_UNIT_MM), - GTK_UNIT_MM); - gtk_page_setup_set_paper_size (page_setup, paper_size); - gtk_paper_size_free (paper_size); - - gtk_list_store_append (store, &iter); - gtk_list_store_set (store, &iter, 0, page_setup, -1); - g_object_unref (page_setup); - - gtk_tree_selection_select_iter (selection, &iter); - path = gtk_tree_model_get_path (GTK_TREE_MODEL (store), &iter); - gtk_widget_grab_focus (data->treeview); - gtk_tree_view_set_cursor (GTK_TREE_VIEW (data->treeview), path, - data->text_column, TRUE); - gtk_tree_path_free (path); - g_free (name); -} - -static void -remove_custom_paper (CustomPaperDialog *data) -{ - GtkTreeSelection *selection; - GtkTreeIter iter; - GtkListStore *store; - - selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (data->treeview)); - store = data->dialog->priv->custom_paper_list; - - if (gtk_tree_selection_get_selected (selection, NULL, &iter)) - { - GtkTreePath *path = gtk_tree_model_get_path (GTK_TREE_MODEL (store), &iter); - gtk_list_store_remove (store, &iter); - - if (gtk_tree_model_get_iter (GTK_TREE_MODEL (store), &iter, path)) - gtk_tree_selection_select_iter (selection, &iter); - else if (gtk_tree_path_prev (path) && gtk_tree_model_get_iter (GTK_TREE_MODEL (store), &iter, path)) - gtk_tree_selection_select_iter (selection, &iter); - - gtk_tree_path_free (path); - } -} - -static void -set_margins_from_printer (CustomPaperDialog *data, - GtkPrinter *printer) -{ - gdouble top, bottom, left, right; - - top = bottom = left = right = 0; - _gtk_printer_get_hard_margins (printer, &top, &bottom, &left, &right); - - data->non_user_change = TRUE; - unit_widget_set (data->top_widget, _gtk_print_convert_to_mm (top, GTK_UNIT_POINTS)); - unit_widget_set (data->bottom_widget, _gtk_print_convert_to_mm (bottom, GTK_UNIT_POINTS)); - unit_widget_set (data->left_widget, _gtk_print_convert_to_mm (left, GTK_UNIT_POINTS)); - unit_widget_set (data->right_widget, _gtk_print_convert_to_mm (right, GTK_UNIT_POINTS)); - data->non_user_change = FALSE; - - /* Only send one change */ - unit_widget_changed (data); -} - -static void -get_margins_finished_callback (GtkPrinter *printer, - gboolean success, - CustomPaperDialog *data) -{ - g_signal_handler_disconnect (data->request_details_printer, - data->request_details_tag); - g_object_unref (data->request_details_printer); - data->request_details_tag = 0; - data->request_details_printer = NULL; - - if (success) - set_margins_from_printer (data, printer); - - gtk_combo_box_set_active (GTK_COMBO_BOX (data->printer_combo), 0); -} - -static void -margins_from_printer_changed (CustomPaperDialog *data) -{ - GtkTreeIter iter; - GtkComboBox *combo; - GtkPrinter *printer; - - combo = GTK_COMBO_BOX (data->printer_combo); - - if (data->request_details_tag) - { - g_signal_handler_disconnect (data->request_details_printer, - data->request_details_tag); - g_object_unref (data->request_details_printer); - data->request_details_printer = NULL; - data->request_details_tag = 0; - } - - if (gtk_combo_box_get_active_iter (combo, &iter)) - { - gtk_tree_model_get (gtk_combo_box_get_model (combo), &iter, - PRINTER_LIST_COL_PRINTER, &printer, -1); - - if (printer) - { - if (gtk_printer_has_details (printer)) - { - set_margins_from_printer (data, printer); - gtk_combo_box_set_active (combo, 0); - } - else - { - data->request_details_printer = g_object_ref (printer); - data->request_details_tag = - g_signal_connect (printer, "details-acquired", - G_CALLBACK (get_margins_finished_callback), data); - gtk_printer_request_details (printer); - } - - g_object_unref (printer); - } - } -} - - -static void -custom_paper_dialog_free (gpointer p) -{ - CustomPaperDialog *data = p; - GtkPageSetupUnixDialogPrivate *priv = data->dialog->priv; - - g_signal_handler_disconnect (priv->printer_list, data->printer_inserted_tag); - g_signal_handler_disconnect (priv->printer_list, data->printer_removed_tag); - - if (data->request_details_tag) - { - g_signal_handler_disconnect (data->request_details_printer, - data->request_details_tag); - g_object_unref (data->request_details_printer); - data->request_details_printer = NULL; - data->request_details_tag = 0; - } - - g_free (data); -} - -static void -custom_size_name_edited (GtkCellRenderer *cell, - gchar *path_string, - gchar *new_text, - CustomPaperDialog *data) -{ - GtkTreePath *path; - GtkTreeIter iter; - GtkListStore *store; - GtkPageSetup *page_setup; - GtkPaperSize *paper_size; - - store = data->dialog->priv->custom_paper_list; - path = gtk_tree_path_new_from_string (path_string); - gtk_tree_model_get_iter (GTK_TREE_MODEL (store), &iter, path); - gtk_tree_model_get (GTK_TREE_MODEL (store), &iter, 0, &page_setup, -1); - gtk_tree_path_free (path); - - paper_size = gtk_paper_size_new_custom (new_text, new_text, - gtk_page_setup_get_paper_width (page_setup, GTK_UNIT_MM), - gtk_page_setup_get_paper_height (page_setup, GTK_UNIT_MM), - GTK_UNIT_MM); - gtk_page_setup_set_paper_size (page_setup, paper_size); - gtk_paper_size_free (paper_size); - - g_object_unref (page_setup); -} - -static void -custom_name_func (GtkTreeViewColumn *tree_column, - GtkCellRenderer *cell, - GtkTreeModel *tree_model, - GtkTreeIter *iter, - gpointer data) -{ - GtkPageSetup *page_setup; - GtkPaperSize *paper_size; - - gtk_tree_model_get (tree_model, iter, 0, &page_setup, -1); - if (page_setup) - { - paper_size = gtk_page_setup_get_paper_size (page_setup); - g_object_set (cell, "text", gtk_paper_size_get_display_name (paper_size), NULL); - g_object_unref (page_setup); - } -} - -static void -custom_paper_dialog_response_cb (GtkWidget *custom_dialog, - gint response, - CustomPaperDialog *data) -{ - GtkPageSetupUnixDialog *dialog = data->dialog; - GtkPageSetupUnixDialogPrivate *priv = dialog->priv; - - save_custom_papers (priv->custom_paper_list); - - /* Update printer page list */ - printer_changed_callback (GTK_COMBO_BOX (priv->printer_combo), dialog); - - gtk_widget_destroy (custom_dialog); -} - -static void -show_custom_paper_dialog (GtkPageSetupUnixDialog *ps_dialog) -{ - GtkPageSetupUnixDialogPrivate *priv = ps_dialog->priv; - GtkWidget *custom_dialog, *image, *table, *label, *widget, *frame, *combo; - GtkWidget *hbox, *vbox, *treeview, *scrolled, *button_box, *button; - GtkDialog *dialog; - GtkCellRenderer *cell; - GtkTreeViewColumn *column; - GtkTreeIter iter; - GtkTreeSelection *selection; - CustomPaperDialog *data; - GtkUnit user_units; - - custom_dialog = gtk_dialog_new_with_buttons (_("Manage Custom Sizes"), - GTK_WINDOW (ps_dialog), - GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_NO_SEPARATOR, - GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE, - NULL); - - dialog = GTK_DIALOG (custom_dialog); - - data = g_new0 (CustomPaperDialog, 1); - data->dialog = ps_dialog; - g_object_set_data_full (G_OBJECT (custom_dialog), "custom-dialog", data, - custom_paper_dialog_free); - g_signal_connect (dialog, "response", - G_CALLBACK (custom_paper_dialog_response_cb), data); - - gtk_dialog_set_has_separator (dialog, FALSE); - gtk_container_set_border_width (GTK_CONTAINER (dialog), 5); - gtk_box_set_spacing (GTK_BOX (dialog->vbox), 2); /* 2 * 5 + 2 = 12 */ - gtk_container_set_border_width (GTK_CONTAINER (dialog->action_area), 5); - gtk_box_set_spacing (GTK_BOX (dialog->action_area), 6); - - hbox = gtk_hbox_new (FALSE, 18); - gtk_container_set_border_width (GTK_CONTAINER (hbox), 5); - gtk_box_pack_start (GTK_BOX (dialog->vbox), hbox, TRUE, TRUE, 0); - gtk_widget_show (hbox); - - vbox = gtk_vbox_new (FALSE, 6); - gtk_box_pack_start (GTK_BOX (hbox), vbox, TRUE, TRUE, 0); - gtk_widget_show (vbox); - - scrolled = gtk_scrolled_window_new (NULL, NULL); - gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled), - GTK_POLICY_AUTOMATIC, - GTK_POLICY_AUTOMATIC); - gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrolled), - GTK_SHADOW_IN); - gtk_box_pack_start (GTK_BOX (vbox), scrolled, TRUE, TRUE, 0); - gtk_widget_show (scrolled); - - treeview = gtk_tree_view_new_with_model (GTK_TREE_MODEL (priv->custom_paper_list)); - data->treeview = treeview; - gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (treeview), FALSE); - gtk_widget_set_size_request (treeview, 140, -1); - - selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (treeview)); - gtk_tree_selection_set_mode (selection, GTK_SELECTION_BROWSE); - g_signal_connect (selection, "changed", G_CALLBACK (selected_custom_paper_changed), data); - - cell = gtk_cell_renderer_text_new (); - g_object_set (cell, "editable", TRUE, NULL); - g_signal_connect (cell, "edited", - G_CALLBACK (custom_size_name_edited), data); - data->text_column = column = - gtk_tree_view_column_new_with_attributes ("paper", cell, - NULL); - gtk_tree_view_column_set_cell_data_func (column, cell, custom_name_func, NULL, NULL); - - gtk_tree_view_append_column (GTK_TREE_VIEW (treeview), column); - - gtk_container_add (GTK_CONTAINER (scrolled), treeview); - gtk_widget_show (treeview); - - button_box = gtk_hbox_new (FALSE, 6); - gtk_box_pack_start (GTK_BOX (vbox), button_box, FALSE, FALSE, 0); - gtk_widget_show (button_box); - - button = gtk_button_new (); - image = gtk_image_new_from_stock (GTK_STOCK_ADD, GTK_ICON_SIZE_BUTTON); - gtk_widget_show (image); - gtk_container_add (GTK_CONTAINER (button), image); - gtk_box_pack_start (GTK_BOX (button_box), button, FALSE, FALSE, 0); - gtk_widget_show (button); - - g_signal_connect_swapped (button, "clicked", G_CALLBACK (add_custom_paper), data); - - button = gtk_button_new (); - image = gtk_image_new_from_stock (GTK_STOCK_REMOVE, GTK_ICON_SIZE_BUTTON); - gtk_widget_show (image); - gtk_container_add (GTK_CONTAINER (button), image); - gtk_box_pack_start (GTK_BOX (button_box), button, FALSE, FALSE, 0); - gtk_widget_show (button); - - g_signal_connect_swapped (button, "clicked", G_CALLBACK (remove_custom_paper), data); - - user_units = get_default_user_units (); - - vbox = gtk_vbox_new (FALSE, 18); - data->values_box = vbox; - gtk_box_pack_start (GTK_BOX (hbox), vbox, TRUE, TRUE, 0); - gtk_widget_show (vbox); - - table = gtk_table_new (2, 2, FALSE); - - gtk_table_set_row_spacings (GTK_TABLE (table), 6); - gtk_table_set_col_spacings (GTK_TABLE (table), 12); - - label = gtk_label_new_with_mnemonic (_("_Width:")); - gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); - gtk_widget_show (label); - gtk_table_attach (GTK_TABLE (table), label, - 0, 1, 0, 1, GTK_FILL, 0, 0, 0); - - widget = new_unit_widget (data, user_units, label); - data->width_widget = widget; - gtk_table_attach (GTK_TABLE (table), widget, - 1, 2, 0, 1, GTK_FILL, 0, 0, 0); - gtk_widget_show (widget); - - label = gtk_label_new_with_mnemonic (_("_Height:")); - gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); - gtk_widget_show (label); - gtk_table_attach (GTK_TABLE (table), label, - 0, 1, 1, 2, GTK_FILL, 0, 0, 0); - - widget = new_unit_widget (data, user_units, label); - data->height_widget = widget; - gtk_table_attach (GTK_TABLE (table), widget, - 1, 2, 1, 2, GTK_FILL, 0, 0, 0); - gtk_widget_show (widget); - - frame = wrap_in_frame (_("Paper Size"), table); - gtk_widget_show (table); - gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0); - gtk_widget_show (frame); - - - table = gtk_table_new (5, 2, FALSE); - gtk_table_set_row_spacings (GTK_TABLE (table), 6); - gtk_table_set_col_spacings (GTK_TABLE (table), 12); - - label = gtk_label_new_with_mnemonic (_("_Top:")); - gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); - gtk_table_attach (GTK_TABLE (table), label, - 0, 1, 0, 1, GTK_FILL, 0, 0, 0); - gtk_widget_show (label); - - widget = new_unit_widget (data, user_units, label); - data->top_widget = widget; - gtk_table_attach (GTK_TABLE (table), widget, - 1, 2, 0, 1, GTK_FILL, 0, 0, 0); - gtk_widget_show (widget); - - label = gtk_label_new_with_mnemonic (_("_Bottom:")); - gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); - gtk_table_attach (GTK_TABLE (table), label, - 0, 1 , 1, 2, GTK_FILL, 0, 0, 0); - gtk_widget_show (label); - - widget = new_unit_widget (data, user_units, label); - data->bottom_widget = widget; - gtk_table_attach (GTK_TABLE (table), widget, - 1, 2, 1, 2, GTK_FILL, 0, 0, 0); - gtk_widget_show (widget); - - label = gtk_label_new_with_mnemonic (_("_Left:")); - gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); - gtk_table_attach (GTK_TABLE (table), label, - 0, 1, 2, 3, GTK_FILL, 0, 0, 0); - gtk_widget_show (label); - - widget = new_unit_widget (data, user_units, label); - data->left_widget = widget; - gtk_table_attach (GTK_TABLE (table), widget, - 1, 2, 2, 3, GTK_FILL, 0, 0, 0); - gtk_widget_show (widget); - - label = gtk_label_new_with_mnemonic (_("_Right:")); - gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); - gtk_table_attach (GTK_TABLE (table), label, - 0, 1, 3, 4, GTK_FILL, 0, 0, 0); - gtk_widget_show (label); - - widget = new_unit_widget (data, user_units, label); - data->right_widget = widget; - gtk_table_attach (GTK_TABLE (table), widget, - 1, 2, 3, 4, GTK_FILL, 0, 0, 0); - gtk_widget_show (widget); - - hbox = gtk_hbox_new (FALSE, 0); - gtk_table_attach (GTK_TABLE (table), hbox, - 0, 2, 4, 5, GTK_FILL | GTK_EXPAND, 0, 0, 0); - gtk_widget_show (hbox); - - combo = gtk_combo_box_new_with_model (GTK_TREE_MODEL (priv->printer_list)); - data->printer_combo = combo; - - data->printer_inserted_tag = - g_signal_connect_swapped (priv->printer_list, "row-inserted", - G_CALLBACK (update_combo_sensitivity_from_printers), data); - data->printer_removed_tag = - g_signal_connect_swapped (priv->printer_list, "row-deleted", - G_CALLBACK (update_combo_sensitivity_from_printers), data); - update_combo_sensitivity_from_printers (data); - - cell = gtk_cell_renderer_text_new (); - gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (combo), cell, TRUE); - gtk_cell_layout_set_cell_data_func (GTK_CELL_LAYOUT (combo), cell, - custom_paper_printer_data_func, - NULL, NULL); - - gtk_combo_box_set_active (GTK_COMBO_BOX (combo), 0); - gtk_box_pack_start (GTK_BOX (hbox), combo, FALSE, FALSE, 0); - gtk_widget_show (combo); - - g_signal_connect_swapped (combo, "changed", - G_CALLBACK (margins_from_printer_changed), data); - - frame = wrap_in_frame (_("Paper Margins"), table); - gtk_widget_show (table); - gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0); - gtk_widget_show (frame); - - update_custom_widgets_from_list (data); - - /* If no custom sizes, add one */ - if (!gtk_tree_model_get_iter_first (GTK_TREE_MODEL (priv->custom_paper_list), - &iter)) - { - /* Need to realize treeview so we can start the rename */ - gtk_widget_realize (treeview); - add_custom_paper (data); - } - - gtk_window_present (GTK_WINDOW (dialog)); -} - - -#define __GTK_PAGE_SETUP_UNIX_DIALOG_C__ -#include "gtkaliasdef.c"