/* PSPPIRE - a graphical user interface for PSPP.
- Copyright (C) 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc.
+ Copyright (C) 2008, 2009, 2010, 2011, 2012, 2016,
+ 2017 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
#include "ui/gui/psppire-data-editor.h"
#include <gtk/gtk.h>
-#include <gtk-contrib/gtkxpaned.h>
#include "data/datasheet.h"
#include "data/value-labels.h"
#include "libpspp/range-set.h"
#include "libpspp/str.h"
+
#include "ui/gui/helper.h"
-#include "ui/gui/pspp-sheet-selection.h"
+#include "ui/gui/var-display.h"
+#include "ui/gui/val-labs-dialog.h"
+#include "ui/gui/missing-val-dialog.h"
+#include "ui/gui/var-type-dialog.h"
+#include "ui/gui/psppire-dict.h"
#include "ui/gui/psppire-data-store.h"
+#include "ui/gui/psppire-data-window.h"
#include "ui/gui/psppire-value-entry.h"
-#include "ui/gui/psppire-var-sheet.h"
#include "ui/gui/psppire-conf.h"
-#include "ui/gui/psppire-var-sheet-header.h"
+#include "ui/gui/psppire-variable-sheet.h"
+#include "ui/gui/psppire-data-sheet.h"
+
-#include "ui/gui/efficient-sheet/jmd-sheet.h"
+#include <ssw-sheet.h>
#include <gettext.h>
#define _(msgid) gettext (msgid)
-
-static GtkCellRenderer *
-create_spin_renderer (GType type)
-{
- GtkCellRenderer *r = gtk_cell_renderer_spin_new ();
-
- GtkAdjustment *adj = gtk_adjustment_new (0,
- 0, G_MAXDOUBLE,
- 1, 1,
- 0);
- g_object_set (r,
- "adjustment", adj,
- NULL);
-
- return r;
-}
-
-static GtkCellRenderer *
-create_combo_renderer (GType type)
-{
- GtkListStore *list_store = gtk_list_store_new (2, G_TYPE_INT, G_TYPE_STRING);
-
- GEnumClass *ec = g_type_class_ref (type);
-
- const GEnumValue *ev ;
- for (ev = ec->values; ev->value_name; ++ev)
- {
- GtkTreeIter iter;
-
- gtk_list_store_append (list_store, &iter);
-
- gtk_list_store_set (list_store, &iter,
- 0, ev->value,
- 1, gettext (ev->value_nick),
- -1);
- }
-
- GtkCellRenderer *r = gtk_cell_renderer_combo_new ();
-
- g_object_set (r,
- "model", list_store,
- "text-column", 1,
- "has-entry", TRUE,
- NULL);
-
- return r;
-}
-
-GtkCellRenderer *xx ;
-GtkCellRenderer *column_width_renderer ;
-GtkCellRenderer *measure_renderer ;
-GtkCellRenderer *alignment_renderer ;
-
-
-
-static GtkCellRenderer *
-select_renderer_func (gint col, gint row, GType type)
-{
- if (!xx)
- xx = create_spin_renderer (type);
-
- if (col == DICT_TVM_COL_ROLE && !column_width_renderer)
- column_width_renderer = create_combo_renderer (type);
-
- if (col == DICT_TVM_COL_MEASURE && !measure_renderer)
- measure_renderer = create_combo_renderer (type);
-
- if (col == DICT_TVM_COL_ALIGNMENT && !alignment_renderer)
- alignment_renderer = create_combo_renderer (type);
-
- switch (col)
- {
- case DICT_TVM_COL_WIDTH:
- case DICT_TVM_COL_DECIMAL:
- case DICT_TVM_COL_COLUMNS:
- return xx;
-
- case DICT_TVM_COL_ALIGNMENT:
- return alignment_renderer;
-
- case DICT_TVM_COL_MEASURE:
- return measure_renderer;
-
- case DICT_TVM_COL_ROLE:
- return column_width_renderer;
- }
-
- return NULL;
-}
-
-
static void psppire_data_editor_class_init (PsppireDataEditorClass *klass);
static void psppire_data_editor_init (PsppireDataEditor *de);
-static void disconnect_data_sheets (PsppireDataEditor *);
static void refresh_entry (PsppireDataEditor *);
-static void psppire_data_editor_update_ui_manager (PsppireDataEditor *);
GType
psppire_data_editor_get_type (void)
{
PsppireDataEditor *de = (PsppireDataEditor *) obj;
- disconnect_data_sheets (de);
-
if (de->data_store)
{
g_object_unref (de->data_store);
de->font = NULL;
}
- if (de->ui_manager)
- {
- g_object_unref (de->ui_manager);
- de->ui_manager = NULL;
- }
-
/* Chain up to the parent class */
G_OBJECT_CLASS (parent_class)->dispose (obj);
}
PROP_DATA_STORE,
PROP_DICTIONARY,
PROP_VALUE_LABELS,
- PROP_SPLIT_WINDOW,
- PROP_UI_MANAGER
+ PROP_SPLIT_WINDOW
};
static void
{
}
+
static void
psppire_data_editor_set_property (GObject *object,
guint prop_id,
switch (prop_id)
{
case PROP_SPLIT_WINDOW:
- psppire_data_editor_split_window (de, g_value_get_boolean (value));
+ de->split = g_value_get_boolean (value);
+ g_object_set (de->data_sheet, "split", de->split, NULL);
+ g_object_set (de->var_sheet, "split", de->split, NULL);
break;
case PROP_DATA_STORE:
if ( de->data_store)
de->data_store = g_value_get_pointer (value);
g_object_ref (de->data_store);
- g_print ("NEW STORE\n");
g_object_set (de->data_sheet, "data-model", de->data_store, NULL);
psppire_data_editor_refresh_model (de);
+ g_signal_connect_swapped (de->data_sheet, "selection-changed",
+ G_CALLBACK (refresh_entry),
+ de);
+
g_signal_connect_swapped (de->data_store, "case-changed",
G_CALLBACK (refresh_entry), de);
de->dict = g_value_get_pointer (value);
g_object_ref (de->dict);
- g_object_set (de->data_sheet, "hmodel", de->dict, NULL);
g_object_set (de->var_sheet, "data-model", de->dict, NULL);
-
break;
+
case PROP_VALUE_LABELS:
+ {
+ gboolean l = g_value_get_boolean (value);
+ g_object_set (de->data_sheet, "forward-conversion",
+ l ?
+ psppire_data_store_value_to_string_with_labels :
+ psppire_data_store_value_to_string,
+ NULL);
+ }
break;
- case PROP_UI_MANAGER:
+
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
break;
case PROP_VALUE_LABELS:
break;
- case PROP_UI_MANAGER:
- g_value_set_object (value, psppire_data_editor_get_ui_manager (de));
- break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
guint page_num)
{
GTK_NOTEBOOK_CLASS (parent_class)->switch_page (notebook, w, page_num);
- psppire_data_editor_update_ui_manager (PSPPIRE_DATA_EDITOR (notebook));
}
static void
GtkWidget *widget)
{
GTK_CONTAINER_CLASS (parent_class)->set_focus_child (container, widget);
- psppire_data_editor_update_ui_manager (PSPPIRE_DATA_EDITOR (container));
+}
+
+
+static gboolean
+on_key_press (GtkWidget *w, GdkEventKey *e)
+{
+ PsppireDataEditor *de = PSPPIRE_DATA_EDITOR (w);
+ if (e->keyval == GDK_KEY_F2 &&
+ PSPPIRE_DATA_EDITOR_DATA_VIEW == gtk_notebook_get_current_page (GTK_NOTEBOOK (de)))
+ {
+ gtk_widget_grab_focus (de->datum_entry);
+ }
+
+ return FALSE;
}
static void
GParamSpec *dict_spec ;
GParamSpec *value_labels_spec;
GParamSpec *split_window_spec;
- GParamSpec *ui_manager_spec;
+
GObjectClass *object_class = G_OBJECT_CLASS (klass);
GtkContainerClass *container_class = GTK_CONTAINER_CLASS (klass);
GtkNotebookClass *notebook_class = GTK_NOTEBOOK_CLASS (klass);
+ GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
parent_class = g_type_class_peek_parent (klass);
object_class->get_property = psppire_data_editor_get_property;
container_class->set_focus_child = psppire_data_editor_set_focus_child;
-
notebook_class->switch_page = psppire_data_editor_switch_page;
+ widget_class->key_press_event = on_key_press;
data_store_spec =
g_param_spec_pointer ("data-store",
g_object_class_install_property (object_class,
PROP_SPLIT_WINDOW,
split_window_spec);
-
- ui_manager_spec =
- g_param_spec_object ("ui-manager",
- "UI Manager",
- "UI manager for the active notebook tab. The client should merge this UI manager with the active UI manager to obtain menu items and tool bar items specific to the active notebook tab.",
- GTK_TYPE_UI_MANAGER,
- G_PARAM_READABLE);
- g_object_class_install_property (object_class,
- PROP_UI_MANAGER,
- ui_manager_spec);
}
static void
-on_var_sheet_var_double_clicked (PsppireVarSheet *var_sheet, gint dict_index,
+on_var_sheet_var_double_clicked (void *var_sheet, gint dict_index,
PsppireDataEditor *de)
{
gtk_notebook_set_current_page (GTK_NOTEBOOK (de),
PSPPIRE_DATA_EDITOR_DATA_VIEW);
- jmd_sheet_scroll_to (JMD_SHEET (de->data_sheet), dict_index, -1);
+ ssw_sheet_scroll_to (SSW_SHEET (de->data_sheet), dict_index, -1);
}
+
static void
-on_data_sheet_var_double_clicked (JmdSheet *data_sheet, gint dict_index,
+on_data_sheet_var_double_clicked (SswSheet *data_sheet, gint dict_index,
PsppireDataEditor *de)
{
+
gtk_notebook_set_current_page (GTK_NOTEBOOK (de),
PSPPIRE_DATA_EDITOR_VARIABLE_VIEW);
- jmd_sheet_scroll_to (JMD_SHEET (de->var_sheet), -1, dict_index);
+ ssw_sheet_scroll_to (SSW_SHEET (de->var_sheet), -1, dict_index);
}
+
/* Refreshes 'de->cell_ref_label' and 'de->datum_entry' from the currently
active cell or cells. */
static void
refresh_entry (PsppireDataEditor *de)
{
- g_print ("%s\n", __FUNCTION__);
-}
+ gint row, col;
+ if (ssw_sheet_get_active_cell (SSW_SHEET (de->data_sheet), &col, &row))
+ {
+ union value val;
+ const struct variable *var = psppire_dict_get_variable (de->dict, col);
+ if (var == NULL)
+ return;
-static void
-on_datum_entry_activate (PsppireValueEntry *entry, PsppireDataEditor *de)
-{
-}
+ psppire_value_entry_set_variable (PSPPIRE_VALUE_ENTRY (de->datum_entry), var);
+ int width = var_get_width (var);
+ if (! psppire_data_store_get_value (PSPPIRE_DATA_STORE (de->data_store),
+ row, var, &val))
+ return;
+
+ psppire_value_entry_set_value (PSPPIRE_VALUE_ENTRY (de->datum_entry),
+ &val, width);
+ value_destroy (&val, width);
+ }
+}
static void
-disconnect_data_sheets (PsppireDataEditor *de)
+on_datum_entry_activate (GtkEntry *entry, PsppireDataEditor *de)
{
+ gint row, col;
+ if (ssw_sheet_get_active_cell (SSW_SHEET (de->data_sheet), &col, &row))
+ {
+ union value val;
+ const struct variable *var = psppire_dict_get_variable (de->dict, col);
+ if (var == NULL)
+ return;
+
+ int width = var_get_width (var);
+ value_init (&val, width);
+ if (psppire_value_entry_get_value (PSPPIRE_VALUE_ENTRY (de->datum_entry),
+ &val, width))
+ {
+ psppire_data_store_set_value (de->data_store, row, var, &val);
+ }
+ value_destroy (&val, width);
+ }
}
+
/* Called when the active cell or the selection in the data sheet changes */
static void
-on_data_selection_change (PsppireDataEditor *de, JmdRange *sel)
+on_data_selection_change (PsppireDataEditor *de, SswRange *sel)
{
gchar *ref_cell_text = NULL;
{
/* A single cell is selected */
const struct variable *var = psppire_dict_get_variable (de->dict, sel->start_x);
-
- ref_cell_text = g_strdup_printf (_("%d : %s"),
- sel->start_y + 1, var_get_name (var));
+
+ if (var)
+ ref_cell_text = g_strdup_printf (_("%d : %s"),
+ sel->start_y + 1, var_get_name (var));
}
else
{
n_vars);
ref_cell_text = ds_steal_cstr (&s);
}
-
+
gtk_label_set_label (GTK_LABEL (de->cell_ref_label),
ref_cell_text ? ref_cell_text : "");
-
+
g_free (ref_cell_text);
}
static void set_font_recursively (GtkWidget *w, gpointer data);
+\f
+
+void
+psppire_data_editor_data_delete_variables (PsppireDataEditor *de)
+{
+ SswRange *range = SSW_SHEET(de->data_sheet)->selection;
+
+ psppire_dict_delete_variables (de->dict, range->start_x,
+ (range->end_x - range->start_x + 1));
+
+ gtk_widget_queue_draw (GTK_WIDGET (de->data_sheet));
+}
+
+void
+psppire_data_editor_var_delete_variables (PsppireDataEditor *de)
+{
+ SswRange *range = SSW_SHEET(de->var_sheet)->selection;
+
+ psppire_dict_delete_variables (de->dict, range->start_y,
+ (range->end_y - range->start_y + 1));
+
+ gtk_widget_queue_draw (GTK_WIDGET (de->var_sheet));
+}
+
+void
+psppire_data_editor_insert_new_case_at_posn (PsppireDataEditor *de, gint posn)
+{
+ psppire_data_store_insert_new_case (de->data_store, posn);
+
+ gtk_widget_queue_draw (GTK_WIDGET (de->data_sheet));
+}
+
+void
+psppire_data_editor_insert_new_variable_at_posn (PsppireDataEditor *de, gint posn)
+{
+ const struct variable *v = psppire_dict_insert_variable (de->dict, posn, NULL);
+ psppire_data_store_insert_value (de->data_store, var_get_width(v),
+ var_get_case_index (v));
+
+ gtk_widget_queue_draw (GTK_WIDGET (de));
+}
+
static void
psppire_data_editor_init (PsppireDataEditor *de)
{
GtkWidget *hbox;
gchar *fontname = NULL;
+ GtkStyleContext *context = gtk_widget_get_style_context (GTK_WIDGET (de));
+ gtk_style_context_add_class (context, "psppire-data-editor");
+
de->font = NULL;
- de->ui_manager = NULL;
- de->old_vbox_widget = NULL;
g_object_set (de, "tab-pos", GTK_POS_BOTTOM, NULL);
gtk_box_pack_start (GTK_BOX (hbox), de->datum_entry, TRUE, TRUE, 0);
de->split = FALSE;
- de->data_sheet = g_object_new (JMD_TYPE_SHEET, NULL);
- GtkWidget *data_button = jmd_sheet_get_button (JMD_SHEET (de->data_sheet));
+ de->data_sheet = psppire_data_sheet_new ();
+
+ GtkWidget *data_button = ssw_sheet_get_button (SSW_SHEET (de->data_sheet));
gtk_button_set_label (GTK_BUTTON (data_button), _("Case"));
de->vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
gtk_box_pack_start (GTK_BOX (de->vbox), hbox, FALSE, FALSE, 0);
g_signal_connect_swapped (de->data_sheet, "selection-changed",
G_CALLBACK (on_data_selection_change), de);
-
+
gtk_notebook_append_page (GTK_NOTEBOOK (de), de->vbox,
gtk_label_new_with_mnemonic (_("Data View")));
gtk_widget_show_all (de->vbox);
- de->var_sheet = g_object_new (JMD_TYPE_SHEET, NULL);
-
- PsppireVarSheetHeader *vsh = g_object_new (PSPPIRE_TYPE_VAR_SHEET_HEADER, NULL);
-
- g_object_set (de->var_sheet,
- "hmodel", vsh,
- "select-renderer-func", select_renderer_func,
- NULL);
+ de->var_sheet = psppire_variable_sheet_new ();
-
- GtkWidget *var_button = jmd_sheet_get_button (JMD_SHEET (de->var_sheet));
+ GtkWidget *var_button = ssw_sheet_get_button (SSW_SHEET (de->var_sheet));
gtk_button_set_label (GTK_BUTTON (var_button), _("Variable"));
-
+
gtk_notebook_append_page (GTK_NOTEBOOK (de), de->var_sheet,
gtk_label_new_with_mnemonic (_("Variable View")));
gtk_widget_show_all (de->var_sheet);
-
+
g_signal_connect (de->var_sheet, "row-header-double-clicked",
G_CALLBACK (on_var_sheet_var_double_clicked), de);
set_font_recursively (GTK_WIDGET (de), de->font);
}
- psppire_data_editor_update_ui_manager (de);
+ gtk_widget_add_events (GTK_WIDGET (de), GDK_KEY_PRESS_MASK);
}
GtkWidget*
void
psppire_data_editor_show_grid (PsppireDataEditor *de, gboolean grid_visible)
{
- GtkTreeViewGridLines grid;
-
- grid = (grid_visible
- ? GTK_TREE_VIEW_GRID_LINES_BOTH
- : GTK_TREE_VIEW_GRID_LINES_NONE);
-
- pspp_sheet_view_set_grid_lines (PSPP_SHEET_VIEW (de->var_sheet), grid);
+ g_object_set (SSW_SHEET (de->var_sheet), "gridlines", grid_visible, NULL);
+ g_object_set (SSW_SHEET (de->data_sheet), "gridlines", grid_visible, NULL);
}
{
PangoFontDescription *font_desc = data;
- gtk_widget_override_font (w, font_desc);
+ GtkStyleContext *style = gtk_widget_get_style_context (w);
+ GtkCssProvider *cssp = gtk_css_provider_new ();
+
+ gchar *str = pango_font_description_to_string (font_desc);
+ gchar *css =
+ g_strdup_printf ("* {font: %s}", str);
+ g_free (str);
+
+ GError *err = NULL;
+ gtk_css_provider_load_from_data (cssp, css, -1, &err);
+ if (err)
+ {
+ g_warning ("Failed to load font css \"%s\": %s", css, err->message);
+ g_error_free (err);
+ }
+ g_free (css);
+
+ gtk_style_context_add_provider (style,
+ GTK_STYLE_PROVIDER (cssp),
+ GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
+ g_object_unref (cssp);
+
if ( GTK_IS_CONTAINER (w))
gtk_container_foreach (GTK_CONTAINER (w), set_font_recursively, font_desc);
psppire_conf_set_string (psppire_conf_new (),
"Data Editor", "font",
font_name);
-
+ g_free (font_name);
}
/* If SPLIT is TRUE, splits DE's data sheet into four panes.
void
psppire_data_editor_split_window (PsppireDataEditor *de, gboolean split)
{
- if (split == de->split)
- return;
-
- disconnect_data_sheets (de);
-
- psppire_data_editor_refresh_model (de);
-
- gtk_widget_show_all (de->vbox);
-
- if (de->font)
- set_font_recursively (GTK_WIDGET (de), de->font);
-
- de->split = split;
- g_object_notify (G_OBJECT (de), "split");
- psppire_data_editor_update_ui_manager (de);
+ g_object_set (de, "split", split, NULL);
}
/* Makes the variable with dictionary index DICT_INDEX in DE's dictionary
void
psppire_data_editor_goto_variable (PsppireDataEditor *de, gint dict_index)
{
-}
+ gint page = gtk_notebook_get_current_page (GTK_NOTEBOOK (de));
-
-/* Returns the UI manager that should be merged into DE's toplevel widget's UI
- manager to display menu items and toolbar items specific to DE's current
- page and data sheet.
-
- DE's toplevel widget can watch for changes by connecting to DE's
- notify::ui-manager signal. */
-GtkUIManager *
-psppire_data_editor_get_ui_manager (PsppireDataEditor *de)
-{
- psppire_data_editor_update_ui_manager (de);
- return de->ui_manager;
+ switch (page)
+ {
+ case PSPPIRE_DATA_EDITOR_DATA_VIEW:
+ ssw_sheet_scroll_to (SSW_SHEET (de->data_sheet), dict_index, -1);
+ ssw_sheet_set_active_cell (SSW_SHEET (de->data_sheet), dict_index, -1, NULL);
+ break;
+ case PSPPIRE_DATA_EDITOR_VARIABLE_VIEW:
+ ssw_sheet_scroll_to (SSW_SHEET (de->var_sheet), -1, dict_index);
+ ssw_sheet_set_active_cell (SSW_SHEET (de->var_sheet), -1, dict_index, NULL);
+ break;
+ }
}
+/* Set the datum at COL, ROW, to that contained in VALUE.
+ */
static void
-psppire_data_editor_update_ui_manager (PsppireDataEditor *de)
+store_set_datum (GtkTreeModel *model, gint col, gint row,
+ const GValue *value)
{
- GtkUIManager *ui_manager;
-
- ui_manager = NULL;
-
- switch (gtk_notebook_get_current_page (GTK_NOTEBOOK (de)))
- {
- case PSPPIRE_DATA_EDITOR_DATA_VIEW:
- break;
-
- case PSPPIRE_DATA_EDITOR_VARIABLE_VIEW:
- break;
-
- default:
- /* This happens transiently in psppire_data_editor_init(). */
- break;
- }
+ PsppireDataStore *store = PSPPIRE_DATA_STORE (model);
+ GVariant *v = g_value_get_variant (value);
+ union value uv;
+ value_variant_get (&uv, v);
+ const struct variable *var = psppire_dict_get_variable (store->dict, col);
+ psppire_data_store_set_value (store, row, var, &uv);
+ value_destroy_from_variant (&uv, v);
+}
- if (ui_manager != de->ui_manager)
- {
- if (de->ui_manager)
- g_object_unref (de->ui_manager);
- if (ui_manager)
- g_object_ref (ui_manager);
- de->ui_manager = ui_manager;
+void
+psppire_data_editor_paste (PsppireDataEditor *de)
+{
+ SswSheet *sheet = SSW_SHEET (de->data_sheet);
+ GtkClipboard *clip =
+ gtk_clipboard_get_for_display (gtk_widget_get_display (GTK_WIDGET (sheet)),
+ GDK_SELECTION_CLIPBOARD);
- g_object_notify (G_OBJECT (de), "ui-manager");
- }
+ ssw_sheet_paste (sheet, clip, store_set_datum);
}
projects / pspp / blobdiff