GNOME.org
 

[gimp] app: use the newly added libgimpwidgets icon name APIs

commit 17167594ea29cd37b1be1c6eb2a2736744486638
Author: Michael Natterer <mitch gimp org>
Date:   Wed May 7 21:30:06 2014 +0200

    app: use the newly added libgimpwidgets icon name APIs

 app/tools/gimpblendoptions.c       |    4 ++--
 app/tools/gimpcurvestool.c         |   14 +++++++-------
 app/tools/gimpflipoptions.c        |    2 +-
 app/tools/gimpinkoptions-gui.c     |    4 ++--
 app/tools/gimplevelstool.c         |   10 +++++-----
 app/tools/gimpmoveoptions.c        |    2 +-
 app/tools/gimprectangleoptions.c   |    8 ++++----
 app/tools/gimpselectionoptions.c   |    4 ++--
 app/tools/gimptextoptions.c        |    2 +-
 app/tools/gimpthresholdtool.c      |    6 +++---
 app/tools/gimptransformoptions.c   |    2 +-
 app/widgets/gimpbrusheditor.c      |   12 ++++++------
 app/widgets/gimpdeviceinfoeditor.c |    4 ++--
 app/widgets/gimpeditor.c           |    6 +++---
 app/widgets/gimphistogrameditor.c  |   10 +++++-----
 app/widgets/gimpstrokeeditor.c     |    8 ++++----
 app/widgets/gimptemplateeditor.c   |   10 +++++-----
 17 files changed, 54 insertions(+), 54 deletions(-)
---
diff --git a/app/tools/gimpblendoptions.c b/app/tools/gimpblendoptions.c
index a773b3b..35983f5 100644
--- a/app/tools/gimpblendoptions.c
+++ b/app/tools/gimpblendoptions.c
@@ -220,8 +220,8 @@ gimp_blend_options_gui (GimpToolOptions *tool_options)
   combo = gimp_prop_enum_combo_box_new (config, "gradient-type", 0, 0);
   gimp_int_combo_box_set_label (GIMP_INT_COMBO_BOX (combo), _("Shape"));
   g_object_set (combo, "ellipsize", PANGO_ELLIPSIZE_END, NULL);
-  gimp_enum_combo_box_set_stock_prefix (GIMP_ENUM_COMBO_BOX (combo),
-                                        "gimp-gradient");
+  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);
 
diff --git a/app/tools/gimpcurvestool.c b/app/tools/gimpcurvestool.c
index eb0362a..840627a 100644
--- a/app/tools/gimpcurvestool.c
+++ b/app/tools/gimpcurvestool.c
@@ -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),
                                  config->channel);
-  gimp_enum_combo_box_set_stock_prefix (GIMP_ENUM_COMBO_BOX (tool->channel_menu),
-                                        "gimp-channel");
+  gimp_enum_combo_box_set_icon_prefix (GIMP_ENUM_COMBO_BOX (tool->channel_menu),
+                                       "gimp-channel");
   gtk_box_pack_start (GTK_BOX (hbox), tool->channel_menu, FALSE, FALSE, 0);
   gtk_widget_show (tool->channel_menu);
 
@@ -455,9 +455,9 @@ gimp_curves_tool_dialog (GimpImageMapTool *image_map_tool)
                     tool);
 
   /*  The histogram scale radio buttons  */
-  hbox2 = gimp_prop_enum_stock_box_new (G_OBJECT (tool_options),
-                                        "histogram-scale", "gimp-histogram",
-                                        0, 0);
+  hbox2 = gimp_prop_enum_icon_box_new (G_OBJECT (tool_options),
+                                       "histogram-scale", "gimp-histogram",
+                                       0, 0);
   gtk_box_pack_end (GTK_BOX (hbox), hbox2, FALSE, FALSE, 0);
   gtk_widget_show (hbox2);
 
@@ -545,8 +545,8 @@ gimp_curves_tool_dialog (GimpImageMapTool *image_map_tool)
   gtk_widget_show (label);
 
   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-curve");
+  gimp_enum_combo_box_set_icon_prefix (GIMP_ENUM_COMBO_BOX (combo),
+                                       "gimp-curve");
   gimp_int_combo_box_connect (GIMP_INT_COMBO_BOX (combo), 0,
                               G_CALLBACK (curves_curve_type_callback),
                               tool);
diff --git a/app/tools/gimpflipoptions.c b/app/tools/gimpflipoptions.c
index c40496a..0f7b1d8 100644
--- a/app/tools/gimpflipoptions.c
+++ b/app/tools/gimpflipoptions.c
@@ -135,7 +135,7 @@ gimp_flip_options_gui (GimpToolOptions *tool_options)
   gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
   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_widget_show (box);
 
