/*
* Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 2001-2009 Hiroyuki Yamamoto and the Claws Mail team
+ * Copyright (C) 2001-2013 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
#ifdef HAVE_CONFIG_H
# include "config.h"
+#include "claws-features.h"
#endif
#include "defs.h"
#include "prefs_toolbar.h"
#include "alertpanel.h"
#include "imap.h"
+#include "account.h"
+#include "send_message.h"
+#ifndef USE_ALT_ADDRBOOK
+ #include "addressbook.h"
+#else
+ #include "addressbook-dbus.h"
+#endif
/* elements */
#define TOOLBAR_TAG_INDEX "toolbar"
static gboolean toolbar_is_duplicate (gint action,
ToolbarType source);
static void toolbar_parse_item (XMLFile *file,
- ToolbarType source);
+ ToolbarType source, gboolean *rewrite);
static gint toolbar_ret_val_from_text (const gchar *text);
static gchar *toolbar_ret_text_from_val (gint val);
-static void toolbar_set_default_main (void);
-static void toolbar_set_default_compose (void);
-static void toolbar_set_default_msgview (void);
+typedef struct _DefaultToolbar DefaultToolbar;
+struct _DefaultToolbar {
+ gint action;
+};
+static void toolbar_set_default_generic(ToolbarType toolbar_type,
+ DefaultToolbar *default_toolbar);
static void toolbar_style (ToolbarType type,
guint action,
static void toolbar_watch_thread_cb (GtkWidget *widget,
gpointer data);
+static void toolbar_mark_cb (GtkWidget *widget,
+ gpointer data);
+
+static void toolbar_unmark_cb (GtkWidget *widget,
+ gpointer data);
+
+static void toolbar_lock_cb (GtkWidget *widget,
+ gpointer data);
+
+static void toolbar_ulock_cb (GtkWidget *widget,
+ gpointer data);
+
+static void toolbar_all_read_cb (GtkWidget *widget,
+ gpointer data);
+
+static void toolbar_all_unread_cb (GtkWidget *widget,
+ gpointer data);
+
+static void toolbar_read_cb (GtkWidget *widget,
+ gpointer data);
+
+static void toolbar_unread_cb (GtkWidget *widget,
+ gpointer data);
+
static void toolbar_print_cb (GtkWidget *widget,
gpointer data);
#endif
static void toolbar_cancel_inc_cb (GtkWidget *widget,
gpointer data);
+static void toolbar_cancel_send_cb (GtkWidget *widget,
+ gpointer data);
+static void toolbar_cancel_all_cb (GtkWidget *widget,
+ gpointer data);
struct {
gchar *index_str;
const gchar *descr;
} toolbar_text [] = {
- { "A_RECEIVE_ALL", N_("Receive Mail on all Accounts") },
- { "A_RECEIVE_CUR", N_("Receive Mail on current Account") },
+ { "A_RECEIVE_ALL", N_("Receive Mail from all Accounts") },
+ { "A_RECEIVE_CUR", N_("Receive Mail from current Account") },
{ "A_SEND_QUEUED", N_("Send Queued Messages") },
{ "A_COMPOSE_EMAIL", N_("Compose Email") },
{ "A_COMPOSE_NEWS", N_("Compose News") },
{ "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_OPEN_MAIL", N_("Open email") },
{ "A_FORWARD", N_("Forward Message") },
{ "A_TRASH", N_("Trash Message") },
{ "A_DELETE_REAL", N_("Delete Message") },
{ "A_EXECUTE", N_("Execute") },
{ "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_IGNORE_THREAD", N_("Ignore thread") },
+ { "A_WATCH_THREAD", N_("Watch thread") },
+ { "A_MARK", N_("Mark Message") },
+ { "A_UNMARK", N_("Unmark Message") },
+ { "A_LOCK", N_("Lock Message") },
+ { "A_UNLOCK", N_("Unlock Message") },
+ { "A_ALL_READ", N_("Mark all Messages as read") },
+ { "A_ALL_UNREAD", N_("Mark all Messages as unread") },
+ { "A_READ", N_("Mark Message as read") },
+ { "A_UNREAD", N_("Mark Message as unread") },
+
+ { "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_PREFERENCES", N_("Preferences") },
{ "A_SEND", N_("Send Message") },
- { "A_SENDL", N_("Put into queue folder and send later") },
+ { "A_SEND_LATER", N_("Put into queue folder and send later") },
{ "A_DRAFT", N_("Save to draft folder") },
{ "A_INSERT", N_("Insert file") },
{ "A_ATTACH", N_("Attach file") },
{ "A_SIG", N_("Insert signature") },
+ { "A_REP_SIG", N_("Replace signature") },
{ "A_EXTEDITOR", N_("Edit with external editor") },
{ "A_LINEWRAP_CURRENT", N_("Wrap long lines of current paragraph") },
{ "A_LINEWRAP_ALL", N_("Wrap all long lines") },
#ifdef USE_ENCHANT
{ "A_CHECK_SPELLING", N_("Check spelling") },
#endif
- { "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") },
+ { "A_CLAWS_ACTIONS", N_("Claws Mail Actions Feature") },
+ { "A_CANCEL_INC", N_("Cancel receiving") },
+ { "A_CANCEL_SEND", N_("Cancel sending") },
+ { "A_CANCEL_ALL", N_("Cancel receiving/sending") },
+ { "A_CLOSE", N_("Close window") },
+ { "A_SEPARATOR", N_("Separator") },
+ { "A_CLAWS_PLUGINS", N_("Claws Mail Plugins") }
};
+/* migration table: support reading toolbar configuration files with
+ old action names and converting them to current action names,
+ see toolbar_parse_item(), which makes uses of this alias table.
+*/
+struct {
+ const gchar *old_name;
+ const gchar *current_name;
+} toolbar_migration [] = {
+ { "A_SYL_ACTIONS", "A_CLAWS_ACTIONS" },
+ { "A_SENDL", "A_SEND_LATER" },
+ { NULL, NULL }
+};
+
/* struct holds configuration files and a list of
* currently active toolbar items
* TOOLBAR_MAIN, TOOLBAR_COMPOSE and TOOLBAR_MSGVIEW
struct {
const gchar *conf_file;
GSList *item_list;
-} toolbar_config[3] = {
+} toolbar_config[NUM_TOOLBARS] = {
{ "toolbar_main.xml", NULL},
{ "toolbar_compose.xml", NULL},
{ "toolbar_msgview.xml", NULL}
gint i = 0;
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_OPEN_MAIL, A_FORWARD,
- A_TRASH , A_DELETE_REAL, A_EXECUTE, A_GOTO_PREV,
- A_GOTO_NEXT, A_IGNORE_THREAD, A_WATCH_THREAD, A_PRINT,
- A_ADDRBOOK, A_LEARN_SPAM, A_GO_FOLDERS,
- A_CANCEL_INC, A_PREFERENCES };
+ 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_OPEN_MAIL, A_FORWARD,
+ A_TRASH, A_DELETE_REAL, A_EXECUTE, A_GOTO_PREV,
+ A_GOTO_NEXT, A_IGNORE_THREAD, A_WATCH_THREAD, A_MARK,
+ A_UNMARK, A_LOCK, A_UNLOCK, A_ALL_READ,
+ A_ALL_UNREAD, A_READ, A_UNREAD, A_PRINT,
+ A_ADDRBOOK, A_LEARN_SPAM, A_GO_FOLDERS,
+ A_CANCEL_INC, A_CANCEL_SEND, A_CANCEL_ALL, 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));
}
}
else if (source == TOOLBAR_COMPOSE) {
- gint comp_items[] = { A_SEND, A_SENDL, A_DRAFT,
+ gint comp_items[] = {
+ A_SEND, A_SEND_LATER, A_DRAFT,
A_INSERT, A_ATTACH, A_SIG,
- A_EXTEDITOR, A_LINEWRAP_CURRENT,
+ A_REP_SIG, A_EXTEDITOR, A_LINEWRAP_CURRENT,
A_LINEWRAP_ALL, A_ADDRBOOK,
#ifdef USE_ENCHANT
- A_CHECK_SPELLING,
+ A_CHECK_SPELLING,
#endif
- A_CLOSE };
+ 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));
}
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_TRASH, A_DELETE_REAL, A_GOTO_PREV, A_GOTO_NEXT,
- A_ADDRBOOK, A_LEARN_SPAM, A_CLOSE };
+ 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_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));
return items;
}
-static void toolbar_parse_item(XMLFile *file, ToolbarType source)
+static void toolbar_parse_item(XMLFile *file, ToolbarType source, gboolean *rewrite)
{
GList *attr;
gchar *name, *value;
ToolbarItem *item = NULL;
- gboolean rewrite = FALSE;
+
+ g_return_if_fail(rewrite != NULL);
attr = xml_get_current_tag_attr(file);
item = g_new0(ToolbarItem, 1);
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 (gettext(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")) {
+
+ 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;
+ item->text = g_strdup(C_("Toolbar", "Trash"));
+ *rewrite = TRUE;
}
- if (item->index == -1 && !strcmp(value, "A_SYL_ACTIONS")) {
- /* switch button */
- item->index = A_CLAWS_ACTIONS;
- rewrite = TRUE;
+ if (item->index == -1) {
+ /* item not found in table: try migrating old action names to current ones */
+ gint i;
+
+ /* replace action name */
+ for (i = 0; toolbar_migration[i].old_name != NULL; i++) {
+ if (g_utf8_collate(value, toolbar_migration[i].old_name) == 0) {
+ item->index = toolbar_ret_val_from_text(toolbar_migration[i].current_name);
+ if (item->index != -1) {
+ *rewrite = TRUE;
+ debug_print("toolbar_parse_item: migrating action label from '%s' to '%s'\n",
+ value, toolbar_migration[i].current_name);
+ break;
+ }
+ }
+ }
}
+ if ((item->index == -1) && !rewrite)
+ g_warning("toolbar_parse_item: unrecognized action name '%s'\n", value);
+
attr = g_list_next(attr);
}
if (item->index != -1) {
-
if (!toolbar_is_duplicate(item->index, source))
toolbar_config[source].item_list = g_slist_append(toolbar_config[source].item_list,
item);
}
- if (rewrite) {
- toolbar_save_config_file(source);
- }
}
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_COMPOSE_EMAIL: return C_("Toolbar", "Compose");
+ case A_COMPOSE_NEWS: return C_("Toolbar", "Compose");
case A_REPLY_MESSAGE: return _("Reply");
+ case A_REPLY_SENDER: return C_("Toolbar", "Sender");
case A_REPLY_ALL: return _("All");
- case A_REPLY_SENDER: return _("Sender");
case A_REPLY_ML: return _("List");
+ case A_OPEN_MAIL: return _("Open");
case A_FORWARD: return _("Forward");
- case A_TRASH: return _("Trash");
+ case A_TRASH: return C_("Toolbar", "Trash");
case A_DELETE_REAL: return _("Delete");
- case A_LEARN_SPAM: return _("Spam");
+ case A_EXECUTE: return _("Execute");
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_MARK: return _("Mark");
+ case A_UNMARK: return _("Unmark");
+ case A_LOCK: return _("Lock");
+ case A_UNLOCK: return _("Unlock");
+ case A_ALL_READ: return _("All read");
+ case A_ALL_UNREAD: return _("All unread");
+ case A_READ: return _("Read");
+ case A_UNREAD: return _("Unread");
+
case A_PRINT: return _("Print");
- case A_CLOSE: return _("Close");
+ case A_LEARN_SPAM: return _("Spam");
+ case A_GO_FOLDERS: return _("Folders");
case A_PREFERENCES: return _("Preferences");
+
case A_SEND: return _("Send");
- case A_SENDL: return _("Send later");
+ case A_SEND_LATER: 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_REP_SIG: return _("Replace 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
+
+ case A_CANCEL_INC: return _("Stop");
+ case A_CANCEL_SEND: return _("Stop");
+ case A_CANCEL_ALL: return _("Stop all");
+ case A_CLOSE: return _("Close");
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_ALL: return STOCK_PIXMAP_MAIL_REPLY_TO_ALL;
case A_REPLY_ML: return STOCK_PIXMAP_MAIL_REPLY_TO_LIST;
+ case A_OPEN_MAIL: return STOCK_PIXMAP_OPEN_MAIL;
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_EXECUTE: return STOCK_PIXMAP_EXEC;
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_IGNORE_THREAD: return STOCK_PIXMAP_MARK_IGNORETHREAD;
+ case A_WATCH_THREAD: return STOCK_PIXMAP_MARK_WATCHTHREAD;
+ case A_MARK: return STOCK_PIXMAP_MARK_MARK;
+ case A_UNMARK: return STOCK_PIXMAP_MARK_UNMARK;
+ case A_LOCK: return STOCK_PIXMAP_MARK_LOCKED;
+ case A_UNLOCK: return STOCK_PIXMAP_MARK_UNLOCKED;
+ case A_ALL_READ: return STOCK_PIXMAP_MARK_ALLREAD;
+ case A_ALL_UNREAD: return STOCK_PIXMAP_MARK_ALLUNREAD;
+ case A_READ: return STOCK_PIXMAP_MARK_READ;
+ case A_UNREAD: return STOCK_PIXMAP_MARK_UNREAD;
+
case A_PRINT: return STOCK_PIXMAP_PRINTER;
- case A_CLOSE: return STOCK_PIXMAP_CLOSE;
+ case A_LEARN_SPAM: return STOCK_PIXMAP_SPAM_BTN;
+ case A_GO_FOLDERS: return STOCK_PIXMAP_GO_FOLDERS;
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_SEND_LATER: 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_REP_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
+
+ case A_CANCEL_INC: return STOCK_PIXMAP_CANCEL;
+ case A_CANCEL_SEND: return STOCK_PIXMAP_CANCEL;
+ case A_CANCEL_ALL: return STOCK_PIXMAP_CANCEL;
+ case A_CLOSE: return STOCK_PIXMAP_CLOSE;
default: return -1;
}
}
-static void toolbar_set_default_main(void)
+static void toolbar_set_default_generic(ToolbarType toolbar_type, DefaultToolbar *default_toolbar)
{
- struct {
- gint action;
- } default_toolbar[] = {
+ gint i;
+
+ g_return_if_fail(default_toolbar != NULL);
+
+ for (i = 0; default_toolbar[i].action != N_ACTION_VAL; i++) {
+
+ ToolbarItem *toolbar_item = g_new0(ToolbarItem, 1);
+
+ if (default_toolbar[i].action != A_SEPARATOR) {
+ gchar *file = NULL;
+ gint icon;
+
+ icon = toolbar_get_icon(default_toolbar[i].action);
+ if (icon > -1) {
+ file = stock_pixmap_get_name((StockPixmap)icon);
+ }
+ toolbar_item->file = g_strdup(file);
+ toolbar_item->index = default_toolbar[i].action;
+ toolbar_item->text = g_strdup(toolbar_get_short_text(default_toolbar[i].action));
+ } else {
+ toolbar_item->file = g_strdup(TOOLBAR_TAG_SEPARATOR);
+ toolbar_item->index = A_SEPARATOR;
+ }
+
+ if (toolbar_item->index != -1) {
+ if (!toolbar_is_duplicate(toolbar_item->index, toolbar_type))
+ toolbar_config[toolbar_type].item_list =
+ g_slist_append(toolbar_config[toolbar_type].item_list, toolbar_item);
+ }
+ }
+}
+
+void toolbar_set_default(ToolbarType source)
+{
+ DefaultToolbar default_toolbar_main[] = {
#ifdef GENERIC_UMPC
{ A_GO_FOLDERS},
{ A_OPEN_MAIL},
{ A_LEARN_SPAM},
#endif
{ A_SEPARATOR},
- { A_GOTO_NEXT}
+ { A_GOTO_NEXT},
+ { N_ACTION_VAL}
};
-
- gint i;
-
- for (i = 0; i < sizeof(default_toolbar) / sizeof(default_toolbar[0]); i++) {
-
- ToolbarItem *toolbar_item = g_new0(ToolbarItem, 1);
-
- if (default_toolbar[i].action != A_SEPARATOR) {
-
- 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(toolbar_get_short_text(default_toolbar[i].action));
- } else {
-
- toolbar_item->file = g_strdup(TOOLBAR_TAG_SEPARATOR);
- toolbar_item->index = A_SEPARATOR;
- }
-
- if (toolbar_item->index != -1) {
- if ( !toolbar_is_duplicate(toolbar_item->index, TOOLBAR_MAIN))
- toolbar_config[TOOLBAR_MAIN].item_list =
- g_slist_append(toolbar_config[TOOLBAR_MAIN].item_list, toolbar_item);
- }
- }
-}
-
-static void toolbar_set_default_compose(void)
-{
- struct {
- gint action;
- } default_toolbar[] = {
+ DefaultToolbar default_toolbar_compose[] = {
#ifdef GENERIC_UMPC
{ A_CLOSE},
{ A_SEPARATOR},
#endif
{ A_SEND},
- { A_SENDL},
+ { A_SEND_LATER},
{ A_DRAFT},
{ A_SEPARATOR},
#ifndef GENERIC_UMPC
#endif
{ A_ATTACH},
{ A_SEPARATOR},
- { A_ADDRBOOK}
+ { A_ADDRBOOK},
+ { N_ACTION_VAL}
};
-
- gint i;
- for (i = 0; i < sizeof(default_toolbar) / sizeof(default_toolbar[0]); i++) {
-
- ToolbarItem *toolbar_item = g_new0(ToolbarItem, 1);
-
- if (default_toolbar[i].action != A_SEPARATOR) {
-
- 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(toolbar_get_short_text(default_toolbar[i].action));
- } else {
-
- toolbar_item->file = g_strdup(TOOLBAR_TAG_SEPARATOR);
- toolbar_item->index = A_SEPARATOR;
- }
-
- if (toolbar_item->index != -1) {
- if ( !toolbar_is_duplicate(toolbar_item->index, TOOLBAR_COMPOSE))
- toolbar_config[TOOLBAR_COMPOSE].item_list =
- g_slist_append(toolbar_config[TOOLBAR_COMPOSE].item_list, toolbar_item);
- }
- }
-}
-
-static void toolbar_set_default_msgview(void)
-{
- struct {
- gint action;
- } default_toolbar[] = {
+ DefaultToolbar default_toolbar_msgview[] = {
#ifdef GENERIC_UMPC
{ A_CLOSE},
{ A_SEPARATOR},
#ifndef GENERIC_UMPC
{ A_LEARN_SPAM},
#endif
- { A_GOTO_NEXT}
+ { A_GOTO_NEXT},
+ { N_ACTION_VAL}
};
- gint i;
-
- for (i = 0; i < sizeof(default_toolbar) / sizeof(default_toolbar[0]); i++) {
-
- ToolbarItem *toolbar_item = g_new0(ToolbarItem, 1);
-
- if (default_toolbar[i].action != A_SEPARATOR) {
- 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(toolbar_get_short_text(default_toolbar[i].action));
- } else {
-
- toolbar_item->file = g_strdup(TOOLBAR_TAG_SEPARATOR);
- toolbar_item->index = A_SEPARATOR;
- }
-
- if (toolbar_item->index != -1) {
- if ( !toolbar_is_duplicate(toolbar_item->index, TOOLBAR_MSGVIEW))
- toolbar_config[TOOLBAR_MSGVIEW].item_list =
- g_slist_append(toolbar_config[TOOLBAR_MSGVIEW].item_list, toolbar_item);
- }
- }
-}
-
-void toolbar_set_default(ToolbarType source)
-{
if (source == TOOLBAR_MAIN)
- toolbar_set_default_main();
+ toolbar_set_default_generic(TOOLBAR_MAIN, default_toolbar_main);
else if (source == TOOLBAR_COMPOSE)
- toolbar_set_default_compose();
+ toolbar_set_default_generic(TOOLBAR_COMPOSE, default_toolbar_compose);
else if (source == TOOLBAR_MSGVIEW)
- toolbar_set_default_msgview();
+ toolbar_set_default_generic(TOOLBAR_MSGVIEW, default_toolbar_msgview);
}
void toolbar_save_config_file(ToolbarType source)
g_free( fileSpec );
if (prefs_file_close (pfile) < 0 )
- g_warning("failed to write toolbar configuration to file\n");
+ g_warning("failed to write toolbar configuration to file");
return;
fail:
g_free( fileSpec );
prefs_file_close_revert (pfile);
} else
- g_warning("failed to open toolbar configuration file for writing\n");
+ g_warning("failed to open toolbar configuration file for writing");
}
void toolbar_read_config_file(ToolbarType source)
{
XMLFile *file = NULL;
gchar *fileSpec = NULL;
- GList *attr;
- gboolean retVal;
jmp_buf jumper;
+ gboolean rewrite = FALSE;
debug_print("read Toolbar Configuration from %s\n", toolbar_config[source].conf_file);
return;
}
- attr = xml_get_current_tag_attr(file);
-
- retVal = TRUE;
for (;;) {
if (!file->level)
break;
/* Get next tag (icon, icon_text or icon_action) */
if (xml_compare_tag(file, TOOLBAR_TAG_ITEM)) {
- toolbar_parse_item(file, source);
+ toolbar_parse_item(file, source, &rewrite);
} else if (xml_compare_tag(file, TOOLBAR_TAG_SEPARATOR)) {
ToolbarItem *item = g_new0(ToolbarItem, 1);
}
xml_close_file(file);
+ if (rewrite) {
+ debug_print("toolbar_read_config_file: rewriting toolbar\n");
+ toolbar_save_config_file(source);
+ }
}
if ((!file) || (g_slist_length(toolbar_config[source].item_list) == 0)) {
else if (source == TOOLBAR_MSGVIEW)
toolbar_set_default(TOOLBAR_MSGVIEW);
else {
- g_warning("failed to write Toolbar Configuration to %s\n", toolbar_config[source].conf_file);
+ g_warning("refusing to write unknown Toolbar Configuration number %d", source);
return;
}
gpointer data,
gint source)
{
- GSList *cur, *lop;
- gchar *action, *action_p;
- gboolean found = FALSE;
+ GSList *cur;
gint i = 0;
for (cur = action_list; cur != NULL; cur = cur->next) {
ToolbarClawsActions *act = (ToolbarClawsActions*)cur->data;
if (widget == act->widget) {
-
- for (lop = prefs_common.actions_list; lop != NULL; lop = lop->next) {
- action = g_strdup((gchar*)lop->data);
-
- action_p = strstr(action, ": ");
- action_p[0] = 0x00;
- if (g_utf8_collate(act->name, action) == 0) {
- found = TRUE;
- g_free(action);
- break;
- } else
- i++;
- g_free(action);
- }
- if (found)
+ i = prefs_actions_find_by_name(act->name);
+
+ if (i != -1)
break;
}
}
- if (found)
+ if (i != -1)
actions_execute(data, i, widget, source);
else
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); \
+gboolean toolbar_check_action_btns(ToolbarType type)
+{
+ GSList *temp, *curr, *list = toolbar_config[type].item_list;
+ gboolean modified = FALSE;
+
+ curr = list;
+ while (curr != NULL) {
+ ToolbarItem *toolbar_item = (ToolbarItem *) curr->data;
+ temp = curr;
+ curr = curr->next;
+
+ if (toolbar_item->index != A_CLAWS_ACTIONS)
+ continue;
+
+ if (prefs_actions_find_by_name(toolbar_item->text) == -1) {
+ list = g_slist_delete_link(list, temp);
+ g_free(toolbar_item->file);
+ g_free(toolbar_item->text);
+ g_free(toolbar_item);
+ modified = TRUE;
+ }
+ }
+
+ return modified;
}
-#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 !(GTK_CHECK_VERSION(2,12,0))
- GtkTooltips *toolbar_tips = toolbar->tooltips;
-#endif
if ((!toolbar->compose_mail_btn))
return;
ToolbarStyle style,
LearnButtonType type)
{
-#if !(GTK_CHECK_VERSION(2,12,0))
- GtkTooltips *toolbar_tips = toolbar->tooltips;
-#endif
if ((!toolbar->learn_spam_btn))
return;
void toolbar_toggle(guint action, gpointer data)
{
MainWindow *mainwin = (MainWindow*)data;
- GList *list;
- GList *cur;
+ const GList *list;
+ const GList *cur;
cm_return_if_fail(mainwin != NULL);
default:
return;
}
+#ifndef USE_ALT_ADDRBOOK
addressbook_open(compose);
+#else
+ GError* error = NULL;
+ addressbook_connect_signals(compose);
+ addressbook_dbus_open(TRUE, &error);
+ if (error) {
+ g_warning("%s", error->message);
+ g_error_free(error);
+ }
+#endif
}
}
}
+static void toolbar_mark_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_mark(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_unmark_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_unmark(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_lock_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_msgs_lock(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_unlock_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_msgs_unlock(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_all_read_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_mark_all_read(mainwin->summaryview, TRUE);
+ 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_all_unread_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_mark_all_unread(mainwin->summaryview, TRUE);
+ 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_read_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_mark_as_read(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_unread_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_mark_as_unread(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;
imap_cancel_all();
}
+static void toolbar_cancel_send_cb(GtkWidget *widget, gpointer data)
+{
+ ToolbarItem *toolbar_item = (ToolbarItem*)data;
+
+ cm_return_if_fail(toolbar_item != NULL);
+ send_cancel();
+}
+
+static void toolbar_cancel_all_cb(GtkWidget *widget, gpointer data)
+{
+ toolbar_cancel_inc_cb(widget, data);
+ toolbar_cancel_send_cb(widget, data);
+}
static void toolbar_print_cb(GtkWidget *widget, gpointer data)
{
static void toolbar_send_later_cb(GtkWidget *widget, gpointer data)
{
- compose_toolbar_cb(A_SENDL, data);
+ compose_toolbar_cb(A_SEND_LATER, data);
}
static void toolbar_draft_cb(GtkWidget *widget, gpointer data)
switch (toolbar_item->type) {
case TOOLBAR_MAIN:
mainwin = (MainWindow *) toolbar_item->parent;
- summary_open_row(mainwin->summaryview);
+ summary_open_row(NULL, mainwin->summaryview);
break;
case TOOLBAR_MSGVIEW:
debug_print("toolbar event not supported\n");
compose_toolbar_cb(A_SIG, data);
}
+static void toolbar_replace_sig_cb(GtkWidget *widget, gpointer data)
+{
+ compose_toolbar_cb(A_REP_SIG, data);
+}
+
static void toolbar_ext_editor_cb(GtkWidget *widget, gpointer data)
{
compose_toolbar_cb(A_EXTEDITOR, data);
mainwin = (MainWindow*)toolbar_item->parent;
break;
default:
- g_warning("wrong toolbar type\n");
+ g_warning("wrong toolbar type");
return;
}
folderview_select(mainwin->folderview, item);
}
} else {
- gtk_widget_grab_focus(mainwin->folderview->ctree);
+ folderview_grab_focus(mainwin->folderview);
mainwindow_exit_folder(mainwin);
}
}
{ 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_MARK, toolbar_mark_cb },
+ { A_UNMARK, toolbar_unmark_cb },
+ { A_LOCK, toolbar_lock_cb },
+ { A_UNLOCK, toolbar_unlock_cb },
+ { A_ALL_READ, toolbar_all_read_cb },
+ { A_ALL_UNREAD, toolbar_all_unread_cb },
+ { A_READ, toolbar_read_cb },
+ { A_UNREAD, toolbar_unread_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_SEND_LATER, toolbar_send_later_cb },
{ A_DRAFT, toolbar_draft_cb },
{ A_OPEN_MAIL, toolbar_open_mail_cb },
{ A_CLOSE, toolbar_close_cb },
{ A_INSERT, toolbar_insert_cb },
{ A_ATTACH, toolbar_attach_cb },
{ A_SIG, toolbar_sig_cb },
+ { A_REP_SIG, toolbar_replace_sig_cb },
{ A_EXTEDITOR, toolbar_ext_editor_cb },
{ A_LINEWRAP_CURRENT, toolbar_linewrap_current_cb },
{ A_LINEWRAP_ALL, toolbar_linewrap_all_cb },
#endif
{ A_CLAWS_ACTIONS, toolbar_actions_execute_cb },
{ A_CANCEL_INC, toolbar_cancel_inc_cb },
+ { A_CANCEL_SEND, toolbar_cancel_send_cb },
+ { A_CANCEL_ALL, toolbar_cancel_all_cb },
{ A_CLAWS_PLUGINS, toolbar_plugins_execute_cb },
};
#ifndef GENERIC_UMPC
#define TOOLBAR_ITEM(item,icon,text,tooltip) { \
item = GTK_WIDGET(gtk_tool_button_new(icon, text)); \
+ gtkut_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); \
gchild = gtk_container_get_children( \
GTK_CONTAINER(child)); \
btn = (GtkWidget *)gchild->data; \
+ gtkut_widget_set_can_focus(btn, FALSE); \
arr = (GtkWidget *)(gchild->next?gchild->next->data:NULL); \
+ gtkut_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); \
#else
#define TOOLBAR_ITEM(item,icon,text,tooltip) { \
item = GTK_WIDGET(gtk_tool_button_new(icon, text)); \
+ gtkut_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); \
gchild = gtk_container_get_children( \
GTK_CONTAINER(child)); \
btn = (GtkWidget *)gchild->data; \
+ gtkut_widget_set_can_focus(btn, FALSE); \
arr = (GtkWidget *)(gchild->next?gchild->next->data:NULL); \
+ gtkut_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); \
GSList *toolbar_list;
Toolbar *toolbar_data;
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 = gtk_toolbar_new();
-#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);
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));
+ icon_wid = stock_pixmap_widget(stock_pixmap_get_icon(toolbar_item->file));
switch (toolbar_item->index) {
break;
case A_RECEIVE_ALL:
TOOLBAR_MENUITEM(item,icon_wid,toolbar_item->text,
- _("Receive Mail on all Accounts"),
- _("Receive Mail on selected Account"));
+ _("Receive Mail from all Accounts"),
+ _("Receive Mail from selected Account"));
toolbar_data->getall_btn = item;
break;
case A_RECEIVE_CUR:
- TOOLBAR_ITEM(item,icon_wid,toolbar_item->text, _("Receive Mail on current Account"));
+ TOOLBAR_ITEM(item,icon_wid,toolbar_item->text, _("Receive Mail from current Account"));
toolbar_data->get_btn = item;
break;
case A_SEND_QUEUED:
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);
+ icon_news = stock_pixmap_widget(STOCK_PIXMAP_NEWS_COMPOSE);
toolbar_data->compose_news_icon = icon_news;
g_object_ref(toolbar_data->compose_news_icon);
#else
toolbar_data->compose_mail_btn = item;
toolbar_data->compose_mail_icon = icon_wid;
- icon_news = stock_pixmap_widget(container, STOCK_PIXMAP_NEWS_COMPOSE);
+ icon_news = stock_pixmap_widget(STOCK_PIXMAP_NEWS_COMPOSE);
toolbar_data->compose_news_icon = icon_news;
#endif
break;
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);
+ icon_ham = stock_pixmap_widget(STOCK_PIXMAP_HAM_BTN);
toolbar_data->learn_ham_icon = icon_ham;
g_object_ref(toolbar_data->learn_ham_icon);
TOOLBAR_ITEM(item,icon_wid,toolbar_item->text,_("Send Message"));
toolbar_data->send_btn = item;
break;
- case A_SENDL:
+ case A_SEND_LATER:
TOOLBAR_ITEM(item,icon_wid,toolbar_item->text,_("Put into queue folder and send later"));
toolbar_data->sendl_btn = item;
break;
TOOLBAR_ITEM(item,icon_wid,toolbar_item->text,_("Insert signature"));
toolbar_data->sig_btn = item;
break;
+ case A_REP_SIG:
+ TOOLBAR_ITEM(item,icon_wid,toolbar_item->text,_("Replace signature"));
+ toolbar_data->repsig_btn = item;
+ break;
case A_EXTEDITOR:
TOOLBAR_ITEM(item,icon_wid,toolbar_item->text,_("Edit with external editor"));
toolbar_data->exteditor_btn = item;
TOOLBAR_ITEM(item,icon_wid,toolbar_item->text,_("Cancel receiving"));
toolbar_data->cancel_inc_btn = item;
break;
+ case A_CANCEL_SEND:
+ TOOLBAR_ITEM(item,icon_wid,toolbar_item->text,_("Cancel sending"));
+ toolbar_data->cancel_send_btn = item;
+ break;
+ case A_CANCEL_ALL:
+ TOOLBAR_ITEM(item,icon_wid,toolbar_item->text,_("Cancel receiving/sending"));
+ toolbar_data->cancel_all_btn = item;
+ break;
case A_CLAWS_PLUGINS:
TOOLBAR_ITEM(item,icon_wid,toolbar_item->text, toolbar_item->text);
break;
}
toolbar_data->toolbar = toolbar;
-#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) {
item = GTK_WIDGET(gtk_tool_item_new());
gtk_container_add (GTK_CONTAINER (item), progressbar);
gtk_widget_show(item);
- gtk_widget_show(progressbar);
- gtk_widget_set_size_request(progressbar, 70, -1);
+ gtk_widget_set_size_request(progressbar, 84, -1);
gtk_toolbar_insert(GTK_TOOLBAR(toolbar), GTK_TOOL_ITEM(item), -1);
mainwin->progressbar = progressbar;
#endif
activate_learn_button(toolbar_data, prefs_common.toolbar_style,
LEARN_SPAM);
-#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;
}
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
}
}
-#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)
{
- SensitiveCond state;
+ SensitiveCondMask state;
gboolean sensitive;
MainWindow *mainwin = (MainWindow*)data;
Toolbar *toolbar = mainwin->toolbar;
typedef struct _Entry Entry;
struct _Entry {
GtkWidget *widget;
- SensitiveCond cond;
+ SensitiveCondMask cond;
gboolean empty;
};
-#define SET_WIDGET_COND(w, c) \
-{ \
+#define SET_WIDGET_COND(w, ...) \
+do { \
Entry *e = g_new0(Entry, 1); \
e->widget = w; \
- e->cond = c; \
+ e->cond = main_window_get_mask(__VA_ARGS__, -1); \
entry_list = g_slist_append(entry_list, e); \
-}
-
+} while (0)
+ /* match all bit flags */
+
if (toolbar->get_btn)
SET_WIDGET_COND(toolbar->get_btn,
- M_HAVE_ACCOUNT|M_UNLOCKED);
+ M_HAVE_ACCOUNT, M_UNLOCKED, M_HAVE_RETRIEVABLE_ACCOUNT);
if (toolbar->getall_btn) {
SET_WIDGET_COND(toolbar->getall_btn,
- M_HAVE_ACCOUNT|M_UNLOCKED);
+ M_HAVE_ACCOUNT, M_UNLOCKED, M_HAVE_ANY_RETRIEVABLE_ACCOUNT);
}
if (toolbar->send_btn) {
SET_WIDGET_COND(toolbar->send_btn,
}
if (toolbar->open_mail_btn) {
SET_WIDGET_COND(toolbar->open_mail_btn,
- M_TARGET_EXIST|M_SUMMARY_ISLIST);
+ 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);
+ 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);
+ 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);
+ 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);
+ 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);
+ 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|M_SUMMARY_ISLIST);
+ SET_WIDGET_COND(toolbar->next_btn, M_MSG_EXIST, M_SUMMARY_ISLIST);
} else {
- SET_WIDGET_COND(toolbar->next_btn, 0);
+ SET_WIDGET_COND(toolbar->next_btn, -1);
}
if (toolbar->trash_btn)
SET_WIDGET_COND(toolbar->trash_btn,
- M_TARGET_EXIST|M_ALLOW_DELETE|M_NOT_NEWS);
+ M_TARGET_EXIST, M_ALLOW_DELETE, M_NOT_NEWS);
if (toolbar->delete_btn)
SET_WIDGET_COND(toolbar->delete_btn,
- M_TARGET_EXIST|M_ALLOW_DELETE);
+ M_TARGET_EXIST, M_ALLOW_DELETE);
if (toolbar->exec_btn)
SET_WIDGET_COND(toolbar->exec_btn,
if (toolbar->learn_spam_btn)
SET_WIDGET_COND(toolbar->learn_spam_btn,
- M_TARGET_EXIST|M_CAN_LEARN_SPAM|M_SUMMARY_ISLIST);
+ 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);
+ if (toolbar->cancel_send_btn)
+ SET_WIDGET_COND(toolbar->cancel_send_btn,
+ M_SEND_ACTIVE);
+
for (cur = toolbar->action_list; cur != NULL; cur = cur->next) {
ToolbarClawsActions *act = (ToolbarClawsActions*)cur->data;
- SET_WIDGET_COND(act->widget, M_TARGET_EXIST|M_UNLOCKED);
+ SET_WIDGET_COND(act->widget, M_TARGET_EXIST, M_UNLOCKED);
}
-#undef SET_WIDGET_COND
-
state = main_window_get_current_state(mainwin);
for (cur = entry_list; cur != NULL; cur = cur->next) {
entry_list = g_slist_remove(entry_list, e);
}
+ /* match any bit flags */
+
+ if (toolbar->cancel_all_btn)
+ SET_WIDGET_COND(toolbar->cancel_all_btn,
+ M_INC_ACTIVE, M_SEND_ACTIVE);
+
+ for (cur = entry_list; cur != NULL; cur = cur->next) {
+ Entry *e = (Entry*) cur->data;
+
+ if (e->widget != NULL) {
+ sensitive = ((e->cond & state) != 0);
+ GTK_BUTTON_SET_SENSITIVE(e->widget, sensitive);
+ }
+ }
+
+ while (entry_list != NULL) {
+ Entry *e = (Entry*) entry_list->data;
+
+ g_free(e);
+ entry_list = g_slist_remove(entry_list, e);
+ }
+
g_slist_free(entry_list);
activate_compose_button(toolbar,
prefs_common.toolbar_style,
toolbar->compose_btn_type);
+#undef SET_WIDGET_COND
}
void toolbar_comp_set_sensitive(gpointer data, gboolean sensitive)
GTK_BUTTON_SET_SENSITIVE(compose->toolbar->attach_btn, sensitive);
if (compose->toolbar->sig_btn)
GTK_BUTTON_SET_SENSITIVE(compose->toolbar->sig_btn, sensitive);
+ if (compose->toolbar->repsig_btn)
+ GTK_BUTTON_SET_SENSITIVE(compose->toolbar->repsig_btn, sensitive);
if (compose->toolbar->exteditor_btn)
GTK_BUTTON_SET_SENSITIVE(compose->toolbar->exteditor_btn, sensitive);
if (compose->toolbar->linewrap_current_btn)
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_mail_icon = NULL;
- toolbar->compose_news_icon = 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;
- toolbar->open_mail_btn = NULL;
- toolbar->close_window_btn = NULL;
+ 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_mail_icon = NULL;
+ toolbar->compose_news_icon = 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;
+ toolbar->separator = NULL;
+ toolbar->learn_spam_btn = NULL;
+ toolbar->learn_spam_icon = NULL;
+ toolbar->learn_ham_icon = NULL;
+ toolbar->cancel_inc_btn = NULL;
+ toolbar->cancel_send_btn = NULL;
+ toolbar->cancel_all_btn = NULL;
+
/* compose buttons */
- toolbar->sendl_btn = NULL;
- toolbar->draft_btn = NULL;
- toolbar->insert_btn = NULL;
- toolbar->attach_btn = NULL;
- toolbar->sig_btn = NULL;
- toolbar->exteditor_btn = NULL;
- toolbar->linewrap_current_btn = NULL;
- toolbar->linewrap_all_btn = NULL;
- toolbar->addrbook_btn = NULL;
+ toolbar->sendl_btn = NULL;
+ toolbar->draft_btn = NULL;
+ toolbar->insert_btn = NULL;
+ toolbar->attach_btn = NULL;
+ toolbar->sig_btn = NULL;
+ toolbar->repsig_btn = NULL;
+ toolbar->exteditor_btn = NULL;
+ toolbar->linewrap_current_btn = NULL;
+ toolbar->linewrap_all_btn = NULL;
+ toolbar->addrbook_btn = NULL;
+
+ toolbar->open_mail_btn = NULL;
+ toolbar->close_window_btn = NULL;
+ toolbar->preferences_btn = NULL;
+ toolbar->action_list = NULL;
+ toolbar->item_list = NULL;
#ifdef USE_ENCHANT
- toolbar->spellcheck_btn = NULL;
+ toolbar->spellcheck_btn = NULL;
#endif
toolbar_destroy(toolbar);
if (item) {
ac = account_find_from_item(item);
- if (ac && ac->protocol != A_NNTP) {
+ if (ac && ac->protocol != A_NNTP && ac->protocol != A_IMAP4) {
compose_new_with_folderitem(ac, item, NULL); /* CLAWS */
return;
}
projects / claws.git / blobdiff