projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
pspp_sheet_view_bin_expose : remove GdkEventExpose parameter and replace with cairo_t
[pspp]
/
src
/
ui
/
gui
/
psppire-dictview.c
diff --git
a/src/ui/gui/psppire-dictview.c
b/src/ui/gui/psppire-dictview.c
index 243d907826f909a933f1fe8a73478b888da83c5c..5554eb0adebf9cbd8ea9a701461e3f7c72eed9b2 100644
(file)
--- a/
src/ui/gui/psppire-dictview.c
+++ b/
src/ui/gui/psppire-dictview.c
@@
-1,5
+1,5
@@
/* PSPPIRE - a graphical user interface for PSPP.
/* PSPPIRE - a graphical user interface for PSPP.
- Copyright (C) 2009 Free Software Foundation
+ Copyright (C) 2009
, 2010, 2011, 2012
Free Software Foundation
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
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
@@
-16,7
+16,7
@@
#include <config.h>
#include <config.h>
-#include <gtk/gtk
treeview
.h>
+#include <gtk/gtk.h>
#include "psppire-dictview.h"
#include "psppire-dict.h"
#include "psppire-conf.h"
#include "psppire-dictview.h"
#include "psppire-dict.h"
#include "psppire-conf.h"
@@
-68,14
+68,13
@@
psppire_dict_view_finalize (GObject *object)
{
PsppireDictView *dict_view = PSPPIRE_DICT_VIEW (object);
{
PsppireDictView *dict_view = PSPPIRE_DICT_VIEW (object);
- g
_object_unref
(dict_view->menu);
+ g
tk_widget_destroy
(dict_view->menu);
}
/* Properties */
enum
{
PROP_0,
}
/* Properties */
enum
{
PROP_0,
- PROP_MODEL,
PROP_DICTIONARY,
PROP_PREDICATE,
PROP_SELECTION_MODE
PROP_DICTIONARY,
PROP_PREDICATE,
PROP_SELECTION_MODE
@@
-106,7
+105,10
@@
set_model (PsppireDictView *dict_view)
{
GtkTreeModel *model ;
{
GtkTreeModel *model ;
- if ( dict_view->predicate )
+ if ( dict_view->dict == NULL)
+ return;
+
+ if ( dict_view->predicate )
{
model = gtk_tree_model_filter_new (GTK_TREE_MODEL (dict_view->dict),
NULL);
{
model = gtk_tree_model_filter_new (GTK_TREE_MODEL (dict_view->dict),
NULL);
@@
-119,9
+121,11
@@
set_model (PsppireDictView *dict_view)
else
{
model = GTK_TREE_MODEL (dict_view->dict);
else
{
model = GTK_TREE_MODEL (dict_view->dict);
+ g_object_ref (model);
}
gtk_tree_view_set_model (GTK_TREE_VIEW (dict_view), model);
}
gtk_tree_view_set_model (GTK_TREE_VIEW (dict_view), model);
+ g_object_unref (model);
}
static void
}
static void
@@
-137,11
+141,6
@@
psppire_dict_view_set_property (GObject *object,
case PROP_DICTIONARY:
dict_view->dict = g_value_get_object (value);
break;
case PROP_DICTIONARY:
dict_view->dict = g_value_get_object (value);
break;
- case PROP_MODEL:
- g_critical ("Don't set the \"model\" property on %s. "
- "Use the \"dictionary\" property instead.",
- G_OBJECT_TYPE_NAME (dict_view));
- break;
case PROP_PREDICATE:
dict_view->predicate = g_value_get_pointer (value);
break;
case PROP_PREDICATE:
dict_view->predicate = g_value_get_pointer (value);
break;
@@
-201,45
+200,27
@@
psppire_dict_view_class_init (PsppireDictViewClass *class)
{
GObjectClass *object_class = G_OBJECT_CLASS (class);
{
GObjectClass *object_class = G_OBJECT_CLASS (class);
- GParamSpec *dictionary_spec =
- g_param_spec_object ("dictionary",
- "Dictionary",
- _("The dictionary to be displayed by this widget"),
- PSPPIRE_TYPE_DICT,
- G_PARAM_READABLE | G_PARAM_WRITABLE);
-
GParamSpec *predicate_spec =
g_param_spec_pointer ("predicate",
"Predicate",
GParamSpec *predicate_spec =
g_param_spec_pointer ("predicate",
"Predicate",
-
_("A predicate function")
,
+
"A predicate function"
,
G_PARAM_READABLE | G_PARAM_WRITABLE);
GParamSpec *selection_mode_spec =
g_param_spec_enum ("selection-mode",
"Selection Mode",
G_PARAM_READABLE | G_PARAM_WRITABLE);
GParamSpec *selection_mode_spec =
g_param_spec_enum ("selection-mode",
"Selection Mode",
-
_("How many things can be selected")
,
+
"How many things can be selected"
,
GTK_TYPE_SELECTION_MODE,
GTK_SELECTION_MULTIPLE,
G_PARAM_CONSTRUCT | G_PARAM_READABLE | G_PARAM_WRITABLE);
GTK_TYPE_SELECTION_MODE,
GTK_SELECTION_MULTIPLE,
G_PARAM_CONSTRUCT | G_PARAM_READABLE | G_PARAM_WRITABLE);
-
- GParamSpec *dummy_spec =
- g_param_spec_pointer ("model",
- "Model",
- "Don't set the property",
- G_PARAM_WRITABLE);
-
object_class->set_property = psppire_dict_view_set_property;
object_class->get_property = psppire_dict_view_get_property;
object_class->set_property = psppire_dict_view_set_property;
object_class->get_property = psppire_dict_view_get_property;
- g_object_class_install_property (object_class,
- PROP_MODEL,
- dummy_spec);
-
- g_object_class_install_property (object_class,
- PROP_DICTIONARY,
- dictionary_spec);
+ g_object_class_override_property (object_class,
+ PROP_DICTIONARY,
+ "model");
g_object_class_install_property (object_class,
PROP_PREDICATE,
g_object_class_install_property (object_class,
PROP_PREDICATE,
@@
-271,8
+252,7
@@
psppire_dict_view_base_finalize (PsppireDictViewClass *class,
static void
dv_get_base_model (GtkTreeModel *top_model, GtkTreeIter *top_iter,
static void
dv_get_base_model (GtkTreeModel *top_model, GtkTreeIter *top_iter,
- GtkTreeModel **model, GtkTreeIter *iter
- )
+ GtkTreeModel **model, GtkTreeIter *iter)
{
*model = top_model;
{
*model = top_model;
@@
-325,18
+305,15
@@
var_description_cell_data_func (GtkTreeViewColumn *col,
struct variable *var;
GtkTreeIter iter;
GtkTreeModel *model;
struct variable *var;
GtkTreeIter iter;
GtkTreeModel *model;
- PsppireDict *dict;
dv_get_base_model (top_model, top_iter, &model, &iter);
dv_get_base_model (top_model, top_iter, &model, &iter);
- dict = PSPPIRE_DICT (model);
-
gtk_tree_model_get (model,
&iter, DICT_TVM_COL_VAR, &var, -1);
if ( var_has_label (var) && dv->prefer_labels)
{
gtk_tree_model_get (model,
&iter, DICT_TVM_COL_VAR, &var, -1);
if ( var_has_label (var) && dv->prefer_labels)
{
- gchar *text = g_
strdup_printf
(
+ gchar *text = g_
markup_printf_escaped
(
"<span stretch=\"condensed\">%s</span>",
var_get_label (var));
"<span stretch=\"condensed\">%s</span>",
var_get_label (var));
@@
-369,7
+346,7
@@
var_icon_cell_data_func (GtkTreeViewColumn *col,
}
else
{
}
else
{
- const struct fmt_spec *fs = var_get_
write
_format (var);
+ const struct fmt_spec *fs = var_get_
print
_format (var);
int cat = fmt_get_category (fs->type);
switch ( var_get_measure (var))
{
int cat = fmt_get_category (fs->type);
switch ( var_get_measure (var))
{
@@
-434,10
+411,8
@@
set_tooltip_for_variable (GtkTreeView *treeview,
{
const gchar *tip ;
GtkTreeModel *m;
{
const gchar *tip ;
GtkTreeModel *m;
- PsppireDict *dict;
dv_get_base_model (tree_model, NULL, &m, NULL);
dv_get_base_model (tree_model, NULL, &m, NULL);
- dict = PSPPIRE_DICT (m);
if ( PSPPIRE_DICT_VIEW (treeview)->prefer_labels )
tip = var_get_name (var);
if ( PSPPIRE_DICT_VIEW (treeview)->prefer_labels )
tip = var_get_name (var);