2011-10-30 [pawel] 3.7.10cvs60

[claws.git] / src / prefs_template.c

diff --git a/src/prefs_template.c b/src/prefs_template.c
index cc284b3b74d027b484c5d36cb68cb5e232adb73c..a4dc4fadb7f8f4e9dec2505379d475dd931335b6 100644 (file)
--- a/src/prefs_template.c
+++ b/src/prefs_template.c
@@ -1,7 +1,7 @@
 /*
  * Claws Mail templates subsystem 
  * Copyright (C) 2001 Alexander Barinov
- * Copyright (C) 2001-2009 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
@@ -76,12 +76,12 @@ static struct
 } 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},
+       {"Subject",     &templates.entry_subject,       FALSE,  NULL},
        {NULL,          NULL,                           FALSE,  NULL}
 };
 
@@ -130,8 +130,7 @@ void prefs_template_open(void)
 {
        inc_lock();
 
-       if (!templates.window)
-               prefs_template_window_create();
+       prefs_template_window_create();
 
        prefs_template_window_setup();
        gtk_widget_show(templates.window);
@@ -185,7 +184,6 @@ static void prefs_template_window_create(void)
        GtkWidget         *ok_btn;
        static GdkGeometry geometry;
        gint i;
-       CLAWS_TIP_DECL();
 
        debug_print("Creating templates configuration window...\n");
 
@@ -210,6 +208,8 @@ static void prefs_template_window_create(void)
        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);
@@ -228,7 +228,9 @@ static void prefs_template_window_create(void)
 
                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),
@@ -421,7 +423,7 @@ static void prefs_template_window_create(void)
 
        if (!geometry.min_height) {
                geometry.min_width = 500;
-               geometry.min_height = 540;
+               geometry.min_height = 560;
        }
 
        gtk_window_set_geometry_hints(GTK_WINDOW(window), NULL, &geometry,
@@ -507,7 +509,7 @@ static gint prefs_template_deleted_cb(GtkWidget *widget, GdkEventAny *event,
 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(
@@ -576,8 +578,7 @@ static void prefs_template_ok_cb(gpointer action, gpointer data)
        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_window_set_modal(GTK_WINDOW(templates.window), FALSE);
+       gtk_widget_destroy(templates.window);
        inc_unlock();
 }
 
@@ -604,7 +605,7 @@ static void prefs_template_cancel_cb(gpointer action, gpointer data)
        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();
 }
 
@@ -893,6 +894,7 @@ static void prefs_template_delete_cb(gpointer action, gpointer data)
                return;
 
        gtk_list_store_remove(GTK_LIST_STORE(model), &iter);
+       prefs_template_reset_dialog();
        modified_list = TRUE;   
 }