/*
* Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 2001-2007 Hiroyuki Yamamoto and the Claws Mail team
+ * Copyright (C) 2001-2011 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
#include "prefs_toolbar.h"
#include "alertpanel.h"
#include "imap.h"
+#ifdef USE_NEW_ADDRBOOK
+ #include "addressbook-dbus.h"
+#endif
/* elements */
#define TOOLBAR_TAG_INDEX "toolbar"
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,
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_CLAWS_ACTIONS", N_("Claws Mail Actions Feature") },
{ "A_CANCEL_INC", N_("Cancel receiving") },
{ "A_CLOSE", N_("Close window") },
- { "A_SEPARATOR", N_("Separator") }
+ { "A_SEPARATOR", N_("Separator") },
+ { "A_CLAWS_PLUGINS", N_("Claws Mail Plugins") },
};
/* struct holds configuration files and a list of
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;
}
{
GSList *cur;
- if ((action == A_SEPARATOR) || (action == A_CLAWS_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 (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")) {
g_free(item->file);
item->file = g_strdup("trash_btn");
g_free(item->text);
- item->text = g_strdup(_("Trash"));
+ item->text = g_strdup(Q_("Toolbar|Trash"));
rewrite = TRUE;
}
if (item->index == -1 && !strcmp(value, "A_SYL_ACTIONS")) {
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_SENDER: return Q_("Toolbar|Sender");
case A_REPLY_ML: return _("List");
case A_FORWARD: return _("Forward");
- case A_TRASH: return _("Trash");
+ case A_TRASH: return Q_("Toolbar|Trash");
case A_DELETE_REAL: return _("Delete");
case A_LEARN_SPAM: return _("Spam");
case A_GOTO_PREV: return _("Prev");
{ A_SEPARATOR},
{ A_TRASH},
#ifndef GENERIC_UMPC
-#if (defined(USE_SPAMASSASSIN_PLUGIN) || defined(USE_BOGOFILTER_PLUGIN))
{ A_LEARN_SPAM},
-#endif
#endif
{ A_SEPARATOR},
{ A_GOTO_NEXT}
if (default_toolbar[i].action != A_SEPARATOR) {
- gchar *file = stock_pixmap_get_name((StockPixmap)toolbar_get_icon(default_toolbar[i].action));
+ 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;
if (default_toolbar[i].action != A_SEPARATOR) {
- gchar *file = stock_pixmap_get_name((StockPixmap)toolbar_get_icon(default_toolbar[i].action));
-
+ 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));
{ A_SEPARATOR},
{ A_TRASH},
#ifndef GENERIC_UMPC
-#if (defined(USE_SPAMASSASSIN_PLUGIN) || defined(USE_BOGOFILTER_PLUGIN))
{ A_LEARN_SPAM},
-#endif
#endif
{ A_GOTO_NEXT}
};
ToolbarItem *toolbar_item = g_new0(ToolbarItem, 1);
if (default_toolbar[i].action != A_SEPARATOR) {
-
- gchar *file = stock_pixmap_get_name((StockPixmap)toolbar_get_icon(default_toolbar[i].action));
+ 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;
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");
}
+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;
+}
+
#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), \
GList *list;
GList *cur;
- g_return_if_fail(mainwin != NULL);
+ cm_return_if_fail(mainwin != NULL);
toolbar_style(TOOLBAR_MAIN, action, mainwin);
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:
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:
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:
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:
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
}
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:
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:
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;
- g_return_if_fail(toolbar_item != NULL);
+ cm_return_if_fail(toolbar_item != NULL);
inc_cancel_all();
imap_cancel_all();
}
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:
MessageView *messageview;
Compose *compose;
- 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:
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:
{ A_CHECK_SPELLING, toolbar_check_spelling_cb },
#endif
{ A_CLAWS_ACTIONS, toolbar_actions_execute_cb },
- { A_CANCEL_INC, toolbar_cancel_inc_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)); \
+ 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); \
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);
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_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));
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
#ifndef MAEMO
gtk_container_add(GTK_CONTAINER(container), toolbar);
- gtk_container_set_border_width(GTK_CONTAINER(container), 2);
+ 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));
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,
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);
projects / claws.git / blobdiff