projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Set the "editable" properties of the sheets to TRUE
[pspp]
/
src
/
ui
/
gui
/
psppire-dialog-action-examine.c
diff --git
a/src/ui/gui/psppire-dialog-action-examine.c
b/src/ui/gui/psppire-dialog-action-examine.c
index 8a643820ea830368c7b58a5527485a961d56cc21..2bafe67952e065a94bba665f1b01f329df9c974c 100644
(file)
--- a/
src/ui/gui/psppire-dialog-action-examine.c
+++ b/
src/ui/gui/psppire-dialog-action-examine.c
@@
-197,23
+197,23
@@
dialog_refresh (PsppireDialogAction *da)
dae->opts = OPT_LISTWISE;
}
dae->opts = OPT_LISTWISE;
}
-static
void
-psppire_dialog_action_examine_activate (PsppireDialogAction *a)
+static
GtkBuilder *
+psppire_dialog_action_examine_activate (PsppireDialogAction *a
, GVariant *param
)
{
PsppireDialogAction *pda = PSPPIRE_DIALOG_ACTION (a);
PsppireDialogActionExamine *act = PSPPIRE_DIALOG_ACTION_EXAMINE (a);
{
PsppireDialogAction *pda = PSPPIRE_DIALOG_ACTION (a);
PsppireDialogActionExamine *act = PSPPIRE_DIALOG_ACTION_EXAMINE (a);
- GHashTable *thing = psppire_dialog_action_get_hash_table (pda);
- GtkBuilder *xml = g_hash_table_lookup (thing, a);
- if (!xml)
- {
- xml = builder_new ("examine.ui");
- g_hash_table_insert (thing, a, xml);
- }
+ GtkBuilder *xml = builder_new ("examine.ui");
GtkWidget *stats_button = get_widget_assert (xml, "stats-button");
GtkWidget *opts_button = get_widget_assert (xml, "opts-button");
GtkWidget *stats_button = get_widget_assert (xml, "stats-button");
GtkWidget *opts_button = get_widget_assert (xml, "opts-button");
-
+
+ g_signal_connect_swapped (stats_button, "clicked",
+ G_CALLBACK (run_stats_dialog), act);
+
+ g_signal_connect_swapped (opts_button, "clicked",
+ G_CALLBACK (run_opts_dialog), act);
+
GtkWidget *dep_sel = get_widget_assert (xml, "psppire-selector1");
GtkWidget *dep_sel2 = get_widget_assert (xml, "psppire-selector2");
GtkWidget *dep_sel3 = get_widget_assert (xml, "psppire-selector3");
GtkWidget *dep_sel = get_widget_assert (xml, "psppire-selector1");
GtkWidget *dep_sel2 = get_widget_assert (xml, "psppire-selector2");
GtkWidget *dep_sel3 = get_widget_assert (xml, "psppire-selector3");
@@
-236,6
+236,7
@@
psppire_dialog_action_examine_activate (PsppireDialogAction *a)
list = g_list_append (list, dep_sel3);
list = g_list_append (list, get_widget_assert (xml, "frame3"));
gtk_container_set_focus_chain (GTK_CONTAINER (table), list);
list = g_list_append (list, dep_sel3);
list = g_list_append (list, get_widget_assert (xml, "frame3"));
gtk_container_set_focus_chain (GTK_CONTAINER (table), list);
+ g_list_free (list);
act->stats_dialog = get_widget_assert (xml, "statistics-dialog");
act->stats_dialog = get_widget_assert (xml, "statistics-dialog");
@@
-252,20
+253,13
@@
psppire_dialog_action_examine_activate (PsppireDialogAction *a)
psppire_dialog_action_set_valid_predicate (pda, (void *) dialog_state_valid);
psppire_dialog_action_set_refresh (pda, dialog_refresh);
psppire_dialog_action_set_valid_predicate (pda, (void *) dialog_state_valid);
psppire_dialog_action_set_refresh (pda, dialog_refresh);
-
- g_signal_connect_swapped (stats_button, "clicked",
- G_CALLBACK (run_stats_dialog), act);
-
- g_signal_connect_swapped (opts_button, "clicked",
- G_CALLBACK (run_opts_dialog), act);
-
- g_list_free (list);
+ return xml;
}
static void
psppire_dialog_action_examine_class_init (PsppireDialogActionExamineClass *class)
{
}
static void
psppire_dialog_action_examine_class_init (PsppireDialogActionExamineClass *class)
{
-
psppire_dialog_action_set_activation (class, psppire_dialog_action_examine_activate)
;
+
PSPPIRE_DIALOG_ACTION_CLASS (class)->initial_activate = psppire_dialog_action_examine_activate
;
PSPPIRE_DIALOG_ACTION_CLASS (class)->generate_syntax = generate_syntax;
}
PSPPIRE_DIALOG_ACTION_CLASS (class)->generate_syntax = generate_syntax;
}