2006-09-20 [colin] 2.4.0cvs200

	* src/folderview.c
	* src/summaryview.c
	* src/gtk/gtksctree.c
	* src/gtk/gtksctree.h
		Add tooltips in the folderview and summaryview
		(Doesn't break string freeze as they already
		exist)
	* src/toolbar.c
		Put the spam button in the default configuration
		if compiled with bogo plugin too

diff --git a/ChangeLog b/ChangeLog
index cb9eaec31c5e00be7f1ab9a5f3b930244a9634af..33baea66983690d5119bd83cab07bc40b0c64e75 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2006-09-20 [colin]     2.4.0cvs200
+
+       * src/folderview.c
+       * src/summaryview.c
+       * src/gtk/gtksctree.c
+       * src/gtk/gtksctree.h
+               Add tooltips in the folderview and summaryview
+               (Doesn't break string freeze as they already
+               exist)
+       * src/toolbar.c
+               Put the spam button in the default configuration
+               if compiled with bogo plugin too
+

 2006-09-19 [colin]     2.4.0cvs199
 
        * src/summaryview.c
 2006-09-19 [colin]     2.4.0cvs199
 
        * src/summaryview.c

diff --git a/PATCHSETS b/PATCHSETS
index 74bf6239096a86c0ac6a01a935b57ab518146127..d0b479b15eac146e78b7ca29b357bf969311c529 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -1891,3 +1891,4 @@
 ( cvs diff -u -r 1.1.2.34 -r 1.1.2.35 src/wizard.c;  ) > 2.4.0cvs197.patchset
 ( cvs diff -u -r 1.15.2.32 -r 1.15.2.33 src/summary_search.c;  ) > 2.4.0cvs198.patchset
 ( cvs diff -u -r 1.43.2.47 -r 1.43.2.48 src/prefs_matcher.c;  cvs diff -u -r 1.395.2.251 -r 1.395.2.252 src/summaryview.c;  cvs diff -u -r 1.68.2.26 -r 1.68.2.27 src/summaryview.h;  cvs diff -u -r 1.1.4.7 -r 1.1.4.8 src/gtk/logwindow.h;  ) > 2.4.0cvs199.patchset
 ( cvs diff -u -r 1.1.2.34 -r 1.1.2.35 src/wizard.c;  ) > 2.4.0cvs197.patchset
 ( cvs diff -u -r 1.15.2.32 -r 1.15.2.33 src/summary_search.c;  ) > 2.4.0cvs198.patchset
 ( cvs diff -u -r 1.43.2.47 -r 1.43.2.48 src/prefs_matcher.c;  cvs diff -u -r 1.395.2.251 -r 1.395.2.252 src/summaryview.c;  cvs diff -u -r 1.68.2.26 -r 1.68.2.27 src/summaryview.h;  cvs diff -u -r 1.1.4.7 -r 1.1.4.8 src/gtk/logwindow.h;  ) > 2.4.0cvs199.patchset

+( cvs diff -u -r 1.207.2.121 -r 1.207.2.122 src/folderview.c;  cvs diff -u -r 1.395.2.252 -r 1.395.2.253 src/summaryview.c;  cvs diff -u -r 1.43.2.51 -r 1.43.2.52 src/toolbar.c;  cvs diff -u -r 1.1.4.31 -r 1.1.4.32 src/gtk/gtksctree.c;  cvs diff -u -r 1.1.4.7 -r 1.1.4.8 src/gtk/gtksctree.h;  ) > 2.4.0cvs200.patchset

diff --git a/configure.ac b/configure.ac
index 2f0517f8f8cea8c58b68ab811ebcc1685d3f9876..5d3bcc161470925c69a288fb4e12b8ba7d0ec023 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=4
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=199
+EXTRA_VERSION=200

 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/folderview.c b/src/folderview.c
index 10aac2ff91b4a4f2f4740abe24a826736c8a3007..100b7a4ddaede9bb9e5bbba86f35ee279cbfe765 100644 (file)
--- a/src/folderview.c
+++ b/src/folderview.c
@@ -379,7 +379,7 @@ static void folderview_column_set_titles(FolderView *folderview)
        GtkWidget *hbox_unread;
        GtkWidget *hbox_total;
        gint *col_pos = folderview->col_pos;
        GtkWidget *hbox_unread;
        GtkWidget *hbox_total;
        gint *col_pos = folderview->col_pos;

-       
+

        debug_print("setting titles...\n");
        gtk_widget_realize(folderview->ctree);
        gtk_widget_show_all(folderview->scrolledwin);
        debug_print("setting titles...\n");
        gtk_widget_realize(folderview->ctree);
        gtk_widget_show_all(folderview->scrolledwin);


