diff --git a/libgimp/gimpexport.c b/libgimp/gimpexport.c index b2455d1543..c05cf603d3 100644 --- a/libgimp/gimpexport.c +++ b/libgimp/gimpexport.c @@ -339,7 +339,7 @@ export_dialog (GSList *actions, NULL, NULL, NULL, TRUE, FALSE, _("Ignore"), export_skip_callback, NULL, NULL, NULL, FALSE, FALSE, - _("Cancel"), gtk_widget_destroy, + GTK_STOCK_CANCEL, gtk_widget_destroy, NULL, 1, NULL, FALSE, TRUE, NULL); diff --git a/libgimp/gimpprocbrowserdialog.c b/libgimp/gimpprocbrowserdialog.c index 15640f4f63..17ac50517a 100644 --- a/libgimp/gimpprocbrowserdialog.c +++ b/libgimp/gimpprocbrowserdialog.c @@ -148,9 +148,9 @@ gimp_db_browser (GimpDBBrowserApplyCallback apply_callback) dbbrowser, NULL, &dbbrowser->name_button, TRUE, FALSE, _("Search by Blurb"), dialog_search_callback, dbbrowser, NULL, &dbbrowser->blurb_button, FALSE, FALSE, - _("Apply"), dialog_apply_callback, + GTK_STOCK_APPLY, dialog_apply_callback, dbbrowser, NULL, NULL, FALSE, FALSE, - _("Close"), dialog_close_callback, + GTK_STOCK_CLOSE, dialog_close_callback, dbbrowser, NULL, NULL, FALSE, TRUE, NULL); @@ -167,7 +167,7 @@ gimp_db_browser (GimpDBBrowserApplyCallback apply_callback) dbbrowser, NULL, &dbbrowser->name_button, TRUE, FALSE, _("Search by Blurb"), dialog_search_callback, dbbrowser, NULL, &dbbrowser->blurb_button, FALSE, FALSE, - _("Close"), dialog_close_callback, + GTK_STOCK_CLOSE, dialog_close_callback, dbbrowser, NULL, NULL, FALSE, TRUE, NULL); diff --git a/libgimp/gimpprocview.c b/libgimp/gimpprocview.c index 15640f4f63..17ac50517a 100644 --- a/libgimp/gimpprocview.c +++ b/libgimp/gimpprocview.c @@ -148,9 +148,9 @@ gimp_db_browser (GimpDBBrowserApplyCallback apply_callback) dbbrowser, NULL, &dbbrowser->name_button, TRUE, FALSE, _("Search by Blurb"), dialog_search_callback, dbbrowser, NULL, &dbbrowser->blurb_button, FALSE, FALSE, - _("Apply"), dialog_apply_callback, + GTK_STOCK_APPLY, dialog_apply_callback, dbbrowser, NULL, NULL, FALSE, FALSE, - _("Close"), dialog_close_callback, + GTK_STOCK_CLOSE, dialog_close_callback, dbbrowser, NULL, NULL, FALSE, TRUE, NULL); @@ -167,7 +167,7 @@ gimp_db_browser (GimpDBBrowserApplyCallback apply_callback) dbbrowser, NULL, &dbbrowser->name_button, TRUE, FALSE, _("Search by Blurb"), dialog_search_callback, dbbrowser, NULL, &dbbrowser->blurb_button, FALSE, FALSE, - _("Close"), dialog_close_callback, + GTK_STOCK_CLOSE, dialog_close_callback, dbbrowser, NULL, NULL, FALSE, TRUE, NULL); diff --git a/libgimpwidgets/gimppixmap.c b/libgimpwidgets/gimppixmap.c index e36a8a52f7..0870cd0ad7 100644 --- a/libgimpwidgets/gimppixmap.c +++ b/libgimpwidgets/gimppixmap.c @@ -58,7 +58,7 @@ gimp_pixmap_get_type (void) (GtkClassInitFunc) NULL }; - pixmap_type = gtk_type_unique (gtk_pixmap_get_type (), &pixmap_info); + pixmap_type = gtk_type_unique (GTK_TYPE_PIXMAP, &pixmap_info); } return pixmap_type; @@ -95,7 +95,7 @@ gimp_pixmap_new (gchar **xpm_data) { GimpPixmap *pixmap; - pixmap = gtk_type_new (gimp_pixmap_get_type ()); + pixmap = gtk_type_new (GIMP_TYPE_PIXMAP); gtk_pixmap_set_build_insensitive (GTK_PIXMAP (pixmap), TRUE); gimp_pixmap_set (pixmap, xpm_data); @@ -114,7 +114,6 @@ void gimp_pixmap_set (GimpPixmap *pixmap, gchar **xpm_data) { - g_return_if_fail (pixmap != NULL); g_return_if_fail (GIMP_IS_PIXMAP (pixmap)); pixmap->xpm_data = xpm_data; diff --git a/libgimpwidgets/gimppixmap.h b/libgimpwidgets/gimppixmap.h index d73ef6bbb0..31dd72a516 100644 --- a/libgimpwidgets/gimppixmap.h +++ b/libgimpwidgets/gimppixmap.h @@ -35,23 +35,26 @@ extern "C" { #define GIMP_PIXMAP_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_PIXMAP, GimpPixmapClass)) #define GIMP_IS_PIXMAP(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_PIXMAP)) #define GIMP_IS_PIXMAP_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_PIXMAP)) +#define GIMP_PIXMAP_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_PIXMAP, GimpPixmapClass)) typedef struct _GimpPixmapClass GimpPixmapClass; struct _GimpPixmap { - GtkPixmap pixmap; + GtkPixmap parent_instance; - gchar **xpm_data; + gchar **xpm_data; }; struct _GimpPixmapClass { - GtkPixmapClass parent_class; + GtkPixmapClass parent_class; }; -GtkType gimp_pixmap_get_type (void); + +GType gimp_pixmap_get_type (void); + GtkWidget * gimp_pixmap_new (gchar **xpm_data); void gimp_pixmap_set (GimpPixmap *pixmap, diff --git a/libgimpwidgets/gimpsizeentry.c b/libgimpwidgets/gimpsizeentry.c index 8a2d47d362..5df0c8bdfd 100644 --- a/libgimpwidgets/gimpsizeentry.c +++ b/libgimpwidgets/gimpsizeentry.c @@ -72,10 +72,11 @@ struct _GimpSizeEntryField }; -static void gimp_size_entry_destroy (GtkObject *object); static void gimp_size_entry_class_init (GimpSizeEntryClass *class); static void gimp_size_entry_init (GimpSizeEntry *gse); +static void gimp_size_entry_destroy (GtkObject *object); + static void gimp_size_entry_update_value (GimpSizeEntryField *gsef, gdouble value); static void gimp_size_entry_value_callback (GtkWidget *widget, @@ -95,24 +96,29 @@ static guint gimp_size_entry_signals[LAST_SIGNAL] = { 0 }; static GtkTableClass *parent_class = NULL; -static void -gimp_size_entry_destroy (GtkObject *object) +GType +gimp_size_entry_get_type (void) { - GimpSizeEntry *gse; + static GType gse_type = 0; - g_return_if_fail (GIMP_IS_SIZE_ENTRY (object)); - - gse = GIMP_SIZE_ENTRY (object); - - if (gse->fields) + if (! gse_type) { - g_slist_foreach (gse->fields, (GFunc) g_free, NULL); - g_slist_free (gse->fields); - gse->fields = NULL; - } + GtkTypeInfo gse_info = + { + "GimpSizeEntry", + sizeof (GimpSizeEntry), + sizeof (GimpSizeEntryClass), + (GtkClassInitFunc) gimp_size_entry_class_init, + (GtkObjectInitFunc) gimp_size_entry_init, + /* reserved_1 */ NULL, + /* reserved_2 */ NULL, + (GtkClassInitFunc) NULL + }; - if (GTK_OBJECT_CLASS (parent_class)->destroy) - GTK_OBJECT_CLASS (parent_class)->destroy (object); + gse_type = gtk_type_unique (GTK_TYPE_TABLE, &gse_info); + } + + return gse_type; } static void @@ -171,46 +177,41 @@ gimp_size_entry_init (GimpSizeEntry *gse) gse->update_policy = GIMP_SIZE_ENTRY_UPDATE_NONE; } -GType -gimp_size_entry_get_type (void) +static void +gimp_size_entry_destroy (GtkObject *object) { - static GType gse_type = 0; + GimpSizeEntry *gse; - if (! gse_type) + g_return_if_fail (GIMP_IS_SIZE_ENTRY (object)); + + gse = GIMP_SIZE_ENTRY (object); + + if (gse->fields) { - GtkTypeInfo gse_info = - { - "GimpSizeEntry", - sizeof (GimpSizeEntry), - sizeof (GimpSizeEntryClass), - (GtkClassInitFunc) gimp_size_entry_class_init, - (GtkObjectInitFunc) gimp_size_entry_init, - /* reserved_1 */ NULL, - /* reserved_2 */ NULL, - (GtkClassInitFunc) NULL - }; - - gse_type = gtk_type_unique (GTK_TYPE_TABLE, &gse_info); + g_slist_foreach (gse->fields, (GFunc) g_free, NULL); + g_slist_free (gse->fields); + gse->fields = NULL; } - - return gse_type; + + if (GTK_OBJECT_CLASS (parent_class)->destroy) + GTK_OBJECT_CLASS (parent_class)->destroy (object); } /** * gimp_size_entry_new: - * @number_of_fields: The number of input fields. - * @unit: The initial unit. - * @unit_format: A printf-like unit-format string (see #GimpUnitMenu). - * @menu_show_pixels: #TRUE if the unit menu shold contain an item for - * GIMP_UNIT_PIXEL (ignored if the @update_policy is not - * GIMP_SIZE_ENTRY_UPDATE_NONE). + * @number_of_fields: The number of input fields. + * @unit: The initial unit. + * @unit_format: A printf-like unit-format string (see #GimpUnitMenu). + * @menu_show_pixels: #TRUE if the unit menu shold contain an item for + * GIMP_UNIT_PIXEL (ignored if the @update_policy is not + * GIMP_SIZE_ENTRY_UPDATE_NONE). * @menu_show_percent: #TRUE if the unit menu shold contain an item for * GIMP_UNIT_PERCENT. - * @show_refval: #TRUE if you want an extra "refenence value" spinbutton per - input field. - * @spinbutton_usize: The minimal horizontal size of the #GtkSpinButton's. - * @update_policy: How the automatic pixel <-> real-world-unit calculations - * should be performed. + * @show_refval: #TRUE if you want an extra "refenence value" + * spinbutton per input field. + * @spinbutton_usize: The minimal horizontal size of the #GtkSpinButton's. + * @update_policy: How the automatic pixel <-> real-world-unit calculations + * should be performed. * * Creates a new #GimpSizeEntry widget. * @@ -239,8 +240,7 @@ gimp_size_entry_get_type (void) * of the #GimpUnitMenu to allow the caller to add labels or a #GimpChainButton. * * Returns: A Pointer to the new #GimpSizeEntry widget. - * - */ + **/ GtkWidget * gimp_size_entry_new (gint number_of_fields, GimpUnit unit, @@ -380,8 +380,7 @@ gimp_size_entry_new (gint number_of_fields, * as #TRUE in gimp_size_entry_new() you have to pass an additional * #GtkSpinButton to hold the reference value. If @show_refval was #FALSE, * @refval_spinbutton will be ignored. - * - */ + **/ void gimp_size_entry_add_field (GimpSizeEntry *gse, GtkSpinButton *value_spinbutton, @@ -389,17 +388,16 @@ gimp_size_entry_add_field (GimpSizeEntry *gse, { GimpSizeEntryField *gsef; - g_return_if_fail (gse != NULL); g_return_if_fail (GIMP_IS_SIZE_ENTRY (gse)); - g_return_if_fail (value_spinbutton != NULL); g_return_if_fail (GTK_IS_SPIN_BUTTON (value_spinbutton)); + if (gse->show_refval) { - g_return_if_fail (refval_spinbutton != NULL); g_return_if_fail (GTK_IS_SPIN_BUTTON (refval_spinbutton)); } gsef = g_new0 (GimpSizeEntryField, 1); + gse->fields = g_slist_prepend (gse->fields, gsef); gse->number_of_fields++; @@ -450,14 +448,14 @@ gimp_size_entry_add_field (GimpSizeEntry *gse, /** * gimp_size_entry_attach_label: - * @gse: The sizeentry you want to add a label to. - * @text: The text of the label. - * @row: The row where the label will be attached. - * @column: The column where the label will be attached. + * @gse: The sizeentry you want to add a label to. + * @text: The text of the label. + * @row: The row where the label will be attached. + * @column: The column where the label will be attached. * @alignment: The horizontal alignment of the label. * * Attaches a #GtkLabel to the #GimpSizeEntry (which is a #GtkTable). - */ + **/ void gimp_size_entry_attach_label (GimpSizeEntry *gse, const gchar *text, @@ -481,11 +479,11 @@ gimp_size_entry_attach_label (GimpSizeEntry *gse, /** * gimp_size_entry_set_resolution: - * @gse: The sizeentry you want to set a resolution for. - * @field: The index of the field you want to set the resolution for. + * @gse: The sizeentry you want to set a resolution for. + * @field: The index of the field you want to set the resolution for. * @resolution: The new resolution (in dpi) for the chosen @field. - * @keep_size: #TRUE if the @field's size in pixels should stay the same. - * #FALSE if the @field's size in units should stay the same. + * @keep_size: #TRUE if the @field's size in pixels should stay the same. + * #FALSE if the @field's size in units should stay the same. * * Sets the resolution (in dpi) for field # @field of the #GimpSizeEntry. * @@ -493,9 +491,8 @@ gimp_size_entry_attach_label (GimpSizeEntry *gse, * [#GIMP_MIN_RESOLUTION..#GIMP_MAX_RESOLUTION]. * * This function does nothing if the #GimpSizeEntryUpdatePolicy specified in - * gimp_size_entry_new() doesn't equal to GIMP_SIZE_ENTRY_UPDATE_SIZE. - * - */ + * gimp_size_entry_new() doesn't equal to #GIMP_SIZE_ENTRY_UPDATE_SIZE. + **/ void gimp_size_entry_set_resolution (GimpSizeEntry *gse, gint field, @@ -505,7 +502,6 @@ gimp_size_entry_set_resolution (GimpSizeEntry *gse, GimpSizeEntryField *gsef; gfloat val; - g_return_if_fail (gse != NULL); g_return_if_fail (GIMP_IS_SIZE_ENTRY (gse)); g_return_if_fail ((field >= 0) && (field < gse->number_of_fields)); @@ -527,7 +523,7 @@ gimp_size_entry_set_resolution (GimpSizeEntry *gse, /** * gimp_size_entry_set_size: - * @gse: The sizeentry you want to set a size for. + * @gse: The sizeentry you want to set a size for. * @field: The index of the field you want to set the size for. * @lower: The reference value which will be treated as 0%. * @upper: The reference value which will be treated as 100%. @@ -541,8 +537,7 @@ gimp_size_entry_set_resolution (GimpSizeEntry *gse, * * This function does nothing if the #GimpSizeEntryUpdatePolicy specified in * gimp_size_entry_new() doesn't equal to GIMP_SIZE_ENTRY_UPDATE_SIZE. - * - */ + **/ void gimp_size_entry_set_size (GimpSizeEntry *gse, gint field, @@ -551,7 +546,6 @@ gimp_size_entry_set_size (GimpSizeEntry *gse, { GimpSizeEntryField *gsef; - g_return_if_fail (gse != NULL); g_return_if_fail (GIMP_IS_SIZE_ENTRY (gse)); g_return_if_fail ((field >= 0) && (field < gse->number_of_fields)); g_return_if_fail (lower <= upper); @@ -566,7 +560,7 @@ gimp_size_entry_set_size (GimpSizeEntry *gse, /** * gimp_size_entry_set_value_boundaries: - * @gse: The sizeentry you want to set value boundaries for. + * @gse: The sizeentry you want to set value boundaries for. * @field: The index of the field you want to set value boundaries for. * @lower: The new lower boundary of the value of the chosen @field. * @upper: The new upper boundary of the value of the chosen @field. @@ -580,17 +574,15 @@ gimp_size_entry_set_size (GimpSizeEntry *gse, * NOTE: In most cases you won't be interested in these values because the * #GimpSizeEntry's purpose is to shield the programmer from unit * calculations. Use gimp_size_entry_set_refval_boundaries() instead. - * - */ + **/ void -gimp_size_entry_set_value_boundaries (GimpSizeEntry *gse, - gint field, - gdouble lower, - gdouble upper) +gimp_size_entry_set_value_boundaries (GimpSizeEntry *gse, + gint field, + gdouble lower, + gdouble upper) { GimpSizeEntryField *gsef; - g_return_if_fail (gse != NULL); g_return_if_fail (GIMP_IS_SIZE_ENTRY (gse)); g_return_if_fail ((field >= 0) && (field < gse->number_of_fields)); g_return_if_fail (lower <= upper); @@ -655,7 +647,7 @@ gimp_size_entry_set_value_boundaries (GimpSizeEntry *gse, /** * gimp_size_entry_get_value; - * @gse: The sizeentry you want to know a value of. + * @gse: The sizeentry you want to know a value of. * @field: The index of the filed you want to know the value of. * * Returns the value of field # @field of the #GimpSizeEntry. @@ -669,19 +661,17 @@ gimp_size_entry_set_value_boundaries (GimpSizeEntry *gse, * calculations. Use gimp_size_entry_get_refval() instead. * * Returns: The value of the chosen @field. - * - */ + **/ gdouble gimp_size_entry_get_value (GimpSizeEntry *gse, gint field) { GimpSizeEntryField *gsef; - g_return_val_if_fail (gse != NULL, 0); g_return_val_if_fail (GIMP_IS_SIZE_ENTRY (gse), 0); g_return_val_if_fail ((field >= 0) && (field < gse->number_of_fields), 0); - gsef = (GimpSizeEntryField*) g_slist_nth_data (gse->fields, field); + gsef = (GimpSizeEntryField *) g_slist_nth_data (gse->fields, field); return gsef->value; } @@ -737,7 +727,7 @@ gimp_size_entry_update_value (GimpSizeEntryField *gsef, /** * gimp_size_entry_set_value; - * @gse: The sizeentry you want to set a value for. + * @gse: The sizeentry you want to set a value for. * @field: The index of the field you want to set a value for. * @value: The new value for @field. * @@ -750,8 +740,7 @@ gimp_size_entry_update_value (GimpSizeEntryField *gsef, * NOTE: In most cases you won't be interested in this value because the * #GimpSizeEntry's purpose is to shield the programmer from unit * calculations. Use gimp_size_entry_set_refval() instead. - * - */ + **/ void gimp_size_entry_set_value (GimpSizeEntry *gse, gint field, @@ -759,11 +748,10 @@ gimp_size_entry_set_value (GimpSizeEntry *gse, { GimpSizeEntryField *gsef; - g_return_if_fail (gse != NULL); g_return_if_fail (GIMP_IS_SIZE_ENTRY (gse)); g_return_if_fail ((field >= 0) && (field < gse->number_of_fields)); - gsef = (GimpSizeEntryField*) g_slist_nth_data (gse->fields, field); + gsef = (GimpSizeEntryField *) g_slist_nth_data (gse->fields, field); value = CLAMP (value, gsef->min_value, gsef->max_value); @@ -780,7 +768,7 @@ gimp_size_entry_value_callback (GtkWidget *widget, GimpSizeEntryField *gsef; gdouble new_value; - gsef = (GimpSizeEntryField*) data; + gsef = (GimpSizeEntryField *) data; new_value = GTK_ADJUSTMENT (widget)->value; @@ -795,7 +783,7 @@ gimp_size_entry_value_callback (GtkWidget *widget, /** * gimp_size_entry_set_refval_boundaries: - * @gse: The sizeentry you want to set the reference value boundaries for. + * @gse: The sizeentry you want to set the reference value boundaries for. * @field: The index of the field you want to set the reference value * boundaries for. * @lower: The new lower boundary of the reference value of the chosen @field. @@ -806,8 +794,7 @@ gimp_size_entry_value_callback (GtkWidget *widget, * * The current reference value of the @field will be clamped to fit in the * @field's new boundaries. - * - */ + **/ void gimp_size_entry_set_refval_boundaries (GimpSizeEntry *gse, gint field, @@ -816,12 +803,11 @@ gimp_size_entry_set_refval_boundaries (GimpSizeEntry *gse, { GimpSizeEntryField *gsef; - g_return_if_fail (gse != NULL); g_return_if_fail (GIMP_IS_SIZE_ENTRY (gse)); g_return_if_fail ((field >= 0) && (field < gse->number_of_fields)); g_return_if_fail (lower <= upper); - gsef = (GimpSizeEntryField*) g_slist_nth_data (gse->fields, field); + gsef = (GimpSizeEntryField *) g_slist_nth_data (gse->fields, field); gsef->min_refval = lower; gsef->max_refval = upper; @@ -886,8 +872,8 @@ gimp_size_entry_set_refval_boundaries (GimpSizeEntry *gse, /** * gimp_size_entry_set_refval_digits: - * @gse: The sizeentry you want to set the reference value digits for. - * @field: The index of the field you want to set the reference value for. + * @gse: The sizeentry you want to set the reference value digits for. + * @field: The index of the field you want to set the reference value for. * @digits: The new number of decimal digits for the #GtkSpinButton which * displays @field's reference value. * @@ -895,10 +881,9 @@ gimp_size_entry_set_refval_boundaries (GimpSizeEntry *gse, * @digits. * * If you don't specify this value explicitly, the reference value's number - * of digits will equal to 0 for GIMP_SIZE_ENTRY_UPDATE_SIZE and to 2 for - * GIMP_SIZE_ENTRY_UPDATE_RESOLUTION. - * - */ + * of digits will equal to 0 for #GIMP_SIZE_ENTRY_UPDATE_SIZE and to 2 for + * #GIMP_SIZE_ENTRY_UPDATE_RESOLUTION. + **/ void gimp_size_entry_set_refval_digits (GimpSizeEntry *gse, gint field, @@ -906,7 +891,6 @@ gimp_size_entry_set_refval_digits (GimpSizeEntry *gse, { GimpSizeEntryField *gsef; - g_return_if_fail (gse != NULL); g_return_if_fail (GIMP_IS_SIZE_ENTRY (gse)); g_return_if_fail ((field >= 0) && (field < gse->number_of_fields)); g_return_if_fail ((digits >= 0) && (digits <= 6)); @@ -927,7 +911,7 @@ gimp_size_entry_set_refval_digits (GimpSizeEntry *gse, /** * gimp_size_entry_get_refval; - * @gse: The sizeentry you want to know a reference value of. + * @gse: The sizeentry you want to know a reference value of. * @field: The index of the field you want to know the reference value of. * * Returns the reference value for field # @field of the #GimpSizeEntry. @@ -937,8 +921,7 @@ gimp_size_entry_set_refval_digits (GimpSizeEntry *gse, * gimp_size_entry_new(). * * Returns: The reference value of the chosen @field. - * - */ + **/ gdouble gimp_size_entry_get_refval (GimpSizeEntry *gse, gint field) @@ -946,7 +929,6 @@ gimp_size_entry_get_refval (GimpSizeEntry *gse, GimpSizeEntryField *gsef; /* return 1.0 to avoid division by zero */ - g_return_val_if_fail (gse != NULL, 1.0); g_return_val_if_fail (GIMP_IS_SIZE_ENTRY (gse), 1.0); g_return_val_if_fail ((field >= 0) && (field < gse->number_of_fields), 1.0); @@ -1004,8 +986,8 @@ gimp_size_entry_update_refval (GimpSizeEntryField *gsef, /** * gimp_size_entry_set_refval; - * @gse: The sizeentry you want to set a reference value for. - * @field: The index of the field you want to set the reference value for. + * @gse: The sizeentry you want to set a reference value for. + * @field: The index of the field you want to set the reference value for. * @refval: The new reference value for @field. * * Sets the reference value for field # @field of the #GimpSizeEntry. @@ -1013,8 +995,7 @@ gimp_size_entry_update_refval (GimpSizeEntryField *gsef, * The @refval passed is either a distance in pixels or a resolution in dpi, * depending on which #GimpSizeEntryUpdatePolicy you chose in * gimp_size_entry_new(). - * - */ + **/ void gimp_size_entry_set_refval (GimpSizeEntry *gse, gint field, @@ -1022,11 +1003,10 @@ gimp_size_entry_set_refval (GimpSizeEntry *gse, { GimpSizeEntryField *gsef; - g_return_if_fail (gse != NULL); g_return_if_fail (GIMP_IS_SIZE_ENTRY (gse)); g_return_if_fail ((field >= 0) && (field < gse->number_of_fields)); - gsef = (GimpSizeEntryField*) g_slist_nth_data (gse->fields, field); + gsef = (GimpSizeEntryField *) g_slist_nth_data (gse->fields, field); refval = CLAMP (refval, gsef->min_refval, gsef->max_refval); @@ -1046,7 +1026,7 @@ gimp_size_entry_refval_callback (GtkWidget *widget, GimpSizeEntryField *gsef; gdouble new_refval; - gsef = (GimpSizeEntryField*) data; + gsef = (GimpSizeEntryField *) data; new_refval = GTK_ADJUSTMENT (widget)->value; @@ -1067,12 +1047,10 @@ gimp_size_entry_refval_callback (GtkWidget *widget, * #GimpUnitMenu. * * Returns: The sizeentry's unit. - * - */ + **/ GimpUnit gimp_size_entry_get_unit (GimpSizeEntry *gse) { - g_return_val_if_fail (gse != NULL, GIMP_UNIT_INCH); g_return_val_if_fail (GIMP_IS_SIZE_ENTRY (gse), GIMP_UNIT_INCH); return gse->unit; @@ -1132,20 +1110,18 @@ gimp_size_entry_update_unit (GimpSizeEntry *gse, /** * gimp_size_entry_set_unit: - * @gse: The sizeentry you want to change the unit for. + * @gse: The sizeentry you want to change the unit for. * @unit: The new unit. * * Sets the #GimpSizeEntry's unit. The reference value for all fields will * stay the same but the value in units or pixels per unit will change * according to which #GimpSizeEntryUpdatePolicy you chose in * gimp_size_entry_new(). - * - */ + **/ void gimp_size_entry_set_unit (GimpSizeEntry *gse, GimpUnit unit) { - g_return_if_fail (gse != NULL); g_return_if_fail (GIMP_IS_SIZE_ENTRY (gse)); g_return_if_fail (gse->menu_show_pixels || (unit != GIMP_UNIT_PIXEL)); g_return_if_fail (gse->menu_show_percent || (unit != GIMP_UNIT_PERCENT)); @@ -1170,14 +1146,12 @@ gimp_size_entry_unit_callback (GtkWidget *widget, * * This function is rather ugly and just a workaround for the fact that * it's impossible to implement gtk_widget_grab_focus() for a #GtkTable. - * - */ + **/ void gimp_size_entry_grab_focus (GimpSizeEntry *gse) { GimpSizeEntryField *gsef; - g_return_if_fail (gse != NULL); g_return_if_fail (GIMP_IS_SIZE_ENTRY (gse)); gsef = (GimpSizeEntryField*) gse->fields->data; diff --git a/libgimpwidgets/gimpsizeentry.h b/libgimpwidgets/gimpsizeentry.h index 3c85baa65f..e74082d60c 100644 --- a/libgimpwidgets/gimpsizeentry.h +++ b/libgimpwidgets/gimpsizeentry.h @@ -36,6 +36,8 @@ extern "C" { #define GIMP_SIZE_ENTRY_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_SIZE_ENTRY, GimpSizeEntryClass)) #define GIMP_IS_SIZE_ENTRY(obj) (G_TYPE_CHECK_INSTANCE_TYPE (obj, GIMP_TYPE_SIZE_ENTRY)) #define GIMP_IS_SIZE_ENTRY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_SIZE_ENTRY)) +#define GIMP_SIZE_ENTRY_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_SIZE_ENTRY, GimpSizeEntryClass)) + typedef struct _GimpSizeEntryClass GimpSizeEntryClass; @@ -43,7 +45,7 @@ typedef struct _GimpSizeEntryField GimpSizeEntryField; struct _GimpSizeEntry { - GtkTable table; + GtkTable parent_instance; GSList *fields; gint number_of_fields; @@ -59,16 +61,17 @@ struct _GimpSizeEntry struct _GimpSizeEntryClass { - GtkTableClass parent_class; + GtkTableClass parent_class; void (* value_changed) (GimpSizeEntry *gse); void (* refval_changed) (GimpSizeEntry *gse); void (* unit_changed) (GimpSizeEntry *gse); }; + /* For information look into the C source or the html documentation */ -GtkType gimp_size_entry_get_type (void); +GType gimp_size_entry_get_type (void); GtkWidget * gimp_size_entry_new (gint number_of_fields, GimpUnit unit, diff --git a/libgimpwidgets/gimpunitmenu.c b/libgimpwidgets/gimpunitmenu.c index e0f70fe0a8..4621d64d91 100644 --- a/libgimpwidgets/gimpunitmenu.c +++ b/libgimpwidgets/gimpunitmenu.c @@ -138,23 +138,22 @@ gimp_unit_menu_destroy (GtkObject *object) /** * gimp_unit_menu_new: - * @format: A printf-like format string which is used to create the unit - * strings. - * @unit: The initially selected unit. - * @show_pixels: #TRUE if the unit menu should contain an item for - * GIMP_UNIT_PIXEL. + * @format: A printf-like format string which is used to create the unit + * strings. + * @unit: The initially selected unit. + * @show_pixels: #TRUE if the unit menu should contain an item for + * GIMP_UNIT_PIXEL. * @show_percent: #TRUE in the unit menu should contain an item for * GIMP_UNIT_PERCENT. - * @show_custom: #TRUE if the unit menu should contain a "More..." item for - * opening the user-defined-unit selection dialog. + * @show_custom: #TRUE if the unit menu should contain a "More..." item for + * opening the user-defined-unit selection dialog. * * Creates a new #GimpUnitMenu widget. * * The @format string supports the following percent expansions: * * Returns: A pointer to the new #GimpUnitMenu widget. - * - */ + **/ GtkWidget * gimp_unit_menu_new (const gchar *format, GimpUnit unit, @@ -195,12 +194,13 @@ gimp_unit_menu_new (const gchar *format, gtk_menu_item_new_with_label (gimp_unit_menu_build_string (format, GIMP_UNIT_PERCENT)); gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); - g_signal_connect (G_OBJECT (menuitem), "activate", - G_CALLBACK (gimp_unit_menu_callback), - gum); g_object_set_data (G_OBJECT (menuitem), "gimp_unit_menu", (gpointer) GIMP_UNIT_PERCENT); gtk_widget_show (menuitem); + + g_signal_connect (G_OBJECT (menuitem), "activate", + G_CALLBACK (gimp_unit_menu_callback), + gum); } if (show_pixels || show_percent) @@ -215,12 +215,13 @@ gimp_unit_menu_new (const gchar *format, menuitem = gtk_menu_item_new_with_label (gimp_unit_menu_build_string (format, u)); gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); - g_signal_connect (G_OBJECT (menuitem), "activate", - G_CALLBACK (gimp_unit_menu_callback), - gum); g_object_set_data (G_OBJECT (menuitem), "gimp_unit_menu", (gpointer) u); gtk_widget_show (menuitem); + + g_signal_connect (G_OBJECT (menuitem), "activate", + G_CALLBACK (gimp_unit_menu_callback), + gum); } if ((unit >= gimp_unit_get_number_of_built_in_units ()) && @@ -234,12 +235,13 @@ gimp_unit_menu_new (const gchar *format, menuitem = gtk_menu_item_new_with_label (gimp_unit_menu_build_string (format, unit)); gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); - g_signal_connect (G_OBJECT (menuitem), "activate", - G_CALLBACK (gimp_unit_menu_callback), - gum); g_object_set_data (G_OBJECT (menuitem), "gimp_unit_menu", (gpointer) unit); gtk_widget_show (menuitem); + + g_signal_connect (G_OBJECT (menuitem), "activate", + G_CALLBACK (gimp_unit_menu_callback), + gum); } if (show_custom) @@ -252,12 +254,13 @@ gimp_unit_menu_new (const gchar *format, menuitem = gtk_menu_item_new_with_label (_("More...")); gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); - g_signal_connect (G_OBJECT (menuitem), "activate", - G_CALLBACK (gimp_unit_menu_callback), - gum); g_object_set_data (G_OBJECT (menuitem), "gimp_unit_menu", (gpointer) (GIMP_UNIT_PERCENT + 1)); gtk_widget_show (menuitem); + + g_signal_connect (G_OBJECT (menuitem), "activate", + G_CALLBACK (gimp_unit_menu_callback), + gum); } gtk_option_menu_set_menu (GTK_OPTION_MENU (gum), menu); @@ -277,12 +280,11 @@ gimp_unit_menu_new (const gchar *format, /** * gimp_unit_menu_set_unit: - * @gum: The unit menu you want to set the unit for. + * @gum: The unit menu you want to set the unit for. * @unit: The new unit. * * Sets a new #GimpUnit for the specified #GimpUnitMenu. - * - */ + **/ void gimp_unit_menu_set_unit (GimpUnitMenu *gum, GimpUnit unit) @@ -291,7 +293,6 @@ gimp_unit_menu_set_unit (GimpUnitMenu *gum, GList *items; gint user_unit; - g_return_if_fail (gum != NULL); g_return_if_fail (GIMP_IS_UNIT_MENU (gum)); g_return_if_fail (((unit >= GIMP_UNIT_PIXEL) && ((unit > GIMP_UNIT_PIXEL) || gum->show_pixels) && @@ -328,14 +329,15 @@ gimp_unit_menu_set_unit (GimpUnitMenu *gum, unit)); gtk_menu_shell_append (GTK_MENU_SHELL (GTK_OPTION_MENU (gum)->menu), menuitem); - g_signal_connect (G_OBJECT (menuitem), "activate", - G_CALLBACK (gimp_unit_menu_callback), - gum); g_object_set_data (G_OBJECT (menuitem), "gimp_unit_menu", (gpointer) unit); gtk_menu_reorder_child (GTK_MENU (GTK_OPTION_MENU (gum)->menu), menuitem, user_unit); gtk_widget_show (menuitem); + + g_signal_connect (G_OBJECT (menuitem), "activate", + G_CALLBACK (gimp_unit_menu_callback), + gum); } gum->unit = unit; @@ -358,12 +360,10 @@ gimp_unit_menu_set_unit (GimpUnitMenu *gum, * Returns the #GimpUnit the user has selected from the #GimpUnitMenu. * * Returns: The unit the user has selected. - * - */ + **/ GimpUnit gimp_unit_menu_get_unit (GimpUnitMenu *gum) { - g_return_val_if_fail (gum != NULL, GIMP_UNIT_INCH); g_return_val_if_fail (GIMP_IS_UNIT_MENU (gum), GIMP_UNIT_INCH); return gum->unit; diff --git a/libgimpwidgets/gimpunitmenu.h b/libgimpwidgets/gimpunitmenu.h index 3a52310ab5..cd71fdbf51 100644 --- a/libgimpwidgets/gimpunitmenu.h +++ b/libgimpwidgets/gimpunitmenu.h @@ -35,12 +35,14 @@ extern "C" { #define GIMP_UNIT_MENU_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_UNIT_MENU, GimpUnitMenuClass)) #define GIMP_IS_UNIT_MENU(obj) (G_TYPE_CHECK_INSTANCE_TYPE (obj, GIMP_TYPE_UNIT_MENU)) #define GIMP_IS_UNIT_MENU_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_UNIT_MENU)) +#define GIMP_UNIT_MENU_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_UNIT_MENU, GimpUnitMenuClass)) + typedef struct _GimpUnitMenuClass GimpUnitMenuClass; struct _GimpUnitMenu { - GtkOptionMenu optionmenu; + GtkOptionMenu parent_instance; /* public (read only) */ gchar *format; @@ -56,13 +58,13 @@ struct _GimpUnitMenu struct _GimpUnitMenuClass { - GtkOptionMenuClass parent_class; + GtkOptionMenuClass parent_class; void (* unit_changed) (GimpUnitMenu *gum); }; -GtkType gimp_unit_menu_get_type (void); +GType gimp_unit_menu_get_type (void); GtkWidget * gimp_unit_menu_new (const gchar *format, GimpUnit unit, diff --git a/modules/cdisplay_gamma.c b/modules/cdisplay_gamma.c index 60f466e08f..751122a13b 100644 --- a/modules/cdisplay_gamma.c +++ b/modules/cdisplay_gamma.c @@ -327,9 +327,9 @@ gamma_configure (gpointer cd_ID, GTK_WIN_POS_MOUSE, FALSE, TRUE, FALSE, - _("OK"), gamma_configure_ok_callback, + GTK_STOCK_OK, gamma_configure_ok_callback, cd_ID, NULL, NULL, TRUE, FALSE, - _("Cancel"), gamma_configure_cancel_callback, + GTK_STOCK_CANCEL, gamma_configure_cancel_callback, cd_ID, NULL, NULL, FALSE, TRUE, NULL); diff --git a/modules/cdisplay_highcontrast.c b/modules/cdisplay_highcontrast.c index 0bd0e83ae1..d318bd748c 100644 --- a/modules/cdisplay_highcontrast.c +++ b/modules/cdisplay_highcontrast.c @@ -320,9 +320,9 @@ contrast_configure (gpointer cd_ID, GTK_WIN_POS_MOUSE, FALSE, TRUE, FALSE, - _("OK"), contrast_configure_ok_callback, + GTK_STOCK_OK, contrast_configure_ok_callback, cd_ID, NULL, NULL, TRUE, FALSE, - _("Cancel"), contrast_configure_cancel_callback, + GTK_STOCK_CANCEL, contrast_configure_cancel_callback, cd_ID, NULL, NULL, FALSE, TRUE, NULL); diff --git a/plug-ins/common/AlienMap.c b/plug-ins/common/AlienMap.c index 160cd51b2a..fb91dce836 100644 --- a/plug-ins/common/AlienMap.c +++ b/plug-ins/common/AlienMap.c @@ -1394,11 +1394,11 @@ alienmap_dialog (void) GTK_WIN_POS_MOUSE, FALSE, TRUE, FALSE, - _("About"), alienmap_logo_dialog, + _("About..."), alienmap_logo_dialog, NULL, NULL, NULL, FALSE, FALSE, - _("OK"), dialog_ok_callback, + GTK_STOCK_OK, dialog_ok_callback, NULL, NULL, NULL, TRUE, FALSE, - _("Cancel"), gtk_widget_destroy, + GTK_STOCK_CANCEL, gtk_widget_destroy, NULL, 1, NULL, FALSE, TRUE, NULL); @@ -1660,7 +1660,7 @@ alienmap_logo_dialog (void) GTK_WIN_POS_MOUSE, FALSE, TRUE, FALSE, - _("OK"), gtk_widget_hide, + GTK_STOCK_CLOSE, gtk_widget_hide, NULL, 1, NULL, TRUE, TRUE, NULL); diff --git a/plug-ins/common/AlienMap2.c b/plug-ins/common/AlienMap2.c index 6769038bb6..840b1e2dc1 100644 --- a/plug-ins/common/AlienMap2.c +++ b/plug-ins/common/AlienMap2.c @@ -1386,11 +1386,11 @@ alienmap2_dialog (void) GTK_WIN_POS_MOUSE, FALSE, TRUE, FALSE, - _("About"), alienmap2_logo_dialog, + _("About..."), alienmap2_logo_dialog, NULL, NULL, NULL, FALSE, FALSE, - _("OK"), dialog_ok_callback, + GTK_STOCK_OK, dialog_ok_callback, NULL, NULL, NULL, TRUE, FALSE, - _("Cancel"), gtk_widget_destroy, + GTK_STOCK_CANCEL, gtk_widget_destroy, NULL, 1, NULL, FALSE, TRUE, NULL); @@ -1674,7 +1674,7 @@ alienmap2_logo_dialog (void) GTK_WIN_POS_MOUSE, FALSE, TRUE, FALSE, - _("OK"), gtk_widget_hide, + GTK_STOCK_CLOSE, gtk_widget_hide, NULL, 1, NULL, TRUE, TRUE, NULL); diff --git a/plug-ins/common/CML_explorer.c b/plug-ins/common/CML_explorer.c index d90aee7c25..ea08d88544 100644 --- a/plug-ins/common/CML_explorer.c +++ b/plug-ins/common/CML_explorer.c @@ -1173,9 +1173,9 @@ CML_explorer_dialog (void) GTK_WIN_POS_MOUSE, FALSE, TRUE, FALSE, - _("OK"), CML_explorer_ok_callback, + GTK_STOCK_OK, CML_explorer_ok_callback, NULL, NULL, NULL, TRUE, FALSE, - _("Cancel"), gtk_widget_destroy, + GTK_STOCK_CANCEL, gtk_widget_destroy, NULL, 1, NULL, FALSE, TRUE, NULL); @@ -1935,7 +1935,7 @@ function_graph_new (GtkWidget *widget, GTK_WIN_POS_MOUSE, FALSE, TRUE, FALSE, - _("OK"), gtk_widget_destroy, + GTK_STOCK_OK, gtk_widget_destroy, NULL, 1, NULL, TRUE, TRUE, NULL); @@ -2254,9 +2254,9 @@ force_overwrite (const gchar *filename) GTK_WIN_POS_MOUSE, FALSE, FALSE, FALSE, - _("OK"), CML_overwrite_ok_callback, + GTK_STOCK_OK, CML_overwrite_ok_callback, NULL, NULL, NULL, FALSE, FALSE, - _("Cancel"), gtk_widget_destroy, + GTK_STOCK_CANCEL, gtk_widget_destroy, NULL, 1, NULL, TRUE, TRUE, NULL); diff --git a/plug-ins/common/aa.c b/plug-ins/common/aa.c index 71f84ee347..3d08316e61 100644 --- a/plug-ins/common/aa.c +++ b/plug-ins/common/aa.c @@ -341,9 +341,9 @@ type_dialog (int selected) GTK_WIN_POS_MOUSE, FALSE, TRUE, FALSE, - _("OK"), gtk_widget_destroy, + GTK_STOCK_OK, gtk_widget_destroy, NULL, 1, NULL, TRUE, FALSE, - _("Cancel"), type_dialog_cancel_callback, + GTK_STOCK_CANCEL, type_dialog_cancel_callback, NULL, NULL, NULL, FALSE, TRUE, NULL); diff --git a/plug-ins/common/align_layers.c b/plug-ins/common/align_layers.c index cc4c590638..bb452bdd9e 100644 --- a/plug-ins/common/align_layers.c +++ b/plug-ins/common/align_layers.c @@ -422,9 +422,9 @@ align_layers_dialog (void) GTK_WIN_POS_MOUSE, FALSE, TRUE, FALSE, - _("OK"), align_layers_ok_callback, + GTK_STOCK_OK, align_layers_ok_callback, NULL, NULL, NULL, TRUE, FALSE, - _("Cancel"), gtk_widget_destroy, + GTK_STOCK_CANCEL, gtk_widget_destroy, NULL, 1, NULL, FALSE, TRUE, NULL); diff --git a/plug-ins/common/animationplay.c b/plug-ins/common/animationplay.c index c937b92aa5..dbaac3191d 100644 --- a/plug-ins/common/animationplay.c +++ b/plug-ins/common/animationplay.c @@ -670,7 +670,7 @@ build_dialog (GimpImageBaseType basetype, GTK_WIN_POS_MOUSE, FALSE, TRUE, FALSE, - _("Close"), window_close_callback, + GTK_STOCK_CLOSE, window_close_callback, NULL, 1, NULL, TRUE, TRUE, NULL); diff --git a/plug-ins/common/apply_lens.c b/plug-ins/common/apply_lens.c index 07e7daa0d1..99d59d48d8 100644 --- a/plug-ins/common/apply_lens.c +++ b/plug-ins/common/apply_lens.c @@ -393,9 +393,9 @@ lens_dialog (GimpDrawable *drawable) GTK_WIN_POS_MOUSE, FALSE, TRUE, FALSE, - _("OK"), lens_ok_callback, + GTK_STOCK_OK, lens_ok_callback, NULL, NULL, NULL, TRUE, FALSE, - _("Cancel"), gtk_widget_destroy, + GTK_STOCK_CANCEL, gtk_widget_destroy, NULL, 1, NULL, FALSE, TRUE, NULL); diff --git a/plug-ins/common/blinds.c b/plug-ins/common/blinds.c index 48ae515c93..5dec52c259 100644 --- a/plug-ins/common/blinds.c +++ b/plug-ins/common/blinds.c @@ -320,9 +320,9 @@ blinds_dialog (void) GTK_WIN_POS_MOUSE, FALSE, TRUE, FALSE, - _("OK"), blinds_ok_callback, + GTK_STOCK_OK, blinds_ok_callback, NULL, NULL, NULL, TRUE, FALSE, - _("Cancel"), gtk_widget_destroy, + GTK_STOCK_CANCEL, gtk_widget_destroy, NULL, 1, NULL, FALSE, TRUE, NULL); diff --git a/plug-ins/common/blur.c b/plug-ins/common/blur.c index 77c0de4dfa..492d457029 100644 --- a/plug-ins/common/blur.c +++ b/plug-ins/common/blur.c @@ -610,9 +610,9 @@ blur_dialog (void) GTK_WIN_POS_MOUSE, FALSE, TRUE, FALSE, - _("OK"), blur_ok_callback, + GTK_STOCK_OK, blur_ok_callback, NULL, NULL, NULL, TRUE, FALSE, - _("Cancel"), gtk_widget_destroy, + GTK_STOCK_CANCEL, gtk_widget_destroy, NULL, 1, NULL, FALSE, TRUE, NULL); diff --git a/plug-ins/common/borderaverage.c b/plug-ins/common/borderaverage.c index b68393fd70..f83950f738 100644 --- a/plug-ins/common/borderaverage.c +++ b/plug-ins/common/borderaverage.c @@ -372,9 +372,9 @@ borderaverage_dialog (void) GTK_WIN_POS_MOUSE, FALSE, TRUE, FALSE, - _("OK"), borderaverage_ok_callback, + GTK_STOCK_OK, borderaverage_ok_callback, NULL, NULL, NULL, TRUE, FALSE, - _("Cancel"), gtk_widget_destroy, + GTK_STOCK_CANCEL, gtk_widget_destroy, NULL, 1, NULL, FALSE, TRUE, NULL); diff --git a/plug-ins/common/bumpmap.c b/plug-ins/common/bumpmap.c index d0f67917ed..3bfd351423 100644 --- a/plug-ins/common/bumpmap.c +++ b/plug-ins/common/bumpmap.c @@ -854,9 +854,9 @@ bumpmap_dialog (void) GTK_WIN_POS_MOUSE, FALSE, TRUE, FALSE, - _("OK"), dialog_ok_callback, + GTK_STOCK_OK, dialog_ok_callback, NULL, NULL, NULL, TRUE, FALSE, - _("Cancel"), gtk_widget_destroy, + GTK_STOCK_CANCEL, gtk_widget_destroy, NULL, 1, NULL, FALSE, TRUE, NULL); diff --git a/plug-ins/common/checkerboard.c b/plug-ins/common/checkerboard.c index e9033245d1..ba6e1a055b 100644 --- a/plug-ins/common/checkerboard.c +++ b/plug-ins/common/checkerboard.c @@ -358,9 +358,9 @@ check_dialog (void) GTK_WIN_POS_MOUSE, FALSE, TRUE, FALSE, - _("OK"), check_ok_callback, + GTK_STOCK_OK, check_ok_callback, NULL, NULL, NULL, TRUE, FALSE, - _("Cancel"), gtk_widget_destroy, + GTK_STOCK_CANCEL, gtk_widget_destroy, NULL, 1, NULL, FALSE, TRUE, NULL); diff --git a/plug-ins/common/colorify.c b/plug-ins/common/colorify.c index 007c70f491..6c69ab0621 100644 --- a/plug-ins/common/colorify.c +++ b/plug-ins/common/colorify.c @@ -308,9 +308,9 @@ colorify_dialog (GimpRGB *color) GTK_WIN_POS_MOUSE, FALSE, TRUE, FALSE, - _("OK"), colorify_ok_callback, + GTK_STOCK_OK, colorify_ok_callback, NULL, NULL, NULL, TRUE, FALSE, - _("Cancel"), gtk_widget_destroy, + GTK_STOCK_CANCEL, gtk_widget_destroy, NULL, 1, NULL, FALSE, TRUE, NULL); diff --git a/plug-ins/common/colortoalpha.c b/plug-ins/common/colortoalpha.c index ba5a524615..3c9bbbc8e5 100644 --- a/plug-ins/common/colortoalpha.c +++ b/plug-ins/common/colortoalpha.c @@ -418,9 +418,9 @@ colortoalpha_dialog (GimpDrawable *drawable) GTK_WIN_POS_MOUSE, FALSE, TRUE, FALSE, - _("OK"), colortoalpha_ok_callback, + GTK_STOCK_OK, colortoalpha_ok_callback, NULL, NULL, NULL, TRUE, FALSE, - _("Cancel"), gtk_widget_destroy, + GTK_STOCK_CANCEL, gtk_widget_destroy, NULL, 1, NULL, FALSE, TRUE, NULL); diff --git a/plug-ins/common/compose.c b/plug-ins/common/compose.c index 3a417b5c3f..abe230d5f1 100644 --- a/plug-ins/common/compose.c +++ b/plug-ins/common/compose.c @@ -773,9 +773,9 @@ compose_dialog (gchar *compose_type, GTK_WIN_POS_MOUSE, FALSE, TRUE, FALSE, - _("OK"), compose_ok_callback, + GTK_STOCK_OK, compose_ok_callback, NULL, NULL, NULL, TRUE, FALSE, - _("Cancel"), gtk_widget_destroy, + GTK_STOCK_CANCEL, gtk_widget_destroy, NULL, 1, NULL, FALSE, TRUE, NULL); diff --git a/plug-ins/common/convmatrix.c b/plug-ins/common/convmatrix.c index 33dc15ff1c..2b3ee7d176 100644 --- a/plug-ins/common/convmatrix.c +++ b/plug-ins/common/convmatrix.c @@ -853,11 +853,11 @@ dialog (void) GTK_WIN_POS_MOUSE, FALSE, TRUE, FALSE, - _("OK"), ok_callback, + GTK_STOCK_OK, ok_callback, NULL, NULL, &my_widgets.ok, TRUE, FALSE, _("Reset"), defaults_callback, NULL, 1, NULL, FALSE, FALSE, - _("Cancel"), gtk_widget_destroy, + GTK_STOCK_CANCEL, gtk_widget_destroy, NULL, 1, NULL, FALSE, TRUE, NULL); diff --git a/plug-ins/common/csource.c b/plug-ins/common/csource.c index 1ffa11bc8d..29daa807ff 100644 --- a/plug-ins/common/csource.c +++ b/plug-ins/common/csource.c @@ -650,9 +650,9 @@ run_save_dialog (Config *config) GTK_WIN_POS_MOUSE, FALSE, TRUE, FALSE, - _("OK"), save_dialog_ok_callback, + GTK_STOCK_OK, save_dialog_ok_callback, NULL, NULL, NULL, TRUE, FALSE, - _("Cancel"), gtk_widget_destroy, + GTK_STOCK_CANCEL, gtk_widget_destroy, NULL, 1, NULL, FALSE, TRUE, NULL); diff --git a/plug-ins/common/cubism.c b/plug-ins/common/cubism.c index b4a237247a..0c2a59c113 100644 --- a/plug-ins/common/cubism.c +++ b/plug-ins/common/cubism.c @@ -318,9 +318,9 @@ cubism_dialog (void) GTK_WIN_POS_MOUSE, FALSE, TRUE, FALSE, - _("OK"), cubism_ok_callback, + GTK_STOCK_OK, cubism_ok_callback, NULL, NULL, NULL, TRUE, FALSE, - _("Cancel"), gtk_widget_destroy, + GTK_STOCK_CANCEL, gtk_widget_destroy, NULL, 1, NULL, FALSE, TRUE, NULL); diff --git a/plug-ins/common/curve_bend.c b/plug-ins/common/curve_bend.c index 8c6ed06aed..826c847675 100644 --- a/plug-ins/common/curve_bend.c +++ b/plug-ins/common/curve_bend.c @@ -1366,9 +1366,9 @@ bender_new_dialog (GimpDrawable *drawable) cd, NULL, NULL, FALSE, FALSE, _("Swap"), bender_swap_callback, cd, NULL, NULL, FALSE, FALSE, - _("OK"), bender_ok_callback, + GTK_STOCK_OK, bender_ok_callback, cd, NULL, NULL, TRUE, FALSE, - _("Cancel"), bender_cancel_callback, + GTK_STOCK_CANCEL, bender_cancel_callback, cd, NULL, NULL, FALSE, TRUE, NULL); diff --git a/plug-ins/common/decompose.c b/plug-ins/common/decompose.c index 5d2f4afa6d..ac578f1485 100644 --- a/plug-ins/common/decompose.c +++ b/plug-ins/common/decompose.c @@ -871,9 +871,9 @@ decompose_dialog (void) GTK_WIN_POS_MOUSE, FALSE, TRUE, FALSE, - _("OK"), decompose_ok_callback, + GTK_STOCK_OK, decompose_ok_callback, NULL, NULL, NULL, TRUE, FALSE, - _("Cancel"), gtk_widget_destroy, + GTK_STOCK_CANCEL, gtk_widget_destroy, NULL, 1, NULL, FALSE, TRUE, NULL); diff --git a/plug-ins/common/deinterlace.c b/plug-ins/common/deinterlace.c index 9e1785385f..74293e07cc 100644 --- a/plug-ins/common/deinterlace.c +++ b/plug-ins/common/deinterlace.c @@ -268,9 +268,9 @@ deinterlace_dialog (void) GTK_WIN_POS_MOUSE, FALSE, TRUE, FALSE, - _("OK"), deinterlace_ok_callback, + GTK_STOCK_OK, deinterlace_ok_callback, NULL, NULL, NULL, TRUE, FALSE, - _("Cancel"), gtk_widget_destroy, + GTK_STOCK_CANCEL, gtk_widget_destroy, NULL, 1, NULL, FALSE, TRUE, NULL); diff --git a/plug-ins/common/depthmerge.c b/plug-ins/common/depthmerge.c index b8b5d8007f..f16e96004d 100644 --- a/plug-ins/common/depthmerge.c +++ b/plug-ins/common/depthmerge.c @@ -640,9 +640,9 @@ DepthMerge_dialog (DepthMerge *dm) GTK_WIN_POS_MOUSE, FALSE, TRUE, FALSE, - _("OK"), dialogOkCallback, + GTK_STOCK_OK, dialogOkCallback, dm, NULL, NULL, TRUE, FALSE, - _("Cancel"), dialogCancelCallback, + GTK_STOCK_CANCEL, dialogCancelCallback, dm, NULL, NULL, FALSE, TRUE, NULL); diff --git a/plug-ins/common/despeckle.c b/plug-ins/common/despeckle.c index b3bc1dad0c..acfaf27f25 100644 --- a/plug-ins/common/despeckle.c +++ b/plug-ins/common/despeckle.c @@ -619,9 +619,9 @@ despeckle_dialog (void) GTK_WIN_POS_MOUSE, FALSE, TRUE, FALSE, - _("OK"), dialog_ok_callback, + GTK_STOCK_OK, dialog_ok_callback, NULL, NULL, NULL, TRUE, FALSE, - _("Cancel"), gtk_widget_destroy, + GTK_STOCK_CANCEL, gtk_widget_destroy, NULL, 1, NULL, FALSE, TRUE, NULL); diff --git a/plug-ins/common/destripe.c b/plug-ins/common/destripe.c index 787fdaa484..ce73fe7d35 100644 --- a/plug-ins/common/destripe.c +++ b/plug-ins/common/destripe.c @@ -549,9 +549,9 @@ destripe_dialog (void) GTK_WIN_POS_MOUSE, FALSE, TRUE, FALSE, - _("OK"), dialog_ok_callback, + GTK_STOCK_OK, dialog_ok_callback, NULL, NULL, NULL, TRUE, FALSE, - _("Cancel"), gtk_widget_destroy, + GTK_STOCK_CANCEL, gtk_widget_destroy, NULL, 1, NULL, FALSE, TRUE, NULL); diff --git a/plug-ins/common/diffraction.c b/plug-ins/common/diffraction.c index c8c8654cd0..1820747cf0 100644 --- a/plug-ins/common/diffraction.c +++ b/plug-ins/common/diffraction.c @@ -531,9 +531,9 @@ diffraction_dialog (void) GTK_WIN_POS_MOUSE, FALSE, TRUE, FALSE, - _("OK"), dialog_ok_callback, + GTK_STOCK_OK, dialog_ok_callback, NULL, NULL, NULL, TRUE, FALSE, - _("Cancel"), gtk_widget_destroy, + GTK_STOCK_CANCEL, gtk_widget_destroy, NULL, 1, NULL, FALSE, TRUE, NULL); diff --git a/plug-ins/common/displace.c b/plug-ins/common/displace.c index 47a6a53b49..fd87c700b4 100644 --- a/plug-ins/common/displace.c +++ b/plug-ins/common/displace.c @@ -295,9 +295,9 @@ displace_dialog (GimpDrawable *drawable) GTK_WIN_POS_MOUSE, FALSE, TRUE, FALSE, - _("OK"), displace_ok_callback, + GTK_STOCK_OK, displace_ok_callback, NULL, NULL, NULL, TRUE, FALSE, - _("Cancel"), gtk_widget_destroy, + GTK_STOCK_CANCEL, gtk_widget_destroy, NULL, 1, NULL, FALSE, TRUE, NULL); diff --git a/plug-ins/common/edge.c b/plug-ins/common/edge.c index c62dbdf7e2..d697c934a3 100644 --- a/plug-ins/common/edge.c +++ b/plug-ins/common/edge.c @@ -647,9 +647,9 @@ edge_dialog (GimpDrawable *drawable) GTK_WIN_POS_MOUSE, FALSE, TRUE, FALSE, - _("OK"), edge_ok_callback, + GTK_STOCK_OK, edge_ok_callback, NULL, NULL, NULL, TRUE, FALSE, - _("Cancel"), gtk_widget_destroy, + GTK_STOCK_CANCEL, gtk_widget_destroy, NULL, 1, NULL, FALSE, TRUE, NULL); diff --git a/plug-ins/common/emboss.c b/plug-ins/common/emboss.c index 78e6689968..20f61e3502 100644 --- a/plug-ins/common/emboss.c +++ b/plug-ins/common/emboss.c @@ -519,9 +519,9 @@ pluginCoreIA (struct piArgs *argp) GTK_WIN_POS_MOUSE, FALSE, TRUE, FALSE, - _("OK"), emboss_ok_callback, + GTK_STOCK_OK, emboss_ok_callback, NULL, NULL, NULL, TRUE, FALSE, - _("Cancel"), gtk_widget_destroy, + GTK_STOCK_CANCEL, gtk_widget_destroy, NULL, 1, NULL, FALSE, TRUE, NULL); diff --git a/plug-ins/common/engrave.c b/plug-ins/common/engrave.c index 31a0c4c2b5..09f1e82d45 100644 --- a/plug-ins/common/engrave.c +++ b/plug-ins/common/engrave.c @@ -221,9 +221,9 @@ engrave_dialog (void) GTK_WIN_POS_MOUSE, FALSE, TRUE, FALSE, - _("OK"), engrave_ok_callback, + GTK_STOCK_OK, engrave_ok_callback, NULL, NULL, NULL, TRUE, FALSE, - _("Cancel"), gtk_widget_destroy, + GTK_STOCK_CANCEL, gtk_widget_destroy, NULL, 1, NULL, FALSE, TRUE, NULL); diff --git a/plug-ins/common/exchange.c b/plug-ins/common/exchange.c index 7594358b09..4a80a38d59 100644 --- a/plug-ins/common/exchange.c +++ b/plug-ins/common/exchange.c @@ -319,9 +319,9 @@ exchange_dialog (void) GTK_WIN_POS_MOUSE, FALSE, TRUE, FALSE, - _("OK"), ok_callback, + GTK_STOCK_OK, ok_callback, NULL, NULL, NULL, TRUE, FALSE, - _("Cancel"), gtk_widget_destroy, + GTK_STOCK_CANCEL, gtk_widget_destroy, NULL, 1, NULL, FALSE, TRUE, NULL); diff --git a/plug-ins/common/film.c b/plug-ins/common/film.c index fa14dd50a8..eec91bb094 100644 --- a/plug-ins/common/film.c +++ b/plug-ins/common/film.c @@ -1168,9 +1168,9 @@ film_dialog (gint32 image_ID) GTK_WIN_POS_NONE, FALSE, TRUE, FALSE, - _("OK"), film_ok_callback, + GTK_STOCK_OK, film_ok_callback, NULL, NULL, NULL, TRUE, FALSE, - _("Cancel"), gtk_widget_destroy, + GTK_STOCK_CANCEL, gtk_widget_destroy, NULL, 1, NULL, FALSE, TRUE, NULL); diff --git a/plug-ins/common/flarefx.c b/plug-ins/common/flarefx.c index 3fdfecba46..7ebb856aed 100644 --- a/plug-ins/common/flarefx.c +++ b/plug-ins/common/flarefx.c @@ -331,9 +331,9 @@ flare_dialog (GimpDrawable *drawable) GTK_WIN_POS_MOUSE, FALSE, TRUE, FALSE, - _("OK"), flare_ok_callback, + GTK_STOCK_OK, flare_ok_callback, NULL, NULL, NULL, TRUE, FALSE, - _("Cancel"), gtk_widget_destroy, + GTK_STOCK_CANCEL, gtk_widget_destroy, NULL, 1, NULL, FALSE, TRUE, NULL); diff --git a/plug-ins/common/fractaltrace.c b/plug-ins/common/fractaltrace.c index 1bd3fd9674..611fedf1cb 100644 --- a/plug-ins/common/fractaltrace.c +++ b/plug-ins/common/fractaltrace.c @@ -722,9 +722,9 @@ dialog_show (void) GTK_WIN_POS_MOUSE, FALSE, TRUE, FALSE, - _("OK"), dialog_ok_callback, + GTK_STOCK_OK, dialog_ok_callback, NULL, NULL, NULL, TRUE, FALSE, - _("Cancel"), gtk_widget_destroy, + GTK_STOCK_CANCEL, gtk_widget_destroy, NULL, 1, NULL, FALSE, TRUE, NULL); diff --git a/plug-ins/common/gauss_iir.c b/plug-ins/common/gauss_iir.c index 0a00d5b3c3..033f3f1cf1 100644 --- a/plug-ins/common/gauss_iir.c +++ b/plug-ins/common/gauss_iir.c @@ -363,9 +363,9 @@ gauss_iir_dialog (void) GTK_WIN_POS_MOUSE, FALSE, TRUE, FALSE, - _("OK"), gauss_ok_callback, + GTK_STOCK_OK, gauss_ok_callback, NULL, NULL, NULL, TRUE, FALSE, - _("Cancel"), gtk_widget_destroy, + GTK_STOCK_CANCEL, gtk_widget_destroy, NULL, 1, NULL, FALSE, TRUE, NULL); @@ -446,9 +446,9 @@ gauss_iir2_dialog (gint32 image_ID, GTK_WIN_POS_MOUSE, FALSE, TRUE, FALSE, - _("OK"), gauss_ok_callback, + GTK_STOCK_OK, gauss_ok_callback, NULL, NULL, NULL, TRUE, FALSE, - _("Cancel"), gtk_widget_destroy, + GTK_STOCK_CANCEL, gtk_widget_destroy, NULL, 1, NULL, FALSE, TRUE, NULL); diff --git a/plug-ins/common/gauss_rle.c b/plug-ins/common/gauss_rle.c index 8536f7cd86..a83eca13e2 100644 --- a/plug-ins/common/gauss_rle.c +++ b/plug-ins/common/gauss_rle.c @@ -358,9 +358,9 @@ gauss_rle_dialog (void) GTK_WIN_POS_MOUSE, TRUE, FALSE, TRUE, - _("OK"), gauss_ok_callback, + GTK_STOCK_OK, gauss_ok_callback, NULL, NULL, NULL, TRUE, FALSE, - _("Cancel"), gtk_widget_destroy, + GTK_STOCK_CANCEL, gtk_widget_destroy, NULL, 1, NULL, FALSE, TRUE, NULL); @@ -441,9 +441,9 @@ gauss_rle2_dialog (gint32 image_ID, GTK_WIN_POS_MOUSE, FALSE, TRUE, FALSE, - _("OK"), gauss_ok_callback, + GTK_STOCK_OK, gauss_ok_callback, NULL, NULL, NULL, TRUE, FALSE, - _("Cancel"), gtk_widget_destroy, + GTK_STOCK_CANCEL, gtk_widget_destroy, NULL, 1, NULL, FALSE, TRUE, NULL); diff --git a/plug-ins/common/gbr.c b/plug-ins/common/gbr.c index 0f01d59fc3..096fbffb92 100644 --- a/plug-ins/common/gbr.c +++ b/plug-ins/common/gbr.c @@ -565,9 +565,9 @@ save_dialog (void) GTK_WIN_POS_MOUSE, FALSE, TRUE, FALSE, - _("OK"), ok_callback, + GTK_STOCK_OK, ok_callback, NULL, NULL, NULL, TRUE, FALSE, - _("Cancel"), gtk_widget_destroy, + GTK_STOCK_CANCEL, gtk_widget_destroy, NULL, 1, NULL, FALSE, TRUE, NULL); diff --git a/plug-ins/common/gicon.c b/plug-ins/common/gicon.c index 0f552cba83..bba9bc1a81 100644 --- a/plug-ins/common/gicon.c +++ b/plug-ins/common/gicon.c @@ -438,9 +438,9 @@ save_dialog (void) GTK_WIN_POS_MOUSE, FALSE, TRUE, FALSE, - _("OK"), ok_callback, + GTK_STOCK_OK, ok_callback, NULL, NULL, NULL, TRUE, FALSE, - _("Cancel"), gtk_widget_destroy, + GTK_STOCK_CANCEL, gtk_widget_destroy, NULL, 1, NULL, FALSE, TRUE, NULL); diff --git a/plug-ins/common/gif.c b/plug-ins/common/gif.c index 2f43614297..e32b257703 100644 --- a/plug-ins/common/gif.c +++ b/plug-ins/common/gif.c @@ -1153,9 +1153,9 @@ badbounds_dialog (void) GTK_WIN_POS_MOUSE, FALSE, FALSE, FALSE, - _("OK"), cropok_callback, + GTK_STOCK_OK, cropok_callback, NULL, NULL, NULL, TRUE, FALSE, - _("Cancel"), gtk_widget_destroy, + GTK_STOCK_CANCEL, gtk_widget_destroy, NULL, 1, NULL, FALSE, TRUE, NULL); @@ -1224,9 +1224,9 @@ save_dialog (gint32 image_ID) GTK_WIN_POS_MOUSE, FALSE, TRUE, FALSE, - _("OK"), save_ok_callback, + GTK_STOCK_OK, save_ok_callback, NULL, NULL, NULL, TRUE, FALSE, - _("Cancel"), gtk_widget_destroy, + GTK_STOCK_CANCEL, gtk_widget_destroy, NULL, 1, NULL, FALSE, TRUE, NULL); diff --git a/plug-ins/common/gih.c b/plug-ins/common/gih.c index c3dfb48e1c..606056130f 100644 --- a/plug-ins/common/gih.c +++ b/plug-ins/common/gih.c @@ -851,9 +851,9 @@ gih_save_dialog (gint32 image_ID) GTK_WIN_POS_MOUSE, FALSE, TRUE, FALSE, - _("OK"), ok_callback, + GTK_STOCK_OK, ok_callback, NULL, NULL, NULL, TRUE, FALSE, - _("Cancel"), gtk_widget_destroy, + GTK_STOCK_CANCEL, gtk_widget_destroy, NULL, 1, NULL, FALSE, TRUE, NULL); diff --git a/plug-ins/common/glasstile.c b/plug-ins/common/glasstile.c index 74a23c6cf5..f76171e115 100644 --- a/plug-ins/common/glasstile.c +++ b/plug-ins/common/glasstile.c @@ -257,9 +257,9 @@ glass_dialog (GimpDrawable *drawable) GTK_WIN_POS_MOUSE, FALSE, TRUE, FALSE, - _("OK"), glass_ok_callback, + GTK_STOCK_OK, glass_ok_callback, NULL, NULL, NULL, TRUE, FALSE, - _("Cancel"), gtk_widget_destroy, + GTK_STOCK_CANCEL, gtk_widget_destroy, NULL, 1, NULL, FALSE, TRUE, NULL); diff --git a/plug-ins/common/grid.c b/plug-ins/common/grid.c index 53bffa249d..4c7db29f24 100644 --- a/plug-ins/common/grid.c +++ b/plug-ins/common/grid.c @@ -650,9 +650,9 @@ dialog (gint32 image_ID, GTK_WIN_POS_MOUSE, FALSE, TRUE, FALSE, - _("OK"), ok_callback, + GTK_STOCK_OK, ok_callback, NULL, NULL, NULL, TRUE, FALSE, - _("Cancel"), gtk_widget_destroy, + GTK_STOCK_CANCEL, gtk_widget_destroy, NULL, 1, NULL, FALSE, TRUE, NULL); diff --git a/plug-ins/common/gtm.c b/plug-ins/common/gtm.c index a5552aaf2d..18497ab656 100644 --- a/plug-ins/common/gtm.c +++ b/plug-ins/common/gtm.c @@ -372,9 +372,9 @@ save_dialog (image_ID) GTK_WIN_POS_MOUSE, FALSE, TRUE, FALSE, - _("OK"), save_ok_callback, + GTK_STOCK_OK, save_ok_callback, NULL, NULL, NULL, TRUE, FALSE, - _("Cancel"), gtk_widget_destroy, + GTK_STOCK_CANCEL, gtk_widget_destroy, NULL, 1, NULL, FALSE, TRUE, NULL); diff --git a/plug-ins/common/hot.c b/plug-ins/common/hot.c index ef0642a9f2..81e5f76c29 100644 --- a/plug-ins/common/hot.c +++ b/plug-ins/common/hot.c @@ -586,9 +586,9 @@ pluginCoreIA (struct piArgs *argp) GTK_WIN_POS_MOUSE, FALSE, TRUE, FALSE, - _("OK"), hot_ok_callback, + GTK_STOCK_OK, hot_ok_callback, NULL, NULL, NULL, TRUE, FALSE, - _("Cancel"), gtk_widget_destroy, + GTK_STOCK_CANCEL, gtk_widget_destroy, NULL, 1, NULL, FALSE, TRUE, NULL); diff --git a/plug-ins/common/hrz.c b/plug-ins/common/hrz.c index 2cc4942832..89e84e3525 100644 --- a/plug-ins/common/hrz.c +++ b/plug-ins/common/hrz.c @@ -522,9 +522,9 @@ save_dialog (void) GTK_WIN_POS_MOUSE, FALSE, TRUE, FALSE, - _("OK"), save_ok_callback, + GTK_STOCK_OK, save_ok_callback, NULL, NULL, NULL, TRUE, FALSE, - _("Cancel"), gtk_widget_destroy, + GTK_STOCK_CANCEL, gtk_widget_destroy, NULL, 1, NULL, FALSE, TRUE, NULL); diff --git a/plug-ins/common/illusion.c b/plug-ins/common/illusion.c index f18094c024..7293cc15c4 100644 --- a/plug-ins/common/illusion.c +++ b/plug-ins/common/illusion.c @@ -558,9 +558,9 @@ dialog (GimpDrawable *mangle) GTK_WIN_POS_MOUSE, FALSE, TRUE, FALSE, - _("OK"), dialog_ok_handler, + GTK_STOCK_OK, dialog_ok_handler, NULL, NULL, NULL, TRUE, FALSE, - _("Cancel"), gtk_widget_destroy, + GTK_STOCK_CANCEL, gtk_widget_destroy, NULL, 1, NULL, FALSE, TRUE, NULL); diff --git a/plug-ins/common/iwarp.c b/plug-ins/common/iwarp.c index 6b262193e3..32261854b5 100644 --- a/plug-ins/common/iwarp.c +++ b/plug-ins/common/iwarp.c @@ -1146,11 +1146,11 @@ iwarp_dialog (void) GTK_WIN_POS_MOUSE, FALSE, TRUE, FALSE, - _("OK"), iwarp_ok_callback, + GTK_STOCK_OK, iwarp_ok_callback, NULL, NULL, NULL, TRUE, FALSE, _("Reset"), iwarp_reset_callback, NULL, NULL, NULL, FALSE, FALSE, - _("Cancel"), gtk_widget_destroy, + GTK_STOCK_CANCEL, gtk_widget_destroy, NULL, 1, NULL, FALSE, TRUE, NULL); diff --git a/plug-ins/common/jigsaw.c b/plug-ins/common/jigsaw.c index e46aed3c53..a78709bec0 100644 --- a/plug-ins/common/jigsaw.c +++ b/plug-ins/common/jigsaw.c @@ -2483,9 +2483,9 @@ dialog_box (void) GTK_WIN_POS_MOUSE, FALSE, TRUE, FALSE, - _("OK"), run_callback, + GTK_STOCK_OK, run_callback, NULL, NULL, NULL, TRUE, FALSE, - _("Cancel"), gtk_widget_destroy, + GTK_STOCK_CANCEL, gtk_widget_destroy, NULL, 1, NULL, FALSE, TRUE, NULL); diff --git a/plug-ins/common/jpeg.c b/plug-ins/common/jpeg.c index f5e5514b41..66238360b5 100644 --- a/plug-ins/common/jpeg.c +++ b/plug-ins/common/jpeg.c @@ -1576,9 +1576,9 @@ save_dialog (void) GTK_WIN_POS_MOUSE, FALSE, TRUE, FALSE, - _("OK"), save_ok_callback, + GTK_STOCK_OK, save_ok_callback, NULL, NULL, NULL, TRUE, FALSE, - _("Cancel"), gtk_widget_destroy, + GTK_STOCK_CANCEL, gtk_widget_destroy, NULL, 1, NULL, FALSE, TRUE, NULL); diff --git a/plug-ins/common/lic.c b/plug-ins/common/lic.c index 76883b3fde..678fd2a43e 100644 --- a/plug-ins/common/lic.c +++ b/plug-ins/common/lic.c @@ -1018,9 +1018,9 @@ create_main_dialog (void) GTK_WIN_POS_MOUSE, FALSE, TRUE, FALSE, - _("OK"), ok_button_clicked, + GTK_STOCK_OK, ok_button_clicked, NULL, NULL, NULL, TRUE, FALSE, - _("Cancel"), gtk_main_quit, + GTK_STOCK_CANCEL, gtk_main_quit, NULL, NULL, NULL, FALSE, TRUE, NULL); diff --git a/plug-ins/common/mail.c b/plug-ins/common/mail.c index 6ba1018913..a05957e84d 100644 --- a/plug-ins/common/mail.c +++ b/plug-ins/common/mail.c @@ -464,9 +464,9 @@ save_dialog (void) GTK_WIN_POS_MOUSE, FALSE, TRUE, FALSE, - _("OK"), ok_callback, + GTK_STOCK_OK, ok_callback, NULL, NULL, NULL, TRUE, FALSE, - _("Cancel"), gtk_widget_destroy, + GTK_STOCK_CANCEL, gtk_widget_destroy, NULL, 1, NULL, FALSE, TRUE, NULL); diff --git a/plug-ins/common/mapcolor.c b/plug-ins/common/mapcolor.c index d59c7aa0c3..b42a2a48ac 100644 --- a/plug-ins/common/mapcolor.c +++ b/plug-ins/common/mapcolor.c @@ -556,9 +556,9 @@ dialog (gint32 drawable_ID) GTK_WIN_POS_MOUSE, FALSE, TRUE, FALSE, - _("OK"), mapcolor_ok_callback, + GTK_STOCK_OK, mapcolor_ok_callback, NULL, NULL, NULL, TRUE, FALSE, - _("Cancel"), gtk_widget_destroy, + GTK_STOCK_CANCEL, gtk_widget_destroy, NULL, 1, NULL, FALSE, TRUE, NULL); diff --git a/plug-ins/common/max_rgb.c b/plug-ins/common/max_rgb.c index b8650a2e66..731539b8c8 100644 --- a/plug-ins/common/max_rgb.c +++ b/plug-ins/common/max_rgb.c @@ -345,9 +345,9 @@ dialog (GimpDrawable *drawable) GTK_WIN_POS_MOUSE, FALSE, TRUE, FALSE, - _("OK"), ok_callback, + GTK_STOCK_OK, ok_callback, NULL, NULL, NULL, TRUE, FALSE, - _("Cancel"), gtk_widget_destroy, + GTK_STOCK_CANCEL, gtk_widget_destroy, NULL, 1, NULL, FALSE, TRUE, NULL); diff --git a/plug-ins/common/mblur.c b/plug-ins/common/mblur.c index 3de1725472..9a0366d30b 100644 --- a/plug-ins/common/mblur.c +++ b/plug-ins/common/mblur.c @@ -759,9 +759,9 @@ mblur_dialog (void) GTK_WIN_POS_MOUSE, FALSE, TRUE, FALSE, - _("OK"), dialog_ok_callback, + GTK_STOCK_OK, dialog_ok_callback, NULL, NULL, NULL, TRUE, FALSE, - _("Cancel"), gtk_widget_destroy, + GTK_STOCK_CANCEL, gtk_widget_destroy, NULL, 1, NULL, FALSE, TRUE, NULL); diff --git a/plug-ins/common/mosaic.c b/plug-ins/common/mosaic.c index 351ccf6870..76033d5300 100644 --- a/plug-ins/common/mosaic.c +++ b/plug-ins/common/mosaic.c @@ -548,9 +548,9 @@ mosaic_dialog (void) GTK_WIN_POS_MOUSE, FALSE, TRUE, FALSE, - _("OK"), mosaic_ok_callback, + GTK_STOCK_OK, mosaic_ok_callback, NULL, NULL, NULL, TRUE, FALSE, - _("Cancel"), gtk_widget_destroy, + GTK_STOCK_CANCEL, gtk_widget_destroy, NULL, 1, NULL, FALSE, TRUE, NULL); diff --git a/plug-ins/common/newsprint.c b/plug-ins/common/newsprint.c index 1672d8fbc9..9ff905bc93 100644 --- a/plug-ins/common/newsprint.c +++ b/plug-ins/common/newsprint.c @@ -1215,9 +1215,9 @@ newsprint_dialog (GimpDrawable *drawable) GTK_WIN_POS_MOUSE, FALSE, TRUE, FALSE, - _("OK"), newsprint_ok_callback, + GTK_STOCK_OK, newsprint_ok_callback, NULL, NULL, NULL, TRUE, FALSE, - _("Cancel"), gtk_widget_destroy, + GTK_STOCK_CANCEL, gtk_widget_destroy, NULL, 1, NULL, FALSE, TRUE, NULL); diff --git a/plug-ins/common/nlfilt.c b/plug-ins/common/nlfilt.c index df5fa8a977..e6de7d9de9 100644 --- a/plug-ins/common/nlfilt.c +++ b/plug-ins/common/nlfilt.c @@ -365,9 +365,9 @@ pluginCoreIA (struct piArgs *argp) GTK_WIN_POS_MOUSE, FALSE, TRUE, FALSE, - _("OK"), nlfilt_ok_callback, + GTK_STOCK_OK, nlfilt_ok_callback, NULL, NULL, NULL, TRUE, FALSE, - _("Cancel"), gtk_widget_destroy, + GTK_STOCK_CANCEL, gtk_widget_destroy, NULL, 1, NULL, FALSE, TRUE, NULL); diff --git a/plug-ins/common/noisify.c b/plug-ins/common/noisify.c index 1f76e199c4..48dd7185c7 100644 --- a/plug-ins/common/noisify.c +++ b/plug-ins/common/noisify.c @@ -486,9 +486,9 @@ noisify_dialog (GimpDrawable *drawable, GTK_WIN_POS_MOUSE, FALSE, TRUE, FALSE, - _("OK"), noisify_ok_callback, + GTK_STOCK_OK, noisify_ok_callback, NULL, NULL, NULL, TRUE, FALSE, - _("Cancel"), gtk_widget_destroy, + GTK_STOCK_CANCEL, gtk_widget_destroy, NULL, 1, NULL, FALSE, TRUE, NULL); diff --git a/plug-ins/common/nova.c b/plug-ins/common/nova.c index 1d173fe6ed..8c5c9bcaa7 100644 --- a/plug-ins/common/nova.c +++ b/plug-ins/common/nova.c @@ -481,9 +481,9 @@ nova_dialog (GimpDrawable *drawable) GTK_WIN_POS_MOUSE, FALSE, TRUE, FALSE, - _("OK"), nova_ok_callback, + GTK_STOCK_OK, nova_ok_callback, NULL, NULL, NULL, TRUE, FALSE, - _("Cancel"), gtk_widget_destroy, + GTK_STOCK_CANCEL, gtk_widget_destroy, NULL, 1, NULL, FALSE, TRUE, NULL); diff --git a/plug-ins/common/oilify.c b/plug-ins/common/oilify.c index 2e7cf50686..d1d2165fdc 100644 --- a/plug-ins/common/oilify.c +++ b/plug-ins/common/oilify.c @@ -455,9 +455,9 @@ oilify_dialog (void) GTK_WIN_POS_MOUSE, FALSE, TRUE, FALSE, - _("OK"), oilify_ok_callback, + GTK_STOCK_OK, oilify_ok_callback, NULL, NULL, NULL, TRUE, FALSE, - _("Cancel"), gtk_widget_destroy, + GTK_STOCK_CANCEL, gtk_widget_destroy, NULL, 1, NULL, FALSE, TRUE, NULL); diff --git a/plug-ins/common/papertile.c b/plug-ins/common/papertile.c index 74b256ba86..c4bf2e5751 100644 --- a/plug-ins/common/papertile.c +++ b/plug-ins/common/papertile.c @@ -247,9 +247,9 @@ open_dialog (void) GTK_WIN_POS_MOUSE, FALSE, FALSE, FALSE, - _("OK"), dialog_ok_clicked, + GTK_STOCK_OK, dialog_ok_clicked, NULL, NULL, NULL, TRUE, FALSE, - _("Cancel"), gtk_widget_destroy, + GTK_STOCK_CANCEL, gtk_widget_destroy, NULL, 1, NULL, FALSE, TRUE, NULL); diff --git a/plug-ins/common/pat.c b/plug-ins/common/pat.c index fcd4588bf5..f281af86ed 100644 --- a/plug-ins/common/pat.c +++ b/plug-ins/common/pat.c @@ -452,9 +452,9 @@ save_dialog (void) GTK_WIN_POS_MOUSE, FALSE, TRUE, FALSE, - _("OK"), ok_callback, + GTK_STOCK_OK, ok_callback, NULL, NULL, NULL, TRUE, FALSE, - _("Cancel"), gtk_widget_destroy, + GTK_STOCK_CANCEL, gtk_widget_destroy, NULL, 1, NULL, FALSE, TRUE, NULL); diff --git a/plug-ins/common/pixelize.c b/plug-ins/common/pixelize.c index 1f37723b67..a6467d5da0 100644 --- a/plug-ins/common/pixelize.c +++ b/plug-ins/common/pixelize.c @@ -277,9 +277,9 @@ pixelize_dialog (void) GTK_WIN_POS_MOUSE, FALSE, TRUE, FALSE, - _("OK"), pixelize_ok_callback, + GTK_STOCK_OK, pixelize_ok_callback, NULL, NULL, NULL, TRUE, FALSE, - _("Cancel"), gtk_widget_destroy, + GTK_STOCK_CANCEL, gtk_widget_destroy, NULL, 1, NULL, FALSE, TRUE, NULL); diff --git a/plug-ins/common/plasma.c b/plug-ins/common/plasma.c index eb49d612d5..d36d67391e 100644 --- a/plug-ins/common/plasma.c +++ b/plug-ins/common/plasma.c @@ -308,9 +308,9 @@ plasma_dialog (GimpDrawable *drawable) GTK_WIN_POS_MOUSE, FALSE, TRUE, FALSE, - _("OK"), plasma_ok_callback, + GTK_STOCK_OK, plasma_ok_callback, NULL, NULL, NULL, TRUE, FALSE, - _("Cancel"), gtk_widget_destroy, + GTK_STOCK_CANCEL, gtk_widget_destroy, NULL, 1, NULL, FALSE, TRUE, NULL); diff --git a/plug-ins/common/plugin-browser.c b/plug-ins/common/plugin-browser.c index 21e203f64e..22b0234bfe 100644 --- a/plug-ins/common/plugin-browser.c +++ b/plug-ins/common/plugin-browser.c @@ -999,7 +999,7 @@ gimp_plugin_desc (void) _("Search by Name"), dialog_search_callback, plugindesc, NULL, NULL, FALSE, FALSE, - _("Close"), dialog_close_callback, + GTK_STOCK_CLOSE, dialog_close_callback, plugindesc, NULL, NULL, TRUE, TRUE, NULL); diff --git a/plug-ins/common/plugindetails.c b/plug-ins/common/plugindetails.c index 21e203f64e..22b0234bfe 100644 --- a/plug-ins/common/plugindetails.c +++ b/plug-ins/common/plugindetails.c @@ -999,7 +999,7 @@ gimp_plugin_desc (void) _("Search by Name"), dialog_search_callback, plugindesc, NULL, NULL, FALSE, FALSE, - _("Close"), dialog_close_callback, + GTK_STOCK_CLOSE, dialog_close_callback, plugindesc, NULL, NULL, TRUE, TRUE, NULL); diff --git a/plug-ins/common/png.c b/plug-ins/common/png.c index 7a3bb912ca..687241f47e 100644 --- a/plug-ins/common/png.c +++ b/plug-ins/common/png.c @@ -1049,9 +1049,9 @@ save_dialog (void) GTK_WIN_POS_MOUSE, FALSE, TRUE, FALSE, - _("OK"), save_ok_callback, + GTK_STOCK_OK, save_ok_callback, NULL, NULL, NULL, TRUE, FALSE, - _("Cancel"), gtk_widget_destroy, + GTK_STOCK_CANCEL, gtk_widget_destroy, NULL, 1, NULL, FALSE, TRUE, NULL); diff --git a/plug-ins/common/pnm.c b/plug-ins/common/pnm.c index b5beed50c2..97486ea5ee 100644 --- a/plug-ins/common/pnm.c +++ b/plug-ins/common/pnm.c @@ -927,9 +927,9 @@ save_dialog (void) GTK_WIN_POS_MOUSE, FALSE, TRUE, FALSE, - _("OK"), save_ok_callback, + GTK_STOCK_OK, save_ok_callback, NULL, NULL, NULL, TRUE, FALSE, - _("Cancel"), gtk_widget_destroy, + GTK_STOCK_CANCEL, gtk_widget_destroy, NULL, 1, NULL, FALSE, TRUE, NULL); diff --git a/plug-ins/common/polar.c b/plug-ins/common/polar.c index cde9b7ccbc..091b8ac017 100644 --- a/plug-ins/common/polar.c +++ b/plug-ins/common/polar.c @@ -915,9 +915,9 @@ polarize_dialog (void) GTK_WIN_POS_MOUSE, FALSE, TRUE, FALSE, - _("OK"), dialog_ok_callback, + GTK_STOCK_OK, dialog_ok_callback, NULL, NULL, NULL, TRUE, FALSE, - _("Cancel"), gtk_widget_destroy, + GTK_STOCK_CANCEL, gtk_widget_destroy, NULL, 1, NULL, FALSE, TRUE, NULL); diff --git a/plug-ins/common/postscript.c b/plug-ins/common/postscript.c index 1ba5b97f9b..8d1a46666e 100644 --- a/plug-ins/common/postscript.c +++ b/plug-ins/common/postscript.c @@ -2607,9 +2607,9 @@ load_dialog (void) GTK_WIN_POS_MOUSE, FALSE, TRUE, FALSE, - _("OK"), load_ok_callback, + GTK_STOCK_OK, load_ok_callback, NULL, NULL, NULL, TRUE, FALSE, - _("Cancel"), gtk_widget_destroy, + GTK_STOCK_CANCEL, gtk_widget_destroy, NULL, 1, NULL, FALSE, TRUE, NULL); @@ -2790,9 +2790,9 @@ save_dialog (void) GTK_WIN_POS_MOUSE, FALSE, TRUE, FALSE, - _("OK"), save_ok_callback, + GTK_STOCK_OK, save_ok_callback, NULL, NULL, NULL, TRUE, FALSE, - _("Cancel"), gtk_widget_destroy, + GTK_STOCK_CANCEL, gtk_widget_destroy, NULL, 1, NULL, FALSE, TRUE, NULL); diff --git a/plug-ins/common/ps.c b/plug-ins/common/ps.c index 1ba5b97f9b..8d1a46666e 100644 --- a/plug-ins/common/ps.c +++ b/plug-ins/common/ps.c @@ -2607,9 +2607,9 @@ load_dialog (void) GTK_WIN_POS_MOUSE, FALSE, TRUE, FALSE, - _("OK"), load_ok_callback, + GTK_STOCK_OK, load_ok_callback, NULL, NULL, NULL, TRUE, FALSE, - _("Cancel"), gtk_widget_destroy, + GTK_STOCK_CANCEL, gtk_widget_destroy, NULL, 1, NULL, FALSE, TRUE, NULL); @@ -2790,9 +2790,9 @@ save_dialog (void) GTK_WIN_POS_MOUSE, FALSE, TRUE, FALSE, - _("OK"), save_ok_callback, + GTK_STOCK_OK, save_ok_callback, NULL, NULL, NULL, TRUE, FALSE, - _("Cancel"), gtk_widget_destroy, + GTK_STOCK_CANCEL, gtk_widget_destroy, NULL, 1, NULL, FALSE, TRUE, NULL); diff --git a/plug-ins/common/psp.c b/plug-ins/common/psp.c index 9db76af874..5c7064942b 100644 --- a/plug-ins/common/psp.c +++ b/plug-ins/common/psp.c @@ -425,9 +425,9 @@ save_dialog (void) GTK_WIN_POS_MOUSE, FALSE, TRUE, FALSE, - _("OK"), save_ok_callback, + GTK_STOCK_OK, save_ok_callback, NULL, NULL, NULL, TRUE, FALSE, - _("Cancel"), gtk_widget_destroy, + GTK_STOCK_CANCEL, gtk_widget_destroy, NULL, 1, NULL, FALSE, TRUE, NULL); diff --git a/plug-ins/common/randomize.c b/plug-ins/common/randomize.c index 901003d75d..242373838d 100644 --- a/plug-ins/common/randomize.c +++ b/plug-ins/common/randomize.c @@ -699,9 +699,9 @@ randomize_dialog (void) GTK_WIN_POS_MOUSE, FALSE, TRUE, FALSE, - _("OK"), randomize_ok_callback, + GTK_STOCK_OK, randomize_ok_callback, NULL, NULL, NULL, TRUE, FALSE, - _("Cancel"), gtk_widget_destroy, + GTK_STOCK_CANCEL, gtk_widget_destroy, NULL, 1, NULL, FALSE, TRUE, NULL); diff --git a/plug-ins/common/ripple.c b/plug-ins/common/ripple.c index b57b1de87b..e1b02fb54b 100644 --- a/plug-ins/common/ripple.c +++ b/plug-ins/common/ripple.c @@ -577,9 +577,9 @@ ripple_dialog (void) GTK_WIN_POS_MOUSE, FALSE, TRUE, FALSE, - _("OK"), ripple_ok_callback, + GTK_STOCK_OK, ripple_ok_callback, NULL, NULL, NULL, TRUE, FALSE, - _("Cancel"), gtk_widget_destroy, + GTK_STOCK_CANCEL, gtk_widget_destroy, NULL, 1, NULL, FALSE, TRUE, NULL); diff --git a/plug-ins/common/sample_colorize.c b/plug-ins/common/sample_colorize.c index d98c3b142f..2fa4f57e3d 100644 --- a/plug-ins/common/sample_colorize.c +++ b/plug-ins/common/sample_colorize.c @@ -1371,7 +1371,7 @@ p_smp_dialog (void) NULL, NULL, NULL, TRUE, FALSE, _("Reset"), p_smp_reset_callback, NULL, NULL, NULL, FALSE, FALSE, - _("Close"), gtk_widget_destroy, + GTK_STOCK_CLOSE, gtk_widget_destroy, NULL, 1, NULL, FALSE, TRUE, NULL); diff --git a/plug-ins/common/scatter_hsv.c b/plug-ins/common/scatter_hsv.c index 2e3c024853..d8e4c1b45c 100644 --- a/plug-ins/common/scatter_hsv.c +++ b/plug-ins/common/scatter_hsv.c @@ -372,9 +372,9 @@ scatter_hsv_dialog (void) GTK_WIN_POS_MOUSE, FALSE, TRUE, FALSE, - _("OK"), scatter_hsv_ok_callback, + GTK_STOCK_OK, scatter_hsv_ok_callback, NULL, NULL, NULL, TRUE, FALSE, - _("Cancel"), gtk_widget_destroy, + GTK_STOCK_CANCEL, gtk_widget_destroy, NULL, 1, NULL, FALSE, TRUE, NULL); diff --git a/plug-ins/common/screenshot.c b/plug-ins/common/screenshot.c index b1403ef53b..1c72be1e0e 100644 --- a/plug-ins/common/screenshot.c +++ b/plug-ins/common/screenshot.c @@ -368,9 +368,9 @@ shoot_dialog (void) GTK_WIN_POS_MOUSE, FALSE, TRUE, FALSE, - _("OK"), shoot_ok_callback, + GTK_STOCK_OK, shoot_ok_callback, NULL, NULL, NULL, TRUE, FALSE, - _("Cancel"), gtk_widget_destroy, + GTK_STOCK_CANCEL, gtk_widget_destroy, NULL, 1, NULL, FALSE, TRUE, NULL); diff --git a/plug-ins/common/sel_gauss.c b/plug-ins/common/sel_gauss.c index c9de781ca2..9c78e839ad 100644 --- a/plug-ins/common/sel_gauss.c +++ b/plug-ins/common/sel_gauss.c @@ -239,9 +239,9 @@ sel_gauss_dialog (void) GTK_WIN_POS_MOUSE, FALSE, TRUE, FALSE, - _("OK"), sel_gauss_ok_callback, + GTK_STOCK_OK, sel_gauss_ok_callback, NULL, NULL, NULL, TRUE, FALSE, - _("Cancel"), gtk_widget_destroy, + GTK_STOCK_CANCEL, gtk_widget_destroy, NULL, 1, NULL, FALSE, TRUE, NULL); diff --git a/plug-ins/common/sharpen.c b/plug-ins/common/sharpen.c index 00624b5848..0097a566d6 100644 --- a/plug-ins/common/sharpen.c +++ b/plug-ins/common/sharpen.c @@ -524,9 +524,9 @@ sharpen_dialog (void) GTK_WIN_POS_MOUSE, FALSE, TRUE, FALSE, - _("OK"), dialog_ok_callback, + GTK_STOCK_OK, dialog_ok_callback, NULL, NULL, NULL, TRUE, FALSE, - _("Cancel"), gtk_widget_destroy, + GTK_STOCK_CANCEL, gtk_widget_destroy, NULL, 1, NULL, FALSE, TRUE, NULL); diff --git a/plug-ins/common/shift.c b/plug-ins/common/shift.c index a959aa430f..6dce30c842 100644 --- a/plug-ins/common/shift.c +++ b/plug-ins/common/shift.c @@ -373,9 +373,9 @@ shift_dialog (void) GTK_WIN_POS_MOUSE, FALSE, TRUE, FALSE, - _("OK"), shift_ok_callback, + GTK_STOCK_OK, shift_ok_callback, NULL, NULL, NULL, TRUE, FALSE, - _("Cancel"), gtk_widget_destroy, + GTK_STOCK_CANCEL, gtk_widget_destroy, NULL, 1, NULL, FALSE, TRUE, NULL); diff --git a/plug-ins/common/sinus.c b/plug-ins/common/sinus.c index 06b2558e6a..7aa4f2628c 100644 --- a/plug-ins/common/sinus.c +++ b/plug-ins/common/sinus.c @@ -1691,9 +1691,9 @@ sinus_dialog (void) GTK_WIN_POS_MOUSE, FALSE, TRUE, FALSE, - _("OK"), sinus_ok_callback, + GTK_STOCK_OK, sinus_ok_callback, NULL, NULL, NULL, TRUE, FALSE, - _("Cancel"), gtk_widget_destroy, + GTK_STOCK_CANCEL, gtk_widget_destroy, NULL, 1, NULL, FALSE, TRUE, NULL); diff --git a/plug-ins/common/smooth_palette.c b/plug-ins/common/smooth_palette.c index 3ef821c36d..1e0ad96af8 100644 --- a/plug-ins/common/smooth_palette.c +++ b/plug-ins/common/smooth_palette.c @@ -400,9 +400,9 @@ dialog (void) GTK_WIN_POS_MOUSE, FALSE, TRUE, FALSE, - _("OK"), ok_callback, + GTK_STOCK_OK, ok_callback, NULL, NULL, NULL, TRUE, FALSE, - _("Cancel"), gtk_widget_destroy, + GTK_STOCK_CANCEL, gtk_widget_destroy, NULL, 1, NULL, FALSE, TRUE, NULL); diff --git a/plug-ins/common/snoise.c b/plug-ins/common/snoise.c index 65e38689e5..40273cd600 100644 --- a/plug-ins/common/snoise.c +++ b/plug-ins/common/snoise.c @@ -512,9 +512,9 @@ solid_noise_dialog (void) GTK_WIN_POS_MOUSE, FALSE, TRUE, FALSE, - _("OK"), dialog_ok_callback, + GTK_STOCK_OK, dialog_ok_callback, NULL, NULL, NULL, TRUE, FALSE, - _("Cancel"), gtk_widget_destroy, + GTK_STOCK_CANCEL, gtk_widget_destroy, NULL, 1, NULL, FALSE, TRUE, NULL); diff --git a/plug-ins/common/sobel.c b/plug-ins/common/sobel.c index 4d36d97314..1e3f7131f0 100644 --- a/plug-ins/common/sobel.c +++ b/plug-ins/common/sobel.c @@ -248,9 +248,9 @@ sobel_dialog (void) GTK_WIN_POS_MOUSE, FALSE, TRUE, FALSE, - _("OK"), sobel_ok_callback, + GTK_STOCK_OK, sobel_ok_callback, NULL, NULL, NULL, TRUE, FALSE, - _("Cancel"), gtk_widget_destroy, + GTK_STOCK_CANCEL, gtk_widget_destroy, NULL, 1, NULL, FALSE, TRUE, NULL); diff --git a/plug-ins/common/sparkle.c b/plug-ins/common/sparkle.c index 15e24a5b1f..e2a1cd8414 100644 --- a/plug-ins/common/sparkle.c +++ b/plug-ins/common/sparkle.c @@ -347,9 +347,9 @@ sparkle_dialog (void) GTK_WIN_POS_MOUSE, FALSE, TRUE, FALSE, - _("OK"), sparkle_ok_callback, + GTK_STOCK_OK, sparkle_ok_callback, NULL, NULL, NULL, TRUE, FALSE, - _("Cancel"), gtk_widget_destroy, + GTK_STOCK_CANCEL, gtk_widget_destroy, NULL, 1, NULL, FALSE, TRUE, NULL); diff --git a/plug-ins/common/spheredesigner.c b/plug-ins/common/spheredesigner.c index 1e03b0bda9..fbc7459a9d 100644 --- a/plug-ins/common/spheredesigner.c +++ b/plug-ins/common/spheredesigner.c @@ -2205,11 +2205,11 @@ GtkWidget* makewindow (void) GTK_WIN_POS_MOUSE, FALSE, TRUE, FALSE, - _("OK"), sphere_ok, + GTK_STOCK_OK, sphere_ok, NULL, NULL, &okbutton, TRUE, FALSE, _("Reset"), sphere_reset, NULL, NULL, &resetbutton, FALSE, FALSE, - _("Cancel"), sphere_cancel, + GTK_STOCK_CANCEL, sphere_cancel, NULL, NULL, &cancelbutton, FALSE, TRUE, NULL); diff --git a/plug-ins/common/spread.c b/plug-ins/common/spread.c index 3907573d2f..bd4dc34778 100644 --- a/plug-ins/common/spread.c +++ b/plug-ins/common/spread.c @@ -379,9 +379,9 @@ spread_dialog (gint32 image_ID, GTK_WIN_POS_MOUSE, FALSE, TRUE, FALSE, - _("OK"), spread_ok_callback, + GTK_STOCK_OK, spread_ok_callback, NULL, NULL, NULL, TRUE, FALSE, - _("Cancel"), gtk_widget_destroy, + GTK_STOCK_CANCEL, gtk_widget_destroy, NULL, 1, NULL, FALSE, TRUE, NULL); diff --git a/plug-ins/common/struc.c b/plug-ins/common/struc.c index 0db957f84b..b058485c01 100644 --- a/plug-ins/common/struc.c +++ b/plug-ins/common/struc.c @@ -1278,9 +1278,9 @@ struc_dialog (void) GTK_WIN_POS_MOUSE, FALSE, TRUE, FALSE, - _("OK"), struc_ok_callback, + GTK_STOCK_OK, struc_ok_callback, NULL, NULL, NULL, TRUE, FALSE, - _("Cancel"), gtk_widget_destroy, + GTK_STOCK_CANCEL, gtk_widget_destroy, NULL, 1, NULL, FALSE, TRUE, NULL); diff --git a/plug-ins/common/sunras.c b/plug-ins/common/sunras.c index 30df8e6844..49a7607500 100644 --- a/plug-ins/common/sunras.c +++ b/plug-ins/common/sunras.c @@ -1587,9 +1587,9 @@ save_dialog (void) GTK_WIN_POS_MOUSE, FALSE, TRUE, FALSE, - _("OK"), save_ok_callback, + GTK_STOCK_OK, save_ok_callback, NULL, NULL, NULL, TRUE, FALSE, - _("Cancel"), gtk_widget_destroy, + GTK_STOCK_CANCEL, gtk_widget_destroy, NULL, 1, NULL, FALSE, TRUE, NULL); diff --git a/plug-ins/common/tga.c b/plug-ins/common/tga.c index 00f292c696..11a0211d37 100644 --- a/plug-ins/common/tga.c +++ b/plug-ins/common/tga.c @@ -1172,9 +1172,9 @@ save_dialog (void) GTK_WIN_POS_MOUSE, FALSE, TRUE, FALSE, - _("OK"), save_ok_callback, + GTK_STOCK_OK, save_ok_callback, NULL, NULL, NULL, TRUE, FALSE, - _("Cancel"), gtk_widget_destroy, + GTK_STOCK_CANCEL, gtk_widget_destroy, NULL, 1, NULL, FALSE, TRUE, NULL); diff --git a/plug-ins/common/threshold_alpha.c b/plug-ins/common/threshold_alpha.c index 003ff26d50..afff449331 100644 --- a/plug-ins/common/threshold_alpha.c +++ b/plug-ins/common/threshold_alpha.c @@ -268,9 +268,9 @@ threshold_alpha_dialog (void) GTK_WIN_POS_MOUSE, FALSE, TRUE, FALSE, - _("OK"), threshold_alpha_ok_callback, + GTK_STOCK_OK, threshold_alpha_ok_callback, NULL, NULL, NULL, TRUE, FALSE, - _("Cancel"), gtk_widget_destroy, + GTK_STOCK_CANCEL, gtk_widget_destroy, NULL, 1, NULL, FALSE, TRUE, NULL); diff --git a/plug-ins/common/tiff.c b/plug-ins/common/tiff.c index 5f4fbbcf82..0f95e8bec2 100644 --- a/plug-ins/common/tiff.c +++ b/plug-ins/common/tiff.c @@ -1559,9 +1559,9 @@ save_dialog (void) GTK_WIN_POS_MOUSE, FALSE, TRUE, FALSE, - _("OK"), save_ok_callback, + GTK_STOCK_OK, save_ok_callback, NULL, NULL, NULL, TRUE, FALSE, - _("Cancel"), gtk_widget_destroy, + GTK_STOCK_CANCEL, gtk_widget_destroy, NULL, 1, NULL, FALSE, TRUE, NULL); diff --git a/plug-ins/common/tile.c b/plug-ins/common/tile.c index b8be0a8285..c92a8d0579 100644 --- a/plug-ins/common/tile.c +++ b/plug-ins/common/tile.c @@ -402,9 +402,9 @@ tile_dialog (gint32 image_ID, GTK_WIN_POS_MOUSE, FALSE, TRUE, FALSE, - _("OK"), tile_ok_callback, + GTK_STOCK_OK, tile_ok_callback, NULL, NULL, NULL, TRUE, FALSE, - _("Cancel"), gtk_widget_destroy, + GTK_STOCK_CANCEL, gtk_widget_destroy, NULL, 1, NULL, FALSE, TRUE, NULL); diff --git a/plug-ins/common/tileit.c b/plug-ins/common/tileit.c index 37033b48c2..ca710e5d04 100644 --- a/plug-ins/common/tileit.c +++ b/plug-ins/common/tileit.c @@ -384,9 +384,9 @@ tileit_dialog (void) GTK_WIN_POS_MOUSE, FALSE, TRUE, FALSE, - _("OK"), tileit_ok_callback, + GTK_STOCK_OK, tileit_ok_callback, NULL, NULL, NULL, TRUE, FALSE, - _("Cancel"), gtk_widget_destroy, + GTK_STOCK_CANCEL, gtk_widget_destroy, NULL, 1, NULL, FALSE, TRUE, NULL); diff --git a/plug-ins/common/uniteditor.c b/plug-ins/common/uniteditor.c index 2599730284..a6ce0b80fc 100644 --- a/plug-ins/common/uniteditor.c +++ b/plug-ins/common/uniteditor.c @@ -37,14 +37,15 @@ static void query (void); -static void run (gchar *name, - gint nparams, +static void run (gchar *name, + gint nparams, GimpParam *param, - gint *nreturn_vals, + gint *nreturn_vals, GimpParam **return_vals); static void unit_editor_dialog (void); + GimpPlugInInfo PLUG_IN_INFO = { NULL, /* init_proc */ @@ -55,6 +56,7 @@ GimpPlugInInfo PLUG_IN_INFO = MAIN () + static void query (void) { @@ -78,10 +80,10 @@ query (void) } static void -run (gchar *name, - gint nparams, +run (gchar *name, + gint nparams, GimpParam *param, - gint *nreturn_vals, + gint *nreturn_vals, GimpParam **return_vals) { static GimpParam values[2]; @@ -104,6 +106,7 @@ run (gchar *name, } } + static GdkPixmap *yes_pixmap = NULL; static GdkBitmap *yes_mask = NULL; static GdkPixmap *no_pixmap = NULL; @@ -119,6 +122,7 @@ static GdkColor color; static GimpUnit current_unit = GIMP_UNIT_INCH; static gint current_row = 0; + enum { SAVE, @@ -170,9 +174,9 @@ new_unit (GimpUnit template) GTK_WIN_POS_MOUSE, FALSE, TRUE, FALSE, - _("OK"), new_unit_ok_callback, + GTK_STOCK_OK, new_unit_ok_callback, &ok, NULL, NULL, TRUE, FALSE, - _("Cancel"), gtk_main_quit, + GTK_STOCK_CANCEL, gtk_main_quit, NULL, 1, NULL, FALSE, TRUE, NULL); @@ -523,7 +527,7 @@ unit_editor_dialog (void) _("Refresh"), refresh_callback, NULL, NULL, NULL, FALSE, FALSE, - _("Close"), gtk_widget_destroy, + GTK_STOCK_CLOSE, gtk_widget_destroy, NULL, 1, NULL, TRUE, TRUE, NULL); @@ -612,10 +616,11 @@ unit_editor_dialog (void) gtk_widget_set_usize (clist, -1, 200); gtk_container_add (GTK_CONTAINER (scrolled_win), clist); + gtk_widget_show (clist); + gtk_signal_connect (GTK_OBJECT (clist), "select_row", GTK_SIGNAL_FUNC (select_row_callback), NULL); - gtk_widget_show (clist); hbox = gtk_hbox_new (FALSE, 2); gtk_box_pack_start (GTK_BOX (main_vbox), hbox, FALSE, FALSE, 0); @@ -623,29 +628,32 @@ unit_editor_dialog (void) button = gimp_pixmap_button_new (new_xpm, _("New Unit")); gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, FALSE, 0); + gtk_widget_show (button); + gtk_signal_connect (GTK_OBJECT (button), "clicked", GTK_SIGNAL_FUNC (new_callback), NULL); - gtk_widget_show (button); gimp_help_set_help_data (button, _("Create a new unit from scratch."), NULL); button = gimp_pixmap_button_new (duplicate_xpm, _("Duplicate Unit")); gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, FALSE, 0); + gtk_widget_show (button); + gtk_signal_connect (GTK_OBJECT (button), "clicked", GTK_SIGNAL_FUNC (duplicate_callback), NULL); - gtk_widget_show (button); gimp_help_set_help_data (button, _("Create a new unit with the currently " "seleted unit as template."), NULL); button = gimp_pixmap_button_new (no_xpm, _("Don't Save Unit")); gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, FALSE, 0); + gtk_widget_show (button); + gtk_signal_connect (GTK_OBJECT (button), "clicked", GTK_SIGNAL_FUNC (delete_callback), NULL); - gtk_widget_show (button); gimp_help_set_help_data (button, _("Don't save the currently selected unit " "before GIMP exits."), NULL); @@ -654,10 +662,11 @@ unit_editor_dialog (void) button = gimp_pixmap_button_new (yes_xpm, _("Save Unit")); gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, FALSE, 0); + gtk_widget_show (button); + gtk_signal_connect (GTK_OBJECT (button), "clicked", GTK_SIGNAL_FUNC (undelete_callback), NULL); - gtk_widget_show (button); gimp_help_set_help_data (button, _("Save the currently selected unit " "before GIMP exits."), NULL); diff --git a/plug-ins/common/unsharp.c b/plug-ins/common/unsharp.c index 7d10b11111..8e89cb3ef1 100644 --- a/plug-ins/common/unsharp.c +++ b/plug-ins/common/unsharp.c @@ -784,9 +784,9 @@ unsharp_mask_dialog (void) GTK_WIN_POS_MOUSE, FALSE, TRUE, FALSE, - _("OK"), unsharp_ok_callback, + GTK_STOCK_OK, unsharp_ok_callback, NULL, NULL, NULL, TRUE, FALSE, - _("Cancel"), gtk_widget_destroy, + GTK_STOCK_CANCEL, gtk_widget_destroy, NULL, 1, NULL, FALSE, TRUE, NULL); diff --git a/plug-ins/common/video.c b/plug-ins/common/video.c index 549a680ad5..599d1123d0 100644 --- a/plug-ins/common/video.c +++ b/plug-ins/common/video.c @@ -2152,9 +2152,9 @@ video_dialog (void) GTK_WIN_POS_MOUSE, FALSE, TRUE, FALSE, - _("OK"), video_ok_callback, + GTK_STOCK_OK, video_ok_callback, NULL, NULL, NULL, TRUE, FALSE, - _("Cancel"), gtk_widget_destroy, + GTK_STOCK_CANCEL, gtk_widget_destroy, NULL, 1, NULL, FALSE, TRUE, NULL); diff --git a/plug-ins/common/vpropagate.c b/plug-ins/common/vpropagate.c index 0a0bec38a0..1ea88ffbef 100644 --- a/plug-ins/common/vpropagate.c +++ b/plug-ins/common/vpropagate.c @@ -938,9 +938,9 @@ vpropagate_dialog (GimpImageBaseType image_type) gimp_standard_help_func, "filters/vpropagate.html", GTK_WIN_POS_MOUSE, FALSE, TRUE, FALSE, - _("OK"), vpropagate_ok_callback, + GTK_STOCK_OK, vpropagate_ok_callback, NULL, NULL, NULL, TRUE, FALSE, - _("Cancel"), gtk_widget_destroy, + GTK_STOCK_CANCEL, gtk_widget_destroy, NULL, 1, NULL, FALSE, TRUE, NULL); diff --git a/plug-ins/common/warp.c b/plug-ins/common/warp.c index 62a4c806f4..d82c175ce9 100644 --- a/plug-ins/common/warp.c +++ b/plug-ins/common/warp.c @@ -426,9 +426,9 @@ warp_dialog (GimpDrawable *drawable) GTK_WIN_POS_MOUSE, FALSE, TRUE, FALSE, - _("OK"), warp_ok_callback, + GTK_STOCK_OK, warp_ok_callback, NULL, NULL, NULL, TRUE, FALSE, - _("Cancel"), gtk_widget_destroy, + GTK_STOCK_CANCEL, gtk_widget_destroy, NULL, 1, NULL, FALSE, TRUE, NULL); diff --git a/plug-ins/common/waves.c b/plug-ins/common/waves.c index 59027ad421..54ac0e5763 100644 --- a/plug-ins/common/waves.c +++ b/plug-ins/common/waves.c @@ -346,9 +346,9 @@ pluginCoreIA (struct piArgs *argp, GTK_WIN_POS_MOUSE, FALSE, TRUE, FALSE, - _("OK"), waves_ok_callback, + GTK_STOCK_OK, waves_ok_callback, NULL, NULL, NULL, TRUE, FALSE, - _("Cancel"), gtk_widget_destroy, + GTK_STOCK_CANCEL, gtk_widget_destroy, NULL, 1, NULL, FALSE, TRUE, NULL); diff --git a/plug-ins/common/whirlpinch.c b/plug-ins/common/whirlpinch.c index abcb692108..3988bfa3cd 100644 --- a/plug-ins/common/whirlpinch.c +++ b/plug-ins/common/whirlpinch.c @@ -802,9 +802,9 @@ whirl_pinch_dialog (void) GTK_WIN_POS_MOUSE, FALSE, TRUE, FALSE, - _("OK"), dialog_ok_callback, + GTK_STOCK_OK, dialog_ok_callback, NULL, NULL, NULL, TRUE, FALSE, - _("Cancel"), gtk_widget_destroy, + GTK_STOCK_CANCEL, gtk_widget_destroy, NULL, 1, NULL, FALSE, TRUE, NULL); diff --git a/plug-ins/common/wind.c b/plug-ins/common/wind.c index 5967ae00ba..0a53b41aa3 100644 --- a/plug-ins/common/wind.c +++ b/plug-ins/common/wind.c @@ -1009,9 +1009,9 @@ dialog_box (GimpDrawable *drawable) GTK_WIN_POS_MOUSE, FALSE, TRUE, FALSE, - _("OK"), ok_callback, + GTK_STOCK_OK, ok_callback, NULL, NULL, NULL, TRUE, FALSE, - _("Cancel"), gtk_widget_destroy, + GTK_STOCK_CANCEL, gtk_widget_destroy, NULL, 1, NULL, FALSE, TRUE, NULL); diff --git a/plug-ins/common/wmf.c b/plug-ins/common/wmf.c index 14714765a8..9804281798 100644 --- a/plug-ins/common/wmf.c +++ b/plug-ins/common/wmf.c @@ -928,9 +928,9 @@ load_dialog (gchar *file_name) GTK_WIN_POS_MOUSE, FALSE, TRUE, FALSE, - _("OK"), load_ok_callback, + GTK_STOCK_OK, load_ok_callback, vals, NULL, NULL, TRUE, FALSE, - _("Cancel"), gtk_widget_destroy, + GTK_STOCK_CANCEL, gtk_widget_destroy, NULL, 1, NULL, FALSE, TRUE, NULL); diff --git a/plug-ins/common/xbm.c b/plug-ins/common/xbm.c index ca785e37cd..a0b474c99d 100644 --- a/plug-ins/common/xbm.c +++ b/plug-ins/common/xbm.c @@ -1152,9 +1152,9 @@ save_dialog (gint32 drawable_ID) GTK_WIN_POS_MOUSE, FALSE, TRUE, FALSE, - _("OK"), save_ok_callback, + GTK_STOCK_OK, save_ok_callback, NULL, NULL, NULL, TRUE, FALSE, - _("Cancel"), gtk_widget_destroy, + GTK_STOCK_CANCEL, gtk_widget_destroy, NULL, 1, NULL, FALSE, TRUE, NULL); diff --git a/plug-ins/common/xpm.c b/plug-ins/common/xpm.c index 6a3e3aff70..1b358b8b7f 100644 --- a/plug-ins/common/xpm.c +++ b/plug-ins/common/xpm.c @@ -797,9 +797,9 @@ save_dialog (void) GTK_WIN_POS_MOUSE, FALSE, TRUE, FALSE, - _("OK"), save_ok_callback, + GTK_STOCK_OK, save_ok_callback, NULL, NULL, NULL, TRUE, FALSE, - _("Cancel"), gtk_widget_destroy, + GTK_STOCK_CANCEL, gtk_widget_destroy, NULL, 1, NULL, FALSE, TRUE, NULL); diff --git a/plug-ins/dbbrowser/dbbrowser_utils.c b/plug-ins/dbbrowser/dbbrowser_utils.c index 15640f4f63..17ac50517a 100644 --- a/plug-ins/dbbrowser/dbbrowser_utils.c +++ b/plug-ins/dbbrowser/dbbrowser_utils.c @@ -148,9 +148,9 @@ gimp_db_browser (GimpDBBrowserApplyCallback apply_callback) dbbrowser, NULL, &dbbrowser->name_button, TRUE, FALSE, _("Search by Blurb"), dialog_search_callback, dbbrowser, NULL, &dbbrowser->blurb_button, FALSE, FALSE, - _("Apply"), dialog_apply_callback, + GTK_STOCK_APPLY, dialog_apply_callback, dbbrowser, NULL, NULL, FALSE, FALSE, - _("Close"), dialog_close_callback, + GTK_STOCK_CLOSE, dialog_close_callback, dbbrowser, NULL, NULL, FALSE, TRUE, NULL); @@ -167,7 +167,7 @@ gimp_db_browser (GimpDBBrowserApplyCallback apply_callback) dbbrowser, NULL, &dbbrowser->name_button, TRUE, FALSE, _("Search by Blurb"), dialog_search_callback, dbbrowser, NULL, &dbbrowser->blurb_button, FALSE, FALSE, - _("Close"), dialog_close_callback, + GTK_STOCK_CLOSE, dialog_close_callback, dbbrowser, NULL, NULL, FALSE, TRUE, NULL); diff --git a/plug-ins/dbbrowser/gimpprocbrowser.c b/plug-ins/dbbrowser/gimpprocbrowser.c index 15640f4f63..17ac50517a 100644 --- a/plug-ins/dbbrowser/gimpprocbrowser.c +++ b/plug-ins/dbbrowser/gimpprocbrowser.c @@ -148,9 +148,9 @@ gimp_db_browser (GimpDBBrowserApplyCallback apply_callback) dbbrowser, NULL, &dbbrowser->name_button, TRUE, FALSE, _("Search by Blurb"), dialog_search_callback, dbbrowser, NULL, &dbbrowser->blurb_button, FALSE, FALSE, - _("Apply"), dialog_apply_callback, + GTK_STOCK_APPLY, dialog_apply_callback, dbbrowser, NULL, NULL, FALSE, FALSE, - _("Close"), dialog_close_callback, + GTK_STOCK_CLOSE, dialog_close_callback, dbbrowser, NULL, NULL, FALSE, TRUE, NULL); @@ -167,7 +167,7 @@ gimp_db_browser (GimpDBBrowserApplyCallback apply_callback) dbbrowser, NULL, &dbbrowser->name_button, TRUE, FALSE, _("Search by Blurb"), dialog_search_callback, dbbrowser, NULL, &dbbrowser->blurb_button, FALSE, FALSE, - _("Close"), dialog_close_callback, + GTK_STOCK_CLOSE, dialog_close_callback, dbbrowser, NULL, NULL, FALSE, TRUE, NULL); diff --git a/plug-ins/dbbrowser/gimpprocview.c b/plug-ins/dbbrowser/gimpprocview.c index 15640f4f63..17ac50517a 100644 --- a/plug-ins/dbbrowser/gimpprocview.c +++ b/plug-ins/dbbrowser/gimpprocview.c @@ -148,9 +148,9 @@ gimp_db_browser (GimpDBBrowserApplyCallback apply_callback) dbbrowser, NULL, &dbbrowser->name_button, TRUE, FALSE, _("Search by Blurb"), dialog_search_callback, dbbrowser, NULL, &dbbrowser->blurb_button, FALSE, FALSE, - _("Apply"), dialog_apply_callback, + GTK_STOCK_APPLY, dialog_apply_callback, dbbrowser, NULL, NULL, FALSE, FALSE, - _("Close"), dialog_close_callback, + GTK_STOCK_CLOSE, dialog_close_callback, dbbrowser, NULL, NULL, FALSE, TRUE, NULL); @@ -167,7 +167,7 @@ gimp_db_browser (GimpDBBrowserApplyCallback apply_callback) dbbrowser, NULL, &dbbrowser->name_button, TRUE, FALSE, _("Search by Blurb"), dialog_search_callback, dbbrowser, NULL, &dbbrowser->blurb_button, FALSE, FALSE, - _("Close"), dialog_close_callback, + GTK_STOCK_CLOSE, dialog_close_callback, dbbrowser, NULL, NULL, FALSE, TRUE, NULL); diff --git a/plug-ins/dbbrowser/plugin-browser.c b/plug-ins/dbbrowser/plugin-browser.c index 21e203f64e..22b0234bfe 100644 --- a/plug-ins/dbbrowser/plugin-browser.c +++ b/plug-ins/dbbrowser/plugin-browser.c @@ -999,7 +999,7 @@ gimp_plugin_desc (void) _("Search by Name"), dialog_search_callback, plugindesc, NULL, NULL, FALSE, FALSE, - _("Close"), dialog_close_callback, + GTK_STOCK_CLOSE, dialog_close_callback, plugindesc, NULL, NULL, TRUE, TRUE, NULL); diff --git a/plug-ins/fits/fits.c b/plug-ins/fits/fits.c index 20e130f934..7901bd3168 100644 --- a/plug-ins/fits/fits.c +++ b/plug-ins/fits/fits.c @@ -984,9 +984,9 @@ load_dialog (void) GTK_WIN_POS_MOUSE, FALSE, FALSE, FALSE, - _("OK"), load_ok_callback, + GTK_STOCK_OK, load_ok_callback, NULL, NULL, NULL, TRUE, FALSE, - _("Cancel"), gtk_widget_destroy, + GTK_STOCK_CANCEL, gtk_widget_destroy, NULL, 1, NULL, FALSE, TRUE, NULL); diff --git a/plug-ins/flame/flame.c b/plug-ins/flame/flame.c index 27d4d0cf45..85657b1967 100644 --- a/plug-ins/flame/flame.c +++ b/plug-ins/flame/flame.c @@ -630,9 +630,9 @@ edit_callback (GtkWidget *widget, GTK_WIN_POS_MOUSE, FALSE, FALSE, FALSE, - _("OK"), edit_ok_callback, + GTK_STOCK_OK, edit_ok_callback, NULL, NULL, NULL, TRUE, FALSE, - _("Cancel"), gtk_widget_hide, + GTK_STOCK_CANCEL, gtk_widget_hide, NULL, 1, NULL, FALSE, TRUE, NULL); @@ -919,9 +919,9 @@ dialog (void) GTK_WIN_POS_MOUSE, FALSE, TRUE, FALSE, - _("OK"), ok_callback, + GTK_STOCK_OK, ok_callback, NULL, NULL, NULL, TRUE, FALSE, - _("Cancel"), gtk_widget_destroy, + GTK_STOCK_CANCEL, gtk_widget_destroy, NULL, 1, NULL, FALSE, TRUE, NULL); diff --git a/plug-ins/gap/gap_arr_dialog.c b/plug-ins/gap/gap_arr_dialog.c index 86e15f6c23..1dda714bd2 100644 --- a/plug-ins/gap/gap_arr_dialog.c +++ b/plug-ins/gap/gap_arr_dialog.c @@ -765,8 +765,8 @@ gint p_array_std_dialog(char *title_txt, for(l_idx = 0; l_idx < b_argc; l_idx++) { - if(b_argv[l_idx].but_txt == NULL) button = gtk_button_new_with_label ( _("OK")); - else button = gtk_button_new_with_label (b_argv[l_idx].but_txt); + if(b_argv[l_idx].but_txt == NULL) button = gtk_button_new_from_stock ( GTK_STOCK_OK); + else button = gtk_button_new_from_stock (b_argv[l_idx].but_txt); GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT); gtk_signal_connect (GTK_OBJECT (button), "clicked", (GtkSignalFunc) but_array_callback, @@ -780,7 +780,7 @@ gint p_array_std_dialog(char *title_txt, if(b_argc < 1) { /* if no buttons are specified use one CLOSE button per default */ - button = gtk_button_new_with_label ( _("Close")); + button = gtk_button_new_from_stock ( GTK_STOCK_CLOSE); GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT); gtk_signal_connect (GTK_OBJECT (button), "clicked", (GtkSignalFunc) but_array_callback, @@ -1007,9 +1007,9 @@ gint p_array_dialog(char *title_txt, { static t_but_arg b_argv[2]; - b_argv[0].but_txt = _("OK"); + b_argv[0].but_txt = GTK_STOCK_OK; b_argv[0].but_val = TRUE; - b_argv[1].but_txt = _("Cancel"); + b_argv[1].but_txt = GTK_STOCK_CANCEL; b_argv[1].but_val = FALSE; return( p_array_std_dialog(title_txt, diff --git a/plug-ins/gap/gap_dbbrowser_utils.c b/plug-ins/gap/gap_dbbrowser_utils.c index 65052651ad..4ed49feb8b 100644 --- a/plug-ins/gap/gap_dbbrowser_utils.c +++ b/plug-ins/gap/gap_dbbrowser_utils.c @@ -218,7 +218,7 @@ gap_db_browser_dialog(char *title_txt, gtk_widget_show (dbbrowser->app_vary_button); } else dbbrowser->app_vary_button = NULL; - button = gtk_button_new_with_label ( _("Cancel")); + button = gtk_button_new_from_stock ( GTK_STOCK_CANCEL); GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT); gtk_signal_connect (GTK_OBJECT (button), "clicked", (GtkSignalFunc) dialog_close_callback, dbbrowser); diff --git a/plug-ins/gap/gap_decode_mpeg_main.c b/plug-ins/gap/gap_decode_mpeg_main.c index 946eee851d..661ac6ec4e 100644 --- a/plug-ins/gap/gap_decode_mpeg_main.c +++ b/plug-ins/gap/gap_decode_mpeg_main.c @@ -334,7 +334,7 @@ p_overwrite_dialog(char *filename, gint overwrite_mode) l_argv[0].but_val = 0; l_argv[1].but_txt = _("Overwrite All"); l_argv[1].but_val = 1; - l_argv[2].but_txt = _("Cancel"); + l_argv[2].but_txt = GTK_STOCK_CANCEL; l_argv[2].but_val = -1; p_init_arr_arg(&argv[0], WGT_LABEL); diff --git a/plug-ins/gap/gap_decode_xanim.c b/plug-ins/gap/gap_decode_xanim.c index 2ae62dd3b6..079135ca9a 100644 --- a/plug-ins/gap/gap_decode_xanim.c +++ b/plug-ins/gap/gap_decode_xanim.c @@ -173,9 +173,9 @@ p_xanim_info(char *errlist) l_idx++; /* the Action Button */ - b_argv[0].but_txt = _("Cancel"); + b_argv[0].but_txt = GTK_STOCK_CANCEL; b_argv[0].but_val = -1; - b_argv[1].but_txt = _("OK"); + b_argv[1].but_txt = GTK_STOCK_OK; b_argv[1].but_val = 0; l_rc = p_array_std_dialog(_("XANIM Information"), @@ -338,7 +338,7 @@ p_overwrite_dialog(char *filename, gint overwrite_mode) l_argv[0].but_val = 0; l_argv[1].but_txt = _("Overwrite All"); l_argv[1].but_val = 1; - l_argv[2].but_txt = _("Cancel"); + l_argv[2].but_txt = GTK_STOCK_CANCEL; l_argv[2].but_val = -1; p_init_arr_arg(&argv[0], WGT_LABEL); diff --git a/plug-ins/gap/gap_filter_foreach.c b/plug-ins/gap/gap_filter_foreach.c index 1d68f2d38f..3ac625f5df 100644 --- a/plug-ins/gap/gap_filter_foreach.c +++ b/plug-ins/gap/gap_filter_foreach.c @@ -131,7 +131,7 @@ static gint p_pitstop(GimpRunModeType run_mode, char *plugin_name, gint text_fla l_but_argv[0].but_txt = _("Continue"); l_but_argv[0].but_val = 0; - l_but_argv[1].but_txt = _("Cancel"); + l_but_argv[1].but_txt = GTK_STOCK_CANCEL; l_but_argv[1].but_val = -1; g_snprintf(l_skip_txt, sizeof(l_skip_txt), _("Skip %d"), (int)layer_idx); l_but_argv[2].but_txt = l_skip_txt; diff --git a/plug-ins/gap/gap_lib.c b/plug-ins/gap/gap_lib.c index 11160d4da8..8e661ad5b9 100644 --- a/plug-ins/gap/gap_lib.c +++ b/plug-ins/gap/gap_lib.c @@ -228,7 +228,7 @@ void p_msg_win(GimpRunModeType run_mode, char *msg) static t_but_arg l_argv[1]; int l_argc; - l_argv[0].but_txt = _("OK"); + l_argv[0].but_txt = GTK_STOCK_OK; l_argv[0].but_val = 0; l_argc = 1; @@ -1024,7 +1024,7 @@ int p_decide_save_as(gint32 image_id, char *sav_name) /* no defined value found (this is the 1.st call for this image_id) * ask what to do with a 3 Button dialog */ - l_argv[0].but_txt = _("Cancel"); + l_argv[0].but_txt = GTK_STOCK_CANCEL; l_argv[0].but_val = -1; l_argv[1].but_txt = _("Save Flattened"); l_argv[1].but_val = 1; diff --git a/plug-ins/gap/gap_mod_layer.c b/plug-ins/gap/gap_mod_layer.c index 439bd8d1ec..066f113dd5 100644 --- a/plug-ins/gap/gap_mod_layer.c +++ b/plug-ins/gap/gap_mod_layer.c @@ -144,9 +144,9 @@ int p_layer_modify_dialog(t_anim_info *ainfo_ptr, l_rc = -1; /* the 3 Action Buttons */ - b_argv[0].but_txt = _("OK"); + b_argv[0].but_txt = GTK_STOCK_OK; b_argv[0].but_val = 0; - b_argv[1].but_txt = _("Cancel"); + b_argv[1].but_txt = GTK_STOCK_CANCEL; b_argv[1].but_val = -1; p_init_arr_arg(&argv[0], WGT_LABEL); @@ -261,7 +261,7 @@ p_pitstop_dialog(gint text_flag, char *filter_procname) l_but_argv[0].but_txt = _("Continue"); l_but_argv[0].but_val = 0; - l_but_argv[1].but_txt = _("Cancel"); + l_but_argv[1].but_txt = GTK_STOCK_CANCEL; l_but_argv[1].but_val = -1; l_but_argc = 2; diff --git a/plug-ins/gap/gap_mov_dialog.c b/plug-ins/gap/gap_mov_dialog.c index 35e2f75d63..bb97b34017 100644 --- a/plug-ins/gap/gap_mov_dialog.c +++ b/plug-ins/gap/gap_mov_dialog.c @@ -494,7 +494,7 @@ mov_dialog ( GimpDrawable *drawable, t_mov_path_preview *path_ptr, gtk_box_pack_end (GTK_BOX (GTK_DIALOG (dlg)->action_area), hbbox, FALSE, FALSE, 0); gtk_widget_show (hbbox); - button = gtk_button_new_with_label ( _("OK")); + button = gtk_button_new_from_stock ( GTK_STOCK_OK); GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT); gtk_signal_connect (GTK_OBJECT (button), "clicked", (GtkSignalFunc) mov_ok_callback, @@ -525,7 +525,7 @@ mov_dialog ( GimpDrawable *drawable, t_mov_path_preview *path_ptr, , NULL); gtk_widget_show (button); - button = gtk_button_new_with_label ( _("Cancel")); + button = gtk_button_new_from_stock ( GTK_STOCK_CANCEL); GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT); gtk_signal_connect_object (GTK_OBJECT (button), "clicked", (GtkSignalFunc) gtk_widget_destroy, @@ -2678,7 +2678,7 @@ p_chk_keyframes(t_mov_path_preview *path_ptr) b_argv[0].but_txt = _("Reset Keyframes"); b_argv[0].but_val = TRUE; - b_argv[1].but_txt = _("Cancel"); + b_argv[1].but_txt = GTK_STOCK_CANCEL; b_argv[1].but_val = FALSE; if(TRUE == p_array_std_dialog( _("Move Path Controlpointcheck"), diff --git a/plug-ins/gap/gap_mpege.c b/plug-ins/gap/gap_mpege.c index 7d73ef73a2..42a539867e 100644 --- a/plug-ins/gap/gap_mpege.c +++ b/plug-ins/gap/gap_mpege.c @@ -186,9 +186,9 @@ int p_mpege_info(t_anim_info *ainfo_ptr, char *errlist, t_gap_mpeg_encoder encod l_idx++; /* the Action Button */ - b_argv[0].but_txt = _("Cancel"); + b_argv[0].but_txt = GTK_STOCK_CANCEL; b_argv[0].but_val = -1; - b_argv[1].but_txt = _("OK"); + b_argv[1].but_txt = GTK_STOCK_OK; b_argv[1].but_val = 0; l_rc = p_array_std_dialog(_("MPEG_ENCODE Information"), @@ -237,7 +237,7 @@ int p_mpege_dialog(t_anim_info *ainfo_ptr, t_mpg_par *mp_ptr, t_gap_mpeg_encoder l_rc = -1; /* the 3 Action Buttons */ - b_argv[0].but_txt = _("Cancel"); + b_argv[0].but_txt = GTK_STOCK_CANCEL; b_argv[0].but_val = -1; b_argv[1].but_txt = _("GenParams"); b_argv[1].but_val = 0; diff --git a/plug-ins/gap/gap_navigator_dialog.c b/plug-ins/gap/gap_navigator_dialog.c index 7b5611d189..1fd9dcc9de 100644 --- a/plug-ins/gap/gap_navigator_dialog.c +++ b/plug-ins/gap/gap_navigator_dialog.c @@ -3157,7 +3157,7 @@ int gap_navigator(gint32 image_id) (GTK_CONTAINER (GTK_DIALOG (shell)->action_area), 1); /* The close button */ - button = gtk_button_new_with_label (_("Close")); + button = gtk_button_new_from_stock (GTK_STOCK_CLOSE); gtk_signal_connect_object (GTK_OBJECT (button), "clicked", GTK_SIGNAL_FUNC (gtk_widget_destroy), GTK_OBJECT (shell)); diff --git a/plug-ins/gap/gap_range_ops.c b/plug-ins/gap/gap_range_ops.c index d5ff1032d0..a1bfcd48a7 100644 --- a/plug-ins/gap/gap_range_ops.c +++ b/plug-ins/gap/gap_range_ops.c @@ -1241,7 +1241,7 @@ p_frames_convert(t_anim_info *ainfo_ptr, l_argv[0].but_val = 0; l_argv[1].but_txt = _("Overwrite All"); l_argv[1].but_val = 1; - l_argv[2].but_txt = _("Cancel"); + l_argv[2].but_txt = GTK_STOCK_CANCEL; l_argv[2].but_val = -1; l_overwrite_mode = p_buttons_dialog ( _("GAP Question"), l_sav_name, 3, l_argv, -1); diff --git a/plug-ins/gap/gap_resi_dialog.c b/plug-ins/gap/gap_resi_dialog.c index da475ea70f..13c2c1fbc6 100644 --- a/plug-ins/gap/gap_resi_dialog.c +++ b/plug-ins/gap/gap_resi_dialog.c @@ -146,7 +146,7 @@ p_resi_dialog (gint32 image_id, t_gap_asiz asiz_mode, char *title_text, gtk_box_pack_start (GTK_BOX (vbox), image_resize->resize->resize_widget, FALSE, FALSE, 0); /* Action area */ - button = gtk_button_new_with_label ( _("OK")); + button = gtk_button_new_from_stock ( GTK_STOCK_OK); GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT); gtk_signal_connect (GTK_OBJECT (button), "clicked", (GtkSignalFunc) res_ok_callback, @@ -155,7 +155,7 @@ p_resi_dialog (gint32 image_id, t_gap_asiz asiz_mode, char *title_text, gtk_widget_grab_default (button); gtk_widget_show (button); - button = gtk_button_new_with_label ( _("Cancel")); + button = gtk_button_new_from_stock ( GTK_STOCK_CANCEL); GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT); gtk_signal_connect (GTK_OBJECT (button), "clicked", (GtkSignalFunc) res_cancel_callback, diff --git a/plug-ins/gdyntext/charmap_window.c b/plug-ins/gdyntext/charmap_window.c index 612b27a87d..119eeff8d5 100644 --- a/plug-ins/gdyntext/charmap_window.c +++ b/plug-ins/gdyntext/charmap_window.c @@ -136,7 +136,7 @@ static void charmap_window_init(CharMapWindow *cmw) gtk_tooltips_set_tip(tooltips, cmw->insert_button, _("Insert the selected char at the cursor position"), NULL); gtk_widget_show(cmw->insert_button); - cmw->close_button = gtk_button_new_with_label(_("Close")); + cmw->close_button = gtk_button_new_from_stock(GTK_STOCK_CLOSE); gtk_box_pack_start(GTK_BOX(hbbox1), cmw->close_button, FALSE, FALSE, 0); GTK_WIDGET_SET_FLAGS(cmw->close_button, GTK_CAN_DEFAULT); gtk_widget_grab_default(cmw->close_button); diff --git a/plug-ins/gdyntext/gdyntext_ui.c b/plug-ins/gdyntext/gdyntext_ui.c index ef7d146eb5..5b9c46ddeb 100644 --- a/plug-ins/gdyntext/gdyntext_ui.c +++ b/plug-ins/gdyntext/gdyntext_ui.c @@ -220,7 +220,7 @@ create_about_dialog (void) gtk_button_box_set_layout(GTK_BUTTON_BOX(hbbox1), GTK_BUTTONBOX_END); gtk_widget_show(hbbox1); - button = gtk_button_new_with_label(_("OK")); + button = gtk_button_new_from_stock(GTK_STOCK_OK); gtk_widget_show(button); GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT); gtk_box_pack_end(GTK_BOX(hbbox1), button, FALSE, TRUE, 4); @@ -610,7 +610,7 @@ create_main_window (GdtMainWindow **main_window, gtk_button_box_set_spacing(GTK_BUTTON_BOX(hbbox2), 4); gtk_widget_show(hbbox2); - button_ok = gtk_button_new_with_label(_("OK")); + button_ok = gtk_button_new_from_stock(GTK_STOCK_OK); GTK_WIDGET_SET_FLAGS(button_ok, GTK_CAN_DEFAULT); gtk_signal_connect(GTK_OBJECT(button_ok), "button_press_event", GTK_SIGNAL_FUNC(on_main_window_ok_press_event), data); @@ -630,7 +630,7 @@ create_main_window (GdtMainWindow **main_window, gtk_box_pack_start(GTK_BOX(hbbox2), button_apply, FALSE, FALSE, 0); gtk_widget_show(button_apply); - button_cancel = gtk_button_new_with_label(_("Close")); + button_cancel = gtk_button_new_from_stock(GTK_STOCK_CLOSE); GTK_WIDGET_SET_FLAGS(button_cancel, GTK_CAN_DEFAULT); gtk_signal_connect(GTK_OBJECT(button_cancel), "clicked", GTK_SIGNAL_FUNC(on_main_window_cancel_clicked), &mw->ok_pressed); diff --git a/plug-ins/gfig/gfig.c b/plug-ins/gfig/gfig.c index 6b1a9f9ce1..f720f7c2f4 100644 --- a/plug-ins/gfig/gfig.c +++ b/plug-ins/gfig/gfig.c @@ -1950,7 +1950,7 @@ num_sides_dialog (gchar *d_title, GTK_WIN_POS_MOUSE, FALSE, TRUE, FALSE, - _("Close"), gtk_widget_destroy, + GTK_STOCK_CLOSE, gtk_widget_destroy, NULL, 1, NULL, TRUE, TRUE, NULL); @@ -2010,7 +2010,7 @@ bezier_dialog (void) GTK_WIN_POS_MOUSE, FALSE, FALSE, FALSE, - _("Close"), gtk_widget_destroy, + GTK_STOCK_CLOSE, gtk_widget_destroy, NULL, 1, NULL, TRUE, TRUE, NULL); @@ -3931,13 +3931,13 @@ gfig_dialog (void) NULL, NULL, NULL, TRUE, FALSE, _("Paint"), gfig_paint_callback, NULL, NULL, NULL, FALSE, FALSE, - _("Save"), save_button_callback, + GTK_STOCK_SAVE, save_button_callback, NULL, NULL, &save_button, FALSE, FALSE, - _("Clear"), gfig_clear_callback, + GTK_STOCK_CLEAR, gfig_clear_callback, NULL, NULL, NULL, FALSE, FALSE, - _("Undo"), gfig_undo_callback, + GTK_STOCK_UNDO, gfig_undo_callback, NULL, NULL, &undo_widget, FALSE, FALSE, - _("Cancel"), gtk_widget_destroy, + GTK_STOCK_CANCEL, gtk_widget_destroy, NULL, 1, NULL, FALSE, TRUE, NULL); @@ -4084,7 +4084,7 @@ gfig_ok_callback (GtkWidget *widget, "filters/gfig.html", FALSE, message, - _("OK"), _("Cancel"), + GTK_STOCK_OK, GTK_STOCK_CANCEL, NULL, NULL, gfig_really_ok_callback, data); @@ -4429,9 +4429,9 @@ gfig_dialog_edit_list (GtkWidget *lwidget, GTK_WIN_POS_MOUSE, FALSE, TRUE, FALSE, - _("OK"), gfig_list_ok_callback, + GTK_STOCK_OK, gfig_list_ok_callback, options, NULL, NULL, TRUE, FALSE, - _("Cancel"), gfig_list_cancel_callback, + GTK_STOCK_CANCEL, gfig_list_cancel_callback, options, NULL, NULL, FALSE, TRUE, NULL); @@ -4512,9 +4512,9 @@ gfig_rescan_list (void) GTK_WIN_POS_MOUSE, FALSE, TRUE, FALSE, - _("OK"), gfig_rescan_ok_callback, + GTK_STOCK_OK, gfig_rescan_ok_callback, NULL, NULL, NULL, TRUE, FALSE, - _("Cancel"), gtk_widget_destroy, + GTK_STOCK_CANCEL, gtk_widget_destroy, NULL, 1, NULL, FALSE, TRUE, NULL); @@ -4817,7 +4817,7 @@ about_button_callback (GtkWidget *widget, GTK_WIN_POS_MOUSE, FALSE, FALSE, FALSE, - _("OK"), gtk_widget_destroy, + GTK_STOCK_OK, gtk_widget_destroy, NULL, 1, NULL, TRUE, TRUE, NULL); @@ -5025,7 +5025,7 @@ gfig_delete_gfig_callback (GtkWidget *widget, "filters/gfig.html", FALSE, str, - _("Delete"), _("Cancel"), + GTK_STOCK_DELETE, GTK_STOCK_CANCEL, NULL, NULL, gfig_do_delete_gfig_callback, data); diff --git a/plug-ins/gflare/gflare.c b/plug-ins/gflare/gflare.c index 6cffd55518..5f302574ba 100644 --- a/plug-ins/gflare/gflare.c +++ b/plug-ins/gflare/gflare.c @@ -2462,9 +2462,9 @@ dlg_run (void) GTK_WIN_POS_MOUSE, FALSE, TRUE, FALSE, - _("OK"), dlg_ok_callback, + GTK_STOCK_OK, dlg_ok_callback, NULL, NULL, NULL, TRUE, FALSE, - _("Cancel"), gtk_widget_destroy, + GTK_STOCK_CANCEL, gtk_widget_destroy, NULL, 1, NULL, FALSE, TRUE, NULL); @@ -3377,7 +3377,7 @@ dlg_selector_delete_callback (GtkWidget *widget, "filters/gflare.html", FALSE, str, - _("Delete"), _("Cancel"), + GTK_STOCK_DELETE, GTK_STOCK_CANCEL, NULL, NULL, dlg_selector_do_delete_callback, NULL); @@ -3476,9 +3476,9 @@ ed_run (GFlare *target_gflare, _("Rescan Gradients"), ed_rescan_callback, NULL, NULL, NULL, FALSE, FALSE, - _("OK"), ed_ok_callback, + GTK_STOCK_OK, ed_ok_callback, NULL, NULL, NULL, TRUE, FALSE, - _("Cancel"), gtk_widget_destroy, + GTK_STOCK_CANCEL, gtk_widget_destroy, NULL, 1, NULL, FALSE, TRUE, NULL); diff --git a/plug-ins/gfli/gfli.c b/plug-ins/gfli/gfli.c index 329b1807b2..85f9ec5efe 100644 --- a/plug-ins/gfli/gfli.c +++ b/plug-ins/gfli/gfli.c @@ -820,9 +820,9 @@ load_dialog (gchar *name) GTK_WIN_POS_MOUSE, FALSE, TRUE, FALSE, - _("OK"), cb_ok, + GTK_STOCK_OK, cb_ok, NULL, NULL, NULL, TRUE, FALSE, - _("Cancel"), gtk_widget_destroy, + GTK_STOCK_CANCEL, gtk_widget_destroy, NULL, 1, NULL, FALSE, TRUE, NULL); @@ -889,9 +889,9 @@ save_dialog (gint32 image_id) GTK_WIN_POS_MOUSE, FALSE, TRUE, FALSE, - _("OK"), cb_ok, + GTK_STOCK_OK, cb_ok, NULL, NULL, NULL, TRUE, FALSE, - _("Cancel"), gtk_widget_destroy, + GTK_STOCK_CANCEL, gtk_widget_destroy, NULL, 1, NULL, FALSE, TRUE, NULL); diff --git a/plug-ins/gimpressionist/gimpressionist.c b/plug-ins/gimpressionist/gimpressionist.c index a0ea6daada..37cd8ef1f5 100644 --- a/plug-ins/gimpressionist/gimpressionist.c +++ b/plug-ins/gimpressionist/gimpressionist.c @@ -339,7 +339,7 @@ void showabout(void) GTK_SIGNAL_FUNC (gtk_widget_hide_on_delete), &window); - tmpw = gtk_button_new_with_label( _("OK")); + tmpw = gtk_button_new_from_stock( GTK_STOCK_OK); GTK_WIDGET_SET_FLAGS(tmpw, GTK_CAN_DEFAULT); gtk_signal_connect_object (GTK_OBJECT(tmpw), "clicked", GTK_SIGNAL_FUNC (gtk_widget_hide), @@ -459,7 +459,7 @@ int create_dialog(void) gtk_box_pack_end (GTK_BOX (box2), box3, FALSE, FALSE, 0); gtk_widget_show (box3); - tmpw = gtk_button_new_with_label( _("OK")); + tmpw = gtk_button_new_from_stock( GTK_STOCK_OK); gtk_signal_connect(GTK_OBJECT(tmpw), "clicked", (GtkSignalFunc)dialog_ok_callback, window); gtk_box_pack_start (GTK_BOX (box3), tmpw, TRUE, TRUE, 0); @@ -468,7 +468,7 @@ int create_dialog(void) gtk_widget_show(tmpw); gtk_tooltips_set_tip(GTK_TOOLTIPS(tooltips), tmpw, _("Run with the selected settings"), NULL); - tmpw = gtk_button_new_with_label( _("Cancel")); + tmpw = gtk_button_new_from_stock( GTK_STOCK_CANCEL); gtk_signal_connect(GTK_OBJECT(tmpw), "clicked", (GtkSignalFunc)dialog_cancel_callback, window); gtk_box_pack_start (GTK_BOX (box3), tmpw, TRUE, TRUE, 0); diff --git a/plug-ins/gimpressionist/orientmap.c b/plug-ins/gimpressionist/orientmap.c index 043facbd18..e54f49cf48 100644 --- a/plug-ins/gimpressionist/orientmap.c +++ b/plug-ins/gimpressionist/orientmap.c @@ -623,21 +623,21 @@ void create_orientmap_dialog(void) gtk_container_set_border_width (GTK_CONTAINER (tmpw), 2); gtk_widget_show(tmpw); - tmpw = gtk_button_new_with_label( _("OK")); + tmpw = gtk_button_new_from_stock( GTK_STOCK_OK); gtk_box_pack_start(GTK_BOX(hbox),tmpw,FALSE,TRUE,0); gtk_widget_show(tmpw); gtk_signal_connect (GTK_OBJECT(tmpw), "clicked", GTK_SIGNAL_FUNC(omokclick), omwindow); gtk_tooltips_set_tip(GTK_TOOLTIPS(tooltips), tmpw, _("Apply and exit the editor"), NULL); - tmpw = gtk_button_new_with_label( _("Apply")); + tmpw = gtk_button_new_from_stock( GTK_STOCK_APPLY); gtk_box_pack_start(GTK_BOX(hbox),tmpw,FALSE,TRUE,0); gtk_widget_show(tmpw); gtk_signal_connect (GTK_OBJECT(tmpw), "clicked", GTK_SIGNAL_FUNC(omokclick), NULL); gtk_tooltips_set_tip(GTK_TOOLTIPS(tooltips), tmpw, _("Apply, but stay inside the editor"), NULL); - tmpw = gtk_button_new_with_label( _("Cancel")); + tmpw = gtk_button_new_from_stock( GTK_STOCK_CANCEL); gtk_box_pack_start(GTK_BOX(hbox),tmpw,FALSE,TRUE,0); gtk_widget_show(tmpw); gtk_signal_connect (GTK_OBJECT(tmpw), "clicked", diff --git a/plug-ins/gimpressionist/presets.c b/plug-ins/gimpressionist/presets.c index 4edcccd5c4..ed1a0fd076 100644 --- a/plug-ins/gimpressionist/presets.c +++ b/plug-ins/gimpressionist/presets.c @@ -393,7 +393,7 @@ void create_savepreset(void) (GtkSignalFunc) presetdesccallback, NULL); - button = gtk_button_new_with_label ( _("OK")); + button = gtk_button_new_from_stock ( GTK_STOCK_OK); gtk_signal_connect_object (GTK_OBJECT (button), "clicked", GTK_SIGNAL_FUNC (oksavepreset), GTK_OBJECT(window)); @@ -401,7 +401,7 @@ void create_savepreset(void) gtk_widget_show (button); - button = gtk_button_new_with_label ( _("Cancel")); + button = gtk_button_new_from_stock ( GTK_STOCK_CANCEL); gtk_signal_connect_object (GTK_OBJECT (button), "clicked", GTK_SIGNAL_FUNC (gtk_widget_destroy), GTK_OBJECT(window)); diff --git a/plug-ins/gimpressionist/sizemap.c b/plug-ins/gimpressionist/sizemap.c index f48ee796e2..0db939843e 100644 --- a/plug-ins/gimpressionist/sizemap.c +++ b/plug-ins/gimpressionist/sizemap.c @@ -482,7 +482,7 @@ void create_sizemap_dialog(void) gtk_container_set_border_width (GTK_CONTAINER (tmpw), 2); gtk_widget_show(tmpw); - tmpw = gtk_button_new_with_label( _("OK")); + tmpw = gtk_button_new_from_stock( GTK_STOCK_OK); gtk_box_pack_start(GTK_BOX(hbox),tmpw,FALSE,TRUE,0); gtk_widget_show(tmpw); gtk_signal_connect (GTK_OBJECT(tmpw), "clicked", @@ -496,7 +496,7 @@ void create_sizemap_dialog(void) GTK_SIGNAL_FUNC(smokclick), NULL); gtk_tooltips_set_tip(GTK_TOOLTIPS(tooltips), tmpw, _("Apply, but stay inside the editor"), NULL); - tmpw = gtk_button_new_with_label( _("Cancel")); + tmpw = gtk_button_new_from_stock( GTK_STOCK_CANCEL); gtk_box_pack_start(GTK_BOX(hbox),tmpw,FALSE,TRUE,0); gtk_widget_show(tmpw); gtk_signal_connect (GTK_OBJECT(tmpw), "clicked", diff --git a/plug-ins/helpbrowser/helpbrowser.c b/plug-ins/helpbrowser/helpbrowser.c index fe16c7aae2..2fd1c03eb0 100644 --- a/plug-ins/helpbrowser/helpbrowser.c +++ b/plug-ins/helpbrowser/helpbrowser.c @@ -843,7 +843,7 @@ open_browser_dialog (gchar *help_path, bbox = gtk_hbutton_box_new (); gtk_box_pack_end (GTK_BOX (hbox), bbox, FALSE, FALSE, 0); - button = gtk_button_new_with_label (_("Close")); + button = gtk_button_new_with_label (GTK_STOCK_CLOSE); gtk_button_set_relief (GTK_BUTTON (button), GTK_RELIEF_NONE); gtk_container_add (GTK_CONTAINER (bbox), button); gtk_signal_connect (GTK_OBJECT (button), "clicked", diff --git a/plug-ins/ifscompose/ifscompose.c b/plug-ins/ifscompose/ifscompose.c index 4fdcdb19f4..4e18c8cc0f 100644 --- a/plug-ins/ifscompose/ifscompose.c +++ b/plug-ins/ifscompose/ifscompose.c @@ -786,7 +786,7 @@ ifs_compose_dialog (GimpDrawable *drawable) GTK_WIN_POS_MOUSE, FALSE, TRUE, FALSE, - _("OK"), ifs_compose_ok_callback, + GTK_STOCK_OK, ifs_compose_ok_callback, NULL, NULL, NULL, TRUE, FALSE, _("New"), ifs_compose_new_callback, NULL, NULL, NULL, FALSE, FALSE, @@ -794,7 +794,7 @@ ifs_compose_dialog (GimpDrawable *drawable) NULL, NULL, NULL, FALSE, FALSE, _("Reset"), ifs_compose_defaults_callback, NULL, NULL, NULL, FALSE, FALSE, - _("Cancel"), gtk_widget_destroy, + GTK_STOCK_CANCEL, gtk_widget_destroy, NULL, 1, NULL, FALSE, TRUE, NULL); @@ -1238,7 +1238,7 @@ ifs_options_dialog (void) GTK_WIN_POS_MOUSE, FALSE, TRUE, FALSE, - _("Close"), gtk_widget_hide, + GTK_STOCK_CLOSE, gtk_widget_hide, NULL, 1, NULL, TRUE, TRUE, NULL); diff --git a/plug-ins/imagemap/imap_default_dialog.c b/plug-ins/imagemap/imap_default_dialog.c index e9d12816ef..307b902a39 100644 --- a/plug-ins/imagemap/imap_default_dialog.c +++ b/plug-ins/imagemap/imap_default_dialog.c @@ -117,7 +117,7 @@ make_default_dialog(const gchar *title) FALSE, 0); gtk_widget_show (hbbox); - data->ok = gtk_button_new_with_label(_("OK")); + data->ok = gtk_button_new_from_stock(GTK_STOCK_OK); GTK_WIDGET_SET_FLAGS(data->ok, GTK_CAN_DEFAULT); gtk_signal_connect(GTK_OBJECT(data->ok), "clicked", GTK_SIGNAL_FUNC(dialog_ok), (gpointer) data); @@ -132,7 +132,7 @@ make_default_dialog(const gchar *title) gtk_box_pack_start(GTK_BOX(hbbox), data->apply, FALSE, FALSE, 0); gtk_widget_show(data->apply); - data->cancel = gtk_button_new_with_label(_("Cancel")); + data->cancel = gtk_button_new_from_stock(GTK_STOCK_CANCEL); GTK_WIDGET_SET_FLAGS(data->cancel, GTK_CAN_DEFAULT); gtk_signal_connect(GTK_OBJECT(data->cancel), "clicked", GTK_SIGNAL_FUNC(dialog_cancel), (gpointer) data); diff --git a/plug-ins/imagemap/imap_menu.c b/plug-ins/imagemap/imap_menu.c index 73fc6300ed..6f6aa6e0de 100644 --- a/plug-ins/imagemap/imap_menu.c +++ b/plug-ins/imagemap/imap_menu.c @@ -224,7 +224,7 @@ make_file_menu(GtkWidget *menu_bar) make_item_with_label(file_menu, _("Preferences..."), menu_command, &_menu.cmd_preferences); make_separator(file_menu); - item = make_item_with_label(file_menu, _("Close"), menu_command, + item = make_item_with_label(file_menu, GTK_STOCK_CLOSE, menu_command, &_menu.cmd_close); add_accelerator(item, 'W', GDK_CONTROL_MASK); item = make_item_with_label(file_menu, _("Quit"), menu_command, diff --git a/plug-ins/jpeg/jpeg-load.c b/plug-ins/jpeg/jpeg-load.c index f5e5514b41..66238360b5 100644 --- a/plug-ins/jpeg/jpeg-load.c +++ b/plug-ins/jpeg/jpeg-load.c @@ -1576,9 +1576,9 @@ save_dialog (void) GTK_WIN_POS_MOUSE, FALSE, TRUE, FALSE, - _("OK"), save_ok_callback, + GTK_STOCK_OK, save_ok_callback, NULL, NULL, NULL, TRUE, FALSE, - _("Cancel"), gtk_widget_destroy, + GTK_STOCK_CANCEL, gtk_widget_destroy, NULL, 1, NULL, FALSE, TRUE, NULL); diff --git a/plug-ins/jpeg/jpeg-load.h b/plug-ins/jpeg/jpeg-load.h index f5e5514b41..66238360b5 100644 --- a/plug-ins/jpeg/jpeg-load.h +++ b/plug-ins/jpeg/jpeg-load.h @@ -1576,9 +1576,9 @@ save_dialog (void) GTK_WIN_POS_MOUSE, FALSE, TRUE, FALSE, - _("OK"), save_ok_callback, + GTK_STOCK_OK, save_ok_callback, NULL, NULL, NULL, TRUE, FALSE, - _("Cancel"), gtk_widget_destroy, + GTK_STOCK_CANCEL, gtk_widget_destroy, NULL, 1, NULL, FALSE, TRUE, NULL); diff --git a/plug-ins/jpeg/jpeg-save.c b/plug-ins/jpeg/jpeg-save.c index f5e5514b41..66238360b5 100644 --- a/plug-ins/jpeg/jpeg-save.c +++ b/plug-ins/jpeg/jpeg-save.c @@ -1576,9 +1576,9 @@ save_dialog (void) GTK_WIN_POS_MOUSE, FALSE, TRUE, FALSE, - _("OK"), save_ok_callback, + GTK_STOCK_OK, save_ok_callback, NULL, NULL, NULL, TRUE, FALSE, - _("Cancel"), gtk_widget_destroy, + GTK_STOCK_CANCEL, gtk_widget_destroy, NULL, 1, NULL, FALSE, TRUE, NULL); diff --git a/plug-ins/jpeg/jpeg-save.h b/plug-ins/jpeg/jpeg-save.h index f5e5514b41..66238360b5 100644 --- a/plug-ins/jpeg/jpeg-save.h +++ b/plug-ins/jpeg/jpeg-save.h @@ -1576,9 +1576,9 @@ save_dialog (void) GTK_WIN_POS_MOUSE, FALSE, TRUE, FALSE, - _("OK"), save_ok_callback, + GTK_STOCK_OK, save_ok_callback, NULL, NULL, NULL, TRUE, FALSE, - _("Cancel"), gtk_widget_destroy, + GTK_STOCK_CANCEL, gtk_widget_destroy, NULL, 1, NULL, FALSE, TRUE, NULL); diff --git a/plug-ins/jpeg/jpeg.c b/plug-ins/jpeg/jpeg.c index f5e5514b41..66238360b5 100644 --- a/plug-ins/jpeg/jpeg.c +++ b/plug-ins/jpeg/jpeg.c @@ -1576,9 +1576,9 @@ save_dialog (void) GTK_WIN_POS_MOUSE, FALSE, TRUE, FALSE, - _("OK"), save_ok_callback, + GTK_STOCK_OK, save_ok_callback, NULL, NULL, NULL, TRUE, FALSE, - _("Cancel"), gtk_widget_destroy, + GTK_STOCK_CANCEL, gtk_widget_destroy, NULL, 1, NULL, FALSE, TRUE, NULL); diff --git a/plug-ins/jpeg/jpeg.h b/plug-ins/jpeg/jpeg.h index f5e5514b41..66238360b5 100644 --- a/plug-ins/jpeg/jpeg.h +++ b/plug-ins/jpeg/jpeg.h @@ -1576,9 +1576,9 @@ save_dialog (void) GTK_WIN_POS_MOUSE, FALSE, TRUE, FALSE, - _("OK"), save_ok_callback, + GTK_STOCK_OK, save_ok_callback, NULL, NULL, NULL, TRUE, FALSE, - _("Cancel"), gtk_widget_destroy, + GTK_STOCK_CANCEL, gtk_widget_destroy, NULL, 1, NULL, FALSE, TRUE, NULL); diff --git a/plug-ins/maze/maze_face.c b/plug-ins/maze/maze_face.c index e43b7b51c4..9b2cac48a2 100644 --- a/plug-ins/maze/maze_face.c +++ b/plug-ins/maze/maze_face.c @@ -188,11 +188,11 @@ maze_dialog (void) GTK_WIN_POS_MOUSE, FALSE, TRUE, FALSE, - _("OK"), maze_ok_callback, + GTK_STOCK_OK, maze_ok_callback, NULL, NULL, NULL, TRUE, FALSE, _("Help"), maze_help, NULL, NULL, NULL, FALSE, FALSE, - _("Cancel"), gtk_widget_destroy, + GTK_STOCK_CANCEL, gtk_widget_destroy, NULL, 1, NULL, FALSE, TRUE, NULL); diff --git a/plug-ins/mosaic/mosaic.c b/plug-ins/mosaic/mosaic.c index 351ccf6870..76033d5300 100644 --- a/plug-ins/mosaic/mosaic.c +++ b/plug-ins/mosaic/mosaic.c @@ -548,9 +548,9 @@ mosaic_dialog (void) GTK_WIN_POS_MOUSE, FALSE, TRUE, FALSE, - _("OK"), mosaic_ok_callback, + GTK_STOCK_OK, mosaic_ok_callback, NULL, NULL, NULL, TRUE, FALSE, - _("Cancel"), gtk_widget_destroy, + GTK_STOCK_CANCEL, gtk_widget_destroy, NULL, 1, NULL, FALSE, TRUE, NULL); diff --git a/plug-ins/pagecurl/pagecurl.c b/plug-ins/pagecurl/pagecurl.c index 82c0bb9964..91395db9f6 100644 --- a/plug-ins/pagecurl/pagecurl.c +++ b/plug-ins/pagecurl/pagecurl.c @@ -515,9 +515,9 @@ do_dialog (void) GTK_WIN_POS_MOUSE, FALSE, TRUE, FALSE, - _("OK"), dialog_ok_callback, + GTK_STOCK_OK, dialog_ok_callback, NULL, NULL, NULL, TRUE, FALSE, - _("Cancel"), gtk_widget_destroy, + GTK_STOCK_CANCEL, gtk_widget_destroy, NULL, 1, NULL, FALSE, TRUE, NULL); diff --git a/plug-ins/plugin-helper/color_picker.c b/plug-ins/plugin-helper/color_picker.c index 9825086828..c566b0cd68 100644 --- a/plug-ins/plugin-helper/color_picker.c +++ b/plug-ins/plugin-helper/color_picker.c @@ -328,7 +328,7 @@ color_picker_button_press (Tool *tool, gimp_dialog_create_action_area (GTK_DIALOG (color_picker_info->shell), - _("Close"), color_picker_info_window_close_callback, + GTK_STOCK_CLOSE, color_picker_info_window_close_callback, color_picker_info, NULL, NULL, TRUE, FALSE, NULL); diff --git a/plug-ins/plugin-helper/iwarp.c b/plug-ins/plugin-helper/iwarp.c index 4c1969aa59..fffb511306 100644 --- a/plug-ins/plugin-helper/iwarp.c +++ b/plug-ins/plugin-helper/iwarp.c @@ -1130,11 +1130,11 @@ iwarp_dialog (void) GTK_WIN_POS_MOUSE, FALSE, TRUE, FALSE, - _("OK"), iwarp_ok_callback, + GTK_STOCK_OK, iwarp_ok_callback, NULL, NULL, NULL, TRUE, FALSE, _("Reset"), iwarp_reset_callback, NULL, NULL, NULL, FALSE, FALSE, - _("Cancel"), gtk_widget_destroy, + GTK_STOCK_CANCEL, gtk_widget_destroy, NULL, 1, NULL, FALSE, TRUE, NULL); diff --git a/plug-ins/print/gimp_color_window.c b/plug-ins/print/gimp_color_window.c index 514a2c0516..86e3bb046d 100644 --- a/plug-ins/print/gimp_color_window.c +++ b/plug-ins/print/gimp_color_window.c @@ -139,7 +139,7 @@ gimp_create_color_adjust_window (void) _("Set Defaults"), gimp_set_color_defaults, NULL, NULL, NULL, FALSE, FALSE, - _("Close"), gtk_widget_hide, + GTK_STOCK_CLOSE, gtk_widget_hide, NULL, 1, NULL, TRUE, TRUE, NULL); diff --git a/plug-ins/print/gimp_main_window.c b/plug-ins/print/gimp_main_window.c index 9969edae1b..d035fdc984 100644 --- a/plug-ins/print/gimp_main_window.c +++ b/plug-ins/print/gimp_main_window.c @@ -267,7 +267,7 @@ gimp_create_main_window (void) NULL, NULL, NULL, FALSE, FALSE, _("Print"), gimp_print_callback, NULL, NULL, NULL, TRUE, FALSE, - _("Cancel"), gtk_widget_destroy, + GTK_STOCK_CANCEL, gtk_widget_destroy, NULL, 1, NULL, FALSE, TRUE, NULL); @@ -826,9 +826,9 @@ gimp_create_main_window (void) GTK_WIN_POS_MOUSE, FALSE, TRUE, FALSE, - _("OK"), gimp_setup_ok_callback, + GTK_STOCK_OK, gimp_setup_ok_callback, NULL, NULL, NULL, TRUE, FALSE, - _("Cancel"), gtk_widget_hide, + GTK_STOCK_CANCEL, gtk_widget_hide, NULL, 1, NULL, FALSE, TRUE, NULL); diff --git a/plug-ins/rcm/rcm_dialog.c b/plug-ins/rcm/rcm_dialog.c index 0cbecc694c..be2dcd51b3 100644 --- a/plug-ins/rcm/rcm_dialog.c +++ b/plug-ins/rcm/rcm_dialog.c @@ -731,9 +731,9 @@ rcm_dialog (void) GTK_WIN_POS_MOUSE, FALSE, TRUE, FALSE, - _("OK"), rcm_ok_callback, + GTK_STOCK_OK, rcm_ok_callback, NULL, NULL, NULL, TRUE, FALSE, - _("Cancel"), gtk_widget_destroy, + GTK_STOCK_CANCEL, gtk_widget_destroy, NULL, 1, NULL, FALSE, TRUE, NULL); diff --git a/plug-ins/script-fu/script-fu-console.c b/plug-ins/script-fu/script-fu-console.c index 951c92eb08..40f482ef37 100644 --- a/plug-ins/script-fu/script-fu-console.c +++ b/plug-ins/script-fu/script-fu-console.c @@ -174,7 +174,7 @@ script_fu_console_interface (void) GTK_WIN_POS_MOUSE, FALSE, TRUE, FALSE, - _("Close"), gtk_widget_destroy, NULL, + GTK_STOCK_CLOSE, gtk_widget_destroy, NULL, 1, NULL, FALSE, TRUE, NULL); diff --git a/plug-ins/script-fu/script-fu-interface.c b/plug-ins/script-fu/script-fu-interface.c index f799038f13..aab8df424c 100644 --- a/plug-ins/script-fu/script-fu-interface.c +++ b/plug-ins/script-fu/script-fu-interface.c @@ -1523,7 +1523,7 @@ script_fu_interface (SFScript *script) gtk_box_pack_end (GTK_BOX (hbox), bbox, FALSE, FALSE, 0); gtk_widget_show (bbox); - button = gtk_button_new_with_label (_("OK")); + button = gtk_button_new_from_stock (GTK_STOCK_OK); GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT); gtk_container_add (GTK_CONTAINER (bbox), button); gtk_widget_grab_default (button); @@ -1533,7 +1533,7 @@ script_fu_interface (SFScript *script) G_CALLBACK (script_fu_ok_callback), script); - button = gtk_button_new_with_label (_("Cancel")); + button = gtk_button_new_from_stock (GTK_STOCK_CANCEL); GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT); gtk_container_add (GTK_CONTAINER (bbox), button); gtk_widget_show (button); @@ -1960,7 +1960,7 @@ script_fu_about_callback (GtkWidget *widget, GTK_WIN_POS_MOUSE, FALSE, TRUE, FALSE, - _("Close"), gtk_widget_destroy, NULL, + GTK_STOCK_CLOSE, gtk_widget_destroy, NULL, 1, NULL, TRUE, TRUE, NULL); diff --git a/plug-ins/script-fu/script-fu-scripts.c b/plug-ins/script-fu/script-fu-scripts.c index f799038f13..aab8df424c 100644 --- a/plug-ins/script-fu/script-fu-scripts.c +++ b/plug-ins/script-fu/script-fu-scripts.c @@ -1523,7 +1523,7 @@ script_fu_interface (SFScript *script) gtk_box_pack_end (GTK_BOX (hbox), bbox, FALSE, FALSE, 0); gtk_widget_show (bbox); - button = gtk_button_new_with_label (_("OK")); + button = gtk_button_new_from_stock (GTK_STOCK_OK); GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT); gtk_container_add (GTK_CONTAINER (bbox), button); gtk_widget_grab_default (button); @@ -1533,7 +1533,7 @@ script_fu_interface (SFScript *script) G_CALLBACK (script_fu_ok_callback), script); - button = gtk_button_new_with_label (_("Cancel")); + button = gtk_button_new_from_stock (GTK_STOCK_CANCEL); GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT); gtk_container_add (GTK_CONTAINER (bbox), button); gtk_widget_show (button); @@ -1960,7 +1960,7 @@ script_fu_about_callback (GtkWidget *widget, GTK_WIN_POS_MOUSE, FALSE, TRUE, FALSE, - _("Close"), gtk_widget_destroy, NULL, + GTK_STOCK_CLOSE, gtk_widget_destroy, NULL, 1, NULL, TRUE, TRUE, NULL); diff --git a/plug-ins/script-fu/script-fu-server.c b/plug-ins/script-fu/script-fu-server.c index 171eb6a74b..502db1bf64 100644 --- a/plug-ins/script-fu/script-fu-server.c +++ b/plug-ins/script-fu/script-fu-server.c @@ -553,9 +553,9 @@ server_interface (void) GTK_WIN_POS_MOUSE, FALSE, TRUE, FALSE, - _("OK"), ok_callback, + GTK_STOCK_OK, ok_callback, NULL, NULL, NULL, TRUE, FALSE, - _("Cancel"), gtk_widget_destroy, + GTK_STOCK_CANCEL, gtk_widget_destroy, NULL, 1, NULL, FALSE, TRUE, NULL); diff --git a/plug-ins/sel2path/sel2path.c b/plug-ins/sel2path/sel2path.c index e21ac7874c..b05a744954 100644 --- a/plug-ins/sel2path/sel2path.c +++ b/plug-ins/sel2path/sel2path.c @@ -333,13 +333,13 @@ sel2path_dialog (SELVALS *sels) GTK_WIN_POS_MOUSE, FALSE, TRUE, FALSE, - _("OK"), sel2path_ok_callback, + GTK_STOCK_OK, sel2path_ok_callback, NULL, NULL, NULL, TRUE, FALSE, _("Reset"), sel2path_reset_callback, NULL, NULL, NULL, FALSE, FALSE, - _("Cancel"), gtk_widget_destroy, + GTK_STOCK_CANCEL, gtk_widget_destroy, NULL, 1, NULL, FALSE, TRUE, NULL); diff --git a/plug-ins/sgi/sgi.c b/plug-ins/sgi/sgi.c index 1777379a7b..8c7bcbc493 100644 --- a/plug-ins/sgi/sgi.c +++ b/plug-ins/sgi/sgi.c @@ -637,9 +637,9 @@ save_dialog (void) GTK_WIN_POS_MOUSE, FALSE, FALSE, FALSE, - _("OK"), save_ok_callback, + GTK_STOCK_OK, save_ok_callback, NULL, NULL, NULL, TRUE, FALSE, - _("Cancel"), gtk_widget_destroy, + GTK_STOCK_CANCEL, gtk_widget_destroy, NULL, 1, NULL, FALSE, TRUE, NULL); diff --git a/plug-ins/webbrowser/webbrowser.c b/plug-ins/webbrowser/webbrowser.c index f4f22f9e44..02293de18c 100644 --- a/plug-ins/webbrowser/webbrowser.c +++ b/plug-ins/webbrowser/webbrowser.c @@ -278,9 +278,9 @@ open_url_dialog (void) _("About"), about_callback, NULL, NULL, NULL, FALSE, FALSE, - _("OK"), ok_callback, + GTK_STOCK_OK, ok_callback, NULL, NULL, NULL, TRUE, FALSE, - _("Cancel"), gtk_widget_destroy, + GTK_STOCK_CANCEL, gtk_widget_destroy, NULL, 1, NULL, FALSE, TRUE, NULL); diff --git a/plug-ins/winsnap/winsnap.c b/plug-ins/winsnap/winsnap.c index c4fbad7bde..8ea1e49d10 100644 --- a/plug-ins/winsnap/winsnap.c +++ b/plug-ins/winsnap/winsnap.c @@ -910,7 +910,7 @@ snap_dialog(void) gtk_widget_grab_default(button); gtk_widget_show(button); - button = gtk_button_new_with_label(_("Cancel")); + button = gtk_button_new_from_stock(GTK_STOCK_CANCEL); GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT); gtk_signal_connect_object (GTK_OBJECT (button), "clicked", (GtkSignalFunc) gtk_widget_destroy, diff --git a/plug-ins/xjt/xjt.c b/plug-ins/xjt/xjt.c index 77c55091b5..9ce0707e20 100644 --- a/plug-ins/xjt/xjt.c +++ b/plug-ins/xjt/xjt.c @@ -790,9 +790,9 @@ save_dialog (void) GTK_WIN_POS_MOUSE, FALSE, TRUE, FALSE, - _("OK"), save_ok_callback, + GTK_STOCK_OK, save_ok_callback, NULL, NULL, NULL, TRUE, FALSE, - _("Cancel"), gtk_widget_destroy, + GTK_STOCK_CANCEL, gtk_widget_destroy, NULL, 1, NULL, FALSE, TRUE, NULL);