Merge branch 'master' into rewrite-sheet

[pspp-builds.git] / src / ui / gui / dict-display.c

diff --git a/src/ui/gui/dict-display.c b/src/ui/gui/dict-display.c
index 13269b639c25d6b7933bc8f72d6d356d6f00771e..356758beeea4100c4f4f1fd3feeaae71ebeb2fb4 100644 (file)
--- a/src/ui/gui/dict-display.c
+++ b/src/ui/gui/dict-display.c
@@ -1,10 +1,9 @@
-/*
-   PSPPIRE --- A Graphical User Interface for PSPP
+/* PSPPIRE - a graphical user interface for PSPP.

    Copyright (C) 2007  Free Software Foundation
 
    Copyright (C) 2007  Free Software Foundation
 

-   This program is free software; you can redistribute it and/or modify
+   This program is free software: you can redistribute it and/or modify

    it under the terms of the GNU General Public License as published by
    it under the terms of the GNU General Public License as published by

-   the Free Software Foundation; either version 2 of the License, or
+   the Free Software Foundation, either version 3 of the License, or

    (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,


@@ -13,9 +12,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License

-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-   02110-1301, USA. */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>. */

 
 
 #include <config.h>
 
 
 #include <config.h>


@@ -27,6 +24,7 @@
 #include "psppire-dict.h"
 #include "helper.h"
 #include <data/variable.h>
 #include "psppire-dict.h"
 #include "helper.h"
 #include <data/variable.h>

+#include <data/format.h>

 
 #define _(msgid) gettext (msgid)
 #define N_(msgid) msgid
 
 #define _(msgid) gettext (msgid)
 #define N_(msgid) msgid


@@ -92,7 +90,7 @@ var_icon_cell_data_func (GtkTreeViewColumn *col,
 }
 
 
 }
 
 

-static void
+void

 get_base_model (GtkTreeModel *top_model, GtkTreeIter *top_iter,
                GtkTreeModel **model, GtkTreeIter *iter
                )
 get_base_model (GtkTreeModel *top_model, GtkTreeIter *top_iter,
                GtkTreeModel **model, GtkTreeIter *iter
                )


@@ -139,10 +137,9 @@ var_description_cell_data_func (GtkTreeViewColumn *col,
   if ( var_has_label (var))
     {
       gchar *text = g_strdup_printf (
   if ( var_has_label (var))
     {
       gchar *text = g_strdup_printf (

-                                    "<span stretch=\"condensed\">%s</span>"
-                                    " (<span weight=\"bold\">%s</span>)",
-                                    var_get_label (var),
-                                    var_get_name (var));
+                                    "<span stretch=\"condensed\">%s</span>",
+                                    var_get_label (var));
+

 
       char *utf8 = pspp_locale_to_utf8 (text, -1, NULL);
 
 
       char *utf8 = pspp_locale_to_utf8 (text, -1, NULL);
 


@@ -156,6 +153,56 @@ var_description_cell_data_func (GtkTreeViewColumn *col,
     }
 }
 
     }
 }
 

+
+#if GTK_CHECK_VERSION (2, 12, 0)
+/* Sets the tooltip to be the name of the variable under the cursor */
+static gboolean
+set_tooltip_for_variable (GtkTreeView  *treeview,
+                         gint        x,
+                         gint        y,
+                         gboolean    keyboard_mode,
+                         GtkTooltip *tooltip,
+                         gpointer    user_data)
+
+{
+  gint bx, by;
+  GtkTreeIter iter;
+  GtkTreePath *path;
+  GtkTreeModel *tree_model;
+  struct variable *var = NULL;
+  gboolean ok;
+
+
+  gtk_tree_view_convert_widget_to_bin_window_coords (treeview,
+                                                     x, y, &bx, &by);
+
+  if (!gtk_tree_view_get_path_at_pos (treeview, bx, by,
+                                      &path, NULL, NULL, NULL))
+    return FALSE;
+
+  tree_model = gtk_tree_view_get_model (treeview);
+
+
+  gtk_tree_view_set_tooltip_row (treeview, tooltip, path);
+
+  ok = gtk_tree_model_get_iter (tree_model, &iter, path);
+
+  gtk_tree_path_free (path);
+  if (!ok)
+    return FALSE;
+
+
+  gtk_tree_model_get (tree_model, &iter, DICT_TVM_COL_VAR,  &var, -1);
+
+  if ( ! var_has_label (var))
+    return FALSE;
+
+  gtk_tooltip_set_text (tooltip, var_get_name (var));
+
+  return TRUE;
+}
+#endif
+

    /* Sets up TREEVIEW to display the variables of DICT.
    MODE is the selection mode for TREEVIEW.
    PREDICATE determines which variables should be visible, or NULL if
    /* Sets up TREEVIEW to display the variables of DICT.
    MODE is the selection mode for TREEVIEW.
    PREDICATE determines which variables should be visible, or NULL if


@@ -222,13 +269,20 @@ attach_dictionary_to_treeview (GtkTreeView *treeview, PsppireDict *dict,
   gtk_tree_view_append_column (treeview, col);
 
   gtk_tree_selection_set_mode (selection, mode);
   gtk_tree_view_append_column (treeview, col);
 
   gtk_tree_selection_set_mode (selection, mode);

+
+  g_object_set (treeview, "has-tooltip", TRUE, NULL);
+
+#if GTK_CHECK_VERSION (2, 12, 0)
+  g_signal_connect (treeview, "query-tooltip", G_CALLBACK (set_tooltip_for_variable), NULL);
+#endif

 }
 
 
 void
 insert_source_row_into_entry (GtkTreeIter iter,
                              GtkWidget *dest,
 }
 
 
 void
 insert_source_row_into_entry (GtkTreeIter iter,
                              GtkWidget *dest,

-                             GtkTreeModel *model
+                             GtkTreeModel *model,
+                             gpointer data

                              )
 {
   GtkTreePath *path;
                              )
 {
   GtkTreePath *path;


@@ -260,7 +314,8 @@ insert_source_row_into_entry (GtkTreeIter iter,
 void
 insert_source_row_into_tree_view (GtkTreeIter iter,
                                  GtkWidget *dest,
 void
 insert_source_row_into_tree_view (GtkTreeIter iter,
                                  GtkWidget *dest,

-                                 GtkTreeModel *model
+                                 GtkTreeModel *model,
+                                 gpointer data

                                  )
 {
   GtkTreePath *path;
                                  )
 {
   GtkTreePath *path;