projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
help-menu.c: start the default html browser via wscript instead of cmd
[pspp]
/
src
/
ui
/
gui
/
psppire-dialog-action-paired.c
diff --git
a/src/ui/gui/psppire-dialog-action-paired.c
b/src/ui/gui/psppire-dialog-action-paired.c
index 558e86f52c70688cff95474142228f669f2eafd2..bdab615c81688ac557ca82a5310ec34c8cc0882a 100644
(file)
--- a/
src/ui/gui/psppire-dialog-action-paired.c
+++ b/
src/ui/gui/psppire-dialog-action-paired.c
@@
-124,7
+124,7
@@
select_as_pair_member (GtkTreeIter source_iter,
static gchar *
static gchar *
-generate_syntax (PsppireDialogAction *pda)
+generate_syntax (
const
PsppireDialogAction *pda)
{
PsppireDialogActionPaired *d = PSPPIRE_DIALOG_ACTION_PAIRED (pda);
gchar *text = NULL;
{
PsppireDialogActionPaired *d = PSPPIRE_DIALOG_ACTION_PAIRED (pda);
gchar *text = NULL;
@@
-150,45
+150,52
@@
generate_syntax (PsppireDialogAction *pda)
}
static void
}
static void
-psppire_dialog_action_paired_activate (
Gtk
Action *a)
+psppire_dialog_action_paired_activate (
PsppireDialog
Action *a)
{
PsppireDialogAction *pda = PSPPIRE_DIALOG_ACTION (a);
PsppireDialogActionPaired *act = PSPPIRE_DIALOG_ACTION_PAIRED (a);
{
PsppireDialogAction *pda = PSPPIRE_DIALOG_ACTION (a);
PsppireDialogActionPaired *act = PSPPIRE_DIALOG_ACTION_PAIRED (a);
- GHashTable *thing = psppire_dialog_action_get_
pointer
(pda);
+ 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);
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");
-
GtkWidget *selector = get_widget_assert (xml, "psppire-selector3
");
-
GtkWidget *button = get_widget_assert (xml, "option-button
");
+
pda->dialog = get_widget_assert (xml, "t-test-paired-samples-dialog
");
+
pda->source = get_widget_assert (xml, "paired-samples-t-test-treeview1
");
- pda->dialog = get_widget_assert (xml, "t-test-paired-samples-dialog");
- pda->source = get_widget_assert (xml, "paired-samples-t-test-treeview1");
+ gtk_window_set_title (GTK_WINDOW (pda->dialog), _("Paired Samples T Test"));
- gtk_window_set_title (GTK_WINDOW (pda->dialog), _("Paired Samples T Test"));
+ 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->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));
-
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);
- 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);
+ 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);
- 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);
+ }
if (PSPPIRE_DIALOG_ACTION_CLASS (psppire_dialog_action_paired_parent_class)->activate)
PSPPIRE_DIALOG_ACTION_CLASS (psppire_dialog_action_paired_parent_class)->activate (pda);
if (PSPPIRE_DIALOG_ACTION_CLASS (psppire_dialog_action_paired_parent_class)->activate)
PSPPIRE_DIALOG_ACTION_CLASS (psppire_dialog_action_paired_parent_class)->activate (pda);