Commit 17167594 authored by Michael Natterer's avatar Michael Natterer 😴

app: use the newly added libgimpwidgets icon name APIs

parent 79bd9c60
...@@ -220,8 +220,8 @@ gimp_blend_options_gui (GimpToolOptions *tool_options) ...@@ -220,8 +220,8 @@ gimp_blend_options_gui (GimpToolOptions *tool_options)
combo = gimp_prop_enum_combo_box_new (config, "gradient-type", 0, 0); combo = gimp_prop_enum_combo_box_new (config, "gradient-type", 0, 0);
gimp_int_combo_box_set_label (GIMP_INT_COMBO_BOX (combo), _("Shape")); gimp_int_combo_box_set_label (GIMP_INT_COMBO_BOX (combo), _("Shape"));
g_object_set (combo, "ellipsize", PANGO_ELLIPSIZE_END, NULL); g_object_set (combo, "ellipsize", PANGO_ELLIPSIZE_END, NULL);
gimp_enum_combo_box_set_stock_prefix (GIMP_ENUM_COMBO_BOX (combo), gimp_enum_combo_box_set_icon_prefix (GIMP_ENUM_COMBO_BOX (combo),
"gimp-gradient"); "gimp-gradient");
gtk_box_pack_start (GTK_BOX (vbox), combo, FALSE, FALSE, 0); gtk_box_pack_start (GTK_BOX (vbox), combo, FALSE, FALSE, 0);
gtk_widget_show (combo); gtk_widget_show (combo);
......
...@@ -435,8 +435,8 @@ gimp_curves_tool_dialog (GimpImageMapTool *image_map_tool) ...@@ -435,8 +435,8 @@ gimp_curves_tool_dialog (GimpImageMapTool *image_map_tool)
gimp_int_combo_box_set_active (GIMP_INT_COMBO_BOX (tool->channel_menu), gimp_int_combo_box_set_active (GIMP_INT_COMBO_BOX (tool->channel_menu),
config->channel); config->channel);
gimp_enum_combo_box_set_stock_prefix (GIMP_ENUM_COMBO_BOX (tool->channel_menu), gimp_enum_combo_box_set_icon_prefix (GIMP_ENUM_COMBO_BOX (tool->channel_menu),
"gimp-channel"); "gimp-channel");
gtk_box_pack_start (GTK_BOX (hbox), tool->channel_menu, FALSE, FALSE, 0); gtk_box_pack_start (GTK_BOX (hbox), tool->channel_menu, FALSE, FALSE, 0);
gtk_widget_show (tool->channel_menu); gtk_widget_show (tool->channel_menu);
...@@ -455,9 +455,9 @@ gimp_curves_tool_dialog (GimpImageMapTool *image_map_tool) ...@@ -455,9 +455,9 @@ gimp_curves_tool_dialog (GimpImageMapTool *image_map_tool)
tool); tool);
/* The histogram scale radio buttons */ /* The histogram scale radio buttons */
hbox2 = gimp_prop_enum_stock_box_new (G_OBJECT (tool_options), hbox2 = gimp_prop_enum_icon_box_new (G_OBJECT (tool_options),
"histogram-scale", "gimp-histogram", "histogram-scale", "gimp-histogram",
0, 0); 0, 0);
gtk_box_pack_end (GTK_BOX (hbox), hbox2, FALSE, FALSE, 0); gtk_box_pack_end (GTK_BOX (hbox), hbox2, FALSE, FALSE, 0);
gtk_widget_show (hbox2); gtk_widget_show (hbox2);
...@@ -545,8 +545,8 @@ gimp_curves_tool_dialog (GimpImageMapTool *image_map_tool) ...@@ -545,8 +545,8 @@ gimp_curves_tool_dialog (GimpImageMapTool *image_map_tool)
gtk_widget_show (label); gtk_widget_show (label);
tool->curve_type = combo = gimp_enum_combo_box_new (GIMP_TYPE_CURVE_TYPE); tool->curve_type = combo = gimp_enum_combo_box_new (GIMP_TYPE_CURVE_TYPE);
gimp_enum_combo_box_set_stock_prefix (GIMP_ENUM_COMBO_BOX (combo), gimp_enum_combo_box_set_icon_prefix (GIMP_ENUM_COMBO_BOX (combo),
"gimp-curve"); "gimp-curve");
gimp_int_combo_box_connect (GIMP_INT_COMBO_BOX (combo), 0, gimp_int_combo_box_connect (GIMP_INT_COMBO_BOX (combo), 0,
G_CALLBACK (curves_curve_type_callback), G_CALLBACK (curves_curve_type_callback),
tool); tool);
......
...@@ -135,7 +135,7 @@ gimp_flip_options_gui (GimpToolOptions *tool_options) ...@@ -135,7 +135,7 @@ gimp_flip_options_gui (GimpToolOptions *tool_options)
gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0); gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
gtk_widget_show (label); gtk_widget_show (label);
box = gimp_prop_enum_stock_box_new (config, "type", "gimp", 0, 0); box = gimp_prop_enum_icon_box_new (config, "type", "gimp", 0, 0);
gtk_box_pack_start (GTK_BOX (hbox), box, FALSE, FALSE, 0); gtk_box_pack_start (GTK_BOX (hbox), box, FALSE, FALSE, 0);
gtk_widget_show (box); gtk_widget_show (box);
......
...@@ -116,8 +116,8 @@ gimp_ink_options_gui (GimpToolOptions *tool_options) ...@@ -116,8 +116,8 @@ gimp_ink_options_gui (GimpToolOptions *tool_options)
size_group = gtk_size_group_new (GTK_SIZE_GROUP_VERTICAL); size_group = gtk_size_group_new (GTK_SIZE_GROUP_VERTICAL);
/* Blob type radiobuttons */ /* Blob type radiobuttons */
blob_box = gimp_prop_enum_stock_box_new (config, "blob-type", blob_box = gimp_prop_enum_icon_box_new (config, "blob-type",
"gimp-shape", 0, 0); "gimp-shape", 0, 0);
gtk_orientable_set_orientation (GTK_ORIENTABLE (blob_box), gtk_orientable_set_orientation (GTK_ORIENTABLE (blob_box),
GTK_ORIENTATION_VERTICAL); GTK_ORIENTATION_VERTICAL);
gtk_box_pack_start (GTK_BOX (hbox), blob_box, FALSE, FALSE, 0); gtk_box_pack_start (GTK_BOX (hbox), blob_box, FALSE, FALSE, 0);
......
...@@ -354,8 +354,8 @@ gimp_levels_tool_dialog (GimpImageMapTool *image_map_tool) ...@@ -354,8 +354,8 @@ gimp_levels_tool_dialog (GimpImageMapTool *image_map_tool)
g_signal_connect (menu, "changed", g_signal_connect (menu, "changed",
G_CALLBACK (levels_channel_callback), G_CALLBACK (levels_channel_callback),
tool); tool);
gimp_enum_combo_box_set_stock_prefix (GIMP_ENUM_COMBO_BOX (menu), gimp_enum_combo_box_set_icon_prefix (GIMP_ENUM_COMBO_BOX (menu),
"gimp-channel"); "gimp-channel");
gtk_box_pack_start (GTK_BOX (hbox), menu, FALSE, FALSE, 0); gtk_box_pack_start (GTK_BOX (hbox), menu, FALSE, FALSE, 0);
gtk_widget_show (menu); gtk_widget_show (menu);
...@@ -371,9 +371,9 @@ gimp_levels_tool_dialog (GimpImageMapTool *image_map_tool) ...@@ -371,9 +371,9 @@ gimp_levels_tool_dialog (GimpImageMapTool *image_map_tool)
G_CALLBACK (levels_channel_reset_callback), G_CALLBACK (levels_channel_reset_callback),
tool); tool);
menu = gimp_prop_enum_stock_box_new (G_OBJECT (tool_options), menu = gimp_prop_enum_icon_box_new (G_OBJECT (tool_options),
"histogram-scale", "gimp-histogram", "histogram-scale", "gimp-histogram",
0, 0); 0, 0);
gtk_box_pack_end (GTK_BOX (hbox), menu, FALSE, FALSE, 0); gtk_box_pack_end (GTK_BOX (hbox), menu, FALSE, FALSE, 0);
gtk_widget_show (menu); gtk_widget_show (menu);
......
...@@ -180,7 +180,7 @@ gimp_move_options_gui (GimpToolOptions *tool_options) ...@@ -180,7 +180,7 @@ gimp_move_options_gui (GimpToolOptions *tool_options)
gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0); gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
gtk_widget_show (label); gtk_widget_show (label);
box = gimp_prop_enum_stock_box_new (config, "move-type", "gimp", 0, 0); box = gimp_prop_enum_icon_box_new (config, "move-type", "gimp", 0, 0);
gtk_box_pack_start (GTK_BOX (hbox), box, FALSE, FALSE, 0); gtk_box_pack_start (GTK_BOX (hbox), box, FALSE, FALSE, 0);
gtk_widget_show (box); gtk_widget_show (box);
......
...@@ -922,8 +922,8 @@ gimp_rectangle_options_gui (GimpToolOptions *tool_options) ...@@ -922,8 +922,8 @@ gimp_rectangle_options_gui (GimpToolOptions *tool_options)
private->aspect_history); private->aspect_history);
private->aspect_button_box = private->aspect_button_box =
gimp_prop_enum_stock_box_new (G_OBJECT (entry), gimp_prop_enum_icon_box_new (G_OBJECT (entry),
"aspect", "gimp", -1, -1); "aspect", "gimp", -1, -1);
gtk_box_pack_start (GTK_BOX (private->fixed_aspect_hbox), gtk_box_pack_start (GTK_BOX (private->fixed_aspect_hbox),
private->aspect_button_box, FALSE, FALSE, 0); private->aspect_button_box, FALSE, FALSE, 0);
gtk_widget_show (private->aspect_button_box); gtk_widget_show (private->aspect_button_box);
...@@ -992,8 +992,8 @@ gimp_rectangle_options_gui (GimpToolOptions *tool_options) ...@@ -992,8 +992,8 @@ gimp_rectangle_options_gui (GimpToolOptions *tool_options)
private->size_history); private->size_history);
private->size_button_box = private->size_button_box =
gimp_prop_enum_stock_box_new (G_OBJECT (entry), gimp_prop_enum_icon_box_new (G_OBJECT (entry),
"aspect", "gimp", -1, -1); "aspect", "gimp", -1, -1);
gtk_box_pack_start (GTK_BOX (private->fixed_size_hbox), gtk_box_pack_start (GTK_BOX (private->fixed_size_hbox),
private->size_button_box, FALSE, FALSE, 0); private->size_button_box, FALSE, FALSE, 0);
gtk_widget_show (private->size_button_box); gtk_widget_show (private->size_button_box);
......
...@@ -219,8 +219,8 @@ gimp_selection_options_gui (GimpToolOptions *tool_options) ...@@ -219,8 +219,8 @@ gimp_selection_options_gui (GimpToolOptions *tool_options)
gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0); gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
gtk_widget_show (label); gtk_widget_show (label);
box = gimp_prop_enum_stock_box_new (config, "operation", box = gimp_prop_enum_icon_box_new (config, "operation",
"gimp-selection", 0, 0); "gimp-selection", 0, 0);
gtk_box_pack_start (GTK_BOX (hbox), box, FALSE, FALSE, 0); gtk_box_pack_start (GTK_BOX (hbox), box, FALSE, FALSE, 0);
gtk_widget_show (box); gtk_widget_show (box);
......
...@@ -566,7 +566,7 @@ gimp_text_options_gui (GimpToolOptions *tool_options) ...@@ -566,7 +566,7 @@ gimp_text_options_gui (GimpToolOptions *tool_options)
button, 1, TRUE); button, 1, TRUE);
gtk_size_group_add_widget (size_group, button); gtk_size_group_add_widget (size_group, button);
box = gimp_prop_enum_stock_box_new (config, "justify", "gtk-justify", 0, 0); box = gimp_prop_enum_icon_box_new (config, "justify", "gtk-justify", 0, 0);
gimp_table_attach_aligned (GTK_TABLE (table), 0, row++, gimp_table_attach_aligned (GTK_TABLE (table), 0, row++,
_("Justify:"), 0.0, 0.5, _("Justify:"), 0.0, 0.5,
box, 2, TRUE); box, 2, TRUE);
......
...@@ -199,9 +199,9 @@ gimp_threshold_tool_dialog (GimpImageMapTool *image_map_tool) ...@@ -199,9 +199,9 @@ gimp_threshold_tool_dialog (GimpImageMapTool *image_map_tool)
gtk_box_pack_start (GTK_BOX (main_vbox), hbox, FALSE, FALSE, 0); gtk_box_pack_start (GTK_BOX (main_vbox), hbox, FALSE, FALSE, 0);
gtk_widget_show (hbox); gtk_widget_show (hbox);
menu = gimp_prop_enum_stock_box_new (G_OBJECT (tool_options), menu = gimp_prop_enum_icon_box_new (G_OBJECT (tool_options),
"histogram-scale", "gimp-histogram", "histogram-scale", "gimp-histogram",
0, 0); 0, 0);
gtk_box_pack_end (GTK_BOX (hbox), menu, FALSE, FALSE, 0); gtk_box_pack_end (GTK_BOX (hbox), menu, FALSE, FALSE, 0);
gtk_widget_show (menu); gtk_widget_show (menu);
......
...@@ -388,7 +388,7 @@ gimp_transform_options_gui (GimpToolOptions *tool_options) ...@@ -388,7 +388,7 @@ gimp_transform_options_gui (GimpToolOptions *tool_options)
gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0); gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
gtk_widget_show (label); gtk_widget_show (label);
box = gimp_prop_enum_stock_box_new (config, "type", "gimp", 0, 0); box = gimp_prop_enum_icon_box_new (config, "type", "gimp", 0, 0);
gtk_box_pack_start (GTK_BOX (hbox), box, FALSE, FALSE, 0); gtk_box_pack_start (GTK_BOX (hbox), box, FALSE, FALSE, 0);
gtk_widget_show (box); gtk_widget_show (box);
......
...@@ -141,12 +141,12 @@ gimp_brush_editor_init (GimpBrushEditor *editor) ...@@ -141,12 +141,12 @@ gimp_brush_editor_init (GimpBrushEditor *editor)
gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0); gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
gtk_widget_show (label); gtk_widget_show (label);
box = gimp_enum_stock_box_new (GIMP_TYPE_BRUSH_GENERATED_SHAPE, box = gimp_enum_icon_box_new (GIMP_TYPE_BRUSH_GENERATED_SHAPE,
"gimp-shape", "gimp-shape",
GTK_ICON_SIZE_MENU, GTK_ICON_SIZE_MENU,
G_CALLBACK (gimp_brush_editor_update_shape), G_CALLBACK (gimp_brush_editor_update_shape),
editor, editor,
&editor->shape_group); &editor->shape_group);
gtk_box_pack_start (GTK_BOX (hbox), box, FALSE, FALSE, 0); gtk_box_pack_start (GTK_BOX (hbox), box, FALSE, FALSE, 0);
gtk_widget_show (box); gtk_widget_show (box);
......
...@@ -464,8 +464,8 @@ gimp_device_info_editor_constructed (GObject *object) ...@@ -464,8 +464,8 @@ gimp_device_info_editor_constructed (GObject *object)
combo = gimp_prop_enum_combo_box_new (G_OBJECT (curve), combo = gimp_prop_enum_combo_box_new (G_OBJECT (curve),
"curve-type", 0, 0); "curve-type", 0, 0);
gimp_enum_combo_box_set_stock_prefix (GIMP_ENUM_COMBO_BOX (combo), gimp_enum_combo_box_set_icon_prefix (GIMP_ENUM_COMBO_BOX (combo),
"gimp-curve"); "gimp-curve");
gtk_box_pack_start (GTK_BOX (hbox), combo, TRUE, TRUE, 0); gtk_box_pack_start (GTK_BOX (hbox), combo, TRUE, TRUE, 0);
gtk_widget_show (combo); gtk_widget_show (combo);
......
...@@ -538,9 +538,9 @@ gimp_editor_add_icon_box (GimpEditor *editor, ...@@ -538,9 +538,9 @@ gimp_editor_add_icon_box (GimpEditor *editor,
button_icon_size = gimp_editor_ensure_button_box (editor, &button_relief); button_icon_size = gimp_editor_ensure_button_box (editor, &button_relief);
hbox = gimp_enum_stock_box_new (enum_type, icon_prefix, button_icon_size, hbox = gimp_enum_icon_box_new (enum_type, icon_prefix, button_icon_size,
callback, callback_data, callback, callback_data,
&first_button); &first_button);
children = gtk_container_get_children (GTK_CONTAINER (hbox)); children = gtk_container_get_children (GTK_CONTAINER (hbox));
......
...@@ -125,8 +125,8 @@ gimp_histogram_editor_init (GimpHistogramEditor *editor) ...@@ -125,8 +125,8 @@ gimp_histogram_editor_init (GimpHistogramEditor *editor)
editor->menu = menu = gimp_prop_enum_combo_box_new (G_OBJECT (view), editor->menu = menu = gimp_prop_enum_combo_box_new (G_OBJECT (view),
"histogram-channel", "histogram-channel",
0, 0); 0, 0);
gimp_enum_combo_box_set_stock_prefix (GIMP_ENUM_COMBO_BOX (menu), gimp_enum_combo_box_set_icon_prefix (GIMP_ENUM_COMBO_BOX (menu),
"gimp-channel"); "gimp-channel");
gimp_int_combo_box_set_sensitivity (GIMP_INT_COMBO_BOX (editor->menu), gimp_int_combo_box_set_sensitivity (GIMP_INT_COMBO_BOX (editor->menu),
gimp_histogram_menu_sensitivity, gimp_histogram_menu_sensitivity,
editor, NULL); editor, NULL);
...@@ -135,9 +135,9 @@ gimp_histogram_editor_init (GimpHistogramEditor *editor) ...@@ -135,9 +135,9 @@ gimp_histogram_editor_init (GimpHistogramEditor *editor)
gtk_box_pack_start (GTK_BOX (hbox), menu, FALSE, FALSE, 0); gtk_box_pack_start (GTK_BOX (hbox), menu, FALSE, FALSE, 0);
gtk_widget_show (menu); gtk_widget_show (menu);
menu = gimp_prop_enum_stock_box_new (G_OBJECT (view), menu = gimp_prop_enum_icon_box_new (G_OBJECT (view),
"histogram-scale", "gimp-histogram", "histogram-scale", "gimp-histogram",
0, 0); 0, 0);
gtk_box_pack_end (GTK_BOX (hbox), menu, FALSE, FALSE, 0); gtk_box_pack_end (GTK_BOX (hbox), menu, FALSE, FALSE, 0);
gtk_widget_show (menu); gtk_widget_show (menu);
......
...@@ -154,14 +154,14 @@ gimp_stroke_editor_constructed (GObject *object) ...@@ -154,14 +154,14 @@ gimp_stroke_editor_constructed (GObject *object)
gtk_container_add (GTK_CONTAINER (frame), table); gtk_container_add (GTK_CONTAINER (frame), table);
gtk_widget_show (table); gtk_widget_show (table);
box = gimp_prop_enum_stock_box_new (G_OBJECT (options), "cap-style", box = gimp_prop_enum_icon_box_new (G_OBJECT (options), "cap-style",
"gimp-cap", 0, 0); "gimp-cap", 0, 0);
gimp_table_attach_aligned (GTK_TABLE (table), 0, row++, gimp_table_attach_aligned (GTK_TABLE (table), 0, row++,
_("_Cap style:"), 0.0, 0.5, _("_Cap style:"), 0.0, 0.5,
box, 2, TRUE); box, 2, TRUE);
box = gimp_prop_enum_stock_box_new (G_OBJECT (options), "join-style", box = gimp_prop_enum_icon_box_new (G_OBJECT (options), "join-style",
"gimp-join", 0, 0); "gimp-join", 0, 0);
gimp_table_attach_aligned (GTK_TABLE (table), 0, row++, gimp_table_attach_aligned (GTK_TABLE (table), 0, row++,
_("_Join style:"), 0.0, 0.5, _("_Join style:"), 0.0, 0.5,
box, 2, TRUE); box, 2, TRUE);
......
...@@ -232,11 +232,11 @@ gimp_template_editor_constructed (GObject *object) ...@@ -232,11 +232,11 @@ gimp_template_editor_constructed (GObject *object)
gtk_box_pack_start (GTK_BOX (hbox), vbox, FALSE, FALSE, 0); gtk_box_pack_start (GTK_BOX (hbox), vbox, FALSE, FALSE, 0);
gtk_widget_show (vbox); gtk_widget_show (vbox);
aspect_box = gimp_enum_stock_box_new (GIMP_TYPE_ASPECT_TYPE, aspect_box = gimp_enum_icon_box_new (GIMP_TYPE_ASPECT_TYPE,
"gimp", GTK_ICON_SIZE_MENU, "gimp", GTK_ICON_SIZE_MENU,
G_CALLBACK (gimp_template_editor_aspect_callback), G_CALLBACK (gimp_template_editor_aspect_callback),
editor, editor,
&private->aspect_button); &private->aspect_button);
gtk_widget_hide (private->aspect_button); /* hide "square" */ gtk_widget_hide (private->aspect_button); /* hide "square" */
gtk_box_pack_start (GTK_BOX (vbox), aspect_box, FALSE, FALSE, 0); gtk_box_pack_start (GTK_BOX (vbox), aspect_box, FALSE, FALSE, 0);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment