mirror of https://github.com/GNOME/gimp.git
libgimpwidgets: remove most deprecated cruft
This commit is contained in:
Michael Natterer
parent
f180a171cd
commit
1f0d296eb6
|
|
@ -52,7 +52,6 @@ enum
|
|||
{
|
||||
PROP_0,
|
||||
PROP_ICON_NAME,
|
||||
PROP_STOCK_ID,
|
||||
PROP_STOCK_SIZE,
|
||||
PROP_OVERRIDE_BACKGROUND
|
||||
};
|
||||
|
|
@ -63,7 +62,6 @@ typedef struct _GimpCellRendererTogglePrivate GimpCellRendererTogglePrivate;
|
|||
struct _GimpCellRendererTogglePrivate
|
||||
{
|
||||
gchar *icon_name;
|
||||
gchar *stock_id;
|
||||
GtkIconSize stock_size;
|
||||
gboolean override_background;
|
||||
|
||||
|
|
@ -150,14 +148,6 @@ gimp_cell_renderer_toggle_class_init (GimpCellRendererToggleClass *klass)
|
|||
GIMP_PARAM_READWRITE |
|
||||
G_PARAM_CONSTRUCT));
|
||||
|
||||
g_object_class_install_property (object_class, PROP_STOCK_ID,
|
||||
g_param_spec_string ("stock-id",
|
||||
"Stock ID",
|
||||
"The icon to display, deprecated",
|
||||
NULL,
|
||||
GIMP_PARAM_READWRITE |
|
||||
G_PARAM_CONSTRUCT));
|
||||
|
||||
g_object_class_install_property (object_class, PROP_STOCK_SIZE,
|
||||
g_param_spec_int ("stock-size",
|
||||
"Stock Size",
|
||||
|
|
@ -189,8 +179,6 @@ gimp_cell_renderer_toggle_finalize (GObject *object)
|
|||
GimpCellRendererTogglePrivate *priv = GET_PRIVATE (object);
|
||||
|
||||
g_clear_pointer (&priv->icon_name, g_free);
|
||||
g_clear_pointer (&priv->stock_id, g_free);
|
||||
|
||||
g_clear_object (&priv->pixbuf);
|
||||
|
||||
G_OBJECT_CLASS (parent_class)->finalize (object);
|
||||
|
|
@ -210,10 +198,6 @@ gimp_cell_renderer_toggle_get_property (GObject *object,
|
|||
g_value_set_string (value, priv->icon_name);
|
||||
break;
|
||||
|
||||
case PROP_STOCK_ID:
|
||||
g_value_set_string (value, priv->stock_id);
|
||||
break;
|
||||
|
||||
case PROP_STOCK_SIZE:
|
||||
g_value_set_int (value, priv->stock_size);
|
||||
break;
|
||||
|
|
@ -244,12 +228,6 @@ gimp_cell_renderer_toggle_set_property (GObject *object,
|
|||
priv->icon_name = g_value_dup_string (value);
|
||||
break;
|
||||
|
||||
case PROP_STOCK_ID:
|
||||
if (priv->stock_id)
|
||||
g_free (priv->stock_id);
|
||||
priv->stock_id = g_value_dup_string (value);
|
||||
break;
|
||||
|
||||
case PROP_STOCK_SIZE:
|
||||
priv->stock_size = g_value_get_int (value);
|
||||
break;
|
||||
|
|
@ -288,7 +266,7 @@ gimp_cell_renderer_toggle_get_size (GtkCellRenderer *cell,
|
|||
gint xpad;
|
||||
gint ypad;
|
||||
|
||||
if (! priv->icon_name && ! priv->stock_id)
|
||||
if (! priv->icon_name)
|
||||
{
|
||||
GTK_CELL_RENDERER_CLASS (parent_class)->get_size (cell,
|
||||
widget,
|
||||
|
|
@ -360,7 +338,7 @@ gimp_cell_renderer_toggle_render (GtkCellRenderer *cell,
|
|||
gint xpad;
|
||||
gint ypad;
|
||||
|
||||
if (! priv->icon_name && ! priv->stock_id)
|
||||
if (! priv->icon_name)
|
||||
{
|
||||
GTK_CELL_RENDERER_CLASS (parent_class)->render (cell, cr, widget,
|
||||
background_area,
|
||||
|
|
@ -522,12 +500,6 @@ gimp_cell_renderer_toggle_create_pixbuf (GimpCellRendererToggle *toggle,
|
|||
priv->icon_name,
|
||||
MIN (width, height), 0, NULL);
|
||||
}
|
||||
else
|
||||
{
|
||||
priv->pixbuf = gtk_widget_render_icon_pixbuf (widget,
|
||||
priv->stock_id,
|
||||
priv->stock_size);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -135,6 +135,7 @@ gimp_color_display_class_init (GimpColorDisplayClass *klass)
|
|||
GIMP_TYPE_COLOR_MANAGED,
|
||||
GIMP_PARAM_READWRITE |
|
||||
G_PARAM_CONSTRUCT_ONLY));
|
||||
|
||||
display_signals[CHANGED] =
|
||||
g_signal_new ("changed",
|
||||
G_TYPE_FROM_CLASS (klass),
|
||||
|
|
@ -148,14 +149,9 @@ gimp_color_display_class_init (GimpColorDisplayClass *klass)
|
|||
klass->help_id = NULL;
|
||||
klass->icon_name = GIMP_ICON_DISPLAY_FILTER;
|
||||
|
||||
klass->clone = NULL;
|
||||
klass->convert_buffer = NULL;
|
||||
klass->convert_surface = NULL;
|
||||
klass->convert = NULL;
|
||||
klass->load_state = NULL;
|
||||
klass->save_state = NULL;
|
||||
klass->configure = NULL;
|
||||
klass->configure_reset = NULL;
|
||||
|
||||
klass->changed = NULL;
|
||||
|
||||
g_type_class_add_private (object_class, sizeof (GimpColorDisplayPrivate));
|
||||
|
|
@ -299,49 +295,11 @@ gimp_color_display_set_color_managed (GimpColorDisplay *display,
|
|||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* gimp_color_display_new:
|
||||
* @display_type: the GType of the GimpColorDisplay to instantiate.
|
||||
*
|
||||
* This function is deprecated. Please use g_object_new() directly.
|
||||
*
|
||||
* Return value: a new %GimpColorDisplay object.
|
||||
**/
|
||||
GimpColorDisplay *
|
||||
gimp_color_display_new (GType display_type)
|
||||
{
|
||||
g_return_val_if_fail (g_type_is_a (display_type, GIMP_TYPE_COLOR_DISPLAY),
|
||||
NULL);
|
||||
|
||||
return g_object_new (display_type, NULL);
|
||||
}
|
||||
|
||||
GimpColorDisplay *
|
||||
gimp_color_display_clone (GimpColorDisplay *display)
|
||||
{
|
||||
g_return_val_if_fail (GIMP_IS_COLOR_DISPLAY (display), NULL);
|
||||
|
||||
/* implementing the clone method is deprecated
|
||||
*/
|
||||
if (GIMP_COLOR_DISPLAY_GET_CLASS (display)->clone)
|
||||
{
|
||||
GimpColorDisplay *clone;
|
||||
|
||||
clone = GIMP_COLOR_DISPLAY_GET_CLASS (display)->clone (display);
|
||||
|
||||
if (clone)
|
||||
{
|
||||
GimpColorDisplayPrivate *private = GET_PRIVATE (display);
|
||||
|
||||
g_object_set (clone,
|
||||
"enabled", private->enabled,
|
||||
"color-managed", private->managed,
|
||||
NULL);
|
||||
}
|
||||
|
||||
return clone;
|
||||
}
|
||||
|
||||
return GIMP_COLOR_DISPLAY (gimp_config_duplicate (GIMP_CONFIG (display)));
|
||||
}
|
||||
|
||||
|
|
@ -375,74 +333,6 @@ gimp_color_display_convert_buffer (GimpColorDisplay *display,
|
|||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* gimp_color_display_convert_surface:
|
||||
* @display: a #GimpColorDisplay
|
||||
* @surface: a #cairo_image_surface_t of type ARGB32
|
||||
*
|
||||
* Converts all pixels in @surface.
|
||||
*
|
||||
* Since: 2.8
|
||||
*
|
||||
* Deprecated: GIMP 2.8: Use gimp_color_display_convert_buffer() instead.
|
||||
**/
|
||||
void
|
||||
gimp_color_display_convert_surface (GimpColorDisplay *display,
|
||||
cairo_surface_t *surface)
|
||||
{
|
||||
GimpColorDisplayPrivate *private;
|
||||
|
||||
g_return_if_fail (GIMP_IS_COLOR_DISPLAY (display));
|
||||
g_return_if_fail (surface != NULL);
|
||||
g_return_if_fail (cairo_surface_get_type (surface) ==
|
||||
CAIRO_SURFACE_TYPE_IMAGE);
|
||||
|
||||
private = GET_PRIVATE (display);
|
||||
|
||||
if (private->enabled &&
|
||||
GIMP_COLOR_DISPLAY_GET_CLASS (display)->convert_surface)
|
||||
{
|
||||
cairo_surface_flush (surface);
|
||||
GIMP_COLOR_DISPLAY_GET_CLASS (display)->convert_surface (display, surface);
|
||||
cairo_surface_mark_dirty (surface);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* gimp_color_display_convert:
|
||||
* @display: a #GimpColorDisplay
|
||||
* @buf: the pixel buffer to convert
|
||||
* @width: the width of the buffer
|
||||
* @height: the height of the buffer
|
||||
* @bpp: the number of bytes per pixel
|
||||
* @bpl: the buffer's rowstride
|
||||
*
|
||||
* Converts all pixels in @buf.
|
||||
*
|
||||
* Deprecated: GIMP 2.8: Use gimp_color_display_convert_buffer() instead.
|
||||
**/
|
||||
void
|
||||
gimp_color_display_convert (GimpColorDisplay *display,
|
||||
guchar *buf,
|
||||
gint width,
|
||||
gint height,
|
||||
gint bpp,
|
||||
gint bpl)
|
||||
{
|
||||
GimpColorDisplayPrivate *private;
|
||||
|
||||
g_return_if_fail (GIMP_IS_COLOR_DISPLAY (display));
|
||||
|
||||
private = GET_PRIVATE (display);
|
||||
|
||||
/* implementing the convert method is deprecated
|
||||
*/
|
||||
if (private->enabled && GIMP_COLOR_DISPLAY_GET_CLASS (display)->convert)
|
||||
GIMP_COLOR_DISPLAY_GET_CLASS (display)->convert (display, buf,
|
||||
width, height,
|
||||
bpp, bpl);
|
||||
}
|
||||
|
||||
void
|
||||
gimp_color_display_load_state (GimpColorDisplay *display,
|
||||
GimpParasite *state)
|
||||
|
|
@ -450,19 +340,10 @@ gimp_color_display_load_state (GimpColorDisplay *display,
|
|||
g_return_if_fail (GIMP_IS_COLOR_DISPLAY (display));
|
||||
g_return_if_fail (state != NULL);
|
||||
|
||||
/* implementing the load_state method is deprecated
|
||||
*/
|
||||
if (GIMP_COLOR_DISPLAY_GET_CLASS (display)->load_state)
|
||||
{
|
||||
GIMP_COLOR_DISPLAY_GET_CLASS (display)->load_state (display, state);
|
||||
}
|
||||
else
|
||||
{
|
||||
gimp_config_deserialize_string (GIMP_CONFIG (display),
|
||||
gimp_parasite_data (state),
|
||||
gimp_parasite_data_size (state),
|
||||
NULL, NULL);
|
||||
}
|
||||
gimp_config_deserialize_string (GIMP_CONFIG (display),
|
||||
gimp_parasite_data (state),
|
||||
gimp_parasite_data_size (state),
|
||||
NULL, NULL);
|
||||
}
|
||||
|
||||
GimpParasite *
|
||||
|
|
@ -473,13 +354,6 @@ gimp_color_display_save_state (GimpColorDisplay *display)
|
|||
|
||||
g_return_val_if_fail (GIMP_IS_COLOR_DISPLAY (display), NULL);
|
||||
|
||||
/* implementing the save_state method is deprecated
|
||||
*/
|
||||
if (GIMP_COLOR_DISPLAY_GET_CLASS (display)->save_state)
|
||||
{
|
||||
return GIMP_COLOR_DISPLAY_GET_CLASS (display)->save_state (display);
|
||||
}
|
||||
|
||||
str = gimp_config_serialize_to_string (GIMP_CONFIG (display), NULL);
|
||||
|
||||
parasite = gimp_parasite_new ("Display/Proof",
|
||||
|
|
@ -506,16 +380,7 @@ gimp_color_display_configure_reset (GimpColorDisplay *display)
|
|||
{
|
||||
g_return_if_fail (GIMP_IS_COLOR_DISPLAY (display));
|
||||
|
||||
/* implementing the configure_reset method is deprecated
|
||||
*/
|
||||
if (GIMP_COLOR_DISPLAY_GET_CLASS (display)->configure_reset)
|
||||
{
|
||||
GIMP_COLOR_DISPLAY_GET_CLASS (display)->configure_reset (display);
|
||||
}
|
||||
else
|
||||
{
|
||||
gimp_config_reset (GIMP_CONFIG (display));
|
||||
}
|
||||
gimp_config_reset (GIMP_CONFIG (display));
|
||||
}
|
||||
|
||||
void
|
||||
|
|
|
|||
|
|
@ -56,37 +56,11 @@ struct _GimpColorDisplayClass
|
|||
|
||||
/* virtual functions */
|
||||
|
||||
/* implementing the GimpColorDisplay::clone method is deprecated */
|
||||
GimpColorDisplay * (* clone) (GimpColorDisplay *display);
|
||||
|
||||
void (* convert_buffer) (GimpColorDisplay *display,
|
||||
GeglBuffer *buffer,
|
||||
GeglRectangle *area);
|
||||
|
||||
/* implementing the GimpColorDisplay::convert_surface method is deprecated */
|
||||
void (* convert_surface) (GimpColorDisplay *display,
|
||||
cairo_surface_t *surface);
|
||||
|
||||
/* implementing the GimpColorDisplay::convert method is deprecated */
|
||||
void (* convert) (GimpColorDisplay *display,
|
||||
guchar *buf,
|
||||
gint width,
|
||||
gint height,
|
||||
gint bpp,
|
||||
gint bpl);
|
||||
|
||||
/* implementing the GimpColorDisplay::load_state method is deprecated */
|
||||
void (* load_state) (GimpColorDisplay *display,
|
||||
GimpParasite *state);
|
||||
|
||||
/* implementing the GimpColorDisplay::save_state method is deprecated */
|
||||
GimpParasite * (* save_state) (GimpColorDisplay *display);
|
||||
|
||||
GtkWidget * (* configure) (GimpColorDisplay *display);
|
||||
|
||||
/* implementing the GimpColorDisplay::configure_reset method is deprecated */
|
||||
void (* configure_reset) (GimpColorDisplay *display);
|
||||
|
||||
/* signals */
|
||||
void (* changed) (GimpColorDisplay *display);
|
||||
|
||||
|
|
@ -100,23 +74,11 @@ struct _GimpColorDisplayClass
|
|||
|
||||
GType gimp_color_display_get_type (void) G_GNUC_CONST;
|
||||
|
||||
GIMP_DEPRECATED_FOR(g_object_new)
|
||||
GimpColorDisplay * gimp_color_display_new (GType display_type);
|
||||
GimpColorDisplay * gimp_color_display_clone (GimpColorDisplay *display);
|
||||
|
||||
void gimp_color_display_convert_buffer (GimpColorDisplay *display,
|
||||
GeglBuffer *buffer,
|
||||
GeglRectangle *area);
|
||||
GIMP_DEPRECATED_FOR(gimp_color_display_convert_buffer)
|
||||
void gimp_color_display_convert_surface (GimpColorDisplay *display,
|
||||
cairo_surface_t *surface);
|
||||
GIMP_DEPRECATED_FOR(gimp_color_display_convert_buffer)
|
||||
void gimp_color_display_convert (GimpColorDisplay *display,
|
||||
guchar *buf,
|
||||
gint width,
|
||||
gint height,
|
||||
gint bpp,
|
||||
gint bpl);
|
||||
void gimp_color_display_load_state (GimpColorDisplay *display,
|
||||
GimpParasite *state);
|
||||
GimpParasite * gimp_color_display_save_state (GimpColorDisplay *display);
|
||||
|
|
|
|||
|
|
@ -28,7 +28,6 @@
|
|||
|
||||
#include "gimpwidgetstypes.h"
|
||||
|
||||
#undef GIMP_DISABLE_DEPRECATED
|
||||
#include "gimpcolordisplay.h"
|
||||
#include "gimpcolordisplaystack.h"
|
||||
#include "gimpwidgetsmarshal.h"
|
||||
|
|
@ -363,79 +362,6 @@ gimp_color_display_stack_convert_buffer (GimpColorDisplayStack *stack,
|
|||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* gimp_color_display_stack_convert_surface:
|
||||
* @stack: a #GimpColorDisplayStack
|
||||
* @surface: a #cairo_image_surface_t of type ARGB32
|
||||
*
|
||||
* Runs all the stack's filters on all pixels in @surface.
|
||||
*
|
||||
* Since: 2.8
|
||||
*
|
||||
* Deprecated: GIMP 2.10: Use gimp_color_display_stack_convert_buffer() instead.
|
||||
**/
|
||||
void
|
||||
gimp_color_display_stack_convert_surface (GimpColorDisplayStack *stack,
|
||||
cairo_surface_t *surface)
|
||||
{
|
||||
GimpColorDisplayStackPrivate *private;
|
||||
GList *list;
|
||||
|
||||
g_return_if_fail (GIMP_IS_COLOR_DISPLAY_STACK (stack));
|
||||
g_return_if_fail (surface != NULL);
|
||||
g_return_if_fail (cairo_surface_get_type (surface) ==
|
||||
CAIRO_SURFACE_TYPE_IMAGE);
|
||||
|
||||
private = GET_PRIVATE (stack);
|
||||
|
||||
for (list = private->filters; list; list = g_list_next (list))
|
||||
{
|
||||
GimpColorDisplay *display = list->data;
|
||||
|
||||
G_GNUC_BEGIN_IGNORE_DEPRECATIONS
|
||||
gimp_color_display_convert_surface (display, surface);
|
||||
G_GNUC_END_IGNORE_DEPRECATIONS
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* gimp_color_display_stack_convert:
|
||||
* @stack: a #GimpColorDisplayStack
|
||||
* @buf: the pixel buffer to convert
|
||||
* @width: the width of the buffer
|
||||
* @height: the height of the buffer
|
||||
* @bpp: the number of bytes per pixel
|
||||
* @bpl: the buffer's rowstride
|
||||
*
|
||||
* Converts all pixels in @buf.
|
||||
*
|
||||
* Deprecated: GIMP 2.8: Use gimp_color_display_stack_convert_buffer() instead.
|
||||
**/
|
||||
void
|
||||
gimp_color_display_stack_convert (GimpColorDisplayStack *stack,
|
||||
guchar *buf,
|
||||
gint width,
|
||||
gint height,
|
||||
gint bpp,
|
||||
gint bpl)
|
||||
{
|
||||
GimpColorDisplayStackPrivate *private;
|
||||
GList *list;
|
||||
|
||||
g_return_if_fail (GIMP_IS_COLOR_DISPLAY_STACK (stack));
|
||||
|
||||
private = GET_PRIVATE (stack);
|
||||
|
||||
for (list = private->filters; list; list = g_list_next (list))
|
||||
{
|
||||
GimpColorDisplay *display = list->data;
|
||||
|
||||
G_GNUC_BEGIN_IGNORE_DEPRECATIONS
|
||||
gimp_color_display_convert (display, buf, width, height, bpp, bpl);
|
||||
G_GNUC_END_IGNORE_DEPRECATIONS
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/* private functions */
|
||||
|
||||
|
|
|
|||
|
|
@ -88,16 +88,7 @@ void gimp_color_display_stack_reorder_down (GimpColorDisplayStack *stack,
|
|||
void gimp_color_display_stack_convert_buffer (GimpColorDisplayStack *stack,
|
||||
GeglBuffer *buffer,
|
||||
GeglRectangle *area);
|
||||
GIMP_DEPRECATED_FOR(gimp_color_display_stack_convert_buffer)
|
||||
void gimp_color_display_stack_convert_surface (GimpColorDisplayStack *stack,
|
||||
cairo_surface_t *surface);
|
||||
GIMP_DEPRECATED_FOR(gimp_color_display_stack_convert_surface)
|
||||
void gimp_color_display_stack_convert (GimpColorDisplayStack *stack,
|
||||
guchar *buf,
|
||||
gint width,
|
||||
gint height,
|
||||
gint bpp,
|
||||
gint bpl);
|
||||
|
||||
|
||||
G_END_DECLS
|
||||
|
||||
|
|
|
|||
|
|
@ -361,40 +361,6 @@ gimp_color_profile_combo_box_new_with_model (GtkWidget *dialog,
|
|||
NULL);
|
||||
}
|
||||
|
||||
/**
|
||||
* gimp_color_profile_combo_box_add:
|
||||
* @combo: a #GimpColorProfileComboBox
|
||||
* @filename: filename of the profile to add (or %NULL)
|
||||
* @label: label to use for the profile
|
||||
* (may only be %NULL if @filename is %NULL)
|
||||
*
|
||||
* This function delegates to the underlying
|
||||
* #GimpColorProfileStore. Please refer to the documentation of
|
||||
* gimp_color_profile_store_add_file() for details.
|
||||
*
|
||||
* Deprecated: use gimp_color_profile_combo_box_add_file() instead.
|
||||
*
|
||||
* Since: 2.4
|
||||
**/
|
||||
void
|
||||
gimp_color_profile_combo_box_add (GimpColorProfileComboBox *combo,
|
||||
const gchar *filename,
|
||||
const gchar *label)
|
||||
{
|
||||
GFile *file = NULL;
|
||||
|
||||
g_return_if_fail (GIMP_IS_COLOR_PROFILE_COMBO_BOX (combo));
|
||||
g_return_if_fail (label != NULL || filename == NULL);
|
||||
|
||||
if (filename)
|
||||
file = g_file_new_for_path (filename);
|
||||
|
||||
gimp_color_profile_combo_box_add_file (combo, file, label);
|
||||
|
||||
if (file)
|
||||
g_object_unref (file);
|
||||
}
|
||||
|
||||
/**
|
||||
* gimp_color_profile_combo_box_add_file:
|
||||
* @combo: a #GimpColorProfileComboBox
|
||||
|
|
@ -425,38 +391,6 @@ gimp_color_profile_combo_box_add_file (GimpColorProfileComboBox *combo,
|
|||
file, label);
|
||||
}
|
||||
|
||||
/**
|
||||
* gimp_color_profile_combo_box_set_active:
|
||||
* @combo: a #GimpColorProfileComboBox
|
||||
* @filename: filename of the profile to select
|
||||
* @label: label to use when adding a new entry (can be %NULL)
|
||||
*
|
||||
* Selects a color profile from the @combo and makes it the active
|
||||
* item. If the profile is not listed in the @combo, then it is added
|
||||
* with the given @label (or @filename in case that @label is %NULL).
|
||||
*
|
||||
* Deprecated: use gimp_color_profile_combo_box_set_active_file() instead.
|
||||
*
|
||||
* Since: 2.4
|
||||
**/
|
||||
void
|
||||
gimp_color_profile_combo_box_set_active (GimpColorProfileComboBox *combo,
|
||||
const gchar *filename,
|
||||
const gchar *label)
|
||||
{
|
||||
GFile *file = NULL;
|
||||
|
||||
g_return_if_fail (GIMP_IS_COLOR_PROFILE_COMBO_BOX (combo));
|
||||
|
||||
if (filename)
|
||||
file = g_file_new_for_path (filename);
|
||||
|
||||
gimp_color_profile_combo_box_set_active_file (combo, file, label);
|
||||
|
||||
if (file)
|
||||
g_object_unref (file);
|
||||
}
|
||||
|
||||
/**
|
||||
* gimp_color_profile_combo_box_set_active_file:
|
||||
* @combo: a #GimpColorProfileComboBox
|
||||
|
|
@ -510,37 +444,6 @@ gimp_color_profile_combo_box_set_active_file (GimpColorProfileComboBox *combo,
|
|||
g_object_unref (profile);
|
||||
}
|
||||
|
||||
/**
|
||||
* gimp_color_profile_combo_box_get_active:
|
||||
* @combo: a #GimpColorProfileComboBox
|
||||
*
|
||||
* Return value: The filename of the currently selected color profile,
|
||||
* This is a newly allocated string and should be released
|
||||
* using g_free() when it is not any longer needed.
|
||||
*
|
||||
* Deprecated: use gimp_color_profile_combo_box_get_active_file() instead.
|
||||
*
|
||||
* Since: 2.4
|
||||
**/
|
||||
gchar *
|
||||
gimp_color_profile_combo_box_get_active (GimpColorProfileComboBox *combo)
|
||||
{
|
||||
GFile *file;
|
||||
gchar *path = NULL;
|
||||
|
||||
g_return_val_if_fail (GIMP_IS_COLOR_PROFILE_COMBO_BOX (combo), NULL);
|
||||
|
||||
file = gimp_color_profile_combo_box_get_active_file (combo);
|
||||
|
||||
if (file)
|
||||
{
|
||||
path = g_file_get_path (file);
|
||||
g_object_unref (file);
|
||||
}
|
||||
|
||||
return path;
|
||||
}
|
||||
|
||||
/**
|
||||
* gimp_color_profile_combo_box_get_active_file:
|
||||
* @combo: a #GimpColorProfileComboBox
|
||||
|
|
|
|||
|
|
@ -62,24 +62,14 @@ GtkWidget * gimp_color_profile_combo_box_new (GtkWidget *dialog,
|
|||
GtkWidget * gimp_color_profile_combo_box_new_with_model (GtkWidget *dialog,
|
||||
GtkTreeModel *model);
|
||||
|
||||
GIMP_DEPRECATED_FOR (gimp_color_profile_combo_box_add_file)
|
||||
void gimp_color_profile_combo_box_add (GimpColorProfileComboBox *combo,
|
||||
const gchar *filename,
|
||||
const gchar *label);
|
||||
void gimp_color_profile_combo_box_add_file (GimpColorProfileComboBox *combo,
|
||||
GFile *file,
|
||||
const gchar *label);
|
||||
|
||||
GIMP_DEPRECATED_FOR (gimp_color_profile_combo_box_set_active_file)
|
||||
void gimp_color_profile_combo_box_set_active (GimpColorProfileComboBox *combo,
|
||||
const gchar *filename,
|
||||
const gchar *label);
|
||||
void gimp_color_profile_combo_box_set_active_file (GimpColorProfileComboBox *combo,
|
||||
GFile *file,
|
||||
const gchar *label);
|
||||
|
||||
GIMP_DEPRECATED_FOR (gimp_color_profile_combo_box_get_active_file)
|
||||
gchar * gimp_color_profile_combo_box_get_active (GimpColorProfileComboBox *combo);
|
||||
GFile * gimp_color_profile_combo_box_get_active_file (GimpColorProfileComboBox *combo);
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -256,44 +256,6 @@ gimp_color_profile_store_new (const gchar *history)
|
|||
NULL);
|
||||
}
|
||||
|
||||
/**
|
||||
* gimp_color_profile_store_add:
|
||||
* @store: a #GimpColorProfileStore
|
||||
* @filename: filename of the profile to add (or %NULL)
|
||||
* @label: label to use for the profile
|
||||
* (may only be %NULL if @filename is %NULL)
|
||||
*
|
||||
* Adds a color profile item to the #GimpColorProfileStore. Items
|
||||
* added with this function will be kept at the top, separated from
|
||||
* the history of last used color profiles.
|
||||
*
|
||||
* This function is often used to add a selectable item for the %NULL
|
||||
* filename. If you pass %NULL for both @filename and @label, the
|
||||
* @label will be set to the string "None" for you (and translated for
|
||||
* the user).
|
||||
*
|
||||
* Deprecated: use gimp_color_profile_store_add_file() instead.
|
||||
*
|
||||
* Since: 2.4
|
||||
**/
|
||||
void
|
||||
gimp_color_profile_store_add (GimpColorProfileStore *store,
|
||||
const gchar *filename,
|
||||
const gchar *label)
|
||||
{
|
||||
GFile *file = NULL;
|
||||
|
||||
g_return_if_fail (GIMP_IS_COLOR_PROFILE_STORE (store));
|
||||
g_return_if_fail (label != NULL || filename == NULL);
|
||||
|
||||
if (filename)
|
||||
file = g_file_new_for_path (filename);
|
||||
|
||||
gimp_color_profile_store_add_file (store, file, label);
|
||||
|
||||
g_object_unref (file);
|
||||
}
|
||||
|
||||
/**
|
||||
* gimp_color_profile_store_add_file:
|
||||
* @store: a #GimpColorProfileStore
|
||||
|
|
|
|||
|
|
@ -59,11 +59,6 @@ GType gimp_color_profile_store_get_type (void) G_GNUC_CONST;
|
|||
|
||||
GtkListStore * gimp_color_profile_store_new (const gchar *history);
|
||||
|
||||
GIMP_DEPRECATED_FOR(gimp_color_profile_store_add_file)
|
||||
void gimp_color_profile_store_add (GimpColorProfileStore *store,
|
||||
const gchar *filename,
|
||||
const gchar *label);
|
||||
|
||||
void gimp_color_profile_store_add_file (GimpColorProfileStore *store,
|
||||
GFile *file,
|
||||
const gchar *label);
|
||||
|
|
|
|||
|
|
@ -184,26 +184,6 @@ gimp_enum_combo_box_new_with_model (GimpEnumStore *enum_store)
|
|||
NULL);
|
||||
}
|
||||
|
||||
/**
|
||||
* gimp_enum_combo_box_set_stock_prefix:
|
||||
* @combo_box: a #GimpEnumComboBox
|
||||
* @stock_prefix: a prefix to create icon stock ID from enum values
|
||||
*
|
||||
* Attempts to create stock icons for all items in the @combo_box. See
|
||||
* gimp_enum_store_set_stock_prefix() to find out what to use as
|
||||
* @stock_prefix.
|
||||
*
|
||||
* Since: 2.4
|
||||
*
|
||||
* Deprecated: GIMP 2.10
|
||||
**/
|
||||
void
|
||||
gimp_enum_combo_box_set_stock_prefix (GimpEnumComboBox *combo_box,
|
||||
const gchar *stock_prefix)
|
||||
{
|
||||
gimp_enum_combo_box_set_icon_prefix (combo_box, stock_prefix);
|
||||
}
|
||||
|
||||
/**
|
||||
* gimp_enum_combo_box_set_icon_prefix:
|
||||
* @combo_box: a #GimpEnumComboBox
|
||||
|
|
|
|||
|
|
@ -62,10 +62,6 @@ GType gimp_enum_combo_box_get_type (void) G_GNUC_CONST;
|
|||
GtkWidget * gimp_enum_combo_box_new (GType enum_type);
|
||||
GtkWidget * gimp_enum_combo_box_new_with_model (GimpEnumStore *enum_store);
|
||||
|
||||
GIMP_DEPRECATED_FOR(gimp_enum_combo_box_set_icon_prefix)
|
||||
void gimp_enum_combo_box_set_stock_prefix (GimpEnumComboBox *combo_box,
|
||||
const gchar *stock_prefix);
|
||||
|
||||
void gimp_enum_combo_box_set_icon_prefix (GimpEnumComboBox *combo_box,
|
||||
const gchar *icon_prefix);
|
||||
|
||||
|
|
|
|||
|
|
@ -317,27 +317,6 @@ gimp_enum_store_new_with_values_valist (GType enum_type,
|
|||
return store;
|
||||
}
|
||||
|
||||
/**
|
||||
* gimp_enum_store_set_stock_prefix:
|
||||
* @store: a #GimpEnumStore
|
||||
* @stock_prefix: a prefix to create icon stock ID from enum values
|
||||
*
|
||||
* Creates a stock ID for each enum value in the @store by appending
|
||||
* the value's nick to the given @stock_prefix, separated by a hyphen.
|
||||
*
|
||||
* See also: gimp_enum_combo_box_set_stock_prefix().
|
||||
*
|
||||
* Since: 2.4
|
||||
*
|
||||
* Deprecated: GIMP 2.10
|
||||
**/
|
||||
void
|
||||
gimp_enum_store_set_stock_prefix (GimpEnumStore *store,
|
||||
const gchar *stock_prefix)
|
||||
{
|
||||
gimp_enum_store_set_icon_prefix (store, stock_prefix);
|
||||
}
|
||||
|
||||
/**
|
||||
* gimp_enum_store_set_icon_prefix:
|
||||
* @store: a #GimpEnumStore
|
||||
|
|
|
|||
|
|
@ -72,10 +72,6 @@ GtkListStore * gimp_enum_store_new_with_values_valist (GType enum_type,
|
|||
gint n_values,
|
||||
va_list args);
|
||||
|
||||
GIMP_DEPRECATED_FOR(gimp_enum_store_set_icon_prefix)
|
||||
void gimp_enum_store_set_stock_prefix (GimpEnumStore *store,
|
||||
const gchar *stock_prefix);
|
||||
|
||||
void gimp_enum_store_set_icon_prefix (GimpEnumStore *store,
|
||||
const gchar *icon_prefix);
|
||||
|
||||
|
|
|
|||
|
|
@ -258,99 +258,6 @@ gimp_enum_radio_frame_new_with_range (GType enum_type,
|
|||
return frame;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* gimp_enum_stock_box_new:
|
||||
* @enum_type: the #GType of an enum.
|
||||
* @stock_prefix: the prefix of the group of stock ids to use.
|
||||
* @icon_size: the icon size for the stock icons
|
||||
* @callback: a callback to connect to the "toggled" signal of each
|
||||
* #GtkRadioButton that is created.
|
||||
* @callback_data: data to pass to the @callback.
|
||||
* @first_button: returns the first button in the created group.
|
||||
*
|
||||
* Creates a horizontal box of radio buttons with stock icons. The
|
||||
* stock_id for each icon is created by appending the enum_value's
|
||||
* nick to the given @stock_prefix.
|
||||
*
|
||||
* Return value: a new #GtkHBox holding a group of #GtkRadioButtons.
|
||||
*
|
||||
* Since: 2.4
|
||||
*
|
||||
* Deprecated: GIMP 2.10
|
||||
**/
|
||||
GtkWidget *
|
||||
gimp_enum_stock_box_new (GType enum_type,
|
||||
const gchar *stock_prefix,
|
||||
GtkIconSize icon_size,
|
||||
GCallback callback,
|
||||
gpointer callback_data,
|
||||
GtkWidget **first_button)
|
||||
{
|
||||
return gimp_enum_icon_box_new (enum_type, stock_prefix, icon_size,
|
||||
callback, callback_data,
|
||||
first_button);
|
||||
}
|
||||
|
||||
/**
|
||||
* gimp_enum_stock_box_new_with_range:
|
||||
* @enum_type: the #GType of an enum.
|
||||
* @minimum: the minumim enum value
|
||||
* @maximum: the maximum enum value
|
||||
* @stock_prefix: the prefix of the group of stock ids to use.
|
||||
* @icon_size: the icon size for the stock icons
|
||||
* @callback: a callback to connect to the "toggled" signal of each
|
||||
* #GtkRadioButton that is created.
|
||||
* @callback_data: data to pass to the @callback.
|
||||
* @first_button: returns the first button in the created group.
|
||||
*
|
||||
* Just like gimp_enum_stock_box_new(), this function creates a group
|
||||
* of radio buttons, but additionally it supports limiting the range
|
||||
* of available enum values.
|
||||
*
|
||||
* Return value: a new #GtkHBox holding a group of #GtkRadioButtons.
|
||||
*
|
||||
* Since: 2.4
|
||||
*
|
||||
* Deprecated: GIMP 2.10
|
||||
**/
|
||||
GtkWidget *
|
||||
gimp_enum_stock_box_new_with_range (GType enum_type,
|
||||
gint minimum,
|
||||
gint maximum,
|
||||
const gchar *stock_prefix,
|
||||
GtkIconSize icon_size,
|
||||
GCallback callback,
|
||||
gpointer callback_data,
|
||||
GtkWidget **first_button)
|
||||
{
|
||||
return gimp_enum_icon_box_new_with_range (enum_type, minimum, maximum,
|
||||
stock_prefix, icon_size,
|
||||
callback, callback_data,
|
||||
first_button);
|
||||
}
|
||||
|
||||
/**
|
||||
* gimp_enum_stock_box_set_child_padding:
|
||||
* @stock_box: a stock box widget
|
||||
* @xpad: horizontal padding
|
||||
* @ypad: vertical padding
|
||||
*
|
||||
* Sets the padding of all buttons in a box created by
|
||||
* gimp_enum_stock_box_new().
|
||||
*
|
||||
* Since: 2.4
|
||||
*
|
||||
* Deprecated: GIMP 2.10
|
||||
**/
|
||||
void
|
||||
gimp_enum_stock_box_set_child_padding (GtkWidget *stock_box,
|
||||
gint xpad,
|
||||
gint ypad)
|
||||
{
|
||||
gimp_enum_icon_box_set_child_padding (stock_box, xpad, ypad);
|
||||
}
|
||||
|
||||
/**
|
||||
* gimp_enum_icon_box_new:
|
||||
* @enum_type: the #GType of an enum.
|
||||
|
|
|
|||
|
|
@ -53,27 +53,6 @@ GtkWidget * gimp_enum_radio_frame_new_with_range (GType enum_type,
|
|||
gpointer callback_data,
|
||||
GtkWidget **first_button);
|
||||
|
||||
GIMP_DEPRECATED_FOR(gimp_enum_icon_box_new)
|
||||
GtkWidget * gimp_enum_stock_box_new (GType enum_type,
|
||||
const gchar *stock_prefix,
|
||||
GtkIconSize icon_size,
|
||||
GCallback callback,
|
||||
gpointer callback_data,
|
||||
GtkWidget **first_button);
|
||||
GIMP_DEPRECATED_FOR(gimp_enum_icon_box_new_with_range)
|
||||
GtkWidget * gimp_enum_stock_box_new_with_range (GType enum_type,
|
||||
gint minimum,
|
||||
gint maximum,
|
||||
const gchar *stock_prefix,
|
||||
GtkIconSize icon_size,
|
||||
GCallback callback,
|
||||
gpointer callback_data,
|
||||
GtkWidget **first_button);
|
||||
GIMP_DEPRECATED_FOR(gimp_enum_icon_box_set_child_padding)
|
||||
void gimp_enum_stock_box_set_child_padding (GtkWidget *stock_box,
|
||||
gint xpad,
|
||||
gint ypad);
|
||||
|
||||
GtkWidget * gimp_enum_icon_box_new (GType enum_type,
|
||||
const gchar *icon_prefix,
|
||||
GtkIconSize icon_size,
|
||||
|
|
|
|||
|
|
@ -43,7 +43,6 @@ typedef struct
|
|||
GtkBox parent_instance;
|
||||
|
||||
gchar *icon_name;
|
||||
gchar *stock_id;
|
||||
gchar *hint;
|
||||
} GimpHintBox;
|
||||
|
||||
|
|
@ -54,7 +53,6 @@ enum
|
|||
{
|
||||
PROP_0,
|
||||
PROP_ICON_NAME,
|
||||
PROP_STOCK_ID,
|
||||
PROP_HINT
|
||||
};
|
||||
|
||||
|
|
@ -94,14 +92,6 @@ gimp_hint_box_class_init (GimpHintBoxClass *klass)
|
|||
G_PARAM_CONSTRUCT_ONLY |
|
||||
GIMP_PARAM_READWRITE));
|
||||
|
||||
g_object_class_install_property (object_class, PROP_STOCK_ID,
|
||||
g_param_spec_string ("stock-id",
|
||||
"Stock ID",
|
||||
"Deprecated: use icon-name instead",
|
||||
GIMP_ICON_DIALOG_INFORMATION,
|
||||
G_PARAM_CONSTRUCT_ONLY |
|
||||
GIMP_PARAM_READWRITE));
|
||||
|
||||
g_object_class_install_property (object_class, PROP_HINT,
|
||||
g_param_spec_string ("hint",
|
||||
"Hint",
|
||||
|
|
@ -134,11 +124,6 @@ gimp_hint_box_constructed (GObject *object)
|
|||
image = gtk_image_new_from_icon_name (box->icon_name,
|
||||
GTK_ICON_SIZE_DIALOG);
|
||||
}
|
||||
else if (box->stock_id)
|
||||
{
|
||||
image = gtk_image_new_from_stock (box->stock_id,
|
||||
GTK_ICON_SIZE_DIALOG);
|
||||
}
|
||||
|
||||
if (image)
|
||||
{
|
||||
|
|
@ -172,12 +157,6 @@ gimp_hint_box_finalize (GObject *object)
|
|||
box->icon_name = NULL;
|
||||
}
|
||||
|
||||
if (box->stock_id)
|
||||
{
|
||||
g_free (box->stock_id);
|
||||
box->stock_id = NULL;
|
||||
}
|
||||
|
||||
if (box->hint)
|
||||
{
|
||||
g_free (box->hint);
|
||||
|
|
@ -201,10 +180,6 @@ gimp_hint_box_set_property (GObject *object,
|
|||
box->icon_name = g_value_dup_string (value);
|
||||
break;
|
||||
|
||||
case PROP_STOCK_ID:
|
||||
box->stock_id = g_value_dup_string (value);
|
||||
break;
|
||||
|
||||
case PROP_HINT:
|
||||
box->hint = g_value_dup_string (value);
|
||||
break;
|
||||
|
|
@ -229,10 +204,6 @@ gimp_hint_box_get_property (GObject *object,
|
|||
g_value_set_string (value, box->icon_name);
|
||||
break;
|
||||
|
||||
case PROP_STOCK_ID:
|
||||
g_value_set_string (value, box->stock_id);
|
||||
break;
|
||||
|
||||
case PROP_HINT:
|
||||
g_value_set_string (value, box->hint);
|
||||
break;
|
||||
|
|
@ -248,7 +219,7 @@ gimp_hint_box_get_property (GObject *object,
|
|||
* @hint: text to display as a user hint
|
||||
*
|
||||
* Creates a new widget that shows a text label showing @hint,
|
||||
* decorated with a GIMP_STOCK_INFO wilber icon.
|
||||
* decorated with a GIMP_ICON_INFO wilber icon.
|
||||
*
|
||||
* Return value: a new widget
|
||||
*
|
||||
|
|
|
|||
|
|
@ -25,7 +25,6 @@
|
|||
|
||||
#include "libgimpbase/gimpbase.h"
|
||||
|
||||
#undef GIMP_DISABLE_DEPRECATED
|
||||
#include "gimpicons.h"
|
||||
|
||||
#include "icons/Color/gimp-icon-pixbufs.c"
|
||||
|
|
@ -54,291 +53,6 @@
|
|||
#define GIMP_DEFAULT_ICON_THEME "Symbolic"
|
||||
|
||||
|
||||
static GtkIconFactory *gimp_stock_factory = NULL;
|
||||
|
||||
|
||||
static const GtkStockItem gimp_stock_items[] =
|
||||
{
|
||||
{ GIMP_STOCK_ANCHOR, N_("Anchor"), 0, 0, LIBGIMP_DOMAIN },
|
||||
{ GIMP_STOCK_CENTER, N_("C_enter"), 0, 0, LIBGIMP_DOMAIN },
|
||||
{ GIMP_STOCK_DUPLICATE, N_("_Duplicate"), 0, 0, LIBGIMP_DOMAIN },
|
||||
{ GIMP_STOCK_LINKED, N_("Linked"), 0, 0, LIBGIMP_DOMAIN },
|
||||
{ GIMP_STOCK_PASTE_AS_NEW, N_("Paste as New"), 0, 0, LIBGIMP_DOMAIN },
|
||||
{ GIMP_STOCK_PASTE_INTO, N_("Paste Into"), 0, 0, LIBGIMP_DOMAIN },
|
||||
{ GIMP_STOCK_RESET, N_("_Reset"), 0, 0, LIBGIMP_DOMAIN },
|
||||
{ GIMP_STOCK_VISIBLE, N_("Visible"), 0, 0, LIBGIMP_DOMAIN },
|
||||
|
||||
{ GIMP_STOCK_GRADIENT_LINEAR, NULL, 0, 0, LIBGIMP_DOMAIN },
|
||||
{ GIMP_STOCK_GRADIENT_BILINEAR, NULL, 0, 0, LIBGIMP_DOMAIN },
|
||||
{ GIMP_STOCK_GRADIENT_RADIAL, NULL, 0, 0, LIBGIMP_DOMAIN },
|
||||
{ GIMP_STOCK_GRADIENT_SQUARE, NULL, 0, 0, LIBGIMP_DOMAIN },
|
||||
{ GIMP_STOCK_GRADIENT_CONICAL_SYMMETRIC, NULL, 0, 0, LIBGIMP_DOMAIN },
|
||||
{ GIMP_STOCK_GRADIENT_CONICAL_ASYMMETRIC, NULL, 0, 0, LIBGIMP_DOMAIN },
|
||||
{ GIMP_STOCK_GRADIENT_SHAPEBURST_ANGULAR, NULL, 0, 0, LIBGIMP_DOMAIN },
|
||||
{ GIMP_STOCK_GRADIENT_SHAPEBURST_SPHERICAL, NULL, 0, 0, LIBGIMP_DOMAIN },
|
||||
{ GIMP_STOCK_GRADIENT_SHAPEBURST_DIMPLED, NULL, 0, 0, LIBGIMP_DOMAIN },
|
||||
{ GIMP_STOCK_GRADIENT_SPIRAL_CLOCKWISE, NULL, 0, 0, LIBGIMP_DOMAIN },
|
||||
{ GIMP_STOCK_GRADIENT_SPIRAL_ANTICLOCKWISE, NULL, 0, 0, LIBGIMP_DOMAIN },
|
||||
|
||||
{ GIMP_STOCK_GRAVITY_EAST, NULL, 0, 0, LIBGIMP_DOMAIN },
|
||||
{ GIMP_STOCK_GRAVITY_NORTH, NULL, 0, 0, LIBGIMP_DOMAIN },
|
||||
{ GIMP_STOCK_GRAVITY_NORTH_EAST, NULL, 0, 0, LIBGIMP_DOMAIN },
|
||||
{ GIMP_STOCK_GRAVITY_NORTH_WEST, NULL, 0, 0, LIBGIMP_DOMAIN },
|
||||
{ GIMP_STOCK_GRAVITY_SOUTH, NULL, 0, 0, LIBGIMP_DOMAIN },
|
||||
{ GIMP_STOCK_GRAVITY_SOUTH_EAST, NULL, 0, 0, LIBGIMP_DOMAIN },
|
||||
{ GIMP_STOCK_GRAVITY_SOUTH_WEST, NULL, 0, 0, LIBGIMP_DOMAIN },
|
||||
{ GIMP_STOCK_GRAVITY_WEST, NULL, 0, 0, LIBGIMP_DOMAIN },
|
||||
|
||||
{ GIMP_STOCK_HCENTER, NULL, 0, 0, LIBGIMP_DOMAIN },
|
||||
{ GIMP_STOCK_VCENTER, NULL, 0, 0, LIBGIMP_DOMAIN },
|
||||
|
||||
{ GIMP_STOCK_HCHAIN, NULL, 0, 0, LIBGIMP_DOMAIN },
|
||||
{ GIMP_STOCK_HCHAIN_BROKEN, NULL, 0, 0, LIBGIMP_DOMAIN },
|
||||
{ GIMP_STOCK_VCHAIN, NULL, 0, 0, LIBGIMP_DOMAIN },
|
||||
{ GIMP_STOCK_VCHAIN_BROKEN, NULL, 0, 0, LIBGIMP_DOMAIN },
|
||||
|
||||
{ GIMP_STOCK_SELECTION, NULL, 0, 0, LIBGIMP_DOMAIN },
|
||||
{ GIMP_STOCK_SELECTION_REPLACE, NULL, 0, 0, LIBGIMP_DOMAIN },
|
||||
{ GIMP_STOCK_SELECTION_ADD, NULL, 0, 0, LIBGIMP_DOMAIN },
|
||||
{ GIMP_STOCK_SELECTION_SUBTRACT, NULL, 0, 0, LIBGIMP_DOMAIN },
|
||||
{ GIMP_STOCK_SELECTION_INTERSECT, NULL, 0, 0, LIBGIMP_DOMAIN },
|
||||
{ GIMP_STOCK_SELECTION_STROKE, N_("_Stroke"), 0, 0, LIBGIMP_DOMAIN },
|
||||
{ GIMP_STOCK_SELECTION_TO_CHANNEL, NULL, 0, 0, LIBGIMP_DOMAIN },
|
||||
{ GIMP_STOCK_SELECTION_TO_PATH, NULL, 0, 0, LIBGIMP_DOMAIN },
|
||||
|
||||
{ GIMP_STOCK_PATH_STROKE, N_("_Stroke"), 0, 0, LIBGIMP_DOMAIN },
|
||||
|
||||
{ GIMP_STOCK_CURVE_FREE, NULL, 0, 0, LIBGIMP_DOMAIN },
|
||||
{ GIMP_STOCK_CURVE_SMOOTH, NULL, 0, 0, LIBGIMP_DOMAIN },
|
||||
|
||||
{ GIMP_STOCK_COLOR_PICKER_BLACK, NULL, 0, 0, LIBGIMP_DOMAIN },
|
||||
{ GIMP_STOCK_COLOR_PICKER_GRAY, NULL, 0, 0, LIBGIMP_DOMAIN },
|
||||
{ GIMP_STOCK_COLOR_PICKER_WHITE, NULL, 0, 0, LIBGIMP_DOMAIN },
|
||||
{ GIMP_STOCK_COLOR_TRIANGLE, NULL, 0, 0, LIBGIMP_DOMAIN },
|
||||
{ GIMP_STOCK_COLOR_PICK_FROM_SCREEN, NULL, 0, 0, LIBGIMP_DOMAIN },
|
||||
|
||||
{ GIMP_STOCK_CHAR_PICKER, NULL, 0, 0, LIBGIMP_DOMAIN },
|
||||
{ GIMP_STOCK_LETTER_SPACING, N_("L_etter Spacing"), 0, 0, LIBGIMP_DOMAIN },
|
||||
{ GIMP_STOCK_LINE_SPACING, N_("L_ine Spacing"), 0, 0, LIBGIMP_DOMAIN },
|
||||
|
||||
{ GIMP_STOCK_TEXT_DIR_LTR, NULL, 0, 0, LIBGIMP_DOMAIN },
|
||||
{ GIMP_STOCK_TEXT_DIR_RTL, NULL, 0, 0, LIBGIMP_DOMAIN },
|
||||
{ GIMP_STOCK_PATTERN, NULL, 0, 0, LIBGIMP_DOMAIN },
|
||||
|
||||
{ GIMP_STOCK_CONVERT_RGB, NULL, 0, 0, LIBGIMP_DOMAIN },
|
||||
{ GIMP_STOCK_CONVERT_GRAYSCALE, NULL, 0, 0, LIBGIMP_DOMAIN },
|
||||
{ GIMP_STOCK_CONVERT_INDEXED, NULL, 0, 0, LIBGIMP_DOMAIN },
|
||||
{ GIMP_STOCK_INVERT, NULL, 0, 0, LIBGIMP_DOMAIN },
|
||||
{ GIMP_STOCK_MERGE_DOWN, NULL, 0, 0, LIBGIMP_DOMAIN },
|
||||
{ GIMP_STOCK_LAYER_TO_IMAGESIZE, NULL, 0, 0, LIBGIMP_DOMAIN },
|
||||
{ GIMP_STOCK_PLUGIN, NULL, 0, 0, LIBGIMP_DOMAIN },
|
||||
{ GIMP_STOCK_RESHOW_FILTER, NULL, 0, 0, LIBGIMP_DOMAIN },
|
||||
{ GIMP_STOCK_ROTATE_90, NULL, 0, 0, LIBGIMP_DOMAIN },
|
||||
{ GIMP_STOCK_ROTATE_180, NULL, 0, 0, LIBGIMP_DOMAIN },
|
||||
{ GIMP_STOCK_ROTATE_270, NULL, 0, 0, LIBGIMP_DOMAIN },
|
||||
{ GIMP_STOCK_RESIZE, N_("Re_size"), 0, 0, LIBGIMP_DOMAIN },
|
||||
{ GIMP_STOCK_SCALE, N_("_Scale"), 0, 0, LIBGIMP_DOMAIN },
|
||||
{ GIMP_STOCK_FLIP_HORIZONTAL, NULL, 0, 0, LIBGIMP_DOMAIN },
|
||||
{ GIMP_STOCK_FLIP_VERTICAL, NULL, 0, 0, LIBGIMP_DOMAIN },
|
||||
|
||||
{ GIMP_STOCK_IMAGES, NULL, 0, 0, LIBGIMP_DOMAIN },
|
||||
{ GIMP_STOCK_LAYERS, NULL, 0, 0, LIBGIMP_DOMAIN },
|
||||
{ GIMP_STOCK_CHANNELS, NULL, 0, 0, LIBGIMP_DOMAIN },
|
||||
{ GIMP_STOCK_PATHS, NULL, 0, 0, LIBGIMP_DOMAIN },
|
||||
{ GIMP_STOCK_TOOLS, NULL, 0, 0, LIBGIMP_DOMAIN },
|
||||
{ GIMP_STOCK_TOOL_OPTIONS, NULL, 0, 0, LIBGIMP_DOMAIN },
|
||||
{ GIMP_STOCK_DEVICE_STATUS, NULL, 0, 0, LIBGIMP_DOMAIN },
|
||||
{ GIMP_STOCK_INPUT_DEVICE, NULL, 0, 0, LIBGIMP_DOMAIN },
|
||||
{ GIMP_STOCK_CURSOR, NULL, 0, 0, LIBGIMP_DOMAIN },
|
||||
{ GIMP_STOCK_SAMPLE_POINT, NULL, 0, 0, LIBGIMP_DOMAIN },
|
||||
{ GIMP_STOCK_DYNAMICS, NULL, 0, 0, LIBGIMP_DOMAIN },
|
||||
{ GIMP_STOCK_TOOL_PRESET, NULL, 0, 0, LIBGIMP_DOMAIN },
|
||||
|
||||
{ GIMP_STOCK_IMAGE, NULL, 0, 0, LIBGIMP_DOMAIN },
|
||||
{ GIMP_STOCK_LAYER, NULL, 0, 0, LIBGIMP_DOMAIN },
|
||||
{ GIMP_STOCK_TEXT_LAYER, NULL, 0, 0, LIBGIMP_DOMAIN },
|
||||
{ GIMP_STOCK_FLOATING_SELECTION, NULL, 0, 0, LIBGIMP_DOMAIN },
|
||||
{ GIMP_STOCK_CHANNEL, NULL, 0, 0, LIBGIMP_DOMAIN },
|
||||
{ GIMP_STOCK_CHANNEL_RED, NULL, 0, 0, LIBGIMP_DOMAIN },
|
||||
{ GIMP_STOCK_CHANNEL_GREEN, NULL, 0, 0, LIBGIMP_DOMAIN },
|
||||
{ GIMP_STOCK_CHANNEL_BLUE, NULL, 0, 0, LIBGIMP_DOMAIN },
|
||||
{ GIMP_STOCK_CHANNEL_GRAY, NULL, 0, 0, LIBGIMP_DOMAIN },
|
||||
{ GIMP_STOCK_CHANNEL_INDEXED, NULL, 0, 0, LIBGIMP_DOMAIN },
|
||||
{ GIMP_STOCK_CHANNEL_ALPHA, NULL, 0, 0, LIBGIMP_DOMAIN },
|
||||
{ GIMP_STOCK_LAYER_MASK, NULL, 0, 0, LIBGIMP_DOMAIN },
|
||||
{ GIMP_STOCK_PATH, NULL, 0, 0, LIBGIMP_DOMAIN },
|
||||
{ GIMP_STOCK_TEMPLATE, NULL, 0, 0, LIBGIMP_DOMAIN },
|
||||
{ GIMP_STOCK_COLORMAP, NULL, 0, 0, LIBGIMP_DOMAIN },
|
||||
{ GIMP_STOCK_HISTOGRAM, NULL, 0, 0, LIBGIMP_DOMAIN },
|
||||
{ GIMP_STOCK_HISTOGRAM_LINEAR, NULL, 0, 0, LIBGIMP_DOMAIN },
|
||||
{ GIMP_STOCK_HISTOGRAM_LOGARITHMIC, NULL, 0, 0, LIBGIMP_DOMAIN },
|
||||
{ GIMP_STOCK_UNDO_HISTORY, NULL, 0, 0, LIBGIMP_DOMAIN },
|
||||
{ GIMP_STOCK_TRANSPARENCY, NULL, 0, 0, LIBGIMP_DOMAIN },
|
||||
|
||||
{ GIMP_STOCK_SELECTION_ALL, NULL, 0, 0, LIBGIMP_DOMAIN },
|
||||
{ GIMP_STOCK_SELECTION_NONE, NULL, 0, 0, LIBGIMP_DOMAIN },
|
||||
{ GIMP_STOCK_SELECTION_GROW, NULL, 0, 0, LIBGIMP_DOMAIN },
|
||||
{ GIMP_STOCK_SELECTION_SHRINK, NULL, 0, 0, LIBGIMP_DOMAIN },
|
||||
{ GIMP_STOCK_SELECTION_BORDER, NULL, 0, 0, LIBGIMP_DOMAIN },
|
||||
|
||||
{ GIMP_STOCK_NAVIGATION, NULL, 0, 0, LIBGIMP_DOMAIN },
|
||||
{ GIMP_STOCK_QUICK_MASK_OFF, NULL, 0, 0, LIBGIMP_DOMAIN },
|
||||
{ GIMP_STOCK_QUICK_MASK_ON, NULL, 0, 0, LIBGIMP_DOMAIN },
|
||||
|
||||
{ GIMP_STOCK_CONTROLLER, NULL, 0, 0, LIBGIMP_DOMAIN },
|
||||
{ GIMP_STOCK_CONTROLLER_KEYBOARD, NULL, 0, 0, LIBGIMP_DOMAIN },
|
||||
{ GIMP_STOCK_CONTROLLER_LINUX_INPUT, NULL, 0, 0, LIBGIMP_DOMAIN },
|
||||
{ GIMP_STOCK_CONTROLLER_MIDI, NULL, 0, 0, LIBGIMP_DOMAIN },
|
||||
{ GIMP_STOCK_CONTROLLER_WHEEL, NULL, 0, 0, LIBGIMP_DOMAIN },
|
||||
|
||||
{ GIMP_STOCK_DISPLAY_FILTER, NULL, 0, 0, LIBGIMP_DOMAIN },
|
||||
{ GIMP_STOCK_DISPLAY_FILTER_COLORBLIND, NULL, 0, 0, LIBGIMP_DOMAIN },
|
||||
{ GIMP_STOCK_DISPLAY_FILTER_CONTRAST, NULL, 0, 0, LIBGIMP_DOMAIN },
|
||||
{ GIMP_STOCK_DISPLAY_FILTER_GAMMA, NULL, 0, 0, LIBGIMP_DOMAIN },
|
||||
{ GIMP_STOCK_DISPLAY_FILTER_LCMS, NULL, 0, 0, LIBGIMP_DOMAIN },
|
||||
{ GIMP_STOCK_DISPLAY_FILTER_PROOF, NULL, 0, 0, LIBGIMP_DOMAIN },
|
||||
|
||||
{ GIMP_STOCK_LIST, NULL, 0, 0, LIBGIMP_DOMAIN },
|
||||
{ GIMP_STOCK_GRID, NULL, 0, 0, LIBGIMP_DOMAIN },
|
||||
|
||||
{ GIMP_STOCK_PORTRAIT, NULL, 0, 0, LIBGIMP_DOMAIN },
|
||||
{ GIMP_STOCK_LANDSCAPE, NULL, 0, 0, LIBGIMP_DOMAIN },
|
||||
|
||||
{ GIMP_TOILET_PAPER, NULL, 0, 0, LIBGIMP_DOMAIN },
|
||||
{ GIMP_STOCK_GEGL, NULL, 0, 0, LIBGIMP_DOMAIN },
|
||||
{ GIMP_STOCK_WEB, NULL, 0, 0, LIBGIMP_DOMAIN },
|
||||
{ GIMP_STOCK_VIDEO, NULL, 0, 0, LIBGIMP_DOMAIN },
|
||||
|
||||
{ GIMP_STOCK_SHAPE_CIRCLE, NULL, 0, 0, LIBGIMP_DOMAIN },
|
||||
{ GIMP_STOCK_SHAPE_DIAMOND, NULL, 0, 0, LIBGIMP_DOMAIN },
|
||||
{ GIMP_STOCK_SHAPE_SQUARE, NULL, 0, 0, LIBGIMP_DOMAIN },
|
||||
|
||||
{ GIMP_STOCK_CAP_BUTT, NULL, 0, 0, LIBGIMP_DOMAIN },
|
||||
{ GIMP_STOCK_CAP_ROUND, NULL, 0, 0, LIBGIMP_DOMAIN },
|
||||
{ GIMP_STOCK_CAP_SQUARE, NULL, 0, 0, LIBGIMP_DOMAIN },
|
||||
|
||||
{ GIMP_STOCK_JOIN_MITER, NULL, 0, 0, LIBGIMP_DOMAIN },
|
||||
{ GIMP_STOCK_JOIN_ROUND, NULL, 0, 0, LIBGIMP_DOMAIN },
|
||||
{ GIMP_STOCK_JOIN_BEVEL, NULL, 0, 0, LIBGIMP_DOMAIN },
|
||||
|
||||
{ GIMP_STOCK_ERROR, NULL, 0, 0, LIBGIMP_DOMAIN },
|
||||
{ GIMP_STOCK_INFO, NULL, 0, 0, LIBGIMP_DOMAIN },
|
||||
{ GIMP_STOCK_QUESTION, NULL, 0, 0, LIBGIMP_DOMAIN },
|
||||
{ GIMP_STOCK_USER_MANUAL, NULL, 0, 0, LIBGIMP_DOMAIN },
|
||||
{ GIMP_STOCK_WARNING, NULL, 0, 0, LIBGIMP_DOMAIN },
|
||||
{ GIMP_STOCK_WILBER, NULL, 0, 0, LIBGIMP_DOMAIN },
|
||||
{ GIMP_STOCK_WILBER_EEK, NULL, 0, 0, LIBGIMP_DOMAIN },
|
||||
|
||||
{ GIMP_STOCK_FRAME, NULL, 0, 0, LIBGIMP_DOMAIN },
|
||||
{ GIMP_STOCK_TEXTURE, NULL, 0, 0, LIBGIMP_DOMAIN },
|
||||
|
||||
{ GIMP_STOCK_TOOL_AIRBRUSH, NULL, 0, 0, LIBGIMP_DOMAIN },
|
||||
{ GIMP_STOCK_TOOL_ALIGN, NULL, 0, 0, LIBGIMP_DOMAIN },
|
||||
{ GIMP_STOCK_TOOL_BLEND, NULL, 0, 0, LIBGIMP_DOMAIN },
|
||||
{ GIMP_STOCK_TOOL_BLUR, NULL, 0, 0, LIBGIMP_DOMAIN },
|
||||
{ GIMP_STOCK_TOOL_BRIGHTNESS_CONTRAST, NULL, 0, 0, LIBGIMP_DOMAIN },
|
||||
{ GIMP_STOCK_TOOL_BUCKET_FILL, NULL, 0, 0, LIBGIMP_DOMAIN },
|
||||
{ GIMP_STOCK_TOOL_BY_COLOR_SELECT, NULL, 0, 0, LIBGIMP_DOMAIN },
|
||||
{ GIMP_STOCK_TOOL_CAGE, NULL, 0, 0, LIBGIMP_DOMAIN },
|
||||
{ GIMP_STOCK_TOOL_CLONE, NULL, 0, 0, LIBGIMP_DOMAIN },
|
||||
{ GIMP_STOCK_TOOL_COLOR_BALANCE, NULL, 0, 0, LIBGIMP_DOMAIN },
|
||||
{ GIMP_STOCK_TOOL_COLOR_PICKER, NULL, 0, 0, LIBGIMP_DOMAIN },
|
||||
{ GIMP_STOCK_TOOL_COLORIZE, NULL, 0, 0, LIBGIMP_DOMAIN },
|
||||
{ GIMP_STOCK_TOOL_CROP, N_("Cr_op"), 0, 0, LIBGIMP_DOMAIN },
|
||||
{ GIMP_STOCK_TOOL_CURVES, NULL, 0, 0, LIBGIMP_DOMAIN },
|
||||
{ GIMP_STOCK_TOOL_DESATURATE, NULL, 0, 0, LIBGIMP_DOMAIN },
|
||||
{ GIMP_STOCK_TOOL_DODGE, NULL, 0, 0, LIBGIMP_DOMAIN },
|
||||
{ GIMP_STOCK_TOOL_ELLIPSE_SELECT, NULL, 0, 0, LIBGIMP_DOMAIN },
|
||||
{ GIMP_STOCK_TOOL_ERASER, NULL, 0, 0, LIBGIMP_DOMAIN },
|
||||
{ GIMP_STOCK_TOOL_FLIP, NULL, 0, 0, LIBGIMP_DOMAIN },
|
||||
{ GIMP_STOCK_TOOL_FREE_SELECT, NULL, 0, 0, LIBGIMP_DOMAIN },
|
||||
{ GIMP_STOCK_TOOL_FOREGROUND_SELECT, N_("_Select"), 0, 0, LIBGIMP_DOMAIN },
|
||||
{ GIMP_STOCK_TOOL_FUZZY_SELECT, NULL, 0, 0, LIBGIMP_DOMAIN },
|
||||
{ GIMP_STOCK_TOOL_HUE_SATURATION, NULL, 0, 0, LIBGIMP_DOMAIN },
|
||||
{ GIMP_STOCK_TOOL_HEAL, NULL, 0, 0, LIBGIMP_DOMAIN },
|
||||
{ GIMP_STOCK_TOOL_INK, NULL, 0, 0, LIBGIMP_DOMAIN },
|
||||
{ GIMP_STOCK_TOOL_ISCISSORS, NULL, 0, 0, LIBGIMP_DOMAIN },
|
||||
{ GIMP_STOCK_TOOL_LEVELS, NULL, 0, 0, LIBGIMP_DOMAIN },
|
||||
{ GIMP_STOCK_TOOL_MEASURE, NULL, 0, 0, LIBGIMP_DOMAIN },
|
||||
{ GIMP_STOCK_TOOL_MOVE, NULL, 0, 0, LIBGIMP_DOMAIN },
|
||||
{ GIMP_STOCK_TOOL_PAINTBRUSH, NULL, 0, 0, LIBGIMP_DOMAIN },
|
||||
{ GIMP_STOCK_TOOL_PATH, NULL, 0, 0, LIBGIMP_DOMAIN },
|
||||
{ GIMP_STOCK_TOOL_PENCIL, NULL, 0, 0, LIBGIMP_DOMAIN },
|
||||
{ GIMP_STOCK_TOOL_PERSPECTIVE, N_("_Transform"), 0, 0, LIBGIMP_DOMAIN },
|
||||
{ GIMP_STOCK_TOOL_PERSPECTIVE_CLONE, NULL, 0, 0, LIBGIMP_DOMAIN },
|
||||
{ GIMP_STOCK_TOOL_POSTERIZE, NULL, 0, 0, LIBGIMP_DOMAIN },
|
||||
{ GIMP_STOCK_TOOL_RECT_SELECT, NULL, 0, 0, LIBGIMP_DOMAIN },
|
||||
{ GIMP_STOCK_TOOL_ROTATE, N_("_Rotate"), 0, 0, LIBGIMP_DOMAIN },
|
||||
{ GIMP_STOCK_TOOL_SCALE, N_("_Scale"), 0, 0, LIBGIMP_DOMAIN },
|
||||
{ GIMP_STOCK_TOOL_SHEAR, N_("_Shear"), 0, 0, LIBGIMP_DOMAIN },
|
||||
{ GIMP_STOCK_TOOL_SMUDGE, NULL, 0, 0, LIBGIMP_DOMAIN },
|
||||
{ GIMP_STOCK_TOOL_TEXT, NULL, 0, 0, LIBGIMP_DOMAIN },
|
||||
{ GIMP_STOCK_TOOL_THRESHOLD, NULL, 0, 0, LIBGIMP_DOMAIN },
|
||||
{ GIMP_STOCK_TOOL_ZOOM, NULL, 0, 0, LIBGIMP_DOMAIN }
|
||||
};
|
||||
|
||||
static const GtkStockItem gimp_compat_stock_items[] =
|
||||
{
|
||||
{ "gimp-indexed-palette", NULL, 0, 0, LIBGIMP_DOMAIN },
|
||||
{ "gimp-qmask-off", NULL, 0, 0, LIBGIMP_DOMAIN },
|
||||
{ "gimp-qmask-on", NULL, 0, 0, LIBGIMP_DOMAIN }
|
||||
};
|
||||
|
||||
|
||||
static void
|
||||
register_stock_icon (GtkIconFactory *factory,
|
||||
const gchar *stock_id,
|
||||
const gchar *icon_name)
|
||||
{
|
||||
GtkIconSet *set = gtk_icon_set_new ();
|
||||
GtkIconSource *source = gtk_icon_source_new ();
|
||||
|
||||
gtk_icon_source_set_direction_wildcarded (source, TRUE);
|
||||
gtk_icon_source_set_size_wildcarded (source, TRUE);
|
||||
gtk_icon_source_set_state_wildcarded (source, TRUE);
|
||||
gtk_icon_source_set_icon_name (source, icon_name);
|
||||
|
||||
gtk_icon_set_add_source (set, source);
|
||||
gtk_icon_source_free (source);
|
||||
|
||||
gtk_icon_factory_add (factory, stock_id, set);
|
||||
gtk_icon_set_unref (set);
|
||||
}
|
||||
|
||||
static void
|
||||
register_bidi_stock_icon (GtkIconFactory *factory,
|
||||
const gchar *stock_id,
|
||||
const gchar *icon_name_ltr,
|
||||
const gchar *icon_name_rtl)
|
||||
{
|
||||
GtkIconSet *set = gtk_icon_set_new ();
|
||||
GtkIconSource *source = gtk_icon_source_new ();
|
||||
|
||||
gtk_icon_source_set_direction (source, GTK_TEXT_DIR_LTR);
|
||||
gtk_icon_source_set_direction_wildcarded (source, FALSE);
|
||||
gtk_icon_source_set_size_wildcarded (source, TRUE);
|
||||
gtk_icon_source_set_state_wildcarded (source, TRUE);
|
||||
gtk_icon_source_set_icon_name (source, icon_name_ltr);
|
||||
|
||||
gtk_icon_set_add_source (set, source);
|
||||
gtk_icon_source_free (source);
|
||||
|
||||
source = gtk_icon_source_new ();
|
||||
|
||||
gtk_icon_source_set_direction (source, GTK_TEXT_DIR_RTL);
|
||||
gtk_icon_source_set_direction_wildcarded (source, FALSE);
|
||||
gtk_icon_source_set_size_wildcarded (source, TRUE);
|
||||
gtk_icon_source_set_state_wildcarded (source, TRUE);
|
||||
gtk_icon_source_set_icon_name (source, icon_name_rtl);
|
||||
|
||||
gtk_icon_set_add_source (set, source);
|
||||
gtk_icon_source_free (source);
|
||||
|
||||
gtk_icon_factory_add (factory, stock_id, set);
|
||||
gtk_icon_set_unref (set);
|
||||
}
|
||||
|
||||
|
||||
static GFile *icon_theme_path = NULL;
|
||||
static GFile *default_search_path = NULL;
|
||||
|
||||
|
|
@ -512,22 +226,6 @@ gimp_icons_set_icon_theme (GFile *path)
|
|||
g_object_unref (path);
|
||||
}
|
||||
|
||||
/**
|
||||
* gimp_stock_init:
|
||||
*
|
||||
* Initializes the GIMP stock icon factory.
|
||||
*
|
||||
* You don't need to call this function as gimp_ui_init() already does
|
||||
* this for you.
|
||||
*
|
||||
* Deprecated: 2.10: Use gimp_icons_init() instead.
|
||||
*/
|
||||
void
|
||||
gimp_stock_init (void)
|
||||
{
|
||||
gimp_icons_init ();
|
||||
}
|
||||
|
||||
/**
|
||||
* gimp_icons_init:
|
||||
*
|
||||
|
|
@ -547,43 +245,10 @@ gimp_icons_init (void)
|
|||
gchar *icons_dir;
|
||||
gchar *system_icon_theme;
|
||||
gchar *gimp_icon_theme;
|
||||
gint i;
|
||||
|
||||
if (initialized)
|
||||
return;
|
||||
|
||||
gimp_stock_factory = gtk_icon_factory_new ();
|
||||
|
||||
for (i = 0; i < G_N_ELEMENTS (gimp_stock_items); i++)
|
||||
{
|
||||
register_stock_icon (gimp_stock_factory,
|
||||
gimp_stock_items[i].stock_id,
|
||||
gimp_stock_items[i].stock_id);
|
||||
}
|
||||
|
||||
register_bidi_stock_icon (gimp_stock_factory,
|
||||
GIMP_STOCK_MENU_LEFT,
|
||||
GIMP_STOCK_MENU_LEFT, GIMP_STOCK_MENU_RIGHT);
|
||||
register_bidi_stock_icon (gimp_stock_factory,
|
||||
GIMP_STOCK_MENU_RIGHT,
|
||||
GIMP_STOCK_MENU_RIGHT, GIMP_STOCK_MENU_LEFT);
|
||||
|
||||
register_stock_icon (gimp_stock_factory,
|
||||
"gimp-indexed-palette", GIMP_STOCK_COLORMAP);
|
||||
register_stock_icon (gimp_stock_factory,
|
||||
"gimp-qmask-off", GIMP_STOCK_QUICK_MASK_OFF);
|
||||
register_stock_icon (gimp_stock_factory,
|
||||
"gimp-qmask-on", GIMP_STOCK_QUICK_MASK_ON);
|
||||
register_stock_icon (gimp_stock_factory,
|
||||
"gimp-tool-blend", GIMP_STOCK_TOOL_BLEND);
|
||||
|
||||
gtk_icon_factory_add_default (gimp_stock_factory);
|
||||
|
||||
gtk_stock_add_static (gimp_stock_items,
|
||||
G_N_ELEMENTS (gimp_stock_items));
|
||||
gtk_stock_add_static (gimp_compat_stock_items,
|
||||
G_N_ELEMENTS (gimp_compat_stock_items));
|
||||
|
||||
/* always prepend the default icon theme, it's never removed from
|
||||
* the path again and acts as fallback for missing icons in other
|
||||
* themes.
|
||||
|
|
@ -638,7 +303,7 @@ gimp_icons_init (void)
|
|||
|
||||
if (pixbuf)
|
||||
{
|
||||
gtk_icon_theme_add_builtin_icon (GIMP_STOCK_WILBER_EEK, 64, pixbuf);
|
||||
gtk_icon_theme_add_builtin_icon (GIMP_ICON_WILBER_EEK, 64, pixbuf);
|
||||
g_object_unref (pixbuf);
|
||||
}
|
||||
else
|
||||
|
|
|
|||
|
|
@ -390,263 +390,6 @@ G_BEGIN_DECLS
|
|||
#define GIMP_ICON_ZOOM_FOLLOW_WINDOW "gimp-zoom-follow-window"
|
||||
|
||||
|
||||
#ifndef GIMP_DISABLE_DEPRECATED
|
||||
|
||||
/* in button size: */
|
||||
|
||||
#define GIMP_STOCK_ANCHOR "gimp-anchor"
|
||||
#define GIMP_STOCK_CENTER "gimp-center"
|
||||
#define GIMP_STOCK_DUPLICATE "gimp-duplicate"
|
||||
#define GIMP_STOCK_LINKED "gimp-linked"
|
||||
#define GIMP_STOCK_PASTE_AS_NEW "gimp-paste-as-new"
|
||||
#define GIMP_STOCK_PASTE_INTO "gimp-paste-into"
|
||||
#define GIMP_STOCK_RESET "gimp-reset"
|
||||
#define GIMP_STOCK_VISIBLE "gimp-visible"
|
||||
|
||||
#define GIMP_STOCK_GRADIENT_LINEAR "gimp-gradient-linear"
|
||||
#define GIMP_STOCK_GRADIENT_BILINEAR "gimp-gradient-bilinear"
|
||||
#define GIMP_STOCK_GRADIENT_RADIAL "gimp-gradient-radial"
|
||||
#define GIMP_STOCK_GRADIENT_SQUARE "gimp-gradient-square"
|
||||
#define GIMP_STOCK_GRADIENT_CONICAL_SYMMETRIC "gimp-gradient-conical-symmetric"
|
||||
#define GIMP_STOCK_GRADIENT_CONICAL_ASYMMETRIC "gimp-gradient-conical-asymmetric"
|
||||
#define GIMP_STOCK_GRADIENT_SHAPEBURST_ANGULAR "gimp-gradient-shapeburst-angular"
|
||||
#define GIMP_STOCK_GRADIENT_SHAPEBURST_SPHERICAL "gimp-gradient-shapeburst-spherical"
|
||||
#define GIMP_STOCK_GRADIENT_SHAPEBURST_DIMPLED "gimp-gradient-shapeburst-dimpled"
|
||||
#define GIMP_STOCK_GRADIENT_SPIRAL_CLOCKWISE "gimp-gradient-spiral-clockwise"
|
||||
#define GIMP_STOCK_GRADIENT_SPIRAL_ANTICLOCKWISE "gimp-gradient-spiral-anticlockwise"
|
||||
|
||||
#define GIMP_STOCK_GRAVITY_EAST "gimp-gravity-east"
|
||||
#define GIMP_STOCK_GRAVITY_NORTH "gimp-gravity-north"
|
||||
#define GIMP_STOCK_GRAVITY_NORTH_EAST "gimp-gravity-north-east"
|
||||
#define GIMP_STOCK_GRAVITY_NORTH_WEST "gimp-gravity-north-west"
|
||||
#define GIMP_STOCK_GRAVITY_SOUTH "gimp-gravity-south"
|
||||
#define GIMP_STOCK_GRAVITY_SOUTH_EAST "gimp-gravity-south-east"
|
||||
#define GIMP_STOCK_GRAVITY_SOUTH_WEST "gimp-gravity-south-west"
|
||||
#define GIMP_STOCK_GRAVITY_WEST "gimp-gravity-west"
|
||||
|
||||
#define GIMP_STOCK_HCENTER "gimp-hcenter"
|
||||
#define GIMP_STOCK_VCENTER "gimp-vcenter"
|
||||
|
||||
#define GIMP_STOCK_HCHAIN "gimp-hchain"
|
||||
#define GIMP_STOCK_HCHAIN_BROKEN "gimp-hchain-broken"
|
||||
#define GIMP_STOCK_VCHAIN "gimp-vchain"
|
||||
#define GIMP_STOCK_VCHAIN_BROKEN "gimp-vchain-broken"
|
||||
|
||||
#define GIMP_STOCK_SELECTION "gimp-selection"
|
||||
#define GIMP_STOCK_SELECTION_REPLACE "gimp-selection-replace"
|
||||
#define GIMP_STOCK_SELECTION_ADD "gimp-selection-add"
|
||||
#define GIMP_STOCK_SELECTION_SUBTRACT "gimp-selection-subtract"
|
||||
#define GIMP_STOCK_SELECTION_INTERSECT "gimp-selection-intersect"
|
||||
#define GIMP_STOCK_SELECTION_STROKE "gimp-selection-stroke"
|
||||
#define GIMP_STOCK_SELECTION_TO_CHANNEL "gimp-selection-to-channel"
|
||||
#define GIMP_STOCK_SELECTION_TO_PATH "gimp-selection-to-path"
|
||||
|
||||
#define GIMP_STOCK_PATH_STROKE "gimp-path-stroke"
|
||||
|
||||
#define GIMP_STOCK_CURVE_FREE "gimp-curve-free"
|
||||
#define GIMP_STOCK_CURVE_SMOOTH "gimp-curve-smooth"
|
||||
|
||||
#define GIMP_STOCK_COLOR_PICKER_BLACK "gimp-color-picker-black"
|
||||
#define GIMP_STOCK_COLOR_PICKER_GRAY "gimp-color-picker-gray"
|
||||
#define GIMP_STOCK_COLOR_PICKER_WHITE "gimp-color-picker-white"
|
||||
#define GIMP_STOCK_COLOR_TRIANGLE "gimp-color-triangle"
|
||||
#define GIMP_STOCK_COLOR_PICK_FROM_SCREEN "gimp-color-pick-from-screen"
|
||||
|
||||
#define GIMP_STOCK_CHAR_PICKER "gimp-char-picker"
|
||||
#define GIMP_STOCK_LETTER_SPACING "gimp-letter-spacing"
|
||||
#define GIMP_STOCK_LINE_SPACING "gimp-line-spacing"
|
||||
#define GIMP_STOCK_PATTERN "gimp-pattern"
|
||||
|
||||
#define GIMP_STOCK_TEXT_DIR_LTR "gimp-text-dir-ltr"
|
||||
#define GIMP_STOCK_TEXT_DIR_RTL "gimp-text-dir-rtl"
|
||||
|
||||
#define GIMP_STOCK_TOOL_AIRBRUSH "gimp-tool-airbrush"
|
||||
#define GIMP_STOCK_TOOL_ALIGN "gimp-tool-align"
|
||||
#define GIMP_STOCK_TOOL_BLEND "gimp-tool-gradient"
|
||||
#define GIMP_STOCK_TOOL_BLUR "gimp-tool-blur"
|
||||
#define GIMP_STOCK_TOOL_BRIGHTNESS_CONTRAST "gimp-tool-brightness-contrast"
|
||||
#define GIMP_STOCK_TOOL_BUCKET_FILL "gimp-tool-bucket-fill"
|
||||
#define GIMP_STOCK_TOOL_BY_COLOR_SELECT "gimp-tool-by-color-select"
|
||||
#define GIMP_STOCK_TOOL_CAGE "gimp-tool-cage"
|
||||
#define GIMP_STOCK_TOOL_CLONE "gimp-tool-clone"
|
||||
#define GIMP_STOCK_TOOL_COLOR_BALANCE "gimp-tool-color-balance"
|
||||
#define GIMP_STOCK_TOOL_COLOR_PICKER "gimp-tool-color-picker"
|
||||
#define GIMP_STOCK_TOOL_COLORIZE "gimp-tool-colorize"
|
||||
#define GIMP_STOCK_TOOL_CROP "gimp-tool-crop"
|
||||
#define GIMP_STOCK_TOOL_CURVES "gimp-tool-curves"
|
||||
#define GIMP_STOCK_TOOL_DESATURATE "gimp-tool-desaturate"
|
||||
#define GIMP_STOCK_TOOL_DODGE "gimp-tool-dodge"
|
||||
#define GIMP_STOCK_TOOL_ELLIPSE_SELECT "gimp-tool-ellipse-select"
|
||||
#define GIMP_STOCK_TOOL_ERASER "gimp-tool-eraser"
|
||||
#define GIMP_STOCK_TOOL_FLIP "gimp-tool-flip"
|
||||
#define GIMP_STOCK_TOOL_FREE_SELECT "gimp-tool-free-select"
|
||||
#define GIMP_STOCK_TOOL_FOREGROUND_SELECT "gimp-tool-foreground-select"
|
||||
#define GIMP_STOCK_TOOL_FUZZY_SELECT "gimp-tool-fuzzy-select"
|
||||
#define GIMP_STOCK_TOOL_HEAL "gimp-tool-heal"
|
||||
#define GIMP_STOCK_TOOL_HUE_SATURATION "gimp-tool-hue-saturation"
|
||||
#define GIMP_STOCK_TOOL_INK "gimp-tool-ink"
|
||||
#define GIMP_STOCK_TOOL_ISCISSORS "gimp-tool-iscissors"
|
||||
#define GIMP_STOCK_TOOL_LEVELS "gimp-tool-levels"
|
||||
#define GIMP_STOCK_TOOL_MEASURE "gimp-tool-measure"
|
||||
#define GIMP_STOCK_TOOL_MOVE "gimp-tool-move"
|
||||
#define GIMP_STOCK_TOOL_PAINTBRUSH "gimp-tool-paintbrush"
|
||||
#define GIMP_STOCK_TOOL_PATH "gimp-tool-path"
|
||||
#define GIMP_STOCK_TOOL_PENCIL "gimp-tool-pencil"
|
||||
#define GIMP_STOCK_TOOL_PERSPECTIVE "gimp-tool-perspective"
|
||||
#define GIMP_STOCK_TOOL_PERSPECTIVE_CLONE "gimp-tool-perspective-clone"
|
||||
#define GIMP_STOCK_TOOL_POSTERIZE "gimp-tool-posterize"
|
||||
#define GIMP_STOCK_TOOL_RECT_SELECT "gimp-tool-rect-select"
|
||||
#define GIMP_STOCK_TOOL_ROTATE "gimp-tool-rotate"
|
||||
#define GIMP_STOCK_TOOL_SCALE "gimp-tool-scale"
|
||||
#define GIMP_STOCK_TOOL_SHEAR "gimp-tool-shear"
|
||||
#define GIMP_STOCK_TOOL_SMUDGE "gimp-tool-smudge"
|
||||
#define GIMP_STOCK_TOOL_TEXT "gimp-tool-text"
|
||||
#define GIMP_STOCK_TOOL_THRESHOLD "gimp-tool-threshold"
|
||||
#define GIMP_STOCK_TOOL_ZOOM "gimp-tool-zoom"
|
||||
|
||||
/* in menu size: */
|
||||
|
||||
#define GIMP_STOCK_CONVERT_RGB "gimp-convert-rgb"
|
||||
#define GIMP_STOCK_CONVERT_GRAYSCALE "gimp-convert-grayscale"
|
||||
#define GIMP_STOCK_CONVERT_INDEXED "gimp-convert-indexed"
|
||||
#define GIMP_STOCK_INVERT "gimp-invert"
|
||||
#define GIMP_STOCK_MERGE_DOWN "gimp-merge-down"
|
||||
#define GIMP_STOCK_LAYER_TO_IMAGESIZE "gimp-layer-to-imagesize"
|
||||
#define GIMP_STOCK_PLUGIN "gimp-plugin"
|
||||
#define GIMP_STOCK_UNDO_HISTORY "gimp-undo-history"
|
||||
#define GIMP_STOCK_RESHOW_FILTER "gimp-reshow-filter"
|
||||
#define GIMP_STOCK_ROTATE_90 "gimp-rotate-90"
|
||||
#define GIMP_STOCK_ROTATE_180 "gimp-rotate-180"
|
||||
#define GIMP_STOCK_ROTATE_270 "gimp-rotate-270"
|
||||
#define GIMP_STOCK_RESIZE "gimp-resize"
|
||||
#define GIMP_STOCK_SCALE "gimp-scale"
|
||||
#define GIMP_STOCK_FLIP_HORIZONTAL "gimp-flip-horizontal"
|
||||
#define GIMP_STOCK_FLIP_VERTICAL "gimp-flip-vertical"
|
||||
|
||||
#define GIMP_STOCK_IMAGE "gimp-image"
|
||||
#define GIMP_STOCK_LAYER "gimp-layer"
|
||||
#define GIMP_STOCK_TEXT_LAYER "gimp-text-layer"
|
||||
#define GIMP_STOCK_FLOATING_SELECTION "gimp-floating-selection"
|
||||
#define GIMP_STOCK_CHANNEL "gimp-channel"
|
||||
#define GIMP_STOCK_CHANNEL_RED "gimp-channel-red"
|
||||
#define GIMP_STOCK_CHANNEL_GREEN "gimp-channel-green"
|
||||
#define GIMP_STOCK_CHANNEL_BLUE "gimp-channel-blue"
|
||||
#define GIMP_STOCK_CHANNEL_GRAY "gimp-channel-gray"
|
||||
#define GIMP_STOCK_CHANNEL_INDEXED "gimp-channel-indexed"
|
||||
#define GIMP_STOCK_CHANNEL_ALPHA "gimp-channel-alpha"
|
||||
#define GIMP_STOCK_LAYER_MASK "gimp-layer-mask"
|
||||
#define GIMP_STOCK_PATH "gimp-path"
|
||||
#define GIMP_STOCK_TEMPLATE "gimp-template"
|
||||
#define GIMP_STOCK_TRANSPARENCY "gimp-transparency"
|
||||
#define GIMP_STOCK_COLORMAP "gimp-colormap"
|
||||
|
||||
#define GIMP_STOCK_INDEXED_PALETTE "gimp-colormap"
|
||||
|
||||
#define GIMP_STOCK_IMAGES "gimp-images"
|
||||
#define GIMP_STOCK_LAYERS "gimp-layers"
|
||||
#define GIMP_STOCK_CHANNELS "gimp-channels"
|
||||
#define GIMP_STOCK_PATHS "gimp-paths"
|
||||
|
||||
#define GIMP_STOCK_SELECTION_ALL "gimp-selection-all"
|
||||
#define GIMP_STOCK_SELECTION_NONE "gimp-selection-none"
|
||||
#define GIMP_STOCK_SELECTION_GROW "gimp-selection-grow"
|
||||
#define GIMP_STOCK_SELECTION_SHRINK "gimp-selection-shrink"
|
||||
#define GIMP_STOCK_SELECTION_BORDER "gimp-selection-border"
|
||||
|
||||
#define GIMP_STOCK_NAVIGATION "gimp-navigation"
|
||||
#define GIMP_STOCK_QUICK_MASK_OFF "gimp-quick-mask-off"
|
||||
#define GIMP_STOCK_QUICK_MASK_ON "gimp-quick-mask-on"
|
||||
|
||||
#define GIMP_STOCK_QMASK_OFF "gimp-quick-mask-off"
|
||||
#define GIMP_STOCK_QMASK_ON "gimp-quick-mask-on"
|
||||
|
||||
#define GIMP_STOCK_HISTOGRAM "gimp-histogram"
|
||||
#define GIMP_STOCK_HISTOGRAM_LINEAR "gimp-histogram-linear"
|
||||
#define GIMP_STOCK_HISTOGRAM_LOGARITHMIC "gimp-histogram-logarithmic"
|
||||
|
||||
#define GIMP_STOCK_CLOSE "gimp-close"
|
||||
#define GIMP_STOCK_MENU_LEFT "gimp-menu-left"
|
||||
#define GIMP_STOCK_MENU_RIGHT "gimp-menu-right"
|
||||
#define GIMP_STOCK_MOVE_TO_SCREEN "gimp-move-to-screen"
|
||||
#define GIMP_STOCK_DEFAULT_COLORS "gimp-default-colors"
|
||||
#define GIMP_STOCK_SWAP_COLORS "gimp-swap-colors"
|
||||
#define GIMP_STOCK_ZOOM_FOLLOW_WINDOW "gimp-zoom-follow-window"
|
||||
|
||||
#define GIMP_STOCK_TOOLS "gimp-tools"
|
||||
#define GIMP_STOCK_TOOL_OPTIONS "gimp-tool-options"
|
||||
#define GIMP_STOCK_DEVICE_STATUS "gimp-device-status"
|
||||
#define GIMP_STOCK_INPUT_DEVICE "gimp-input-device"
|
||||
#define GIMP_STOCK_CURSOR "gimp-cursor"
|
||||
#define GIMP_STOCK_SAMPLE_POINT "gimp-sample-point"
|
||||
#define GIMP_STOCK_DYNAMICS "gimp-dynamics"
|
||||
#define GIMP_STOCK_TOOL_PRESET "gimp-tool-preset"
|
||||
|
||||
#define GIMP_STOCK_CONTROLLER "gimp-controller"
|
||||
#define GIMP_STOCK_CONTROLLER_KEYBOARD "gimp-controller-keyboard"
|
||||
#define GIMP_STOCK_CONTROLLER_LINUX_INPUT "gimp-controller-linux-input"
|
||||
#define GIMP_STOCK_CONTROLLER_MIDI "gimp-controller-midi"
|
||||
#define GIMP_STOCK_CONTROLLER_WHEEL "gimp-controller-wheel"
|
||||
|
||||
#define GIMP_STOCK_DISPLAY_FILTER "gimp-display-filter"
|
||||
#define GIMP_STOCK_DISPLAY_FILTER_COLORBLIND "gimp-display-filter-colorblind"
|
||||
#define GIMP_STOCK_DISPLAY_FILTER_CONTRAST "gimp-display-filter-contrast"
|
||||
#define GIMP_STOCK_DISPLAY_FILTER_GAMMA "gimp-display-filter-gamma"
|
||||
#define GIMP_STOCK_DISPLAY_FILTER_LCMS "gimp-display-filter-lcms"
|
||||
#define GIMP_STOCK_DISPLAY_FILTER_PROOF "gimp-display-filter-proof"
|
||||
|
||||
#define GIMP_STOCK_LIST "gimp-list"
|
||||
#define GIMP_STOCK_GRID "gimp-grid"
|
||||
|
||||
#define GIMP_STOCK_PORTRAIT "gimp-portrait"
|
||||
#define GIMP_STOCK_LANDSCAPE "gimp-landscape"
|
||||
|
||||
#define GIMP_STOCK_GEGL "gimp-gegl"
|
||||
#define GIMP_STOCK_VIDEO "gimp-video"
|
||||
#define GIMP_STOCK_WEB "gimp-web"
|
||||
|
||||
#define GIMP_STOCK_SHAPE_CIRCLE "gimp-shape-circle"
|
||||
#define GIMP_STOCK_SHAPE_DIAMOND "gimp-shape-diamond"
|
||||
#define GIMP_STOCK_SHAPE_SQUARE "gimp-shape-square"
|
||||
|
||||
#define GIMP_STOCK_CAP_BUTT "gimp-cap-butt"
|
||||
#define GIMP_STOCK_CAP_ROUND "gimp-cap-round"
|
||||
#define GIMP_STOCK_CAP_SQUARE "gimp-cap-square"
|
||||
|
||||
#define GIMP_STOCK_JOIN_MITER "gimp-join-miter"
|
||||
#define GIMP_STOCK_JOIN_ROUND "gimp-join-round"
|
||||
#define GIMP_STOCK_JOIN_BEVEL "gimp-join-bevel"
|
||||
|
||||
/* in dialog size: */
|
||||
|
||||
#define GIMP_STOCK_ERROR "gimp-error"
|
||||
#define GIMP_STOCK_INFO "gimp-info"
|
||||
#define GIMP_STOCK_QUESTION "gimp-question"
|
||||
#define GIMP_STOCK_WARNING "gimp-warning"
|
||||
#define GIMP_STOCK_WILBER "gimp-wilber"
|
||||
#define GIMP_STOCK_WILBER_EEK "gimp-wilber-eek"
|
||||
#define GIMP_STOCK_FRAME "gimp-frame"
|
||||
#define GIMP_STOCK_TEXTURE "gimp-texture"
|
||||
#define GIMP_STOCK_USER_MANUAL "gimp-user-manual"
|
||||
|
||||
/* missing icons: */
|
||||
|
||||
#define GIMP_STOCK_BRUSH GIMP_STOCK_TOOL_PAINTBRUSH
|
||||
#define GIMP_STOCK_BUFFER "edit-paste"
|
||||
#define GIMP_STOCK_DETACH GTK_STOCK_CONVERT
|
||||
#define GIMP_STOCK_FONT GTK_STOCK_SELECT_FONT
|
||||
#define GIMP_STOCK_GRADIENT GIMP_STOCK_TOOL_BLEND
|
||||
#define GIMP_STOCK_PALETTE GTK_STOCK_SELECT_COLOR
|
||||
#define GIMP_STOCK_CONTROLLER_MOUSE GIMP_STOCK_CURSOR
|
||||
#define GIMP_STOCK_PRINT_RESOLUTION "document-print"
|
||||
|
||||
#define GIMP_STOCK_EDIT "gtk-edit"
|
||||
|
||||
#endif /* GIMP_DISABLE_DEPRECATED */
|
||||
|
||||
|
||||
GIMP_DEPRECATED_FOR(gimp_icons_init)
|
||||
void gimp_stock_init (void);
|
||||
|
||||
void gimp_icons_init (void);
|
||||
|
||||
void gimp_icons_set_icon_theme (GFile *path);
|
||||
|
|
|
|||
|
|
@ -38,7 +38,6 @@ G_BEGIN_DECLS
|
|||
* @GIMP_INT_STORE_USER_DATA: arbitrary user data
|
||||
* @GIMP_INT_STORE_ABBREV: an abbreviated label
|
||||
* @GIMP_INT_STORE_NUM_COLUMNS: the number of columns
|
||||
* @GIMP_INT_STORE_STOCK_ID: compat alias for @GIMP_INT_STORE_ICON_NAME
|
||||
*
|
||||
* The column types of #GimpIntStore.
|
||||
**/
|
||||
|
|
@ -50,10 +49,7 @@ typedef enum
|
|||
GIMP_INT_STORE_PIXBUF,
|
||||
GIMP_INT_STORE_USER_DATA,
|
||||
GIMP_INT_STORE_ABBREV,
|
||||
GIMP_INT_STORE_NUM_COLUMNS,
|
||||
|
||||
/* deprecated */
|
||||
GIMP_INT_STORE_STOCK_ID = GIMP_INT_STORE_ICON_NAME
|
||||
GIMP_INT_STORE_NUM_COLUMNS
|
||||
} GimpIntStoreColumns;
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -20,8 +20,6 @@
|
|||
#include <string.h>
|
||||
|
||||
#include <gegl.h>
|
||||
/* FIXME: #undef GTK_DISABLE_DEPRECATED */
|
||||
#undef GTK_DISABLE_DEPRECATED
|
||||
#include <gtk/gtk.h>
|
||||
|
||||
#include "libgimpcolor/gimpcolor.h"
|
||||
|
|
@ -1068,37 +1066,6 @@ gimp_prop_boolean_radio_frame_new (GObject *config,
|
|||
return frame;
|
||||
}
|
||||
|
||||
/**
|
||||
* gimp_prop_enum_stock_box_new:
|
||||
* @config: Object to which property is attached.
|
||||
* @property_name: Name of enum property controlled by the radio buttons.
|
||||
* @stock_prefix: The prefix of the group of stock ids to use.
|
||||
* @minimum: Smallest value of enum to be included.
|
||||
* @maximum: Largest value of enum to be included.
|
||||
*
|
||||
* Creates a horizontal box of radio buttons with stock icons, which
|
||||
* function to set and display the value of the specified Enum
|
||||
* property. The stock_id for each icon is created by appending the
|
||||
* enum_value's nick to the given @stock_prefix. See
|
||||
* gimp_enum_stock_box_new() for more information.
|
||||
*
|
||||
* Return value: A #libgimpwidgets-gimpenumstockbox containing the radio buttons.
|
||||
*
|
||||
* Since: 2.4
|
||||
*
|
||||
* Deprecated: 2.10
|
||||
*/
|
||||
GtkWidget *
|
||||
gimp_prop_enum_stock_box_new (GObject *config,
|
||||
const gchar *property_name,
|
||||
const gchar *stock_prefix,
|
||||
gint minimum,
|
||||
gint maximum)
|
||||
{
|
||||
return gimp_prop_enum_icon_box_new (config, property_name,
|
||||
stock_prefix, minimum, maximum);
|
||||
}
|
||||
|
||||
/**
|
||||
* gimp_prop_enum_icon_box_new:
|
||||
* @config: Object to which property is attached.
|
||||
|
|
@ -3825,30 +3792,6 @@ static void gimp_prop_icon_image_notify (GObject *config,
|
|||
GParamSpec *param_spec,
|
||||
GtkWidget *image);
|
||||
|
||||
/**
|
||||
* gimp_prop_stock_image_new:
|
||||
* @config: Object to which property is attached.
|
||||
* @property_name: Name of string property.
|
||||
* @icon_size: Size of desired stock image.
|
||||
*
|
||||
* Creates a widget to display a stock image representing the value of the
|
||||
* specified string property, which should encode a Stock ID.
|
||||
* See gtk_image_new_from_stock() for more information.
|
||||
*
|
||||
* Return value: A new #GtkImage widget.
|
||||
*
|
||||
* Since: 2.4
|
||||
*
|
||||
* Deprecated: 2.10
|
||||
*/
|
||||
GtkWidget *
|
||||
gimp_prop_stock_image_new (GObject *config,
|
||||
const gchar *property_name,
|
||||
GtkIconSize icon_size)
|
||||
{
|
||||
return gimp_prop_icon_image_new (config, property_name, icon_size);
|
||||
}
|
||||
|
||||
/**
|
||||
* gimp_prop_icon_image_new:
|
||||
* @config: Object to which property is attached.
|
||||
|
|
|
|||
|
|
@ -84,13 +84,6 @@ GtkWidget * gimp_prop_enum_radio_box_new (GObject *config,
|
|||
gint minimum,
|
||||
gint maximum);
|
||||
|
||||
GIMP_DEPRECATED_FOR(gimp_prop_enum_icon_box_new)
|
||||
GtkWidget * gimp_prop_enum_stock_box_new (GObject *config,
|
||||
const gchar *property_name,
|
||||
const gchar *stock_prefix,
|
||||
gint minimum,
|
||||
gint maximum);
|
||||
|
||||
GtkWidget * gimp_prop_enum_icon_box_new (GObject *config,
|
||||
const gchar *property_name,
|
||||
const gchar *icon_prefix,
|
||||
|
|
@ -225,10 +218,6 @@ GtkWidget * gimp_prop_unit_combo_box_new (GObject *config,
|
|||
|
||||
/* GParamString (icon name) */
|
||||
|
||||
GIMP_DEPRECATED_FOR(gimp_prop_stock_image_new)
|
||||
GtkWidget * gimp_prop_stock_image_new (GObject *config,
|
||||
const gchar *property_name,
|
||||
GtkIconSize icon_size);
|
||||
GtkWidget * gimp_prop_icon_image_new (GObject *config,
|
||||
const gchar *property_name,
|
||||
GtkIconSize icon_size);
|
||||
|
|
|
|||
|
|
@ -36,7 +36,6 @@
|
|||
* @see_also: #GimpUnit, #GimpUnitStore
|
||||
*
|
||||
* #GimpUnitComboBox selects units stored in a #GimpUnitStore.
|
||||
* It replaces the deprecated #GimpUnitMenu.
|
||||
**/
|
||||
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue