From 183fa4a9bcd44fe6c02c6c5f432b1b6aea6f2665 Mon Sep 17 00:00:00 2001 From: Sven Neumann Date: Fri, 11 Feb 2000 21:32:37 +0000 Subject: [PATCH] in the info_window, use the colorpicker pixmap from the toolbox --Sven --- ChangeLog | 7 +++++++ Makefile.am | 1 - app/dialogs/info-window.c | 22 +++++----------------- app/gui/info-window.c | 22 +++++----------------- app/info_window.c | 22 +++++----------------- pixmaps/dropper.xpm | 24 ------------------------ 6 files changed, 22 insertions(+), 76 deletions(-) delete mode 100644 pixmaps/dropper.xpm diff --git a/ChangeLog b/ChangeLog index 709fc696f2..77c4ab27aa 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +Fri Feb 11 17:15:00 CET 2000 Sven Neumann + + * Makefile.am + * pixmaps/dropper.xpm: removed + + * app/info_window.c: reuse the colorpicker pixmap in the toolbox + Fri Feb 11 15:07:04 CET 2000 Sven Neumann * gimp1_1_splash.ppm: sweet new splash created by Raphael Quinet diff --git a/Makefile.am b/Makefile.am index f63e87e304..cb9aeba0c5 100644 --- a/Makefile.am +++ b/Makefile.am @@ -51,7 +51,6 @@ EXTRA_DIST = \ pixmaps/chain.xpm \ pixmaps/channel.xbm \ pixmaps/delete.xpm \ - pixmaps/dropper.xpm \ pixmaps/duplicate.xpm \ pixmaps/eek.xpm \ pixmaps/eye.xbm \ diff --git a/app/dialogs/info-window.c b/app/dialogs/info-window.c index 0e9fd2df46..c716f3449c 100644 --- a/app/dialogs/info-window.c +++ b/app/dialogs/info-window.c @@ -28,10 +28,10 @@ #include "info_window.h" #include "interface.h" #include "scroll.h" +#include "tools.h" #include "libgimp/gimpintl.h" #include "libgimp/gimpunit.h" -#include "pixmaps/dropper.xpm" #define MAX_BUF 256 @@ -135,10 +135,7 @@ info_window_image_preview_book (InfoDialog *info_win) GtkWidget *labelG; GtkWidget *labelR; GtkWidget *labelA; - GtkWidget *pixmapwid; - GdkPixmap *pixmap; - GdkBitmap *mask; - GtkStyle *style; + GtkWidget *pixmap; InfoWinData *iwd; @@ -200,19 +197,10 @@ info_window_image_preview_book (InfoDialog *info_win) gtk_table_attach (GTK_TABLE (table2), labelR, 0, 1, 1, 2, GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0); - gtk_widget_realize(info_win->shell); - style = gtk_widget_get_style (info_win->shell); - - pixmap = gdk_pixmap_create_from_xpm_d (info_win->shell->window, &mask, - &style->bg[GTK_STATE_NORMAL], - dropper_xpm); - pixmapwid = gtk_pixmap_new (pixmap, mask); - gdk_pixmap_unref (pixmap); - gdk_bitmap_unref (mask); - - gtk_table_attach (GTK_TABLE (table2), pixmapwid, 0, 2, 0, 1, + pixmap = gtk_pixmap_new (tool_get_pixmap (COLOR_PICKER), NULL); + gtk_table_attach (GTK_TABLE (table2), pixmap, 0, 2, 0, 1, GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0); - gtk_widget_show (pixmapwid); + gtk_widget_show (pixmap); gtk_notebook_append_page(GTK_NOTEBOOK(info_win->info_notebook), hbox1, diff --git a/app/gui/info-window.c b/app/gui/info-window.c index 0e9fd2df46..c716f3449c 100644 --- a/app/gui/info-window.c +++ b/app/gui/info-window.c @@ -28,10 +28,10 @@ #include "info_window.h" #include "interface.h" #include "scroll.h" +#include "tools.h" #include "libgimp/gimpintl.h" #include "libgimp/gimpunit.h" -#include "pixmaps/dropper.xpm" #define MAX_BUF 256 @@ -135,10 +135,7 @@ info_window_image_preview_book (InfoDialog *info_win) GtkWidget *labelG; GtkWidget *labelR; GtkWidget *labelA; - GtkWidget *pixmapwid; - GdkPixmap *pixmap; - GdkBitmap *mask; - GtkStyle *style; + GtkWidget *pixmap; InfoWinData *iwd; @@ -200,19 +197,10 @@ info_window_image_preview_book (InfoDialog *info_win) gtk_table_attach (GTK_TABLE (table2), labelR, 0, 1, 1, 2, GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0); - gtk_widget_realize(info_win->shell); - style = gtk_widget_get_style (info_win->shell); - - pixmap = gdk_pixmap_create_from_xpm_d (info_win->shell->window, &mask, - &style->bg[GTK_STATE_NORMAL], - dropper_xpm); - pixmapwid = gtk_pixmap_new (pixmap, mask); - gdk_pixmap_unref (pixmap); - gdk_bitmap_unref (mask); - - gtk_table_attach (GTK_TABLE (table2), pixmapwid, 0, 2, 0, 1, + pixmap = gtk_pixmap_new (tool_get_pixmap (COLOR_PICKER), NULL); + gtk_table_attach (GTK_TABLE (table2), pixmap, 0, 2, 0, 1, GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0); - gtk_widget_show (pixmapwid); + gtk_widget_show (pixmap); gtk_notebook_append_page(GTK_NOTEBOOK(info_win->info_notebook), hbox1, diff --git a/app/info_window.c b/app/info_window.c index 0e9fd2df46..c716f3449c 100644 --- a/app/info_window.c +++ b/app/info_window.c @@ -28,10 +28,10 @@ #include "info_window.h" #include "interface.h" #include "scroll.h" +#include "tools.h" #include "libgimp/gimpintl.h" #include "libgimp/gimpunit.h" -#include "pixmaps/dropper.xpm" #define MAX_BUF 256 @@ -135,10 +135,7 @@ info_window_image_preview_book (InfoDialog *info_win) GtkWidget *labelG; GtkWidget *labelR; GtkWidget *labelA; - GtkWidget *pixmapwid; - GdkPixmap *pixmap; - GdkBitmap *mask; - GtkStyle *style; + GtkWidget *pixmap; InfoWinData *iwd; @@ -200,19 +197,10 @@ info_window_image_preview_book (InfoDialog *info_win) gtk_table_attach (GTK_TABLE (table2), labelR, 0, 1, 1, 2, GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0); - gtk_widget_realize(info_win->shell); - style = gtk_widget_get_style (info_win->shell); - - pixmap = gdk_pixmap_create_from_xpm_d (info_win->shell->window, &mask, - &style->bg[GTK_STATE_NORMAL], - dropper_xpm); - pixmapwid = gtk_pixmap_new (pixmap, mask); - gdk_pixmap_unref (pixmap); - gdk_bitmap_unref (mask); - - gtk_table_attach (GTK_TABLE (table2), pixmapwid, 0, 2, 0, 1, + pixmap = gtk_pixmap_new (tool_get_pixmap (COLOR_PICKER), NULL); + gtk_table_attach (GTK_TABLE (table2), pixmap, 0, 2, 0, 1, GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0); - gtk_widget_show (pixmapwid); + gtk_widget_show (pixmap); gtk_notebook_append_page(GTK_NOTEBOOK(info_win->info_notebook), hbox1, diff --git a/pixmaps/dropper.xpm b/pixmaps/dropper.xpm deleted file mode 100644 index 66af3fef3f..0000000000 --- a/pixmaps/dropper.xpm +++ /dev/null @@ -1,24 +0,0 @@ -/* XPM */ -static char * dropper_xpm[] = { -"17 17 4 1", -" c None", -". c #000000", -"+ c #929292", -"@ c #FFFFFF", -" ... ", -" ..... ", -" .....+", -" ........+", -" ......++", -" +@...+++ ", -" +@@@..+ ", -" +@@@.+.+ ", -" +@@@.++ + ", -" +@@@.++ ", -" +@@@.++ ", -" +@@@.++ ", -" +@@@.++ ", -" +@@.++ ", -"+@..++ ", -" .+++ ", -" + "};