src_ui_gui_psppire_SOURCES += \
- src/ui/gui/efficient-sheet/jmd-axis-model.c \
- src/ui/gui/efficient-sheet/jmd-constraint.c \
- src/ui/gui/efficient-sheet/jmd-sheet.c \
- src/ui/gui/efficient-sheet/jmd-sheet-axis.c \
- src/ui/gui/efficient-sheet/jmd-sheet-body.c \
- src/ui/gui/efficient-sheet/jmd-sheet-single.c \
- src/ui/gui/efficient-sheet/jmd-datum.c \
- src/ui/gui/efficient-sheet/jmd-cell.c
-
+ src/ui/gui/efficient-sheet/src/jmd-axis-model.c \
+ src/ui/gui/efficient-sheet/src/jmd-constraint.c \
+ src/ui/gui/efficient-sheet/src/jmd-sheet.c \
+ src/ui/gui/efficient-sheet/src/jmd-sheet-axis.c \
+ src/ui/gui/efficient-sheet/src/jmd-sheet-body.c \
+ src/ui/gui/efficient-sheet/src/jmd-sheet-single.c \
+ src/ui/gui/efficient-sheet/src/jmd-datum.c \
+ src/ui/gui/efficient-sheet/src/jmd-cell.c
nodist_src_ui_gui_psppire_SOURCES += \
src/ui/gui/efficient-sheet/jmd-marshaller.c \
src/ui/gui/efficient-sheet/jmd-marshaller.h
-src_ui_gui_psppire_CPPFLAGS+=-Isrc/ui/gui/efficient-sheet
-
-
+src_ui_gui_psppire_CPPFLAGS+=-Isrc/ui/gui/efficient-sheet/src
BUILT_SOURCES += \
- src/ui/gui/efficient-sheet/jmd-marshaller.c \
- src/ui/gui/efficient-sheet/jmd-marshaller.h
+ src/ui/gui/efficient-sheet/src/jmd-marshaller.c \
+ src/ui/gui/efficient-sheet/src/jmd-marshaller.h
-src/ui/gui/efficient-sheet/jmd-marshaller.c: src/ui/gui/efficient-sheet/marshall-list
+src/ui/gui/efficient-sheet/src/jmd-marshaller.c: src/ui/gui/efficient-sheet/src/marshall-list
glib-genmarshal --body --prefix=jmd_cclosure_marshal $< > $@
-src/ui/gui/efficient-sheet/jmd-marshaller.h: src/ui/gui/efficient-sheet/marshall-list
+src/ui/gui/efficient-sheet/src/jmd-marshaller.h: src/ui/gui/efficient-sheet/src/marshall-list
glib-genmarshal --header --prefix=jmd_cclosure_marshal $< > $@
#include "psppire-dialog.h"
#include "psppire-data-window.h"
#include "psppire-data-store.h"
-#include "ui/gui/efficient-sheet/jmd-sheet.h"
+#include "psppire-data-sheet.h"
static void
-refresh (JmdSheet *ds, GtkBuilder *xml)
+refresh (PsppireDataSheet *ds, GtkBuilder *xml)
{
+ PsppireDataStore *store = NULL;
+ g_object_get (ds, "data-model", &store, NULL);
+
GtkWidget *case_num_entry = get_widget_assert (xml, "goto-case-case-num-entry");
- casenumber case_count = gtk_tree_model_iter_n_children (ds->data_model, NULL);
+ casenumber case_count = gtk_tree_model_iter_n_children (GTK_TREE_MODEL (store), NULL);
gtk_spin_button_set_range (GTK_SPIN_BUTTON (case_num_entry), 1, case_count);
}
void
-goto_case_dialog (JmdSheet *ds)
+goto_case_dialog (PsppireDataSheet *ds)
{
GtkWindow *top_level;
gint response;
if (response == PSPPIRE_RESPONSE_GOTO)
{
+ PsppireDataStore *store = NULL;
+ g_object_get (ds, "data-model", &store, NULL);
+
GtkWidget *case_num_entry =
get_widget_assert (xml, "goto-case-case-num-entry");
- FIRST_CASE_NUMBER ;
if (case_num >= 0 &&
- case_num < gtk_tree_model_iter_n_children (ds->data_model, NULL))
+ case_num < gtk_tree_model_iter_n_children (GTK_TREE_MODEL (ds), NULL))
{
jmd_sheet_scroll_to (ds, -1, case_num);
jmd_sheet_set_active_cell (ds, -1, case_num, 0);
#ifndef __GOTO_CASE_DIALOG_H
#define __GOTO_CASE_DIALOG_H
-#include "ui/gui/efficient-sheet/jmd-sheet.h"
+#include "psppire-data-sheet.h"
-void goto_case_dialog (JmdSheet *ds);
+void goto_case_dialog (PsppireDataSheet *ds);
#endif
#include "ui/gui/psppire-data-sheet.h"
-#include "ui/gui/efficient-sheet/jmd-sheet.h"
+#include "ui/gui/efficient-sheet/src/jmd-sheet.h"
#include <gettext.h>
#define _(msgid) gettext (msgid)
#define _PSPPIRE_DATA_SHEET_H
#include <gtk/gtk.h>
-#include "ui/gui/efficient-sheet/jmd-sheet.h"
+#include "ui/gui/efficient-sheet/src/jmd-sheet.h"
struct _PsppireDataSheet
{
#include "gl/c-strcasestr.h"
#include "gl/xvasprintf.h"
-#include "ui/gui/efficient-sheet/jmd-sheet.h"
+#include "ui/gui/efficient-sheet/src/jmd-sheet.h"
#include "find-dialog.h"
#include "options-dialog.h"
int p = gtk_notebook_get_current_page (GTK_NOTEBOOK (de));
if (p == PSPPIRE_DATA_EDITOR_DATA_VIEW)
{
- goto_case_dialog (JMD_SHEET (de->data_sheet));
+ goto_case_dialog (PSPPIRE_DATA_SHEET (de->data_sheet));
}
}
#include "ui/gui/psppire-marshal.h"
#include "ui/gui/psppire-var-ptr.h"
-#include "ui/gui/efficient-sheet/jmd-datum.h"
+#include "ui/gui/efficient-sheet/src/jmd-datum.h"
#include <gobject/genums.h>
#include "psppire-var-sheet-header.h"
-#include "efficient-sheet/jmd-axis-model.h"
-#include "efficient-sheet/jmd-datum.h"
+#include "efficient-sheet/src/jmd-axis-model.h"
+#include "efficient-sheet/src/jmd-datum.h"
enum {CHANGED,
n_SIGNALS};
#define _PSPPIRE_VARIABLE_SHEET_H
#include <gtk/gtk.h>
-#include "ui/gui/efficient-sheet/jmd-sheet.h"
+#include "ui/gui/efficient-sheet/src/jmd-sheet.h"
struct _PsppireVariableSheet