commit f60f6e5572b76a9d7c319271c006b5ba85235e3d
parent 2eedcb8e29c0c965f852ceff3046fc10a4d416ce
Author: Paweł Pękala <c0rn@gazeta.pl>
Date: Tue, 9 Feb 2010 21:55:04 +0000
2010-02-09 [pawel] 3.7.5cvs14
* src/prefs_account.c
* src/prefs_folder_item.c
* src/prefs_template.c
* src/quote_fmt.c
Respect prefs_common.trans_hdr in couple more places to avoid
confusion with translated/non-translated header names
Diffstat:
7 files changed, 51 insertions(+), 25 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,12 @@
+2010-02-09 [pawel] 3.7.5cvs14
+
+ * src/prefs_account.c
+ * src/prefs_folder_item.c
+ * src/prefs_template.c
+ * src/quote_fmt.c
+ Respect prefs_common.trans_hdr in couple more places to avoid
+ confusion with translated/non-translated header names
+
2010-02-09 [colin] 3.7.5cvs13
* po/POTFILES.in
diff --git a/PATCHSETS b/PATCHSETS
@@ -3954,3 +3954,4 @@
( cvs diff -u -r 1.654.2.4023 -r 1.654.2.4024 configure.ac; cvs diff -u -r 1.155.2.95 -r 1.155.2.96 src/Makefile.am; cvs diff -u -r 1.382.2.543 -r 1.382.2.544 src/compose.c; cvs diff -u -r 1.23.2.33 -r 1.23.2.34 src/crash.c; cvs diff -u -r 1.26.2.44 -r 1.26.2.45 src/foldersel.c; cvs diff -u -r -1.1.2.15 -r -1.1.2.16 src/gedit-print.c; cvs diff -u -r -1.1.2.6 -r -1.1.2.7 src/gedit-print.h; cvs diff -u -r 1.115.2.223 -r 1.115.2.224 src/main.c; cvs diff -u -r 1.274.2.304 -r 1.274.2.305 src/mainwindow.c; cvs diff -u -r 1.94.2.208 -r 1.94.2.209 src/messageview.c; cvs diff -u -r 1.19.2.24 -r 1.19.2.25 src/messageview.h; cvs diff -u -r 1.60.2.70 -r 1.60.2.71 src/prefs_actions.c; cvs diff -u -r 1.204.2.193 -r 1.204.2.194 src/prefs_common.c; cvs diff -u -r 1.103.2.126 -r 1.103.2.127 src/prefs_common.h; cvs diff -u -r 1.3.2.24 -r 1.3.2.25 src/prefs_ext_prog.c; cvs diff -u -r 1.1.4.62 -r 1.1.4.63 src/prefs_filtering_action.c; cvs diff -u -r 1.4.2.25 -r 1.4.2.26 src/prefs_fonts.c; cvs diff -u -r 1.1.2.14 -r 1.1.2.15 src/prefs_image_viewer.c; cvs diff -u -r 1.43.2.82 -r 1.43.2.83 src/prefs_matcher.c; cvs diff -u -r 1.1.2.40 -r 1.1.2.41 src/prefs_msg_colors.c; cvs diff -u -r 1.1.2.63 -r 1.1.2.64 src/prefs_summaries.c; cvs diff -u -r 1.12.2.71 -r 1.12.2.72 src/prefs_template.c; cvs diff -u -r 1.1.2.28 -r 1.1.2.29 src/printing.c; cvs diff -u -r 1.1.2.7 -r 1.1.2.8 src/printing.h; cvs diff -u -r 1.8.2.40 -r 1.8.2.41 src/quote_fmt.c; cvs diff -u -r 1.395.2.416 -r 1.395.2.417 src/summaryview.c; cvs diff -u -r 1.96.2.220 -r 1.96.2.221 src/textview.c; cvs diff -u -r 1.20.2.23 -r 1.20.2.24 src/gtk/Makefile.am; cvs diff -u -r 1.4.2.76 -r 1.4.2.77 src/gtk/about.c; cvs diff -u -r 1.1.2.10 -r 1.1.2.11 src/gtk/gtkcmclist.c; cvs diff -u -r 1.1.2.13 -r 1.1.2.14 src/gtk/gtkcmctree.c; cvs diff -u -r -1.1.2.13 -r -1.1.2.14 src/gtk/gtksourceprintjob.c; cvs diff -u -r -1.1.2.5 -r -1.1.2.6 src/gtk/gtksourceprintjob.h; cvs diff -u -r 1.5.2.88 -r 1.5.2.89 src/gtk/gtkutils.c; cvs diff -u -r 1.1.2.88 -r 1.1.2.89 src/gtk/quicksearch.c; ) > 3.7.5cvs11.patchset
( cvs diff -u -r 1.83.2.159 -r 1.83.2.160 src/mimeview.c; ) > 3.7.5cvs12.patchset
( cvs diff -u -r 1.53.2.35 -r 1.53.2.36 po/POTFILES.in; ) > 3.7.5cvs13.patchset
+( cvs diff -u -r 1.105.2.157 -r 1.105.2.158 src/prefs_account.c; cvs diff -u -r 1.52.2.78 -r 1.52.2.79 src/prefs_folder_item.c; cvs diff -u -r 1.12.2.72 -r 1.12.2.73 src/prefs_template.c; cvs diff -u -r 1.8.2.41 -r 1.8.2.42 src/quote_fmt.c; ) > 3.7.5cvs14.patchset
diff --git a/configure.ac b/configure.ac
@@ -12,7 +12,7 @@ MINOR_VERSION=7
MICRO_VERSION=5
INTERFACE_AGE=0
BINARY_AGE=0
-EXTRA_VERSION=13
+EXTRA_VERSION=14
EXTRA_RELEASE=
EXTRA_GTK2_VERSION=
diff --git a/src/prefs_account.c b/src/prefs_account.c
@@ -1965,7 +1965,8 @@ static void compose_create_widget_func(PrefsPage * _page,
gtk_table_set_row_spacings (GTK_TABLE (table), VSPACING_NARROW_2);
gtk_table_set_col_spacings (GTK_TABLE (table), 8);
- autocc_checkbtn = gtk_check_button_new_with_label (_("Cc"));
+ autocc_checkbtn = gtk_check_button_new_with_label (
+ prefs_common_translated_header_name("Cc"));
gtk_widget_show (autocc_checkbtn);
gtk_table_attach (GTK_TABLE (table), autocc_checkbtn, 0, 1, 0, 1,
GTK_FILL, 0, 0, 0);
@@ -1978,7 +1979,8 @@ static void compose_create_widget_func(PrefsPage * _page,
SET_TOGGLE_SENSITIVITY (autocc_checkbtn, autocc_entry);
- autobcc_checkbtn = gtk_check_button_new_with_label (_("Bcc"));
+ autobcc_checkbtn = gtk_check_button_new_with_label (
+ prefs_common_translated_header_name("Bcc"));
gtk_widget_show (autobcc_checkbtn);
gtk_table_attach (GTK_TABLE (table), autobcc_checkbtn, 0, 1, 1, 2,
GTK_FILL, 0, 0, 0);
@@ -1991,7 +1993,8 @@ static void compose_create_widget_func(PrefsPage * _page,
SET_TOGGLE_SENSITIVITY (autobcc_checkbtn, autobcc_entry);
- autoreplyto_checkbtn = gtk_check_button_new_with_label (_("Reply-To"));
+ autoreplyto_checkbtn = gtk_check_button_new_with_label (
+ prefs_common_translated_header_name("Reply-To"));
gtk_widget_show (autoreplyto_checkbtn);
gtk_table_attach (GTK_TABLE (table), autoreplyto_checkbtn, 0, 1, 2, 3,
GTK_FILL, 0, 0, 0);
diff --git a/src/prefs_folder_item.c b/src/prefs_folder_item.c
@@ -756,6 +756,7 @@ static void prefs_folder_item_compose_create_widget_func(PrefsPage * page_,
FolderItemComposePage *page = (FolderItemComposePage *) page_;
FolderItem *item = (FolderItem *) data;
guint rowcount;
+ gchar *text = NULL;
GtkWidget *table;
GtkWidget *label;
@@ -865,11 +866,13 @@ static void prefs_folder_item_compose_create_widget_func(PrefsPage * page_,
rowcount++;
/* Default To */
- checkbtn_default_to = gtk_check_button_new_with_label(_("Default To:"));
+ text = g_strconcat(_("Default "), prefs_common_translated_header_name("To:"), NULL);
+ checkbtn_default_to = gtk_check_button_new_with_label(text);
gtk_table_attach(GTK_TABLE(table), checkbtn_default_to, 0, 1,
rowcount, rowcount + 1, GTK_SHRINK | GTK_FILL, GTK_SHRINK, 0, 0);
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_default_to),
item->prefs->enable_default_to);
+ g_free(text);
entry_default_to = gtk_entry_new();
gtk_table_attach(GTK_TABLE(table), entry_default_to, 1, 2,
@@ -886,11 +889,14 @@ static void prefs_folder_item_compose_create_widget_func(PrefsPage * page_,
rowcount++;
/* Default address to reply to */
- checkbtn_default_reply_to = gtk_check_button_new_with_label(_("Default To: for replies"));
+ text = g_strconcat(_("Default "), prefs_common_translated_header_name("To:"),
+ _(" for replies"), NULL);
+ checkbtn_default_reply_to = gtk_check_button_new_with_label(text);
gtk_table_attach(GTK_TABLE(table), checkbtn_default_reply_to, 0, 1,
rowcount, rowcount + 1, GTK_SHRINK | GTK_FILL, GTK_SHRINK, 0, 0);
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_default_reply_to),
item->prefs->enable_default_reply_to);
+ g_free(text);
entry_default_reply_to = gtk_entry_new();
gtk_table_attach(GTK_TABLE(table), entry_default_reply_to, 1, 2,
@@ -907,11 +913,13 @@ static void prefs_folder_item_compose_create_widget_func(PrefsPage * page_,
rowcount++;
/* Default Cc */
- checkbtn_default_cc = gtk_check_button_new_with_label(_("Default Cc:"));
+ text = g_strconcat(_("Default "), prefs_common_translated_header_name("Cc:"), NULL);
+ checkbtn_default_cc = gtk_check_button_new_with_label(text);
gtk_table_attach(GTK_TABLE(table), checkbtn_default_cc, 0, 1,
rowcount, rowcount + 1, GTK_SHRINK | GTK_FILL, GTK_SHRINK, 0, 0);
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_default_cc),
item->prefs->enable_default_cc);
+ g_free(text);
entry_default_cc = gtk_entry_new();
gtk_table_attach(GTK_TABLE(table), entry_default_cc, 1, 2,
@@ -928,11 +936,13 @@ static void prefs_folder_item_compose_create_widget_func(PrefsPage * page_,
rowcount++;
/* Default Bcc */
- checkbtn_default_bcc = gtk_check_button_new_with_label(_("Default Bcc:"));
+ text = g_strconcat(_("Default "), prefs_common_translated_header_name("Bcc:"), NULL);
+ checkbtn_default_bcc = gtk_check_button_new_with_label(text);
gtk_table_attach(GTK_TABLE(table), checkbtn_default_bcc, 0, 1,
rowcount, rowcount + 1, GTK_SHRINK | GTK_FILL, GTK_SHRINK, 0, 0);
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_default_bcc),
item->prefs->enable_default_bcc);
+ g_free(text);
entry_default_bcc = gtk_entry_new();
gtk_table_attach(GTK_TABLE(table), entry_default_bcc, 1, 2,
@@ -949,11 +959,13 @@ static void prefs_folder_item_compose_create_widget_func(PrefsPage * page_,
rowcount++;
/* Default Reply-to */
- checkbtn_default_replyto = gtk_check_button_new_with_label(_("Default Reply-to:"));
+ text = g_strconcat(_("Default "), prefs_common_translated_header_name("Reply-To:"), NULL);
+ checkbtn_default_replyto = gtk_check_button_new_with_label(text);
gtk_table_attach(GTK_TABLE(table), checkbtn_default_replyto, 0, 1,
rowcount, rowcount + 1, GTK_SHRINK | GTK_FILL, GTK_SHRINK, 0, 0);
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_default_replyto),
item->prefs->enable_default_replyto);
+ g_free(text);
entry_default_replyto = gtk_entry_new();
gtk_table_attach(GTK_TABLE(table), entry_default_replyto, 1, 2,
diff --git a/src/prefs_template.c b/src/prefs_template.c
@@ -74,14 +74,14 @@ static struct
gboolean compl;
gchar *tooltips;
} widgets_table[] = {
- {N_("Name"), &templates.entry_name, FALSE,
+ {"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);
@@ -210,6 +209,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 +229,8 @@ static void prefs_template_window_create(void)
GtkWidget *label;
- label = gtk_label_new(widgets_table[i].label);
+ label = gtk_label_new(prefs_common_translated_header_name(
+ widgets_table[i].label));
gtk_widget_show(label);
gtk_table_attach(GTK_TABLE(table), label, 0, 1, i, (i + 1),
(GtkAttachOptions) (GTK_FILL),
@@ -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();
}
diff --git a/src/quote_fmt.c b/src/quote_fmt.c
@@ -164,7 +164,7 @@ void quotefmt_create_new_msg_fmt_widgets(GtkWindow *parent_window,
gtk_widget_show (hbox2_format);
gtk_box_pack_start (GTK_BOX (vbox_format), hbox2_format, FALSE, FALSE, 0);
- label_from = gtk_label_new (_("From"));
+ label_from = gtk_label_new (prefs_common_translated_header_name("From"));
gtk_misc_set_alignment(GTK_MISC(label_from), 1, 0.5);
gtk_widget_show (label_from);
gtk_box_pack_start (GTK_BOX (hbox2_format), label_from, FALSE, FALSE, 0);
@@ -183,7 +183,7 @@ void quotefmt_create_new_msg_fmt_widgets(GtkWindow *parent_window,
gtk_widget_show (hbox_format);
gtk_box_pack_start (GTK_BOX (vbox_format), hbox_format, FALSE, FALSE, 0);
- label_subject = gtk_label_new (_("Subject"));
+ label_subject = gtk_label_new (prefs_common_translated_header_name("Subject"));
gtk_misc_set_alignment(GTK_MISC(label_subject), 1, 0.5);
gtk_widget_show (label_subject);
gtk_box_pack_start (GTK_BOX (hbox_format), label_subject, FALSE, FALSE, 0);
@@ -292,7 +292,7 @@ void quotefmt_create_reply_fmt_widgets(GtkWindow *parent_window,
gtk_widget_show (hbox3);
gtk_box_pack_start (GTK_BOX (vbox_quote), hbox3, FALSE, FALSE, 0);
- label_from = gtk_label_new (_("From"));
+ label_from = gtk_label_new (prefs_common_translated_header_name("From"));
gtk_misc_set_alignment(GTK_MISC(label_from), 1, 0.5);
gtk_widget_show (label_from);
gtk_box_pack_start (GTK_BOX (hbox3), label_from, FALSE, FALSE, 0);
@@ -424,7 +424,7 @@ void quotefmt_create_forward_fmt_widgets(GtkWindow *parent_window,
gtk_widget_show (hbox3);
gtk_box_pack_start (GTK_BOX (vbox_quote), hbox3, FALSE, FALSE, 0);
- label_from = gtk_label_new (_("From"));
+ label_from = gtk_label_new (prefs_common_translated_header_name("From"));
gtk_misc_set_alignment(GTK_MISC(label_from), 1, 0.5);
gtk_widget_show (label_from);
gtk_box_pack_start (GTK_BOX (hbox3), label_from, FALSE, FALSE, 0);
