2007-05-03 [wwp] 2.9.1cvs41
[claws.git] / src / prefs_template.c
index 2880a6f2fe1f81bf6884f911911cc48dd017f3f7..0f2fa3ab759b08d3cf0e4ac202b246f67c0fed11 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * Sylpheed templates subsystem 
  * Copyright (C) 2001 Alexander Barinov
- * Copyright (C) 2001-2002 Hiroyuki Yamamoto
+ * 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
  *
  * 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
 #include "defs.h"
 
 #include <glib.h>
+#include <glib/gi18n.h>
 #include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
 #include <string.h>
 #include <dirent.h>
 #include <sys/stat.h>
 
-#include "intl.h"
 #include "template.h"
 #include "main.h"
+#include "prefs_gtk.h"
 #include "inc.h"
 #include "utils.h"
 #include "gtkutils.h"
 #include "compose.h"
 #include "addr_compl.h"
 #include "quote_fmt.h"
+#include "prefs_common.h"
+#include "manual.h"
+#include "gtkutils.h"
+
+enum {
+       TEMPL_TEXT,
+       TEMPL_DATA,
+       TEMPL_AUTO_DATA,        /*!< auto pointer */
+       N_TEMPL_COLUMNS
+};
 
 static struct Templates {
        GtkWidget *window;
        GtkWidget *ok_btn;
-       GtkWidget *clist_tmpls;
+       GtkWidget *list_view;
        GtkWidget *entry_name;
        GtkWidget *entry_subject;
        GtkWidget *entry_to;
@@ -51,6 +62,8 @@ static struct Templates {
        GtkWidget *text_value;
 } templates;
 
+static int modified = FALSE;
+
 /* widget creating functions */
 static void prefs_template_window_create       (void);
 static void prefs_template_window_setup                (void);
@@ -67,13 +80,26 @@ static gboolean prefs_template_key_pressed_cb       (GtkWidget      *widget,
                                                 gpointer        data);
 static void prefs_template_cancel_cb           (void);
 static void prefs_template_ok_cb               (void);
-static void prefs_template_select_cb           (GtkCList       *clist,
-                                                gint            row,
-                                                gint            column,
-                                                GdkEvent       *event);
 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);
+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,
+                                                        GtkTreeModel *model, 
+                                                        GtkTreePath *path,
+                                                        gboolean currently_selected,
+                                                        gpointer data);
 
 /* Called from mainwindow.c */
 void prefs_template_open(void)
@@ -87,18 +113,16 @@ void prefs_template_open(void)
        gtk_widget_show(templates.window);
 }
 
-#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); \
+/*!
+ *\brief       Save Gtk object size to prefs dataset
+ */
+static void prefs_template_size_allocate_cb(GtkWidget *widget,
+                                        GtkAllocation *allocation)
+{
+       g_return_if_fail(allocation != NULL);
+
+       prefs_common.templateswin_width = allocation->width;
+       prefs_common.templateswin_height = allocation->height;
 }
 
 static void prefs_template_window_create(void)
@@ -107,14 +131,7 @@ static void prefs_template_window_create(void)
        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;
@@ -125,20 +142,30 @@ static void prefs_template_window_create(void)
        GtkWidget           *subst_btn;
        GtkWidget           *del_btn;
        GtkWidget         *desc_btn;
-       GtkWidget       *scroll1;
-       GtkWidget         *clist_tmpls;
+       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;
 
-       gchar *title[1];
+       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_window_set_default_size(GTK_WINDOW(window), 400, -1);
 
        /* vpaned to separate template settings from templates list */
        vpaned = gtk_vpaned_new();
@@ -151,42 +178,74 @@ static void prefs_template_window_create(void)
        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)
-       ADD_ENTRY(entry_bcc, _("Bcc:"), 2)      
-       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_widget_show(scroll2);
        gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scroll2),
-                                      GTK_POLICY_NEVER,
-                                      GTK_POLICY_ALWAYS);
+                                      GTK_POLICY_AUTOMATIC,
+                                      GTK_POLICY_AUTOMATIC);
+       gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(scroll2),
+                                           GTK_SHADOW_IN);
        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);
@@ -213,55 +272,89 @@ static void prefs_template_window_create(void)
        gtk_widget_show(hbox3);
        gtk_box_pack_start(GTK_BOX(hbox2), hbox3, FALSE, FALSE, 0);
 
