gimp r25688 - in trunk: . app/dialogs app/tools app/widgets

[mitch svn gnome org]

Author: mitch
Date: Sat May 17 14:29:25 2008
New Revision: 25688
URL: http://svn.gnome.org/viewvc/gimp?rev=25688&view=rev

Log:
2008-05-17  Michael Natterer  <mitch gimp org>

	* app/widgets/gimpwidgets-constructors.[ch]: add new function
	gimp_stock_button_new() which creates a button with icon and label
	which is *not* the stock_id's label.

	* app/dialogs/preferences-dialog.c (prefs_button_add)
	* app/tools/gimplevelstool.c (gimp_levels_tool_dialog): use it.



Modified:
   trunk/ChangeLog
   trunk/app/dialogs/preferences-dialog.c
   trunk/app/tools/gimplevelstool.c
   trunk/app/widgets/gimpwidgets-constructors.c
   trunk/app/widgets/gimpwidgets-constructors.h

Modified: trunk/app/dialogs/preferences-dialog.c
==============================================================================
--- trunk/app/dialogs/preferences-dialog.c	(original)
+++ trunk/app/dialogs/preferences-dialog.c	Sat May 17 14:29:25 2008
@@ -49,6 +49,7 @@
 #include "widgets/gimpprofilechooserdialog.h"
 #include "widgets/gimppropwidgets.h"
 #include "widgets/gimptemplateeditor.h"
+#include "widgets/gimpwidgets-constructors.h"
 #include "widgets/gimpwidgets-utils.h"
 
 #include "menus/menus.h"
@@ -1070,25 +1071,8 @@
                   GtkBox      *box)
 {
   GtkWidget *button;
-  GtkWidget *hbox;
-  GtkWidget *image;
-  GtkWidget *lab;
-
-  button = gtk_button_new ();
-
-  hbox = gtk_hbox_new (FALSE, 6);
-  gtk_container_add (GTK_CONTAINER (button), hbox);
-  gtk_widget_show (hbox);
-
-  image = gtk_image_new_from_stock (stock_id, GTK_ICON_SIZE_BUTTON);
-  gtk_box_pack_start (GTK_BOX (hbox), image, FALSE, FALSE, 0);
-  gtk_widget_show (image);
-
-  lab = gtk_label_new_with_mnemonic (label);
-  gtk_label_set_mnemonic_widget (GTK_LABEL (lab), button);
-  gtk_box_pack_start (GTK_BOX (hbox), lab, TRUE, TRUE, 0);
-  gtk_widget_show (lab);
 
+  button = gimp_stock_button_new (stock_id, label);
   gtk_box_pack_start (GTK_BOX (box), button, FALSE, FALSE, 0);
   gtk_widget_show (button);
 

Modified: trunk/app/tools/gimplevelstool.c
==============================================================================
--- trunk/app/tools/gimplevelstool.c	(original)
+++ trunk/app/tools/gimplevelstool.c	Sat May 17 14:29:25 2008
@@ -45,6 +45,7 @@
 #include "widgets/gimphandlebar.h"
 #include "widgets/gimphelp-ids.h"
 #include "widgets/gimphistogramview.h"
+#include "widgets/gimpwidgets-constructors.h"
 
 #include "display/gimpdisplay.h"
 
@@ -680,9 +681,8 @@
                     G_CALLBACK (gimp_levels_tool_dialog_unmap),
                     tool);
 
-  button = gtk_button_new_from_stock (GIMP_STOCK_TOOL_LEVELS);
-  gtk_button_set_label (GTK_BUTTON (button),
-                        _("Edit this Settings as Curves"));
+  button = gimp_stock_button_new (GIMP_STOCK_TOOL_LEVELS,
+                                  _("Edit this Settings as Curves"));
   gtk_box_pack_start (GTK_BOX (image_map_tool->main_vbox), button,
                       FALSE, FALSE, 0);
   gtk_widget_show (button);

Modified: trunk/app/widgets/gimpwidgets-constructors.c
==============================================================================
--- trunk/app/widgets/gimpwidgets-constructors.c	(original)
+++ trunk/app/widgets/gimpwidgets-constructors.c	Sat May 17 14:29:25 2008
@@ -173,6 +173,33 @@
   return combo;
 }
 
+GtkWidget *
+gimp_stock_button_new (const gchar *stock_id,
+                       const gchar *label)
+{
+  GtkWidget *button;
+  GtkWidget *hbox;
+  GtkWidget *image;
+  GtkWidget *lab;
+
+  button = gtk_button_new ();
+
+  hbox = gtk_hbox_new (FALSE, 6);
+  gtk_container_add (GTK_CONTAINER (button), hbox);
+  gtk_widget_show (hbox);
+
+  image = gtk_image_new_from_stock (stock_id, GTK_ICON_SIZE_BUTTON);
+  gtk_box_pack_start (GTK_BOX (hbox), image, FALSE, FALSE, 0);
+  gtk_widget_show (image);
+
+  lab = gtk_label_new_with_mnemonic (label);
+  gtk_label_set_mnemonic_widget (GTK_LABEL (lab), button);
+  gtk_box_pack_start (GTK_BOX (hbox), lab, TRUE, TRUE, 0);
+  gtk_widget_show (lab);
+
+  return button;
+}
+
 
 /*  private functions  */
 

Modified: trunk/app/widgets/gimpwidgets-constructors.h
==============================================================================
--- trunk/app/widgets/gimpwidgets-constructors.h	(original)
+++ trunk/app/widgets/gimpwidgets-constructors.h	Sat May 17 14:29:25 2008
@@ -20,8 +20,11 @@
 #define __GIMP_WIDGETS_CONSTRUCTORS_H__
 
 
-GtkWidget * gimp_paint_mode_menu_new (gboolean with_behind_mode,
-                                      gboolean with_replace_modes);
+GtkWidget * gimp_paint_mode_menu_new (gboolean     with_behind_mode,
+                                      gboolean     with_replace_modes);
+
+GtkWidget * gimp_stock_button_new    (const gchar *stock_id,
+                                      const gchar *label);
 
 
 #endif  /*  __GIMP_WIDGETS_CONSTRUCTORS_H__  */