X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=src%2Fui%2Fgui%2Fpsppire-window.c;h=7d478a642bfa38d87d807c5a2e3aac490f07f9e6;hb=fd5bffd255a87432a2d64a5dd03f98e142f2130f;hp=ef95b83b0907974906d1f9ae41fb21302e800902;hpb=ebb78b26936b7c3db462befcef45b4dcd2590b7e;p=pspp diff --git a/src/ui/gui/psppire-window.c b/src/ui/gui/psppire-window.c index ef95b83b09..7d478a642b 100644 --- a/src/ui/gui/psppire-window.c +++ b/src/ui/gui/psppire-window.c @@ -1,5 +1,5 @@ /* PSPPIRE - a graphical user interface for PSPP. - Copyright (C) 2009, 2010, 2011, 2013, 2014 Free Software Foundation + Copyright (C) 2009, 2010, 2011, 2013, 2014, 2020 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 @@ -23,16 +23,20 @@ #include #include -#include #include #define _(msgid) gettext (msgid) #define N_(msgid) msgid #include "data/any-reader.h" -#include "data/file-name.h" +#include "data/file-handle-def.h" #include "data/dataset.h" #include "libpspp/version.h" +#include "output/group-item.h" +#include "output/pivot-table.h" +#include "output/spv/spv.h" +#include "output/spv/spv-output.h" +#include "output/spv/spv-select.h" #include "helper.h" #include "psppire-data-window.h" @@ -91,7 +95,7 @@ psppire_window_set_title (PsppireWindow *window) { GString *title = g_string_sized_new (80); - if (window->dirty) + if (window->edited != NULL) g_string_append_c (title, '*'); if (window->basename || window->id) @@ -99,7 +103,7 @@ psppire_window_set_title (PsppireWindow *window) if (window->basename) g_string_append_printf (title, "%s ", window->basename); - if (window->id != '\0') + if (window->id) g_string_append_printf (title, "[%s] ", window->id); g_string_append_unichar (title, 0x2014); /* em dash */ @@ -108,6 +112,11 @@ psppire_window_set_title (PsppireWindow *window) g_string_append_printf (title, "PSPPIRE %s", window->description); + int minor = 1; + sscanf (bare_version, "%*d.%d.%*d", &minor); + if (minor % 2) + g_string_append_printf (title, " - Test version! Please report bugs to %s", PACKAGE_BUGREPORT); + gtk_window_set_title (GTK_WINDOW (window), title->str); g_string_free (title, TRUE); @@ -191,7 +200,6 @@ psppire_window_set_property (GObject *object, : NULL); psppire_window_name_changed (window); break; - break; case PROP_ID: g_free (window->id); window->id = g_value_dup_string (value); @@ -237,6 +245,9 @@ psppire_window_finalize (GObject *object) PsppireWindowRegister *reg = psppire_window_register_new (); + if (window->edited) + g_date_time_unref (window->edited); + g_signal_handler_disconnect (reg, window->remove_handler); g_signal_handler_disconnect (reg, window->insert_handler); psppire_window_register_remove (reg, window->list_name); @@ -308,62 +319,15 @@ psppire_window_base_init (PsppireWindowClass *class) -static void -menu_toggled (GtkCheckMenuItem *mi, gpointer data) -{ -#if GTK3_TRANSITION - /* Prohibit changes to the state */ - mi->active = !mi->active; -#endif -} - - -/* Look up the window associated with this menuitem and present it to the user */ -static void -menu_activate (GtkMenuItem *mi, gpointer data) -{ - const gchar *key = data; - - PsppireWindowRegister *reg = psppire_window_register_new (); - - PsppireWindow *window = psppire_window_register_lookup (reg, key); - - gtk_window_present (GTK_WINDOW (window)); -} - static void insert_menuitem_into_menu (PsppireWindow *window, gpointer key) { gchar *filename; GtkWidget *item; - - /* Add a separator before adding the first real item. If we add a separator - at any other time, sometimes GtkUIManager removes it. */ - if (!window->added_separator) - { - GtkWidget *separator = gtk_separator_menu_item_new (); - gtk_widget_show (separator); - gtk_menu_shell_append (window->menu, separator); - window->added_separator = TRUE; - } - filename = g_filename_display_name (key); item = gtk_check_menu_item_new_with_label (filename); g_free (filename); - g_signal_connect (item, "toggled", G_CALLBACK (menu_toggled), NULL); - g_signal_connect (item, "activate", G_CALLBACK (menu_activate), key); - - gtk_widget_show (item); - - gtk_menu_shell_append (window->menu, item); - -#if GTK3_TRANSITION - /* Set the state without emitting a signal */ - GTK_CHECK_MENU_ITEM (item)->active = - (psppire_window_register_lookup (psppire_window_register_new (), key) == window); -#endif - g_hash_table_insert (window->menuitem_table, key, item); } @@ -372,7 +336,7 @@ insert_item (gpointer key, gpointer value, gpointer data) { PsppireWindow *window = PSPPIRE_WINDOW (data); - if ( NULL != g_hash_table_lookup (window->menuitem_table, key)) + if (NULL != g_hash_table_lookup (window->menuitem_table, key)) return; insert_menuitem_into_menu (window, key); @@ -383,7 +347,7 @@ static void insert_menuitem (GObject *reg, const gchar *key, gpointer data) { PsppireWindow *window = PSPPIRE_WINDOW (data); - + insert_menuitem_into_menu (window, (gpointer) key); } @@ -392,14 +356,7 @@ static void remove_menuitem (PsppireWindowRegister *reg, const gchar *key, gpointer data) { PsppireWindow *window = PSPPIRE_WINDOW (data); - GtkWidget *item ; - - item = g_hash_table_lookup (window->menuitem_table, key); - g_hash_table_remove (window->menuitem_table, key); - - if (GTK_IS_CONTAINER (window->menu)) - gtk_container_remove (GTK_CONTAINER (window->menu), item); } static void @@ -414,7 +371,7 @@ on_delete (PsppireWindow *w, GdkEvent *event, gpointer user_data) { PsppireWindowRegister *reg = psppire_window_register_new (); - if ( w->dirty ) + if (w->edited != NULL) { gint response = psppire_window_query_save (w); @@ -426,7 +383,7 @@ on_delete (PsppireWindow *w, GdkEvent *event, gpointer user_data) break; case GTK_RESPONSE_APPLY: psppire_window_save (w); - if (w->dirty) + if (w->edited != NULL) { /* Save failed, or user exited Save As dialog with Cancel. */ return TRUE; @@ -437,7 +394,7 @@ on_delete (PsppireWindow *w, GdkEvent *event, gpointer user_data) } } - if ( 1 == psppire_window_register_n_items (reg)) + if (1 == psppire_window_register_n_items (reg)) gtk_main_quit (); return FALSE; @@ -447,12 +404,12 @@ on_delete (PsppireWindow *w, GdkEvent *event, gpointer user_data) static void psppire_window_init (PsppireWindow *window) { - window->menu = NULL; window->filename = NULL; window->basename = NULL; window->id = NULL; window->description = NULL; window->list_name = NULL; + window->edited = NULL; window->menuitem_table = g_hash_table_new (g_str_hash, g_str_equal); @@ -470,7 +427,6 @@ psppire_window_init (PsppireWindow *window) window); window->added_separator = FALSE; - window->dirty = FALSE; g_signal_connect_swapped (window, "delete-event", G_CALLBACK (on_delete), window); @@ -490,9 +446,9 @@ psppire_window_query_save (PsppireWindow *se) gchar *description; - GTimeVal time; - - g_get_current_time (&time); + GDateTime *now = g_date_time_new_now_utc (); + GTimeSpan timespan = g_date_time_difference (now, se->edited); + g_date_time_unref (now); if (se->filename) description = g_filename_display_basename (se->filename); @@ -513,7 +469,7 @@ psppire_window_query_save (PsppireWindow *se) gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog), _("If you don't save, changes from the last %ld seconds will be permanently lost."), - time.tv_sec - se->savetime.tv_sec); + timespan / G_TIME_SPAN_SECOND); gtk_dialog_add_button (GTK_DIALOG (dialog), _("Close _without saving"), @@ -555,10 +511,8 @@ psppire_window_set_filename (PsppireWindow *w, const gchar *filename) void psppire_window_set_unsaved (PsppireWindow *w) { - if ( w->dirty == FALSE) - g_get_current_time (&w->savetime); - - w->dirty = TRUE; + if (w->edited == NULL) + w->edited = g_date_time_new_now_utc (); psppire_window_set_title (w); } @@ -566,7 +520,7 @@ psppire_window_set_unsaved (PsppireWindow *w) gboolean psppire_window_get_unsaved (PsppireWindow *w) { - return w->dirty; + return w->edited != NULL; } @@ -635,7 +589,10 @@ psppire_window_save (PsppireWindow *w) else { i->save (w); - w->dirty = FALSE; + if (w->edited) + g_date_time_unref (w->edited); + w->edited = NULL; + psppire_window_set_title (w); } } @@ -679,10 +636,12 @@ psppire_window_load (PsppireWindow *w, const gchar *file, ok = i->load (w, file, encoding, hint); - if ( ok ) + if (ok) { psppire_window_set_filename (w, file); - w->dirty = FALSE; + if (w->edited) + g_date_time_unref (w->edited); + w->edited = NULL; } else delete_recent (file); @@ -708,9 +667,12 @@ psppire_window_file_chooser_dialog (PsppireWindow *toplevel) gtk_file_filter_set_name (filter, _("Data and Syntax Files")); gtk_file_filter_add_mime_type (filter, "application/x-spss-sav"); gtk_file_filter_add_mime_type (filter, "application/x-spss-por"); + gtk_file_filter_add_mime_type (filter, "application/x-spss-spv"); gtk_file_filter_add_pattern (filter, "*.zsav"); gtk_file_filter_add_pattern (filter, "*.sps"); gtk_file_filter_add_pattern (filter, "*.SPS"); + gtk_file_filter_add_pattern (filter, "*.spv"); + gtk_file_filter_add_pattern (filter, "*.SPV"); gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (dialog), filter); filter = gtk_file_filter_new (); @@ -730,6 +692,12 @@ psppire_window_file_chooser_dialog (PsppireWindow *toplevel) 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, _("Output Files (*.spv) ")); + gtk_file_filter_add_pattern (filter, "*.spv"); + gtk_file_filter_add_pattern (filter, "*.SPV"); + 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, "*"); @@ -740,7 +708,7 @@ psppire_window_file_chooser_dialog (PsppireWindow *toplevel) const gchar *filename = toplevel->filename; gchar *dir_name; - if ( ! g_path_is_absolute (filename)) + if (! g_path_is_absolute (filename)) { gchar *path = g_build_filename (g_get_current_dir (), filename, NULL); @@ -763,6 +731,112 @@ psppire_window_file_chooser_dialog (PsppireWindow *toplevel) return dialog; } +struct item_path + { + const struct spv_item **nodes; + size_t n; + +#define N_STUB 10 + const struct spv_item *stub[N_STUB]; + }; + +static void +swap_nodes (const struct spv_item **a, const struct spv_item **b) +{ + const struct spv_item *tmp = *a; + *a = *b; + *b = tmp; +} + +static void +get_path (const struct spv_item *item, struct item_path *path) +{ + size_t allocated = 10; + path->nodes = path->stub; + path->n = 0; + + while (item) + { + if (path->n >= allocated) + { + if (path->nodes == path->stub) + path->nodes = xmemdup (path->stub, sizeof path->stub); + path->nodes = x2nrealloc (path->nodes, &allocated, + sizeof *path->nodes); + } + path->nodes[path->n++] = item; + item = item->parent; + } + + for (size_t i = 0; i < path->n / 2; i++) + swap_nodes (&path->nodes[i], &path->nodes[path->n - i - 1]); +} + +static void +free_path (struct item_path *path) +{ + if (path && path->nodes != path->stub) + free (path->nodes); +} + +static void +dump_heading_transition (const struct spv_item *old, + const struct spv_item *new) +{ + if (old == new) + return; + + struct item_path old_path, new_path; + get_path (old, &old_path); + get_path (new, &new_path); + + size_t common = 0; + for (; common < old_path.n && common < new_path.n; common++) + if (old_path.nodes[common] != new_path.nodes[common]) + break; + + for (size_t i = common; i < old_path.n; i++) + group_close_item_submit (group_close_item_create ()); + for (size_t i = common; i < new_path.n; i++) + group_open_item_submit (group_open_item_create ( + new_path.nodes[i]->command_id)); + + free_path (&old_path); + free_path (&new_path); +} + +void +read_spv_file (const char *filename) +{ + struct spv_reader *spv; + char *error = spv_open (filename, &spv); + if (error) + { + /* XXX */ + fprintf (stderr, "%s\n", error); + return; + } + + struct spv_item **items; + size_t n_items; + spv_select (spv, NULL, 0, &items, &n_items); + struct spv_item *prev_heading = spv_get_root (spv); + for (size_t i = 0; i < n_items; i++) + { + struct spv_item *heading + = items[i]->type == SPV_ITEM_HEADING ? items[i] : items[i]->parent; + dump_heading_transition (prev_heading, heading); + if (items[i]->type == SPV_ITEM_TEXT) + spv_text_submit (items[i]); + else if (items[i]->type == SPV_ITEM_TABLE) + pivot_table_submit (spv_item_get_table (items[i])); + prev_heading = heading; + } + dump_heading_transition (prev_heading, spv_get_root (spv)); + free (items); + spv_close (spv); +} + /* Callback for the file_open action. Prompts for a filename and opens it */ void @@ -779,19 +853,31 @@ psppire_window_open (PsppireWindow *de) gchar *name = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (dialog)); - gchar *sysname = convert_glib_filename_to_system_filename (name, NULL); + const gchar **cs = NULL; + g_get_filename_charsets (&cs); gchar *encoding = psppire_encoding_selector_get_encoding ( gtk_file_chooser_get_extra_widget (GTK_FILE_CHOOSER (dialog))); - int retval = any_reader_detect (sysname, NULL); + struct file_handle *fh = fh_create_file (NULL, name, cs[0], fh_default_properties ()); + + int retval = any_reader_detect (fh, NULL); if (retval == 1) open_data_window (de, name, encoding, NULL); else if (retval == 0) - open_syntax_window (name, encoding); + { + char *error = spv_detect (name); + if (!error) + read_spv_file (name); + else + { + free (error); + open_syntax_window (name, encoding); + } + } g_free (encoding); - g_free (sysname); + fh_unref (fh); g_free (name); } break; @@ -811,7 +897,7 @@ add_most_recent (const char *file_name, const char *mime_type, const char *encoding) { gchar *uri = g_filename_to_uri (file_name, NULL, NULL); - if ( uri ) + if (uri) { GtkRecentData recent_data; gchar *full_mime_type; @@ -850,7 +936,7 @@ delete_recent (const char *file_name) { gchar *uri = g_filename_to_uri (file_name, NULL, NULL); - if ( uri ) + if (uri) gtk_recent_manager_remove_item (gtk_recent_manager_get_default (), uri, NULL); g_free (uri);