-       reg_btn = gtk_button_new_with_label(_("Add"));
+       reg_btn = gtk_button_new_from_stock(GTK_STOCK_ADD);
        gtk_widget_show(reg_btn);
        gtk_box_pack_start(GTK_BOX(hbox3), reg_btn, FALSE, TRUE, 0);
        g_signal_connect(G_OBJECT (reg_btn), "clicked",
                         G_CALLBACK (prefs_template_register_cb), NULL);
 
-       subst_btn = gtk_button_new_with_label(_("  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",
                         G_CALLBACK(prefs_template_substitute_cb),
                         NULL);
 
-       del_btn = gtk_button_new_with_label(_("Delete"));
+       del_btn = gtk_button_new_from_stock(GTK_STOCK_DELETE);
        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",
                         G_CALLBACK(prefs_template_delete_cb), NULL);
 
-       desc_btn = gtk_button_new_with_label(_(" Symbols "));
+#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);
-
-       title[0] = _("Current templates");
-       clist_tmpls = gtk_clist_new_with_titles(1, title);
-       gtk_widget_show(clist_tmpls);
+                                      
+       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), clist_tmpls);
-       gtk_clist_set_column_width(GTK_CLIST(clist_tmpls), 0, 80);
-       gtk_clist_set_selection_mode(GTK_CLIST(clist_tmpls),
-                                    GTK_SELECTION_BROWSE);
-       GTK_WIDGET_UNSET_FLAGS(GTK_CLIST(clist_tmpls)->column[0].button,
-                              GTK_CAN_FOCUS);
-       g_signal_connect(G_OBJECT (clist_tmpls), "select_row",
-                        G_CALLBACK (prefs_template_select_cb), NULL);
-
-       /* ok | cancel */
-       gtkut_button_set_create(&confirm_area, &ok_btn, _("OK"),
-                               &cancel_btn, _("Cancel"), NULL, NULL);
+       gtk_container_add(GTK_CONTAINER(scroll1), list_view);
+
+       /* 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);
@@ -270,6 +363,8 @@ static void prefs_template_window_create(void)
 
        g_signal_connect(G_OBJECT(window), "delete_event",
                         G_CALLBACK(prefs_template_deleted_cb), NULL);
+       g_signal_connect(G_OBJECT(window), "size_allocate",
+                        G_CALLBACK(prefs_template_size_allocate_cb), NULL);
        g_signal_connect(G_OBJECT(window), "key_press_event",
                         G_CALLBACK(prefs_template_key_pressed_cb), NULL);
        MANAGE_WINDOW_SIGNALS_CONNECT(window);
@@ -277,65 +372,76 @@ static void prefs_template_window_create(void)
                         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 = 480;
+               geometry.min_height = 540;
+       }
+
+       gtk_window_set_geometry_hints(GTK_WINDOW(window), NULL, &geometry,
+                                     GDK_HINT_MIN_SIZE);
+       gtk_widget_set_size_request(window, prefs_common.templateswin_width,
+                                   prefs_common.templateswin_height);
+
        templates.window = window;
        templates.ok_btn = ok_btn;
-       templates.clist_tmpls = clist_tmpls;
-       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.list_view = list_view;
        templates.text_value = text_value;
 }
 
 static void prefs_template_window_setup(void)
 {
-       GtkCList *clist = GTK_CLIST(templates.clist_tmpls);
        GSList *tmpl_list;
        GSList *cur;
-       gchar *title[1];
-       gint row;
        Template *tmpl;
+       GtkListStore *store;
+       GtkTextBuffer *buffer;
+       
+       store = GTK_LIST_STORE(gtk_tree_view_get_model(GTK_TREE_VIEW
+                               (templates.list_view)));
 
        manage_window_set_transient(GTK_WINDOW(templates.window));
        gtk_widget_grab_focus(templates.ok_btn);
 
-       gtk_clist_freeze(clist);
-       gtk_clist_clear(clist);
-
-       title[0] = _("(New)");
-       row = gtk_clist_append(clist, title);
-       gtk_clist_set_row_data(clist, row, NULL);
+       gtk_list_store_clear(store);
 
+       prefs_template_list_view_insert_template(templates.list_view,
+                                                NULL, _("(New)"),
+                                                NULL);
+       
        tmpl_list = template_read_config();
 
        for (cur = tmpl_list; cur != NULL; cur = cur->next) {
                tmpl = (Template *)cur->data;
-               title[0] = tmpl->name;
-               row = gtk_clist_append(clist, title);
-               gtk_clist_set_row_data(clist, row, tmpl);
+               prefs_template_list_view_insert_template(templates.list_view,
+                                                        NULL, tmpl->name, 
+                                                        tmpl);
        }
 
-       g_slist_free(tmpl_list);
+       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);
 
-       gtk_clist_thaw(clist);
+       g_slist_free(tmpl_list);
 }
 
 static void prefs_template_clear(void)
 {
-       Template *tmpl;
-       gint row = 1;
+       GtkListStore *store;
 
-       while ((tmpl = gtk_clist_get_row_data
-               (GTK_CLIST(templates.clist_tmpls), row)) != NULL) {
-               template_free(tmpl);
-               row++;
-       }
-
-       gtk_clist_clear(GTK_CLIST(templates.clist_tmpls));
+       store = GTK_LIST_STORE(gtk_tree_view_get_model(GTK_TREE_VIEW
+                               (templates.list_view)));
+       gtk_list_store_clear(store);
 }
 
 static gint prefs_template_deleted_cb(GtkWidget *widget, GdkEventAny *event,
@@ -350,6 +456,13 @@ static gboolean prefs_template_key_pressed_cb(GtkWidget *widget,
 {
        if (event && event->keyval == GDK_Escape)
                prefs_template_cancel_cb();
+       else {
+               GtkWidget *focused = gtkut_get_focused_child(
+                                       GTK_CONTAINER(widget));
+               if (focused && GTK_IS_EDITABLE(focused)) {
+                       modified = TRUE;
+               }
+       }
        return FALSE;
 }
 
@@ -357,123 +470,150 @@ static void prefs_template_ok_cb(void)
 {
        GSList *tmpl_list;
 
+       if (modified && alertpanel(_("Entry not saved"),
+                                _("The entry was not saved. Close anyway?"),
+                                GTK_STOCK_CLOSE, _("+_Continue editing"), 
+                                NULL) != G_ALERTDEFAULT) {
+               return;
+       }
+       modified = FALSE;
        tmpl_list = prefs_template_get_list();
        template_set_config(tmpl_list);
        compose_reflect_prefs_all();
-       gtk_clist_clear(GTK_CLIST(templates.clist_tmpls));
+       prefs_template_clear();
        gtk_widget_hide(templates.window);
        inc_unlock();
 }
 
 static void prefs_template_cancel_cb(void)
 {
+       if (modified && alertpanel(_("Entry not saved"),
+                                _("The entry was not saved. Close anyway?"),
+                                GTK_STOCK_CLOSE, _("+_Continue editing"),
+                                NULL) != G_ALERTDEFAULT) {
+               return;
+       }
+       modified = FALSE;
        prefs_template_clear();
        gtk_widget_hide(templates.window);
        inc_unlock();
 }
 
-static void prefs_template_select_cb(GtkCList *clist, gint row, gint column,
-                                    GdkEvent *event)
+/*!
+ *\brief       Request list for storage. New list is owned
+ *             by template.c...
+ */
+static GSList *prefs_template_get_list(void)
 {
+       GSList *tmpl_list = NULL;
        Template *tmpl;
-       Template tmpl_def;
-       GtkTextBuffer *buffer;
-       GtkTextIter iter;
-
-       tmpl_def.name = _("Template");
-       tmpl_def.subject = "";
-       tmpl_def.to = "";
-       tmpl_def.cc = "";
-       tmpl_def.bcc = "";      
-       tmpl_def.value = "";
-
-       if (!(tmpl = gtk_clist_get_row_data(clist, row)))
-               tmpl = &tmpl_def;
-
-       gtk_entry_set_text(GTK_ENTRY(templates.entry_name), tmpl->name);
-       gtk_entry_set_text(GTK_ENTRY(templates.entry_to),
-                          tmpl->to ? tmpl->to : "");
-       gtk_entry_set_text(GTK_ENTRY(templates.entry_cc),
-                          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_subject),
-                          tmpl->subject ? tmpl->subject : "");
+       GtkTreeModel *model;
+       GtkTreeIter iter;
+
+       model = gtk_tree_view_get_model(GTK_TREE_VIEW(templates.list_view));
+       if (!gtk_tree_model_get_iter_first(model, &iter))
+               return NULL;
+
+       do {
+               gtk_tree_model_get(model, &iter,
+                                  TEMPL_DATA, &tmpl,
+                                  -1);
+               
+               if (tmpl) {
+                       Template *ntmpl;
+                       
+                       ntmpl = g_new(Template, 1);
+                       ntmpl->load_filename = NULL;
+                       ntmpl->name    = tmpl->name && *(tmpl->name) 
+                                        ? g_strdup(tmpl->name) 
+                                        : NULL;
+                       ntmpl->subject = tmpl->subject && *(tmpl->subject) 
+                                        ? g_strdup(tmpl->subject) 
+                                        : NULL;
+                       ntmpl->to      = tmpl->to && *(tmpl->to)
+                                        ? g_strdup(tmpl->to)
+                                        : NULL;
+                       ntmpl->cc      = tmpl->cc && *(tmpl->cc)
+                                        ? g_strdup(tmpl->cc)
+                                        : NULL;
+                       ntmpl->bcc     = tmpl->bcc && *(tmpl->bcc)
+                                        ? g_strdup(tmpl->bcc)
+                                        : NULL;        
+                       ntmpl->value   = tmpl->value && *(tmpl->value)
+                                        ? g_strdup(tmpl->value)
+                                        : NULL;
+                       tmpl_list = g_slist_append(tmpl_list, ntmpl);
+               }                       
        
-       buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(templates.text_value));
-       gtk_text_buffer_set_text(buffer, "\0", -1);
-       gtk_text_buffer_get_start_iter(buffer, &iter);
-       gtk_text_buffer_insert(buffer, &iter, tmpl->value, -1);
+       } while (gtk_tree_model_iter_next(model, &iter)); 
+
+       return tmpl_list;
 }
 
