G_DEFINE_TYPE (PsppireDialogActionSort, psppire_dialog_action_sort, PSPPIRE_TYPE_DIALOG_ACTION);
static char *
-generate_syntax (PsppireDialogAction *act)
+generate_syntax (const PsppireDialogAction *act)
{
PsppireDialogActionSort *scd = PSPPIRE_DIALOG_ACTION_SORT (act);
gchar *text;
PsppireVarView *var_view = PSPPIRE_VAR_VIEW (scd->variables);
gint n_vars = psppire_var_view_append_names (var_view, 0, string);
- if ( n_vars == 0 )
+ if (n_vars == 0)
{
g_string_assign (string, "");
}
gint n_rows = gtk_tree_model_iter_n_children (model, NULL);
- if ( n_rows == 0 )
+ if (n_rows == 0)
return FALSE;
return TRUE;
}
-static void
-psppire_dialog_action_sort_activate (GtkAction *a)
+static GtkBuilder *
+psppire_dialog_action_sort_activate (PsppireDialogAction *a, GVariant *param)
{
PsppireDialogAction *pda = PSPPIRE_DIALOG_ACTION (a);
PsppireDialogActionSort *act = PSPPIRE_DIALOG_ACTION_SORT (a);
GtkBuilder *xml = builder_new ("sort.ui");
- pda->dialog = get_widget_assert (xml, "sort-cases-dialog");
- pda->source = get_widget_assert (xml, "sort-cases-treeview1");
-
- act->variables = get_widget_assert (xml, "sort-cases-treeview2");
+
+ pda->dialog = get_widget_assert (xml, "sort-cases-dialog");
+ pda->source = get_widget_assert (xml, "sort-cases-treeview1");
+
+ act->variables = get_widget_assert (xml, "sort-cases-treeview2");
act->ascending = get_widget_assert (xml, "sort-cases-radiobutton0");
psppire_dialog_action_set_refresh (pda, reset);
psppire_dialog_action_set_valid_predicate (pda,
dialog_state_valid);
-
- if (PSPPIRE_DIALOG_ACTION_CLASS (psppire_dialog_action_sort_parent_class)->activate)
- PSPPIRE_DIALOG_ACTION_CLASS (psppire_dialog_action_sort_parent_class)->activate (pda);
-
- g_object_unref (xml);
+ return xml;
}
static void
psppire_dialog_action_sort_class_init (PsppireDialogActionSortClass *class)
{
PsppireDialogActionClass *pdac = PSPPIRE_DIALOG_ACTION_CLASS (class);
- psppire_dialog_action_set_activation (class, psppire_dialog_action_sort_activate);
+ PSPPIRE_DIALOG_ACTION_CLASS (class)->initial_activate = psppire_dialog_action_sort_activate;
- pdac->generate_syntax = generate_syntax;
+ pdac->generate_syntax = generate_syntax;
}