X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire-window.c;h=fe4119dd374fd8d40626693eb7184c791ff5ec16;hb=a09789d93e0160b14f1b06ad91080a249c252253;hp=c268256bb003ea1c43c460d087b4454c11486c41;hpb=a74cf2a2c1391eae93cba8cbe6772cc3b8013193;p=pspp diff --git a/src/ui/gui/psppire-window.c b/src/ui/gui/psppire-window.c index c268256bb0..fe4119dd37 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,7 +23,6 @@ #include #include -#include #include #define _(msgid) gettext (msgid) @@ -33,6 +32,11 @@ #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" @@ -40,41 +44,12 @@ #include "psppire-syntax-window.h" #include "psppire-window-register.h" -static void psppire_window_base_init (PsppireWindowClass *class); static void psppire_window_class_init (PsppireWindowClass *class); static void psppire_window_init (PsppireWindow *window); - static GObjectClass *parent_class; -GType -psppire_window_get_type (void) -{ - static GType psppire_window_type = 0; - - if (!psppire_window_type) - { - static const GTypeInfo psppire_window_info = - { - sizeof (PsppireWindowClass), - (GBaseInitFunc) psppire_window_base_init, - (GBaseFinalizeFunc) NULL, - (GClassInitFunc) psppire_window_class_init, - (GClassFinalizeFunc) NULL, - NULL, - sizeof (PsppireWindow), - 0, - (GInstanceInitFunc) psppire_window_init, - }; - - psppire_window_type = - g_type_register_static (PSPPIRE_TYPE_WINDOW_BASE, "PsppireWindow", - &psppire_window_info, G_TYPE_FLAG_ABSTRACT); - } - - return psppire_window_type; -} - +G_DEFINE_ABSTRACT_TYPE (PsppireWindow, psppire_window, PSPPIRE_TYPE_WINDOW_BASE) /* Properties */ enum @@ -91,7 +66,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 +74,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 */ @@ -112,7 +87,7 @@ psppire_window_set_title (PsppireWindow *window) 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); @@ -241,6 +216,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); @@ -261,6 +239,8 @@ psppire_window_class_init (PsppireWindowClass *class) { GObjectClass *object_class = G_OBJECT_CLASS (class); + object_class->finalize = psppire_window_finalize; + GParamSpec *description_spec = null_if_empty_param ("description", "Description", @@ -302,16 +282,6 @@ psppire_window_class_init (PsppireWindowClass *class) } -static void -psppire_window_base_init (PsppireWindowClass *class) -{ - GObjectClass *object_class = G_OBJECT_CLASS (class); - - object_class->finalize = psppire_window_finalize; -} - - - static void insert_menuitem_into_menu (PsppireWindow *window, gpointer key) { @@ -319,8 +289,9 @@ insert_menuitem_into_menu (PsppireWindow *window, gpointer key) GtkWidget *item; filename = g_filename_display_name (key); item = gtk_check_menu_item_new_with_label (filename); + g_object_ref_sink (item); g_free (filename); - + g_hash_table_insert (window->menuitem_table, key, item); } @@ -329,7 +300,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); @@ -340,7 +311,7 @@ static void insert_menuitem (GObject *reg, const gchar *key, gpointer data) { PsppireWindow *window = PSPPIRE_WINDOW (data); - + insert_menuitem_into_menu (window, (gpointer) key); } @@ -364,7 +335,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); @@ -376,7 +347,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; @@ -387,7 +358,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; @@ -402,24 +373,26 @@ psppire_window_init (PsppireWindow *window) 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); + window->menuitem_table = g_hash_table_new_full (g_str_hash, g_str_equal, + NULL, g_object_unref); g_signal_connect (window, "realize", G_CALLBACK (insert_existing_items), NULL); - window->insert_handler = g_signal_connect (psppire_window_register_new (), + PsppireWindowRegister *reg = psppire_window_register_new (); + window->insert_handler = g_signal_connect (reg, "inserted", G_CALLBACK (insert_menuitem), window); - window->remove_handler = g_signal_connect (psppire_window_register_new (), + window->remove_handler = g_signal_connect (reg, "removed", G_CALLBACK (remove_menuitem), window); window->added_separator = FALSE; - window->dirty = FALSE; g_signal_connect_swapped (window, "delete-event", G_CALLBACK (on_delete), window); @@ -439,9 +412,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); @@ -462,7 +435,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); + (long int) (timespan / G_TIME_SPAN_SECOND)); gtk_dialog_add_button (GTK_DIALOG (dialog), _("Close _without saving"), @@ -504,10 +477,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); } @@ -515,7 +486,7 @@ psppire_window_set_unsaved (PsppireWindow *w) gboolean psppire_window_get_unsaved (PsppireWindow *w) { - return w->dirty; + return w->edited != NULL; } @@ -557,13 +528,14 @@ psppire_window_model_get_type (void) NULL, /* class_data */ 0, 0, /* n_preallocs */ - NULL + NULL, + NULL /* value_table */ }; window_model_type = g_type_register_static (G_TYPE_INTERFACE, "PsppireWindowModel", &window_model_info, 0); - + g_type_interface_add_prerequisite (window_model_type, G_TYPE_OBJECT); } @@ -584,7 +556,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); } } @@ -628,10 +603,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); @@ -657,9 +634,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 (); @@ -679,6 +659,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, "*"); @@ -689,7 +675,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); @@ -712,6 +698,113 @@ 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, + new_path.nodes[i]->label)); + + 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 (pivot_table_ref (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 @@ -740,7 +833,16 @@ psppire_window_open (PsppireWindow *de) 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); fh_unref (fh); @@ -763,7 +865,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; @@ -802,9 +904,8 @@ 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); } -