-static GSList *prefs_template_get_list(void)
+gboolean prefs_template_string_is_valid(gchar *string)
 {
-       gint row = 1;
-       GSList *tmpl_list = NULL;
-       Template *tmpl;
+       if (string && *string != '\0') {
+               gchar *parsed_buf;
+               MsgInfo dummyinfo;
 
-       while ((tmpl = gtk_clist_get_row_data
-               (GTK_CLIST(templates.clist_tmpls), row)) != NULL) {
-               tmpl_list = g_slist_append(tmpl_list, tmpl);
-               row++;
+               memset(&dummyinfo, 0, sizeof(MsgInfo));
+               quote_fmt_init(&dummyinfo, NULL, NULL, TRUE, NULL);
+               quote_fmt_scan_string(string);
+               quote_fmt_parse();
+               parsed_buf = quote_fmt_get_buffer();
+               if (!parsed_buf)
+                       return FALSE;
+               quote_fmt_reset_vartable();
        }
-
-       return tmpl_list;
+       return TRUE;
 }
 
-static gint prefs_template_clist_set_row(gint row)
+static gboolean prefs_template_list_view_set_row(GtkTreeIter *row)
+/* return TRUE if the row could be modified */
 {
-       GtkCList *clist = GTK_CLIST(templates.clist_tmpls);
        Template *tmpl;
-       Template *tmp_tmpl;
        gchar *name;
        gchar *subject;
        gchar *to;
        gchar *cc;
        gchar *bcc;     
        gchar *value;
-       gchar *title[1];
        GtkTextBuffer *buffer;
        GtkTextIter start, end;
+       GtkTreeModel *model;
 
-       g_return_val_if_fail(row != 0, -1);
+       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 = 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);
-               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 -1;
+               value = NULL;
                }