diff --git a/app/tools/gimpinkoptions-gui.c b/app/tools/gimpinkoptions-gui.c
index c054288..86d5bd2 100644
--- a/app/tools/gimpinkoptions-gui.c
+++ b/app/tools/gimpinkoptions-gui.c
@@ -116,8 +116,8 @@ gimp_ink_options_gui (GimpToolOptions *tool_options)
   size_group = gtk_size_group_new (GTK_SIZE_GROUP_VERTICAL);
 
   /* Blob type radiobuttons */
-  blob_box = gimp_prop_enum_stock_box_new (config, "blob-type",
-                                           "gimp-shape", 0, 0);
+  blob_box = gimp_prop_enum_icon_box_new (config, "blob-type",
+                                          "gimp-shape", 0, 0);
   gtk_orientable_set_orientation (GTK_ORIENTABLE (blob_box),
                                   GTK_ORIENTATION_VERTICAL);
   gtk_box_pack_start (GTK_BOX (hbox), blob_box, FALSE, FALSE, 0);
diff --git a/app/tools/gimplevelstool.c b/app/tools/gimplevelstool.c
index 6142e88..985f710 100644
--- a/app/tools/gimplevelstool.c
+++ b/app/tools/gimplevelstool.c
@@ -354,8 +354,8 @@ gimp_levels_tool_dialog (GimpImageMapTool *image_map_tool)
   g_signal_connect (menu, "changed",
                     G_CALLBACK (levels_channel_callback),
                     tool);
-  gimp_enum_combo_box_set_stock_prefix (GIMP_ENUM_COMBO_BOX (menu),
-                                        "gimp-channel");
+  gimp_enum_combo_box_set_icon_prefix (GIMP_ENUM_COMBO_BOX (menu),
+                                       "gimp-channel");
   gtk_box_pack_start (GTK_BOX (hbox), menu, FALSE, FALSE, 0);
   gtk_widget_show (menu);
 
@@ -371,9 +371,9 @@ gimp_levels_tool_dialog (GimpImageMapTool *image_map_tool)
                     G_CALLBACK (levels_channel_reset_callback),
                     tool);
 
-  menu = gimp_prop_enum_stock_box_new (G_OBJECT (tool_options),
-                                       "histogram-scale", "gimp-histogram",
-                                       0, 0);
+  menu = gimp_prop_enum_icon_box_new (G_OBJECT (tool_options),
+                                      "histogram-scale", "gimp-histogram",
+                                      0, 0);
   gtk_box_pack_end (GTK_BOX (hbox), menu, FALSE, FALSE, 0);
   gtk_widget_show (menu);
 
diff --git a/app/tools/gimpmoveoptions.c b/app/tools/gimpmoveoptions.c
index b24c2d6..496a94b 100644
--- a/app/tools/gimpmoveoptions.c
+++ b/app/tools/gimpmoveoptions.c
@@ -180,7 +180,7 @@ gimp_move_options_gui (GimpToolOptions *tool_options)
   gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
   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_widget_show (box);
 
diff --git a/app/tools/gimprectangleoptions.c b/app/tools/gimprectangleoptions.c
index b8b6d54..b907350 100644
--- a/app/tools/gimprectangleoptions.c
+++ b/app/tools/gimprectangleoptions.c
@@ -922,8 +922,8 @@ gimp_rectangle_options_gui (GimpToolOptions *tool_options)
                                                    private->aspect_history);
 
     private->aspect_button_box =
-      gimp_prop_enum_stock_box_new (G_OBJECT (entry),
-                                    "aspect", "gimp", -1, -1);
+      gimp_prop_enum_icon_box_new (G_OBJECT (entry),
+                                   "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);
@@ -992,8 +992,8 @@ gimp_rectangle_options_gui (GimpToolOptions *tool_options)
                                                    private->size_history);
 
     private->size_button_box =
-      gimp_prop_enum_stock_box_new (G_OBJECT (entry),
-                                    "aspect", "gimp", -1, -1);
+      gimp_prop_enum_icon_box_new (G_OBJECT (entry),
+                                   "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);
diff --git a/app/tools/gimpselectionoptions.c b/app/tools/gimpselectionoptions.c
index 9406a54..d43b01e 100644
--- a/app/tools/gimpselectionoptions.c
+++ b/app/tools/gimpselectionoptions.c
@@ -219,8 +219,8 @@ gimp_selection_options_gui (GimpToolOptions *tool_options)
     gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
     gtk_widget_show (label);
 
-    box = gimp_prop_enum_stock_box_new (config, "operation",
-                                        "gimp-selection", 0, 0);
+    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);
 
