projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
cleanup
[pspp]
/
src
/
ui
/
gui
/
psppire-dialog-action-reliability.c
diff --git
a/src/ui/gui/psppire-dialog-action-reliability.c
b/src/ui/gui/psppire-dialog-action-reliability.c
index 11d1eeefc1372a610578e7346ce5187f2a467cfe..4bb78f9e1e1a089fb0dbf09682849d195e93fc25 100644
(file)
--- a/
src/ui/gui/psppire-dialog-action-reliability.c
+++ b/
src/ui/gui/psppire-dialog-action-reliability.c
@@
-29,7
+29,7
@@
static void psppire_dialog_action_reliability_class_init (PsppireDialogActi
G_DEFINE_TYPE (PsppireDialogActionReliability, psppire_dialog_action_reliability, PSPPIRE_TYPE_DIALOG_ACTION);
G_DEFINE_TYPE (PsppireDialogActionReliability, psppire_dialog_action_reliability, PSPPIRE_TYPE_DIALOG_ACTION);
-enum
+enum
{
ALPHA = 0,
SPLIT = 1
{
ALPHA = 0,
SPLIT = 1
@@
-48,14
+48,14
@@
generate_syntax (const PsppireDialogAction *act)
g_string_append (string, "\n\t/MODEL=");
g_string_append (string, "\n\t/MODEL=");
- if (
ALPHA == gtk_combo_box_get_active (GTK_COMBO_BOX (rd->model_combo)))
+ if (ALPHA == gtk_combo_box_get_active (GTK_COMBO_BOX (rd->model_combo)))
g_string_append (string, "ALPHA");
else
g_string_append_printf (string, "SPLIT (%d)",
gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (rd->split_spinbutton))
g_string_append (string, "ALPHA");
else
g_string_append_printf (string, "SPLIT (%d)",
gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (rd->split_spinbutton))
-
);
+ );
- if (
gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (rd->scale_if_item_deleted_checkbutton)))
+ if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (rd->scale_if_item_deleted_checkbutton)))
g_string_append (string, "\n\t/SUMMARY = TOTAL");
g_string_append (string, ".\n");
g_string_append (string, "\n\t/SUMMARY = TOTAL");
g_string_append (string, ".\n");
@@
-95,7
+95,7
@@
update_split_control (PsppireDialogActionReliability *pda)
0, n_vars - 1);
gtk_widget_set_sensitive (pda->split_point_hbox,
0, n_vars - 1);
gtk_widget_set_sensitive (pda->split_point_hbox,
- (
SPLIT == gtk_combo_box_get_active (GTK_COMBO_BOX (pda->model_combo))));
+ (SPLIT == gtk_combo_box_get_active (GTK_COMBO_BOX (pda->model_combo))));
}
}
@@
-119,20
+119,14
@@
refresh (PsppireDialogAction *pda_)
FALSE);
}
FALSE);
}
-static
void
-psppire_dialog_action_reliability_activate (PsppireDialogAction *a)
+static
GtkBuilder *
+psppire_dialog_action_reliability_activate (PsppireDialogAction *a
, GVariant *param
)
{
PsppireDialogAction *pda = PSPPIRE_DIALOG_ACTION (a);
PsppireDialogActionReliability *act = PSPPIRE_DIALOG_ACTION_RELIABILITY (a);
GtkTreeModel *liststore ;
{
PsppireDialogAction *pda = PSPPIRE_DIALOG_ACTION (a);
PsppireDialogActionReliability *act = PSPPIRE_DIALOG_ACTION_RELIABILITY (a);
GtkTreeModel *liststore ;
- GHashTable *thing = psppire_dialog_action_get_hash_table (pda);
- GtkBuilder *xml = g_hash_table_lookup (thing, a);
- if (!xml)
- {
- xml = builder_new ("reliability.ui");
- g_hash_table_insert (thing, a, xml);
- }
+ GtkBuilder *xml = builder_new ("reliability.ui");
pda->dialog = get_widget_assert (xml, "reliability-dialog");
pda->source = get_widget_assert (xml, "dict-view");
pda->dialog = get_widget_assert (xml, "reliability-dialog");
pda->source = get_widget_assert (xml, "dict-view");
@@
-164,14
+158,14
@@
psppire_dialog_action_reliability_activate (PsppireDialogAction *a)
psppire_dialog_action_set_refresh (pda, refresh);
psppire_dialog_action_set_valid_predicate (pda, dialog_state_valid);
psppire_dialog_action_set_refresh (pda, refresh);
psppire_dialog_action_set_valid_predicate (pda, dialog_state_valid);
-
+ return xml;
}
static void
psppire_dialog_action_reliability_class_init (PsppireDialogActionReliabilityClass *class)
{
PsppireDialogActionClass *pdac = PSPPIRE_DIALOG_ACTION_CLASS (class);
}
static void
psppire_dialog_action_reliability_class_init (PsppireDialogActionReliabilityClass *class)
{
PsppireDialogActionClass *pdac = PSPPIRE_DIALOG_ACTION_CLASS (class);
-
psppire_dialog_action_set_activation (class, psppire_dialog_action_reliability_activate)
;
+
PSPPIRE_DIALOG_ACTION_CLASS (class)->initial_activate = psppire_dialog_action_reliability_activate
;
pdac->generate_syntax = generate_syntax;
}
pdac->generate_syntax = generate_syntax;
}