From: Paul Mangan Date: Sat, 22 May 2010 11:03:08 +0000 (+0000) Subject: 2010-05-22 [paul] 3.7.6cvs7 X-Git-Tag: REL_3_7_7~60 X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=aa96cabf3259b38e8b36688d412ec5b4e6587dbf 2010-05-22 [paul] 3.7.6cvs7 * manual/advanced.xml * src/compose.c * src/prefs_common.c * src/prefs_common.h after using the compose margin for several days I wanted the old style back - add a new hidden pref 'show_compose_margin' to restore the old behaviour (defaults to FALSE) --- diff --git a/ChangeLog b/ChangeLog index d0086ad17..f572d64b9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +2010-05-22 [paul] 3.7.6cvs7 + + * manual/advanced.xml + * src/compose.c + * src/prefs_common.c + * src/prefs_common.h + after using the compose margin for several days + I wanted the old style back - add a new hidden + pref 'show_compose_margin' to restore the old + behaviour (defaults to FALSE) + 2010-05-14 [paul] 3.7.6cvs6 * src/compose.c diff --git a/PATCHSETS b/PATCHSETS index 9949153de..b53b971cb 100644 --- a/PATCHSETS +++ b/PATCHSETS @@ -4002,3 +4002,4 @@ ( cvs diff -u -r 1.9.2.29 -r 1.9.2.30 src/gtk/sslcertwindow.c; ) > 3.7.6cvs4.patchset ( cvs diff -u -r 1.9.2.30 -r 1.9.2.31 src/gtk/sslcertwindow.c; ) > 3.7.6cvs5.patchset ( cvs diff -u -r 1.382.2.550 -r 1.382.2.551 src/compose.c; ) > 3.7.6cvs6.patchset +( cvs diff -u -r 1.1.2.53 -r 1.1.2.54 manual/advanced.xml; cvs diff -u -r 1.382.2.551 -r 1.382.2.552 src/compose.c; cvs diff -u -r 1.204.2.196 -r 1.204.2.197 src/prefs_common.c; cvs diff -u -r 1.103.2.129 -r 1.103.2.130 src/prefs_common.h; ) > 3.7.6cvs7.patchset diff --git a/configure.ac b/configure.ac index 75b5a1fc4..ea2f99b6a 100644 --- a/configure.ac +++ b/configure.ac @@ -12,7 +12,7 @@ MINOR_VERSION=7 MICRO_VERSION=6 INTERFACE_AGE=0 BINARY_AGE=0 -EXTRA_VERSION=6 +EXTRA_VERSION=7 EXTRA_RELEASE= EXTRA_GTK2_VERSION= diff --git a/manual/advanced.xml b/manual/advanced.xml index 1a7024b24..f7b5785c4 100644 --- a/manual/advanced.xml +++ b/manual/advanced.xml @@ -694,7 +694,16 @@ - + + show_compose_margin + + + 0 or 1. Adds margins to the message text area in the Compose window. + Default is 0, turned off. + + + + skip_ssl_cert_check diff --git a/src/compose.c b/src/compose.c index aa3c6c5f6..9761ed139 100644 --- a/src/compose.c +++ b/src/compose.c @@ -7407,8 +7407,10 @@ static Compose *compose_create(PrefsAccount *account, gtk_widget_set_size_request(scrolledwin, prefs_common.compose_width, -1); text = gtk_text_view_new(); - gtk_text_view_set_left_margin(GTK_TEXT_VIEW(text), 6); - gtk_text_view_set_right_margin(GTK_TEXT_VIEW(text), 6); + if (prefs_common.show_compose_margin) { + gtk_text_view_set_left_margin(GTK_TEXT_VIEW(text), 6); + gtk_text_view_set_right_margin(GTK_TEXT_VIEW(text), 6); + } buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(text)); gtk_text_view_set_wrap_mode(GTK_TEXT_VIEW(text), GTK_WRAP_WORD_CHAR); gtk_text_view_set_editable(GTK_TEXT_VIEW(text), TRUE); diff --git a/src/prefs_common.c b/src/prefs_common.c index 245f85015..24c342978 100644 --- a/src/prefs_common.c +++ b/src/prefs_common.c @@ -226,6 +226,9 @@ static PrefParam param[] = { &prefs_common.compose_subject_format, P_STRING, NULL, NULL, NULL}, {"compose_body_format", N_("Hello,\\n"), &prefs_common.compose_body_format, P_STRING, NULL, NULL, NULL}, + {"show_compose_margin", "FALSE", &prefs_common.show_compose_margin, P_BOOL, + NULL, NULL, NULL}, + {"linewrap_length", "72", &prefs_common.linewrap_len, P_INT, NULL, NULL, NULL}, diff --git a/src/prefs_common.h b/src/prefs_common.h index f4f456188..81dc1c083 100644 --- a/src/prefs_common.h +++ b/src/prefs_common.h @@ -157,6 +157,7 @@ struct _PrefsCommon gboolean compose_with_format; gchar *compose_subject_format; gchar *compose_body_format; + gboolean show_compose_margin; /* Quote */ gboolean reply_with_quote;