From afcaddfc22cdb27a5696e34d9543d3df64413ad7 Mon Sep 17 00:00:00 2001
From: John Darrington <john@darrington.wattle.id.au>
Date: Sun, 19 Jan 2014 10:13:33 +0100
Subject: [PATCH] REGRESSION: Show tooltips for Statistics items in sub-dialog.

This should make it easier for GUI users who don't read user manuals.
---
 src/ui/gui/psppire-checkbox-treeview.c        | 10 ++++++----
 src/ui/gui/psppire-checkbox-treeview.h        |  2 ++
 src/ui/gui/psppire-dialog-action-regression.c | 18 +++++++++---------
 3 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/src/ui/gui/psppire-checkbox-treeview.c b/src/ui/gui/psppire-checkbox-treeview.c
index 9cf5030219..04f49d3747 100644
--- a/src/ui/gui/psppire-checkbox-treeview.c
+++ b/src/ui/gui/psppire-checkbox-treeview.c
@@ -118,8 +118,9 @@ static void
 psppire_checkbox_treeview_init (PsppireCheckboxTreeview *cbtv)
 {
   cbtv->list = GTK_TREE_MODEL (gtk_list_store_new (N_CHECKBOX_COLUMNS,
-						  G_TYPE_STRING, 
-						  G_TYPE_BOOLEAN));
+						   G_TYPE_STRING, 
+						   G_TYPE_BOOLEAN,
+						   G_TYPE_STRING));
 
   gtk_tree_view_set_model (GTK_TREE_VIEW (cbtv), cbtv->list);
   g_object_unref (cbtv->list);
@@ -147,9 +148,10 @@ psppire_checkbox_treeview_populate (PsppireCheckboxTreeview *cbtv,
       gtk_list_store_append (GTK_LIST_STORE (cbtv->list), &iter);
       gtk_list_store_set (GTK_LIST_STORE (cbtv->list), &iter,
                           CHECKBOX_COLUMN_LABEL, gettext (items[i].label),
-                          CHECKBOX_COLUMN_SELECTED,
-			  (default_items & (1u << i)) != 0,
+                          CHECKBOX_COLUMN_SELECTED,  (default_items & (1u << i)) != 0,
+			  CHECKBOX_COLUMN_TOOLTIP, gettext (items[i].tooltip),
                           -1);
     }
 
+  gtk_tree_view_set_tooltip_column (GTK_TREE_VIEW (cbtv), CHECKBOX_COLUMN_TOOLTIP);
 }
diff --git a/src/ui/gui/psppire-checkbox-treeview.h b/src/ui/gui/psppire-checkbox-treeview.h
index b61cfdcc3c..d18e62cec6 100644
--- a/src/ui/gui/psppire-checkbox-treeview.h
+++ b/src/ui/gui/psppire-checkbox-treeview.h
@@ -69,12 +69,14 @@ struct checkbox_entry_item
   {
     const char *name;
     const char *label;
+    const char *tooltip;
   };
 
 enum
   {
     CHECKBOX_COLUMN_LABEL,
     CHECKBOX_COLUMN_SELECTED,
+    CHECKBOX_COLUMN_TOOLTIP,
     N_CHECKBOX_COLUMNS
   };
 
diff --git a/src/ui/gui/psppire-dialog-action-regression.c b/src/ui/gui/psppire-dialog-action-regression.c
index acc0ce0245..7a09132093 100644
--- a/src/ui/gui/psppire-dialog-action-regression.c
+++ b/src/ui/gui/psppire-dialog-action-regression.c
@@ -36,16 +36,16 @@
 #define N_(msgid) msgid
 
 
-#define REGRESSION_STATS			  \
-  RG (COEFF, N_("Coeff"))                         \
-  RG (CI, N_("Conf. Interval"))                 \
-  RG (R, N_("R"))				  \
-  RG (ANOVA, N_("Anova"))			  \
-  RG (BCOV, N_("Bcov"))
+#define REGRESSION_STATS       \
+  RG (COEFF, N_("Coeff"),          N_("Show the regression coefficients"))	\
+  RG (CI,    N_("Conf. Interval"), N_("Show the confidence interval for the regression coefficients"))   \
+  RG (R,     N_("R"),              N_("Show the correlation between observed and predicted values")) \
+  RG (ANOVA, N_("Anova"),          N_("Show the analysis of variance table"))  \
+  RG (BCOV,  N_("Bcov"),           N_("Show the variance coefficient matrix"))
 
 enum
   {
-#define RG(NAME, LABEL) RG_##NAME,
+#define RG(NAME, LABEL, TOOLTIP) RG_##NAME,
     REGRESSION_STATS
 #undef RG
     N_REGRESSION_STATS
@@ -53,7 +53,7 @@ enum
 
 enum
   {
-#define RG(NAME, LABEL) B_RG_##NAME = 1u << RG_##NAME,
+#define RG(NAME, LABEL, TOOLTIP) B_RG_##NAME = 1u << RG_##NAME,
     REGRESSION_STATS
 #undef RG
     B_RG_STATS_ALL = (1u << N_REGRESSION_STATS) - 1,
@@ -62,7 +62,7 @@ enum
 
 static const struct checkbox_entry_item stats[] =
   {
-#define RG(NAME, LABEL) {#NAME, LABEL},
+#define RG(NAME, LABEL, TOOLTIP) {#NAME, LABEL, TOOLTIP},
     REGRESSION_STATS
 #undef RG
   };
-- 
2.30.2