diff --git a/ChangeLog b/ChangeLog index 8141512c37..c6a7866c25 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,23 @@ +2006-06-28 Sven Neumann + + * libgimp/gimpfontselectbutton.[ch] + * libgimp/gimpgradientselectbutton.[ch] + * libgimp/gimppaletteselectbutton.[ch] + * libgimp/gimppatternselectbutton.[ch]: for consistency with + GimpBrushSelectButton dropped the _name suffix from the getter + and setter API. + + * libgimp/gimpfontmenu.c + * libgimp/gimpgradientmenu.c + * libgimp/gimppalettemenu.c + * libgimp/gimppatternmenu.c + * plug-ins/gfig/gfig-style.c + * plug-ins/script-fu/script-fu-interface.c: changed accordingly. + + * libgimp/gimpbrushmenu.c + * libgimp/gimpbrushselectbutton.[ch] + * libgimp/gimpselectbutton.c: cleanup for consistency. + 2006-06-28 Sven Neumann * tools/pdbgen/pdb/text_tool.pdb: applied a (slightly modified) diff --git a/devel-docs/ChangeLog b/devel-docs/ChangeLog index 22be7c7331..7ae1f38fdb 100644 --- a/devel-docs/ChangeLog +++ b/devel-docs/ChangeLog @@ -1,3 +1,26 @@ +2006-06-28 Sven Neumann + + * libgimp/tmpl/gimpbrushselectbutton.sgml + * libgimp/tmpl/gimpgradientselectbutton.sgml + * libgimp/tmpl/gimppaletteselectbutton.sgml + * libgimp/tmpl/gimppatternselectbutton.sgml + * libgimp/tmpl/gimpselectbutton.sgml: new files. + + * libgimp/libgimp-docs.sgml + * libgimp/libgimp-sections.txt + * libgimp/libgimp.types: added docs for GimpSelectButton widgets. + + * libgimp/tmpl/gimpfontselectbutton.sgml: regenerated. + + * libgimpcolor/libgimpcolor-sections.txt: added docs for GValue API. + + * libgimpcolor/tmpl/gimprgb.sgml: regenerated. + + * libgimpwidgets/libgimpwidgets-sections.txt: updated. + + * libgimpwidgets/tmpl/gimppropwidgets.sgml + * libgimpwidgets/tmpl/gimpstock.sgml: regenerated. + 2006-06-02 Sven Neumann * libgimpbase/libgimpbase-docs.sgml diff --git a/devel-docs/libgimp/libgimp-docs.sgml b/devel-docs/libgimp/libgimp-docs.sgml index b247763772..958fe3f59b 100644 --- a/devel-docs/libgimp/libgimp-docs.sgml +++ b/devel-docs/libgimp/libgimp-docs.sgml @@ -82,8 +82,14 @@ Controlling the Core's Selection Dialogs - + + + + + + + diff --git a/devel-docs/libgimp/libgimp-sections.txt b/devel-docs/libgimp/libgimp-sections.txt index 5e4325d700..d25f61b7b2 100644 --- a/devel-docs/libgimp/libgimp-sections.txt +++ b/devel-docs/libgimp/libgimp-sections.txt @@ -1039,14 +1039,49 @@ GIMP_IS_PROGRESS_BAR_CLASS GIMP_PROGRESS_BAR_GET_CLASS +
+gimpbrushselectbutton +GimpBrushSelectButton +GimpBrushSelectButton +gimp_brush_select_button_new +gimp_brush_select_button_get_brush +gimp_brush_select_button_set_brush + +GimpBrushSelectButtonClass +GIMP_BRUSH_SELECT_BUTTON +GIMP_IS_BRUSH_SELECT_BUTTON +GIMP_TYPE_BRUSH_SELECT_BUTTON +gimp_brush_select_button_get_type +GIMP_BRUSH_SELECT_BUTTON_CLASS +GIMP_IS_BRUSH_SELECT_BUTTON_CLASS +GIMP_BRUSH_SELECT_BUTTON_GET_CLASS +
+ +
+gimpgradientselectbutton +GimpGradientSelectButton +GimpGradientSelectButton +gimp_gradient_select_button_new +gimp_gradient_select_button_get_gradient +gimp_gradient_select_button_set_gradient + +GimpGradientSelectButtonClass +GIMP_GRADIENT_SELECT_BUTTON +GIMP_IS_GRADIENT_SELECT_BUTTON +GIMP_TYPE_GRADIENT_SELECT_BUTTON +gimp_gradient_select_button_get_type +GIMP_GRADIENT_SELECT_BUTTON_CLASS +GIMP_IS_GRADIENT_SELECT_BUTTON_CLASS +GIMP_GRADIENT_SELECT_BUTTON_GET_CLASS +
+
gimpfontselectbutton GimpFontSelectButton GimpFontSelectButton gimp_font_select_button_new -gimp_font_select_button_get_font_name -gimp_font_select_button_set_font_name -gimp_font_select_button_close_popup +gimp_font_select_button_get_font +gimp_font_select_button_set_font GimpFontSelectButtonClass GIMP_FONT_SELECT_BUTTON @@ -1058,6 +1093,58 @@ GIMP_IS_FONT_SELECT_BUTTON_CLASS GIMP_FONT_SELECT_BUTTON_GET_CLASS
+
+gimppaletteselectbutton +GimpPaletteSelectButton +GimpPaletteSelectButton +gimp_palette_select_button_new +gimp_palette_select_button_get_palette +gimp_palette_select_button_set_palette + +GimpPaletteSelectButtonClass +GIMP_PALETTE_SELECT_BUTTON +GIMP_IS_PALETTE_SELECT_BUTTON +GIMP_TYPE_PALETTE_SELECT_BUTTON +gimp_palette_select_button_get_type +GIMP_PALETTE_SELECT_BUTTON_CLASS +GIMP_IS_PALETTE_SELECT_BUTTON_CLASS +GIMP_PALETTE_SELECT_BUTTON_GET_CLASS +
+ +
+gimppatternselectbutton +GimpPatternSelectButton +GimpPatternSelectButton +gimp_pattern_select_button_new +gimp_pattern_select_button_get_pattern +gimp_pattern_select_button_set_pattern + +GimpPatternSelectButtonClass +GIMP_PATTERN_SELECT_BUTTON +GIMP_IS_PATTERN_SELECT_BUTTON +GIMP_TYPE_PATTERN_SELECT_BUTTON +gimp_pattern_select_button_get_type +GIMP_PATTERN_SELECT_BUTTON_CLASS +GIMP_IS_PATTERN_SELECT_BUTTON_CLASS +GIMP_PATTERN_SELECT_BUTTON_GET_CLASS +
+ +
+gimpselectbutton +GimpSelectButton +GimpSelectButton +gimp_select_button_close_popup + +GimpSelectButtonClass +GIMP_SELECT_BUTTON +GIMP_IS_SELECT_BUTTON +GIMP_TYPE_SELECT_BUTTON +gimp_select_button_get_type +GIMP_SELECT_BUTTON_CLASS +GIMP_IS_SELECT_BUTTON_CLASS +GIMP_SELECT_BUTTON_GET_CLASS +
+
gimpmenu GimpConstraintFunc diff --git a/devel-docs/libgimp/libgimp.types b/devel-docs/libgimp/libgimp.types index d2223bbf32..7998fbbf44 100644 --- a/devel-docs/libgimp/libgimp.types +++ b/devel-docs/libgimp/libgimp.types @@ -4,12 +4,17 @@ #include gimp_aspect_preview_get_type +gimp_brush_select_button_get_type gimp_channel_combo_box_get_type gimp_drawable_combo_box_get_type gimp_drawable_preview_get_type gimp_font_select_button_get_type +gimp_font_select_button_get_type +gimp_gradient_select_button_get_type gimp_image_combo_box_get_type gimp_layer_combo_box_get_type +gimp_palette_select_button_get_type gimp_proc_browser_dialog_get_type gimp_progress_bar_get_type +gimp_select_button_get_type gimp_zoom_preview_get_type diff --git a/devel-docs/libgimp/tmpl/gimpbrushselectbutton.sgml b/devel-docs/libgimp/tmpl/gimpbrushselectbutton.sgml new file mode 100644 index 0000000000..2a3897d186 --- /dev/null +++ b/devel-docs/libgimp/tmpl/gimpbrushselectbutton.sgml @@ -0,0 +1,102 @@ + +GimpBrushSelectButton + + + + + + + + + + + + + + + + + + + + + + + + + + + + +@gimpbrushselectbutton: the object which received the signal. +@arg1: +@arg2: +@arg3: +@arg4: +@arg5: +@arg6: +@arg7: +@arg8: + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +@title: +@brush_name: +@opacity: +@spacing: +@paint_mode: +@Returns: + + + + + + + +@button: +@opacity: +@spacing: +@paint_mode: +@Returns: + + + + + + + +@button: +@brush_name: +@opacity: +@spacing: +@paint_mode: + + diff --git a/devel-docs/libgimp/tmpl/gimpfontselectbutton.sgml b/devel-docs/libgimp/tmpl/gimpfontselectbutton.sgml index 55685184dc..375839cdba 100644 --- a/devel-docs/libgimp/tmpl/gimpfontselectbutton.sgml +++ b/devel-docs/libgimp/tmpl/gimpfontselectbutton.sgml @@ -9,11 +9,13 @@ GimpFontSelectButton + + @@ -32,16 +34,19 @@ GimpFontSelectButton @arg1: @arg2: - - - - + + + + + + + @@ -52,7 +57,7 @@ GimpFontSelectButton @Returns: - + @@ -61,7 +66,7 @@ GimpFontSelectButton @Returns: - + @@ -70,11 +75,3 @@ GimpFontSelectButton @font_name: - - - - - -@button: - - diff --git a/devel-docs/libgimp/tmpl/gimpgradientselectbutton.sgml b/devel-docs/libgimp/tmpl/gimpgradientselectbutton.sgml new file mode 100644 index 0000000000..44a3b5391d --- /dev/null +++ b/devel-docs/libgimp/tmpl/gimpgradientselectbutton.sgml @@ -0,0 +1,74 @@ + +GimpGradientSelectButton + + + + + + + + + + + + + + + + + + + + + + + + + + + + +@gimpgradientselectbutton: the object which received the signal. +@arg1: +@arg2: +@arg3: +@arg4: + + + + + + + + + + + + + + + + +@title: +@gradient_name: +@Returns: + + + + + + + +@button: +@Returns: + + + + + + + +@button: +@gradient_name: + + diff --git a/devel-docs/libgimp/tmpl/gimppaletteselectbutton.sgml b/devel-docs/libgimp/tmpl/gimppaletteselectbutton.sgml new file mode 100644 index 0000000000..ae2d08cb08 --- /dev/null +++ b/devel-docs/libgimp/tmpl/gimppaletteselectbutton.sgml @@ -0,0 +1,72 @@ + +GimpPaletteSelectButton + + + + + + + + + + + + + + + + + + + + + + + + + + + + +@gimppaletteselectbutton: the object which received the signal. +@arg1: +@arg2: + + + + + + + + + + + + + + + + +@title: +@palette_name: +@Returns: + + + + + + + +@button: +@Returns: + + + + + + + +@button: +@palette_name: + + diff --git a/devel-docs/libgimp/tmpl/gimppatternselectbutton.sgml b/devel-docs/libgimp/tmpl/gimppatternselectbutton.sgml new file mode 100644 index 0000000000..8a293bc845 --- /dev/null +++ b/devel-docs/libgimp/tmpl/gimppatternselectbutton.sgml @@ -0,0 +1,54 @@ + +GimpPatternSelectButton + + + + + + + + + + + + + + + + + + + + + + +@parent_instance: + + + + + + +@title: +@pattern_name: +@Returns: + + + + + + + +@button: +@Returns: + + + + + + + +@button: +@pattern_name: + + diff --git a/devel-docs/libgimp/tmpl/gimpselectbutton.sgml b/devel-docs/libgimp/tmpl/gimpselectbutton.sgml new file mode 100644 index 0000000000..0034218d93 --- /dev/null +++ b/devel-docs/libgimp/tmpl/gimpselectbutton.sgml @@ -0,0 +1,33 @@ + +GimpSelectButton + + + + + + + + + + + + + + + + + + + + + + + + + + + + +@button: + + diff --git a/devel-docs/libgimpcolor/libgimpcolor-sections.txt b/devel-docs/libgimpcolor/libgimpcolor-sections.txt index c2b546c679..b172f57039 100644 --- a/devel-docs/libgimpcolor/libgimpcolor-sections.txt +++ b/devel-docs/libgimpcolor/libgimpcolor-sections.txt @@ -89,6 +89,8 @@ GIMP_TYPE_PARAM_RGB gimp_param_spec_rgb gimp_param_spec_rgb_has_alpha GIMP_VALUE_HOLDS_RGB +gimp_value_get_rgb +gimp_value_set_rgb GIMP_IS_PARAM_SPEC_RGB gimp_param_rgb_get_type diff --git a/devel-docs/libgimpcolor/tmpl/gimprgb.sgml b/devel-docs/libgimpcolor/tmpl/gimprgb.sgml index 96494e1976..7858c307c3 100644 --- a/devel-docs/libgimpcolor/tmpl/gimprgb.sgml +++ b/devel-docs/libgimpcolor/tmpl/gimprgb.sgml @@ -431,3 +431,21 @@ coefficients taken from the NTSC analog television standard. @value: + + + + + +@value: +@rgb: + + + + + + + +@value: +@rgb: + + diff --git a/devel-docs/libgimpwidgets/libgimpwidgets-sections.txt b/devel-docs/libgimpwidgets/libgimpwidgets-sections.txt index 90e41d84b2..52189b8302 100644 --- a/devel-docs/libgimpwidgets/libgimpwidgets-sections.txt +++ b/devel-docs/libgimpwidgets/libgimpwidgets-sections.txt @@ -608,6 +608,7 @@ GIMP_STOCK_IMAGES GIMP_STOCK_LAYERS GIMP_STOCK_CHANNELS GIMP_STOCK_PATHS +GIMP_STOCK_COLORMAP GIMP_STOCK_INDEXED_PALETTE GIMP_STOCK_CURSOR GIMP_STOCK_SAMPLE_POINT @@ -679,6 +680,7 @@ GIMP_STOCK_DEFAULT_COLORS GIMP_STOCK_SWAP_COLORS GIMP_STOCK_UNDO_HISTORY GIMP_STOCK_TOOL_AIRBRUSH +GIMP_STOCK_TOOL_ALIGN GIMP_STOCK_TOOL_BLEND GIMP_STOCK_TOOL_BLUR GIMP_STOCK_TOOL_BRIGHTNESS_CONTRAST @@ -813,7 +815,6 @@ gimp_prop_label_new gimp_prop_entry_new gimp_prop_text_buffer_new gimp_prop_file_chooser_button_new -gimp_prop_file_entry_new gimp_prop_path_editor_new gimp_prop_size_entry_new gimp_prop_coordinates_new diff --git a/devel-docs/libgimpwidgets/tmpl/gimppropwidgets.sgml b/devel-docs/libgimpwidgets/tmpl/gimppropwidgets.sgml index c46af017dc..6b20cd01f0 100644 --- a/devel-docs/libgimpwidgets/tmpl/gimppropwidgets.sgml +++ b/devel-docs/libgimpwidgets/tmpl/gimppropwidgets.sgml @@ -262,19 +262,6 @@ GimpPropWidgets @Returns: - - - - - -@config: -@property_name: -@filesel_title: -@dir_only: -@check_valid: -@Returns: - - diff --git a/devel-docs/libgimpwidgets/tmpl/gimpstock.sgml b/devel-docs/libgimpwidgets/tmpl/gimpstock.sgml index 1251f5c04a..da8ad4bd5b 100644 --- a/devel-docs/libgimpwidgets/tmpl/gimpstock.sgml +++ b/devel-docs/libgimpwidgets/tmpl/gimpstock.sgml @@ -476,14 +476,20 @@ RTL variant - - - - + + + + + + + + + + @@ -982,6 +988,14 @@ RTL variant + + + + + + + + @@ -1434,6 +1448,3 @@ RTL variant - - - diff --git a/libgimp/gimpbrushmenu.c b/libgimp/gimpbrushmenu.c index 2db565a720..4d255f7c49 100644 --- a/libgimp/gimpbrushmenu.c +++ b/libgimp/gimpbrushmenu.c @@ -130,9 +130,8 @@ gimp_brush_select_widget_set (GtkWidget *widget, { g_return_if_fail (widget != NULL); - gimp_brush_select_button_set_brush - (GIMP_BRUSH_SELECT_BUTTON (widget), brush_name, - opacity, spacing, paint_mode); + gimp_brush_select_button_set_brush (GIMP_BRUSH_SELECT_BUTTON (widget), + brush_name, opacity, spacing, paint_mode); } diff --git a/libgimp/gimpbrushselectbutton.c b/libgimp/gimpbrushselectbutton.c index a6a75b6188..ba838c743e 100644 --- a/libgimp/gimpbrushselectbutton.c +++ b/libgimp/gimpbrushselectbutton.c @@ -89,7 +89,7 @@ static void gimp_brush_select_button_get_property (GObject *object, GValue *value, GParamSpec *pspec); -static void gimp_brush_select_button_clicked (GimpBrushSelectButton *brush_button); +static void gimp_brush_select_button_clicked (GimpBrushSelectButton *button); static void gimp_brush_select_button_callback (const gchar *brush_name, gdouble opacity, @@ -101,10 +101,10 @@ static void gimp_brush_select_button_callback (const gchar *brush_nam gboolean dialog_closing, gpointer user_data); -static void gimp_brush_select_preview_resize (GimpBrushSelectButton *brush_button); +static void gimp_brush_select_preview_resize (GimpBrushSelectButton *button); static gboolean gimp_brush_select_preview_events (GtkWidget *widget, GdkEvent *event, - GimpBrushSelectButton *brush_button); + GimpBrushSelectButton *button); static void gimp_brush_select_preview_draw (GimpPreviewArea *area, gint x, gint y, @@ -117,12 +117,12 @@ static void gimp_brush_select_preview_update (GtkWidget *previe gint brush_height, const guchar *mask_data); -static void gimp_brush_select_button_open_popup (GimpBrushSelectButton *brush_button, +static void gimp_brush_select_button_open_popup (GimpBrushSelectButton *button, gint x, gint y); -static void gimp_brush_select_button_close_popup (GimpBrushSelectButton *brush_button); +static void gimp_brush_select_button_close_popup (GimpBrushSelectButton *button); -static void gimp_brush_select_drag_data_received (GimpBrushSelectButton *brush_button, +static void gimp_brush_select_drag_data_received (GimpBrushSelectButton *button, GdkDragContext *context, gint x, gint y, @@ -130,7 +130,7 @@ static void gimp_brush_select_drag_data_received (GimpBrushSelectButton *brush guint info, guint time); -static GtkWidget * gimp_brush_select_button_create_inside (GimpBrushSelectButton *brush_button); +static GtkWidget * gimp_brush_select_button_create_inside (GimpBrushSelectButton *button); static const GtkTargetEntry target = { "application/x-gimp-brush-name", 0 }; @@ -266,7 +266,7 @@ gimp_brush_select_button_class_init (GimpBrushSelectButtonClass *klass) } static void -gimp_brush_select_button_init (GimpBrushSelectButton *brush_button) +gimp_brush_select_button_init (GimpBrushSelectButton *button) { GimpBrushSelectButtonPrivate *priv; gint mask_bpp; @@ -274,8 +274,8 @@ gimp_brush_select_button_init (GimpBrushSelectButton *brush_button) gint color_bpp; gint color_data_size; guint8 *color_data; - - priv = GIMP_BRUSH_SELECT_BUTTON_GET_PRIVATE (brush_button); + + priv = GIMP_BRUSH_SELECT_BUTTON_GET_PRIVATE (button); priv->brush_name = gimp_context_get_brush (); gimp_brush_get_pixels (priv->brush_name, @@ -288,8 +288,8 @@ gimp_brush_select_button_init (GimpBrushSelectButton *brush_button) &color_data_size, &color_data); - priv->inside = gimp_brush_select_button_create_inside (brush_button); - gtk_container_add (GTK_CONTAINER (brush_button), priv->inside); + priv->inside = gimp_brush_select_button_create_inside (button); + gtk_container_add (GTK_CONTAINER (button), priv->inside); priv->popup = NULL; } @@ -318,25 +318,25 @@ gimp_brush_select_button_new (const gchar *title, gint spacing, GimpLayerModeEffects paint_mode) { - GtkWidget *brush_button; + GtkWidget *button; if (title) - brush_button = g_object_new (GIMP_TYPE_BRUSH_SELECT_BUTTON, - "title", title, - "brush-name", brush_name, - "brush-opacity", opacity, - "brush-spacing", spacing, - "brush-paint-mode", paint_mode, - NULL); + button = g_object_new (GIMP_TYPE_BRUSH_SELECT_BUTTON, + "title", title, + "brush-name", brush_name, + "brush-opacity", opacity, + "brush-spacing", spacing, + "brush-paint-mode", paint_mode, + NULL); else - brush_button = g_object_new (GIMP_TYPE_BRUSH_SELECT_BUTTON, - "brush-name", brush_name, - "brush-opacity", opacity, - "brush-spacing", spacing, - "brush-paint-mode", paint_mode, - NULL); + button = g_object_new (GIMP_TYPE_BRUSH_SELECT_BUTTON, + "brush-name", brush_name, + "brush-opacity", opacity, + "brush-spacing", spacing, + "brush-paint-mode", paint_mode, + NULL); - return brush_button; + return button; } /** @@ -353,14 +353,16 @@ gimp_brush_select_button_new (const gchar *title, * Since: GIMP 2.4 */ G_CONST_RETURN gchar * -gimp_brush_select_button_get_brush (GimpBrushSelectButton *brush_button, +gimp_brush_select_button_get_brush (GimpBrushSelectButton *button, gdouble *opacity, gint *spacing, GimpLayerModeEffects *paint_mode) { GimpBrushSelectButtonPrivate *priv; - g_return_val_if_fail (GIMP_IS_BRUSH_SELECT_BUTTON (brush_button), NULL); + g_return_val_if_fail (GIMP_IS_BRUSH_SELECT_BUTTON (button), NULL); + + priv = GIMP_BRUSH_SELECT_BUTTON_GET_PRIVATE (button); if (opacity) *opacity = priv->opacity; @@ -371,13 +373,12 @@ gimp_brush_select_button_get_brush (GimpBrushSelectButton *brush_button, if (paint_mode) *paint_mode = priv->paint_mode; - priv = GIMP_BRUSH_SELECT_BUTTON_GET_PRIVATE (brush_button); return priv->brush_name; } /** * gimp_brush_select_button_set_brush: - * @brush_button: A #GimpBrushSelectButton + * @button: A #GimpBrushSelectButton * @brush_name: Brush name to set; %NULL means no change. * @opacity: Opacity to set. -1.0 means no change. * @spacing: Spacing to set. -1 means no change. @@ -389,17 +390,17 @@ gimp_brush_select_button_get_brush (GimpBrushSelectButton *brush_button, * Since: GIMP 2.4 */ void -gimp_brush_select_button_set_brush (GimpBrushSelectButton *brush_button, +gimp_brush_select_button_set_brush (GimpBrushSelectButton *button, const gchar *brush_name, gdouble opacity, - gint spacing, + gint spacing, GimpLayerModeEffects paint_mode) { GimpSelectButton *select_button; - g_return_if_fail (GIMP_IS_BRUSH_SELECT_BUTTON (brush_button)); + g_return_if_fail (GIMP_IS_BRUSH_SELECT_BUTTON (button)); - select_button = GIMP_SELECT_BUTTON (brush_button); + select_button = GIMP_SELECT_BUTTON (button); if (select_button->temp_callback) { @@ -448,7 +449,7 @@ gimp_brush_select_button_set_brush (GimpBrushSelectButton *brush_button, gimp_brush_select_button_callback (name, opacity, spacing, paint_mode, width, height, mask_data, - FALSE, brush_button); + FALSE, button); g_free (mask_data); } @@ -485,11 +486,10 @@ gimp_brush_select_button_set_property (GObject *object, const GValue *value, GParamSpec *pspec) { - GimpBrushSelectButton *brush_button; + GimpBrushSelectButton *button = GIMP_BRUSH_SELECT_BUTTON (object); GimpBrushSelectButtonPrivate *priv; - brush_button = GIMP_BRUSH_SELECT_BUTTON (object); - priv = GIMP_BRUSH_SELECT_BUTTON_GET_PRIVATE (brush_button); + priv = GIMP_BRUSH_SELECT_BUTTON_GET_PRIVATE (button); switch (property_id) { @@ -497,7 +497,7 @@ gimp_brush_select_button_set_property (GObject *object, priv->title = g_value_dup_string (value); break; case PROP_BRUSH_NAME: - gimp_brush_select_button_set_brush (brush_button, + gimp_brush_select_button_set_brush (button, g_value_get_string (value), -1.0, -1, -1); break; @@ -522,11 +522,10 @@ gimp_brush_select_button_get_property (GObject *object, GValue *value, GParamSpec *pspec) { - GimpBrushSelectButton *brush_button; + GimpBrushSelectButton *button = GIMP_BRUSH_SELECT_BUTTON (object); GimpBrushSelectButtonPrivate *priv; - brush_button = GIMP_BRUSH_SELECT_BUTTON (object); - priv = GIMP_BRUSH_SELECT_BUTTON_GET_PRIVATE (brush_button); + priv = GIMP_BRUSH_SELECT_BUTTON_GET_PRIVATE (button); switch (property_id) { @@ -562,14 +561,14 @@ gimp_brush_select_button_callback (const gchar *name, gboolean dialog_closing, gpointer data) { - GimpBrushSelectButton *brush_button; + GimpBrushSelectButton *button; GimpBrushSelectButtonPrivate *priv; GimpSelectButton *select_button; - brush_button = GIMP_BRUSH_SELECT_BUTTON (data); + button = GIMP_BRUSH_SELECT_BUTTON (data); - priv = GIMP_BRUSH_SELECT_BUTTON_GET_PRIVATE (brush_button); - select_button = GIMP_SELECT_BUTTON (brush_button); + priv = GIMP_BRUSH_SELECT_BUTTON_GET_PRIVATE (button); + select_button = GIMP_SELECT_BUTTON (button); g_free (priv->brush_name); g_free (priv->mask_data); @@ -588,20 +587,20 @@ gimp_brush_select_button_callback (const gchar *name, if (dialog_closing) select_button->temp_callback = NULL; - g_signal_emit (brush_button, brush_button_signals[BRUSH_SET], 0, + g_signal_emit (button, brush_button_signals[BRUSH_SET], 0, name, opacity, spacing, paint_mode, width, height, mask_data, dialog_closing); - g_object_notify (G_OBJECT (brush_button), "brush-name"); + g_object_notify (G_OBJECT (button), "brush-name"); } static void -gimp_brush_select_button_clicked (GimpBrushSelectButton *brush_button) +gimp_brush_select_button_clicked (GimpBrushSelectButton *button) { GimpBrushSelectButtonPrivate *priv; - GimpSelectButton *select_button; - - priv = GIMP_BRUSH_SELECT_BUTTON_GET_PRIVATE (brush_button); - select_button = GIMP_SELECT_BUTTON (brush_button); + GimpSelectButton *select_button; + + priv = GIMP_BRUSH_SELECT_BUTTON_GET_PRIVATE (button); + select_button = GIMP_SELECT_BUTTON (button); if (select_button->temp_callback) { @@ -618,16 +617,16 @@ gimp_brush_select_button_clicked (GimpBrushSelectButton *brush_button) gimp_brush_select_new (priv->title, priv->brush_name, priv->opacity, priv->spacing, priv->paint_mode, gimp_brush_select_button_callback, - brush_button); + button); } } static void -gimp_brush_select_preview_resize (GimpBrushSelectButton *brush_button) +gimp_brush_select_preview_resize (GimpBrushSelectButton *button) { GimpBrushSelectButtonPrivate *priv; - priv = GIMP_BRUSH_SELECT_BUTTON_GET_PRIVATE (brush_button); + priv = GIMP_BRUSH_SELECT_BUTTON_GET_PRIVATE (button); if (priv->width > 0 && priv->height > 0) gimp_brush_select_preview_update (priv->preview, @@ -639,12 +638,12 @@ gimp_brush_select_preview_resize (GimpBrushSelectButton *brush_button) static gboolean gimp_brush_select_preview_events (GtkWidget *widget, GdkEvent *event, - GimpBrushSelectButton *brush_button) + GimpBrushSelectButton *button) { GimpBrushSelectButtonPrivate *priv; - GdkEventButton *bevent; + GdkEventButton *bevent; - priv = GIMP_BRUSH_SELECT_BUTTON_GET_PRIVATE (brush_button); + priv = GIMP_BRUSH_SELECT_BUTTON_GET_PRIVATE (button); if (priv->mask_data) { @@ -656,7 +655,7 @@ gimp_brush_select_preview_events (GtkWidget *widget, if (bevent->button == 1) { gtk_grab_add (widget); - gimp_brush_select_button_open_popup (brush_button, + gimp_brush_select_button_open_popup (button, bevent->x, bevent->y); } break; @@ -667,7 +666,7 @@ gimp_brush_select_preview_events (GtkWidget *widget, if (bevent->button == 1) { gtk_grab_remove (widget); - gimp_brush_select_button_close_popup (brush_button); + gimp_brush_select_button_close_popup (button); } break; @@ -746,7 +745,7 @@ gimp_brush_select_preview_update (GtkWidget *preview, } static void -gimp_brush_select_button_open_popup (GimpBrushSelectButton *brush_button, +gimp_brush_select_button_open_popup (GimpBrushSelectButton *button, gint x, gint y) { @@ -759,10 +758,10 @@ gimp_brush_select_button_open_popup (GimpBrushSelectButton *brush_button, gint scr_w; gint scr_h; - priv = GIMP_BRUSH_SELECT_BUTTON_GET_PRIVATE (brush_button); + priv = GIMP_BRUSH_SELECT_BUTTON_GET_PRIVATE (button); if (priv->popup) - gimp_brush_select_button_close_popup (brush_button); + gimp_brush_select_button_close_popup (button); if (priv->width <= CELL_SIZE && priv->height <= CELL_SIZE) return; @@ -805,11 +804,11 @@ gimp_brush_select_button_open_popup (GimpBrushSelectButton *brush_button, } static void -gimp_brush_select_button_close_popup (GimpBrushSelectButton *brush_button) +gimp_brush_select_button_close_popup (GimpBrushSelectButton *button) { GimpBrushSelectButtonPrivate *priv; - priv = GIMP_BRUSH_SELECT_BUTTON_GET_PRIVATE (brush_button); + priv = GIMP_BRUSH_SELECT_BUTTON_GET_PRIVATE (button); if (priv->popup) { @@ -819,13 +818,13 @@ gimp_brush_select_button_close_popup (GimpBrushSelectButton *brush_button) } static void -gimp_brush_select_drag_data_received (GimpBrushSelectButton *brush_button, - GdkDragContext *context, - gint x, - gint y, - GtkSelectionData *selection, - guint info, - guint time) +gimp_brush_select_drag_data_received (GimpBrushSelectButton *button, + GdkDragContext *context, + gint x, + gint y, + GtkSelectionData *selection, + guint info, + guint time) { gchar *str; @@ -848,7 +847,7 @@ gimp_brush_select_drag_data_received (GimpBrushSelectButton *brush_button, { gchar *name = str + name_offset; - gimp_brush_select_button_set_brush (brush_button, name, -1.0, -1, -1); + gimp_brush_select_button_set_brush (button, name, -1.0, -1, -1); } } @@ -858,9 +857,9 @@ gimp_brush_select_drag_data_received (GimpBrushSelectButton *brush_button, static GtkWidget * gimp_brush_select_button_create_inside (GimpBrushSelectButton *brush_button) { - GtkWidget *hbox; - GtkWidget *frame; - GtkWidget *button; + GtkWidget *hbox; + GtkWidget *frame; + GtkWidget *button; GimpBrushSelectButtonPrivate *priv; priv = GIMP_BRUSH_SELECT_BUTTON_GET_PRIVATE (brush_button); diff --git a/libgimp/gimpbrushselectbutton.h b/libgimp/gimpbrushselectbutton.h index d712cbd99d..9c5590f8fc 100644 --- a/libgimp/gimpbrushselectbutton.h +++ b/libgimp/gimpbrushselectbutton.h @@ -49,7 +49,7 @@ struct _GimpBrushSelectButtonClass GimpSelectButtonClass parent_class; /* brush_set signal is emitted when brush is chosen */ - void (* brush_set) (GimpBrushSelectButton *brush_button, + void (* brush_set) (GimpBrushSelectButton *button, const gchar *brush_name, gdouble opacity, gint spacing, diff --git a/libgimp/gimpfontmenu.c b/libgimp/gimpfontmenu.c index f7331add89..4955d1fd0c 100644 --- a/libgimp/gimpfontmenu.c +++ b/libgimp/gimpfontmenu.c @@ -112,8 +112,8 @@ gimp_font_select_widget_set (GtkWidget *widget, { g_return_if_fail (widget != NULL); - gimp_font_select_button_set_font_name (GIMP_FONT_SELECT_BUTTON (widget), - font_name); + gimp_font_select_button_set_font (GIMP_FONT_SELECT_BUTTON (widget), + font_name); } static void diff --git a/libgimp/gimpfontselectbutton.c b/libgimp/gimpfontselectbutton.c index ed9feb7dc5..0f4b9d8d5f 100644 --- a/libgimp/gimpfontselectbutton.c +++ b/libgimp/gimpfontselectbutton.c @@ -76,13 +76,13 @@ static void gimp_font_select_button_get_property (GObject *object, GValue *value, GParamSpec *pspec); -static void gimp_font_select_button_clicked (GimpFontSelectButton *font_button); +static void gimp_font_select_button_clicked (GimpFontSelectButton *button); static void gimp_font_select_button_callback (const gchar *font_name, gboolean dialog_closing, gpointer user_data); -static void gimp_font_select_drag_data_received (GimpFontSelectButton *font_button, +static void gimp_font_select_drag_data_received (GimpFontSelectButton *button, GdkDragContext *context, gint x, gint y, @@ -171,16 +171,16 @@ gimp_font_select_button_class_init (GimpFontSelectButtonClass *klass) } static void -gimp_font_select_button_init (GimpFontSelectButton *font_button) +gimp_font_select_button_init (GimpFontSelectButton *button) { GimpFontSelectButtonPrivate *priv; - - priv = GIMP_FONT_SELECT_BUTTON_GET_PRIVATE (font_button); + + priv = GIMP_FONT_SELECT_BUTTON_GET_PRIVATE (button); priv->font_name = NULL; - priv->inside = gimp_font_select_button_create_inside (font_button); - gtk_container_add (GTK_CONTAINER (font_button), priv->inside); + priv->inside = gimp_font_select_button_create_inside (button); + gtk_container_add (GTK_CONTAINER (button), priv->inside); } /** @@ -200,24 +200,24 @@ GtkWidget * gimp_font_select_button_new (const gchar *title, const gchar *font_name) { - GtkWidget *font_button; + GtkWidget *button; if (title) - font_button = g_object_new (GIMP_TYPE_FONT_SELECT_BUTTON, - "title", title, - "font-name", font_name, - NULL); + button = g_object_new (GIMP_TYPE_FONT_SELECT_BUTTON, + "title", title, + "font-name", font_name, + NULL); else - font_button = g_object_new (GIMP_TYPE_FONT_SELECT_BUTTON, - "font-name", font_name, - NULL); + button = g_object_new (GIMP_TYPE_FONT_SELECT_BUTTON, + "font-name", font_name, + NULL); - return font_button; + return button; } /** - * gimp_font_select_button_get_font_name: - * @font_button: A #GimpFontSelectButton + * gimp_font_select_button_get_font: + * @button: A #GimpFontSelectButton * * Retrieves the name of currently selected font. * @@ -226,19 +226,19 @@ gimp_font_select_button_new (const gchar *title, * Since: GIMP 2.4 */ G_CONST_RETURN gchar * -gimp_font_select_button_get_font_name (GimpFontSelectButton *font_button) +gimp_font_select_button_get_font (GimpFontSelectButton *button) { GimpFontSelectButtonPrivate *priv; - g_return_val_if_fail (GIMP_IS_FONT_SELECT_BUTTON (font_button), NULL); + g_return_val_if_fail (GIMP_IS_FONT_SELECT_BUTTON (button), NULL); - priv = GIMP_FONT_SELECT_BUTTON_GET_PRIVATE (font_button); + priv = GIMP_FONT_SELECT_BUTTON_GET_PRIVATE (button); return priv->font_name; } /** - * gimp_font_select_button_set_font_name: - * @font_button: A #GimpFontSelectButton + * gimp_font_select_button_set_font: + * @button: A #GimpFontSelectButton * @font_name: Font name to set; %NULL means no change. * * Sets the current font for the font select button. @@ -246,19 +246,19 @@ gimp_font_select_button_get_font_name (GimpFontSelectButton *font_button) * Since: GIMP 2.4 */ void -gimp_font_select_button_set_font_name (GimpFontSelectButton *font_button, - const gchar *font_name) +gimp_font_select_button_set_font (GimpFontSelectButton *button, + const gchar *font_name) { GimpSelectButton *select_button; - g_return_if_fail (GIMP_IS_FONT_SELECT_BUTTON (font_button)); + g_return_if_fail (GIMP_IS_FONT_SELECT_BUTTON (button)); - select_button = GIMP_SELECT_BUTTON (font_button); + select_button = GIMP_SELECT_BUTTON (button); if (select_button->temp_callback) gimp_fonts_set_popup (select_button->temp_callback, font_name); else - gimp_font_select_button_callback (font_name, FALSE, font_button); + gimp_font_select_button_callback (font_name, FALSE, button); } @@ -286,11 +286,10 @@ gimp_font_select_button_set_property (GObject *object, const GValue *value, GParamSpec *pspec) { - GimpFontSelectButton *font_button; + GimpFontSelectButton *button = GIMP_FONT_SELECT_BUTTON (object); GimpFontSelectButtonPrivate *priv; - font_button = GIMP_FONT_SELECT_BUTTON (object); - priv = GIMP_FONT_SELECT_BUTTON_GET_PRIVATE (font_button); + priv = GIMP_FONT_SELECT_BUTTON_GET_PRIVATE (button); switch (property_id) { @@ -298,8 +297,8 @@ gimp_font_select_button_set_property (GObject *object, priv->title = g_value_dup_string (value); break; case PROP_FONT_NAME: - gimp_font_select_button_set_font_name (font_button, - g_value_get_string (value)); + gimp_font_select_button_set_font (button, + g_value_get_string (value)); break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); @@ -313,11 +312,10 @@ gimp_font_select_button_get_property (GObject *object, GValue *value, GParamSpec *pspec) { - GimpFontSelectButton *font_button; + GimpFontSelectButton *button = GIMP_FONT_SELECT_BUTTON (object); GimpFontSelectButtonPrivate *priv; - font_button = GIMP_FONT_SELECT_BUTTON (object); - priv = GIMP_FONT_SELECT_BUTTON_GET_PRIVATE (font_button); + priv = GIMP_FONT_SELECT_BUTTON_GET_PRIVATE (button); switch (property_id) { @@ -338,14 +336,14 @@ gimp_font_select_button_callback (const gchar *font_name, gboolean dialog_closing, gpointer user_data) { - GimpFontSelectButton *font_button; + GimpFontSelectButton *button; GimpFontSelectButtonPrivate *priv; GimpSelectButton *select_button; - font_button = GIMP_FONT_SELECT_BUTTON (user_data); + button = GIMP_FONT_SELECT_BUTTON (user_data); - priv = GIMP_FONT_SELECT_BUTTON_GET_PRIVATE (font_button); - select_button = GIMP_SELECT_BUTTON (font_button); + priv = GIMP_FONT_SELECT_BUTTON_GET_PRIVATE (button); + select_button = GIMP_SELECT_BUTTON (button); g_free (priv->font_name); priv->font_name = g_strdup (font_name); @@ -355,19 +353,19 @@ gimp_font_select_button_callback (const gchar *font_name, if (dialog_closing) select_button->temp_callback = NULL; - g_signal_emit (font_button, font_button_signals[FONT_SET], 0, + g_signal_emit (button, font_button_signals[FONT_SET], 0, font_name, dialog_closing); - g_object_notify (G_OBJECT (font_button), "font-name"); + g_object_notify (G_OBJECT (button), "font-name"); } static void -gimp_font_select_button_clicked (GimpFontSelectButton *font_button) +gimp_font_select_button_clicked (GimpFontSelectButton *button) { GimpFontSelectButtonPrivate *priv; GimpSelectButton *select_button; - - priv = GIMP_FONT_SELECT_BUTTON_GET_PRIVATE (font_button); - select_button = GIMP_SELECT_BUTTON (font_button); + + priv = GIMP_FONT_SELECT_BUTTON_GET_PRIVATE (button); + select_button = GIMP_SELECT_BUTTON (button); if (select_button->temp_callback) { @@ -380,12 +378,12 @@ gimp_font_select_button_clicked (GimpFontSelectButton *font_button) select_button->temp_callback = gimp_font_select_new (priv->title, priv->font_name, gimp_font_select_button_callback, - font_button); + button); } } static void -gimp_font_select_drag_data_received (GimpFontSelectButton *font_button, +gimp_font_select_drag_data_received (GimpFontSelectButton *button, GdkDragContext *context, gint x, gint y, @@ -414,7 +412,7 @@ gimp_font_select_drag_data_received (GimpFontSelectButton *font_button, { gchar *name = str + name_offset; - gimp_font_select_button_set_font_name (font_button, name); + gimp_font_select_button_set_font (button, name); } } diff --git a/libgimp/gimpfontselectbutton.h b/libgimp/gimpfontselectbutton.h index 493c190fc7..3838b3f315 100644 --- a/libgimp/gimpfontselectbutton.h +++ b/libgimp/gimpfontselectbutton.h @@ -49,7 +49,7 @@ struct _GimpFontSelectButtonClass GimpSelectButtonClass parent_class; /* font_set signal is emitted when font is chosen */ - void (* font_set) (GimpFontSelectButton *font_button, + void (* font_set) (GimpFontSelectButton *button, const gchar *font_name, gboolean dialog_closing); @@ -66,11 +66,9 @@ GType gimp_font_select_button_get_type (void) G_GNUC_CONST; GtkWidget * gimp_font_select_button_new (const gchar *title, const gchar *font_name); -G_CONST_RETURN gchar * gimp_font_select_button_get_font_name - (GimpFontSelectButton *button); -void gimp_font_select_button_set_font_name - (GimpFontSelectButton *button, - const gchar *font_name); +G_CONST_RETURN gchar * gimp_font_select_button_get_font (GimpFontSelectButton *button); +void gimp_font_select_button_set_font (GimpFontSelectButton *button, + const gchar *font_name); G_END_DECLS diff --git a/libgimp/gimpgradientmenu.c b/libgimp/gimpgradientmenu.c index ed33d633a0..f243d40566 100644 --- a/libgimp/gimpgradientmenu.c +++ b/libgimp/gimpgradientmenu.c @@ -116,8 +116,8 @@ gimp_gradient_select_widget_set (GtkWidget *widget, { g_return_if_fail (widget != NULL); - gimp_gradient_select_button_set_gradient_name - (GIMP_GRADIENT_SELECT_BUTTON (widget), gradient_name); + gimp_gradient_select_button_set_gradient (GIMP_GRADIENT_SELECT_BUTTON (widget), + gradient_name); } static void diff --git a/libgimp/gimpgradientselectbutton.c b/libgimp/gimpgradientselectbutton.c index 7f19d0bb6b..148396b5f0 100644 --- a/libgimp/gimpgradientselectbutton.c +++ b/libgimp/gimpgradientselectbutton.c @@ -46,7 +46,7 @@ typedef struct _GimpGradientSelectButtonPrivate GimpGradientSelectButtonPrivate; struct _GimpGradientSelectButtonPrivate { gchar *title; - + gchar *gradient_name; /* Local copy */ gint sample_size; gboolean reverse; @@ -84,7 +84,7 @@ static void gimp_gradient_select_button_get_property (GObject *object, GValue *value, GParamSpec *pspec); -static void gimp_gradient_select_button_clicked (GimpGradientSelectButton *gradient_button); +static void gimp_gradient_select_button_clicked (GimpGradientSelectButton *button); static void gimp_gradient_select_button_callback (const gchar *gradient_name, gint n_samples, @@ -95,12 +95,12 @@ static void gimp_gradient_select_button_callback (const gchar *gradient_name static void gimp_gradient_select_preview_size_allocate (GtkWidget *widget, GtkAllocation *allocation, - GimpGradientSelectButton *gradient_button); + GimpGradientSelectButton *button); static void gimp_gradient_select_preview_expose (GtkWidget *preview, GdkEventExpose *event, - GimpGradientSelectButton *gradient_button); + GimpGradientSelectButton *button); -static void gimp_gradient_select_drag_data_received (GimpGradientSelectButton *gradient_button, +static void gimp_gradient_select_drag_data_received (GimpGradientSelectButton *button, GdkDragContext *context, gint x, gint y, @@ -108,7 +108,7 @@ static void gimp_gradient_select_drag_data_received (GimpGradientSelectButton guint info, guint time); -static GtkWidget * gimp_gradient_select_button_create_inside (GimpGradientSelectButton *gradient_button); +static GtkWidget * gimp_gradient_select_button_create_inside (GimpGradientSelectButton *button); static const GtkTargetEntry target = { "application/x-gimp-gradient-name", 0 }; @@ -193,18 +193,18 @@ gimp_gradient_select_button_class_init (GimpGradientSelectButtonClass *klass) } static void -gimp_gradient_select_button_init (GimpGradientSelectButton *gradient_button) +gimp_gradient_select_button_init (GimpGradientSelectButton *button) { GimpGradientSelectButtonPrivate *priv; - - priv = GIMP_GRADIENT_SELECT_BUTTON_GET_PRIVATE (gradient_button); + + priv = GIMP_GRADIENT_SELECT_BUTTON_GET_PRIVATE (button); priv->gradient_name = gimp_context_get_gradient (); priv->sample_size = CELL_WIDTH; priv->reverse = FALSE; - priv->inside = gimp_gradient_select_button_create_inside (gradient_button); - gtk_container_add (GTK_CONTAINER (gradient_button), priv->inside); + priv->inside = gimp_gradient_select_button_create_inside (button); + gtk_container_add (GTK_CONTAINER (button), priv->inside); } /** @@ -224,24 +224,24 @@ GtkWidget * gimp_gradient_select_button_new (const gchar *title, const gchar *gradient_name) { - GtkWidget *gradient_button; + GtkWidget *button; if (title) - gradient_button = g_object_new (GIMP_TYPE_GRADIENT_SELECT_BUTTON, + button = g_object_new (GIMP_TYPE_GRADIENT_SELECT_BUTTON, "title", title, "gradient-name", gradient_name, NULL); else - gradient_button = g_object_new (GIMP_TYPE_GRADIENT_SELECT_BUTTON, + button = g_object_new (GIMP_TYPE_GRADIENT_SELECT_BUTTON, "gradient-name", gradient_name, NULL); - return gradient_button; + return button; } /** * gimp_gradient_select_button_get_gradient_name: - * @gradient_button: A #GimpGradientSelectButton + * @button: A #GimpGradientSelectButton * * Retrieves the name of currently selected gradient. * @@ -250,19 +250,19 @@ gimp_gradient_select_button_new (const gchar *title, * Since: GIMP 2.4 */ G_CONST_RETURN gchar * -gimp_gradient_select_button_get_gradient_name (GimpGradientSelectButton *gradient_button) +gimp_gradient_select_button_get_gradient (GimpGradientSelectButton *button) { GimpGradientSelectButtonPrivate *priv; - g_return_val_if_fail (GIMP_IS_GRADIENT_SELECT_BUTTON (gradient_button), NULL); + g_return_val_if_fail (GIMP_IS_GRADIENT_SELECT_BUTTON (button), NULL); - priv = GIMP_GRADIENT_SELECT_BUTTON_GET_PRIVATE (gradient_button); + priv = GIMP_GRADIENT_SELECT_BUTTON_GET_PRIVATE (button); return priv->gradient_name; } /** - * gimp_gradient_select_button_set_gradient_name: - * @gradient_button: A #GimpGradientSelectButton + * gimp_gradient_select_button_set_gradient: + * @button: A #GimpGradientSelectButton * @gradient_name: Gradient name to set. * * Sets the current gradient for the gradient select button. @@ -270,16 +270,16 @@ gimp_gradient_select_button_get_gradient_name (GimpGradientSelectButton *gradien * Since: GIMP 2.4 */ void -gimp_gradient_select_button_set_gradient_name (GimpGradientSelectButton *gradient_button, - const gchar *gradient_name) +gimp_gradient_select_button_set_gradient (GimpGradientSelectButton *button, + const gchar *gradient_name) { GimpGradientSelectButtonPrivate *priv; GimpSelectButton *select_button; - g_return_if_fail (GIMP_IS_GRADIENT_SELECT_BUTTON (gradient_button)); + g_return_if_fail (GIMP_IS_GRADIENT_SELECT_BUTTON (button)); - priv = GIMP_GRADIENT_SELECT_BUTTON_GET_PRIVATE (gradient_button); - select_button = GIMP_SELECT_BUTTON (gradient_button); + priv = GIMP_GRADIENT_SELECT_BUTTON_GET_PRIVATE (button); + select_button = GIMP_SELECT_BUTTON (button); if (select_button->temp_callback) { @@ -304,7 +304,7 @@ gimp_gradient_select_button_set_gradient_name (GimpGradientSelectButton *gradien { gimp_gradient_select_button_callback (name, n_samples, samples, - FALSE, gradient_button); + FALSE, button); g_free (samples); } @@ -341,11 +341,11 @@ gimp_gradient_select_button_set_property (GObject *object, const GValue *value, GParamSpec *pspec) { - GimpGradientSelectButton *gradient_button; + GimpGradientSelectButton *button; GimpGradientSelectButtonPrivate *priv; - gradient_button = GIMP_GRADIENT_SELECT_BUTTON (object); - priv = GIMP_GRADIENT_SELECT_BUTTON_GET_PRIVATE (gradient_button); + button = GIMP_GRADIENT_SELECT_BUTTON (object); + priv = GIMP_GRADIENT_SELECT_BUTTON_GET_PRIVATE (button); switch (property_id) { @@ -353,8 +353,8 @@ gimp_gradient_select_button_set_property (GObject *object, priv->title = g_value_dup_string (value); break; case PROP_GRADIENT_NAME: - gimp_gradient_select_button_set_gradient_name (gradient_button, - g_value_get_string (value)); + gimp_gradient_select_button_set_gradient (button, + g_value_get_string (value)); break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); @@ -368,11 +368,11 @@ gimp_gradient_select_button_get_property (GObject *object, GValue *value, GParamSpec *pspec) { - GimpGradientSelectButton *gradient_button; + GimpGradientSelectButton *button; GimpGradientSelectButtonPrivate *priv; - gradient_button = GIMP_GRADIENT_SELECT_BUTTON (object); - priv = GIMP_GRADIENT_SELECT_BUTTON_GET_PRIVATE (gradient_button); + button = GIMP_GRADIENT_SELECT_BUTTON (object); + priv = GIMP_GRADIENT_SELECT_BUTTON_GET_PRIVATE (button); switch (property_id) { @@ -395,14 +395,14 @@ gimp_gradient_select_button_callback (const gchar *gradient_name, gboolean dialog_closing, gpointer user_data) { - GimpGradientSelectButton *gradient_button; + GimpGradientSelectButton *button; GimpGradientSelectButtonPrivate *priv; GimpSelectButton *select_button; - gradient_button = GIMP_GRADIENT_SELECT_BUTTON (user_data); + button = GIMP_GRADIENT_SELECT_BUTTON (user_data); - priv = GIMP_GRADIENT_SELECT_BUTTON_GET_PRIVATE (gradient_button); - select_button = GIMP_SELECT_BUTTON (gradient_button); + priv = GIMP_GRADIENT_SELECT_BUTTON_GET_PRIVATE (button); + select_button = GIMP_SELECT_BUTTON (button); g_free (priv->gradient_name); g_free (priv->gradient_data); @@ -416,19 +416,19 @@ gimp_gradient_select_button_callback (const gchar *gradient_name, if (dialog_closing) select_button->temp_callback = NULL; - g_signal_emit (gradient_button, gradient_button_signals[GRADIENT_SET], 0, + g_signal_emit (button, gradient_button_signals[GRADIENT_SET], 0, gradient_name, n_samples, gradient_data, dialog_closing); - g_object_notify (G_OBJECT (gradient_button), "gradient-name"); + g_object_notify (G_OBJECT (button), "gradient-name"); } static void -gimp_gradient_select_button_clicked (GimpGradientSelectButton *gradient_button) +gimp_gradient_select_button_clicked (GimpGradientSelectButton *button) { GimpGradientSelectButtonPrivate *priv; GimpSelectButton *select_button; - - priv = GIMP_GRADIENT_SELECT_BUTTON_GET_PRIVATE (gradient_button); - select_button = GIMP_SELECT_BUTTON (gradient_button); + + priv = GIMP_GRADIENT_SELECT_BUTTON_GET_PRIVATE (button); + select_button = GIMP_SELECT_BUTTON (button); if (select_button->temp_callback) { @@ -442,20 +442,20 @@ gimp_gradient_select_button_clicked (GimpGradientSelectButton *gradient_button) gimp_gradient_select_new (priv->title, priv->gradient_name, priv->sample_size, gimp_gradient_select_button_callback, - gradient_button); + button); } } static void gimp_gradient_select_preview_size_allocate (GtkWidget *widget, GtkAllocation *allocation, - GimpGradientSelectButton *gradient_button) + GimpGradientSelectButton *button) { gdouble *samples; gint n_samples; GimpGradientSelectButtonPrivate *priv; - priv = GIMP_GRADIENT_SELECT_BUTTON_GET_PRIVATE (gradient_button); + priv = GIMP_GRADIENT_SELECT_BUTTON_GET_PRIVATE (button); if (gimp_gradient_get_uniform_samples (priv->gradient_name, allocation->width, @@ -474,7 +474,7 @@ gimp_gradient_select_preview_size_allocate (GtkWidget *widget, static void gimp_gradient_select_preview_expose (GtkWidget *widget, GdkEventExpose *event, - GimpGradientSelectButton *gradient_button) + GimpGradientSelectButton *button) { const gdouble *src; guchar *p0; @@ -485,7 +485,7 @@ gimp_gradient_select_preview_expose (GtkWidget *widget, gint x, y; GimpGradientSelectButtonPrivate *priv; - priv = GIMP_GRADIENT_SELECT_BUTTON_GET_PRIVATE (gradient_button); + priv = GIMP_GRADIENT_SELECT_BUTTON_GET_PRIVATE (button); src = priv->gradient_data; if (! src) @@ -545,7 +545,7 @@ gimp_gradient_select_preview_expose (GtkWidget *widget, } static void -gimp_gradient_select_drag_data_received (GimpGradientSelectButton *gradient_button, +gimp_gradient_select_drag_data_received (GimpGradientSelectButton *button, GdkDragContext *context, gint x, gint y, @@ -574,7 +574,7 @@ gimp_gradient_select_drag_data_received (GimpGradientSelectButton *gradient_butt { gchar *name = str + name_offset; - gimp_gradient_select_button_set_gradient_name (gradient_button, name); + gimp_gradient_select_button_set_gradient (button, name); } } @@ -586,7 +586,7 @@ gimp_gradient_select_button_create_inside (GimpGradientSelectButton *gradient_bu { GtkWidget *button; GimpGradientSelectButtonPrivate *priv; - + priv = GIMP_GRADIENT_SELECT_BUTTON_GET_PRIVATE (gradient_button); gtk_widget_push_composite_child (); diff --git a/libgimp/gimpgradientselectbutton.h b/libgimp/gimpgradientselectbutton.h index a06289182b..939d634eb8 100644 --- a/libgimp/gimpgradientselectbutton.h +++ b/libgimp/gimpgradientselectbutton.h @@ -49,7 +49,7 @@ struct _GimpGradientSelectButtonClass GimpSelectButtonClass parent_class; /* gradient_set signal is emitted when gradient is chosen */ - void (* gradient_set) (GimpGradientSelectButton *gradient_button, + void (* gradient_set) (GimpGradientSelectButton *button, const gchar *gradient_name, gint width, const gdouble *gradient_data, @@ -68,9 +68,9 @@ GType gimp_gradient_select_button_get_type (void) G_GNUC_CONST; GtkWidget * gimp_gradient_select_button_new (const gchar *title, const gchar *gradient_name); -G_CONST_RETURN gchar * gimp_gradient_select_button_get_gradient_name (GimpGradientSelectButton *button); -void gimp_gradient_select_button_set_gradient_name (GimpGradientSelectButton *button, - const gchar *gradient_name); +G_CONST_RETURN gchar * gimp_gradient_select_button_get_gradient (GimpGradientSelectButton *button); +void gimp_gradient_select_button_set_gradient (GimpGradientSelectButton *button, + const gchar *gradient_name); G_END_DECLS diff --git a/libgimp/gimppalettemenu.c b/libgimp/gimppalettemenu.c index 9d9c3366bd..869f0acb55 100644 --- a/libgimp/gimppalettemenu.c +++ b/libgimp/gimppalettemenu.c @@ -118,8 +118,8 @@ gimp_palette_select_widget_set (GtkWidget *widget, { g_return_if_fail (widget != NULL); - gimp_palette_select_button_set_palette_name - (GIMP_PALETTE_SELECT_BUTTON (widget), palette_name); + gimp_palette_select_button_set_palette (GIMP_PALETTE_SELECT_BUTTON (widget), + palette_name); } static void diff --git a/libgimp/gimppaletteselectbutton.c b/libgimp/gimppaletteselectbutton.c index 82c7c4d48f..72491b73bf 100644 --- a/libgimp/gimppaletteselectbutton.c +++ b/libgimp/gimppaletteselectbutton.c @@ -76,13 +76,13 @@ static void gimp_palette_select_button_get_property (GObject *object, GValue *value, GParamSpec *pspec); -static void gimp_palette_select_button_clicked (GimpPaletteSelectButton *palette_button); +static void gimp_palette_select_button_clicked (GimpPaletteSelectButton *button); static void gimp_palette_select_button_callback (const gchar *palette_name, gboolean dialog_closing, gpointer user_data); -static void gimp_palette_select_drag_data_received (GimpPaletteSelectButton *palette_button, +static void gimp_palette_select_drag_data_received (GimpPaletteSelectButton *button, GdkDragContext *context, gint x, gint y, @@ -171,16 +171,16 @@ gimp_palette_select_button_class_init (GimpPaletteSelectButtonClass *klass) } static void -gimp_palette_select_button_init (GimpPaletteSelectButton *palette_button) +gimp_palette_select_button_init (GimpPaletteSelectButton *button) { GimpPaletteSelectButtonPrivate *priv; - - priv = GIMP_PALETTE_SELECT_BUTTON_GET_PRIVATE (palette_button); + + priv = GIMP_PALETTE_SELECT_BUTTON_GET_PRIVATE (button); priv->palette_name = NULL; - priv->inside = gimp_palette_select_button_create_inside (palette_button); - gtk_container_add (GTK_CONTAINER (palette_button), priv->inside); + priv->inside = gimp_palette_select_button_create_inside (button); + gtk_container_add (GTK_CONTAINER (button), priv->inside); } /** @@ -200,24 +200,24 @@ GtkWidget * gimp_palette_select_button_new (const gchar *title, const gchar *palette_name) { - GtkWidget *palette_button; + GtkWidget *button; if (title) - palette_button = g_object_new (GIMP_TYPE_PALETTE_SELECT_BUTTON, + button = g_object_new (GIMP_TYPE_PALETTE_SELECT_BUTTON, "title", title, "palette-name", palette_name, NULL); else - palette_button = g_object_new (GIMP_TYPE_PALETTE_SELECT_BUTTON, + button = g_object_new (GIMP_TYPE_PALETTE_SELECT_BUTTON, "palette-name", palette_name, NULL); - return palette_button; + return button; } /** - * gimp_palette_select_button_get_palette_name: - * @palette_button: A #GimpPaletteSelectButton + * gimp_palette_select_button_get_palette: + * @button: A #GimpPaletteSelectButton * * Retrieves the name of currently selected palette. * @@ -226,19 +226,19 @@ gimp_palette_select_button_new (const gchar *title, * Since: GIMP 2.4 */ G_CONST_RETURN gchar * -gimp_palette_select_button_get_palette_name (GimpPaletteSelectButton *palette_button) +gimp_palette_select_button_get_palette (GimpPaletteSelectButton *button) { GimpPaletteSelectButtonPrivate *priv; - g_return_val_if_fail (GIMP_IS_PALETTE_SELECT_BUTTON (palette_button), NULL); + g_return_val_if_fail (GIMP_IS_PALETTE_SELECT_BUTTON (button), NULL); - priv = GIMP_PALETTE_SELECT_BUTTON_GET_PRIVATE (palette_button); + priv = GIMP_PALETTE_SELECT_BUTTON_GET_PRIVATE (button); return priv->palette_name; } /** - * gimp_palette_select_button_set_palette_name: - * @palette_button: A #GimpPaletteSelectButton + * gimp_palette_select_button_set_palette: + * @button: A #GimpPaletteSelectButton * @palette_name: Palette name to set; %NULL means no change. * * Sets the current palette for the palette select button. @@ -246,19 +246,19 @@ gimp_palette_select_button_get_palette_name (GimpPaletteSelectButton *palette_bu * Since: GIMP 2.4 */ void -gimp_palette_select_button_set_palette_name (GimpPaletteSelectButton *palette_button, - const gchar *palette_name) +gimp_palette_select_button_set_palette (GimpPaletteSelectButton *button, + const gchar *palette_name) { GimpSelectButton *select_button; - g_return_if_fail (GIMP_IS_PALETTE_SELECT_BUTTON (palette_button)); + g_return_if_fail (GIMP_IS_PALETTE_SELECT_BUTTON (button)); - select_button = GIMP_SELECT_BUTTON (palette_button); + select_button = GIMP_SELECT_BUTTON (button); if (select_button->temp_callback) gimp_palettes_set_popup (select_button->temp_callback, palette_name); else - gimp_palette_select_button_callback (palette_name, FALSE, palette_button); + gimp_palette_select_button_callback (palette_name, FALSE, button); } @@ -286,11 +286,11 @@ gimp_palette_select_button_set_property (GObject *object, const GValue *value, GParamSpec *pspec) { - GimpPaletteSelectButton *palette_button; + GimpPaletteSelectButton *button; GimpPaletteSelectButtonPrivate *priv; - palette_button = GIMP_PALETTE_SELECT_BUTTON (object); - priv = GIMP_PALETTE_SELECT_BUTTON_GET_PRIVATE (palette_button); + button = GIMP_PALETTE_SELECT_BUTTON (object); + priv = GIMP_PALETTE_SELECT_BUTTON_GET_PRIVATE (button); switch (property_id) { @@ -298,8 +298,8 @@ gimp_palette_select_button_set_property (GObject *object, priv->title = g_value_dup_string (value); break; case PROP_PALETTE_NAME: - gimp_palette_select_button_set_palette_name (palette_button, - g_value_get_string (value)); + gimp_palette_select_button_set_palette (button, + g_value_get_string (value)); break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); @@ -313,11 +313,11 @@ gimp_palette_select_button_get_property (GObject *object, GValue *value, GParamSpec *pspec) { - GimpPaletteSelectButton *palette_button; + GimpPaletteSelectButton *button; GimpPaletteSelectButtonPrivate *priv; - palette_button = GIMP_PALETTE_SELECT_BUTTON (object); - priv = GIMP_PALETTE_SELECT_BUTTON_GET_PRIVATE (palette_button); + button = GIMP_PALETTE_SELECT_BUTTON (object); + priv = GIMP_PALETTE_SELECT_BUTTON_GET_PRIVATE (button); switch (property_id) { @@ -338,14 +338,14 @@ gimp_palette_select_button_callback (const gchar *palette_name, gboolean dialog_closing, gpointer user_data) { - GimpPaletteSelectButton *palette_button; + GimpPaletteSelectButton *button; GimpPaletteSelectButtonPrivate *priv; GimpSelectButton *select_button; - palette_button = GIMP_PALETTE_SELECT_BUTTON (user_data); + button = GIMP_PALETTE_SELECT_BUTTON (user_data); - priv = GIMP_PALETTE_SELECT_BUTTON_GET_PRIVATE (palette_button); - select_button = GIMP_SELECT_BUTTON (palette_button); + priv = GIMP_PALETTE_SELECT_BUTTON_GET_PRIVATE (button); + select_button = GIMP_SELECT_BUTTON (button); g_free (priv->palette_name); priv->palette_name = g_strdup (palette_name); @@ -355,19 +355,19 @@ gimp_palette_select_button_callback (const gchar *palette_name, if (dialog_closing) select_button->temp_callback = NULL; - g_signal_emit (palette_button, palette_button_signals[PALETTE_SET], 0, + g_signal_emit (button, palette_button_signals[PALETTE_SET], 0, palette_name, dialog_closing); - g_object_notify (G_OBJECT (palette_button), "palette-name"); + g_object_notify (G_OBJECT (button), "palette-name"); } static void -gimp_palette_select_button_clicked (GimpPaletteSelectButton *palette_button) +gimp_palette_select_button_clicked (GimpPaletteSelectButton *button) { GimpPaletteSelectButtonPrivate *priv; GimpSelectButton *select_button; - - priv = GIMP_PALETTE_SELECT_BUTTON_GET_PRIVATE (palette_button); - select_button = GIMP_SELECT_BUTTON (palette_button); + + priv = GIMP_PALETTE_SELECT_BUTTON_GET_PRIVATE (button); + select_button = GIMP_SELECT_BUTTON (button); if (select_button->temp_callback) { @@ -380,12 +380,12 @@ gimp_palette_select_button_clicked (GimpPaletteSelectButton *palette_button) select_button->temp_callback = gimp_palette_select_new (priv->title, priv->palette_name, gimp_palette_select_button_callback, - palette_button); + button); } } static void -gimp_palette_select_drag_data_received (GimpPaletteSelectButton *palette_button, +gimp_palette_select_drag_data_received (GimpPaletteSelectButton *button, GdkDragContext *context, gint x, gint y, @@ -414,7 +414,7 @@ gimp_palette_select_drag_data_received (GimpPaletteSelectButton *palette_button, { gchar *name = str + name_offset; - gimp_palette_select_button_set_palette_name (palette_button, name); + gimp_palette_select_button_set_palette (button, name); } } diff --git a/libgimp/gimppaletteselectbutton.h b/libgimp/gimppaletteselectbutton.h index ddce1f59f7..fdce2ca772 100644 --- a/libgimp/gimppaletteselectbutton.h +++ b/libgimp/gimppaletteselectbutton.h @@ -49,7 +49,7 @@ struct _GimpPaletteSelectButtonClass GimpSelectButtonClass parent_class; /* palette_set signal is emitted when palette is chosen */ - void (* palette_set) (GimpPaletteSelectButton *palette_button, + void (* palette_set) (GimpPaletteSelectButton *button, const gchar *palette_name, gboolean dialog_closing); @@ -66,9 +66,9 @@ GType gimp_palette_select_button_get_type (void) G_GNUC_CONST; GtkWidget * gimp_palette_select_button_new (const gchar *title, const gchar *palette_name); -G_CONST_RETURN gchar * gimp_palette_select_button_get_palette_name (GimpPaletteSelectButton *button); -void gimp_palette_select_button_set_palette_name (GimpPaletteSelectButton *button, - const gchar *palette_name); +G_CONST_RETURN gchar * gimp_palette_select_button_get_palette (GimpPaletteSelectButton *button); +void gimp_palette_select_button_set_palette (GimpPaletteSelectButton *button, + const gchar *palette_name); G_END_DECLS diff --git a/libgimp/gimppatternmenu.c b/libgimp/gimppatternmenu.c index e2d5c79eb2..3cf821572c 100644 --- a/libgimp/gimppatternmenu.c +++ b/libgimp/gimppatternmenu.c @@ -114,8 +114,8 @@ gimp_pattern_select_widget_set (GtkWidget *widget, { g_return_if_fail (widget != NULL); - gimp_pattern_select_button_set_pattern_name - (GIMP_PATTERN_SELECT_BUTTON (widget), pattern_name); + gimp_pattern_select_button_set_pattern (GIMP_PATTERN_SELECT_BUTTON (widget), + pattern_name); } static void diff --git a/libgimp/gimppatternselectbutton.c b/libgimp/gimppatternselectbutton.c index adfc2f7a44..98a58c3104 100644 --- a/libgimp/gimppatternselectbutton.c +++ b/libgimp/gimppatternselectbutton.c @@ -84,7 +84,7 @@ static void gimp_pattern_select_button_get_property (GObject *object, GValue *value, GParamSpec *pspec); -static void gimp_pattern_select_button_clicked (GimpPatternSelectButton *pattern_button); +static void gimp_pattern_select_button_clicked (GimpPatternSelectButton *button); static void gimp_pattern_select_button_callback (const gchar *pattern_name, gint width, @@ -94,22 +94,22 @@ static void gimp_pattern_select_button_callback (const gchar *pattern_name, gboolean dialog_closing, gpointer user_data); -static void gimp_pattern_select_preview_resize (GimpPatternSelectButton *pattern_button); +static void gimp_pattern_select_preview_resize (GimpPatternSelectButton *button); static gboolean gimp_pattern_select_preview_events (GtkWidget *widget, GdkEvent *event, - GimpPatternSelectButton *pattern_button); + GimpPatternSelectButton *button); static void gimp_pattern_select_preview_update (GtkWidget *preview, gint width, gint height, gint bytes, const guchar *mask_data); -static void gimp_pattern_select_button_open_popup (GimpPatternSelectButton *pattern_button, +static void gimp_pattern_select_button_open_popup (GimpPatternSelectButton *button, gint x, gint y); -static void gimp_pattern_select_button_close_popup (GimpPatternSelectButton *pattern_button); +static void gimp_pattern_select_button_close_popup (GimpPatternSelectButton *button); -static void gimp_pattern_select_drag_data_received (GimpPatternSelectButton *pattern_button, +static void gimp_pattern_select_drag_data_received (GimpPatternSelectButton *button, GdkDragContext *context, gint x, gint y, @@ -117,7 +117,7 @@ static void gimp_pattern_select_drag_data_received (GimpPatternSelectButton *p guint info, guint time); -static GtkWidget * gimp_pattern_select_button_create_inside (GimpPatternSelectButton *pattern_button); +static GtkWidget * gimp_pattern_select_button_create_inside (GimpPatternSelectButton *button); static const GtkTargetEntry target = { "application/x-gimp-pattern-name", 0 }; @@ -205,12 +205,12 @@ gimp_pattern_select_button_class_init (GimpPatternSelectButtonClass *klass) } static void -gimp_pattern_select_button_init (GimpPatternSelectButton *pattern_button) +gimp_pattern_select_button_init (GimpPatternSelectButton *button) { GimpPatternSelectButtonPrivate *priv; gint mask_data_size; - - priv = GIMP_PATTERN_SELECT_BUTTON_GET_PRIVATE (pattern_button); + + priv = GIMP_PATTERN_SELECT_BUTTON_GET_PRIVATE (button); priv->pattern_name = gimp_context_get_pattern (); gimp_pattern_get_pixels (priv->pattern_name, @@ -220,8 +220,8 @@ gimp_pattern_select_button_init (GimpPatternSelectButton *pattern_button) &mask_data_size, &priv->mask_data); - priv->inside = gimp_pattern_select_button_create_inside (pattern_button); - gtk_container_add (GTK_CONTAINER (pattern_button), priv->inside); + priv->inside = gimp_pattern_select_button_create_inside (button); + gtk_container_add (GTK_CONTAINER (button), priv->inside); priv->popup = NULL; } @@ -243,23 +243,23 @@ GtkWidget * gimp_pattern_select_button_new (const gchar *title, const gchar *pattern_name) { - GtkWidget *pattern_button; + GtkWidget *button; if (title) - pattern_button = g_object_new (GIMP_TYPE_PATTERN_SELECT_BUTTON, - "title", title, - "pattern-name", pattern_name, - NULL); + button = g_object_new (GIMP_TYPE_PATTERN_SELECT_BUTTON, + "title", title, + "pattern-name", pattern_name, + NULL); else - pattern_button = g_object_new (GIMP_TYPE_PATTERN_SELECT_BUTTON, - "pattern-name", pattern_name, - NULL); + button = g_object_new (GIMP_TYPE_PATTERN_SELECT_BUTTON, + "pattern-name", pattern_name, + NULL); - return pattern_button; + return button; } /** - * gimp_pattern_select_button_get_pattern_name: + * gimp_pattern_select_button_get_pattern: * @button: A #GimpPatternSelectButton * * Retrieves the name of currently selected pattern. @@ -269,19 +269,19 @@ gimp_pattern_select_button_new (const gchar *title, * Since: GIMP 2.4 */ G_CONST_RETURN gchar * -gimp_pattern_select_button_get_pattern_name (GimpPatternSelectButton *pattern_button) +gimp_pattern_select_button_get_pattern (GimpPatternSelectButton *button) { GimpPatternSelectButtonPrivate *priv; - g_return_val_if_fail (GIMP_IS_PATTERN_SELECT_BUTTON (pattern_button), NULL); + g_return_val_if_fail (GIMP_IS_PATTERN_SELECT_BUTTON (button), NULL); - priv = GIMP_PATTERN_SELECT_BUTTON_GET_PRIVATE (pattern_button); + priv = GIMP_PATTERN_SELECT_BUTTON_GET_PRIVATE (button); return priv->pattern_name; } /** * gimp_pattern_select_button_set_pattern_name: - * @pattern_button: A #GimpPatternSelectButton + * @button: A #GimpPatternSelectButton * @pattern_name: Pattern name to set; %NULL means no change. * * Sets the current pattern for the pattern select button. @@ -289,14 +289,14 @@ gimp_pattern_select_button_get_pattern_name (GimpPatternSelectButton *pattern_bu * Since: GIMP 2.4 */ void -gimp_pattern_select_button_set_pattern_name (GimpPatternSelectButton *pattern_button, - const gchar *pattern_name) +gimp_pattern_select_button_set_pattern (GimpPatternSelectButton *button, + const gchar *pattern_name) { GimpSelectButton *select_button; - g_return_if_fail (GIMP_IS_PATTERN_SELECT_BUTTON (pattern_button)); + g_return_if_fail (GIMP_IS_PATTERN_SELECT_BUTTON (button)); - select_button = GIMP_SELECT_BUTTON (pattern_button); + select_button = GIMP_SELECT_BUTTON (button); if (select_button->temp_callback) { @@ -325,7 +325,7 @@ gimp_pattern_select_button_set_pattern_name (GimpPatternSelectButton *pattern_bu { gimp_pattern_select_button_callback (name, width, height, bytes, mask_data, - FALSE, pattern_button); + FALSE, button); g_free (mask_data); } @@ -362,11 +362,11 @@ gimp_pattern_select_button_set_property (GObject *object, const GValue *value, GParamSpec *pspec) { - GimpPatternSelectButton *pattern_button; + GimpPatternSelectButton *button; GimpPatternSelectButtonPrivate *priv; - pattern_button = GIMP_PATTERN_SELECT_BUTTON (object); - priv = GIMP_PATTERN_SELECT_BUTTON_GET_PRIVATE (pattern_button); + button = GIMP_PATTERN_SELECT_BUTTON (object); + priv = GIMP_PATTERN_SELECT_BUTTON_GET_PRIVATE (button); switch (property_id) { @@ -374,8 +374,8 @@ gimp_pattern_select_button_set_property (GObject *object, priv->title = g_value_dup_string (value); break; case PROP_PATTERN_NAME: - gimp_pattern_select_button_set_pattern_name (pattern_button, - g_value_get_string (value)); + gimp_pattern_select_button_set_pattern (button, + g_value_get_string (value)); break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); @@ -389,11 +389,11 @@ gimp_pattern_select_button_get_property (GObject *object, GValue *value, GParamSpec *pspec) { - GimpPatternSelectButton *pattern_button; + GimpPatternSelectButton *button; GimpPatternSelectButtonPrivate *priv; - pattern_button = GIMP_PATTERN_SELECT_BUTTON (object); - priv = GIMP_PATTERN_SELECT_BUTTON_GET_PRIVATE (pattern_button); + button = GIMP_PATTERN_SELECT_BUTTON (object); + priv = GIMP_PATTERN_SELECT_BUTTON_GET_PRIVATE (button); switch (property_id) { @@ -418,14 +418,14 @@ gimp_pattern_select_button_callback (const gchar *pattern_name, gboolean dialog_closing, gpointer user_data) { - GimpPatternSelectButton *pattern_button; + GimpPatternSelectButton *button; GimpPatternSelectButtonPrivate *priv; GimpSelectButton *select_button; - pattern_button = GIMP_PATTERN_SELECT_BUTTON (user_data); + button = GIMP_PATTERN_SELECT_BUTTON (user_data); - priv = GIMP_PATTERN_SELECT_BUTTON_GET_PRIVATE (pattern_button); - select_button = GIMP_SELECT_BUTTON (pattern_button); + priv = GIMP_PATTERN_SELECT_BUTTON_GET_PRIVATE (button); + select_button = GIMP_SELECT_BUTTON (button); g_free (priv->pattern_name); g_free (priv->mask_data); @@ -442,19 +442,19 @@ gimp_pattern_select_button_callback (const gchar *pattern_name, if (dialog_closing) select_button->temp_callback = NULL; - g_signal_emit (pattern_button, pattern_button_signals[PATTERN_SET], 0, + g_signal_emit (button, pattern_button_signals[PATTERN_SET], 0, pattern_name, width, height, bytes, dialog_closing); - g_object_notify (G_OBJECT (pattern_button), "pattern-name"); + g_object_notify (G_OBJECT (button), "pattern-name"); } static void -gimp_pattern_select_button_clicked (GimpPatternSelectButton *pattern_button) +gimp_pattern_select_button_clicked (GimpPatternSelectButton *button) { GimpPatternSelectButtonPrivate *priv; GimpSelectButton *select_button; - - priv = GIMP_PATTERN_SELECT_BUTTON_GET_PRIVATE (pattern_button); - select_button = GIMP_SELECT_BUTTON (pattern_button); + + priv = GIMP_PATTERN_SELECT_BUTTON_GET_PRIVATE (button); + select_button = GIMP_SELECT_BUTTON (button); if (select_button->temp_callback) { @@ -467,16 +467,16 @@ gimp_pattern_select_button_clicked (GimpPatternSelectButton *pattern_button) select_button->temp_callback = gimp_pattern_select_new (priv->title, priv->pattern_name, gimp_pattern_select_button_callback, - pattern_button); + button); } } static void -gimp_pattern_select_preview_resize (GimpPatternSelectButton *pattern_button) +gimp_pattern_select_preview_resize (GimpPatternSelectButton *button) { GimpPatternSelectButtonPrivate *priv; - priv = GIMP_PATTERN_SELECT_BUTTON_GET_PRIVATE (pattern_button); + priv = GIMP_PATTERN_SELECT_BUTTON_GET_PRIVATE (button); if (priv->width > 0 && priv->height > 0) gimp_pattern_select_preview_update (priv->preview, @@ -489,12 +489,12 @@ gimp_pattern_select_preview_resize (GimpPatternSelectButton *pattern_button) static gboolean gimp_pattern_select_preview_events (GtkWidget *widget, GdkEvent *event, - GimpPatternSelectButton *pattern_button) + GimpPatternSelectButton *button) { GimpPatternSelectButtonPrivate *priv; GdkEventButton *bevent; - priv = GIMP_PATTERN_SELECT_BUTTON_GET_PRIVATE (pattern_button); + priv = GIMP_PATTERN_SELECT_BUTTON_GET_PRIVATE (button); if (priv->mask_data) { @@ -506,7 +506,7 @@ gimp_pattern_select_preview_events (GtkWidget *widget, if (bevent->button == 1) { gtk_grab_add (widget); - gimp_pattern_select_button_open_popup (pattern_button, + gimp_pattern_select_button_open_popup (button, bevent->x, bevent->y); } break; @@ -517,7 +517,7 @@ gimp_pattern_select_preview_events (GtkWidget *widget, if (bevent->button == 1) { gtk_grab_remove (widget); - gimp_pattern_select_button_close_popup (pattern_button); + gimp_pattern_select_button_close_popup (button); } break; @@ -556,7 +556,7 @@ gimp_pattern_select_preview_update (GtkWidget *preview, } static void -gimp_pattern_select_button_open_popup (GimpPatternSelectButton *pattern_button, +gimp_pattern_select_button_open_popup (GimpPatternSelectButton *button, gint x, gint y) { @@ -569,10 +569,10 @@ gimp_pattern_select_button_open_popup (GimpPatternSelectButton *pattern_button, gint scr_w; gint scr_h; - priv = GIMP_PATTERN_SELECT_BUTTON_GET_PRIVATE (pattern_button); + priv = GIMP_PATTERN_SELECT_BUTTON_GET_PRIVATE (button); if (priv->popup) - gimp_pattern_select_button_close_popup (pattern_button); + gimp_pattern_select_button_close_popup (button); if (priv->width <= CELL_SIZE && priv->height <= CELL_SIZE) return; @@ -617,11 +617,11 @@ gimp_pattern_select_button_open_popup (GimpPatternSelectButton *pattern_button, } static void -gimp_pattern_select_button_close_popup (GimpPatternSelectButton *pattern_button) +gimp_pattern_select_button_close_popup (GimpPatternSelectButton *button) { GimpPatternSelectButtonPrivate *priv; - priv = GIMP_PATTERN_SELECT_BUTTON_GET_PRIVATE (pattern_button); + priv = GIMP_PATTERN_SELECT_BUTTON_GET_PRIVATE (button); if (priv->popup) { @@ -631,7 +631,7 @@ gimp_pattern_select_button_close_popup (GimpPatternSelectButton *pattern_button) } static void -gimp_pattern_select_drag_data_received (GimpPatternSelectButton *pattern_button, +gimp_pattern_select_drag_data_received (GimpPatternSelectButton *button, GdkDragContext *context, gint x, gint y, @@ -660,7 +660,7 @@ gimp_pattern_select_drag_data_received (GimpPatternSelectButton *pattern_button, { gchar *name = str + name_offset; - gimp_pattern_select_button_set_pattern_name (pattern_button, name); + gimp_pattern_select_button_set_pattern (button, name); } } diff --git a/libgimp/gimppatternselectbutton.h b/libgimp/gimppatternselectbutton.h index 373010e371..620bd5b9c5 100644 --- a/libgimp/gimppatternselectbutton.h +++ b/libgimp/gimppatternselectbutton.h @@ -49,7 +49,7 @@ struct _GimpPatternSelectButtonClass GimpSelectButtonClass parent_class; /* pattern_set signal is emitted when pattern is chosen */ - void (* pattern_set) (GimpPatternSelectButton *pattern_button, + void (* pattern_set) (GimpPatternSelectButton *button, const gchar *pattern_name, gint width, gint height, @@ -70,9 +70,9 @@ GType gimp_pattern_select_button_get_type (void) G_GNUC_CONST; GtkWidget * gimp_pattern_select_button_new (const gchar *title, const gchar *pattern_name); -G_CONST_RETURN gchar * gimp_pattern_select_button_get_pattern_name (GimpPatternSelectButton *button); -void gimp_pattern_select_button_set_pattern_name (GimpPatternSelectButton *button, - const gchar *pattern_name); +G_CONST_RETURN gchar * gimp_pattern_select_button_get_pattern (GimpPatternSelectButton *button); +void gimp_pattern_select_button_set_pattern (GimpPatternSelectButton *button, + const gchar *pattern_name); G_END_DECLS diff --git a/libgimp/gimpselectbutton.c b/libgimp/gimpselectbutton.c index 03b67a3d93..ef94290094 100644 --- a/libgimp/gimpselectbutton.c +++ b/libgimp/gimpselectbutton.c @@ -29,7 +29,7 @@ /* local function prototypes */ -static void gimp_select_button_destroy (GtkObject *object); +static void gimp_select_button_destroy (GtkObject *object); G_DEFINE_TYPE (GimpSelectButton, gimp_select_button, GTK_TYPE_HBOX) @@ -50,22 +50,22 @@ gimp_select_button_init (GimpSelectButton *select_button) /** * gimp_select_button_close_popup: - * @select_button: A #GimpSelectButton + * @button: A #GimpSelectButton * - * Closes the popup window associated with @select_button. + * Closes the popup window associated with @button. * * Since: GIMP 2.4 */ void -gimp_select_button_close_popup (GimpSelectButton *select_button) +gimp_select_button_close_popup (GimpSelectButton *button) { - g_return_if_fail (GIMP_IS_SELECT_BUTTON (select_button)); - - if (select_button->temp_callback) + g_return_if_fail (GIMP_IS_SELECT_BUTTON (button)); + + if (button->temp_callback) { - GIMP_SELECT_BUTTON_GET_CLASS (select_button)->select_destroy - (select_button->temp_callback); - select_button->temp_callback = NULL; + GIMP_SELECT_BUTTON_GET_CLASS (button)->select_destroy (button->temp_callback); + + button->temp_callback = NULL; } } @@ -75,9 +75,7 @@ gimp_select_button_close_popup (GimpSelectButton *select_button) static void gimp_select_button_destroy (GtkObject *object) { - GimpSelectButton *select_button = GIMP_SELECT_BUTTON (object); - - gimp_select_button_close_popup (select_button); + gimp_select_button_close_popup (GIMP_SELECT_BUTTON (object)); GTK_OBJECT_CLASS (gimp_select_button_parent_class)->destroy (object); } diff --git a/plug-ins/gfig/gfig-style.c b/plug-ins/gfig/gfig-style.c index a100c48edf..29c332e329 100644 --- a/plug-ins/gfig/gfig-style.c +++ b/plug-ins/gfig/gfig-style.c @@ -666,17 +666,14 @@ gfig_style_set_context_from_style (Style *style) g_message ("Style from context: Failed to set brush to '%s'", style->brush_name); - gimp_brush_select_button_set_brush - (GIMP_BRUSH_SELECT_BUTTON (gfig_context->brush_select), - style->brush_name, -1.0, -1, -1); /* FIXME */ + gimp_brush_select_button_set_brush (GIMP_BRUSH_SELECT_BUTTON (gfig_context->brush_select), + style->brush_name, -1.0, -1, -1); /* FIXME */ - gimp_pattern_select_button_set_pattern_name - (GIMP_PATTERN_SELECT_BUTTON (gfig_context->pattern_select), - style->pattern); + gimp_pattern_select_button_set_pattern (GIMP_PATTERN_SELECT_BUTTON (gfig_context->pattern_select), + style->pattern); - gimp_gradient_select_button_set_gradient_name - (GIMP_GRADIENT_SELECT_BUTTON (gfig_context->gradient_select), - style->gradient); + gimp_gradient_select_button_set_gradient (GIMP_GRADIENT_SELECT_BUTTON (gfig_context->gradient_select), + style->gradient); gfig_context->bdesc.name = style->brush_name; if (gfig_context->debug_styles) diff --git a/plug-ins/script-fu/script-fu-interface.c b/plug-ins/script-fu/script-fu-interface.c index 410197d8b6..fc7d4d4d97 100644 --- a/plug-ins/script-fu/script-fu-interface.c +++ b/plug-ins/script-fu/script-fu-interface.c @@ -938,36 +938,31 @@ script_fu_reset (SFScript *script) break; case SF_FONT: - gimp_font_select_button_set_font_name - (GIMP_FONT_SELECT_BUTTON (widget), - script->arg_defaults[i].sfa_font); + gimp_font_select_button_set_font (GIMP_FONT_SELECT_BUTTON (widget), + script->arg_defaults[i].sfa_font); break; case SF_PALETTE: - gimp_palette_select_button_set_palette_name - (GIMP_PALETTE_SELECT_BUTTON (widget), - script->arg_defaults[i].sfa_palette); + gimp_palette_select_button_set_palette (GIMP_PALETTE_SELECT_BUTTON (widget), + script->arg_defaults[i].sfa_palette); break; case SF_PATTERN: - gimp_pattern_select_button_set_pattern_name - (GIMP_PATTERN_SELECT_BUTTON (widget), - script->arg_defaults[i].sfa_pattern); + gimp_pattern_select_button_set_pattern (GIMP_PATTERN_SELECT_BUTTON (widget), + script->arg_defaults[i].sfa_pattern); break; case SF_GRADIENT: - gimp_gradient_select_button_set_gradient_name - (GIMP_GRADIENT_SELECT_BUTTON (widget), - script->arg_defaults[i].sfa_gradient); + gimp_gradient_select_button_set_gradient (GIMP_GRADIENT_SELECT_BUTTON (widget), + script->arg_defaults[i].sfa_gradient); break; case SF_BRUSH: - gimp_brush_select_button_set_brush - (GIMP_BRUSH_SELECT_BUTTON (widget), - script->arg_defaults[i].sfa_brush.name, - script->arg_defaults[i].sfa_brush.opacity, - script->arg_defaults[i].sfa_brush.spacing, - script->arg_defaults[i].sfa_brush.paint_mode); + gimp_brush_select_button_set_brush (GIMP_BRUSH_SELECT_BUTTON (widget), + script->arg_defaults[i].sfa_brush.name, + script->arg_defaults[i].sfa_brush.opacity, + script->arg_defaults[i].sfa_brush.spacing, + script->arg_defaults[i].sfa_brush.paint_mode); break; case SF_OPTION: diff --git a/po/Makefile.in.in b/po/Makefile.in.in index deeb686368..d2d4e4cdcd 100644 --- a/po/Makefile.in.in +++ b/po/Makefile.in.in @@ -22,7 +22,6 @@ PACKAGE = @PACKAGE@ VERSION = @VERSION@ SHELL = /bin/sh -@SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -34,9 +33,8 @@ exec_prefix = @exec_prefix@ datadir = @datadir@ datarootdir = @datarootdir@ libdir = @libdir@ -localedir = $(libdir)/locale -gnulocaledir = $(datadir)/locale -gettextsrcdir = $(datadir)/glib-2.0/gettext/po +DATADIRNAME = @DATADIRNAME@ +itlocaledir = $(prefix)/$(DATADIRNAME)/locale subdir = po install_sh = @install_sh@ # Automake >= 1.8 provides @mkdir_p@. @@ -46,7 +44,6 @@ mkdir_p = $(install_sh) -d INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ -CC = @CC@ GMSGFMT = @GMSGFMT@ MSGFMT = @MSGFMT@ XGETTEXT = @XGETTEXT@ @@ -55,31 +52,22 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ MSGMERGE = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --dist GENPOT = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --pot -DEFS = @DEFS@ -CFLAGS = @CFLAGS@ -CPPFLAGS = @CPPFLAGS@ +ALL_LINGUAS = @ALL_LINGUAS@ -INCLUDES = -I.. -I$(top_srcdir)/intl +PO_LINGUAS=$(shell if test -r $(srcdir)/LINGUAS; then grep -v "^\#" $(srcdir)/LINGUAS; fi) -COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(XCFLAGS) +POFILES=$(shell if test -n "$(PO_LINGUAS)"; then LINGUAS="$(PO_LINGUAS)"; else LINGUAS="$(ALL_LINGUAS)"; fi; for lang in $$LINGUAS; do printf "$$lang.po "; done) -SOURCES = -POFILES = @POFILES@ -GMOFILES = @GMOFILES@ -DISTFILES = ChangeLog Makefile.in.in POTFILES.in \ -$(POFILES) $(SOURCES) +DISTFILES = ChangeLog Makefile.in.in POTFILES.in $(POFILES) EXTRA_DISTFILES = POTFILES.skip Makevars LINGUAS POTFILES = \ +#This Gets Replace for some reason -CATALOGS = @CATALOGS@ -CATOBJEXT = @CATOBJEXT@ +CATALOGS=$(shell if test -n "$(PO_LINGUAS)"; then LINGUAS="$(PO_LINGUAS)"; else LINGUAS="$(ALL_LINGUAS)"; fi; for lang in $$LINGUAS; do printf "$$lang.gmo "; done) .SUFFIXES: -.SUFFIXES: .c .o .po .pox .gmo .mo .msg .cat - -.c.o: - $(COMPILE) $< +.SUFFIXES: .po .pox .gmo .mo .msg .cat .po.pox: $(MAKE) $(GETTEXT_PACKAGE).pot @@ -105,76 +93,63 @@ all-no: $(GETTEXT_PACKAGE).pot: $(POTFILES) $(GENPOT) -install: install-exec install-data -install-exec: +install: install-data install-data: install-data-@USE_NLS@ install-data-no: all install-data-yes: all - $(mkdir_p) $(DESTDIR)$(datadir) - @catalogs='$(CATALOGS)'; \ - for cat in $$catalogs; do \ - cat=`basename $$cat`; \ - case "$$cat" in \ - *.gmo) destdir=$(gnulocaledir);; \ - *) destdir=$(localedir);; \ - esac; \ - lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \ - dir=$(DESTDIR)$$destdir/$$lang/LC_MESSAGES; \ + $(mkdir_p) $(DESTDIR)$(itlocaledir) + if test -n "$(PO_LINGUAS)"; then \ + linguas="$(PO_LINGUAS)"; \ + else \ + linguas="$(ALL_LINGUAS)"; \ + fi; \ + for lang in $$linguas; do \ + dir=$(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES; \ $(mkdir_p) $$dir; \ - if test -r $$cat; then \ - $(INSTALL_DATA) $$cat $$dir/$(GETTEXT_PACKAGE).mo; \ - echo "installing $$cat as $$dir/$(GETTEXT_PACKAGE).mo"; \ + if test -r $$lang.gmo; then \ + $(INSTALL_DATA) $$lang.gmo $$dir/$(GETTEXT_PACKAGE).mo; \ + echo "installing $$lang.gmo as $$dir/$(GETTEXT_PACKAGE).mo"; \ else \ - $(INSTALL_DATA) $(srcdir)/$$cat $$dir/$(GETTEXT_PACKAGE).mo; \ - echo "installing $(srcdir)/$$cat as" \ + $(INSTALL_DATA) $(srcdir)/$$lang.gmo $$dir/$(GETTEXT_PACKAGE).mo; \ + echo "installing $(srcdir)/$$lang.gmo as" \ "$$dir/$(GETTEXT_PACKAGE).mo"; \ fi; \ - if test -r $$cat.m; then \ - $(INSTALL_DATA) $$cat.m $$dir/$(GETTEXT_PACKAGE).mo.m; \ - echo "installing $$cat.m as $$dir/$(GETTEXT_PACKAGE).mo.m"; \ + if test -r $$lang.gmo.m; then \ + $(INSTALL_DATA) $$lang.gmo.m $$dir/$(GETTEXT_PACKAGE).mo.m; \ + echo "installing $$lang.gmo.m as $$dir/$(GETTEXT_PACKAGE).mo.m"; \ else \ - if test -r $(srcdir)/$$cat.m ; then \ - $(INSTALL_DATA) $(srcdir)/$$cat.m \ + if test -r $(srcdir)/$$lang.gmo.m ; then \ + $(INSTALL_DATA) $(srcdir)/$$lang.gmo.m \ $$dir/$(GETTEXT_PACKAGE).mo.m; \ - echo "installing $(srcdir)/$$cat as" \ + echo "installing $(srcdir)/$$lang.gmo.m as" \ "$$dir/$(GETTEXT_PACKAGE).mo.m"; \ else \ true; \ fi; \ fi; \ done - if test "$(PACKAGE)" = "glib"; then \ - $(mkdir_p) $(DESTDIR)$(gettextsrcdir); \ - $(INSTALL_DATA) $(srcdir)/Makefile.in.in \ - $(DESTDIR)$(gettextsrcdir)/Makefile.in.in; \ - else \ - : ; \ - fi + +# Empty stubs to satisfy archaic automake needs +dvi info tags TAGS ID: # Define this as empty until I found a useful application. installcheck: uninstall: - catalogs='$(CATALOGS)'; \ - for cat in $$catalogs; do \ - cat=`basename $$cat`; \ - lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \ - rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo; \ - rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo.m; \ - rm -f $(DESTDIR)$(gnulocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo; \ - rm -f $(DESTDIR)$(gnulocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo.m; \ + if test -n "$(PO_LINGUAS)"; then \ + linguas="$(PO_LINGUAS)"; \ + else \ + linguas="$(ALL_LINGUAS)"; \ + fi; \ + for lang in $$linguas; do \ + rm -f $(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo; \ + rm -f $(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo.m; \ done - if test "$(PACKAGE)" = "glib"; then \ - rm -f $(DESTDIR)$(gettextsrcdir)/Makefile.in.in; \ - fi check: all $(GETTEXT_PACKAGE).pot -dvi info tags TAGS ID: - mostlyclean: - rm -f core core.* *.pox $(GETTEXT_PACKAGE).pot *.old.po cat-id-tbl.tmp - rm -fr *.o + rm -f *.pox $(GETTEXT_PACKAGE).pot *.old.po cat-id-tbl.tmp rm -f .intltool-merge-cache clean: mostlyclean @@ -188,7 +163,7 @@ maintainer-clean: distclean @echo "it deletes files that may require special tools to rebuild." rm -f Makefile.in.in -distdir = ../$(GETTEXT_PACKAGE)-$(VERSION)/$(subdir) +distdir = ../$(PACKAGE)-$(VERSION)/$(subdir) dist distdir: $(DISTFILES) dists="$(DISTFILES)"; \ extra_dists="$(EXTRA_DISTFILES)"; \ @@ -204,10 +179,12 @@ dist distdir: $(DISTFILES) update-po: Makefile $(MAKE) $(GETTEXT_PACKAGE).pot tmpdir=`pwd`; \ - catalogs='$(CATALOGS)'; \ - for cat in $$catalogs; do \ - cat=`basename $$cat`; \ - lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \ + if test -n "$(PO_LINGUAS)"; then \ + linguas="$(PO_LINGUAS)"; \ + else \ + linguas="$(ALL_LINGUAS)"; \ + fi; \ + for lang in $$linguas; do \ echo "$$lang:"; \ result="`$(MSGMERGE) -o $$tmpdir/$$lang.new.po $$lang`"; \ if $$result; then \ @@ -223,7 +200,7 @@ update-po: Makefile fi; \ fi; \ else \ - echo "msgmerge for $$cat failed!"; \ + echo "msgmerge for $$lang.gmo failed!"; \ rm -f $$tmpdir/$$lang.new.po; \ fi; \ done