/* PSPPIRE - a graphical user interface for PSPP.
- Copyrigght (C) 2008 Free Software Foundation, Inc.
+ Copyright (C) 2008 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 <config.h>
#include <gtk/gtksignal.h>
#include <gtk/gtk.h>
-#include <gtksheet/gtksheet.h>
+#include <gtksheet/gtkextra-sheet.h>
#include "psppire-data-editor.h"
#include "psppire-var-sheet.h"
-#include <gtksheet/gsheet-hetero-column.h>
#include <language/syntax-string-source.h>
#include "psppire-data-store.h"
#include "helper.h"
}
+
+
+
/* Callback which occurs when the var sheet's row title
button is double clicked */
static gboolean
if ( row < visible_range.col0 || row > visible_range.coli)
{
gtk_sheet_moveto (GTK_SHEET (de->data_sheet[0]),
- current_row, row, 0, 0);
+ -1, row, 0, 0);
}
return FALSE;
}
+/* Moves the focus to a new cell.
+ Returns TRUE iff the move should be disallowed */
+static gboolean
+traverse_cell_callback (GtkSheet *sheet,
+ GtkSheetCell *existing_cell,
+ GtkSheetCell *new_cell,
+ gpointer data)
+{
+ PsppireDataEditor *de = PSPPIRE_DATA_EDITOR (data);
+ const PsppireDict *dict = de->data_store->dict;
+
+ if ( new_cell->col >= psppire_dict_get_var_cnt (dict))
+ return TRUE;
+
+ return FALSE;
+}
+
enum
{
PROP_SPLIT_WINDOW
};
+
+#define WIDTH_OF_M 10
+
+static void
+new_variables_callback (PsppireDict *dict, gpointer data)
+{
+ gint v, i;
+ PsppireDataEditor *de = PSPPIRE_DATA_EDITOR (data);
+
+ for (i = 0 ; i < 4 ; ++i)
+ {
+ PsppireAxis *haxis;
+ g_object_get (de->data_sheet[i], "horizontal-axis", &haxis, NULL);
+
+ psppire_axis_clear (haxis);
+
+ for (v = 0 ; v < psppire_dict_get_var_cnt (dict); ++v)
+ {
+ const struct variable *var = psppire_dict_get_variable (dict, v);
+
+ psppire_axis_append (haxis, 10 * var_get_display_width (var));
+ }
+ }
+}
+
+static void
+insert_variable_callback (PsppireDict *dict, gint x, gpointer data)
+{
+ gint i;
+ PsppireDataEditor *de = PSPPIRE_DATA_EDITOR (data);
+
+ for (i = 0 ; i < 4 ; ++i)
+ {
+ const struct variable *var = psppire_dict_get_variable (dict, x);
+ PsppireAxis *haxis;
+ g_object_get (de->data_sheet[i], "horizontal-axis", &haxis, NULL);
+
+ psppire_axis_insert (haxis, WIDTH_OF_M * var_get_display_width (var), x);
+ }
+}
+
+
+static void
+delete_variable_callback (PsppireDict *dict, gint posn, gint x UNUSED, gint y UNUSED, gpointer data)
+{
+ gint i;
+ PsppireDataEditor *de = PSPPIRE_DATA_EDITOR (data);
+
+ for (i = 0 ; i < 4 ; ++i)
+ {
+ PsppireAxis *haxis;
+ g_object_get (de->data_sheet[i], "horizontal-axis", &haxis, NULL);
+
+ psppire_axis_remove (haxis, posn);
+ }
+}
+
+
+static void
+rewidth_variable_callback (PsppireDict *dict, gint posn, gpointer data)
+{
+ gint i;
+ PsppireDataEditor *de = PSPPIRE_DATA_EDITOR (data);
+
+ for (i = 0 ; i < 4 ; ++i)
+ {
+ const struct variable *var = psppire_dict_get_variable (dict, posn);
+ PsppireAxis *haxis;
+ g_object_get (de->data_sheet[i], "horizontal-axis", &haxis, NULL);
+
+ psppire_axis_resize_unit (haxis, WIDTH_OF_M * var_get_display_width (var), posn);
+ }
+}
+
+
static void
psppire_data_editor_set_property (GObject *object,
guint prop_id,
for (i = 0 ; i < 4 ; ++i )
g_object_set (de->data_sheet[i],
"row-geometry", de->data_store,
- "column-geometry", de->data_store,
"model", de->data_store,
NULL);
+
+ g_signal_connect (de->data_store->dict, "backend-changed", G_CALLBACK (new_variables_callback), de);
+ g_signal_connect (de->data_store->dict, "variable-inserted", G_CALLBACK (insert_variable_callback), de);
+ g_signal_connect (de->data_store->dict, "variable-deleted", G_CALLBACK (delete_variable_callback), de);
+ // g_signal_connect (de->data_store->dict, "variable-changed", G_CALLBACK (alter_variable_callback), de);
+ g_signal_connect (de->data_store->dict, "variable-display-width-changed", G_CALLBACK (rewidth_variable_callback), de);
break;
case PROP_VAR_STORE:
if ( de->var_store) g_object_unref (de->var_store);
case PSPPIRE_DATA_EDITOR_DATA_VIEW:
gtk_sheet_get_active_cell (GTK_SHEET (de->data_sheet[0]), &row, &col);
gtk_sheet_set_active_cell (GTK_SHEET (de->data_sheet[0]), row, var);
- gtk_sheet_moveto (GTK_SHEET (de->data_sheet[0]), row, var, 0.5, 0.5);
+ gtk_sheet_moveto (GTK_SHEET (de->data_sheet[0]), -1, var, 0.5, 0.5);
break;
case PSPPIRE_DATA_EDITOR_VARIABLE_VIEW:
gtk_sheet_get_active_cell (GTK_SHEET (de->var_sheet), &row, &col);
gtk_sheet_set_active_cell (GTK_SHEET (de->var_sheet), var, col);
- gtk_sheet_moveto (GTK_SHEET (de->var_sheet), var, col, 0.5, 0.5);
+ gtk_sheet_moveto (GTK_SHEET (de->var_sheet), var, -1, 0.5, 0.5);
break;
default:
g_assert_not_reached ();
gint case_num = g_value_get_long (value);
gtk_sheet_get_active_cell (GTK_SHEET (de->data_sheet[0]), &row, &col);
gtk_sheet_set_active_cell (GTK_SHEET (de->data_sheet[0]), case_num, col);
- gtk_sheet_moveto (GTK_SHEET (de->data_sheet[0]), case_num, col, 0.5, 0.5);
+ gtk_sheet_moveto (GTK_SHEET (de->data_sheet[0]), case_num, -1, 0.5, 0.5);
}
break;
case PROP_VALUE_LABELS:
/* Update the data_ref_entry with the reference of the active cell */
static gint
-update_data_ref_entry (const GtkSheet *sheet, gint row, gint col, gpointer data)
+update_data_ref_entry (const GtkSheet *sheet,
+ gint row, gint col,
+ gint old_row, gint old_col,
+ gpointer data)
{
PsppireDataEditor *de = data;
psppire_data_store_set_string (de->data_store, text, row, column);
}
-static gboolean on_data_sheet_activate (GtkWidget *sheet, gint i, gint j, PsppireDataEditor *de);
static void on_activate (PsppireDataEditor *de);
-static void on_deactivate (PsppireDataEditor *de);
static gboolean on_switch_page (PsppireDataEditor *de, GtkNotebookPage *p, gint pagenum, gpointer data);
static void on_select_range (PsppireDataEditor *de);
init_sheet (PsppireDataEditor *de, int i,
GtkAdjustment *hadj, GtkAdjustment *vadj)
{
+ PsppireAxis *haxis = psppire_axis_new ();
de->sheet_bin[i] = gtk_scrolled_window_new (hadj, vadj);
de->data_sheet[i] = gtk_sheet_new (NULL, NULL, NULL);
"shadow-type", GTK_SHADOW_ETCHED_IN,
NULL);
+ g_object_set (de->data_sheet[i],
+ "horizontal-axis", haxis,
+ NULL);
+
gtk_container_add (GTK_CONTAINER (de->sheet_bin[i]), de->data_sheet[i]);
+ g_signal_connect (de->data_sheet[i], "traverse",
+ G_CALLBACK (traverse_cell_callback), de);
+
gtk_widget_show (de->sheet_bin[i]);
}
static void
psppire_data_editor_init (PsppireDataEditor *de)
{
- int i;
-
GtkWidget *hbox = gtk_hbox_new (FALSE, 0);
GtkWidget *sw_vs = gtk_scrolled_window_new (NULL, NULL);
G_CALLBACK (on_activate),
de);
- for (i = 0 ; i < 4 ; ++i )
- g_signal_connect (de->data_sheet[i], "activate",
- G_CALLBACK (on_data_sheet_activate),
- de);
-
- g_signal_connect_swapped (de->data_sheet[0], "deactivate",
- G_CALLBACK (on_deactivate),
- de);
-
g_signal_connect_swapped (de->data_sheet[0], "select-range",
G_CALLBACK (on_select_range),
de);
psppire_data_editor_new (PsppireVarStore *var_store,
PsppireDataStore *data_store)
{
- GtkWidget *widget;
-
- widget = g_object_new (PSPPIRE_DATA_EDITOR_TYPE,
- "var-store", var_store,
- "data-store", data_store,
- NULL);
-
-
-
- return widget;
+ return g_object_new (PSPPIRE_DATA_EDITOR_TYPE,
+ "var-store", var_store,
+ "data-store", data_store,
+ NULL);
}
void
psppire_data_editor_clip_paste (PsppireDataEditor *de)
{
- GtkClipboard *clipboard = gtk_clipboard_get (GDK_SELECTION_CLIPBOARD);
+ GdkDisplay *display = gtk_widget_get_display ( GTK_WIDGET (de));
+ GtkClipboard *clipboard =
+ gtk_clipboard_get_for_display (display, GDK_SELECTION_CLIPBOARD);
gtk_clipboard_request_contents (clipboard,
gdk_atom_intern ("UTF8_STRING", TRUE),
g_signal_emit (de, data_editor_signals[DATA_SELECTION_CHANGED], 0, data_selected);
}
-static gboolean
-on_data_sheet_activate (GtkWidget *sheet, gint row, gint col, PsppireDataEditor *de)
-{
- gint i;
-
- for ( i = 0 ; i < 4 ; ++i )
- {
- gint current_row, current_col;
- if (de->data_sheet[i] == sheet) continue;
-
- gtk_sheet_get_active_cell (GTK_SHEET (de->data_sheet[0]), ¤t_row, ¤t_col);
-
- if ( row == current_row && current_col == col ) continue;
-
- gtk_sheet_set_active_cell (GTK_SHEET (de->data_sheet[i]), row, col);
- }
-
- return TRUE;
-}
static void
on_activate (PsppireDataEditor *de)
}
-static void
-on_deactivate (PsppireDataEditor *de)
-{
- emit_selected_signal (de);
-}
-
static void
on_select_range (PsppireDataEditor *de)
{
projects / pspp-builds.git / blobdiff