diff --git a/ChangeLog b/ChangeLog index 4ec7bf46d4..37d594a8ec 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,22 @@ +2003-04-04 Sven Neumann + + * themes/Default/images/Makefile.am + * themes/Default/images/stock-gradient-bilinear-16.png + * themes/Default/images/stock-gradient-conical-asymmetric-16.png + * themes/Default/images/stock-gradient-conical-symmetric-16.png + * themes/Default/images/stock-gradient-linear-16.png + * themes/Default/images/stock-gradient-radial-16.png + * themes/Default/images/stock-gradient-shapeburst-angular-16.png + * themes/Default/images/stock-gradient-shapeburst-dimpled-16.png + * themes/Default/images/stock-gradient-shapeburst-spherical-16.png + * themes/Default/images/stock-gradient-spiral-anticlockwise-16.png + * themes/Default/images/stock-gradient-spiral-clockwise-16.png + * themes/Default/images/stock-gradient-square-16.png + * libgimpwidgets/gimpstock.[ch]: added new icons drawn by Jimmac. + + * app/tools/gimpblendoptions.c (gimp_blend_options_gui): use the + new icons in the gradient type menu. + 2003-04-04 Michael Natterer * app/widgets/gimpcontainertreeview.[ch]: removed diff --git a/app/tools/gimpblendoptions.c b/app/tools/gimpblendoptions.c index 0f86800d44..3a8a19e3d0 100644 --- a/app/tools/gimpblendoptions.c +++ b/app/tools/gimpblendoptions.c @@ -33,6 +33,7 @@ #include "widgets/gimpcontainerpopup.h" #include "widgets/gimpdock.h" #include "widgets/gimpdialogfactory.h" +#include "widgets/gimpenummenu.h" #include "widgets/gimppropwidgets.h" #include "gimpblendoptions.h" @@ -232,7 +233,7 @@ gimp_blend_options_gui (GimpToolOptions *tool_options) GtkWidget *vbox; GtkWidget *table; GtkWidget *frame; - GtkWidget *optionmenu; + GtkWidget *menu; GtkWidget *button; GtkWidget *preview; @@ -264,20 +265,22 @@ gimp_blend_options_gui (GimpToolOptions *tool_options) FALSE, 0.0, 0.0); /* the gradient type menu */ - optionmenu = gimp_prop_enum_option_menu_new (config, "gradient-type", 0, 0); + menu = gimp_prop_enum_option_menu_new (config, "gradient-type", 0, 0); + gimp_enum_option_menu_set_stock_prefix (GTK_OPTION_MENU (menu), + "gimp-gradient"); gimp_table_attach_aligned (GTK_TABLE (table), 0, 4, _("Shape:"), 1.0, 0.5, - optionmenu, 2, TRUE); + menu, 2, TRUE); /* the repeat option */ - optionmenu = gimp_prop_enum_option_menu_new (config, "repeat", 0, 0); + menu = gimp_prop_enum_option_menu_new (config, "repeat", 0, 0); gimp_table_attach_aligned (GTK_TABLE (table), 0, 5, _("Repeat:"), 1.0, 0.5, - optionmenu, 2, TRUE); + menu, 2, TRUE); g_signal_connect (config, "notify::gradient-type", G_CALLBACK (blend_options_gradient_type_notify), - optionmenu); + menu); /* frame for supersampling options */ frame = gtk_frame_new (NULL); diff --git a/devel-docs/ChangeLog b/devel-docs/ChangeLog index 8f38a11c4e..88d7aebcc2 100644 --- a/devel-docs/ChangeLog +++ b/devel-docs/ChangeLog @@ -1,3 +1,9 @@ +2003-04-04 Sven Neumann + + * libgimpwidgets/libgimpwidgets-sections.txt + * libgimpwidgets/tmpl/gimpstock.sgml: Jimmac keeps drawing icons + like crazy. + 2003-04-04 Michael Natterer * libgimpbase/libgimpbase-sections.txt diff --git a/devel-docs/libgimpwidgets/libgimpwidgets-sections.txt b/devel-docs/libgimpwidgets/libgimpwidgets-sections.txt index 7432521734..9dd580d937 100644 --- a/devel-docs/libgimpwidgets/libgimpwidgets-sections.txt +++ b/devel-docs/libgimpwidgets/libgimpwidgets-sections.txt @@ -302,6 +302,17 @@ GIMP_STOCK_SELECTION_INTERSECT GIMP_STOCK_SELECTION_STROKE GIMP_STOCK_SELECTION_TO_CHANNEL GIMP_STOCK_SELECTION_TO_PATH +GIMP_STOCK_GRADIENT_LINEAR +GIMP_STOCK_GRADIENT_BILINEAR +GIMP_STOCK_GRADIENT_RADIAL +GIMP_STOCK_GRADIENT_SQUARE +GIMP_STOCK_GRADIENT_CONICAL_SYMMETRIC +GIMP_STOCK_GRADIENT_CONICAL_ASYMMETRIC +GIMP_STOCK_GRADIENT_SHAPEBURST_SPHERICAL +GIMP_STOCK_GRADIENT_SHAPEBURST_ANGULAR +GIMP_STOCK_GRADIENT_SHAPEBURST_DIMPLED +GIMP_STOCK_GRADIENT_SPIRAL_CLOCKWISE +GIMP_STOCK_GRADIENT_SPIRAL_ANTICLOCKWISE GIMP_STOCK_GRAVITY_NORTH_WEST GIMP_STOCK_GRAVITY_NORTH GIMP_STOCK_GRAVITY_NORTH_EAST diff --git a/devel-docs/libgimpwidgets/tmpl/gimpstock.sgml b/devel-docs/libgimpwidgets/tmpl/gimpstock.sgml index bc2227ce59..a29b4700cd 100644 --- a/devel-docs/libgimpwidgets/tmpl/gimpstock.sgml +++ b/devel-docs/libgimpwidgets/tmpl/gimpstock.sgml @@ -271,6 +271,83 @@ size). + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/libgimpwidgets/gimpstock.c b/libgimpwidgets/gimpstock.c index 75fa6d5f11..972dd40652 100644 --- a/libgimpwidgets/gimpstock.c +++ b/libgimpwidgets/gimpstock.c @@ -106,6 +106,18 @@ static GtkStockItem gimp_stock_items[] = { 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 }, @@ -406,6 +418,18 @@ gimp_stock_menu_pixbufs[] = { GIMP_STOCK_DEFAULT_COLORS, stock_default_colors_12 }, { GIMP_STOCK_SWAP_COLORS, stock_swap_colors_12 }, + { GIMP_STOCK_GRADIENT_LINEAR, stock_gradient_linear_16 }, + { GIMP_STOCK_GRADIENT_BILINEAR, stock_gradient_bilinear_16 }, + { GIMP_STOCK_GRADIENT_RADIAL, stock_gradient_radial_16 }, + { GIMP_STOCK_GRADIENT_SQUARE, stock_gradient_square_16 }, + { GIMP_STOCK_GRADIENT_CONICAL_SYMMETRIC, stock_gradient_conical_symmetric_16 }, + { GIMP_STOCK_GRADIENT_CONICAL_ASYMMETRIC, stock_gradient_conical_asymmetric_16 }, + { GIMP_STOCK_GRADIENT_SHAPEBURST_ANGULAR, stock_gradient_shapeburst_angular_16 }, + { GIMP_STOCK_GRADIENT_SHAPEBURST_SPHERICAL, stock_gradient_shapeburst_spherical_16 }, + { GIMP_STOCK_GRADIENT_SHAPEBURST_DIMPLED, stock_gradient_shapeburst_dimpled_16 }, + { GIMP_STOCK_GRADIENT_SPIRAL_CLOCKWISE, stock_gradient_spiral_clockwise_16 }, + { GIMP_STOCK_GRADIENT_SPIRAL_ANTICLOCKWISE, stock_gradient_spiral_anticlockwise_16 }, + { GIMP_STOCK_TOOL_AIRBRUSH, stock_tool_airbrush_16 }, { GIMP_STOCK_TOOL_BEZIER_SELECT, stock_tool_bezier_select_16 }, { GIMP_STOCK_TOOL_BLEND, stock_tool_blend_16 }, diff --git a/libgimpwidgets/gimpstock.h b/libgimpwidgets/gimpstock.h index beddf98b51..982336cd90 100644 --- a/libgimpwidgets/gimpstock.h +++ b/libgimpwidgets/gimpstock.h @@ -39,6 +39,19 @@ G_BEGIN_DECLS #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" diff --git a/themes/Default/images/Makefile.am b/themes/Default/images/Makefile.am index d0a9900895..c56a294509 100644 --- a/themes/Default/images/Makefile.am +++ b/themes/Default/images/Makefile.am @@ -36,6 +36,17 @@ STOCK_MENU_IMAGES = \ stock-default-colors-12.png \ stock-device-status-16.png \ stock-eye-12.png \ + stock-gradient-bilinear-16.png \ + stock-gradient-conical-asymmetric-16.png\ + stock-gradient-conical-symmetric-16.png \ + stock-gradient-linear-16.png \ + stock-gradient-radial-16.png \ + stock-gradient-shapeburst-angular-16.png\ + stock-gradient-shapeburst-dimpled-16.png\ + stock-gradient-shapeburst-spherical-16.png\ + stock-gradient-spiral-anticlockwise-16.png\ + stock-gradient-spiral-clockwise-16.png \ + stock-gradient-square-16.png \ stock-grid-16.png \ stock-image-16.png \ stock-images-16.png \ diff --git a/themes/Default/images/stock-gradient-bilinear-16.png b/themes/Default/images/stock-gradient-bilinear-16.png new file mode 100644 index 0000000000..b2ddc9e452 Binary files /dev/null and b/themes/Default/images/stock-gradient-bilinear-16.png differ diff --git a/themes/Default/images/stock-gradient-conical-asymmetric-16.png b/themes/Default/images/stock-gradient-conical-asymmetric-16.png new file mode 100644 index 0000000000..465386d581 Binary files /dev/null and b/themes/Default/images/stock-gradient-conical-asymmetric-16.png differ diff --git a/themes/Default/images/stock-gradient-conical-symmetric-16.png b/themes/Default/images/stock-gradient-conical-symmetric-16.png new file mode 100644 index 0000000000..de14aec1dc Binary files /dev/null and b/themes/Default/images/stock-gradient-conical-symmetric-16.png differ diff --git a/themes/Default/images/stock-gradient-linear-16.png b/themes/Default/images/stock-gradient-linear-16.png new file mode 100644 index 0000000000..92f68b2e27 Binary files /dev/null and b/themes/Default/images/stock-gradient-linear-16.png differ diff --git a/themes/Default/images/stock-gradient-radial-16.png b/themes/Default/images/stock-gradient-radial-16.png new file mode 100644 index 0000000000..1d9d56464d Binary files /dev/null and b/themes/Default/images/stock-gradient-radial-16.png differ diff --git a/themes/Default/images/stock-gradient-shapeburst-angular-16.png b/themes/Default/images/stock-gradient-shapeburst-angular-16.png new file mode 100644 index 0000000000..d8d31a2d5f Binary files /dev/null and b/themes/Default/images/stock-gradient-shapeburst-angular-16.png differ diff --git a/themes/Default/images/stock-gradient-shapeburst-dimpled-16.png b/themes/Default/images/stock-gradient-shapeburst-dimpled-16.png new file mode 100644 index 0000000000..1dcbb7ab86 Binary files /dev/null and b/themes/Default/images/stock-gradient-shapeburst-dimpled-16.png differ diff --git a/themes/Default/images/stock-gradient-shapeburst-spherical-16.png b/themes/Default/images/stock-gradient-shapeburst-spherical-16.png new file mode 100644 index 0000000000..c71765164d Binary files /dev/null and b/themes/Default/images/stock-gradient-shapeburst-spherical-16.png differ diff --git a/themes/Default/images/stock-gradient-spiral-anticlockwise-16.png b/themes/Default/images/stock-gradient-spiral-anticlockwise-16.png new file mode 100644 index 0000000000..4eade4cf06 Binary files /dev/null and b/themes/Default/images/stock-gradient-spiral-anticlockwise-16.png differ diff --git a/themes/Default/images/stock-gradient-spiral-clockwise-16.png b/themes/Default/images/stock-gradient-spiral-clockwise-16.png new file mode 100644 index 0000000000..ed0cdc1195 Binary files /dev/null and b/themes/Default/images/stock-gradient-spiral-clockwise-16.png differ diff --git a/themes/Default/images/stock-gradient-square-16.png b/themes/Default/images/stock-gradient-square-16.png new file mode 100644 index 0000000000..c57957c7fc Binary files /dev/null and b/themes/Default/images/stock-gradient-square-16.png differ