* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
#include "config.h"
+
#include <stdlib.h>
#include <string.h>
#include <ctype.h>
#include <stdio.h>
#include <math.h>
-#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"
#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 "gtkcustompaperunixdialog.h"
-#include "gtkprintbackend.h"
-#include "gtkprinter-private.h"
-#include "gtkprintunixdialog.h"
-#include "gtkprinteroptionwidget.h"
-#include "gtkprintutils.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
+
+/**
+ * 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
+ * <link linkend="gtk-High-level-Printing-API">high-level printing API</link>
+ *
+ * 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:
+ * <variablelist>
+ * <varlistentry><term>%GTK_RESPONSE_OK</term>
+ * <listitem><para>for the "Print" button</para></listitem>
+ * </varlistentry>
+ * <varlistentry><term>%GTK_RESPONSE_APPLY</term>
+ * <listitem><para>for the "Preview" button</para></listitem>
+ * </varlistentry>
+ * <varlistentry><term>%GTK_RESPONSE_CANCEL</term>
+ * <listitem><para>for the "Cancel" button</para></listitem>
+ * </varlistentry>
+ * </variablelist>
+ *
+ * <!-- FIXME example here -->
+ *
+ * Printing support was added in GTK+ 2.10.
+ *
+ * <refsect2 id="GtkPrintUnixDialog-BUILDER-UI">
+ * <title>GtkPrintUnixDialog as GtkBuildable</title>
+ * <para>
+ * The GtkPrintUnixDialog implementation of the GtkBuildable interface exposes its
+ * @notebook internal children with the name "notebook".
+ *
+ * <example>
+ * <title>A <structname>GtkPrintUnixDialog</structname> UI definition fragment.</title>
+ * <programlisting><![CDATA[
+ * <object class="GtkPrintUnixDialog" id="dialog1">
+ * <child internal-child="notebook">
+ * <object class="GtkNotebook" id="notebook">
+ * <child>
+ * <object class="GtkLabel" id="tabcontent">
+ * <property name="label">Content on notebook tab</property>
+ * </object>
+ * </child>
+ * <child type="tab">
+ * <object class="GtkLabel" id="tablabel">
+ * <property name="label">Tab label</property>
+ * </object>
+ * <packing>
+ * <property name="tab_expand">False</property>
+ * <property name="tab_fill">False</property>
+ * </packing>
+ * </child>
+ * </object>
+ * </child>
+ * </object>
+ * ]]></programlisting>
+ * </example>
+ * </para>
+ * </refsect2>
+ */
+
+
+#define EXAMPLE_PAGE_AREA_SIZE 110
#define RULER_DISTANCE 7.5
#define RULER_RADIUS 2
-#define GTK_PRINT_UNIX_DIALOG_GET_PRIVATE(o) \
- (G_TYPE_INSTANCE_GET_PRIVATE ((o), GTK_TYPE_PRINT_UNIX_DIALOG, GtkPrintUnixDialogPrivate))
-
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,
GValue *value,
GParamSpec *pspec);
-static void gtk_print_unix_dialog_style_set (GtkWidget *widget,
- GtkStyle *previous_style);
+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,
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;
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_object_class_install_property (object_class,
PROP_MANUAL_CAPABILITIES,
g_param_spec_flags ("manual-capabilities",
- P_("Manual Capabilites"),
+ 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_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));
+ 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));
}
static void
set_busy_cursor (GtkPrintUnixDialog *dialog,
- gboolean busy)
+ gboolean busy)
{
+ GtkWidget *widget;
GtkWindow *toplevel;
GdkDisplay *display;
GdkCursor *cursor;
toplevel = get_toplevel (GTK_WIDGET (dialog));
- if (!toplevel || !GTK_WIDGET_REALIZED (toplevel))
+ widget = GTK_WIDGET (toplevel);
+
+ if (!toplevel || !gtk_widget_get_realized (widget))
return;
- display = gtk_widget_get_display (GTK_WIDGET (toplevel));
+ 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 (toplevel)->window, cursor);
+ gdk_window_set_cursor (gtk_widget_get_window (widget), cursor);
gdk_display_flush (display);
if (cursor)
- gdk_cursor_unref (cursor);
+ g_object_unref (cursor);
}
static void
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));
return TRUE;
}
- /* Shows overwrite confirmation dialog in the case of printing to file which
- * already exists. */
+ /* Shows overwrite confirmation dialog in the case of printing
+ * to file which already exists.
+ */
if (gtk_printer_is_virtual (printer))
{
option = gtk_printer_option_set_lookup (priv->options,
gtk_dialog_set_default_response (GTK_DIALOG (dialog),
GTK_RESPONSE_ACCEPT);
- if (toplevel->group)
- gtk_window_group_add_window (toplevel->group,
+ 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));
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;
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);
+ 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);
}
static void
-disconnect_printer_details_request (GtkPrintUnixDialog *dialog, gboolean details_failed)
+disconnect_printer_details_request (GtkPrintUnixDialog *dialog,
+ gboolean details_failed)
{
GtkPrintUnixDialogPrivate *priv = dialog->priv;
unschedule_idle_mark_conflicts (dialog);
disconnect_printer_details_request (dialog, FALSE);
- if (priv->current_printer)
- {
- g_object_unref (priv->current_printer);
- priv->current_printer = NULL;
- }
-
- if (priv->printer_list)
- {
- g_object_unref (priv->printer_list);
- priv->printer_list = NULL;
- }
-
- if (priv->custom_paper_list)
- {
- g_object_unref (priv->custom_paper_list);
- priv->custom_paper_list = NULL;
- }
-
- if (priv->printer_list_filter)
- {
- g_object_unref (priv->printer_list_filter);
- priv->printer_list_filter = NULL;
- }
-
- if (priv->options)
- {
- g_object_unref (priv->options);
- priv->options = 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->number_up_layout_2_option)
{
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)
{
g_list_free (priv->print_backends);
priv->print_backends = NULL;
- if (priv->page_setup_list)
- {
- g_object_unref (priv->page_setup_list);
- priv->page_setup_list = NULL;
- }
+ g_clear_object (&priv->page_setup_list);
G_OBJECT_CLASS (gtk_print_unix_dialog_parent_class)->finalize (object);
}
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,
{
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
-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);
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);
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);
GtkPrinter *printer;
GtkPrintUnixDialogPrivate *priv = dialog->priv;
- gtk_tree_model_get (model,
- iter,
- PRINTER_LIST_COL_PRINTER_OBJ,
- &printer,
+ gtk_tree_model_get (model, iter,
+ PRINTER_LIST_COL_PRINTER_OBJ, &printer,
-1);
if (printer == NULL)
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;
}
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 ("<b>%s</b>", 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_widget_set_margin_left (child, 12);
+ gtk_widget_set_halign (child, GTK_ALIGN_FILL);
+ gtk_widget_set_valign (child, GTK_ALIGN_FILL);
- gtk_container_add (GTK_CONTAINER (alignment), child);
+ gtk_box_pack_start (GTK_BOX (frame), child, FALSE, FALSE, 0);
gtk_widget_show (frame);
- gtk_widget_show (alignment);
return frame;
}
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)
{
- GtkTable *table;
+ GtkGrid *table;
GtkWidget *label, *widget;
- gint row;
+ guint row;
- table = GTK_TABLE (user_data);
+ table = GTK_GRID (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
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)
+
+ nrows = grid_rows (GTK_GRID (table));
+ if (nrows == 0)
gtk_widget_hide (page);
else
gtk_widget_show (page);
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));
+ const gchar *text;
+
+ text = gtk_entry_get_text (GTK_ENTRY (priv->print_at_entry));
gtk_printer_option_set (option, text);
}
}
gchar *group;
GtkWidget *table, *frame;
gboolean has_advanced, has_job;
+ guint nrows;
+ GList *children;
if (priv->current_printer == NULL)
{
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);
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);
+ 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)
+
+ nrows = grid_rows (GTK_GRID (table));
+ if (nrows == 0)
gtk_widget_destroy (table);
else
{
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
}
static gboolean
-page_setup_is_equal (GtkPageSetup *a,
- GtkPageSetup *b)
+page_setup_is_equal (GtkPageSetup *a,
+ GtkPageSetup *b)
{
return
gtk_paper_size_is_equal (gtk_page_setup_get_paper_size (a),
- gtk_page_setup_get_paper_size (b)) &&
+ gtk_page_setup_get_paper_size (b)) &&
gtk_page_setup_get_top_margin (a, GTK_UNIT_MM) == gtk_page_setup_get_top_margin (b, GTK_UNIT_MM) &&
gtk_page_setup_get_bottom_margin (a, GTK_UNIT_MM) == gtk_page_setup_get_bottom_margin (b, GTK_UNIT_MM) &&
gtk_page_setup_get_left_margin (a, GTK_UNIT_MM) == gtk_page_setup_get_left_margin (b, GTK_UNIT_MM) &&
static gboolean
page_setup_is_same_size (GtkPageSetup *a,
- GtkPageSetup *b)
+ GtkPageSetup *b)
{
return gtk_paper_size_is_equal (gtk_page_setup_get_paper_size (a),
- gtk_page_setup_get_paper_size (b));
+ gtk_page_setup_get_paper_size (b));
}
static gboolean
set_paper_size (GtkPrintUnixDialog *dialog,
- GtkPageSetup *page_setup,
- gboolean size_only,
- gboolean add_item)
+ GtkPageSetup *page_setup,
+ gboolean size_only,
+ gboolean add_item)
{
GtkPrintUnixDialogPrivate *priv = dialog->priv;
GtkTreeModel *model;
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));
+ {
+ 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);
+ PAGE_SETUP_LIST_COL_IS_SEPARATOR, TRUE,
+ -1);
gtk_list_store_append (priv->page_setup_list, &iter);
gtk_list_store_set (priv->page_setup_list, &iter,
- PAGE_SETUP_LIST_COL_PAGE_SETUP, page_setup,
- -1);
+ PAGE_SETUP_LIST_COL_PAGE_SETUP, page_setup,
+ -1);
gtk_combo_box_set_active_iter (GTK_COMBO_BOX (priv->paper_size_combo),
- &iter);
+ &iter);
gtk_combo_box_set_active (GTK_COMBO_BOX (priv->orientation_combo),
- gtk_page_setup_get_orientation (page_setup));
+ gtk_page_setup_get_orientation (page_setup));
return TRUE;
}
{
gtk_list_store_append (priv->page_setup_list, &paper_iter);
gtk_list_store_set (priv->page_setup_list, &paper_iter,
- PAGE_SETUP_LIST_COL_IS_SEPARATOR, TRUE,
- -1);
+ PAGE_SETUP_LIST_COL_IS_SEPARATOR, TRUE,
+ -1);
do
- {
- GtkPageSetup *page_setup;
- gtk_tree_model_get (model, &iter, 0, &page_setup, -1);
+ {
+ GtkPageSetup *page_setup;
+ gtk_tree_model_get (model, &iter, 0, &page_setup, -1);
- gtk_list_store_append (priv->page_setup_list, &paper_iter);
- gtk_list_store_set (priv->page_setup_list, &paper_iter,
- PAGE_SETUP_LIST_COL_PAGE_SETUP, page_setup,
- -1);
+ gtk_list_store_append (priv->page_setup_list, &paper_iter);
+ gtk_list_store_set (priv->page_setup_list, &paper_iter,
+ PAGE_SETUP_LIST_COL_PAGE_SETUP, page_setup,
+ -1);
- g_object_unref (page_setup);
- } while (gtk_tree_model_iter_next (model, &iter));
+ g_object_unref (page_setup);
+ } while (gtk_tree_model_iter_next (model, &iter));
}
-
+
gtk_list_store_append (priv->page_setup_list, &paper_iter);
gtk_list_store_set (priv->page_setup_list, &paper_iter,
PAGE_SETUP_LIST_COL_IS_SEPARATOR, TRUE,
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);
- }
+ {
+ 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);
- }
+ {
+ 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);
}
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));
}
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)
{
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))
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..."),
+ PRINTER_LIST_COL_STATE, _("Getting printer information…"),
-1);
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;
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);
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;
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_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,
+ cairo_t *cr,
GtkPrintUnixDialog *dialog)
{
GtkSettings *settings;
- cairo_t *cr;
gint size;
gfloat scale;
gboolean collate, reverse, rtl;
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);
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))
{
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);
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 (4, 2, FALSE);
+ table = gtk_grid_new ();
priv->range_table = table;
- gtk_table_set_row_spacings (GTK_TABLE (table), 6);
- gtk_table_set_col_spacings (GTK_TABLE (table), 12);
+ 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);
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"));
if (priv->current_page == -1)
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_table_attach (GTK_TABLE (table), radio,
- 0, 2, 2, 3, GTK_FILL, 0,
- 0, 0);
- gtk_table_set_row_spacing (GTK_TABLE (table), 2, 0);
+ 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");
priv->page_range_radio = radio;
gtk_widget_show (radio);
- gtk_table_attach (GTK_TABLE (table), radio,
- 0, 1, 3, 4, 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, 3, 4, GTK_FILL, 0,
- 0, 0);
+ 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_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 ();
+ 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);
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"));
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 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 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 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 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;
}
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)
static gboolean
draw_page_cb (GtkWidget *widget,
- GdkEventExpose *event,
+ 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;
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;
(orientation == GTK_PAGE_ORIENTATION_REVERSE_LANDSCAPE);
number_up_layout = dialog_get_number_up_layout (dialog);
-
- cr = gdk_cairo_create (widget->window);
+ 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);
+ page_setup = gtk_print_unix_dialog_get_page_setup (dialog);
if (page_setup != NULL)
{
pages_y = tmp;
}
- pos_x = widget->allocation.x + (widget->allocation.width - w) / 2;
- pos_y = widget->allocation.y + (widget->allocation.height - h) / 2 - 10;
- color = &widget->style->text[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);
+
+ 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]);
+ 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);
if (ltr)
cairo_translate (cr, pos_x - layout_w / PANGO_SCALE - 2 * RULER_DISTANCE,
- widget->allocation.y + (widget->allocation.height - layout_h / PANGO_SCALE) / 2);
+ (height - layout_h / PANGO_SCALE) / 2);
else
cairo_translate (cr, pos_x + w + shadow_offset + 2 * RULER_DISTANCE,
- widget->allocation.y + (widget->allocation.height - layout_h / PANGO_SCALE) / 2);
+ (height - layout_h / PANGO_SCALE) / 2);
pango_cairo_show_layout (cr, layout);
g_free (text);
pango_layout_get_size (layout, &layout_w, &layout_h);
- cairo_translate (cr, widget->allocation.x + (widget->allocation.width - layout_w / PANGO_SCALE) / 2,
+ cairo_translate (cr, (width - layout_w / PANGO_SCALE) / 2,
pos_y + h + shadow_offset + 2 * RULER_DISTANCE);
pango_cairo_show_layout (cr, layout);
cairo_stroke (cr);
}
- cairo_destroy (cr);
+ gtk_style_context_restore (context);
return TRUE;
}
static void
custom_paper_dialog_response_cb (GtkDialog *custom_paper_dialog,
- gint response_id,
- gpointer user_data)
+ gint response_id,
+ gpointer user_data)
{
GtkPrintUnixDialog *print_dialog = GTK_PRINT_UNIX_DIALOG (user_data);
GtkPrintUnixDialogPrivate *priv = print_dialog->priv;
if (gtk_combo_box_get_active_iter (combo_box, &iter))
{
gtk_tree_model_get (gtk_combo_box_get_model (combo_box),
- &iter, PAGE_SETUP_LIST_COL_PAGE_SETUP, &page_setup, -1);
+ &iter, PAGE_SETUP_LIST_COL_PAGE_SETUP, &page_setup,
+ -1);
if (page_setup == NULL)
{
{
gboolean separator;
- gtk_tree_model_get (model, iter, PAGE_SETUP_LIST_COL_IS_SEPARATOR, &separator, -1);
+ gtk_tree_model_get (model, iter,
+ PAGE_SETUP_LIST_COL_IS_SEPARATOR, &separator,
+ -1);
return separator;
}
GtkPaperSize *paper_size;
gtk_tree_model_get (tree_model, iter,
- PAGE_SETUP_LIST_COL_PAGE_SETUP, &page_setup, -1);
+ PAGE_SETUP_LIST_COL_PAGE_SETUP, &page_setup,
+ -1);
if (page_setup)
{
paper_size = gtk_page_setup_get_paper_size (page_setup);
g_object_unref (page_setup);
}
else
- g_object_set (cell, "text", _("Manage Custom Sizes..."), NULL);
+ g_object_set (cell, "text", _("Manage Custom Sizes…"), NULL);
}
static void
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_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_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_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),
+ 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_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);
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_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);
- combo = gtk_combo_box_new_text ();
+ combo = gtk_combo_box_text_new ();
priv->orientation_combo = GTK_WIDGET (combo);
- gtk_table_attach (GTK_TABLE (table), combo,
- 1, 2, 4, 5, GTK_FILL, 0,
- 0, 0);
+ 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_append_text (GTK_COMBO_BOX (combo), _("Portrait"));
- gtk_combo_box_append_text (GTK_COMBO_BOX (combo), _("Landscape"));
- gtk_combo_box_append_text (GTK_COMBO_BOX (combo), _("Reverse portrait"));
- gtk_combo_box_append_text (GTK_COMBO_BOX (combo), _("Reverse landscape"));
+ 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, 350, 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);
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
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);
+ 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.
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_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);
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_signal_connect_swapped (priv->print_hold_radio, "toggled",
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
* 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
* 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
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);
+ 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_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_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_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;
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 ();
&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);
* Return value: a new #GtkPrintUnixDialog
*
* Since: 2.10
- **/
+ */
GtkWidget *
gtk_print_unix_dialog_new (const gchar *title,
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,
+ "title", title ? title : _("Print"),
NULL);
return result;
*
* Gets the currently selected printer.
*
- * Returns: the currently selected printer
+ * Returns: (transfer none): the currently selected printer
*
* Since: 2.10
*/
*
* 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
*/
* 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
*
do
{
gtk_tree_model_get (GTK_TREE_MODEL (priv->printer_list), &iter,
- PRINTER_LIST_COL_PRINTER_OBJ, &printer, -1);
+ PRINTER_LIST_COL_PRINTER_OBJ, &printer,
+ -1);
if (printer == NULL)
continue;
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);
}
GtkTreeSelection *selection;
selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (priv->printer_treeview));
-
- g_object_unref (priv->current_printer);
- priv->current_printer = NULL;
+ g_clear_object (&priv->current_printer);
priv->internal_printer_change = TRUE;
selected_printer_changed (selection, dialog);
priv->internal_printer_change = FALSE;
* gtk_print_unix_dialog_get_manual_capabilities:
* @dialog: a #GtkPrintUnixDialog
*
- * Gets the value of #GtkPrintUnixDialog::manual-capabilities property.
+ * Gets the value of #GtkPrintUnixDialog:manual-capabilities property.
*
* Returns: the printing capabilities
*
if (support_selection)
{
gtk_widget_set_sensitive (priv->selection_radio, priv->has_selection);
- gtk_table_set_row_spacing (GTK_TABLE (priv->range_table),
- 2,
- gtk_table_get_default_row_spacing (GTK_TABLE (priv->range_table)));
gtk_widget_show (priv->selection_radio);
}
else
{
gtk_widget_set_sensitive (priv->selection_radio, FALSE);
- gtk_table_set_row_spacing (GTK_TABLE (priv->range_table), 2, 0);
gtk_widget_hide (priv->selection_radio);
}
}
* gtk_print_unix_dialog_get_support_selection:
* @dialog: a #GtkPrintUnixDialog
*
- * Gets the value of #GtkPrintUnixDialog::support-selection property.
+ * Gets the value of #GtkPrintUnixDialog:support-selection property.
*
* Returns: whether the application supports print of selection
*
* gtk_print_unix_dialog_get_has_selection:
* @dialog: a #GtkPrintUnixDialog
*
- * Gets the value of #GtkPrintUnixDialog::has-selection property.
+ * Gets the value of #GtkPrintUnixDialog:has-selection property.
*
* Returns: whether there is a selection
*
* gtk_print_unix_dialog_get_embed_page_setup:
* @dialog: a #GtkPrintUnixDialog
*
- * Gets the value of #GtkPrintUnixDialog::embed-page-setup property.
+ * Gets the value of #GtkPrintUnixDialog:embed-page-setup property.
*
* Returns: whether there is a selection
*
return dialog->priv->embed_page_setup;
}
-
-#define __GTK_PRINT_UNIX_DIALOG_C__
-#include "gtkaliasdef.c"
projects / ~andy / gtk / blobdiff