dallasgroot/Gimp
dallasgroot/Gimp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

app: move "default_name" from GimpItemClass to GimpViewableClass and

Browse source 
set default names for a lot of stuff. To be used by GimpRow soon.
This commit is contained in:
Michael Natterer 2025-07-16 17:22:11 +02:00
parent b32ab62822
commit df497b5ca6
19 changed files with 26 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/core/gimpbrush.c
View file

@ -135,6 +135,7 @@ gimp_brush_class_init (GimpBrushClass *klass)
gimp_object_class->get_memsize = gimp_brush_get_memsize;
viewable_class->default_icon_name = "gimp-tool-paintbrush";
viewable_class->default_name = _("Brush");
viewable_class->get_size = gimp_brush_get_size;
viewable_class->get_new_preview = gimp_brush_get_new_preview;
viewable_class->get_description = gimp_brush_get_description;

3
app/core/gimpbuffer.c
View file

@ -35,6 +35,8 @@
#include "gimpimage.h"
#include "gimptempbuf.h"
#include "gimp-intl.h"
static void gimp_color_managed_iface_init (GimpColorManagedInterface *iface);
@ -101,6 +103,7 @@ gimp_buffer_class_init (GimpBufferClass *klass)
gimp_object_class->get_memsize = gimp_buffer_get_memsize;
viewable_class->default_icon_name = "edit-paste";
viewable_class->default_name = _("Buffer");
viewable_class->name_editable = TRUE;
viewable_class->get_size = gimp_buffer_get_size;
viewable_class->get_preview_size = gimp_buffer_get_preview_size;

4
app/core/gimpchannel.c
View file

@ -236,8 +236,9 @@ gimp_channel_class_init (GimpChannelClass *klass)
gimp_object_class->get_memsize = gimp_channel_get_memsize;
viewable_class->get_description = gimp_channel_get_description;
viewable_class->default_icon_name = "gimp-channel";
viewable_class->default_name = _("Channel");
viewable_class->get_description = gimp_channel_get_description;
filter_class->get_node = gimp_channel_get_node;
@ -253,7 +254,6 @@ gimp_channel_class_init (GimpChannelClass *klass)
item_class->fill = gimp_channel_fill;
item_class->stroke = gimp_channel_stroke;
item_class->to_selection = gimp_channel_to_selection;
item_class->default_name = _("Channel");
item_class->rename_desc = C_("undo-type", "Rename Channel");
item_class->translate_desc = C_("undo-type", "Move Channel");
item_class->scale_desc = C_("undo-type", "Scale Channel");

3
app/core/gimpgradient.c
View file

@ -35,6 +35,8 @@
#include "gimptagged.h"
#include "gimptempbuf.h"
#include "gimp-intl.h"
#define EPSILON 1e-10
@ -120,6 +122,7 @@ gimp_gradient_class_init (GimpGradientClass *klass)
gimp_object_class->get_memsize = gimp_gradient_get_memsize;
viewable_class->default_icon_name = "gimp-tool-gradient";
viewable_class->default_name = _("Gradient");
viewable_class->get_preview_size = gimp_gradient_get_preview_size;
viewable_class->get_popup_size = gimp_gradient_get_popup_size;
viewable_class->get_new_preview = gimp_gradient_get_new_preview;

2
app/core/gimpgrouplayer.c
View file

@ -276,6 +276,7 @@ gimp_group_layer_class_init (GimpGroupLayerClass *klass)
gimp_object_class->get_memsize = gimp_group_layer_get_memsize;
viewable_class->default_icon_name = "gimp-group-layer";
viewable_class->default_name = _("Layer Group");
viewable_class->ancestry_changed = gimp_group_layer_ancestry_changed;
viewable_class->get_size = gimp_group_layer_get_size;
viewable_class->get_children = gimp_group_layer_get_children;
@ -290,7 +291,6 @@ gimp_group_layer_class_init (GimpGroupLayerClass *klass)
item_class->resize = gimp_group_layer_resize;
item_class->get_clip = gimp_group_layer_get_clip;
item_class->default_name = _("Layer Group");
item_class->rename_desc = C_("undo-type", "Rename Layer Group");
item_class->translate_desc = C_("undo-type", "Move Layer Group");
item_class->scale_desc = C_("undo-type", "Scale Layer Group");

