X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire-dialog-action-paired.c;h=c08a4d60e6ef2dc6421e903342f263fc7aae0d04;hb=7ef0d7851bafb01ad78c03d66d344fa3ea6f31c6;hp=d08fc109aa69ad021a6b7d909e8dc842d79d2173;hpb=2a71889bf86463fb752bcbab248da47b25b4fd9a;p=pspp diff --git a/src/ui/gui/psppire-dialog-action-paired.c b/src/ui/gui/psppire-dialog-action-paired.c index d08fc109aa..c08a4d60e6 100644 --- a/src/ui/gui/psppire-dialog-action-paired.c +++ b/src/ui/gui/psppire-dialog-action-paired.c @@ -150,50 +150,53 @@ generate_syntax (PsppireDialogAction *pda) } static void -psppire_dialog_action_paired_activate (GtkAction *a) +psppire_dialog_action_paired_activate (PsppireDialogAction *a) { PsppireDialogAction *pda = PSPPIRE_DIALOG_ACTION (a); PsppireDialogActionPaired *act = PSPPIRE_DIALOG_ACTION_PAIRED (a); - GtkBuilder *xml = builder_new ("paired-samples.ui"); - GtkWidget *selector = get_widget_assert (xml, "psppire-selector3"); - GtkWidget *bb = gtk_button_box_new (GTK_ORIENTATION_HORIZONTAL); - GtkWidget *button = gtk_button_new_with_mnemonic (_("O_ptions...")); - GtkWidget *box = get_widget_assert (xml, "vbox3"); - - - pda->dialog = get_widget_assert (xml, "t-test-paired-samples-dialog"); - pda->source = get_widget_assert (xml, "paired-samples-t-test-treeview1"); + GHashTable *thing = psppire_dialog_action_get_hash_table (pda); + GtkBuilder *xml = g_hash_table_lookup (thing, a); + if (!xml) + { + xml = builder_new ("paired-samples.ui"); + g_hash_table_insert (thing, a, xml); + + GtkWidget *selector = get_widget_assert (xml, "psppire-selector3"); + GtkWidget *bb = gtk_button_box_new (GTK_ORIENTATION_HORIZONTAL); + GtkWidget *button = gtk_button_new_with_mnemonic (_("O_ptions...")); + GtkWidget *box = get_widget_assert (xml, "dynamic-populate"); - gtk_window_set_title (GTK_WINDOW (pda->dialog), _("Paired Samples T Test")); + pda->dialog = get_widget_assert (xml, "t-test-paired-samples-dialog"); + pda->source = get_widget_assert (xml, "paired-samples-t-test-treeview1"); - act->pairs_treeview = get_widget_assert (xml, "paired-samples-t-test-treeview2"); - act->list_store = GTK_LIST_STORE (gtk_tree_view_get_model (GTK_TREE_VIEW (act->pairs_treeview))); + gtk_window_set_title (GTK_WINDOW (pda->dialog), _("Paired Samples T Test")); - act->opt = tt_options_dialog_create (GTK_WINDOW (pda->toplevel)); + act->pairs_treeview = get_widget_assert (xml, "paired-samples-t-test-treeview2"); + act->list_store = GTK_LIST_STORE (gtk_tree_view_get_model (GTK_TREE_VIEW (act->pairs_treeview))); + act->opt = tt_options_dialog_create (GTK_WINDOW (pda->toplevel)); - g_signal_connect_swapped (button, "clicked", G_CALLBACK (tt_options_dialog_run), act->opt); + g_signal_connect_swapped (button, "clicked", G_CALLBACK (tt_options_dialog_run), act->opt); - gtk_box_pack_start (GTK_BOX (bb), button, TRUE, TRUE, 5); - gtk_box_pack_start (GTK_BOX (box), bb, FALSE, FALSE, 5); - gtk_widget_show_all (box); + gtk_box_pack_start (GTK_BOX (bb), button, TRUE, TRUE, 5); + gtk_box_pack_start (GTK_BOX (box), bb, FALSE, FALSE, 5); + gtk_widget_show_all (box); - 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); + psppire_dialog_action_set_refresh (pda, refresh); - g_object_set (pda->source, - "predicate", var_is_numeric, - NULL); + g_object_set (pda->source, + "predicate", var_is_numeric, + NULL); - psppire_selector_set_select_func (PSPPIRE_SELECTOR (selector), - select_as_pair_member, - act); + psppire_selector_set_select_func (PSPPIRE_SELECTOR (selector), + select_as_pair_member, + act); + } - g_object_unref (xml); - if (PSPPIRE_DIALOG_ACTION_CLASS (psppire_dialog_action_paired_parent_class)->activate) PSPPIRE_DIALOG_ACTION_CLASS (psppire_dialog_action_paired_parent_class)->activate (pda); }