From 9a94231819bbfaf23e477dc27c3966903ebdf1e1 Mon Sep 17 00:00:00 2001 From: monsta Date: Mon, 21 Nov 2016 22:28:15 +0300 Subject: move to GTK+3 (>= 3.14), drop GTK+2 code and --with-gtk build option and require libmate-desktop >= 1.17 --- src/eom-print-image-setup.c | 120 +------------------------------------------- 1 file changed, 1 insertion(+), 119 deletions(-) (limited to 'src/eom-print-image-setup.c') diff --git a/src/eom-print-image-setup.c b/src/eom-print-image-setup.c index 59f075a..0e7b43d 100644 --- a/src/eom-print-image-setup.c +++ b/src/eom-print-image-setup.c @@ -51,16 +51,7 @@ #define EOM_PRINT_IMAGE_SETUP_GET_PRIVATE(object) \ (G_TYPE_INSTANCE_GET_PRIVATE ((object), EOM_TYPE_PRINT_IMAGE_SETUP, EomPrintImageSetupPrivate)) -#if GTK_CHECK_VERSION (3, 2, 0) -#define gtk_hbox_new(X,Y) gtk_box_new(GTK_ORIENTATION_HORIZONTAL,Y) -#define gtk_vbox_new(X,Y) gtk_box_new(GTK_ORIENTATION_VERTICAL,Y) -#endif - -#if GTK_CHECK_VERSION (3, 4, 0) G_DEFINE_TYPE (EomPrintImageSetup, eom_print_image_setup, GTK_TYPE_GRID); -#else -G_DEFINE_TYPE (EomPrintImageSetup, eom_print_image_setup, GTK_TYPE_TABLE); -#endif struct _EomPrintImageSetupPrivate { GtkWidget *left; @@ -648,55 +639,30 @@ static GtkWidget * wrap_in_frame (const gchar *label, GtkWidget *child) { -#if GTK_CHECK_VERSION (3, 14, 0) GtkWidget *frame, *label_widget; -#else - GtkWidget *frame, *alignment, *label_widget; -#endif gchar *bold_text; label_widget = gtk_label_new (""); -#if GTK_CHECK_VERSION (3, 0, 0) gtk_widget_set_halign (label_widget, GTK_ALIGN_START); -#else - gtk_misc_set_alignment (GTK_MISC (label_widget), 0.0, 0.5); -#endif 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); -#if GTK_CHECK_VERSION (3, 14, 0) gtk_box_pack_start (GTK_BOX (frame), child, FALSE, FALSE, 0); gtk_widget_set_margin_start (child, 12); gtk_widget_show (frame); -#else - - alignment = gtk_alignment_new (0.0, 0.0, 1.0, 1.0); - gtk_alignment_set_padding (GTK_ALIGNMENT (alignment), - 0, 0, 12, 0); - gtk_box_pack_start (GTK_BOX (frame), alignment, FALSE, FALSE, 0); - - gtk_container_add (GTK_CONTAINER (alignment), child); - - gtk_widget_show (frame); - gtk_widget_show (alignment); -#endif return frame; } static GtkWidget * -#if GTK_CHECK_VERSION (3, 4, 0) grid_attach_spin_button_with_label (GtkWidget *grid, -#else -table_attach_spin_button_with_label (GtkWidget *table, -#endif const gchar* text_label, gint left, gint top) { @@ -711,16 +677,9 @@ table_attach_spin_button_with_label (GtkWidget *table, spin_button = gtk_spin_button_new_with_range (0, 100, 0.01); gtk_spin_button_set_digits (GTK_SPIN_BUTTON (spin_button), 2); gtk_entry_set_width_chars (GTK_ENTRY (spin_button), 6); -#if GTK_CHECK_VERSION (3, 4, 0) gtk_grid_attach (GTK_GRID (grid), label, left, top, 1, 1); gtk_grid_attach_next_to (GTK_GRID (grid), spin_button, label, GTK_POS_RIGHT, 1, 1); -#else - gtk_table_attach (GTK_TABLE (table), label, left, left + 1, - top, top + 1, GTK_FILL, GTK_FILL, 0, 0); - gtk_table_attach (GTK_TABLE (table), spin_button, left + 1, left + 2, - top, top + 1, GTK_FILL, GTK_FILL, 0, 0); -#endif gtk_label_set_mnemonic_widget (GTK_LABEL (label), spin_button); return spin_button; @@ -889,11 +848,7 @@ static void eom_print_image_setup_init (EomPrintImageSetup *setup) { GtkWidget *frame; -#if GTK_CHECK_VERSION (3, 4, 0) GtkWidget *grid; -#else - GtkWidget *table; -#endif GtkWidget *label; GtkWidget *hscale; GtkWidget *combobox; @@ -907,7 +862,6 @@ eom_print_image_setup_init (EomPrintImageSetup *setup) priv->image = NULL; -#if GTK_CHECK_VERSION (3, 4, 0) grid = gtk_grid_new (); gtk_grid_set_row_spacing (GTK_GRID (grid), 6); gtk_grid_set_column_spacing (GTK_GRID (grid), 12); @@ -921,20 +875,6 @@ eom_print_image_setup_init (EomPrintImageSetup *setup) priv->top = grid_attach_spin_button_with_label (grid, _("_Top:"), 2, 0); priv->bottom = grid_attach_spin_button_with_label (grid, _("_Bottom:"), 2, 1); -#else - table = gtk_table_new (3, 4, FALSE); - gtk_table_set_row_spacings (GTK_TABLE (table), 6); - gtk_table_set_col_spacings (GTK_TABLE (table), 12); - frame = wrap_in_frame (_("Position"), table); - gtk_table_attach (GTK_TABLE (setup), frame, - 0, 1, 0, 1, GTK_FILL, 0, - 0, 0); - - priv->left = table_attach_spin_button_with_label (table, _("_Left:"), 0, 0); - priv->right = table_attach_spin_button_with_label (table, _("_Right:"), 0, 1); - priv->top = table_attach_spin_button_with_label (table, _("_Top:"), 2, 0); - priv->bottom = table_attach_spin_button_with_label (table, _("_Bottom:"), 2, 1); -#endif label = gtk_label_new_with_mnemonic (_("C_enter:")); #if GTK_CHECK_VERSION (3, 16, 0) @@ -953,27 +893,17 @@ eom_print_image_setup_init (EomPrintImageSetup *setup) gtk_combo_box_text_insert_text (GTK_COMBO_BOX_TEXT (combobox), CENTER_BOTH, _("Both")); gtk_combo_box_set_active (GTK_COMBO_BOX (combobox), CENTER_NONE); -#if GTK_CHECK_VERSION (3, 4, 0) /* Attach combobox below right margin spinbutton and span until end */ gtk_grid_attach_next_to (GTK_GRID (grid), combobox, priv->right, GTK_POS_BOTTOM, 3, 1); /* Attach the label to the left of the combobox */ gtk_grid_attach_next_to (GTK_GRID (grid), label, combobox, GTK_POS_LEFT, 1, 1); -#else - gtk_table_attach (GTK_TABLE (table), label, - 0, 1, 2, 3, GTK_FILL, GTK_FILL, - 0, 0); - gtk_table_attach (GTK_TABLE (table), combobox, - 1, 4, 2, 3, GTK_FILL | GTK_EXPAND, GTK_FILL, - 0, 0); -#endif gtk_label_set_mnemonic_widget (GTK_LABEL (label), combobox); priv->center = combobox; g_signal_connect (G_OBJECT (combobox), "changed", G_CALLBACK (on_center_changed), setup); -#if GTK_CHECK_VERSION (3, 4, 0) grid = gtk_grid_new (); gtk_grid_set_row_spacing (GTK_GRID (grid), 6); gtk_grid_set_column_spacing (GTK_GRID (grid), 12); @@ -984,42 +914,15 @@ eom_print_image_setup_init (EomPrintImageSetup *setup) 0, 0); priv->height = grid_attach_spin_button_with_label (grid, _("_Height:"), 2, 0); -#else - table = gtk_table_new (3, 4, FALSE); - gtk_table_set_row_spacings (GTK_TABLE (table), 6); - gtk_table_set_col_spacings (GTK_TABLE (table), 12); - frame = wrap_in_frame (_("Size"), table); - gtk_table_attach (GTK_TABLE (setup), frame, - 0, 1, 1, 2, GTK_FILL, 0, - 0, 0); - - priv->width = table_attach_spin_button_with_label (table, _("_Width:"), - 0, 0); - priv->height = table_attach_spin_button_with_label (table, _("_Height:"), - 2, 0); -#endif label = gtk_label_new_with_mnemonic (_("_Scaling:")); -#if GTK_CHECK_VERSION (3, 0, 0) hscale = gtk_scale_new_with_range (GTK_ORIENTATION_HORIZONTAL, 1, 100, 1); -#else - hscale = gtk_hscale_new_with_range (1, 100, 1); -#endif gtk_scale_set_value_pos (GTK_SCALE (hscale), GTK_POS_RIGHT); gtk_range_set_value (GTK_RANGE (hscale), 100); -#if GTK_CHECK_VERSION (3, 4, 0) gtk_grid_attach_next_to (GTK_GRID (grid), hscale, priv->width, GTK_POS_BOTTOM, 3, 1); gtk_grid_attach_next_to (GTK_GRID (grid), label, hscale, GTK_POS_LEFT, 1, 1); -#else - gtk_table_attach (GTK_TABLE (table), label, - 0, 1, 1, 2, GTK_FILL, GTK_FILL, - 0, 0); - gtk_table_attach (GTK_TABLE (table), hscale, - 1, 4, 1, 2, GTK_FILL | GTK_EXPAND, GTK_FILL, - 0, 0); -#endif gtk_label_set_mnemonic_widget (GTK_LABEL (label), hscale); priv->scaling = hscale; @@ -1048,19 +951,10 @@ eom_print_image_setup_init (EomPrintImageSetup *setup) set_scale_unit (setup, GTK_UNIT_MM); } -#if GTK_CHECK_VERSION (3, 4, 0) gtk_grid_attach_next_to (GTK_GRID (grid), combobox, hscale, GTK_POS_BOTTOM, 3, 1); gtk_grid_attach_next_to (GTK_GRID (grid), label, combobox, GTK_POS_LEFT, 1, 1); -#else - gtk_table_attach (GTK_TABLE (table), label, - 0, 1, 2, 3, GTK_FILL, GTK_FILL, - 0, 0); - gtk_table_attach (GTK_TABLE (table), combobox, - 1, 4, 2, 3, GTK_FILL | GTK_EXPAND, GTK_FILL, - 0, 0); -#endif gtk_label_set_mnemonic_widget (GTK_LABEL (label), combobox); priv->unit = combobox; g_signal_connect (G_OBJECT (combobox), "changed", @@ -1072,14 +966,8 @@ eom_print_image_setup_init (EomPrintImageSetup *setup) gtk_widget_set_size_request (priv->preview, 250, 250); frame = wrap_in_frame (_("Preview"), priv->preview); -#if GTK_CHECK_VERSION (3, 4, 0) /* The preview widget needs to span the whole grid height */ gtk_grid_attach (GTK_GRID (setup), frame, 1, 0, 1, 2); -#else - gtk_table_attach (GTK_TABLE (setup), frame, - 1, 2, 0, 2, GTK_FILL, GTK_FILL, - 0, 0); -#endif gtk_widget_show_all (GTK_WIDGET (setup)); } @@ -1104,13 +992,7 @@ eom_print_image_setup_new (EomImage *image, GtkPageSetup *page_setup) GtkWidget *preview; setup = g_object_new (EOM_TYPE_PRINT_IMAGE_SETUP, -#if GTK_CHECK_VERSION (3, 4, 0) "orientation", GTK_ORIENTATION_VERTICAL, -#else - "n-rows", 2, - "n-columns", 2, - "homogeneous", FALSE, -#endif "row-spacing", 18, "column-spacing", 18, "border-width", 12, -- cgit v1.2.1