2007-07-26 [colin] 2.10.0cvs70

* src/folderview.c
	* src/mainwindow.c
	* src/prefs_common.c
	* src/prefs_common.h
	* src/summaryview.c
		Add View/Show or Hide/Column headers
This commit is contained in:
Colin Leroy 2007-07-26 20:30:13 +00:00
parent aef49eed94
commit 3efa2ea184
8 changed files with 44 additions and 7 deletions

View file

@ -1,3 +1,12 @@
2007-07-26 [colin] 2.10.0cvs70
* src/folderview.c
* src/mainwindow.c
* src/prefs_common.c
* src/prefs_common.h
* src/summaryview.c
Add View/Show or Hide/Column headers
2007-07-26 [colin] 2.10.0cvs69
* src/procmime.c

View file

@ -2723,3 +2723,4 @@
( cvs diff -u -r 1.83.2.113 -r 1.83.2.114 src/mimeview.c; cvs diff -u -r 1.75.2.43 -r 1.75.2.44 src/matcher.c; cvs diff -u -r 1.9.2.20 -r 1.9.2.21 src/common/ssl.c; ) > 2.10.0cvs67.patchset
( cvs diff -u -r 1.382.2.395 -r 1.382.2.396 src/compose.c; cvs diff -u -r 1.4.2.10 -r 1.4.2.11 src/ldapserver.c; cvs diff -u -r 1.49.2.93 -r 1.49.2.94 src/procmime.c; cvs diff -u -r 1.17.2.18 -r 1.17.2.19 src/procmime.h; cvs diff -u -r 1.22.2.34 -r 1.22.2.35 src/quote_fmt_parse.y; ) > 2.10.0cvs68.patchset
( cvs diff -u -r 1.49.2.94 -r 1.49.2.95 src/procmime.c; ) > 2.10.0cvs69.patchset
( cvs diff -u -r 1.207.2.169 -r 1.207.2.170 src/folderview.c; cvs diff -u -r 1.274.2.201 -r 1.274.2.202 src/mainwindow.c; cvs diff -u -r 1.204.2.143 -r 1.204.2.144 src/prefs_common.c; cvs diff -u -r 1.103.2.89 -r 1.103.2.90 src/prefs_common.h; cvs diff -u -r 1.395.2.314 -r 1.395.2.315 src/summaryview.c; ) > 2.10.0cvs70.patchset

View file

@ -11,7 +11,7 @@ MINOR_VERSION=10
MICRO_VERSION=0
INTERFACE_AGE=0
BINARY_AGE=0
EXTRA_VERSION=69
EXTRA_VERSION=70
EXTRA_RELEASE=
EXTRA_GTK2_VERSION=

View file

@ -475,9 +475,9 @@ static GtkWidget *folderview_ctree_create(FolderView *folderview)
ctree = gtk_sctree_new_with_titles(N_FOLDER_COLS, col_pos[F_COL_FOLDER],
titles);
#ifdef MAEMO
gtk_clist_column_titles_hide(GTK_CLIST(ctree));
#endif
if (prefs_common.show_col_headers == FALSE)
gtk_clist_column_titles_hide(GTK_CLIST(ctree));
gtk_clist_set_selection_mode(GTK_CLIST(ctree), GTK_SELECTION_BROWSE);
gtk_clist_set_column_justification(GTK_CLIST(ctree), col_pos[F_COL_NEW],

View file

@ -187,6 +187,9 @@ static void toggle_message_cb (MainWindow *mainwin,
static void toggle_toolbar_cb (MainWindow *mainwin,
guint action,
GtkWidget *widget);
static void toggle_col_headers_cb(MainWindow *mainwin,
guint action,
GtkWidget *widget);
#ifndef MAEMO
static void toggle_statusbar_cb (MainWindow *mainwin,
guint action,
@ -562,6 +565,8 @@ static GtkItemFactoryEntry mainwin_entries[] =
{N_("/_View/Show or hi_de/Status _bar"),
NULL, toggle_statusbar_cb, 0, "<ToggleItem>"},
#endif
{N_("/_View/Show or hi_de/Column headers"),
NULL, toggle_col_headers_cb, 0, "<ToggleItem>"},
{N_("/_View/Set displayed _columns"), NULL, NULL, 0, "<Branch>"},
{N_("/_View/Set displayed _columns/in _Folder list..."), NULL, set_folder_display_item_cb, 0, NULL},
{N_("/_View/Set displayed _columns/in _Message list..."),NULL, set_summary_display_item_cb, 0, NULL},
@ -1669,6 +1674,10 @@ MainWindow *main_window_create()
gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem),
prefs_common.show_statusbar);
#endif
menuitem = gtk_item_factory_get_item
(ifactory, "/View/Show or hide/Column headers");
gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem),
prefs_common.show_col_headers);
/* set account selection menu */
ac_menu = gtk_item_factory_get_widget
(ifactory, "/Configuration/Change current account");
@ -3408,6 +3417,22 @@ static void main_window_reply_cb(MainWindow *mainwin, guint action,
g_slist_free(msginfo_list);
}
static void toggle_col_headers_cb(MainWindow *mainwin, guint action,
GtkWidget *widget)
{
FolderView *folderview = mainwin->folderview;
SummaryView *summaryview = mainwin->summaryview;
if (GTK_CHECK_MENU_ITEM(widget)->active) {
gtk_clist_column_titles_show(GTK_CLIST(folderview->ctree));
gtk_clist_column_titles_show(GTK_CLIST(summaryview->ctree));
prefs_common.show_col_headers = TRUE;
} else {
gtk_clist_column_titles_hide(GTK_CLIST(folderview->ctree));
gtk_clist_column_titles_hide(GTK_CLIST(summaryview->ctree));
prefs_common.show_col_headers = FALSE;
}
}
#ifndef MAEMO
static void toggle_statusbar_cb(MainWindow *mainwin, guint action,

View file

@ -435,6 +435,8 @@ static PrefParam param[] = {
#endif
{"toolbar_detachable", "FALSE", &prefs_common.toolbar_detachable, P_BOOL,
NULL, NULL, NULL},
{"show_col_headers", "TRUE", &prefs_common.show_col_headers, P_BOOL,
NULL, NULL, NULL},
#ifndef MAEMO
{"show_statusbar", "TRUE", &prefs_common.show_statusbar, P_BOOL,
NULL, NULL, NULL},

View file

@ -224,6 +224,7 @@ struct _PrefsCommon
ToolbarStyle toolbar_style;
gboolean toolbar_detachable;
gboolean show_statusbar;
gboolean show_col_headers;
gint folderview_vscrollbar_policy;

View file

@ -5589,9 +5589,8 @@ static GtkWidget *summary_ctree_create(SummaryView *summaryview)
ctree = gtk_sctree_new_with_titles
(N_SUMMARY_COLS, col_pos[S_COL_SUBJECT], titles);
#ifdef MAEMO
gtk_clist_column_titles_hide(GTK_CLIST(ctree));
#endif
if (prefs_common.show_col_headers == FALSE)
gtk_clist_column_titles_hide(GTK_CLIST(ctree));
gtk_clist_set_selection_mode(GTK_CLIST(ctree), GTK_SELECTION_EXTENDED);
gtk_clist_set_column_justification(GTK_CLIST(ctree), col_pos[S_COL_MARK],