/*
* Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 2001-2011 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_NEW_ADDRBOOK
+ #include "addressbook.h"
+#else
+ #include "addressbook-dbus.h"
+#endif
/* elements */
#define TOOLBAR_TAG_INDEX "toolbar"
#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;
{ "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_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") },
#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") },
};
/* struct holds configuration files and a list of
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,
+ 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 };
+ 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_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));
g_free(item->file);
item->file = g_strdup("trash_btn");
g_free(item->text);
- item->text = g_strdup(Q_("Toolbar|Trash"));
+ item->text = g_strdup(C_("Toolbar", "Trash"));
rewrite = TRUE;
}
if (item->index == -1 && !strcmp(value, "A_SYL_ACTIONS")) {
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_ALL: return _("All");
- case A_REPLY_SENDER: return Q_("Toolbar|Sender");
+ case A_REPLY_SENDER: return C_("Toolbar", "Sender");
case A_REPLY_ML: return _("List");
case A_FORWARD: return _("Forward");
- case A_TRASH: return Q_("Toolbar|Trash");
+ case A_TRASH: return C_("Toolbar", "Trash");
case A_DELETE_REAL: return _("Delete");
case A_LEARN_SPAM: return _("Spam");
case A_GOTO_PREV: return _("Prev");
case A_LINEWRAP_ALL: return _("Wrap all");
case A_ADDRBOOK: return _("Address");
case A_CANCEL_INC: return _("Stop");
+ case A_CANCEL_SEND: return _("Stop");
+ case A_CANCEL_ALL: return _("Stop all");
case A_EXECUTE: return _("Execute");
#ifdef USE_ENCHANT
case A_CHECK_SPELLING: return _("Check spelling");
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_CANCEL_SEND: return STOCK_PIXMAP_CANCEL;
+ case A_CANCEL_ALL: return STOCK_PIXMAP_CANCEL;
case A_EXECUTE: return STOCK_PIXMAP_EXEC;
#ifdef USE_ENCHANT
case A_CHECK_SPELLING: return STOCK_PIXMAP_CHECK_SPELLING;
{
XMLFile *file = NULL;
gchar *fileSpec = NULL;
- GList *attr;
- gboolean retVal;
jmp_buf jumper;
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;
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\n", source);
return;
}
default:
return;
}
+#ifndef USE_NEW_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
}
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)
{
#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 },
};
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;
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
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_RETRIEVABLE_ACCOUNT);
+ 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_ANY_RETRIEVABLE_ACCOUNT);
+ 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)
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->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
+#if !GTK_CHECK_VERSION(2,12,0)
+ toolbar->tooltips = NULL;
#endif
toolbar_destroy(toolbar);
projects / claws.git / blobdiff