projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
DATASET: Improve error messages and coding style.
[pspp]
/
src
/
ui
/
gui
/
psppire-dialog-action-roc.c
diff --git
a/src/ui/gui/psppire-dialog-action-roc.c
b/src/ui/gui/psppire-dialog-action-roc.c
index 578ef747771b59fb2ee097552ad7c16de7b9936a..23c6cae24ce1bab8eed7c38391a7837809c128ef 100644
(file)
--- a/
src/ui/gui/psppire-dialog-action-roc.c
+++ b/
src/ui/gui/psppire-dialog-action-roc.c
@@
-55,17
+55,17
@@
dialog_state_valid (gpointer data)
var = psppire_dict_lookup_var (PSPPIRE_DIALOG_ACTION (rd)->dict, var_name);
var = psppire_dict_lookup_var (PSPPIRE_DIALOG_ACTION (rd)->dict, var_name);
- if (
var == NULL)
+ if (var == NULL)
return FALSE;
width = var_get_width (var);
value_init (&val, width);
result = psppire_value_entry_get_value (PSPPIRE_VALUE_ENTRY (rd->state_value), &val, width);
return FALSE;
width = var_get_width (var);
value_init (&val, width);
result = psppire_value_entry_get_value (PSPPIRE_VALUE_ENTRY (rd->state_value), &val, width);
-
- if (var_is_value_missing (var, &val
, MV_SYSTEM)
)
+
+ if (var_is_value_missing (var, &val
) == MV_SYSTEM
)
result = FALSE;
result = FALSE;
-
+
value_destroy (&val, width);
return result;
value_destroy (&val, width);
return result;
@@
-74,13
+74,13
@@
dialog_state_valid (gpointer data)
static void
on_curve_button_toggle (GtkCheckButton *curve, PsppireDialogActionRoc *rd)
{
static void
on_curve_button_toggle (GtkCheckButton *curve, PsppireDialogActionRoc *rd)
{
- if (
!gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (curve)))
+ if (!gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (curve)))
{
{
- if (
gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (rd->reference)))
+ if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (rd->reference)))
g_object_set (rd->reference, "inconsistent", TRUE, NULL);
g_object_set (rd->reference, "sensitive", FALSE, NULL);
}
g_object_set (rd->reference, "inconsistent", TRUE, NULL);
g_object_set (rd->reference, "sensitive", FALSE, NULL);
}
- else
+ else
{
g_object_set (rd->reference, "inconsistent", FALSE, NULL);
g_object_set (rd->reference, "sensitive", TRUE, NULL);
{
g_object_set (rd->reference, "inconsistent", FALSE, NULL);
g_object_set (rd->reference, "sensitive", TRUE, NULL);
@@
-105,7
+105,7
@@
refresh (PsppireDialogAction *rd_)
}
static void
}
static void
-on_state_var_changed (
Gtk
Action *a)
+on_state_var_changed (
PsppireDialog
Action *a)
{
PsppireDialogActionRoc *act = PSPPIRE_DIALOG_ACTION_ROC (a);
{
PsppireDialogActionRoc *act = PSPPIRE_DIALOG_ACTION_ROC (a);
@@
-114,19
+114,20
@@
on_state_var_changed (GtkAction *a)
const struct variable *var =
psppire_dict_lookup_var (PSPPIRE_DIALOG_ACTION(act)->dict, var_name);
const struct variable *var =
psppire_dict_lookup_var (PSPPIRE_DIALOG_ACTION(act)->dict, var_name);
- if (
var == NULL)
+ if (var == NULL)
return;
psppire_value_entry_set_variable (PSPPIRE_VALUE_ENTRY (act->state_value), var);
}
return;
psppire_value_entry_set_variable (PSPPIRE_VALUE_ENTRY (act->state_value), var);
}
-static
void
-psppire_dialog_action_roc_activate (
GtkAction *a
)
+static
GtkBuilder *
+psppire_dialog_action_roc_activate (
PsppireDialogAction *a, GVariant *param
)
{
PsppireDialogActionRoc *act = PSPPIRE_DIALOG_ACTION_ROC (a);
PsppireDialogAction *pda = PSPPIRE_DIALOG_ACTION (a);
GtkBuilder *xml = builder_new ("roc.ui");
{
PsppireDialogActionRoc *act = PSPPIRE_DIALOG_ACTION_ROC (a);
PsppireDialogAction *pda = PSPPIRE_DIALOG_ACTION (a);
GtkBuilder *xml = builder_new ("roc.ui");
+
pda->dialog = get_widget_assert (xml, "roc-dialog");
pda->source = get_widget_assert (xml, "dict-view");
pda->dialog = get_widget_assert (xml, "roc-dialog");
pda->source = get_widget_assert (xml, "dict-view");
@@
-142,8
+143,6
@@
psppire_dialog_action_roc_activate (GtkAction *a)
g_signal_connect_swapped (act->state_variable, "changed",
G_CALLBACK (on_state_var_changed), act);
g_signal_connect_swapped (act->state_variable, "changed",
G_CALLBACK (on_state_var_changed), act);
- g_object_unref (xml);
-
g_signal_connect (act->curve, "toggled",
G_CALLBACK (on_curve_button_toggle), act);
g_signal_connect (act->curve, "toggled",
G_CALLBACK (on_curve_button_toggle), act);
@@
-151,15
+150,13
@@
psppire_dialog_action_roc_activate (GtkAction *a)
psppire_dialog_action_set_valid_predicate (pda,
dialog_state_valid);
psppire_dialog_action_set_valid_predicate (pda,
dialog_state_valid);
-
- if (PSPPIRE_DIALOG_ACTION_CLASS (psppire_dialog_action_roc_parent_class)->activate)
- PSPPIRE_DIALOG_ACTION_CLASS (psppire_dialog_action_roc_parent_class)->activate (pda);
+ return xml;
}
static char *
}
static char *
-generate_syntax (PsppireDialogAction *a)
+generate_syntax (
const
PsppireDialogAction *a)
{
PsppireDialogActionRoc *rd = PSPPIRE_DIALOG_ACTION_ROC (a);
gchar *text;
{
PsppireDialogActionRoc *rd = PSPPIRE_DIALOG_ACTION_ROC (a);
gchar *text;
@@
-188,10
+185,10
@@
generate_syntax (PsppireDialogAction *a)
{
struct string str;
ds_init_empty (&str);
{
struct string str;
ds_init_empty (&str);
-
+
syntax_gen_value (&str, &val, var_get_width (var),
var_get_print_format (var));
syntax_gen_value (&str, &val, var_get_width (var),
var_get_print_format (var));
-
+
g_string_append (string, ds_cstr (&str));
ds_destroy (&str);
}
g_string_append (string, ds_cstr (&str));
ds_destroy (&str);
}
@@
-203,10
+200,10
@@
generate_syntax (PsppireDialogAction *a)
/* The /PLOT subcommand */
g_string_append (string, "\n\t/PLOT ");
/* The /PLOT subcommand */
g_string_append (string, "\n\t/PLOT ");
- if (
gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (rd->curve)))
+ if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (rd->curve)))
{
g_string_append (string, "CURVE");
{
g_string_append (string, "CURVE");
- if (
gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (rd->reference)))
+ if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (rd->reference)))
g_string_append (string, " (REFERENCE)");
}
else
g_string_append (string, " (REFERENCE)");
}
else
@@
-214,15
+211,15
@@
generate_syntax (PsppireDialogAction *a)
/* The /PRINT subcommand */
/* The /PRINT subcommand */
- if (
gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (rd->standard_error)) ||
- gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (rd->coordinates))
)
+ if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (rd->standard_error)) ||
+ gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (rd->coordinates)))
{
g_string_append (string, "\n\t/PRINT");
{
g_string_append (string, "\n\t/PRINT");
- if (
gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (rd->standard_error)))
+ if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (rd->standard_error)))
g_string_append (string, " SE");
g_string_append (string, " SE");
- if (
gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (rd->coordinates)))
+ if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (rd->coordinates)))
g_string_append (string, " COORDINATES");
}
g_string_append (string, " COORDINATES");
}
@@
-238,7
+235,7
@@
generate_syntax (PsppireDialogAction *a)
static void
psppire_dialog_action_roc_class_init (PsppireDialogActionRocClass *class)
{
static void
psppire_dialog_action_roc_class_init (PsppireDialogActionRocClass *class)
{
-
psppire_dialog_action_set_activation (class, psppire_dialog_action_roc_activate)
;
+
PSPPIRE_DIALOG_ACTION_CLASS (class)->initial_activate = psppire_dialog_action_roc_activate
;
PSPPIRE_DIALOG_ACTION_CLASS (class)->generate_syntax = generate_syntax;
}
PSPPIRE_DIALOG_ACTION_CLASS (class)->generate_syntax = generate_syntax;
}