dnrops
/
gimp
mirror of https://github.com/GNOME/gimp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

themes/Default/images/Makefile.am new icon. 

2003-09-11  Sven Neumann  <sven@gimp.org>

	* themes/Default/images/Makefile.am
	* themes/Default/images/stock-transparency-[16|24].png: new icon.

	* libgimpwidgets/gimpstock.[ch]: register as GIMP_STOCK_TRANSPARENCY.

	* app/gui/image-menu.c
	* app/gui/layers-menu.c: use the new icon for "Add Alpha Channel".

	* app/widgets/gimplayertreeview.c: replaced the "Keep Trans."
	button with a check button plus the new icon (bug #121784).
This commit is contained in:
Sven Neumann 2003-09-11 18:48:00 +00:00 committed by Sven Neumann
parent c7414c12a0
commit 4aabfe7b34
13 changed files with 60 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ChangeLog
View File

@ -1,3 +1,16 @@
2003-09-11 Sven Neumann <sven@gimp.org>
* themes/Default/images/Makefile.am
* themes/Default/images/stock-transparency-[16|24].png: new icon.
* libgimpwidgets/gimpstock.[ch]: register as GIMP_STOCK_TRANSPARENCY.
* app/gui/image-menu.c
* app/gui/layers-menu.c: use the new icon for "Add Alpha Channel".
* app/widgets/gimplayertreeview.c: replaced the "Keep Trans."
button with a check button plus the new icon (bug #121784).
2003-09-11 Michael Natterer <mitch@gimp.org>
* app/core/gimpitem-linked.[ch]: made gimp_item_linked_get_list()

3
app/gui/image-menu.c
View File

@ -781,7 +781,8 @@ GimpItemFactoryEntry image_menu_entries[] =
MENU_BRANCH (N_("/Layer/Tr_ansparency")),
{ { N_("/Layer/Transparency/_Add Alpha Channel"), NULL,
layers_alpha_add_cmd_callback, 0 },
layers_alpha_add_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_TRANSPARENCY },
NULL,
GIMP_HELP_LAYER_ALPHA_ADD, NULL },

3
app/gui/layers-menu.c
View File

@ -139,7 +139,8 @@ GimpItemFactoryEntry layers_menu_entries[] =
MENU_SEPARATOR ("/---"),
{ { N_("/Add Alpha C_hannel"), NULL,
layers_alpha_add_cmd_callback, 0 },
layers_alpha_add_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_TRANSPARENCY },
NULL,
GIMP_HELP_LAYER_ALPHA_ADD, NULL },
{ { N_("/Al_pha to Selection"), NULL,

3
app/menus/image-menu.c
View File

@ -781,7 +781,8 @@ GimpItemFactoryEntry image_menu_entries[] =
MENU_BRANCH (N_("/Layer/Tr_ansparency")),
{ { N_("/Layer/Transparency/_Add Alpha Channel"), NULL,
layers_alpha_add_cmd_callback, 0 },
layers_alpha_add_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_TRANSPARENCY },
NULL,
GIMP_HELP_LAYER_ALPHA_ADD, NULL },

30
app/widgets/gimplayertreeview.c
View File

@ -236,6 +236,9 @@ gimp_layer_tree_view_init (GimpLayerTreeView *view)
GimpDrawableTreeView *drawable_view;
GtkWidget *abox;
GtkWidget *hbox;
GtkWidget *toggle;
GtkWidget *image;
GtkIconSize icon_size;
PangoAttribute *attr;
tree_view = GIMP_CONTAINER_TREE_VIEW (view);
@ -266,29 +269,36 @@ gimp_layer_tree_view_init (GimpLayerTreeView *view)
gtk_widget_show (view->paint_mode_menu);
gimp_help_set_help_data (view->paint_mode_menu,
NULL, "#paint_mode_menu");
NULL, "#paint_mode_menu");
/* Preserve transparency toggle */
abox = gtk_alignment_new (0.5, 0.5, 0.0, 0.0);
gtk_box_pack_start (GTK_BOX (hbox), abox, FALSE, FALSE, 0);
abox = gtk_alignment_new (1.0, 0.5, 0.0, 1.0);
gtk_box_pack_end (GTK_BOX (hbox), abox, TRUE, TRUE, 0);
gtk_widget_show (abox);
view->preserve_trans_toggle =
gtk_toggle_button_new_with_label (_("Keep Trans."));
gtk_container_add (GTK_CONTAINER (abox), view->preserve_trans_toggle);
gtk_widget_show (view->preserve_trans_toggle);
view->preserve_trans_toggle = toggle = gtk_check_button_new ();
gtk_container_add (GTK_CONTAINER (abox), toggle);
gtk_widget_show (toggle);
g_signal_connect (view->preserve_trans_toggle, "toggled",
gtk_widget_style_get (GTK_WIDGET (view),
"button_icon_size", &icon_size,
NULL);
image = gtk_image_new_from_stock (GIMP_STOCK_TRANSPARENCY, icon_size);
gtk_container_add (GTK_CONTAINER (toggle), image);
gtk_widget_show (image);
g_signal_connect (toggle, "toggled",
G_CALLBACK (gimp_layer_tree_view_preserve_button_toggled),
view);
gimp_help_set_help_data (view->preserve_trans_toggle,
gimp_help_set_help_data (toggle,
_("Keep Transparency"), "#keep_trans_button");
gimp_table_attach_aligned (GTK_TABLE (view->options_box), 0, 0,
_("Mode:"), 1.0, 0.5,
hbox, 2, TRUE);
hbox, 2, FALSE);
/* Opacity scale */

5
devel-docs/ChangeLog
View File

@ -1,3 +1,8 @@
2003-09-11 Sven Neumann <sven@gimp.org>
* libgimpwidgets/libgimpwidgets-sections.txt
* libgimpwidgets/tmpl/gimpstock.sgml: updated for new icon.
2003-09-09 Michael Natterer <mitch@gimp.org>
* app/app-docs.sgml: added IDs to all <chapter>s so they are

1
devel-docs/libgimpwidgets/libgimpwidgets-sections.txt
View File

@ -361,6 +361,7 @@ GIMP_STOCK_COLOR_TRIANGLE
GIMP_STOCK_CONVERT_GRAYSCALE
GIMP_STOCK_CONVERT_INDEXED
GIMP_STOCK_CONVERT_RGB
GIMP_STOCK_TRANSPARENCY
GIMP_STOCK_DEFAULT_COLORS
GIMP_STOCK_SWAP_COLORS
GIMP_STOCK_UNDO_HISTORY

7
devel-docs/libgimpwidgets/tmpl/gimpstock.sgml
View File

@ -723,6 +723,13 @@ size).
<!-- ##### MACRO GIMP_STOCK_TRANSPARENCY ##### -->
<para>
<inlinegraphic fileref="stock-transparency-24.png" format="png"></inlinegraphic><inlinegraphic fileref="stock-transparency-16.png" format="png"></inlinegraphic>
</para>
<!-- ##### MACRO GIMP_STOCK_DEFAULT_COLORS ##### -->
<para>
<inlinegraphic fileref="stock-default-colors-12.png" format="png"></inlinegraphic>

