From 703b02db6a46bdbc601109afa09322617d46eae1 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Mon, 16 Sep 2002 22:52:22 +0000 Subject: [PATCH] Stockify color picker icon. (#89880) * gtk/stock-icons/stock_color_picker_25.png: * gtk/stock-icons/Makefile.am (VARIABLES1): * gtk/gtkstock.h (GTK_STOCK_COLOR_PICKER): * gtk/gtkiconfactory.c (get_default_icons): * gtk/gtkcolorsel.c (gtk_color_selection_init): Stockify color picker icon. (#89880) --- ChangeLog | 9 +++++ ChangeLog.pre-2-10 | 9 +++++ ChangeLog.pre-2-2 | 9 +++++ ChangeLog.pre-2-4 | 9 +++++ ChangeLog.pre-2-6 | 9 +++++ ChangeLog.pre-2-8 | 9 +++++ gtk/gtkcolorsel.c | 46 +--------------------- gtk/gtkiconfactory.c | 1 + gtk/gtkstock.h | 1 + gtk/stock-icons/Makefile.am | 2 + gtk/stock-icons/stock_color_picker_25.png | Bin 0 -> 256 bytes 11 files changed, 60 insertions(+), 44 deletions(-) create mode 100644 gtk/stock-icons/stock_color_picker_25.png diff --git a/ChangeLog b/ChangeLog index 231e703063..176ce09c0a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2002-09-17 Matthias Clasen + + * gtk/stock-icons/stock_color_picker_25.png: + * gtk/stock-icons/Makefile.am (VARIABLES1): + * gtk/gtkstock.h (GTK_STOCK_COLOR_PICKER): + * gtk/gtkiconfactory.c (get_default_icons): + * gtk/gtkcolorsel.c (gtk_color_selection_init): Stockify color + picker icon. (#89880) + 2002-09-14 Sven Neumann * gdk/gdkpixbuf-drawable.c: fixed my latest change. diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 231e703063..176ce09c0a 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,12 @@ +2002-09-17 Matthias Clasen + + * gtk/stock-icons/stock_color_picker_25.png: + * gtk/stock-icons/Makefile.am (VARIABLES1): + * gtk/gtkstock.h (GTK_STOCK_COLOR_PICKER): + * gtk/gtkiconfactory.c (get_default_icons): + * gtk/gtkcolorsel.c (gtk_color_selection_init): Stockify color + picker icon. (#89880) + 2002-09-14 Sven Neumann * gdk/gdkpixbuf-drawable.c: fixed my latest change. diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 231e703063..176ce09c0a 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,12 @@ +2002-09-17 Matthias Clasen + + * gtk/stock-icons/stock_color_picker_25.png: + * gtk/stock-icons/Makefile.am (VARIABLES1): + * gtk/gtkstock.h (GTK_STOCK_COLOR_PICKER): + * gtk/gtkiconfactory.c (get_default_icons): + * gtk/gtkcolorsel.c (gtk_color_selection_init): Stockify color + picker icon. (#89880) + 2002-09-14 Sven Neumann * gdk/gdkpixbuf-drawable.c: fixed my latest change. diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 231e703063..176ce09c0a 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,12 @@ +2002-09-17 Matthias Clasen + + * gtk/stock-icons/stock_color_picker_25.png: + * gtk/stock-icons/Makefile.am (VARIABLES1): + * gtk/gtkstock.h (GTK_STOCK_COLOR_PICKER): + * gtk/gtkiconfactory.c (get_default_icons): + * gtk/gtkcolorsel.c (gtk_color_selection_init): Stockify color + picker icon. (#89880) + 2002-09-14 Sven Neumann * gdk/gdkpixbuf-drawable.c: fixed my latest change. diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 231e703063..176ce09c0a 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,12 @@ +2002-09-17 Matthias Clasen + + * gtk/stock-icons/stock_color_picker_25.png: + * gtk/stock-icons/Makefile.am (VARIABLES1): + * gtk/gtkstock.h (GTK_STOCK_COLOR_PICKER): + * gtk/gtkiconfactory.c (get_default_icons): + * gtk/gtkcolorsel.c (gtk_color_selection_init): Stockify color + picker icon. (#89880) + 2002-09-14 Sven Neumann * gdk/gdkpixbuf-drawable.c: fixed my latest change. diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 231e703063..176ce09c0a 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,12 @@ +2002-09-17 Matthias Clasen + + * gtk/stock-icons/stock_color_picker_25.png: + * gtk/stock-icons/Makefile.am (VARIABLES1): + * gtk/gtkstock.h (GTK_STOCK_COLOR_PICKER): + * gtk/gtkiconfactory.c (get_default_icons): + * gtk/gtkcolorsel.c (gtk_color_selection_init): Stockify color + picker icon. (#89880) + 2002-09-14 Sven Neumann * gdk/gdkpixbuf-drawable.c: fixed my latest change. diff --git a/gtk/gtkcolorsel.c b/gtk/gtkcolorsel.c index 3cd40b51ef..17b1176071 100644 --- a/gtk/gtkcolorsel.c +++ b/gtk/gtkcolorsel.c @@ -57,6 +57,7 @@ #include "gtksettings.h" #include "gtkintl.h" #include "gtkimage.h" +#include "gtkstock.h" #include @@ -204,47 +205,6 @@ static char dropper_mask[] = { 0x02, 0x00, 0x00, }; -/* XPM */ -static char *picker[] = { - /* columns rows colors chars-per-pixel */ - "25 25 8 1", - " c Gray0", - ". c #020202", - "X c Gray12", - "o c Gray13", - "O c Gray52", - "+ c #929292", - "@ c Gray100", - "# c None", - /* pixels */ - "#########################", - "#########################", - "#########################", - "#########################", - "#########################", - "################# #####", - "################ ####", - "################ +###", - "############# +###", - "############## ++###", - "#############+@ +++####", - "############+@@@ +######", - "###########+@@@ + +######", - "##########+@@@ ++#+######", - "#########+@@@ ++#########", - "########+@@@ ++##########", - "#######+@@@ ++###########", - "######+@@@ ++############", - "######+@@ ++#############", - "#####+@ ++##############", - "###### +++###############", - "#########################", - "#########################", - "#########################", - "#########################" -}; - - /* * * The Sample Color @@ -1802,7 +1762,6 @@ gtk_color_selection_init (GtkColorSelection *colorsel) GtkWidget *top_right_vbox; GtkWidget *table, *label, *hbox, *frame, *vbox, *button; GtkAdjustment *adjust; - GdkPixbuf *picker_pix = NULL; GtkWidget *picker_image; gint i, j; ColorSelectionPrivate *priv; @@ -1848,8 +1807,7 @@ gtk_color_selection_init (GtkColorSelection *colorsel) gtk_object_set_data (GTK_OBJECT (button), "COLORSEL", colorsel); gtk_signal_connect (GTK_OBJECT (button), "clicked", GTK_SIGNAL_FUNC (get_screen_color), NULL); - picker_pix = gdk_pixbuf_new_from_xpm_data ((const char **) &picker); - picker_image = gtk_image_new_from_pixbuf (picker_pix); + picker_image = gtk_image_new_from_stock (GTK_STOCK_COLOR_PICKER, GTK_ICON_SIZE_BUTTON); gtk_container_add (GTK_CONTAINER (button), picker_image); gtk_widget_show (GTK_WIDGET (picker_image)); gtk_box_pack_end (GTK_BOX (hbox), button, FALSE, FALSE, 0); diff --git a/gtk/gtkiconfactory.c b/gtk/gtkiconfactory.c index 548511cd12..63a5d1e5d6 100644 --- a/gtk/gtkiconfactory.c +++ b/gtk/gtkiconfactory.c @@ -792,6 +792,7 @@ get_default_icons (GtkIconFactory *factory) add_unsized (factory, stock_clear_24, GTK_STOCK_CLEAR); add_unsized (factory, stock_colorselector_24, GTK_STOCK_SELECT_COLOR); + add_unsized (factory, stock_color_picker_25, GTK_STOCK_COLOR_PICKER); add_unsized (factory, stock_index_24, GTK_STOCK_INDEX); add_unsized (factory, stock_zoom_1_24, GTK_STOCK_ZOOM_100); add_unsized (factory, stock_zoom_fit_24, GTK_STOCK_ZOOM_FIT); diff --git a/gtk/gtkstock.h b/gtk/gtkstock.h index 4aff435d0d..97ac69f3fd 100644 --- a/gtk/gtkstock.h +++ b/gtk/gtkstock.h @@ -77,6 +77,7 @@ void gtk_stock_item_free (GtkStockItem *item); #define GTK_STOCK_CDROM "gtk-cdrom" #define GTK_STOCK_CLEAR "gtk-clear" #define GTK_STOCK_CLOSE "gtk-close" +#define GTK_STOCK_COLOR_PICKER "gtk-color-picker" #define GTK_STOCK_CONVERT "gtk-convert" #define GTK_STOCK_COPY "gtk-copy" #define GTK_STOCK_CUT "gtk-cut" diff --git a/gtk/stock-icons/Makefile.am b/gtk/stock-icons/Makefile.am index f2807981c7..4efcc1b8a7 100644 --- a/gtk/stock-icons/Makefile.am +++ b/gtk/stock-icons/Makefile.am @@ -22,6 +22,7 @@ IMAGES = @STRIP_BEGIN@ \ stock_close_20.png \ stock_close_24.png \ stock_colorselector_24.png \ + stock_color_picker_25.png \ stock_convert_16.png \ stock_convert_24.png \ stock_copy_16.png \ @@ -143,6 +144,7 @@ VARIABLES1 = @STRIP_BEGIN@ \ stock_close_20 $(srcdir)/stock_close_20.png \ stock_close_24 $(srcdir)/stock_close_24.png \ stock_colorselector_24 $(srcdir)/stock_colorselector_24.png \ + stock_color_picker_25 $(srcdir)/stock_color_picker_25.png \ @STRIP_END@ VARIABLES2 = @STRIP_BEGIN@ \ stock_convert_16 $(srcdir)/stock_convert_16.png \ diff --git a/gtk/stock-icons/stock_color_picker_25.png b/gtk/stock-icons/stock_color_picker_25.png new file mode 100644 index 0000000000000000000000000000000000000000..9273bdd0f7889977304e2af95ae6491a400dc0bd GIT binary patch literal 256 zcmeAS@N?(olHy`uVBq!ia0vp^k|4~%1|*NXY)uAIY)RhkE)4%caKYZ?lYt_f1s;*b z3=G^tAk28_ZrvZCAbW|YuPgf{RxvS6gOHX7MnIunPZ!6KiaBp5JMuLcaIhTwarc|y z??js!QXySipC%+dzcQh%Rn^<%r>e{q_dW9jm6ERb)lO%aD9zw^C_7y~`8ICZk-W#Gt^AOU~{Jb_7lwqDnxX;8Fq;IHs&=h wJN#OiKYc;KHifB;g57&os+b&|?7xw5$C_!Y+|8rr03F8Q>FVdQ&MBb@0FjzrR{#J2 literal 0 HcmV?d00001