diff --git a/app/tools/gimptextoptions.c b/app/tools/gimptextoptions.c
index 0211b51..c633429 100644
--- a/app/tools/gimptextoptions.c
+++ b/app/tools/gimptextoptions.c
@@ -566,7 +566,7 @@ gimp_text_options_gui (GimpToolOptions *tool_options)
                              button, 1, TRUE);
   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++,
                              _("Justify:"), 0.0, 0.5,
                              box, 2, TRUE);
diff --git a/app/tools/gimpthresholdtool.c b/app/tools/gimpthresholdtool.c
index b1073be..128c23b 100644
--- a/app/tools/gimpthresholdtool.c
+++ b/app/tools/gimpthresholdtool.c
@@ -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_widget_show (hbox);
 
-  menu = gimp_prop_enum_stock_box_new (G_OBJECT (tool_options),
-                                       "histogram-scale", "gimp-histogram",
-                                       0, 0);
+  menu = gimp_prop_enum_icon_box_new (G_OBJECT (tool_options),
+                                      "histogram-scale", "gimp-histogram",
+                                      0, 0);
   gtk_box_pack_end (GTK_BOX (hbox), menu, FALSE, FALSE, 0);
   gtk_widget_show (menu);
 
diff --git a/app/tools/gimptransformoptions.c b/app/tools/gimptransformoptions.c
index a13ae7a..ff607f9 100644
--- a/app/tools/gimptransformoptions.c
+++ b/app/tools/gimptransformoptions.c
@@ -388,7 +388,7 @@ gimp_transform_options_gui (GimpToolOptions *tool_options)
   gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
   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_widget_show (box);
 
diff --git a/app/widgets/gimpbrusheditor.c b/app/widgets/gimpbrusheditor.c
index 0355698..45184f2 100644
--- a/app/widgets/gimpbrusheditor.c
+++ b/app/widgets/gimpbrusheditor.c
@@ -141,12 +141,12 @@ gimp_brush_editor_init (GimpBrushEditor *editor)
   gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
   gtk_widget_show (label);
 
-  box = gimp_enum_stock_box_new (GIMP_TYPE_BRUSH_GENERATED_SHAPE,
-                                 "gimp-shape",
-                                 GTK_ICON_SIZE_MENU,
-                                 G_CALLBACK (gimp_brush_editor_update_shape),
-                                 editor,
-                                 &editor->shape_group);
+  box = gimp_enum_icon_box_new (GIMP_TYPE_BRUSH_GENERATED_SHAPE,
+                                "gimp-shape",
+                                GTK_ICON_SIZE_MENU,
+                                G_CALLBACK (gimp_brush_editor_update_shape),
+                                editor,
+                                &editor->shape_group);
   gtk_box_pack_start (GTK_BOX (hbox), box, FALSE, FALSE, 0);
   gtk_widget_show (box);
 
diff --git a/app/widgets/gimpdeviceinfoeditor.c b/app/widgets/gimpdeviceinfoeditor.c
index 2f1a673..8eaeb36 100644
--- a/app/widgets/gimpdeviceinfoeditor.c
+++ b/app/widgets/gimpdeviceinfoeditor.c
@@ -464,8 +464,8 @@ gimp_device_info_editor_constructed (GObject *object)
 
           combo = gimp_prop_enum_combo_box_new (G_OBJECT (curve),
                                                 "curve-type", 0, 0);
-          gimp_enum_combo_box_set_stock_prefix (GIMP_ENUM_COMBO_BOX (combo),
-                                                "gimp-curve");
+          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);
 
