diff --git a/ChangeLog b/ChangeLog index 27b8dc7a01..1678ea57e3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,16 @@ +2003-09-11 Sven Neumann + + * 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 * app/core/gimpitem-linked.[ch]: made gimp_item_linked_get_list() diff --git a/app/gui/image-menu.c b/app/gui/image-menu.c index 5a7baa36ef..a704ccf5e0 100644 --- a/app/gui/image-menu.c +++ b/app/gui/image-menu.c @@ -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, + "", GIMP_STOCK_TRANSPARENCY }, NULL, GIMP_HELP_LAYER_ALPHA_ADD, NULL }, diff --git a/app/gui/layers-menu.c b/app/gui/layers-menu.c index 123a56d398..6623425eb3 100644 --- a/app/gui/layers-menu.c +++ b/app/gui/layers-menu.c @@ -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, + "", GIMP_STOCK_TRANSPARENCY }, NULL, GIMP_HELP_LAYER_ALPHA_ADD, NULL }, { { N_("/Al_pha to Selection"), NULL, diff --git a/app/menus/image-menu.c b/app/menus/image-menu.c index 5a7baa36ef..a704ccf5e0 100644 --- a/app/menus/image-menu.c +++ b/app/menus/image-menu.c @@ -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, + "", GIMP_STOCK_TRANSPARENCY }, NULL, GIMP_HELP_LAYER_ALPHA_ADD, NULL }, diff --git a/app/widgets/gimplayertreeview.c b/app/widgets/gimplayertreeview.c index 4c377abd89..1395f38ea6 100644 --- a/app/widgets/gimplayertreeview.c +++ b/app/widgets/gimplayertreeview.c @@ -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 */ diff --git a/devel-docs/ChangeLog b/devel-docs/ChangeLog index 5dbff74c42..8c0cfb2d1f 100644 --- a/devel-docs/ChangeLog +++ b/devel-docs/ChangeLog @@ -1,3 +1,8 @@ +2003-09-11 Sven Neumann + + * libgimpwidgets/libgimpwidgets-sections.txt + * libgimpwidgets/tmpl/gimpstock.sgml: updated for new icon. + 2003-09-09 Michael Natterer * app/app-docs.sgml: added IDs to all s so they are diff --git a/devel-docs/libgimpwidgets/libgimpwidgets-sections.txt b/devel-docs/libgimpwidgets/libgimpwidgets-sections.txt index cc156dd8d1..e0900ae8f7 100644 --- a/devel-docs/libgimpwidgets/libgimpwidgets-sections.txt +++ b/devel-docs/libgimpwidgets/libgimpwidgets-sections.txt @@ -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 diff --git a/devel-docs/libgimpwidgets/tmpl/gimpstock.sgml b/devel-docs/libgimpwidgets/tmpl/gimpstock.sgml index 51f4c2fb19..ceac7a7b7c 100644 --- a/devel-docs/libgimpwidgets/tmpl/gimpstock.sgml +++ b/devel-docs/libgimpwidgets/tmpl/gimpstock.sgml @@ -723,6 +723,13 @@ size). + + + + + + + diff --git a/libgimpwidgets/gimpstock.c b/libgimpwidgets/gimpstock.c index 2af0ebc8c5..4826fdb8be 100644 --- a/libgimpwidgets/gimpstock.c +++ b/libgimpwidgets/gimpstock.c @@ -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 }, diff --git a/libgimpwidgets/gimpstock.h b/libgimpwidgets/gimpstock.h index a498cfaf40..eadc24f394 100644 --- a/libgimpwidgets/gimpstock.h +++ b/libgimpwidgets/gimpstock.h @@ -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" diff --git a/themes/Default/images/Makefile.am b/themes/Default/images/Makefile.am index a93115129d..876c76e64b 100644 --- a/themes/Default/images/Makefile.am +++ b/themes/Default/images/Makefile.am @@ -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 \ diff --git a/themes/Default/images/stock-transparency-16.png b/themes/Default/images/stock-transparency-16.png new file mode 100644 index 0000000000..77a2d18f7b Binary files /dev/null and b/themes/Default/images/stock-transparency-16.png differ diff --git a/themes/Default/images/stock-transparency-24.png b/themes/Default/images/stock-transparency-24.png new file mode 100644 index 0000000000..322dcc712f Binary files /dev/null and b/themes/Default/images/stock-transparency-24.png differ