projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Disable drag and drop on sheet axes for which there is no connected signal
[pspp]
/
src
/
ui
/
gui
/
psppire-dialog-action-regression.c
diff --git
a/src/ui/gui/psppire-dialog-action-regression.c
b/src/ui/gui/psppire-dialog-action-regression.c
index 7a09132093505321fcf1819f24132ffdc0a04096..b475ebb0dfb6a9b5be6a855ee43cefaf3ea0eef3 100644
(file)
--- a/
src/ui/gui/psppire-dialog-action-regression.c
+++ b/
src/ui/gui/psppire-dialog-action-regression.c
@@
-141,13
+141,14
@@
on_save_clicked (PsppireDialogActionRegression *rd)
}
}
-static
void
-psppire_dialog_action_regression_activate (
GtkAction *a
)
+static
GtkBuilder *
+psppire_dialog_action_regression_activate (
PsppireDialogAction *a, GVariant *param
)
{
PsppireDialogActionRegression *act = PSPPIRE_DIALOG_ACTION_REGRESSION (a);
PsppireDialogAction *pda = PSPPIRE_DIALOG_ACTION (a);
{
PsppireDialogActionRegression *act = PSPPIRE_DIALOG_ACTION_REGRESSION (a);
PsppireDialogAction *pda = PSPPIRE_DIALOG_ACTION (a);
- GtkBuilder *xml = builder_new ("regression.ui");
+ GtkBuilder *xml = builder_new ( "regression.ui");
+
GtkWidget *stat_button = get_widget_assert (xml, "stat-button");
GtkWidget *save_button = get_widget_assert (xml, "save-button");
GtkWidget *stat_button = get_widget_assert (xml, "stat-button");
GtkWidget *save_button = get_widget_assert (xml, "save-button");
@@
-162,8
+163,6
@@
psppire_dialog_action_regression_activate (GtkAction *a)
act->pred_button = get_widget_assert (xml, "pred-button");
act->resid_button = get_widget_assert (xml, "resid-button");
act->pred_button = get_widget_assert (xml, "pred-button");
act->resid_button = get_widget_assert (xml, "resid-button");
- g_object_unref (xml);
-
psppire_checkbox_treeview_populate (PSPPIRE_CHECKBOX_TREEVIEW (act->stat_view),
B_RG_STATS_DEFAULT,
N_REGRESSION_STATS,
psppire_checkbox_treeview_populate (PSPPIRE_CHECKBOX_TREEVIEW (act->stat_view),
B_RG_STATS_DEFAULT,
N_REGRESSION_STATS,
@@
-180,15
+179,13
@@
psppire_dialog_action_regression_activate (GtkAction *a)
g_signal_connect_swapped (save_button, "clicked",
G_CALLBACK (on_save_clicked), act);
g_signal_connect_swapped (save_button, "clicked",
G_CALLBACK (on_save_clicked), act);
-
- if (PSPPIRE_DIALOG_ACTION_CLASS (psppire_dialog_action_regression_parent_class)->activate)
- PSPPIRE_DIALOG_ACTION_CLASS (psppire_dialog_action_regression_parent_class)->activate (pda);
+ return xml;
}
static char *
}
static char *
-generate_syntax (PsppireDialogAction *a)
+generate_syntax (
const
PsppireDialogAction *a)
{
PsppireDialogActionRegression *rd = PSPPIRE_DIALOG_ACTION_REGRESSION (a);
gchar *text = NULL;
{
PsppireDialogActionRegression *rd = PSPPIRE_DIALOG_ACTION_REGRESSION (a);
gchar *text = NULL;
@@
-205,19
+202,20
@@
generate_syntax (PsppireDialogAction *a)
g_string_append (string, "\n\t/VARIABLES=");
psppire_var_view_append_names (PSPPIRE_VAR_VIEW (rd->indep_vars), 0, string);
g_string_append (string, "\n\t/VARIABLES=");
psppire_var_view_append_names (PSPPIRE_VAR_VIEW (rd->indep_vars), 0, string);
- g_string_append (string, "\n\t/DEPENDENT=
\t
");
+ g_string_append (string, "\n\t/DEPENDENT=");
psppire_var_view_append_names (PSPPIRE_VAR_VIEW (rd->dep_vars), 0, string);
psppire_var_view_append_names (PSPPIRE_VAR_VIEW (rd->dep_vars), 0, string);
+ g_string_append (string, "\n\t/METHOD=ENTER");
selected = 0;
selected = 0;
- for (i = 0, ok = gtk_tree_model_get_iter_first (model, &iter); ok;
+ for (i = 0, ok = gtk_tree_model_get_iter_first (model, &iter); ok;
i++, ok = gtk_tree_model_iter_next (model, &iter))
{
gboolean toggled;
gtk_tree_model_get (model, &iter,
i++, ok = gtk_tree_model_iter_next (model, &iter))
{
gboolean toggled;
gtk_tree_model_get (model, &iter,
- CHECKBOX_COLUMN_SELECTED, &toggled, -1);
- if (toggled)
- selected |= 1u << i;
- else
+ CHECKBOX_COLUMN_SELECTED, &toggled, -1);
+ if (toggled)
+ selected |= 1u << i;
+ else
selected &= ~(1u << i);
}
selected &= ~(1u << i);
}
@@
-255,9
+253,7
@@
generate_syntax (PsppireDialogAction *a)
static void
psppire_dialog_action_regression_class_init (PsppireDialogActionRegressionClass *class)
{
static void
psppire_dialog_action_regression_class_init (PsppireDialogActionRegressionClass *class)
{
- GtkActionClass *action_class = GTK_ACTION_CLASS (class);
-
- action_class->activate = psppire_dialog_action_regression_activate;
+ PSPPIRE_DIALOG_ACTION_CLASS (class)->initial_activate = psppire_dialog_action_regression_activate;
PSPPIRE_DIALOG_ACTION_CLASS (class)->generate_syntax = generate_syntax;
}
PSPPIRE_DIALOG_ACTION_CLASS (class)->generate_syntax = generate_syntax;
}