+       if (!prefs_template_string_is_valid(value)) {
+               alertpanel_error(_("Template body format error."));     
+               g_free(value);
+               return FALSE;
        }
 
        name = gtk_editable_get_chars(GTK_EDITABLE(templates.entry_name),
                                      0, -1);
-       subject = gtk_editable_get_chars(GTK_EDITABLE(templates.entry_subject),
-                                        0, -1);
+       if (*name == '\0') {
+               alertpanel_error(_("Template name is not set."));
+               return FALSE;
+       }
        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;
@@ -486,8 +626,34 @@ static gint prefs_template_clist_set_row(gint row)
                g_free(bcc);
                bcc = NULL;
        }
+       if (subject && *subject == '\0') {
+               g_free(subject);
+               subject = NULL;
+       }
+
+       if (!prefs_template_string_is_valid(to)) {
+               alertpanel_error(_("Template To format error."));
+               g_free(to);
+               return FALSE;
+       }
+       if (!prefs_template_string_is_valid(cc)) {
+               alertpanel_error(_("Template Cc format error."));       
+               g_free(cc);
+               return FALSE;
+       }
+       if (!prefs_template_string_is_valid(bcc)) {
+               alertpanel_error(_("Template Bcc format error."));      
+               g_free(bcc);
+               return FALSE;
+       }
+       if (!prefs_template_string_is_valid(subject)) {
+               alertpanel_error(_("Template subject format error."));  
+               g_free(subject);
+               return FALSE;
+       }
        
        tmpl = g_new(Template, 1);
