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

diff --git a/ChangeLog b/ChangeLog
index 6930d7c2d96d22d08aac7dd849759041b3f22346..d2000cf603fc77f2ab3a0c72000ffae1b33a748a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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

diff --git a/PATCHSETS b/PATCHSETS
index 92d98e4b07bb3a42c48355c6670c70dba25e1af0..da0b3c867cabe1bc4fe1c82319f31b97f1399bf7 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -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

diff --git a/configure.ac b/configure.ac
index 968db04def4cf8d1c1251e5a8cd8ba1f2296c6d6..b775f23cbf63dc341929fdb1cfc0ec5798a42397 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -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=
 

diff --git a/src/folderview.c b/src/folderview.c
index cfade1b3d03af474e8ad4e91640f5cb425b84f89..15bd011bd555966a051c496856bec6fc635072e8 100644 (file)
--- a/src/folderview.c
+++ b/src/folderview.c
@@ -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],

diff --git a/src/mainwindow.c b/src/mainwindow.c
index 52c060ea1f081ddd6c0e8d156b24223aaea6e2d6..2a05e39d45ae718d2791e6ecba94db9cf7c61c1e 100644 (file)
--- a/src/mainwindow.c
+++ b/src/mainwindow.c
@@ -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,

diff --git a/src/prefs_common.c b/src/prefs_common.c
index b9b951d3757a0c349a17873f4a09c96aadc5436b..8da548e917ae2265e8f554e235236d68014901b9 100644 (file)
--- a/src/prefs_common.c
+++ b/src/prefs_common.c
@@ -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},

diff --git a/src/prefs_common.h b/src/prefs_common.h
index 637c735325b7984b4349077127d6116fd7bcaf79..864c52df227c0807a6ca331320e09abfd39447f9 100644 (file)
--- a/src/prefs_common.h
+++ b/src/prefs_common.h
@@ -224,6 +224,7 @@ struct _PrefsCommon
        ToolbarStyle toolbar_style;
        gboolean toolbar_detachable;
        gboolean show_statusbar;
+       gboolean show_col_headers;
 
        gint folderview_vscrollbar_policy;
 

diff --git a/src/summaryview.c b/src/summaryview.c
index df10f9ad0f2b99c3adec6a4d71fa03737cad571e..fef9ade1fa92a103717fde032c25d13d175b5951 100644 (file)
--- a/src/summaryview.c
+++ b/src/summaryview.c
@@ -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],