1
app/core/gimpimage.c
View file

@ -599,6 +599,7 @@ gimp_image_class_init (GimpImageClass *klass)
gimp_object_class->get_memsize = gimp_image_get_memsize;
viewable_class->default_icon_name = "gimp-image";
viewable_class->default_name = _("Image");
viewable_class->get_size = gimp_image_get_size;
viewable_class->size_changed = gimp_image_size_changed;
viewable_class->get_preview_size = gimp_image_get_preview_size;

5
app/core/gimpitem.c
View file

@ -280,7 +280,6 @@ gimp_item_class_init (GimpItemClass *klass)
klass->stroke = NULL;
klass->to_selection = NULL;
klass->default_name = NULL;
klass->rename_desc = NULL;
klass->translate_desc = NULL;
klass->scale_desc = NULL;
@ -775,7 +774,7 @@ gimp_item_new (GType type,
gimp_object_set_name (GIMP_OBJECT (item), name);
else
gimp_object_set_static_name (GIMP_OBJECT (item),
GIMP_ITEM_GET_CLASS (item)->default_name);
GIMP_VIEWABLE_GET_CLASS (item)->default_name);
return item;
}
@ -1100,7 +1099,7 @@ gimp_item_rename (GimpItem *item,
item_class = GIMP_ITEM_GET_CLASS (item);
if (! new_name || ! *new_name)
new_name = item_class->default_name;
new_name = GIMP_VIEWABLE_GET_CLASS (item)->default_name;
if (strcmp (new_name, gimp_object_get_name (item)))
return item_class->rename (item, new_name, item_class->rename_desc, error);

1
app/core/gimpitem.h
View file

@ -129,7 +129,6 @@ struct _GimpItemClass
gdouble feather_radius_x,
gdouble feather_radius_y);
const gchar *default_name;
const gchar *rename_desc;
const gchar *translate_desc;
const gchar *scale_desc;

2
app/core/gimplayer.c
View file

@ -403,6 +403,7 @@ gimp_layer_class_init (GimpLayerClass *klass)
gimp_object_class->get_memsize = gimp_layer_get_memsize;
viewable_class->default_icon_name = "gimp-layer";
viewable_class->default_name = _("Layer");
viewable_class->invalidate_preview = gimp_layer_invalidate_preview;
viewable_class->get_description = gimp_layer_get_description;
@ -424,7 +425,6 @@ gimp_layer_class_init (GimpLayerClass *klass)
item_class->rotate = gimp_layer_rotate;
item_class->transform = gimp_layer_transform;
item_class->to_selection = gimp_layer_to_selection;
item_class->default_name = _("Layer");
item_class->rename_desc = C_("undo-type", "Rename Layer");
item_class->translate_desc = C_("undo-type", "Move Layer");
item_class->scale_desc = C_("undo-type", "Scale Layer");

1
app/core/gimppalette.c
View file

@ -127,6 +127,7 @@ gimp_palette_class_init (GimpPaletteClass *klass)
gimp_object_class->get_memsize = gimp_palette_get_memsize;
viewable_class->default_icon_name = "gtk-select-color";
viewable_class->default_name = _("Palette");
viewable_class->get_preview_size = gimp_palette_get_preview_size;
viewable_class->get_popup_size = gimp_palette_get_popup_size;
viewable_class->get_new_preview = gimp_palette_get_new_preview;

1
app/core/gimppattern.c
View file

@ -82,6 +82,7 @@ gimp_pattern_class_init (GimpPatternClass *klass)
gimp_object_class->get_memsize = gimp_pattern_get_memsize;
viewable_class->default_icon_name = "gimp-tool-bucket-fill";
viewable_class->default_name = _("Pattern");
viewable_class->get_size = gimp_pattern_get_size;
viewable_class->get_new_preview = gimp_pattern_get_new_preview;
viewable_class->get_description = gimp_pattern_get_description;

2
app/core/gimpselection.c
View file

