2007-07-27 [paul] 2.10.0cvs73

	* src/prefs_folder_item.c
		adjust labels, add tooltips

diff --git a/ChangeLog b/ChangeLog
index e9a5cc5eef05a3a5144cb532814e2aa2df399146..dfeb0a4c3811fe4bb1652a7dfd9e1f5885e50cd2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-07-27 [paul]      2.10.0cvs73
+
+       * src/prefs_folder_item.c
+               adjust labels, add tooltips
+
 2007-07-27 [colin]     2.10.0cvs72
 
        * src/summaryview.c

diff --git a/PATCHSETS b/PATCHSETS
index 343d8efb462e39c8ffb8135fe38a39a0e020d910..48ca5644e8eadd1752288203f75d2a5b1a928e76 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -2726,3 +2726,4 @@
 ( 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
 ( cvs diff -u -r 1.94.2.142 -r 1.94.2.143 src/messageview.c;  ) > 2.10.0cvs71.patchset
 ( cvs diff -u -r 1.395.2.315 -r 1.395.2.316 src/summaryview.c;  ) > 2.10.0cvs72.patchset
+( cvs diff -u -r 1.52.2.42 -r 1.52.2.43 src/prefs_folder_item.c;  ) > 2.10.0cvs73.patchset

diff --git a/configure.ac b/configure.ac
index bee76f3de9adae21aba1472fe2c78f3f0b1978a9..edd57024b64a9854863dcdb7f8309c2b8f9d226a 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=72
+EXTRA_VERSION=73
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/prefs_folder_item.c b/src/prefs_folder_item.c
index 61ae493409c882efe08424a69e815a3a18366eec..5c47894e97621024abc8d8bf1b6b7fa7f5423199 100644 (file)
--- a/src/prefs_folder_item.c
+++ b/src/prefs_folder_item.c
@@ -223,6 +223,7 @@ static void prefs_folder_item_general_create_widget_func(PrefsPage * page_,
        GtkWidget *offlinesync_rec_checkbtn;
        GtkTooltips *tooltips;
 
+       tooltips = gtk_tooltips_new();
        page->item         = item;
 
        /* Table */
@@ -397,7 +398,6 @@ static void prefs_folder_item_general_create_widget_func(PrefsPage * page_,
        folder_color_btn = gtk_button_new_with_label("");
        gtk_widget_set_size_request(folder_color_btn, 36, 26);
        gtk_box_pack_start (GTK_BOX(hbox), folder_color_btn, FALSE, FALSE, 0);
-       tooltips = gtk_tooltips_new();
        gtk_tooltips_set_tip(tooltips, folder_color_btn,
                             _("Pick color for folder"), NULL);
 
@@ -431,6 +431,10 @@ static void prefs_folder_item_general_create_widget_func(PrefsPage * page_,
 
        /* Check folder for new mail */
        checkbtn_newmailcheck = gtk_check_button_new_with_label(_("Scan for new mail"));
+       gtk_tooltips_set_tip(tooltips, checkbtn_newmailcheck,
+                            _("Turn this option on if mail is delivered directly "
+                              "to this folder by server side filtering on IMAP or "
+                              "by an external application"), NULL);
        gtk_table_attach(GTK_TABLE(table), checkbtn_newmailcheck, 0, 2,
                         rowcount, rowcount+1, GTK_EXPAND | GTK_FILL, GTK_FILL, 0, 0);
        
@@ -464,20 +468,22 @@ static void prefs_folder_item_general_create_widget_func(PrefsPage * page_,
        gtk_box_pack_start (GTK_BOX (hbox), hbox_spc, FALSE, FALSE, 0);
        gtk_widget_set_size_request (hbox_spc, 12, -1);
 
-       label_offlinesync = gtk_label_new(_("Fetch bodies for the last"));
+       label_offlinesync = gtk_label_new(_("Fetch message bodies from the last"));
        gtk_widget_show (label_offlinesync);
        gtk_box_pack_start (GTK_BOX (hbox), label_offlinesync, FALSE, FALSE, 0);
 
        entry_offlinesync = gtk_entry_new();
        gtk_widget_set_size_request (entry_offlinesync, 64, -1);
        gtk_widget_show (entry_offlinesync);
+       gtk_tooltips_set_tip(tooltips, entry_offlinesync, _("0: all bodies"), NULL);
        gtk_box_pack_start (GTK_BOX (hbox), entry_offlinesync, FALSE, FALSE, 0);
 
-       label_end_offlinesync = gtk_label_new(_("days (0: all bodies)"));
+       label_end_offlinesync = gtk_label_new(_("days"));
        gtk_widget_show (label_end_offlinesync);
        gtk_box_pack_start (GTK_BOX (hbox), label_end_offlinesync, FALSE, FALSE, 0);
 
-       checkbtn_remove_old_offlinesync = gtk_check_button_new_with_label(_("Remove older bodies"));
+       checkbtn_remove_old_offlinesync = gtk_check_button_new_with_label(
+                                               _("Remove older messages bodies"));
 
        hbox2 = gtk_hbox_new (FALSE, 8);
        gtk_widget_show (hbox2);