AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Stockify color picker icon. (#89880)

Browse Source 
* 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)
This commit is contained in:
Matthias Clasen 2002-09-16 22:52:22 +00:00
parent bee922f0f8
commit 703b02db6a
11 changed files with 60 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -1,3 +1,12 @@
2002-09-17 Matthias Clasen <maclas@gmx.de>
* 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 <sven@gimp.org>
* gdk/gdkpixbuf-drawable.c: fixed my latest change.

9
ChangeLog.pre-2-10
View File

@ -1,3 +1,12 @@
2002-09-17 Matthias Clasen <maclas@gmx.de>
* 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 <sven@gimp.org>
* gdk/gdkpixbuf-drawable.c: fixed my latest change.

9
ChangeLog.pre-2-2
View File

@ -1,3 +1,12 @@
2002-09-17 Matthias Clasen <maclas@gmx.de>
* 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 <sven@gimp.org>
* gdk/gdkpixbuf-drawable.c: fixed my latest change.

9
ChangeLog.pre-2-4
View File

@ -1,3 +1,12 @@
2002-09-17 Matthias Clasen <maclas@gmx.de>
* 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 <sven@gimp.org>
* gdk/gdkpixbuf-drawable.c: fixed my latest change.

9
ChangeLog.pre-2-6
View File

@ -1,3 +1,12 @@
2002-09-17 Matthias Clasen <maclas@gmx.de>
* 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 <sven@gimp.org>
* gdk/gdkpixbuf-drawable.c: fixed my latest change.

9
ChangeLog.pre-2-8
View File

@ -1,3 +1,12 @@
2002-09-17 Matthias Clasen <maclas@gmx.de>
* 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 <sven@gimp.org>
* gdk/gdkpixbuf-drawable.c: fixed my latest change.

46
gtk/gtkcolorsel.c
View File

@ -57,6 +57,7 @@
#include "gtksettings.h"
#include "gtkintl.h"
#include "gtkimage.h"
#include "gtkstock.h"
#include <string.h>
@ -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);

1
gtk/gtkiconfactory.c
View File

@ -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);

1
gtk/gtkstock.h
View File

@ -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"

2
gtk/stock-icons/Makefile.am
View File

@ -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 \

BIN
gtk/stock-icons/stock_color_picker_25.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 256 B