/*
* Sylpheed templates subsystem
* Copyright (C) 2001 Alexander Barinov
- * Copyright (C) 2001-2006 Hiroyuki Yamamoto and the Sylpheed-Claws team
+ * Copyright (C) 2001-2007 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
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
*/
#include "defs.h"
#include "template.h"
#include "main.h"
+#include "prefs_gtk.h"
#include "inc.h"
#include "utils.h"
#include "gtkutils.h"
#include "addr_compl.h"
#include "quote_fmt.h"
#include "prefs_common.h"
+#include "manual.h"
+#include "gtkutils.h"
enum {
TEMPL_TEXT,
} templates;
static int modified = FALSE;
-
+static int modified_list = FALSE;
/* widget creating functions */
static void prefs_template_window_create (void);
static void prefs_template_window_setup (void);
static void prefs_template_register_cb (void);
static void prefs_template_substitute_cb (void);
static void prefs_template_delete_cb (void);
+static void prefs_template_top_cb (void);
+static void prefs_template_up_cb (void);
+static void prefs_template_down_cb (void);
+static void prefs_template_bottom_cb (void);
static GtkListStore* prefs_template_create_data_store (void);
static void prefs_template_list_view_insert_template (GtkWidget *list_view,
GtkTreeIter *row_iter,
const gchar *template,
- Template *data,
- gboolean sorted);
+ Template *data);
static GtkWidget *prefs_template_list_view_create (void);
static void prefs_template_create_list_view_columns (GtkWidget *list_view);
static gboolean prefs_template_selected (GtkTreeSelection *selector,
prefs_common.templateswin_height = allocation->height;
}
-#define ADD_ENTRY(entry, str, row) \
-{ \
- label1 = gtk_label_new(str); \
- gtk_widget_show(label1); \
- gtk_table_attach(GTK_TABLE(table), label1, 0, 1, row, (row + 1), \
- GTK_FILL, 0, 0, 0); \
- gtk_misc_set_alignment(GTK_MISC(label1), 1, 0.5); \
- \
- entry = gtk_entry_new(); \
- gtk_widget_show(entry); \
- gtk_table_attach(GTK_TABLE(table), entry, 1, 2, row, (row + 1), \
- GTK_EXPAND|GTK_SHRINK|GTK_FILL, 0, 0, 0); \
-}
-
static void prefs_template_window_create(void)
{
/* window structure ;) */
GtkWidget *window;
GtkWidget *vpaned;
GtkWidget *vbox1;
- GtkWidget *hbox1;
- GtkWidget *label1;
- GtkWidget *entry_name;
- GtkWidget *table;
- GtkWidget *entry_to;
- GtkWidget *entry_cc;
- GtkWidget *entry_bcc;
- GtkWidget *entry_subject;
+ GtkWidget *table; /* including : entry_[name|to|cc|bcc|subject] */
GtkWidget *scroll2;
GtkWidget *text_value;
GtkWidget *vbox2;
GtkWidget *subst_btn;
GtkWidget *del_btn;
GtkWidget *desc_btn;
- GtkWidget *scroll1;
- GtkWidget *list_view;
+ GtkWidget *hbox4;
+ GtkWidget *scroll1;
+ GtkWidget *list_view;
+ GtkWidget *vbox3;
+ GtkWidget *spc_vbox;
+ GtkWidget *top_btn;
+ GtkWidget *up_btn;
+ GtkWidget *down_btn;
+ GtkWidget *bottom_btn;
GtkWidget *confirm_area;
- GtkWidget *ok_btn;
+ GtkWidget *help_btn;
GtkWidget *cancel_btn;
+ GtkWidget *ok_btn;
static GdkGeometry geometry;
+ gint i;
+ GtkTooltips *tooltips;
debug_print("Creating templates configuration window...\n");
/* main window */
- window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
+ 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_container_set_border_width(GTK_CONTAINER(vbox1), 8);
gtk_paned_pack1(GTK_PANED(vpaned), vbox1, FALSE, FALSE);
- hbox1 = gtk_hbox_new(FALSE, 8);
- gtk_widget_show(hbox1);
- gtk_box_pack_start(GTK_BOX(vbox1), hbox1, FALSE, FALSE, 0);
-
- label1 = gtk_label_new(_("Template name"));
- gtk_widget_show(label1);
- gtk_box_pack_start(GTK_BOX(hbox1), label1, FALSE, FALSE, 0);
-
- entry_name = gtk_entry_new();
- gtk_widget_show(entry_name);
- gtk_box_pack_start(GTK_BOX(hbox1), entry_name, TRUE, TRUE, 0);
-
- /* table for headers */
- table = gtk_table_new(2, 2, FALSE);
+ table = gtk_table_new(5, 2, FALSE);
+ gtk_table_set_row_spacings (GTK_TABLE (table), VSPACING_NARROW_2);
+ gtk_table_set_col_spacings (GTK_TABLE (table), 4);
gtk_widget_show(table);
- gtk_box_pack_start(GTK_BOX(vbox1), table, FALSE, FALSE, 0);
- gtk_table_set_row_spacings(GTK_TABLE(table), 4);
- gtk_table_set_col_spacings(GTK_TABLE(table), 4);
-
- ADD_ENTRY(entry_to, _("To:"), 0);
- address_completion_register_entry(GTK_ENTRY(entry_to));
- ADD_ENTRY(entry_cc, _("Cc:"), 1)
- address_completion_register_entry(GTK_ENTRY(entry_cc));
- ADD_ENTRY(entry_bcc, _("Bcc:"), 2)
- address_completion_register_entry(GTK_ENTRY(entry_bcc));
- ADD_ENTRY(entry_subject, _("Subject:"), 3);
-
-#undef ADD_ENTRY
+ gtk_box_pack_start (GTK_BOX (vbox1), table, FALSE, FALSE, 0);
+
+ tooltips = gtk_tooltips_new();
+
+ struct
+ {
+ gchar *label;
+ GtkWidget **entry;
+ gboolean compl;
+ gchar *tooltips;
+ } tab[] = {
+ {_("Name"), &templates.entry_name, FALSE,
+ _("This name is used as the Menu item")},
+ {_("To"), &templates.entry_to, TRUE, NULL},
+ {_("Cc"), &templates.entry_cc, TRUE, NULL},
+ {_("Bcc"), &templates.entry_bcc, TRUE, NULL},
+ {_("Subject"), &templates.entry_subject, FALSE, NULL},
+ {NULL, NULL, FALSE, NULL}
+ };
+
+ for (i=0; tab[i].label; i++) {
+
+ GtkWidget *label;
+
+ label = gtk_label_new(tab[i].label);
+ gtk_widget_show(label);
+ gtk_table_attach(GTK_TABLE(table), label, 0, 1, i, (i + 1),
+ (GtkAttachOptions) (GTK_FILL),
+ (GtkAttachOptions) 0, 0, 0);
+ gtk_misc_set_alignment(GTK_MISC(label), 1, 0.5);
+
+ *(tab[i].entry) = gtk_entry_new();
+ gtk_widget_show(*(tab[i].entry));
+ gtk_table_attach(GTK_TABLE(table), *(tab[i].entry), 1, 2, i, (i + 1),
+ (GtkAttachOptions) (GTK_EXPAND|GTK_SHRINK|GTK_FILL),
+ (GtkAttachOptions) 0, 0, 0);
+ gtk_tooltips_set_tip(tooltips, *(tab[i].entry), tab[i].tooltips, NULL);
+
+ if (tab[i].compl)
+ address_completion_register_entry(
+ GTK_ENTRY(*(tab[i].entry)), TRUE);
+ }
/* template content */
scroll2 = gtk_scrolled_window_new(NULL, NULL);
gtk_box_pack_start(GTK_BOX(vbox1), scroll2, TRUE, TRUE, 0);
text_value = gtk_text_view_new();
+ if (prefs_common.textfont) {
+ PangoFontDescription *font_desc;
+
+ font_desc = pango_font_description_from_string
+ (prefs_common.textfont);
+ if (font_desc) {
+ gtk_widget_modify_font(text_value, font_desc);
+ pango_font_description_free(font_desc);
+ }
+ }
gtk_widget_show(text_value);
gtk_widget_set_size_request(text_value, -1, 120);
gtk_container_add(GTK_CONTAINER(scroll2), text_value);
g_signal_connect(G_OBJECT(del_btn), "clicked",
G_CALLBACK(prefs_template_delete_cb), NULL);
+#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",
G_CALLBACK(quote_fmt_quote_description), NULL);
/* templates list */
+ hbox4 = gtk_hbox_new(FALSE, 8);
+ gtk_widget_show(hbox4);
+ gtk_box_pack_start(GTK_BOX(vbox2), hbox4, TRUE, TRUE, 0);
+
scroll1 = gtk_scrolled_window_new(NULL, NULL);
gtk_widget_show(scroll1);
- gtk_box_pack_start(GTK_BOX(vbox2), scroll1, TRUE, TRUE, 0);
+ gtk_box_pack_start(GTK_BOX(hbox4), scroll1, TRUE, TRUE, 0);
gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scroll1),
GTK_POLICY_AUTOMATIC,
GTK_POLICY_AUTOMATIC);
+ vbox3 = gtk_vbox_new(FALSE, 8);
+ gtk_widget_show(vbox3);
+ gtk_box_pack_start(GTK_BOX(hbox4), vbox3, FALSE, FALSE, 0);
+
+ top_btn = gtk_button_new_from_stock(GTK_STOCK_GOTO_TOP);
+ gtk_widget_show(top_btn);
+ gtk_box_pack_start(GTK_BOX(vbox3), top_btn, FALSE, FALSE, 0);
+ g_signal_connect(G_OBJECT(top_btn), "clicked",
+ G_CALLBACK(prefs_template_top_cb), NULL);
+
+ PACK_VSPACER(vbox3, spc_vbox, VSPACING_NARROW_2);
+
+ up_btn = gtk_button_new_from_stock(GTK_STOCK_GO_UP);
+ gtk_widget_show(up_btn);
+ gtk_box_pack_start (GTK_BOX(vbox3), up_btn, FALSE, FALSE, 0);
+ g_signal_connect(G_OBJECT(up_btn), "clicked",
+ G_CALLBACK(prefs_template_up_cb), NULL);
+
+ down_btn = gtk_button_new_from_stock(GTK_STOCK_GO_DOWN);
+ gtk_widget_show (down_btn);
+ gtk_box_pack_start(GTK_BOX (vbox3), down_btn, FALSE, FALSE, 0);
+ g_signal_connect(G_OBJECT (down_btn), "clicked",
+ G_CALLBACK(prefs_template_down_cb), NULL);
+
+ PACK_VSPACER(vbox3, spc_vbox, VSPACING_NARROW_2);
+
+ bottom_btn = gtk_button_new_from_stock(GTK_STOCK_GOTO_BOTTOM);
+ gtk_widget_show(bottom_btn);
+ gtk_box_pack_start(GTK_BOX(vbox3), bottom_btn, FALSE, FALSE, 0);
+ g_signal_connect(G_OBJECT(bottom_btn), "clicked",
+ G_CALLBACK(prefs_template_bottom_cb), NULL);
+
list_view = prefs_template_list_view_create();
gtk_widget_show(list_view);
gtk_widget_set_size_request(scroll1, -1, 140);
gtk_container_add(GTK_CONTAINER(scroll1), list_view);
- /* ok | cancel */
- gtkut_stock_button_set_create(&confirm_area, &cancel_btn, GTK_STOCK_CANCEL,
- &ok_btn, GTK_STOCK_OK, NULL, NULL);
+ /* help | cancel | ok */
+ gtkut_stock_button_set_create_with_help(&confirm_area, &help_btn,
+ &cancel_btn, GTK_STOCK_CANCEL,
+ &ok_btn, GTK_STOCK_OK,
+ NULL, NULL);
gtk_widget_show(confirm_area);
gtk_box_pack_end(GTK_BOX(vbox2), confirm_area, FALSE, FALSE, 0);
gtk_widget_grab_default(ok_btn);
G_CALLBACK(prefs_template_ok_cb), NULL);
g_signal_connect(G_OBJECT(cancel_btn), "clicked",
G_CALLBACK(prefs_template_cancel_cb), NULL);
+ g_signal_connect(G_OBJECT(help_btn), "clicked",
+ G_CALLBACK(manual_open_with_anchor_cb),
+ MANUAL_ANCHOR_TEMPLATES);
address_completion_start(window);
if (!geometry.min_height) {
- geometry.min_width = 440;
- geometry.min_height = 500;
+ geometry.min_width = 480;
+ geometry.min_height = 540;
}
gtk_window_set_geometry_hints(GTK_WINDOW(window), NULL, &geometry,
templates.window = window;
templates.ok_btn = ok_btn;
templates.list_view = list_view;
- templates.entry_name = entry_name;
- templates.entry_subject = entry_subject;
- templates.entry_to = entry_to;
- templates.entry_cc = entry_cc;
- templates.entry_bcc = entry_bcc;
templates.text_value = text_value;
}
GSList *cur;
Template *tmpl;
GtkListStore *store;
-
+ GtkTextBuffer *buffer;
+
store = GTK_LIST_STORE(gtk_tree_view_get_model(GTK_TREE_VIEW
(templates.list_view)));
prefs_template_list_view_insert_template(templates.list_view,
NULL, _("(New)"),
- NULL, FALSE);
+ NULL);
tmpl_list = template_read_config();
tmpl = (Template *)cur->data;
prefs_template_list_view_insert_template(templates.list_view,
NULL, tmpl->name,
- tmpl, FALSE);
+ tmpl);
}
+ gtk_entry_set_text(GTK_ENTRY(templates.entry_name), "");
+ 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_subject), "");
+
+ buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(templates.text_value));
+ gtk_text_buffer_set_text(buffer, "", -1);
+
g_slist_free(tmpl_list);
}
if (modified && alertpanel(_("Entry not saved"),
_("The entry was not saved. Close anyway?"),
- GTK_STOCK_CLOSE, _("_Continue editing"),
+ GTK_STOCK_CLOSE, _("+_Continue editing"),
+ NULL) != 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) {
return;
}
modified = FALSE;
+ modified_list = FALSE;
tmpl_list = prefs_template_get_list();
template_set_config(tmpl_list);
compose_reflect_prefs_all();
{
if (modified && alertpanel(_("Entry not saved"),
_("The entry was not saved. Close anyway?"),
- GTK_STOCK_CLOSE, _("_Continue editing"),
+ GTK_STOCK_CLOSE, _("+_Continue editing"),
+ NULL) != 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) {
return;
}
modified = FALSE;
+ modified_list = FALSE;
prefs_template_clear();
gtk_widget_hide(templates.window);
inc_unlock();
Template *ntmpl;
ntmpl = g_new(Template, 1);
+ ntmpl->load_filename = NULL;
ntmpl->name = tmpl->name && *(tmpl->name)
? g_strdup(tmpl->name)
: NULL;
return tmpl_list;
}
+gboolean prefs_template_string_is_valid(gchar *string, gint *line)
+{
+ if (string && *string != '\0') {
+ gchar *parsed_buf;
+ MsgInfo dummyinfo;
+
+ memset(&dummyinfo, 0, sizeof(MsgInfo));
+#ifdef USE_ASPELL
+ quote_fmt_init(&dummyinfo, NULL, NULL, TRUE, NULL, NULL);
+#else
+ quote_fmt_init(&dummyinfo, NULL, NULL, TRUE, NULL);
+#endif
+ quote_fmt_scan_string(string);
+ quote_fmt_parse();
+ parsed_buf = quote_fmt_get_buffer();
+ if (!parsed_buf) {
+ if (line)
+ *line = quote_fmt_get_line();
+ return FALSE;
+ }
+ quote_fmt_reset_vartable();
+ }
+ return TRUE;
+}
+
static gboolean prefs_template_list_view_set_row(GtkTreeIter *row)
/* return TRUE if the row could be modified */
{
GtkTextBuffer *buffer;
GtkTextIter start, end;
GtkTreeModel *model;
+ gint line;
model = gtk_tree_view_get_model(GTK_TREE_VIEW(templates.list_view));
gtk_text_buffer_get_iter_at_offset(buffer, &end, -1);
value = gtk_text_buffer_get_text(buffer, &start, &end, FALSE);
- if (value && *value != '\0') {
- gchar *parsed_buf;
- MsgInfo dummyinfo;
-
- memset(&dummyinfo, 0, sizeof(MsgInfo));
- quote_fmt_init(&dummyinfo, NULL, NULL, TRUE);
- quote_fmt_scan_string(value);
- quote_fmt_parse();
- parsed_buf = quote_fmt_get_buffer();
- if (!parsed_buf) {
- alertpanel_error(_("Template format error."));
+ if (value && *value == '\0') {
g_free(value);
- return FALSE;
+ value = NULL;
}
+ if (!prefs_template_string_is_valid(value, &line)) {
+ alertpanel_error(_("Template body format 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] == '\0') {
+ if (*name == '\0') {
alertpanel_error(_("Template name is not set."));
+ g_free(value);
return FALSE;
}
- subject = gtk_editable_get_chars(GTK_EDITABLE(templates.entry_subject),
- 0, -1);
to = gtk_editable_get_chars(GTK_EDITABLE(templates.entry_to),
0, -1);
cc = gtk_editable_get_chars(GTK_EDITABLE(templates.entry_cc),
0, -1);
bcc = gtk_editable_get_chars(GTK_EDITABLE(templates.entry_bcc),
0, -1);
+ subject = gtk_editable_get_chars(GTK_EDITABLE(templates.entry_subject),
+ 0, -1);
- if (subject && *subject == '\0') {
- g_free(subject);
- subject = NULL;
- }
if (to && *to == '\0') {
g_free(to);
to = NULL;
g_free(bcc);
bcc = NULL;
}
+ if (subject && *subject == '\0') {
+ g_free(subject);
+ subject = NULL;
+ }
+
+ if (!prefs_template_string_is_valid(to, NULL)) {
+ alertpanel_error(_("Template To format error."));
+ g_free(to);
+ g_free(value);
+ return FALSE;
+ }
+ if (!prefs_template_string_is_valid(cc, NULL)) {
+ alertpanel_error(_("Template Cc format error."));
+ g_free(cc);
+ g_free(value);
+ return FALSE;
+ }
+ if (!prefs_template_string_is_valid(bcc, NULL)) {
+ alertpanel_error(_("Template Bcc format error."));
+ g_free(bcc);
+ g_free(value);
+ return FALSE;
+ }
+ if (!prefs_template_string_is_valid(subject, NULL)) {
+ alertpanel_error(_("Template subject format error."));
+ g_free(subject);
+ g_free(value);
+ return FALSE;
+ }
tmpl = g_new(Template, 1);
+ tmpl->load_filename = NULL;
tmpl->name = name;
tmpl->subject = subject;
tmpl->to = to;
tmpl->value = value;
prefs_template_list_view_insert_template(templates.list_view,
- row, tmpl->name, tmpl, TRUE);
+ row, tmpl->name, tmpl);
+
return TRUE;
}
static void prefs_template_register_cb(void)
{
modified = !prefs_template_list_view_set_row(NULL);
+ modified_list = TRUE;
}
static void prefs_template_substitute_cb(void)
if (!tmpl) return;
modified = !prefs_template_list_view_set_row(&row);
+ modified_list = TRUE;
}
static void prefs_template_delete_cb(void)
NULL) != G_ALERTALTERNATE)
return;
- gtk_list_store_remove(GTK_LIST_STORE(model), &row);
+ gtk_list_store_remove(GTK_LIST_STORE(model), &row);
+ modified_list = TRUE;
+}
+
+static void prefs_template_top_cb(void)
+{
+ gint row;
+ GtkTreeIter top, sel;
+ GtkTreeModel *model;
+
+ row = gtkut_list_view_get_selected_row(templates.list_view);
+ if (row <= 1)
+ return;
+
+ model = gtk_tree_view_get_model(GTK_TREE_VIEW(templates.list_view));
+
+ if (!gtk_tree_model_iter_nth_child(model, &top, NULL, 0)
+ || !gtk_tree_model_iter_nth_child(model, &sel, NULL, row))
+ return;
+
+ gtk_list_store_move_after(GTK_LIST_STORE(model), &sel, &top);
+ gtkut_list_view_select_row(templates.list_view, 1);
+ modified_list = TRUE;
+}
+
+static void prefs_template_up_cb(void)
+{
+ gint row;
+ GtkTreeIter top, sel;
+ GtkTreeModel *model;
+
+ row = gtkut_list_view_get_selected_row(templates.list_view);
+ if (row <= 1)
+ return;
+
+ model = gtk_tree_view_get_model(GTK_TREE_VIEW(templates.list_view));
+
+ if (!gtk_tree_model_iter_nth_child(model, &top, NULL, row - 1)
+ || !gtk_tree_model_iter_nth_child(model, &sel, NULL, row))
+ return;
+
+ gtk_list_store_swap(GTK_LIST_STORE(model), &top, &sel);
+ gtkut_list_view_select_row(templates.list_view, row - 1);
+ modified_list = TRUE;
+}
+
+static void prefs_template_down_cb(void)
+{
+ gint row, n_rows;
+ GtkTreeIter top, sel;
+ GtkTreeModel *model;
+
+ model = gtk_tree_view_get_model(GTK_TREE_VIEW(templates.list_view));
+ n_rows = gtk_tree_model_iter_n_children(model, NULL);
+ row = gtkut_list_view_get_selected_row(templates.list_view);
+ if (row < 1 || row >= n_rows - 1)
+ return;
+
+ if (!gtk_tree_model_iter_nth_child(model, &top, NULL, row)
+ || !gtk_tree_model_iter_nth_child(model, &sel, NULL, row + 1))
+ return;
+
+ gtk_list_store_swap(GTK_LIST_STORE(model), &top, &sel);
+ gtkut_list_view_select_row(templates.list_view, row + 1);
+ modified_list = TRUE;
+}
+
+static void prefs_template_bottom_cb(void)
+{
+ gint row, n_rows;
+ GtkTreeIter top, sel;
+ GtkTreeModel *model;
+
+ model = gtk_tree_view_get_model(GTK_TREE_VIEW(templates.list_view));
+ n_rows = gtk_tree_model_iter_n_children(model, NULL);
+ row = gtkut_list_view_get_selected_row(templates.list_view);
+ if (row < 1 || row >= n_rows - 1)
+ return;
+
+ if (!gtk_tree_model_iter_nth_child(model, &top, NULL, row)
+ || !gtk_tree_model_iter_nth_child(model, &sel, NULL, n_rows - 1))
+ return;
+
+ gtk_list_store_move_after(GTK_LIST_STORE(model), &top, &sel);
+ gtkut_list_view_select_row(templates.list_view, n_rows - 1);
+ modified_list = TRUE;
}
static GtkListStore* prefs_template_create_data_store(void)
-1);
}
-static gboolean prefs_template_list_view_find_insertion_point(GtkTreeModel* model,
- const gchar* template,
- GtkTreeIter* iter)
-{
- GtkTreeIter i;
- gchar *text = NULL;
-
- if ((gtk_tree_model_get_iter_first(model, &i))) {
- for ( ; gtk_tree_model_iter_next(model, &i); ) {
- gtk_tree_model_get(model, &i, TEMPL_TEXT, &text, -1);
- if (strcmp(text, template) >= 0) {
- g_free(text);
- *iter = i;
- return TRUE;
- }
- g_free(text);
- }
- }
- /* cannot add before (need to append) */
- return FALSE;
-}
-
static void prefs_template_list_view_insert_template(GtkWidget *list_view,
GtkTreeIter *row_iter,
const gchar *template,
- Template *data,
- gboolean sorted)
+ Template *data)
{
GtkTreeIter iter;
GtkTreeModel *model = gtk_tree_view_get_model
GAuto *auto_data;
if (row_iter == NULL) {
- if (sorted) {
- GtkTreeIter insertion_point;
-
- /* insert sorted */
- if (prefs_template_list_view_find_insertion_point(model,
- template, &insertion_point)) {
- gtk_list_store_insert_before(list_store, &iter,
- &insertion_point);
- } else {
- gtk_list_store_append(list_store, &iter);
- }
- } else {
- /* append new */
- gtk_list_store_append(list_store, &iter);
- }
+ /* append new */
+ gtk_list_store_append(list_store, &iter);
} else {
/* modify the existing */
iter = *row_iter;
-
- if (sorted) {
- GtkTreeIter insertion_point;
- gchar *text = NULL;
-
- /* force re-sorting if template's name changed */
- gtk_tree_model_get(model, row_iter, TEMPL_TEXT, &text, -1);
- if (strcmp(text, template) != 0) {
-
- /* move the modified template */
- if (prefs_template_list_view_find_insertion_point(model,
- template, &insertion_point)) {
- gtk_list_store_move_before(list_store, row_iter,
- &insertion_point);
- } else {
- /* move to the end */
- gtk_list_store_move_before(list_store, row_iter,
- NULL);
- }
- }
- g_free(text);
- }
}
auto_data = g_auto_pointer_new_with_free(data, (GFreeFunc) template_free);
list_view = GTK_TREE_VIEW(gtk_tree_view_new_with_model(model));
g_object_unref(model);
- gtk_tree_view_set_rules_hint(list_view, prefs_common.enable_rules_hint);
-
+ gtk_tree_view_set_rules_hint(list_view, prefs_common.use_stripes_everywhere);
+ gtk_tree_view_set_reorderable(list_view, TRUE);
+
selector = gtk_tree_view_get_selection(list_view);
gtk_tree_selection_set_mode(selector, GTK_SELECTION_BROWSE);
gtk_tree_selection_set_select_function(selector, prefs_template_selected,
projects / claws.git / blobdiff