X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire-data-window.c;h=6cf3a8f617d421a4fe4a48ab7296a892596f5360;hb=469b69a6df92b30f18a4a5c7262d9290601a0a88;hp=500877bdd38470abdda490fb8747746cc00718f6;hpb=c0f256a4ff6d51ab0ce34c30fc12681686a41033;p=pspp diff --git a/src/ui/gui/psppire-data-window.c b/src/ui/gui/psppire-data-window.c index 500877bdd3..6cf3a8f617 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, 2011, 2012 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 @@ -24,38 +24,20 @@ #include "language/lexer/lexer.h" #include "libpspp/message.h" #include "libpspp/str.h" -#include "ui/gui/aggregate-dialog.h" -#include "ui/gui/autorecode-dialog.h" #include "ui/gui/builder-wrapper.h" -#include "ui/gui/chi-square-dialog.h" -#include "ui/gui/comments-dialog.h" -#include "ui/gui/compute-dialog.h" -#include "ui/gui/count-dialog.h" #include "ui/gui/entry-dialog.h" #include "ui/gui/executor.h" -#include "ui/gui/find-dialog.h" -#include "ui/gui/goto-case-dialog.h" #include "ui/gui/help-menu.h" #include "ui/gui/helper.h" #include "ui/gui/helper.h" -#include "ui/gui/k-related-dialog.h" -#include "ui/gui/npar-two-sample-related.h" -#include "ui/gui/oneway-anova-dialog.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/runs-dialog.h" -#include "ui/gui/ks-one-sample-dialog.h" #include "ui/gui/recode-dialog.h" -#include "ui/gui/select-cases-dialog.h" -#include "ui/gui/split-file-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/univariate-dialog.h" -#include "ui/gui/weight-cases-dialog.h" #include "ui/syntax-gen.h" #include "gl/c-strcase.h" @@ -86,6 +68,10 @@ static void psppire_data_window_get_property (GObject *object, 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) { @@ -151,24 +137,6 @@ psppire_data_window_class_init (PsppireDataWindowClass *class) G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE)); } -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 (PsppireDataWindow *dw) @@ -182,15 +150,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) @@ -215,13 +186,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); @@ -288,12 +257,10 @@ 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); @@ -333,18 +300,25 @@ dump_rm (GtkRecentManager *rm) } #endif +static gboolean +has_suffix (const gchar *name, const gchar *suffix) +{ + 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 gboolean name_has_por_suffix (const gchar *name) { - size_t length = strlen (name); - return length > 4 && !c_strcasecmp (&name[length - 4], ".por"); + return has_suffix (name, ".por"); } static gboolean name_has_sav_suffix (const gchar *name) { - size_t length = strlen (name); - return length > 4 && !c_strcasecmp (&name[length - 4], ".sav"); + return has_suffix (name, ".sav") || has_suffix (name, ".zsav"); } /* Returns true if NAME has a suffix which might denote a PSPP file */ @@ -355,38 +329,68 @@ name_has_suffix (const gchar *name) } static gboolean -load_file (PsppireWindow *de, const gchar *file_name) +load_file (PsppireWindow *de, const gchar *file_name, const char *encoding, + gpointer syn) { - struct string filename; - gchar *utf8_file_name; - const char *mime_type; - gchar *syntax; + const char *mime_type = NULL; + gchar *syntax = NULL; bool ok; - ds_init_empty (&filename); - - utf8_file_name = g_filename_to_utf8 (file_name, -1, NULL, NULL, NULL); + if (syn == NULL) + { + gchar *utf8_file_name; + struct string filename; + + utf8_file_name = g_filename_to_utf8 (file_name, -1, NULL, NULL, NULL); - syntax_gen_string (&filename, ss_cstr (utf8_file_name)); + if (NULL == utf8_file_name) + return FALSE; - g_free (utf8_file_name); + ds_init_empty (&filename); + syntax_gen_string (&filename, ss_cstr (utf8_file_name)); + + g_free (utf8_file_name); - syntax = g_strdup_printf ("GET FILE=%s.", ds_cstr (&filename)); - ds_destroy (&filename); + 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 + { + syntax = syn; + } ok = execute_syntax (PSPPIRE_DATA_WINDOW (de), - lex_reader_for_string (syntax)); + lex_reader_for_string (syntax, "UTF-8")); g_free (syntax); - mime_type = (name_has_por_suffix (file_name) - ? "application/x-spss-por" - : "application/x-spss-sav"); - - add_most_recent (file_name, mime_type); + 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); + } return ok; } +static const char * +psppire_data_window_format_to_string (enum PsppireDataWindowFormat format) +{ + 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) @@ -403,12 +407,7 @@ save_file (PsppireWindow *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); @@ -419,9 +418,13 @@ save_file (PsppireWindow *w) syntax_gen_string (&filename, ss_cstr (utf8_file_name)); g_free (utf8_file_name); - syntax = g_strdup_printf ("%s OUTFILE=%s.", - de->save_as_portable ? "EXPORT" : "SAVE", - 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 + syntax = g_strdup_printf ("EXPORT OUTFILE=%s.", ds_cstr (&filename)); ds_destroy (&filename); @@ -429,19 +432,6 @@ save_file (PsppireWindow *w) } -static void -insert_case (PsppireDataWindow *dw) -{ - psppire_data_editor_insert_case (dw->data_editor); -} - -static void -on_insert_variable (PsppireDataWindow *dw) -{ - psppire_data_editor_insert_variable (dw->data_editor); -} - - static void display_dict (PsppireDataWindow *de) { @@ -458,10 +448,12 @@ sysfile_info (PsppireDataWindow *de) struct string filename; 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 *syntax; ds_init_empty (&filename); @@ -470,7 +462,11 @@ sysfile_info (PsppireDataWindow *de) g_free (utf8_file_name); - syntax = g_strdup_printf ("SYSFILE INFO %s.", ds_cstr (&filename)); + 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)); } @@ -482,23 +478,31 @@ sysfile_info (PsppireDataWindow *de) static void data_pick_filename (PsppireWindow *window) { + GtkListStore *list_store; + GtkWidget *combo_box; + PsppireDataWindow *de = PSPPIRE_DATA_WINDOW (window); - GtkFileFilter *filter = gtk_file_filter_new (); - GtkWidget *button_sys; + 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); 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_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_mime_type (filter, "application/x-spss-por"); @@ -508,24 +512,49 @@ data_pick_filename (PsppireWindow *window) 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), @@ -541,16 +570,18 @@ data_pick_filename (PsppireWindow *window) 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); @@ -584,8 +615,8 @@ confirm_delete_dataset (PsppireDataWindow *de, old_dataset, new_dataset, existing_dataset); gtk_dialog_add_buttons (GTK_DIALOG (dialog), - GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, - GTK_STOCK_DELETE, GTK_RESPONSE_OK, + _("Cancel"), GTK_RESPONSE_CANCEL, + _("Delete"), GTK_RESPONSE_OK, NULL); g_object_set (dialog, "icon-name", "pspp", NULL); @@ -626,27 +657,6 @@ on_rename_dataset (PsppireDataWindow *de) free (new_name); } -static void -on_edit_paste (PsppireDataWindow *de) -{ - psppire_data_editor_clip_paste (de->data_editor); -} - -static void -on_edit_copy (PsppireDataWindow *de) -{ - psppire_data_editor_clip_copy (de->data_editor); -} - - - -static void -on_edit_cut (PsppireDataWindow *de) -{ - psppire_data_editor_clip_cut (de->data_editor); -} - - static void status_bar_activate (PsppireDataWindow *de, GtkToggleAction *action) { @@ -685,29 +695,18 @@ static void fonts_activate (PsppireDataWindow *de) { 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); } @@ -741,7 +740,6 @@ file_quit (PsppireDataWindow *de) psppire_quit (); } - static void on_recent_data_select (GtkMenuShell *menushell, PsppireWindow *window) @@ -755,7 +753,7 @@ on_recent_data_select (GtkMenuShell *menushell, g_free (uri); - open_data_window (window, file); + open_data_window (window, file, NULL, NULL); g_free (file); } @@ -818,7 +816,7 @@ on_recent_files_select (GtkMenuShell *menushell, gpointer user_data) free (encoding); - if ( psppire_window_load (PSPPIRE_WINDOW (se), file) ) + if ( psppire_window_load (PSPPIRE_WINDOW (se), file, encoding, NULL) ) gtk_widget_show (se); else gtk_widget_destroy (se); @@ -826,75 +824,53 @@ on_recent_files_select (GtkMenuShell *menushell, gpointer user_data) g_free (file); } - - static void -enable_delete_cases (GtkWidget *w, gint case_num, gpointer data) +set_unsaved (gpointer w) { - PsppireDataWindow *de = PSPPIRE_DATA_WINDOW (data); - - gtk_action_set_visible (de->delete_cases, case_num != -1); + psppire_window_set_unsaved (PSPPIRE_WINDOW (w)); } - static void -enable_delete_variables (GtkWidget *w, gint var, gpointer data) +on_switch_page (PsppireDataEditor *de, gpointer p, + gint pagenum, PsppireDataWindow *dw) { - PsppireDataWindow *de = PSPPIRE_DATA_WINDOW (data); + /* 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). */ - gtk_action_set_visible (de->delete_variables, var != -1); + 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 *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); } -/* Callback for when the datasheet/varsheet is selected */ static void -on_switch_sheet (GtkNotebook *notebook, - GtkNotebookPage *page, - guint page_num, - gpointer user_data) +on_ui_manager_changed (PsppireDataEditor *de, + GParamSpec *pspec UNUSED, + PsppireDataWindow *dw) { - 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"); + GtkUIManager *uim = psppire_data_editor_get_ui_manager (de); + if (uim == dw->uim) + return; - switch (page_num) + if (dw->uim) { - case PSPPIRE_DATA_EDITOR_VARIABLE_VIEW: - gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (view_variables), - TRUE); - 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); - break; - case PSPPIRE_DATA_EDITOR_DATA_VIEW: - gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (view_data), TRUE); - gtk_action_set_sensitive (de->invoke_goto_dialog, TRUE); - gtk_action_set_sensitive (de->insert_case, TRUE); - break; - default: - g_assert_not_reached (); - break; + psppire_data_window_remove_ui (dw, dw->uim, dw->merge_id); + g_object_unref (dw->uim); + dw->uim = NULL; } -#if 0 - update_paste_menuitem (de, page_num); -#endif -} - - - -static void -set_unsaved (gpointer w) -{ - psppire_window_set_unsaved (PSPPIRE_WINDOW (w)); + dw->uim = uim; + if (dw->uim) + { + g_object_ref (dw->uim); + dw->merge_id = psppire_data_window_add_ui (dw, dw->uim); + } } - /* Connects the action called ACTION_NAME to HANDLER passing DW as the auxilliary data. Returns a pointer to the action */ @@ -913,8 +889,7 @@ connect_action (PsppireDataWindow *dw, const char *action_name, static void enable_save (PsppireDataWindow *dw) { - PsppireDict *dict = dw->var_store->dictionary; - gboolean enable = psppire_dict_get_var_cnt (dict) > 0; + gboolean enable = psppire_dict_get_var_cnt (dw->dict) > 0; gtk_action_set_sensitive (get_action_assert (dw->builder, "file_save"), enable); @@ -932,14 +907,53 @@ enable_save (PsppireDataWindow *dw) static void psppire_data_window_init (PsppireDataWindow *de) { - GtkUIManager *uim; - + GtkWidget *w ; de->builder = builder_new ("data-editor.ui"); - uim = GTK_UI_MANAGER (get_object_assert (de->builder, "uimanager1", GTK_TYPE_UI_MANAGER)); + de->ui_manager = GTK_UI_MANAGER (get_object_assert (de->builder, "uimanager1", GTK_TYPE_UI_MANAGER)); - PSPPIRE_WINDOW (de)->menu = - GTK_MENU_SHELL (gtk_ui_manager_get_widget (uim,"/ui/menubar/windows/windows_minimise_all")->parent); + 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)); + + de->uim = NULL; + de->merge_id = 0; +} + +static void +file_import (PsppireDataWindow *dw) +{ + 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 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_RESPONSE_PASTE: + g_debug ("THERE"); + free (paste_syntax_to_window (psppire_import_assistant_generate_syntax (asst))); + break; + default: + break; + } + + end: + gtk_widget_destroy (GTK_WIDGET (asst)); } static void @@ -952,28 +966,28 @@ psppire_data_window_finish_init (PsppireDataWindow *de, transformation_change_callback, /* transformations_changed */ }; - PsppireDict *dict; - GtkWidget *menubar; GtkWidget *hb ; GtkWidget *sb ; - GtkWidget *box = gtk_vbox_new (FALSE, 0); + GtkWidget *box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); de->dataset = ds; - dict = psppire_dict_new_from_dict (dataset_dict (ds)); - de->var_store = psppire_var_store_new (dict); - g_object_unref (dict); - de->data_store = psppire_data_store_new (dict); + 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 (de, de->var_store, - de->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 (de->data_store, "case-changed", G_CALLBACK (set_unsaved), de); @@ -995,115 +1009,47 @@ psppire_data_window_finish_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); - - 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 (dict, "backend-changed", + g_signal_connect_swapped (de->dict, "backend-changed", G_CALLBACK (enable_save), de); - g_signal_connect_swapped (dict, "variable-inserted", + g_signal_connect_swapped (de->dict, "variable-inserted", G_CALLBACK (enable_save), de); - g_signal_connect_swapped (dict, "variable-deleted", + g_signal_connect_swapped (de->dict, "variable-deleted", G_CALLBACK (enable_save), de); enable_save (de); - connect_action (de, "edit_copy", G_CALLBACK (on_edit_copy)); - - connect_action (de, "edit_cut", G_CALLBACK (on_edit_cut)); - connect_action (de, "file_new_data", G_CALLBACK (create_data_window)); - - connect_action (de, "file_import", G_CALLBACK (text_data_import_assistant)); + 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)); - connect_action (de, "edit_paste", G_CALLBACK (on_edit_paste)); - - de->insert_case = connect_action (de, "edit_insert-case", G_CALLBACK (insert_case)); - - de->insert_variable = connect_action (de, "action_insert-variable", G_CALLBACK (on_insert_variable)); - - de->invoke_goto_dialog = connect_action (de, "edit_goto-case", G_CALLBACK (goto_case_dialog)); - g_signal_connect_swapped (get_action_assert (de->builder, "view_value-labels"), "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); - } - - - connect_action (de, "data_transpose", G_CALLBACK (transpose_dialog)); - connect_action (de, "data_select-cases", G_CALLBACK (select_cases_dialog)); - connect_action (de, "data_aggregate", G_CALLBACK (aggregate_dialog)); - connect_action (de, "transform_compute", G_CALLBACK (compute_dialog)); - connect_action (de, "transform_autorecode", G_CALLBACK (autorecode_dialog)); - connect_action (de, "edit_find", G_CALLBACK (find_dialog)); - connect_action (de, "data_split-file", G_CALLBACK (split_file_dialog)); - connect_action (de, "data_weight-cases", G_CALLBACK (weight_cases_dialog)); - connect_action (de, "oneway-anova", G_CALLBACK (oneway_anova_dialog)); - connect_action (de, "paired-t-test", G_CALLBACK (t_test_paired_samples_dialog)); - connect_action (de, "one-sample-t-test", G_CALLBACK (t_test_one_sample_dialog)); - connect_action (de, "utilities_comments", G_CALLBACK (comments_dialog)); - connect_action (de, "transform_count", G_CALLBACK (count_dialog)); connect_action (de, "transform_recode-same", G_CALLBACK (recode_same_dialog)); connect_action (de, "transform_recode-different", G_CALLBACK (recode_different_dialog)); - connect_action (de, "univariate", G_CALLBACK (univariate_dialog)); - connect_action (de, "chi-square", G_CALLBACK (chisquare_dialog)); - connect_action (de, "runs", G_CALLBACK (runs_dialog)); - connect_action (de, "ks-one-sample", G_CALLBACK (ks_one_sample_dialog)); - connect_action (de, "k-related-samples", G_CALLBACK (k_related_dialog)); - connect_action (de, "two-related-samples", G_CALLBACK (two_related_dialog)); { - 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"); + gtk_ui_manager_get_widget (de->ui_manager, "/ui/menubar/file/file_recent-data"); GtkWidget *recent_files = - gtk_ui_manager_get_widget (uim,"/ui/menubar/file/file_recent-files"); + gtk_ui_manager_get_widget (de->ui_manager, "/ui/menubar/file/file_recent-files"); GtkWidget *menu_data = gtk_recent_chooser_menu_new_for_manager ( @@ -1151,21 +1097,6 @@ psppire_data_window_finish_init (PsppireDataWindow *de, connect_action (de, "file_new_syntax", G_CALLBACK (create_syntax_window)); - g_signal_connect (de->data_editor, - "cases-selected", - G_CALLBACK (enable_delete_cases), - de); - - g_signal_connect (de->data_editor, - "variables-selected", - G_CALLBACK (enable_delete_variables), - de); - - - g_signal_connect (de->data_editor, - "switch-page", - G_CALLBACK (on_switch_sheet), 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); @@ -1187,36 +1118,11 @@ psppire_data_window_finish_init (PsppireDataWindow *de, 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)); - - merge_help_menu (uim); - } - - { - GtkWidget *data_sheet_cases_popup_menu = get_widget_assert (de->builder, - "datasheet-cases-popup"); - - GtkWidget *var_sheet_variable_popup_menu = get_widget_assert (de->builder, - "varsheet-variable-popup"); - - GtkWidget *data_sheet_variable_popup_menu = get_widget_assert (de->builder, - "datasheet-variable-popup"); - - g_signal_connect_swapped (get_action_assert (de->builder, "sort-up"), "activate", - G_CALLBACK (psppire_data_editor_sort_ascending), - de->data_editor); - - g_signal_connect_swapped (get_action_assert (de->builder, "sort-down"), "activate", - G_CALLBACK (psppire_data_editor_sort_descending), - de->data_editor); - - 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); - } + 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); @@ -1229,16 +1135,32 @@ psppire_data_window_dispose (GObject *object) { PsppireDataWindow *dw = PSPPIRE_DATA_WINDOW (object); + if (dw->uim) + { + psppire_data_window_remove_ui (dw, dw->uim, dw->merge_id); + g_object_unref (dw->uim); + dw->uim = NULL; + } + if (dw->builder != NULL) { g_object_unref (dw->builder); dw->builder = NULL; } - if (dw->var_store) + if (dw->dict) { - g_object_unref (dw->var_store); - dw->var_store = NULL; + 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) @@ -1316,13 +1238,72 @@ psppire_data_window_get_property (GObject *object, }; } +static guint +psppire_data_window_add_ui (PsppireDataWindow *pdw, GtkUIManager *uim) +{ + gchar *ui_string; + guint merge_id; + GList *list; + + 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); + + 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); + } + + gtk_ui_manager_insert_action_group (pdw->ui_manager, action_group, 0); + } + + gtk_window_add_accel_group (GTK_WINDOW (pdw), + gtk_ui_manager_get_accel_group (uim)); + + return merge_id; +} + +static void +psppire_data_window_remove_ui (PsppireDataWindow *pdw, + GtkUIManager *uim, guint merge_id) +{ + GList *list; + + 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); + } + + gtk_window_remove_accel_group (GTK_WINDOW (pdw), + gtk_ui_manager_get_accel_group (uim)); +} + GtkWidget* psppire_data_window_new (struct dataset *ds) { GtkWidget *dw; if (the_session == NULL) - the_session = session_create (); + the_session = session_create (NULL); if (ds == NULL) { @@ -1348,7 +1329,7 @@ psppire_data_window_new (struct dataset *ds) bool psppire_data_window_is_empty (PsppireDataWindow *dw) { - return psppire_var_store_get_var_cnt (dw->var_store) == 0; + return psppire_dict_get_var_cnt (dw->dict) == 0; } static void @@ -1393,6 +1374,18 @@ psppire_data_window_for_dataset (struct dataset *ds) return NULL; } +PsppireDataWindow * +psppire_data_window_for_data_store (PsppireDataStore *data_store) +{ + PsppireDataWindow *pdw; + + ll_for_each (pdw, PsppireDataWindow, ll, &all_data_windows) + if (pdw->data_store == data_store) + return pdw; + + return NULL; +} + void create_data_window (void) { @@ -1400,16 +1393,21 @@ create_data_window (void) } void -open_data_window (PsppireWindow *victim, const char *file_name) +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); + { + window = GTK_WIDGET (victim); + gtk_widget_hide (GTK_WIDGET (PSPPIRE_DATA_WINDOW (window)->data_editor)); + } else window = psppire_data_window_new (NULL); - psppire_window_load (PSPPIRE_WINDOW (window), file_name); - gtk_widget_show (window); + psppire_window_load (PSPPIRE_WINDOW (window), file_name, encoding, hint); + gtk_widget_show_all (window); } +