prefs_filter_edit.c: use GTK stock icon for add and remove button.

git-svn-id: svn://sylpheed.sraoss.jp/sylpheed/trunk@45 ee746299-78ed-0310-b773-934348b2243d

6 files changed, 24 insertions, 97 deletions

diff --git a/src/Makefile.am b/src/Makefile.am
index 7890c309..be28dbc7 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -164,8 +164,6 @@ EXTRA_DIST = \
 	pixmaps/stock_up_arrow.xpm \
 	pixmaps/stock_down_arrow.xpm \
 	pixmaps/stock_paste.xpm \
-	pixmaps/stock_add_16.xpm \
-	pixmaps/stock_remove_16.xpm \
 	pixmaps/tb_address_book.xpm \
 	pixmaps/sylpheed-logo.xpm \
 	pixmaps/address.xpm \
diff --git a/src/pixmaps/stock_add_16.xpm b/src/pixmaps/stock_add_16.xpm
deleted file mode 100644
index f068b153..00000000
--- a/src/pixmaps/stock_add_16.xpm
+++ /dev/null
@@ -1,35 +0,0 @@
-/* XPM */
-static char * stock_add_16_xpm[] = {
-"16 16 16 1",
-" 	c None",
-".	c #000100",
-"+	c #4D6076",
-"@	c #5C6E85",
-"#	c #5F7289",
-"$	c #607794",
-"%	c #6B829F",
-"&	c #7689A1",
-"*	c #7890AD",
-"=	c #859CB9",
-"-	c #939EAC",
-";	c #93A6BE",
-">	c #A0AFC2",
-",	c #A9B7C8",
-"'	c #B9C4D2",
-")	c #C9D4DF",
-"      ...       ",
-"     .)'-.      ",
-"     .'*#.      ",
-"     .'*#.      ",
-"     .'*#.      ",
-" .....'*@.....  ",
-".,>>>>;*=,'''-. ",
-".)***********$. ",
-".&####**%#####. ",
-" .....=*$.....  ",
-"     .'*#.      ",
-"     .'*#.      ",
-"     .'*#.      ",
-"     .>#+.      ",
-"      ...       ",
-"                "};
diff --git a/src/pixmaps/stock_remove_16.xpm b/src/pixmaps/stock_remove_16.xpm
deleted file mode 100644
index a1903d6a..00000000
--- a/src/pixmaps/stock_remove_16.xpm
+++ /dev/null
@@ -1,28 +0,0 @@
-/* XPM */
-static char * stock_remove_16_xpm[] = {
-"16 16 9 1",
-" 	c None",
-".	c #000000",
-"+	c #5E738B",
-"@	c #617891",
-"#	c #7589A0",
-"$	c #7590AE",
-"%	c #93A0AD",
-"&	c #ADBCCE",
-"*	c #C4CEDC",
-"                ",
-"                ",
-"                ",
-"                ",
-"                ",
-" .............  ",
-".&***********%. ",
-".*$$$$$$$$$$$@. ",
-".#++++++++++++. ",
-" .............  ",
-"                ",
-"                ",
-"                ",
-"                ",
-"                ",
-"                "};
diff --git a/src/prefs_filter_edit.c b/src/prefs_filter_edit.c
index dc6587cd..edc17917 100644
--- a/src/prefs_filter_edit.c
+++ b/src/prefs_filter_edit.c
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2004 Hiroyuki Yamamoto
+ * Copyright (C) 1999-2005 Hiroyuki Yamamoto
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -537,8 +537,8 @@ static CondHBox *prefs_filter_edit_cond_hbox_create(void)
 	GtkWidget *label;
 	GtkWidget *del_btn;
 	GtkWidget *add_btn;
-	GtkWidget *del_pixmap;
-	GtkWidget *add_pixmap;
+	GtkWidget *del_img;
+	GtkWidget *add_img;
 
 	cond_hbox = g_new0(CondHBox, 1);
 
@@ -622,21 +622,20 @@ static CondHBox *prefs_filter_edit_cond_hbox_create(void)
 	label = gtk_label_new(_("KB"));
 	gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
 
-	del_pixmap = stock_pixmap_widget(rule_edit_window.window,
-					 STOCK_PIXMAP_REMOVE);
-	gtk_widget_show(del_pixmap);
+	del_img = gtk_image_new_from_stock
+		(GTK_STOCK_REMOVE, GTK_ICON_SIZE_MENU);
+	gtk_widget_show(del_img);
 
 	del_btn = gtk_button_new();
-	gtk_container_add(GTK_CONTAINER(del_btn), del_pixmap);
+	gtk_container_add(GTK_CONTAINER(del_btn), del_img);
 	gtk_widget_show(del_btn);
 	gtk_box_pack_end(GTK_BOX(hbox), del_btn, FALSE, FALSE, 0);
 
-	add_pixmap = stock_pixmap_widget(rule_edit_window.window,
-					 STOCK_PIXMAP_ADD);
-	gtk_widget_show(add_pixmap);
+	add_img = gtk_image_new_from_stock(GTK_STOCK_ADD, GTK_ICON_SIZE_MENU);
+	gtk_widget_show(add_img);
 
 	add_btn = gtk_button_new();
