[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Pspp-cvs] pspp ChangeLog INSTALL configure.ac src/ui/gui/...
From: |
John Darrington |
Subject: |
[Pspp-cvs] pspp ChangeLog INSTALL configure.ac src/ui/gui/... |
Date: |
Tue, 19 Feb 2008 00:35:20 +0000 |
CVSROOT: /sources/pspp
Module name: pspp
Changes by: John Darrington <jmd> 08/02/19 00:35:20
Modified files:
. : ChangeLog INSTALL configure.ac
src/ui/gui : ChangeLog dict-display.c
Log message:
Applied patch #6420
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/pspp/ChangeLog?cvsroot=pspp&r1=1.96&r2=1.97
http://cvs.savannah.gnu.org/viewcvs/pspp/INSTALL?cvsroot=pspp&r1=1.19&r2=1.20
http://cvs.savannah.gnu.org/viewcvs/pspp/configure.ac?cvsroot=pspp&r1=1.74&r2=1.75
http://cvs.savannah.gnu.org/viewcvs/pspp/src/ui/gui/ChangeLog?cvsroot=pspp&r1=1.111&r2=1.112
http://cvs.savannah.gnu.org/viewcvs/pspp/src/ui/gui/dict-display.c?cvsroot=pspp&r1=1.5&r2=1.6
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/pspp/pspp/ChangeLog,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -b -r1.96 -r1.97
--- ChangeLog 11 Dec 2007 11:46:04 -0000 1.96
+++ ChangeLog 19 Feb 2008 00:35:19 -0000 1.97
@@ -1,3 +1,7 @@
+2008-02-19 John Darrington <address@hidden>
+
+ * configure.ac INSTALL: We now depend on GTK+ 2.12
+
2007-12-11 John Darrington <address@hidden>
* t-test-independent-samples-dialog.c: Quoted the group values, when
Index: INSTALL
===================================================================
RCS file: /sources/pspp/pspp/INSTALL,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- INSTALL 18 Nov 2007 04:10:34 -0000 1.19
+++ INSTALL 19 Feb 2008 00:35:20 -0000 1.20
@@ -48,8 +48,7 @@
0.18 and 0.19 have a bug that will prevent library detection,
but other versions should be fine.
- * GTK+ (http://www.gtk.org/), version 2.8.0 or later, although we
- recommend version 2.10.2 or later.
+ * GTK+ (http://www.gtk.org/), version 2.12.0 or later.
* libglade (http://www.jamesh.id.au/software/libglade/), version
2.6 or later.
Index: configure.ac
===================================================================
RCS file: /sources/pspp/pspp/configure.ac,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -b -r1.74 -r1.75
--- configure.ac 7 Feb 2008 04:40:42 -0000 1.74
+++ configure.ac 19 Feb 2008 00:35:20 -0000 1.75
@@ -39,8 +39,8 @@
[AS_HELP_STRING([--without-gui], [don't build the PSPPIRE gui])])
if test x"$with_gui" != x"no" ; then
- PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.8.0,,
- [PSPP_REQUIRED_PREREQ([gtk+ 2.0 v2.8.0 or later (or use --without-gui)])])
+ PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.12.0,,
+ [PSPP_REQUIRED_PREREQ([gtk+ 2.0 v2.12.0 or later (or use --without-gui)])])
PKG_CHECK_MODULES(GLADE, libglade-2.0 >= 2.6.0,,
[PSPP_REQUIRED_PREREQ([libglade 2.0 (or use --without-gui)])])
fi
Index: src/ui/gui/ChangeLog
===================================================================
RCS file: /sources/pspp/pspp/src/ui/gui/ChangeLog,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -b -r1.111 -r1.112
--- src/ui/gui/ChangeLog 13 Feb 2008 03:22:02 -0000 1.111
+++ src/ui/gui/ChangeLog 19 Feb 2008 00:35:20 -0000 1.112
@@ -1,3 +1,8 @@
+2008-02-19 John Darrington <address@hidden>
+
+ * dict-display.c: Display names of variables in dialog box
+ dictionary treeviews, when the mouse hovers over the variable.
+
2008-02-13 John Darrington <address@hidden>
* variable-info-dialog.c: Fix crash when clicking "Jump" when no
Index: src/ui/gui/dict-display.c
===================================================================
RCS file: /sources/pspp/pspp/src/ui/gui/dict-display.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- src/ui/gui/dict-display.c 29 Jan 2008 11:12:59 -0000 1.5
+++ src/ui/gui/dict-display.c 19 Feb 2008 00:35:20 -0000 1.6
@@ -136,10 +136,9 @@
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);
@@ -153,6 +152,53 @@
}
}
+
+/* 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;
+}
+
/* 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
@@ -219,6 +265,10 @@
gtk_tree_view_append_column (treeview, col);
gtk_tree_selection_set_mode (selection, mode);
+
+ g_object_set (treeview, "has-tooltip", TRUE, NULL);
+
+ g_signal_connect (treeview, "query-tooltip", G_CALLBACK
(set_tooltip_for_variable), NULL);
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Pspp-cvs] pspp ChangeLog INSTALL configure.ac src/ui/gui/...,
John Darrington <=