mirror of https://github.com/GNOME/gimp.git
app, libgimpwidgets: return visible widgets from all gimp_prop_foo_new()
and remove a gazillion gtk_widget_show() all over the place, some places need a gtk_widget_hide() now, and I'm pretty sure I broke at least one thing in all those files...
This commit is contained in:
parent
1099aea726
commit
9593121431
|
@ -96,7 +96,6 @@ keyboard_shortcuts_dialog_new (Gimp *gimp)
|
|||
button = gimp_prop_check_button_new (G_OBJECT (gimp->config), "save-accels",
|
||||
_("S_ave keyboard shortcuts on exit"));
|
||||
gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
|
||||
gtk_widget_show (button);
|
||||
|
||||
return dialog;
|
||||
}
|
||||
|
|
|
@ -130,10 +130,7 @@ prefs_check_button_add (GObject *config,
|
|||
button = gimp_prop_check_button_new (config, property_name, label);
|
||||
|
||||
if (button)
|
||||
{
|
||||
gtk_box_pack_start (vbox, button, FALSE, FALSE, 0);
|
||||
gtk_widget_show (button);
|
||||
}
|
||||
|
||||
return button;
|
||||
}
|
||||
|
@ -151,7 +148,7 @@ prefs_check_button_add_with_icon (GObject *config,
|
|||
GtkWidget *image;
|
||||
|
||||
button = gimp_prop_check_button_new (config, property_name, label);
|
||||
if (!button)
|
||||
if (! button)
|
||||
return NULL;
|
||||
|
||||
hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
|
||||
|
@ -169,7 +166,6 @@ prefs_check_button_add_with_icon (GObject *config,
|
|||
gtk_widget_show (image);
|
||||
|
||||
gtk_box_pack_start (GTK_BOX (hbox), button, TRUE, TRUE, 0);
|
||||
gtk_widget_show (button);
|
||||
|
||||
if (group)
|
||||
gtk_size_group_add_widget (group, image);
|
||||
|
@ -357,10 +353,7 @@ prefs_language_combo_box_add (GObject *config,
|
|||
GtkWidget *combo = gimp_prop_language_combo_box_new (config, property_name);
|
||||
|
||||
if (combo)
|
||||
{
|
||||
gtk_box_pack_start (vbox, combo, FALSE, FALSE, 0);
|
||||
gtk_widget_show (combo);
|
||||
}
|
||||
|
||||
return combo;
|
||||
}
|
||||
|
|
|
@ -1351,7 +1351,6 @@ prefs_dialog_new (Gimp *gimp,
|
|||
_("_Try to use the system monitor "
|
||||
"profile"));
|
||||
gtk_grid_attach (GTK_GRID (grid), button, 1, row, 1, 1);
|
||||
gtk_widget_show (button);
|
||||
row++;
|
||||
|
||||
prefs_enum_combo_box_add (color_config,
|
||||
|
@ -1363,7 +1362,6 @@ prefs_dialog_new (Gimp *gimp,
|
|||
"display-use-black-point-compensation",
|
||||
_("Use _black point compensation"));
|
||||
gtk_grid_attach (GTK_GRID (grid), button, 1, row, 1, 1);
|
||||
gtk_widget_show (button);
|
||||
row++;
|
||||
|
||||
prefs_boolean_combo_box_add (color_config,
|
||||
|
@ -1398,7 +1396,6 @@ prefs_dialog_new (Gimp *gimp,
|
|||
"simulation-use-black-point-compensation",
|
||||
_("Use black _point compensation"));
|
||||
gtk_grid_attach (GTK_GRID (grid), button, 1, row, 1, 1);
|
||||
gtk_widget_show (button);
|
||||
row++;
|
||||
|
||||
prefs_boolean_combo_box_add (color_config,
|
||||
|
@ -1416,7 +1413,6 @@ prefs_dialog_new (Gimp *gimp,
|
|||
button = gimp_prop_check_button_new (color_config, "simulation-gamut-check",
|
||||
_("Mar_k out of gamut colors"));
|
||||
gtk_box_pack_start (GTK_BOX (hbox), button, TRUE, TRUE, 0);
|
||||
gtk_widget_show (button);
|
||||
|
||||
button = gimp_prop_color_button_new (color_config, "out-of-gamut-color",
|
||||
_("Select Warning Color"),
|
||||
|
@ -1424,7 +1420,6 @@ prefs_dialog_new (Gimp *gimp,
|
|||
PREFS_COLOR_BUTTON_HEIGHT,
|
||||
GIMP_COLOR_AREA_FLAT);
|
||||
gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, FALSE, 0);
|
||||
gtk_widget_show (button);
|
||||
|
||||
gimp_color_panel_set_context (GIMP_COLOR_PANEL (button),
|
||||
gimp_get_user_context (gimp));
|
||||
|
@ -2686,7 +2681,6 @@ prefs_dialog_new (Gimp *gimp,
|
|||
gtk_widget_set_halign (hbox, GTK_ALIGN_START);
|
||||
|
||||
gtk_box_pack_start (GTK_BOX (hbox), entry, FALSE, FALSE, 24);
|
||||
gtk_widget_show (entry);
|
||||
gtk_widget_set_sensitive (entry, ! display_config->monitor_res_from_gdk);
|
||||
|
||||
group = NULL;
|
||||
|
@ -2986,7 +2980,6 @@ prefs_dialog_new (Gimp *gimp,
|
|||
|
||||
entry = gimp_prop_entry_new (object, formats[format].property_name, 0);
|
||||
gtk_box_pack_start (GTK_BOX (vbox2), entry, FALSE, FALSE, 0);
|
||||
gtk_widget_show (entry);
|
||||
|
||||
scrolled_win = gtk_scrolled_window_new (NULL, NULL);
|
||||
gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrolled_win),
|
||||
|
@ -3325,7 +3318,6 @@ prefs_dialog_new (Gimp *gimp,
|
|||
paths[i].writable_property_name,
|
||||
gettext (paths[i].fs_label));
|
||||
gtk_box_pack_start (GTK_BOX (vbox), editor, TRUE, TRUE, 0);
|
||||
gtk_widget_show (editor);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -243,7 +243,6 @@ stroke_dialog_new (GimpItem *item,
|
|||
"emulate-brush-dynamics",
|
||||
_("_Emulate brush dynamics"));
|
||||
gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
|
||||
gtk_widget_show (button);
|
||||
}
|
||||
|
||||
return dialog;
|
||||
|
|
|
@ -336,7 +336,6 @@ gimp_cursor_view_init (GimpCursorView *view)
|
|||
toggle = gimp_prop_check_button_new (G_OBJECT (view), "sample-merged",
|
||||
_("_Sample Merged"));
|
||||
gtk_box_pack_start (GTK_BOX (view), toggle, FALSE, FALSE, 0);
|
||||
gtk_widget_show (toggle);
|
||||
}
|
||||
|
||||
static void
|
||||
|
|
|
@ -71,17 +71,14 @@ _gimp_prop_gui_new_channel_mixer (GObject *config,
|
|||
scale = gimp_prop_widget_new (config, "rr-gain",
|
||||
area, context, NULL, NULL, NULL, &label);
|
||||
gtk_box_pack_start (GTK_BOX (vbox), scale, FALSE, FALSE, 0);
|
||||
gtk_widget_show (scale);
|
||||
|
||||
scale = gimp_prop_widget_new (config, "rg-gain",
|
||||
area, context, NULL, NULL, NULL, &label);
|
||||
gtk_box_pack_start (GTK_BOX (vbox), scale, FALSE, FALSE, 0);
|
||||
gtk_widget_show (scale);
|
||||
|
||||
scale = gimp_prop_widget_new (config, "rb-gain",
|
||||
area, context, NULL, NULL, NULL, &label);
|
||||
gtk_box_pack_start (GTK_BOX (vbox), scale, FALSE, FALSE, 0);
|
||||
gtk_widget_show (scale);
|
||||
|
||||
|
||||
frame = gimp_frame_new (_("Green channel"));
|
||||
|
@ -95,17 +92,14 @@ _gimp_prop_gui_new_channel_mixer (GObject *config,
|
|||
scale = gimp_prop_widget_new (config, "gr-gain",
|
||||
area, context, NULL, NULL, NULL, &label);
|
||||
gtk_box_pack_start (GTK_BOX (vbox), scale, FALSE, FALSE, 0);
|
||||
gtk_widget_show (scale);
|
||||
|
||||
scale = gimp_prop_widget_new (config, "gg-gain",
|
||||
area, context, NULL, NULL, NULL, &label);
|
||||
gtk_box_pack_start (GTK_BOX (vbox), scale, FALSE, FALSE, 0);
|
||||
gtk_widget_show (scale);
|
||||
|
||||
scale = gimp_prop_widget_new (config, "gb-gain",
|
||||
area, context, NULL, NULL, NULL, &label);
|
||||
gtk_box_pack_start (GTK_BOX (vbox), scale, FALSE, FALSE, 0);
|
||||
gtk_widget_show (scale);
|
||||
|
||||
|
||||
frame = gimp_frame_new (_("Blue channel"));
|
||||
|
@ -119,23 +113,19 @@ _gimp_prop_gui_new_channel_mixer (GObject *config,
|
|||
scale = gimp_prop_widget_new (config, "br-gain",
|
||||
area, context, NULL, NULL, NULL, &label);
|
||||
gtk_box_pack_start (GTK_BOX (vbox), scale, FALSE, FALSE, 0);
|
||||
gtk_widget_show (scale);
|
||||
|
||||
scale = gimp_prop_widget_new (config, "bg-gain",
|
||||
area, context, NULL, NULL, NULL, &label);
|
||||
gtk_box_pack_start (GTK_BOX (vbox), scale, FALSE, FALSE, 0);
|
||||
gtk_widget_show (scale);
|
||||
|
||||
scale = gimp_prop_widget_new (config, "bb-gain",
|
||||
area, context, NULL, NULL, NULL, &label);
|
||||
gtk_box_pack_start (GTK_BOX (vbox), scale, FALSE, FALSE, 0);
|
||||
gtk_widget_show (scale);
|
||||
|
||||
|
||||
checkbox = gimp_prop_widget_new (config, "preserve-luminosity",
|
||||
area, context, NULL, NULL, NULL, &label);
|
||||
gtk_box_pack_start (GTK_BOX (main_vbox), checkbox, FALSE, FALSE, 0);
|
||||
gtk_widget_show (checkbox);
|
||||
|
||||
return main_vbox;
|
||||
}
|
||||
|
|
|
@ -61,7 +61,6 @@ create_levels_scale (GObject *config,
|
|||
gimp_prop_widget_set_factor (scale, 100.0, 0.0, 0.0, 1);
|
||||
gtk_widget_set_hexpand (scale, TRUE);
|
||||
gtk_grid_attach (GTK_GRID (grid), scale, 1, col, 1, 1);
|
||||
gtk_widget_show (scale);
|
||||
|
||||
label = gtk_label_new (right);
|
||||
gtk_label_set_xalign (GTK_LABEL (label), 0.0);
|
||||
|
@ -97,7 +96,6 @@ _gimp_prop_gui_new_color_balance (GObject *config,
|
|||
_("Select Range to Adjust"),
|
||||
0, 0);
|
||||
gtk_box_pack_start (GTK_BOX (main_vbox), frame, FALSE, FALSE, 0);
|
||||
gtk_widget_show (frame);
|
||||
|
||||
frame = gimp_frame_new (_("Adjust Color Levels"));
|
||||
gtk_box_pack_start (GTK_BOX (main_vbox), frame, FALSE, FALSE, 0);
|
||||
|
@ -142,7 +140,6 @@ _gimp_prop_gui_new_color_balance (GObject *config,
|
|||
"preserve-luminosity",
|
||||
_("Preserve _luminosity"));
|
||||
gtk_box_pack_end (GTK_BOX (main_vbox), button, FALSE, FALSE, 0);
|
||||
gtk_widget_show (button);
|
||||
|
||||
return main_vbox;
|
||||
}
|
||||
|
|
|
@ -109,13 +109,11 @@ gimp_prop_angle_range_box_new (GObject *config,
|
|||
1.0, 15.0, 2);
|
||||
gtk_spin_button_set_wrap (GTK_SPIN_BUTTON (scale), TRUE);
|
||||
gtk_box_pack_start (GTK_BOX (vbox), scale, FALSE, FALSE, 0);
|
||||
gtk_widget_show (scale);
|
||||
|
||||
scale = gimp_prop_spin_scale_new (config, beta_property_name, NULL,
|
||||
1.0, 15.0, 2);
|
||||
gtk_spin_button_set_wrap (GTK_SPIN_BUTTON (scale), TRUE);
|
||||
gtk_box_pack_start (GTK_BOX (vbox), scale, FALSE, FALSE, 0);
|
||||
gtk_widget_show (scale);
|
||||
|
||||
hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 4);
|
||||
gtk_box_set_homogeneous (GTK_BOX (hbox), TRUE);
|
||||
|
@ -125,7 +123,6 @@ gimp_prop_angle_range_box_new (GObject *config,
|
|||
button = gimp_prop_check_button_new (config, clockwise_property_name,
|
||||
_("Clockwise"));
|
||||
gtk_box_pack_start (GTK_BOX (hbox), button, TRUE, TRUE, 0);
|
||||
gtk_widget_show (button);
|
||||
|
||||
invert_button = gtk_button_new_with_label (_("Invert Range"));
|
||||
gtk_box_pack_start (GTK_BOX (hbox), invert_button, TRUE, TRUE, 0);
|
||||
|
@ -140,7 +137,6 @@ gimp_prop_angle_range_box_new (GObject *config,
|
|||
beta_property_name,
|
||||
clockwise_property_name);
|
||||
gtk_box_pack_start (GTK_BOX (main_hbox), dial, FALSE, FALSE, 0);
|
||||
gtk_widget_show (dial);
|
||||
|
||||
g_signal_connect (invert_button, "clicked",
|
||||
G_CALLBACK (invert_segment_clicked),
|
||||
|
@ -173,18 +169,17 @@ gimp_prop_polar_box_new (GObject *config,
|
|||
1.0, 15.0, 2);
|
||||
gtk_spin_button_set_wrap (GTK_SPIN_BUTTON (scale), TRUE);
|
||||
gtk_box_pack_start (GTK_BOX (vbox), scale, FALSE, FALSE, 0);
|
||||
gtk_widget_show (scale);
|
||||
|
||||
scale = gimp_prop_spin_scale_new (config, radius_property_name, NULL,
|
||||
1.0, 15.0, 2);
|
||||
gtk_box_pack_start (GTK_BOX (vbox), scale, FALSE, FALSE, 0);
|
||||
gtk_widget_show (scale);
|
||||
|
||||
polar = gimp_prop_polar_new (config,
|
||||
angle_property_name,
|
||||
radius_property_name);
|
||||
gtk_box_pack_start (GTK_BOX (main_hbox), polar, FALSE, FALSE, 0);
|
||||
gtk_widget_show (polar);
|
||||
|
||||
gtk_widget_show (main_hbox);
|
||||
|
||||
return main_hbox;
|
||||
}
|
||||
|
@ -220,7 +215,6 @@ _gimp_prop_gui_new_color_rotate (GObject *config,
|
|||
param_specs[2]->name,
|
||||
param_specs[0]->name);
|
||||
gtk_container_add (GTK_CONTAINER (frame), box);
|
||||
gtk_widget_show (box);
|
||||
|
||||
frame = gimp_frame_new (_("Destination Range"));
|
||||
gtk_box_pack_start (GTK_BOX (main_vbox), frame, FALSE, FALSE, 0);
|
||||
|
@ -231,7 +225,6 @@ _gimp_prop_gui_new_color_rotate (GObject *config,
|
|||
param_specs[5]->name,
|
||||
param_specs[3]->name);
|
||||
gtk_container_add (GTK_CONTAINER (frame), box);
|
||||
gtk_widget_show (box);
|
||||
|
||||
frame = gimp_frame_new (_("Gray Handling"));
|
||||
gtk_box_pack_start (GTK_BOX (main_vbox), frame, FALSE, FALSE, 0);
|
||||
|
@ -248,13 +241,11 @@ _gimp_prop_gui_new_color_rotate (GObject *config,
|
|||
create_controller_func,
|
||||
creator);
|
||||
gtk_box_pack_start (GTK_BOX (vbox), box, FALSE, FALSE, 0);
|
||||
gtk_widget_show (box);
|
||||
|
||||
box = gimp_prop_polar_box_new (config,
|
||||
param_specs[8]->name,
|
||||
param_specs[9]->name);
|
||||
gtk_box_pack_start (GTK_BOX (vbox), box, FALSE, FALSE, 0);
|
||||
gtk_widget_show (box);
|
||||
|
||||
return main_vbox;
|
||||
}
|
||||
|
|
|
@ -90,7 +90,6 @@ _gimp_prop_gui_new_color_to_alpha (GObject *config,
|
|||
area, context, create_picker_func, NULL,
|
||||
creator);
|
||||
gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
|
||||
gtk_widget_show (button);
|
||||
|
||||
hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 4);
|
||||
gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
|
||||
|
@ -99,7 +98,6 @@ _gimp_prop_gui_new_color_to_alpha (GObject *config,
|
|||
scale = gimp_prop_widget_new (config, "transparency-threshold",
|
||||
area, context, NULL, NULL, NULL, &label);
|
||||
gtk_box_pack_start (GTK_BOX (hbox), scale, TRUE, TRUE, 0);
|
||||
gtk_widget_show (scale);
|
||||
|
||||
if (create_picker_func)
|
||||
{
|
||||
|
@ -121,7 +119,6 @@ _gimp_prop_gui_new_color_to_alpha (GObject *config,
|
|||
scale = gimp_prop_widget_new (config, "opacity-threshold",
|
||||
area, context, NULL, NULL, NULL, &label);
|
||||
gtk_box_pack_start (GTK_BOX (hbox), scale, TRUE, TRUE, 0);
|
||||
gtk_widget_show (scale);
|
||||
|
||||
if (create_picker_func)
|
||||
{
|
||||
|
|
|
@ -179,7 +179,6 @@ _gimp_prop_gui_new_convolution_matrix (GObject *config,
|
|||
1.0, 10.0, 2);
|
||||
gtk_entry_set_width_chars (GTK_ENTRY (spin), 8);
|
||||
gtk_grid_attach (GTK_GRID (grid), spin, y, x, 1, 1);
|
||||
gtk_widget_show (spin);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -269,12 +268,10 @@ _gimp_prop_gui_new_convolution_matrix (GObject *config,
|
|||
scale = gimp_prop_widget_new (config, "divisor",
|
||||
area, context, NULL, NULL, NULL, &label);
|
||||
gtk_box_pack_start (GTK_BOX (hbox), scale, TRUE, TRUE, 0);
|
||||
gtk_widget_show (scale);
|
||||
|
||||
scale = gimp_prop_widget_new (config, "offset",
|
||||
area, context, NULL, NULL, NULL, &label);
|
||||
gtk_box_pack_start (GTK_BOX (hbox), scale, TRUE, TRUE, 0);
|
||||
gtk_widget_show (scale);
|
||||
|
||||
/* rest of the properties */
|
||||
|
||||
|
@ -290,7 +287,6 @@ _gimp_prop_gui_new_convolution_matrix (GObject *config,
|
|||
create_controller_func,
|
||||
creator);
|
||||
gtk_box_pack_start (GTK_BOX (hbox), vbox2, TRUE, TRUE, 0);
|
||||
gtk_widget_show (vbox2);
|
||||
|
||||
vbox2 = _gimp_prop_gui_new_generic (config,
|
||||
param_specs + 31,
|
||||
|
@ -300,7 +296,6 @@ _gimp_prop_gui_new_convolution_matrix (GObject *config,
|
|||
create_controller_func,
|
||||
creator);
|
||||
gtk_box_pack_start (GTK_BOX (hbox), vbox2, TRUE, TRUE, 0);
|
||||
gtk_widget_show (vbox2);
|
||||
|
||||
return main_vbox;
|
||||
}
|
||||
|
|
|
@ -66,7 +66,6 @@ _gimp_prop_gui_new_diffraction_patterns (GObject *config,
|
|||
gtk_container_set_border_width (GTK_CONTAINER (vbox), 6);
|
||||
gtk_notebook_append_page (GTK_NOTEBOOK (notebook), vbox,
|
||||
gtk_label_new (_("Frequencies")));
|
||||
gtk_widget_show (vbox);
|
||||
|
||||
vbox = _gimp_prop_gui_new_generic (config,
|
||||
param_specs + 3, 3,
|
||||
|
@ -77,7 +76,6 @@ _gimp_prop_gui_new_diffraction_patterns (GObject *config,
|
|||
gtk_container_set_border_width (GTK_CONTAINER (vbox), 6);
|
||||
gtk_notebook_append_page (GTK_NOTEBOOK (notebook), vbox,
|
||||
gtk_label_new (_("Contours")));
|
||||
gtk_widget_show (vbox);
|
||||
|
||||
vbox = _gimp_prop_gui_new_generic (config,
|
||||
param_specs + 6, 3,
|
||||
|
@ -88,7 +86,6 @@ _gimp_prop_gui_new_diffraction_patterns (GObject *config,
|
|||
gtk_container_set_border_width (GTK_CONTAINER (vbox), 6);
|
||||
gtk_notebook_append_page (GTK_NOTEBOOK (notebook), vbox,
|
||||
gtk_label_new (_("Sharp Edges")));
|
||||
gtk_widget_show (vbox);
|
||||
|
||||
vbox = _gimp_prop_gui_new_generic (config,
|
||||
param_specs + 9, 3,
|
||||
|
@ -99,7 +96,6 @@ _gimp_prop_gui_new_diffraction_patterns (GObject *config,
|
|||
gtk_container_set_border_width (GTK_CONTAINER (vbox), 6);
|
||||
gtk_notebook_append_page (GTK_NOTEBOOK (notebook), vbox,
|
||||
gtk_label_new (_("Other Options")));
|
||||
gtk_widget_show (vbox);
|
||||
|
||||
return notebook;
|
||||
}
|
||||
|
|
|
@ -266,6 +266,8 @@ _gimp_prop_gui_new_generic (GObject *config,
|
|||
g_object_set_data_full (G_OBJECT (main_vbox), "chains", chains,
|
||||
(GDestroyNotify) g_list_free);
|
||||
|
||||
gtk_widget_show (main_vbox);
|
||||
|
||||
return main_vbox;
|
||||
}
|
||||
|
||||
|
|
|
@ -226,7 +226,6 @@ _gimp_prop_gui_new_hue_saturation (GObject *config,
|
|||
_("_Overlap"), 0.01, 0.1, 0);
|
||||
gimp_prop_widget_set_factor (scale, 100.0, 0.0, 0.0, 1);
|
||||
gtk_box_pack_start (GTK_BOX (vbox), scale, FALSE, FALSE, 0);
|
||||
gtk_widget_show (scale);
|
||||
|
||||
frame = gimp_frame_new (_("Adjust Selected Color"));
|
||||
gtk_box_pack_start (GTK_BOX (main_vbox), frame, FALSE, FALSE, 0);
|
||||
|
@ -241,21 +240,18 @@ _gimp_prop_gui_new_hue_saturation (GObject *config,
|
|||
_("_Hue"), 1.0 / 180.0, 15.0 / 180.0, 0);
|
||||
gimp_prop_widget_set_factor (scale, 180.0, 0.0, 0.0, 1);
|
||||
gtk_box_pack_start (GTK_BOX (vbox), scale, FALSE, FALSE, 0);
|
||||
gtk_widget_show (scale);
|
||||
|
||||
/* Create the lightness scale widget */
|
||||
scale = gimp_prop_spin_scale_new (config, "lightness",
|
||||
_("_Lightness"), 0.01, 0.1, 0);
|
||||
gimp_prop_widget_set_factor (scale, 100.0, 0.0, 0.0, 1);
|
||||
gtk_box_pack_start (GTK_BOX (vbox), scale, FALSE, FALSE, 0);
|
||||
gtk_widget_show (scale);
|
||||
|
||||
/* Create the saturation scale widget */
|
||||
scale = gimp_prop_spin_scale_new (config, "saturation",
|
||||
_("_Saturation"), 0.01, 0.1, 0);
|
||||
gimp_prop_widget_set_factor (scale, 100.0, 0.0, 0.0, 1);
|
||||
gtk_box_pack_start (GTK_BOX (vbox), scale, FALSE, FALSE, 0);
|
||||
gtk_widget_show (scale);
|
||||
|
||||
hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
|
||||
gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
|
||||
|
|
|
@ -70,12 +70,10 @@ _gimp_prop_gui_new_shadows_highlights (GObject *config,
|
|||
scale = gimp_prop_widget_new (config, "shadows",
|
||||
area, context, NULL, NULL, NULL, &label);
|
||||
gtk_box_pack_start (GTK_BOX (vbox), scale, FALSE, FALSE, 0);
|
||||
gtk_widget_show (scale);
|
||||
|
||||
scale = gimp_prop_widget_new (config, "shadows-ccorrect",
|
||||
area, context, NULL, NULL, NULL, &label);
|
||||
gtk_box_pack_start (GTK_BOX (vbox), scale, FALSE, FALSE, 0);
|
||||
gtk_widget_show (scale);
|
||||
|
||||
frame = gimp_frame_new (_("Highlights"));
|
||||
gtk_box_pack_start (GTK_BOX (main_vbox), frame, FALSE, FALSE, 0);
|
||||
|
@ -88,12 +86,10 @@ _gimp_prop_gui_new_shadows_highlights (GObject *config,
|
|||
scale = gimp_prop_widget_new (config, "highlights",
|
||||
area, context, NULL, NULL, NULL, &label);
|
||||
gtk_box_pack_start (GTK_BOX (vbox), scale, FALSE, FALSE, 0);
|
||||
gtk_widget_show (scale);
|
||||
|
||||
scale = gimp_prop_widget_new (config, "highlights-ccorrect",
|
||||
area, context, NULL, NULL, NULL, &label);
|
||||
gtk_box_pack_start (GTK_BOX (vbox), scale, FALSE, FALSE, 0);
|
||||
gtk_widget_show (scale);
|
||||
|
||||
frame = gimp_frame_new (_("Common"));
|
||||
gtk_box_pack_start (GTK_BOX (main_vbox), frame, FALSE, FALSE, 0);
|
||||
|
@ -106,17 +102,14 @@ _gimp_prop_gui_new_shadows_highlights (GObject *config,
|
|||
scale = gimp_prop_widget_new (config, "whitepoint",
|
||||
area, context, NULL, NULL, NULL, &label);
|
||||
gtk_box_pack_start (GTK_BOX (vbox), scale, FALSE, FALSE, 0);
|
||||
gtk_widget_show (scale);
|
||||
|
||||
scale = gimp_prop_widget_new (config, "radius",
|
||||
area, context, NULL, NULL, NULL, &label);
|
||||
gtk_box_pack_start (GTK_BOX (vbox), scale, FALSE, FALSE, 0);
|
||||
gtk_widget_show (scale);
|
||||
|
||||
scale = gimp_prop_widget_new (config, "compress",
|
||||
area, context, NULL, NULL, NULL, &label);
|
||||
gtk_box_pack_start (GTK_BOX (vbox), scale, FALSE, FALSE, 0);
|
||||
gtk_widget_show (scale);
|
||||
|
||||
return main_vbox;
|
||||
}
|
||||
|
|
|
@ -433,6 +433,8 @@ gimp_prop_widget_new_from_pspec (GObject *config,
|
|||
gimp_prop_config_notify (config, NULL, widget);
|
||||
}
|
||||
|
||||
gtk_widget_show (widget);
|
||||
|
||||
return widget;
|
||||
}
|
||||
|
||||
|
@ -550,6 +552,8 @@ gimp_prop_gui_new (GObject *config,
|
|||
NULL);
|
||||
}
|
||||
|
||||
gtk_widget_show (gui);
|
||||
|
||||
return gui;
|
||||
}
|
||||
|
||||
|
|
|
@ -134,17 +134,14 @@ gimp_airbrush_options_gui (GimpToolOptions *tool_options)
|
|||
|
||||
button = gimp_prop_check_button_new (config, "motion-only", NULL);
|
||||
gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
|
||||
gtk_widget_show (button);
|
||||
|
||||
scale = gimp_prop_spin_scale_new (config, "rate", NULL,
|
||||
1.0, 10.0, 1);
|
||||
gtk_box_pack_start (GTK_BOX (vbox), scale, FALSE, FALSE, 0);
|
||||
gtk_widget_show (scale);
|
||||
|
||||
scale = gimp_prop_spin_scale_new (config, "flow", NULL,
|
||||
1.0, 10.0, 1);
|
||||
gtk_box_pack_start (GTK_BOX (vbox), scale, FALSE, FALSE, 0);
|
||||
gtk_widget_show (scale);
|
||||
|
||||
return vbox;
|
||||
}
|
||||
|
|
|
@ -291,7 +291,6 @@ gimp_align_options_gui (GimpToolOptions *tool_options)
|
|||
gimp_int_combo_box_set_label (GIMP_INT_COMBO_BOX (combo), _("Relative to"));
|
||||
g_object_set (combo, "ellipsize", PANGO_ELLIPSIZE_END, NULL);
|
||||
gtk_box_pack_start (GTK_BOX (align_vbox), combo, FALSE, FALSE, 0);
|
||||
gtk_widget_show (combo);
|
||||
|
||||
hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
|
||||
gtk_box_pack_start (GTK_BOX (align_vbox), hbox, FALSE, FALSE, 0);
|
||||
|
@ -384,7 +383,6 @@ gimp_align_options_gui (GimpToolOptions *tool_options)
|
|||
spinbutton = gimp_prop_spin_button_new (config, "offset-x",
|
||||
1, 20, 0);
|
||||
gtk_box_pack_start (GTK_BOX (hbox), spinbutton, FALSE, FALSE, 0);
|
||||
gtk_widget_show (spinbutton);
|
||||
|
||||
hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
|
||||
gtk_box_pack_start (GTK_BOX (align_vbox), hbox, FALSE, FALSE, 0);
|
||||
|
@ -397,7 +395,6 @@ gimp_align_options_gui (GimpToolOptions *tool_options)
|
|||
spinbutton = gimp_prop_spin_button_new (config, "offset-y",
|
||||
1, 20, 0);
|
||||
gtk_box_pack_start (GTK_BOX (hbox), spinbutton, FALSE, FALSE, 0);
|
||||
gtk_widget_show (spinbutton);
|
||||
|
||||
return vbox;
|
||||
}
|
||||
|
|
|
@ -276,7 +276,6 @@ gimp_brightness_contrast_tool_dialog (GimpFilterTool *filter_tool)
|
|||
scale = gimp_prop_spin_scale_new (filter_tool->config, "brightness",
|
||||
_("_Brightness"), 0.01, 0.1, 3);
|
||||
gtk_box_pack_start (GTK_BOX (main_vbox), scale, FALSE, FALSE, 0);
|
||||
gtk_widget_show (scale);
|
||||
|
||||
bc_tool->brightness_scale = scale;
|
||||
|
||||
|
@ -284,7 +283,6 @@ gimp_brightness_contrast_tool_dialog (GimpFilterTool *filter_tool)
|
|||
scale = gimp_prop_spin_scale_new (filter_tool->config, "contrast",
|
||||
_("_Contrast"), 0.01, 0.1, 3);
|
||||
gtk_box_pack_start (GTK_BOX (main_vbox), scale, FALSE, FALSE, 0);
|
||||
gtk_widget_show (scale);
|
||||
|
||||
bc_tool->contrast_scale = scale;
|
||||
|
||||
|
|
|
@ -408,10 +408,8 @@ gimp_bucket_fill_options_gui (GimpToolOptions *tool_options)
|
|||
str = g_strdup_printf (_("Fill Type (%s)"),
|
||||
gimp_get_mod_string (toggle_mask)),
|
||||
frame = gimp_prop_enum_radio_frame_new (config, "fill-mode", str, 0, 0);
|
||||
g_free (str);
|
||||
|
||||
gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0);
|
||||
gtk_widget_show (frame);
|
||||
g_free (str);
|
||||
|
||||
hbox = gimp_prop_pattern_box_new (NULL, GIMP_CONTEXT (tool_options),
|
||||
NULL, 2,
|
||||
|
@ -423,10 +421,8 @@ gimp_bucket_fill_options_gui (GimpToolOptions *tool_options)
|
|||
str = g_strdup_printf (_("Affected Area (%s)"),
|
||||
gimp_get_mod_string (extend_mask));
|
||||
frame = gimp_prop_enum_radio_frame_new (config, "fill-area", str, 0, 0);
|
||||
g_free (str);
|
||||
|
||||
gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0);
|
||||
gtk_widget_show (frame);
|
||||
g_free (str);
|
||||
|
||||
/* Similar color frame */
|
||||
frame = gimp_frame_new (_("Finding Similar Colors"));
|
||||
|
@ -441,36 +437,30 @@ gimp_bucket_fill_options_gui (GimpToolOptions *tool_options)
|
|||
/* the fill transparent areas toggle */
|
||||
widget = gimp_prop_check_button_new (config, "fill-transparent", NULL);
|
||||
gtk_box_pack_start (GTK_BOX (box2), widget, FALSE, FALSE, 0);
|
||||
gtk_widget_show (widget);
|
||||
|
||||
/* the sample merged toggle */
|
||||
widget = gimp_prop_check_button_new (config, "sample-merged", NULL);
|
||||
gtk_box_pack_start (GTK_BOX (box2), widget, FALSE, FALSE, 0);
|
||||
gtk_widget_show (widget);
|
||||
|
||||
/* the diagonal neighbors toggle */
|
||||
widget = gimp_prop_check_button_new (config, "diagonal-neighbors", NULL);
|
||||
gtk_box_pack_start (GTK_BOX (box2), widget, FALSE, FALSE, 0);
|
||||
options->priv->diagonal_neighbors_checkbox = widget;
|
||||
gtk_widget_show (widget);
|
||||
|
||||
/* the antialias toggle */
|
||||
widget = gimp_prop_check_button_new (config, "antialias", NULL);
|
||||
gtk_box_pack_start (GTK_BOX (box2), widget, FALSE, FALSE, 0);
|
||||
gtk_widget_show (widget);
|
||||
|
||||
/* the threshold scale */
|
||||
scale = gimp_prop_spin_scale_new (config, "threshold", NULL,
|
||||
1.0, 16.0, 1);
|
||||
gtk_box_pack_start (GTK_BOX (box2), scale, FALSE, FALSE, 0);
|
||||
options->priv->threshold_scale = scale;
|
||||
gtk_widget_show (scale);
|
||||
|
||||
/* the fill criterion combo */
|
||||
combo = gimp_prop_enum_combo_box_new (config, "fill-criterion", 0, 0);
|
||||
gimp_int_combo_box_set_label (GIMP_INT_COMBO_BOX (combo), _("Fill by"));
|
||||
gtk_box_pack_start (GTK_BOX (box2), combo, FALSE, FALSE, 0);
|
||||
gtk_widget_show (combo);
|
||||
|
||||
/* Line art frame */
|
||||
frame = gimp_frame_new (NULL);
|
||||
|
@ -505,12 +495,10 @@ gimp_bucket_fill_options_gui (GimpToolOptions *tool_options)
|
|||
combo = gimp_prop_enum_combo_box_new (config, "line-art-source", 0, 0);
|
||||
gimp_int_combo_box_set_label (GIMP_INT_COMBO_BOX (combo), _("Source"));
|
||||
gtk_box_pack_start (GTK_BOX (box2), combo, FALSE, FALSE, 0);
|
||||
gtk_widget_show (combo);
|
||||
|
||||
/* the fill transparent areas toggle */
|
||||
widget = gimp_prop_check_button_new (config, "fill-transparent", NULL);
|
||||
gtk_box_pack_start (GTK_BOX (box2), widget, FALSE, FALSE, 0);
|
||||
gtk_widget_show (widget);
|
||||
|
||||
/* Line Art: feather radius scale */
|
||||
scale = gimp_prop_spin_scale_new (config, "feather-radius", NULL,
|
||||
|
@ -519,25 +507,21 @@ gimp_bucket_fill_options_gui (GimpToolOptions *tool_options)
|
|||
frame = gimp_prop_expanding_frame_new (config, "feather", NULL,
|
||||
scale, NULL);
|
||||
gtk_box_pack_start (GTK_BOX (box2), frame, FALSE, FALSE, 0);
|
||||
gtk_widget_show (frame);
|
||||
|
||||
/* Line Art: max growing size */
|
||||
scale = gimp_prop_spin_scale_new (config, "line-art-max-grow", NULL,
|
||||
1, 5, 0);
|
||||
gtk_box_pack_start (GTK_BOX (box2), scale, FALSE, FALSE, 0);
|
||||
gtk_widget_show (scale);
|
||||
|
||||
/* Line Art: stroke threshold */
|
||||
scale = gimp_prop_spin_scale_new (config, "line-art-threshold", NULL,
|
||||
0.05, 0.1, 2);
|
||||
gtk_box_pack_start (GTK_BOX (box2), scale, FALSE, FALSE, 0);
|
||||
gtk_widget_show (scale);
|
||||
|
||||
/* Line Art: max gap length */
|
||||
scale = gimp_prop_spin_scale_new (config, "line-art-max-gap-length", NULL,
|
||||
1, 5, 0);
|
||||
gtk_box_pack_start (GTK_BOX (box2), scale, FALSE, FALSE, 0);
|
||||
gtk_widget_show (scale);
|
||||
|
||||
gimp_bucket_fill_options_update_area (options);
|
||||
|
||||
|
|
|
@ -143,11 +143,9 @@ gimp_cage_options_gui (GimpToolOptions *tool_options)
|
|||
|
||||
mode = gimp_prop_enum_radio_box_new (config, "cage-mode", 0, 0);
|
||||
gtk_box_pack_start (GTK_BOX (vbox), mode, FALSE, FALSE, 0);
|
||||
gtk_widget_show (mode);
|
||||
|
||||
button = gimp_prop_check_button_new (config, "fill-plain-color", NULL);
|
||||
gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
|
||||
gtk_widget_show (button);
|
||||
|
||||
return vbox;
|
||||
}
|
||||
|
|
|
@ -70,7 +70,6 @@ gimp_clone_options_gui (GimpToolOptions *tool_options)
|
|||
gimp_int_combo_box_set_label (GIMP_INT_COMBO_BOX (combo), _("Source"));
|
||||
g_object_set (combo, "ellipsize", PANGO_ELLIPSIZE_END, NULL);
|
||||
gtk_frame_set_label_widget (GTK_FRAME (frame), combo);
|
||||
gtk_widget_show (combo);
|
||||
|
||||
source_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
|
||||
gtk_container_add (GTK_CONTAINER (frame), source_vbox);
|
||||
|
@ -102,7 +101,6 @@ gimp_clone_options_gui (GimpToolOptions *tool_options)
|
|||
gimp_int_combo_box_set_label (GIMP_INT_COMBO_BOX (combo), _("Alignment"));
|
||||
g_object_set (combo, "ellipsize", PANGO_ELLIPSIZE_END, NULL);
|
||||
gtk_box_pack_start (GTK_BOX (vbox), combo, TRUE, TRUE, 0);
|
||||
gtk_widget_show (combo);
|
||||
|
||||
return vbox;
|
||||
}
|
||||
|
|
|
@ -159,7 +159,6 @@ gimp_color_options_gui (GimpToolOptions *tool_options)
|
|||
frame = gimp_prop_expanding_frame_new (config, "sample-average", NULL,
|
||||
scale, NULL);
|
||||
gtk_box_pack_start (GTK_BOX (vbox), frame, TRUE, TRUE, 0);
|
||||
gtk_widget_show (frame);
|
||||
|
||||
return vbox;
|
||||
}
|
||||
|
|
|
@ -190,25 +190,20 @@ gimp_color_picker_options_gui (GimpToolOptions *tool_options)
|
|||
/* the sample merged toggle button */
|
||||
button = gimp_prop_check_button_new (config, "sample-merged", NULL);
|
||||
gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
|
||||
gtk_widget_show (button);
|
||||
|
||||
/* the pick FG/BG frame */
|
||||
str = g_strdup_printf (_("Pick Target (%s)"),
|
||||
gimp_get_mod_string (toggle_mask));
|
||||
frame = gimp_prop_enum_radio_frame_new (config, "pick-target", str, -1, -1);
|
||||
g_free (str);
|
||||
|
||||
gtk_box_pack_start (GTK_BOX (vbox), frame, TRUE, TRUE, 0);
|
||||
gtk_widget_show (frame);
|
||||
g_free (str);
|
||||
|
||||
/* the use_info_window toggle button */
|
||||
str = g_strdup_printf (_("Use info window (%s)"),
|
||||
gimp_get_mod_string (extend_mask));
|
||||
button = gimp_prop_check_button_new (config, "use-info-window", str);
|
||||
g_free (str);
|
||||
|
||||
gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
|
||||
gtk_widget_show (button);
|
||||
g_free (str);
|
||||
|
||||
return vbox;
|
||||
}
|
||||
|
|
|
@ -216,7 +216,6 @@ gimp_convolve_options_gui (GimpToolOptions *tool_options)
|
|||
frame = gimp_prop_enum_radio_frame_new (config, "type",
|
||||
str, 0, 0);
|
||||
gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0);
|
||||
gtk_widget_show (frame);
|
||||
|
||||
g_free (str);
|
||||
|
||||
|
@ -224,7 +223,6 @@ gimp_convolve_options_gui (GimpToolOptions *tool_options)
|
|||
scale = gimp_prop_spin_scale_new (config, "rate", NULL,
|
||||
1.0, 10.0, 1);
|
||||
gtk_box_pack_start (GTK_BOX (vbox), scale, FALSE, FALSE, 0);
|
||||
gtk_widget_show (scale);
|
||||
|
||||
return vbox;
|
||||
}
|
||||
|
|
|
@ -194,7 +194,6 @@ gimp_crop_options_gui (GimpToolOptions *tool_options)
|
|||
/* layer toggle */
|
||||
button = gimp_prop_check_button_new (config, "layer-only", NULL);
|
||||
gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
|
||||
gtk_widget_show (button);
|
||||
|
||||
/* fill type combo */
|
||||
combo = gimp_prop_enum_combo_box_new (config, "fill-type", 0, 0);
|
||||
|
@ -204,7 +203,6 @@ gimp_crop_options_gui (GimpToolOptions *tool_options)
|
|||
frame = gimp_prop_expanding_frame_new (config, "allow-growing", NULL,
|
||||
combo, NULL);
|
||||
gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0);
|
||||
gtk_widget_show (frame);
|
||||
|
||||
/* rectangle options */
|
||||
vbox_rectangle = gimp_rectangle_options_gui (tool_options);
|
||||
|
|
|
@ -516,14 +516,12 @@ gimp_curves_tool_dialog (GimpFilterTool *filter_tool)
|
|||
"histogram-scale", "gimp-histogram",
|
||||
0, 0);
|
||||
gtk_box_pack_end (GTK_BOX (hbox), hbox2, FALSE, FALSE, 0);
|
||||
gtk_widget_show (hbox2);
|
||||
|
||||
/* The linear/perceptual radio buttons */
|
||||
hbox2 = gimp_prop_enum_icon_box_new (G_OBJECT (config), "trc",
|
||||
"gimp-color-space",
|
||||
-1, -1);
|
||||
gtk_box_pack_end (GTK_BOX (hbox), hbox2, FALSE, FALSE, 0);
|
||||
gtk_widget_show (hbox2);
|
||||
|
||||
frame_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 4);
|
||||
gtk_container_add (GTK_CONTAINER (main_frame), frame_vbox);
|
||||
|
|
|
@ -219,25 +219,20 @@ gimp_dodge_burn_options_gui (GimpToolOptions *tool_options)
|
|||
/* the type (dodge or burn) */
|
||||
str = g_strdup_printf (_("Type (%s)"),
|
||||
gimp_get_mod_string (toggle_mask));
|
||||
|
||||
frame = gimp_prop_enum_radio_frame_new (config, "type",
|
||||
str, 0, 0);
|
||||
gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0);
|
||||
gtk_widget_show (frame);
|
||||
|
||||
g_free (str);
|
||||
|
||||
/* mode (highlights, midtones, or shadows) */
|
||||
frame = gimp_prop_enum_radio_frame_new (config, "mode", NULL,
|
||||
0, 0);
|
||||
gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0);
|
||||
gtk_widget_show (frame);
|
||||
|
||||
/* the exposure scale */
|
||||
scale = gimp_prop_spin_scale_new (config, "exposure", NULL,
|
||||
1.0, 10.0, 1);
|
||||
gtk_box_pack_start (GTK_BOX (vbox), scale, FALSE, FALSE, 0);
|
||||
gtk_widget_show (scale);
|
||||
|
||||
return vbox;
|
||||
}
|
||||
|
|
|
@ -168,7 +168,6 @@ gimp_eraser_options_gui (GimpToolOptions *tool_options)
|
|||
|
||||
button = gimp_prop_check_button_new (config, "anti-erase", str);
|
||||
gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
|
||||
gtk_widget_show (button);
|
||||
|
||||
g_free (str);
|
||||
|
||||
|
|
|
@ -372,12 +372,10 @@ gimp_filter_tool_initialize (GimpTool *tool,
|
|||
toggle = gimp_prop_check_button_new (G_OBJECT (tool_info->tool_options),
|
||||
"preview", NULL);
|
||||
gtk_box_pack_start (GTK_BOX (hbox), toggle, TRUE, TRUE, 0);
|
||||
gtk_widget_show (toggle);
|
||||
|
||||
toggle = gimp_prop_check_button_new (G_OBJECT (tool_info->tool_options),
|
||||
"preview-split", NULL);
|
||||
gtk_box_pack_start (GTK_BOX (hbox), toggle, FALSE, FALSE, 0);
|
||||
gtk_widget_show (toggle);
|
||||
|
||||
g_object_bind_property (G_OBJECT (tool_info->tool_options), "preview",
|
||||
toggle, "sensitive",
|
||||
|
@ -389,8 +387,8 @@ gimp_filter_tool_initialize (GimpTool *tool,
|
|||
"controller", NULL);
|
||||
gtk_box_pack_end (GTK_BOX (vbox), filter_tool->controller_toggle,
|
||||
FALSE, FALSE, 0);
|
||||
if (filter_tool->widget)
|
||||
gtk_widget_show (filter_tool->controller_toggle);
|
||||
if (! filter_tool->widget)
|
||||
gtk_widget_hide (filter_tool->controller_toggle);
|
||||
|
||||
/* The Color Options expander */
|
||||
expander = gtk_expander_new (_("Advanced Color Options"));
|
||||
|
@ -414,7 +412,6 @@ gimp_filter_tool_initialize (GimpTool *tool,
|
|||
toggle = gimp_prop_check_button_new (G_OBJECT (tool_info->tool_options),
|
||||
"gamma-hack", NULL);
|
||||
gtk_box_pack_start (GTK_BOX (vbox2), toggle, FALSE, FALSE, 0);
|
||||
gtk_widget_show (toggle);
|
||||
|
||||
/* The area combo */
|
||||
filter_tool->region_combo =
|
||||
|
@ -423,6 +420,7 @@ gimp_filter_tool_initialize (GimpTool *tool,
|
|||
0, 0);
|
||||
gtk_box_pack_end (GTK_BOX (vbox), filter_tool->region_combo,
|
||||
FALSE, FALSE, 0);
|
||||
gtk_widget_hide (filter_tool->region_combo);
|
||||
|
||||
/* The clipping combo */
|
||||
filter_tool->clip_combo =
|
||||
|
@ -434,6 +432,7 @@ gimp_filter_tool_initialize (GimpTool *tool,
|
|||
GIMP_INT_COMBO_BOX (filter_tool->clip_combo), _("Clipping"));
|
||||
gtk_box_pack_end (GTK_BOX (vbox), filter_tool->clip_combo,
|
||||
FALSE, FALSE, 0);
|
||||
gtk_widget_hide (filter_tool->clip_combo);
|
||||
|
||||
/* Fill in subclass widgets */
|
||||
gimp_filter_tool_dialog (filter_tool);
|
||||
|
|
|
@ -140,7 +140,6 @@ gimp_flip_options_gui (GimpToolOptions *tool_options)
|
|||
GIMP_ORIENTATION_HORIZONTAL,
|
||||
GIMP_ORIENTATION_VERTICAL);
|
||||
gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0);
|
||||
gtk_widget_show (frame);
|
||||
|
||||
g_free (str);
|
||||
|
||||
|
@ -157,7 +156,6 @@ gimp_flip_options_gui (GimpToolOptions *tool_options)
|
|||
gimp_int_combo_box_set_label (GIMP_INT_COMBO_BOX (combo), _("Clipping"));
|
||||
g_object_set (combo, "ellipsize", PANGO_ELLIPSIZE_END, NULL);
|
||||
gtk_box_pack_start (GTK_BOX (vbox), combo, FALSE, FALSE, 0);
|
||||
gtk_widget_show (combo);
|
||||
|
||||
g_object_unref (clip_model);
|
||||
|
||||
|
|
|
@ -293,7 +293,6 @@ gimp_foreground_select_options_gui (GimpToolOptions *tool_options)
|
|||
frame = gimp_prop_enum_radio_frame_new (config, "draw-mode", NULL,
|
||||
0, 0);
|
||||
gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0);
|
||||
gtk_widget_show (frame);
|
||||
|
||||
hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 2);
|
||||
gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
|
||||
|
@ -305,7 +304,6 @@ gimp_foreground_select_options_gui (GimpToolOptions *tool_options)
|
|||
gimp_spin_scale_set_scale_limits (GIMP_SPIN_SCALE (scale), 1.0, 1000.0);
|
||||
gimp_spin_scale_set_gamma (GIMP_SPIN_SCALE (scale), 1.7);
|
||||
gtk_box_pack_start (GTK_BOX (hbox), scale, TRUE, TRUE, 0);
|
||||
gtk_widget_show (scale);
|
||||
|
||||
button = gimp_icon_button_new (GIMP_ICON_RESET, NULL);
|
||||
gtk_button_set_relief (GTK_BUTTON (button), GTK_RELIEF_NONE);
|
||||
|
@ -326,16 +324,15 @@ gimp_foreground_select_options_gui (GimpToolOptions *tool_options)
|
|||
frame = gimp_prop_enum_radio_frame_new (config, "preview-mode", NULL,
|
||||
0, 0);
|
||||
gtk_box_pack_start (GTK_BOX (vbox), frame, TRUE, TRUE, 0);
|
||||
gtk_widget_show (frame);
|
||||
|
||||
/* mask color */
|
||||
button = gimp_prop_color_button_new (config, "mask-color",
|
||||
NULL,
|
||||
128, 24,
|
||||
GIMP_COLOR_AREA_SMALL_CHECKS);
|
||||
gimp_color_panel_set_context (GIMP_COLOR_PANEL (button), GIMP_CONTEXT (config));
|
||||
gimp_color_panel_set_context (GIMP_COLOR_PANEL (button),
|
||||
GIMP_CONTEXT (config));
|
||||
gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
|
||||
gtk_widget_show (button);
|
||||
|
||||
/* engine */
|
||||
frame = gimp_frame_new (NULL);
|
||||
|
@ -347,9 +344,8 @@ gimp_foreground_select_options_gui (GimpToolOptions *tool_options)
|
|||
g_object_set (combo, "ellipsize", PANGO_ELLIPSIZE_END, NULL);
|
||||
gtk_frame_set_label_widget (GTK_FRAME (frame), combo);
|
||||
|
||||
if (!gegl_has_operation ("gegl:matting-levin"))
|
||||
if (! gegl_has_operation ("gegl:matting-levin"))
|
||||
gtk_widget_set_sensitive (combo, FALSE);
|
||||
gtk_widget_show (combo);
|
||||
|
||||
inner_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 2);
|
||||
gtk_container_add (GTK_CONTAINER (frame), inner_vbox);
|
||||
|
|
|
@ -274,7 +274,6 @@ gimp_gradient_options_gui (GimpToolOptions *tool_options)
|
|||
"gimp-gradient-editor",
|
||||
_("Edit this gradient"));
|
||||
gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
|
||||
gtk_widget_show (button);
|
||||
|
||||
/* the blend color space */
|
||||
combo = gimp_prop_enum_combo_box_new (config, "gradient-blend-color-space",
|
||||
|
@ -283,7 +282,6 @@ gimp_gradient_options_gui (GimpToolOptions *tool_options)
|
|||
_("Blend Color Space"));
|
||||
g_object_set (combo, "ellipsize", PANGO_ELLIPSIZE_END, NULL);
|
||||
gtk_box_pack_start (GTK_BOX (vbox), combo, TRUE, TRUE, 0);
|
||||
gtk_widget_show (combo);
|
||||
|
||||
/* the gradient type menu */
|
||||
combo = gimp_prop_enum_combo_box_new (config, "gradient-type", 0, 0);
|
||||
|
@ -292,14 +290,12 @@ gimp_gradient_options_gui (GimpToolOptions *tool_options)
|
|||
gimp_enum_combo_box_set_icon_prefix (GIMP_ENUM_COMBO_BOX (combo),
|
||||
"gimp-gradient");
|
||||
gtk_box_pack_start (GTK_BOX (vbox), combo, FALSE, FALSE, 0);
|
||||
gtk_widget_show (combo);
|
||||
|
||||
/* the distance metric menu */
|
||||
combo = gimp_prop_enum_combo_box_new (config, "distance-metric", 0, 0);
|
||||
gimp_int_combo_box_set_label (GIMP_INT_COMBO_BOX (combo), _("Metric"));
|
||||
g_object_set (combo, "ellipsize", PANGO_ELLIPSIZE_END, NULL);
|
||||
gtk_box_pack_start (GTK_BOX (vbox), combo, FALSE, FALSE, 0);
|
||||
gtk_widget_show (combo);
|
||||
|
||||
g_signal_connect (config, "notify::gradient-type",
|
||||
G_CALLBACK (gradient_options_metric_gradient_type_notify),
|
||||
|
@ -311,7 +307,6 @@ gimp_gradient_options_gui (GimpToolOptions *tool_options)
|
|||
gimp_int_combo_box_set_label (GIMP_INT_COMBO_BOX (combo), _("Repeat"));
|
||||
g_object_set (combo, "ellipsize", PANGO_ELLIPSIZE_END, NULL);
|
||||
gtk_box_pack_start (GTK_BOX (vbox), combo, FALSE, FALSE, 0);
|
||||
gtk_widget_show (combo);
|
||||
|
||||
g_signal_connect (config, "notify::gradient-type",
|
||||
G_CALLBACK (gradient_options_repeat_gradient_type_notify),
|
||||
|
@ -322,31 +317,26 @@ gimp_gradient_options_gui (GimpToolOptions *tool_options)
|
|||
scale = gimp_prop_spin_scale_new (config, "offset", NULL,
|
||||
1.0, 10.0, 1);
|
||||
gtk_box_pack_start (GTK_BOX (vbox), scale, FALSE, FALSE, 0);
|
||||
gtk_widget_show (scale);
|
||||
|
||||
/* the dither toggle */
|
||||
button = gimp_prop_check_button_new (config, "dither", NULL);
|
||||
gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
|
||||
gtk_widget_show (button);
|
||||
|
||||
/* supersampling options */
|
||||
vbox2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 2);
|
||||
frame = gimp_prop_expanding_frame_new (config, "supersample", NULL,
|
||||
vbox2, NULL);
|
||||
gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0);
|
||||
gtk_widget_show (frame);
|
||||
|
||||
/* max depth scale */
|
||||
scale = gimp_prop_spin_scale_new (config, "supersample-depth", NULL,
|
||||
1.0, 1.0, 0);
|
||||
gtk_box_pack_start (GTK_BOX (vbox2), scale, FALSE, FALSE, 0);
|
||||
gtk_widget_show (scale);
|
||||
|
||||
/* threshold scale */
|
||||
scale = gimp_prop_spin_scale_new (config, "supersample-threshold", NULL,
|
||||
0.01, 0.1, 2);
|
||||
gtk_box_pack_start (GTK_BOX (vbox2), scale, FALSE, FALSE, 0);
|
||||
gtk_widget_show (scale);
|
||||
|
||||
/* the instant toggle */
|
||||
str = g_strdup_printf (_("Instant mode (%s)"),
|
||||
|
@ -354,7 +344,6 @@ gimp_gradient_options_gui (GimpToolOptions *tool_options)
|
|||
|
||||
button = gimp_prop_check_button_new (config, "instant", str);
|
||||
gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
|
||||
gtk_widget_show (button);
|
||||
|
||||
g_free (str);
|
||||
|
||||
|
@ -365,7 +354,6 @@ gimp_gradient_options_gui (GimpToolOptions *tool_options)
|
|||
frame = gimp_prop_expanding_frame_new (config, "modify-active", NULL,
|
||||
vbox2, NULL);
|
||||
gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0);
|
||||
gtk_widget_show (frame);
|
||||
|
||||
options->modify_active_frame = frame;
|
||||
|
||||
|
|
|
@ -143,7 +143,6 @@ gimp_handle_transform_options_gui (GimpToolOptions *tool_options)
|
|||
frame = gimp_prop_enum_radio_frame_new (config, "handle-mode", NULL,
|
||||
0, 0);
|
||||
gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0);
|
||||
gtk_widget_show (frame);
|
||||
|
||||
/* add modifier to name, add tooltip */
|
||||
button = g_object_get_data (G_OBJECT (frame), "radio-button");
|
||||
|
|
|
@ -98,14 +98,12 @@ gimp_heal_options_gui (GimpToolOptions *tool_options)
|
|||
button = gimp_prop_check_button_new (config, "sample-merged",
|
||||
_("Sample merged"));
|
||||
gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
|
||||
gtk_widget_show (button);
|
||||
|
||||
/* the alignment combo */
|
||||
combo = gimp_prop_enum_combo_box_new (config, "align-mode", 0, 0);
|
||||
gimp_int_combo_box_set_label (GIMP_INT_COMBO_BOX (combo), _("Alignment"));
|
||||
g_object_set (combo, "ellipsize", PANGO_ELLIPSIZE_END, NULL);
|
||||
gtk_box_pack_start (GTK_BOX (vbox), combo, TRUE, TRUE, 0);
|
||||
gtk_widget_show (combo);
|
||||
|
||||
return vbox;
|
||||
}
|
||||
|
|
|
@ -64,13 +64,11 @@ gimp_ink_options_gui (GimpToolOptions *tool_options)
|
|||
scale = gimp_prop_spin_scale_new (config, "size", NULL,
|
||||
1.0, 2.0, 1);
|
||||
gtk_box_pack_start (GTK_BOX (vbox2), scale, FALSE, FALSE, 0);
|
||||
gtk_widget_show (scale);
|
||||
|
||||
/* angle adjust slider */
|
||||
scale = gimp_prop_spin_scale_new (config, "tilt-angle", NULL,
|
||||
1.0, 10.0, 1);
|
||||
gtk_box_pack_start (GTK_BOX (vbox2), scale, FALSE, FALSE, 0);
|
||||
gtk_widget_show (scale);
|
||||
|
||||
/* sens sliders */
|
||||
frame = gimp_frame_new (_("Sensitivity"));
|
||||
|
@ -85,19 +83,16 @@ gimp_ink_options_gui (GimpToolOptions *tool_options)
|
|||
scale = gimp_prop_spin_scale_new (config, "size-sensitivity", NULL,
|
||||
0.01, 0.1, 2);
|
||||
gtk_box_pack_start (GTK_BOX (vbox2), scale, FALSE, FALSE, 0);
|
||||
gtk_widget_show (scale);
|
||||
|
||||
/* tilt sens slider */
|
||||
scale = gimp_prop_spin_scale_new (config, "tilt-sensitivity", NULL,
|
||||
0.01, 0.1, 2);
|
||||
gtk_box_pack_start (GTK_BOX (vbox2), scale, FALSE, FALSE, 0);
|
||||
gtk_widget_show (scale);
|
||||
|
||||
/* velocity sens slider */
|
||||
scale = gimp_prop_spin_scale_new (config, "vel-sensitivity", NULL,
|
||||
0.01, 0.1, 2);
|
||||
gtk_box_pack_start (GTK_BOX (vbox2), scale, FALSE, FALSE, 0);
|
||||
gtk_widget_show (scale);
|
||||
|
||||
/* Blob shape widgets */
|
||||
frame = gimp_frame_new (_("Shape"));
|
||||
|
@ -116,7 +111,6 @@ gimp_ink_options_gui (GimpToolOptions *tool_options)
|
|||
gtk_orientable_set_orientation (GTK_ORIENTABLE (blob_box),
|
||||
GTK_ORIENTATION_VERTICAL);
|
||||
gtk_box_pack_start (GTK_BOX (hbox), blob_box, FALSE, FALSE, 0);
|
||||
gtk_widget_show (blob_box);
|
||||
|
||||
gtk_size_group_add_widget (size_group, blob_box);
|
||||
g_object_unref (size_group);
|
||||
|
|
|
@ -128,7 +128,6 @@ gimp_iscissors_options_gui (GimpToolOptions *tool_options)
|
|||
|
||||
button = gimp_prop_check_button_new (config, "interactive", NULL);
|
||||
gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
|
||||
gtk_widget_show (button);
|
||||
|
||||
return vbox;
|
||||
}
|
||||
|
|
|
@ -394,14 +394,12 @@ gimp_levels_tool_dialog (GimpFilterTool *filter_tool)
|
|||
"histogram-scale", "gimp-histogram",
|
||||
0, 0);
|
||||
gtk_box_pack_end (GTK_BOX (hbox), hbox2, FALSE, FALSE, 0);
|
||||
gtk_widget_show (hbox2);
|
||||
|
||||
/* The linear/perceptual radio buttons */
|
||||
hbox2 = gimp_prop_enum_icon_box_new (G_OBJECT (config), "trc",
|
||||
"gimp-color-space",
|
||||
-1, -1);
|
||||
gtk_box_pack_end (GTK_BOX (hbox), hbox2, FALSE, FALSE, 0);
|
||||
gtk_widget_show (hbox2);
|
||||
|
||||
frame_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 4);
|
||||
gtk_container_add (GTK_CONTAINER (main_frame), frame_vbox);
|
||||
|
@ -483,7 +481,6 @@ gimp_levels_tool_dialog (GimpFilterTool *filter_tool)
|
|||
gimp_prop_spin_button_new (filter_tool->config, "low-input",
|
||||
0.01, 0.1, 1);
|
||||
gtk_box_pack_start (GTK_BOX (hbox2), spinbutton, FALSE, FALSE, 0);
|
||||
gtk_widget_show (spinbutton);
|
||||
|
||||
tool->low_input = gtk_spin_button_get_adjustment (GTK_SPIN_BUTTON (spinbutton));
|
||||
gimp_handle_bar_set_adjustment (GIMP_HANDLE_BAR (handle_bar), 0,
|
||||
|
@ -497,14 +494,12 @@ gimp_levels_tool_dialog (GimpFilterTool *filter_tool)
|
|||
button = gimp_prop_check_button_new (filter_tool->config, "clamp-input",
|
||||
_("Clamp _input"));
|
||||
gtk_box_pack_start (GTK_BOX (hbox2), button, FALSE, FALSE, 0);
|
||||
gtk_widget_show (button);
|
||||
|
||||
/* input gamma spin */
|
||||
spinbutton = gimp_prop_spin_button_new (filter_tool->config, "gamma",
|
||||
0.01, 0.1, 2);
|
||||
gtk_box_pack_start (GTK_BOX (hbox2), spinbutton, FALSE, FALSE, 0);
|
||||
gimp_help_set_help_data (spinbutton, _("Gamma"), NULL);
|
||||
gtk_widget_show (spinbutton);
|
||||
|
||||
tool->gamma = gtk_spin_button_get_adjustment (GTK_SPIN_BUTTON (spinbutton));
|
||||
|
||||
|
@ -529,7 +524,6 @@ gimp_levels_tool_dialog (GimpFilterTool *filter_tool)
|
|||
spinbutton = gimp_prop_spin_button_new (filter_tool->config, "high-input",
|
||||
0.01, 0.1, 1);
|
||||
gtk_box_pack_start (GTK_BOX (hbox2), spinbutton, FALSE, FALSE, 0);
|
||||
gtk_widget_show (spinbutton);
|
||||
tool->high_input_spinbutton = spinbutton;
|
||||
|
||||
tool->high_input = gtk_spin_button_get_adjustment (GTK_SPIN_BUTTON (spinbutton));
|
||||
|
@ -578,7 +572,6 @@ gimp_levels_tool_dialog (GimpFilterTool *filter_tool)
|
|||
gimp_prop_spin_button_new (filter_tool->config, "low-output",
|
||||
0.01, 0.1, 1);
|
||||
gtk_box_pack_start (GTK_BOX (hbox), spinbutton, FALSE, FALSE, 0);
|
||||
gtk_widget_show (spinbutton);
|
||||
|
||||
adjustment = gtk_spin_button_get_adjustment (GTK_SPIN_BUTTON (spinbutton));
|
||||
gimp_handle_bar_set_adjustment (GIMP_HANDLE_BAR (handle_bar), 0, adjustment);
|
||||
|
@ -587,14 +580,12 @@ gimp_levels_tool_dialog (GimpFilterTool *filter_tool)
|
|||
button = gimp_prop_check_button_new (filter_tool->config, "clamp-output",
|
||||
_("Clamp outpu_t"));
|
||||
gtk_box_pack_start (GTK_BOX (hbox), button, TRUE, FALSE, 0);
|
||||
gtk_widget_show (button);
|
||||
|
||||
/* high output spin */
|
||||
tool->high_output_spinbutton = spinbutton =
|
||||
gimp_prop_spin_button_new (filter_tool->config, "high-output",
|
||||
0.01, 0.1, 1);
|
||||
gtk_box_pack_end (GTK_BOX (hbox), spinbutton, FALSE, FALSE, 0);
|
||||
gtk_widget_show (spinbutton);
|
||||
|
||||
adjustment = gtk_spin_button_get_adjustment (GTK_SPIN_BUTTON (spinbutton));
|
||||
gimp_handle_bar_set_adjustment (GIMP_HANDLE_BAR (handle_bar), 2, adjustment);
|
||||
|
|
|
@ -186,17 +186,13 @@ gimp_magnify_options_gui (GimpToolOptions *tool_options)
|
|||
/* the auto_resize toggle button */
|
||||
button = gimp_prop_check_button_new (config, "auto-resize", NULL);
|
||||
gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
|
||||
gtk_widget_show (button);
|
||||
|
||||
/* tool toggle */
|
||||
str = g_strdup_printf (_("Direction (%s)"),
|
||||
gimp_get_mod_string (toggle_mask));
|
||||
|
||||
frame = gimp_prop_enum_radio_frame_new (config, "zoom-type",
|
||||
str, 0, 0);
|
||||
gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0);
|
||||
gtk_widget_show (frame);
|
||||
|
||||
g_free (str);
|
||||
|
||||
return vbox;
|
||||
|
|
|
@ -54,35 +54,29 @@ gimp_mybrush_options_gui (GimpToolOptions *tool_options)
|
|||
_("Brush"), 2,
|
||||
NULL, NULL);
|
||||
gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
|
||||
gtk_widget_show (button);
|
||||
|
||||
/* erase mode */
|
||||
scale = gimp_prop_check_button_new (config, "eraser", NULL);
|
||||
gtk_box_pack_start (GTK_BOX (vbox), scale, FALSE, FALSE, 0);
|
||||
gtk_widget_show (scale);
|
||||
|
||||
/* no erasing */
|
||||
scale = gimp_prop_check_button_new (config, "no-erasing", NULL);
|
||||
gtk_box_pack_start (GTK_BOX (vbox), scale, FALSE, FALSE, 0);
|
||||
gtk_widget_show (scale);
|
||||
|
||||
/* radius */
|
||||
scale = gimp_prop_spin_scale_new (config, "radius", NULL,
|
||||
0.1, 1.0, 2);
|
||||
gtk_box_pack_start (GTK_BOX (vbox), scale, FALSE, FALSE, 0);
|
||||
gtk_widget_show (scale);
|
||||
|
||||
/* opaque */
|
||||
scale = gimp_prop_spin_scale_new (config, "opaque", NULL,
|
||||
0.1, 1.0, 2);
|
||||
gtk_box_pack_start (GTK_BOX (vbox), scale, FALSE, FALSE, 0);
|
||||
gtk_widget_show (scale);
|
||||
|
||||
/* hardness */
|
||||
scale = gimp_prop_spin_scale_new (config, "hardness", NULL,
|
||||
0.1, 1.0, 2);
|
||||
gtk_box_pack_start (GTK_BOX (vbox), scale, FALSE, FALSE, 0);
|
||||
gtk_widget_show (scale);
|
||||
|
||||
return vbox;
|
||||
}
|
||||
|
|
|
@ -209,7 +209,6 @@ gimp_n_point_deformation_options_gui (GimpToolOptions *tool_options)
|
|||
npd_options->check_mesh_visible = widget;
|
||||
gtk_box_pack_start (GTK_BOX (vbox), widget, FALSE, FALSE, 0);
|
||||
gtk_widget_set_can_focus (widget, FALSE);
|
||||
gtk_widget_show (widget);
|
||||
|
||||
widget = gimp_prop_spin_scale_new (config, "square-size", NULL,
|
||||
1.0, 10.0, 0);
|
||||
|
@ -217,14 +216,12 @@ gimp_n_point_deformation_options_gui (GimpToolOptions *tool_options)
|
|||
gimp_spin_scale_set_scale_limits (GIMP_SPIN_SCALE (widget), 10.0, 100.0);
|
||||
gtk_box_pack_start (GTK_BOX (vbox), widget, FALSE, FALSE, 0);
|
||||
gtk_widget_set_can_focus (widget, FALSE);
|
||||
gtk_widget_show (widget);
|
||||
|
||||
widget = gimp_prop_spin_scale_new (config, "rigidity", NULL,
|
||||
1.0, 10.0, 0);
|
||||
gimp_spin_scale_set_scale_limits (GIMP_SPIN_SCALE (widget), 1.0, 2000.0);
|
||||
gtk_box_pack_start (GTK_BOX (vbox), widget, FALSE, FALSE, 0);
|
||||
gtk_widget_set_can_focus (widget, FALSE);
|
||||
gtk_widget_show (widget);
|
||||
|
||||
widget = gimp_prop_boolean_radio_frame_new (config, "asap-deformation",
|
||||
NULL,
|
||||
|
@ -232,19 +229,16 @@ gimp_n_point_deformation_options_gui (GimpToolOptions *tool_options)
|
|||
_("Rigid (Rubber)"));
|
||||
gtk_box_pack_start (GTK_BOX (vbox), widget, FALSE, FALSE, 0);
|
||||
gtk_widget_set_can_focus (widget, FALSE);
|
||||
gtk_widget_show (widget);
|
||||
|
||||
widget = gimp_prop_check_button_new (config, "mls-weights", NULL);
|
||||
gtk_box_pack_start (GTK_BOX (vbox), widget, FALSE, FALSE, 0);
|
||||
gtk_widget_set_can_focus (widget, FALSE);
|
||||
gtk_widget_show (widget);
|
||||
|
||||
widget = gimp_prop_spin_scale_new (config, "mls-weights-alpha", NULL,
|
||||
0.1, 0.1, 1);
|
||||
gimp_spin_scale_set_scale_limits (GIMP_SPIN_SCALE (widget), 0.1, 2.0);
|
||||
gtk_box_pack_start (GTK_BOX (vbox), widget, FALSE, FALSE, 0);
|
||||
gtk_widget_set_can_focus (widget, FALSE);
|
||||
gtk_widget_show (widget);
|
||||
|
||||
g_object_bind_property (config, "mls-weights",
|
||||
widget, "sensitive",
|
||||
|
|
|
@ -112,7 +112,6 @@ gimp_paint_options_gui (GimpToolOptions *tool_options)
|
|||
gimp_layer_mode_box_set_ellipsize (GIMP_LAYER_MODE_BOX (menu),
|
||||
PANGO_ELLIPSIZE_END);
|
||||
gtk_box_pack_start (GTK_BOX (vbox), menu, FALSE, FALSE, 0);
|
||||
gtk_widget_show (menu);
|
||||
|
||||
g_object_set_data (G_OBJECT (vbox),
|
||||
"gimp-paint-options-gui-paint-mode-box", menu);
|
||||
|
@ -133,7 +132,6 @@ gimp_paint_options_gui (GimpToolOptions *tool_options)
|
|||
gimp_spin_scale_set_constrain_drag (GIMP_SPIN_SCALE (scale), TRUE);
|
||||
gimp_prop_widget_set_factor (scale, 100.0, 0.0, 0.0, 1);
|
||||
gtk_box_pack_start (GTK_BOX (vbox), scale, FALSE, FALSE, 0);
|
||||
gtk_widget_show (scale);
|
||||
|
||||
/* temp debug foo, disabled in stable */
|
||||
if (FALSE &&
|
||||
|
@ -144,7 +142,6 @@ gimp_paint_options_gui (GimpToolOptions *tool_options)
|
|||
|
||||
button = gimp_prop_check_button_new (config, "use-applicator", NULL);
|
||||
gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
|
||||
gtk_widget_show (button);
|
||||
}
|
||||
|
||||
/* the brush */
|
||||
|
@ -161,7 +158,6 @@ gimp_paint_options_gui (GimpToolOptions *tool_options)
|
|||
"gimp-brush-editor",
|
||||
_("Edit this brush"));
|
||||
gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
|
||||
gtk_widget_show (button);
|
||||
|
||||
link_group = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
|
||||
|
||||
|
@ -225,7 +221,6 @@ gimp_paint_options_gui (GimpToolOptions *tool_options)
|
|||
"gimp-dynamics-editor",
|
||||
_("Edit this dynamics"));
|
||||
gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
|
||||
gtk_widget_show (button);
|
||||
|
||||
frame = dynamics_options_gui (options, tool_type);
|
||||
gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0);
|
||||
|
@ -253,7 +248,6 @@ gimp_paint_options_gui (GimpToolOptions *tool_options)
|
|||
|
||||
button = gimp_prop_check_button_new (config, "brush-lock-to-view", NULL);
|
||||
gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
|
||||
gtk_widget_show (button);
|
||||
}
|
||||
|
||||
/* the "incremental" toggle */
|
||||
|
@ -269,7 +263,6 @@ gimp_paint_options_gui (GimpToolOptions *tool_options)
|
|||
GIMP_PAINT_CONSTANT,
|
||||
GIMP_PAINT_INCREMENTAL);
|
||||
gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
|
||||
gtk_widget_show (button);
|
||||
}
|
||||
|
||||
/* the "hard edge" toggle */
|
||||
|
@ -285,7 +278,6 @@ gimp_paint_options_gui (GimpToolOptions *tool_options)
|
|||
|
||||
button = gimp_prop_check_button_new (config, "hard", NULL);
|
||||
gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
|
||||
gtk_widget_show (button);
|
||||
}
|
||||
|
||||
return vbox;
|
||||
|
@ -340,11 +332,9 @@ dynamics_options_gui (GimpPaintOptions *paint_options,
|
|||
1.0, 50.0, 0);
|
||||
gimp_spin_scale_set_scale_limits (GIMP_SPIN_SCALE (scale), 1.0, 1000.0);
|
||||
gtk_box_pack_start (GTK_BOX (hbox), scale, TRUE, TRUE, 0);
|
||||
gtk_widget_show (scale);
|
||||
|
||||
menu = gimp_prop_unit_combo_box_new (config, "fade-unit");
|
||||
gtk_box_pack_start (GTK_BOX (hbox), menu, FALSE, FALSE, 0);
|
||||
gtk_widget_show (menu);
|
||||
|
||||
#if 0
|
||||
/* FIXME pixel digits */
|
||||
|
@ -357,11 +347,9 @@ dynamics_options_gui (GimpPaintOptions *paint_options,
|
|||
gimp_int_combo_box_set_label (GIMP_INT_COMBO_BOX (combo), _("Repeat"));
|
||||
g_object_set (combo, "ellipsize", PANGO_ELLIPSIZE_END, NULL);
|
||||
gtk_box_pack_start (GTK_BOX (inner_vbox), combo, TRUE, TRUE, 0);
|
||||
gtk_widget_show (combo);
|
||||
|
||||
checkbox = gimp_prop_check_button_new (config, "fade-reverse", NULL);
|
||||
gtk_box_pack_start (GTK_BOX (inner_vbox), checkbox, FALSE, FALSE, 0);
|
||||
gtk_widget_show (checkbox);
|
||||
|
||||
/* Color UI */
|
||||
if (g_type_is_a (tool_type, GIMP_TYPE_PAINTBRUSH_TOOL) ||
|
||||
|
@ -384,7 +372,6 @@ dynamics_options_gui (GimpPaintOptions *paint_options,
|
|||
"gimp-gradient-editor",
|
||||
_("Edit this gradient"));
|
||||
gtk_box_pack_start (GTK_BOX (inner_vbox), box, FALSE, FALSE, 0);
|
||||
gtk_widget_show (box);
|
||||
|
||||
/* the blend color space */
|
||||
combo = gimp_prop_enum_combo_box_new (config, "gradient-blend-color-space",
|
||||
|
@ -393,7 +380,6 @@ dynamics_options_gui (GimpPaintOptions *paint_options,
|
|||
_("Blend Color Space"));
|
||||
g_object_set (combo, "ellipsize", PANGO_ELLIPSIZE_END, NULL);
|
||||
gtk_box_pack_start (GTK_BOX (inner_vbox), combo, TRUE, TRUE, 0);
|
||||
gtk_widget_show (combo);
|
||||
}
|
||||
|
||||
return frame;
|
||||
|
@ -434,12 +420,10 @@ smoothing_options_gui (GimpPaintOptions *paint_options,
|
|||
scale = gimp_prop_spin_scale_new (config, "smoothing-quality", NULL,
|
||||
1, 10, 1);
|
||||
gtk_box_pack_start (GTK_BOX (vbox), scale, FALSE, FALSE, 0);
|
||||
gtk_widget_show (scale);
|
||||
|
||||
scale = gimp_prop_spin_scale_new (config, "smoothing-factor", NULL,
|
||||
1, 10, 1);
|
||||
gtk_box_pack_start (GTK_BOX (vbox), scale, FALSE, FALSE, 0);
|
||||
gtk_widget_show (scale);
|
||||
|
||||
return frame;
|
||||
}
|
||||
|
|
|
@ -912,7 +912,6 @@ gimp_perspective_clone_options_gui (GimpToolOptions *tool_options)
|
|||
mode = gimp_prop_enum_radio_box_new (config, "clone-mode", 0, 0);
|
||||
gtk_box_pack_start (GTK_BOX (vbox), mode, FALSE, FALSE, 0);
|
||||
gtk_box_reorder_child (GTK_BOX (vbox), mode, 0);
|
||||
gtk_widget_show (mode);
|
||||
|
||||
return vbox;
|
||||
}
|
||||
|
|
|
@ -785,7 +785,6 @@ gimp_rectangle_options_prop_dimension_frame_new (GObject *config,
|
|||
|
||||
menu = gimp_prop_unit_combo_box_new (config, unit_property_name);
|
||||
gtk_box_pack_end (GTK_BOX (hbox), menu, FALSE, FALSE, 0);
|
||||
gtk_widget_show (menu);
|
||||
|
||||
/* content */
|
||||
hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 2);
|
||||
|
@ -832,7 +831,6 @@ gimp_rectangle_options_gui (GimpToolOptions *tool_options)
|
|||
/* Fixed Center */
|
||||
button = gimp_prop_check_button_new (config, "fixed-center", NULL);
|
||||
gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
|
||||
gtk_widget_show (button);
|
||||
|
||||
/* Rectangle fixed-rules (e.g. aspect or width). */
|
||||
{
|
||||
|
@ -855,7 +853,6 @@ gimp_rectangle_options_gui (GimpToolOptions *tool_options)
|
|||
button = gimp_prop_check_button_new (config, "fixed-rule-active", NULL);
|
||||
gtk_widget_destroy (gtk_bin_get_child (GTK_BIN (button)));
|
||||
gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, TRUE, 0);
|
||||
gtk_widget_show (button);
|
||||
|
||||
g_signal_connect (button, "toggled",
|
||||
G_CALLBACK (gimp_rectangle_options_fixed_rule_changed),
|
||||
|
@ -865,7 +862,6 @@ gimp_rectangle_options_gui (GimpToolOptions *tool_options)
|
|||
gimp_int_combo_box_set_label (GIMP_INT_COMBO_BOX (combo), _("Fixed"));
|
||||
g_object_set (combo, "ellipsize", PANGO_ELLIPSIZE_END, NULL);
|
||||
gtk_box_pack_start (GTK_BOX (hbox), combo, TRUE, TRUE, 0);
|
||||
gtk_widget_show (combo);
|
||||
|
||||
g_signal_connect (combo, "changed",
|
||||
G_CALLBACK (gimp_rectangle_options_fixed_rule_changed),
|
||||
|
@ -902,7 +898,6 @@ gimp_rectangle_options_gui (GimpToolOptions *tool_options)
|
|||
0.001, GIMP_MAX_IMAGE_SIZE);
|
||||
gtk_box_pack_start (GTK_BOX (private->fixed_aspect_hbox), entry,
|
||||
TRUE, TRUE, 0);
|
||||
gtk_widget_show (entry);
|
||||
|
||||
g_signal_connect (entry, "notify::user-override",
|
||||
G_CALLBACK (gimp_rectangle_options_string_current_updates),
|
||||
|
@ -920,7 +915,6 @@ gimp_rectangle_options_gui (GimpToolOptions *tool_options)
|
|||
"aspect", "gimp", -1, -1);
|
||||
gtk_box_pack_start (GTK_BOX (private->fixed_aspect_hbox),
|
||||
private->aspect_button_box, FALSE, FALSE, 0);
|
||||
gtk_widget_show (private->aspect_button_box);
|
||||
|
||||
g_object_add_weak_pointer (G_OBJECT (private->aspect_button_box),
|
||||
(gpointer) &private->aspect_button_box);
|
||||
|
@ -939,7 +933,7 @@ gimp_rectangle_options_gui (GimpToolOptions *tool_options)
|
|||
gtk_box_pack_start (GTK_BOX (vbox2), private->fixed_width_entry,
|
||||
FALSE, FALSE, 0);
|
||||
gtk_size_group_add_widget (size_group, private->fixed_width_entry);
|
||||
/* don't show */
|
||||
gtk_widget_hide (private->fixed_width_entry);
|
||||
|
||||
g_object_add_weak_pointer (G_OBJECT (private->fixed_width_entry),
|
||||
(gpointer) &private->fixed_width_entry);
|
||||
|
@ -952,7 +946,7 @@ gimp_rectangle_options_gui (GimpToolOptions *tool_options)
|
|||
gtk_box_pack_start (GTK_BOX (vbox2), private->fixed_height_entry,
|
||||
FALSE, FALSE, 0);
|
||||
gtk_size_group_add_widget (size_group, private->fixed_height_entry);
|
||||
/* don't show */
|
||||
gtk_widget_hide (private->fixed_height_entry);
|
||||
|
||||
g_object_add_weak_pointer (G_OBJECT (private->fixed_height_entry),
|
||||
(gpointer) &private->fixed_height_entry);
|
||||
|
@ -962,7 +956,7 @@ gimp_rectangle_options_gui (GimpToolOptions *tool_options)
|
|||
gtk_box_pack_start (GTK_BOX (vbox2), private->fixed_size_hbox,
|
||||
FALSE, FALSE, 0);
|
||||
gtk_size_group_add_widget (size_group, private->fixed_size_hbox);
|
||||
/* don't show */
|
||||
gtk_widget_hide (private->fixed_size_hbox);
|
||||
|
||||
g_object_add_weak_pointer (G_OBJECT (private->fixed_size_hbox),
|
||||
(gpointer) &private->fixed_size_hbox);
|
||||
|
@ -979,7 +973,6 @@ gimp_rectangle_options_gui (GimpToolOptions *tool_options)
|
|||
1, GIMP_MAX_IMAGE_SIZE);
|
||||
gtk_box_pack_start (GTK_BOX (private->fixed_size_hbox), entry,
|
||||
TRUE, TRUE, 0);
|
||||
gtk_widget_show (entry);
|
||||
|
||||
gimp_rectangle_options_setup_ratio_completion (GIMP_RECTANGLE_OPTIONS (tool_options),
|
||||
entry,
|
||||
|
@ -990,7 +983,6 @@ gimp_rectangle_options_gui (GimpToolOptions *tool_options)
|
|||
"aspect", "gimp", -1, -1);
|
||||
gtk_box_pack_start (GTK_BOX (private->fixed_size_hbox),
|
||||
private->size_button_box, FALSE, FALSE, 0);
|
||||
gtk_widget_show (private->size_button_box);
|
||||
|
||||
/* hide "square" */
|
||||
children =
|
||||
|
@ -1034,7 +1026,6 @@ gimp_rectangle_options_gui (GimpToolOptions *tool_options)
|
|||
frame = gimp_prop_expanding_frame_new (config, "highlight", NULL,
|
||||
scale, NULL);
|
||||
gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0);
|
||||
gtk_widget_show (frame);
|
||||
}
|
||||
|
||||
/* Guide */
|
||||
|
@ -1042,7 +1033,6 @@ gimp_rectangle_options_gui (GimpToolOptions *tool_options)
|
|||
GIMP_GUIDES_NONE,
|
||||
GIMP_GUIDES_DIAGONALS);
|
||||
gtk_box_pack_start (GTK_BOX (vbox), combo, FALSE, FALSE, 0);
|
||||
gtk_widget_show (combo);
|
||||
|
||||
/* Auto Shrink */
|
||||
private->auto_shrink_button = gtk_button_new_with_label (_("Auto Shrink"));
|
||||
|
@ -1056,7 +1046,6 @@ gimp_rectangle_options_gui (GimpToolOptions *tool_options)
|
|||
|
||||
button = gimp_prop_check_button_new (config, "shrink-merged", NULL);
|
||||
gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
|
||||
gtk_widget_show (button);
|
||||
|
||||
/* Setup initial fixed rule widgets */
|
||||
gimp_rectangle_options_fixed_rule_changed (NULL, private);
|
||||
|
|
|
@ -182,7 +182,6 @@ gimp_rectangle_select_options_gui (GimpToolOptions *tool_options)
|
|||
frame = gimp_prop_expanding_frame_new (config, "round-corners", NULL,
|
||||
scale, NULL);
|
||||
gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0);
|
||||
gtk_widget_show (frame);
|
||||
|
||||
toggle = GIMP_SELECTION_OPTIONS (tool_options)->antialias_toggle;
|
||||
|
||||
|
|
|
@ -255,37 +255,31 @@ gimp_region_select_options_gui (GimpToolOptions *tool_options)
|
|||
/* the select transparent areas toggle */
|
||||
button = gimp_prop_check_button_new (config, "select-transparent", NULL);
|
||||
gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
|
||||
gtk_widget_show (button);
|
||||
|
||||
/* the sample merged toggle */
|
||||
button = gimp_prop_check_button_new (config, "sample-merged", NULL);
|
||||
gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
|
||||
gtk_widget_show (button);
|
||||
|
||||
/* the diagonal neighbors toggle */
|
||||
if (tool_type == GIMP_TYPE_FUZZY_SELECT_TOOL)
|
||||
{
|
||||
button = gimp_prop_check_button_new (config, "diagonal-neighbors", NULL);
|
||||
gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
|
||||
gtk_widget_show (button);
|
||||
}
|
||||
|
||||
/* the threshold scale */
|
||||
scale = gimp_prop_spin_scale_new (config, "threshold", NULL,
|
||||
1.0, 16.0, 1);
|
||||
gtk_box_pack_start (GTK_BOX (vbox), scale, FALSE, FALSE, 0);
|
||||
gtk_widget_show (scale);
|
||||
|
||||
/* the select criterion combo */
|
||||
combo = gimp_prop_enum_combo_box_new (config, "select-criterion", 0, 0);
|
||||
gimp_int_combo_box_set_label (GIMP_INT_COMBO_BOX (combo), _("Select by"));
|
||||
gtk_box_pack_start (GTK_BOX (vbox), combo, TRUE, TRUE, 0);
|
||||
gtk_widget_show (combo);
|
||||
|
||||
/* the show mask toggle */
|
||||
button = gimp_prop_check_button_new (config, "draw-mask", NULL);
|
||||
gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
|
||||
gtk_widget_show (button);
|
||||
|
||||
return vbox;
|
||||
}
|
||||
|
|
|
@ -133,7 +133,6 @@ gimp_seamless_clone_options_gui (GimpToolOptions *tool_options)
|
|||
1.0, 10.0, 0);
|
||||
gimp_spin_scale_set_scale_limits (GIMP_SPIN_SCALE (scale), 0.0, 50.0);
|
||||
gtk_box_pack_start (GTK_BOX (vbox), scale, FALSE, FALSE, 0);
|
||||
gtk_widget_show (scale);
|
||||
|
||||
return vbox;
|
||||
}
|
||||
|
|
|
@ -229,7 +229,6 @@ gimp_selection_options_gui (GimpToolOptions *tool_options)
|
|||
box = gimp_prop_enum_icon_box_new (config, "operation",
|
||||
"gimp-selection", 0, 0);
|
||||
gtk_box_pack_start (GTK_BOX (hbox), box, FALSE, FALSE, 0);
|
||||
gtk_widget_show (box);
|
||||
|
||||
children = gtk_container_get_children (GTK_CONTAINER (box));
|
||||
|
||||
|
@ -270,7 +269,6 @@ gimp_selection_options_gui (GimpToolOptions *tool_options)
|
|||
/* the antialias toggle button */
|
||||
button = gimp_prop_check_button_new (config, "antialias", NULL);
|
||||
gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
|
||||
gtk_widget_show (button);
|
||||
|
||||
options->antialias_toggle = button;
|
||||
|
||||
|
@ -286,7 +284,6 @@ gimp_selection_options_gui (GimpToolOptions *tool_options)
|
|||
frame = gimp_prop_expanding_frame_new (config, "feather", NULL,
|
||||
scale, NULL);
|
||||
gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0);
|
||||
gtk_widget_show (frame);
|
||||
}
|
||||
|
||||
return vbox;
|
||||
|
|
|
@ -94,22 +94,18 @@ gimp_smudge_options_gui (GimpToolOptions *tool_options)
|
|||
|
||||
button = gimp_prop_check_button_new (config, "no-erasing", NULL);
|
||||
gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
|
||||
gtk_widget_show (button);
|
||||
|
||||
button = gimp_prop_check_button_new (config, "sample-merged", NULL);
|
||||
gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
|
||||
gtk_widget_show (button);
|
||||
|
||||
/* the rate scale */
|
||||
scale = gimp_prop_spin_scale_new (config, "rate", NULL,
|
||||
1.0, 10.0, 1);
|
||||
gtk_box_pack_start (GTK_BOX (vbox), scale, FALSE, FALSE, 0);
|
||||
gtk_widget_show (scale);
|
||||
|
||||
scale = gimp_prop_spin_scale_new (config, "flow", NULL,
|
||||
1.0, 10.0, 1);
|
||||
gtk_box_pack_start (GTK_BOX (vbox), scale, FALSE, FALSE, 0);
|
||||
gtk_widget_show (scale);
|
||||
|
||||
return vbox;
|
||||
}
|
||||
|
|
|
@ -551,7 +551,6 @@ gimp_text_options_gui (GimpToolOptions *tool_options)
|
|||
_("Font"), 2,
|
||||
"font-view-type", "font-view-size");
|
||||
gtk_box_pack_start (GTK_BOX (options_vbox), hbox, FALSE, FALSE, 0);
|
||||
gtk_widget_show (hbox);
|
||||
|
||||
grid = gtk_grid_new ();
|
||||
gtk_grid_set_column_spacing (GTK_GRID (grid), 2);
|
||||
|
@ -574,11 +573,9 @@ gimp_text_options_gui (GimpToolOptions *tool_options)
|
|||
|
||||
button = gimp_prop_check_button_new (config, "use-editor", NULL);
|
||||
gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
|
||||
gtk_widget_show (button);
|
||||
|
||||
button = gimp_prop_check_button_new (config, "antialias", NULL);
|
||||
gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
|
||||
gtk_widget_show (button);
|
||||
|
||||
grid = gtk_grid_new ();
|
||||
gtk_grid_set_column_spacing (GTK_GRID (grid), 2);
|
||||
|
@ -664,7 +661,6 @@ gimp_text_options_gui (GimpToolOptions *tool_options)
|
|||
|
||||
entry = gimp_prop_language_entry_new (config, "language");
|
||||
gtk_box_pack_start (GTK_BOX (vbox), entry, FALSE, FALSE, 0);
|
||||
gtk_widget_show (entry);
|
||||
}
|
||||
#endif
|
||||
|
||||
|
|
|
@ -238,13 +238,10 @@ gimp_threshold_tool_dialog (GimpFilterTool *filter_tool)
|
|||
"channel", -1, -1);
|
||||
gimp_enum_combo_box_set_icon_prefix (GIMP_ENUM_COMBO_BOX (t_tool->channel_menu),
|
||||
"gimp-channel");
|
||||
|
||||
gimp_int_combo_box_set_sensitivity (GIMP_INT_COMBO_BOX (t_tool->channel_menu),
|
||||
gimp_threshold_tool_channel_sensitive,
|
||||
filter_tool, NULL);
|
||||
|
||||
gtk_box_pack_start (GTK_BOX (hbox), t_tool->channel_menu, FALSE, FALSE, 0);
|
||||
gtk_widget_show (t_tool->channel_menu);
|
||||
|
||||
gtk_label_set_mnemonic_widget (GTK_LABEL (label), t_tool->channel_menu);
|
||||
|
||||
|
@ -252,7 +249,6 @@ gimp_threshold_tool_dialog (GimpFilterTool *filter_tool)
|
|||
"histogram-scale", "gimp-histogram",
|
||||
0, 0);
|
||||
gtk_box_pack_end (GTK_BOX (hbox), hbox2, FALSE, FALSE, 0);
|
||||
gtk_widget_show (hbox2);
|
||||
|
||||
frame_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 4);
|
||||
gtk_container_add (GTK_CONTAINER (main_frame), frame_vbox);
|
||||
|
|
|
@ -400,10 +400,10 @@ gimp_transform_grid_options_gui (GimpToolOptions *tool_options)
|
|||
scale = gimp_prop_spin_scale_new (config, "preview-opacity", NULL,
|
||||
0.01, 0.1, 0);
|
||||
gimp_prop_widget_set_factor (scale, 100.0, 0.0, 0.0, 1);
|
||||
|
||||
frame = gimp_prop_expanding_frame_new (config, "show-preview", NULL,
|
||||
scale, NULL);
|
||||
gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0);
|
||||
gtk_widget_show (frame);
|
||||
|
||||
/* the guides frame */
|
||||
frame = gimp_frame_new (NULL);
|
||||
|
@ -415,7 +415,6 @@ gimp_transform_grid_options_gui (GimpToolOptions *tool_options)
|
|||
gimp_int_combo_box_set_label (GIMP_INT_COMBO_BOX (combo), _("Guides"));
|
||||
g_object_set (combo, "ellipsize", PANGO_ELLIPSIZE_END, NULL);
|
||||
gtk_frame_set_label_widget (GTK_FRAME (frame), combo);
|
||||
gtk_widget_show (combo);
|
||||
|
||||
/* the grid density scale */
|
||||
scale = gimp_prop_spin_scale_new (config, "grid-size", NULL,
|
||||
|
@ -440,7 +439,6 @@ gimp_transform_grid_options_gui (GimpToolOptions *tool_options)
|
|||
|
||||
button = gimp_prop_check_button_new (config, "constrain-rotate", label);
|
||||
gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
|
||||
gtk_widget_show (button);
|
||||
|
||||
gimp_help_set_help_data (button, _("Limit rotation steps to 15 degrees"),
|
||||
NULL);
|
||||
|
@ -457,7 +455,6 @@ gimp_transform_grid_options_gui (GimpToolOptions *tool_options)
|
|||
|
||||
button = gimp_prop_check_button_new (config, "constrain-scale", label);
|
||||
gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
|
||||
gtk_widget_show (button);
|
||||
|
||||
gimp_help_set_help_data (button, _("Keep the original aspect ratio"),
|
||||
NULL);
|
||||
|
@ -469,7 +466,6 @@ gimp_transform_grid_options_gui (GimpToolOptions *tool_options)
|
|||
|
||||
button = gimp_prop_check_button_new (config, "frompivot-scale", label);
|
||||
gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
|
||||
gtk_widget_show (button);
|
||||
|
||||
gimp_help_set_help_data (button, _("Scale around the center point"),
|
||||
NULL);
|
||||
|
@ -486,7 +482,6 @@ gimp_transform_grid_options_gui (GimpToolOptions *tool_options)
|
|||
|
||||
button = gimp_prop_check_button_new (config, "constrain-perspective", label);
|
||||
gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
|
||||
gtk_widget_show (button);
|
||||
|
||||
gimp_help_set_help_data (
|
||||
button, _("Constrain handles to move along edges and diagonal (%s)"),
|
||||
|
@ -499,7 +494,6 @@ gimp_transform_grid_options_gui (GimpToolOptions *tool_options)
|
|||
|
||||
button = gimp_prop_check_button_new (config, "frompivot-perspective", label);
|
||||
gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
|
||||
gtk_widget_show (button);
|
||||
|
||||
gimp_help_set_help_data (
|
||||
button, _("Transform around the center point"),
|
||||
|
@ -568,12 +562,9 @@ gimp_transform_grid_options_gui (GimpToolOptions *tool_options)
|
|||
{
|
||||
button = gimp_prop_check_button_new (config, opt_list[i].name,
|
||||
label);
|
||||
|
||||
gtk_box_pack_start (GTK_BOX (frame ? grid_box : vbox),
|
||||
button, FALSE, FALSE, 0);
|
||||
|
||||
gtk_widget_show (button);
|
||||
|
||||
g_free (label);
|
||||
label = g_strdup_printf (gettext (opt_list[i].tip),
|
||||
gimp_get_mod_string (opt_list[i].mod));
|
||||
|
|
|
@ -236,14 +236,12 @@ gimp_transform_options_gui (GimpToolOptions *tool_options,
|
|||
|
||||
box = gimp_prop_enum_icon_box_new (config, "type", "gimp", 0, 0);
|
||||
gtk_box_pack_start (GTK_BOX (hbox), box, FALSE, FALSE, 0);
|
||||
gtk_widget_show (box);
|
||||
|
||||
if (direction)
|
||||
{
|
||||
frame = gimp_prop_enum_radio_frame_new (config, "direction", NULL,
|
||||
0, 0);
|
||||
gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0);
|
||||
gtk_widget_show (frame);
|
||||
|
||||
options->direction_frame = frame;
|
||||
}
|
||||
|
@ -255,7 +253,6 @@ gimp_transform_options_gui (GimpToolOptions *tool_options,
|
|||
gimp_int_combo_box_set_label (GIMP_INT_COMBO_BOX (combo), _("Interpolation"));
|
||||
g_object_set (combo, "ellipsize", PANGO_ELLIPSIZE_END, NULL);
|
||||
gtk_box_pack_start (GTK_BOX (vbox), combo, FALSE, FALSE, 0);
|
||||
gtk_widget_show (combo);
|
||||
}
|
||||
|
||||
/* the clipping menu */
|
||||
|
@ -265,7 +262,6 @@ gimp_transform_options_gui (GimpToolOptions *tool_options,
|
|||
gimp_int_combo_box_set_label (GIMP_INT_COMBO_BOX (combo), _("Clipping"));
|
||||
g_object_set (combo, "ellipsize", PANGO_ELLIPSIZE_END, NULL);
|
||||
gtk_box_pack_start (GTK_BOX (vbox), combo, FALSE, FALSE, 0);
|
||||
gtk_widget_show (combo);
|
||||
}
|
||||
|
||||
return vbox;
|
||||
|
|
|
@ -159,7 +159,6 @@ gimp_vector_options_gui (GimpToolOptions *tool_options)
|
|||
frame = gimp_prop_enum_radio_frame_new (config, "vectors-edit-mode", NULL,
|
||||
0, 0);
|
||||
gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0);
|
||||
gtk_widget_show (frame);
|
||||
|
||||
button = g_object_get_data (G_OBJECT (frame), "radio-button");
|
||||
|
||||
|
@ -177,7 +176,6 @@ gimp_vector_options_gui (GimpToolOptions *tool_options)
|
|||
|
||||
button = gimp_prop_check_button_new (config, "vectors-polygonal", NULL);
|
||||
gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
|
||||
gtk_widget_show (button);
|
||||
|
||||
str = g_strdup_printf (_("Path to Selection\n"
|
||||
"%s Add\n"
|
||||
|
|
|
@ -307,7 +307,6 @@ gimp_warp_options_gui (GimpToolOptions *tool_options)
|
|||
combo = gimp_prop_enum_combo_box_new (config, "behavior", 0, 0);
|
||||
g_object_set (combo, "ellipsize", PANGO_ELLIPSIZE_END, NULL);
|
||||
gtk_box_pack_start (GTK_BOX (vbox), combo, FALSE, FALSE, 0);
|
||||
gtk_widget_show (combo);
|
||||
|
||||
options->behavior_combo = combo;
|
||||
|
||||
|
@ -315,46 +314,38 @@ gimp_warp_options_gui (GimpToolOptions *tool_options)
|
|||
0.01, 1.0, 2);
|
||||
gimp_spin_scale_set_scale_limits (GIMP_SPIN_SCALE (scale), 1.0, 1000.0);
|
||||
gtk_box_pack_start (GTK_BOX (vbox), scale, FALSE, FALSE, 0);
|
||||
gtk_widget_show (scale);
|
||||
|
||||
scale = gimp_prop_spin_scale_new (config, "effect-hardness", NULL,
|
||||
1, 10, 1);
|
||||
gimp_spin_scale_set_scale_limits (GIMP_SPIN_SCALE (scale), 0.0, 100.0);
|
||||
gtk_box_pack_start (GTK_BOX (vbox), scale, FALSE, FALSE, 0);
|
||||
gtk_widget_show (scale);
|
||||
|
||||
scale = gimp_prop_spin_scale_new (config, "effect-strength", NULL,
|
||||
1, 10, 1);
|
||||
gimp_spin_scale_set_scale_limits (GIMP_SPIN_SCALE (scale), 1.0, 100.0);
|
||||
gtk_box_pack_start (GTK_BOX (vbox), scale, FALSE, FALSE, 0);
|
||||
gtk_widget_show (scale);
|
||||
|
||||
scale = gimp_prop_spin_scale_new (config, "stroke-spacing", NULL,
|
||||
1, 10, 1);
|
||||
gimp_spin_scale_set_scale_limits (GIMP_SPIN_SCALE (scale), 1.0, 100.0);
|
||||
gtk_box_pack_start (GTK_BOX (vbox), scale, FALSE, FALSE, 0);
|
||||
gtk_widget_show (scale);
|
||||
|
||||
combo = gimp_prop_enum_combo_box_new (config, "interpolation", 0, 0);
|
||||
gimp_int_combo_box_set_label (GIMP_INT_COMBO_BOX (combo), _("Interpolation"));
|
||||
g_object_set (combo, "ellipsize", PANGO_ELLIPSIZE_END, NULL);
|
||||
gtk_box_pack_start (GTK_BOX (vbox), combo, FALSE, FALSE, 0);
|
||||
gtk_widget_show (combo);
|
||||
|
||||
combo = gimp_prop_enum_combo_box_new (config, "abyss-policy",
|
||||
GEGL_ABYSS_NONE, GEGL_ABYSS_LOOP);
|
||||
gimp_int_combo_box_set_label (GIMP_INT_COMBO_BOX (combo), _("Abyss policy"));
|
||||
g_object_set (combo, "ellipsize", PANGO_ELLIPSIZE_END, NULL);
|
||||
gtk_box_pack_start (GTK_BOX (vbox), combo, FALSE, FALSE, 0);
|
||||
gtk_widget_show (combo);
|
||||
|
||||
button = gimp_prop_check_button_new (config, "high-quality-preview", NULL);
|
||||
gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
|
||||
gtk_widget_show (button);
|
||||
|
||||
button = gimp_prop_check_button_new (config, "real-time-preview", NULL);
|
||||
gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
|
||||
gtk_widget_show (button);
|
||||
|
||||
/* the stroke frame */
|
||||
frame = gimp_frame_new (_("Stroke"));
|
||||
|
@ -369,7 +360,6 @@ gimp_warp_options_gui (GimpToolOptions *tool_options)
|
|||
|
||||
button = gimp_prop_check_button_new (config, "stroke-during-motion", NULL);
|
||||
gtk_box_pack_start (GTK_BOX (vbox2), button, FALSE, FALSE, 0);
|
||||
gtk_widget_show (button);
|
||||
|
||||
scale = gimp_prop_spin_scale_new (config, "stroke-periodically-rate", NULL,
|
||||
1, 10, 1);
|
||||
|
@ -378,7 +368,6 @@ gimp_warp_options_gui (GimpToolOptions *tool_options)
|
|||
frame = gimp_prop_expanding_frame_new (config, "stroke-periodically", NULL,
|
||||
scale, NULL);
|
||||
gtk_box_pack_start (GTK_BOX (vbox2), frame, FALSE, FALSE, 0);
|
||||
gtk_widget_show (frame);
|
||||
|
||||
/* the animation frame */
|
||||
frame = gimp_frame_new (_("Animate"));
|
||||
|
@ -393,7 +382,6 @@ gimp_warp_options_gui (GimpToolOptions *tool_options)
|
|||
1.0, 10.0, 0);
|
||||
gimp_spin_scale_set_scale_limits (GIMP_SPIN_SCALE (scale), 3.0, 100.0);
|
||||
gtk_box_pack_start (GTK_BOX (vbox2), scale, FALSE, FALSE, 0);
|
||||
gtk_widget_show (scale);
|
||||
|
||||
options->animate_button = gtk_button_new_with_label (_("Create Animation"));
|
||||
gtk_widget_set_sensitive (options->animate_button, FALSE);
|
||||
|
|
|
@ -195,17 +195,14 @@ gimp_controller_editor_constructed (GObject *object)
|
|||
|
||||
entry = gimp_prop_entry_new (G_OBJECT (info), "name", -1);
|
||||
gtk_box_pack_start (GTK_BOX (vbox), entry, FALSE, FALSE, 0);
|
||||
gtk_widget_show (entry);
|
||||
|
||||
button = gimp_prop_check_button_new (G_OBJECT (info), "debug-events",
|
||||
_("_Dump events from this controller"));
|
||||
gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
|
||||
gtk_widget_show (button);
|
||||
|
||||
button = gimp_prop_check_button_new (G_OBJECT (info), "enabled",
|
||||
_("_Enable this controller"));
|
||||
gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
|
||||
gtk_widget_show (button);
|
||||
|
||||
frame = gimp_frame_new (controller_class->name);
|
||||
gtk_box_pack_start (GTK_BOX (editor), frame, TRUE, TRUE, 0);
|
||||
|
|
|
@ -506,7 +506,6 @@ gimp_device_info_editor_constructed (GObject *object)
|
|||
gimp_enum_combo_box_set_icon_prefix (GIMP_ENUM_COMBO_BOX (combo),
|
||||
"gimp-curve");
|
||||
gtk_box_pack_start (GTK_BOX (hbox), combo, TRUE, TRUE, 0);
|
||||
gtk_widget_show (combo);
|
||||
|
||||
gtk_label_set_mnemonic_widget (GTK_LABEL (label), combo);
|
||||
|
||||
|
|
|
@ -342,7 +342,6 @@ gimp_device_status_device_add (GimpContainer *devices,
|
|||
entry->tool = gimp_prop_view_new (G_OBJECT (entry->context), "tool",
|
||||
entry->context, CELL_SIZE);
|
||||
gtk_box_pack_start (GTK_BOX (hbox), entry->tool, FALSE, FALSE, 0);
|
||||
gtk_widget_show (entry->tool);
|
||||
|
||||
/* the foreground color */
|
||||
|
||||
|
|
|
@ -316,7 +316,6 @@ gimp_dynamics_editor_add_icon_editor (GimpDynamics *dynamics,
|
|||
|
||||
button = gimp_prop_icon_picker_new (GIMP_VIEWABLE (dynamics), gimp);
|
||||
gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, FALSE, 0);
|
||||
gtk_widget_show (button);
|
||||
}
|
||||
|
||||
static void
|
||||
|
@ -374,7 +373,6 @@ dynamics_check_button_new (GObject *config,
|
|||
button = gimp_prop_check_button_new (config, property_name, NULL);
|
||||
gtk_widget_destroy (gtk_bin_get_child (GTK_BIN (button)));
|
||||
gtk_grid_attach (grid, button, column, row, 1, 1);
|
||||
gtk_widget_show (button);
|
||||
|
||||
return button;
|
||||
}
|
||||
|
|
|
@ -758,7 +758,6 @@ gimp_file_dialog_add_proc_selection (GimpFileDialog *dialog)
|
|||
"show-all-files",
|
||||
_("Show _All Files"));
|
||||
gtk_box_pack_end (GTK_BOX (box), checkbox, FALSE, FALSE, 1);
|
||||
gtk_widget_show (checkbox);
|
||||
}
|
||||
|
||||
static void
|
||||
|
|
|
@ -112,7 +112,6 @@ gimp_fill_editor_constructed (GObject *object)
|
|||
box = gimp_prop_enum_radio_box_new (G_OBJECT (editor->options), "style",
|
||||
0, 0);
|
||||
gtk_box_pack_start (GTK_BOX (editor), box, FALSE, FALSE, 0);
|
||||
gtk_widget_show (box);
|
||||
|
||||
if (editor->edit_context)
|
||||
{
|
||||
|
@ -142,7 +141,6 @@ gimp_fill_editor_constructed (GObject *object)
|
|||
"antialias",
|
||||
_("_Antialiasing"));
|
||||
gtk_box_pack_start (GTK_BOX (editor), button, FALSE, FALSE, 0);
|
||||
gtk_widget_show (button);
|
||||
}
|
||||
|
||||
static void
|
||||
|
|
|
@ -205,7 +205,6 @@ gimp_grid_editor_constructed (GObject *object)
|
|||
gimp_size_entry_set_refval_digits (GIMP_SIZE_ENTRY (sizeentry), 1, 2);
|
||||
|
||||
gtk_box_pack_start (GTK_BOX (hbox), sizeentry, FALSE, FALSE, 0);
|
||||
gtk_widget_show (sizeentry);
|
||||
|
||||
gtk_widget_show (hbox);
|
||||
|
||||
|
@ -241,7 +240,6 @@ gimp_grid_editor_constructed (GObject *object)
|
|||
gimp_size_entry_set_refval_digits (GIMP_SIZE_ENTRY (sizeentry), 1, 2);
|
||||
|
||||
gtk_box_pack_start (GTK_BOX (hbox), sizeentry, FALSE, FALSE, 0);
|
||||
gtk_widget_show (sizeentry);
|
||||
|
||||
gtk_widget_show (hbox);
|
||||
}
|
||||
|
|
|
@ -170,12 +170,10 @@ gimp_histogram_box_init (GimpHistogramBox *box)
|
|||
spinbutton = gimp_prop_spin_button_new (G_OBJECT (box->view), "border-width",
|
||||
1, 5, 0);
|
||||
gtk_box_pack_start (GTK_BOX (hbox), spinbutton, FALSE, FALSE, 0);
|
||||
gtk_widget_show (spinbutton);
|
||||
|
||||
spinbutton = gimp_prop_spin_button_new (G_OBJECT (box->view), "subdivisions",
|
||||
1, 5, 0);
|
||||
gtk_box_pack_start (GTK_BOX (hbox), spinbutton, FALSE, FALSE, 0);
|
||||
gtk_widget_show (spinbutton);
|
||||
#endif
|
||||
}
|
||||
|
||||
|
|
|
@ -159,7 +159,6 @@ gimp_histogram_editor_init (GimpHistogramEditor *editor)
|
|||
gimp_int_combo_box_set_active (GIMP_INT_COMBO_BOX (editor->menu),
|
||||
view->channel);
|
||||
gtk_box_pack_start (GTK_BOX (hbox), menu, FALSE, FALSE, 0);
|
||||
gtk_widget_show (menu);
|
||||
|
||||
gimp_help_set_help_data (editor->menu,
|
||||
_("Histogram channel"), NULL);
|
||||
|
@ -168,13 +167,11 @@ gimp_histogram_editor_init (GimpHistogramEditor *editor)
|
|||
"histogram-scale", "gimp-histogram",
|
||||
0, 0);
|
||||
gtk_box_pack_end (GTK_BOX (hbox), menu, FALSE, FALSE, 0);
|
||||
gtk_widget_show (menu);
|
||||
|
||||
menu = gimp_prop_enum_icon_box_new (G_OBJECT (editor), "trc",
|
||||
"gimp-color-space",
|
||||
-1, -1);
|
||||
gtk_box_pack_end (GTK_BOX (hbox), menu, FALSE, FALSE, 0);
|
||||
gtk_widget_show (menu);
|
||||
|
||||
gtk_box_pack_start (GTK_BOX (editor), editor->box, TRUE, TRUE, 0);
|
||||
gtk_widget_show (GTK_WIDGET (editor->box));
|
||||
|
|
|
@ -147,7 +147,6 @@ gimp_layer_mode_box_constructed (GObject *object)
|
|||
gimp_int_combo_box_set_layout (GIMP_INT_COMBO_BOX (group_combo),
|
||||
GIMP_INT_COMBO_BOX_LAYOUT_ICON_ONLY);
|
||||
gtk_box_pack_start (GTK_BOX (box), group_combo, FALSE, FALSE, 0);
|
||||
gtk_widget_show (group_combo);
|
||||
|
||||
gimp_help_set_help_data (group_combo,
|
||||
_("Switch to another group of modes"),
|
||||
|
|
|
@ -138,6 +138,8 @@ gimp_prop_expanding_frame_new (GObject *config,
|
|||
if (button)
|
||||
*button = toggle;
|
||||
|
||||
gtk_widget_show (frame);
|
||||
|
||||
return frame;
|
||||
}
|
||||
|
||||
|
@ -238,6 +240,8 @@ gimp_prop_boolean_icon_box_new (GObject *config,
|
|||
G_CALLBACK (gimp_prop_radio_button_notify),
|
||||
button);
|
||||
|
||||
gtk_widget_show (box);
|
||||
|
||||
return box;
|
||||
}
|
||||
|
||||
|
@ -318,6 +322,8 @@ gimp_prop_layer_mode_box_new (GObject *config,
|
|||
G_BINDING_BIDIRECTIONAL |
|
||||
G_BINDING_SYNC_CREATE);
|
||||
|
||||
gtk_widget_show (box);
|
||||
|
||||
return box;
|
||||
}
|
||||
|
||||
|
@ -387,6 +393,8 @@ gimp_prop_color_button_new (GObject *config,
|
|||
G_CALLBACK (gimp_prop_color_button_notify),
|
||||
button);
|
||||
|
||||
gtk_widget_show (button);
|
||||
|
||||
return button;
|
||||
}
|
||||
|
||||
|
@ -536,6 +544,8 @@ gimp_prop_spin_scale_new (GObject *config,
|
|||
G_CALLBACK (gimp_prop_adjustment_notify),
|
||||
adjustment);
|
||||
|
||||
gtk_widget_show (scale);
|
||||
|
||||
return scale;
|
||||
}
|
||||
|
||||
|
@ -880,6 +890,8 @@ gimp_prop_angle_dial_new (GObject *config,
|
|||
l, (GDestroyNotify) g_free);
|
||||
}
|
||||
|
||||
gtk_widget_show (dial);
|
||||
|
||||
return dial;
|
||||
}
|
||||
|
||||
|
@ -976,6 +988,8 @@ gimp_prop_polar_new (GObject *config,
|
|||
G_BINDING_BIDIRECTIONAL |
|
||||
G_BINDING_SYNC_CREATE);
|
||||
|
||||
gtk_widget_show (polar);
|
||||
|
||||
return polar;
|
||||
}
|
||||
|
||||
|
@ -1061,6 +1075,8 @@ gimp_prop_view_new (GObject *config,
|
|||
G_CALLBACK (gimp_prop_view_notify),
|
||||
view);
|
||||
|
||||
gtk_widget_show (view);
|
||||
|
||||
return view;
|
||||
}
|
||||
|
||||
|
@ -1259,8 +1275,7 @@ gimp_prop_number_pair_entry_new (GObject *config,
|
|||
G_CALLBACK (gimp_prop_number_pair_entry_config_notify),
|
||||
number_pair_entry);
|
||||
|
||||
|
||||
/* Done */
|
||||
gtk_widget_show (number_pair_entry);
|
||||
|
||||
return number_pair_entry;
|
||||
}
|
||||
|
@ -1402,6 +1417,8 @@ gimp_prop_language_combo_box_new (GObject *config,
|
|||
G_CALLBACK (gimp_prop_language_combo_box_notify),
|
||||
combo);
|
||||
|
||||
gtk_widget_show (combo);
|
||||
|
||||
return combo;
|
||||
}
|
||||
|
||||
|
@ -1500,6 +1517,8 @@ gimp_prop_language_entry_new (GObject *config,
|
|||
G_CALLBACK (gimp_prop_language_entry_notify),
|
||||
entry);
|
||||
|
||||
gtk_widget_show (entry);
|
||||
|
||||
return entry;
|
||||
}
|
||||
|
||||
|
@ -1652,6 +1671,8 @@ gimp_prop_profile_combo_box_new (GObject *config,
|
|||
G_CALLBACK (gimp_prop_profile_combo_notify),
|
||||
combo);
|
||||
|
||||
gtk_widget_show (combo);
|
||||
|
||||
return combo;
|
||||
}
|
||||
|
||||
|
@ -1789,6 +1810,8 @@ gimp_prop_compression_combo_box_new (GObject *config,
|
|||
G_CALLBACK (gimp_prop_compression_combo_box_notify),
|
||||
combo);
|
||||
|
||||
gtk_widget_show (combo);
|
||||
|
||||
return combo;
|
||||
}
|
||||
|
||||
|
@ -1898,6 +1921,8 @@ gimp_prop_icon_picker_new (GimpViewable *viewable,
|
|||
if (pixbuf_value)
|
||||
g_object_unref (pixbuf_value);
|
||||
|
||||
gtk_widget_show (picker);
|
||||
|
||||
return picker;
|
||||
}
|
||||
|
||||
|
|
|
@ -137,7 +137,6 @@ gimp_stroke_editor_constructed (GObject *object)
|
|||
editor->resolution);
|
||||
gimp_size_entry_set_pixel_digits (GIMP_SIZE_ENTRY (size), 1);
|
||||
gtk_box_pack_start (GTK_BOX (box), size, FALSE, FALSE, 0);
|
||||
gtk_widget_show (size);
|
||||
|
||||
expander = gtk_expander_new_with_mnemonic (_("_Line Style"));
|
||||
gtk_box_pack_start (GTK_BOX (editor), expander, FALSE, FALSE, 0);
|
||||
|
|
|
@ -179,7 +179,6 @@ gimp_symmetry_editor_set_image (GimpImageEditor *image_editor,
|
|||
gtk_box_pack_start (GTK_BOX (editor), editor->p->menu,
|
||||
FALSE, FALSE, 0);
|
||||
gtk_box_reorder_child (GTK_BOX (editor), editor->p->menu, 0);
|
||||
gtk_widget_show (editor->p->menu);
|
||||
|
||||
/* Connect to symmetry change. */
|
||||
g_signal_connect (image_editor->image, "notify::symmetry",
|
||||
|
@ -252,7 +251,6 @@ gimp_symmetry_editor_set_options (GimpSymmetryEditor *editor,
|
|||
NULL, NULL, NULL);
|
||||
gtk_box_pack_start (GTK_BOX (editor->p->options_vbox), gui,
|
||||
FALSE, FALSE, 0);
|
||||
gtk_widget_show (gui);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -150,47 +150,38 @@ gimp_tool_preset_editor_constructed (GObject *object)
|
|||
button = gimp_prop_icon_picker_new (GIMP_VIEWABLE (preset),
|
||||
data_editor->context->gimp);
|
||||
gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, FALSE, 0);
|
||||
gtk_widget_show (button);
|
||||
|
||||
button = editor->priv->fg_bg_toggle =
|
||||
gimp_prop_check_button_new (G_OBJECT (preset), "use-fg-bg", NULL);
|
||||
gtk_box_pack_start (GTK_BOX (data_editor), button, FALSE, FALSE, 0);
|
||||
gtk_widget_show (button);
|
||||
|
||||
button = editor->priv->brush_toggle =
|
||||
gimp_prop_check_button_new (G_OBJECT (preset), "use-brush", NULL);
|
||||
gtk_box_pack_start (GTK_BOX (data_editor), button, FALSE, FALSE, 0);
|
||||
gtk_widget_show (button);
|
||||
|
||||
button = editor->priv->dynamics_toggle =
|
||||
gimp_prop_check_button_new (G_OBJECT (preset), "use-dynamics", NULL);
|
||||
gtk_box_pack_start (GTK_BOX (data_editor), button, FALSE, FALSE, 0);
|
||||
gtk_widget_show (button);
|
||||
|
||||
button = editor->priv->mybrush_toggle =
|
||||
gimp_prop_check_button_new (G_OBJECT (preset), "use-mypaint-brush", NULL);
|
||||
gtk_box_pack_start (GTK_BOX (data_editor), button, FALSE, FALSE, 0);
|
||||
gtk_widget_show (button);
|
||||
|
||||
button = editor->priv->gradient_toggle =
|
||||
gimp_prop_check_button_new (G_OBJECT (preset), "use-gradient", NULL);
|
||||
gtk_box_pack_start (GTK_BOX (data_editor), button, FALSE, FALSE, 0);
|
||||
gtk_widget_show (button);
|
||||
|
||||
button = editor->priv->pattern_toggle =
|
||||
gimp_prop_check_button_new (G_OBJECT (preset), "use-pattern", NULL);
|
||||
gtk_box_pack_start (GTK_BOX (data_editor), button, FALSE, FALSE, 0);
|
||||
gtk_widget_show (button);
|
||||
|
||||
button = editor->priv->palette_toggle =
|
||||
gimp_prop_check_button_new (G_OBJECT (preset), "use-palette", NULL);
|
||||
gtk_box_pack_start (GTK_BOX (data_editor), button, FALSE, FALSE, 0);
|
||||
gtk_widget_show (button);
|
||||
|
||||
button = editor->priv->font_toggle =
|
||||
gimp_prop_check_button_new (G_OBJECT (preset), "use-font", NULL);
|
||||
gtk_box_pack_start (GTK_BOX (data_editor), button, FALSE, FALSE, 0);
|
||||
gtk_widget_show (button);
|
||||
|
||||
button = gimp_editor_add_action_button (GIMP_EDITOR (editor),
|
||||
"tool-preset-editor",
|
||||
|
|
|
@ -717,6 +717,8 @@ view_props_connect (GtkWidget *box,
|
|||
gimp_config_connect_full (G_OBJECT (context), G_OBJECT (button),
|
||||
view_size_prop, "popup-view-size");
|
||||
|
||||
gtk_widget_show (box);
|
||||
|
||||
return box;
|
||||
}
|
||||
|
||||
|
|
|
@ -313,7 +313,6 @@ gimp_viewable_button_new (GimpContainer *container,
|
|||
button->view = gimp_prop_view_new (G_OBJECT (context), prop_name,
|
||||
context, button->button_view_size);
|
||||
gtk_container_add (GTK_CONTAINER (button), button->view);
|
||||
gtk_widget_show (button->view);
|
||||
|
||||
return GTK_WIDGET (button);
|
||||
}
|
||||
|
|
|
@ -137,6 +137,8 @@ gimp_prop_check_button_new (GObject *config,
|
|||
G_CALLBACK (gimp_prop_check_button_notify),
|
||||
button);
|
||||
|
||||
gtk_widget_show (button);
|
||||
|
||||
return button;
|
||||
}
|
||||
|
||||
|
@ -259,6 +261,8 @@ gimp_prop_enum_check_button_new (GObject *config,
|
|||
G_CALLBACK (gimp_prop_enum_check_button_notify),
|
||||
button);
|
||||
|
||||
gtk_widget_show (button);
|
||||
|
||||
return button;
|
||||
}
|
||||
|
||||
|
@ -404,6 +408,8 @@ gimp_prop_int_combo_box_new (GObject *config,
|
|||
G_CALLBACK (gimp_prop_int_combo_box_notify),
|
||||
combo_box);
|
||||
|
||||
gtk_widget_show (combo_box);
|
||||
|
||||
return combo_box;
|
||||
}
|
||||
|
||||
|
@ -470,6 +476,8 @@ gimp_prop_pointer_combo_box_new (GObject *config,
|
|||
G_CALLBACK (gimp_prop_pointer_combo_box_notify),
|
||||
combo_box);
|
||||
|
||||
gtk_widget_show (combo_box);
|
||||
|
||||
return combo_box;
|
||||
}
|
||||
|
||||
|
@ -573,6 +581,8 @@ gimp_prop_enum_combo_box_new (GObject *config,
|
|||
G_CALLBACK (gimp_prop_int_combo_box_notify),
|
||||
combo_box);
|
||||
|
||||
gtk_widget_show (combo_box);
|
||||
|
||||
return combo_box;
|
||||
}
|
||||
|
||||
|
@ -731,6 +741,8 @@ gimp_prop_boolean_combo_box_new (GObject *config,
|
|||
G_CALLBACK (gimp_prop_boolean_combo_box_notify),
|
||||
combo);
|
||||
|
||||
gtk_widget_show (combo);
|
||||
|
||||
return combo;
|
||||
}
|
||||
|
||||
|
@ -864,6 +876,8 @@ gimp_prop_enum_radio_frame_new (GObject *config,
|
|||
|
||||
g_object_set_data (G_OBJECT (frame), "radio-button", button);
|
||||
|
||||
gtk_widget_show (frame);
|
||||
|
||||
return frame;
|
||||
}
|
||||
|
||||
|
@ -934,6 +948,8 @@ gimp_prop_enum_radio_box_new (GObject *config,
|
|||
|
||||
g_object_set_data (G_OBJECT (vbox), "radio-button", button);
|
||||
|
||||
gtk_widget_show (vbox);
|
||||
|
||||
return vbox;
|
||||
}
|
||||
|
||||
|
@ -984,6 +1000,8 @@ gimp_prop_enum_label_new (GObject *config,
|
|||
G_CALLBACK (gimp_prop_enum_label_notify),
|
||||
label);
|
||||
|
||||
gtk_widget_show (label);
|
||||
|
||||
return label;
|
||||
}
|
||||
|
||||
|
@ -1064,6 +1082,8 @@ gimp_prop_boolean_radio_frame_new (GObject *config,
|
|||
|
||||
g_object_set_data (G_OBJECT (frame), "radio-button", button);
|
||||
|
||||
gtk_widget_show (frame);
|
||||
|
||||
return frame;
|
||||
}
|
||||
|
||||
|
@ -1137,6 +1157,8 @@ gimp_prop_enum_icon_box_new (GObject *config,
|
|||
G_CALLBACK (gimp_prop_radio_button_notify),
|
||||
button);
|
||||
|
||||
gtk_widget_show (box);
|
||||
|
||||
return box;
|
||||
}
|
||||
|
||||
|
@ -1245,6 +1267,8 @@ gimp_prop_spin_button_new (GObject *config,
|
|||
G_CALLBACK (gimp_prop_adjustment_notify),
|
||||
adjustment);
|
||||
|
||||
gtk_widget_show (spinbutton);
|
||||
|
||||
return spinbutton;
|
||||
}
|
||||
|
||||
|
@ -1307,6 +1331,8 @@ gimp_prop_hscale_new (GObject *config,
|
|||
G_CALLBACK (gimp_prop_adjustment_notify),
|
||||
adjustment);
|
||||
|
||||
gtk_widget_show (scale);
|
||||
|
||||
return scale;
|
||||
}
|
||||
|
||||
|
@ -1755,6 +1781,8 @@ gimp_prop_memsize_entry_new (GObject *config,
|
|||
G_CALLBACK (gimp_prop_memsize_notify),
|
||||
entry);
|
||||
|
||||
gtk_widget_show (entry);
|
||||
|
||||
return entry;
|
||||
}
|
||||
|
||||
|
@ -1866,6 +1894,8 @@ gimp_prop_label_new (GObject *config,
|
|||
|
||||
gimp_prop_label_notify (config, param_spec, label);
|
||||
|
||||
gtk_widget_show (label);
|
||||
|
||||
return label;
|
||||
}
|
||||
|
||||
|
@ -1970,6 +2000,8 @@ gimp_prop_entry_new (GObject *config,
|
|||
G_CALLBACK (gimp_prop_entry_notify),
|
||||
entry);
|
||||
|
||||
gtk_widget_show (entry);
|
||||
|
||||
return entry;
|
||||
}
|
||||
|
||||
|
@ -2250,6 +2282,8 @@ gimp_prop_string_combo_box_new (GObject *config,
|
|||
G_CALLBACK (gimp_prop_string_combo_box_notify),
|
||||
combo_box);
|
||||
|
||||
gtk_widget_show (combo_box);
|
||||
|
||||
return combo_box;
|
||||
}
|
||||
|
||||
|
@ -2305,7 +2339,6 @@ gimp_prop_string_combo_box_notify (GObject *config,
|
|||
/* file chooser button */
|
||||
/*************************/
|
||||
|
||||
|
||||
static GtkWidget * gimp_prop_file_chooser_button_setup (GtkWidget *button,
|
||||
GObject *config,
|
||||
GParamSpec *param_spec);
|
||||
|
@ -2436,6 +2469,8 @@ gimp_prop_file_chooser_button_setup (GtkWidget *button,
|
|||
G_CALLBACK (gimp_prop_file_chooser_button_notify),
|
||||
button);
|
||||
|
||||
gtk_widget_show (button);
|
||||
|
||||
return button;
|
||||
}
|
||||
|
||||
|
@ -2621,6 +2656,8 @@ gimp_prop_path_editor_new (GObject *config,
|
|||
editor);
|
||||
}
|
||||
|
||||
gtk_widget_show (editor);
|
||||
|
||||
return editor;
|
||||
}
|
||||
|
||||
|
@ -2928,6 +2965,8 @@ gimp_prop_size_entry_new (GObject *config,
|
|||
entry);
|
||||
}
|
||||
|
||||
gtk_widget_show (entry);
|
||||
|
||||
return entry;
|
||||
}
|
||||
|
||||
|
@ -3162,6 +3201,8 @@ gimp_prop_coordinates_new (GObject *config,
|
|||
return NULL;
|
||||
}
|
||||
|
||||
gtk_widget_show (entry);
|
||||
|
||||
return entry;
|
||||
}
|
||||
|
||||
|
@ -3615,6 +3656,8 @@ gimp_prop_color_area_new (GObject *config,
|
|||
G_CALLBACK (gimp_prop_color_area_notify),
|
||||
area);
|
||||
|
||||
gtk_widget_show (area);
|
||||
|
||||
return area;
|
||||
}
|
||||
|
||||
|
@ -3739,6 +3782,8 @@ gimp_prop_unit_combo_box_new (GObject *config,
|
|||
G_CALLBACK (gimp_prop_unit_combo_box_notify),
|
||||
combo);
|
||||
|
||||
gtk_widget_show (combo);
|
||||
|
||||
return combo;
|
||||
}
|
||||
|
||||
|
@ -3850,6 +3895,8 @@ gimp_prop_icon_image_new (GObject *config,
|
|||
G_CALLBACK (gimp_prop_icon_image_notify),
|
||||
image);
|
||||
|
||||
gtk_widget_show (image);
|
||||
|
||||
return image;
|
||||
}
|
||||
|
||||
|
@ -3937,6 +3984,8 @@ gimp_prop_expander_new (GObject *config,
|
|||
G_CALLBACK (gimp_prop_expander_notify),
|
||||
expander);
|
||||
|
||||
gtk_widget_show (expander);
|
||||
|
||||
return expander;
|
||||
}
|
||||
|
||||
|
|
|
@ -1264,7 +1264,6 @@ save_dialog (GimpProcedure *procedure,
|
|||
button = gimp_prop_check_button_new (config, "lossless",
|
||||
_("_Lossless"));
|
||||
gtk_frame_set_label_widget (GTK_FRAME (frame), button);
|
||||
gtk_widget_show (button);
|
||||
|
||||
grid = gtk_grid_new ();
|
||||
gtk_grid_set_column_spacing (GTK_GRID (grid), 6);
|
||||
|
@ -1286,7 +1285,6 @@ save_dialog (GimpProcedure *procedure,
|
|||
button = gimp_prop_check_button_new (config, "save-color-profile",
|
||||
_("Save color _profile"));
|
||||
gtk_box_pack_start (GTK_BOX (main_vbox), button, FALSE, FALSE, 0);
|
||||
gtk_widget_show (button);
|
||||
#endif
|
||||
|
||||
gtk_widget_show (dialog);
|
||||
|
|
|
@ -1060,7 +1060,6 @@ load_dialog (PopplerDocument *doc,
|
|||
title = gimp_prop_label_new (G_OBJECT (doc), "title");
|
||||
gtk_label_set_ellipsize (GTK_LABEL (title), PANGO_ELLIPSIZE_END);
|
||||
gtk_box_pack_start (GTK_BOX (vbox), title, FALSE, FALSE, 0);
|
||||
gtk_widget_show (title);
|
||||
|
||||
/* Page Selector */
|
||||
selector = gimp_page_selector_new ();
|
||||
|
|
|
@ -2291,38 +2291,31 @@ save_dialog (GimpImage *image,
|
|||
button = gimp_prop_check_button_new (config, "interlaced",
|
||||
_("_Interlacing (Adam7)"));
|
||||
gtk_grid_attach (GTK_GRID (grid), button, col, row++, 1, 1);
|
||||
gtk_widget_show (button);
|
||||
|
||||
button = gimp_prop_check_button_new (config, "bkgd",
|
||||
_("Save _background color"));
|
||||
gtk_grid_attach (GTK_GRID (grid), button, col, row++, 1, 1);
|
||||
gtk_widget_show (button);
|
||||
|
||||
button = gimp_prop_check_button_new (config, "gama",
|
||||
_("Save _gamma"));
|
||||
gtk_grid_attach (GTK_GRID (grid), button, col, row++, 1, 1);
|
||||
gtk_widget_show (button);
|
||||
|
||||
button = gimp_prop_check_button_new (config, "offs",
|
||||
_("Save layer o_ffset"));
|
||||
gtk_grid_attach (GTK_GRID (grid), button, col, row++, 1, 1);
|
||||
gtk_widget_show (button);
|
||||
|
||||
button = gimp_prop_check_button_new (config, "phys",
|
||||
_("Save _resolution"));
|
||||
gtk_grid_attach (GTK_GRID (grid), button, col, row++, 1, 1);
|
||||
gtk_widget_show (button);
|
||||
|
||||
button = gimp_prop_check_button_new (config, "time",
|
||||
_("Save creation _time"));
|
||||
gtk_grid_attach (GTK_GRID (grid), button, col, row++, 1, 1);
|
||||
gtk_widget_show (button);
|
||||
|
||||
button = gimp_prop_check_button_new (config, "save-transparent",
|
||||
_("Save color _values from "
|
||||
"transparent pixels"));
|
||||
gtk_grid_attach (GTK_GRID (grid), button, col, row++, 2, 1);
|
||||
gtk_widget_show (button);
|
||||
|
||||
gtk_widget_set_sensitive (button, alpha);
|
||||
|
||||
|
@ -2332,7 +2325,6 @@ save_dialog (GimpImage *image,
|
|||
button = gimp_prop_check_button_new (config, "comment",
|
||||
_("Save comme_nt"));
|
||||
gtk_grid_attach (GTK_GRID (grid), button, col, row++, 1, 1);
|
||||
gtk_widget_show (button);
|
||||
|
||||
parasite = gimp_image_get_parasite (image, "gimp-comment");
|
||||
gtk_widget_set_sensitive (button, parasite != NULL);
|
||||
|
@ -2341,27 +2333,22 @@ save_dialog (GimpImage *image,
|
|||
button = gimp_prop_check_button_new (config, "save-exif",
|
||||
_("Save E_xif data"));
|
||||
gtk_grid_attach (GTK_GRID (grid), button, col, row++, 1, 1);
|
||||
gtk_widget_show (button);
|
||||
|
||||
button = gimp_prop_check_button_new (config, "save-xmp",
|
||||
_("Save XMP data"));
|
||||
gtk_grid_attach (GTK_GRID (grid), button, col, row++, 1, 1);
|
||||
gtk_widget_show (button);
|
||||
|
||||
button = gimp_prop_check_button_new (config, "save-iptc",
|
||||
_("Save IPTC data"));
|
||||
gtk_grid_attach (GTK_GRID (grid), button, col, row++, 1, 1);
|
||||
gtk_widget_show (button);
|
||||
|
||||
button = gimp_prop_check_button_new (config, "save-thumbnail",
|
||||
_("Save thumbnail"));
|
||||
gtk_grid_attach (GTK_GRID (grid), button, col, row++, 1, 1);
|
||||
gtk_widget_show (button);
|
||||
|
||||
button = gimp_prop_check_button_new (config, "save-color-profile",
|
||||
_("Save color profile"));
|
||||
gtk_grid_attach (GTK_GRID (grid), button, col, row++, 1, 1);
|
||||
gtk_widget_show (button);
|
||||
|
||||
#if !defined(PNG_iCCP_SUPPORTED)
|
||||
gtk_widget_hide (button);
|
||||
|
|
Loading…
Reference in New Issue