/* PSPPIRE - a graphical user interface for PSPP.
- Copyright (C) 2008, 2009, 2011, 2012, 2013 Free Software Foundation, Inc.
+ Copyright (C) 2008, 2009, 2011, 2012, 2013, 2014 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
{
gtk_widget_queue_resize (GTK_WIDGET (var_sheet));
var_sheet->scroll_to_bottom_signal =
- g_signal_connect (var_sheet, "size-request",
+ g_signal_connect (var_sheet, "size-allocate",
G_CALLBACK (scroll_to_bottom), NULL);
}
}
break;
case VS_LABEL:
- var_set_label (var, new_text, false);
+ var_set_label (var, new_text);
break;
case VS_VALUES:
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 ("");
}
{
switch (role)
{
- case ROLE_INPUT: return "variable-role-input";
- case ROLE_OUTPUT: return "variable-role-target";
- case ROLE_BOTH: return "variable-role-both";
- case ROLE_NONE: return "variable-role-none";
- case ROLE_PARTITION: return "variable-role-partition";
- case ROLE_SPLIT: return "variable-role-split";
+ 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 ("");
}
"column-number")) - 1;
row = GPOINTER_TO_INT (iter->user_data);
+ gtk_cell_renderer_set_visible (cell, true);
if (row >= psppire_dict_get_var_cnt (var_sheet->dict))
{
if (GTK_IS_CELL_RENDERER_TEXT (cell))
g_object_set (cell, "adjustment", NULL, NULL);
}
else
- g_object_set (cell, "stock-id", "", NULL);
+ {
+ gtk_cell_renderer_set_visible (cell, false);
+ }
return;
}
"editable", TRUE,
NULL);
else
- g_object_set (cell, "stock-id",
+ g_object_set (cell, "icon-name",
get_var_align_stock_id (var_get_alignment (var)), NULL);
break;
enum fmt_type type = var_get_print_format (var)->type;
enum measure measure = var_get_measure (var);
- g_object_set (cell, "stock-id",
+ g_object_set (cell, "icon-name",
get_var_measurement_stock_id (type, measure),
NULL);
}
"editable", TRUE,
NULL);
else
- g_object_set (cell, "stock-id",
+ g_object_set (cell, "icon-name",
get_var_role_stock_id (var_get_role (var)), NULL);
break;
}
g_object_set (G_OBJECT (renderer),
PSPPIRE_IS_CELL_RENDERER_BUTTON (renderer) ? "label" : "text",
string, (void *) NULL);
- gtk_cell_renderer_get_size (renderer, GTK_WIDGET (treeview),
- NULL, NULL, NULL, &width, NULL);
+
+ gtk_cell_renderer_get_preferred_width (renderer, GTK_WIDGET (treeview), NULL, &width);
+
return width;
}
value_to_stock_id = g_object_get_data (G_OBJECT (cell), "value-to-stock-id");
gtk_tree_model_get (tree_model, iter, 0, &value, -1);
- g_object_set (cell, "stock-id", value_to_stock_id (type, value), NULL);
+ g_object_set (cell, "icon-name", value_to_stock_id (type, value), NULL);
}
static void
do_popup_menu (GtkWidget *widget, guint button, guint32 time)
{
PsppireVarSheet *var_sheet = PSPPIRE_VAR_SHEET (widget);
- GtkWidget *menu;
+ GtkWidget *menu = gtk_menu_new ();
+
+ int i = 0;
+
+ GtkWidget *insert_variable = gtk_menu_item_new_with_mnemonic (_("_Insert Variable"));
+ GtkWidget *clear_variables = gtk_menu_item_new_with_mnemonic (_("Cl_ear Variables"));
+
+ g_signal_connect_swapped (insert_variable, "activate", G_CALLBACK (psppire_var_sheet_insert_variable), var_sheet);
+ g_signal_connect_swapped (clear_variables, "activate", G_CALLBACK (psppire_var_sheet_clear_variables), var_sheet);
+
+ gtk_menu_attach (GTK_MENU (menu), insert_variable, 0, 1, i, i + 1); ++i;
+ gtk_menu_attach (GTK_MENU (menu), clear_variables, 0, 1, i, i + 1); ++i;
+
+ gtk_widget_show_all (menu);
- menu = get_widget_assert (var_sheet->builder, "varsheet-variable-popup");
gtk_menu_popup (GTK_MENU (menu), NULL, NULL, NULL, NULL, button, time);
}
return FALSE;
}
+
\f
GType
psppire_fmt_use_get_type (void)
PROP_DICTIONARY,
PROP_MAY_CREATE_VARS,
PROP_MAY_DELETE_VARS,
- PROP_FORMAT_TYPE,
- PROP_UI_MANAGER
+ PROP_FORMAT_TYPE
};
static void
obj->format_use = g_value_get_enum (value);
break;
- case PROP_UI_MANAGER:
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
g_value_set_enum (value, obj->format_use);
break;
- case PROP_UI_MANAGER:
- g_value_set_object (value, psppire_var_sheet_get_ui_manager (obj));
- break;
-
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
if (var_sheet->dict)
g_object_unref (var_sheet->dict);
-
- if (var_sheet->uim)
- g_object_unref (var_sheet->uim);
/* These dialogs are not GObjects (although they should be!)
But for now, unreffing them only causes a GCritical Error
FMT_FOR_OUTPUT,
G_PARAM_READWRITE);
g_object_class_install_property (gobject_class, PROP_FORMAT_TYPE, pspec);
-
- pspec = g_param_spec_object ("ui-manager",
- "UI Manager",
- "UI manager for the variable sheet. The client should merge this UI manager with the active UI manager to obtain variable sheet specific menu items and tool bar items.",
- GTK_TYPE_UI_MANAGER,
- G_PARAM_READABLE);
- g_object_class_install_property (gobject_class, PROP_UI_MANAGER, pspec);
}
static void
return column;
}
-static void
-on_edit_clear_variables (GtkAction *action, PsppireVarSheet *var_sheet)
+void
+psppire_var_sheet_clear_variables (PsppireVarSheet *var_sheet)
{
PsppSheetView *sheet_view = PSPP_SHEET_VIEW (var_sheet);
PsppSheetSelection *selection = pspp_sheet_view_get_selection (sheet_view);
PsppireDict *dict = var_sheet->dict;
const struct range_set_node *node;
- struct range_set *selected;
+ struct range_set *selected = pspp_sheet_selection_get_range_set (selection);
- selected = pspp_sheet_selection_get_range_set (selection);
for (node = range_set_last (selected); node != NULL;
node = range_set_prev (selected, node))
{
for (i = 1; i <= range_set_node_get_width (node); i++)
{
unsigned long row = range_set_node_get_end (node) - i;
- if (row >= 0 && row < psppire_dict_get_var_cnt (dict))
+ if (row < psppire_dict_get_var_cnt (dict))
psppire_dict_delete_variables (dict, row, 1);
}
}
{
PsppSheetView *sheet_view = pspp_sheet_selection_get_tree_view (selection);
PsppireVarSheet *var_sheet = PSPPIRE_VAR_SHEET (sheet_view);
- gint n_selected_rows;
+ gint n_selected_rows = pspp_sheet_selection_count_selected_rows (selection);
gboolean may_delete;
GtkTreePath *path;
- GtkAction *action;
- n_selected_rows = pspp_sheet_selection_count_selected_rows (selection);
+ GtkWidget *top = gtk_widget_get_toplevel (GTK_WIDGET (var_sheet));
+ if (! PSPPIRE_IS_DATA_WINDOW (top))
+ return;
- action = get_action_assert (var_sheet->builder, "edit_insert-variable");
- gtk_action_set_sensitive (action, (var_sheet->may_create_vars
- && n_selected_rows > 0));
+ PsppireDataWindow *dw = PSPPIRE_DATA_WINDOW (top);
+ gtk_widget_set_sensitive (dw->mi_insert_var, n_selected_rows > 0);
switch (n_selected_rows)
{
may_delete = TRUE;
break;
}
- action = get_action_assert (var_sheet->builder, "edit_clear-variables");
- gtk_action_set_sensitive (action, var_sheet->may_delete_vars && may_delete);
+
+ gtk_widget_set_sensitive (dw->mi_clear_variables, var_sheet->may_delete_vars && may_delete);
}
-static void
-on_edit_insert_variable (GtkAction *action, PsppireVarSheet *var_sheet)
+void
+psppire_var_sheet_insert_variable (PsppireVarSheet *var_sheet)
{
PsppSheetView *sheet_view = PSPP_SHEET_VIEW (var_sheet);
PsppSheetSelection *selection = pspp_sheet_view_get_selection (sheet_view);
{
PsppSheetView *sheet_view = PSPP_SHEET_VIEW (obj);
PsppSheetViewColumn *column;
- GtkAction *action;
GList *list;
obj->dict = NULL;
obj->container = NULL;
obj->dispose_has_run = FALSE;
- obj->uim = NULL;
pspp_sheet_view_append_column (sheet_view, make_row_number_column (obj));
alignment_to_string (ALIGN_RIGHT), ALIGN_RIGHT,
NULL);
- add_combo_column (obj, VS_MEASURE, _("Measure"), 12, measure_to_stock_id,
+ 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, role_to_stock_id,
+ 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,
G_CALLBACK (on_query_var_tooltip), NULL);
g_signal_connect (obj, "button-press-event",
G_CALLBACK (on_button_pressed), NULL);
- g_signal_connect (obj, "popup-menu", G_CALLBACK (on_popup_menu), NULL);
- obj->builder = builder_new ("var-sheet.ui");
+ g_signal_connect (obj, "popup-menu", G_CALLBACK (on_popup_menu), NULL);
- action = get_action_assert (obj->builder, "edit_clear-variables");
- g_signal_connect (action, "activate", G_CALLBACK (on_edit_clear_variables),
- obj);
- gtk_action_set_sensitive (action, FALSE);
g_signal_connect (pspp_sheet_view_get_selection (sheet_view),
"changed", G_CALLBACK (on_selection_changed), NULL);
-
- action = get_action_assert (obj->builder, "edit_insert-variable");
- gtk_action_set_sensitive (action, FALSE);
- g_signal_connect (action, "activate", G_CALLBACK (on_edit_insert_variable),
- obj);
}
GtkWidget *
if (var_sheet->dict != NULL)
{
int i;
-
+
for (i = 0; i < PSPPIRE_VAR_SHEET_N_SIGNALS; i++)
{
if (var_sheet->dict_signals[i])
g_signal_handler_disconnect (var_sheet->dict,
var_sheet->dict_signals[i]);
-
+
var_sheet->dict_signals[i] = 0;
}
gtk_tree_path_free (path);
}
-GtkUIManager *
-psppire_var_sheet_get_ui_manager (PsppireVarSheet *var_sheet)
-{
- if (var_sheet->uim == NULL)
- {
- var_sheet->uim = GTK_UI_MANAGER (get_object_assert (var_sheet->builder,
- "var_sheet_uim",
- GTK_TYPE_UI_MANAGER));
- g_object_ref (var_sheet->uim);
- }
-
- return var_sheet->uim;
-}
projects / pspp / blobdiff