X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire-data-window.c;h=7ea037a9117d75b5423263d46dd91228e8b5cfc6;hb=83239cbb53294662025d5ee957d7e24e5feb66a9;hp=813959dd76d488a32fce5b500601a3335aba4001;hpb=e17bf22963466952e4333a9f9994ebad4ca2f5e8;p=pspp diff --git a/src/ui/gui/psppire-data-window.c b/src/ui/gui/psppire-data-window.c index 813959dd76..7ea037a911 100644 --- a/src/ui/gui/psppire-data-window.c +++ b/src/ui/gui/psppire-data-window.c @@ -24,8 +24,6 @@ #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/comments-dialog.h" #include "ui/gui/entry-dialog.h" @@ -33,6 +31,7 @@ #include "ui/gui/help-menu.h" #include "ui/gui/helper.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" @@ -42,7 +41,6 @@ #include "ui/gui/recode-dialog.h" #include "ui/gui/select-cases-dialog.h" #include "ui/gui/split-file-dialog.h" -#include "ui/gui/text-data-import-dialog.h" #include "ui/gui/weight-cases-dialog.h" #include "ui/syntax-gen.h" @@ -156,15 +154,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) @@ -367,7 +368,7 @@ load_file (PsppireWindow *de, const gchar *file_name, const char *encoding, } ok = execute_syntax (PSPPIRE_DATA_WINDOW (de), - lex_reader_for_string (syntax)); + lex_reader_for_string (syntax, "UTF-8")); g_free (syntax); if (ok && syn == NULL) @@ -837,15 +838,16 @@ static void on_switch_page (PsppireDataEditor *de, gpointer p, gint pagenum, PsppireDataWindow *dw) { - GtkWidget *page_menu_item; - gboolean is_ds; - const char *path; + /* 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). */ - is_ds = pagenum == PSPPIRE_DATA_EDITOR_DATA_VIEW; - path = (is_ds + gboolean is_ds = pagenum == PSPPIRE_DATA_EDITOR_DATA_VIEW; + const char *path = (is_ds ? "/ui/menubar/view/view_data" : "/ui/menubar/view/view_variables"); - page_menu_item = gtk_ui_manager_get_widget (dw->ui_manager, path); + + 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); } @@ -922,6 +924,42 @@ psppire_data_window_init (PsppireDataWindow *de) 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 psppire_data_window_finish_init (PsppireDataWindow *de, struct dataset *ds) @@ -944,7 +982,7 @@ psppire_data_window_finish_init (PsppireDataWindow *de, 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; @@ -996,7 +1034,8 @@ psppire_data_window_finish_init (PsppireDataWindow *de, enable_save (de); 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)); @@ -1007,8 +1046,6 @@ psppire_data_window_finish_init (PsppireDataWindow *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, "data_aggregate", G_CALLBACK (aggregate_dialog)); - connect_action (de, "transform_autorecode", G_CALLBACK (autorecode_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, "utilities_comments", G_CALLBACK (comments_dialog)); @@ -1089,8 +1126,8 @@ 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); - merge_help_menu (de->ui_manager); - + 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);