case VS_ROLE:
if (!strcmp (new_text, var_role_to_string (ROLE_INPUT)))
var_set_role (var, ROLE_INPUT);
- else if (!strcmp (new_text, var_role_to_string (ROLE_OUTPUT)))
- var_set_role (var, ROLE_OUTPUT);
+ else if (!strcmp (new_text, var_role_to_string (ROLE_TARGET)))
+ var_set_role (var, ROLE_TARGET);
else if (!strcmp (new_text, var_role_to_string (ROLE_BOTH)))
var_set_role (var, ROLE_BOTH);
else if (!strcmp (new_text, var_role_to_string (ROLE_NONE)))
{
switch (alignment)
{
- case ALIGN_LEFT:
- return GTK_STOCK_JUSTIFY_LEFT;
-
- case ALIGN_CENTRE:
- return GTK_STOCK_JUSTIFY_CENTER;
-
- case ALIGN_RIGHT:
- return GTK_STOCK_JUSTIFY_RIGHT;
+ case ALIGN_LEFT: return "align-left";
+ case ALIGN_CENTRE: return "align-center";
+ case ALIGN_RIGHT: return "align-right";
+ default:
+ g_return_val_if_reached ("");
+ }
+}
+const char *
+get_var_role_stock_id (enum var_role role)
+{
+ switch (role)
+ {
+ case ROLE_INPUT: return "role-input";
+ case ROLE_TARGET: return "role-target";
+ case ROLE_BOTH: return "role-both";
+ case ROLE_NONE: return "role-none";
+ case ROLE_PARTITION: return "role-partition";
+ case ROLE_SPLIT: return "role-split";
default:
g_return_val_if_reached ("");
}
case VS_MISSING:
{
- char *text = missing_values_to_string (var_sheet->dict, var, NULL);
+ char *text = missing_values_to_string (var, NULL);
g_object_set (cell,
"text", text,
"editable", FALSE,
break;
case VS_ROLE:
- g_object_set (cell,
- "text", var_role_to_string (var_get_role (var)),
- "editable", TRUE,
- NULL);
+ if (GTK_IS_CELL_RENDERER_TEXT (cell))
+ g_object_set (cell,
+ "text", var_role_to_string (var_get_role (var)),
+ "editable", TRUE,
+ NULL);
+ else
+ g_object_set (cell, "stock-id",
+ get_var_role_stock_id (var_get_role (var)), NULL);
break;
}
}
return get_var_align_stock_id (alignment);
}
+static const char *
+role_to_stock_id (enum fmt_type type, int role)
+{
+ return get_var_role_stock_id (role);
+}
+
static void
-render_measure (GtkCellLayout *cell_layout,
- GtkCellRenderer *cell,
- GtkTreeModel *tree_model,
- GtkTreeIter *iter,
- gpointer data)
+render_var_pixbuf (GtkCellLayout *cell_layout,
+ GtkCellRenderer *cell,
+ GtkTreeModel *tree_model,
+ GtkTreeIter *iter,
+ gpointer data)
{
const char *(*value_to_stock_id) (enum fmt_type, int value);
enum fmt_type type = GPOINTER_TO_INT (data);
"value-to-stock-id", value_to_stock_id);
gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (editable), cell, FALSE);
gtk_cell_layout_set_cell_data_func (GTK_CELL_LAYOUT (editable), cell,
- render_measure,
+ render_var_pixbuf,
GINT_TO_POINTER (format->type),
NULL);
}
}
-static PsppSheetViewColumn *
+static void
add_combo_column (PsppireVarSheet *var_sheet, enum vs_column column_id,
const char *title, int width,
const char *(*value_to_stock_id) (enum fmt_type, int value),
...)
{
+ PsppSheetViewColumn *column;
GtkCellRenderer *cell;
GtkListStore *store;
const char *name;
var_sheet);
}
- return add_var_sheet_column (var_sheet, cell, column_id, title, width);
+ column = add_var_sheet_column (var_sheet, cell, column_id, title, width);
+
+ cell = gtk_cell_renderer_pixbuf_new ();
+ g_object_set (cell, "width", 16, "height", 16, NULL);
+ pspp_sheet_view_column_pack_end (column, cell, FALSE);
+ pspp_sheet_view_column_set_cell_data_func (
+ column, cell, render_var_cell, var_sheet, NULL);
}
static void
{
PsppSheetView *sheet_view = PSPP_SHEET_VIEW (obj);
PsppSheetViewColumn *column;
- GtkCellRenderer *cell;
GtkAction *action;
GList *list;
add_spin_column (obj, VS_COLUMNS, _("Columns"), 3);
- column
- = add_combo_column (obj, VS_ALIGN, _("Align"), 8, alignment_to_stock_id,
- alignment_to_string (ALIGN_LEFT), ALIGN_LEFT,
- alignment_to_string (ALIGN_CENTRE), ALIGN_CENTRE,
- alignment_to_string (ALIGN_RIGHT), ALIGN_RIGHT,
- NULL);
- cell = gtk_cell_renderer_pixbuf_new ();
- g_object_set (cell, "width", 16, "height", 16, NULL);
- pspp_sheet_view_column_pack_end (column, cell, FALSE);
- pspp_sheet_view_column_set_cell_data_func (
- column, cell, render_var_cell, obj, NULL);
+ add_combo_column (obj, VS_ALIGN, _("Align"), 8, alignment_to_stock_id,
+ alignment_to_string (ALIGN_LEFT), ALIGN_LEFT,
+ alignment_to_string (ALIGN_CENTRE), ALIGN_CENTRE,
+ alignment_to_string (ALIGN_RIGHT), ALIGN_RIGHT,
+ NULL);
- column
- = add_combo_column (obj, VS_MEASURE, _("Measure"), 12, measure_to_stock_id,
- measure_to_string (MEASURE_NOMINAL), MEASURE_NOMINAL,
- measure_to_string (MEASURE_ORDINAL), MEASURE_ORDINAL,
- measure_to_string (MEASURE_SCALE), MEASURE_SCALE,
- NULL);
- cell = gtk_cell_renderer_pixbuf_new ();
- g_object_set (cell, "width", 16, "height", 16, NULL);
- pspp_sheet_view_column_pack_end (column, cell, FALSE);
- pspp_sheet_view_column_set_cell_data_func (
- column, cell, render_var_cell, obj, NULL);
+ add_combo_column (obj, VS_MEASURE, _("Measure"), 11, measure_to_stock_id,
+ measure_to_string (MEASURE_NOMINAL), MEASURE_NOMINAL,
+ measure_to_string (MEASURE_ORDINAL), MEASURE_ORDINAL,
+ measure_to_string (MEASURE_SCALE), MEASURE_SCALE,
+ NULL);
- add_combo_column (obj, VS_ROLE, _("Role"), 12, NULL,
+ add_combo_column (obj, VS_ROLE, _("Role"), 11, role_to_stock_id,
var_role_to_string (ROLE_INPUT), ROLE_INPUT,
- var_role_to_string (ROLE_OUTPUT), ROLE_OUTPUT,
+ var_role_to_string (ROLE_TARGET), ROLE_TARGET,
var_role_to_string (ROLE_BOTH), ROLE_BOTH,
var_role_to_string (ROLE_NONE), ROLE_NONE,
var_role_to_string (ROLE_PARTITION), ROLE_PARTITION,