#include <config.h>
#include "psppire-var-sheet.h"
+#include <ui/gui/sheet/psppire-axis-impl.h>
#include <glade/glade.h>
#include "helper.h"
-#include <gtksheet/gsheet-hetero-column.h>
+
#include "customentry.h"
#include <data/variable.h>
#include "psppire-var-store.h"
(GInstanceInitFunc) psppire_var_sheet_init,
};
- vs_type = g_type_register_static (GTK_TYPE_SHEET, "PsppireVarSheet",
+ vs_type = g_type_register_static (PSPPIRE_TYPE_SHEET, "PsppireVarSheet",
&vs_info, 0);
}
gint width ;
};
-static const struct column_parameters column_def[] = {
- { N_("Name"), 80},
- { N_("Type"), 100},
- { N_("Width"), 57},
- { N_("Decimals"),91},
- { N_("Label"), 95},
- { N_("Values"), 103},
- { N_("Missing"), 95},
- { N_("Columns"), 80},
- { N_("Align"), 69},
- { N_("Measure"), 99},
-};
-
-
#define n_ALIGNMENTS 3
const gchar *const alignments[n_ALIGNMENTS + 1]={
/* Moves the focus to a new cell.
Returns TRUE iff the move should be disallowed */
static gboolean
-traverse_cell_callback (GtkSheet *sheet,
- gint row, gint column,
- gint *new_row, gint *new_column)
+traverse_cell_callback (PsppireSheet *sheet,
+ const PsppireSheetCell *existing_cell,
+ PsppireSheetCell *new_cell)
{
PsppireVarSheet *var_sheet = PSPPIRE_VAR_SHEET (sheet);
- PsppireVarStore *var_store = PSPPIRE_VAR_STORE (gtk_sheet_get_model (sheet));
+ PsppireVarStore *var_store = PSPPIRE_VAR_STORE (psppire_sheet_get_model (sheet));
gint n_vars = psppire_var_store_get_var_cnt (var_store);
- if (*new_row >= n_vars && !var_sheet->may_create_vars)
+ if (new_cell->row >= n_vars && !var_sheet->may_create_vars)
return TRUE;
-
- if ( row == n_vars && *new_row >= n_vars)
+ if ( existing_cell->row == n_vars && new_cell->row >= n_vars)
{
- GtkEntry *entry = GTK_ENTRY (gtk_sheet_get_entry (sheet));
+ GtkEntry *entry = psppire_sheet_get_entry (sheet);
const gchar *name = gtk_entry_get_text (entry);
if (! psppire_dict_check_name (var_store->dict, name, TRUE))
return TRUE;
- psppire_dict_insert_variable (var_store->dict, row, name);
+ psppire_dict_insert_variable (var_store->dict, existing_cell->row, name);
return FALSE;
}
/* If the destination cell is outside the current variables, then
automatically create variables for the new rows.
*/
- if ( ((*new_row > n_vars) ||
- (*new_row == n_vars && *new_column != PSPPIRE_VAR_STORE_COL_NAME)) )
+ if ( ((new_cell->row > n_vars) ||
+ (new_cell->row == n_vars &&
+ new_cell->col != PSPPIRE_VAR_STORE_COL_NAME)) )
{
gint i;
- for ( i = n_vars ; i <= *new_row; ++i )
+ for ( i = n_vars ; i <= new_cell->row; ++i )
psppire_dict_insert_variable (var_store->dict, i, NULL);
}
-
-
return FALSE;
}
gint oldrow, gint oldcolumn,
gpointer data)
{
- GtkSheetCellAttr attributes;
+ PsppireSheetCellAttr attributes;
PsppireVarStore *var_store;
PsppireVarSheetClass *vs_class =
PSPPIRE_VAR_SHEET_CLASS(G_OBJECT_GET_CLASS (vs));
struct variable *var ;
- GtkSheet *sheet = GTK_SHEET (vs);
+ PsppireSheet *sheet = PSPPIRE_SHEET (vs);
g_return_if_fail (sheet != NULL);
- var_store = PSPPIRE_VAR_STORE (gtk_sheet_get_model (sheet));
+ var_store = PSPPIRE_VAR_STORE (psppire_sheet_get_model (sheet));
g_assert (var_store);
g_return_if_fail (oldcolumn == PSPPIRE_VAR_STORE_COL_NAME ||
row < psppire_var_store_get_var_cnt (var_store));
- gtk_sheet_get_attributes (sheet, row, column, &attributes);
+ psppire_sheet_get_attributes (sheet, row, column, &attributes);
var = psppire_var_store_get_var (var_store, row);
{
case PSPPIRE_VAR_STORE_COL_ALIGN:
{
+ GtkEntry *entry;
static GtkListStore *list_store = NULL;
GtkComboBoxEntry *cbe;
- gtk_sheet_change_entry (sheet, GTK_TYPE_COMBO_BOX_ENTRY);
- cbe =
- GTK_COMBO_BOX_ENTRY (gtk_sheet_get_entry (sheet)->parent);
-
+ psppire_sheet_change_entry (sheet, GTK_TYPE_COMBO_BOX_ENTRY);
+ entry = psppire_sheet_get_entry (sheet);
+ cbe = GTK_COMBO_BOX_ENTRY (GTK_WIDGET (entry)->parent);
if ( ! list_store) list_store = create_label_list (alignments);
case PSPPIRE_VAR_STORE_COL_MEASURE:
{
+ GtkEntry *entry;
GtkComboBoxEntry *cbe;
- gtk_sheet_change_entry (sheet, GTK_TYPE_COMBO_BOX_ENTRY);
- cbe =
- GTK_COMBO_BOX_ENTRY (gtk_sheet_get_entry (sheet)->parent);
-
-
+ psppire_sheet_change_entry (sheet, GTK_TYPE_COMBO_BOX_ENTRY);
+ entry = psppire_sheet_get_entry (sheet);
+ cbe = GTK_COMBO_BOX_ENTRY (GTK_WIDGET (entry)->parent);
gtk_combo_box_set_model (GTK_COMBO_BOX (cbe),
GTK_TREE_MODEL (vs_class->measure_list));
{
PsppireCustomEntry *customEntry;
- gtk_sheet_change_entry (sheet, PSPPIRE_CUSTOM_ENTRY_TYPE);
+ psppire_sheet_change_entry (sheet, PSPPIRE_CUSTOM_ENTRY_TYPE);
customEntry =
- PSPPIRE_CUSTOM_ENTRY (gtk_sheet_get_entry (sheet));
+ PSPPIRE_CUSTOM_ENTRY (psppire_sheet_get_entry (sheet));
if ( var_is_long_string (var))
g_object_set (customEntry,
{
PsppireCustomEntry *customEntry;
- gtk_sheet_change_entry (sheet, PSPPIRE_CUSTOM_ENTRY_TYPE);
+ psppire_sheet_change_entry (sheet, PSPPIRE_CUSTOM_ENTRY_TYPE);
customEntry =
- PSPPIRE_CUSTOM_ENTRY (gtk_sheet_get_entry (sheet));
+ PSPPIRE_CUSTOM_ENTRY (psppire_sheet_get_entry (sheet));
if ( var_is_long_string (var))
g_object_set (customEntry,
{
PsppireCustomEntry *customEntry;
- gtk_sheet_change_entry (sheet, PSPPIRE_CUSTOM_ENTRY_TYPE);
+ psppire_sheet_change_entry (sheet, PSPPIRE_CUSTOM_ENTRY_TYPE);
customEntry =
- PSPPIRE_CUSTOM_ENTRY (gtk_sheet_get_entry (sheet));
+ PSPPIRE_CUSTOM_ENTRY (psppire_sheet_get_entry (sheet));
/* Popup the Variable Type dialog box */
{
gint r_min, r_max;
- const gchar *s = gtk_sheet_cell_get_text (sheet, row, column);
+ const gchar *s = psppire_sheet_cell_get_text (sheet, row, column);
if (s)
{
1.0, 1.0, 1.0 /* steps */
);
- gtk_sheet_change_entry (sheet, GTK_TYPE_SPIN_BUTTON);
+ psppire_sheet_change_entry (sheet, GTK_TYPE_SPIN_BUTTON);
spinButton =
- GTK_SPIN_BUTTON (gtk_sheet_get_entry (sheet));
+ GTK_SPIN_BUTTON (psppire_sheet_get_entry (sheet));
gtk_spin_button_set_adjustment (spinButton, GTK_ADJUSTMENT (adj));
gtk_spin_button_set_digits (spinButton, 0);
break;
default:
- gtk_sheet_change_entry (sheet, GTK_TYPE_ENTRY);
+ psppire_sheet_change_entry (sheet, GTK_TYPE_ENTRY);
break;
}
}
-
-
static void
psppire_var_sheet_init (PsppireVarSheet *vs)
{
- gint i;
- GObject *geo = g_sheet_hetero_column_new (75, PSPPIRE_VAR_STORE_n_COLS);
GladeXML *xml = XML_NEW ("data-editor.glade");
vs->val_labs_dialog = val_labs_dialog_create (xml);
vs->dispose_has_run = FALSE;
vs->may_create_vars = TRUE;
- for (i = 0 ; i < PSPPIRE_VAR_STORE_n_COLS ; ++i )
- {
- g_sheet_hetero_column_set_button_label (G_SHEET_HETERO_COLUMN (geo), i,
- gettext (column_def[i].label));
-
- g_sheet_hetero_column_set_width (G_SHEET_HETERO_COLUMN (geo), i,
- column_def[i].width);
- }
-
- g_object_set (vs, "column-geometry", geo, NULL);
-
g_signal_connect (vs, "activate",
G_CALLBACK (var_sheet_change_active_cell),
NULL);
}
+static const struct column_parameters column_def[] = {
+ { N_("Name"), 80},
+ { N_("Type"), 100},
+ { N_("Width"), 57},
+ { N_("Decimals"),91},
+ { N_("Label"), 95},
+ { N_("Values"), 103},
+ { N_("Missing"), 95},
+ { N_("Columns"), 80},
+ { N_("Align"), 69},
+ { N_("Measure"), 99},
+};
+
GtkWidget*
psppire_var_sheet_new (void)
{
- return GTK_WIDGET (g_object_new (psppire_var_sheet_get_type (), NULL));
+ gint i;
+ PsppireAxisImpl *ha = psppire_axis_impl_new ();
+ PsppireAxisImpl *va = psppire_axis_impl_new ();
+
+ GtkWidget *w = g_object_new (psppire_var_sheet_get_type (), NULL);
+
+ for (i = 0 ; i < 10 ; ++i)
+ psppire_axis_impl_append (ha, column_def[i].width);
+
+ g_object_set (va,
+ "default-size", 25,
+ NULL);
+
+ g_object_set (ha, "minimum-extent", 0,
+ NULL);
+
+ g_object_set (w,
+ "horizontal-axis", ha,
+ "vertical-axis", va,
+ NULL);
+
+ return w;
}
projects / pspp-builds.git / blobdiff