From a1bfef74204b36041a071560234d1d3dedd312f7 Mon Sep 17 00:00:00 2001 From: Salvatore De Paolis Date: Tue, 4 May 2010 22:29:30 +0000 Subject: [PATCH] 2010-05-04 [iwkse] 3.7.6cvs1 * src/prefs_message.c * src/prefs_common.h * src/prefs_common.c * src/textview.c Fix #2188 Option for collapsing via double-click --- ChangeLog | 9 +++++++++ PATCHSETS | 1 + configure.ac | 2 +- src/prefs_common.c | 3 +++ src/prefs_common.h | 1 + src/prefs_message.c | 8 ++++++++ src/textview.c | 3 ++- 7 files changed, 25 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index e3f4ab4ef..0fea284e5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2010-05-04 [iwkse] 3.7.6cvs1 + + * src/prefs_message.c + * src/prefs_common.h + * src/prefs_common.c + * src/textview.c + Fix #2188 + Option for collapsing via double-click + 2010-05-01 [paul] 3.7.6 * NEWS * README diff --git a/PATCHSETS b/PATCHSETS index 95325f993..c2d40ede6 100644 --- a/PATCHSETS +++ b/PATCHSETS @@ -3996,3 +3996,4 @@ ( cvs diff -u -r 1.654.2.4065 -r 1.654.2.4066 configure.ac; cvs diff -u -r 1.9.2.18 -r 1.9.2.19 po/cs.po; cvs diff -u -r 1.58.2.46 -r 1.58.2.47 po/de.po; cvs diff -u -r 1.1.2.24 -r 1.1.2.25 po/fi.po; cvs diff -u -r 1.5.2.16 -r 1.5.2.17 po/hu.po; cvs diff -u -r 1.28.2.14 -r 1.28.2.15 po/nl.po; cvs diff -u -r 1.50.2.38 -r 1.50.2.39 po/pt_BR.po; cvs diff -u -r 1.1.2.2 -r 1.1.2.3 po/pt_PT.po; cvs diff -u -r 1.2.2.29 -r 1.2.2.30 po/sk.po; diff -u /dev/null po/uk.po; ) > 3.7.5cvs53.patchset ( cvs diff -u -r 1.1.2.66 -r 1.1.2.67 src/gtk/authors.h; ) > 3.7.5cvs54.patchset ( cvs diff -u -r 1.1.2.23 -r 1.1.2.24 tools/claws.i18n.status.pl; ) > 3.7.5cvs55.patchset +( cvs diff -u -r 1.1.2.30 -r 1.1.2.31 src/prefs_message.c; cvs diff -u -r 1.103.2.128 -r 1.103.2.129 src/prefs_common.h; cvs diff -u -r 1.204.2.195 -r 1.204.2.196 src/prefs_common.c; cvs diff -u -r 1.96.2.223 -r 1.96.2.224 src/textview.c; ) > 3.7.6cvs1.patchset diff --git a/configure.ac b/configure.ac index f1d3afcbf..e6311f330 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=0 +EXTRA_VERSION=1 EXTRA_RELEASE= EXTRA_GTK2_VERSION= diff --git a/src/prefs_common.c b/src/prefs_common.c index 69ce9752c..245f85015 100644 --- a/src/prefs_common.c +++ b/src/prefs_common.c @@ -730,6 +730,9 @@ static PrefParam param[] = { NULL, NULL, NULL}, {"scroll_half_page", "FALSE", &prefs_common.scroll_halfpage, P_BOOL, NULL, NULL, NULL}, + {"hide_quoted", "TRUE", + &prefs_common.hide_quoted, P_BOOL, + NULL, NULL, NULL}, {"respect_flowed_format", "FALSE", &prefs_common.respect_flowed_format, P_BOOL, NULL, NULL, NULL}, diff --git a/src/prefs_common.h b/src/prefs_common.h index a76d79a9b..f4f456188 100644 --- a/src/prefs_common.h +++ b/src/prefs_common.h @@ -317,6 +317,7 @@ struct _PrefsCommon gboolean enable_smooth_scroll; gint scroll_step; gboolean scroll_halfpage; + gboolean hide_quoted; gboolean respect_flowed_format; gboolean show_other_header; diff --git a/src/prefs_message.c b/src/prefs_message.c index 36c5aabbc..13b80fb0a 100644 --- a/src/prefs_message.c +++ b/src/prefs_message.c @@ -58,6 +58,7 @@ typedef struct _MessagePage GtkWidget *checkbtn_smoothscroll; GtkWidget *spinbtn_scrollstep; GtkWidget *checkbtn_halfpage; + GtkWidget *checkbtn_hide_quoted; GtkWidget *checkbtn_attach_desc; GtkWidget *entry_quote_chars; @@ -101,6 +102,7 @@ static void prefs_message_create_widget(PrefsPage *_page, GtkWindow *window, GtkObject *spinbtn_scrollstep_adj; GtkWidget *spinbtn_scrollstep; GtkWidget *checkbtn_halfpage; + GtkWidget *checkbtn_hide_quoted; GtkWidget *checkbtn_attach_desc; @@ -236,6 +238,7 @@ static void prefs_message_create_widget(PrefsPage *_page, GtkWindow *window, hbox1 = gtk_hbox_new (FALSE, 32); gtk_widget_show (hbox1); + PACK_CHECK_BUTTON(vbox_quote, checkbtn_hide_quoted, _("Collapse quoted text on double click")); gtk_box_pack_start (GTK_BOX (vbox_quote), hbox1, FALSE, FALSE, 0); hbox2 = gtk_hbox_new (FALSE, 8); @@ -268,6 +271,8 @@ static void prefs_message_create_widget(PrefsPage *_page, GtkWindow *window, prefs_common.promote_html_part); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_smoothscroll), prefs_common.enable_smooth_scroll); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_hide_quoted), + prefs_common.hide_quoted); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_halfpage), prefs_common.scroll_halfpage); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_attach_desc), @@ -288,6 +293,7 @@ static void prefs_message_create_widget(PrefsPage *_page, GtkWindow *window, prefs_message->checkbtn_promote_html_part = checkbtn_promote_html_part; prefs_message->spinbtn_linespc = spinbtn_linespc; prefs_message->checkbtn_smoothscroll = checkbtn_smoothscroll; + prefs_message->checkbtn_hide_quoted = checkbtn_hide_quoted; prefs_message->spinbtn_scrollstep = spinbtn_scrollstep; prefs_message->checkbtn_halfpage = checkbtn_halfpage; prefs_message->checkbtn_attach_desc = checkbtn_attach_desc; @@ -316,6 +322,8 @@ static void prefs_message_save(PrefsPage *_page) GTK_TOGGLE_BUTTON(page->checkbtn_smoothscroll)); prefs_common.scroll_halfpage = gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON(page->checkbtn_halfpage)); + prefs_common.hide_quoted = gtk_toggle_button_get_active( + GTK_TOGGLE_BUTTON(page->checkbtn_hide_quoted)); prefs_common.attach_desc = gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON(page->checkbtn_attach_desc)); prefs_common.line_space = gtk_spin_button_get_value_as_int( diff --git a/src/textview.c b/src/textview.c index eda6c6f1c..077885bb1 100644 --- a/src/textview.c +++ b/src/textview.c @@ -2670,7 +2670,8 @@ static gboolean textview_uri_button_pressed(GtkTextTag *tag, GObject *obj, } return TRUE; } else if (qlink && bevent->button == 1) { - textview_toggle_quote(textview, NULL, uri, FALSE); + if (prefs_common.hide_quoted) + textview_toggle_quote(textview, NULL, uri, FALSE); return TRUE; } else if (!g_ascii_strncasecmp(uri->uri, "mailto:", 7)) { if (bevent->button == 3) { -- 2.25.1