/* PSPPIRE - a graphical user interface for PSPP.
- Copyright (C) 2008 Free Software Foundation, Inc.
+ Copyright (C) 2008, 2009 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/gtkextra-sheet.h>
+#include <gtk-contrib/gtkextra-sheet.h>
#include "psppire-data-editor.h"
#include "psppire-var-sheet.h"
#include <language/syntax-string-source.h>
#include "psppire-data-store.h"
-#include <gtksheet/psppire-axis-hetero.h>
-#include <gtksheet/psppire-axis-uniform.h>
-#include "helper.h"
+#include <libpspp/i18n.h>
+#include <ui/gui/sheet/psppire-axis.h>
+#include "executor.h"
-#include <gtksheet/gtkxpaned.h>
+#include <gtk-contrib/gtkxpaned.h>
#include <gettext.h>
#define _(msgid) gettext (msgid)
#define N_(msgid) msgid
-static void popup_variable_menu (GtkSheet *sheet, gint column,
- GdkEventButton *event, gpointer data);
+static void popup_variable_column_menu (PsppireSheet *sheet, gint column,
+ GdkEventButton *event, gpointer data);
-static void popup_cases_menu (GtkSheet *sheet, gint row,
+static void popup_variable_row_menu (PsppireSheet *sheet, gint row,
+ GdkEventButton *event, gpointer data);
+
+
+static void popup_cases_menu (PsppireSheet *sheet, gint row,
GdkEventButton *event, gpointer data);
+
/* Callback which occurs when the data sheet's column title
is double clicked */
static gboolean
on_data_column_clicked (PsppireDataEditor *de, gint col, gpointer data)
{
- GtkSheetRange visible_range;
+ PsppireSheetRange visible_range;
gint current_row, current_column;
gtk_notebook_set_current_page (GTK_NOTEBOOK (de),
PSPPIRE_DATA_EDITOR_VARIABLE_VIEW);
- gtk_sheet_get_active_cell (GTK_SHEET (de->var_sheet),
+ psppire_sheet_get_active_cell (PSPPIRE_SHEET (de->var_sheet),
¤t_row, ¤t_column);
- gtk_sheet_set_active_cell (GTK_SHEET (de->var_sheet), col, current_column);
+ psppire_sheet_set_active_cell (PSPPIRE_SHEET (de->var_sheet), col, current_column);
- gtk_sheet_get_visible_range (GTK_SHEET (de->var_sheet), &visible_range);
+ psppire_sheet_get_visible_range (PSPPIRE_SHEET (de->var_sheet), &visible_range);
if ( col < visible_range.row0 || col > visible_range.rowi)
- gtk_sheet_moveto (GTK_SHEET (de->var_sheet), col, current_column, 0.5, 0.5);
+ psppire_sheet_moveto (PSPPIRE_SHEET (de->var_sheet), col, current_column, 0.5, 0.5);
return FALSE;
static gboolean
on_var_row_clicked (PsppireDataEditor *de, gint row, gpointer data)
{
- GtkSheetRange visible_range;
+ PsppireSheetRange visible_range;
gint current_row, current_column;
gtk_notebook_set_current_page (GTK_NOTEBOOK(de), PSPPIRE_DATA_EDITOR_DATA_VIEW);
- gtk_sheet_get_active_cell (GTK_SHEET (de->data_sheet[0]),
+ psppire_sheet_get_active_cell (PSPPIRE_SHEET (de->data_sheet[0]),
¤t_row, ¤t_column);
- gtk_sheet_set_active_cell (GTK_SHEET (de->data_sheet[0]), current_row, row);
+ psppire_sheet_set_active_cell (PSPPIRE_SHEET (de->data_sheet[0]), current_row, row);
- gtk_sheet_get_visible_range (GTK_SHEET (de->data_sheet[0]), &visible_range);
+ psppire_sheet_get_visible_range (PSPPIRE_SHEET (de->data_sheet[0]), &visible_range);
if ( row < visible_range.col0 || row > visible_range.coli)
- gtk_sheet_moveto (GTK_SHEET (de->data_sheet[0]), -1, row, 0.5, 0.5);
+ psppire_sheet_moveto (PSPPIRE_SHEET (de->data_sheet[0]), -1, row, 0.5, 0.5);
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,
+traverse_cell_callback (PsppireSheet *sheet,
+ PsppireSheetCell *existing_cell,
+ PsppireSheetCell *new_cell,
gpointer data)
{
PsppireDataEditor *de = PSPPIRE_DATA_EDITOR (data);
PROP_0,
PROP_DATA_STORE,
PROP_VAR_STORE,
- PROP_COLUMN_MENU,
- PROP_ROW_MENU,
+ PROP_VS_ROW_MENU,
+ PROP_DS_COLUMN_MENU,
+ PROP_DS_ROW_MENU,
PROP_VALUE_LABELS,
PROP_CURRENT_CASE,
PROP_CURRENT_VAR,
};
-#define WIDTH_OF_M 10
#define DEFAULT_ROW_HEIGHT 25
static void
new_data_callback (PsppireDataStore *ds, gpointer data)
{
- PsppireDataEditor *de = PSPPIRE_DATA_EDITOR (data);
gint i;
- for (i = 0 ; i < 4 ; ++i)
- {
- PsppireAxisUniform *vaxis;
- casenumber n_cases = psppire_case_file_get_case_count (ds->case_file);
+ PsppireDataEditor *de = PSPPIRE_DATA_EDITOR (data);
- g_object_get (de->data_sheet[i], "vertical-axis", &vaxis, NULL);
+ casenumber n_cases = psppire_data_store_get_case_count (ds);
- psppire_axis_uniform_set_count (vaxis, n_cases);
+ for (i = 0; i < 2; ++i)
+ {
+ psppire_axis_clear (de->vaxis[i]);
+ psppire_axis_append_n (de->vaxis[i], n_cases, DEFAULT_ROW_HEIGHT);
}
}
+static void
+case_inserted_callback (PsppireDataStore *ds, gint before, gpointer data)
+{
+ gint i;
+ PsppireDataEditor *de = PSPPIRE_DATA_EDITOR (data);
+
+ for (i = 0; i < 2; ++i)
+ psppire_axis_insert (de->vaxis[i], before, DEFAULT_ROW_HEIGHT);
+}
+
+
+static void
+cases_deleted_callback (PsppireDataStore *ds, gint first, gint n_cases, gpointer data)
+{
+ gint i;
+ PsppireDataEditor *de = PSPPIRE_DATA_EDITOR (data);
+
+ for (i = 0; i < 2; ++i)
+ psppire_axis_delete (de->vaxis[0], first, n_cases);
+}
+
+
+
+/* Return the width (in pixels) of an upper case M when rendered in the
+ current font of W
+*/
+static gint
+width_of_m (GtkWidget *w)
+{
+ PangoRectangle rect;
+ PangoLayout *layout = gtk_widget_create_pango_layout (w, "M");
+
+ pango_layout_get_pixel_extents (layout, NULL, &rect);
+
+ g_object_unref (layout);
+
+ return rect.width;
+}
+
+/* Callback for the axis' resize signal.
+ Changes the variable's display width */
+static void
+rewidth_variable (GtkWidget *w, gint unit, glong size)
+{
+ PsppireDataEditor *de = PSPPIRE_DATA_EDITOR (w);
+
+ const PsppireDict *dict = de->data_store->dict;
+ struct variable *var = psppire_dict_get_variable (dict, unit);
+
+ if (NULL == var)
+ return;
+
+ var_set_display_width (var, size / (float) width_of_m (w));
+}
+
+
static void
new_variables_callback (PsppireDict *dict, gpointer data)
{
- gint v, i;
+ gint v;
PsppireDataEditor *de = PSPPIRE_DATA_EDITOR (data);
+ gint m_width = width_of_m (GTK_WIDGET (de));
- PsppireAxisHetero *vaxis;
+ PsppireAxis *vaxis;
g_object_get (de->var_sheet, "vertical-axis", &vaxis, NULL);
- psppire_axis_hetero_clear (vaxis);
-
- for (v = 0 ; v < psppire_dict_get_var_cnt (dict); ++v)
- psppire_axis_hetero_append (vaxis, DEFAULT_ROW_HEIGHT);
+ psppire_axis_clear (vaxis);
+ psppire_axis_append_n (vaxis, 1 + psppire_dict_get_var_cnt (dict), DEFAULT_ROW_HEIGHT);
- for (i = 0 ; i < 4 ; ++i)
- {
- PsppireAxisHetero *haxis;
- g_object_get (de->data_sheet[i], "horizontal-axis", &haxis, NULL);
+ g_signal_connect_swapped (de->haxis, "resize-unit",
+ G_CALLBACK (rewidth_variable), de);
- psppire_axis_hetero_clear (haxis);
+ psppire_axis_clear (de->haxis);
- for (v = 0 ; v < psppire_dict_get_var_cnt (dict); ++v)
- {
- const struct variable *var = psppire_dict_get_variable (dict, v);
+ for (v = 0 ; v < psppire_dict_get_var_cnt (dict); ++v)
+ {
+ const struct variable *var = psppire_dict_get_variable (dict, v);
- psppire_axis_hetero_append (haxis, 10 * var_get_display_width (var));
- }
+ psppire_axis_append (de->haxis, m_width * var_get_display_width (var));
}
}
static void
insert_variable_callback (PsppireDict *dict, gint x, gpointer data)
{
- gint i;
PsppireDataEditor *de = PSPPIRE_DATA_EDITOR (data);
- PsppireAxisHetero *var_vaxis;
+ gint m_width = width_of_m (GTK_WIDGET (de));
+
+ PsppireAxis *var_vaxis;
+
+ const struct variable *var = psppire_dict_get_variable (dict, x);
+
g_object_get (de->var_sheet, "vertical-axis", &var_vaxis, NULL);
- psppire_axis_hetero_insert (var_vaxis, DEFAULT_ROW_HEIGHT, x);
+ psppire_axis_insert (var_vaxis, x, DEFAULT_ROW_HEIGHT);
- for (i = 0 ; i < 4 ; ++i)
- {
- const struct variable *var = psppire_dict_get_variable (dict, x);
- PsppireAxisHetero *haxis;
- g_object_get (de->data_sheet[i], "horizontal-axis", &haxis, NULL);
- psppire_axis_hetero_insert (haxis, WIDTH_OF_M * var_get_display_width (var), x);
- }
+ psppire_axis_insert (de->haxis, x, m_width * var_get_display_width (var));
}
delete_variable_callback (PsppireDict *dict, gint posn,
gint x UNUSED, gint y UNUSED, gpointer data)
{
- gint i;
PsppireDataEditor *de = PSPPIRE_DATA_EDITOR (data);
- PsppireAxisHetero *var_vaxis;
+ PsppireAxis *var_vaxis;
g_object_get (de->var_sheet, "vertical-axis", &var_vaxis, NULL);
- psppire_axis_hetero_remove (var_vaxis, posn);
-
- for (i = 0 ; i < 4 ; ++i)
- {
- PsppireAxisHetero *haxis;
- g_object_get (de->data_sheet[i], "horizontal-axis", &haxis, NULL);
+ psppire_axis_delete (var_vaxis, posn, 1);
- psppire_axis_hetero_remove (haxis, posn);
- }
+ psppire_axis_delete (de->haxis, posn, 1);
}
static void
rewidth_variable_callback (PsppireDict *dict, gint posn, gpointer data)
{
- gint i;
PsppireDataEditor *de = PSPPIRE_DATA_EDITOR (data);
+ gint m_width = width_of_m (GTK_WIDGET (de));
- for (i = 0 ; i < 4 ; ++i)
- {
- const struct variable *var = psppire_dict_get_variable (dict, posn);
- PsppireAxisHetero *haxis;
- g_object_get (de->data_sheet[i], "horizontal-axis", &haxis, NULL);
+ const struct variable *var = psppire_dict_get_variable (dict, posn);
- psppire_axis_hetero_resize_unit (haxis,
- WIDTH_OF_M *
- var_get_display_width (var), posn);
- }
+ gint var_width = var_get_display_width (var);
+
+ /* Don't allow zero width */
+ if ( var_width < 1 )
+ var_width = 1;
+
+ psppire_axis_resize (de->haxis, posn, m_width * var_width);
}
g_object_ref (de->data_store);
for (i = 0 ; i < 4 ; ++i )
- g_object_set (de->data_sheet[i],
- "model", de->data_store,
- NULL);
+ {
+ g_object_set (de->data_sheet[i],
+ "model", de->data_store,
+ NULL);
+
+ g_signal_connect_swapped (de->data_store->dict, "filter-changed",
+ G_CALLBACK (gtk_widget_queue_draw),
+ de->data_sheet[i]);
+ }
+
+ g_signal_connect (de->data_store->dict, "backend-changed",
+ G_CALLBACK (new_variables_callback), de);
- 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-display-width-changed", G_CALLBACK (rewidth_variable_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-display-width-changed",
+ G_CALLBACK (rewidth_variable_callback), de);
+
+ g_signal_connect (de->data_store, "backend-changed",
+ G_CALLBACK (new_data_callback), de);
+
+ g_signal_connect (de->data_store, "case-inserted",
+ G_CALLBACK (case_inserted_callback), de);
+
+ g_signal_connect (de->data_store, "cases-deleted",
+ G_CALLBACK (cases_deleted_callback), de);
- g_signal_connect (de->data_store, "backend-changed", G_CALLBACK (new_data_callback), de);
break;
case PROP_VAR_STORE:
if ( de->var_store) g_object_unref (de->var_store);
"model", de->var_store,
NULL);
break;
- case PROP_COLUMN_MENU:
+ case PROP_VS_ROW_MENU:
+ {
+ GObject *menu = g_value_get_object (value);
+
+ g_signal_connect (de->var_sheet, "button-event-row",
+ G_CALLBACK (popup_variable_row_menu), menu);
+ }
+ break;
+ case PROP_DS_COLUMN_MENU:
{
GObject *menu = g_value_get_object (value);
g_signal_connect (de->data_sheet[0], "button-event-column",
- G_CALLBACK (popup_variable_menu), menu);
+ G_CALLBACK (popup_variable_column_menu), menu);
}
break;
- case PROP_ROW_MENU:
+ case PROP_DS_ROW_MENU:
{
GObject *menu = g_value_get_object (value);
switch (gtk_notebook_get_current_page (GTK_NOTEBOOK (object)))
{
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]), -1, var, 0.5, 0.5);
+ psppire_sheet_get_active_cell (PSPPIRE_SHEET (de->data_sheet[0]), &row, &col);
+ psppire_sheet_set_active_cell (PSPPIRE_SHEET (de->data_sheet[0]), row, var);
+ psppire_sheet_moveto (PSPPIRE_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, -1, 0.5, 0.5);
+ psppire_sheet_get_active_cell (PSPPIRE_SHEET (de->var_sheet), &row, &col);
+ psppire_sheet_set_active_cell (PSPPIRE_SHEET (de->var_sheet), var, col);
+ psppire_sheet_moveto (PSPPIRE_SHEET (de->var_sheet), var, -1, 0.5, 0.5);
break;
default:
g_assert_not_reached ();
{
gint row, col;
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, -1, 0.5, 0.5);
+ psppire_sheet_get_active_cell (PSPPIRE_SHEET (de->data_sheet[0]), &row, &col);
+ psppire_sheet_set_active_cell (PSPPIRE_SHEET (de->data_sheet[0]), case_num, col);
+ psppire_sheet_moveto (PSPPIRE_SHEET (de->data_sheet[0]), case_num, -1, 0.5, 0.5);
}
break;
case PROP_VALUE_LABELS:
case PROP_CURRENT_CASE:
{
gint row, column;
- gtk_sheet_get_active_cell (GTK_SHEET (de->data_sheet[0]), &row, &column);
+ psppire_sheet_get_active_cell (PSPPIRE_SHEET (de->data_sheet[0]), &row, &column);
g_value_set_long (value, row);
}
break;
case PROP_CURRENT_VAR:
{
gint row, column;
- gtk_sheet_get_active_cell (GTK_SHEET (de->data_sheet[0]), &row, &column);
+ psppire_sheet_get_active_cell (PSPPIRE_SHEET (de->data_sheet[0]), &row, &column);
g_value_set_long (value, column);
}
break;
GParamSpec *data_store_spec ;
GParamSpec *var_store_spec ;
GParamSpec *column_menu_spec;
- GParamSpec *row_menu_spec;
+ GParamSpec *ds_row_menu_spec;
+ GParamSpec *vs_row_menu_spec;
GParamSpec *value_labels_spec;
GParamSpec *current_case_spec;
GParamSpec *current_var_spec;
object_class->set_property = psppire_data_editor_set_property;
object_class->get_property = psppire_data_editor_get_property;
+
+
data_store_spec =
g_param_spec_pointer ("data-store",
"Data Store",
var_store_spec);
column_menu_spec =
- g_param_spec_object ("column-menu",
- "Column Menu",
- "A menu to be displayed when button 3 is pressed in the column title buttons",
+ g_param_spec_object ("datasheet-column-menu",
+ "Data Sheet Column Menu",
+ "A menu to be displayed when button 3 is pressed in thedata sheet's column title buttons",
GTK_TYPE_MENU,
G_PARAM_WRITABLE);
g_object_class_install_property (object_class,
- PROP_COLUMN_MENU,
+ PROP_DS_COLUMN_MENU,
column_menu_spec);
- row_menu_spec =
- g_param_spec_object ("row-menu",
- "Row Menu",
- "A menu to be displayed when button 3 is pressed in the row title buttons",
+ ds_row_menu_spec =
+ g_param_spec_object ("datasheet-row-menu",
+ "Data Sheet Row Menu",
+ "A menu to be displayed when button 3 is pressed in the data sheet's row title buttons",
+ GTK_TYPE_MENU,
+ G_PARAM_WRITABLE);
+
+ g_object_class_install_property (object_class,
+ PROP_DS_ROW_MENU,
+ ds_row_menu_spec);
+
+
+ vs_row_menu_spec =
+ g_param_spec_object ("varsheet-row-menu",
+ "Variable Sheet Row Menu",
+ "A menu to be displayed when button 3 is pressed in the variable sheet's row title buttons",
GTK_TYPE_MENU,
G_PARAM_WRITABLE);
g_object_class_install_property (object_class,
- PROP_ROW_MENU,
- row_menu_spec);
+ PROP_VS_ROW_MENU,
+ vs_row_menu_spec);
+
value_labels_spec =
g_param_spec_boolean ("value-labels",
/* Update the data_ref_entry with the reference of the active cell */
static gint
-update_data_ref_entry (const GtkSheet *sheet,
+update_data_ref_entry (const PsppireSheet *sheet,
gint row, gint col,
gint old_row, gint old_col,
gpointer data)
PsppireDataEditor *de = data;
PsppireDataStore *data_store =
- PSPPIRE_DATA_STORE (gtk_sheet_get_model (sheet));
+ PSPPIRE_DATA_STORE (psppire_sheet_get_model (sheet));
if (data_store)
{
gchar *text = g_strdup_printf ("%d: %s", row + FIRST_CASE_NUMBER,
var_get_name (var));
- gchar *s = pspp_locale_to_utf8 (text, -1, 0);
- g_free (text);
+ gtk_entry_set_text (GTK_ENTRY (de->cell_ref_entry), text);
- gtk_entry_set_text (GTK_ENTRY (de->cell_ref_entry), s);
-
- g_free (s);
+ g_free (text);
}
else
goto blank_entry;
const gchar *text = gtk_entry_get_text (entry);
- gtk_sheet_get_active_cell (GTK_SHEET (de->data_sheet[0]), &row, &column);
+ psppire_sheet_get_active_cell (PSPPIRE_SHEET (de->data_sheet[0]), &row, &column);
if ( row == -1 || column == -1)
return;
static gboolean on_switch_page (PsppireDataEditor *de, GtkNotebookPage *p, gint pagenum, gpointer data);
static void on_select_range (PsppireDataEditor *de);
-static void on_select_row (GtkSheet *, gint, PsppireDataEditor *);
-static void on_select_variable (GtkSheet *, gint, PsppireDataEditor *);
+static void on_select_row (PsppireSheet *, gint, PsppireDataEditor *);
+static void on_select_variable (PsppireSheet *, gint, PsppireDataEditor *);
static void on_owner_change (GtkClipboard *,
static void
init_sheet (PsppireDataEditor *de, int i,
- GtkAdjustment *hadj, GtkAdjustment *vadj)
+ GtkAdjustment *hadj, GtkAdjustment *vadj,
+ PsppireAxis *vaxis,
+ PsppireAxis *haxis
+ )
{
- PsppireAxisHetero *haxis = psppire_axis_hetero_new ();
- PsppireAxisUniform *vaxis = psppire_axis_uniform_new ();
de->sheet_bin[i] = gtk_scrolled_window_new (hadj, vadj);
- de->data_sheet[i] = gtk_sheet_new (NULL);
+ de->data_sheet[i] = psppire_sheet_new (NULL);
g_object_set (de->sheet_bin[i],
"border-width", 3,
static void
init_data_sheet (PsppireDataEditor *de)
{
- GtkAdjustment *va0, *ha0;
- GtkAdjustment *va1, *ha1;
+ GtkAdjustment *vadj0, *hadj0;
+ GtkAdjustment *vadj1, *hadj1;
GtkWidget *sheet ;
+ de->vaxis[0] = psppire_axis_new ();
+ de->vaxis[1] = psppire_axis_new ();
+
+ /* There's only one horizontal axis, since the
+ column widths are parameters of the variables */
+ de->haxis = psppire_axis_new ();
+
de->split = TRUE;
de->paned = gtk_xpaned_new ();
- init_sheet (de, 0, NULL, NULL);
+ init_sheet (de, 0, NULL, NULL, de->vaxis[0], de->haxis);
gtk_widget_show (de->sheet_bin[0]);
- va0 = gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (de->sheet_bin[0]));
- ha0 = gtk_scrolled_window_get_hadjustment (GTK_SCROLLED_WINDOW (de->sheet_bin[0]));
+ vadj0 = gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (de->sheet_bin[0]));
+ hadj0 = gtk_scrolled_window_get_hadjustment (GTK_SCROLLED_WINDOW (de->sheet_bin[0]));
g_object_set (de->sheet_bin[0], "vscrollbar-policy", GTK_POLICY_NEVER, NULL);
g_object_set (de->sheet_bin[0], "hscrollbar-policy", GTK_POLICY_NEVER, NULL);
- init_sheet (de, 1, NULL, va0);
+ init_sheet (de, 1, NULL, vadj0, de->vaxis[0], de->haxis);
gtk_widget_show (de->sheet_bin[1]);
sheet = gtk_bin_get_child (GTK_BIN (de->sheet_bin[1]));
- gtk_sheet_hide_row_titles (GTK_SHEET (sheet));
- ha1 = gtk_scrolled_window_get_hadjustment (GTK_SCROLLED_WINDOW (de->sheet_bin[1]));
+ psppire_sheet_hide_row_titles (PSPPIRE_SHEET (sheet));
+ hadj1 = gtk_scrolled_window_get_hadjustment (GTK_SCROLLED_WINDOW (de->sheet_bin[1]));
g_object_set (de->sheet_bin[1], "vscrollbar-policy", GTK_POLICY_ALWAYS, NULL);
g_object_set (de->sheet_bin[1], "hscrollbar-policy", GTK_POLICY_NEVER, NULL);
- init_sheet (de, 2, ha0, NULL);
+ init_sheet (de, 2, hadj0, NULL, de->vaxis[1], de->haxis);
gtk_widget_show (de->sheet_bin[2]);
sheet = gtk_bin_get_child (GTK_BIN (de->sheet_bin[2]));
- gtk_sheet_hide_column_titles (GTK_SHEET (sheet));
+ psppire_sheet_hide_column_titles (PSPPIRE_SHEET (sheet));
g_object_set (de->sheet_bin[2], "vscrollbar-policy", GTK_POLICY_NEVER, NULL);
g_object_set (de->sheet_bin[2], "hscrollbar-policy", GTK_POLICY_ALWAYS, NULL);
- va1 = gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (de->sheet_bin[2]));
+ vadj1 = gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (de->sheet_bin[2]));
- init_sheet (de, 3, ha1, va1);
+ init_sheet (de, 3, hadj1, vadj1, de->vaxis[1], de->haxis);
gtk_widget_show (de->sheet_bin[3]);
sheet = gtk_bin_get_child (GTK_BIN (de->sheet_bin[3]));
- gtk_sheet_hide_column_titles (GTK_SHEET (sheet));
- gtk_sheet_hide_row_titles (GTK_SHEET (sheet));
+ psppire_sheet_hide_column_titles (PSPPIRE_SHEET (sheet));
+ psppire_sheet_hide_row_titles (PSPPIRE_SHEET (sheet));
g_object_set (de->sheet_bin[3], "vscrollbar-policy", GTK_POLICY_ALWAYS, NULL);
g_object_set (de->sheet_bin[3], "hscrollbar-policy", GTK_POLICY_ALWAYS, NULL);
G_CALLBACK (on_switch_page),
NULL);
+ g_object_set (de, "can-focus", FALSE, NULL);
g_signal_connect (de, "map", G_CALLBACK (on_map), NULL);
-
- // gtk_sheet_hide_column_titles (de->var_sheet);
- // gtk_sheet_hide_row_titles (de->data_sheet);
+ // psppire_sheet_hide_column_titles (de->var_sheet);
+ // psppire_sheet_hide_row_titles (de->data_sheet);
de->dispose_has_run = FALSE;
gtk_widget_show_all (de->data_vbox);
}
-static void data_sheet_set_clip (GtkSheet *sheet);
+static void data_sheet_set_clip (PsppireSheet *sheet);
static void data_sheet_contents_received_callback (GtkClipboard *clipboard,
GtkSelectionData *sd,
gpointer data);
void
psppire_data_editor_clip_copy (PsppireDataEditor *de)
{
- data_sheet_set_clip (GTK_SHEET (de->data_sheet[0]));
+ data_sheet_set_clip (PSPPIRE_SHEET (de->data_sheet[0]));
}
void
{
gint max_rows, max_columns;
gint r;
- GtkSheetRange range;
+ PsppireSheetRange range;
PsppireDataStore *ds = de->data_store;
- data_sheet_set_clip (GTK_SHEET (de->data_sheet[0]));
+ data_sheet_set_clip (PSPPIRE_SHEET (de->data_sheet[0]));
/* Now blank all the cells */
- gtk_sheet_get_selected_range (GTK_SHEET (de->data_sheet[0]), &range);
+ psppire_sheet_get_selected_range (PSPPIRE_SHEET (de->data_sheet[0]), &range);
/* If nothing selected, then use active cell */
if ( range.row0 < 0 || range.col0 < 0 )
{
gint row, col;
- gtk_sheet_get_active_cell (GTK_SHEET (de->data_sheet[0]), &row, &col);
+ psppire_sheet_get_active_cell (PSPPIRE_SHEET (de->data_sheet[0]), &row, &col);
range.row0 = range.rowi = row;
range.col0 = range.coli = col;
}
/* and remove the selection */
- gtk_sheet_unselect_range (GTK_SHEET (de->data_sheet[0]));
+ psppire_sheet_unselect_range (PSPPIRE_SHEET (de->data_sheet[0]));
}
/* Popup menu related stuff */
static void
-popup_variable_menu (GtkSheet *sheet, gint column,
+popup_variable_column_menu (PsppireSheet *sheet, gint column,
GdkEventButton *event, gpointer data)
{
GtkMenu *menu = GTK_MENU (data);
PsppireDataStore *data_store =
- PSPPIRE_DATA_STORE (gtk_sheet_get_model (sheet));
+ PSPPIRE_DATA_STORE (psppire_sheet_get_model (sheet));
const struct variable *v =
psppire_dict_get_variable (data_store->dict, column);
if ( v && event->button == 3)
{
- gtk_sheet_select_column (sheet, column);
+ psppire_sheet_select_column (sheet, column);
+
+ gtk_menu_popup (menu,
+ NULL, NULL, NULL, NULL,
+ event->button, event->time);
+ }
+}
+
+
+static void
+popup_variable_row_menu (PsppireSheet *sheet, gint row,
+ GdkEventButton *event, gpointer data)
+{
+ GtkMenu *menu = GTK_MENU (data);
+
+ PsppireVarStore *var_store =
+ PSPPIRE_VAR_STORE (psppire_sheet_get_model (sheet));
+
+ const struct variable *v =
+ psppire_dict_get_variable (var_store->dict, row);
+
+ if ( v && event->button == 3)
+ {
+ psppire_sheet_select_row (sheet, row);
gtk_menu_popup (menu,
NULL, NULL, NULL, NULL,
static void
-popup_cases_menu (GtkSheet *sheet, gint row,
+popup_cases_menu (PsppireSheet *sheet, gint row,
GdkEventButton *event, gpointer data)
{
GtkMenu *menu = GTK_MENU (data);
PsppireDataStore *data_store =
- PSPPIRE_DATA_STORE (gtk_sheet_get_model (sheet));
+ PSPPIRE_DATA_STORE (psppire_sheet_get_model (sheet));
if ( row <= psppire_data_store_get_case_count (data_store) &&
event->button == 3)
{
- gtk_sheet_select_row (sheet, row);
+ psppire_sheet_select_row (sheet, row);
gtk_menu_popup (menu,
NULL, NULL, NULL, NULL,
void
psppire_data_editor_sort_ascending (PsppireDataEditor *de)
{
- GtkSheetRange range;
- gtk_sheet_get_selected_range (GTK_SHEET(de->data_sheet[0]), &range);
+ PsppireSheetRange range;
+ psppire_sheet_get_selected_range (PSPPIRE_SHEET(de->data_sheet[0]), &range);
do_sort (de->data_store, range.col0, FALSE);
}
void
psppire_data_editor_sort_descending (PsppireDataEditor *de)
{
- GtkSheetRange range;
- gtk_sheet_get_selected_range (GTK_SHEET(de->data_sheet[0]), &range);
+ PsppireSheetRange range;
+ psppire_sheet_get_selected_range (PSPPIRE_SHEET(de->data_sheet[0]), &range);
do_sort (de->data_store, range.col0, TRUE);
}
void
psppire_data_editor_insert_variable (PsppireDataEditor *de)
{
- glong posn = -1;
+ glong posn = 0;
- if ( de->data_sheet[0]->state == GTK_SHEET_COLUMN_SELECTED )
- posn = GTK_SHEET (de->data_sheet[0])->range.col0;
- else
- posn = GTK_SHEET (de->data_sheet[0])->active_cell.col;
-
- if ( posn == -1 ) posn = 0;
+ switch (gtk_notebook_get_current_page (GTK_NOTEBOOK (de)))
+ {
+ case PSPPIRE_DATA_EDITOR_DATA_VIEW:
+ if ( PSPPIRE_SHEET (de->data_sheet[0])->select_status
+ == PSPPIRE_SHEET_COLUMN_SELECTED )
+ posn = PSPPIRE_SHEET (de->data_sheet[0])->range.col0;
+ else
+ posn = PSPPIRE_SHEET (de->data_sheet[0])->active_cell.col;
+ break;
+ case PSPPIRE_DATA_EDITOR_VARIABLE_VIEW:
+ if ( PSPPIRE_SHEET (de->var_sheet)->select_status
+ == PSPPIRE_SHEET_ROW_SELECTED )
+ posn = PSPPIRE_SHEET (de->var_sheet)->range.row0;
+ else
+ posn = PSPPIRE_SHEET (de->var_sheet)->active_cell.row;
+ break;
+ default:
+ g_assert_not_reached ();
+ break;
+ };
psppire_dict_insert_variable (de->data_store->dict, posn, NULL);
}
{
glong posn = -1;
- if ( de->data_sheet[0]->state == GTK_SHEET_ROW_SELECTED )
- posn = GTK_SHEET (de->data_sheet[0])->range.row0;
+ if ( PSPPIRE_SHEET (de->data_sheet[0])->select_status == PSPPIRE_SHEET_ROW_SELECTED )
+ {
+ posn = PSPPIRE_SHEET (de->data_sheet[0])->range.row0;
+ }
else
- posn = GTK_SHEET (de->data_sheet[0])->active_cell.row;
+ {
+ posn = PSPPIRE_SHEET (de->data_sheet[0])->active_cell.row;
+ }
if ( posn == -1 ) posn = 0;
void
psppire_data_editor_delete_cases (PsppireDataEditor *de)
{
- gint first = GTK_SHEET (de->data_sheet[0])->range.row0;
- gint n = GTK_SHEET (de->data_sheet[0])->range.rowi - first + 1;
+ gint first = PSPPIRE_SHEET (de->data_sheet[0])->range.row0;
+ gint n = PSPPIRE_SHEET (de->data_sheet[0])->range.rowi - first + 1;
psppire_data_store_delete_cases (de->data_store, first, n);
- gtk_sheet_unselect_range (GTK_SHEET (de->data_sheet[0]));
+ psppire_sheet_unselect_range (PSPPIRE_SHEET (de->data_sheet[0]));
}
/* Delete the variables currently selected in the
switch (gtk_notebook_get_current_page (GTK_NOTEBOOK (de)))
{
case PSPPIRE_DATA_EDITOR_DATA_VIEW:
- first = GTK_SHEET (de->data_sheet[0])->range.col0;
- n = GTK_SHEET (de->data_sheet[0])->range.coli - first + 1;
+ first = PSPPIRE_SHEET (de->data_sheet[0])->range.col0;
+ n = PSPPIRE_SHEET (de->data_sheet[0])->range.coli - first + 1;
break;
case PSPPIRE_DATA_EDITOR_VARIABLE_VIEW:
- first = GTK_SHEET (de->var_sheet)->range.row0;
- n = GTK_SHEET (de->var_sheet)->range.rowi - first + 1;
+ first = PSPPIRE_SHEET (de->var_sheet)->range.row0;
+ n = PSPPIRE_SHEET (de->var_sheet)->range.rowi - first + 1;
break;
default:
g_assert_not_reached ();
psppire_dict_delete_variables (de->var_store->dict, first, n);
- gtk_sheet_unselect_range (GTK_SHEET (de->data_sheet[0]));
- gtk_sheet_unselect_range (GTK_SHEET (de->var_sheet));
+ psppire_sheet_unselect_range (PSPPIRE_SHEET (de->data_sheet[0]));
+ psppire_sheet_unselect_range (PSPPIRE_SHEET (de->var_sheet));
}
void
psppire_data_editor_show_grid (PsppireDataEditor *de, gboolean grid_visible)
{
- gtk_sheet_show_grid (GTK_SHEET (de->var_sheet), grid_visible);
- gtk_sheet_show_grid (GTK_SHEET (de->data_sheet[0]), grid_visible);
+ psppire_sheet_show_grid (PSPPIRE_SHEET (de->var_sheet), grid_visible);
+ psppire_sheet_show_grid (PSPPIRE_SHEET (de->data_sheet[0]), grid_visible);
+}
+
+
+static void
+set_font (GtkWidget *w, gpointer data)
+{
+ PangoFontDescription *font_desc = data;
+ GtkRcStyle *style = gtk_widget_get_modifier_style (w);
+
+ pango_font_description_free (style->font_desc);
+ style->font_desc = pango_font_description_copy (font_desc);
+
+ gtk_widget_modify_style (w, style);
+
+ if ( GTK_IS_CONTAINER (w))
+ gtk_container_foreach (GTK_CONTAINER (w), set_font, font_desc);
}
void
psppire_data_editor_set_font (PsppireDataEditor *de, PangoFontDescription *font_desc)
{
- psppire_data_store_set_font (de->data_store, font_desc);
- psppire_var_store_set_font (de->var_store, font_desc);
+ set_font (GTK_WIDGET (de), font_desc);
+ gtk_container_foreach (GTK_CONTAINER (de), set_font, font_desc);
}
on_activate (PsppireDataEditor *de)
{
gint row, col;
- gtk_sheet_get_active_cell (GTK_SHEET (de->data_sheet[0]), &row, &col);
+ psppire_sheet_get_active_cell (PSPPIRE_SHEET (de->data_sheet[0]), &row, &col);
if ( row < psppire_data_store_get_case_count (de->data_store)
static void
on_select_range (PsppireDataEditor *de)
{
- GtkSheetRange range;
+ PsppireSheetRange range;
- gtk_sheet_get_selected_range (GTK_SHEET (de->data_sheet[0]), &range);
+ psppire_sheet_get_selected_range (PSPPIRE_SHEET (de->data_sheet[0]), &range);
if ( range.rowi < psppire_data_store_get_case_count (de->data_store)
&&
on_switch_page (PsppireDataEditor *de, GtkNotebookPage *p,
gint pagenum, gpointer data)
{
- if ( pagenum != PSPPIRE_DATA_EDITOR_DATA_VIEW )
+ switch (pagenum)
{
+ case PSPPIRE_DATA_EDITOR_DATA_VIEW:
+ gtk_widget_grab_focus (de->data_vbox);
+ on_select_range (de);
+ break;
+ case PSPPIRE_DATA_EDITOR_VARIABLE_VIEW:
+ gtk_widget_grab_focus (de->var_sheet);
emit_selected_signal (de);
- return TRUE;
- }
-
- on_select_range (de);
+ break;
+ default:
+ break;
+ };
return TRUE;
}
static gboolean
data_is_selected (PsppireDataEditor *de)
{
- GtkSheetRange range;
+ PsppireSheetRange range;
gint row, col;
if ( gtk_notebook_get_current_page (GTK_NOTEBOOK (de)) != PSPPIRE_DATA_EDITOR_DATA_VIEW)
return FALSE;
- gtk_sheet_get_active_cell (GTK_SHEET (de->data_sheet[0]), &row, &col);
+ psppire_sheet_get_active_cell (PSPPIRE_SHEET (de->data_sheet[0]), &row, &col);
if ( row >= psppire_data_store_get_case_count (de->data_store)
||
return FALSE;
}
- gtk_sheet_get_selected_range (GTK_SHEET (de->data_sheet[0]), &range);
+ psppire_sheet_get_selected_range (PSPPIRE_SHEET (de->data_sheet[0]), &range);
if ( range.rowi >= psppire_data_store_get_case_count (de->data_store)
||
static void
-on_select_row (GtkSheet *sheet, gint row, PsppireDataEditor *de)
+on_select_row (PsppireSheet *sheet, gint row, PsppireDataEditor *de)
{
g_signal_emit (de, data_editor_signals[CASES_SELECTED], 0, row);
}
static void
-on_select_variable (GtkSheet *sheet, gint var, PsppireDataEditor *de)
+on_select_variable (PsppireSheet *sheet, gint var, PsppireDataEditor *de)
{
g_signal_emit (de, data_editor_signals[VARIABLES_SELECTED], 0, var);
}
static struct dictionary *clip_dict = NULL;
-static void data_sheet_update_clipboard (GtkSheet *);
+static void data_sheet_update_clipboard (PsppireSheet *);
/* Set the clip according to the currently
selected range in the data sheet */
static void
-data_sheet_set_clip (GtkSheet *sheet)
+data_sheet_set_clip (PsppireSheet *sheet)
{
int i;
struct casewriter *writer ;
- GtkSheetRange range;
+ PsppireSheetRange range;
PsppireDataStore *ds;
struct case_map *map = NULL;
casenumber max_rows;
size_t max_columns;
- ds = PSPPIRE_DATA_STORE (gtk_sheet_get_model (sheet));
+ ds = PSPPIRE_DATA_STORE (psppire_sheet_get_model (sheet));
- gtk_sheet_get_selected_range (sheet, &range);
+ psppire_sheet_get_selected_range (sheet, &range);
/* If nothing selected, then use active cell */
if ( range.row0 < 0 || range.col0 < 0 )
{
gint row, col;
- gtk_sheet_get_active_cell (sheet, &row, &col);
+ psppire_sheet_get_active_cell (sheet, &row, &col);
range.row0 = range.rowi = row;
range.col0 = range.coli = col;
/* Construct clip data. */
map = case_map_by_name (ds->dict->dict, clip_dict);
- writer = autopaging_writer_create (dict_get_next_value_idx (clip_dict));
+ writer = autopaging_writer_create (dict_get_proto (clip_dict));
for (i = range.row0; i <= range.rowi ; ++i )
{
- struct ccase old;
-
- if (psppire_case_file_get_case (ds->case_file, i, &old))
- {
- struct ccase new;
-
- case_map_execute (map, &old, &new);
- case_destroy (&old);
- casewriter_write (writer, &new);
- }
+ struct ccase *old = psppire_data_store_get_case (ds, i);
+ if (old != NULL)
+ casewriter_write (writer, case_map_execute (map, old));
else
casewriter_force_error (writer);
}
data_out_g_string (GString *string, const struct variable *v,
const struct ccase *cc)
{
- char *buf ;
-
const struct fmt_spec *fs = var_get_print_format (v);
const union value *val = case_data (cc, v);
- buf = xzalloc (fs->w);
- data_out (val, fs, buf);
+ char *s = data_out (val, fs);
- g_string_append_len (string, buf, fs->w);
+ g_string_append_len (string, s, fs->w);
- g_free (buf);
+ g_free (s);
}
static GString *
casenumber r;
GString *string;
- const size_t val_cnt = casereader_get_value_cnt (clip_datasheet);
+ const size_t val_cnt = caseproto_get_n_widths (casereader_get_proto (clip_datasheet));
const casenumber case_cnt = casereader_get_case_cnt (clip_datasheet);
const size_t var_cnt = dict_get_var_cnt (clip_dict);
for (r = 0 ; r < case_cnt ; ++r )
{
int c;
- struct ccase cc;
- if ( ! casereader_peek (clip_datasheet, r, &cc))
+ struct ccase *cc;
+
+ cc = casereader_peek (clip_datasheet, r);
+ if (cc == NULL)
{
g_warning ("Clipboard seems to have inexplicably shrunk");
break;
for (c = 0 ; c < var_cnt ; ++c)
{
const struct variable *v = dict_get_var (clip_dict, c);
- data_out_g_string (string, v, &cc);
+ data_out_g_string (string, v, cc);
if ( c < val_cnt - 1 )
g_string_append (string, "\t");
}
if ( r < case_cnt)
g_string_append (string, "\n");
- case_destroy (&cc);
+ case_unref (cc);
}
return string;
casenumber r;
GString *string;
- const size_t val_cnt = casereader_get_value_cnt (clip_datasheet);
+ const size_t val_cnt = caseproto_get_n_widths (casereader_get_proto (clip_datasheet));
const casenumber case_cnt = casereader_get_case_cnt (clip_datasheet);
const size_t var_cnt = dict_get_var_cnt (clip_dict);
for (r = 0 ; r < case_cnt ; ++r )
{
int c;
- struct ccase cc;
- if ( ! casereader_peek (clip_datasheet, r, &cc))
+ struct ccase *cc = casereader_peek (clip_datasheet, r);
+ if (cc == NULL)
{
g_warning ("Clipboard seems to have inexplicably shrunk");
break;
{
const struct variable *v = dict_get_var (clip_dict, c);
g_string_append (string, "<td>");
- data_out_g_string (string, v, &cc);
+ data_out_g_string (string, v, cc);
g_string_append (string, "</td>\n");
}
g_string_append (string, "</tr>\n");
- case_destroy (&cc);
+ case_unref (cc);
}
g_string_append (string, "</table>\n");
static void
-data_sheet_update_clipboard (GtkSheet *sheet)
+data_sheet_update_clipboard (PsppireSheet *sheet)
{
GtkClipboard *clipboard =
gtk_widget_get_clipboard (GTK_WIDGET (sheet),
c = (char *) sd->data;
/* Paste text to selected position */
- gtk_sheet_get_active_cell (GTK_SHEET (data_editor->data_sheet[0]),
+ psppire_sheet_get_active_cell (PSPPIRE_SHEET (data_editor->data_sheet[0]),
&row, &column);
g_return_if_fail (row >= 0);
g_signal_emit (de, data_editor_signals[DATA_AVAILABLE_CHANGED], 0,
compatible_target);
}
-
-
projects / pspp-builds.git / blobdiff