@@ -396,7 +396,9 @@ static void folderview_column_set_titles(FolderView *folderview)
        label_new = gtk_pixmap_new(newxpm, newxpmmask);
        label_unread = gtk_pixmap_new(unreadxpm, unreadxpmmask);
        label_total = gtk_pixmap_new(readxpm, readxpmmask);
        label_new = gtk_pixmap_new(newxpm, newxpmmask);
        label_unread = gtk_pixmap_new(unreadxpm, unreadxpmmask);
        label_total = gtk_pixmap_new(readxpm, readxpmmask);

-
+       
+       gtk_clist_column_titles_active(GTK_CLIST(ctree));
+        

        hbox_new = gtk_hbox_new(FALSE, 4);
        hbox_unread = gtk_hbox_new(FALSE, 4);
        hbox_total = gtk_hbox_new(FALSE, 4);
        hbox_new = gtk_hbox_new(FALSE, 4);
        hbox_unread = gtk_hbox_new(FALSE, 4);
        hbox_total = gtk_hbox_new(FALSE, 4);


@@ -416,6 +418,10 @@ static void folderview_column_set_titles(FolderView *folderview)
        gtk_clist_set_column_widget(GTK_CLIST(ctree),col_pos[F_COL_NEW],hbox_new);
        gtk_clist_set_column_widget(GTK_CLIST(ctree),col_pos[F_COL_UNREAD],hbox_unread);
        gtk_clist_set_column_widget(GTK_CLIST(ctree),col_pos[F_COL_TOTAL],hbox_total);
        gtk_clist_set_column_widget(GTK_CLIST(ctree),col_pos[F_COL_NEW],hbox_new);
        gtk_clist_set_column_widget(GTK_CLIST(ctree),col_pos[F_COL_UNREAD],hbox_unread);
        gtk_clist_set_column_widget(GTK_CLIST(ctree),col_pos[F_COL_TOTAL],hbox_total);

+
+       gtk_sctree_set_column_tooltip(GTK_SCTREE(ctree), col_pos[F_COL_NEW], _("New"));
+       gtk_sctree_set_column_tooltip(GTK_SCTREE(ctree), col_pos[F_COL_UNREAD], _("Unread"));
+       gtk_sctree_set_column_tooltip(GTK_SCTREE(ctree), col_pos[F_COL_TOTAL], _("Total"));

 }
 
 static gboolean folderview_popup_menu(GtkWidget *widget, gpointer data)
 }
 
 static gboolean folderview_popup_menu(GtkWidget *widget, gpointer data)

diff --git a/src/gtk/gtksctree.c b/src/gtk/gtksctree.c
index 1125dcd0b2fee2aba3501a070ecd2c7c5b31effa..a2b78e115c3cd10f083e413cd6201e355916dab6 100644 (file)
--- a/src/gtk/gtksctree.c
+++ b/src/gtk/gtksctree.c
@@ -3078,3 +3078,16 @@ sreal_tree_move (GtkCTree     *ctree,
   gtk_clist_thaw (clist);
 }
 
   gtk_clist_thaw (clist);
 }
 

+void gtk_sctree_set_column_tooltip         (GtkSCTree          *sctree,
+                                            int                 column,
+                                            const gchar        *tip)
+{
+       if (!sctree->tips)
+               sctree->tips = gtk_tooltips_new();
+               
+       gtk_tooltips_set_tip(GTK_TOOLTIPS(sctree->tips), 
+               GTK_CLIST(sctree)->column[column].button,
+                       tip, NULL);
+
+}
+

diff --git a/src/gtk/gtksctree.h b/src/gtk/gtksctree.h
index a4b2f1c1d0af81e8daca5b6802304961d5b9913f..9faed4237eeee977f90d44d68b98489b05302ffb 100644 (file)
--- a/src/gtk/gtksctree.h
+++ b/src/gtk/gtksctree.h
@@ -38,6 +38,7 @@ struct _GtkSCTree {
 
        /* (dis)allow fancy color stripes */
        gboolean show_stripes;
 
        /* (dis)allow fancy color stripes */
        gboolean show_stripes;

+       GtkTooltips *tips;

 };
 
 struct _GtkSCTreeClass {
 };
 
 struct _GtkSCTreeClass {


@@ -114,4 +115,7 @@ gtk_sctree_insert_gnode                 (GtkCTree          *ctree,
                                             GtkCTreeGNodeFunc  func,
                                             gpointer           data);
 
                                             GtkCTreeGNodeFunc  func,
                                             gpointer           data);
 

+void gtk_sctree_set_column_tooltip         (GtkSCTree          *sctree,
+                                            int                 column,
+                                            const gchar        *tip);

 #endif /* __GTK_SCTREE_H__ */
 #endif /* __GTK_SCTREE_H__ */

