X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=blobdiff_plain;f=src%2Fselective_download.c;h=f51eac2ada319cbb230d31f525ba37bbf1ca4076;hp=dd2b75e899b0897df21161445197092ba386d1bb;hb=292529e6204af09bd0bdad38c47e6857a105bf49;hpb=35d630cae45cb3e8433ebfaa4e39302c876159c9

diff --git a/src/selective_download.c b/src/selective_download.c
index dd2b75e89..f51eac2ad 100644
--- a/src/selective_download.c
+++ b/src/selective_download.c
@@ -33,9 +33,6 @@
 #include "intl.h"
 #include "main.h"
 #include "prefs.h"
-#include "prefs_matcher.h"
-#include "prefs_filtering.h"
-#include "prefs_account.h"
 #include "account.h"
 #include "mainwindow.h"
 #include "manage_window.h"
@@ -43,14 +40,13 @@
 #include "stock_pixmap.h"
 #include "inc.h"
 #include "utils.h"
-#include "gtkutils.h"
 #include "alertpanel.h"
-#include "folder.h"
 #include "inc.h"
 #include "filtering.h"
-#include "matcher_parser.h"
-#include "selective_download.h"
+#include "matcher.h"
 #include "procheader.h"
+#include "selective_download.h"
+
 
 static struct _SDView {
 	MainWindow *mainwin;
@@ -69,6 +65,7 @@ static struct _SDView {
 
 }selective;
 
+/* clist pixmaps */
 static GdkPixmap *checkboxonxpm;
 static GdkBitmap *checkboxonxpmmask;
 static GdkPixmap *checkboxoffxpm;
@@ -77,21 +74,19 @@ static GdkPixmap *markxpm;
 static GdkBitmap *markxpmmask;
 static GdkPixmap *deletedxpm;
 static GdkBitmap *deletedxpmmask;
-static GdkPixmap *continuexpm;
-static GdkBitmap *continuexpmmask;
-
 
 /* local functions */
-static void sd_clear_msglist();
-static void sd_remove_header_files();
-static void sd_toggle_btn();
-static SD_State sd_header_filter (MsgInfo *msginfo);
-static MsgInfo *sd_get_msginfo_from_file (const gchar *filename);
-
-static void sd_clist_set_pixmap(HeaderItems *items, gint row);
-static void sd_clist_get_items();
-static void sd_clist_set_items();
-static void sd_update_msg_num(PrefsAccount *acc);
+static void sd_clear_msglist			(void);
+static void sd_remove_header_files		(void);
+static void sd_toggle_btn			(void);
+static SD_State sd_header_filter		(MsgInfo	*msginfo);
+static MsgInfo *sd_get_msginfo_from_file	(const gchar	*filename);
+
+static void sd_clist_set_pixmap			(HeaderItems	*items,
+						 gint		 row);
+static void sd_clist_get_items			(void);
+static void sd_clist_set_items			(void);
+static void sd_update_msg_num			(PrefsAccount	*acc);
 
 enum {
 	PREVIEW_NEW,
@@ -103,33 +98,50 @@ enum {
 };
 
 /* callbacks */
-static void sd_action_cb(GtkWidget *widget, guint action);
+static void sd_action_cb	(GtkWidget 	*widget,
+				 guint		 action);
+
+static void sd_select_row_cb	(GtkCList 	*clist,
+				 gint		 row,
+				 gint		 column,
+				 GdkEvent 	*event,
+				 gpointer	 user_data);
+static gint sd_key_pressed	(GtkWidget	*widget,
+				 GdkEventKey	*event,
+				 gpointer	 data);
+static gint sd_delete_event_cb	(GtkWidget	*widget, 
+				 GdkEvent	*event,
+				 gpointer	 data);
 
-static void sd_select_row_cb (GtkCList *clist, gint row, gint column,
-			      GdkEvent *event, gpointer user_data);
-static void sd_key_pressed (GtkWidget *widget,
-			    GdkEventKey *event,
-			    gpointer data);
 /* account menu */
-static void sd_ac_label_pressed(GtkWidget *widget, 
-				GdkEventButton *event,
-				gpointer data);
+static gint sd_ac_label_pressed		(GtkWidget	*widget, 
+				 	 GdkEventButton	*event,
+					 gpointer	 data);
 
-static void sd_ac_menu_popup_closed(GtkMenuShell *menu_shell);
-static void sd_ac_menu_cb(GtkMenuItem *menuitem, gpointer data);
-static void sd_ac_menu_set();
+static void sd_ac_menu_popup_closed	(GtkMenuShell	*menu_shell);
+static void sd_ac_menu_cb		(GtkMenuItem	*menuitem,
+					 gpointer	 data);
+static void sd_ac_menu_set		(void);
 
 /* preview popup */
-static void sd_preview_popup_closed(GtkMenuShell *menu_shell);
-static void sd_preview_popup_cb(GtkWidget *widget, GdkEventButton *event);
+static void sd_preview_popup_closed	(GtkMenuShell	*menu_shell);
+static gint sd_preview_popup_cb		(GtkWidget	*widget,
+					 GdkEventButton	*event,
+					 gpointer	 data);
+
 static GtkItemFactoryEntry preview_popup_entries[] =
 {
-	{N_("/Preview _new Messages"), NULL, sd_action_cb, PREVIEW_NEW, NULL},
-	{N_("/Preview _all Messages"), NULL, sd_action_cb, PREVIEW_ALL, NULL}
+	{N_("/Preview _new messages"), NULL, sd_action_cb, PREVIEW_NEW, NULL},
+	{N_("/Preview _all messages"), NULL, sd_action_cb, PREVIEW_ALL, NULL}
 };
 
 /* create dialog */
-static void sd_window_create (MainWindow *mainwin);
+static void sd_window_create	(MainWindow	*mainwin);
+static void sd_create_toolbar	(MainWindow	*mainwin,
+				 GtkWidget	*container);
+
+/* pixmaps */
+void sd_init_pixmaps		(MainWindow	*mainwin);
 
 void selective_download(MainWindow *mainwin)
 {
@@ -137,28 +149,41 @@ void selective_download(MainWindow *mainwin)
 
 	sd_remove_header_files();
 	
-	stock_pixmap_gdk(mainwin->window, STOCK_PIXMAP_CHECKBOX_OFF,
-			 &checkboxoffxpm, &checkboxoffxpmmask);
-	stock_pixmap_gdk(mainwin->window, STOCK_PIXMAP_CHECKBOX_ON,
-			 &checkboxonxpm, &checkboxonxpmmask);
-	stock_pixmap_gdk(mainwin->window, STOCK_PIXMAP_DELETED,
-			 &deletedxpm, &deletedxpmmask);
-	stock_pixmap_gdk(mainwin->window, STOCK_PIXMAP_CONTINUE,
-			 &continuexpm, &continuexpmmask);
-	stock_pixmap_gdk(mainwin->window, STOCK_PIXMAP_MARK,
-			 &markxpm, &markxpmmask);
 	inc_lock();
-
-	if (!selective.window)
-	    sd_window_create(mainwin);
+	
+	if (!selective.window) {
+		sd_init_pixmaps(mainwin);
+		sd_window_create(mainwin);
+	}
 
 	manage_window_set_transient(GTK_WINDOW(selective.window));
 	gtk_widget_show(selective.window);
 	sd_clear_msglist();
 	sd_ac_menu_set();
 	gtk_clist_clear(GTK_CLIST(selective.clist));
+}
+
+void sd_init_pixmaps(MainWindow *mainwin)
+{
+	GtkWidget *widget = mainwin->window;
 
+	g_return_if_fail(mainwin != NULL);
+
+	/* clist pixmaps */
+	stock_pixmap_gdk(widget, STOCK_PIXMAP_CHECKBOX_OFF,
+			 &checkboxoffxpm, &checkboxoffxpmmask);
+	stock_pixmap_gdk(widget, STOCK_PIXMAP_CHECKBOX_ON,
+			 &checkboxonxpm, &checkboxonxpmmask);
+	stock_pixmap_gdk(widget, STOCK_PIXMAP_DELETED,
+			 &deletedxpm, &deletedxpmmask);
+	stock_pixmap_gdk(widget, STOCK_PIXMAP_MARK,
+			 &markxpm, &markxpmmask);
+}
 
+void sd_reflect_prefs_pixmap_theme()
+{
+	if (selective.window) 
+		selective.window = NULL;
 }
 
 static void sd_clear_msglist()
@@ -166,7 +191,12 @@ static void sd_clear_msglist()
 	PrefsAccount *acc = cur_account;
 	while (acc->msg_list != NULL) {
 		HeaderItems *item = (HeaderItems*)acc->msg_list->data;
+
 		acc->msg_list = g_slist_remove(acc->msg_list, item);
+		g_free(item->from);
+		g_free(item->subject);
+		g_free(item->date);
+		g_free(item);
 	}	
 	g_slist_free(acc->msg_list);
 	sd_update_msg_num(acc);
@@ -241,29 +271,30 @@ SD_State sd_header_filter(MsgInfo *msginfo)
  *
  * - retrieve msginfo from saved header files
  */
-MsgInfo *sd_get_msginfo_from_file(const gchar *filename)
+static MsgInfo *sd_get_msginfo_from_file(const gchar *filename)
 {
-	MsgInfo *msginfo  = g_new0(MsgInfo, 1);
-	MsgInfo *msg;
-	MsgFlags msgflags = { 0, 0 };
-
-	msg  = procheader_parse(filename, msgflags, TRUE, FALSE);
-
-	if (!msg) {
-		msginfo->subject = _("(No Subject)");
-		msginfo->from    = _("(No Sender)");
-		msginfo->date    = _("(No Date)");
-	} else {
-		g_memmove(&msginfo, &msg, sizeof(msginfo)); 
-
-		if (msginfo->date_t) {
-			gchar date_modified[80];
-			procheader_date_get_localtime(date_modified,
-						      sizeof(date_modified),
-						      msginfo->date_t);
-			msginfo->date = date_modified;
-		}
+	MsgInfo  *msginfo;
+	MsgFlags  msgflags = { 0, 0 };
+	gchar	  date[80];
+
+	msginfo = procheader_parse_file(filename, msgflags, TRUE, FALSE);
+
+	if (msginfo && msginfo->date_t) {
+		procheader_date_get_localtime(date, sizeof date, msginfo->date_t);
+		if (msginfo->date) g_free(msginfo->date);
+		msginfo->date = g_strdup(date);
 	} 
+
+	if (!msginfo)
+		msginfo = g_new0(MsgInfo, 1);
+
+	if (!msginfo->date) 
+		msginfo->date = g_strdup(_("(No date)"));
+	if (!msginfo->from)
+		msginfo->from = g_strdup(_("(No sender)"));
+	if (!msginfo->subject)
+		msginfo->subject = g_strdup(_("(No subject)"));
+		
 	return msginfo;
 }
 
@@ -309,7 +340,7 @@ static void sd_clist_set_items()
 		gchar *row[5];
 		gint row_num;
 		
-		row[0] = _("");
+		row[0] = ("");
 		row[1] = items->from;
 		row[2] = items->subject;
 		row[3] = items->date;
@@ -369,7 +400,7 @@ static void sd_update_msg_num(PrefsAccount *acc)
  *
  * - get items for clist from Files
  */
-static void sd_clist_get_items()
+static void sd_clist_get_items(void)
 {
 	GSList *cur;
 	PrefsAccount *acc = cur_account;
@@ -378,12 +409,12 @@ static void sd_clist_get_items()
 	for (cur = acc->msg_list; cur != NULL; cur = cur->next) {
 
 		HeaderItems *items = (HeaderItems*) cur->data;
-		gchar *filename = g_strdup_printf("%s%i", path, items->index);
-		MsgInfo *msginfo  = sd_get_msginfo_from_file(filename);
+		gchar *filename    = g_strdup_printf("%s%i", path, items->index);
+		MsgInfo *msginfo   = sd_get_msginfo_from_file(filename);
 		
-		items->from    = msginfo->from;
-		items->subject = msginfo->subject;
-		strncpy2(items->date, msginfo->date, sizeof(items->date));
+		items->from        = g_strdup(msginfo->from);
+		items->subject     = g_strdup(msginfo->subject);
+		items->date	   = g_strdup(msginfo->date);
 		
 		msginfo->folder = folder_get_default_processing();
 
@@ -399,22 +430,12 @@ static void sd_clist_get_items()
 
 		folder_item_remove_msg(msginfo->folder, msginfo->msgnum);
 		g_free(filename);
-		g_free(msginfo);
+		procmsg_msginfo_free(msginfo);
 	}
 
 	g_free(path);
 }
 
-static gint sd_deleted_cb(GtkWidget *widget, GdkEventAny *event, gpointer data)
-{
-	sd_remove_header_files();
-	sd_clear_msglist();
-	gtk_widget_destroy(selective.window);	
-	selective.window = NULL;
-	inc_unlock();
-	return TRUE;
-}
-
 /* --- Callbacks -- */
 static void sd_action_cb(GtkWidget *widget, guint action)
 {
@@ -426,7 +447,7 @@ static void sd_action_cb(GtkWidget *widget, guint action)
 		if ( (acc->protocol != A_APOP) &&
 		     (acc->protocol != A_POP3) ) {
 			alertpanel_error(
-				_("Selected Account \"%s\" is not a POP Mail Server.\nPlease select a different Account"), acc->account_name);
+				_("Selected account \"%s\" is not a POP mail server.\nPlease select a different account"), acc->account_name);
 			return;
 		}
 		sd_clear_msglist();
@@ -491,19 +512,30 @@ static void sd_select_row_cb(GtkCList *clist, gint row, gint column,
 	}
 }
 
-static void sd_key_pressed(GtkWidget *widget,
+static gint sd_key_pressed(GtkWidget *widget,
 			   GdkEventKey *event,
 			   gpointer data)
 {
-	if (event && event->keyval == GDK_Escape)
+	if (event && event->keyval == GDK_Escape) {
 		sd_action_cb(widget, DONE);
+		return TRUE;
+	}
+	return FALSE;
+}
+
+static gint sd_delete_event_cb(GtkWidget *widget, 
+			      GdkEvent *event,
+			      gpointer data)
+{
+	sd_action_cb(widget, DONE);
+	return TRUE;
 }
 
 /* account menu */
-static void sd_ac_label_pressed(GtkWidget *widget, GdkEventButton *event,
+static gint sd_ac_label_pressed(GtkWidget *widget, GdkEventButton *event,
 				    gpointer data)
 {
-	if (!event) return;
+	if (!event) return FALSE;
 
 	gtk_button_set_relief(GTK_BUTTON(widget), GTK_RELIEF_NORMAL);
 	gtk_object_set_data(GTK_OBJECT(selective.ac_menu), "menu_button",
@@ -512,6 +544,7 @@ static void sd_ac_label_pressed(GtkWidget *widget, GdkEventButton *event,
 	gtk_menu_popup(GTK_MENU(selective.ac_menu), NULL, NULL,
 		       menu_button_position, widget,
 		       event->button, event->time);
+	return TRUE;
 }
 
 static void sd_ac_menu_popup_closed(GtkMenuShell *menu_shell)
@@ -573,16 +606,106 @@ static void sd_preview_popup_closed(GtkMenuShell *menu_shell)
 	manage_window_focus_in(selective.window, NULL, NULL);
 }
 
-static void sd_preview_popup_cb(GtkWidget *widget, GdkEventButton *event)
+static gint sd_preview_popup_cb(GtkWidget *widget, GdkEventButton *event,
+				gpointer data)
 {
-	if (!event) return;
+	if (!event) return FALSE;
 	
 	if (event->button == 1) {
 		gtk_button_set_relief(GTK_BUTTON(widget), GTK_RELIEF_NORMAL);
 		gtk_menu_popup(GTK_MENU(selective.preview_popup), NULL, NULL,
 		       menu_button_position, widget,
 		       event->button, event->time);
+		return TRUE;
 	}
+	return FALSE;
+}
+
+static void sd_create_toolbar(MainWindow *mainwin, GtkWidget *container)
+{
+	GtkWidget *toolbar;
+	GtkWidget *tmp_toolbar_icon;
+	GtkWidget *preview_btn;
+	GtkWidget *remove_btn;
+	GtkWidget *download_btn;
+	GtkWidget *done_btn;
+	GtkWidget *preview_popup;
+	gint n_menu_entries;
+
+	toolbar = gtk_toolbar_new (GTK_ORIENTATION_VERTICAL, GTK_TOOLBAR_BOTH);
+
+	gtk_container_add (GTK_CONTAINER(container), toolbar);
+	gtk_container_set_border_width (GTK_CONTAINER(container), 2);
+
+	gtk_toolbar_set_space_size (GTK_TOOLBAR (toolbar), 30);
+	gtk_toolbar_set_space_style (GTK_TOOLBAR (toolbar), GTK_TOOLBAR_SPACE_LINE);
+	
+	tmp_toolbar_icon = stock_pixmap_widget (container, STOCK_PIXMAP_MAIL_RECEIVE);
+	preview_btn = gtk_toolbar_append_element (GTK_TOOLBAR (toolbar),
+						  GTK_TOOLBAR_CHILD_BUTTON,
+						  NULL,
+						  _("Preview mail"),
+						  _("Preview old/new mail on account"), NULL,
+						  tmp_toolbar_icon, NULL, NULL);
+
+	n_menu_entries = sizeof (preview_popup_entries)/sizeof (preview_popup_entries[0]);
+	preview_popup = popupmenu_create (preview_btn, preview_popup_entries, n_menu_entries,
+				      "<SelectiveDownload>", mainwin);
+
+	gtk_signal_connect (GTK_OBJECT(preview_popup), "selection_done",
+			    GTK_SIGNAL_FUNC(sd_preview_popup_closed), NULL);
+
+	gtk_toolbar_append_space (GTK_TOOLBAR (toolbar));
+	
+	tmp_toolbar_icon = stock_pixmap_widget (container, STOCK_PIXMAP_CLOSE);
+	remove_btn = gtk_toolbar_append_element (GTK_TOOLBAR (toolbar),
+						 GTK_TOOLBAR_CHILD_BUTTON,
+						 NULL,
+						 _("Remove"),
+						 _("Remove selected mail"), NULL,
+						 tmp_toolbar_icon, NULL, NULL);
+
+	gtk_widget_set_sensitive (remove_btn, FALSE);
+
+	tmp_toolbar_icon = stock_pixmap_widget(container, STOCK_PIXMAP_DOWN_ARROW);
+	download_btn = gtk_toolbar_append_element (GTK_TOOLBAR (toolbar),
+						   GTK_TOOLBAR_CHILD_BUTTON,
+						   NULL,
+						   _("Download"),
+						   _("Download selected mail"), NULL,
+						   tmp_toolbar_icon, NULL, NULL);
+
+	gtk_widget_set_sensitive (download_btn, FALSE);
+
+	gtk_toolbar_append_space (GTK_TOOLBAR (toolbar));
+
+	tmp_toolbar_icon = stock_pixmap_widget (container, STOCK_PIXMAP_COMPLETE);
+	
+	done_btn = gtk_toolbar_append_element (GTK_TOOLBAR (toolbar),
+					       GTK_TOOLBAR_CHILD_BUTTON,
+					       NULL, 
+					       _("Done"),
+					       _("Exit dialog"), NULL ,
+					       tmp_toolbar_icon, NULL, NULL);
+
+	gtk_signal_connect (GTK_OBJECT (preview_btn), "button_press_event",
+			    GTK_SIGNAL_FUNC (sd_preview_popup_cb),
+			    NULL);
+	gtk_signal_connect (GTK_OBJECT (remove_btn), "clicked",
+			    GTK_SIGNAL_FUNC (sd_action_cb),
+			    GUINT_TO_POINTER(REMOVE));
+	gtk_signal_connect (GTK_OBJECT (download_btn), "clicked",
+			    GTK_SIGNAL_FUNC (sd_action_cb),
+			    GUINT_TO_POINTER(DOWNLOAD));
+	gtk_signal_connect (GTK_OBJECT (done_btn), "clicked",
+			    GTK_SIGNAL_FUNC (sd_action_cb),
+			    GUINT_TO_POINTER(DONE));
+
+	selective.preview_btn     = preview_btn;
+	selective.remove_btn      = remove_btn;
+	selective.download_btn    = download_btn;
+	selective.preview_popup   = preview_popup;
+
 }
 
 static void sd_window_create(MainWindow *mainwin)
@@ -605,14 +728,6 @@ static void sd_window_create(MainWindow *mainwin)
 	GtkWidget *size_label;
 	GtkWidget *date_label;
 	GtkWidget *toolbar_hbox;
-	GtkWidget *toolbar;
-	GtkWidget *tmp_toolbar_icon;
-	GtkWidget *preview_btn;
-	GtkWidget *preview_popup;
-	GtkWidget *remove_btn;
-	GtkWidget *download_btn;
-	GtkWidget *done_btn;
-	gint n_menu_entries;
 
 	window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
 	gtk_object_set_data (GTK_OBJECT (window), "window", window);
@@ -620,11 +735,13 @@ static void sd_window_create(MainWindow *mainwin)
 	gtk_window_set_position (GTK_WINDOW (window), GTK_WIN_POS_CENTER);
 	gtk_window_set_modal (GTK_WINDOW (window), TRUE);
 	gtk_window_set_policy (GTK_WINDOW (window), TRUE, TRUE, TRUE);
+	/* avoids GDK warning (pixmap with NULL window) */ 
+	gtk_widget_realize (window);
 
 	table = gtk_table_new (2, 2, FALSE);
 	gtk_container_add (GTK_CONTAINER (window), table);
 
-	msgs_label = gtk_label_new (_("0 Messages"));
+	msgs_label = gtk_label_new (_("0 messages"));
 	gtk_table_attach (GTK_TABLE (table), msgs_label, 1, 2, 1, 2,
 			  (GtkAttachOptions) (GTK_FILL),
 			  (GtkAttachOptions) (0), 0, 0);
@@ -634,34 +751,34 @@ static void sd_window_create(MainWindow *mainwin)
 	gtk_table_attach (GTK_TABLE (table), bottom_hbox, 0, 1, 1, 2,
 			  (GtkAttachOptions) (GTK_FILL),
 			  (GtkAttachOptions) (GTK_FILL), 0, 0);
-	
-	show_old_chkbtn = gtk_check_button_new_with_label("Show only old Messages"); 
-	gtk_box_pack_start(GTK_BOX(bottom_hbox), show_old_chkbtn, FALSE, FALSE, 0); 
-	
-	gtk_signal_connect(GTK_OBJECT(show_old_chkbtn), "toggled", 
-			   GTK_SIGNAL_FUNC(sd_action_cb), GUINT_TO_POINTER(CHECKBTN)); 
-	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(show_old_chkbtn), FALSE);
-	GTK_WIDGET_UNSET_FLAGS(show_old_chkbtn, GTK_CAN_FOCUS);							
-			   
-	expand_label = gtk_label_new (_(" "));
+
+	show_old_chkbtn = gtk_check_button_new_with_label("Show only old messages");
+	gtk_box_pack_start (GTK_BOX(bottom_hbox), show_old_chkbtn, FALSE, FALSE, 0);
+
+	gtk_signal_connect (GTK_OBJECT(show_old_chkbtn), "toggled",
+			    GTK_SIGNAL_FUNC(sd_action_cb), GUINT_TO_POINTER(CHECKBTN));
+	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(show_old_chkbtn), FALSE);
+	GTK_WIDGET_UNSET_FLAGS (show_old_chkbtn, GTK_CAN_FOCUS);
+
+	expand_label = gtk_label_new (" ");
 	gtk_box_pack_start (GTK_BOX (bottom_hbox), expand_label, TRUE, TRUE, 0);
 	
 	fixed_label = gtk_label_new (_(" contains "));
 	gtk_box_pack_end (GTK_BOX (bottom_hbox), fixed_label, FALSE, FALSE, 0);
 
 	ac_menu = gtk_menu_new();
-	gtk_signal_connect(GTK_OBJECT(ac_menu), "selection_done",
-			   GTK_SIGNAL_FUNC(sd_ac_menu_popup_closed), NULL);
+	gtk_signal_connect (GTK_OBJECT(ac_menu), "selection_done",
+			    GTK_SIGNAL_FUNC(sd_ac_menu_popup_closed), NULL);
 	ac_button = gtk_button_new();
-	gtk_button_set_relief(GTK_BUTTON(ac_button), GTK_RELIEF_NONE);
-	GTK_WIDGET_UNSET_FLAGS(ac_button, GTK_CAN_FOCUS);
-	gtk_widget_set_usize(ac_button, -1, 1);
-	gtk_box_pack_start(GTK_BOX(bottom_hbox), ac_button, FALSE, FALSE, 0);
-	gtk_signal_connect(GTK_OBJECT(ac_button), "button_press_event",
-			   GTK_SIGNAL_FUNC(sd_ac_label_pressed), GTK_OBJECT(ac_menu));
+	gtk_button_set_relief (GTK_BUTTON(ac_button), GTK_RELIEF_NONE);
+	GTK_WIDGET_UNSET_FLAGS (ac_button, GTK_CAN_FOCUS);
+	gtk_widget_set_usize (ac_button, -1, 1);
+	gtk_box_pack_start (GTK_BOX(bottom_hbox), ac_button, FALSE, FALSE, 0);
+	gtk_signal_connect (GTK_OBJECT(ac_button), "button_press_event",
+			    GTK_SIGNAL_FUNC(sd_ac_label_pressed), GTK_OBJECT(ac_menu));
 
 	ac_label = gtk_label_new("");
-	gtk_container_add(GTK_CONTAINER(ac_button), ac_label);
+	gtk_container_add (GTK_CONTAINER(ac_button), ac_label);
 
 	scrolledwindow = gtk_scrolled_window_new (NULL, NULL);
 	gtk_table_attach (GTK_TABLE (table), scrolledwindow, 0, 1, 0, 1,
@@ -687,7 +804,7 @@ static void sd_window_create(MainWindow *mainwin)
 	
 	from_label = gtk_label_new (_("From"));
 	gtk_clist_set_column_widget (GTK_CLIST (clist), 1, from_label);
-	
+
 	subject_label = gtk_label_new (_("Subject"));
 	gtk_clist_set_column_widget (GTK_CLIST (clist), 2, subject_label);
 	
@@ -698,104 +815,35 @@ static void sd_window_create(MainWindow *mainwin)
 	gtk_widget_ref (size_label);
 	gtk_clist_set_column_widget (GTK_CLIST (clist), 4, size_label);
 	
+	/* create toolbar */
 	toolbar_hbox = gtk_hbox_new (FALSE, 0);
 
 	gtk_table_attach (GTK_TABLE (table), toolbar_hbox, 1, 2, 0, 1,
 			  (GtkAttachOptions) (GTK_FILL),
 			  (GtkAttachOptions) (GTK_FILL), 0, 0);
-	
-	toolbar = gtk_toolbar_new (GTK_ORIENTATION_VERTICAL, GTK_TOOLBAR_BOTH);
-
-	gtk_box_pack_end (GTK_BOX (toolbar_hbox), toolbar, FALSE, FALSE, 0);
-	gtk_toolbar_set_space_size (GTK_TOOLBAR (toolbar), 30);
-	gtk_toolbar_set_space_style (GTK_TOOLBAR (toolbar), GTK_TOOLBAR_SPACE_LINE);
-	gtk_container_set_border_width (GTK_CONTAINER (toolbar), 5);
-	
-	tmp_toolbar_icon = stock_pixmap_widget(toolbar_hbox, STOCK_PIXMAP_MAIL_RECEIVE);
-	preview_btn = gtk_toolbar_append_element (GTK_TOOLBAR (toolbar),
-						  GTK_TOOLBAR_CHILD_BUTTON,
-						  NULL,
-						  _("Preview Mail"),
-						  _("preview old/new E-Mail on account"), NULL,
-						  tmp_toolbar_icon, NULL, NULL);
-
-	n_menu_entries = sizeof(preview_popup_entries)/sizeof(preview_popup_entries[0]);
-	preview_popup = popupmenu_create(preview_btn, preview_popup_entries, n_menu_entries,
-				      "<SelectiveDownload>", window);
-
-	gtk_signal_connect(GTK_OBJECT(preview_popup), "selection_done",
-			   GTK_SIGNAL_FUNC(sd_preview_popup_closed), NULL);
-
-	gtk_toolbar_append_space (GTK_TOOLBAR (toolbar));
-	
-	tmp_toolbar_icon = stock_pixmap_widget(toolbar_hbox, STOCK_PIXMAP_CLOSE);
-	remove_btn = gtk_toolbar_append_element (GTK_TOOLBAR (toolbar),
-						 GTK_TOOLBAR_CHILD_BUTTON,
-						 NULL,
-						 _("Remove"),
-						 _("remove selected E-Mails"), NULL,
-						 tmp_toolbar_icon, NULL, NULL);
+	sd_create_toolbar(mainwin, toolbar_hbox);
 
-	gtk_widget_set_sensitive (remove_btn, FALSE);
-
-	tmp_toolbar_icon = stock_pixmap_widget(toolbar_hbox, STOCK_PIXMAP_DOWN_ARROW);
-	download_btn = gtk_toolbar_append_element (GTK_TOOLBAR (toolbar),
-						 GTK_TOOLBAR_CHILD_BUTTON,
-						 NULL,
-						 _("Download"),
-						 _("Download selected E-Mails"), NULL,
-						 tmp_toolbar_icon, NULL, NULL);
 
-	gtk_widget_set_sensitive (download_btn, FALSE);
-
-	gtk_toolbar_append_space (GTK_TOOLBAR (toolbar));
-
-	tmp_toolbar_icon = stock_pixmap_widget (toolbar_hbox, STOCK_PIXMAP_COMPLETE);
-	done_btn = gtk_toolbar_append_element (GTK_TOOLBAR (toolbar),
-					       GTK_TOOLBAR_CHILD_BUTTON,
-					       NULL,
-					       _("Done"),
-					       _("Exit Dialog"), NULL,
-					       tmp_toolbar_icon, NULL, NULL);
-	
 	gtk_signal_connect (GTK_OBJECT (window), "delete_event",
-			    GTK_SIGNAL_FUNC (gtk_widget_hide_on_delete),
+			    GTK_SIGNAL_FUNC (sd_delete_event_cb),
 			    NULL);
 	gtk_signal_connect (GTK_OBJECT(window), "key_press_event",
 			    GTK_SIGNAL_FUNC(sd_key_pressed),
 			    NULL);
-	MANAGE_WINDOW_SIGNALS_CONNECT(window);
-	gtk_signal_connect (GTK_OBJECT (preview_btn), "button_press_event",
-			    GTK_SIGNAL_FUNC (sd_preview_popup_cb),
-			    NULL);
+	MANAGE_WINDOW_SIGNALS_CONNECT (window);
 
-	gtk_signal_connect (GTK_OBJECT (remove_btn), "clicked",
-			    GTK_SIGNAL_FUNC (sd_action_cb),
-			    GUINT_TO_POINTER(REMOVE));
-	gtk_signal_connect (GTK_OBJECT (download_btn), "clicked",
-			    GTK_SIGNAL_FUNC (sd_action_cb),
-			    GUINT_TO_POINTER(DOWNLOAD));
-	gtk_signal_connect (GTK_OBJECT (done_btn), "clicked",
-			    GTK_SIGNAL_FUNC (sd_action_cb),
-			    GUINT_TO_POINTER(DONE));
 	gtk_signal_connect (GTK_OBJECT (clist), "select_row",
 			    GTK_SIGNAL_FUNC (sd_select_row_cb),
 			    NULL);
 
-
 	selective.mainwin         = mainwin;
 	selective.window          = window;
 	selective.clist           = clist;
-	selective.preview_btn     = preview_btn;
-	selective.remove_btn      = remove_btn;
-	selective.download_btn    = download_btn;
 	selective.ac_label        = ac_label;
 	selective.ac_button       = ac_button;
 	selective.ac_menu         = ac_menu;
-	selective.preview_popup   = preview_popup;
 	selective.msgs_label      = msgs_label;
 	selective.show_old_chkbtn = show_old_chkbtn;
 
 	gtk_widget_show_all(window);
 }
-