commit 93104c5912cd5d0ae7e81d6ef6f86ff3966f72af
parent 4ebd2f6f38698522947d2ac3dfb741bacbf4a166
Author: Paul Mangan <paul@claws-mail.org>
Date: Tue, 22 Apr 2008 18:35:12 +0000
2008-04-22 [paul] 3.4.0cvs7
* src/prefs_common.c
* src/prefs_common.h
* src/summaryview.c
make the 2-line view in summaryview when in three
columns mode configurable. hidden pref: "two_line_vertical"
Diffstat:
6 files changed, 27 insertions(+), 10 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,11 @@
+2008-04-22 [paul] 3.4.0cvs7
+
+ * src/prefs_common.c
+ * src/prefs_common.h
+ * src/summaryview.c
+ make the 2-line view in summaryview when in three
+ columns mode configurable. hidden pref: "two_line_vertical"
+
2008-04-22 [colin] 3.4.0cvs6
* src/inc.c
diff --git a/PATCHSETS b/PATCHSETS
@@ -3302,3 +3302,4 @@
( cvs diff -u -r 1.149.2.87 -r 1.149.2.88 src/inc.c; cvs diff -u -r 1.204.2.164 -r 1.204.2.165 src/prefs_common.c; cvs diff -u -r 1.17.2.45 -r 1.17.2.46 src/send_message.c; ) > 3.4.0cvs4.patchset
( cvs diff -u -r 1.1.4.99 -r 1.1.4.100 src/etpan/imap-thread.c; ) > 3.4.0cvs5.patchset
( cvs diff -u -r 1.149.2.88 -r 1.149.2.89 src/inc.c; cvs diff -u -r 1.43.2.70 -r 1.43.2.71 src/prefs_matcher.c; cvs diff -u -r 1.17.2.46 -r 1.17.2.47 src/send_message.c; ) > 3.4.0cvs6.patchset
+( cvs diff -u -r 1.204.2.165 -r 1.204.2.166 src/prefs_common.c; cvs diff -u -r 1.103.2.106 -r 1.103.2.107 src/prefs_common.h; cvs diff -u -r 1.395.2.364 -r 1.395.2.365 src/summaryview.c; ) > 3.4.0cvs7.patchset
diff --git a/configure.ac b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=4
MICRO_VERSION=0
INTERFACE_AGE=0
BINARY_AGE=0
-EXTRA_VERSION=6
+EXTRA_VERSION=7
EXTRA_RELEASE=
EXTRA_GTK2_VERSION=
diff --git a/src/prefs_common.c b/src/prefs_common.c
@@ -1105,6 +1105,9 @@ static PrefParam param[] = {
{"use_shred", "FALSE", &prefs_common.use_shred, P_BOOL,
NULL, NULL, NULL},
+ {"two_line_vertical", "TRUE", &prefs_common.two_line_vert,
+ P_BOOL, NULL, NULL, NULL },
+
{NULL, NULL, NULL, P_OTHER, NULL, NULL, NULL}
};
diff --git a/src/prefs_common.h b/src/prefs_common.h
@@ -486,6 +486,8 @@ struct _PrefsCommon
gboolean use_networkmanager;
gboolean use_shred;
+ gboolean two_line_vert;
+
};
extern PrefsCommon prefs_common;
diff --git a/src/summaryview.c b/src/summaryview.c
@@ -856,7 +856,8 @@ void summary_relayout(SummaryView *summaryview)
break;
}
summary_set_column_order(summaryview);
- if (prefs_common.layout_mode == VERTICAL_LAYOUT) {
+ if (prefs_common.layout_mode == VERTICAL_LAYOUT &&
+ prefs_common.two_line_vert) {
gtk_clist_set_row_height(GTK_CLIST(summaryview->ctree), 2*normal_row_height + 2);
} else {
gtk_clist_set_row_height(GTK_CLIST(summaryview->ctree), 0);
@@ -2947,7 +2948,7 @@ static gboolean summary_insert_gnode_func(GtkCTree *ctree, guint depth, GNode *g
if (summaryview->col_state[summaryview->col_pos[S_COL_TAGS]].visible)
SET_TEXT(S_COL_TAGS);
- if (vert)
+ if (vert && prefs_common.two_line_vert)
g_free(text[summaryview->col_pos[S_COL_SUBJECT]]);
#undef SET_TEXT
@@ -3027,7 +3028,7 @@ static void summary_set_ctree_from_list(SummaryView *summaryview,
(ctree, NULL, node, text, 2,
NULL, NULL, NULL, NULL,
FALSE, FALSE);
- if (vert)
+ if (vert && prefs_common.two_line_vert)
g_free(text[summaryview->col_pos[S_COL_SUBJECT]]);
GTKUT_CTREE_NODE_SET_ROW_DATA(node, msginfo);
@@ -3172,7 +3173,8 @@ static inline void summary_set_header(SummaryView *summaryview, gchar *text[],
text[col_pos[S_COL_TAGS]] = "";
/* slow! */
- if (summaryview->col_state[summaryview->col_pos[S_COL_DATE]].visible || vert) {
+ if (summaryview->col_state[summaryview->col_pos[S_COL_DATE]].visible ||
+ (vert && prefs_common.two_line_vert)) {
if (msginfo->date_t) {
procheader_date_get_localtime(date_modified,
sizeof(date_modified),
@@ -3239,7 +3241,7 @@ static inline void summary_set_header(SummaryView *summaryview, gchar *text[],
else
text[col_pos[S_COL_SUBJECT]] = msginfo->subject ? msginfo->subject :
_("(No Subject)");
- if (vert) {
+ if (vert && prefs_common.two_line_vert) {
gchar *tmp = g_markup_printf_escaped(_("%s\n<span color='%s' style='italic'>From: %s, on %s</span>"),
text[col_pos[S_COL_SUBJECT]],
color_dim_rgb,
@@ -5967,7 +5969,7 @@ static gboolean tooltip_cb (GtkWidget *widget,
if (!vert)
gtk_tooltip_set_text (tooltip, formatted);
- else
+ else if (prefs_common.two_line_vert)
gtk_tooltip_set_markup (tooltip, formatted);
g_free(formatted);
@@ -6070,15 +6072,16 @@ static GtkWidget *summary_ctree_create(SummaryView *summaryview)
GTK_WIDGET_UNSET_FLAGS(GTK_CLIST(ctree)->column[pos].button,
GTK_CAN_FOCUS);
if ((pos == summaryview->col_pos[S_COL_FROM] ||
- pos == summaryview->col_pos[S_COL_DATE]) && vert)
+ pos == summaryview->col_pos[S_COL_DATE]) && vert &&
+ prefs_common.two_line_vert)
gtk_clist_set_column_visibility
(GTK_CLIST(ctree), pos, FALSE);
else
gtk_clist_set_column_visibility
(GTK_CLIST(ctree), pos, col_state[pos].visible);
}
-
- gtk_sctree_set_use_markup(GTK_SCTREE(ctree), summaryview->col_pos[S_COL_SUBJECT], vert);
+ if (prefs_common.two_line_vert)
+ gtk_sctree_set_use_markup(GTK_SCTREE(ctree), summaryview->col_pos[S_COL_SUBJECT], vert);
/* connect signal to the buttons for sorting */
#define CLIST_BUTTON_SIGNAL_CONNECT(col, func) \
