commit 0b253d952793e5297ec28df3b06bdffd9ea67eda
parent 84ef4ef55f3a18d6be95f7c8f704443545370839
Author: Paul <paul@claws-mail.org>
Date: Mon, 3 Feb 2014 14:03:17 +0000
implement RFE bug 3053, 'Can't add "replace signature" to the toolbar'
Diffstat:
3 files changed, 22 insertions(+), 1 deletion(-)
diff --git a/src/compose.c b/src/compose.c
@@ -2672,6 +2672,9 @@ void compose_toolbar_cb(gint action, gpointer data)
case A_SIG:
compose_insert_sig(compose, FALSE);
break;
+ case A_REP_SIG:
+ compose_insert_sig(compose, TRUE);
+ break;
case A_EXTEDITOR:
compose_ext_editor_cb(NULL, compose);
break;
diff --git a/src/toolbar.c b/src/toolbar.c
@@ -218,6 +218,7 @@ struct {
{ "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") },
@@ -327,7 +328,7 @@ GList *toolbar_get_action_items(ToolbarType source)
else if (source == TOOLBAR_COMPOSE) {
gint comp_items[] = { A_SEND, A_SENDL, 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,
@@ -426,6 +427,7 @@ const gchar *toolbar_get_short_text(int action) {
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");
@@ -471,6 +473,7 @@ gint toolbar_get_icon(int action) {
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;
@@ -1614,6 +1617,11 @@ static void toolbar_sig_cb(GtkWidget *widget, gpointer data)
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);
@@ -1761,6 +1769,7 @@ static void toolbar_buttons_cb(GtkWidget *widget,
{ 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 },
@@ -2141,6 +2150,10 @@ Toolbar *toolbar_create(ToolbarType type,
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;
@@ -2540,6 +2553,8 @@ 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)
@@ -2596,6 +2611,7 @@ static void toolbar_init(Toolbar * toolbar)
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;
diff --git a/src/toolbar.h b/src/toolbar.h
@@ -91,6 +91,7 @@ struct _Toolbar {
GtkWidget *insert_btn;
GtkWidget *attach_btn;
GtkWidget *sig_btn;
+ GtkWidget *repsig_btn;
GtkWidget *exteditor_btn;
GtkWidget *linewrap_current_btn;
GtkWidget *linewrap_all_btn;
@@ -187,6 +188,7 @@ enum {
A_INSERT,
A_ATTACH,
A_SIG,
+ A_REP_SIG,
A_EXTEDITOR,
A_LINEWRAP_CURRENT,
A_LINEWRAP_ALL,