-	gtk_container_add(GTK_CONTAINER(add_btn), add_pixmap);
+	gtk_container_add(GTK_CONTAINER(add_btn), add_img);
 	gtk_widget_show(add_btn);
 	gtk_box_pack_end(GTK_BOX(hbox), add_btn, FALSE, FALSE, 0);
 
@@ -675,13 +674,13 @@ static ActionHBox *prefs_filter_edit_action_hbox_create(void)
 	GtkWidget *folder_entry;
 	GtkWidget *cmd_entry;
 	GtkWidget *address_entry;
-	GtkWidget *folder_pixmap;
+	GtkWidget *folder_img;
 	GtkWidget *folder_sel_btn;
 	GtkWidget *clabel_optmenu;
 	GtkWidget *del_btn;
 	GtkWidget *add_btn;
-	GtkWidget *del_pixmap;
-	GtkWidget *add_pixmap;
+	GtkWidget *del_img;
+	GtkWidget *add_img;
 
 	action_hbox = g_new0(ActionHBox, 1);
 
@@ -740,12 +739,12 @@ static ActionHBox *prefs_filter_edit_action_hbox_create(void)
 	gtk_widget_show(folder_entry);
 	gtk_box_pack_start(GTK_BOX(hbox), folder_entry, TRUE, TRUE, 0);
 
-	folder_pixmap = stock_pixmap_widget(rule_edit_window.window,
-					    STOCK_PIXMAP_DIR_OPEN);
-	gtk_widget_show(folder_pixmap);
+	folder_img = stock_pixmap_widget(rule_edit_window.window,
+					 STOCK_PIXMAP_DIR_OPEN);
+	gtk_widget_show(folder_img);
 
 	folder_sel_btn = gtk_button_new();
-	gtk_container_add(GTK_CONTAINER(folder_sel_btn), folder_pixmap);
+	gtk_container_add(GTK_CONTAINER(folder_sel_btn), folder_img);
 	gtk_widget_show(folder_sel_btn);
 	gtk_box_pack_start(GTK_BOX(hbox), folder_sel_btn, FALSE, FALSE, 0);
 
@@ -764,21 +763,20 @@ static ActionHBox *prefs_filter_edit_action_hbox_create(void)
 	menu = colorlabel_create_color_menu();
 	gtk_option_menu_set_menu(GTK_OPTION_MENU(clabel_optmenu), menu);
 
-	del_pixmap = stock_pixmap_widget(rule_edit_window.window,
-					 STOCK_PIXMAP_REMOVE);
-	gtk_widget_show(del_pixmap);
+	del_img = gtk_image_new_from_stock
+		(GTK_STOCK_REMOVE, GTK_ICON_SIZE_MENU);
+	gtk_widget_show(del_img);
 
 	del_btn = gtk_button_new();
-	gtk_container_add(GTK_CONTAINER(del_btn), del_pixmap);
+	gtk_container_add(GTK_CONTAINER(del_btn), del_img);
 	gtk_widget_show(del_btn);
 	gtk_box_pack_end(GTK_BOX(hbox), del_btn, FALSE, FALSE, 0);
 
-	add_pixmap = stock_pixmap_widget(rule_edit_window.window,
-					 STOCK_PIXMAP_ADD);
-	gtk_widget_show(add_pixmap);
+	add_img = gtk_image_new_from_stock(GTK_STOCK_ADD, GTK_ICON_SIZE_MENU);
+	gtk_widget_show(add_img);
 
 	add_btn = gtk_button_new();
-	gtk_container_add(GTK_CONTAINER(add_btn), add_pixmap);
+	gtk_container_add(GTK_CONTAINER(add_btn), add_img);
 	gtk_widget_show(add_btn);
 	gtk_box_pack_end(GTK_BOX(hbox), add_btn, FALSE, FALSE, 0);
 
diff --git a/src/stock_pixmap.c b/src/stock_pixmap.c
index 41cd91ef..e43cf518 100644
--- a/src/stock_pixmap.c
+++ b/src/stock_pixmap.c
@@ -71,8 +71,6 @@
 #include "pixmaps/vcard.xpm"
 #include "pixmaps/online.xpm"
 #include "pixmaps/offline.xpm"
-#include "pixmaps/stock_add_16.xpm"
-#include "pixmaps/stock_remove_16.xpm"
 #include "pixmaps/mail.xpm"
 
 typedef struct _StockPixmapData	StockPixmapData;
@@ -133,8 +131,6 @@ static StockPixmapData pixmaps[] =
 	{vcard_xpm			, NULL, NULL},
 	{online_xpm			, NULL, NULL},
 	{offline_xpm			, NULL, NULL},
-	{stock_add_16_xpm		, NULL, NULL},
-	{stock_remove_16_xpm		, NULL, NULL},
 	{mail_xpm			, NULL, NULL},
 };
 
diff --git a/src/stock_pixmap.h b/src/stock_pixmap.h
index 6a097e1a..4da4d41f 100644
--- a/src/stock_pixmap.h
+++ b/src/stock_pixmap.h
@@ -72,8 +72,6 @@ typedef enum
 	STOCK_PIXMAP_VCARD,
 	STOCK_PIXMAP_ONLINE,
 	STOCK_PIXMAP_OFFLINE,
-	STOCK_PIXMAP_ADD,
-	STOCK_PIXMAP_REMOVE,
 	STOCK_PIXMAP_MAIL_SMALL,
 
 	N_STOCK_PIXMAPS