diff --git a/app/widgets/gimpeditor.c b/app/widgets/gimpeditor.c
index dd311aa..7a8132e 100644
--- a/app/widgets/gimpeditor.c
+++ b/app/widgets/gimpeditor.c
@@ -538,9 +538,9 @@ gimp_editor_add_icon_box (GimpEditor  *editor,
 
   button_icon_size = gimp_editor_ensure_button_box (editor, &button_relief);
 
-  hbox = gimp_enum_stock_box_new (enum_type, icon_prefix, button_icon_size,
-                                  callback, callback_data,
-                                  &first_button);
+  hbox = gimp_enum_icon_box_new (enum_type, icon_prefix, button_icon_size,
+                                 callback, callback_data,
+                                 &first_button);
 
   children = gtk_container_get_children (GTK_CONTAINER (hbox));
 
diff --git a/app/widgets/gimphistogrameditor.c b/app/widgets/gimphistogrameditor.c
index 5ee8272..eca4837 100644
--- a/app/widgets/gimphistogrameditor.c
+++ b/app/widgets/gimphistogrameditor.c
@@ -125,8 +125,8 @@ gimp_histogram_editor_init (GimpHistogramEditor *editor)
   editor->menu = menu = gimp_prop_enum_combo_box_new (G_OBJECT (view),
                                                       "histogram-channel",
                                                       0, 0);
-  gimp_enum_combo_box_set_stock_prefix (GIMP_ENUM_COMBO_BOX (menu),
-                                        "gimp-channel");
+  gimp_enum_combo_box_set_icon_prefix (GIMP_ENUM_COMBO_BOX (menu),
+                                       "gimp-channel");
   gimp_int_combo_box_set_sensitivity (GIMP_INT_COMBO_BOX (editor->menu),
                                       gimp_histogram_menu_sensitivity,
                                       editor, NULL);
@@ -135,9 +135,9 @@ gimp_histogram_editor_init (GimpHistogramEditor *editor)
   gtk_box_pack_start (GTK_BOX (hbox), menu, FALSE, FALSE, 0);
   gtk_widget_show (menu);
 
-  menu = gimp_prop_enum_stock_box_new (G_OBJECT (view),
-                                       "histogram-scale", "gimp-histogram",
-                                       0, 0);
+  menu = gimp_prop_enum_icon_box_new (G_OBJECT (view),
+                                      "histogram-scale", "gimp-histogram",
+                                      0, 0);
   gtk_box_pack_end (GTK_BOX (hbox), menu, FALSE, FALSE, 0);
   gtk_widget_show (menu);
 
diff --git a/app/widgets/gimpstrokeeditor.c b/app/widgets/gimpstrokeeditor.c
index 56d6637..0d710a5 100644
--- a/app/widgets/gimpstrokeeditor.c
+++ b/app/widgets/gimpstrokeeditor.c
@@ -154,14 +154,14 @@ gimp_stroke_editor_constructed (GObject *object)
   gtk_container_add (GTK_CONTAINER (frame), table);
   gtk_widget_show (table);
 
-  box = gimp_prop_enum_stock_box_new (G_OBJECT (options), "cap-style",
-                                      "gimp-cap", 0, 0);
+  box = gimp_prop_enum_icon_box_new (G_OBJECT (options), "cap-style",
+                                     "gimp-cap", 0, 0);
   gimp_table_attach_aligned (GTK_TABLE (table), 0, row++,
                              _("_Cap style:"), 0.0, 0.5,
                              box, 2, TRUE);
 
-  box = gimp_prop_enum_stock_box_new (G_OBJECT (options), "join-style",
-                                      "gimp-join", 0, 0);
+  box = gimp_prop_enum_icon_box_new (G_OBJECT (options), "join-style",
+                                     "gimp-join", 0, 0);
   gimp_table_attach_aligned (GTK_TABLE (table), 0, row++,
                              _("_Join style:"), 0.0, 0.5,
                              box, 2, TRUE);
diff --git a/app/widgets/gimptemplateeditor.c b/app/widgets/gimptemplateeditor.c
index e4343c5..83880e6 100644
--- a/app/widgets/gimptemplateeditor.c
+++ b/app/widgets/gimptemplateeditor.c
@@ -232,11 +232,11 @@ gimp_template_editor_constructed (GObject *object)
   gtk_box_pack_start (GTK_BOX (hbox), vbox, FALSE, FALSE, 0);
   gtk_widget_show (vbox);
 
-  aspect_box = gimp_enum_stock_box_new (GIMP_TYPE_ASPECT_TYPE,
-                                        "gimp", GTK_ICON_SIZE_MENU,
-                                        G_CALLBACK (gimp_template_editor_aspect_callback),
-                                        editor,
-                                        &private->aspect_button);
+  aspect_box = gimp_enum_icon_box_new (GIMP_TYPE_ASPECT_TYPE,
+                                       "gimp", GTK_ICON_SIZE_MENU,
+                                       G_CALLBACK (gimp_template_editor_aspect_callback),
+                                       editor,
+                                       &private->aspect_button);
   gtk_widget_hide (private->aspect_button); /* hide "square" */
 
   gtk_box_pack_start (GTK_BOX (vbox), aspect_box, FALSE, FALSE, 0);
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]