+       tmpl->load_filename = NULL;
        tmpl->name = name;
        tmpl->subject = subject;
        tmpl->to = to;
@@ -495,59 +661,272 @@ static gint prefs_template_clist_set_row(gint row)
        tmpl->bcc = bcc;        
        tmpl->value = value;
 
-       title[0] = name;
-
-       if (row < 0) {
-               row = gtk_clist_append(clist, title);
-       } else {
-               gtk_clist_set_text(clist, row, 0, name);
-               tmp_tmpl = gtk_clist_get_row_data(clist, row);
-               if (tmp_tmpl)
-                       template_free(tmp_tmpl);
-       }
-
-       gtk_clist_set_row_data(clist, row, tmpl);
-       return row;
+       prefs_template_list_view_insert_template(templates.list_view,
+                                                row, tmpl->name, tmpl);
+       return TRUE;
 }
 
 static void prefs_template_register_cb(void)
 {
-       prefs_template_clist_set_row(-1);
+       modified = !prefs_template_list_view_set_row(NULL);
 }
 
 static void prefs_template_substitute_cb(void)
 {
-       GtkCList *clist = GTK_CLIST(templates.clist_tmpls);
        Template *tmpl;
-       gint row;
+       GtkTreeIter row;
+       GtkTreeSelection *selection;
+       GtkTreeModel *model;
 
-       if (!clist->selection) return;
+       selection = gtk_tree_view_get_selection
+                       (GTK_TREE_VIEW(templates.list_view));
+       
+       if (!gtk_tree_selection_get_selected(selection, &model, &row))
+               return;
 
-       row = GPOINTER_TO_INT(clist->selection->data);
-       if (row == 0) return;
+       gtk_tree_model_get(model, &row, 
+                          TEMPL_DATA, &tmpl,
+                          -1);
 
-       tmpl = gtk_clist_get_row_data(clist, row);
        if (!tmpl) return;
 
-       prefs_template_clist_set_row(row);
+       modified = !prefs_template_list_view_set_row(&row);
 }
 
 static void prefs_template_delete_cb(void)
 {
-       GtkCList *clist = GTK_CLIST(templates.clist_tmpls);
        Template *tmpl;
-       gint row;
+       GtkTreeIter row;
+       GtkTreeSelection *selection;
+       GtkTreeModel *model;
 
-       if (!clist->selection) return;
-       row = GPOINTER_TO_INT(clist->selection->data);
-       if (row == 0) return;
+       selection = gtk_tree_view_get_selection
+                       (GTK_TREE_VIEW(templates.list_view));
+       
+       if (!gtk_tree_selection_get_selected(selection, &model, &row))
+               return;
+
+       gtk_tree_model_get(model, &row, 
+                          TEMPL_DATA, &tmpl,
+                          -1);
+
+       if (!tmpl) 
+               return;
 
        if (alertpanel(_("Delete template"),
                       _("Do you really want to delete this template?"),
-                      _("Yes"), _("No"), NULL) != G_ALERTDEFAULT)
+                      GTK_STOCK_CANCEL, GTK_STOCK_DELETE,
+                      NULL) != G_ALERTALTERNATE)
                return;
 