diff --git a/src/summaryview.c b/src/summaryview.c
index cc28da66f3a1ceb345e1198f8d1ee7254fd61568..7670525a1689c8bd5f95d3d973199e954127a119 100644 (file)
--- a/src/summaryview.c
+++ b/src/summaryview.c
@@ -2315,19 +2315,23 @@ static void summary_set_column_titles(SummaryView *summaryview)
                        label = gtk_image_new_from_pixmap(clipxpm, clipxpmmask);
                        gtk_widget_show(label);
                        gtk_clist_set_column_widget(clist, pos, label);
                        label = gtk_image_new_from_pixmap(clipxpm, clipxpmmask);
                        gtk_widget_show(label);
                        gtk_clist_set_column_widget(clist, pos, label);

+                       gtk_sctree_set_column_tooltip(GTK_SCTREE(clist), pos, _("Attachment"));

                        continue;
                } else if (type == S_COL_MARK) {
                        label = gtk_image_new_from_pixmap(markxpm, markxpmmask);
                        gtk_widget_show(label);
                        gtk_clist_set_column_widget(clist, pos, label);
                        continue;
                } else if (type == S_COL_MARK) {
                        label = gtk_image_new_from_pixmap(markxpm, markxpmmask);
                        gtk_widget_show(label);
                        gtk_clist_set_column_widget(clist, pos, label);

+                       gtk_sctree_set_column_tooltip(GTK_SCTREE(clist), pos, _("Mark"));

                        continue;
                } else if (type == S_COL_LOCKED) {
                        label = gtk_image_new_from_pixmap(lockedxpm, lockedxpmmask);
                        gtk_widget_show(label);
                        gtk_clist_set_column_widget(clist, pos, label);
                        continue;
                } else if (type == S_COL_LOCKED) {
                        label = gtk_image_new_from_pixmap(lockedxpm, lockedxpmmask);
                        gtk_widget_show(label);
                        gtk_clist_set_column_widget(clist, pos, label);

+                       gtk_sctree_set_column_tooltip(GTK_SCTREE(clist), pos, _("Locked"));

                        continue;
                } else if (type == S_COL_STATUS) {
                        gtk_clist_set_column_title(clist, pos, title);
                        continue;
                } else if (type == S_COL_STATUS) {
                        gtk_clist_set_column_title(clist, pos, title);

+                       gtk_sctree_set_column_tooltip(GTK_SCTREE(clist), pos, _("Status"));

                        continue;
                }
 
                        continue;
                }
 

diff --git a/src/toolbar.c b/src/toolbar.c
index c078c8f34e8d6e75d65479f80a9bcb5355cbcd3d..925327b3943370315129c980b2219aaf9bc9bf7e 100644 (file)
--- a/src/toolbar.c
+++ b/src/toolbar.c
@@ -398,7 +398,7 @@ static void toolbar_set_default_main(void)
                { A_FORWARD,       STOCK_PIXMAP_MAIL_FORWARD,         _("Forward") },
                { A_SEPARATOR,     0,                                 ("")         },
                { A_TRASH,         STOCK_PIXMAP_TRASH,                _("Trash")   },
                { A_FORWARD,       STOCK_PIXMAP_MAIL_FORWARD,         _("Forward") },
                { A_SEPARATOR,     0,                                 ("")         },
                { A_TRASH,         STOCK_PIXMAP_TRASH,                _("Trash")   },

-#ifdef USE_SPAMASSASSIN_PLUGIN
+#if (defined(USE_SPAMASSASSIN_PLUGIN) || defined(USE_BOGOFILTER_PLUGIN))

                { A_LEARN_SPAM,    STOCK_PIXMAP_SPAM_BTN,             _("Spam")    },
 #endif
                { A_SEPARATOR,     0,                                 ("")         },
                { A_LEARN_SPAM,    STOCK_PIXMAP_SPAM_BTN,             _("Spam")    },
 #endif
                { A_SEPARATOR,     0,                                 ("")         },


@@ -489,7 +489,7 @@ static void toolbar_set_default_msgview(void)
                { A_FORWARD,       STOCK_PIXMAP_MAIL_FORWARD,         _("Forward") },
                { A_SEPARATOR,     0,                                 ("")         },
                { A_TRASH,         STOCK_PIXMAP_TRASH,                _("Trash")   },
                { A_FORWARD,       STOCK_PIXMAP_MAIL_FORWARD,         _("Forward") },
                { A_SEPARATOR,     0,                                 ("")         },
                { A_TRASH,         STOCK_PIXMAP_TRASH,                _("Trash")   },

-#ifdef USE_SPAMASSASSIN_PLUGIN
+#if (defined(USE_SPAMASSASSIN_PLUGIN) || defined(USE_BOGOFILTER_PLUGIN))

                { A_LEARN_SPAM,    STOCK_PIXMAP_SPAM_BTN,             _("Spam")    },
 #endif
                { A_GOTO_NEXT,     STOCK_PIXMAP_DOWN_ARROW,           _("Next")    }
                { A_LEARN_SPAM,    STOCK_PIXMAP_SPAM_BTN,             _("Spam")    },
 #endif
                { A_GOTO_NEXT,     STOCK_PIXMAP_DOWN_ARROW,           _("Next")    }