/*
* Claws Mail templates subsystem
* Copyright (C) 2001 Alexander Barinov
- * Copyright (C) 2001-2007 Hiroyuki Yamamoto and the Claws Mail team
+ * Copyright (C) 2001-2020 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 "manual.h"
#include "gtkutils.h"
#include "menu.h"
+#include "account.h"
enum {
TEMPL_TEXT,
GtkWidget *entry_to;
GtkWidget *entry_cc;
GtkWidget *entry_bcc;
+ GtkWidget *entry_replyto;
GtkWidget *text_value;
} templates;
} widgets_table[] = {
{N_("Name"), &templates.entry_name, FALSE,
N_("This name is used as the Menu item")},
- {N_("From"), &templates.entry_from, TRUE,
+ {"From", &templates.entry_from, TRUE,
N_("Override composing account's From header. This doesn't change the composing account.")},
- {N_("To"), &templates.entry_to, TRUE, NULL},
- {N_("Cc"), &templates.entry_cc, TRUE, NULL},
- {N_("Bcc"), &templates.entry_bcc, TRUE, NULL},
- {N_("Subject"), &templates.entry_subject, FALSE, NULL},
+ {"To", &templates.entry_to, TRUE, NULL},
+ {"Cc", &templates.entry_cc, TRUE, NULL},
+ {"Bcc", &templates.entry_bcc, TRUE, NULL},
+ {"Reply-To", &templates.entry_replyto, TRUE, NULL},
+ {"Subject", &templates.entry_subject, FALSE, NULL},
{NULL, NULL, FALSE, NULL}
};
static gboolean prefs_template_key_pressed_cb (GtkWidget *widget,
GdkEventKey *event,
gpointer data);
+static gboolean prefs_template_search_func_cb (GtkTreeModel *model, gint column,
+ const gchar *key, GtkTreeIter *iter,
+ gpointer search_data);
+
static void prefs_template_cancel_cb (gpointer action, gpointer data);
static void prefs_template_ok_cb (gpointer action, gpointer data);
static void prefs_template_register_cb (gpointer action, gpointer data);
{
inc_lock();
- if (!templates.window)
- prefs_template_window_create();
+ prefs_template_window_create();
prefs_template_window_setup();
gtk_widget_show(templates.window);
+ gtk_window_set_modal(GTK_WINDOW(templates.window), TRUE);
}
/*!
static void prefs_template_size_allocate_cb(GtkWidget *widget,
GtkAllocation *allocation)
{
- g_return_if_fail(allocation != NULL);
+ cm_return_if_fail(allocation != NULL);
prefs_common.templateswin_width = allocation->width;
prefs_common.templateswin_height = allocation->height;
GtkWidget *scrolled_window;
GtkWidget *vpaned;
GtkWidget *vbox1;
- GtkWidget *table; /* including : entry_[name|from|to|cc|bcc|subject] */
+ GtkWidget *table; /* including : entry_[name|from|to|cc|bcc|replyto|subject] */
GtkWidget *scroll2;
GtkWidget *text_value;
GtkWidget *vbox2;
GtkWidget *ok_btn;
static GdkGeometry geometry;
gint i;
- CLAWS_TIP_DECL();
debug_print("Creating templates configuration window...\n");
/* main window */
window = gtkut_window_new(GTK_WINDOW_TOPLEVEL, "prefs_template");
gtk_window_set_position(GTK_WINDOW(window), GTK_WIN_POS_CENTER);
- gtk_window_set_modal(GTK_WINDOW(window), TRUE);
gtk_window_set_resizable(GTK_WINDOW(window), TRUE);
+ gtk_window_set_type_hint(GTK_WINDOW(window), GDK_WINDOW_TYPE_HINT_DIALOG);
vbox = gtk_vbox_new(FALSE, 8);
gtk_widget_show(vbox);
gtk_widget_show(vpaned);
gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(scrolled_window),
vpaned);
+ gtk_viewport_set_shadow_type (GTK_VIEWPORT(
+ gtk_bin_get_child(GTK_BIN(scrolled_window))), GTK_SHADOW_NONE);
/* vbox to handle template name and content */
vbox1 = gtk_vbox_new(FALSE, 6);
GtkWidget *label;
- label = gtk_label_new(widgets_table[i].label);
+ label = gtk_label_new( (i != 0) ?
+ prefs_common_translated_header_name(widgets_table[i].label) :
+ _(widgets_table[i].label));
gtk_widget_show(label);
gtk_table_attach(GTK_TABLE(table), label, 0, 1, i, (i + 1),
(GtkAttachOptions) (GTK_FILL),
(GtkAttachOptions) (GTK_EXPAND|GTK_SHRINK|GTK_FILL),
(GtkAttachOptions) 0, 0, 0);
CLAWS_SET_TIP(*(widgets_table[i].entry),
- widgets_table[i].tooltips);
+ _(widgets_table[i].tooltips));
}
/* template content */
arrow1 = gtk_arrow_new(GTK_ARROW_DOWN, GTK_SHADOW_OUT);
gtk_widget_show(arrow1);
gtk_box_pack_start(GTK_BOX(hbox2), arrow1, FALSE, FALSE, 0);
- gtk_widget_set_size_request(arrow1, -1, 16);
hbox3 = gtk_hbox_new(TRUE, 4);
gtk_widget_show(hbox3);
CLAWS_SET_TIP(reg_btn,
_("Append the new template above to the list"));
- subst_btn = gtkut_get_replace_btn(_("Replace"));
+ subst_btn = gtkut_get_replace_btn(_("_Replace"));
gtk_widget_show(subst_btn);
gtk_box_pack_start(GTK_BOX(hbox3), subst_btn, FALSE, TRUE, 0);
g_signal_connect(G_OBJECT(subst_btn), "clicked",
CLAWS_SET_TIP(subst_btn,
_("Replace the selected template in list with the template above"));
- del_btn = gtk_button_new_from_stock(GTK_STOCK_DELETE);
+ del_btn = gtk_button_new_with_mnemonic (_("D_elete"));
+ gtk_button_set_image(GTK_BUTTON(del_btn),
+ gtk_image_new_from_stock(GTK_STOCK_REMOVE,GTK_ICON_SIZE_BUTTON));
gtk_widget_show(del_btn);
gtk_box_pack_start(GTK_BOX(hbox3), del_btn, FALSE, TRUE, 0);
g_signal_connect(G_OBJECT(del_btn), "clicked",
CLAWS_SET_TIP(del_btn,
_("Delete the selected template from the list"));
- clear_btn = gtk_button_new_from_stock (GTK_STOCK_CLEAR);
+ clear_btn = gtk_button_new_with_mnemonic (_("C_lear"));
+ gtk_button_set_image(GTK_BUTTON(clear_btn),
+ gtk_image_new_from_stock(GTK_STOCK_CLEAR,GTK_ICON_SIZE_BUTTON));
gtk_widget_show (clear_btn);
gtk_box_pack_start (GTK_BOX (hbox3), clear_btn, FALSE, TRUE, 0);
g_signal_connect(G_OBJECT (clear_btn), "clicked",
CLAWS_SET_TIP(clear_btn,
_("Clear all the input fields in the dialog"));
-#if GTK_CHECK_VERSION(2, 8, 0)
desc_btn = gtk_button_new_from_stock(GTK_STOCK_INFO);
-#else
- desc_btn = gtk_button_new_with_label(_(" Symbols... "));
-#endif
gtk_widget_show(desc_btn);
gtk_box_pack_end(GTK_BOX(hbox2), desc_btn, FALSE, FALSE, 0);
g_signal_connect(G_OBJECT(desc_btn), "clicked",
CLAWS_SET_TIP(top_btn,
_("Move the selected template to the top"));
- PACK_VSPACER(vbox3, spc_vbox, VSPACING_NARROW_2);
+ PACK_SPACER(vbox3, spc_vbox, VSPACING_NARROW_2);
up_btn = gtk_button_new_from_stock(GTK_STOCK_GO_UP);
gtk_widget_show(up_btn);
CLAWS_SET_TIP(down_btn,
_("Move the selected template down"));
- PACK_VSPACER(vbox3, spc_vbox, VSPACING_NARROW_2);
+ PACK_SPACER(vbox3, spc_vbox, VSPACING_NARROW_2);
bottom_btn = gtk_button_new_from_stock(GTK_STOCK_GOTO_BOTTOM);
gtk_widget_show(bottom_btn);
gtk_entry_set_text(GTK_ENTRY(templates.entry_to), "");
gtk_entry_set_text(GTK_ENTRY(templates.entry_cc), "");
gtk_entry_set_text(GTK_ENTRY(templates.entry_bcc), "");
+ gtk_entry_set_text(GTK_ENTRY(templates.entry_replyto), "");
gtk_entry_set_text(GTK_ENTRY(templates.entry_subject), "");
buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(templates.text_value));
static gboolean prefs_template_key_pressed_cb(GtkWidget *widget,
GdkEventKey *event, gpointer data)
{
- if (event && event->keyval == GDK_Escape)
+ if (event && event->keyval == GDK_KEY_Escape)
prefs_template_cancel_cb(NULL, NULL);
else {
GtkWidget *focused = gtkut_get_focused_child(
return FALSE;
}
+static gboolean prefs_template_search_func_cb (GtkTreeModel *model, gint column, const gchar *key,
+ GtkTreeIter *iter, gpointer search_data)
+{
+ gchar *store_string;
+ gint key_len;
+ gboolean retval;
+ GtkTreePath *path;
+
+ gtk_tree_model_get (model, iter, column, &store_string, -1);
+
+ if (!store_string || !key) return FALSE;
+
+ key_len = strlen (key);
+ retval = (strncmp (key, store_string, key_len) != 0);
+
+ g_free(store_string);
+ debug_print("selecting row\n");
+ path = gtk_tree_model_get_path(model, iter);
+ prefs_template_select_row(GTK_TREE_VIEW(templates.list_view), path);
+ gtk_tree_path_free(path);
+
+ return retval;
+}
static void prefs_template_address_completion_end(void)
{
gint i;
if (modified && alertpanel(_("Entry not saved"),
_("The entry was not saved. Close anyway?"),
- GTK_STOCK_CLOSE, _("+_Continue editing"),
- NULL) != G_ALERTDEFAULT) {
+ GTK_STOCK_CLOSE, _("_Continue editing"), NULL,
+ ALERTFOCUS_SECOND) != G_ALERTDEFAULT) {
return;
}
store = GTK_LIST_STORE(gtk_tree_view_get_model(GTK_TREE_VIEW
(templates.list_view)));
gtk_list_store_clear(store);
- gtk_widget_hide(templates.window);
+ gtk_widget_destroy(templates.window);
inc_unlock();
}
if (modified && alertpanel(_("Entry not saved"),
_("The entry was not saved. Close anyway?"),
- GTK_STOCK_CLOSE, _("+_Continue editing"),
- NULL) != G_ALERTDEFAULT) {
+ GTK_STOCK_CLOSE, _("_Continue editing"), NULL,
+ ALERTFOCUS_SECOND) != G_ALERTDEFAULT) {
return;
} else if (modified_list && alertpanel(_("Templates list not saved"),
_("The templates list has been modified. Close anyway?"),
- GTK_STOCK_CLOSE, _("+_Continue editing"),
- NULL) != G_ALERTDEFAULT) {
+ GTK_STOCK_CLOSE, _("_Continue editing"), NULL,
+ ALERTFOCUS_SECOND) != G_ALERTDEFAULT) {
return;
}
store = GTK_LIST_STORE(gtk_tree_view_get_model(GTK_TREE_VIEW
(templates.list_view)));
gtk_list_store_clear(store);
- gtk_widget_hide(templates.window);
+ gtk_widget_destroy(templates.window);
inc_unlock();
}
ntmpl->bcc = tmpl->bcc && *(tmpl->bcc)
? g_strdup(tmpl->bcc)
: NULL;
+ ntmpl->replyto = tmpl->replyto && *(tmpl->replyto)
+ ? g_strdup(tmpl->replyto)
+ : NULL;
ntmpl->value = tmpl->value && *(tmpl->value)
? g_strdup(tmpl->value)
: NULL;
tmp = g_strdup(string);
}
memset(&dummyinfo, 0, sizeof(MsgInfo));
-#ifdef USE_ASPELL
+ /* init dummy fields, so we can test the result of the parse */
+ dummyinfo.date="Sat, 30 May 2009 01:23:45 +0200";
+ dummyinfo.fromname="John Doe";
+ dummyinfo.from="John Doe <john@example.com>";
+ dummyinfo.to="John Doe <john@example.com>";
+ dummyinfo.cc="John Doe <john@example.com>";
+ dummyinfo.msgid="<1234john@example.com>";
+ dummyinfo.inreplyto="<1234john@example.com>";
+ dummyinfo.newsgroups="alt.test";
+ dummyinfo.subject="subject";
+
+
+#ifdef USE_ENCHANT
quote_fmt_init(&dummyinfo, NULL, NULL, TRUE, account, FALSE, NULL);
#else
quote_fmt_init(&dummyinfo, NULL, NULL, TRUE, account, FALSE);
if (!parsed_buf) {
if (line)
*line = quote_fmt_get_line();
+ quote_fmtlex_destroy();
return FALSE;
}
- if (email) {
- const gchar *start = strrchr(parsed_buf, '<');
- const gchar *end = strrchr(parsed_buf, '>');
- const gchar *at = strrchr(parsed_buf, '@');
- const gchar *space = strrchr(parsed_buf, ' ');
- if (!at)
- result = FALSE;
- if (at && space && (!start || !end || end < start || start < space))
- result = FALSE;
- }
quote_fmt_reset_vartable();
+ quote_fmtlex_destroy();
}
return result;
}
gchar *from;
gchar *to;
gchar *cc;
- gchar *bcc;
+ gchar *bcc;
+ gchar *replyto;
gchar *value;
GtkTextBuffer *buffer;
GtkTextIter start, end;
- GtkTreeModel *model;
gint line;
- model = gtk_tree_view_get_model(GTK_TREE_VIEW(templates.list_view));
-
buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(templates.text_value));
gtk_text_buffer_get_start_iter(buffer, &start);
gtk_text_buffer_get_iter_at_offset(buffer, &end, -1);
value = NULL;
}
if (!prefs_template_string_is_valid(value, &line, TRUE, FALSE)) {
- alertpanel_error(_("Template body format error at line %d."), line);
+ alertpanel_error(_("The body of the template has an error at line %d."), line);
g_free(value);
return FALSE;
}
name = gtk_editable_get_chars(GTK_EDITABLE(templates.entry_name),
0, -1);
if (*name == '\0') {
- alertpanel_error(_("Template name is not set."));
+ alertpanel_error(_("The template's name is not set."));
g_free(value);
return FALSE;
}
0, -1);
bcc = gtk_editable_get_chars(GTK_EDITABLE(templates.entry_bcc),
0, -1);
+ replyto = gtk_editable_get_chars(GTK_EDITABLE(templates.entry_replyto),
+ 0, -1);
subject = gtk_editable_get_chars(GTK_EDITABLE(templates.entry_subject),
0, -1);
g_free(bcc);
bcc = NULL;
}
+ if (replyto && *replyto == '\0') {
+ g_free(replyto);
+ replyto = NULL;
+ }
if (subject && *subject == '\0') {
g_free(subject);
subject = NULL;
}
if (!prefs_template_string_is_valid(from, NULL, TRUE, TRUE)) {
- alertpanel_error(_("Template From format error."));
+ alertpanel_error(_("The \"From\" field of the template contains an invalid email address."));
g_free(from);
g_free(value);
return FALSE;
}
if (!prefs_template_string_is_valid(to, NULL, TRUE, TRUE)) {
- alertpanel_error(_("Template To format error."));
+ alertpanel_error(_("The \"To\" field of the template contains an invalid email address."));
g_free(to);
g_free(value);
return FALSE;
}
if (!prefs_template_string_is_valid(cc, NULL, TRUE, TRUE)) {
- alertpanel_error(_("Template Cc format error."));
+ alertpanel_error(_("The \"Cc\" field of the template contains an invalid email address."));
g_free(cc);
g_free(value);
return FALSE;
}
if (!prefs_template_string_is_valid(bcc, NULL, TRUE, TRUE)) {
- alertpanel_error(_("Template Bcc format error."));
+ alertpanel_error(_("The \"Bcc\" field of the template contains an invalid email address."));
g_free(bcc);
g_free(value);
return FALSE;
}
+ if (!prefs_template_string_is_valid(replyto, NULL, TRUE, TRUE)) {
+ alertpanel_error(_("The \"Reply-To\" field of the template contains an invalid email address."));
+ g_free(replyto);
+ g_free(value);
+ return FALSE;
+ }
if (!prefs_template_string_is_valid(subject, NULL, TRUE, FALSE)) {
- alertpanel_error(_("Template subject format error."));
+ alertpanel_error(_("The \"Subject\" field of the template is invalid."));
g_free(subject);
g_free(value);
return FALSE;
tmpl->to = to;
tmpl->cc = cc;
tmpl->bcc = bcc;
+ tmpl->replyto = replyto;
tmpl->value = value;
prefs_template_list_view_insert_template(templates.list_view,
if (alertpanel(_("Delete template"),
_("Do you really want to delete this template?"),
- GTK_STOCK_CANCEL, GTK_STOCK_DELETE,
- NULL) != G_ALERTALTERNATE)
+ GTK_STOCK_CANCEL, GTK_STOCK_DELETE, NULL,
+ ALERTFOCUS_FIRST) != G_ALERTALTERNATE)
return;
gtk_list_store_remove(GTK_LIST_STORE(model), &iter);
+ prefs_template_reset_dialog();
modified_list = TRUE;
}
static void prefs_template_delete_all_cb(gpointer action, gpointer data)
{
- GtkListStore *list_store;
-
if (alertpanel(_("Delete all templates"),
_("Do you really want to delete all the templates?"),
- GTK_STOCK_CANCEL, "+"GTK_STOCK_DELETE, NULL) == G_ALERTDEFAULT)
+ GTK_STOCK_CANCEL, GTK_STOCK_DELETE, NULL,
+ ALERTFOCUS_SECOND) == G_ALERTDEFAULT)
return;
- list_store = GTK_LIST_STORE(gtk_tree_view_get_model(GTK_TREE_VIEW(templates.list_view)));
prefs_template_clear_list();
modified = FALSE;
static GtkActionEntry prefs_template_popup_entries[] =
{
- {"PrefsTemplatePopup", NULL, "PrefsTemplatePopup" },
+ {"PrefsTemplatePopup", NULL, "PrefsTemplatePopup", NULL, NULL, NULL },
{"PrefsTemplatePopup/Delete", NULL, N_("_Delete"), NULL, NULL, G_CALLBACK(prefs_template_delete_cb) },
{"PrefsTemplatePopup/DeleteAll", NULL, N_("Delete _all"), NULL, NULL, G_CALLBACK(prefs_template_delete_all_cb) },
{"PrefsTemplatePopup/Duplicate", NULL, N_("D_uplicate"), NULL, NULL, G_CALLBACK(prefs_template_duplicate_cb) },
};
+static void prefs_template_row_selected(GtkTreeSelection *selection,
+ GtkTreeView *list_view)
+{
+ GtkTreePath *path;
+ GtkTreeIter iter;
+ GtkTreeModel *model;
+
+ if (!gtk_tree_selection_get_selected(selection, &model, &iter))
+ return;
+
+ path = gtk_tree_model_get_path(model, &iter);
+ prefs_template_select_row(list_view, path);
+ gtk_tree_path_free(path);
+}
+
static gint prefs_template_list_btn_pressed(GtkWidget *widget, GdkEventButton *event,
GtkTreeView *list_view)
{
list_view = GTK_TREE_VIEW(gtk_tree_view_new_with_model(model));
g_object_unref(model);
-#ifndef MAEMO
g_signal_connect(G_OBJECT(list_view), "popup-menu",
G_CALLBACK(prefs_template_list_popup_menu), list_view);
-#else
- gtk_widget_tap_and_hold_setup(GTK_WIDGET(list_view), NULL, NULL,
- GTK_TAP_AND_HOLD_NONE | GTK_TAP_AND_HOLD_NO_INTERNALS);
- g_signal_connect(G_OBJECT(list_view), "tap-and-hold",
- G_CALLBACK(prefs_template_list_popup_menu), list_view);
-#endif
g_signal_connect(G_OBJECT(list_view), "button-press-event",
G_CALLBACK(prefs_template_list_btn_pressed), list_view);
selector = gtk_tree_view_get_selection(list_view);
gtk_tree_selection_set_mode(selector, GTK_SELECTION_BROWSE);
+ g_signal_connect(G_OBJECT(selector), "changed",
+ G_CALLBACK(prefs_template_row_selected), list_view);
/* create the columns */
prefs_template_create_list_view_columns(GTK_WIDGET(list_view));
"text", TEMPL_TEXT,
NULL);
gtk_tree_view_append_column(GTK_TREE_VIEW(list_view), column);
+ gtk_tree_view_set_search_equal_func(GTK_TREE_VIEW(list_view), prefs_template_search_func_cb , NULL, NULL);
}
/*!
tmpl_def.to = "";
tmpl_def.cc = "";
tmpl_def.bcc = "";
+ tmpl_def.replyto = "";
tmpl_def.value = "";
gtk_tree_model_get(model, &titer, TEMPL_DATA, &tmpl, -1);
tmpl->cc ? tmpl->cc : "");
gtk_entry_set_text(GTK_ENTRY(templates.entry_bcc),
tmpl->bcc ? tmpl->bcc : "");
+ gtk_entry_set_text(GTK_ENTRY(templates.entry_replyto),
+ tmpl->replyto ? tmpl->replyto : "");
gtk_entry_set_text(GTK_ENTRY(templates.entry_subject),
tmpl->subject ? tmpl->subject : "");
projects / claws.git / blobdiff