projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added a BACKEND_CHANGED signal on PsppireDict, and handled it accordingly.
[pspp-builds.git]
/
src
/
ui
/
gui
/
data-sheet.c
diff --git
a/src/ui/gui/data-sheet.c
b/src/ui/gui/data-sheet.c
index 20869dcb0b0939466fdb16e3847779a83c8ca547..df0bf3837f381d2fba785b872c91d15c678b6c39 100644
(file)
--- a/
src/ui/gui/data-sheet.c
+++ b/
src/ui/gui/data-sheet.c
@@
-1,11
+1,9
@@
-/*
- PSPPIRE --- A Graphical User Interface for PSPP
+/* PSPPIRE - a graphical user interface for PSPP.
Copyright (C) 2004, 2005, 2006 Free Software Foundation
Copyright (C) 2004, 2005, 2006 Free Software Foundation
- Written by John Darrington
- This program is free software
;
you can redistribute it and/or modify
+ 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
it under the terms of the GNU General Public License as published by
- the Free Software Foundation
; either version 2
of the License, or
+ the Free Software Foundation
, either version 3
of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
(at your option) any later version.
This program is distributed in the hope that it will be useful,
@@
-14,11
+12,9
@@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- 02110-1301, USA.
-*/
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
+#include <config.h>
#include <gtk/gtk.h>
#include <glade/glade.h>
#include <gtk/gtk.h>
#include <glade/glade.h>
@@
-29,7
+25,6
@@
#include <gtksheet/gsheet-uniform-row.h>
#include "psppire-dict.h"
#include <gtksheet/gsheet-uniform-row.h>
#include "psppire-dict.h"
-#include "psppire-variable.h"
#include "psppire-data-store.h"
#include "helper.h"
#include "psppire-data-store.h"
#include "helper.h"
@@
-37,120
+32,110
@@
#include <data/case.h>
#include <data/data-in.h>
#include <data/case.h>
#include <data/data-in.h>
-#include "menu-actions.h"
#include "data-sheet.h"
#include "data-sheet.h"
-#define _(A) A
-#define N_(A) A
-
-extern GladeXML *xml;
-
-
-static gboolean
-traverse_callback (GtkSheet * sheet,
- gint row, gint col,
- gint *new_row, gint *new_column
- )
+static gboolean
+traverse_callback (GtkSheet * sheet,
+ gint row, gint col,
+ gint *new_row, gint *new_column
+ )
{
{
- PsppireDataStore *data_store = PSPPIRE_DATA_STORE(gtk_sheet_get_model(sheet));
+ gint case_count;
+ gint n_vars;
- const gint n_vars = psppire_dict_get_var_cnt(data_store->dict);
+ PsppireDataStore *data_store =
+ PSPPIRE_DATA_STORE (gtk_sheet_get_model (sheet));
- if ( *new_column >= n_vars )
- return FALSE;
- return TRUE;
-}
+ g_assert (data_store);
+ n_vars = psppire_dict_get_var_cnt (data_store->dict);
+ if ( *new_column >= n_vars )
+ return FALSE;
-/* Callback which occurs when the column title is double clicked */
-static gboolean
-click2column(GtkWidget *w, gint col, gpointer data)
-{
- gint current_row, current_column;
- GtkWidget *var_sheet = get_widget_assert(xml, "variable_sheet");
+ case_count = psppire_case_file_get_case_count (data_store->case_file);
- select_sheet(PAGE_VAR_SHEET);
+ if ( *new_row >= case_count )
+ {
+ gint i;
- gtk_sheet_get_active_cell(GTK_SHEET(var_sheet),
-
¤t_row, ¤t_column
);
+ for ( i = case_count ; i <= *new_row; ++i )
+
psppire_data_store_insert_new_case (data_store, i
);
- gtk_sheet_set_active_cell(GTK_SHEET(var_sheet), col, current_column);
+ return TRUE;
+ }
- return
FALS
E;
+ return
TRU
E;
}
}
+extern PsppireDataStore *the_data_store ;
-/* Update the data_ref_entry with the reference of the active cell */
-static gint
-update_data_ref_entry(GtkSheet *sheet, gint row, gint col)
+
+/* Return the width that an 'M' character would occupy when typeset in WIDGET */
+static guint
+calc_m_width (GtkWidget *widget, const PangoFontDescription *font_desc)
{
{
+ PangoRectangle rect;
+ PangoLayout *layout ;
+ PangoContext * context;
- /* The entry where the reference to the current cell is displayed */
- GtkEntry *cell_ref_entry;
+ context = gtk_widget_create_pango_context (widget);
+ g_assert (context);
+ layout = pango_layout_new (context);
+ g_assert (layout);
- PsppireDataStore *data_store = PSPPIRE_DATA_STORE(gtk_sheet_get_model(sheet));
- if (data_store)
- {
- const struct PsppireVariable *pv =
- psppire_dict_get_variable(data_store->dict, col);
+ pango_layout_set_text (layout, "M", 1);
- gchar *text ;
- gchar *s ;
+ pango_layout_set_font_description (layout, font_desc);
- if ( !xml)
- return FALSE;
+ pango_layout_get_extents (layout, NULL, &rect);
- text = g_strdup_printf("%d: %s", row,
- pv ? psppire_variable_get_name(pv) : "");
-
- cell_ref_entry = GTK_ENTRY(get_widget_assert(xml, "cell_ref_entry"));
+ g_object_unref (G_OBJECT (layout));
+ g_object_unref (G_OBJECT (context));
- s = pspp_locale_to_utf8(text, -1, 0);
+ return PANGO_PIXELS (rect.width);
+}
- g_free(text);
- gtk_entry_set_text(cell_ref_entry, s);
- g_free(s);
- }
+void
+font_change_callback (GObject *obj, gpointer data)
+{
+ GtkWidget *sheet = data;
+ PsppireDataStore *ds = PSPPIRE_DATA_STORE (obj);
-
return FALSE
;
+
ds->width_of_m = calc_m_width (sheet, ds->font_desc)
;
}
}
-extern PsppireDataStore *data_store ;
-
-GtkWidget*
+G
_MODULE_EXPORT G
tkWidget*
psppire_data_sheet_create (gchar *widget_name, gchar *string1, gchar *string2,
gint int1, gint int2)
{
GtkWidget *sheet;
psppire_data_sheet_create (gchar *widget_name, gchar *string1, gchar *string2,
gint int1, gint int2)
{
GtkWidget *sheet;
- const gint rows = 10046;
+ sheet = gtk_sheet_new (G_SHEET_ROW (the_data_store),
+ G_SHEET_COLUMN (the_data_store), "data sheet", 0);
- GObject *row_geometry = g_sheet_uniform_row_new(25, rows);
+ the_data_store->width_of_m = calc_m_width (sheet, the_data_store->font_desc);
- sheet = gtk_sheet_new(G_SHEET_ROW(row_geometry),
- G_SHEET_COLUMN(data_store), "data sheet", 0);
+ g_signal_connect (G_OBJECT (sheet), "traverse",
+ G_CALLBACK (traverse_callback), 0);
- g_signal_connect (GTK_OBJECT (sheet), "activate",
- GTK_SIGNAL_FUNC (update_data_ref_entry),
- 0);
+ g_signal_connect (G_OBJECT (the_data_store), "font-changed",
+ G_CALLBACK (font_change_callback), sheet);
- g_signal_connect (GTK_OBJECT (sheet), "traverse",
- GTK_SIGNAL_FUNC (traverse_callback), 0);
+ gtk_sheet_set_active_cell (GTK_SHEET (sheet), -1, -1);
+ gtk_sheet_set_model (GTK_SHEET (sheet), G_SHEET_MODEL (the_data_store));
- g_signal_connect (GTK_OBJECT (sheet), "double-click-column",
- GTK_SIGNAL_FUNC (click2column),
- 0);
+ gtk_sheet_set_autoscroll (GTK_SHEET (sheet), FALSE);
- gtk_widget_show(sheet);
+ gtk_widget_show
(sheet);
return sheet;
}
return sheet;
}