X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire-data-window.c;h=4a23cf1f401b766d8065ac5ae271dd5410022a41;hb=43f0e5bf6c53ee0ba31b259aab230861baa4eb7e;hp=d11dc3fa867777d056e04305fb213fea857eab56;hpb=0c120e1c2f74ace50987771f1102fa609fd271cd;p=pspp diff --git a/src/ui/gui/psppire-data-window.c b/src/ui/gui/psppire-data-window.c index d11dc3fa86..b020d19ecf 100644 --- a/src/ui/gui/psppire-data-window.c +++ b/src/ui/gui/psppire-data-window.c @@ -1,5 +1,5 @@ /* PSPPIRE - a graphical user interface for PSPP. - Copyright (C) 2008, 2009, 2010 Free Software Foundation + Copyright (C) 2008, 2009, 2010, 2011, 2012, 2013, 2014 Free Software Foundation 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 @@ -16,63 +16,62 @@ #include -#include -#include +#include #include -#include "data/any-reader.h" -#include "data/procedure.h" -#include "language/syntax-string-source.h" +#include "data/dataset.h" +#include "data/session.h" +#include "language/lexer/lexer.h" #include "libpspp/message.h" -#include "ui/gui/about.h" -#include "ui/gui/comments-dialog.h" -#include "ui/gui/compute-dialog.h" -#include "ui/gui/correlation-dialog.h" -#include "ui/gui/crosstabs-dialog.h" -#include "ui/gui/descriptives-dialog.h" -#include "ui/gui/examine-dialog.h" +#include "libpspp/str.h" +#include "ui/gui/builder-wrapper.h" +#include "ui/gui/entry-dialog.h" #include "ui/gui/executor.h" -#include "ui/gui/factor-dialog.h" -#include "ui/gui/find-dialog.h" -#include "ui/gui/frequencies-dialog.h" -#include "ui/gui/goto-case-dialog.h" +#include "ui/gui/help-menu.h" #include "ui/gui/helper.h" -#include "ui/gui/oneway-anova-dialog.h" +#include "ui/gui/helper.h" +#include "ui/gui/psppire-import-assistant.h" #include "ui/gui/psppire-data-window.h" +#include "ui/gui/psppire-dialog-action.h" +#include "ui/gui/psppire-encoding-selector.h" #include "ui/gui/psppire-syntax-window.h" #include "ui/gui/psppire-window.h" #include "ui/gui/psppire.h" -#include "ui/gui/rank-dialog.h" #include "ui/gui/recode-dialog.h" -#include "ui/gui/regression-dialog.h" -#include "ui/gui/reliability-dialog.h" -#include "ui/gui/roc-dialog.h" #include "ui/gui/select-cases-dialog.h" -#include "ui/gui/sort-cases-dialog.h" -#include "ui/gui/split-file-dialog.h" -#include "ui/gui/t-test-independent-samples-dialog.h" -#include "ui/gui/t-test-one-sample.h" -#include "ui/gui/t-test-paired-samples.h" -#include "ui/gui/text-data-import-dialog.h" -#include "ui/gui/transpose-dialog.h" -#include "ui/gui/variable-info-dialog.h" -#include "ui/gui/weight-cases-dialog.h" #include "ui/syntax-gen.h" +#include "gl/c-strcase.h" +#include "gl/c-strcasestr.h" +#include "gl/xvasprintf.h" + #include #define _(msgid) gettext (msgid) #define N_(msgid) msgid +struct session *the_session; +struct ll_list all_data_windows = LL_INITIALIZER (all_data_windows); - -static void psppire_data_window_base_finalize (PsppireDataWindowClass *, gpointer); -static void psppire_data_window_base_init (PsppireDataWindowClass *class); static void psppire_data_window_class_init (PsppireDataWindowClass *class); static void psppire_data_window_init (PsppireDataWindow *data_editor); static void psppire_data_window_iface_init (PsppireWindowIface *iface); +static void psppire_data_window_dispose (GObject *object); +static void psppire_data_window_finalize (GObject *object); +static void psppire_data_window_set_property (GObject *object, + guint prop_id, + const GValue *value, + GParamSpec *pspec); +static void psppire_data_window_get_property (GObject *object, + guint prop_id, + GValue *value, + GParamSpec *pspec); + +static guint psppire_data_window_add_ui (PsppireDataWindow *, GtkUIManager *); +static void psppire_data_window_remove_ui (PsppireDataWindow *, + GtkUIManager *, guint); GType psppire_data_window_get_type (void) @@ -84,8 +83,8 @@ psppire_data_window_get_type (void) static const GTypeInfo psppire_data_window_info = { sizeof (PsppireDataWindowClass), - (GBaseInitFunc) psppire_data_window_base_init, - (GBaseFinalizeFunc) psppire_data_window_base_finalize, + NULL, + NULL, (GClassInitFunc)psppire_data_window_class_init, (GClassFinalizeFunc) NULL, NULL, @@ -105,7 +104,7 @@ psppire_data_window_get_type (void) g_type_register_static (PSPPIRE_TYPE_WINDOW, "PsppireDataWindow", &psppire_data_window_info, 0); - + g_type_add_interface_static (psppire_data_window_type, PSPPIRE_TYPE_WINDOW_MODEL, &window_interface_info); @@ -116,76 +115,34 @@ psppire_data_window_get_type (void) static GObjectClass *parent_class ; -static void -psppire_data_window_finalize (GObject *object) -{ - PsppireDataWindow *de = PSPPIRE_DATA_WINDOW (object); - - g_object_unref (de->builder); - - if (G_OBJECT_CLASS (parent_class)->finalize) - (*G_OBJECT_CLASS (parent_class)->finalize) (object); -} - +enum { + PROP_DATASET = 1 +}; static void psppire_data_window_class_init (PsppireDataWindowClass *class) -{ - parent_class = g_type_class_peek_parent (class); -} - - -static void -psppire_data_window_base_init (PsppireDataWindowClass *class) { GObjectClass *object_class = G_OBJECT_CLASS (class); - object_class->finalize = psppire_data_window_finalize; -} - - + parent_class = g_type_class_peek_parent (class); -static void -psppire_data_window_base_finalize (PsppireDataWindowClass *class, - gpointer class_data) -{ + object_class->dispose = psppire_data_window_dispose; + object_class->finalize = psppire_data_window_finalize; + object_class->set_property = psppire_data_window_set_property; + object_class->get_property = psppire_data_window_get_property; + + g_object_class_install_property ( + object_class, PROP_DATASET, + g_param_spec_pointer ("dataset", "Dataset", + "'struct datset *' represented by the window", + G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE)); } - - - - -extern PsppireVarStore *the_var_store; -extern struct dataset *the_dataset; -extern PsppireDataStore *the_data_store ; - -extern GtkRecentManager *the_recent_mgr; - -static void -set_paste_menuitem_sensitivity (PsppireDataWindow *de, gboolean x) -{ - GtkAction *edit_paste = get_action_assert (de->builder, "edit_paste"); - - gtk_action_set_sensitive (edit_paste, x); -} - -static void -set_cut_copy_menuitem_sensitivity (PsppireDataWindow *de, gboolean x) -{ - GtkAction *edit_copy = get_action_assert (de->builder, "edit_copy"); - GtkAction *edit_cut = get_action_assert (de->builder, "edit_cut"); - - gtk_action_set_sensitive (edit_copy, x); - gtk_action_set_sensitive (edit_cut, x); -} - /* Run the EXECUTE command. */ static void -execute (GtkMenuItem *mi, gpointer data) +execute (PsppireDataWindow *dw) { - struct getl_interface *sss = create_syntax_string_source ("EXECUTE."); - - execute_syntax (sss); + execute_const_syntax_string (dw, "EXECUTE."); } static void @@ -194,15 +151,18 @@ transformation_change_callback (bool transformations_pending, { PsppireDataWindow *de = PSPPIRE_DATA_WINDOW (data); - GtkUIManager *uim = GTK_UI_MANAGER (get_object_assert (de->builder, "uimanager1", GTK_TYPE_UI_MANAGER)); - - GtkWidget *menuitem = - gtk_ui_manager_get_widget (uim,"/ui/menubar/transform/transform_run-pending"); - GtkWidget *status_label = get_widget_assert (de->builder, "case-counter-area"); - gtk_widget_set_sensitive (menuitem, transformations_pending); + { /* Set the sensitivity of the "Transformations Pending" menuitem */ + GtkUIManager *uim = + GTK_UI_MANAGER (get_object_assert (de->builder, "uimanager1", GTK_TYPE_UI_MANAGER)); + + GtkWidget *menuitem = + gtk_ui_manager_get_widget (uim,"/ui/menubar/transform/transform_run-pending"); + + gtk_widget_set_sensitive (menuitem, transformations_pending); + } if ( transformations_pending) @@ -227,13 +187,11 @@ on_filter_change (GObject *o, gint filter_index, gpointer data) } else { - PsppireVarStore *vs = NULL; PsppireDict *dict = NULL; struct variable *var ; gchar *text ; - g_object_get (de->data_editor, "var-store", &vs, NULL); - g_object_get (vs, "dictionary", &dict, NULL); + g_object_get (de->data_editor, "dictionary", &dict, NULL); var = psppire_dict_get_variable (dict, filter_index); @@ -300,13 +258,11 @@ on_weight_change (GObject *o, gint weight_index, gpointer data) else { struct variable *var ; - PsppireVarStore *vs = NULL; PsppireDict *dict = NULL; gchar *text; - g_object_get (de->data_editor, "var-store", &vs, NULL); - g_object_get (vs, "dictionary", &dict, NULL); - + g_object_get (de->data_editor, "dictionary", &dict, NULL); + var = psppire_dict_get_variable (dict, weight_index); text = g_strdup_printf (_("Weight by %s"), var_get_name (var)); @@ -345,304 +301,266 @@ dump_rm (GtkRecentManager *rm) } #endif - static gboolean -load_file (PsppireWindow *de, const gchar *file_name) +has_suffix (const gchar *name, const gchar *suffix) { - gchar *native_file_name; - struct getl_interface *sss; - struct string filename; - - ds_init_empty (&filename); - - native_file_name = - convert_glib_filename_to_system_filename (file_name, NULL); - - syntax_gen_string (&filename, ss_cstr (native_file_name)); - - g_free (native_file_name); - - sss = create_syntax_string_source ("GET FILE=%s.", - ds_cstr (&filename)); - - ds_destroy (&filename); - - if (execute_syntax (sss) ) - return TRUE; - - return FALSE; + size_t name_len = strlen (name); + size_t suffix_len = strlen (suffix); + return (name_len > suffix_len + && !c_strcasecmp (&name[name_len - suffix_len], suffix)); } -static GtkWidget * -sysfile_chooser_dialog (PsppireWindow *toplevel) +static gboolean +name_has_por_suffix (const gchar *name) { - GtkWidget *dialog = - gtk_file_chooser_dialog_new (_("Open"), - GTK_WINDOW (toplevel), - GTK_FILE_CHOOSER_ACTION_OPEN, - GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, - GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT, - NULL); - - GtkFileFilter *filter; - - filter = gtk_file_filter_new (); - gtk_file_filter_set_name (filter, _("Data and Syntax Files")); - gtk_file_filter_add_pattern (filter, "*.sav"); - gtk_file_filter_add_pattern (filter, "*.SAV"); - gtk_file_filter_add_pattern (filter, "*.por"); - gtk_file_filter_add_pattern (filter, "*.POR"); - gtk_file_filter_add_pattern (filter, "*.sps"); - gtk_file_filter_add_pattern (filter, "*.SPS"); - gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (dialog), filter); - - filter = gtk_file_filter_new (); - gtk_file_filter_set_name (filter, _("System Files (*.sav)")); - gtk_file_filter_add_pattern (filter, "*.sav"); - gtk_file_filter_add_pattern (filter, "*.SAV"); - gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (dialog), filter); - - filter = gtk_file_filter_new (); - gtk_file_filter_set_name (filter, _("Portable Files (*.por) ")); - gtk_file_filter_add_pattern (filter, "*.por"); - gtk_file_filter_add_pattern (filter, "*.POR"); - gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (dialog), filter); + return has_suffix (name, ".por"); +} - filter = gtk_file_filter_new (); - gtk_file_filter_set_name (filter, _("Syntax Files (*.sps) ")); - gtk_file_filter_add_pattern (filter, "*.sps"); - gtk_file_filter_add_pattern (filter, "*.SPS"); - gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (dialog), filter); +static gboolean +name_has_sav_suffix (const gchar *name) +{ + return has_suffix (name, ".sav") || has_suffix (name, ".zsav"); +} - filter = gtk_file_filter_new (); - gtk_file_filter_set_name (filter, _("All Files")); - gtk_file_filter_add_pattern (filter, "*"); - gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (dialog), filter); +/* Returns true if NAME has a suffix which might denote a PSPP file */ +static gboolean +name_has_suffix (const gchar *name) +{ + return name_has_por_suffix (name) || name_has_sav_suffix (name); +} - { - gchar *dir_name; - gchar *filename = NULL; - g_object_get (toplevel, "filename", &filename, NULL); +static gboolean +load_file (PsppireWindow *de, const gchar *file_name, const char *encoding, + gpointer syn) +{ + const char *mime_type = NULL; + gchar *syntax = NULL; + bool ok; - if ( ! g_path_is_absolute (filename)) - { - gchar *path = - g_build_filename (g_get_current_dir (), filename, NULL); - dir_name = g_path_get_dirname (path); - g_free (path); - } - else - { - dir_name = g_path_get_dirname (filename); - } - gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (dialog), - dir_name); - free (dir_name); - } + if (syn == NULL) + { + gchar *utf8_file_name; + struct string filename; + + utf8_file_name = g_filename_to_utf8 (file_name, -1, NULL, NULL, NULL); - return dialog; -} + if (NULL == utf8_file_name) + return FALSE; -/* Callback for the data_open action. - Prompts for a filename and opens it */ -static void -open_window (GtkAction *action, PsppireWindow *de) -{ - GtkWidget *dialog = sysfile_chooser_dialog (de); + ds_init_empty (&filename); + syntax_gen_string (&filename, ss_cstr (utf8_file_name)); + + g_free (utf8_file_name); - switch (gtk_dialog_run (GTK_DIALOG (dialog))) + if (encoding && encoding[0]) + syntax = g_strdup_printf ("GET FILE=%s ENCODING='%s'.", + ds_cstr (&filename), encoding); + else + syntax = g_strdup_printf ("GET FILE=%s.", ds_cstr (&filename)); + ds_destroy (&filename); + } + else { - case GTK_RESPONSE_ACCEPT: - { - gchar *name = - gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (dialog)); + syntax = syn; + } - if (any_reader_may_open (name)) - psppire_window_load (de, name); - else - open_syntax_window (name); + ok = execute_syntax (PSPPIRE_DATA_WINDOW (de), + lex_reader_for_string (syntax, "UTF-8")); + g_free (syntax); - g_free (name); - } - break; - default: - break; + if (ok && syn == NULL) + { + if (name_has_por_suffix (file_name)) + mime_type = "application/x-spss-por"; + else if (name_has_sav_suffix (file_name)) + mime_type = "application/x-spss-sav"; + + add_most_recent (file_name, mime_type, encoding); } - gtk_widget_destroy (dialog); + return ok; } -/* Returns true if NAME has a suffix which might denote a PSPP file */ -static gboolean -name_has_suffix (const gchar *name) +static const char * +psppire_data_window_format_to_string (enum PsppireDataWindowFormat format) { - if ( g_str_has_suffix (name, ".sav")) - return TRUE; - if ( g_str_has_suffix (name, ".SAV")) - return TRUE; - if ( g_str_has_suffix (name, ".por")) - return TRUE; - if ( g_str_has_suffix (name, ".POR")) - return TRUE; - - return FALSE; + if (format == PSPPIRE_DATA_WINDOW_SAV) + return ".sav"; + else if (format == PSPPIRE_DATA_WINDOW_ZSAV) + return ".zsav"; + else + return ".por"; } - /* Save DE to file */ static void save_file (PsppireWindow *w) { - gchar *native_file_name = NULL; - gchar *file_name = NULL; + const gchar *file_name = NULL; + gchar *utf8_file_name = NULL; GString *fnx; - struct getl_interface *sss; struct string filename ; PsppireDataWindow *de = PSPPIRE_DATA_WINDOW (w); + gchar *syntax; - g_object_get (w, "filename", &file_name, NULL); + file_name = psppire_window_get_filename (w); fnx = g_string_new (file_name); if ( ! name_has_suffix (fnx->str)) - { - if ( de->save_as_portable) - g_string_append (fnx, ".por"); - else - g_string_append (fnx, ".sav"); - } + g_string_append (fnx, psppire_data_window_format_to_string (de->format)); ds_init_empty (&filename); - native_file_name = - convert_glib_filename_to_system_filename (fnx->str, NULL); + utf8_file_name = g_filename_to_utf8 (fnx->str, -1, NULL, NULL, NULL); g_string_free (fnx, TRUE); - syntax_gen_string (&filename, ss_cstr (native_file_name)); - g_free (native_file_name); + syntax_gen_string (&filename, ss_cstr (utf8_file_name)); + g_free (utf8_file_name); - if ( de->save_as_portable ) - { - sss = create_syntax_string_source ("EXPORT OUTFILE=%s.", - ds_cstr (&filename)); - } + if (de->format == PSPPIRE_DATA_WINDOW_SAV) + syntax = g_strdup_printf ("SAVE OUTFILE=%s.", ds_cstr (&filename)); + else if (de->format == PSPPIRE_DATA_WINDOW_ZSAV) + syntax = g_strdup_printf ("SAVE /ZCOMPRESSED /OUTFILE=%s.", + ds_cstr (&filename)); else - { - sss = create_syntax_string_source ("SAVE OUTFILE=%s.", - ds_cstr (&filename)); - } + syntax = g_strdup_printf ("EXPORT OUTFILE=%s.", ds_cstr (&filename)); ds_destroy (&filename); - execute_syntax (sss); -} - - -static void -insert_case (GtkAction *action, gpointer data) -{ - PsppireDataWindow *dw = PSPPIRE_DATA_WINDOW (data); - psppire_data_editor_insert_case (dw->data_editor); -} - -static void -on_insert_variable (GtkAction *action, gpointer data) -{ - PsppireDataWindow *dw = PSPPIRE_DATA_WINDOW (data); - psppire_data_editor_insert_variable (dw->data_editor); + g_free (execute_syntax_string (de, syntax)); } static void display_dict (PsppireDataWindow *de) { - - struct getl_interface *sss = - create_syntax_string_source ("DISPLAY DICTIONARY."); - - execute_syntax (sss); + execute_const_syntax_string (de, "DISPLAY DICTIONARY."); } static void sysfile_info (PsppireDataWindow *de) { - GtkWidget *dialog = sysfile_chooser_dialog (PSPPIRE_WINDOW (de)); + GtkWidget *dialog = psppire_window_file_chooser_dialog (PSPPIRE_WINDOW (de)); if ( GTK_RESPONSE_ACCEPT == gtk_dialog_run (GTK_DIALOG (dialog))) { struct string filename; - struct getl_interface *sss; gchar *file_name = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (dialog)); + gchar *utf8_file_name = g_filename_to_utf8 (file_name, -1, NULL, NULL, + NULL); + + const gchar *encoding = psppire_encoding_selector_get_encoding ( + gtk_file_chooser_get_extra_widget (GTK_FILE_CHOOSER (dialog))); - gchar *native_file_name = - convert_glib_filename_to_system_filename (file_name, NULL); + gchar *syntax; ds_init_empty (&filename); - syntax_gen_string (&filename, ss_cstr (native_file_name)); + syntax_gen_string (&filename, ss_cstr (utf8_file_name)); - g_free (native_file_name); + g_free (utf8_file_name); - sss = create_syntax_string_source ("SYSFILE INFO %s.", - ds_cstr (&filename)); - execute_syntax (sss); + if (encoding) + syntax = g_strdup_printf ("SYSFILE INFO %s ENCODING='%s'.", + ds_cstr (&filename), encoding); + else + syntax = g_strdup_printf ("SYSFILE INFO %s.", ds_cstr (&filename)); + g_free (execute_syntax_string (de, syntax)); } gtk_widget_destroy (dialog); } -/* Callback for data_save_as action. Prompt for a filename and save */ +/* PsppireWindow 'pick_filename' callback: prompt for a filename to save as. */ static void -data_save_as_dialog (PsppireDataWindow *de) +data_pick_filename (PsppireWindow *window) { - GtkWidget *button_sys; + GtkListStore *list_store; + GtkWidget *combo_box; + + PsppireDataWindow *de = PSPPIRE_DATA_WINDOW (window); + GtkFileFilter *filter; GtkWidget *dialog = gtk_file_chooser_dialog_new (_("Save"), GTK_WINDOW (de), GTK_FILE_CHOOSER_ACTION_SAVE, - GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, - GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT, + _("Cancel"), GTK_RESPONSE_CANCEL, + _("Save"), GTK_RESPONSE_ACCEPT, NULL); - GtkFileFilter *filter = gtk_file_filter_new (); + g_object_set (dialog, "local-only", FALSE, NULL); + + filter = gtk_file_filter_new (); gtk_file_filter_set_name (filter, _("System Files (*.sav)")); - gtk_file_filter_add_pattern (filter, "*.sav"); - gtk_file_filter_add_pattern (filter, "*.SAV"); + gtk_file_filter_add_mime_type (filter, "application/x-spss-sav"); + gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (dialog), filter); + + filter = gtk_file_filter_new (); + gtk_file_filter_set_name (filter, _("Compressed System Files (*.zsav)")); + gtk_file_filter_add_pattern (filter, "*.zsav"); gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (dialog), filter); filter = gtk_file_filter_new (); gtk_file_filter_set_name (filter, _("Portable Files (*.por) ")); - gtk_file_filter_add_pattern (filter, "*.por"); - gtk_file_filter_add_pattern (filter, "*.POR"); + gtk_file_filter_add_mime_type (filter, "application/x-spss-por"); gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (dialog), filter); filter = gtk_file_filter_new (); gtk_file_filter_set_name (filter, _("All Files")); gtk_file_filter_add_pattern (filter, "*"); gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (dialog), filter); + gtk_file_chooser_set_filter (GTK_FILE_CHOOSER (dialog), filter); { - GtkWidget *button_por; - GtkWidget *vbox = gtk_vbox_new (TRUE, 5); - button_sys = - gtk_radio_button_new_with_label (NULL, _("System File")); - - button_por = - gtk_radio_button_new_with_label - (gtk_radio_button_get_group (GTK_RADIO_BUTTON(button_sys)), - _("Portable File")); - - psppire_box_pack_start_defaults (GTK_BOX (vbox), button_sys); - psppire_box_pack_start_defaults (GTK_BOX (vbox), button_por); - - gtk_widget_show_all (vbox); - - gtk_file_chooser_set_extra_widget (GTK_FILE_CHOOSER(dialog), vbox); + GtkCellRenderer *cell; + GtkWidget *label; + GtkTreeIter iter; + GtkWidget *hbox; + + list_store = gtk_list_store_new (2, G_TYPE_INT, G_TYPE_STRING); + combo_box = gtk_combo_box_new_with_model (GTK_TREE_MODEL (list_store)); + + gtk_list_store_append (list_store, &iter); + gtk_list_store_set (list_store, &iter, + 0, PSPPIRE_DATA_WINDOW_SAV, + 1, _("System File"), + -1); + gtk_combo_box_set_active_iter (GTK_COMBO_BOX (combo_box), &iter); + + gtk_list_store_append (list_store, &iter); + gtk_list_store_set (list_store, &iter, + 0, PSPPIRE_DATA_WINDOW_ZSAV, + 1, _("Compressed System File"), + -1); + + gtk_list_store_append (list_store, &iter); + gtk_list_store_set (list_store, &iter, + 0, PSPPIRE_DATA_WINDOW_POR, + 1, _("Portable File"), + -1); + + label = gtk_label_new (_("Format:")); + + cell = gtk_cell_renderer_text_new (); + gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (combo_box), cell, FALSE); + gtk_cell_layout_add_attribute (GTK_CELL_LAYOUT (combo_box), cell, + "text", 1); + + hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); + gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX (hbox), combo_box, FALSE, FALSE, 0); + gtk_widget_show_all (hbox); + + gtk_file_chooser_set_extra_widget (GTK_FILE_CHOOSER (dialog), hbox); } + gtk_file_chooser_set_do_overwrite_confirmation (GTK_FILE_CHOOSER (dialog), + TRUE); + switch (gtk_dialog_run (GTK_DIALOG (dialog))) { case GTK_RESPONSE_ACCEPT: @@ -653,21 +571,21 @@ data_save_as_dialog (PsppireDataWindow *de) gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (dialog)) ); - de->save_as_portable = - ! gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (button_sys)); + GtkTreeIter iter; + int format; + + gtk_combo_box_get_active_iter (GTK_COMBO_BOX (combo_box), &iter); + gtk_tree_model_get (GTK_TREE_MODEL (list_store), &iter, + 0, &format, + -1); + de->format = format; if ( ! name_has_suffix (filename->str)) - { - if ( de->save_as_portable) - g_string_append (filename, ".por"); - else - g_string_append (filename, ".sav"); - } + g_string_append (filename, + psppire_data_window_format_to_string (format)); psppire_window_set_filename (PSPPIRE_WINDOW (de), filename->str); - save_file (PSPPIRE_WINDOW (de)); - g_string_free (filename, TRUE); } break; @@ -678,70 +596,74 @@ data_save_as_dialog (PsppireDataWindow *de) gtk_widget_destroy (dialog); } - -/* Callback for data_save action. - */ -static void -data_save (PsppireWindow *de) -{ - const gchar *fn = psppire_window_get_filename (de); - - if ( NULL != fn) - psppire_window_save (de); - else - data_save_as_dialog (PSPPIRE_DATA_WINDOW (de)); -} - - -/* Callback for data_new action. - Performs the NEW FILE command */ -static void -new_file (GtkAction *action, PsppireDataWindow *de) +static bool +confirm_delete_dataset (PsppireDataWindow *de, + const char *old_dataset, + const char *new_dataset, + const char *existing_dataset) { - struct getl_interface *sss = - create_syntax_string_source ("NEW FILE."); + GtkWidget *dialog; + int result; - execute_syntax (sss); - - psppire_window_set_filename (PSPPIRE_WINDOW (de), NULL); -} + dialog = gtk_message_dialog_new ( + GTK_WINDOW (de), 0, GTK_MESSAGE_QUESTION, GTK_BUTTONS_NONE, "%s", + _("Delete Existing Dataset?")); + gtk_message_dialog_format_secondary_text ( + GTK_MESSAGE_DIALOG (dialog), + _("Renaming \"%s\" to \"%s\" will destroy the existing " + "dataset named \"%s\". Are you sure that you want to do this?"), + old_dataset, new_dataset, existing_dataset); + gtk_dialog_add_buttons (GTK_DIALOG (dialog), + _("Cancel"), GTK_RESPONSE_CANCEL, + _("Delete"), GTK_RESPONSE_OK, + NULL); -static void -on_edit_paste (GtkAction *a, gpointer data) -{ - PsppireDataWindow *de = PSPPIRE_DATA_WINDOW (data); + g_object_set (dialog, "icon-name", "pspp", NULL); - psppire_data_editor_clip_paste (de->data_editor); -} + result = gtk_dialog_run (GTK_DIALOG (dialog)); -static void -on_edit_copy (GtkMenuItem *m, gpointer data) -{ - PsppireDataWindow *de = PSPPIRE_DATA_WINDOW (data); + gtk_widget_destroy (dialog); - psppire_data_editor_clip_copy (de->data_editor); + return result == GTK_RESPONSE_OK; } - - static void -on_edit_cut (GtkMenuItem *m, gpointer data) +on_rename_dataset (PsppireDataWindow *de) { - PsppireDataWindow *de = PSPPIRE_DATA_WINDOW (data); - - psppire_data_editor_clip_cut (de->data_editor); + struct dataset *ds = de->dataset; + struct session *session = dataset_session (ds); + const char *old_name = dataset_name (ds); + struct dataset *existing_dataset; + char *new_name; + char *prompt; + + prompt = xasprintf (_("Please enter a new name for dataset \"%s\":"), + old_name); + new_name = entry_dialog_run (GTK_WINDOW (de), _("Rename Dataset"), prompt, + old_name); + free (prompt); + + if (new_name == NULL) + return; + + existing_dataset = session_lookup_dataset (session, new_name); + if (existing_dataset == NULL || existing_dataset == ds + || confirm_delete_dataset (de, old_name, new_name, + dataset_name (existing_dataset))) + g_free (execute_syntax_string (de, g_strdup_printf ("DATASET NAME %s.", + new_name))); + + free (new_name); } - static void -status_bar_activate (GtkToggleAction *action, gpointer data) +status_bar_activate (PsppireDataWindow *de, GtkToggleAction *action) { - PsppireDataWindow *de = PSPPIRE_DATA_WINDOW (data); GtkWidget *statusbar = get_widget_assert (de->builder, "status-bar"); - if ( gtk_toggle_action_get_active (action) ) + if ( gtk_toggle_action_get_active (action)) gtk_widget_show (statusbar); else gtk_widget_hide (statusbar); @@ -749,60 +671,43 @@ status_bar_activate (GtkToggleAction *action, gpointer data) static void -grid_lines_activate (GtkToggleAction *action, gpointer data) +grid_lines_activate (PsppireDataWindow *de, GtkToggleAction *action) { - PsppireDataWindow *de = PSPPIRE_DATA_WINDOW (data); const gboolean grid_visible = gtk_toggle_action_get_active (action); psppire_data_editor_show_grid (de->data_editor, grid_visible); } static void -data_view_activate (GtkCheckMenuItem *menuitem, gpointer data) +data_view_activate (PsppireDataWindow *de) { - PsppireDataWindow *de = PSPPIRE_DATA_WINDOW (data); - gtk_notebook_set_current_page (GTK_NOTEBOOK (de->data_editor), PSPPIRE_DATA_EDITOR_DATA_VIEW); } static void -variable_view_activate (GtkCheckMenuItem *menuitem, gpointer data) +variable_view_activate (PsppireDataWindow *de) { - PsppireDataWindow *de = PSPPIRE_DATA_WINDOW (data); - gtk_notebook_set_current_page (GTK_NOTEBOOK (de->data_editor), PSPPIRE_DATA_EDITOR_VARIABLE_VIEW); } static void -fonts_activate (GtkMenuItem *menuitem, gpointer data) +fonts_activate (PsppireDataWindow *de) { - PsppireDataWindow *de = PSPPIRE_DATA_WINDOW (data); GtkWidget *toplevel = gtk_widget_get_toplevel (GTK_WIDGET (de)); - PangoFontDescription *current_font; - gchar *font_name; - GtkWidget *dialog = - gtk_font_selection_dialog_new (_("Font Selection")); - + GtkWidget *dialog = gtk_font_chooser_dialog_new (NULL, GTK_WINDOW (toplevel)); + GtkStyle *style = gtk_widget_get_style (GTK_WIDGET(de->data_editor)); + PangoFontDescription *current_font = style->font_desc; - current_font = GTK_WIDGET(de->data_editor)->style->font_desc; - font_name = pango_font_description_to_string (current_font); - - gtk_font_selection_dialog_set_font_name (GTK_FONT_SELECTION_DIALOG (dialog), font_name); - - g_free (font_name); + gtk_font_chooser_set_font_desc (GTK_FONT_CHOOSER (dialog), current_font); gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (toplevel)); if ( GTK_RESPONSE_OK == gtk_dialog_run (GTK_DIALOG (dialog)) ) { - const gchar *font = gtk_font_selection_dialog_get_font_name - (GTK_FONT_SELECTION_DIALOG (dialog)); - - PangoFontDescription* font_desc = - pango_font_description_from_string (font); + PangoFontDescription* font_desc = gtk_font_chooser_get_font_desc (GTK_FONT_CHOOSER (dialog)); psppire_data_editor_set_font (de->data_editor, font_desc); } @@ -814,247 +719,287 @@ fonts_activate (GtkMenuItem *menuitem, gpointer data) /* Callback for the value labels action */ static void -toggle_value_labels (GtkToggleAction *ta, gpointer data) +toggle_value_labels (PsppireDataWindow *de, GtkToggleAction *ta) { - PsppireDataWindow *de = PSPPIRE_DATA_WINDOW (data); - g_object_set (de->data_editor, "value-labels", gtk_toggle_action_get_active (ta), NULL); } static void -toggle_split_window (GtkToggleAction *ta, gpointer data) +toggle_split_window (PsppireDataWindow *de, GtkToggleAction *ta) { - PsppireDataWindow *de = PSPPIRE_DATA_WINDOW (data); - psppire_data_editor_split_window (de->data_editor, gtk_toggle_action_get_active (ta)); } static void -file_quit (GtkCheckMenuItem *menuitem, gpointer data) +file_quit (PsppireDataWindow *de) { /* FIXME: Need to be more intelligent here. Give the user the opportunity to save any unsaved data. */ - g_object_unref (the_data_store); - psppire_quit (); } - -static GtkWidget * -create_data_sheet_cases_popup_menu (PsppireDataWindow *de) +static void +on_recent_data_select (GtkMenuShell *menushell, + PsppireWindow *window) { - GtkWidget *menu = gtk_menu_new (); + gchar *file; + + gchar *uri = + gtk_recent_chooser_get_current_uri (GTK_RECENT_CHOOSER (menushell)); - GtkWidget *insert_case = - gtk_menu_item_new_with_label (_("Insert Case")); + file = g_filename_from_uri (uri, NULL, NULL); + + g_free (uri); - GtkWidget *delete_case = - gtk_menu_item_new_with_label (_("Clear")); + open_data_window (window, file, NULL, NULL); + g_free (file); +} - gtk_action_connect_proxy (de->delete_cases, - delete_case); +static char * +charset_from_mime_type (const char *mime_type) +{ + const char *charset; + struct string s; + const char *p; + if (mime_type == NULL) + return NULL; - gtk_menu_shell_append (GTK_MENU_SHELL (menu), insert_case); + charset = c_strcasestr (mime_type, "charset="); + if (charset == NULL) + return NULL; - g_signal_connect_swapped (insert_case, "activate", - G_CALLBACK (gtk_action_activate), - de->insert_case); + ds_init_empty (&s); + p = charset + 8; + if (*p == '"') + { + /* Parse a "quoted-string" as defined by RFC 822. */ + for (p++; *p != '\0' && *p != '"'; p++) + { + if (*p != '\\') + ds_put_byte (&s, *p); + else if (*++p != '\0') + ds_put_byte (&s, *p); + } + } + else + { + /* Parse a "token" as defined by RFC 2045. */ + while (*p > 32 && *p < 127 && strchr ("()<>@,;:\\\"/[]?=", *p) == NULL) + ds_put_byte (&s, *p++); + } + if (!ds_is_empty (&s)) + return ds_steal_cstr (&s); + ds_destroy (&s); + return NULL; +} - gtk_menu_shell_append (GTK_MENU_SHELL (menu), - gtk_separator_menu_item_new ()); +static void +on_recent_files_select (GtkMenuShell *menushell, gpointer user_data) +{ + GtkRecentInfo *item; + char *encoding; + GtkWidget *se; + gchar *file; + /* Get the file name and its encoding. */ + item = gtk_recent_chooser_get_current_item (GTK_RECENT_CHOOSER (menushell)); + file = g_filename_from_uri (gtk_recent_info_get_uri (item), NULL, NULL); + encoding = charset_from_mime_type (gtk_recent_info_get_mime_type (item)); + gtk_recent_info_unref (item); - gtk_menu_shell_append (GTK_MENU_SHELL (menu), delete_case); + se = psppire_syntax_window_new (encoding); + free (encoding); - gtk_widget_show_all (menu); + if ( psppire_window_load (PSPPIRE_WINDOW (se), file, encoding, NULL) ) + gtk_widget_show (se); + else + gtk_widget_destroy (se); - return menu; + g_free (file); } +static void +set_unsaved (gpointer w) +{ + psppire_window_set_unsaved (PSPPIRE_WINDOW (w)); +} -static GtkWidget * -create_var_sheet_variable_popup_menu (PsppireDataWindow *de) +static void +on_switch_page (PsppireDataEditor *de, gpointer p, + gint pagenum, PsppireDataWindow *dw) { - GtkWidget *menu = gtk_menu_new (); + /* Set the appropriate ui_manager according to the selected page. + This is necessary, because the menus for the variable view and + the data view are different (slightly). */ - GtkWidget *insert_variable = - gtk_menu_item_new_with_label (_("Insert Variable")); + gboolean is_ds = pagenum == PSPPIRE_DATA_EDITOR_DATA_VIEW; + const char *path = (is_ds + ? "/ui/menubar/view/view_data" + : "/ui/menubar/view/view_variables"); - GtkWidget *delete_variable = - gtk_menu_item_new_with_label (_("Clear")); + GtkWidget *page_menu_item = gtk_ui_manager_get_widget (dw->ui_manager, path); + gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (page_menu_item), TRUE); +} +static void +on_ui_manager_changed (PsppireDataEditor *de, + GParamSpec *pspec UNUSED, + PsppireDataWindow *dw) +{ + GtkUIManager *uim = psppire_data_editor_get_ui_manager (de); + if (uim == dw->uim) + return; - gtk_action_connect_proxy (de->delete_variables, - delete_variable); + if (dw->uim) + { + psppire_data_window_remove_ui (dw, dw->uim, dw->merge_id); + g_object_unref (dw->uim); + dw->uim = NULL; + } + dw->uim = uim; + if (dw->uim) + { + g_object_ref (dw->uim); + dw->merge_id = psppire_data_window_add_ui (dw, dw->uim); + } +} - gtk_menu_shell_append (GTK_MENU_SHELL (menu), insert_variable); +/* Connects the action called ACTION_NAME to HANDLER passing DW as the auxilliary data. + Returns a pointer to the action +*/ +static GtkAction * +connect_action (PsppireDataWindow *dw, const char *action_name, + GCallback handler) +{ + GtkAction *action = get_action_assert (dw->builder, action_name); - g_signal_connect_swapped (insert_variable, "activate", - G_CALLBACK (gtk_action_activate), - de->insert_variable); + g_signal_connect_swapped (action, "activate", handler, dw); + return action; +} - gtk_menu_shell_append (GTK_MENU_SHELL (menu), - gtk_separator_menu_item_new ()); +/* Only a data file with at least one variable can be saved. */ +static void +enable_save (PsppireDataWindow *dw) +{ + gboolean enable = psppire_dict_get_var_cnt (dw->dict) > 0; + gtk_action_set_sensitive (get_action_assert (dw->builder, "file_save"), + enable); + gtk_action_set_sensitive (get_action_assert (dw->builder, "file_save_as"), + enable); +} - gtk_menu_shell_append (GTK_MENU_SHELL (menu), delete_variable); +/* Initializes as much of a PsppireDataWindow as we can and must before the + dataset has been set. + In particular, the 'menu' member is required in case the "filename" property + is set before the "dataset" property: otherwise PsppireWindow will try to + modify the menu as part of the "filename" property_set() function and end up + with a Gtk-CRITICAL since 'menu' is NULL. */ +static void +psppire_data_window_init (PsppireDataWindow *de) +{ + GtkWidget *w ; + de->builder = builder_new ("data-editor.ui"); - gtk_widget_show_all (menu); + de->ui_manager = GTK_UI_MANAGER (get_object_assert (de->builder, "uimanager1", GTK_TYPE_UI_MANAGER)); - return menu; -} + w = gtk_ui_manager_get_widget (de->ui_manager, "/ui/menubar/windows/windows_minimise_all"); + PSPPIRE_WINDOW (de)->menu = GTK_MENU_SHELL (gtk_widget_get_parent (w)); -static void -on_recent_data_select (GtkMenuShell *menushell, - PsppireWindow *window) -{ - gchar *file; - - gchar *uri = - gtk_recent_chooser_get_current_uri (GTK_RECENT_CHOOSER (menushell)); - - file = g_filename_from_uri (uri, NULL, NULL); - - g_free (uri); - - psppire_window_load (window, file); - - g_free (file); + de->uim = NULL; + de->merge_id = 0; } static void -on_recent_files_select (GtkMenuShell *menushell, gpointer user_data) +file_import (PsppireDataWindow *dw) { - gchar *file; - - GtkWidget *se ; - - gchar *uri = - gtk_recent_chooser_get_current_uri (GTK_RECENT_CHOOSER (menushell)); - - file = g_filename_from_uri (uri, NULL, NULL); - - g_free (uri); - - se = psppire_syntax_window_new (); - - if ( psppire_window_load (PSPPIRE_WINDOW (se), file) ) - gtk_widget_show (se); - else - gtk_widget_destroy (se); - - g_free (file); -} - - -static void -enable_delete_cases (GtkWidget *w, gint case_num, gpointer data) -{ - PsppireDataWindow *de = PSPPIRE_DATA_WINDOW (data); - - gtk_action_set_visible (de->delete_cases, case_num != -1); -} - - -static void -enable_delete_variables (GtkWidget *w, gint var, gpointer data) -{ - PsppireDataWindow *de = PSPPIRE_DATA_WINDOW (data); - - gtk_action_set_visible (de->delete_variables, var != -1); -} - -/* Callback for when the datasheet/varsheet is selected */ -static void -on_switch_sheet (GtkNotebook *notebook, - GtkNotebookPage *page, - guint page_num, - gpointer user_data) -{ - PsppireDataWindow *de = PSPPIRE_DATA_WINDOW (user_data); - - GtkUIManager *uim = GTK_UI_MANAGER (get_object_assert (de->builder, "uimanager1", GTK_TYPE_UI_MANAGER)); - - GtkWidget *view_data = - gtk_ui_manager_get_widget (uim,"/ui/menubar/view/view_data"); - - GtkWidget *view_variables = - gtk_ui_manager_get_widget (uim,"/ui/menubar/view/view_variables"); - - switch (page_num) + GtkWidget *w = psppire_import_assistant_new (GTK_WINDOW (dw)); + PsppireImportAssistant *asst = PSPPIRE_IMPORT_ASSISTANT (w); + gtk_widget_show_all (w); + + asst->main_loop = g_main_loop_new (NULL, TRUE); + g_main_loop_run (asst->main_loop); + g_main_loop_unref (asst->main_loop); + + if (!asst->file_name) + goto end; + + switch (asst->response) { - case PSPPIRE_DATA_EDITOR_VARIABLE_VIEW: - gtk_widget_hide (view_variables); - gtk_widget_show (view_data); - gtk_action_set_sensitive (de->insert_variable, TRUE); - gtk_action_set_sensitive (de->insert_case, FALSE); - gtk_action_set_sensitive (de->invoke_goto_dialog, FALSE); + case GTK_RESPONSE_APPLY: + { + g_debug ("HERE"); + gchar *fn = g_path_get_basename (asst->file_name); + open_data_window (PSPPIRE_WINDOW (dw), fn, NULL, psppire_import_assistant_generate_syntax (asst)); + g_free (fn); + } break; - case PSPPIRE_DATA_EDITOR_DATA_VIEW: - gtk_widget_show (view_variables); - gtk_widget_hide (view_data); - gtk_action_set_sensitive (de->invoke_goto_dialog, TRUE); - gtk_action_set_sensitive (de->insert_case, TRUE); + case PSPPIRE_RESPONSE_PASTE: + g_debug ("THERE"); + free (paste_syntax_to_window (psppire_import_assistant_generate_syntax (asst))); break; default: - g_assert_not_reached (); break; } - -#if 0 - update_paste_menuitem (de, page_num); -#endif -} - - - -static void -set_unsaved (gpointer w) -{ - psppire_window_set_unsaved (PSPPIRE_WINDOW (w)); + + end: + gtk_widget_destroy (GTK_WIDGET (asst)); } static void -psppire_data_window_init (PsppireDataWindow *de) +psppire_data_window_finish_init (PsppireDataWindow *de, + struct dataset *ds) { - PsppireVarStore *vs; - PsppireDict *dict = NULL; + static const struct dataset_callbacks cbs = + { + set_unsaved, /* changed */ + transformation_change_callback, /* transformations_changed */ + }; GtkWidget *menubar; GtkWidget *hb ; GtkWidget *sb ; - GtkWidget *box = gtk_vbox_new (FALSE, 0); - de->builder = builder_new ("data-editor.ui"); + GtkWidget *box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); + + de->dataset = ds; + de->dict = psppire_dict_new_from_dict (dataset_dict (ds)); + de->data_store = psppire_data_store_new (de->dict); + psppire_data_store_set_reader (de->data_store, NULL); menubar = get_widget_assert (de->builder, "menubar"); - hb = get_widget_assert (de->builder, "handlebox1"); + hb = get_widget_assert (de->builder, "toolbar"); sb = get_widget_assert (de->builder, "status-bar"); + de->uim = NULL; + de->merge_id = 0; + de->data_editor = - PSPPIRE_DATA_EDITOR (psppire_data_editor_new (the_var_store, the_data_store)); + PSPPIRE_DATA_EDITOR (psppire_data_editor_new (de->dict, de->data_store)); + g_signal_connect (de->data_editor, "switch-page", + G_CALLBACK (on_switch_page), de); - g_signal_connect_swapped (the_data_store, "case-changed", + g_signal_connect_swapped (de->data_store, "case-changed", G_CALLBACK (set_unsaved), de); - g_signal_connect_swapped (the_data_store, "case-inserted", + g_signal_connect_swapped (de->data_store, "case-inserted", G_CALLBACK (set_unsaved), de); - g_signal_connect_swapped (the_data_store, "cases-deleted", + g_signal_connect_swapped (de->data_store, "cases-deleted", G_CALLBACK (set_unsaved), de); - dataset_set_callback (the_dataset, set_unsaved, de); + dataset_set_callbacks (de->dataset, &cbs, de); connect_help (de->builder); @@ -1065,603 +1010,406 @@ psppire_data_window_init (PsppireDataWindow *de) gtk_container_add (GTK_CONTAINER (de), box); - set_cut_copy_menuitem_sensitivity (de, FALSE); - - g_signal_connect_swapped (de->data_editor, "data-selection-changed", - G_CALLBACK (set_cut_copy_menuitem_sensitivity), de); - - - set_paste_menuitem_sensitivity (de, FALSE); - - g_signal_connect_swapped (de->data_editor, "data-available-changed", - G_CALLBACK (set_paste_menuitem_sensitivity), de); - - dataset_add_transform_change_callback (the_dataset, - transformation_change_callback, - de); - - - vs = the_var_store; - - g_assert(vs); /* Traps a possible bug in w32 build */ - - g_object_get (vs, "dictionary", &dict, NULL); - - g_signal_connect (dict, "weight-changed", + g_signal_connect (de->dict, "weight-changed", G_CALLBACK (on_weight_change), de); - g_signal_connect (dict, "filter-changed", + g_signal_connect (de->dict, "filter-changed", G_CALLBACK (on_filter_change), de); - g_signal_connect (dict, "split-changed", + g_signal_connect (de->dict, "split-changed", G_CALLBACK (on_split_change), de); + g_signal_connect_swapped (de->dict, "backend-changed", + G_CALLBACK (enable_save), de); + g_signal_connect_swapped (de->dict, "variable-inserted", + G_CALLBACK (enable_save), de); + g_signal_connect_swapped (de->dict, "variable-deleted", + G_CALLBACK (enable_save), de); + enable_save (de); - g_signal_connect (get_action_assert (de->builder, "edit_copy"), - "activate", - G_CALLBACK (on_edit_copy), de); - - g_signal_connect (get_action_assert (de->builder, "edit_cut"), - "activate", - G_CALLBACK (on_edit_cut), de); - - - - - - { - GtkAction *action_data_new = - get_action_assert (de->builder, "file_new_data"); - - g_signal_connect (action_data_new, "activate", - G_CALLBACK (new_file), de); - } - - - - { - GtkAction *invoke_text_import_assistant = - get_action_assert (de->builder, "file_import-text"); - - g_signal_connect (invoke_text_import_assistant, "activate", - G_CALLBACK (text_data_import_assistant), de); - } - - - - { - GtkAction *action_data_save = get_action_assert (de->builder, "file_save"); - - g_signal_connect_swapped (action_data_save, "activate", - G_CALLBACK (data_save), de); - } - - - { - GtkAction *action_data_open = get_action_assert (de->builder, "file_open"); - - g_signal_connect (action_data_open, "activate", - G_CALLBACK (open_window), de); - } - - { - GtkAction *action_data_save_as = - get_action_assert (de->builder, "file_save_as"); - - g_signal_connect_swapped (action_data_save_as, "activate", - G_CALLBACK (data_save_as_dialog), de); - } - - - { - GtkAction *action_info_working_file = - get_action_assert (de->builder, "file_information_working-file"); - - - g_signal_connect_swapped (action_info_working_file, "activate", - G_CALLBACK (display_dict), de); - } - - - { - GtkAction *action_info_external_file = - get_action_assert (de->builder, "file_information_external-file"); - - - g_signal_connect_swapped (action_info_external_file, "activate", - G_CALLBACK (sysfile_info), de); - } - - - - - g_signal_connect (get_action_assert (de->builder, "edit_paste"), "activate", - G_CALLBACK (on_edit_paste), - de); - - { - de->insert_case = get_action_assert (de->builder, "edit_insert-case"); - g_signal_connect (de->insert_case, "activate", - G_CALLBACK (insert_case), - de); - - } - - { - de->insert_variable = get_action_assert (de->builder, "action_insert-variable"); - - g_signal_connect (de->insert_variable, "activate", - G_CALLBACK (on_insert_variable), - de); - - - } - - de->invoke_goto_dialog = get_action_assert (de->builder, "edit_goto-case"); - g_signal_connect (de->invoke_goto_dialog, "activate", G_CALLBACK (goto_case_dialog), de); - - - { - GtkAction *value_labels_action = get_action_assert (de->builder, "view_value-labels"); - g_signal_connect (value_labels_action, "toggled", - G_CALLBACK (toggle_value_labels), de); - } - - { - de->delete_cases = - get_action_assert (de->builder, "edit_clear-cases"); - - - g_signal_connect_swapped (de->delete_cases, "activate", - G_CALLBACK (psppire_data_editor_delete_cases), - de->data_editor); - - gtk_action_set_visible (de->delete_cases, FALSE); - } - - - { - de->delete_variables = - get_action_assert (de->builder, "edit_clear-variables"); - - g_signal_connect_swapped (de->delete_variables, "activate", - G_CALLBACK (psppire_data_editor_delete_variables), - de->data_editor); - - gtk_action_set_visible (de->delete_variables, FALSE); - } - - - - { - GtkAction *invoke_transpose_dialog = - get_action_assert (de->builder, "data_transpose"); - - - g_signal_connect (invoke_transpose_dialog, "activate", - G_CALLBACK (transpose_dialog), de); - } - - - { - GtkAction *invoke_sort_cases_dialog = - get_action_assert (de->builder, "data_sort-cases"); - - - g_signal_connect (invoke_sort_cases_dialog, "activate", - G_CALLBACK (sort_cases_dialog), de); - } - - - - { - GtkAction *invoke_compute_dialog = - get_action_assert (de->builder, "transform_compute"); - - g_signal_connect (invoke_compute_dialog, "activate", - G_CALLBACK (compute_dialog), de); - } - - { - GtkAction *invoke_find_dialog = get_action_assert (de->builder, "edit_find"); - - g_signal_connect (invoke_find_dialog, "activate", - G_CALLBACK (find_dialog), de); - } - - - { - GtkAction *invoke_split_file_dialog = get_action_assert (de->builder, "data_split-file"); - - g_signal_connect (invoke_split_file_dialog, "activate", - G_CALLBACK (split_file_dialog), de); - } - - - { - GtkAction *invoke_weight_cases_dialog = get_action_assert (de->builder, "data_weight-cases"); - - g_signal_connect (invoke_weight_cases_dialog, "activate", - G_CALLBACK (weight_cases_dialog), de); - } - - - - { - GtkAction *invoke_variable_info_dialog = get_action_assert (de->builder, "utilities_variables"); - - g_signal_connect (invoke_variable_info_dialog, "activate", - G_CALLBACK (variable_info_dialog), de); - } - - - - { - GtkAction *invoke_oneway_anova_dialog = - get_action_assert (de->builder, "oneway-anova"); - - g_signal_connect (invoke_oneway_anova_dialog, "activate", - G_CALLBACK (oneway_anova_dialog), de); - } + connect_action (de, "file_new_data", G_CALLBACK (create_data_window)); + connect_action (de, "file_import", G_CALLBACK (file_import)); + connect_action (de, "file_save", G_CALLBACK (psppire_window_save)); + connect_action (de, "file_open", G_CALLBACK (psppire_window_open)); + connect_action (de, "file_save_as", G_CALLBACK (psppire_window_save_as)); + connect_action (de, "rename_dataset", G_CALLBACK (on_rename_dataset)); + connect_action (de, "file_information_working-file", G_CALLBACK (display_dict)); + connect_action (de, "file_information_external-file", G_CALLBACK (sysfile_info)); - { - GtkAction *invoke_t_test_independent_samples_dialog = - get_action_assert (de->builder, "indep-t-test"); - - - g_signal_connect (invoke_t_test_independent_samples_dialog, "activate", - G_CALLBACK (t_test_independent_samples_dialog), de); - } + g_signal_connect_swapped (get_action_assert (de->builder, "view_value-labels"), "toggled", G_CALLBACK (toggle_value_labels), de); + connect_action (de, "data_select-cases", G_CALLBACK (select_cases_dialog)); + connect_action (de, "transform_recode-same", G_CALLBACK (recode_same_dialog)); + connect_action (de, "transform_recode-different", G_CALLBACK (recode_different_dialog)); { - GtkAction *invoke_t_test_paired_samples_dialog = - get_action_assert (de->builder, "paired-t-test"); - - g_signal_connect (invoke_t_test_paired_samples_dialog, "activate", - G_CALLBACK (t_test_paired_samples_dialog), de); - } - - - { - GtkAction *invoke_t_test_one_sample_dialog = - get_action_assert (de->builder, "one-sample-t-test"); - - g_signal_connect (invoke_t_test_one_sample_dialog, "activate", - G_CALLBACK (t_test_one_sample_dialog), de); - } - - - { - GtkAction *invoke_comments_dialog = - get_action_assert (de->builder, "utilities_comments"); - - - g_signal_connect (invoke_comments_dialog, "activate", - G_CALLBACK (comments_dialog), de); - } - - - - { - GtkAction *invoke_rank_dialog = - get_action_assert (de->builder, "transform_rank"); - - g_signal_connect (invoke_rank_dialog, "activate", - G_CALLBACK (rank_dialog), de); - } - - - { - GtkAction *invoke_recode_same_dialog = - get_action_assert (de->builder, "transform_recode-same"); - - g_signal_connect (invoke_recode_same_dialog, "activate", - G_CALLBACK (recode_same_dialog), de); - } - - - { - GtkAction *invoke_recode_different_dialog = - get_action_assert (de->builder, "transform_recode-different"); - - - g_signal_connect (invoke_recode_different_dialog, "activate", - G_CALLBACK (recode_different_dialog), de); - } - + GtkWidget *recent_data = + gtk_ui_manager_get_widget (de->ui_manager, "/ui/menubar/file/file_recent-data"); - { - GtkAction *invoke_descriptives_dialog = - get_action_assert (de->builder, "analyze_descriptives"); + GtkWidget *recent_files = + gtk_ui_manager_get_widget (de->ui_manager, "/ui/menubar/file/file_recent-files"); - g_signal_connect (invoke_descriptives_dialog, "activate", - G_CALLBACK (descriptives_dialog), de); - } + GtkWidget *menu_data = gtk_recent_chooser_menu_new_for_manager ( + gtk_recent_manager_get_default ()); - { - GtkAction *invoke_frequencies_dialog = - get_action_assert (de->builder, "analyze_frequencies"); + GtkWidget *menu_files = gtk_recent_chooser_menu_new_for_manager ( + gtk_recent_manager_get_default ()); + g_object_set (menu_data, "show-tips", TRUE, NULL); + g_object_set (menu_files, "show-tips", TRUE, NULL); - g_signal_connect (invoke_frequencies_dialog, "activate", - G_CALLBACK (frequencies_dialog), de); - } + { + GtkRecentFilter *filter = gtk_recent_filter_new (); + gtk_recent_filter_add_mime_type (filter, "application/x-spss-sav"); + gtk_recent_filter_add_mime_type (filter, "application/x-spss-por"); - { - GtkAction *invoke_crosstabs_dialog = - get_action_assert (de->builder, "crosstabs"); + gtk_recent_chooser_set_sort_type (GTK_RECENT_CHOOSER (menu_data), GTK_RECENT_SORT_MRU); + gtk_recent_chooser_add_filter (GTK_RECENT_CHOOSER (menu_data), filter); + } - g_signal_connect (invoke_crosstabs_dialog, "activate", - G_CALLBACK (crosstabs_dialog), de); - } + gtk_menu_item_set_submenu (GTK_MENU_ITEM (recent_data), menu_data); + g_signal_connect (menu_data, "selection-done", G_CALLBACK (on_recent_data_select), de); - { - GtkAction *invoke_examine_dialog = - get_action_assert (de->builder, "analyze_explore"); + { + GtkRecentFilter *filter = gtk_recent_filter_new (); + gtk_recent_filter_add_pattern (filter, "*.sps"); + gtk_recent_filter_add_pattern (filter, "*.SPS"); - g_signal_connect (invoke_examine_dialog, "activate", - G_CALLBACK (examine_dialog), de); - } + gtk_recent_chooser_set_sort_type (GTK_RECENT_CHOOSER (menu_files), GTK_RECENT_SORT_MRU); + gtk_recent_chooser_add_filter (GTK_RECENT_CHOOSER (menu_files), filter); + } - { - GtkAction *invoke_regression_dialog = - get_action_assert (de->builder, "linear-regression"); + gtk_menu_item_set_submenu (GTK_MENU_ITEM (recent_files), menu_files); + g_signal_connect (menu_files, "selection-done", G_CALLBACK (on_recent_files_select), de); - g_signal_connect (invoke_regression_dialog, "activate", - G_CALLBACK (regression_dialog), de); } - { - GtkAction *invoke_reliability_dialog = - get_action_assert (de->builder, "reliability"); + connect_action (de, "file_new_syntax", G_CALLBACK (create_syntax_window)); - g_signal_connect (invoke_reliability_dialog, "activate", - G_CALLBACK (reliability_dialog), de); - } + gtk_notebook_set_current_page (GTK_NOTEBOOK (de->data_editor), PSPPIRE_DATA_EDITOR_VARIABLE_VIEW); + gtk_notebook_set_current_page (GTK_NOTEBOOK (de->data_editor), PSPPIRE_DATA_EDITOR_DATA_VIEW); - { - GtkAction *invoke_roc_dialog = - get_action_assert (de->builder, "roc-curve"); + connect_action (de, "view_statusbar", G_CALLBACK (status_bar_activate)); + connect_action (de, "view_gridlines", G_CALLBACK (grid_lines_activate)); - g_signal_connect (invoke_roc_dialog, "activate", - G_CALLBACK (roc_dialog), de); - } + connect_action (de, "view_data", G_CALLBACK (data_view_activate)); - { - GtkAction *invoke_correlation_dialog = - get_action_assert (de->builder, "correlation"); + connect_action (de, "view_variables", G_CALLBACK (variable_view_activate)); + connect_action (de, "view_fonts", G_CALLBACK (fonts_activate)); - g_signal_connect (invoke_correlation_dialog, "activate", - G_CALLBACK (correlation_dialog), de); - } + connect_action (de, "file_quit", G_CALLBACK (file_quit)); - { - GtkAction *invoke_factor_dialog = - get_action_assert (de->builder, "factor-analysis"); + connect_action (de, "transform_run-pending", G_CALLBACK (execute)); - g_signal_connect (invoke_factor_dialog, "activate", - G_CALLBACK (factor_dialog), de); - } + connect_action (de, "windows_minimise_all", G_CALLBACK (psppire_window_minimise_all)); + g_signal_connect_swapped (get_action_assert (de->builder, "windows_split"), "toggled", G_CALLBACK (toggle_split_window), de); - { - GtkUIManager *uim = GTK_UI_MANAGER (get_object_assert (de->builder, "uimanager1", GTK_TYPE_UI_MANAGER)); - - GtkWidget *recent_data = - gtk_ui_manager_get_widget (uim,"/ui/menubar/file/file_recent-data"); - - GtkWidget *recent_files = - gtk_ui_manager_get_widget (uim,"/ui/menubar/file/file_recent-files"); + gtk_menu_shell_append (GTK_MENU_SHELL (menubar), create_help_menu (GTK_WINDOW (de))); + + g_signal_connect (de->data_editor, "notify::ui-manager", + G_CALLBACK (on_ui_manager_changed), de); + on_ui_manager_changed (de->data_editor, NULL, de); + gtk_widget_show (GTK_WIDGET (de->data_editor)); + gtk_widget_show (box); - GtkWidget *menu_data = - gtk_recent_chooser_menu_new_for_manager (the_recent_mgr); + ll_push_head (&all_data_windows, &de->ll); +} - GtkWidget *menu_files = - gtk_recent_chooser_menu_new_for_manager (the_recent_mgr); +static void +psppire_data_window_dispose (GObject *object) +{ + PsppireDataWindow *dw = PSPPIRE_DATA_WINDOW (object); + if (dw->uim) { - GtkRecentFilter *filter = gtk_recent_filter_new (); - - gtk_recent_filter_add_pattern (filter, "*.sav"); - gtk_recent_filter_add_pattern (filter, "*.SAV"); - gtk_recent_filter_add_pattern (filter, "*.por"); - gtk_recent_filter_add_pattern (filter, "*.POR"); - - gtk_recent_chooser_set_sort_type (GTK_RECENT_CHOOSER (menu_data), GTK_RECENT_SORT_MRU); - - gtk_recent_chooser_add_filter (GTK_RECENT_CHOOSER (menu_data), filter); + psppire_data_window_remove_ui (dw, dw->uim, dw->merge_id); + g_object_unref (dw->uim); + dw->uim = NULL; } - gtk_menu_item_set_submenu (GTK_MENU_ITEM (recent_data), menu_data); - - - g_signal_connect (menu_data, "selection-done", - G_CALLBACK (on_recent_data_select), - de); - + if (dw->builder != NULL) { - GtkRecentFilter *filter = gtk_recent_filter_new (); - - gtk_recent_filter_add_pattern (filter, "*.sps"); - gtk_recent_filter_add_pattern (filter, "*.SPS"); - - gtk_recent_chooser_set_sort_type (GTK_RECENT_CHOOSER (menu_files), GTK_RECENT_SORT_MRU); - - gtk_recent_chooser_add_filter (GTK_RECENT_CHOOSER (menu_files), filter); + g_object_unref (dw->builder); + dw->builder = NULL; } - gtk_menu_item_set_submenu (GTK_MENU_ITEM (recent_files), menu_files); - - g_signal_connect (menu_files, "selection-done", - G_CALLBACK (on_recent_files_select), - de); + if (dw->dict) + { + g_signal_handlers_disconnect_by_func (dw->dict, + G_CALLBACK (enable_save), dw); + g_signal_handlers_disconnect_by_func (dw->dict, + G_CALLBACK (on_weight_change), dw); + g_signal_handlers_disconnect_by_func (dw->dict, + G_CALLBACK (on_filter_change), dw); + g_signal_handlers_disconnect_by_func (dw->dict, + G_CALLBACK (on_split_change), dw); + + g_object_unref (dw->dict); + dw->dict = NULL; + } - } + if (dw->data_store) + { + g_object_unref (dw->data_store); + dw->data_store = NULL; + } - g_signal_connect (get_action_assert (de->builder,"file_new_syntax"), - "activate", - G_CALLBACK (create_syntax_window), - NULL); + if (dw->ll.next != NULL) + { + ll_remove (&dw->ll); + dw->ll.next = NULL; + } + if (G_OBJECT_CLASS (parent_class)->dispose) + G_OBJECT_CLASS (parent_class)->dispose (object); +} - { - GtkAction *abt = get_action_assert (de->builder, "help_about"); +static void +psppire_data_window_finalize (GObject *object) +{ + PsppireDataWindow *dw = PSPPIRE_DATA_WINDOW (object); - g_signal_connect (abt, - "activate", - G_CALLBACK (about_new), - de); - } + if (dw->dataset) + { + struct dataset *dataset = dw->dataset; + struct session *session = dataset_session (dataset); + dw->dataset = NULL; - g_signal_connect (get_action_assert (de->builder,"help_reference"), - "activate", - G_CALLBACK (reference_manual), - de); + dataset_set_callbacks (dataset, NULL, NULL); + session_set_active_dataset (session, NULL); + dataset_destroy (dataset); + } + if (G_OBJECT_CLASS (parent_class)->finalize) + G_OBJECT_CLASS (parent_class)->finalize (object); +} - g_signal_connect (de->data_editor, - "cases-selected", - G_CALLBACK (enable_delete_cases), - de); +static void +psppire_data_window_set_property (GObject *object, + guint prop_id, + const GValue *value, + GParamSpec *pspec) +{ + PsppireDataWindow *window = PSPPIRE_DATA_WINDOW (object); - g_signal_connect (de->data_editor, - "variables-selected", - G_CALLBACK (enable_delete_variables), - de); + switch (prop_id) + { + case PROP_DATASET: + psppire_data_window_finish_init (window, g_value_get_pointer (value)); + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); + break; + }; +} +static void +psppire_data_window_get_property (GObject *object, + guint prop_id, + GValue *value, + GParamSpec *pspec) +{ + PsppireDataWindow *window = PSPPIRE_DATA_WINDOW (object); - g_signal_connect (de->data_editor, - "switch-page", - G_CALLBACK (on_switch_sheet), de); + switch (prop_id) + { + case PROP_DATASET: + g_value_set_pointer (value, window->dataset); + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); + break; + }; +} - gtk_notebook_set_current_page (GTK_NOTEBOOK (de->data_editor), PSPPIRE_DATA_EDITOR_VARIABLE_VIEW); - gtk_notebook_set_current_page (GTK_NOTEBOOK (de->data_editor), PSPPIRE_DATA_EDITOR_DATA_VIEW); +static guint +psppire_data_window_add_ui (PsppireDataWindow *pdw, GtkUIManager *uim) +{ + gchar *ui_string; + guint merge_id; + GList *list; - g_signal_connect (get_action_assert (de->builder, "view_statusbar"), - "activate", - G_CALLBACK (status_bar_activate), de); + ui_string = gtk_ui_manager_get_ui (uim); + merge_id = gtk_ui_manager_add_ui_from_string (pdw->ui_manager, ui_string, + -1, NULL); + g_free (ui_string); + g_return_val_if_fail (merge_id != 0, 0); - g_signal_connect (get_action_assert (de->builder, "view_gridlines"), - "activate", - G_CALLBACK (grid_lines_activate), de); + list = gtk_ui_manager_get_action_groups (uim); + for (; list != NULL; list = list->next) + { + GtkActionGroup *action_group = list->data; + GList *actions = gtk_action_group_list_actions (action_group); + GList *action; + for (action = actions; action != NULL; action = action->next) + { + GtkAction *a = action->data; + if (PSPPIRE_IS_DIALOG_ACTION (a)) + g_object_set (a, "manager", pdw->ui_manager, NULL); + } - g_signal_connect (get_action_assert (de->builder, "view_data"), - "activate", - G_CALLBACK (data_view_activate), de); + gtk_ui_manager_insert_action_group (pdw->ui_manager, action_group, 0); + } - g_signal_connect (get_action_assert (de->builder, "view_variables"), - "activate", - G_CALLBACK (variable_view_activate), de); + gtk_window_add_accel_group (GTK_WINDOW (pdw), + gtk_ui_manager_get_accel_group (uim)); + return merge_id; +} - { - GtkAction *font_action = get_action_assert (de->builder, "view_fonts"); +static void +psppire_data_window_remove_ui (PsppireDataWindow *pdw, + GtkUIManager *uim, guint merge_id) +{ + GList *list; - g_signal_connect (font_action, - "activate", - G_CALLBACK (fonts_activate), de); - } + g_return_if_fail (merge_id != 0); + gtk_ui_manager_remove_ui (pdw->ui_manager, merge_id); + list = gtk_ui_manager_get_action_groups (uim); + for (; list != NULL; list = list->next) + { + GtkActionGroup *action_group = list->data; + gtk_ui_manager_remove_action_group (pdw->ui_manager, action_group); + } - g_signal_connect (get_action_assert (de->builder, "file_quit"), - "activate", - G_CALLBACK (file_quit), de); + gtk_window_remove_accel_group (GTK_WINDOW (pdw), + gtk_ui_manager_get_accel_group (uim)); +} - g_signal_connect (get_action_assert (de->builder, "transform_run-pending"), - "activate", - G_CALLBACK (execute), de); +GtkWidget* +psppire_data_window_new (struct dataset *ds) +{ + GtkWidget *dw; + if (the_session == NULL) + the_session = session_create (NULL); - g_signal_connect (get_action_assert (de->builder, "windows_minimise_all"), - "activate", - G_CALLBACK (psppire_window_minimise_all), NULL); + if (ds == NULL) + { + char *dataset_name = session_generate_dataset_name (the_session); + ds = dataset_create (the_session, dataset_name); + free (dataset_name); + } + assert (dataset_session (ds) == the_session); + dw = GTK_WIDGET ( + g_object_new ( + psppire_data_window_get_type (), + "description", _("Data Editor"), + "dataset", ds, + NULL)); - { - GtkAction *split_window_action = - get_action_assert (de->builder, "windows_split"); + if (dataset_name (ds) != NULL) + g_object_set (dw, "id", dataset_name (ds), (void *) NULL); + return dw; +} - g_signal_connect (split_window_action, "toggled", - G_CALLBACK (toggle_split_window), - de); - } +bool +psppire_data_window_is_empty (PsppireDataWindow *dw) +{ + return psppire_dict_get_var_cnt (dw->dict) == 0; +} - { - GtkUIManager *uim = GTK_UI_MANAGER (get_object_assert (de->builder, "uimanager1", GTK_TYPE_UI_MANAGER)); +static void +psppire_data_window_iface_init (PsppireWindowIface *iface) +{ + iface->save = save_file; + iface->pick_filename = data_pick_filename; + iface->load = load_file; +} + +PsppireDataWindow * +psppire_default_data_window (void) +{ + if (ll_is_empty (&all_data_windows)) + create_data_window (); + return ll_data (ll_head (&all_data_windows), PsppireDataWindow, ll); +} - PSPPIRE_WINDOW (de)->menu = - GTK_MENU_SHELL (gtk_ui_manager_get_widget (uim,"/ui/menubar/windows/windows_minimise_all")->parent); - } +void +psppire_data_window_set_default (PsppireDataWindow *pdw) +{ + ll_remove (&pdw->ll); + ll_push_head (&all_data_windows, &pdw->ll); +} - { - GtkMenu *data_sheet_variable_popup_menu = get_widget_assert (de->builder, - "datasheet-variable-popup"); +void +psppire_data_window_undefault (PsppireDataWindow *pdw) +{ + ll_remove (&pdw->ll); + ll_push_tail (&all_data_windows, &pdw->ll); +} - g_signal_connect_swapped (get_action_assert (de->builder, "sort-up"), "activate", - G_CALLBACK (psppire_data_editor_sort_ascending), - de->data_editor); +PsppireDataWindow * +psppire_data_window_for_dataset (struct dataset *ds) +{ + PsppireDataWindow *pdw; - g_signal_connect_swapped (get_action_assert (de->builder, "sort-down"), "activate", - G_CALLBACK (psppire_data_editor_sort_descending), - de->data_editor); + ll_for_each (pdw, PsppireDataWindow, ll, &all_data_windows) + if (pdw->dataset == ds) + return pdw; - GtkMenu *var_sheet_variable_popup_menu = - GTK_MENU (create_var_sheet_variable_popup_menu (de)); + return NULL; +} - GtkMenu *data_sheet_cases_popup_menu = - GTK_MENU (create_data_sheet_cases_popup_menu (de)); +PsppireDataWindow * +psppire_data_window_for_data_store (PsppireDataStore *data_store) +{ + PsppireDataWindow *pdw; - g_object_set (de->data_editor, - "datasheet-column-menu", data_sheet_variable_popup_menu, - "datasheet-row-menu", data_sheet_cases_popup_menu, - "varsheet-row-menu", var_sheet_variable_popup_menu, - NULL); - } + ll_for_each (pdw, PsppireDataWindow, ll, &all_data_windows) + if (pdw->data_store == data_store) + return pdw; - gtk_widget_show (GTK_WIDGET (de->data_editor)); - gtk_widget_show (box); + return NULL; } - -GtkWidget* -psppire_data_window_new (void) +void +create_data_window (void) { - return GTK_WIDGET (g_object_new (psppire_data_window_get_type (), - "description", _("Data Editor"), - NULL)); + gtk_widget_show (psppire_data_window_new (NULL)); } +void +open_data_window (PsppireWindow *victim, const char *file_name, + const char *encoding, gpointer hint) +{ + GtkWidget *window; + if (PSPPIRE_IS_DATA_WINDOW (victim) + && psppire_data_window_is_empty (PSPPIRE_DATA_WINDOW (victim))) + { + window = GTK_WIDGET (victim); + gtk_widget_hide (GTK_WIDGET (PSPPIRE_DATA_WINDOW (window)->data_editor)); + } + else + window = psppire_data_window_new (NULL); - - - -static void -psppire_data_window_iface_init (PsppireWindowIface *iface) -{ - iface->save = save_file; - iface->load = load_file; + psppire_window_load (PSPPIRE_WINDOW (window), file_name, encoding, hint); + gtk_widget_show_all (window); } +