diff --git a/ChangeLog b/ChangeLog index 48310f3764..1820f43913 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,19 @@ +2004-11-14 Sven Neumann + + * themes/Default/images/Makefile.am + * themes/Default/images/stock-center-16.png + * themes/Default/images/stock-center-24.png + * themes/Default/images/stock-print-resolution-16.png + * themes/Default/images/stock-print-resolution-24.png: new icons + drawn by Jimmac. + + * libgimpwidgets/gimpstock.[ch]: registered the new icons. + + * app/actions/image-actions.c + * app/dialogs/print-size-dialog.c + * app/dialogs/resize-dialog.c + * plug-ins/ifscompose/ifscompose.c: use them. + 2004-11-14 Sven Neumann * configure.in: bumped version to 2.2-pre2. diff --git a/NEWS b/NEWS index a35530d2b2..fddbc9572f 100644 --- a/NEWS +++ b/NEWS @@ -35,7 +35,7 @@ Contributors: Michael Natterer, Sven Neumann, David Odin, Manish Singh, Kevin Cozens, Joao S. O. Bueno, Geert Jordaens, David Gowers, Øyvind Kolås, Cai Qian, - Simon Budig + Simon Budig, Jakub Steiner diff --git a/app/actions/image-actions.c b/app/actions/image-actions.c index 143ebd6221..0214243fc3 100644 --- a/app/actions/image-actions.c +++ b/app/actions/image-actions.c @@ -81,7 +81,7 @@ static GimpActionEntry image_actions[] = G_CALLBACK (image_resize_to_layers_cmd_callback), GIMP_HELP_IMAGE_RESIZE_TO_LAYERS }, - { "image-print-size", GTK_STOCK_PRINT, + { "image-print-size", GIMP_STOCK_PRINT_RESOLUTION, N_("_Print Size..."), NULL, NULL, G_CALLBACK (image_print_size_cmd_callback), GIMP_HELP_IMAGE_PRINT_SIZE }, diff --git a/app/dialogs/print-size-dialog.c b/app/dialogs/print-size-dialog.c index ea0881d926..c3112e17e5 100644 --- a/app/dialogs/print-size-dialog.c +++ b/app/dialogs/print-size-dialog.c @@ -80,7 +80,8 @@ print_size_dialog_new (GimpImage *image, height = gimp_image_get_height (image); dialog = gimp_viewable_dialog_new (GIMP_VIEWABLE (image), - title, role, GTK_STOCK_PRINT, title, + title, role, + GIMP_STOCK_PRINT_RESOLUTION, title, parent, help_func, help_id, diff --git a/app/dialogs/resize-dialog.c b/app/dialogs/resize-dialog.c index 63257cfe39..9bede8a873 100644 --- a/app/dialogs/resize-dialog.c +++ b/app/dialogs/resize-dialog.c @@ -231,8 +231,7 @@ resize_dialog_new (GimpViewable *viewable, G_CALLBACK (offset_update), private); - button = gtk_button_new_with_mnemonic (_("C_enter")); - gtk_misc_set_padding (GTK_MISC (GTK_BIN (button)->child), 2, 0); + button = gtk_button_new_from_stock (GIMP_STOCK_CENTER); gtk_table_attach_defaults (GTK_TABLE (entry), button, 4, 5, 1, 2); gtk_widget_show (button); diff --git a/devel-docs/ChangeLog b/devel-docs/ChangeLog index 5d30f603c6..3a41f159c9 100644 --- a/devel-docs/ChangeLog +++ b/devel-docs/ChangeLog @@ -1,3 +1,8 @@ +2004-11-14 Sven Neumann + + * libgimpwidgets/libgimpwidgets-sections.txt + * libgimpwidgets/tmpl/gimpstock.sgml: added new icons. + 2004-11-10 Michael Natterer * libgimpbase/libgimpbase-sections.txt diff --git a/devel-docs/libgimpwidgets/libgimpwidgets-sections.txt b/devel-docs/libgimpwidgets/libgimpwidgets-sections.txt index 7ff4ce4d25..ad086ff4d3 100644 --- a/devel-docs/libgimpwidgets/libgimpwidgets-sections.txt +++ b/devel-docs/libgimpwidgets/libgimpwidgets-sections.txt @@ -433,6 +433,7 @@ GIMP_QUERY_BOX_VBOX gimp_stock_init GIMP_STOCK_ANCHOR +GIMP_STOCK_CENTER GIMP_STOCK_DUPLICATE GIMP_STOCK_EDIT GIMP_STOCK_RESET @@ -534,6 +535,7 @@ GIMP_STOCK_LETTER_SPACING GIMP_STOCK_LINE_SPACING GIMP_STOCK_TEXT_DIR_LTR GIMP_STOCK_TEXT_DIR_RTL +GIMP_STOCK_PRINT_RESOLUTION GIMP_STOCK_TOOLS GIMP_STOCK_TOOL_OPTIONS GIMP_STOCK_DEVICE_STATUS diff --git a/devel-docs/libgimpwidgets/tmpl/gimpstock.sgml b/devel-docs/libgimpwidgets/tmpl/gimpstock.sgml index a165c94b1b..752cdeb0cb 100644 --- a/devel-docs/libgimpwidgets/tmpl/gimpstock.sgml +++ b/devel-docs/libgimpwidgets/tmpl/gimpstock.sgml @@ -35,6 +35,14 @@ locales. + + + + + + + + @@ -795,6 +803,14 @@ RTL variant + + + + + + + + diff --git a/libgimpwidgets/gimpstock.c b/libgimpwidgets/gimpstock.c index 62647860c9..0e82101b52 100644 --- a/libgimpwidgets/gimpstock.c +++ b/libgimpwidgets/gimpstock.c @@ -111,6 +111,7 @@ add_sized_with_same_fallback (GtkIconFactory *factory, static 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_EDIT, N_("_Edit"), 0, 0, LIBGIMP_DOMAIN }, { GIMP_STOCK_LINKED, N_("Linked"), 0, 0, LIBGIMP_DOMAIN }, @@ -170,6 +171,7 @@ static GtkStockItem gimp_stock_items[] = { 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_PRINT_RESOLUTION, NULL, 0, 0, LIBGIMP_DOMAIN }, { GIMP_STOCK_CONVERT_RGB, NULL, 0, 0, LIBGIMP_DOMAIN }, { GIMP_STOCK_CONVERT_GRAYSCALE, NULL, 0, 0, LIBGIMP_DOMAIN }, @@ -303,6 +305,7 @@ static struct gimp_stock_button_pixbufs[] = { { GIMP_STOCK_ANCHOR, stock_anchor_16 }, + { GIMP_STOCK_CENTER, stock_center_24 }, { GIMP_STOCK_DUPLICATE, stock_duplicate_16 }, { GIMP_STOCK_EDIT, stock_edit_16 }, { GIMP_STOCK_PASTE_AS_NEW, stock_paste_as_new_16 }, @@ -348,6 +351,7 @@ gimp_stock_button_pixbufs[] = { GIMP_STOCK_LINE_SPACING, stock_line_spacing_22 }, { GIMP_STOCK_TEXT_DIR_LTR, stock_text_dir_ltr_24 }, { GIMP_STOCK_TEXT_DIR_RTL, stock_text_dir_rtl_24 }, + { GIMP_STOCK_PRINT_RESOLUTION, stock_print_resolution_24 }, { GIMP_STOCK_IMAGES, stock_images_24 }, { GIMP_STOCK_LAYERS, stock_layers_24 }, @@ -434,6 +438,8 @@ static struct } gimp_stock_menu_pixbufs[] = { + { GIMP_STOCK_CENTER, stock_center_16 }, + { GIMP_STOCK_CONVERT_RGB, stock_convert_rgb_16 }, { GIMP_STOCK_CONVERT_GRAYSCALE, stock_convert_grayscale_16 }, { GIMP_STOCK_CONVERT_INDEXED, stock_convert_indexed_16 }, @@ -450,6 +456,8 @@ gimp_stock_menu_pixbufs[] = { GIMP_STOCK_FLIP_HORIZONTAL, stock_flip_horizontal_16 }, { GIMP_STOCK_FLIP_VERTICAL, stock_flip_vertical_16 }, + { GIMP_STOCK_PRINT_RESOLUTION, stock_print_resolution_16 }, + { GIMP_STOCK_IMAGES, stock_images_16 }, { GIMP_STOCK_LAYERS, stock_layers_16 }, { GIMP_STOCK_CHANNELS, stock_channels_16 }, diff --git a/libgimpwidgets/gimpstock.h b/libgimpwidgets/gimpstock.h index 14a766325e..9a6e23afe8 100644 --- a/libgimpwidgets/gimpstock.h +++ b/libgimpwidgets/gimpstock.h @@ -31,6 +31,7 @@ G_BEGIN_DECLS /* in button size: */ #define GIMP_STOCK_ANCHOR "gimp-anchor" +#define GIMP_STOCK_CENTER "gimp-center" #define GIMP_STOCK_DUPLICATE "gimp-duplicate" #define GIMP_STOCK_EDIT "gimp-edit" #define GIMP_STOCK_LINKED "gimp-linked" @@ -89,6 +90,7 @@ G_BEGIN_DECLS #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_PRINT_RESOLUTION "gimp-print-resolution" #define GIMP_STOCK_TEXT_DIR_LTR "gimp-text-dir-ltr" #define GIMP_STOCK_TEXT_DIR_RTL "gimp-text-dir-rtl" diff --git a/plug-ins/ifscompose/ifscompose.c b/plug-ins/ifscompose/ifscompose.c index 1fec8e1126..d45cf84729 100644 --- a/plug-ins/ifscompose/ifscompose.c +++ b/plug-ins/ifscompose/ifscompose.c @@ -1063,7 +1063,7 @@ design_op_menu_create (GtkWidget *window) N_("Select _All"), "A", NULL, G_CALLBACK (design_area_select_all_callback) }, - { "center", GTK_STOCK_JUSTIFY_CENTER, + { "center", GIMP_STOCK_CENTER, N_("Re_center"), "C", N_("Recompute Center"), G_CALLBACK (recompute_center_cb) }, diff --git a/themes/Default/images/Makefile.am b/themes/Default/images/Makefile.am index 93539d741a..249bd60613 100644 --- a/themes/Default/images/Makefile.am +++ b/themes/Default/images/Makefile.am @@ -35,6 +35,7 @@ STOCK_MENU_IMAGES = \ stock-cap-butt-16.png \ stock-cap-round-16.png \ stock-cap-square-16.png \ + stock-center-16.png \ stock-channel-16.png \ stock-channel-alpha-16.png \ stock-channel-blue-16.png \ @@ -92,6 +93,7 @@ STOCK_MENU_IMAGES = \ stock-paths-16.png \ stock-plugin-16.png \ stock-portrait-16.png \ + stock-print-resolution-16.png \ stock-qmask-off-16.png \ stock-qmask-on-16.png \ stock-reshow-filter-16.png \ @@ -125,6 +127,7 @@ STOCK_MENU_IMAGES = \ STOCK_BUTTON_IMAGES = \ stock-anchor-16.png \ + stock-center-24.png \ stock-channel-24.png \ stock-channel-alpha-24.png \ stock-channel-blue-24.png \ @@ -175,6 +178,7 @@ STOCK_BUTTON_IMAGES = \ stock-path-stroke-16.png \ stock-path-22.png \ stock-paths-22.png \ + stock-print-resolution-24.png \ stock-reset-16.png \ stock-selection-add-16.png \ stock-selection-intersect-16.png \ diff --git a/themes/Default/images/stock-center-16.png b/themes/Default/images/stock-center-16.png new file mode 100644 index 0000000000..abab1d9458 Binary files /dev/null and b/themes/Default/images/stock-center-16.png differ diff --git a/themes/Default/images/stock-center-24.png b/themes/Default/images/stock-center-24.png new file mode 100644 index 0000000000..fb2a5464c4 Binary files /dev/null and b/themes/Default/images/stock-center-24.png differ diff --git a/themes/Default/images/stock-print-resolution-16.png b/themes/Default/images/stock-print-resolution-16.png new file mode 100644 index 0000000000..ab4b538e30 Binary files /dev/null and b/themes/Default/images/stock-print-resolution-16.png differ diff --git a/themes/Default/images/stock-print-resolution-24.png b/themes/Default/images/stock-print-resolution-24.png new file mode 100644 index 0000000000..f0f3fc549a Binary files /dev/null and b/themes/Default/images/stock-print-resolution-24.png differ