/*
* 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
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
/*
#include "defs.h"
#include <glib.h>
+#include <glib/gi18n.h>
#include <stdio.h>
#include <stdlib.h>
#include <dirent.h>
#include <math.h>
#include <setjmp.h>
-#include "intl.h"
#include "mainwindow.h"
#include "summaryview.h"
#include "compose.h"
guint action);
static void toolbar_delete_cb (GtkWidget *widget,
gpointer data);
+static void toolbar_trash_cb (GtkWidget *widget,
+ gpointer data);
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);
static void toolbar_forward_cb (GtkWidget *widget,
gpointer data);
+static void toolbar_prev_unread_cb (GtkWidget *widget,
+ gpointer data);
static void toolbar_next_unread_cb (GtkWidget *widget,
gpointer data);
} toolbar_text [] = {
{ "A_RECEIVE_ALL", N_("Receive Mail on all Accounts") },
{ "A_RECEIVE_CUR", N_("Receive Mail on current Account") },
- { "A_SEND_QUEUED", N_("Send Queued Message(s)") },
+ { "A_SEND_QUEUED", N_("Send Queued Messages") },
{ "A_COMPOSE_EMAIL", N_("Compose Email") },
{ "A_COMPOSE_NEWS", N_("Compose News") },
{ "A_REPLY_MESSAGE", N_("Reply to Message") },
{ "A_REPLY_ALL", N_("Reply to All") },
{ "A_REPLY_ML", N_("Reply to Mailing-list") },
{ "A_FORWARD", N_("Forward Message") },
- { "A_DELETE", N_("Delete Message") },
+ { "A_TRASH", N_("Trash Message") },
+ { "A_DELETE_REAL", N_("Delete Message") },
{ "A_EXECUTE", N_("Execute") },
- { "A_GOTO_NEXT", N_("Goto Next Message") },
- { "A_IGNORE_THREAD", N_("Ignore thread") },
- { "A_PRINT", N_("Print") },
+ { "A_GOTO_PREV", N_("Go to Previous Unread Message") },
+ { "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") },
#ifdef USE_ASPELL
{ "A_CHECK_SPELLING", N_("Check spelling") },
#endif
- { "A_SYL_ACTIONS", N_("Sylpheed Actions Feature") },
+ { "A_SYL_ACTIONS", N_("Sylpheed-Claws Actions Feature") },
{ "A_SEPARATOR", "Separator" }
};
gint i;
for (i = 0; i < N_ACTION_VAL; i++) {
- if (g_strcasecmp(gettext(toolbar_text[i].descr), descr) == 0)
+ if (g_utf8_collate(gettext(toolbar_text[i].descr), descr) == 0)
return i;
}
gint i;
for (i = 0; i < N_ACTION_VAL; i++) {
- if (g_strcasecmp(toolbar_text[i].index_str, text) == 0)
+ if (g_utf8_collate(toolbar_text[i].index_str, text) == 0)
return i;
}
-
+
return -1;
}
gint main_items[] = { A_RECEIVE_ALL, A_RECEIVE_CUR, A_SEND_QUEUED,
A_COMPOSE_EMAIL, A_REPLY_MESSAGE, A_REPLY_SENDER,
A_REPLY_ALL, A_REPLY_ML, A_FORWARD,
- A_DELETE, A_EXECUTE, A_GOTO_NEXT,
- A_IGNORE_THREAD, A_PRINT,
- A_ADDRBOOK, A_SYL_ACTIONS };
+ A_TRASH , A_DELETE_REAL, A_EXECUTE, A_GOTO_PREV,
+ A_GOTO_NEXT, A_IGNORE_THREAD, A_PRINT,
+ 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));
- if (main_items[i] == A_PRINT) {
- g_print("$$$ descr %s, trans %s\n",
- toolbar_text[main_items[i]].descr,
- gettext(toolbar_text[main_items[i]].descr));
- }
}
}
else if (source == TOOLBAR_COMPOSE) {
else if (source == TOOLBAR_MSGVIEW) {
gint msgv_items[] = { A_COMPOSE_EMAIL, A_REPLY_MESSAGE, A_REPLY_SENDER,
A_REPLY_ALL, A_REPLY_ML, A_FORWARD,
- A_DELETE, A_GOTO_NEXT, A_ADDRBOOK,
- A_SYL_ACTIONS };
+ A_TRASH, A_DELETE_REAL, A_GOTO_PREV, A_GOTO_NEXT,
+ 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));
GList *attr;
gchar *name, *value;
ToolbarItem *item = NULL;
+ gboolean rewrite = FALSE;
attr = xml_get_current_tag_attr(file);
item = g_new0(ToolbarItem, 1);
name = ((XMLAttr *)attr->data)->name;
value = ((XMLAttr *)attr->data)->value;
- if (g_strcasecmp(name, TOOLBAR_ICON_FILE) == 0)
+ if (g_utf8_collate(name, TOOLBAR_ICON_FILE) == 0)
item->file = g_strdup (value);
- else if (g_strcasecmp(name, TOOLBAR_ICON_TEXT) == 0)
+ else if (g_utf8_collate(name, TOOLBAR_ICON_TEXT) == 0)
item->text = g_strdup (value);
- else if (g_strcasecmp(name, TOOLBAR_ICON_ACTION) == 0)
+ else if (g_utf8_collate(name, TOOLBAR_ICON_ACTION) == 0)
item->index = toolbar_ret_val_from_text(value);
-
+ if (item->index == -1 && !strcmp(value, "A_DELETE")) {
+ /* switch button */
+ item->index = A_TRASH;
+ g_free(item->file);
+ item->file = g_strdup("trash_btn");
+ g_free(item->text);
+ item->text = g_strdup(_("Trash"));
+ rewrite = TRUE;
+ }
attr = g_list_next(attr);
}
if (item->index != -1) {
toolbar_config[source].item_list = g_slist_append(toolbar_config[source].item_list,
item);
}
+ if (rewrite) {
+ toolbar_save_config_file(source);
+ }
}
static void toolbar_set_default_main(void)
gint icon;
gchar *text;
} default_toolbar[] = {
- { A_RECEIVE_CUR, STOCK_PIXMAP_MAIL_RECEIVE, _("Get") },
- { A_RECEIVE_ALL, STOCK_PIXMAP_MAIL_RECEIVE_ALL, _("Get All") },
+ { A_RECEIVE_ALL, STOCK_PIXMAP_MAIL_RECEIVE_ALL, _("Get Mail") },
{ A_SEPARATOR, 0, ("") },
{ A_SEND_QUEUED, STOCK_PIXMAP_MAIL_SEND_QUEUE, _("Send") },
- { A_COMPOSE_EMAIL, STOCK_PIXMAP_MAIL_COMPOSE, _("Email") },
+ { A_COMPOSE_EMAIL, STOCK_PIXMAP_MAIL_COMPOSE,
+ (gchar*)Q_("Toolbar|Compose") },
{ A_SEPARATOR, 0, ("") },
{ A_REPLY_MESSAGE, STOCK_PIXMAP_MAIL_REPLY, _("Reply") },
{ A_REPLY_ALL, STOCK_PIXMAP_MAIL_REPLY_TO_ALL, _("All") },
{ A_REPLY_SENDER, STOCK_PIXMAP_MAIL_REPLY_TO_AUTHOR, _("Sender") },
{ A_FORWARD, STOCK_PIXMAP_MAIL_FORWARD, _("Forward") },
{ A_SEPARATOR, 0, ("") },
- { A_DELETE, STOCK_PIXMAP_CLOSE, _("Delete") },
- { A_EXECUTE, STOCK_PIXMAP_EXEC, _("Execute") },
+ { 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_SEPARATOR, 0, ("") },
{ A_INSERT, STOCK_PIXMAP_INSERT_FILE, _("Insert") },
{ A_ATTACH, STOCK_PIXMAP_MAIL_ATTACH, _("Attach") },
- { A_SIG, STOCK_PIXMAP_MAIL_SIGN, _("Signature") },
- { A_SEPARATOR, 0, ("") },
- { A_EXTEDITOR, STOCK_PIXMAP_EDIT_EXTERN, _("Editor") },
- { A_LINEWRAP_CURRENT, STOCK_PIXMAP_LINEWRAP_CURRENT, _("Wrap paragraph") },
- { A_LINEWRAP_ALL, STOCK_PIXMAP_LINEWRAP_ALL, _("Wrap all") },
{ A_SEPARATOR, 0, ("") },
{ A_ADDRBOOK, STOCK_PIXMAP_ADDRESS_BOOK, _("Address") }
};
{ A_REPLY_SENDER, STOCK_PIXMAP_MAIL_REPLY_TO_AUTHOR, _("Sender") },
{ A_FORWARD, STOCK_PIXMAP_MAIL_FORWARD, _("Forward") },
{ A_SEPARATOR, 0, ("") },
- { A_DELETE, STOCK_PIXMAP_CLOSE, _("Delete") },
+ { 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") }
};
g_free( fileSpec );
if( pfile ) {
fp = pfile->fp;
- fprintf(fp, "<?xml version=\"1.0\" encoding=\"%s\" ?>\n",
- conv_get_current_charset_str());
+ fprintf(fp, "<?xml version=\"1.0\" encoding=\"%s\" ?>\n", CS_INTERNAL);
fprintf(fp, "<%s>\n", TOOLBAR_TAG_INDEX);
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);
action_p = strstr(action, ": ");
action_p[0] = 0x00;
- if (g_strcasecmp(act->name, action) == 0) {
+ if (g_utf8_collate(act->name, action) == 0) {
found = TRUE;
g_free(action);
break;
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;
gtk_toolbar_set_style(GTK_TOOLBAR(toolbar_wid),
GTK_TOOLBAR_BOTH);
break;
+ case TOOLBAR_BOTH_HORIZ:
+ gtk_toolbar_set_style(GTK_TOOLBAR(toolbar_wid),
+ GTK_TOOLBAR_BOTH_HORIZ);
+ break;
default:
return;
}
prefs_common.toolbar_style = (ToolbarStyle)action;
- gtk_widget_set_usize(handlebox_wid, 1, -1);
+ gtk_widget_set_size_request(handlebox_wid, 1, -1);
if (prefs_common.toolbar_style != TOOLBAR_NONE) {
gtk_widget_show(handlebox_wid);
summary_execute(mainwin->summaryview);
}
+/*
+ * Delete current/selected(s) message(s)
+ */
+static void toolbar_trash_cb(GtkWidget *widget, gpointer data)
+{
+ ToolbarItem *toolbar_item = (ToolbarItem*)data;
+ MainWindow *mainwin;
+
+ g_return_if_fail(toolbar_item != NULL);
+ g_return_if_fail(toolbar_item->parent);
+
+ switch (toolbar_item->type) {
+ case TOOLBAR_MSGVIEW:
+ messageview_delete((MessageView *)toolbar_item->parent);
+ break;
+ case TOOLBAR_MAIN:
+ mainwin = (MainWindow *)toolbar_item->parent;
+ summary_delete_trash(mainwin->summaryview);
+ break;
+ default:
+ debug_print("toolbar event not supported\n");
+ break;
+ }
+}
+
/*
* Delete current/selected(s) message(s)
*/
}
}
+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
toolbar_reply(data, COMPOSE_FORWARD);
}
+/*
+ * Goto Prev Unread Message
+ */
+static void toolbar_prev_unread_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;
+ summary_select_prev_unread(mainwin->summaryview);
+ break;
+
+ 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) {
+ GtkCTree *ctree = GTK_CTREE(msgview->mainwin->summaryview->ctree);
+
+ MsgInfo * msginfo = gtk_ctree_node_get_row_data(ctree,
+ msgview->mainwin->summaryview->selected);
+
+ messageview_show(msgview, msginfo,
+ msgview->all_headers);
+ } else {
+ gtk_widget_destroy(msgview->window);
+ }
+ break;
+ default:
+ debug_print("toolbar event not supported\n");
+ }
+}
/*
* Goto Next Unread Message
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_REPLY_ALL, toolbar_reply_to_all_cb },
{ A_REPLY_ML, toolbar_reply_to_list_cb },
{ A_FORWARD, toolbar_forward_cb },
- { A_DELETE, toolbar_delete_cb },
+ { A_TRASH, toolbar_trash_cb },
+ { A_DELETE_REAL, toolbar_delete_cb },
{ A_EXECUTE, toolbar_exec_cb },
+ { A_GOTO_PREV, toolbar_prev_unread_cb },
{ 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 *replyall_combo;
ComboButton *replylist_combo;
ComboButton *replysender_combo;
ComboButton *fwd_combo;
+ ComboButton *compose_combo;
GtkTooltips *toolbar_tips;
ToolbarSylpheedActions *action_item;
for (cur = toolbar_list; cur != NULL; cur = cur->next) {
- if (g_strcasecmp(((ToolbarItem*)cur->data)->file, TOOLBAR_TAG_SEPARATOR) == 0) {
+ if (g_ascii_strcasecmp(((ToolbarItem*)cur->data)->file, TOOLBAR_TAG_SEPARATOR) == 0) {
gtk_toolbar_append_space(GTK_TOOLBAR(toolbar));
continue;
}
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->getall_btn,
_("Receive Mail on all Accounts"), NULL);
+ getall_combo = gtkut_combo_button_create(toolbar_data->getall_btn, NULL, 0,
+ "<GetAll>", (gpointer)toolbar_item);
+ gtk_button_set_relief(GTK_BUTTON(getall_combo->arrow),
+ GTK_RELIEF_NONE);
+ gtk_toolbar_append_widget(GTK_TOOLBAR(toolbar),
+ GTK_WIDGET_PTR(getall_combo),
+ _("Receive Mail on selected Account"), "Reply");
+ toolbar_data->getall_combo = getall_combo;
break;
case A_RECEIVE_CUR:
toolbar_data->get_btn = item;
toolbar_data->send_btn = item;
gtk_tooltips_set_tip(GTK_TOOLTIPS(toolbar_tips),
toolbar_data->send_btn,
- _("Send Queued Message(s)"), NULL);
+ _("Send Queued Messages"), NULL);
break;
case A_COMPOSE_EMAIL:
icon_news = stock_pixmap_widget(container, STOCK_PIXMAP_NEWS_COMPOSE);
item_news = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar),
- _("News"),
+ _("Compose"),
(""),
(""),
icon_news, G_CALLBACK(toolbar_buttons_cb),
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;
_("Forward Message"), "Fwd");
toolbar_data->fwd_combo = fwd_combo;
break;
- case A_DELETE:
+ case A_TRASH:
+ toolbar_data->trash_btn = item;
+ gtk_tooltips_set_tip(GTK_TOOLTIPS(toolbar_tips),
+ toolbar_data->trash_btn,
+ _("Trash Message"), NULL);
+ break;
+ case A_DELETE_REAL:
toolbar_data->delete_btn = item;
gtk_tooltips_set_tip(GTK_TOOLTIPS(toolbar_tips),
toolbar_data->delete_btn,
toolbar_data->exec_btn,
_("Execute"), NULL);
break;
+ case A_GOTO_PREV:
+ toolbar_data->prev_btn = item;
+ gtk_tooltips_set_tip(GTK_TOOLTIPS(toolbar_tips),
+ toolbar_data->prev_btn,
+ _("Go to Previous Unread Message"),
+ NULL);
+ break;
case A_GOTO_NEXT:
toolbar_data->next_btn = item;
gtk_tooltips_set_tip(GTK_TOOLTIPS(toolbar_tips),
toolbar_data->next_btn,
- _("Goto Next Message"), NULL);
+ _("Go to Next Unread Message"),
+ NULL);
break;
/* Compose Toolbar */
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);
toolbar_style(type, prefs_common.toolbar_style, data);
- if (type == TOOLBAR_MAIN)
+ if (type == TOOLBAR_MAIN) {
toolbar_main_set_sensitive((MainWindow*)data);
+ account_set_menu_only_toolbar();
+ }
+}
+
+#define GTK_BUTTON_SET_SENSITIVE(widget,sensitive) { \
+ gboolean in_btn = FALSE; \
+ if (GTK_IS_BUTTON(widget)) \
+ in_btn = GTK_BUTTON(widget)->in_button; \
+ gtk_widget_set_sensitive(widget, sensitive); \
+ if (GTK_IS_BUTTON(widget)) \
+ GTK_BUTTON(widget)->in_button = in_btn; \
}
void toolbar_main_set_sensitive(gpointer data)
entry_list = g_slist_append(entry_list, e); \
}
- SET_WIDGET_COND(toolbar->get_btn, M_HAVE_ACCOUNT|M_UNLOCKED);
- SET_WIDGET_COND(toolbar->getall_btn, M_HAVE_ACCOUNT|M_UNLOCKED);
- SET_WIDGET_COND(toolbar->compose_news_btn, M_HAVE_ACCOUNT);
- SET_WIDGET_COND(toolbar->reply_btn,
- M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST);
- if (toolbar->reply_btn)
+
+ if (toolbar->get_btn)
+ SET_WIDGET_COND(toolbar->get_btn,
+ M_HAVE_ACCOUNT|M_UNLOCKED);
+
+ if (toolbar->getall_btn) {
+ SET_WIDGET_COND(toolbar->getall_btn,
+ M_HAVE_ACCOUNT|M_UNLOCKED);
+ SET_WIDGET_COND(GTK_WIDGET_PTR(toolbar->getall_combo),
+ M_HAVE_ACCOUNT|M_UNLOCKED);
+ }
+ if (toolbar->send_btn) {
+ SET_WIDGET_COND(toolbar->send_btn,
+ M_HAVE_QUEUED_MAILS);
+ }
+ 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);
+ }
+ if (toolbar->reply_btn) {
+ SET_WIDGET_COND(toolbar->reply_btn,
+ M_HAVE_ACCOUNT|M_TARGET_EXIST);
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);
- if (toolbar->replyall_btn)
+ M_HAVE_ACCOUNT|M_TARGET_EXIST);
+ }
+ if (toolbar->replyall_btn) {
+ SET_WIDGET_COND(toolbar->replyall_btn,
+ M_HAVE_ACCOUNT|M_TARGET_EXIST);
SET_WIDGET_COND(GTK_WIDGET_PTR(toolbar->replyall_combo),
- M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST);
- SET_WIDGET_COND(toolbar->replylist_btn,
- M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST);
- if (toolbar->replylist_btn)
+ M_HAVE_ACCOUNT|M_TARGET_EXIST);
+ }
+ if (toolbar->replylist_btn) {
+ SET_WIDGET_COND(toolbar->replylist_btn,
+ M_HAVE_ACCOUNT|M_TARGET_EXIST);
SET_WIDGET_COND(GTK_WIDGET_PTR(toolbar->replylist_combo),
- M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST);
- SET_WIDGET_COND(toolbar->replysender_btn,
- M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST);
- if (toolbar->replysender_btn)
+ M_HAVE_ACCOUNT|M_TARGET_EXIST);
+ }
+ if (toolbar->replysender_btn) {
+ SET_WIDGET_COND(toolbar->replysender_btn,
+ M_HAVE_ACCOUNT|M_TARGET_EXIST);
SET_WIDGET_COND(GTK_WIDGET_PTR(toolbar->replysender_combo),
- M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST);
- SET_WIDGET_COND(toolbar->fwd_btn, M_HAVE_ACCOUNT|M_TARGET_EXIST);
- if (toolbar->fwd_btn)
+ M_HAVE_ACCOUNT|M_TARGET_EXIST);
+ }
+ if (toolbar->fwd_btn) {
+ SET_WIDGET_COND(toolbar->fwd_btn,
+ M_HAVE_ACCOUNT|M_TARGET_EXIST);
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_TARGET_EXIST);
+ }
if (prefs_common.next_unread_msg_dialog == NEXTUNREADMSGDIALOG_ASSUME_NO) {
SET_WIDGET_COND(toolbar->next_btn, M_MSG_EXIST);
} else {
SET_WIDGET_COND(toolbar->next_btn, 0);
}
+
+ 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);
- 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->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;
if (e->widget != NULL) {
sensitive = ((e->cond & state) == e->cond);
- gtk_widget_set_sensitive(e->widget, sensitive);
+ GTK_BUTTON_SET_SENSITIVE(e->widget, sensitive);
}
}
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);
}
activate_compose_button(toolbar,
prefs_common.toolbar_style,
toolbar->compose_btn_type);
+
}
void toolbar_comp_set_sensitive(gpointer data, gboolean sensitive)
GSList *items = compose->toolbar->action_list;
if (compose->toolbar->send_btn)
- gtk_widget_set_sensitive(compose->toolbar->send_btn, sensitive);
+ GTK_BUTTON_SET_SENSITIVE(compose->toolbar->send_btn, sensitive);
if (compose->toolbar->sendl_btn)
- gtk_widget_set_sensitive(compose->toolbar->sendl_btn, sensitive);
+ GTK_BUTTON_SET_SENSITIVE(compose->toolbar->sendl_btn, sensitive);
if (compose->toolbar->draft_btn )
- gtk_widget_set_sensitive(compose->toolbar->draft_btn , sensitive);
+ GTK_BUTTON_SET_SENSITIVE(compose->toolbar->draft_btn , sensitive);
if (compose->toolbar->insert_btn )
- gtk_widget_set_sensitive(compose->toolbar->insert_btn , sensitive);
+ GTK_BUTTON_SET_SENSITIVE(compose->toolbar->insert_btn , sensitive);
if (compose->toolbar->attach_btn)
- gtk_widget_set_sensitive(compose->toolbar->attach_btn, sensitive);
+ GTK_BUTTON_SET_SENSITIVE(compose->toolbar->attach_btn, sensitive);
if (compose->toolbar->sig_btn)
- gtk_widget_set_sensitive(compose->toolbar->sig_btn, sensitive);
+ GTK_BUTTON_SET_SENSITIVE(compose->toolbar->sig_btn, sensitive);
if (compose->toolbar->exteditor_btn)
- gtk_widget_set_sensitive(compose->toolbar->exteditor_btn, sensitive);
+ GTK_BUTTON_SET_SENSITIVE(compose->toolbar->exteditor_btn, sensitive);
if (compose->toolbar->linewrap_current_btn)
- gtk_widget_set_sensitive(compose->toolbar->linewrap_current_btn, sensitive);
+ GTK_BUTTON_SET_SENSITIVE(compose->toolbar->linewrap_current_btn, sensitive);
if (compose->toolbar->linewrap_all_btn)
- gtk_widget_set_sensitive(compose->toolbar->linewrap_all_btn, sensitive);
+ GTK_BUTTON_SET_SENSITIVE(compose->toolbar->linewrap_all_btn, sensitive);
if (compose->toolbar->addrbook_btn)
- gtk_widget_set_sensitive(compose->toolbar->addrbook_btn, sensitive);
+ GTK_BUTTON_SET_SENSITIVE(compose->toolbar->addrbook_btn, sensitive);
#ifdef USE_ASPELL
if (compose->toolbar->spellcheck_btn)
- gtk_widget_set_sensitive(compose->toolbar->spellcheck_btn, sensitive);
+ GTK_BUTTON_SET_SENSITIVE(compose->toolbar->spellcheck_btn, sensitive);
#endif
for (; items != NULL; items = g_slist_next(items)) {
ToolbarSylpheedActions *item = (ToolbarSylpheedActions *)items->data;
- gtk_widget_set_sensitive(item->widget, sensitive);
+ GTK_BUTTON_SET_SENSITIVE(item->widget, sensitive);
}
}
toolbar->toolbar = NULL;
toolbar->get_btn = NULL;
toolbar->getall_btn = NULL;
+ toolbar->getall_combo = NULL;
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;
toolbar->replylist_btn = NULL;
toolbar->fwd_btn = NULL;
+ toolbar->trash_btn = NULL;
toolbar->delete_btn = NULL;
+ toolbar->prev_btn = NULL;
toolbar->next_btn = NULL;
toolbar->exec_btn = NULL;
MainWindow *mainwin;
MessageView *msgview;
GSList *msginfo_list = NULL;
- gchar *body;
g_return_if_fail(toolbar_item != NULL);
break;
case TOOLBAR_MSGVIEW:
msgview = (MessageView*)toolbar_item->parent;
+ g_return_if_fail(msgview != NULL);
msginfo_list = g_slist_append(msginfo_list, msgview->msginfo);
break;
default:
}
g_return_if_fail(msgview != NULL);
- body = messageview_get_selection(msgview);
-
g_return_if_fail(msginfo_list != NULL);
- compose_reply_mode((ComposeMode)action, msginfo_list, body);
-
- g_free(body);
+ compose_reply_from_messageview(msgview, msginfo_list, action);
g_slist_free(msginfo_list);
/* TODO: update reply state ion summaryview */
void send_queue_cb(gpointer data, guint action, GtkWidget *widget)
{
GList *list;
+ gboolean found;
+ gboolean got_error = FALSE;
+ gchar *errstr = NULL;
if (prefs_common.work_offline)
if (alertpanel(_("Offline warning"),
_("You're working offline. Override?"),
- _("Yes"), _("No"), NULL) != G_ALERTDEFAULT)
+ GTK_STOCK_NO, GTK_STOCK_YES,
+ NULL) != G_ALERTALTERNATE)
return;
+ /* ask for confirmation before sending queued messages only
+ in online mode and if there is at least one message queued
+ in any of the folder queue
+ */
+ if (prefs_common.confirm_send_queued_messages) {
+ found = FALSE;
+ /* check if there's a queued message */
+ for (list = folder_get_list(); !found && list != NULL; list = list->next) {
+ Folder *folder = list->data;
+
+ found = !procmsg_queue_is_empty(folder->queue);
+ }
+ /* if necessary, ask for confirmation before sending */
+ if (found && !prefs_common.work_offline) {
+ if (alertpanel(_("Send queued messages"),
+ _("Send all queued messages?"),
+ GTK_STOCK_CANCEL, _("_Send"),
+ NULL) != G_ALERTALTERNATE)
+ return;
+ }
+ }
+
for (list = folder_get_list(); list != NULL; list = list->next) {
Folder *folder = list->data;
if (folder->queue) {
- procmsg_send_queue(folder->queue, prefs_common.savemsg);
- folder_item_scan(folder->queue);
+ if (procmsg_send_queue(folder->queue,
+ prefs_common.savemsg,
+ &errstr) < 0)
+ got_error = TRUE;
+ }
+ }
+ if (got_error) {
+ if (!errstr)
+ alertpanel_error_log(_("Some errors occurred while "
+ "sending queued messages."));
+ else {
+ gchar *tmp = g_strdup_printf(_("Some errors occurred "
+ "while sending queued messages:\n%s"), errstr);
+ g_free(errstr);
+ alertpanel_error_log(tmp);
+ g_free(tmp);
}
}
}
FolderItem *item = mainwin->summaryview->folder_item;
GList * list;
GList * cur;
-
+
if (item) {
ac = account_find_from_item(item);
if (ac && ac->protocol != A_NNTP) {
if (mainwin->summaryview->folder_item) {
ac = mainwin->summaryview->folder_item->folder->account;
if (ac && ac->protocol == A_NNTP) {
- compose_new(ac,
- mainwin->summaryview->folder_item->path,
- NULL);
+ compose_new_with_folderitem(ac,
+ mainwin->summaryview->folder_item);
return;
}
}
for(cur = list ; cur != NULL ; cur = g_list_next(cur)) {
ac = (PrefsAccount *) cur->data;
if (ac->protocol == A_NNTP) {
- compose_new(ac, NULL, NULL);
+ compose_new_with_folderitem(ac,
+ mainwin->summaryview->folder_item);
return;
}
}
projects / claws.git / blobdiff