7
libgimpwidgets/gimpstock.c
View File

@ -86,7 +86,7 @@ add_sized_with_same_fallback (GtkIconFactory *factory,
if (! set)
{
set = gtk_icon_set_new ();
gtk_icon_factory_add (factory, stock_id, set);
gtk_icon_factory_add (factory, stock_id, set);
gtk_icon_set_unref (set);
fallback = TRUE;
@ -119,7 +119,7 @@ static GtkStockItem gimp_stock_items[] =
{ 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_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 },
@ -195,6 +195,7 @@ static GtkStockItem gimp_stock_items[] =
{ GIMP_STOCK_TEMPLATE, NULL, 0, 0, LIBGIMP_DOMAIN },
{ GIMP_STOCK_INDEXED_PALETTE, 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 },
@ -335,6 +336,7 @@ gimp_stock_button_pixbufs[] =
{ GIMP_STOCK_TEMPLATE, stock_template_24 },
{ GIMP_STOCK_INDEXED_PALETTE, stock_indexed_palette_24 },
{ GIMP_STOCK_UNDO_HISTORY, stock_undo_history_24 },
{ GIMP_STOCK_TRANSPARENCY, stock_transparency_24 },
{ GIMP_STOCK_LINKED, stock_linked_20 },
{ GIMP_STOCK_VISIBLE, stock_eye_20 },
@ -429,6 +431,7 @@ gimp_stock_menu_pixbufs[] =
{ GIMP_STOCK_TEMPLATE, stock_template_16 },
{ GIMP_STOCK_INDEXED_PALETTE, stock_indexed_palette_16 },
{ GIMP_STOCK_UNDO_HISTORY, stock_undo_history_16 },
{ GIMP_STOCK_TRANSPARENCY, stock_transparency_16 },
{ GIMP_STOCK_LINKED, stock_linked_12 },
{ GIMP_STOCK_VISIBLE, stock_eye_12 },

1
libgimpwidgets/gimpstock.h
View File

@ -163,6 +163,7 @@ G_BEGIN_DECLS
#define GIMP_STOCK_PATH "gimp-path"
#define GIMP_STOCK_TEMPLATE "gimp-template"
#define GIMP_STOCK_INDEXED_PALETTE "gimp-indexed-palette"
#define GIMP_STOCK_TRANSPARENCY "gimp-transparency"
#define GIMP_STOCK_IMAGES "gimp-images"
#define GIMP_STOCK_LAYERS "gimp-layers"

2
themes/Default/images/Makefile.am
View File

@ -85,6 +85,7 @@ STOCK_MENU_IMAGES = \
stock-text-layer-16.png \
stock-toilet-paper-16.png \
stock-tool-options-16.png \
stock-transparency-16.png \
stock-undo-history-16.png \
stock-video-16.png \
stock-warning-16.png \
@ -149,6 +150,7 @@ STOCK_BUTTON_IMAGES = \
stock-template-24.png \
stock-text-layer-24.png \
stock-toilet-paper-24.png \
stock-transparency-24.png \
stock-vchain-24.png \
stock-vchain-broken-24.png \
stock-video-24.png \

BIN
themes/Default/images/stock-transparency-16.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 104 B

BIN
themes/Default/images/stock-transparency-24.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 114 B