/* PSPPIRE - a graphical user interface for PSPP.
Copyright (C) 2008, 2009, 2010, 2011, 2012, 2016,
- 2017 Free Software Foundation, Inc.
+ 2017, 2019 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 "ui/gui/val-labs-dialog.h"
#include "ui/gui/missing-val-dialog.h"
#include "ui/gui/var-type-dialog.h"
+#include "ui/gui/value-variant.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-data-sheet.h"
-#include "ui/gui/efficient-sheet/src/ssw-sheet.h"
+#include <ssw-sheet.h>
#include <gettext.h>
#define _(msgid) gettext (msgid)
g_object_set (de->var_sheet, "split", de->split, NULL);
break;
case PROP_DATA_STORE:
- if ( de->data_store)
+ if (de->data_store)
{
g_signal_handlers_disconnect_by_func (de->data_store,
G_CALLBACK (refresh_entry),
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;
default:
guint page_num)
{
GTK_NOTEBOOK_CLASS (parent_class)->switch_page (notebook, w, page_num);
-
}
static void
GtkWidget *widget)
{
GTK_CONTAINER_CLASS (parent_class)->set_focus_child (container, widget);
+}
+
+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
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",
"Data Store",
"A pointer to the data store associated with this editor",
- G_PARAM_CONSTRUCT_ONLY | G_PARAM_WRITABLE | G_PARAM_READABLE );
+ G_PARAM_CONSTRUCT_ONLY | G_PARAM_WRITABLE | G_PARAM_READABLE);
g_object_class_install_property (object_class,
PROP_DATA_STORE,
g_param_spec_pointer ("dictionary",
"Dictionary",
"A pointer to the dictionary associated with this editor",
- G_PARAM_CONSTRUCT_ONLY | G_PARAM_WRITABLE | G_PARAM_READABLE );
+ G_PARAM_CONSTRUCT_ONLY | G_PARAM_WRITABLE | G_PARAM_READABLE);
g_object_class_install_property (object_class,
PROP_DICTIONARY,
}
static void
-on_datum_entry_activate (PsppireValueEntry *entry, 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);
+
+ gtk_widget_grab_focus (de->data_sheet);
+ ssw_sheet_set_active_cell (SSW_SHEET (de->data_sheet), col, row, NULL);
+ }
}
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));
+ psppire_data_sheet_delete_variables (PSPPIRE_DATA_SHEET (de->data_sheet));
}
void
{
SswRange *range = SSW_SHEET(de->var_sheet)->selection;
+ if (range->start_x > range->end_x)
+ {
+ gint temp = range->start_x;
+ range->start_x = range->end_x;
+ range->end_x = temp;
+ }
+
psppire_dict_delete_variables (de->dict, range->start_y,
(range->end_y - range->start_y + 1));
void
psppire_data_editor_insert_new_case_at_posn (PsppireDataEditor *de, gint posn)
{
+ g_return_if_fail (posn >= 0);
+
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));
+ psppire_data_sheet_insert_new_variable_at_posn (PSPPIRE_DATA_SHEET (de->data_sheet), posn);
}
static void
gtk_widget_set_valign (de->cell_ref_label, GTK_ALIGN_CENTER);
de->datum_entry = psppire_value_entry_new ();
- g_signal_connect (GTK_ENTRY (gtk_bin_get_child (GTK_BIN (de->datum_entry))),
- "activate", G_CALLBACK (on_datum_entry_activate), de);
+ g_signal_connect (de->datum_entry, "edit-done",
+ G_CALLBACK (on_datum_entry_activate), de);
hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
gtk_box_pack_start (GTK_BOX (hbox), de->cell_ref_label, FALSE, FALSE, 0);
if (psppire_conf_get_string (psppire_conf_new (),
"Data Editor", "font",
- &fontname) )
+ &fontname))
{
de->font = pango_font_description_from_string (fontname);
g_free (fontname);
set_font_recursively (GTK_WIDGET (de), de->font);
}
+ gtk_widget_add_events (GTK_WIDGET (de), GDK_KEY_PRESS_MASK);
}
GtkWidget*
GtkStyleContext *style = gtk_widget_get_style_context (w);
GtkCssProvider *cssp = gtk_css_provider_new ();
- gchar *str = pango_font_description_to_string (font_desc);
+ /* The Pango font description as string has a different syntax than the
+ css style description:
+ Pango: Courier Italic 12
+ CSS: italic 12pt Courier
+ I ignore Weight, Style and Variant and just take family and size */
+ const gchar *str = pango_font_description_get_family (font_desc);
+ gint size = pango_font_description_get_size (font_desc);
gchar *css =
- g_strdup_printf ("* {font: %s}", str);
- g_free (str);
+ g_strdup_printf ("* {font: %dpt %s}", size/PANGO_SCALE, str);
GError *err = NULL;
gtk_css_provider_load_from_data (cssp, css, -1, &err);
g_object_unref (cssp);
- if ( GTK_IS_CONTAINER (w))
+ if (GTK_IS_CONTAINER (w))
gtk_container_foreach (GTK_CONTAINER (w), set_font_recursively, font_desc);
}