projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Make the default view the variable view instead of the data view
[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 8649fbbe6dd3c070aeefa3d2702daac8094a17a3..40afd8e7623ebec984c96bdceeae4fe233cd17d8 100644
(file)
--- a/
src/ui/gui/psppire-dialog-action-runs.c
+++ b/
src/ui/gui/psppire-dialog-action-runs.c
@@
-51,7
+51,7
@@
append_fragment (GString *string, const gchar *cut, PsppireVarView *vv)
}
static char *
}
static char *
-generate_syntax (PsppireDialogAction *act)
+generate_syntax (
const
PsppireDialogAction *act)
{
PsppireDialogActionRuns *rd = PSPPIRE_DIALOG_ACTION_RUNS (act);
gchar *text;
{
PsppireDialogActionRuns *rd = PSPPIRE_DIALOG_ACTION_RUNS (act);
gchar *text;
@@
-127,13
+127,14
@@
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 (
GtkAction *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);
- GtkBuilder *xml = builder_new ("runs.ui");
+ 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");
@@
-144,20
+145,15
@@
psppire_dialog_action_runs_activate (GtkAction *a)
act->cb[CB_CUSTOM] = get_widget_assert (xml, "checkbutton3");
act->variables = get_widget_assert (xml, "psppire-var-view1");
act->cb[CB_CUSTOM] = get_widget_assert (xml, "checkbutton3");
act->variables = get_widget_assert (xml, "psppire-var-view1");
-
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_unref (xml);
-
- if (PSPPIRE_DIALOG_ACTION_CLASS (psppire_dialog_action_runs_parent_class)->activate)
- PSPPIRE_DIALOG_ACTION_CLASS (psppire_dialog_action_runs_parent_class)->activate (pda);
+ 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;
}