/*
* Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 2001-2003 Hiroyuki Yamamoto and the Sylpheed-Claws team
+ * Copyright (C) 2001-2006 Hiroyuki Yamamoto and the Sylpheed-Claws team
*
* 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
static void toolbar_compose_cb (GtkWidget *widget,
gpointer data);
+static void toolbar_learn_cb (GtkWidget *widget,
+ gpointer data);
+
static void toolbar_reply_cb (GtkWidget *widget,
gpointer data);
{ "A_GOTO_NEXT", N_("Go to Next Unread Message") },
{ "A_IGNORE_THREAD", N_("Ignore thread") },
{ "A_PRINT", N_("Print") },
+ { "A_LEARN_SPAM", N_("Learn Spam or Ham") },
{ "A_SEND", N_("Send Message") },
{ "A_SENDL", N_("Put into queue folder and send later") },
A_REPLY_ALL, A_REPLY_ML, A_FORWARD,
A_TRASH , A_DELETE_REAL, A_EXECUTE, A_GOTO_PREV,
A_GOTO_NEXT, A_IGNORE_THREAD, A_PRINT,
- A_ADDRBOOK, A_SYL_ACTIONS };
+ A_ADDRBOOK, A_LEARN_SPAM, A_SYL_ACTIONS };
for (i = 0; i < sizeof main_items / sizeof main_items[0]; i++) {
items = g_list_append(items, gettext(toolbar_text[main_items[i]].descr));
gint msgv_items[] = { A_COMPOSE_EMAIL, A_REPLY_MESSAGE, A_REPLY_SENDER,
A_REPLY_ALL, A_REPLY_ML, A_FORWARD,
A_TRASH, A_DELETE_REAL, A_GOTO_PREV, A_GOTO_NEXT,
- A_ADDRBOOK, A_SYL_ACTIONS };
+ A_ADDRBOOK, A_LEARN_SPAM, A_SYL_ACTIONS };
for (i = 0; i < sizeof msgv_items / sizeof msgv_items[0]; i++)
items = g_list_append(items, gettext(toolbar_text[msgv_items[i]].descr));
{ A_FORWARD, STOCK_PIXMAP_MAIL_FORWARD, _("Forward") },
{ A_SEPARATOR, 0, ("") },
{ A_TRASH, STOCK_PIXMAP_TRASH, _("Trash") },
+#ifdef USE_SPAMASSASSIN_PLUGIN
+ { A_LEARN_SPAM, STOCK_PIXMAP_SPAM_BTN, _("Spam") },
+#endif
{ A_SEPARATOR, 0, ("") },
{ A_GOTO_NEXT, STOCK_PIXMAP_DOWN_ARROW, _("Next") }
};
{ A_FORWARD, STOCK_PIXMAP_MAIL_FORWARD, _("Forward") },
{ A_SEPARATOR, 0, ("") },
{ A_TRASH, STOCK_PIXMAP_TRASH, _("Trash") },
+#ifdef USE_SPAMASSASSIN_PLUGIN
+ { A_LEARN_SPAM, STOCK_PIXMAP_SPAM_BTN, _("Spam") },
+#endif
{ A_GOTO_NEXT, STOCK_PIXMAP_DOWN_ARROW, _("Next") }
};
toolbar_config[source].item_list =
g_slist_remove(toolbar_config[source].item_list, item);
- if (item->file)
- g_free(item->file);
- if (item->text)
- g_free(item->text);
+ g_free(item->file);
+ g_free(item->text);
g_free(item);
}
g_slist_free(toolbar_config[source].item_list);
compose_btn_type);
}
+static void activate_learn_button (Toolbar *toolbar,
+ ToolbarStyle style,
+ LearnButtonType type)
+{
+ if ((!toolbar->learn_spam_btn) || (!toolbar->learn_ham_btn))
+ return;
+
+ gtk_widget_hide(type == LEARN_SPAM ? toolbar->learn_ham_btn
+ : toolbar->learn_spam_btn);
+ gtk_widget_show(type == LEARN_SPAM ? toolbar->learn_spam_btn
+ : toolbar->learn_ham_btn);
+ toolbar->learn_btn_type = type;
+}
+
+void toolbar_set_learn_button(Toolbar *toolbar,
+ LearnButtonType learn_btn_type)
+{
+ if (toolbar->learn_btn_type != learn_btn_type)
+ activate_learn_button(toolbar,
+ prefs_common.toolbar_style,
+ learn_btn_type);
+}
+
void toolbar_toggle(guint action, gpointer data)
{
MainWindow *mainwin = (MainWindow*)data;
}
}
+static void toolbar_learn_cb(GtkWidget *widget, gpointer data)
+{
+ ToolbarItem *toolbar_item = (ToolbarItem*)data;
+ MainWindow *mainwin;
+ MessageView *msgview;
+
+ g_return_if_fail(toolbar_item != NULL);
+
+ switch (toolbar_item->type) {
+ case TOOLBAR_MAIN:
+ mainwin = (MainWindow*)toolbar_item->parent;
+ if (mainwin->toolbar->learn_btn_type == LEARN_SPAM)
+ mainwindow_learn(mainwin, TRUE);
+ else
+ mainwindow_learn(mainwin, FALSE);
+ break;
+ case TOOLBAR_MSGVIEW:
+ msgview = (MessageView*)toolbar_item->parent;
+ if (msgview->toolbar->learn_btn_type == LEARN_SPAM)
+ messageview_learn(msgview, TRUE);
+ else
+ messageview_learn(msgview, FALSE);
+ break;
+ default:
+ debug_print("toolbar event not supported\n");
+ }
+}
+
/*
* Reply Message
case TOOLBAR_MSGVIEW:
msgview = (MessageView*)toolbar_item->parent;
+ msgview->updating = TRUE;
summary_select_prev_unread(msgview->mainwin->summaryview);
+ msgview->updating = FALSE;
+
+ if (msgview->deferred_destroy) {
+ debug_print("messageview got away!\n");
+ messageview_destroy(msgview);
+ return;
+ }
/* Now we need to update the messageview window */
if (msgview->mainwin->summaryview->selected) {
case TOOLBAR_MSGVIEW:
msgview = (MessageView*)toolbar_item->parent;
+ msgview->updating = TRUE;
summary_select_next_unread(msgview->mainwin->summaryview);
-
+ msgview->updating = FALSE;
+
+ if (msgview->deferred_destroy) {
+ debug_print("messageview got away!\n");
+ messageview_destroy(msgview);
+ return;
+ }
+
/* Now we need to update the messageview window */
if (msgview->mainwin->summaryview->selected) {
GtkCTree *ctree = GTK_CTREE(msgview->mainwin->summaryview->ctree);
{ A_GOTO_NEXT, toolbar_next_unread_cb },
{ A_IGNORE_THREAD, toolbar_ignore_thread_cb },
{ A_PRINT, toolbar_print_cb },
+ { A_LEARN_SPAM, toolbar_learn_cb },
{ A_SEND, toolbar_send_cb },
{ A_SENDL, toolbar_send_later_cb },
GtkWidget *toolbar;
GtkWidget *icon_wid = NULL;
GtkWidget *icon_news;
+ GtkWidget *icon_ham;
GtkWidget *item;
GtkWidget *item_news;
-
+ GtkWidget *item_ham;
guint n_menu_entries;
ComboButton *getall_combo;
ComboButton *reply_combo;
ComboButton *replylist_combo;
ComboButton *replysender_combo;
ComboButton *fwd_combo;
+ ComboButton *compose_combo;
GtkTooltips *toolbar_tips;
ToolbarSylpheedActions *action_item;
toolbar_data->item_list =
g_slist_append(toolbar_data->item_list,
toolbar_item);
-
icon_wid = stock_pixmap_widget(container, stock_pixmap_get_icon(toolbar_item->file));
item = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar),
toolbar_item->text,
gtk_tooltips_set_tip(GTK_TOOLTIPS(toolbar_tips),
toolbar_data->compose_news_btn,
_("Compose News"), NULL);
+ compose_combo = gtkut_combo_button_create(toolbar_data->compose_mail_btn, NULL, 0,
+ "<Compose>", (gpointer)toolbar_item);
+ gtk_button_set_relief(GTK_BUTTON(compose_combo->arrow),
+ GTK_RELIEF_NONE);
+ gtk_toolbar_append_widget(GTK_TOOLBAR(toolbar),
+ GTK_WIDGET_PTR(compose_combo),
+ _("Compose with selected Account"), "Compose");
+ toolbar_data->compose_combo = compose_combo;
+ break;
+ case A_LEARN_SPAM:
+ icon_ham = stock_pixmap_widget(container, STOCK_PIXMAP_HAM_BTN);
+ item_ham = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar),
+ _("Ham"),
+ (""),
+ (""),
+ icon_ham, G_CALLBACK(toolbar_buttons_cb),
+ toolbar_item);
+ toolbar_data->learn_spam_btn = item;
+ gtk_tooltips_set_tip(GTK_TOOLTIPS(toolbar_tips),
+ toolbar_data->learn_spam_btn,
+ _("Learn Spam"), NULL);
+ toolbar_data->learn_ham_btn = item_ham;
+ gtk_tooltips_set_tip(GTK_TOOLTIPS(toolbar_tips),
+ toolbar_data->learn_ham_btn,
+ _("Learn Ham"), NULL);
break;
case A_REPLY_MESSAGE:
toolbar_data->reply_btn = item;
activate_compose_button(toolbar_data,
prefs_common.toolbar_style,
toolbar_data->compose_btn_type);
+ if (type != TOOLBAR_COMPOSE)
+ activate_learn_button(toolbar_data, prefs_common.toolbar_style,
+ LEARN_SPAM);
gtk_widget_show_all(toolbar);
if (toolbar->getall_btn)
SET_WIDGET_COND(GTK_WIDGET_PTR(toolbar->getall_combo),
M_HAVE_ACCOUNT|M_UNLOCKED);
+ if (toolbar->compose_mail_btn)
+ SET_WIDGET_COND(GTK_WIDGET_PTR(toolbar->compose_combo),
+ M_HAVE_ACCOUNT);
SET_WIDGET_COND(toolbar->compose_news_btn, M_HAVE_ACCOUNT);
SET_WIDGET_COND(toolbar->reply_btn,
- M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST);
+ M_HAVE_ACCOUNT|M_TARGET_EXIST);
if (toolbar->reply_btn)
SET_WIDGET_COND(GTK_WIDGET_PTR(toolbar->reply_combo),
- M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST);
- SET_WIDGET_COND(toolbar->replyall_btn,
- M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST);
+ M_HAVE_ACCOUNT|M_TARGET_EXIST);
+ if (toolbar->replyall_btn)
+ SET_WIDGET_COND(toolbar->replyall_btn,
+ M_HAVE_ACCOUNT|M_TARGET_EXIST);
if (toolbar->replyall_btn)
SET_WIDGET_COND(GTK_WIDGET_PTR(toolbar->replyall_combo),
- M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST);
+ M_HAVE_ACCOUNT|M_TARGET_EXIST);
SET_WIDGET_COND(toolbar->replylist_btn,
- M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST);
+ M_HAVE_ACCOUNT|M_TARGET_EXIST);
if (toolbar->replylist_btn)
SET_WIDGET_COND(GTK_WIDGET_PTR(toolbar->replylist_combo),
- M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST);
+ M_HAVE_ACCOUNT|M_TARGET_EXIST);
SET_WIDGET_COND(toolbar->replysender_btn,
- M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST);
+ M_HAVE_ACCOUNT|M_TARGET_EXIST);
if (toolbar->replysender_btn)
SET_WIDGET_COND(GTK_WIDGET_PTR(toolbar->replysender_combo),
- M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST);
+ M_HAVE_ACCOUNT|M_TARGET_EXIST);
SET_WIDGET_COND(toolbar->fwd_btn, M_HAVE_ACCOUNT|M_TARGET_EXIST);
if (toolbar->fwd_btn)
SET_WIDGET_COND(GTK_WIDGET_PTR(toolbar->fwd_combo),
M_HAVE_ACCOUNT|M_TARGET_EXIST);
if (toolbar->fwd_combo) {
GtkWidget *submenu = gtk_item_factory_get_widget(toolbar->fwd_combo->factory, "/Redirect");
- SET_WIDGET_COND(submenu, M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST);
+ SET_WIDGET_COND(submenu, M_HAVE_ACCOUNT|M_TARGET_EXIST);
}
if (prefs_common.next_unread_msg_dialog == NEXTUNREADMSGDIALOG_ASSUME_NO) {
} else {
SET_WIDGET_COND(toolbar->next_btn, 0);
}
-
- SET_WIDGET_COND(toolbar->trash_btn,
- M_TARGET_EXIST|M_ALLOW_DELETE|M_UNLOCKED);
- SET_WIDGET_COND(toolbar->delete_btn,
- M_TARGET_EXIST|M_ALLOW_DELETE|M_UNLOCKED);
- SET_WIDGET_COND(toolbar->exec_btn, M_DELAY_EXEC);
+
+ if (toolbar->trash_btn)
+ SET_WIDGET_COND(toolbar->trash_btn,
+ M_TARGET_EXIST|M_ALLOW_DELETE);
+ if (toolbar->delete_btn)
+ SET_WIDGET_COND(toolbar->delete_btn,
+ M_TARGET_EXIST|M_ALLOW_DELETE);
+ if (toolbar->exec_btn)
+ SET_WIDGET_COND(toolbar->exec_btn, M_DELAY_EXEC);
+
+ if (toolbar->learn_ham_btn)
+ SET_WIDGET_COND(toolbar->learn_ham_btn, M_TARGET_EXIST|M_CAN_LEARN_SPAM);
+ if (toolbar->learn_spam_btn)
+ SET_WIDGET_COND(toolbar->learn_spam_btn, M_TARGET_EXIST|M_CAN_LEARN_SPAM);
for (cur = toolbar->action_list; cur != NULL; cur = cur->next) {
ToolbarSylpheedActions *act = (ToolbarSylpheedActions*)cur->data;
while (entry_list != NULL) {
Entry *e = (Entry*) entry_list->data;
- if (e)
- g_free(e);
+ g_free(e);
entry_list = g_slist_remove(entry_list, e);
}
toolbar->send_btn = NULL;
toolbar->compose_mail_btn = NULL;
toolbar->compose_news_btn = NULL;
+ toolbar->compose_combo = NULL;
toolbar->reply_btn = NULL;
toolbar->replysender_btn = NULL;
toolbar->replyall_btn = NULL;
if (prefs_common.work_offline)
if (alertpanel(_("Offline warning"),
_("You're working offline. Override?"),
- GTK_STOCK_YES, GTK_STOCK_NO, NULL) != G_ALERTDEFAULT)
+ GTK_STOCK_NO, GTK_STOCK_YES,
+ NULL) != G_ALERTALTERNATE)
return;
/* ask for confirmation before sending queued messages only
if (found && !prefs_common.work_offline) {
if (alertpanel(_("Send queued messages"),
_("Send all queued messages?"),
- GTK_STOCK_YES, GTK_STOCK_NO, NULL) != G_ALERTDEFAULT)
+ GTK_STOCK_CANCEL, _("_Send"),
+ NULL) != G_ALERTALTERNATE)
return;
}
}
projects / claws.git / blobdiff