@ -159,6 +159,7 @@ gimp_selection_class_init (GimpSelectionClass *klass)
GimpChannelClass *channel_class = GIMP_CHANNEL_CLASS (klass);
viewable_class->default_icon_name = "gimp-selection";
viewable_class->default_name = _("Selection Mask");
item_class->is_attached = gimp_selection_is_attached;
item_class->get_tree = gimp_selection_get_tree;
@ -169,7 +170,6 @@ gimp_selection_class_init (GimpSelectionClass *klass)
item_class->rotate = gimp_selection_rotate;
item_class->fill = gimp_selection_fill;
item_class->stroke = gimp_selection_stroke;
item_class->default_name = _("Selection Mask");
item_class->translate_desc = C_("undo-type", "Move Selection");
item_class->fill_desc = C_("undo-type", "Fill Selection");
item_class->stroke_desc = C_("undo-type", "Stroke Selection");

3
app/core/gimpsettings.c
View file

@ -68,8 +68,9 @@ gimp_settings_class_init (GimpSettingsClass *klass)
object_class->set_property = gimp_settings_set_property;
object_class->get_property = gimp_settings_get_property;
viewable_class->get_description = gimp_settings_get_description;
viewable_class->default_name = _("Preset");
viewable_class->name_editable = TRUE;
viewable_class->get_description = gimp_settings_get_description;
GIMP_CONFIG_PROP_INT64 (object_class, PROP_TIME,
"time",

1
app/core/gimpviewable.c
View file

@ -195,6 +195,7 @@ gimp_viewable_class_init (GimpViewableClass *klass)
gimp_object_class->get_memsize = gimp_viewable_get_memsize;
klass->default_icon_name = "gimp-image";
klass->default_name = "EEK: Missing Default Name";
klass->name_changed_signal = "name-changed";
klass->name_editable = FALSE;

1
app/core/gimpviewable.h
View file

@ -41,6 +41,7 @@ struct _GimpViewableClass
GimpObjectClass parent_class;
const gchar *default_icon_name;
const gchar *default_name;
const gchar *name_changed_signal;
gboolean name_editable;

4
app/path/gimppath.c
View file

@ -203,8 +203,9 @@ gimp_path_class_init (GimpPathClass *klass)
gimp_object_class->get_memsize = gimp_path_get_memsize;
viewable_class->get_new_preview = gimp_path_get_new_preview;
viewable_class->default_icon_name = "gimp-path";
viewable_class->default_name = _("Path");
viewable_class->get_new_preview = gimp_path_get_new_preview;
item_class->is_attached = gimp_path_is_attached;
item_class->get_tree = gimp_path_get_tree;
@ -221,7 +222,6 @@ gimp_path_class_init (GimpPathClass *klass)
item_class->fill = gimp_path_fill;
item_class->stroke = gimp_path_stroke;
item_class->to_selection = gimp_path_to_selection;
item_class->default_name = _("Path");
item_class->rename_desc = C_("undo-type", "Rename Path");
item_class->translate_desc = C_("undo-type", "Move Path");
item_class->scale_desc = C_("undo-type", "Scale Path");

1
app/text/gimpfont.c
View file

@ -601,6 +601,7 @@ gimp_font_class_init (GimpFontClass *klass)
viewable_class->get_new_preview = gimp_font_get_new_preview;
viewable_class->default_icon_name = "gtk-select-font";
viewable_class->default_name = _("Font");
}
static void

2
app/text/gimptextlayer.c
View file

@ -143,6 +143,7 @@ gimp_text_layer_class_init (GimpTextLayerClass *klass)
gimp_object_class->get_memsize = gimp_text_layer_get_memsize;
viewable_class->default_icon_name = "gimp-text-layer";
viewable_class->default_name = _("Text Layer");
item_class->duplicate = gimp_text_layer_duplicate;
item_class->rename = gimp_text_layer_rename;
@ -154,7 +155,6 @@ gimp_text_layer_class_init (GimpTextLayerClass *klass)
item_class->transform = gimp_text_layer_transform;
#endif
item_class->default_name = _("Text Layer");
item_class->rename_desc = _("Rename Text Layer");
item_class->translate_desc = _("Move Text Layer");
item_class->scale_desc = _("Scale Text Layer");

1
app/widgets/gimpcontrollerinfo.c
View file

@ -107,6 +107,7 @@ gimp_controller_info_class_init (GimpControllerInfoClass *klass)
object_class->get_property = gimp_controller_info_get_property;
viewable_class->default_icon_name = GIMP_ICON_CONTROLLER;
viewable_class->default_name = _("Input Controller");
viewable_class->name_editable = TRUE;
GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_ENABLED,