GtkTreeIter notused;
- return (gtk_tree_model_get_iter_first (row_vars, ¬used)
+ return (gtk_tree_model_get_iter_first (row_vars, ¬used)
&& gtk_tree_model_get_iter_first (col_vars, ¬used));
}
GtkTreeModel *liststore = gtk_tree_view_get_model (GTK_TREE_VIEW (cd->dest_rows));
gtk_list_store_clear (GTK_LIST_STORE (liststore));
-
+
liststore = gtk_tree_view_get_model (GTK_TREE_VIEW (cd->dest_cols));
gtk_list_store_clear (GTK_LIST_STORE (liststore));
}
cd->format_options_table =
gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (cd->table_button));
- cd->format_options_pivot =
+ cd->format_options_pivot =
gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (cd->pivot_button));
}
}
}
-static void
-psppire_dialog_action_crosstabs_activate (GtkAction *a)
+static GtkBuilder *
+psppire_dialog_action_crosstabs_activate (PsppireDialogAction *a, GVariant *param)
{
PsppireDialogActionCrosstabs *act = PSPPIRE_DIALOG_ACTION_CROSSTABS (a);
PsppireDialogAction *pda = PSPPIRE_DIALOG_ACTION (a);
- GtkBuilder *xml = builder_new ("crosstabs.ui");
+ GtkBuilder *xml = builder_new ( "crosstabs.ui");
pda->dialog = get_widget_assert (xml, "crosstabs-dialog");
pda->source = get_widget_assert (xml, "dict-treeview");
act->table_button = get_widget_assert (xml, "print-tables");
act->pivot_button = get_widget_assert (xml, "pivot");
-
- g_object_unref (xml);
-
act->format_options_avalue = TRUE;
act->format_options_table = TRUE;
act->format_options_pivot = TRUE;
psppire_checkbox_treeview_populate (PSPPIRE_CHECKBOX_TREEVIEW (act->cell_view),
- B_CS_CELL_DEFAULT,
- N_CROSSTABS_CELLS,
- cells);
+ B_CS_CELL_DEFAULT,
+ N_CROSSTABS_CELLS,
+ cells);
act->cell = gtk_tree_view_get_model (GTK_TREE_VIEW (act->cell_view));
psppire_checkbox_treeview_populate (PSPPIRE_CHECKBOX_TREEVIEW (act->stat_view),
- B_CS_STATS_DEFAULT,
- N_CROSSTABS_STATS,
- stats);
+ B_CS_STATS_DEFAULT,
+ N_CROSSTABS_STATS,
+ stats);
act->stat = gtk_tree_view_get_model (GTK_TREE_VIEW (act->stat_view));
psppire_dialog_action_set_refresh (pda, refresh);
psppire_dialog_action_set_valid_predicate (pda,
- dialog_state_valid);
+ dialog_state_valid);
g_signal_connect_swapped (act->cell_button, "clicked",
G_CALLBACK (on_cell_clicked), act);
g_signal_connect_swapped (act->format_button, "clicked",
G_CALLBACK (on_format_clicked), act);
-
- if (PSPPIRE_DIALOG_ACTION_CLASS (psppire_dialog_action_crosstabs_parent_class)->activate)
- PSPPIRE_DIALOG_ACTION_CLASS (psppire_dialog_action_crosstabs_parent_class)->activate (pda);
+ return xml;
}
static char *
-generate_syntax (PsppireDialogAction *a)
+generate_syntax (const PsppireDialogAction *a)
{
PsppireDialogActionCrosstabs *cd = PSPPIRE_DIALOG_ACTION_CROSSTABS (a);
gchar *text = NULL;
if (cd->format_options_avalue)
g_string_append (string, "AVALUE");
- else
+ else
g_string_append (string, "DVALUE");
g_string_append (string, " ");
if (cd->format_options_pivot)
g_string_append (string, "PIVOT");
- else
+ else
g_string_append (string, "NOPIVOT");
selected = 0;
- for (i = 0, ok = gtk_tree_model_get_iter_first (cd->stat, &iter); ok;
+ for (i = 0, ok = gtk_tree_model_get_iter_first (cd->stat, &iter); ok;
i++, ok = gtk_tree_model_iter_next (cd->stat, &iter))
{
gboolean toggled;
gtk_tree_model_get (cd->stat, &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 = 0;
- for (i = 0, ok = gtk_tree_model_get_iter_first (cd->cell, &iter); ok;
+ for (i = 0, ok = gtk_tree_model_get_iter_first (cd->cell, &iter); ok;
i++, ok = gtk_tree_model_iter_next (cd->cell, &iter))
{
gboolean toggled;
gtk_tree_model_get (cd->cell, &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);
}
static void
psppire_dialog_action_crosstabs_class_init (PsppireDialogActionCrosstabsClass *class)
{
- GtkActionClass *action_class = GTK_ACTION_CLASS (class);
-
- action_class->activate = psppire_dialog_action_crosstabs_activate;
-
+ PSPPIRE_DIALOG_ACTION_CLASS (class)->initial_activate = psppire_dialog_action_crosstabs_activate;
PSPPIRE_DIALOG_ACTION_CLASS (class)->generate_syntax = generate_syntax;
}
psppire_dialog_action_crosstabs_init (PsppireDialogActionCrosstabs *act)
{
}
-