projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Regression Dialog: Reduce the size of the Independent Variables widget.
[pspp]
/
src
/
ui
/
gui
/
psppire-dialog-action-chisquare.c
diff --git
a/src/ui/gui/psppire-dialog-action-chisquare.c
b/src/ui/gui/psppire-dialog-action-chisquare.c
index a8dc856b77c2f0c3a0418ecd3b248ff5768513d1..4fd09d0a44726986b3f555d3a66386271a035345 100644
(file)
--- a/
src/ui/gui/psppire-dialog-action-chisquare.c
+++ b/
src/ui/gui/psppire-dialog-action-chisquare.c
@@
-48,7
+48,7
@@
generate_syntax (const PsppireDialogAction *act)
psppire_var_view_append_names_str (PSPPIRE_VAR_VIEW (scd->var_view), 0, &dss);
psppire_var_view_append_names_str (PSPPIRE_VAR_VIEW (scd->var_view), 0, &dss);
- if (
gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (scd->range_button)))
+ if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (scd->range_button)))
{
ds_put_cstr (&dss, "(");
{
ds_put_cstr (&dss, "(");
@@
-63,7
+63,7
@@
generate_syntax (const PsppireDialogAction *act)
ds_put_cstr (&dss, ")");
}
ds_put_cstr (&dss, ")");
}
- if (
gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (scd->values_button)))
+ if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (scd->values_button)))
{
GtkListStore *ls = scd->expected_list;
GtkTreeIter iter;
{
GtkListStore *ls = scd->expected_list;
GtkTreeIter iter;
@@
-105,7
+105,7
@@
dialog_state_valid (gpointer a)
GtkTreeModel *vars =
gtk_tree_view_get_model (GTK_TREE_VIEW (act->var_view));
GtkTreeModel *vars =
gtk_tree_view_get_model (GTK_TREE_VIEW (act->var_view));
- if (
!gtk_tree_model_get_iter_first (vars, ¬used)
)
+ if (
!gtk_tree_model_get_iter_first (vars, ¬used)
)
return FALSE;
return TRUE;
return FALSE;
return TRUE;
@@
-128,19
+128,13
@@
refresh (PsppireDialogAction *rd_)
gtk_entry_set_text (GTK_ENTRY (csd->value_upper), "");
}
gtk_entry_set_text (GTK_ENTRY (csd->value_upper), "");
}
-static
void
-psppire_dialog_action_chisquare_activate (PsppireDialogAction *a)
+static
GtkBuilder *
+psppire_dialog_action_chisquare_activate (PsppireDialogAction *a
, GVariant *param
)
{
PsppireDialogAction *pda = PSPPIRE_DIALOG_ACTION (a);
PsppireDialogActionChisquare *act = PSPPIRE_DIALOG_ACTION_CHISQUARE (a);
{
PsppireDialogAction *pda = PSPPIRE_DIALOG_ACTION (a);
PsppireDialogActionChisquare *act = PSPPIRE_DIALOG_ACTION_CHISQUARE (a);
- GHashTable *thing = psppire_dialog_action_get_hash_table (pda);
- GtkBuilder *xml = g_hash_table_lookup (thing, a);
- if (!xml)
- {
- xml = builder_new ("chi-square.ui");
- g_hash_table_insert (thing, a, xml);
- }
+ GtkBuilder *xml = builder_new ("chi-square.ui");
GtkWidget *range_table = get_widget_assert (xml, "range-table");
GtkWidget *values_acr = get_widget_assert (xml, "psppire-acr1");
GtkWidget *range_table = get_widget_assert (xml, "range-table");
GtkWidget *values_acr = get_widget_assert (xml, "psppire-acr1");
@@
-183,13
+177,13
@@
psppire_dialog_action_chisquare_activate (PsppireDialogAction *a)
psppire_acr_set_model(PSPPIRE_ACR (values_acr), act->expected_list);
psppire_acr_set_model(PSPPIRE_ACR (values_acr), act->expected_list);
-
+ return xml;
}
static void
psppire_dialog_action_chisquare_class_init (PsppireDialogActionChisquareClass *class)
{
}
static void
psppire_dialog_action_chisquare_class_init (PsppireDialogActionChisquareClass *class)
{
-
psppire_dialog_action_set_activation (class, psppire_dialog_action_chisquare_activate)
;
+
PSPPIRE_DIALOG_ACTION_CLASS (class)->initial_activate = psppire_dialog_action_chisquare_activate
;
PSPPIRE_DIALOG_ACTION_CLASS (class)->generate_syntax = generate_syntax;
}
PSPPIRE_DIALOG_ACTION_CLASS (class)->generate_syntax = generate_syntax;
}