-       tmpl = gtk_clist_get_row_data(clist, row);
-       template_free(tmpl);
-       gtk_clist_remove(clist, row);
+       gtk_list_store_remove(GTK_LIST_STORE(model), &row);             
+}
+
+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);
+}
+
+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);
+}
+
+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);
+}
+
+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);
+}
+
+static GtkListStore* prefs_template_create_data_store(void)
+{
+       return gtk_list_store_new(N_TEMPL_COLUMNS,
+                                 G_TYPE_STRING,        
+                                 G_TYPE_POINTER,
+                                 G_TYPE_AUTO_POINTER,
+                                 -1);
+}
+
+static void prefs_template_list_view_insert_template(GtkWidget *list_view,
+                                                    GtkTreeIter *row_iter,
+                                                    const gchar *template,
+                                                    Template *data)
+{
+       GtkTreeIter iter;
+       GtkTreeModel *model = gtk_tree_view_get_model
+                                       (GTK_TREE_VIEW(list_view));
+       GtkListStore *list_store = GTK_LIST_STORE(model);
+       GAuto *auto_data;                                       
+
+       if (row_iter == NULL) {
+               /* append new */
+               gtk_list_store_append(list_store, &iter);
+       } else {
+               /* modify the existing */
+               iter = *row_iter;
+       }
+               
+       auto_data = g_auto_pointer_new_with_free(data, (GFreeFunc) template_free);  
+
+       /* if replacing data in an existing row, the auto pointer takes care
+        * of destroying the Template data */
+       gtk_list_store_set(list_store, &iter,
+                          TEMPL_TEXT, template,
+                          TEMPL_DATA, data,
+                          TEMPL_AUTO_DATA, auto_data,
+                          -1);
+
+       g_auto_pointer_free(auto_data);                    
+}
+
+static GtkWidget *prefs_template_list_view_create(void)
+{
+       GtkTreeView *list_view;
+       GtkTreeSelection *selector;
+       GtkTreeModel *model;
+
+       model = GTK_TREE_MODEL(prefs_template_create_data_store());
+       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.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,
+                                              NULL, NULL);
+
+       /* create the columns */
+       prefs_template_create_list_view_columns(GTK_WIDGET(list_view));
+
+       return GTK_WIDGET(list_view);
+}
+
+static void prefs_template_create_list_view_columns(GtkWidget *list_view)
+{
+       GtkTreeViewColumn *column;
+       GtkCellRenderer *renderer;
+
+       renderer = gtk_cell_renderer_text_new();
+       column = gtk_tree_view_column_new_with_attributes
+                       (_("Current templates"),
+                        renderer,
+                        "text", TEMPL_TEXT,
+                        NULL);
+       gtk_tree_view_append_column(GTK_TREE_VIEW(list_view), column);          
+}
+
+static gboolean prefs_template_selected(GtkTreeSelection *selector,
+                                       GtkTreeModel *model, 
+                                       GtkTreePath *path,
+                                       gboolean currently_selected,
+                                       gpointer data)
+{
+       Template *tmpl;
+       Template tmpl_def;
+       GtkTextBuffer *buffer;
+       GtkTextIter iter;
+       GtkTreeIter titer;
+
+       if (currently_selected)
+               return TRUE;
+
+       if (!gtk_tree_model_get_iter(model, &titer, path))
+               return TRUE;
+
+       tmpl_def.name = _("Template");
+       tmpl_def.subject = "";
+       tmpl_def.to = "";
+       tmpl_def.cc = "";
+       tmpl_def.bcc = "";      
+       tmpl_def.value = "";
+
+       gtk_tree_model_get(model, &titer,
+                          TEMPL_DATA, &tmpl,
+                          -1);
+
+       if (!tmpl) 
+               tmpl = &tmpl_def;
+
+       gtk_entry_set_text(GTK_ENTRY(templates.entry_name), tmpl->name);
+       gtk_entry_set_text(GTK_ENTRY(templates.entry_to),
+                          tmpl->to ? tmpl->to : "");
+       gtk_entry_set_text(GTK_ENTRY(templates.entry_cc),
+                          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_subject),
+                          tmpl->subject ? tmpl->subject : "");
+       
+       buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(templates.text_value));
+       gtk_text_buffer_set_text(buffer, "", -1);
+       gtk_text_buffer_get_start_iter(buffer, &iter);
+       gtk_text_buffer_insert(buffer, &iter, tmpl->value, -1);
+
+       return TRUE;
 }