projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
numbers back in tables
[pspp]
/
src
/
ui
/
gui
/
psppire-dialog-action-runs.c
diff --git
a/src/ui/gui/psppire-dialog-action-runs.c
b/src/ui/gui/psppire-dialog-action-runs.c
index a0e9e30357410839736e64a1f318ddbe794577da..3a073e227b05bd215f723aeb834c5e3fe322b8e0 100644
(file)
--- a/
src/ui/gui/psppire-dialog-action-runs.c
+++ b/
src/ui/gui/psppire-dialog-action-runs.c
@@
-43,9
+43,9
@@
append_fragment (GString *string, const gchar *cut, PsppireVarView *vv)
{
g_string_append (string, "\n\t/RUNS");
{
g_string_append (string, "\n\t/RUNS");
- g_string_append (string, " (
");
+ g_string_append (string, " (");
g_string_append (string, cut);
g_string_append (string, cut);
- g_string_append (string, "
) = ");
+ g_string_append (string, ") = ");
psppire_var_view_append_names (vv, 0, string);
}
psppire_var_view_append_names (vv, 0, string);
}
@@
-54,20
+54,20
@@
static char *
generate_syntax (const PsppireDialogAction *act)
{
PsppireDialogActionRuns *rd = PSPPIRE_DIALOG_ACTION_RUNS (act);
generate_syntax (const PsppireDialogAction *act)
{
PsppireDialogActionRuns *rd = PSPPIRE_DIALOG_ACTION_RUNS (act);
- gchar *
text
;
+ gchar *
str
;
GString *string = g_string_new ("NPAR TEST");
GString *string = g_string_new ("NPAR TEST");
- if (
gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (rd->cb[CB_MEAN])))
+ if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (rd->cb[CB_MEAN])))
append_fragment (string, "MEAN", PSPPIRE_VAR_VIEW (rd->variables));
append_fragment (string, "MEAN", PSPPIRE_VAR_VIEW (rd->variables));
- if (
gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (rd->cb[CB_MEDIAN])))
+ if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (rd->cb[CB_MEDIAN])))
append_fragment (string, "MEDIAN", PSPPIRE_VAR_VIEW (rd->variables));
append_fragment (string, "MEDIAN", PSPPIRE_VAR_VIEW (rd->variables));
- if (
gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (rd->cb[CB_MODE])))
+ if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (rd->cb[CB_MODE])))
append_fragment (string, "MODE", PSPPIRE_VAR_VIEW (rd->variables));
append_fragment (string, "MODE", PSPPIRE_VAR_VIEW (rd->variables));
- if (
gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (rd->cb[CB_CUSTOM])))
+ if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (rd->cb[CB_CUSTOM])))
{
const char *text = gtk_entry_get_text (GTK_ENTRY (rd->entry));
append_fragment (string, text, PSPPIRE_VAR_VIEW (rd->variables));
{
const char *text = gtk_entry_get_text (GTK_ENTRY (rd->entry));
append_fragment (string, text, PSPPIRE_VAR_VIEW (rd->variables));
@@
-75,11
+75,11
@@
generate_syntax (const PsppireDialogAction *act)
g_string_append (string, ".\n");
g_string_append (string, ".\n");
-
text
= string->str;
+
str
= string->str;
g_string_free (string, FALSE);
g_string_free (string, FALSE);
- return
text
;
+ return
str
;
}
}
@@
-96,10
+96,10
@@
dialog_state_valid (gpointer data)
for (i = 0; i < 4; ++i)
{
for (i = 0; i < 4; ++i)
{
- if (
TRUE == gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (fd->cb[i])))
+ if (TRUE == gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (fd->cb[i])))
break;
}
break;
}
- if (
i >= 4)
+ if (i >= 4)
return FALSE;
return FALSE;
@@
-127,19
+127,13
@@
refresh (PsppireDialogAction *rd_)
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (rd->cb[i]), FALSE);
}
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (rd->cb[i]), FALSE);
}
-static
void
-psppire_dialog_action_runs_activate (PsppireDialogAction *a)
+static
GtkBuilder *
+psppire_dialog_action_runs_activate (PsppireDialogAction *a
, GVariant *param
)
{
PsppireDialogAction *pda = PSPPIRE_DIALOG_ACTION (a);
PsppireDialogActionRuns *act = PSPPIRE_DIALOG_ACTION_RUNS (a);
{
PsppireDialogAction *pda = PSPPIRE_DIALOG_ACTION (a);
PsppireDialogActionRuns *act = PSPPIRE_DIALOG_ACTION_RUNS (a);
- GHashTable *thing = psppire_dialog_action_get_hash_table (pda);
- GtkBuilder *xml = g_hash_table_lookup (thing, a);
- if (!xml)
- {
- xml = builder_new ("runs.ui");
- g_hash_table_insert (thing, a, xml);
- }
+ GtkBuilder *xml = builder_new ("runs.ui");
pda->dialog = get_widget_assert (xml, "runs-dialog");
pda->source = get_widget_assert (xml, "dict-view");
pda->dialog = get_widget_assert (xml, "runs-dialog");
pda->source = get_widget_assert (xml, "dict-view");
@@
-153,13
+147,13
@@
psppire_dialog_action_runs_activate (PsppireDialogAction *a)
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);
-
+ return xml;
}
static void
psppire_dialog_action_runs_class_init (PsppireDialogActionRunsClass *class)
{
}
static void
psppire_dialog_action_runs_class_init (PsppireDialogActionRunsClass *class)
{
-
psppire_dialog_action_set_activation (class, psppire_dialog_action_runs_activate)
;
+
PSPPIRE_DIALOG_ACTION_CLASS (class)->initial_activate = psppire_dialog_action_runs_activate
;
PSPPIRE_DIALOG_ACTION_CLASS (class)->generate_syntax = generate_syntax;
}
PSPPIRE_DIALOG_ACTION_CLASS (class)->generate_syntax = generate_syntax;
}