/*
* Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 2001-2003 Hiroyuki Yamamoto and the Sylpheed-Claws team
+ * Copyright (C) 2001-2009 Hiroyuki Yamamoto and the Claws Mail 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
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* GNU General Public License for more details.
*
* 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
*/
/*
#include <math.h>
#include <setjmp.h>
+#include "main.h"
#include "mainwindow.h"
#include "summaryview.h"
#include "compose.h"
#include "prefs_common.h"
#include "prefs_toolbar.h"
#include "alertpanel.h"
+#include "imap.h"
/* elements */
#define TOOLBAR_TAG_INDEX "toolbar"
#define TOOLBAR_ICON_TEXT "text"
#define TOOLBAR_ICON_ACTION "action"
-gboolean toolbar_is_duplicate (gint action,
+static void toolbar_init(Toolbar * toolbar);
+static gboolean toolbar_is_duplicate (gint action,
ToolbarType source);
static void toolbar_parse_item (XMLFile *file,
ToolbarType source);
/* toolbar callbacks */
static void toolbar_reply (gpointer data,
- guint action);
+ guint action);
+static void toolbar_learn (gpointer data,
+ guint action);
static void toolbar_delete_cb (GtkWidget *widget,
gpointer data);
static void toolbar_trash_cb (GtkWidget *widget,
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_ignore_thread_cb (GtkWidget *widget,
gpointer data);
+static void toolbar_watch_thread_cb (GtkWidget *widget,
+ gpointer data);
+
static void toolbar_print_cb (GtkWidget *widget,
gpointer data);
static void toolbar_actions_execute_cb (GtkWidget *widget,
gpointer data);
+static void toolbar_plugins_execute_cb (GtkWidget *widget,
+ gpointer data);
static void toolbar_send_cb (GtkWidget *widget,
gpointer data);
static void toolbar_draft_cb (GtkWidget *widget,
gpointer data);
+static void toolbar_close_cb (GtkWidget *widget,
+ gpointer data);
+static void toolbar_preferences_cb (GtkWidget *widget,
+ gpointer data);
+static void toolbar_open_mail_cb (GtkWidget *widget,
+ gpointer data);
static void toolbar_insert_cb (GtkWidget *widget,
gpointer data);
static void toolbar_attach_cb (GtkWidget *widget,
gpointer data);
static void toolbar_addrbook_cb (GtkWidget *widget,
gpointer data);
-#ifdef USE_ASPELL
+#ifdef USE_ENCHANT
static void toolbar_check_spelling_cb (GtkWidget *widget,
gpointer data);
#endif
+static void toolbar_cancel_inc_cb (GtkWidget *widget,
+ gpointer data);
struct {
gchar *index_str;
{ "A_REPLY_SENDER", N_("Reply to Sender") },
{ "A_REPLY_ALL", N_("Reply to All") },
{ "A_REPLY_ML", N_("Reply to Mailing-list") },
+ { "A_OPEN_MAIL", N_("Open email") },
{ "A_FORWARD", N_("Forward Message") },
{ "A_TRASH", N_("Trash Message") },
{ "A_DELETE_REAL", N_("Delete Message") },
{ "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_WATCH_THREAD", N_("Watch thread") },
{ "A_PRINT", N_("Print") },
+ { "A_LEARN_SPAM", N_("Learn Spam or Ham") },
+ { "A_GO_FOLDERS", N_("Open folder/Go to folder list") },
+ { "A_PREFERENCES", N_("Preferences") },
{ "A_SEND", N_("Send Message") },
{ "A_SENDL", N_("Put into queue folder and send later") },
{ "A_LINEWRAP_CURRENT", N_("Wrap long lines of current paragraph") },
{ "A_LINEWRAP_ALL", N_("Wrap all long lines") },
{ "A_ADDRBOOK", N_("Address book") },
-#ifdef USE_ASPELL
+#ifdef USE_ENCHANT
{ "A_CHECK_SPELLING", N_("Check spelling") },
#endif
- { "A_SYL_ACTIONS", N_("Sylpheed Actions Feature") },
- { "A_SEPARATOR", "Separator" }
+ { "A_CLAWS_ACTIONS", N_("Claws Mail Actions Feature") },
+ { "A_CANCEL_INC", N_("Cancel receiving") },
+ { "A_CLOSE", N_("Close window") },
+ { "A_SEPARATOR", N_("Separator") },
+ { "A_CLAWS_PLUGINS", N_("Claws Mail Plugins") },
};
/* struct holds configuration files and a list of
{ "toolbar_msgview.xml", NULL}
};
-static GtkItemFactoryEntry reply_entries[] =
-{
- {N_("/Reply with _quote"), NULL, toolbar_reply, COMPOSE_REPLY_WITH_QUOTE, NULL},
- {N_("/_Reply without quote"), NULL, toolbar_reply, COMPOSE_REPLY_WITHOUT_QUOTE, NULL}
-};
-static GtkItemFactoryEntry replyall_entries[] =
-{
- {N_("/Reply to all with _quote"), "<shift>A", toolbar_reply, COMPOSE_REPLY_TO_ALL_WITH_QUOTE, NULL},
- {N_("/_Reply to all without quote"), "a", toolbar_reply, COMPOSE_REPLY_TO_ALL_WITHOUT_QUOTE, NULL}
-};
-static GtkItemFactoryEntry replylist_entries[] =
-{
- {N_("/Reply to list with _quote"), NULL, toolbar_reply, COMPOSE_REPLY_TO_LIST_WITH_QUOTE, NULL},
- {N_("/_Reply to list without quote"), NULL, toolbar_reply, COMPOSE_REPLY_TO_LIST_WITHOUT_QUOTE, NULL}
-};
-static GtkItemFactoryEntry replysender_entries[] =
-{
- {N_("/Reply to sender with _quote"), NULL, toolbar_reply, COMPOSE_REPLY_TO_SENDER_WITH_QUOTE, NULL},
- {N_("/_Reply to sender without quote"), NULL, toolbar_reply, COMPOSE_REPLY_TO_SENDER_WITHOUT_QUOTE, NULL}
-};
-static GtkItemFactoryEntry forward_entries[] =
-{
- {N_("/_Forward"), "f", toolbar_reply, COMPOSE_FORWARD_INLINE, NULL},
- {N_("/For_ward as attachment"), "<shift>F", toolbar_reply, COMPOSE_FORWARD_AS_ATTACH, NULL},
- {N_("/Redirec_t"), NULL, toolbar_reply, COMPOSE_REDIRECT, NULL}
-};
-
-
gint toolbar_ret_val_from_descr(const gchar *descr)
{
gint i;
gchar *toolbar_ret_descr_from_val(gint val)
{
- g_return_val_if_fail(val >=0 && val < N_ACTION_VAL, NULL);
+ cm_return_val_if_fail(val >=0 && val < N_ACTION_VAL, NULL);
return gettext(toolbar_text[val].descr);
}
static gchar *toolbar_ret_text_from_val(gint val)
{
- g_return_val_if_fail(val >=0 && val < N_ACTION_VAL, NULL);
+ cm_return_val_if_fail(val >=0 && val < N_ACTION_VAL, NULL);
return toolbar_text[val].index_str;
}
-gboolean toolbar_is_duplicate(gint action, ToolbarType source)
+static gboolean toolbar_is_duplicate(gint action, ToolbarType source)
{
GSList *cur;
- if ((action == A_SEPARATOR) || (action == A_SYL_ACTIONS))
+ if ((action == A_SEPARATOR) || (action == A_CLAWS_ACTIONS) || (action == A_CLAWS_PLUGINS))
return FALSE;
for (cur = toolbar_config[source].item_list; cur != NULL; cur = cur->next) {
if (source == TOOLBAR_MAIN) {
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_REPLY_ALL, A_REPLY_ML, A_OPEN_MAIL, 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_GOTO_NEXT, A_IGNORE_THREAD, A_WATCH_THREAD, A_PRINT,
+ A_ADDRBOOK, A_LEARN_SPAM, A_GO_FOLDERS,
+ A_CANCEL_INC, A_PREFERENCES };
for (i = 0; i < sizeof main_items / sizeof main_items[0]; i++) {
items = g_list_append(items, gettext(toolbar_text[main_items[i]].descr));
A_INSERT, A_ATTACH, A_SIG,
A_EXTEDITOR, A_LINEWRAP_CURRENT,
A_LINEWRAP_ALL, A_ADDRBOOK,
-#ifdef USE_ASPELL
+#ifdef USE_ENCHANT
A_CHECK_SPELLING,
#endif
- A_SYL_ACTIONS };
+ A_CLOSE };
for (i = 0; i < sizeof comp_items / sizeof comp_items[0]; i++)
items = g_list_append(items, gettext(toolbar_text[comp_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_CLOSE };
for (i = 0; i < sizeof msgv_items / sizeof msgv_items[0]; i++)
items = g_list_append(items, gettext(toolbar_text[msgv_items[i]].descr));
if (g_utf8_collate(name, TOOLBAR_ICON_FILE) == 0)
item->file = g_strdup (value);
else if (g_utf8_collate(name, TOOLBAR_ICON_TEXT) == 0)
- item->text = g_strdup (value);
+ item->text = g_strdup (*value ? gettext(value):"");
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")) {
item->text = g_strdup(_("Trash"));
rewrite = TRUE;
}
+ if (item->index == -1 && !strcmp(value, "A_SYL_ACTIONS")) {
+ /* switch button */
+ item->index = A_CLAWS_ACTIONS;
+ rewrite = TRUE;
+ }
attr = g_list_next(attr);
}
if (item->index != -1) {
}
}
+const gchar *toolbar_get_short_text(int action) {
+ switch(action) {
+ case A_GO_FOLDERS: return _("Folders");
+ case A_OPEN_MAIL: return _("Open");
+ case A_RECEIVE_ALL: return _("Get Mail");
+ case A_RECEIVE_CUR: return _("Get");
+ case A_SEND_QUEUED: return _("Send");
+ case A_COMPOSE_EMAIL: return Q_("Toolbar|Compose");
+ case A_COMPOSE_NEWS: return Q_("Toolbar|Compose");
+ case A_REPLY_MESSAGE: return _("Reply");
+ case A_REPLY_ALL: return _("All");
+ case A_REPLY_SENDER: return _("Sender");
+ case A_REPLY_ML: return _("List");
+ case A_FORWARD: return _("Forward");
+ case A_TRASH: return _("Trash");
+ case A_DELETE_REAL: return _("Delete");
+ case A_LEARN_SPAM: return _("Spam");
+ case A_GOTO_PREV: return _("Prev");
+ case A_GOTO_NEXT: return _("Next");
+ case A_IGNORE_THREAD: return _("Ignore thread");
+ case A_WATCH_THREAD: return _("Watch thread");
+ case A_PRINT: return _("Print");
+ case A_CLOSE: return _("Close");
+ case A_PREFERENCES: return _("Preferences");
+ case A_SEND: return _("Send");
+ case A_SENDL: return _("Send later");
+ case A_DRAFT: return _("Draft");
+ case A_INSERT: return _("Insert");
+ case A_ATTACH: return _("Attach");
+ case A_SIG: return _("Insert sig.");
+ case A_EXTEDITOR: return _("Edit");
+ case A_LINEWRAP_CURRENT:return _("Wrap para.");
+ case A_LINEWRAP_ALL: return _("Wrap all");
+ case A_ADDRBOOK: return _("Address");
+ case A_CANCEL_INC: return _("Stop");
+ case A_EXECUTE: return _("Execute");
+ #ifdef USE_ENCHANT
+ case A_CHECK_SPELLING: return _("Check spelling");
+ #endif
+ default: return "";
+ }
+}
+
+gint toolbar_get_icon(int action) {
+ switch(action) {
+ case A_GO_FOLDERS: return STOCK_PIXMAP_GO_FOLDERS;
+ case A_OPEN_MAIL: return STOCK_PIXMAP_OPEN_MAIL;
+ case A_RECEIVE_ALL: return STOCK_PIXMAP_MAIL_RECEIVE_ALL;
+ case A_RECEIVE_CUR: return STOCK_PIXMAP_MAIL_RECEIVE;
+ case A_SEND_QUEUED: return STOCK_PIXMAP_MAIL_SEND_QUEUE;
+ case A_COMPOSE_EMAIL: return STOCK_PIXMAP_MAIL_COMPOSE;
+ case A_COMPOSE_NEWS: return STOCK_PIXMAP_NEWS_COMPOSE;
+ case A_REPLY_MESSAGE: return STOCK_PIXMAP_MAIL_REPLY;
+ case A_REPLY_ALL: return STOCK_PIXMAP_MAIL_REPLY_TO_ALL;
+ case A_REPLY_SENDER: return STOCK_PIXMAP_MAIL_REPLY_TO_AUTHOR;
+ case A_REPLY_ML: return STOCK_PIXMAP_MAIL_REPLY_TO_LIST;
+ case A_FORWARD: return STOCK_PIXMAP_MAIL_FORWARD;
+ case A_TRASH: return STOCK_PIXMAP_TRASH;
+ case A_DELETE_REAL: return STOCK_PIXMAP_DELETE;
+ case A_LEARN_SPAM: return STOCK_PIXMAP_SPAM_BTN;
+ case A_GOTO_PREV: return STOCK_PIXMAP_UP_ARROW;
+ case A_GOTO_NEXT: return STOCK_PIXMAP_DOWN_ARROW;
+ case A_IGNORE_THREAD: return STOCK_PIXMAP_IGNORETHREAD;
+ case A_WATCH_THREAD: return STOCK_PIXMAP_WATCHTHREAD;
+ case A_PRINT: return STOCK_PIXMAP_PRINTER;
+ case A_CLOSE: return STOCK_PIXMAP_CLOSE;
+ case A_PREFERENCES: return STOCK_PIXMAP_PREFERENCES;
+ case A_SEND: return STOCK_PIXMAP_MAIL_SEND;
+ case A_SENDL: return STOCK_PIXMAP_MAIL_SEND_QUEUE;
+ case A_DRAFT: return STOCK_PIXMAP_MAIL;
+ case A_INSERT: return STOCK_PIXMAP_INSERT_FILE;
+ case A_ATTACH: return STOCK_PIXMAP_MAIL_ATTACH;
+ case A_SIG: return STOCK_PIXMAP_MAIL_SIGN;
+ case A_EXTEDITOR: return STOCK_PIXMAP_EDIT_EXTERN;
+ case A_LINEWRAP_CURRENT:return STOCK_PIXMAP_LINEWRAP_CURRENT;
+ case A_LINEWRAP_ALL: return STOCK_PIXMAP_LINEWRAP_ALL;
+ case A_ADDRBOOK: return STOCK_PIXMAP_ADDRESS_BOOK;
+ case A_CANCEL_INC: return STOCK_PIXMAP_CANCEL;
+ case A_EXECUTE: return STOCK_PIXMAP_EXEC;
+ #ifdef USE_ENCHANT
+ case A_CHECK_SPELLING: return STOCK_PIXMAP_CHECK_SPELLING;
+ #endif
+ default: return -1;
+ }
+}
+
static void toolbar_set_default_main(void)
{
struct {
gint action;
- 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_SEPARATOR, 0, ("") },
- { A_SEND_QUEUED, STOCK_PIXMAP_MAIL_SEND_QUEUE, _("Send") },
- { A_COMPOSE_EMAIL, STOCK_PIXMAP_MAIL_COMPOSE, _("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_TRASH, STOCK_PIXMAP_TRASH, _("Trash") },
- { A_EXECUTE, STOCK_PIXMAP_EXEC, _("Execute") },
- { A_GOTO_PREV, STOCK_PIXMAP_UP_ARROW, _("Previous")},
- { A_GOTO_NEXT, STOCK_PIXMAP_DOWN_ARROW, _("Next") }
+#ifdef GENERIC_UMPC
+ { A_GO_FOLDERS},
+ { A_OPEN_MAIL},
+ { A_SEPARATOR},
+#endif
+ { A_RECEIVE_ALL},
+ { A_SEPARATOR},
+ { A_SEND_QUEUED},
+ { A_COMPOSE_EMAIL},
+ { A_SEPARATOR},
+ { A_REPLY_MESSAGE},
+#ifndef GENERIC_UMPC
+ { A_REPLY_ALL},
+ { A_REPLY_SENDER},
+#endif
+ { A_FORWARD},
+ { A_SEPARATOR},
+ { A_TRASH},
+#ifndef GENERIC_UMPC
+ { A_LEARN_SPAM},
+#endif
+ { A_SEPARATOR},
+ { A_GOTO_NEXT}
};
gint i;
if (default_toolbar[i].action != A_SEPARATOR) {
- gchar *file = stock_pixmap_get_name((StockPixmap)default_toolbar[i].icon);
+ gchar *file = NULL;
+ if (toolbar_get_icon(default_toolbar[i].action) > -1) {
+ file = stock_pixmap_get_name((StockPixmap)toolbar_get_icon(default_toolbar[i].action));
+ }
toolbar_item->file = g_strdup(file);
toolbar_item->index = default_toolbar[i].action;
- toolbar_item->text = g_strdup(default_toolbar[i].text);
+ toolbar_item->text = g_strdup(toolbar_get_short_text(default_toolbar[i].action));
} else {
toolbar_item->file = g_strdup(TOOLBAR_TAG_SEPARATOR);
{
struct {
gint action;
- gint icon;
- gchar *text;
} default_toolbar[] = {
- { A_SEND, STOCK_PIXMAP_MAIL_SEND, _("Send") },
- { A_SENDL, STOCK_PIXMAP_MAIL_SEND_QUEUE, _("Send later") },
- { A_DRAFT, STOCK_PIXMAP_MAIL, _("Draft") },
- { 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") }
+#ifdef GENERIC_UMPC
+ { A_CLOSE},
+ { A_SEPARATOR},
+#endif
+ { A_SEND},
+ { A_SENDL},
+ { A_DRAFT},
+ { A_SEPARATOR},
+#ifndef GENERIC_UMPC
+ { A_INSERT},
+#endif
+ { A_ATTACH},
+ { A_SEPARATOR},
+ { A_ADDRBOOK}
};
gint i;
if (default_toolbar[i].action != A_SEPARATOR) {
- gchar *file = stock_pixmap_get_name((StockPixmap)default_toolbar[i].icon);
-
+ gchar *file = NULL;
+ if (toolbar_get_icon(default_toolbar[i].action) > -1) {
+ file = stock_pixmap_get_name((StockPixmap)toolbar_get_icon(default_toolbar[i].action));
+ }
toolbar_item->file = g_strdup(file);
toolbar_item->index = default_toolbar[i].action;
- toolbar_item->text = g_strdup(default_toolbar[i].text);
+ toolbar_item->text = g_strdup(toolbar_get_short_text(default_toolbar[i].action));
} else {
toolbar_item->file = g_strdup(TOOLBAR_TAG_SEPARATOR);
{
struct {
gint action;
- gint icon;
- gchar *text;
} default_toolbar[] = {
- { 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_TRASH, STOCK_PIXMAP_TRASH, _("Trash") },
- { A_GOTO_NEXT, STOCK_PIXMAP_DOWN_ARROW, _("Next") }
+#ifdef GENERIC_UMPC
+ { A_CLOSE},
+ { A_SEPARATOR},
+#endif
+ { A_REPLY_MESSAGE},
+ { A_REPLY_ALL},
+ { A_REPLY_SENDER},
+ { A_FORWARD},
+ { A_SEPARATOR},
+ { A_TRASH},
+#ifndef GENERIC_UMPC
+ { A_LEARN_SPAM},
+#endif
+ { A_GOTO_NEXT}
};
gint i;
ToolbarItem *toolbar_item = g_new0(ToolbarItem, 1);
if (default_toolbar[i].action != A_SEPARATOR) {
-
- gchar *file = stock_pixmap_get_name((StockPixmap)default_toolbar[i].icon);
+ gchar *file = NULL;
+ if (toolbar_get_icon(default_toolbar[i].action) > -1) {
+ file = stock_pixmap_get_name((StockPixmap)toolbar_get_icon(default_toolbar[i].action));
+ }
toolbar_item->file = g_strdup(file);
toolbar_item->index = default_toolbar[i].action;
- toolbar_item->text = g_strdup(default_toolbar[i].text);
+ toolbar_item->text = g_strdup(toolbar_get_short_text(default_toolbar[i].action));
} else {
toolbar_item->file = g_strdup(TOOLBAR_TAG_SEPARATOR);
fileSpec = g_strconcat(get_rc_dir(), G_DIR_SEPARATOR_S, toolbar_config[source].conf_file, NULL );
pfile = prefs_write_open(fileSpec);
- g_free( fileSpec );
if( pfile ) {
fp = pfile->fp;
- fprintf(fp, "<?xml version=\"1.0\" encoding=\"%s\" ?>\n", CS_INTERNAL);
+ if (fprintf(fp, "<?xml version=\"1.0\" encoding=\"%s\" ?>\n", CS_INTERNAL) < 0)
+ goto fail;
- fprintf(fp, "<%s>\n", TOOLBAR_TAG_INDEX);
+ if (fprintf(fp, "<%s>\n", TOOLBAR_TAG_INDEX) < 0)
+ goto fail;
for (cur = toolbar_config[source].item_list; cur != NULL; cur = cur->next) {
ToolbarItem *toolbar_item = (ToolbarItem*) cur->data;
if (toolbar_item->index != A_SEPARATOR) {
- fprintf(fp, "\t<%s %s=\"%s\" %s=\"",
+ if (fprintf(fp, "\t<%s %s=\"%s\" %s=\"",
TOOLBAR_TAG_ITEM,
TOOLBAR_ICON_FILE, toolbar_item->file,
- TOOLBAR_ICON_TEXT);
- xml_file_put_escape_str(fp, toolbar_item->text);
- fprintf(fp, "\" %s=\"%s\"/>\n",
+ TOOLBAR_ICON_TEXT) < 0)
+ goto fail;
+ if (xml_file_put_escape_str(fp, toolbar_item->text) < 0)
+ goto fail;
+ if (fprintf(fp, "\" %s=\"%s\"/>\n",
TOOLBAR_ICON_ACTION,
- toolbar_ret_text_from_val(toolbar_item->index));
+ toolbar_ret_text_from_val(toolbar_item->index)) < 0)
+ goto fail;
} else {
- fprintf(fp, "\t<%s/>\n", TOOLBAR_TAG_SEPARATOR);
+ if (fprintf(fp, "\t<%s/>\n", TOOLBAR_TAG_SEPARATOR) < 0)
+ goto fail;
}
}
- fprintf(fp, "</%s>\n", TOOLBAR_TAG_INDEX);
+ if (fprintf(fp, "</%s>\n", TOOLBAR_TAG_INDEX) < 0)
+ goto fail;
+ g_free( fileSpec );
if (prefs_file_close (pfile) < 0 )
g_warning("failed to write toolbar configuration to file\n");
+ return;
+
+fail:
+ FILE_OP_ERROR(fileSpec, "fprintf");
+ g_free( fileSpec );
+ prefs_file_close_revert (pfile);
} else
g_warning("failed to open toolbar configuration file for writing\n");
}
} else if (xml_compare_tag(file, TOOLBAR_TAG_SEPARATOR)) {
ToolbarItem *item = g_new0(ToolbarItem, 1);
- item->file = g_strdup(toolbar_ret_descr_from_val(A_SEPARATOR));
+ item->file = g_strdup(TOOLBAR_TAG_SEPARATOR);
item->index = A_SEPARATOR;
toolbar_config[source].item_list =
g_slist_append(toolbar_config[source].item_list, item);
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);
toolbar_item);
}
-void toolbar_action_execute(GtkWidget *widget,
+static void toolbar_action_execute(GtkWidget *widget,
GSList *action_list,
gpointer data,
gint source)
gint i = 0;
for (cur = action_list; cur != NULL; cur = cur->next) {
- ToolbarSylpheedActions *act = (ToolbarSylpheedActions*)cur->data;
+ ToolbarClawsActions *act = (ToolbarClawsActions*)cur->data;
if (widget == act->widget) {
if (found)
actions_execute(data, i, widget, source);
else
- g_warning ("Error: did not find Sylpheed Action to execute");
+ g_warning ("Error: did not find Claws Action to execute");
+}
+
+#if !(GTK_CHECK_VERSION(2,12,0))
+#define CLAWS_SET_TOOL_ITEM_TIP(widget,tip) { \
+ gtk_tool_item_set_tooltip(GTK_TOOL_ITEM(widget), GTK_TOOLTIPS(toolbar_tips), \
+ tip, NULL); \
+}
+#else
+#define CLAWS_SET_TOOL_ITEM_TIP(widget,tip) { \
+ gtk_tool_item_set_tooltip_text(GTK_TOOL_ITEM(widget), tip); \
+}
+#endif
+
+#if !(GTK_CHECK_VERSION(2,12,0))
+#define CLAWS_SET_ARROW_TIP(widget,tip) { \
+ gtk_menu_tool_button_set_arrow_tooltip(GTK_MENU_TOOL_BUTTON(widget), GTK_TOOLTIPS(toolbar_tips), \
+ tip, NULL); \
+}
+#else
+#define CLAWS_SET_ARROW_TIP(widget,tip) { \
+ gtk_menu_tool_button_set_arrow_tooltip_text(GTK_MENU_TOOL_BUTTON(widget), tip); \
}
+#endif
static void activate_compose_button (Toolbar *toolbar,
ToolbarStyle style,
ComposeButtonType type)
{
- if ((!toolbar->compose_mail_btn) || (!toolbar->compose_news_btn))
+#if !(GTK_CHECK_VERSION(2,12,0))
+ GtkTooltips *toolbar_tips = toolbar->tooltips;
+#endif
+ if ((!toolbar->compose_mail_btn))
return;
- gtk_widget_hide(type == COMPOSEBUTTON_NEWS ? toolbar->compose_mail_btn
- : toolbar->compose_news_btn);
- gtk_widget_show(type == COMPOSEBUTTON_NEWS ? toolbar->compose_news_btn
- : toolbar->compose_mail_btn);
- toolbar->compose_btn_type = type;
+ if (type == COMPOSEBUTTON_NEWS) {
+ gtk_tool_button_set_icon_widget(
+ GTK_TOOL_BUTTON(toolbar->compose_mail_btn),
+ toolbar->compose_news_icon);
+#ifndef GENERIC_UMPC
+ CLAWS_SET_TOOL_ITEM_TIP(GTK_TOOL_ITEM(toolbar->compose_mail_btn), _("Compose News message"));
+#endif
+ gtk_widget_show(toolbar->compose_news_icon);
+ } else {
+ gtk_tool_button_set_icon_widget(
+ GTK_TOOL_BUTTON(toolbar->compose_mail_btn),
+ toolbar->compose_mail_icon);
+#ifndef GENERIC_UMPC
+ CLAWS_SET_TOOL_ITEM_TIP(GTK_TOOL_ITEM(toolbar->compose_mail_btn), _("Compose Email"));
+#endif
+ gtk_widget_show(toolbar->compose_mail_icon);
+ }
+ toolbar->compose_btn_type = type;
}
void toolbar_set_compose_button(Toolbar *toolbar,
compose_btn_type);
}
+static void activate_learn_button (Toolbar *toolbar,
+ ToolbarStyle style,
+ LearnButtonType type)
+{
+#if !(GTK_CHECK_VERSION(2,12,0))
+ GtkTooltips *toolbar_tips = toolbar->tooltips;
+#endif
+ if ((!toolbar->learn_spam_btn))
+ return;
+
+ if (type == LEARN_SPAM) {
+ gtk_tool_button_set_icon_widget(
+ GTK_TOOL_BUTTON(toolbar->learn_spam_btn),
+ toolbar->learn_spam_icon);
+ gtk_tool_button_set_label(
+ GTK_TOOL_BUTTON(toolbar->learn_spam_btn),
+ _("Spam"));
+#ifndef GENERIC_UMPC
+ CLAWS_SET_TOOL_ITEM_TIP(GTK_TOOL_ITEM(toolbar->learn_spam_btn), _("Learn spam"));
+#endif
+ gtk_widget_show(toolbar->learn_spam_icon);
+ } else {
+ gtk_tool_button_set_icon_widget(
+ GTK_TOOL_BUTTON(toolbar->learn_spam_btn),
+ toolbar->learn_ham_icon);
+ gtk_tool_button_set_label(
+ GTK_TOOL_BUTTON(toolbar->learn_spam_btn),
+ _("Ham"));
+#ifndef GENERIC_UMPC
+ CLAWS_SET_TOOL_ITEM_TIP(GTK_TOOL_ITEM(toolbar->learn_spam_btn), _("Learn ham"));
+#endif
+ gtk_widget_show(toolbar->learn_ham_icon);
+ }
+ 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;
GList *list;
GList *cur;
- g_return_if_fail(mainwin != NULL);
+ cm_return_if_fail(mainwin != NULL);
toolbar_style(TOOLBAR_MAIN, action, mainwin);
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;
}
Compose *compose = (Compose*)data;
MessageView *msgview = (MessageView*)data;
- g_return_if_fail(data != NULL);
+ cm_return_if_fail(data != NULL);
switch (type) {
case TOOLBAR_MAIN:
ToolbarItem *toolbar_item = (ToolbarItem*)data;
MainWindow *mainwin;
- g_return_if_fail(toolbar_item != NULL);
+ cm_return_if_fail(toolbar_item != NULL);
switch (toolbar_item->type) {
case TOOLBAR_MAIN:
ToolbarItem *toolbar_item = (ToolbarItem*)data;
MainWindow *mainwin;
- g_return_if_fail(toolbar_item != NULL);
+ cm_return_if_fail(toolbar_item != NULL);
switch (toolbar_item->type) {
case TOOLBAR_MAIN:
ToolbarItem *toolbar_item = (ToolbarItem*)data;
MainWindow *mainwin;
- g_return_if_fail(toolbar_item != NULL);
+ cm_return_if_fail(toolbar_item != NULL);
switch (toolbar_item->type) {
case TOOLBAR_MAIN:
{
MainWindow *mainwin = get_mainwin(data);
- g_return_if_fail(mainwin != NULL);
+ cm_return_if_fail(mainwin != NULL);
summary_execute(mainwin->summaryview);
}
ToolbarItem *toolbar_item = (ToolbarItem*)data;
MainWindow *mainwin;
- g_return_if_fail(toolbar_item != NULL);
- g_return_if_fail(toolbar_item->parent);
+ cm_return_if_fail(toolbar_item != NULL);
+ cm_return_if_fail(toolbar_item->parent);
switch (toolbar_item->type) {
case TOOLBAR_MSGVIEW:
ToolbarItem *toolbar_item = (ToolbarItem*)data;
MainWindow *mainwin;
- g_return_if_fail(toolbar_item != NULL);
- g_return_if_fail(toolbar_item->parent);
+ cm_return_if_fail(toolbar_item != NULL);
+ cm_return_if_fail(toolbar_item->parent);
switch (toolbar_item->type) {
case TOOLBAR_MSGVIEW:
MainWindow *mainwin;
MessageView *msgview;
- g_return_if_fail(toolbar_item != NULL);
+ cm_return_if_fail(toolbar_item != NULL);
switch (toolbar_item->type) {
case TOOLBAR_MAIN:
case TOOLBAR_MSGVIEW:
msgview = (MessageView*)toolbar_item->parent;
compose_new_with_folderitem(NULL,
- msgview->msginfo->folder);
+ msgview->msginfo->folder, NULL);
break;
default:
debug_print("toolbar event not supported\n");
}
}
+static void toolbar_learn(gpointer data, guint as_spam)
+{
+ ToolbarItem *toolbar_item = (ToolbarItem*)data;
+ MainWindow *mainwin;
+ MessageView *msgview;
+
+ cm_return_if_fail(toolbar_item != NULL);
+
+ switch (toolbar_item->type) {
+ case TOOLBAR_MAIN:
+ mainwin = (MainWindow*)toolbar_item->parent;
+ if (as_spam)
+ mainwindow_learn(mainwin, TRUE);
+ else
+ mainwindow_learn(mainwin, FALSE);
+ break;
+ case TOOLBAR_MSGVIEW:
+ msgview = (MessageView*)toolbar_item->parent;
+ if (as_spam)
+ messageview_learn(msgview, TRUE);
+ else
+ messageview_learn(msgview, FALSE);
+ break;
+ default:
+ debug_print("toolbar event not supported\n");
+ }
+}
+
+static void toolbar_learn_cb(GtkWidget *widget, gpointer data)
+{
+ ToolbarItem *toolbar_item = (ToolbarItem*)data;
+ MainWindow *mainwin;
+ MessageView *msgview;
+
+ cm_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
*/
static void toolbar_reply_cb(GtkWidget *widget, gpointer data)
{
- toolbar_reply(data, prefs_common.reply_with_quote ?
- COMPOSE_REPLY_WITH_QUOTE : COMPOSE_REPLY_WITHOUT_QUOTE);
+ toolbar_reply(data, (prefs_common.reply_with_quote ?
+ COMPOSE_REPLY_WITH_QUOTE : COMPOSE_REPLY_WITHOUT_QUOTE));
}
static void toolbar_reply_to_all_cb(GtkWidget *widget, gpointer data)
{
toolbar_reply(data,
- prefs_common.reply_with_quote ? COMPOSE_REPLY_TO_ALL_WITH_QUOTE
- : COMPOSE_REPLY_TO_ALL_WITHOUT_QUOTE);
+ (prefs_common.reply_with_quote ? COMPOSE_REPLY_TO_ALL_WITH_QUOTE
+ : COMPOSE_REPLY_TO_ALL_WITHOUT_QUOTE));
}
static void toolbar_reply_to_list_cb(GtkWidget *widget, gpointer data)
{
toolbar_reply(data,
- prefs_common.reply_with_quote ? COMPOSE_REPLY_TO_LIST_WITH_QUOTE
- : COMPOSE_REPLY_TO_LIST_WITHOUT_QUOTE);
+ (prefs_common.reply_with_quote ? COMPOSE_REPLY_TO_LIST_WITH_QUOTE
+ : COMPOSE_REPLY_TO_LIST_WITHOUT_QUOTE));
}
static void toolbar_reply_to_sender_cb(GtkWidget *widget, gpointer data)
{
toolbar_reply(data,
- prefs_common.reply_with_quote ? COMPOSE_REPLY_TO_SENDER_WITH_QUOTE
- : COMPOSE_REPLY_TO_SENDER_WITHOUT_QUOTE);
+ (prefs_common.reply_with_quote ? COMPOSE_REPLY_TO_SENDER_WITH_QUOTE
+ : COMPOSE_REPLY_TO_SENDER_WITHOUT_QUOTE));
}
/*
ToolbarItem *toolbar_item = (ToolbarItem*)data;
Compose *compose;
- g_return_if_fail(toolbar_item != NULL);
+ cm_return_if_fail(toolbar_item != NULL);
switch (toolbar_item->type) {
case TOOLBAR_MAIN:
*/
static void toolbar_forward_cb(GtkWidget *widget, gpointer data)
{
- toolbar_reply(data, COMPOSE_FORWARD);
+ toolbar_reply(data, (COMPOSE_FORWARD));
}
/*
MainWindow *mainwin;
MessageView *msgview;
- g_return_if_fail(toolbar_item != NULL);
+ cm_return_if_fail(toolbar_item != NULL);
switch (toolbar_item->type) {
case TOOLBAR_MAIN:
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);
+#ifndef GENERIC_UMPC
+ MsgInfo * msginfo = summary_get_selected_msg(msgview->mainwin->summaryview);
- messageview_show(msgview, msginfo,
+ if (msginfo)
+ messageview_show(msgview, msginfo,
msgview->all_headers);
+#endif
} else {
gtk_widget_destroy(msgview->window);
}
MainWindow *mainwin;
MessageView *msgview;
- g_return_if_fail(toolbar_item != NULL);
+ cm_return_if_fail(toolbar_item != NULL);
switch (toolbar_item->type) {
case TOOLBAR_MAIN:
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);
+#ifndef GENERIC_UMPC
+ MsgInfo * msginfo = summary_get_selected_msg(msgview->mainwin->summaryview);
- MsgInfo * msginfo = gtk_ctree_node_get_row_data(ctree,
- msgview->mainwin->summaryview->selected);
-
- messageview_show(msgview, msginfo,
+ if (msginfo)
+ messageview_show(msgview, msginfo,
msgview->all_headers);
+#endif
} else {
gtk_widget_destroy(msgview->window);
}
ToolbarItem *toolbar_item = (ToolbarItem*)data;
MainWindow *mainwin;
- g_return_if_fail(toolbar_item != NULL);
+ cm_return_if_fail(toolbar_item != NULL);
switch (toolbar_item->type) {
case TOOLBAR_MAIN:
}
}
+static void toolbar_watch_thread_cb(GtkWidget *widget, gpointer data)
+{
+ ToolbarItem *toolbar_item = (ToolbarItem*)data;
+ MainWindow *mainwin;
+
+ cm_return_if_fail(toolbar_item != NULL);
+
+ switch (toolbar_item->type) {
+ case TOOLBAR_MAIN:
+ mainwin = (MainWindow *) toolbar_item->parent;
+ summary_toggle_watch_thread(mainwin->summaryview);
+ break;
+ case TOOLBAR_MSGVIEW:
+ /* TODO: see toolbar_next_unread_cb() if you need
+ * this in the message view */
+ break;
+ default:
+ debug_print("toolbar event not supported\n");
+ break;
+ }
+}
+
+static void toolbar_cancel_inc_cb(GtkWidget *widget, gpointer data)
+{
+ ToolbarItem *toolbar_item = (ToolbarItem*)data;
+
+ cm_return_if_fail(toolbar_item != NULL);
+ inc_cancel_all();
+ imap_cancel_all();
+}
+
+
static void toolbar_print_cb(GtkWidget *widget, gpointer data)
{
ToolbarItem *toolbar_item = (ToolbarItem*)data;
MainWindow *mainwin;
- g_return_if_fail(toolbar_item != NULL);
+ cm_return_if_fail(toolbar_item != NULL);
switch (toolbar_item->type) {
case TOOLBAR_MAIN:
compose_toolbar_cb(A_DRAFT, data);
}
+static void toolbar_close_cb(GtkWidget *widget, gpointer data)
+{
+ ToolbarItem *toolbar_item = (ToolbarItem*)data;
+ MainWindow *mainwin;
+ MessageView *messageview;
+ Compose *compose;
+
+ cm_return_if_fail(toolbar_item != NULL);
+
+ switch (toolbar_item->type) {
+ case TOOLBAR_MAIN:
+ mainwin = (MainWindow *) toolbar_item->parent;
+ app_will_exit(NULL, mainwin);
+ break;
+ case TOOLBAR_MSGVIEW:
+ messageview = (MessageView *)toolbar_item->parent;
+ messageview_destroy(messageview);
+ break;
+ case TOOLBAR_COMPOSE:
+ compose = (Compose *)toolbar_item->parent;
+ compose_close_toolbar(compose);
+ break;
+ }
+}
+
+static void toolbar_preferences_cb(GtkWidget *widget, gpointer data)
+{
+ prefs_gtk_open();
+}
+
+static void toolbar_open_mail_cb(GtkWidget *widget, gpointer data)
+{
+ ToolbarItem *toolbar_item = (ToolbarItem*)data;
+ MainWindow *mainwin;
+
+ cm_return_if_fail(toolbar_item != NULL);
+
+ switch (toolbar_item->type) {
+ case TOOLBAR_MAIN:
+ mainwin = (MainWindow *) toolbar_item->parent;
+ summary_open_row(NULL, mainwin->summaryview);
+ break;
+ case TOOLBAR_MSGVIEW:
+ debug_print("toolbar event not supported\n");
+ break;
+ case TOOLBAR_COMPOSE:
+ debug_print("toolbar event not supported\n");
+ break;
+ }
+}
+
static void toolbar_insert_cb(GtkWidget *widget, gpointer data)
{
compose_toolbar_cb(A_INSERT, data);
compose_toolbar_cb(A_LINEWRAP_ALL, data);
}
-#ifdef USE_ASPELL
+#ifdef USE_ENCHANT
static void toolbar_check_spelling_cb(GtkWidget *widget, gpointer data)
{
compose_toolbar_cb(A_CHECK_SPELLING, data);
MessageView *msgview;
gpointer parent = toolbar_item->parent;
- g_return_if_fail(toolbar_item != NULL);
+ cm_return_if_fail(toolbar_item != NULL);
switch (toolbar_item->type) {
case TOOLBAR_MAIN:
toolbar_action_execute(widget, action_list, parent, toolbar_item->type);
}
+static void toolbar_plugins_execute_cb(GtkWidget *widget, gpointer data)
+{
+ ToolbarItem *toolbar_item = data;
+ prefs_toolbar_execute_plugin_item(toolbar_item->parent, toolbar_item->type, toolbar_item->text);
+}
+
static MainWindow *get_mainwin(gpointer data)
{
ToolbarItem *toolbar_item = (ToolbarItem*)data;
MainWindow *mainwin = NULL;
MessageView *msgview;
- g_return_val_if_fail(toolbar_item != NULL, NULL);
+ cm_return_val_if_fail(toolbar_item != NULL, NULL);
switch(toolbar_item->type) {
case TOOLBAR_MAIN:
return mainwin;
}
+static void toolbar_go_folders_cb(GtkWidget *widget, gpointer data)
+{
+ ToolbarItem *toolbar_item = (ToolbarItem*)data;
+ MainWindow *mainwin = NULL;
+ switch(toolbar_item->type) {
+ case TOOLBAR_MAIN:
+ mainwin = (MainWindow*)toolbar_item->parent;
+ break;
+ default:
+ g_warning("wrong toolbar type\n");
+ return;
+ }
+
+ if (!mainwin->in_folder) {
+ FolderItem *item = folderview_get_selected_item(mainwin->folderview);
+ if (item) {
+ folderview_select(mainwin->folderview, item);
+ }
+ } else {
+ gtk_widget_grab_focus(mainwin->folderview->ctree);
+ mainwindow_exit_folder(mainwin);
+ }
+}
+
static void toolbar_buttons_cb(GtkWidget *widget,
ToolbarItem *item)
{
{ A_GOTO_PREV, toolbar_prev_unread_cb },
{ A_GOTO_NEXT, toolbar_next_unread_cb },
{ A_IGNORE_THREAD, toolbar_ignore_thread_cb },
+ { A_WATCH_THREAD, toolbar_watch_thread_cb },
{ A_PRINT, toolbar_print_cb },
+ { A_LEARN_SPAM, toolbar_learn_cb },
+ { A_GO_FOLDERS, toolbar_go_folders_cb },
{ A_SEND, toolbar_send_cb },
{ A_SENDL, toolbar_send_later_cb },
{ A_DRAFT, toolbar_draft_cb },
+ { A_OPEN_MAIL, toolbar_open_mail_cb },
+ { A_CLOSE, toolbar_close_cb },
+ { A_PREFERENCES, toolbar_preferences_cb },
{ A_INSERT, toolbar_insert_cb },
{ A_ATTACH, toolbar_attach_cb },
{ A_SIG, toolbar_sig_cb },
{ A_LINEWRAP_CURRENT, toolbar_linewrap_current_cb },
{ A_LINEWRAP_ALL, toolbar_linewrap_all_cb },
{ A_ADDRBOOK, toolbar_addrbook_cb },
-#ifdef USE_ASPELL
+#ifdef USE_ENCHANT
{ A_CHECK_SPELLING, toolbar_check_spelling_cb },
#endif
- { A_SYL_ACTIONS, toolbar_actions_execute_cb }
+ { A_CLAWS_ACTIONS, toolbar_actions_execute_cb },
+ { A_CANCEL_INC, toolbar_cancel_inc_cb },
+ { A_CLAWS_PLUGINS, toolbar_plugins_execute_cb },
};
num_items = sizeof(callbacks)/sizeof(callbacks[0]);
}
}
}
+#ifndef GENERIC_UMPC
+#define TOOLBAR_ITEM(item,icon,text,tooltip) { \
+ item = GTK_WIDGET(gtk_tool_button_new(icon, text)); \
+ gtk_widget_set_can_focus(gtk_bin_get_child(GTK_BIN(item)), FALSE); \
+ gtk_tool_item_set_homogeneous(GTK_TOOL_ITEM(item), FALSE); \
+ gtk_tool_item_set_is_important(GTK_TOOL_ITEM(item), TRUE); \
+ g_signal_connect (G_OBJECT(item), "clicked", G_CALLBACK(toolbar_buttons_cb), toolbar_item); \
+ gtk_toolbar_insert(GTK_TOOLBAR(toolbar), GTK_TOOL_ITEM(item), -1); \
+ CLAWS_SET_TOOL_ITEM_TIP(GTK_TOOL_ITEM(item), \
+ tooltip); \
+}
+
+#define TOOLBAR_MENUITEM(item,icon,text,tooltip,menutip) { \
+ GtkWidget *child = NULL, *btn = NULL, *arr = NULL; \
+ GList *gchild = NULL; \
+ item = GTK_WIDGET(gtk_menu_tool_button_new(icon, text)); \
+ gtk_tool_item_set_homogeneous(GTK_TOOL_ITEM(item), FALSE); \
+ gtk_tool_item_set_is_important(GTK_TOOL_ITEM(item), TRUE); \
+ g_signal_connect (G_OBJECT(item), "clicked", G_CALLBACK(toolbar_buttons_cb), toolbar_item); \
+ gtk_toolbar_insert(GTK_TOOLBAR(toolbar), GTK_TOOL_ITEM(item), -1); \
+ CLAWS_SET_TOOL_ITEM_TIP(GTK_TOOL_ITEM(item), \
+ tooltip); \
+ CLAWS_SET_ARROW_TIP(GTK_MENU_TOOL_BUTTON(item), menutip); \
+ child = gtk_bin_get_child(GTK_BIN(item)); \
+ gchild = gtk_container_get_children( \
+ GTK_CONTAINER(child)); \
+ btn = (GtkWidget *)gchild->data; \
+ gtk_widget_set_can_focus(btn, FALSE); \
+ arr = (GtkWidget *)(gchild->next?gchild->next->data:NULL); \
+ gtk_widget_set_can_focus(arr, FALSE); \
+ g_list_free(gchild); \
+ gchild = gtk_container_get_children(GTK_CONTAINER(arr)); \
+ gtk_widget_set_size_request(GTK_WIDGET(gchild->data), 9, -1); \
+ g_list_free(gchild); \
+}
+#else
+#define TOOLBAR_ITEM(item,icon,text,tooltip) { \
+ item = GTK_WIDGET(gtk_tool_button_new(icon, text)); \
+ gtk_widget_set_can_focus(gtk_bin_get_child(GTK_BIN(item)), FALSE); \
+ gtk_tool_item_set_homogeneous(GTK_TOOL_ITEM(item), FALSE); \
+ gtk_tool_item_set_is_important(GTK_TOOL_ITEM(item), TRUE); \
+ g_signal_connect (G_OBJECT(item), "clicked", G_CALLBACK(toolbar_buttons_cb), toolbar_item); \
+ gtk_toolbar_insert(GTK_TOOLBAR(toolbar), GTK_TOOL_ITEM(item), -1); \
+}
+
+#define TOOLBAR_MENUITEM(item,icon,text,tooltip,menutip) { \
+ GtkWidget *child = NULL, *btn = NULL, *arr = NULL; \
+ GList *gchild = NULL; \
+ item = GTK_WIDGET(gtk_menu_tool_button_new(icon, text)); \
+ gtk_tool_item_set_homogeneous(GTK_TOOL_ITEM(item), FALSE); \
+ gtk_tool_item_set_is_important(GTK_TOOL_ITEM(item), TRUE); \
+ g_signal_connect (G_OBJECT(item), "clicked", G_CALLBACK(toolbar_buttons_cb), toolbar_item); \
+ gtk_toolbar_insert(GTK_TOOLBAR(toolbar), GTK_TOOL_ITEM(item), -1); \
+ child = gtk_bin_get_child(GTK_BIN(item)); \
+ gchild = gtk_container_get_children( \
+ GTK_CONTAINER(child)); \
+ btn = (GtkWidget *)gchild->data; \
+ gtk_widget_set_can_focus(btn, FALSE); \
+ arr = (GtkWidget *)(gchild->next?gchild->next->data:NULL); \
+ gtk_widget_set_can_focus(arr, FALSE); \
+ g_list_free(gchild); \
+ gchild = gtk_container_get_children(GTK_CONTAINER(arr)); \
+ gtk_widget_set_size_request(GTK_WIDGET(gchild->data), 9, -1); \
+ g_list_free(gchild); \
+}
+#endif
+
+#define ADD_MENU_ITEM(name,cb,data) { \
+ item = gtk_menu_item_new_with_mnemonic(name); \
+ gtk_menu_shell_append(GTK_MENU_SHELL(menu), item); \
+ g_signal_connect(G_OBJECT(item), "activate", \
+ G_CALLBACK(cb), \
+ toolbar_item); \
+ g_object_set_data(G_OBJECT(item), "int-value", GINT_TO_POINTER(data)); \
+ gtk_widget_show(item); \
+}
+
+static void toolbar_reply_menu_cb(GtkWidget *widget, gpointer data)
+{
+ gpointer int_value = g_object_get_data(G_OBJECT(widget), "int-value");
+ ToolbarItem *toolbar_item = (ToolbarItem *)data;
+
+ toolbar_reply(toolbar_item, GPOINTER_TO_INT(int_value));
+}
+
+static void toolbar_learn_menu_cb(GtkWidget *widget, gpointer data)
+{
+ gpointer int_value = g_object_get_data(G_OBJECT(widget), "int-value");
+ ToolbarItem *toolbar_item = (ToolbarItem *)data;
+
+ toolbar_learn(toolbar_item, GPOINTER_TO_INT(int_value));
+}
/**
* Create a new toolbar with specified type
GtkWidget *toolbar;
GtkWidget *icon_wid = NULL;
GtkWidget *icon_news;
+ GtkWidget *icon_ham;
GtkWidget *item;
- GtkWidget *item_news;
-
- guint n_menu_entries;
- ComboButton *reply_combo;
- ComboButton *replyall_combo;
- ComboButton *replylist_combo;
- ComboButton *replysender_combo;
- ComboButton *fwd_combo;
-
- GtkTooltips *toolbar_tips;
- ToolbarSylpheedActions *action_item;
+ ToolbarClawsActions *action_item;
GSList *cur;
GSList *toolbar_list;
Toolbar *toolbar_data;
-
-
- toolbar_tips = gtk_tooltips_new();
-
+ GtkWidget *menu;
+#ifndef GENERIC_UMPC
+#if !(GTK_CHECK_VERSION(2,12,0))
+ GtkTooltips *toolbar_tips = gtk_tooltips_new();
+#endif
+#endif
toolbar_read_config_file(type);
toolbar_list = toolbar_get_list(type);
toolbar_data = g_new0(Toolbar, 1);
toolbar = gtk_toolbar_new();
- gtk_container_add(GTK_CONTAINER(container), toolbar);
- gtk_container_set_border_width(GTK_CONTAINER(container), 2);
+
+#if (GTK_CHECK_VERSION(2,16,0))
+ gtk_orientable_set_orientation(GTK_ORIENTABLE(toolbar), GTK_ORIENTATION_HORIZONTAL);
+#else
gtk_toolbar_set_orientation(GTK_TOOLBAR(toolbar), GTK_ORIENTATION_HORIZONTAL);
+#endif
gtk_toolbar_set_style(GTK_TOOLBAR(toolbar), GTK_TOOLBAR_BOTH);
+ gtk_toolbar_set_show_arrow(GTK_TOOLBAR(toolbar), TRUE);
for (cur = toolbar_list; cur != NULL; cur = cur->next) {
if (g_ascii_strcasecmp(((ToolbarItem*)cur->data)->file, TOOLBAR_TAG_SEPARATOR) == 0) {
- gtk_toolbar_append_space(GTK_TOOLBAR(toolbar));
+ gtk_toolbar_insert(GTK_TOOLBAR(toolbar), gtk_separator_tool_item_new(), -1);
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,
- (""),
- (""),
- icon_wid, G_CALLBACK(toolbar_buttons_cb),
- toolbar_item);
-
+
switch (toolbar_item->index) {
+ case A_GO_FOLDERS:
+ TOOLBAR_ITEM(item,icon_wid,toolbar_item->text,_("Go to folder list"));
+ toolbar_data->folders_btn = item;
+ break;
case A_RECEIVE_ALL:
+ TOOLBAR_MENUITEM(item,icon_wid,toolbar_item->text,
+ _("Receive Mail on all Accounts"),
+ _("Receive Mail on selected Account"));
toolbar_data->getall_btn = item;
- gtk_tooltips_set_tip(GTK_TOOLTIPS(toolbar_tips),
- toolbar_data->getall_btn,
- _("Receive Mail on all Accounts"), NULL);
break;
case A_RECEIVE_CUR:
+ TOOLBAR_ITEM(item,icon_wid,toolbar_item->text, _("Receive Mail on current Account"));
toolbar_data->get_btn = item;
- gtk_tooltips_set_tip(GTK_TOOLTIPS(toolbar_tips),
- toolbar_data->get_btn,
- _("Receive Mail on current Account"), NULL);
break;
case A_SEND_QUEUED:
+ TOOLBAR_ITEM(item,icon_wid,toolbar_item->text,_("Send Queued Messages"));
toolbar_data->send_btn = item;
- gtk_tooltips_set_tip(GTK_TOOLTIPS(toolbar_tips),
- toolbar_data->send_btn,
- _("Send Queued Messages"), NULL);
+ break;
+ case A_CLOSE:
+ TOOLBAR_ITEM(item,icon_wid,toolbar_item->text,_("Close window"));
+ toolbar_data->close_window_btn = item;
+ break;
+ case A_PREFERENCES:
+ TOOLBAR_ITEM(item,icon_wid,toolbar_item->text,_("Open preferences"));
+ toolbar_data->preferences_btn = item;
+ break;
+ case A_OPEN_MAIL:
+ TOOLBAR_ITEM(item,icon_wid,toolbar_item->text,_("Open email"));
+ toolbar_data->open_mail_btn = item;
break;
case A_COMPOSE_EMAIL:
+#ifndef GENERIC_UMPC
+ TOOLBAR_MENUITEM(item,icon_wid,toolbar_item->text,
+ _("Compose Email"),
+ _("Compose with selected Account"));
+ toolbar_data->compose_mail_btn = item;
+ toolbar_data->compose_mail_icon = icon_wid;
+ g_object_ref(toolbar_data->compose_mail_icon);
+
icon_news = stock_pixmap_widget(container, STOCK_PIXMAP_NEWS_COMPOSE);
- item_news = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar),
- _("Compose"),
- (""),
- (""),
- icon_news, G_CALLBACK(toolbar_buttons_cb),
- toolbar_item);
+ toolbar_data->compose_news_icon = icon_news;
+ g_object_ref(toolbar_data->compose_news_icon);
+#else
+ TOOLBAR_ITEM(item,icon_wid,toolbar_item->text,
+ _("Compose Email"));
toolbar_data->compose_mail_btn = item;
- gtk_tooltips_set_tip(GTK_TOOLTIPS(toolbar_tips),
- toolbar_data->compose_mail_btn,
- _("Compose Email"), NULL);
- toolbar_data->compose_news_btn = item_news;
- gtk_tooltips_set_tip(GTK_TOOLTIPS(toolbar_tips),
- toolbar_data->compose_news_btn,
- _("Compose News"), NULL);
+ toolbar_data->compose_mail_icon = icon_wid;
+
+ icon_news = stock_pixmap_widget(container, STOCK_PIXMAP_NEWS_COMPOSE);
+ toolbar_data->compose_news_icon = icon_news;
+#endif
+ break;
+ case A_LEARN_SPAM:
+ TOOLBAR_MENUITEM(item,icon_wid,toolbar_item->text,
+ _("Spam"),
+ _("Learn as..."));
+ toolbar_data->learn_spam_btn = item;
+ toolbar_data->learn_spam_icon = icon_wid;
+ g_object_ref(toolbar_data->learn_spam_icon);
+
+ icon_ham = stock_pixmap_widget(container, STOCK_PIXMAP_HAM_BTN);
+ toolbar_data->learn_ham_icon = icon_ham;
+ g_object_ref(toolbar_data->learn_ham_icon);
+
+ menu = gtk_menu_new();
+ ADD_MENU_ITEM(_("Learn as _Spam"), toolbar_learn_menu_cb, TRUE);
+ ADD_MENU_ITEM(_("Learn as _Ham"), toolbar_learn_menu_cb, FALSE);
+ gtk_menu_tool_button_set_menu(GTK_MENU_TOOL_BUTTON(toolbar_data->learn_spam_btn), menu);
break;
case A_REPLY_MESSAGE:
+#ifndef GENERIC_UMPC
+ TOOLBAR_MENUITEM(item,icon_wid,toolbar_item->text,
+ _("Reply to Message"),
+ _("Reply to Message options"));
+ toolbar_data->reply_btn = item;
+
+ menu = gtk_menu_new();
+ ADD_MENU_ITEM(_("_Reply with quote"), toolbar_reply_menu_cb, COMPOSE_REPLY_WITH_QUOTE);
+ ADD_MENU_ITEM(_("Reply without _quote"), toolbar_reply_menu_cb, COMPOSE_REPLY_WITHOUT_QUOTE);
+ gtk_menu_tool_button_set_menu(GTK_MENU_TOOL_BUTTON(toolbar_data->reply_btn), menu);
+#else
+ TOOLBAR_ITEM(item,icon_wid,toolbar_item->text,
+ _("Reply to Message"));
toolbar_data->reply_btn = item;
- gtk_tooltips_set_tip(GTK_TOOLTIPS(toolbar_tips),
- toolbar_data->reply_btn,
- _("Reply to Message"), NULL);
- n_menu_entries = sizeof(reply_entries) /
- sizeof(reply_entries[0]);
- reply_combo = gtkut_combo_button_create(toolbar_data->reply_btn,
- reply_entries, n_menu_entries,
- "<Reply>", (gpointer)toolbar_item);
- gtk_button_set_relief(GTK_BUTTON(reply_combo->arrow),
- GTK_RELIEF_NONE);
- gtk_toolbar_append_widget(GTK_TOOLBAR(toolbar),
- GTK_WIDGET_PTR(reply_combo),
- _("Reply to Message"), "Reply");
- toolbar_data->reply_combo = reply_combo;
+#endif
break;
case A_REPLY_SENDER:
+#ifndef GENERIC_UMPC
+ TOOLBAR_MENUITEM(item,icon_wid,toolbar_item->text,
+ _("Reply to Sender"),
+ _("Reply to Sender options"));
+ toolbar_data->replysender_btn = item;
+
+ menu = gtk_menu_new();
+ ADD_MENU_ITEM(_("_Reply with quote"), toolbar_reply_menu_cb, COMPOSE_REPLY_TO_SENDER_WITH_QUOTE);
+ ADD_MENU_ITEM(_("Reply without _quote"), toolbar_reply_menu_cb, COMPOSE_REPLY_TO_SENDER_WITHOUT_QUOTE);
+ gtk_menu_tool_button_set_menu(GTK_MENU_TOOL_BUTTON(toolbar_data->replysender_btn), menu);
+#else
+ TOOLBAR_ITEM(item,icon_wid,toolbar_item->text,
+ _("Reply to Sender"));
toolbar_data->replysender_btn = item;
- gtk_tooltips_set_tip(GTK_TOOLTIPS(toolbar_tips),
- toolbar_data->replysender_btn,
- _("Reply to Sender"), NULL);
- n_menu_entries = sizeof(replysender_entries) /
- sizeof(replysender_entries[0]);
- replysender_combo = gtkut_combo_button_create(toolbar_data->replysender_btn,
- replysender_entries, n_menu_entries,
- "<ReplySender>", (gpointer)toolbar_item);
- gtk_button_set_relief(GTK_BUTTON(replysender_combo->arrow),
- GTK_RELIEF_NONE);
- gtk_toolbar_append_widget(GTK_TOOLBAR(toolbar),
- GTK_WIDGET_PTR(replysender_combo),
- _("Reply to Sender"), "ReplySender");
- toolbar_data->replysender_combo = replysender_combo;
+#endif
break;
case A_REPLY_ALL:
+#ifndef GENERIC_UMPC
+ TOOLBAR_MENUITEM(item,icon_wid,toolbar_item->text,
+ _("Reply to All"),
+ _("Reply to All options"));
+ toolbar_data->replyall_btn = item;
+
+ menu = gtk_menu_new();
+ ADD_MENU_ITEM(_("_Reply with quote"), toolbar_reply_menu_cb, COMPOSE_REPLY_TO_ALL_WITH_QUOTE);
+ ADD_MENU_ITEM(_("Reply without _quote"), toolbar_reply_menu_cb, COMPOSE_REPLY_TO_ALL_WITHOUT_QUOTE);
+ gtk_menu_tool_button_set_menu(GTK_MENU_TOOL_BUTTON(toolbar_data->replyall_btn), menu);
+#else
+ TOOLBAR_ITEM(item,icon_wid,toolbar_item->text,
+ _("Reply to All"));
toolbar_data->replyall_btn = item;
- gtk_tooltips_set_tip(GTK_TOOLTIPS(toolbar_tips),
- toolbar_data->replyall_btn,
- _("Reply to All"), NULL);
- n_menu_entries = sizeof(replyall_entries) /
- sizeof(replyall_entries[0]);
- replyall_combo = gtkut_combo_button_create(toolbar_data->replyall_btn,
- replyall_entries, n_menu_entries,
- "<ReplyAll>", (gpointer)toolbar_item);
- gtk_button_set_relief(GTK_BUTTON(replyall_combo->arrow),
- GTK_RELIEF_NONE);
- gtk_toolbar_append_widget(GTK_TOOLBAR(toolbar),
- GTK_WIDGET_PTR(replyall_combo),
- _("Reply to All"), "ReplyAll");
- toolbar_data->replyall_combo = replyall_combo;
+#endif
break;
case A_REPLY_ML:
+#ifndef GENERIC_UMPC
+ TOOLBAR_MENUITEM(item,icon_wid,toolbar_item->text,
+ _("Reply to Mailing-list"),
+ _("Reply to Mailing-list options"));
toolbar_data->replylist_btn = item;
- gtk_tooltips_set_tip(GTK_TOOLTIPS(toolbar_tips),
- toolbar_data->replylist_btn,
- _("Reply to Mailing-list"), NULL);
- n_menu_entries = sizeof(replylist_entries) /
- sizeof(replylist_entries[0]);
- replylist_combo = gtkut_combo_button_create(toolbar_data->replylist_btn,
- replylist_entries, n_menu_entries,
- "<ReplyList>", (gpointer)toolbar_item);
- gtk_button_set_relief(GTK_BUTTON(replylist_combo->arrow),
- GTK_RELIEF_NONE);
- gtk_toolbar_append_widget(GTK_TOOLBAR(toolbar),
- GTK_WIDGET_PTR(replylist_combo),
- _("Reply to Mailing-list"), "ReplyList");
- toolbar_data->replylist_combo = replylist_combo;
+
+ menu = gtk_menu_new();
+ ADD_MENU_ITEM(_("_Reply with quote"), toolbar_reply_menu_cb, COMPOSE_REPLY_TO_LIST_WITH_QUOTE);
+ ADD_MENU_ITEM(_("Reply without _quote"), toolbar_reply_menu_cb, COMPOSE_REPLY_TO_LIST_WITHOUT_QUOTE);
+ gtk_menu_tool_button_set_menu(GTK_MENU_TOOL_BUTTON(toolbar_data->replylist_btn), menu);
+#else
+ TOOLBAR_ITEM(item,icon_wid,toolbar_item->text,
+ _("Reply to Mailing-list"));
+ toolbar_data->replylist_btn = item;
+#endif
break;
case A_FORWARD:
+#ifndef GENERIC_UMPC
+ TOOLBAR_MENUITEM(item,icon_wid,toolbar_item->text,
+ _("Forward Message"),
+ _("Forward Message options"));
toolbar_data->fwd_btn = item;
- gtk_tooltips_set_tip(GTK_TOOLTIPS(toolbar_tips),
- toolbar_data->fwd_btn,
- _("Forward Message"), NULL);
- n_menu_entries = sizeof(forward_entries) /
- sizeof(forward_entries[0]);
- fwd_combo = gtkut_combo_button_create(toolbar_data->fwd_btn,
- forward_entries, n_menu_entries,
- "<Forward>", (gpointer)toolbar_item);
- gtk_button_set_relief(GTK_BUTTON(fwd_combo->arrow),
- GTK_RELIEF_NONE);
- gtk_toolbar_append_widget(GTK_TOOLBAR(toolbar),
- GTK_WIDGET_PTR(fwd_combo),
- _("Forward Message"), "Fwd");
- toolbar_data->fwd_combo = fwd_combo;
+
+ menu = gtk_menu_new();
+ ADD_MENU_ITEM(_("_Forward"), toolbar_reply_menu_cb, COMPOSE_FORWARD_INLINE);
+ ADD_MENU_ITEM(_("For_ward as attachment"), toolbar_reply_menu_cb, COMPOSE_FORWARD_AS_ATTACH);
+ ADD_MENU_ITEM(_("Redirec_t"), toolbar_reply_menu_cb, COMPOSE_REDIRECT);
+ gtk_menu_tool_button_set_menu(GTK_MENU_TOOL_BUTTON(toolbar_data->fwd_btn), menu);
+#else
+ TOOLBAR_ITEM(item,icon_wid,toolbar_item->text,
+ _("Forward Message"));
+ toolbar_data->fwd_btn = item;
+#endif
break;
case A_TRASH:
+ TOOLBAR_ITEM(item,icon_wid,toolbar_item->text,_("Trash Message"));
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_ITEM(item,icon_wid,toolbar_item->text,_("Delete Message"));
toolbar_data->delete_btn = item;
- gtk_tooltips_set_tip(GTK_TOOLTIPS(toolbar_tips),
- toolbar_data->delete_btn,
- _("Delete Message"), NULL);
break;
case A_EXECUTE:
+ TOOLBAR_ITEM(item,icon_wid,toolbar_item->text,_("Execute"));
toolbar_data->exec_btn = item;
- gtk_tooltips_set_tip(GTK_TOOLTIPS(toolbar_tips),
- toolbar_data->exec_btn,
- _("Execute"), NULL);
break;
case A_GOTO_PREV:
+ TOOLBAR_ITEM(item,icon_wid,toolbar_item->text,_("Go to Previous Unread Message"));
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_ITEM(item,icon_wid,toolbar_item->text,_("Go to Next Unread Message"));
toolbar_data->next_btn = item;
- gtk_tooltips_set_tip(GTK_TOOLTIPS(toolbar_tips),
- toolbar_data->next_btn,
- _("Go to Next Unread Message"),
- NULL);
break;
/* Compose Toolbar */
case A_SEND:
+ TOOLBAR_ITEM(item,icon_wid,toolbar_item->text,_("Send Message"));
toolbar_data->send_btn = item;
- gtk_tooltips_set_tip(GTK_TOOLTIPS(toolbar_tips),
- toolbar_data->send_btn,
- _("Send Message"), NULL);
break;
case A_SENDL:
+ TOOLBAR_ITEM(item,icon_wid,toolbar_item->text,_("Put into queue folder and send later"));
toolbar_data->sendl_btn = item;
- gtk_tooltips_set_tip(GTK_TOOLTIPS(toolbar_tips),
- toolbar_data->sendl_btn,
- _("Put into queue folder and send later"), NULL);
break;
case A_DRAFT:
+ TOOLBAR_ITEM(item,icon_wid,toolbar_item->text,_("Save to draft folder"));
toolbar_data->draft_btn = item;
- gtk_tooltips_set_tip(GTK_TOOLTIPS(toolbar_tips),
- toolbar_data->draft_btn,
- _("Save to draft folder"), NULL);
break;
case A_INSERT:
+ TOOLBAR_ITEM(item,icon_wid,toolbar_item->text,_("Insert file"));
toolbar_data->insert_btn = item;
- gtk_tooltips_set_tip(GTK_TOOLTIPS(toolbar_tips),
- toolbar_data->insert_btn,
- _("Insert file"), NULL);
break;
case A_ATTACH:
+ TOOLBAR_ITEM(item,icon_wid,toolbar_item->text,_("Attach file"));
toolbar_data->attach_btn = item;
- gtk_tooltips_set_tip(GTK_TOOLTIPS(toolbar_tips),
- toolbar_data->attach_btn,
- _("Attach file"), NULL);
break;
case A_SIG:
+ TOOLBAR_ITEM(item,icon_wid,toolbar_item->text,_("Insert signature"));
toolbar_data->sig_btn = item;
- gtk_tooltips_set_tip(GTK_TOOLTIPS(toolbar_tips),
- toolbar_data->sig_btn,
- _("Insert signature"), NULL);
break;
case A_EXTEDITOR:
+ TOOLBAR_ITEM(item,icon_wid,toolbar_item->text,_("Edit with external editor"));
toolbar_data->exteditor_btn = item;
- gtk_tooltips_set_tip(GTK_TOOLTIPS(toolbar_tips),
- toolbar_data->exteditor_btn,
- _("Edit with external editor"), NULL);
break;
case A_LINEWRAP_CURRENT:
+ TOOLBAR_ITEM(item,icon_wid,toolbar_item->text,_("Wrap long lines of current paragraph"));
toolbar_data->linewrap_current_btn = item;
- gtk_tooltips_set_tip(GTK_TOOLTIPS(toolbar_tips),
- toolbar_data->linewrap_current_btn,
- _("Wrap long lines of current paragraph"), NULL);
break;
case A_LINEWRAP_ALL:
+ TOOLBAR_ITEM(item,icon_wid,toolbar_item->text,_("Wrap all long lines"));
toolbar_data->linewrap_all_btn = item;
- gtk_tooltips_set_tip(GTK_TOOLTIPS(toolbar_tips),
- toolbar_data->linewrap_all_btn,
- _("Wrap all long lines"), NULL);
break;
case A_ADDRBOOK:
+ TOOLBAR_ITEM(item,icon_wid,toolbar_item->text,_("Address book"));
toolbar_data->addrbook_btn = item;
- gtk_tooltips_set_tip(GTK_TOOLTIPS(toolbar_tips),
- toolbar_data->addrbook_btn,
- _("Address book"), NULL);
break;
-#ifdef USE_ASPELL
+#ifdef USE_ENCHANT
case A_CHECK_SPELLING:
+ TOOLBAR_ITEM(item,icon_wid,toolbar_item->text,_("Check spelling"));
toolbar_data->spellcheck_btn = item;
- gtk_tooltips_set_tip(GTK_TOOLTIPS(toolbar_tips),
- toolbar_data->spellcheck_btn,
- _("Check spelling"), NULL);
break;
#endif
- case A_SYL_ACTIONS:
- action_item = g_new0(ToolbarSylpheedActions, 1);
+ case A_CLAWS_ACTIONS:
+ TOOLBAR_ITEM(item,icon_wid,toolbar_item->text,toolbar_item->text);
+ action_item = g_new0(ToolbarClawsActions, 1);
action_item->widget = item;
action_item->name = g_strdup(toolbar_item->text);
toolbar_data->action_list =
g_slist_append(toolbar_data->action_list,
action_item);
-
- gtk_tooltips_set_tip(GTK_TOOLTIPS(toolbar_tips),
- item,
- action_item->name, NULL);
-
- gtk_widget_show(item);
+ break;
+ case A_CANCEL_INC:
+ TOOLBAR_ITEM(item,icon_wid,toolbar_item->text,_("Cancel receiving"));
+ toolbar_data->cancel_inc_btn = item;
+ break;
+ case A_CLAWS_PLUGINS:
+ TOOLBAR_ITEM(item,icon_wid,toolbar_item->text, toolbar_item->text);
break;
default:
+ TOOLBAR_ITEM(item,icon_wid,toolbar_item->text,
+ toolbar_ret_descr_from_val(toolbar_item->index));
/* find and set the tool tip text */
- gtk_tooltips_set_tip(GTK_TOOLTIPS(toolbar_tips),
- item,
- toolbar_ret_descr_from_val
- (toolbar_item->index),
- NULL);
break;
}
}
toolbar_data->toolbar = toolbar;
- if (type == TOOLBAR_MAIN)
+#ifndef GENERIC_UMPC
+#if !(GTK_CHECK_VERSION(2,12,0))
+ toolbar_data->tooltips = toolbar_tips;
+#endif
+#endif
+ gtk_widget_show_all(toolbar);
+
+ if (type == TOOLBAR_MAIN) {
+#ifdef GENERIC_UMPC
+ MainWindow *mainwin = mainwindow_get_mainwindow();
+ GtkWidget *progressbar = gtk_progress_bar_new();
+ item = GTK_WIDGET(gtk_tool_item_new());
+ gtk_container_add (GTK_CONTAINER (item), progressbar);
+ gtk_widget_show(item);
+ gtk_widget_set_size_request(progressbar, 70, -1);
+ gtk_toolbar_insert(GTK_TOOLBAR(toolbar), GTK_TOOL_ITEM(item), -1);
+ mainwin->progressbar = progressbar;
+#endif
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);
-
+#ifndef MAEMO
+ gtk_container_add(GTK_CONTAINER(container), toolbar);
+ gtk_container_set_border_width(GTK_CONTAINER(container), 0);
+#else
+ if ( GTK_IS_WINDOW(container) ) {
+ hildon_window_add_toolbar (HILDON_WINDOW(container), GTK_TOOLBAR(toolbar));
+ gtk_widget_show_all (container);
+ } else {
+ gtk_container_add(GTK_CONTAINER(container), toolbar);
+ gtk_container_set_border_width(GTK_CONTAINER(container), 2);
+ }
+#endif
return toolbar_data;
}
Compose *compose = (Compose*)data;
MessageView *msgview = (MessageView*)data;
+#ifndef GENERIC_UMPC
switch(type) {
case TOOLBAR_MAIN:
toolbar_data = mainwin->toolbar;
toolbar_init(toolbar_data);
toolbar_data = toolbar_create(type, handlebox, data);
+#else
+ switch(type) {
+ case TOOLBAR_MAIN:
+ toolbar_data = mainwin->toolbar;
+ handlebox = mainwin->window;
+ break;
+ case TOOLBAR_COMPOSE:
+ toolbar_data = compose->toolbar;
+ handlebox = compose->window;
+ break;
+ case TOOLBAR_MSGVIEW:
+ toolbar_data = msgview->toolbar;
+ handlebox = msgview->window;
+ break;
+ default:
+ return;
+ }
+#ifdef MAEMO
+ hildon_window_remove_toolbar(HILDON_WINDOW(handlebox), GTK_TOOLBAR(toolbar_data->toolbar));
+#endif
+ toolbar_init(toolbar_data);
+ toolbar_data = toolbar_create(type, handlebox, data);
+#endif
+
switch(type) {
case TOOLBAR_MAIN:
mainwin->toolbar = toolbar_data;
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();
+ }
+}
+
+#if !GTK_CHECK_VERSION(2,14,0)
+/* Work around http://bugzilla.gnome.org/show_bug.cgi?id=56070 */
+#define GTK_BUTTON_SET_SENSITIVE(widget,sensitive) { \
+ gboolean in_btn1 = FALSE, in_btn2 = FALSE; \
+ if (GTK_IS_BUTTON(widget)) \
+ in_btn1 = GTK_BUTTON(widget)->in_button; \
+ else if (GTK_IS_MENU_TOOL_BUTTON(widget)) { \
+ GtkWidget *child = gtk_bin_get_child( \
+ GTK_BIN(widget)); \
+ GList *gchild = gtk_container_get_children( \
+ GTK_CONTAINER(child)); \
+ GtkWidget *btn = (GtkWidget *)gchild->data; \
+ GtkWidget *arr = (GtkWidget *) \
+ (gchild->next?gchild->next->data:NULL); \
+ g_list_free(gchild); \
+ if (GTK_IS_BUTTON(btn)) \
+ in_btn1 = GTK_BUTTON(btn)->in_button; \
+ if (GTK_IS_BUTTON(arr)) \
+ in_btn2 = GTK_BUTTON(arr)->in_button; \
+ } \
+ else if (GTK_IS_TOOL_ITEM(widget)) { \
+ GtkWidget *child = gtk_bin_get_child( \
+ GTK_BIN(widget)); \
+ if (GTK_IS_BUTTON(child)) \
+ in_btn1 = GTK_BUTTON(child)->in_button; \
+ } \
+ gtk_widget_set_sensitive(widget, sensitive); \
+ if (GTK_IS_BUTTON(widget)) \
+ GTK_BUTTON(widget)->in_button = in_btn1; \
+ else if (GTK_IS_MENU_TOOL_BUTTON(widget)) { \
+ GtkWidget *child = gtk_bin_get_child( \
+ GTK_BIN(widget)); \
+ GList *gchild = gtk_container_get_children( \
+ GTK_CONTAINER(child)); \
+ GtkWidget *btn = (GtkWidget *)gchild->data; \
+ GtkWidget *arr = (GtkWidget *) \
+ (gchild->next?gchild->next->data:NULL); \
+ g_list_free(gchild); \
+ if (GTK_IS_BUTTON(btn)) \
+ GTK_BUTTON(btn)->in_button = in_btn1; \
+ if (GTK_IS_BUTTON(arr)) \
+ GTK_BUTTON(arr)->in_button = in_btn2; \
+ } \
+ else if (GTK_IS_TOOL_ITEM(widget)) { \
+ GtkWidget *child = gtk_bin_get_child( \
+ GTK_BIN(widget)); \
+ if (GTK_IS_BUTTON(child)) \
+ GTK_BUTTON(child)->in_button = in_btn1; \
+ } \
+}
+#else
+#define GTK_BUTTON_SET_SENSITIVE(widget,sensitive) { \
+ gtk_widget_set_sensitive(widget, sensitive); \
}
+#endif
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)
- 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)
- 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)
- 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)
- 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)
- 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);
+
+ 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);
+ }
+ if (toolbar->send_btn) {
+ SET_WIDGET_COND(toolbar->send_btn,
+ M_HAVE_QUEUED_MAILS);
+ }
+ if (toolbar->compose_mail_btn) {
+ SET_WIDGET_COND(toolbar->compose_mail_btn,
+ M_HAVE_ACCOUNT);
+ }
+ if (toolbar->close_window_btn) {
+ SET_WIDGET_COND(toolbar->close_window_btn,
+ M_UNLOCKED);
+ }
+ if (toolbar->open_mail_btn) {
+ SET_WIDGET_COND(toolbar->open_mail_btn,
+ M_TARGET_EXIST|M_SUMMARY_ISLIST);
+ }
+ if (toolbar->reply_btn) {
+ SET_WIDGET_COND(toolbar->reply_btn,
+ M_HAVE_ACCOUNT|M_TARGET_EXIST|M_SUMMARY_ISLIST);
+ }
+ if (toolbar->replyall_btn) {
+ SET_WIDGET_COND(toolbar->replyall_btn,
+ M_HAVE_ACCOUNT|M_TARGET_EXIST|M_SUMMARY_ISLIST);
+ }
+ if (toolbar->replylist_btn) {
+ SET_WIDGET_COND(toolbar->replylist_btn,
+ M_HAVE_ACCOUNT|M_TARGET_EXIST|M_SUMMARY_ISLIST);
+ }
+ if (toolbar->replysender_btn) {
+ SET_WIDGET_COND(toolbar->replysender_btn,
+ M_HAVE_ACCOUNT|M_TARGET_EXIST|M_SUMMARY_ISLIST);
+ }
+ if (toolbar->fwd_btn) {
+ SET_WIDGET_COND(toolbar->fwd_btn,
+ M_HAVE_ACCOUNT|M_TARGET_EXIST|M_SUMMARY_ISLIST);
}
if (prefs_common.next_unread_msg_dialog == NEXTUNREADMSGDIALOG_ASSUME_NO) {
- SET_WIDGET_COND(toolbar->next_btn, M_MSG_EXIST);
+ SET_WIDGET_COND(toolbar->next_btn, M_MSG_EXIST|M_SUMMARY_ISLIST);
} else {
SET_WIDGET_COND(toolbar->next_btn, 0);
}
+
+ if (toolbar->trash_btn)
+ SET_WIDGET_COND(toolbar->trash_btn,
+ M_TARGET_EXIST|M_ALLOW_DELETE|M_NOT_NEWS);
- 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->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_spam_btn)
+ SET_WIDGET_COND(toolbar->learn_spam_btn,
+ M_TARGET_EXIST|M_CAN_LEARN_SPAM|M_SUMMARY_ISLIST);
+
+ if (toolbar->cancel_inc_btn)
+ SET_WIDGET_COND(toolbar->cancel_inc_btn,
+ M_INC_ACTIVE);
for (cur = toolbar->action_list; cur != NULL; cur = cur->next) {
- ToolbarSylpheedActions *act = (ToolbarSylpheedActions*)cur->data;
+ ToolbarClawsActions *act = (ToolbarClawsActions*)cur->data;
SET_WIDGET_COND(act->widget, M_TARGET_EXIST|M_UNLOCKED);
}
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);
-#ifdef USE_ASPELL
+ GTK_BUTTON_SET_SENSITIVE(compose->toolbar->addrbook_btn, sensitive);
+#ifdef USE_ENCHANT
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);
+ ToolbarClawsActions *item = (ToolbarClawsActions *)items->data;
+ GTK_BUTTON_SET_SENSITIVE(item->widget, sensitive);
}
}
/**
* Initialize toolbar structure
**/
-void toolbar_init(Toolbar * toolbar) {
+static void toolbar_init(Toolbar * toolbar)
+{
toolbar->toolbar = NULL;
+ toolbar->folders_btn = NULL;
toolbar->get_btn = NULL;
toolbar->getall_btn = NULL;
toolbar->send_btn = NULL;
toolbar->compose_mail_btn = NULL;
- toolbar->compose_news_btn = NULL;
+ toolbar->compose_mail_icon = NULL;
+ toolbar->compose_news_icon = NULL;
toolbar->reply_btn = NULL;
toolbar->replysender_btn = NULL;
toolbar->replyall_btn = NULL;
toolbar->prev_btn = NULL;
toolbar->next_btn = NULL;
toolbar->exec_btn = NULL;
-
+ toolbar->open_mail_btn = NULL;
+ toolbar->close_window_btn = NULL;
/* compose buttons */
toolbar->sendl_btn = NULL;
toolbar->draft_btn = NULL;
toolbar->linewrap_current_btn = NULL;
toolbar->linewrap_all_btn = NULL;
toolbar->addrbook_btn = NULL;
-#ifdef USE_ASPELL
+#ifdef USE_ENCHANT
toolbar->spellcheck_btn = NULL;
#endif
MessageView *msgview;
GSList *msginfo_list = NULL;
- g_return_if_fail(toolbar_item != NULL);
+ cm_return_if_fail(toolbar_item != NULL);
switch (toolbar_item->type) {
case TOOLBAR_MAIN:
break;
case TOOLBAR_MSGVIEW:
msgview = (MessageView*)toolbar_item->parent;
- g_return_if_fail(msgview != NULL);
+ cm_return_if_fail(msgview != NULL);
msginfo_list = g_slist_append(msginfo_list, msgview->msginfo);
break;
default:
return;
}
- g_return_if_fail(msgview != NULL);
- g_return_if_fail(msginfo_list != NULL);
+ cm_return_if_fail(msgview != NULL);
+ cm_return_if_fail(msginfo_list != NULL);
compose_reply_from_messageview(msgview, msginfo_list, action);
g_slist_free(msginfo_list);
{
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?"),
- 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;
}
}
if (folder->queue) {
if (procmsg_send_queue(folder->queue,
- prefs_common.savemsg) < 0)
- alertpanel_error(_("Some errors occurred while "
- "sending queued messages."));
+ prefs_common.savemsg,
+ &errstr) < 0)
+ got_error = TRUE;
+ }
+ }
+ if (got_error) {
+ if (!errstr)
+ alertpanel_error_log(_("Some errors occurred while "
+ "sending queued messages."));
+ else {
+ alertpanel_error_log(_("Some errors occurred "
+ "while sending queued messages:\n%s"), errstr);
+ g_free(errstr);
}
}
}
FolderItem *item = mainwin->summaryview->folder_item;
GList * list;
GList * cur;
-
+
if (item) {
ac = account_find_from_item(item);
if (ac && ac->protocol != A_NNTP) {
- compose_new_with_folderitem(ac, item); /* CLAWS */
+ compose_new_with_folderitem(ac, item, NULL); /* CLAWS */
return;
}
}
* CLAWS - use current account
*/
if (cur_account && (cur_account->protocol != A_NNTP)) {
- compose_new_with_folderitem(cur_account, item);
+ compose_new_with_folderitem(cur_account, item, NULL);
return;
}
for (cur = list ; cur != NULL ; cur = g_list_next(cur)) {
ac = (PrefsAccount *) cur->data;
if (ac->protocol != A_NNTP) {
- compose_new_with_folderitem(ac, item);
+ compose_new_with_folderitem(ac, item, NULL);
return;
}
}
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, NULL);
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, NULL);
return;
}
}
projects / claws.git / blobdiff