projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
sys-file-reader: Avoid assert-fail for duplicate attribute names.
[pspp]
/
src
/
ui
/
gui
/
psppire-dialog-action-descriptives.c
diff --git
a/src/ui/gui/psppire-dialog-action-descriptives.c
b/src/ui/gui/psppire-dialog-action-descriptives.c
index 9140e19c3c21100f6e86863b5e3a445909cbe5bf..5d2f4b7c5cd75537bba902f5ba2949fe4c8d726c 100644
(file)
--- a/
src/ui/gui/psppire-dialog-action-descriptives.c
+++ b/
src/ui/gui/psppire-dialog-action-descriptives.c
@@
-1,5
+1,5
@@
/* PSPPIRE - a graphical user interface for PSPP.
/* PSPPIRE - a graphical user interface for PSPP.
- Copyright (C) 201
2
Free Software Foundation
+ Copyright (C) 201
5
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
@@
-74,7
+74,7
@@
static const struct checkbox_entry_item stats[] =
static char *
static char *
-generate_syntax (PsppireDialogAction *act)
+generate_syntax (
const
PsppireDialogAction *act)
{
PsppireDialogActionDescriptives *scd = PSPPIRE_DIALOG_ACTION_DESCRIPTIVES (act);
gchar *text;
{
PsppireDialogActionDescriptives *scd = PSPPIRE_DIALOG_ACTION_DESCRIPTIVES (act);
gchar *text;
@@
-193,22
+193,20
@@
dialog_refresh (PsppireDialogAction *scd_)
}
}
-static
void
-psppire_dialog_action_descriptives_activate (
GtkAction *a
)
+static
GtkBuilder *
+psppire_dialog_action_descriptives_activate (
PsppireDialogAction *a, GVariant *param
)
{
PsppireDialogAction *pda = PSPPIRE_DIALOG_ACTION (a);
PsppireDialogActionDescriptives *act = PSPPIRE_DIALOG_ACTION_DESCRIPTIVES (a);
{
PsppireDialogAction *pda = PSPPIRE_DIALOG_ACTION (a);
PsppireDialogActionDescriptives *act = PSPPIRE_DIALOG_ACTION_DESCRIPTIVES (a);
- GHashTable *thing = psppire_dialog_action_get_pointer (pda);
- GtkBuilder *xml = g_hash_table_lookup (thing, a);
- if (!xml)
- {
- xml = builder_new ("descriptives.ui");
- g_hash_table_insert (thing, a, xml);
- }
+ GtkBuilder *xml = builder_new ( "descriptives.ui");
GtkWidget *stats_treeview = get_widget_assert (xml, "statistics");
GtkWidget *stats_treeview = get_widget_assert (xml, "statistics");
-
+ psppire_checkbox_treeview_populate (PSPPIRE_CHECKBOX_TREEVIEW (stats_treeview),
+ B_DS_DEFAULT,
+ N_DESCRIPTIVE_STATS, stats);
+ act->stats = gtk_tree_view_get_model (GTK_TREE_VIEW (stats_treeview));
+
pda->dialog = get_widget_assert (xml, "descriptives-dialog");
pda->source = get_widget_assert (xml, "all-variables");
act->variables = get_widget_assert (xml, "stat-variables");
pda->dialog = get_widget_assert (xml, "descriptives-dialog");
pda->source = get_widget_assert (xml, "all-variables");
act->variables = get_widget_assert (xml, "stat-variables");
@@
-216,13
+214,8
@@
psppire_dialog_action_descriptives_activate (GtkAction *a)
g_object_set (pda->source,
"predicate", var_is_numeric, NULL);
g_object_set (pda->source,
"predicate", var_is_numeric, NULL);
- psppire_checkbox_treeview_populate (PSPPIRE_CHECKBOX_TREEVIEW (stats_treeview),
- B_DS_DEFAULT,
- N_DESCRIPTIVE_STATS, stats);
-
act->stat_vars = GTK_TREE_VIEW (act->variables);
act->stat_vars = GTK_TREE_VIEW (act->variables);
- act->stats = gtk_tree_view_get_model (GTK_TREE_VIEW (stats_treeview));
-
+
act->include_user_missing =
GTK_TOGGLE_BUTTON (get_widget_assert (xml, "include_user_missing"));
act->exclude_missing_listwise =
act->include_user_missing =
GTK_TOGGLE_BUTTON (get_widget_assert (xml, "include_user_missing"));
act->exclude_missing_listwise =
@@
-233,13
+226,13
@@
psppire_dialog_action_descriptives_activate (GtkAction *a)
psppire_dialog_action_set_valid_predicate (pda, dialog_state_valid);
psppire_dialog_action_set_refresh (pda, dialog_refresh);
psppire_dialog_action_set_valid_predicate (pda, dialog_state_valid);
psppire_dialog_action_set_refresh (pda, dialog_refresh);
-
PSPPIRE_DIALOG_ACTION_CLASS (psppire_dialog_action_descriptives_parent_class)->activate (pda)
;
+
return xml
;
}
static void
psppire_dialog_action_descriptives_class_init (PsppireDialogActionDescriptivesClass *class)
{
}
static void
psppire_dialog_action_descriptives_class_init (PsppireDialogActionDescriptivesClass *class)
{
-
psppire_dialog_action_set_activation (class, psppire_dialog_action_descriptives_activate)
;
+
PSPPIRE_DIALOG_ACTION_CLASS (class)->initial_activate = psppire_dialog_action_descriptives_activate
;
PSPPIRE_DIALOG_ACTION_CLASS (class)->generate_syntax = generate_syntax;
}
PSPPIRE_DIALOG_ACTION_CLASS (class)->generate_syntax = generate_syntax;
}