X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=gtk%2Fgtkprintunixdialog.c;h=c4ac91343f38db8e3b35c98d01b76411d8a008f7;hb=45ad8a06ad511ad95a74172172b9fe459bc666ad;hp=128722745a3a3409826a67161f4630c4e301ebe7;hpb=1b62d9ebdaba694f044af978e3313bee7698a781;p=~andy%2Fgtk diff --git a/gtk/gtkprintunixdialog.c b/gtk/gtkprintunixdialog.c index 128722745..c4ac91343 100644 --- a/gtk/gtkprintunixdialog.c +++ b/gtk/gtkprintunixdialog.c @@ -14,20 +14,24 @@ * 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 . */ #include "config.h" + #include #include #include #include #include -#include "gtkintl.h" -#include "gtkprivate.h" +#include "gtkprintunixdialog.h" + +#include "gtkcustompaperunixdialog.h" +#include "gtkprintbackend.h" +#include "gtkprinter-private.h" +#include "gtkprinteroptionwidget.h" +#include "gtkprintutils.h" #include "gtkspinbutton.h" #include "gtkcellrendererpixbuf.h" @@ -42,67 +46,133 @@ #include "gtktogglebutton.h" #include "gtkradiobutton.h" #include "gtkdrawingarea.h" -#include "gtkvbox.h" -#include "gtktable.h" +#include "gtkbox.h" +#include "gtkgrid.h" #include "gtkframe.h" -#include "gtkalignment.h" #include "gtklabel.h" #include "gtkeventbox.h" #include "gtkbuildable.h" - -#include "gtkprintbackend.h" -#include "gtkprinter-private.h" -#include "gtkprintunixdialog.h" -#include "gtkprinteroptionwidget.h" -#include "gtkalias.h" - #include "gtkmessagedialog.h" #include "gtkbutton.h" +#include "gtkintl.h" +#include "gtkprivate.h" +#include "gtktypebuiltins.h" -#define EXAMPLE_PAGE_AREA_SIZE 140 -#define GTK_PRINT_UNIX_DIALOG_GET_PRIVATE(o) \ - (G_TYPE_INSTANCE_GET_PRIVATE ((o), GTK_TYPE_PRINT_UNIX_DIALOG, GtkPrintUnixDialogPrivate)) +/** + * SECTION:gtkprintunixdialog + * @Short_description: A print dialog + * @Title: GtkPrintUnixDialog + * @See_also: #GtkPageSetupUnixDialog, #GtkPrinter, #GtkPrintJob + * + * GtkPrintUnixDialog implements a print dialog for platforms + * which don't provide a native print 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 + * + * In order to print something with #GtkPrintUnixDialog, you need + * to use gtk_print_unix_dialog_get_selected_printer() to obtain + * a #GtkPrinter object and use it to construct a #GtkPrintJob using + * gtk_print_job_new(). + * + * #GtkPrintUnixDialog uses the following response values: + * + * %GTK_RESPONSE_OK + * for the "Print" button + * + * %GTK_RESPONSE_APPLY + * for the "Preview" button + * + * %GTK_RESPONSE_CANCEL + * for the "Cancel" button + * + * + * + * + * + * Printing support was added in GTK+ 2.10. + * + * + * GtkPrintUnixDialog as GtkBuildable + * + * The GtkPrintUnixDialog implementation of the GtkBuildable interface exposes its + * @notebook internal children with the name "notebook". + * + * + * A <structname>GtkPrintUnixDialog</structname> UI definition fragment. + * + * + * + * + * + * Content on notebook tab + * + * + * + * + * Tab label + * + * + * False + * False + * + * + * + * + * + * ]]> + * + * + * + */ + + +#define EXAMPLE_PAGE_AREA_SIZE 110 +#define RULER_DISTANCE 7.5 +#define RULER_RADIUS 2 + static void gtk_print_unix_dialog_destroy (GtkPrintUnixDialog *dialog); static void gtk_print_unix_dialog_finalize (GObject *object); static void gtk_print_unix_dialog_set_property (GObject *object, - guint prop_id, - const GValue *value, - GParamSpec *pspec); + guint prop_id, + const GValue *value, + GParamSpec *pspec); static void gtk_print_unix_dialog_get_property (GObject *object, - guint prop_id, - GValue *value, - GParamSpec *pspec); -static void gtk_print_unix_dialog_style_set (GtkWidget *widget, - GtkStyle *previous_style); + guint prop_id, + GValue *value, + GParamSpec *pspec); +static void gtk_print_unix_dialog_style_updated (GtkWidget *widget); static void populate_dialog (GtkPrintUnixDialog *dialog); static void unschedule_idle_mark_conflicts (GtkPrintUnixDialog *dialog); static void selected_printer_changed (GtkTreeSelection *selection, - GtkPrintUnixDialog *dialog); + GtkPrintUnixDialog *dialog); static void clear_per_printer_ui (GtkPrintUnixDialog *dialog); static void printer_added_cb (GtkPrintBackend *backend, - GtkPrinter *printer, - GtkPrintUnixDialog *dialog); + GtkPrinter *printer, + GtkPrintUnixDialog *dialog); static void printer_removed_cb (GtkPrintBackend *backend, - GtkPrinter *printer, - GtkPrintUnixDialog *dialog); + GtkPrinter *printer, + GtkPrintUnixDialog *dialog); static void printer_status_cb (GtkPrintBackend *backend, - GtkPrinter *printer, - GtkPrintUnixDialog *dialog); + GtkPrinter *printer, + GtkPrintUnixDialog *dialog); static void update_collate_icon (GtkToggleButton *toggle_button, - GtkPrintUnixDialog *dialog); + GtkPrintUnixDialog *dialog); static gboolean dialog_get_collate (GtkPrintUnixDialog *dialog); static gboolean dialog_get_reverse (GtkPrintUnixDialog *dialog); static gint dialog_get_n_copies (GtkPrintUnixDialog *dialog); static void set_cell_sensitivity_func (GtkTreeViewColumn *tree_column, - GtkCellRenderer *cell, - GtkTreeModel *model, - GtkTreeIter *iter, - gpointer data); + GtkCellRenderer *cell, + GtkTreeModel *model, + GtkTreeIter *iter, + gpointer data); static gboolean set_active_printer (GtkPrintUnixDialog *dialog, - const gchar *printer_name); + const gchar *printer_name); +static void redraw_page_layout_preview (GtkPrintUnixDialog *dialog); /* GtkBuildable */ static void gtk_print_unix_dialog_buildable_init (GtkBuildableIface *iface); @@ -110,12 +180,37 @@ static GObject *gtk_print_unix_dialog_buildable_get_internal_child (GtkBuildabl GtkBuilder *builder, const gchar *childname); +static const gchar const common_paper_sizes[][16] = { + "na_letter", + "na_legal", + "iso_a4", + "iso_a5", + "roc_16k", + "iso_b5", + "jis_b5", + "na_number-10", + "iso_dl", + "jpn_chou3", + "na_ledger", + "iso_a3", +}; + +enum { + PAGE_SETUP_LIST_COL_PAGE_SETUP, + PAGE_SETUP_LIST_COL_IS_SEPARATOR, + PAGE_SETUP_LIST_N_COLS +}; + enum { PROP_0, PROP_PAGE_SETUP, PROP_CURRENT_PAGE, PROP_PRINT_SETTINGS, - PROP_SELECTED_PRINTER + PROP_SELECTED_PRINTER, + PROP_MANUAL_CAPABILITIES, + PROP_SUPPORT_SELECTION, + PROP_HAS_SELECTION, + PROP_EMBED_PAGE_SETUP }; enum { @@ -136,18 +231,26 @@ struct GtkPrintUnixDialogPrivate GtkPrintCapabilities manual_capabilities; GtkPrintCapabilities printer_capabilities; - + GtkTreeModel *printer_list; GtkTreeModelFilter *printer_list_filter; GtkPageSetup *page_setup; gboolean page_setup_set; + gboolean embed_page_setup; + GtkListStore *page_setup_list; + GtkListStore *custom_paper_list; + + gboolean support_selection; + gboolean has_selection; GtkWidget *all_pages_radio; GtkWidget *current_page_radio; + GtkWidget *selection_radio; + GtkWidget *range_table; GtkWidget *page_range_radio; GtkWidget *page_range_entry; - + GtkWidget *copies_spin; GtkWidget *collate_check; GtkWidget *reverse_check; @@ -160,6 +263,11 @@ struct GtkPrintUnixDialogPrivate GtkWidget *print_at_entry; GtkWidget *print_hold_radio; GtkWidget *preview_button; + GtkWidget *paper_size_combo; + GtkWidget *paper_size_combo_label; + GtkWidget *orientation_combo; + GtkWidget *orientation_combo_label; + gboolean internal_page_setup_change; gboolean updating_print_at; GtkPrinterOptionWidget *pages_per_sheet; GtkPrinterOptionWidget *duplex; @@ -187,34 +295,34 @@ struct GtkPrintUnixDialogPrivate GtkWidget *extension_point; - /* These are set initially on selected printer (either default printer, - * printer taken from set settings, or user-selected), but when any setting - * is changed by the user it is cleared. + /* These are set initially on selected printer (either default printer, + * printer taken from set settings, or user-selected), but when any + * setting is changed by the user it is cleared. */ GtkPrintSettings *initial_settings; GtkPrinterOption *number_up_layout_n_option; GtkPrinterOption *number_up_layout_2_option; - - /* This is the initial printer set by set_settings. We look for it in the - * added printers. We clear this whenever the user manually changes + + /* This is the initial printer set by set_settings. We look for it in + * the added printers. We clear this whenever the user manually changes * to another printer, when the user changes a setting or when we find * this printer. */ char *waiting_for_printer; gboolean internal_printer_change; - + GList *print_backends; - + GtkPrinter *current_printer; GtkPrinter *request_details_printer; - guint request_details_tag; + gulong request_details_tag; GtkPrinterOptionSet *options; gulong options_changed_handler; gulong mark_conflicts_id; gchar *format_for_printer; - + gint current_page; }; @@ -226,13 +334,13 @@ static GtkBuildableIface *parent_buildable_iface; static gboolean is_default_printer (GtkPrintUnixDialog *dialog, - GtkPrinter *printer) + GtkPrinter *printer) { GtkPrintUnixDialogPrivate *priv = dialog->priv; if (priv->format_for_printer) return strcmp (priv->format_for_printer, - gtk_printer_get_name (printer)) == 0; + gtk_printer_get_name (printer)) == 0; else return gtk_printer_is_default (printer); } @@ -250,44 +358,76 @@ gtk_print_unix_dialog_class_init (GtkPrintUnixDialogClass *class) object_class->set_property = gtk_print_unix_dialog_set_property; object_class->get_property = gtk_print_unix_dialog_get_property; - widget_class->style_set = gtk_print_unix_dialog_style_set; + widget_class->style_updated = gtk_print_unix_dialog_style_updated; g_object_class_install_property (object_class, - PROP_PAGE_SETUP, - g_param_spec_object ("page-setup", - P_("Page Setup"), - P_("The GtkPageSetup to use"), - GTK_TYPE_PAGE_SETUP, - GTK_PARAM_READWRITE)); + PROP_PAGE_SETUP, + g_param_spec_object ("page-setup", + P_("Page Setup"), + P_("The GtkPageSetup to use"), + GTK_TYPE_PAGE_SETUP, + GTK_PARAM_READWRITE)); g_object_class_install_property (object_class, - PROP_CURRENT_PAGE, - g_param_spec_int ("current-page", - P_("Current Page"), - P_("The current page in the document"), - -1, - G_MAXINT, - -1, - GTK_PARAM_READWRITE)); + PROP_CURRENT_PAGE, + g_param_spec_int ("current-page", + P_("Current Page"), + P_("The current page in the document"), + -1, + G_MAXINT, + -1, + GTK_PARAM_READWRITE)); g_object_class_install_property (object_class, - PROP_PRINT_SETTINGS, - g_param_spec_object ("print-settings", - P_("Print Settings"), - P_("The GtkPrintSettings used for initializing the dialog"), - GTK_TYPE_PRINT_SETTINGS, - GTK_PARAM_READWRITE)); + PROP_PRINT_SETTINGS, + g_param_spec_object ("print-settings", + P_("Print Settings"), + P_("The GtkPrintSettings used for initializing the dialog"), + GTK_TYPE_PRINT_SETTINGS, + GTK_PARAM_READWRITE)); g_object_class_install_property (object_class, - PROP_SELECTED_PRINTER, - g_param_spec_object ("selected-printer", - P_("Selected Printer"), - P_("The GtkPrinter which is selected"), - GTK_TYPE_PRINTER, - GTK_PARAM_READABLE)); - - - g_type_class_add_private (class, sizeof (GtkPrintUnixDialogPrivate)); + PROP_SELECTED_PRINTER, + g_param_spec_object ("selected-printer", + P_("Selected Printer"), + P_("The GtkPrinter which is selected"), + GTK_TYPE_PRINTER, + GTK_PARAM_READABLE)); + + g_object_class_install_property (object_class, + PROP_MANUAL_CAPABILITIES, + g_param_spec_flags ("manual-capabilities", + P_("Manual Capabilities"), + P_("Capabilities the application can handle"), + GTK_TYPE_PRINT_CAPABILITIES, + 0, + GTK_PARAM_READWRITE)); + + g_object_class_install_property (object_class, + PROP_SUPPORT_SELECTION, + g_param_spec_boolean ("support-selection", + P_("Support Selection"), + P_("Whether the dialog supports selection"), + FALSE, + GTK_PARAM_READWRITE)); + + g_object_class_install_property (object_class, + PROP_HAS_SELECTION, + g_param_spec_boolean ("has-selection", + P_("Has Selection"), + P_("Whether the application has a selection"), + FALSE, + GTK_PARAM_READWRITE)); + + g_object_class_install_property (object_class, + PROP_EMBED_PAGE_SETUP, + g_param_spec_boolean ("embed-page-setup", + P_("Embed Page Setup"), + P_("TRUE if page setup combos are embedded in GtkPrintUnixDialog"), + FALSE, + GTK_PARAM_READWRITE)); + + g_type_class_add_private (class, sizeof (GtkPrintUnixDialogPrivate)); } /* Returns a toplevel GtkWindow, or NULL if none */ @@ -297,12 +437,41 @@ get_toplevel (GtkWidget *widget) GtkWidget *toplevel = NULL; toplevel = gtk_widget_get_toplevel (widget); - if (!GTK_WIDGET_TOPLEVEL (toplevel)) + if (!gtk_widget_is_toplevel (toplevel)) return NULL; else return GTK_WINDOW (toplevel); } +static void +set_busy_cursor (GtkPrintUnixDialog *dialog, + gboolean busy) +{ + GtkWidget *widget; + GtkWindow *toplevel; + GdkDisplay *display; + GdkCursor *cursor; + + toplevel = get_toplevel (GTK_WIDGET (dialog)); + widget = GTK_WIDGET (toplevel); + + if (!toplevel || !gtk_widget_get_realized (widget)) + return; + + display = gtk_widget_get_display (widget); + + if (busy) + cursor = gdk_cursor_new_for_display (display, GDK_WATCH); + else + cursor = NULL; + + gdk_window_set_cursor (gtk_widget_get_window (widget), cursor); + gdk_display_flush (display); + + if (cursor) + g_object_unref (cursor); +} + static void add_custom_button_to_dialog (GtkDialog *dialog, const gchar *mnemonic_label, @@ -312,7 +481,7 @@ add_custom_button_to_dialog (GtkDialog *dialog, GtkWidget *button = NULL; button = gtk_button_new_with_mnemonic (mnemonic_label); - GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT); + gtk_widget_set_can_default (button, TRUE); gtk_button_set_image (GTK_BUTTON (button), gtk_image_new_from_stock (stock_id, GTK_ICON_SIZE_BUTTON)); @@ -342,72 +511,82 @@ error_dialogs (GtkPrintUnixDialog *print_dialog, { printer = gtk_print_unix_dialog_get_selected_printer (print_dialog); - /* Shows overwrite confirmation dialog in the case of printing to file which - * already exists. */ - if (printer != NULL && gtk_printer_is_virtual (printer)) + if (printer != NULL) { - option = gtk_printer_option_set_lookup (priv->options, - "gtk-main-page-custom-input"); + if (priv->request_details_tag || !gtk_printer_is_accepting_jobs (printer)) + { + g_signal_stop_emission_by_name (print_dialog, "response"); + return TRUE; + } - if (option != NULL && - option->type == GTK_PRINTER_OPTION_TYPE_FILESAVE) + /* Shows overwrite confirmation dialog in the case of printing + * to file which already exists. + */ + if (gtk_printer_is_virtual (printer)) { - file = g_file_new_for_uri (option->value); + option = gtk_printer_option_set_lookup (priv->options, + "gtk-main-page-custom-input"); - if (file != NULL && - g_file_query_exists (file, NULL)) + if (option != NULL && + option->type == GTK_PRINTER_OPTION_TYPE_FILESAVE) { - toplevel = get_toplevel (GTK_WIDGET (print_dialog)); - - basename = g_file_get_basename (file); - dirname = g_file_get_parse_name (g_file_get_parent (file)); - - dialog = gtk_message_dialog_new (toplevel, - GTK_DIALOG_MODAL | - GTK_DIALOG_DESTROY_WITH_PARENT, - GTK_MESSAGE_QUESTION, - GTK_BUTTONS_NONE, - _("A file named \"%s\" already exists. Do you want to replace it?"), - basename); - - gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog), - _("The file already exists in \"%s\". Replacing it will " - "overwrite its contents."), - dirname); - - gtk_dialog_add_button (GTK_DIALOG (dialog), - GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL); - add_custom_button_to_dialog (GTK_DIALOG (dialog), - _("_Replace"), - GTK_STOCK_PRINT, - GTK_RESPONSE_ACCEPT); - gtk_dialog_set_alternative_button_order (GTK_DIALOG (dialog), - GTK_RESPONSE_ACCEPT, - GTK_RESPONSE_CANCEL, - -1); - gtk_dialog_set_default_response (GTK_DIALOG (dialog), - GTK_RESPONSE_ACCEPT); - - if (toplevel->group) - gtk_window_group_add_window (toplevel->group, - GTK_WINDOW (dialog)); - - response = gtk_dialog_run (GTK_DIALOG (dialog)); + file = g_file_new_for_uri (option->value); - gtk_widget_destroy (dialog); - - g_free (dirname); - g_free (basename); - - if (response != GTK_RESPONSE_ACCEPT) + if (file != NULL && + g_file_query_exists (file, NULL)) { - g_signal_stop_emission_by_name (print_dialog, "response"); - g_object_unref (file); - return TRUE; + toplevel = get_toplevel (GTK_WIDGET (print_dialog)); + + basename = g_file_get_basename (file); + dirname = g_file_get_parse_name (g_file_get_parent (file)); + + dialog = gtk_message_dialog_new (toplevel, + GTK_DIALOG_MODAL | + GTK_DIALOG_DESTROY_WITH_PARENT, + GTK_MESSAGE_QUESTION, + GTK_BUTTONS_NONE, + _("A file named \"%s\" already exists. Do you want to replace it?"), + basename); + + gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog), + _("The file already exists in \"%s\". Replacing it will " + "overwrite its contents."), + dirname); + + gtk_dialog_add_button (GTK_DIALOG (dialog), + GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL); + add_custom_button_to_dialog (GTK_DIALOG (dialog), + _("_Replace"), + GTK_STOCK_PRINT, + GTK_RESPONSE_ACCEPT); + gtk_dialog_set_alternative_button_order (GTK_DIALOG (dialog), + GTK_RESPONSE_ACCEPT, + GTK_RESPONSE_CANCEL, + -1); + gtk_dialog_set_default_response (GTK_DIALOG (dialog), + GTK_RESPONSE_ACCEPT); + + if (gtk_window_has_group (toplevel)) + gtk_window_group_add_window (gtk_window_get_group (toplevel), + GTK_WINDOW (dialog)); + + response = gtk_dialog_run (GTK_DIALOG (dialog)); + + gtk_widget_destroy (dialog); + + g_free (dirname); + g_free (basename); + + if (response != GTK_RESPONSE_ACCEPT) + { + g_signal_stop_emission_by_name (print_dialog, "response"); + g_object_unref (file); + return TRUE; + } } - } - g_object_unref (file); + g_object_unref (file); + } } } } @@ -417,9 +596,13 @@ error_dialogs (GtkPrintUnixDialog *print_dialog, static void gtk_print_unix_dialog_init (GtkPrintUnixDialog *dialog) { - GtkPrintUnixDialogPrivate *priv = dialog->priv; + GtkPrintUnixDialogPrivate *priv; + + dialog->priv = G_TYPE_INSTANCE_GET_PRIVATE (dialog, + GTK_TYPE_PRINT_UNIX_DIALOG, + GtkPrintUnixDialogPrivate); + priv = dialog->priv; - priv = dialog->priv = GTK_PRINT_UNIX_DIALOG_GET_PRIVATE (dialog); priv->print_backends = NULL; priv->current_page = -1; priv->number_up_layout_n_option = NULL; @@ -427,48 +610,60 @@ gtk_print_unix_dialog_init (GtkPrintUnixDialog *dialog) priv->page_setup = gtk_page_setup_new (); priv->page_setup_set = FALSE; + priv->embed_page_setup = FALSE; + priv->internal_page_setup_change = FALSE; + + priv->support_selection = FALSE; + priv->has_selection = FALSE; - g_signal_connect (dialog, - "destroy", - (GCallback) gtk_print_unix_dialog_destroy, - NULL); + g_signal_connect (dialog, "destroy", + (GCallback) gtk_print_unix_dialog_destroy, NULL); - g_signal_connect (dialog, - "response", - (GCallback) error_dialogs, - NULL); + g_signal_connect (dialog, "response", + (GCallback) error_dialogs, NULL); + + g_signal_connect (dialog, "notify::page-setup", + (GCallback) redraw_page_layout_preview, NULL); priv->preview_button = gtk_button_new_from_stock (GTK_STOCK_PRINT_PREVIEW); gtk_widget_show (priv->preview_button); - - gtk_dialog_add_action_widget (GTK_DIALOG (dialog), - priv->preview_button, + + gtk_dialog_add_action_widget (GTK_DIALOG (dialog), + priv->preview_button, GTK_RESPONSE_APPLY); gtk_dialog_add_buttons (GTK_DIALOG (dialog), - GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, - GTK_STOCK_PRINT, GTK_RESPONSE_OK, + GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, + GTK_STOCK_PRINT, GTK_RESPONSE_OK, NULL); gtk_dialog_set_alternative_button_order (GTK_DIALOG (dialog), - GTK_RESPONSE_APPLY, - GTK_RESPONSE_OK, - GTK_RESPONSE_CANCEL, - -1); + GTK_RESPONSE_APPLY, + GTK_RESPONSE_OK, + GTK_RESPONSE_CANCEL, + -1); gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK); gtk_dialog_set_response_sensitive (GTK_DIALOG (dialog), GTK_RESPONSE_OK, FALSE); - populate_dialog (dialog); + priv->page_setup_list = gtk_list_store_new (PAGE_SETUP_LIST_N_COLS, + G_TYPE_OBJECT, + G_TYPE_BOOLEAN); + + priv->custom_paper_list = gtk_list_store_new (1, G_TYPE_OBJECT); + _gtk_print_load_custom_papers (priv->custom_paper_list); + + populate_dialog (dialog); } static void gtk_print_unix_dialog_destroy (GtkPrintUnixDialog *dialog) { /* Make sure we don't destroy custom widgets owned by the backends */ - clear_per_printer_ui (dialog); + clear_per_printer_ui (dialog); } static void -disconnect_printer_details_request (GtkPrintUnixDialog *dialog) +disconnect_printer_details_request (GtkPrintUnixDialog *dialog, + gboolean details_failed) { GtkPrintUnixDialogPrivate *priv = dialog->priv; @@ -477,6 +672,21 @@ disconnect_printer_details_request (GtkPrintUnixDialog *dialog) g_signal_handler_disconnect (priv->request_details_printer, priv->request_details_tag); priv->request_details_tag = 0; + set_busy_cursor (dialog, FALSE); + if (details_failed) + gtk_list_store_set (GTK_LIST_STORE (priv->printer_list), + g_object_get_data (G_OBJECT (priv->request_details_printer), + "gtk-print-tree-iter"), + PRINTER_LIST_COL_STATE, + _("Getting printer information failed"), + -1); + else + gtk_list_store_set (GTK_LIST_STORE (priv->printer_list), + g_object_get_data (G_OBJECT (priv->request_details_printer), + "gtk-print-tree-iter"), + PRINTER_LIST_COL_STATE, + gtk_printer_get_state_message (priv->request_details_printer), + -1); g_object_unref (priv->request_details_printer); priv->request_details_printer = NULL; } @@ -491,33 +701,14 @@ gtk_print_unix_dialog_finalize (GObject *object) GList *node; unschedule_idle_mark_conflicts (dialog); - disconnect_printer_details_request (dialog); - - if (priv->current_printer) - { - g_object_unref (priv->current_printer); - priv->current_printer = NULL; - } + disconnect_printer_details_request (dialog, FALSE); - if (priv->printer_list) - { - g_object_unref (priv->printer_list); - priv->printer_list = NULL; - } - - if (priv->printer_list_filter) - { - g_object_unref (priv->printer_list_filter); - priv->printer_list_filter = NULL; - } + g_clear_object (&priv->current_printer); + g_clear_object (&priv->printer_list); + g_clear_object (&priv->custom_paper_list); + g_clear_object (&priv->printer_list_filter); + g_clear_object (&priv->options); - - if (priv->options) - { - g_object_unref (priv->options); - priv->options = NULL; - } - if (priv->number_up_layout_2_option) { priv->number_up_layout_2_option->choices[0] = NULL; @@ -530,29 +721,11 @@ gtk_print_unix_dialog_finalize (GObject *object) priv->number_up_layout_2_option = NULL; } - if (priv->number_up_layout_n_option) - { - g_object_unref (priv->number_up_layout_n_option); - priv->number_up_layout_n_option = NULL; - } - - if (priv->page_setup) - { - g_object_unref (priv->page_setup); - priv->page_setup = NULL; - } - - if (priv->initial_settings) - { - g_object_unref (priv->initial_settings); - priv->initial_settings = NULL; - } - - g_free (priv->waiting_for_printer); - priv->waiting_for_printer = NULL; - - g_free (priv->format_for_printer); - priv->format_for_printer = NULL; + g_clear_object (&priv->number_up_layout_n_option); + g_clear_object (&priv->page_setup); + g_clear_object (&priv->initial_settings); + g_clear_pointer (&priv->waiting_for_printer, (GDestroyNotify)g_free); + g_clear_pointer (&priv->format_for_printer, (GDestroyNotify)g_free); for (node = priv->print_backends; node != NULL; node = node->next) { @@ -565,17 +738,19 @@ gtk_print_unix_dialog_finalize (GObject *object) gtk_print_backend_destroy (backend); g_object_unref (backend); } - + g_list_free (priv->print_backends); priv->print_backends = NULL; - + + g_clear_object (&priv->page_setup_list); + G_OBJECT_CLASS (gtk_print_unix_dialog_parent_class)->finalize (object); } static void -printer_removed_cb (GtkPrintBackend *backend, - GtkPrinter *printer, - GtkPrintUnixDialog *dialog) +printer_removed_cb (GtkPrintBackend *backend, + GtkPrinter *printer, + GtkPrintUnixDialog *dialog) { GtkPrintUnixDialogPrivate *priv = dialog->priv; GtkTreeIter *iter; @@ -603,8 +778,9 @@ gtk_print_unix_dialog_buildable_get_internal_child (GtkBuildable *buildable, return parent_buildable_iface->get_internal_child (buildable, builder, childname); } -/* This function controls "sensitive" property of GtkCellRenderer based on pause - * state of printers. */ +/* This function controls "sensitive" property of GtkCellRenderer + * based on pause state of printers. + */ void set_cell_sensitivity_func (GtkTreeViewColumn *tree_column, GtkCellRenderer *cell, GtkTreeModel *tree_model, @@ -612,23 +788,23 @@ void set_cell_sensitivity_func (GtkTreeViewColumn *tree_column, gpointer data) { GtkPrinter *printer; - - gtk_tree_model_get (tree_model, iter, PRINTER_LIST_COL_PRINTER_OBJ, &printer, -1); + + gtk_tree_model_get (tree_model, iter, + PRINTER_LIST_COL_PRINTER_OBJ, &printer, + -1); if (printer != NULL && !gtk_printer_is_accepting_jobs (printer)) - g_object_set (cell, - "sensitive", FALSE, - NULL); + g_object_set (cell, "sensitive", FALSE, NULL); else - g_object_set (cell, - "sensitive", TRUE, - NULL); + g_object_set (cell, "sensitive", TRUE, NULL); + + g_object_unref (printer); } static void -printer_status_cb (GtkPrintBackend *backend, - GtkPrinter *printer, - GtkPrintUnixDialog *dialog) +printer_status_cb (GtkPrintBackend *backend, + GtkPrinter *printer, + GtkPrintUnixDialog *dialog) { GtkPrintUnixDialogPrivate *priv = dialog->priv; GtkTreeIter *iter; @@ -644,7 +820,8 @@ printer_status_cb (GtkPrintBackend *backend, -1); /* When the pause state change then we need to update sensitive property - * of GTK_RESPONSE_OK button inside of selected_printer_changed function. */ + * of GTK_RESPONSE_OK button inside of selected_printer_changed function. + */ selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (priv->printer_treeview)); selected_printer_changed (selection, dialog); @@ -655,9 +832,9 @@ printer_status_cb (GtkPrintBackend *backend, } static void -printer_added_cb (GtkPrintBackend *backend, - GtkPrinter *printer, - GtkPrintUnixDialog *dialog) +printer_added_cb (GtkPrintBackend *backend, + GtkPrinter *printer, + GtkPrintUnixDialog *dialog) { GtkPrintUnixDialogPrivate *priv = dialog->priv; GtkTreeIter iter, filter_iter; @@ -665,9 +842,9 @@ printer_added_cb (GtkPrintBackend *backend, GtkTreePath *path; gtk_list_store_append (GTK_LIST_STORE (priv->printer_list), &iter); - - 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); @@ -681,14 +858,13 @@ printer_added_cb (GtkPrintBackend *backend, -1); gtk_tree_model_filter_convert_child_iter_to_iter (priv->printer_list_filter, - &filter_iter, &iter); + &filter_iter, &iter); path = gtk_tree_model_get_path (GTK_TREE_MODEL (priv->printer_list_filter), &filter_iter); selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (priv->printer_treeview)); - + if (priv->waiting_for_printer != NULL && - strcmp (gtk_printer_get_name (printer), - priv->waiting_for_printer) == 0) + strcmp (gtk_printer_get_name (printer), priv->waiting_for_printer) == 0) { priv->internal_printer_change = TRUE; gtk_tree_selection_select_iter (selection, &filter_iter); @@ -699,7 +875,7 @@ printer_added_cb (GtkPrintBackend *backend, priv->waiting_for_printer = NULL; } else if (is_default_printer (dialog, printer) && - gtk_tree_selection_count_selected_rows (selection) == 0) + gtk_tree_selection_count_selected_rows (selection) == 0) { priv->internal_printer_change = TRUE; gtk_tree_selection_select_iter (selection, &filter_iter); @@ -713,27 +889,21 @@ printer_added_cb (GtkPrintBackend *backend, static void printer_list_initialize (GtkPrintUnixDialog *dialog, - GtkPrintBackend *print_backend) + GtkPrintBackend *print_backend) { GList *list; GList *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); @@ -757,14 +927,17 @@ load_print_backends (GtkPrintUnixDialog *dialog) priv->print_backends = gtk_print_backend_load_modules (); for (node = priv->print_backends; node != NULL; node = node->next) - printer_list_initialize (dialog, GTK_PRINT_BACKEND (node->data)); + { + GtkPrintBackend *backend = node->data; + printer_list_initialize (dialog, backend); + } } static void gtk_print_unix_dialog_set_property (GObject *object, - guint prop_id, - const GValue *value, - GParamSpec *pspec) + guint prop_id, + const GValue *value, + GParamSpec *pspec) { GtkPrintUnixDialog *dialog = GTK_PRINT_UNIX_DIALOG (object); @@ -780,6 +953,18 @@ gtk_print_unix_dialog_set_property (GObject *object, case PROP_PRINT_SETTINGS: gtk_print_unix_dialog_set_settings (dialog, g_value_get_object (value)); break; + case PROP_MANUAL_CAPABILITIES: + gtk_print_unix_dialog_set_manual_capabilities (dialog, g_value_get_flags (value)); + break; + case PROP_SUPPORT_SELECTION: + gtk_print_unix_dialog_set_support_selection (dialog, g_value_get_boolean (value)); + break; + case PROP_HAS_SELECTION: + gtk_print_unix_dialog_set_has_selection (dialog, g_value_get_boolean (value)); + break; + case PROP_EMBED_PAGE_SETUP: + gtk_print_unix_dialog_set_embed_page_setup (dialog, g_value_get_boolean (value)); + break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); break; @@ -788,9 +973,9 @@ gtk_print_unix_dialog_set_property (GObject *object, static void gtk_print_unix_dialog_get_property (GObject *object, - guint prop_id, - GValue *value, - GParamSpec *pspec) + guint prop_id, + GValue *value, + GParamSpec *pspec) { GtkPrintUnixDialog *dialog = GTK_PRINT_UNIX_DIALOG (object); GtkPrintUnixDialogPrivate *priv = dialog->priv; @@ -809,6 +994,18 @@ gtk_print_unix_dialog_get_property (GObject *object, case PROP_SELECTED_PRINTER: g_value_set_object (value, priv->current_printer); break; + case PROP_MANUAL_CAPABILITIES: + g_value_set_flags (value, priv->manual_capabilities); + break; + case PROP_SUPPORT_SELECTION: + g_value_set_boolean (value, priv->support_selection); + break; + case PROP_HAS_SELECTION: + g_value_set_boolean (value, priv->has_selection); + break; + case PROP_EMBED_PAGE_SETUP: + g_value_set_boolean (value, priv->embed_page_setup); + break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); break; @@ -818,38 +1015,36 @@ gtk_print_unix_dialog_get_property (GObject *object, static gboolean is_printer_active (GtkTreeModel *model, GtkTreeIter *iter, - GtkPrintUnixDialog *dialog) + GtkPrintUnixDialog *dialog) { gboolean result; GtkPrinter *printer; GtkPrintUnixDialogPrivate *priv = dialog->priv; - gtk_tree_model_get (model, - iter, - PRINTER_LIST_COL_PRINTER_OBJ, - &printer, - -1); - + gtk_tree_model_get (model, iter, + PRINTER_LIST_COL_PRINTER_OBJ, &printer, + -1); + if (printer == NULL) return FALSE; result = gtk_printer_is_active (printer); - - if (result && + + if (result && priv->manual_capabilities & (GTK_PRINT_CAPABILITY_GENERATE_PDF | - GTK_PRINT_CAPABILITY_GENERATE_PS)) + GTK_PRINT_CAPABILITY_GENERATE_PS)) { - /* Check that the printer can handle at least one of the data - * formats that the application supports. + /* Check that the printer can handle at least one of the data + * formats that the application supports. */ result = ((priv->manual_capabilities & GTK_PRINT_CAPABILITY_GENERATE_PDF) && - gtk_printer_accepts_pdf (printer)) || - ((priv->manual_capabilities & GTK_PRINT_CAPABILITY_GENERATE_PS) && - gtk_printer_accepts_ps (printer)); + gtk_printer_accepts_pdf (printer)) || + ((priv->manual_capabilities & GTK_PRINT_CAPABILITY_GENERATE_PS) && + gtk_printer_accepts_ps (printer)); } - + g_object_unref (printer); - + return result; } @@ -865,14 +1060,14 @@ default_printer_list_sort_func (GtkTreeModel *model, GtkPrinter *b_printer; gint result; - gtk_tree_model_get (model, a, - PRINTER_LIST_COL_NAME, &a_name, - PRINTER_LIST_COL_PRINTER_OBJ, &a_printer, - -1); - gtk_tree_model_get (model, b, + gtk_tree_model_get (model, a, + PRINTER_LIST_COL_NAME, &a_name, + PRINTER_LIST_COL_PRINTER_OBJ, &a_printer, + -1); + gtk_tree_model_get (model, b, PRINTER_LIST_COL_NAME, &b_name, - PRINTER_LIST_COL_PRINTER_OBJ, &b_printer, - -1); + PRINTER_LIST_COL_PRINTER_OBJ, &b_printer, + -1); if (a_printer == NULL && b_printer == NULL) result = 0; @@ -897,13 +1092,14 @@ default_printer_list_sort_func (GtkTreeModel *model, g_free (a_name); g_free (b_name); - g_object_unref (a_printer); - g_object_unref (b_printer); + if (a_printer) + g_object_unref (a_printer); + if (b_printer) + g_object_unref (b_printer); return result; } - static void create_printer_list_model (GtkPrintUnixDialog *dialog) { @@ -913,69 +1109,68 @@ create_printer_list_model (GtkPrintUnixDialog *dialog) model = gtk_list_store_new (PRINTER_LIST_N_COLS, G_TYPE_STRING, - G_TYPE_STRING, - G_TYPE_STRING, - G_TYPE_INT, + G_TYPE_STRING, + G_TYPE_STRING, + G_TYPE_INT, G_TYPE_STRING, G_TYPE_OBJECT); priv->printer_list = (GtkTreeModel *)model; priv->printer_list_filter = (GtkTreeModelFilter *) gtk_tree_model_filter_new ((GtkTreeModel *)model, - NULL); + NULL); gtk_tree_model_filter_set_visible_func (priv->printer_list_filter, - (GtkTreeModelFilterVisibleFunc) is_printer_active, - dialog, - NULL); + (GtkTreeModelFilterVisibleFunc) is_printer_active, + dialog, + NULL); sort = GTK_TREE_SORTABLE (model); gtk_tree_sortable_set_default_sort_func (sort, - default_printer_list_sort_func, - NULL, - NULL); - + default_printer_list_sort_func, + NULL, + NULL); + gtk_tree_sortable_set_sort_column_id (sort, - GTK_TREE_SORTABLE_DEFAULT_SORT_COLUMN_ID, - GTK_SORT_ASCENDING); + GTK_TREE_SORTABLE_DEFAULT_SORT_COLUMN_ID, + GTK_SORT_ASCENDING); } static GtkWidget * -wrap_in_frame (const gchar *label, +wrap_in_frame (const gchar *label, GtkWidget *child) { - GtkWidget *frame, *alignment, *label_widget; + GtkWidget *frame, *label_widget; gchar *bold_text; label_widget = gtk_label_new (NULL); - gtk_misc_set_alignment (GTK_MISC (label_widget), 0.0, 0.5); + gtk_widget_set_halign (label_widget, GTK_ALIGN_START); + gtk_widget_set_valign (label_widget, GTK_ALIGN_CENTER); 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); + + frame = gtk_box_new (GTK_ORIENTATION_VERTICAL, 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_set_margin_left (child, 12); + gtk_widget_set_halign (child, GTK_ALIGN_FILL); + gtk_widget_set_valign (child, GTK_ALIGN_FILL); + + gtk_box_pack_start (GTK_BOX (frame), child, FALSE, FALSE, 0); gtk_widget_show (frame); - gtk_widget_show (alignment); - + return frame; } static gboolean setup_option (GtkPrintUnixDialog *dialog, - const gchar *option_name, - GtkPrinterOptionWidget *widget) + const gchar *option_name, + GtkPrinterOptionWidget *widget) { GtkPrintUnixDialogPrivate *priv = dialog->priv; GtkPrinterOption *option; @@ -988,83 +1183,115 @@ setup_option (GtkPrintUnixDialog *dialog, static void add_option_to_extension_point (GtkPrinterOption *option, - gpointer data) + gpointer data) { GtkWidget *extension_point = data; GtkWidget *widget; widget = gtk_printer_option_widget_new (option); gtk_widget_show (widget); - + if (gtk_printer_option_widget_has_external_label (GTK_PRINTER_OPTION_WIDGET (widget))) { GtkWidget *label, *hbox; - + label = gtk_printer_option_widget_get_external_label (GTK_PRINTER_OPTION_WIDGET (widget)); gtk_widget_show (label); - gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); + gtk_widget_set_halign (label, GTK_ALIGN_START); + gtk_widget_set_valign (label, GTK_ALIGN_CENTER); gtk_label_set_mnemonic_widget (GTK_LABEL (label), widget); - - hbox = gtk_hbox_new (FALSE, 12); + + hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12); gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0); gtk_box_pack_start (GTK_BOX (hbox), widget, FALSE, FALSE, 0); gtk_widget_show (hbox); - - gtk_box_pack_start (GTK_BOX (extension_point), hbox, FALSE, FALSE, 0); + + gtk_box_pack_start (GTK_BOX (extension_point), hbox, TRUE, TRUE, 0); } else - gtk_box_pack_start (GTK_BOX (extension_point), widget, FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX (extension_point), widget, TRUE, TRUE, 0); +} + +static gint +grid_rows (GtkGrid *table) +{ + gint t0, t1, t, h; + GList *children, *c; + + children = gtk_container_get_children (GTK_CONTAINER (table)); + t0 = t1 = 0; + for (c = children; c; c = c->next) + { + gtk_container_child_get (GTK_CONTAINER (table), c->data, + "top-attach", &t, + "height", &h, + NULL); + if (c == children) + { + t0 = t; + t1 = t + h; + } + else + { + if (t < t0) + t0 = t; + if (t + h > t1) + t1 = t + h; + } + } + g_list_free (children); + + return t1 - t0; } static void add_option_to_table (GtkPrinterOption *option, - gpointer user_data) + gpointer user_data) { - GtkTable *table; + GtkGrid *table; GtkWidget *label, *widget; - gint row; + guint row; + + table = GTK_GRID (user_data); - table = GTK_TABLE (user_data); - if (g_str_has_prefix (option->name, "gtk-")) return; - + + row = grid_rows (table); + widget = gtk_printer_option_widget_new (option); gtk_widget_show (widget); - row = table->nrows; - gtk_table_resize (table, table->nrows + 1, 2); - if (gtk_printer_option_widget_has_external_label (GTK_PRINTER_OPTION_WIDGET (widget))) { label = gtk_printer_option_widget_get_external_label (GTK_PRINTER_OPTION_WIDGET (widget)); gtk_widget_show (label); - gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); + gtk_widget_set_halign (label, GTK_ALIGN_START); + gtk_widget_set_valign (label, GTK_ALIGN_CENTER); gtk_label_set_mnemonic_widget (GTK_LABEL (label), widget); - gtk_table_attach (table, label, - 0, 1, row - 1 , row, GTK_FILL, 0, 0, 0); - - gtk_table_attach (table, widget, - 1, 2, row - 1, row, GTK_FILL, 0, 0, 0); + gtk_grid_attach (table, label, 0, row - 1, 1, 1); + gtk_grid_attach (table, widget, 1, row - 1, 1, 1); } else - gtk_table_attach (table, widget, - 0, 2, row - 1, row, GTK_FILL, 0, 0, 0); + gtk_grid_attach (table, widget, 0, row - 1, 2, 1); } - static void setup_page_table (GtkPrinterOptionSet *options, - const gchar *group, - GtkWidget *table, - GtkWidget *page) + const gchar *group, + GtkWidget *table, + GtkWidget *page) { + gint nrows; + gtk_printer_option_set_foreach_in_group (options, group, - add_option_to_table, - table); - if (GTK_TABLE (table)->nrows == 1) + add_option_to_table, + table); + + nrows = grid_rows (GTK_GRID (table)); + if (nrows == 0) gtk_widget_hide (page); else gtk_widget_show (page); @@ -1075,27 +1302,29 @@ update_print_at_option (GtkPrintUnixDialog *dialog) { GtkPrintUnixDialogPrivate *priv = dialog->priv; GtkPrinterOption *option; - + option = gtk_printer_option_set_lookup (priv->options, "gtk-print-time"); if (option == NULL) return; - + if (priv->updating_print_at) return; - + if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (priv->print_at_radio))) gtk_printer_option_set (option, "at"); else if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (priv->print_hold_radio))) gtk_printer_option_set (option, "on-hold"); else gtk_printer_option_set (option, "now"); - + option = gtk_printer_option_set_lookup (priv->options, "gtk-print-time-text"); if (option != NULL) { - const char *text = gtk_entry_get_text (GTK_ENTRY (priv->print_at_entry)); - gtk_printer_option_set (option,text); + const gchar *text; + + text = gtk_entry_get_text (GTK_ENTRY (priv->print_at_entry)); + gtk_printer_option_set (option, text); } } @@ -1105,13 +1334,13 @@ setup_print_at (GtkPrintUnixDialog *dialog) { GtkPrintUnixDialogPrivate *priv = dialog->priv; GtkPrinterOption *option; - + option = gtk_printer_option_set_lookup (priv->options, "gtk-print-time"); - + if (option == NULL) { gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (priv->print_now_radio), - TRUE); + TRUE); gtk_widget_set_sensitive (priv->print_at_radio, FALSE); gtk_widget_set_sensitive (priv->print_at_entry, FALSE); gtk_widget_set_sensitive (priv->print_hold_radio, FALSE); @@ -1120,44 +1349,35 @@ setup_print_at (GtkPrintUnixDialog *dialog) } priv->updating_print_at = TRUE; - - if (gtk_printer_option_has_choice (option, "at")) - { - gtk_widget_set_sensitive (priv->print_at_radio, TRUE); - gtk_widget_set_sensitive (priv->print_at_entry, TRUE); - } - else - { - gtk_widget_set_sensitive (priv->print_at_radio, FALSE); - gtk_widget_set_sensitive (priv->print_at_entry, FALSE); - } - + + gtk_widget_set_sensitive (priv->print_at_entry, FALSE); + gtk_widget_set_sensitive (priv->print_at_radio, + gtk_printer_option_has_choice (option, "at")); + gtk_widget_set_sensitive (priv->print_hold_radio, - gtk_printer_option_has_choice (option, "on-hold")); + gtk_printer_option_has_choice (option, "on-hold")); update_print_at_option (dialog); if (strcmp (option->value, "at") == 0) gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (priv->print_at_radio), - TRUE); + TRUE); else if (strcmp (option->value, "on-hold") == 0) gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (priv->print_hold_radio), - TRUE); + TRUE); else gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (priv->print_now_radio), - TRUE); + TRUE); option = gtk_printer_option_set_lookup (priv->options, "gtk-print-time-text"); if (option != NULL) - gtk_entry_set_text (GTK_ENTRY (priv->print_at_entry), - option->value); - + gtk_entry_set_text (GTK_ENTRY (priv->print_at_entry), option->value); priv->updating_print_at = FALSE; return TRUE; } - + static void update_dialog_from_settings (GtkPrintUnixDialog *dialog) { @@ -1166,7 +1386,9 @@ update_dialog_from_settings (GtkPrintUnixDialog *dialog) gchar *group; GtkWidget *table, *frame; gboolean has_advanced, has_job; - + guint nrows; + GList *children; + if (priv->current_printer == NULL) { clear_per_printer_ui (dialog); @@ -1179,7 +1401,7 @@ update_dialog_from_settings (GtkPrintUnixDialog *dialog) return; } - + setup_option (dialog, "gtk-n-up", priv->pages_per_sheet); setup_option (dialog, "gtk-n-up-layout", priv->number_up_layout); setup_option (dialog, "gtk-duplex", priv->duplex); @@ -1193,32 +1415,41 @@ update_dialog_from_settings (GtkPrintUnixDialog *dialog) has_job |= setup_option (dialog, "gtk-cover-before", priv->cover_before); has_job |= setup_option (dialog, "gtk-cover-after", priv->cover_after); has_job |= setup_print_at (dialog); - + if (has_job) gtk_widget_show (priv->job_page); else gtk_widget_hide (priv->job_page); - setup_page_table (priv->options, - "ImageQualityPage", - priv->image_quality_table, - priv->image_quality_page); - + "ImageQualityPage", + priv->image_quality_table, + priv->image_quality_page); + setup_page_table (priv->options, - "FinishingPage", - priv->finishing_table, - priv->finishing_page); + "FinishingPage", + priv->finishing_table, + priv->finishing_page); setup_page_table (priv->options, - "ColorPage", - priv->color_table, - priv->color_page); + "ColorPage", + priv->color_table, + priv->color_page); gtk_printer_option_set_foreach_in_group (priv->options, - "GtkPrintDialogExtension", - add_option_to_extension_point, - priv->extension_point); + "GtkPrintDialogExtension", + add_option_to_extension_point, + priv->extension_point); + + /* A bit of a hack, keep the last option flush right. + * This keeps the file format radios from moving as the + * filename changes. + */ + children = gtk_container_get_children (GTK_CONTAINER (priv->extension_point)); + l = g_list_last (children); + if (l && l != children) + gtk_widget_set_halign (GTK_WIDGET (l->data), GTK_ALIGN_END); + g_list_free (children); /* Put the rest of the groups in the advanced page */ groups = gtk_printer_option_set_get_groups (priv->options); @@ -1229,34 +1460,36 @@ update_dialog_from_settings (GtkPrintUnixDialog *dialog) group = l->data; if (group == NULL) - continue; - + continue; + if (strcmp (group, "ImageQualityPage") == 0 || - strcmp (group, "ColorPage") == 0 || - strcmp (group, "FinishingPage") == 0 || - strcmp (group, "GtkPrintDialogExtension") == 0) - continue; - - table = gtk_table_new (1, 2, FALSE); - gtk_table_set_row_spacings (GTK_TABLE (table), 6); - gtk_table_set_col_spacings (GTK_TABLE (table), 12); - + strcmp (group, "ColorPage") == 0 || + strcmp (group, "FinishingPage") == 0 || + strcmp (group, "GtkPrintDialogExtension") == 0) + continue; + + table = gtk_grid_new (); + gtk_grid_set_row_spacing (GTK_GRID (table), 6); + gtk_grid_set_column_spacing (GTK_GRID (table), 12); + gtk_printer_option_set_foreach_in_group (priv->options, - group, - add_option_to_table, - table); - if (GTK_TABLE (table)->nrows == 1) - gtk_widget_destroy (table); + group, + add_option_to_table, + table); + + nrows = grid_rows (GTK_GRID (table)); + if (nrows == 0) + gtk_widget_destroy (table); else - { - has_advanced = TRUE; - frame = wrap_in_frame (group, table); - gtk_widget_show (table); - gtk_widget_show (frame); - - gtk_box_pack_start (GTK_BOX (priv->advanced_vbox), - frame, FALSE, FALSE, 0); - } + { + has_advanced = TRUE; + frame = wrap_in_frame (group, table); + gtk_widget_show (table); + gtk_widget_show (frame); + + gtk_box_pack_start (GTK_BOX (priv->advanced_vbox), + frame, FALSE, FALSE, 0); + } } if (has_advanced) @@ -1264,9 +1497,7 @@ update_dialog_from_settings (GtkPrintUnixDialog *dialog) else gtk_widget_hide (priv->advanced_page); - - g_list_foreach (groups, (GFunc) g_free, NULL); - g_list_free (groups); + g_list_free_full (groups, g_free); } static void @@ -1283,18 +1514,18 @@ update_dialog_from_capabilities (GtkPrintUnixDialog *dialog) caps = priv->manual_capabilities | priv->printer_capabilities; gtk_widget_set_sensitive (priv->page_set_combo, - caps & GTK_PRINT_CAPABILITY_PAGE_SET); + caps & GTK_PRINT_CAPABILITY_PAGE_SET); gtk_widget_set_sensitive (priv->copies_spin, - caps & GTK_PRINT_CAPABILITY_COPIES); + caps & GTK_PRINT_CAPABILITY_COPIES); gtk_widget_set_sensitive (priv->collate_check, - can_collate && - (caps & GTK_PRINT_CAPABILITY_COLLATE)); + can_collate && + (caps & GTK_PRINT_CAPABILITY_COLLATE)); gtk_widget_set_sensitive (priv->reverse_check, - caps & GTK_PRINT_CAPABILITY_REVERSE); + caps & GTK_PRINT_CAPABILITY_REVERSE); gtk_widget_set_sensitive (priv->scale_spin, - caps & GTK_PRINT_CAPABILITY_SCALE); + caps & GTK_PRINT_CAPABILITY_SCALE); gtk_widget_set_sensitive (GTK_WIDGET (priv->pages_per_sheet), - caps & GTK_PRINT_CAPABILITY_NUMBER_UP); + caps & GTK_PRINT_CAPABILITY_NUMBER_UP); if (caps & GTK_PRINT_CAPABILITY_PREVIEW) gtk_widget_show (priv->preview_button); @@ -1306,87 +1537,272 @@ update_dialog_from_capabilities (GtkPrintUnixDialog *dialog) gtk_tree_model_filter_refilter (priv->printer_list_filter); } -static void -mark_conflicts (GtkPrintUnixDialog *dialog) +static gboolean +page_setup_is_equal (GtkPageSetup *a, + GtkPageSetup *b) { - GtkPrintUnixDialogPrivate *priv = dialog->priv; - GtkPrinter *printer; - gboolean have_conflict; - - have_conflict = FALSE; - - printer = priv->current_printer; - - if (printer) - { - - g_signal_handler_block (priv->options, - priv->options_changed_handler); - - gtk_printer_option_set_clear_conflicts (priv->options); - - have_conflict = _gtk_printer_mark_conflicts (printer, - priv->options); - - g_signal_handler_unblock (priv->options, - priv->options_changed_handler); - } + return + gtk_paper_size_is_equal (gtk_page_setup_get_paper_size (a), + 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) && + gtk_page_setup_get_right_margin (a, GTK_UNIT_MM) == gtk_page_setup_get_right_margin (b, GTK_UNIT_MM); +} - if (have_conflict) - gtk_widget_show (priv->conflicts_widget); - else - gtk_widget_hide (priv->conflicts_widget); +static gboolean +page_setup_is_same_size (GtkPageSetup *a, + GtkPageSetup *b) +{ + return gtk_paper_size_is_equal (gtk_page_setup_get_paper_size (a), + gtk_page_setup_get_paper_size (b)); } static gboolean -mark_conflicts_callback (gpointer data) +set_paper_size (GtkPrintUnixDialog *dialog, + GtkPageSetup *page_setup, + gboolean size_only, + gboolean add_item) { - GtkPrintUnixDialog *dialog = data; GtkPrintUnixDialogPrivate *priv = dialog->priv; + GtkTreeModel *model; + GtkTreeIter iter; + GtkPageSetup *list_page_setup; - priv->mark_conflicts_id = 0; + if (!priv->internal_page_setup_change) + return TRUE; - mark_conflicts (dialog); + if (page_setup == NULL) + return FALSE; + + model = GTK_TREE_MODEL (priv->page_setup_list); + + 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); + gtk_combo_box_set_active (GTK_COMBO_BOX (priv->orientation_combo), + gtk_page_setup_get_orientation (page_setup)); + 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); + 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); + gtk_combo_box_set_active_iter (GTK_COMBO_BOX (priv->paper_size_combo), + &iter); + gtk_combo_box_set_active (GTK_COMBO_BOX (priv->orientation_combo), + gtk_page_setup_get_orientation (page_setup)); + return TRUE; + } return FALSE; } static void -unschedule_idle_mark_conflicts (GtkPrintUnixDialog *dialog) +fill_custom_paper_sizes (GtkPrintUnixDialog *dialog) { GtkPrintUnixDialogPrivate *priv = dialog->priv; + GtkTreeIter iter, paper_iter; + GtkTreeModel *model; - if (priv->mark_conflicts_id != 0) + model = GTK_TREE_MODEL (priv->custom_paper_list); + if (gtk_tree_model_get_iter_first (model, &iter)) { - g_source_remove (priv->mark_conflicts_id); - priv->mark_conflicts_id = 0; + 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); + do + { + 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); + + 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, + -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, NULL, + -1); } static void -schedule_idle_mark_conflicts (GtkPrintUnixDialog *dialog) +fill_paper_sizes (GtkPrintUnixDialog *dialog, + GtkPrinter *printer) { GtkPrintUnixDialogPrivate *priv = dialog->priv; + GList *list, *l; + GtkPageSetup *page_setup; + GtkPaperSize *paper_size; + GtkTreeIter iter; + gint i; - if (priv->mark_conflicts_id != 0) - return; + gtk_list_store_clear (priv->page_setup_list); - priv->mark_conflicts_id = gdk_threads_add_idle (mark_conflicts_callback, - dialog); + if (printer == NULL || (list = gtk_printer_list_papers (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); + } + } + else + { + 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); + } + g_list_free (list); + } + + fill_custom_paper_sizes (dialog); } static void -options_changed_cb (GtkPrintUnixDialog *dialog) +update_paper_sizes (GtkPrintUnixDialog *dialog) +{ + GtkPageSetup *current_page_setup = NULL; + GtkPrinter *printer; + + printer = gtk_print_unix_dialog_get_selected_printer (dialog); + + fill_paper_sizes (dialog, printer); + + current_page_setup = gtk_page_setup_copy (gtk_print_unix_dialog_get_page_setup (dialog)); + + if (current_page_setup) + { + if (!set_paper_size (dialog, current_page_setup, FALSE, FALSE)) + set_paper_size (dialog, current_page_setup, TRUE, TRUE); + + g_object_unref (current_page_setup); + } +} + +static void +mark_conflicts (GtkPrintUnixDialog *dialog) { GtkPrintUnixDialogPrivate *priv = dialog->priv; + GtkPrinter *printer; + gboolean have_conflict; - schedule_idle_mark_conflicts (dialog); + have_conflict = FALSE; - if (priv->initial_settings) + printer = priv->current_printer; + + if (printer) + { + + g_signal_handler_block (priv->options, + priv->options_changed_handler); + + gtk_printer_option_set_clear_conflicts (priv->options); + + have_conflict = _gtk_printer_mark_conflicts (printer, + priv->options); + + g_signal_handler_unblock (priv->options, + priv->options_changed_handler); + } + + if (have_conflict) + gtk_widget_show (priv->conflicts_widget); + else + gtk_widget_hide (priv->conflicts_widget); +} + +static gboolean +mark_conflicts_callback (gpointer data) +{ + GtkPrintUnixDialog *dialog = data; + GtkPrintUnixDialogPrivate *priv = dialog->priv; + + priv->mark_conflicts_id = 0; + + mark_conflicts (dialog); + + return FALSE; +} + +static void +unschedule_idle_mark_conflicts (GtkPrintUnixDialog *dialog) +{ + GtkPrintUnixDialogPrivate *priv = dialog->priv; + + if (priv->mark_conflicts_id != 0) { - g_object_unref (priv->initial_settings); - priv->initial_settings = NULL; + g_source_remove (priv->mark_conflicts_id); + priv->mark_conflicts_id = 0; } +} + +static void +schedule_idle_mark_conflicts (GtkPrintUnixDialog *dialog) +{ + GtkPrintUnixDialogPrivate *priv = dialog->priv; + + if (priv->mark_conflicts_id != 0) + return; + + priv->mark_conflicts_id = gdk_threads_add_idle (mark_conflicts_callback, + dialog); +} + +static void +options_changed_cb (GtkPrintUnixDialog *dialog) +{ + GtkPrintUnixDialogPrivate *priv = dialog->priv; + + schedule_idle_mark_conflicts (dialog); g_free (priv->waiting_for_printer); priv->waiting_for_printer = NULL; @@ -1413,51 +1829,45 @@ clear_per_printer_ui (GtkPrintUnixDialog *dialog) GtkPrintUnixDialogPrivate *priv = dialog->priv; gtk_container_foreach (GTK_CONTAINER (priv->finishing_table), - (GtkCallback)gtk_widget_destroy, - NULL); - gtk_table_resize (GTK_TABLE (priv->finishing_table), 1, 2); + (GtkCallback)gtk_widget_destroy, NULL); gtk_container_foreach (GTK_CONTAINER (priv->image_quality_table), - (GtkCallback)gtk_widget_destroy, - NULL); - gtk_table_resize (GTK_TABLE (priv->image_quality_table), 1, 2); + (GtkCallback)gtk_widget_destroy, NULL); gtk_container_foreach (GTK_CONTAINER (priv->color_table), - (GtkCallback)gtk_widget_destroy, - NULL); - gtk_table_resize (GTK_TABLE (priv->color_table), 1, 2); + (GtkCallback)gtk_widget_destroy, NULL); gtk_container_foreach (GTK_CONTAINER (priv->advanced_vbox), - (GtkCallback)gtk_widget_destroy, - NULL); + (GtkCallback)gtk_widget_destroy, NULL); extension_point_clear_children (GTK_CONTAINER (priv->extension_point)); } static void printer_details_acquired (GtkPrinter *printer, - gboolean success, - GtkPrintUnixDialog *dialog) + gboolean success, + GtkPrintUnixDialog *dialog) { GtkPrintUnixDialogPrivate *priv = dialog->priv; - disconnect_printer_details_request (dialog); - + disconnect_printer_details_request (dialog, !success); + if (success) { GtkTreeSelection *selection; selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (priv->printer_treeview)); - + selected_printer_changed (selection, dialog); } } static void selected_printer_changed (GtkTreeSelection *selection, - GtkPrintUnixDialog *dialog) + GtkPrintUnixDialog *dialog) { GtkPrintUnixDialogPrivate *priv = dialog->priv; GtkPrinter *printer; GtkTreeIter iter, filter_iter; /* Whenever the user selects a printer we stop looking for - the printer specified in the initial settings */ + * the printer specified in the initial settings + */ if (priv->waiting_for_printer && !priv->internal_printer_change) { @@ -1465,106 +1875,112 @@ selected_printer_changed (GtkTreeSelection *selection, priv->waiting_for_printer = NULL; } - disconnect_printer_details_request (dialog); + disconnect_printer_details_request (dialog, FALSE); printer = NULL; if (gtk_tree_selection_get_selected (selection, NULL, &filter_iter)) { gtk_tree_model_filter_convert_iter_to_child_iter (priv->printer_list_filter, - &iter, - &filter_iter); + &iter, + &filter_iter); gtk_tree_model_get (priv->printer_list, &iter, - PRINTER_LIST_COL_PRINTER_OBJ, &printer, - -1); + PRINTER_LIST_COL_PRINTER_OBJ, &printer, + -1); } - /* sets GTK_RESPONSE_OK button sensitive/insensitive depending on whether the printer - * accepts/rejects jobs */ + /* sets GTK_RESPONSE_OK button sensitivity depending on whether the printer + * accepts/rejects jobs + */ if (printer != NULL) { if (!gtk_printer_is_accepting_jobs (printer)) - { - gtk_dialog_set_response_sensitive (GTK_DIALOG (dialog), GTK_RESPONSE_OK, FALSE); - } - else - { - if (priv->current_printer == printer && gtk_printer_has_details (printer)) - gtk_dialog_set_response_sensitive (GTK_DIALOG (dialog), GTK_RESPONSE_OK, TRUE); - } + gtk_dialog_set_response_sensitive (GTK_DIALOG (dialog), GTK_RESPONSE_OK, FALSE); + else if (priv->current_printer == printer && gtk_printer_has_details (printer)) + + gtk_dialog_set_response_sensitive (GTK_DIALOG (dialog), GTK_RESPONSE_OK, TRUE); } - + if (printer != NULL && !gtk_printer_has_details (printer)) { gtk_dialog_set_response_sensitive (GTK_DIALOG (dialog), GTK_RESPONSE_OK, FALSE); priv->request_details_tag = - g_signal_connect (printer, "details-acquired", - G_CALLBACK (printer_details_acquired), dialog); + g_signal_connect (printer, "details-acquired", + G_CALLBACK (printer_details_acquired), dialog); /* take the reference */ priv->request_details_printer = printer; gtk_printer_request_details (printer); + set_busy_cursor (dialog, TRUE); + gtk_list_store_set (GTK_LIST_STORE (priv->printer_list), + g_object_get_data (G_OBJECT (printer), "gtk-print-tree-iter"), + PRINTER_LIST_COL_STATE, _("Getting printer information…"), + -1); return; } - + if (printer == priv->current_printer) { if (printer) - g_object_unref (printer); + g_object_unref (printer); return; } if (priv->options) { - g_object_unref (priv->options); - priv->options = NULL; - + g_clear_object (&priv->options); clear_per_printer_ui (dialog); } - if (priv->current_printer) - { - g_object_unref (priv->current_printer); - } - + g_clear_object (&priv->current_printer); priv->printer_capabilities = 0; - - if (gtk_printer_is_accepting_jobs (printer)) + + if (printer != NULL && gtk_printer_is_accepting_jobs (printer)) gtk_dialog_set_response_sensitive (GTK_DIALOG (dialog), GTK_RESPONSE_OK, TRUE); priv->current_printer = printer; if (printer != NULL) { if (!priv->page_setup_set) - { - /* if no explicit page setup has been set, use the printer default */ - GtkPageSetup *page_setup; + { + /* if no explicit page setup has been set, use the printer default */ + GtkPageSetup *page_setup; - page_setup = gtk_printer_get_default_page_size (printer); + page_setup = gtk_printer_get_default_page_size (printer); - if (!page_setup) - page_setup = gtk_page_setup_new (); + if (!page_setup) + page_setup = gtk_page_setup_new (); - g_object_unref (priv->page_setup); - priv->page_setup = page_setup; - } + if (page_setup && priv->page_setup) + gtk_page_setup_set_orientation (page_setup, gtk_page_setup_get_orientation (priv->page_setup)); + + g_object_unref (priv->page_setup); + priv->page_setup = page_setup; + } priv->printer_capabilities = gtk_printer_get_capabilities (printer); - priv->options = _gtk_printer_get_options (printer, - priv->initial_settings, - priv->page_setup, - priv->manual_capabilities); - - priv->options_changed_handler = + priv->options = _gtk_printer_get_options (printer, + priv->initial_settings, + priv->page_setup, + priv->manual_capabilities); + + priv->options_changed_handler = g_signal_connect_swapped (priv->options, "changed", G_CALLBACK (options_changed_cb), dialog); + schedule_idle_mark_conflicts (dialog); } update_dialog_from_settings (dialog); update_dialog_from_capabilities (dialog); + + priv->internal_page_setup_change = TRUE; + update_paper_sizes (dialog); + priv->internal_page_setup_change = FALSE; + + g_object_notify ( G_OBJECT(dialog), "selected-printer"); } static void update_collate_icon (GtkToggleButton *toggle_button, - GtkPrintUnixDialog *dialog) + GtkPrintUnixDialog *dialog) { GtkPrintUnixDialogPrivate *priv = dialog->priv; @@ -1573,15 +1989,17 @@ update_collate_icon (GtkToggleButton *toggle_button, static void paint_page (GtkWidget *widget, - cairo_t *cr, - gfloat scale, - gint x_offset, - gint y_offset, - gchar *text, - gint text_x) + cairo_t *cr, + gfloat scale, + gint x_offset, + gint y_offset, + gchar *text, + gint text_x) { + GtkStyleContext *context; gint x, y, width, height; gint text_y, linewidth; + GdkRGBA color; x = x_offset * scale; y = y_offset * scale; @@ -1591,31 +2009,38 @@ paint_page (GtkWidget *widget, linewidth = 2; text_y = 21; - gdk_cairo_set_source_color (cr, &widget->style->base[GTK_STATE_NORMAL]); + context = gtk_widget_get_style_context (widget); + + gtk_style_context_save (context); + gtk_style_context_add_class (context, GTK_STYLE_CLASS_VIEW); + + gtk_style_context_get_background_color (context, 0, &color); + gdk_cairo_set_source_rgba (cr, &color); cairo_rectangle (cr, x, y, width, height); cairo_fill (cr); - gdk_cairo_set_source_color (cr, &widget->style->text[GTK_STATE_NORMAL]); + gtk_style_context_get_color (context, 0, &color); + gdk_cairo_set_source_rgba (cr, &color); cairo_set_line_width (cr, linewidth); cairo_rectangle (cr, x + linewidth/2.0, y + linewidth/2.0, width - linewidth, height - linewidth); cairo_stroke (cr); - cairo_select_font_face (cr, "Sans", - CAIRO_FONT_SLANT_NORMAL, - CAIRO_FONT_WEIGHT_NORMAL); + cairo_select_font_face (cr, "Sans", + CAIRO_FONT_SLANT_NORMAL, + CAIRO_FONT_WEIGHT_NORMAL); cairo_set_font_size (cr, (gint)(9 * scale)); cairo_move_to (cr, x + (gint)(text_x * scale), y + (gint)(text_y * scale)); cairo_show_text (cr, text); -} + gtk_style_context_restore (context); +} static gboolean -draw_collate_cb (GtkWidget *widget, - GdkEventExpose *event, - GtkPrintUnixDialog *dialog) +draw_collate_cb (GtkWidget *widget, + cairo_t *cr, + GtkPrintUnixDialog *dialog) { GtkSettings *settings; - cairo_t *cr; gint size; gfloat scale; gboolean collate, reverse, rtl; @@ -1630,16 +2055,12 @@ draw_collate_cb (GtkWidget *widget, settings = gtk_widget_get_settings (widget); gtk_icon_size_lookup_for_settings (settings, - GTK_ICON_SIZE_DIALOG, - &size, - NULL); + GTK_ICON_SIZE_DIALOG, + &size, + NULL); scale = size / 48.0; text_x = rtl ? 4 : 11; - cr = gdk_cairo_create (widget->window); - - cairo_translate (cr, widget->allocation.x, widget->allocation.y); - if (copies == 1) { paint_page (widget, cr, scale, rtl ? 40: 15, 5, reverse ? "1" : "2", text_x); @@ -1654,16 +2075,13 @@ draw_collate_cb (GtkWidget *widget, paint_page (widget, cr, scale, rtl ? 15 : 40, 15, collate == reverse ? "2" : "1", text_x); } - cairo_destroy (cr); - return TRUE; } static void -gtk_print_unix_dialog_style_set (GtkWidget *widget, - GtkStyle *previous_style) +gtk_print_unix_dialog_style_updated (GtkWidget *widget) { - GTK_WIDGET_CLASS (gtk_print_unix_dialog_parent_class)->style_set (widget, previous_style); + GTK_WIDGET_CLASS (gtk_print_unix_dialog_parent_class)->style_updated (widget); if (gtk_widget_has_screen (widget)) { @@ -1672,29 +2090,32 @@ gtk_print_unix_dialog_style_set (GtkWidget *widget, GtkSettings *settings; gint size; gfloat scale; - + settings = gtk_widget_get_settings (widget); gtk_icon_size_lookup_for_settings (settings, - GTK_ICON_SIZE_DIALOG, - &size, - NULL); + GTK_ICON_SIZE_DIALOG, + &size, + NULL); scale = size / 48.0; - - gtk_widget_set_size_request (priv->collate_image, - (50 + 20) * scale, - (15 + 26) * scale); + + gtk_widget_set_size_request (priv->collate_image, + (50 + 20) * scale, + (15 + 26) * scale); } } static void -update_range_sensitivity (GtkWidget *button, - GtkWidget *range) +update_entry_sensitivity (GtkWidget *button, + GtkWidget *range) { gboolean active; active = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (button)); gtk_widget_set_sensitive (range, active); + + if (active) + gtk_widget_grab_focus (range); } static void @@ -1724,20 +2145,20 @@ create_main_page (GtkPrintUnixDialog *dialog) GtkWidget *custom_input; const gchar *range_tooltip; - main_vbox = gtk_vbox_new (FALSE, 18); + main_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 18); gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12); gtk_widget_show (main_vbox); - vbox = gtk_vbox_new (FALSE, 6); + vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6); gtk_box_pack_start (GTK_BOX (main_vbox), 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_POLICY_AUTOMATIC, + GTK_POLICY_AUTOMATIC); gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrolled), - GTK_SHADOW_IN); + GTK_SHADOW_IN); gtk_widget_show (scrolled); gtk_box_pack_start (GTK_BOX (vbox), scrolled, TRUE, TRUE, 0); @@ -1749,32 +2170,32 @@ create_main_page (GtkPrintUnixDialog *dialog) 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_printer_changed), dialog); - + renderer = gtk_cell_renderer_pixbuf_new (); column = gtk_tree_view_column_new_with_attributes ("", - renderer, - "icon-name", - PRINTER_LIST_COL_ICON, - NULL); + renderer, + "icon-name", + PRINTER_LIST_COL_ICON, + NULL); gtk_tree_view_column_set_cell_data_func (column, renderer, set_cell_sensitivity_func, NULL, NULL); gtk_tree_view_append_column (GTK_TREE_VIEW (treeview), column); renderer = gtk_cell_renderer_text_new (); column = gtk_tree_view_column_new_with_attributes (_("Printer"), - renderer, - "text", - PRINTER_LIST_COL_NAME, - NULL); + renderer, + "text", + PRINTER_LIST_COL_NAME, + NULL); gtk_tree_view_column_set_cell_data_func (column, renderer, set_cell_sensitivity_func, NULL, NULL); gtk_tree_view_append_column (GTK_TREE_VIEW (treeview), column); - + renderer = gtk_cell_renderer_text_new (); /* Translators: this is the header for the location column in the print dialog */ column = gtk_tree_view_column_new_with_attributes (_("Location"), - renderer, - "text", - PRINTER_LIST_COL_LOCATION, - NULL); + renderer, + "text", + PRINTER_LIST_COL_LOCATION, + NULL); gtk_tree_view_column_set_cell_data_func (column, renderer, set_cell_sensitivity_func, NULL, NULL); gtk_tree_view_append_column (GTK_TREE_VIEW (treeview), column); @@ -1782,30 +2203,31 @@ create_main_page (GtkPrintUnixDialog *dialog) g_object_set (renderer, "ellipsize", PANGO_ELLIPSIZE_END, NULL); /* Translators: this is the header for the printer status column in the print dialog */ column = gtk_tree_view_column_new_with_attributes (_("Status"), - renderer, - "text", - PRINTER_LIST_COL_STATE, - NULL); + renderer, + "text", + PRINTER_LIST_COL_STATE, + NULL); gtk_tree_view_column_set_cell_data_func (column, renderer, set_cell_sensitivity_func, NULL, NULL); gtk_tree_view_append_column (GTK_TREE_VIEW (treeview), column); g_signal_connect (GTK_TREE_VIEW (treeview), "row-activated", G_CALLBACK (emit_ok_response), dialog); - + gtk_widget_show (treeview); gtk_container_add (GTK_CONTAINER (scrolled), treeview); - custom_input = gtk_hbox_new (FALSE, 18); + custom_input = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 18); gtk_widget_show (custom_input); gtk_box_pack_start (GTK_BOX (vbox), custom_input, FALSE, FALSE, 0); priv->extension_point = custom_input; - hbox = gtk_hbox_new (FALSE, 18); + hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 18); gtk_widget_show (hbox); gtk_box_pack_start (GTK_BOX (main_vbox), hbox, FALSE, FALSE, 0); - table = gtk_table_new (3, 2, FALSE); - gtk_table_set_row_spacings (GTK_TABLE (table), 6); - gtk_table_set_col_spacings (GTK_TABLE (table), 12); + table = gtk_grid_new (); + priv->range_table = table; + gtk_grid_set_row_spacing (GTK_GRID (table), 6); + gtk_grid_set_column_spacing (GTK_GRID (table), 12); frame = wrap_in_frame (_("Range"), table); gtk_box_pack_start (GTK_BOX (hbox), frame, TRUE, TRUE, 0); gtk_widget_show (table); @@ -1813,95 +2235,89 @@ create_main_page (GtkPrintUnixDialog *dialog) radio = gtk_radio_button_new_with_mnemonic (NULL, _("_All Pages")); priv->all_pages_radio = radio; gtk_widget_show (radio); - gtk_table_attach (GTK_TABLE (table), radio, - 0, 2, 0, 1, GTK_FILL, 0, - 0, 0); + gtk_grid_attach (GTK_GRID (table), radio, 0, 0, 2, 1); radio = gtk_radio_button_new_with_mnemonic (gtk_radio_button_get_group (GTK_RADIO_BUTTON (radio)), - _("C_urrent Page")); + _("C_urrent Page")); if (priv->current_page == -1) - gtk_widget_set_sensitive (radio, FALSE); + gtk_widget_set_sensitive (radio, FALSE); priv->current_page_radio = radio; gtk_widget_show (radio); - gtk_table_attach (GTK_TABLE (table), radio, - 0, 2, 1, 2, GTK_FILL, 0, - 0, 0); - + gtk_grid_attach (GTK_GRID (table), radio, 0, 1, 2, 1); + + radio = gtk_radio_button_new_with_mnemonic (gtk_radio_button_get_group (GTK_RADIO_BUTTON (radio)), + _("Se_lection")); + + gtk_widget_set_sensitive (radio, priv->has_selection); + priv->selection_radio = radio; + gtk_grid_attach (GTK_GRID (table), radio, 0, 2, 2, 1); + radio = gtk_radio_button_new_with_mnemonic (gtk_radio_button_get_group (GTK_RADIO_BUTTON (radio)), _("Pag_es:")); range_tooltip = _("Specify one or more page ranges,\n e.g. 1-3,7,11"); gtk_widget_set_tooltip_text (radio, range_tooltip); - + priv->page_range_radio = radio; gtk_widget_show (radio); - gtk_table_attach (GTK_TABLE (table), radio, - 0, 1, 2, 3, GTK_FILL, 0, - 0, 0); + gtk_grid_attach (GTK_GRID (table), radio, 0, 3, 1, 1); entry = gtk_entry_new (); gtk_widget_set_tooltip_text (entry, range_tooltip); + gtk_entry_set_activates_default (GTK_ENTRY (entry), TRUE); + atk_object_set_name (gtk_widget_get_accessible (entry), _("Pages")); + atk_object_set_description (gtk_widget_get_accessible (entry), range_tooltip); priv->page_range_entry = entry; gtk_widget_show (entry); - gtk_table_attach (GTK_TABLE (table), entry, - 1, 2, 2, 3, GTK_FILL, 0, - 0, 0); - g_signal_connect (radio, "toggled", G_CALLBACK (update_range_sensitivity), entry); - update_range_sensitivity (radio, entry); - - table = gtk_table_new (3, 2, FALSE); - gtk_table_set_row_spacings (GTK_TABLE (table), 6); - gtk_table_set_col_spacings (GTK_TABLE (table), 12); + gtk_grid_attach (GTK_GRID (table), entry, 1, 3, 1, 1); + g_signal_connect (radio, "toggled", G_CALLBACK (update_entry_sensitivity), entry); + update_entry_sensitivity (radio, entry); + + table = gtk_grid_new (); + gtk_grid_set_row_spacing (GTK_GRID (table), 6); + gtk_grid_set_column_spacing (GTK_GRID (table), 12); frame = wrap_in_frame (_("Copies"), table); gtk_box_pack_start (GTK_BOX (hbox), frame, TRUE, TRUE, 0); gtk_widget_show (table); /* FIXME chpe: too much space between Copies and spinbutton, put those 2 in a hbox and make it span 2 columns */ label = gtk_label_new_with_mnemonic (_("Copie_s:")); - gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); + gtk_widget_set_halign (label, GTK_ALIGN_START); + gtk_widget_set_valign (label, GTK_ALIGN_CENTER); gtk_widget_show (label); - gtk_table_attach (GTK_TABLE (table), label, - 0, 1, 0, 1, GTK_FILL, 0, - 0, 0); + gtk_grid_attach (GTK_GRID (table), label, 0, 0, 1, 1); spinbutton = gtk_spin_button_new_with_range (1.0, 100.0, 1.0); + gtk_entry_set_activates_default (GTK_ENTRY (spinbutton), TRUE); priv->copies_spin = spinbutton; gtk_widget_show (spinbutton); - gtk_table_attach (GTK_TABLE (table), spinbutton, - 1, 2, 0, 1, GTK_FILL, 0, - 0, 0); + gtk_grid_attach (GTK_GRID (table), spinbutton, 1, 0, 1, 1); gtk_label_set_mnemonic_widget (GTK_LABEL (label), spinbutton); - g_signal_connect_swapped (spinbutton, "value-changed", - G_CALLBACK (update_dialog_from_capabilities), dialog); - g_signal_connect_swapped (spinbutton, "changed", - G_CALLBACK (update_dialog_from_capabilities), dialog); - + g_signal_connect_swapped (spinbutton, "value-changed", + G_CALLBACK (update_dialog_from_capabilities), dialog); + g_signal_connect_swapped (spinbutton, "changed", + G_CALLBACK (update_dialog_from_capabilities), dialog); + check = gtk_check_button_new_with_mnemonic (_("C_ollate")); priv->collate_check = check; g_signal_connect (check, "toggled", G_CALLBACK (update_collate_icon), dialog); gtk_widget_show (check); - gtk_table_attach (GTK_TABLE (table), check, - 0, 1, 1, 2, GTK_FILL, 0, - 0, 0); + gtk_grid_attach (GTK_GRID (table), check, 0, 1, 1, 1); check = gtk_check_button_new_with_mnemonic (_("_Reverse")); g_signal_connect (check, "toggled", G_CALLBACK (update_collate_icon), dialog); priv->reverse_check = check; gtk_widget_show (check); - gtk_table_attach (GTK_TABLE (table), check, - 0, 1, 2, 3, GTK_FILL, 0, - 0, 0); + gtk_grid_attach (GTK_GRID (table), check, 0, 2, 1, 1); image = gtk_drawing_area_new (); - GTK_WIDGET_SET_FLAGS (image, GTK_NO_WINDOW); + gtk_widget_set_has_window (image, FALSE); priv->collate_image = image; gtk_widget_show (image); gtk_widget_set_size_request (image, 70, 90); - gtk_table_attach (GTK_TABLE (table), image, - 1, 2, 1, 3, GTK_FILL, 0, - 0, 0); - g_signal_connect (image, "expose-event", + gtk_grid_attach (GTK_GRID (table), image, 1, 1, 1, 2); + g_signal_connect (image, "draw", G_CALLBACK (draw_collate_cb), dialog); label = gtk_label_new (_("General")); gtk_widget_show (label); - + gtk_notebook_append_page (GTK_NOTEBOOK (priv->notebook), main_vbox, label); } @@ -1913,7 +2329,7 @@ is_range_separator (gchar c) static GtkPageRange * dialog_get_page_ranges (GtkPrintUnixDialog *dialog, - gint *n_ranges_out) + gint *n_ranges_out) { GtkPrintUnixDialogPrivate *priv = dialog->priv; gint i, n_ranges; @@ -1921,7 +2337,7 @@ dialog_get_page_ranges (GtkPrintUnixDialog *dialog, gchar *next; GtkPageRange *ranges; gint start, end; - + text = gtk_entry_get_text (GTK_ENTRY (priv->page_range_entry)); if (*text == 0) @@ -1929,18 +2345,18 @@ dialog_get_page_ranges (GtkPrintUnixDialog *dialog, *n_ranges_out = 0; return NULL; } - + n_ranges = 1; p = text; while (*p) { if (is_range_separator (*p)) - n_ranges++; + n_ranges++; p++; } ranges = g_new0 (GtkPageRange, n_ranges); - + i = 0; p = text; while (*p) @@ -1956,23 +2372,23 @@ dialog_get_page_ranges (GtkPrintUnixDialog *dialog, { start = (int)strtol (p, &next, 10); if (start < 1) - start = 1; + start = 1; p = next; } - + end = start; while (isspace (*p)) p++; if (*p == '-') - { - p++; - end = (int)strtol (p, &next, 10); + { + p++; + end = (int)strtol (p, &next, 10); if (next == p) /* a half-open range like 2- */ end = 0; - else if (end < start) - end = start; - } + else if (end < start) + end = start; + } ranges[i].start = start - 1; ranges[i].end = end - 1; @@ -1980,22 +2396,22 @@ dialog_get_page_ranges (GtkPrintUnixDialog *dialog, /* Skip until end or separator */ while (*p && !is_range_separator (*p)) - p++; + p++; /* if not at end, skip separator */ if (*p) - p++; + p++; } *n_ranges_out = i; - + return ranges; } static void dialog_set_page_ranges (GtkPrintUnixDialog *dialog, - GtkPageRange *ranges, - gint n_ranges) + GtkPageRange *ranges, + gint n_ranges) { GtkPrintUnixDialogPrivate *priv = dialog->priv; gint i; @@ -2005,36 +2421,37 @@ dialog_set_page_ranges (GtkPrintUnixDialog *dialog, { g_string_append_printf (s, "%d", ranges[i].start + 1); if (ranges[i].end > ranges[i].start) - g_string_append_printf (s, "-%d", ranges[i].end + 1); + g_string_append_printf (s, "-%d", ranges[i].end + 1); else if (ranges[i].end == -1) g_string_append (s, "-"); - + if (i != n_ranges - 1) - g_string_append (s, ","); + g_string_append (s, ","); } gtk_entry_set_text (GTK_ENTRY (priv->page_range_entry), s->str); - + g_string_free (s, TRUE); } - static GtkPrintPages dialog_get_print_pages (GtkPrintUnixDialog *dialog) { GtkPrintUnixDialogPrivate *priv = dialog->priv; - + if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (priv->all_pages_radio))) return GTK_PRINT_PAGES_ALL; else if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (priv->current_page_radio))) return GTK_PRINT_PAGES_CURRENT; + else if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (priv->selection_radio))) + return GTK_PRINT_PAGES_SELECTION; else return GTK_PRINT_PAGES_RANGES; } static void -dialog_set_print_pages (GtkPrintUnixDialog *dialog, - GtkPrintPages pages) +dialog_set_print_pages (GtkPrintUnixDialog *dialog, + GtkPrintPages pages) { GtkPrintUnixDialogPrivate *priv = dialog->priv; @@ -2042,6 +2459,8 @@ dialog_set_print_pages (GtkPrintUnixDialog *dialog, gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (priv->page_range_radio), TRUE); else if (pages == GTK_PRINT_PAGES_CURRENT) gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (priv->current_page_radio), TRUE); + else if (pages == GTK_PRINT_PAGES_SELECTION) + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (priv->selection_radio), TRUE); else gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (priv->all_pages_radio), TRUE); } @@ -2049,14 +2468,14 @@ dialog_set_print_pages (GtkPrintUnixDialog *dialog, static gdouble dialog_get_scale (GtkPrintUnixDialog *dialog) { - if (GTK_WIDGET_IS_SENSITIVE (dialog->priv->scale_spin)) + if (gtk_widget_is_sensitive (dialog->priv->scale_spin)) return gtk_spin_button_get_value (GTK_SPIN_BUTTON (dialog->priv->scale_spin)); else return 100.0; } static void -dialog_set_scale (GtkPrintUnixDialog *dialog, +dialog_set_scale (GtkPrintUnixDialog *dialog, gdouble val) { gtk_spin_button_set_value (GTK_SPIN_BUTTON (dialog->priv->scale_spin), val); @@ -2065,69 +2484,69 @@ dialog_set_scale (GtkPrintUnixDialog *dialog, static GtkPageSet dialog_get_page_set (GtkPrintUnixDialog *dialog) { - if (GTK_WIDGET_IS_SENSITIVE (dialog->priv->page_set_combo)) + if (gtk_widget_is_sensitive (dialog->priv->page_set_combo)) return (GtkPageSet)gtk_combo_box_get_active (GTK_COMBO_BOX (dialog->priv->page_set_combo)); else return GTK_PAGE_SET_ALL; } static void -dialog_set_page_set (GtkPrintUnixDialog *dialog, +dialog_set_page_set (GtkPrintUnixDialog *dialog, GtkPageSet val) { gtk_combo_box_set_active (GTK_COMBO_BOX (dialog->priv->page_set_combo), - (int)val); + (int)val); } static gint dialog_get_n_copies (GtkPrintUnixDialog *dialog) { - if (GTK_WIDGET_IS_SENSITIVE (dialog->priv->copies_spin)) + if (gtk_widget_is_sensitive (dialog->priv->copies_spin)) return gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (dialog->priv->copies_spin)); return 1; } static void -dialog_set_n_copies (GtkPrintUnixDialog *dialog, +dialog_set_n_copies (GtkPrintUnixDialog *dialog, gint n_copies) { gtk_spin_button_set_value (GTK_SPIN_BUTTON (dialog->priv->copies_spin), - n_copies); + n_copies); } static gboolean dialog_get_collate (GtkPrintUnixDialog *dialog) { - if (GTK_WIDGET_IS_SENSITIVE (dialog->priv->collate_check)) + if (gtk_widget_is_sensitive (dialog->priv->collate_check)) return gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (dialog->priv->collate_check)); return FALSE; } static void -dialog_set_collate (GtkPrintUnixDialog *dialog, +dialog_set_collate (GtkPrintUnixDialog *dialog, gboolean collate) { gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (dialog->priv->collate_check), - collate); + collate); } static gboolean dialog_get_reverse (GtkPrintUnixDialog *dialog) { - if (GTK_WIDGET_IS_SENSITIVE (dialog->priv->reverse_check)) + if (gtk_widget_is_sensitive (dialog->priv->reverse_check)) return gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (dialog->priv->reverse_check)); return FALSE; } static void -dialog_set_reverse (GtkPrintUnixDialog *dialog, +dialog_set_reverse (GtkPrintUnixDialog *dialog, gboolean reverse) { gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (dialog->priv->reverse_check), - reverse); + reverse); } -static gint +static gint dialog_get_pages_per_sheet (GtkPrintUnixDialog *dialog) { GtkPrintUnixDialogPrivate *priv = dialog->priv; @@ -2137,14 +2556,14 @@ dialog_get_pages_per_sheet (GtkPrintUnixDialog *dialog) val = gtk_printer_option_widget_get_value (priv->pages_per_sheet); num = 1; - + if (val) { num = atoi(val); if (num < 1) - num = 1; + num = 1; } - + return num; } @@ -2173,6 +2592,13 @@ dialog_get_number_up_layout (GtkPrintUnixDialog *dialog) if (val == NULL) return layout; + if (val[0] == '\0' && priv->options) + { + GtkPrinterOption *option = gtk_printer_option_set_lookup (priv->options, "gtk-n-up-layout"); + if (option) + val = option->value; + } + enum_class = g_type_class_ref (GTK_TYPE_NUMBER_UP_LAYOUT); enum_value = g_enum_get_value_by_nick (enum_class, val); if (enum_value) @@ -2183,12 +2609,12 @@ dialog_get_number_up_layout (GtkPrintUnixDialog *dialog) } static gboolean -draw_page_cb (GtkWidget *widget, - GdkEventExpose *event, - GtkPrintUnixDialog *dialog) +draw_page_cb (GtkWidget *widget, + cairo_t *cr, + GtkPrintUnixDialog *dialog) { GtkPrintUnixDialogPrivate *priv = dialog->priv; - cairo_t *cr; + GtkStyleContext *context; gdouble ratio; gint w, h, tmp, shadow_offset; gint pages_x, pages_y, i, x, y, layout_w, layout_h; @@ -2198,29 +2624,70 @@ draw_page_cb (GtkWidget *widget, PangoLayout *layout; PangoFontDescription *font; gchar *text; - GdkColor *color; + GdkRGBA color; GtkNumberUpLayout number_up_layout; gint start_x, end_x, start_y, end_y; gint dx, dy; + gint width, height; gboolean horizontal; - + GtkPageSetup *page_setup; + gdouble paper_width, paper_height; + gdouble pos_x, pos_y; + gint pages_per_sheet; + gboolean ltr = TRUE; + orientation = gtk_page_setup_get_orientation (priv->page_setup); landscape = (orientation == GTK_PAGE_ORIENTATION_LANDSCAPE) || (orientation == GTK_PAGE_ORIENTATION_REVERSE_LANDSCAPE); number_up_layout = dialog_get_number_up_layout (dialog); + width = gtk_widget_get_allocated_width (widget); + height = gtk_widget_get_allocated_height (widget); + + cairo_save (cr); + + page_setup = gtk_print_unix_dialog_get_page_setup (dialog); + + if (page_setup != NULL) + { + if (!landscape) + { + paper_width = gtk_page_setup_get_paper_width (page_setup, GTK_UNIT_MM); + paper_height = gtk_page_setup_get_paper_height (page_setup, GTK_UNIT_MM); + } + else + { + paper_width = gtk_page_setup_get_paper_height (page_setup, GTK_UNIT_MM); + paper_height = gtk_page_setup_get_paper_width (page_setup, GTK_UNIT_MM); + } - cr = gdk_cairo_create (widget->window); - - cairo_translate (cr, widget->allocation.x, widget->allocation.y); + if (paper_width < paper_height) + { + h = EXAMPLE_PAGE_AREA_SIZE - 3; + w = (paper_height != 0) ? h * paper_width / paper_height : 0; + } + else + { + w = EXAMPLE_PAGE_AREA_SIZE - 3; + h = (paper_width != 0) ? w * paper_height / paper_width : 0; + } - ratio = G_SQRT2; + if (paper_width == 0) + w = 0; - w = (EXAMPLE_PAGE_AREA_SIZE - 3) / ratio; - h = w * ratio; + if (paper_height == 0) + h = 0; + } + else + { + ratio = G_SQRT2; + w = (EXAMPLE_PAGE_AREA_SIZE - 3) / ratio; + h = EXAMPLE_PAGE_AREA_SIZE - 3; + } - switch (dialog_get_pages_per_sheet (dialog)) + pages_per_sheet = dialog_get_pages_per_sheet (dialog); + switch (pages_per_sheet) { default: case 1: @@ -2255,39 +2722,55 @@ draw_page_cb (GtkWidget *widget, pages_x = pages_y; pages_y = tmp; } - + + context = gtk_widget_get_style_context (widget); + + gtk_style_context_save (context); + gtk_style_context_add_class (context, GTK_STYLE_CLASS_VIEW); + + pos_x = (width - w) / 2; + pos_y = (height - h) / 2 - 10; + cairo_translate (cr, pos_x, pos_y); + shadow_offset = 3; - - color = &widget->style->text[GTK_STATE_NORMAL]; - cairo_set_source_rgba (cr, color->red / 65535., color->green / 65535., color->blue / 65535, 0.5); + + gtk_style_context_get_color (context, 0, &color); + cairo_set_source_rgba (cr, color.red, color.green, color.blue, 0.5); cairo_rectangle (cr, shadow_offset + 1, shadow_offset + 1, w, h); cairo_fill (cr); - - gdk_cairo_set_source_color (cr, &widget->style->base[GTK_STATE_NORMAL]); + + gtk_style_context_get_background_color (context, 0, &color); + gdk_cairo_set_source_rgba (cr, &color); cairo_rectangle (cr, 1, 1, w, h); cairo_fill (cr); cairo_set_line_width (cr, 1.0); - cairo_rectangle (cr, 0.5, 0.5, w+1, h+1); - - gdk_cairo_set_source_color (cr, &widget->style->text[GTK_STATE_NORMAL]); + cairo_rectangle (cr, 0.5, 0.5, w + 1, h + 1); + + gtk_style_context_get_color (context, 0, &color); + gdk_cairo_set_source_rgba (cr, &color); cairo_stroke (cr); i = 1; - page_width = (double)w / pages_x; - page_height = (double)h / pages_y; + page_width = (gdouble)w / pages_x; + page_height = (gdouble)h / pages_y; layout = pango_cairo_create_layout (cr); font = pango_font_description_new (); pango_font_description_set_family (font, "sans"); - pango_font_description_set_absolute_size (font, page_height * 0.4 * PANGO_SCALE); + + if (page_height > 0) + pango_font_description_set_absolute_size (font, page_height * 0.4 * PANGO_SCALE); + else + pango_font_description_set_absolute_size (font, 1); + pango_layout_set_font_description (layout, font); pango_font_description_free (font); pango_layout_set_width (layout, page_width * PANGO_SCALE); pango_layout_set_alignment (layout, PANGO_ALIGN_CENTER); - + switch (number_up_layout) { default: @@ -2401,9 +2884,138 @@ draw_page_cb (GtkWidget *widget, cairo_restore (cr); } } - + g_object_unref (layout); - cairo_destroy (cr); + + if (page_setup != NULL) + { + pos_x += 1; + pos_y += 1; + + if (pages_per_sheet == 2 || pages_per_sheet == 6) + { + paper_width = gtk_page_setup_get_paper_height (page_setup, _gtk_print_get_default_user_units ()); + paper_height = gtk_page_setup_get_paper_width (page_setup, _gtk_print_get_default_user_units ()); + } + else + { + paper_width = gtk_page_setup_get_paper_width (page_setup, _gtk_print_get_default_user_units ()); + paper_height = gtk_page_setup_get_paper_height (page_setup, _gtk_print_get_default_user_units ()); + } + + cairo_restore (cr); + cairo_save (cr); + + layout = pango_cairo_create_layout (cr); + + font = pango_font_description_new (); + pango_font_description_set_family (font, "sans"); + + PangoContext *pango_c = NULL; + PangoFontDescription *pango_f = NULL; + gint font_size = 12 * PANGO_SCALE; + + pango_c = gtk_widget_get_pango_context (widget); + if (pango_c != NULL) + { + pango_f = pango_context_get_font_description (pango_c); + if (pango_f != NULL) + font_size = pango_font_description_get_size (pango_f); + } + + pango_font_description_set_size (font, font_size); + pango_layout_set_font_description (layout, font); + pango_font_description_free (font); + + pango_layout_set_width (layout, -1); + pango_layout_set_alignment (layout, PANGO_ALIGN_CENTER); + + if (_gtk_print_get_default_user_units () == GTK_UNIT_MM) + text = g_strdup_printf ("%.1f mm", paper_height); + else + text = g_strdup_printf ("%.2f inch", paper_height); + + pango_layout_set_text (layout, text, -1); + g_free (text); + pango_layout_get_size (layout, &layout_w, &layout_h); + + ltr = gtk_widget_get_direction (GTK_WIDGET (dialog)) == GTK_TEXT_DIR_LTR; + + if (ltr) + cairo_translate (cr, pos_x - layout_w / PANGO_SCALE - 2 * RULER_DISTANCE, + (height - layout_h / PANGO_SCALE) / 2); + else + cairo_translate (cr, pos_x + w + shadow_offset + 2 * RULER_DISTANCE, + (height - layout_h / PANGO_SCALE) / 2); + + pango_cairo_show_layout (cr, layout); + + cairo_restore (cr); + cairo_save (cr); + + if (_gtk_print_get_default_user_units () == GTK_UNIT_MM) + text = g_strdup_printf ("%.1f mm", paper_width); + else + text = g_strdup_printf ("%.2f inch", paper_width); + + pango_layout_set_text (layout, text, -1); + g_free (text); + pango_layout_get_size (layout, &layout_w, &layout_h); + + cairo_translate (cr, (width - layout_w / PANGO_SCALE) / 2, + pos_y + h + shadow_offset + 2 * RULER_DISTANCE); + + pango_cairo_show_layout (cr, layout); + + g_object_unref (layout); + + cairo_restore (cr); + + cairo_set_line_width (cr, 1); + + if (ltr) + { + cairo_move_to (cr, pos_x - RULER_DISTANCE, pos_y); + cairo_line_to (cr, pos_x - RULER_DISTANCE, pos_y + h); + cairo_stroke (cr); + + cairo_move_to (cr, pos_x - RULER_DISTANCE - RULER_RADIUS, pos_y - 0.5); + cairo_line_to (cr, pos_x - RULER_DISTANCE + RULER_RADIUS, pos_y - 0.5); + cairo_stroke (cr); + + cairo_move_to (cr, pos_x - RULER_DISTANCE - RULER_RADIUS, pos_y + h + 0.5); + cairo_line_to (cr, pos_x - RULER_DISTANCE + RULER_RADIUS, pos_y + h + 0.5); + cairo_stroke (cr); + } + else + { + cairo_move_to (cr, pos_x + w + shadow_offset + RULER_DISTANCE, pos_y); + cairo_line_to (cr, pos_x + w + shadow_offset + RULER_DISTANCE, pos_y + h); + cairo_stroke (cr); + + cairo_move_to (cr, pos_x + w + shadow_offset + RULER_DISTANCE - RULER_RADIUS, pos_y - 0.5); + cairo_line_to (cr, pos_x + w + shadow_offset + RULER_DISTANCE + RULER_RADIUS, pos_y - 0.5); + cairo_stroke (cr); + + cairo_move_to (cr, pos_x + w + shadow_offset + RULER_DISTANCE - RULER_RADIUS, pos_y + h + 0.5); + cairo_line_to (cr, pos_x + w + shadow_offset + RULER_DISTANCE + RULER_RADIUS, pos_y + h + 0.5); + cairo_stroke (cr); + } + + cairo_move_to (cr, pos_x, pos_y + h + shadow_offset + RULER_DISTANCE); + cairo_line_to (cr, pos_x + w, pos_y + h + shadow_offset + RULER_DISTANCE); + cairo_stroke (cr); + + cairo_move_to (cr, pos_x - 0.5, pos_y + h + shadow_offset + RULER_DISTANCE - RULER_RADIUS); + cairo_line_to (cr, pos_x - 0.5, pos_y + h + shadow_offset + RULER_DISTANCE + RULER_RADIUS); + cairo_stroke (cr); + + cairo_move_to (cr, pos_x + w + 0.5, pos_y + h + shadow_offset + RULER_DISTANCE - RULER_RADIUS); + cairo_line_to (cr, pos_x + w + 0.5, pos_y + h + shadow_offset + RULER_DISTANCE + RULER_RADIUS); + cairo_stroke (cr); + } + + gtk_style_context_restore (context); return TRUE; } @@ -2426,6 +3038,7 @@ update_number_up_layout (GtkPrintUnixDialog *dialog) GtkNumberUpLayout layout; GtkPrinterOption *option; GtkPrinterOption *old_option; + GtkPageOrientation page_orientation; set = priv->options; @@ -2436,17 +3049,64 @@ update_number_up_layout (GtkPrintUnixDialog *dialog) if (priv->number_up_layout_n_option == NULL) { priv->number_up_layout_n_option = gtk_printer_option_set_lookup (set, "gtk-n-up-layout"); + if (priv->number_up_layout_n_option == NULL) + { + char *n_up_layout[] = { "lrtb", "lrbt", "rltb", "rlbt", "tblr", "tbrl", "btlr", "btrl" }; + /* Translators: These strings name the possible arrangements of + * multiple pages on a sheet when printing (same as in gtkprintbackendcups.c) + */ + char *n_up_layout_display[] = { N_("Left to right, top to bottom"), N_("Left to right, bottom to top"), + N_("Right to left, top to bottom"), N_("Right to left, bottom to top"), + N_("Top to bottom, left to right"), N_("Top to bottom, right to left"), + N_("Bottom to top, left to right"), N_("Bottom to top, right to left") }; + int i; + + priv->number_up_layout_n_option = gtk_printer_option_new ("gtk-n-up-layout", + _("Page Ordering"), + GTK_PRINTER_OPTION_TYPE_PICKONE); + gtk_printer_option_allocate_choices (priv->number_up_layout_n_option, 8); + + for (i = 0; i < G_N_ELEMENTS (n_up_layout_display); i++) + { + priv->number_up_layout_n_option->choices[i] = g_strdup (n_up_layout[i]); + priv->number_up_layout_n_option->choices_display[i] = g_strdup (_(n_up_layout_display[i])); + } + } g_object_ref (priv->number_up_layout_n_option); priv->number_up_layout_2_option = gtk_printer_option_new ("gtk-n-up-layout", _("Page Ordering"), GTK_PRINTER_OPTION_TYPE_PICKONE); gtk_printer_option_allocate_choices (priv->number_up_layout_2_option, 2); + } - priv->number_up_layout_2_option->choices[0] = priv->number_up_layout_n_option->choices[0]; - priv->number_up_layout_2_option->choices[1] = priv->number_up_layout_n_option->choices[2]; - priv->number_up_layout_2_option->choices_display[0] = g_strdup ( _("Left to right")); - priv->number_up_layout_2_option->choices_display[1] = g_strdup ( _("Right to left")); + page_orientation = gtk_page_setup_get_orientation (priv->page_setup); + if (page_orientation == GTK_PAGE_ORIENTATION_PORTRAIT || + page_orientation == GTK_PAGE_ORIENTATION_REVERSE_PORTRAIT) + { + if (! (priv->number_up_layout_2_option->choices[0] == priv->number_up_layout_n_option->choices[0] && + priv->number_up_layout_2_option->choices[1] == priv->number_up_layout_n_option->choices[2])) + { + g_free (priv->number_up_layout_2_option->choices_display[0]); + g_free (priv->number_up_layout_2_option->choices_display[1]); + priv->number_up_layout_2_option->choices[0] = priv->number_up_layout_n_option->choices[0]; + priv->number_up_layout_2_option->choices[1] = priv->number_up_layout_n_option->choices[2]; + priv->number_up_layout_2_option->choices_display[0] = g_strdup ( _("Left to right")); + priv->number_up_layout_2_option->choices_display[1] = g_strdup ( _("Right to left")); + } + } + else + { + if (! (priv->number_up_layout_2_option->choices[0] == priv->number_up_layout_n_option->choices[0] && + priv->number_up_layout_2_option->choices[1] == priv->number_up_layout_n_option->choices[1])) + { + g_free (priv->number_up_layout_2_option->choices_display[0]); + g_free (priv->number_up_layout_2_option->choices_display[1]); + priv->number_up_layout_2_option->choices[0] = priv->number_up_layout_n_option->choices[0]; + priv->number_up_layout_2_option->choices[1] = priv->number_up_layout_n_option->choices[1]; + priv->number_up_layout_2_option->choices_display[0] = g_strdup ( _("Top to bottom")); + priv->number_up_layout_2_option->choices_display[1] = g_strdup ( _("Bottom to top")); + } } layout = dialog_get_number_up_layout (dialog); @@ -2465,13 +3125,32 @@ update_number_up_layout (GtkPrintUnixDialog *dialog) { option = priv->number_up_layout_2_option; - if (layout == GTK_NUMBER_UP_LAYOUT_LEFT_TO_RIGHT_TOP_TO_BOTTOM || - layout == GTK_NUMBER_UP_LAYOUT_LEFT_TO_RIGHT_BOTTOM_TO_TOP || - layout == GTK_NUMBER_UP_LAYOUT_TOP_TO_BOTTOM_LEFT_TO_RIGHT || - layout == GTK_NUMBER_UP_LAYOUT_BOTTOM_TO_TOP_LEFT_TO_RIGHT) - enum_value = g_enum_get_value (enum_class, GTK_NUMBER_UP_LAYOUT_LEFT_TO_RIGHT_TOP_TO_BOTTOM); - else - enum_value = g_enum_get_value (enum_class, GTK_NUMBER_UP_LAYOUT_RIGHT_TO_LEFT_TOP_TO_BOTTOM); + switch (layout) + { + case GTK_NUMBER_UP_LAYOUT_LEFT_TO_RIGHT_TOP_TO_BOTTOM: + case GTK_NUMBER_UP_LAYOUT_TOP_TO_BOTTOM_LEFT_TO_RIGHT: + enum_value = g_enum_get_value (enum_class, GTK_NUMBER_UP_LAYOUT_LEFT_TO_RIGHT_TOP_TO_BOTTOM); + break; + + case GTK_NUMBER_UP_LAYOUT_LEFT_TO_RIGHT_BOTTOM_TO_TOP: + case GTK_NUMBER_UP_LAYOUT_BOTTOM_TO_TOP_LEFT_TO_RIGHT: + enum_value = g_enum_get_value (enum_class, GTK_NUMBER_UP_LAYOUT_LEFT_TO_RIGHT_BOTTOM_TO_TOP); + break; + + case GTK_NUMBER_UP_LAYOUT_RIGHT_TO_LEFT_TOP_TO_BOTTOM: + case GTK_NUMBER_UP_LAYOUT_TOP_TO_BOTTOM_RIGHT_TO_LEFT: + enum_value = g_enum_get_value (enum_class, GTK_NUMBER_UP_LAYOUT_RIGHT_TO_LEFT_TOP_TO_BOTTOM); + break; + + case GTK_NUMBER_UP_LAYOUT_RIGHT_TO_LEFT_BOTTOM_TO_TOP: + case GTK_NUMBER_UP_LAYOUT_BOTTOM_TO_TOP_RIGHT_TO_LEFT: + enum_value = g_enum_get_value (enum_class, GTK_NUMBER_UP_LAYOUT_RIGHT_TO_LEFT_BOTTOM_TO_TOP); + break; + + default: + g_assert_not_reached(); + enum_value = NULL; + } } else { @@ -2496,6 +3175,160 @@ update_number_up_layout (GtkPrintUnixDialog *dialog) (dialog_get_pages_per_sheet (dialog) > 1)); } +static void +custom_paper_dialog_response_cb (GtkDialog *custom_paper_dialog, + gint response_id, + gpointer user_data) +{ + GtkPrintUnixDialog *print_dialog = GTK_PRINT_UNIX_DIALOG (user_data); + GtkPrintUnixDialogPrivate *priv = print_dialog->priv; + GtkTreeModel *model; + GtkTreeIter iter; + + _gtk_print_load_custom_papers (priv->custom_paper_list); + + priv->internal_page_setup_change = TRUE; + update_paper_sizes (print_dialog); + priv->internal_page_setup_change = FALSE; + + if (priv->page_setup_set) + { + model = GTK_TREE_MODEL (priv->custom_paper_list); + if (gtk_tree_model_get_iter_first (model, &iter)) + { + do + { + GtkPageSetup *page_setup; + gtk_tree_model_get (model, &iter, 0, &page_setup, -1); + + if (page_setup && + g_strcmp0 (gtk_paper_size_get_display_name (gtk_page_setup_get_paper_size (page_setup)), + gtk_paper_size_get_display_name (gtk_page_setup_get_paper_size (priv->page_setup))) == 0) + gtk_print_unix_dialog_set_page_setup (print_dialog, page_setup); + + g_object_unref (page_setup); + } while (gtk_tree_model_iter_next (model, &iter)); + } + } + + gtk_widget_destroy (GTK_WIDGET (custom_paper_dialog)); +} + +static void +orientation_changed (GtkComboBox *combo_box, + GtkPrintUnixDialog *dialog) +{ + GtkPrintUnixDialogPrivate *priv = dialog->priv; + GtkPageOrientation orientation; + GtkPageSetup *page_setup; + + if (priv->internal_page_setup_change) + return; + + orientation = (GtkPageOrientation) gtk_combo_box_get_active (GTK_COMBO_BOX (priv->orientation_combo)); + + if (priv->page_setup) + { + page_setup = gtk_page_setup_copy (priv->page_setup); + if (page_setup) + gtk_page_setup_set_orientation (page_setup, orientation); + + gtk_print_unix_dialog_set_page_setup (dialog, page_setup); + } + + redraw_page_layout_preview (dialog); +} + +static void +paper_size_changed (GtkComboBox *combo_box, + GtkPrintUnixDialog *dialog) +{ + GtkPrintUnixDialogPrivate *priv = dialog->priv; + GtkTreeIter iter; + GtkPageSetup *page_setup, *last_page_setup; + GtkPageOrientation orientation; + + if (priv->internal_page_setup_change) + return; + + 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); + + if (page_setup == NULL) + { + GtkWidget *custom_paper_dialog; + + /* Change from "manage" menu item to last value */ + if (priv->page_setup) + last_page_setup = g_object_ref (priv->page_setup); + else + last_page_setup = gtk_page_setup_new (); /* "good" default */ + + if (!set_paper_size (dialog, last_page_setup, FALSE, FALSE)) + set_paper_size (dialog, last_page_setup, TRUE, TRUE); + g_object_unref (last_page_setup); + + /* And show the custom paper dialog */ + custom_paper_dialog = _gtk_custom_paper_unix_dialog_new (GTK_WINDOW (dialog), _("Manage Custom Sizes")); + 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->page_setup) + orientation = gtk_page_setup_get_orientation (priv->page_setup); + else + orientation = GTK_PAGE_ORIENTATION_PORTRAIT; + + gtk_page_setup_set_orientation (page_setup, orientation); + gtk_print_unix_dialog_set_page_setup (dialog, page_setup); + + g_object_unref (page_setup); + } + + redraw_page_layout_preview (dialog); +} + +static gboolean +paper_size_row_is_separator (GtkTreeModel *model, + GtkTreeIter *iter, + gpointer data) +{ + gboolean separator; + + gtk_tree_model_get (model, iter, + PAGE_SETUP_LIST_COL_IS_SEPARATOR, &separator, + -1); + return separator; +} + +static void +page_name_func (GtkCellLayout *cell_layout, + 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); + 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); + } + else + g_object_set (cell, "text", _("Manage Custom Sizes…"), NULL); +} + static void create_page_setup_page (GtkPrintUnixDialog *dialog) { @@ -2503,104 +3336,89 @@ create_page_setup_page (GtkPrintUnixDialog *dialog) GtkWidget *main_vbox, *label, *hbox, *hbox2; GtkWidget *frame, *table, *widget; GtkWidget *combo, *spinbutton, *draw; + GtkCellRenderer *cell; - main_vbox = gtk_vbox_new (FALSE, 18); + main_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 18); gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12); gtk_widget_show (main_vbox); - hbox = gtk_hbox_new (FALSE, 18); + hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 18); gtk_widget_show (hbox); gtk_box_pack_start (GTK_BOX (main_vbox), hbox, FALSE, FALSE, 0); - 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); + table = gtk_grid_new (); + gtk_grid_set_row_spacing (GTK_GRID (table), 6); + gtk_grid_set_column_spacing (GTK_GRID (table), 12); frame = wrap_in_frame (_("Layout"), table); gtk_box_pack_start (GTK_BOX (hbox), frame, TRUE, TRUE, 0); gtk_widget_show (table); label = gtk_label_new_with_mnemonic (_("T_wo-sided:")); - gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); + gtk_widget_set_halign (label, GTK_ALIGN_START); + gtk_widget_set_valign (label, GTK_ALIGN_CENTER); gtk_widget_show (label); - gtk_table_attach (GTK_TABLE (table), label, - 0, 1, 0, 1, GTK_FILL, 0, - 0, 0); + gtk_grid_attach (GTK_GRID (table), label, 0, 0, 1, 1); widget = gtk_printer_option_widget_new (NULL); priv->duplex = GTK_PRINTER_OPTION_WIDGET (widget); gtk_widget_show (widget); - gtk_table_attach (GTK_TABLE (table), widget, - 1, 2, 0, 1, GTK_FILL, 0, - 0, 0); + gtk_grid_attach (GTK_GRID (table), widget, 1, 0, 1, 1); gtk_label_set_mnemonic_widget (GTK_LABEL (label), widget); label = gtk_label_new_with_mnemonic (_("Pages per _side:")); - gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); + gtk_widget_set_halign (label, GTK_ALIGN_START); + gtk_widget_set_valign (label, GTK_ALIGN_CENTER); gtk_widget_show (label); - gtk_table_attach (GTK_TABLE (table), label, - 0, 1, 1, 2, GTK_FILL, 0, - 0, 0); + gtk_grid_attach (GTK_GRID (table), label, 0, 1, 1, 1); widget = gtk_printer_option_widget_new (NULL); g_signal_connect_swapped (widget, "changed", G_CALLBACK (redraw_page_layout_preview), dialog); g_signal_connect_swapped (widget, "changed", G_CALLBACK (update_number_up_layout), dialog); priv->pages_per_sheet = GTK_PRINTER_OPTION_WIDGET (widget); gtk_widget_show (widget); - gtk_table_attach (GTK_TABLE (table), widget, - 1, 2, 1, 2, GTK_FILL, 0, - 0, 0); + gtk_grid_attach (GTK_GRID (table), widget, 1, 1, 1, 1); gtk_label_set_mnemonic_widget (GTK_LABEL (label), widget); - label = gtk_label_new_with_mnemonic (_("Page or_dering:")); - gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); + gtk_widget_set_halign (label, GTK_ALIGN_START); + gtk_widget_set_valign (label, GTK_ALIGN_CENTER); gtk_widget_show (label); - gtk_table_attach (GTK_TABLE (table), label, - 0, 1, 2, 3, GTK_FILL, 0, - 0, 0); + gtk_grid_attach (GTK_GRID (table), label, 0, 2, 1, 1); widget = gtk_printer_option_widget_new (NULL); g_signal_connect_swapped (widget, "changed", G_CALLBACK (redraw_page_layout_preview), dialog); priv->number_up_layout = GTK_PRINTER_OPTION_WIDGET (widget); gtk_widget_show (widget); - gtk_table_attach (GTK_TABLE (table), widget, - 1, 2, 2, 3, GTK_FILL, 0, - 0, 0); + gtk_grid_attach (GTK_GRID (table), widget, 1, 2, 1, 1); gtk_label_set_mnemonic_widget (GTK_LABEL (label), widget); label = gtk_label_new_with_mnemonic (_("_Only print:")); - gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); + gtk_widget_set_halign (label, GTK_ALIGN_START); + gtk_widget_set_valign (label, GTK_ALIGN_CENTER); gtk_widget_show (label); - gtk_table_attach (GTK_TABLE (table), label, - 0, 1, 3, 4, GTK_FILL, 0, - 0, 0); + gtk_grid_attach (GTK_GRID (table), label, 0, 3, 1, 1); - combo = gtk_combo_box_new_text (); + combo = gtk_combo_box_text_new (); priv->page_set_combo = combo; gtk_widget_show (combo); - gtk_table_attach (GTK_TABLE (table), combo, - 1, 2, 3, 4, GTK_FILL, 0, - 0, 0); + gtk_grid_attach (GTK_GRID (table), combo, 1, 3, 1, 1); gtk_label_set_mnemonic_widget (GTK_LABEL (label), combo); /* In enum order */ - gtk_combo_box_append_text (GTK_COMBO_BOX (combo), _("All sheets")); - gtk_combo_box_append_text (GTK_COMBO_BOX (combo), _("Even sheets")); - gtk_combo_box_append_text (GTK_COMBO_BOX (combo), _("Odd sheets")); + gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo), _("All sheets")); + gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo), _("Even sheets")); + gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo), _("Odd sheets")); gtk_combo_box_set_active (GTK_COMBO_BOX (combo), 0); label = gtk_label_new_with_mnemonic (_("Sc_ale:")); - gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); + gtk_widget_set_halign (label, GTK_ALIGN_START); + gtk_widget_set_valign (label, GTK_ALIGN_CENTER); gtk_widget_show (label); - gtk_table_attach (GTK_TABLE (table), label, - 0, 1, 4, 5, GTK_FILL, 0, - 0, 0); + gtk_grid_attach (GTK_GRID (table), label, 0, 4, 1, 1); - hbox2 = gtk_hbox_new (FALSE, 6); + hbox2 = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6); gtk_widget_show (hbox2); - gtk_table_attach (GTK_TABLE (table), hbox2, - 1, 2, 4, 5, GTK_FILL, 0, - 0, 0); - + gtk_grid_attach (GTK_GRID (table), hbox2, 1, 4, 1, 1); + spinbutton = gtk_spin_button_new_with_range (1.0, 1000.0, 1.0); priv->scale_spin = spinbutton; gtk_spin_button_set_digits (GTK_SPIN_BUTTON (spinbutton), 1); @@ -2612,77 +3430,109 @@ create_page_setup_page (GtkPrintUnixDialog *dialog) gtk_widget_show (label); gtk_box_pack_start (GTK_BOX (hbox2), label, FALSE, FALSE, 0); - table = gtk_table_new (4, 2, 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); frame = wrap_in_frame (_("Paper"), table); gtk_box_pack_start (GTK_BOX (hbox), frame, TRUE, TRUE, 6); gtk_widget_show (table); label = gtk_label_new_with_mnemonic (_("Paper _type:")); - gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); + gtk_widget_set_halign (label, GTK_ALIGN_START); + gtk_widget_set_valign (label, GTK_ALIGN_CENTER); gtk_widget_show (label); - gtk_table_attach (GTK_TABLE (table), label, - 0, 1, 0, 1, GTK_FILL, 0, - 0, 0); + gtk_grid_attach (GTK_GRID (table), label, 0, 0, 1, 1); widget = gtk_printer_option_widget_new (NULL); priv->paper_type = GTK_PRINTER_OPTION_WIDGET (widget); gtk_widget_show (widget); - gtk_table_attach (GTK_TABLE (table), widget, - 1, 2, 0, 1, GTK_FILL, 0, - 0, 0); + gtk_grid_attach (GTK_GRID (table), widget, 1, 0, 1, 1); gtk_label_set_mnemonic_widget (GTK_LABEL (label), widget); label = gtk_label_new_with_mnemonic (_("Paper _source:")); - gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); + gtk_widget_set_halign (label, GTK_ALIGN_START); + gtk_widget_set_valign (label, GTK_ALIGN_CENTER); gtk_widget_show (label); - gtk_table_attach (GTK_TABLE (table), label, - 0, 1, 1, 2, GTK_FILL, 0, - 0, 0); + gtk_grid_attach (GTK_GRID (table), label, 0, 1, 1, 1); widget = gtk_printer_option_widget_new (NULL); priv->paper_source = GTK_PRINTER_OPTION_WIDGET (widget); gtk_widget_show (widget); - gtk_table_attach (GTK_TABLE (table), widget, - 1, 2, 1, 2, GTK_FILL, 0, - 0, 0); + gtk_grid_attach (GTK_GRID (table), widget, 1, 1, 1, 1); gtk_label_set_mnemonic_widget (GTK_LABEL (label), widget); label = gtk_label_new_with_mnemonic (_("Output t_ray:")); - gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); + gtk_widget_set_halign (label, GTK_ALIGN_START); + gtk_widget_set_valign (label, GTK_ALIGN_CENTER); gtk_widget_show (label); - gtk_table_attach (GTK_TABLE (table), label, - 0, 1, 2, 3, GTK_FILL, 0, - 0, 0); + gtk_grid_attach (GTK_GRID (table), label, 0, 2, 1, 1); widget = gtk_printer_option_widget_new (NULL); priv->output_tray = GTK_PRINTER_OPTION_WIDGET (widget); gtk_widget_show (widget); - gtk_table_attach (GTK_TABLE (table), widget, - 1, 2, 2, 3, GTK_FILL, 0, - 0, 0); + gtk_grid_attach (GTK_GRID (table), widget, 1, 2, 1, 1); gtk_label_set_mnemonic_widget (GTK_LABEL (label), widget); + + label = gtk_label_new_with_mnemonic (_("_Paper size:")); + priv->paper_size_combo_label = GTK_WIDGET (label); + gtk_widget_set_halign (label, GTK_ALIGN_START); + gtk_widget_set_valign (label, GTK_ALIGN_CENTER); + gtk_widget_show (label); + gtk_grid_attach (GTK_GRID (table), label, 0, 3, 1, 1); + + combo = gtk_combo_box_new_with_model (GTK_TREE_MODEL (priv->page_setup_list)); + priv->paper_size_combo = GTK_WIDGET (combo); + 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); + gtk_grid_attach (GTK_GRID (table), combo, 1, 3, 1, 1); + gtk_label_set_mnemonic_widget (GTK_LABEL (label), combo); + gtk_widget_set_sensitive (combo, FALSE); + gtk_widget_show (combo); + + label = gtk_label_new_with_mnemonic (_("Or_ientation:")); + priv->orientation_combo_label = GTK_WIDGET (label); + gtk_widget_set_halign (label, GTK_ALIGN_START); + gtk_widget_set_valign (label, GTK_ALIGN_CENTER); + gtk_widget_show (label); + gtk_grid_attach (GTK_GRID (table), label, 0, 4, 1, 1); + + combo = gtk_combo_box_text_new (); + priv->orientation_combo = GTK_WIDGET (combo); + gtk_grid_attach (GTK_GRID (table), combo, 1, 4, 1, 1); + gtk_label_set_mnemonic_widget (GTK_LABEL (label), combo); + /* In enum order */ + gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo), _("Portrait")); + gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo), _("Landscape")); + gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo), _("Reverse portrait")); + gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo), _("Reverse landscape")); + gtk_combo_box_set_active (GTK_COMBO_BOX (combo), 0); + gtk_widget_set_sensitive (combo, FALSE); + gtk_widget_show (combo); + /* Add the page layout preview */ - hbox2 = gtk_hbox_new (FALSE, 0); + hbox2 = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); gtk_widget_show (hbox2); gtk_box_pack_start (GTK_BOX (main_vbox), hbox2, TRUE, TRUE, 0); draw = gtk_drawing_area_new (); - GTK_WIDGET_SET_FLAGS (draw, GTK_NO_WINDOW); + gtk_widget_set_has_window (draw, FALSE); priv->page_layout_preview = draw; - gtk_widget_set_size_request (draw, 200, 200); - g_signal_connect (draw, "expose-event", G_CALLBACK (draw_page_cb), dialog); + gtk_widget_set_size_request (draw, 280, 160); + g_signal_connect (draw, "draw", G_CALLBACK (draw_page_cb), dialog); gtk_widget_show (draw); gtk_box_pack_start (GTK_BOX (hbox2), draw, TRUE, FALSE, 0); - + label = gtk_label_new (_("Page Setup")); gtk_widget_show (label); - + gtk_notebook_append_page (GTK_NOTEBOOK (priv->notebook), - main_vbox, label); + main_vbox, label); } static void @@ -2692,152 +3542,143 @@ create_job_page (GtkPrintUnixDialog *dialog) GtkWidget *main_table, *label; GtkWidget *frame, *table, *radio; GtkWidget *entry, *widget; + const gchar *at_tooltip; + const gchar *on_hold_tooltip; - main_table = gtk_table_new (2, 2, FALSE); + main_table = gtk_grid_new (); gtk_container_set_border_width (GTK_CONTAINER (main_table), 12); - gtk_table_set_row_spacings (GTK_TABLE (main_table), 18); - gtk_table_set_col_spacings (GTK_TABLE (main_table), 18); + gtk_grid_set_row_spacing (GTK_GRID (main_table), 18); + gtk_grid_set_column_spacing (GTK_GRID (main_table), 18); - 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); + table = gtk_grid_new (); + gtk_grid_set_row_spacing (GTK_GRID (table), 6); + gtk_grid_set_column_spacing (GTK_GRID (table), 12); frame = wrap_in_frame (_("Job Details"), table); - gtk_table_attach (GTK_TABLE (main_table), frame, - 0, 1, 0, 1, GTK_FILL, 0, - 0, 0); + gtk_grid_attach (GTK_GRID (main_table), frame, 0, 0, 1, 1); gtk_widget_show (table); label = gtk_label_new_with_mnemonic (_("Pri_ority:")); - gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); + gtk_widget_set_halign (label, GTK_ALIGN_START); + gtk_widget_set_valign (label, GTK_ALIGN_CENTER); gtk_widget_show (label); - gtk_table_attach (GTK_TABLE (table), label, - 0, 1, 0, 1, GTK_FILL, 0, - 0, 0); + gtk_grid_attach (GTK_GRID (table), label, 0, 0, 1, 1); widget = gtk_printer_option_widget_new (NULL); priv->job_prio = GTK_PRINTER_OPTION_WIDGET (widget); gtk_widget_show (widget); - gtk_table_attach (GTK_TABLE (table), widget, - 1, 2, 0, 1, GTK_FILL, 0, - 0, 0); + gtk_grid_attach (GTK_GRID (table), widget, 1, 0, 1, 1); gtk_label_set_mnemonic_widget (GTK_LABEL (label), widget); label = gtk_label_new_with_mnemonic (_("_Billing info:")); - gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); + gtk_widget_set_halign (label, GTK_ALIGN_START); + gtk_widget_set_valign (label, GTK_ALIGN_CENTER); gtk_widget_show (label); - gtk_table_attach (GTK_TABLE (table), label, - 0, 1, 1, 2, GTK_FILL, 0, - 0, 0); + gtk_grid_attach (GTK_GRID (table), label, 0, 1, 1, 1); widget = gtk_printer_option_widget_new (NULL); priv->billing_info = GTK_PRINTER_OPTION_WIDGET (widget); gtk_widget_show (widget); - gtk_table_attach (GTK_TABLE (table), widget, - 1, 2, 1, 2, GTK_FILL, 0, - 0, 0); + gtk_grid_attach (GTK_GRID (table), widget, 1, 1, 1, 1); gtk_label_set_mnemonic_widget (GTK_LABEL (label), widget); - 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); + table = gtk_grid_new (); + gtk_grid_set_row_spacing (GTK_GRID (table), 6); + gtk_grid_set_column_spacing (GTK_GRID (table), 12); frame = wrap_in_frame (_("Print Document"), table); - gtk_table_attach (GTK_TABLE (main_table), frame, - 0, 1, 1, 2, GTK_FILL, 0, - 0, 0); + gtk_grid_attach (GTK_GRID (main_table), frame, 0, 1, 1, 1); gtk_widget_show (table); - /* Translators: this is one of the choices for the print at option + /* Translators: this is one of the choices for the print at option * in the print dialog */ radio = gtk_radio_button_new_with_mnemonic (NULL, _("_Now")); priv->print_now_radio = radio; gtk_widget_show (radio); - gtk_table_attach (GTK_TABLE (table), radio, - 0, 2, 0, 1, GTK_FILL, 0, - 0, 0); - /* Translators: this is one of the choices for the print at option + gtk_grid_attach (GTK_GRID (table), radio, 0, 0, 2, 1); + /* Translators: this is one of the choices for the print at option * in the print dialog. It also serves as the label for an entry that * allows the user to enter a time. */ radio = gtk_radio_button_new_with_mnemonic (gtk_radio_button_get_group (GTK_RADIO_BUTTON (radio)), - _("A_t:")); + _("A_t:")); + + /* Translators: Ability to parse the am/pm format depends on actual locale. + * You can remove the am/pm values below for your locale if they are not + * supported. + */ + at_tooltip = _("Specify the time of print,\n e.g. 15:30, 2:35 pm, 14:15:20, 11:46:30 am, 4 pm"); + gtk_widget_set_tooltip_text (radio, at_tooltip); priv->print_at_radio = radio; gtk_widget_show (radio); - gtk_table_attach (GTK_TABLE (table), radio, - 0, 1, 1, 2, GTK_FILL, 0, - 0, 0); + gtk_grid_attach (GTK_GRID (table), radio, 0, 1, 1, 1); entry = gtk_entry_new (); + gtk_widget_set_tooltip_text (entry, at_tooltip); + atk_object_set_name (gtk_widget_get_accessible (entry), _("Time of print")); + atk_object_set_description (gtk_widget_get_accessible (entry), at_tooltip); priv->print_at_entry = entry; gtk_widget_show (entry); - gtk_table_attach (GTK_TABLE (table), entry, - 1, 2, 1, 2, GTK_FILL, 0, - 0, 0); + gtk_grid_attach (GTK_GRID (table), entry, 1, 1, 1, 1); + + g_signal_connect (radio, "toggled", G_CALLBACK (update_entry_sensitivity), entry); + update_entry_sensitivity (radio, entry); - /* Translators: this is one of the choices for the print at option + /* Translators: this is one of the choices for the print at option * in the print dialog. It means that the print job will not be * printed until it explicitly gets 'released'. */ radio = gtk_radio_button_new_with_mnemonic (gtk_radio_button_get_group (GTK_RADIO_BUTTON (radio)), - _("On _hold")); + _("On _hold")); + on_hold_tooltip = _("Hold the job until it is explicitly released"); + gtk_widget_set_tooltip_text (radio, on_hold_tooltip); priv->print_hold_radio = radio; gtk_widget_show (radio); - gtk_table_attach (GTK_TABLE (table), radio, - 0, 2, 2, 3, GTK_FILL, 0, - 0, 0); + gtk_grid_attach (GTK_GRID (table), radio, 0, 2, 2, 1); g_signal_connect_swapped (priv->print_now_radio, "toggled", - G_CALLBACK (update_print_at_option), dialog); + G_CALLBACK (update_print_at_option), dialog); g_signal_connect_swapped (priv->print_at_radio, "toggled", - G_CALLBACK (update_print_at_option), dialog); + G_CALLBACK (update_print_at_option), dialog); g_signal_connect_swapped (priv->print_at_entry, "changed", - G_CALLBACK (update_print_at_option), dialog); + G_CALLBACK (update_print_at_option), dialog); g_signal_connect_swapped (priv->print_hold_radio, "toggled", - G_CALLBACK (update_print_at_option), dialog); + G_CALLBACK (update_print_at_option), dialog); - 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); + table = gtk_grid_new (); + gtk_grid_set_row_spacing (GTK_GRID (table), 6); + gtk_grid_set_column_spacing (GTK_GRID (table), 12); frame = wrap_in_frame (_("Add Cover Page"), table); - gtk_table_attach (GTK_TABLE (main_table), frame, - 1, 2, 0, 1, GTK_FILL, 0, - 0, 0); + gtk_grid_attach (GTK_GRID (main_table), frame, 1, 0, 1, 1); gtk_widget_show (table); - /* Translators, this is the label used for the option in the print + /* Translators, this is the label used for the option in the print * dialog that controls the front cover page. */ label = gtk_label_new_with_mnemonic (_("Be_fore:")); - gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); + gtk_widget_set_halign (label, GTK_ALIGN_START); + gtk_widget_set_valign (label, GTK_ALIGN_CENTER); gtk_widget_show (label); - gtk_table_attach (GTK_TABLE (table), label, - 0, 1, 0, 1, GTK_FILL, 0, - 0, 0); + gtk_grid_attach (GTK_GRID (table), label, 0, 0, 1, 1); widget = gtk_printer_option_widget_new (NULL); priv->cover_before = GTK_PRINTER_OPTION_WIDGET (widget); gtk_widget_show (widget); - gtk_table_attach (GTK_TABLE (table), widget, - 1, 2, 0, 1, GTK_FILL, 0, - 0, 0); + gtk_grid_attach (GTK_GRID (table), widget, 1, 0, 1, 1); gtk_label_set_mnemonic_widget (GTK_LABEL (label), widget); - /* Translators, this is the label used for the option in the print + /* Translators, this is the label used for the option in the print * dialog that controls the back cover page. */ label = gtk_label_new_with_mnemonic (_("_After:")); - gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); + gtk_widget_set_halign (label, GTK_ALIGN_START); + gtk_widget_set_valign (label, GTK_ALIGN_CENTER); gtk_widget_show (label); - gtk_table_attach (GTK_TABLE (table), label, - 0, 1, 1, 2, GTK_FILL, 0, - 0, 0); + gtk_grid_attach (GTK_GRID (table), label, 0, 1, 1, 1); widget = gtk_printer_option_widget_new (NULL); priv->cover_after = GTK_PRINTER_OPTION_WIDGET (widget); gtk_widget_show (widget); - gtk_table_attach (GTK_TABLE (table), widget, - 1, 2, 1, 2, GTK_FILL, 0, - 0, 0); + gtk_grid_attach (GTK_GRID (table), widget, 1, 1, 1, 1); gtk_label_set_mnemonic_widget (GTK_LABEL (label), widget); /* Translators: this is the tab label for the notebook tab containing @@ -2848,39 +3689,38 @@ create_job_page (GtkPrintUnixDialog *dialog) priv->job_page = main_table; gtk_notebook_append_page (GTK_NOTEBOOK (priv->notebook), - main_table, label); + main_table, label); } -static void +static void create_optional_page (GtkPrintUnixDialog *dialog, - const gchar *text, - GtkWidget **table_out, - GtkWidget **page_out) + const gchar *text, + GtkWidget **table_out, + GtkWidget **page_out) { GtkPrintUnixDialogPrivate *priv = dialog->priv; GtkWidget *table, *label, *scrolled; scrolled = gtk_scrolled_window_new (NULL, NULL); gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled), - GTK_POLICY_NEVER, - GTK_POLICY_AUTOMATIC); - - table = gtk_table_new (1, 2, FALSE); - gtk_table_set_row_spacings (GTK_TABLE (table), 6); - gtk_table_set_col_spacings (GTK_TABLE (table), 12); + GTK_POLICY_NEVER, + GTK_POLICY_AUTOMATIC); + + 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), 12); gtk_widget_show (table); - gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (scrolled), - table); - gtk_viewport_set_shadow_type (GTK_VIEWPORT (GTK_BIN(scrolled)->child), - GTK_SHADOW_NONE); - + gtk_container_add (GTK_CONTAINER (scrolled), table); + gtk_viewport_set_shadow_type (GTK_VIEWPORT (gtk_bin_get_child (GTK_BIN (scrolled))), + GTK_SHADOW_NONE); + label = gtk_label_new (text); gtk_widget_show (label); - + gtk_notebook_append_page (GTK_NOTEBOOK (priv->notebook), - scrolled, label); + scrolled, label); *table_out = table; *page_out = scrolled; @@ -2895,44 +3735,45 @@ create_advanced_page (GtkPrintUnixDialog *dialog) scrolled = gtk_scrolled_window_new (NULL, NULL); priv->advanced_page = scrolled; gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled), - GTK_POLICY_NEVER, - GTK_POLICY_AUTOMATIC); + GTK_POLICY_NEVER, + GTK_POLICY_AUTOMATIC); - main_vbox = gtk_vbox_new (FALSE, 18); + main_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 18); gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12); gtk_widget_show (main_vbox); - gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (scrolled), - main_vbox); - gtk_viewport_set_shadow_type (GTK_VIEWPORT (GTK_BIN(scrolled)->child), - GTK_SHADOW_NONE); - + gtk_container_add (GTK_CONTAINER (scrolled), main_vbox); + gtk_viewport_set_shadow_type (GTK_VIEWPORT (gtk_bin_get_child (GTK_BIN (scrolled))), + GTK_SHADOW_NONE); + priv->advanced_vbox = main_vbox; - + label = gtk_label_new (_("Advanced")); gtk_widget_show (label); - + gtk_notebook_append_page (GTK_NOTEBOOK (priv->notebook), - scrolled, label); + scrolled, label); } - static void populate_dialog (GtkPrintUnixDialog *print_dialog) { GtkPrintUnixDialogPrivate *priv = print_dialog->priv; GtkDialog *dialog = GTK_DIALOG (print_dialog); GtkWidget *vbox, *conflict_hbox, *image, *label; + GtkWidget *action_area, *content_area; + + content_area = gtk_dialog_get_content_area (dialog); + action_area = gtk_dialog_get_action_area (dialog); - 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); + 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); - vbox = gtk_vbox_new (FALSE, 6); + vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6); gtk_container_set_border_width (GTK_CONTAINER (vbox), 5); - gtk_box_pack_start (GTK_BOX (dialog->vbox), vbox, TRUE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (content_area), vbox, TRUE, TRUE, 0); gtk_widget_show (vbox); priv->notebook = gtk_notebook_new (); @@ -2944,18 +3785,22 @@ populate_dialog (GtkPrintUnixDialog *print_dialog) create_main_page (print_dialog); create_page_setup_page (print_dialog); create_job_page (print_dialog); + /* Translators: this will appear as tab label in print dialog. */ create_optional_page (print_dialog, _("Image Quality"), - &priv->image_quality_table, - &priv->image_quality_page); + &priv->image_quality_table, + &priv->image_quality_page); + /* Translators: this will appear as tab label in print dialog. */ create_optional_page (print_dialog, _("Color"), - &priv->color_table, - &priv->color_page); + &priv->color_table, + &priv->color_page); + /* Translators: this will appear as tab label in print dialog. */ + /* It's a typographical term, as in "Binding and finishing" */ create_optional_page (print_dialog, _("Finishing"), - &priv->finishing_table, - &priv->finishing_page); + &priv->finishing_table, + &priv->finishing_page); create_advanced_page (print_dialog); - priv->conflicts_widget = conflict_hbox = gtk_hbox_new (FALSE, 12); + priv->conflicts_widget = conflict_hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12); gtk_box_pack_end (GTK_BOX (vbox), conflict_hbox, FALSE, FALSE, 0); image = gtk_image_new_from_stock (GTK_STOCK_DIALOG_WARNING, GTK_ICON_SIZE_MENU); gtk_widget_show (image); @@ -2963,48 +3808,43 @@ populate_dialog (GtkPrintUnixDialog *print_dialog) label = gtk_label_new (_("Some of the settings in the dialog conflict")); gtk_widget_show (label); gtk_box_pack_start (GTK_BOX (conflict_hbox), label, FALSE, TRUE, 0); - + load_print_backends (print_dialog); } /** * gtk_print_unix_dialog_new: - * @title: Title of the dialog, or %NULL - * @parent: Transient parent of the dialog, or %NULL + * @title: (allow-none): Title of the dialog, or %NULL + * @parent: (allow-none): Transient parent of the dialog, or %NULL * * Creates a new #GtkPrintUnixDialog. * * Return value: a new #GtkPrintUnixDialog * * Since: 2.10 - **/ + */ GtkWidget * gtk_print_unix_dialog_new (const gchar *title, - GtkWindow *parent) + GtkWindow *parent) { GtkWidget *result; - const gchar *_title = _("Print"); - - if (title) - _title = title; result = g_object_new (GTK_TYPE_PRINT_UNIX_DIALOG, - "transient-for", parent, - "title", _title, - "has-separator", FALSE, + "transient-for", parent, + "title", title ? title : _("Print"), NULL); - + return result; } /** * gtk_print_unix_dialog_get_selected_printer: * @dialog: a #GtkPrintUnixDialog - * + * * Gets the currently selected printer. - * - * Returns: the currently selected printer - * + * + * Returns: (transfer none): the currently selected printer + * * Since: 2.10 */ GtkPrinter * @@ -3019,14 +3859,14 @@ gtk_print_unix_dialog_get_selected_printer (GtkPrintUnixDialog *dialog) * gtk_print_unix_dialog_set_page_setup: * @dialog: a #GtkPrintUnixDialog * @page_setup: a #GtkPageSetup - * + * * Sets the page setup of the #GtkPrintUnixDialog. * * Since: 2.10 */ void gtk_print_unix_dialog_set_page_setup (GtkPrintUnixDialog *dialog, - GtkPageSetup *page_setup) + GtkPageSetup *page_setup) { GtkPrintUnixDialogPrivate *priv; @@ -3049,10 +3889,10 @@ gtk_print_unix_dialog_set_page_setup (GtkPrintUnixDialog *dialog, /** * gtk_print_unix_dialog_get_page_setup: * @dialog: a #GtkPrintUnixDialog - * + * * Gets the page setup that is used by the #GtkPrintUnixDialog. - * - * Returns: the page setup of @dialog. + * + * Returns: (transfer none): the page setup of @dialog. * * Since: 2.10 */ @@ -3064,11 +3904,29 @@ gtk_print_unix_dialog_get_page_setup (GtkPrintUnixDialog *dialog) return dialog->priv->page_setup; } +/** + * gtk_print_unix_dialog_get_page_setup_set: + * @dialog: a #GtkPrintUnixDialog + * + * Gets the page setup that is used by the #GtkPrintUnixDialog. + * + * Returns: whether a page setup was set by user. + * + * Since: 2.18 + */ +gboolean +gtk_print_unix_dialog_get_page_setup_set (GtkPrintUnixDialog *dialog) +{ + g_return_val_if_fail (GTK_IS_PRINT_UNIX_DIALOG (dialog), FALSE); + + return dialog->priv->page_setup_set; +} + /** * gtk_print_unix_dialog_set_current_page: * @dialog: a #GtkPrintUnixDialog * @current_page: the current page number. - * + * * Sets the current page number. If @current_page is not -1, this enables * the current page choice for the range of pages to print. * @@ -3076,7 +3934,7 @@ gtk_print_unix_dialog_get_page_setup (GtkPrintUnixDialog *dialog) */ void gtk_print_unix_dialog_set_current_page (GtkPrintUnixDialog *dialog, - gint current_page) + gint current_page) { GtkPrintUnixDialogPrivate *priv; @@ -3089,7 +3947,7 @@ gtk_print_unix_dialog_set_current_page (GtkPrintUnixDialog *dialog, priv->current_page = current_page; if (priv->current_page_radio) - gtk_widget_set_sensitive (priv->current_page_radio, current_page != -1); + gtk_widget_set_sensitive (priv->current_page_radio, current_page != -1); g_object_notify (G_OBJECT (dialog), "current-page"); } @@ -3098,11 +3956,11 @@ gtk_print_unix_dialog_set_current_page (GtkPrintUnixDialog *dialog, /** * gtk_print_unix_dialog_get_current_page: * @dialog: a #GtkPrintUnixDialog - * - * Gets the current page of the #GtkPrintDialog. - * + * + * Gets the current page of the #GtkPrintUnixDialog. + * * Returns: the current page of @dialog - * + * * Since: 2.10 */ gint @@ -3115,7 +3973,7 @@ gtk_print_unix_dialog_get_current_page (GtkPrintUnixDialog *dialog) static gboolean set_active_printer (GtkPrintUnixDialog *dialog, - const gchar *printer_name) + const gchar *printer_name) { GtkPrintUnixDialogPrivate *priv = dialog->priv; GtkTreeModel *model; @@ -3128,56 +3986,57 @@ set_active_printer (GtkPrintUnixDialog *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_OBJ, &printer, -1); - if (printer == NULL) - continue; - - if (strcmp (gtk_printer_get_name (printer), printer_name) == 0) - { - gtk_tree_model_filter_convert_child_iter_to_iter (priv->printer_list_filter, - &filter_iter, &iter); - - selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (priv->printer_treeview)); - priv->internal_printer_change = TRUE; - gtk_tree_selection_select_iter (selection, &filter_iter); - priv->internal_printer_change = FALSE; - g_free (priv->waiting_for_printer); - priv->waiting_for_printer = NULL; - - 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_OBJ, &printer, + -1); + if (printer == NULL) + continue; + + if (strcmp (gtk_printer_get_name (printer), printer_name) == 0) + { + gtk_tree_model_filter_convert_child_iter_to_iter (priv->printer_list_filter, + &filter_iter, &iter); + + selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (priv->printer_treeview)); + priv->internal_printer_change = TRUE; + gtk_tree_selection_select_iter (selection, &filter_iter); + priv->internal_printer_change = FALSE; + g_free (priv->waiting_for_printer); + priv->waiting_for_printer = NULL; + + g_object_unref (printer); + return TRUE; + } + + g_object_unref (printer); + + } while (gtk_tree_model_iter_next (model, &iter)); + } + return FALSE; } /** * gtk_print_unix_dialog_set_settings: * @dialog: a #GtkPrintUnixDialog - * @settings: a #GtkPrintSettings, or %NULL - * + * @settings: (allow-none): a #GtkPrintSettings, or %NULL + * * Sets the #GtkPrintSettings for the #GtkPrintUnixDialog. Typically, * this is used to restore saved print settings from a previous print * operation before the print dialog is shown. - * + * * Since: 2.10 **/ void gtk_print_unix_dialog_set_settings (GtkPrintUnixDialog *dialog, - GtkPrintSettings *settings) + GtkPrintSettings *settings) { GtkPrintUnixDialogPrivate *priv; const gchar *printer; GtkPageRange *ranges; gint num_ranges; - + g_return_if_fail (GTK_IS_PRINT_UNIX_DIALOG (dialog)); g_return_if_fail (settings == NULL || GTK_IS_PRINT_SETTINGS (settings)); @@ -3194,12 +4053,12 @@ gtk_print_unix_dialog_set_settings (GtkPrintUnixDialog *dialog, ranges = gtk_print_settings_get_page_ranges (settings, &num_ranges); if (ranges) { - dialog_set_page_ranges (dialog, ranges, num_ranges); + dialog_set_page_ranges (dialog, ranges, num_ranges); g_free (ranges); } priv->format_for_printer = - g_strdup (gtk_print_settings_get (settings, "format-for-printer")); + g_strdup (gtk_print_settings_get (settings, "format-for-printer")); } if (priv->initial_settings) @@ -3209,15 +4068,15 @@ gtk_print_unix_dialog_set_settings (GtkPrintUnixDialog *dialog, g_free (priv->waiting_for_printer); priv->waiting_for_printer = NULL; - + if (settings) { g_object_ref (settings); printer = gtk_print_settings_get_printer (settings); - + if (printer && !set_active_printer (dialog, printer)) - priv->waiting_for_printer = g_strdup (printer); + priv->waiting_for_printer = g_strdup (printer); } g_object_notify (G_OBJECT (dialog), "print-settings"); @@ -3226,12 +4085,12 @@ gtk_print_unix_dialog_set_settings (GtkPrintUnixDialog *dialog, /** * gtk_print_unix_dialog_get_settings: * @dialog: a #GtkPrintUnixDialog - * + * * Gets a new #GtkPrintSettings object that represents the * current values in the print dialog. Note that this creates a * new object, and you need to unref it * if don't want to keep it. - * + * * Returns: a new #GtkPrintSettings object with the values from @dialog * * Since: 2.10 @@ -3252,36 +4111,35 @@ gtk_print_unix_dialog_get_settings (GtkPrintUnixDialog *dialog) if (priv->current_printer) gtk_print_settings_set_printer (settings, - gtk_printer_get_name (priv->current_printer)); + gtk_printer_get_name (priv->current_printer)); else gtk_print_settings_set_printer (settings, "default"); - + gtk_print_settings_set (settings, "format-for-printer", - priv->format_for_printer); + priv->format_for_printer); - gtk_print_settings_set_collate (settings, - dialog_get_collate (dialog)); - + dialog_get_collate (dialog)); + gtk_print_settings_set_reverse (settings, - dialog_get_reverse (dialog)); - + dialog_get_reverse (dialog)); + gtk_print_settings_set_n_copies (settings, - dialog_get_n_copies (dialog)); + dialog_get_n_copies (dialog)); gtk_print_settings_set_scale (settings, - dialog_get_scale (dialog)); - + dialog_get_scale (dialog)); + gtk_print_settings_set_page_set (settings, - dialog_get_page_set (dialog)); - + dialog_get_page_set (dialog)); + print_pages = dialog_get_print_pages (dialog); gtk_print_settings_set_print_pages (settings, print_pages); ranges = dialog_get_page_ranges (dialog, &n_ranges); if (ranges) { - gtk_print_settings_set_page_ranges (settings, ranges, n_ranges); + gtk_print_settings_set_page_ranges (settings, ranges, n_ranges); g_free (ranges); } @@ -3289,9 +4147,9 @@ gtk_print_unix_dialog_get_settings (GtkPrintUnixDialog *dialog) if (priv->current_printer) _gtk_printer_get_settings_from_options (priv->current_printer, - priv->options, - settings); - + priv->options, + settings); + return settings; } @@ -3307,11 +4165,11 @@ gtk_print_unix_dialog_get_settings (GtkPrintUnixDialog *dialog) */ void gtk_print_unix_dialog_add_custom_tab (GtkPrintUnixDialog *dialog, - GtkWidget *child, - GtkWidget *tab_label) + GtkWidget *child, + GtkWidget *tab_label) { gtk_notebook_insert_page (GTK_NOTEBOOK (dialog->priv->notebook), - child, tab_label, 2); + child, tab_label, 2); gtk_widget_show (child); gtk_widget_show (tab_label); } @@ -3331,27 +4189,226 @@ gtk_print_unix_dialog_add_custom_tab (GtkPrintUnixDialog *dialog, */ void gtk_print_unix_dialog_set_manual_capabilities (GtkPrintUnixDialog *dialog, - GtkPrintCapabilities capabilities) + GtkPrintCapabilities capabilities) { GtkPrintUnixDialogPrivate *priv = dialog->priv; - priv->manual_capabilities = capabilities; - update_dialog_from_capabilities (dialog); + if (priv->manual_capabilities != capabilities) + { + priv->manual_capabilities = capabilities; + update_dialog_from_capabilities (dialog); - if (priv->current_printer) + if (priv->current_printer) + { + GtkTreeSelection *selection; + + selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (priv->printer_treeview)); + g_clear_object (&priv->current_printer); + priv->internal_printer_change = TRUE; + selected_printer_changed (selection, dialog); + priv->internal_printer_change = FALSE; + } + + g_object_notify (G_OBJECT (dialog), "manual-capabilities"); + } +} + +/** + * gtk_print_unix_dialog_get_manual_capabilities: + * @dialog: a #GtkPrintUnixDialog + * + * Gets the value of #GtkPrintUnixDialog:manual-capabilities property. + * + * Returns: the printing capabilities + * + * Since: 2.18 + */ +GtkPrintCapabilities +gtk_print_unix_dialog_get_manual_capabilities (GtkPrintUnixDialog *dialog) +{ + g_return_val_if_fail (GTK_IS_PRINT_UNIX_DIALOG (dialog), FALSE); + + return dialog->priv->manual_capabilities; +} + +/** + * gtk_print_unix_dialog_set_support_selection: + * @dialog: a #GtkPrintUnixDialog + * @support_selection: %TRUE to allow print selection + * + * Sets whether the print dialog allows user to print a selection. + * + * Since: 2.18 + */ +void +gtk_print_unix_dialog_set_support_selection (GtkPrintUnixDialog *dialog, + gboolean support_selection) +{ + GtkPrintUnixDialogPrivate *priv; + + g_return_if_fail (GTK_IS_PRINT_UNIX_DIALOG (dialog)); + + priv = dialog->priv; + + support_selection = support_selection != FALSE; + if (priv->support_selection != support_selection) { - GtkTreeSelection *selection; + priv->support_selection = support_selection; - selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (priv->printer_treeview)); + if (priv->selection_radio) + { + if (support_selection) + { + gtk_widget_set_sensitive (priv->selection_radio, priv->has_selection); + gtk_widget_show (priv->selection_radio); + } + else + { + gtk_widget_set_sensitive (priv->selection_radio, FALSE); + gtk_widget_hide (priv->selection_radio); + } + } - g_object_unref (priv->current_printer); - priv->current_printer = NULL; - priv->internal_printer_change = TRUE; - selected_printer_changed (selection, dialog); - priv->internal_printer_change = FALSE; - } + g_object_notify (G_OBJECT (dialog), "support-selection"); + } +} + +/** + * gtk_print_unix_dialog_get_support_selection: + * @dialog: a #GtkPrintUnixDialog + * + * Gets the value of #GtkPrintUnixDialog:support-selection property. + * + * Returns: whether the application supports print of selection + * + * Since: 2.18 + */ +gboolean +gtk_print_unix_dialog_get_support_selection (GtkPrintUnixDialog *dialog) +{ + g_return_val_if_fail (GTK_IS_PRINT_UNIX_DIALOG (dialog), FALSE); + + return dialog->priv->support_selection; +} + +/** + * gtk_print_unix_dialog_set_has_selection: + * @dialog: a #GtkPrintUnixDialog + * @has_selection: %TRUE indicates that a selection exists + * + * Sets whether a selection exists. + * + * Since: 2.18 + */ +void +gtk_print_unix_dialog_set_has_selection (GtkPrintUnixDialog *dialog, + gboolean has_selection) +{ + GtkPrintUnixDialogPrivate *priv; + + g_return_if_fail (GTK_IS_PRINT_UNIX_DIALOG (dialog)); + + priv = dialog->priv; + + has_selection = has_selection != FALSE; + if (priv->has_selection != has_selection) + { + priv->has_selection = has_selection; + + if (priv->selection_radio) + { + if (priv->support_selection) + gtk_widget_set_sensitive (priv->selection_radio, has_selection); + else + gtk_widget_set_sensitive (priv->selection_radio, FALSE); + } + + g_object_notify (G_OBJECT (dialog), "has-selection"); + } +} + +/** + * gtk_print_unix_dialog_get_has_selection: + * @dialog: a #GtkPrintUnixDialog + * + * Gets the value of #GtkPrintUnixDialog:has-selection property. + * + * Returns: whether there is a selection + * + * Since: 2.18 + */ +gboolean +gtk_print_unix_dialog_get_has_selection (GtkPrintUnixDialog *dialog) +{ + g_return_val_if_fail (GTK_IS_PRINT_UNIX_DIALOG (dialog), FALSE); + + return dialog->priv->has_selection; +} + +/** + * gtk_print_unix_dialog_set_embed_page_setup + * @dialog: a #GtkPrintUnixDialog + * @embed: embed page setup selection + * + * Embed page size combo box and orientation combo box into page setup page. + * + * Since: 2.18 + */ +void +gtk_print_unix_dialog_set_embed_page_setup (GtkPrintUnixDialog *dialog, + gboolean embed) +{ + GtkPrintUnixDialogPrivate *priv; + + g_return_if_fail (GTK_IS_PRINT_UNIX_DIALOG (dialog)); + + priv = dialog->priv; + + embed = embed != FALSE; + if (priv->embed_page_setup != embed) + { + priv->embed_page_setup = embed; + + gtk_widget_set_sensitive (priv->paper_size_combo, priv->embed_page_setup); + gtk_widget_set_sensitive (priv->orientation_combo, priv->embed_page_setup); + + if (priv->embed_page_setup) + { + if (priv->paper_size_combo != NULL) + g_signal_connect (priv->paper_size_combo, "changed", G_CALLBACK (paper_size_changed), dialog); + + if (priv->orientation_combo) + g_signal_connect (priv->orientation_combo, "changed", G_CALLBACK (orientation_changed), dialog); + } + else + { + if (priv->paper_size_combo != NULL) + g_signal_handlers_disconnect_by_func (priv->paper_size_combo, G_CALLBACK (paper_size_changed), dialog); + + if (priv->orientation_combo) + g_signal_handlers_disconnect_by_func (priv->orientation_combo, G_CALLBACK (orientation_changed), dialog); + } + + priv->internal_page_setup_change = TRUE; + update_paper_sizes (dialog); + priv->internal_page_setup_change = FALSE; + } } -#define __GTK_PRINT_UNIX_DIALOG_C__ -#include "gtkaliasdef.c" +/** + * gtk_print_unix_dialog_get_embed_page_setup: + * @dialog: a #GtkPrintUnixDialog + * + * Gets the value of #GtkPrintUnixDialog:embed-page-setup property. + * + * Returns: whether there is a selection + * + * Since: 2.18 + */ +gboolean +gtk_print_unix_dialog_get_embed_page_setup (GtkPrintUnixDialog *dialog) +{ + g_return_val_if_fail (GTK_IS_PRINT_UNIX_DIALOG (dialog), FALSE); + return dialog->priv->embed_page_setup; +}