Commit 6d960a0e authored by Sven Neumann's avatar Sven Neumann Committed by Sven Neumann
Browse files

themes/Default/images/stock-channel-16.png

2003-03-22  Sven Neumann  <sven@gimp.org>

	* themes/Default/images/stock-channel-16.png
	* themes/Default/images/stock-channel-24.png
	* themes/Default/images/stock-layer-16.png
	* themes/Default/images/stock-layer-24.png: new icons provided by
	Jimmac.

	* themes/Default/images/stock-eye-12.png
	* themes/Default/images/stock-linked-12.png: tiny visibility and
	linked icons that I created from Jimmac's small versions by
	scaling them down. Should probably be redone.

	* libgimpwidgets/gimpstock.[ch]: allow to register multiple sizes
	for the same stock_id. Added new icons.

	* app/core/gimpchannel.c
	* app/core/gimplayer.c: set default stock_ids so the new icons are
	used when layer previews are disabled.
parent f9d45dcd
2003-03-22 Sven Neumann <sven@gimp.org>
* themes/Default/images/stock-channel-16.png
* themes/Default/images/stock-channel-24.png
* themes/Default/images/stock-layer-16.png
* themes/Default/images/stock-layer-24.png: new icons provided by
Jimmac.
* themes/Default/images/stock-eye-12.png
* themes/Default/images/stock-linked-12.png: tiny visibility and
linked icons that I created from Jimmac's small versions by
scaling them down. Should probably be redone.
* libgimpwidgets/gimpstock.[ch]: allow to register multiple sizes
for the same stock_id. Added new icons.
* app/core/gimpchannel.c
* app/core/gimplayer.c: set default stock_ids so the new icons are
used when layer previews are disabled.
2003-03-21 Sven Neumann <sven@gimp.org>
* widgets/gimpdockbook.c: renamed "tab_size" style property to
......@@ -99,23 +99,27 @@ gimp_channel_get_type (void)
static void
gimp_channel_class_init (GimpChannelClass *klass)
{
GObjectClass *object_class;
GimpObjectClass *gimp_object_class;
GimpItemClass *item_class;
GObjectClass *object_class;
GimpObjectClass *gimp_object_class;
GimpViewableClass *viewable_class;
GimpItemClass *item_class;
object_class = G_OBJECT_CLASS (klass);
gimp_object_class = GIMP_OBJECT_CLASS (klass);
viewable_class = GIMP_VIEWABLE_CLASS (klass);
item_class = GIMP_ITEM_CLASS (klass);
parent_class = g_type_class_peek_parent (klass);
object_class->finalize = gimp_channel_finalize;
object_class->finalize = gimp_channel_finalize;
gimp_object_class->get_memsize = gimp_channel_get_memsize;
gimp_object_class->get_memsize = gimp_channel_get_memsize;
item_class->duplicate = gimp_channel_duplicate;
item_class->default_name = _("Channel");
item_class->rename_desc = _("Rename Channel");
viewable_class->default_stock_id = "gimp-channel";
item_class->duplicate = gimp_channel_duplicate;
item_class->default_name = _("Channel");
item_class->rename_desc = _("Rename Channel");
}
static void
......
......@@ -99,23 +99,27 @@ gimp_channel_get_type (void)
static void
gimp_channel_class_init (GimpChannelClass *klass)
{
GObjectClass *object_class;
GimpObjectClass *gimp_object_class;
GimpItemClass *item_class;
GObjectClass *object_class;
GimpObjectClass *gimp_object_class;
GimpViewableClass *viewable_class;
GimpItemClass *item_class;
object_class = G_OBJECT_CLASS (klass);
gimp_object_class = GIMP_OBJECT_CLASS (klass);
viewable_class = GIMP_VIEWABLE_CLASS (klass);
item_class = GIMP_ITEM_CLASS (klass);
parent_class = g_type_class_peek_parent (klass);
object_class->finalize = gimp_channel_finalize;
object_class->finalize = gimp_channel_finalize;
gimp_object_class->get_memsize = gimp_channel_get_memsize;
gimp_object_class->get_memsize = gimp_channel_get_memsize;
item_class->duplicate = gimp_channel_duplicate;
item_class->default_name = _("Channel");
item_class->rename_desc = _("Rename Channel");
viewable_class->default_stock_id = "gimp-channel";
item_class->duplicate = gimp_channel_duplicate;
item_class->default_name = _("Channel");
item_class->rename_desc = _("Rename Channel");
}
static void
......
......@@ -180,6 +180,7 @@ gimp_layer_class_init (GimpLayerClass *klass)
gimp_object_class->get_memsize = gimp_layer_get_memsize;
viewable_class->default_stock_id = "gimp-layer";
viewable_class->invalidate_preview = gimp_layer_invalidate_preview;
item_class->duplicate = gimp_layer_duplicate;
......
......@@ -313,6 +313,8 @@ GIMP_STOCK_LETTER_SPACING
GIMP_STOCK_LINE_SPACING
GIMP_STOCK_TOOL_OPTIONS
GIMP_STOCK_DEVICE_STATUS
GIMP_STOCK_LAYER
GIMP_STOCK_CHANNEL
GIMP_STOCK_IMAGES
GIMP_STOCK_LAYERS
GIMP_STOCK_CHANNELS
......
......@@ -346,6 +346,20 @@ size).
<!-- ##### MACRO GIMP_STOCK_LAYER ##### -->
<para>
<inlinegraphic fileref="stock-layer-24.png" format="png"></inlinegraphic>
</para>
<!-- ##### MACRO GIMP_STOCK_CHANNEL ##### -->
<para>
<inlinegraphic fileref="stock-channel-24.png" format="png"></inlinegraphic>
</para>
<!-- ##### MACRO GIMP_STOCK_IMAGES ##### -->
<para>
<inlinegraphic fileref="stock-images-16.png" format="png"></inlinegraphic>
......
......@@ -38,12 +38,13 @@
static GtkIconFactory *gimp_stock_factory = NULL;
static GtkIconSet *
sized_with_same_fallback_icon_set_from_inline (const guchar *inline_data,
GtkIconSize size)
static void
icon_set_from_inline (GtkIconSet *set,
const guchar *inline_data,
GtkIconSize size,
gboolean fallback)
{
GtkIconSource *source;
GtkIconSet *set;
GdkPixbuf *pixbuf;
source = gtk_icon_source_new ();
......@@ -59,16 +60,15 @@ sized_with_same_fallback_icon_set_from_inline (const guchar *inline_data,
g_object_unref (pixbuf);
set = gtk_icon_set_new ();
gtk_icon_set_add_source (set, source);
gtk_icon_source_set_size_wildcarded (source, TRUE);
gtk_icon_set_add_source (set, source);
if (fallback)
{
gtk_icon_source_set_size_wildcarded (source, TRUE);
gtk_icon_set_add_source (set, source);
}
gtk_icon_source_free (source);
return set;
}
static void
......@@ -78,14 +78,23 @@ add_sized_with_same_fallback (GtkIconFactory *factory,
const gchar *stock_id)
{
GtkIconSet *set;
set = sized_with_same_fallback_icon_set_from_inline (inline_data, size);
gtk_icon_factory_add (factory, stock_id, set);
gboolean fallback = FALSE;
set = gtk_icon_factory_lookup (factory, stock_id);
if (! set)
{
set = gtk_icon_set_new ();
gtk_icon_factory_add (factory, stock_id, set);
gtk_icon_set_unref (set);
fallback = TRUE;
}
gtk_icon_set_unref (set);
icon_set_from_inline (set, inline_data, size, fallback);
}
static GtkStockItem gimp_stock_items[] =
{
{ GIMP_STOCK_ANCHOR, N_("Anchor"), 0, 0, LIBGIMP_DOMAIN },
......@@ -154,6 +163,9 @@ static GtkStockItem gimp_stock_items[] =
{ GIMP_STOCK_CHANNELS, NULL, 0, 0, LIBGIMP_DOMAIN },
{ GIMP_STOCK_PATHS, NULL, 0, 0, LIBGIMP_DOMAIN },
{ GIMP_STOCK_LAYER, NULL, 0, 0, LIBGIMP_DOMAIN },
{ GIMP_STOCK_CHANNEL, 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 },
......@@ -220,11 +232,9 @@ gimp_stock_button_pixbufs[] =
{ GIMP_STOCK_ANCHOR, stock_anchor_16 },
{ GIMP_STOCK_DUPLICATE, stock_duplicate_16 },
{ GIMP_STOCK_EDIT, stock_edit_16 },
{ GIMP_STOCK_LINKED, stock_linked_20 },
{ GIMP_STOCK_PASTE_AS_NEW, stock_paste_as_new_16 },
{ GIMP_STOCK_PASTE_INTO, stock_paste_into_16 },
{ GIMP_STOCK_RESET, stock_reset_16 },
{ GIMP_STOCK_VISIBLE, stock_eye_20 },
{ GIMP_STOCK_GRAVITY_EAST, stock_gravity_east_24 },
{ GIMP_STOCK_GRAVITY_NORTH, stock_gravity_north_24 },
......@@ -261,6 +271,12 @@ gimp_stock_button_pixbufs[] =
{ GIMP_STOCK_LETTER_SPACING, stock_letter_spacing_22 },
{ GIMP_STOCK_LINE_SPACING, stock_line_spacing_22 },
{ GIMP_STOCK_LAYER, stock_layer_24 },
{ GIMP_STOCK_CHANNEL, stock_channel_24 },
{ GIMP_STOCK_LINKED, stock_linked_20 },
{ GIMP_STOCK_VISIBLE, stock_eye_20 },
{ GIMP_STOCK_TOOL_AIRBRUSH, stock_tool_airbrush_22 },
{ GIMP_STOCK_TOOL_BEZIER_SELECT, stock_tool_bezier_select_22 },
{ GIMP_STOCK_TOOL_BLEND, stock_tool_blend_22 },
......@@ -332,6 +348,12 @@ gimp_stock_menu_pixbufs[] =
{ GIMP_STOCK_CHANNELS, stock_channels_16 },
{ GIMP_STOCK_PATHS, stock_paths_16 },
{ GIMP_STOCK_LAYER, stock_layer_16 },
{ GIMP_STOCK_CHANNEL, stock_channel_16 },
{ GIMP_STOCK_LINKED, stock_linked_12 },
{ GIMP_STOCK_VISIBLE, stock_eye_12 },
{ GIMP_STOCK_SELECTION_ALL, stock_selection_all_16 },
{ GIMP_STOCK_SELECTION_NONE, stock_selection_none_16 },
{ GIMP_STOCK_SELECTION_GROW, stock_selection_grow_16 },
......
......@@ -130,6 +130,9 @@ G_BEGIN_DECLS
#define GIMP_STOCK_RESIZE "gimp-resize"
#define GIMP_STOCK_SCALE "gimp-scale"
#define GIMP_STOCK_LAYER "gimp-layer"
#define GIMP_STOCK_CHANNEL "gimp-channel"
#define GIMP_STOCK_IMAGES "gimp-images"
#define GIMP_STOCK_LAYERS "gimp-layers"
#define GIMP_STOCK_CHANNELS "gimp-channels"
......
......@@ -24,6 +24,8 @@ WILBER_VARIABLES = \
STOCK_BUTTON_IMAGES = \
stock-anchor-16.png \
stock-channel-16.png \
stock-channel-24.png \
stock-char-picker-22.png \
stock-color-picker-black-18.png \
stock-color-picker-gray-18.png \
......@@ -33,6 +35,7 @@ STOCK_BUTTON_IMAGES = \
stock-curve-smooth-16.png \
stock-duplicate-16.png \
stock-edit-16.png \
stock-eye-12.png \
stock-eye-20.png \
stock-gravity-east-24.png \
stock-gravity-north-24.png \
......@@ -42,7 +45,10 @@ STOCK_BUTTON_IMAGES = \
stock-gravity-south-east-24.png \
stock-gravity-south-west-24.png \
stock-gravity-west-24.png \
stock-layer-16.png \
stock-layer-24.png \
stock-line-spacing-22.png \
stock-linked-12.png \
stock-linked-20.png \
stock-letter-spacing-22.png \
stock-paste-as-new-16.png \
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment