X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=src%2Fui%2Fgui%2Fpsppire.c;h=9181d7e571b963575c2aea5ec00e4a6bf9beb2a6;hb=65d602ed236d685ffec00ad1552a193cf47b2e4d;hp=557130d355f3ae838a3dd0d9e5376cb96f265658;hpb=732b6a86124e89e24d685ed785d2df55728eb01b;p=pspp
diff --git a/src/ui/gui/psppire.c b/src/ui/gui/psppire.c
index 557130d355..9181d7e571 100644
--- a/src/ui/gui/psppire.c
+++ b/src/ui/gui/psppire.c
@@ -1,10 +1,9 @@
-/*
- PSPPIRE --- A Graphical User Interface for PSPP
- Copyright (C) 2004, 2005, 2006 Free Software Foundation
+/* PSPPIRE - a graphical user interface for PSPP.
+ Copyright (C) 2004, 2005, 2006, 2009, 2010, 2011, 2012, 2013, 2014, 2016 Free Software Foundation
- This program is free software; you can redistribute it and/or modify
+ 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
- the Free Software Foundation; either version 2 of the License, or
+ the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
@@ -13,268 +12,199 @@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- 02110-1301, USA. */
+ along with this program. If not, see . */
#include
-#include
-#include
-
-#include "progname.h"
-#include "relocatable.h"
-
-#include "data-editor.h"
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-
-#include
-#include
+#include
#include
-#include
-#include "psppire-dict.h"
-#include "psppire-var-store.h"
-#include "psppire-data-store.h"
-#include "helper.h"
-#include "data-sheet.h"
-#include "var-sheet.h"
-#include "message-dialog.h"
-#include "flexifile-factory.h"
-
-PsppireDataStore *the_data_store = 0;
-
-
-static bool parse_command_line (int *argc, char ***argv,
- gchar **filename, GError **err);
-
-
-PsppireVarStore *the_var_store = 0;
+#include
+#include
+
+#include "data/any-reader.h"
+#include "data/casereader.h"
+#include "data/dataset.h"
+#include "data/datasheet.h"
+#include "data/file-handle-def.h"
+#include "data/session.h"
+#include "data/settings.h"
+
+#include "language/lexer/lexer.h"
+#include "libpspp/i18n.h"
+#include "libpspp/message.h"
+#include "libpspp/version.h"
+
+#include "output/driver.h"
+#include "output/journal.h"
+#include "output/message-item.h"
+#include "output/spv/spv.h"
+
+#include "ui/gui/dict-display.h"
+#include "ui/gui/executor.h"
+#include "ui/gui/psppire-data-store.h"
+#include "ui/gui/psppire-data-window.h"
+#include "ui/gui/psppire-dict.h"
+#include "ui/gui/psppire.h"
+#include "ui/gui/psppire-output-window.h"
+#include "ui/gui/psppire-syntax-window.h"
+#include "ui/gui/psppire-selector.h"
+#include "ui/gui/psppire-var-view.h"
+#include "ui/gui/psppire-means-layer.h"
+#include "ui/gui/psppire-window-register.h"
+#include "ui/gui/widgets.h"
+#include "ui/source-init-opts.h"
+#include "ui/syntax-gen.h"
+
+
+#include "gl/configmake.h"
+#include "gl/xalloc.h"
+#include "gl/relocatable.h"
void create_icon_factory (void);
-struct source_stream *the_source_stream ;
-struct dataset * the_dataset = NULL;
+#define _(msgid) gettext (msgid)
+#define N_(msgid) msgid
-static void
-replace_dictionary (struct dictionary *d)
+void
+register_selection_functions (void)
{
- psppire_dict_replace_dictionary (the_data_store->dict,
- d);
+ psppire_selector_set_default_selection_func (GTK_TYPE_ENTRY, insert_source_row_into_entry);
+ psppire_selector_set_default_selection_func (PSPPIRE_VAR_VIEW_TYPE, insert_source_row_into_tree_view);
+ psppire_selector_set_default_selection_func (GTK_TYPE_TREE_VIEW, insert_source_row_into_tree_view);
+ psppire_selector_set_default_selection_func (PSPPIRE_TYPE_MEANS_LAYER, insert_source_row_into_layers);
}
-
-static void
-replace_flexifile (struct case_source *s)
+bool
+initialize (const struct init_source *is)
{
- if ( NULL == s )
- psppire_case_file_replace_flexifile (the_data_store->case_file,
- (struct flexifile *) flexifile_create (0));
- else
+ switch (is->state)
{
- if ( ! case_source_is_class (s, &storage_source_class))
- return ;
-
- psppire_case_file_replace_flexifile (the_data_store->case_file,
- (struct flexifile *)
- storage_source_get_casefile (s));
+ case 0:
+ i18n_init ();
+ break;
+ case 1:
+ preregister_widgets ();
+ break;
+ case 2:
+ gsl_set_error_handler_off ();
+ break;
+ case 3:
+ output_engine_push ();
+ break;
+ case 4:
+ settings_init ();
+ break;
+ case 5:
+ fh_init ();
+ break;
+ case 6:
+ psppire_set_lexer (NULL);
+ break;
+ case 7:
+ bind_textdomain_codeset (PACKAGE, "UTF-8");
+ break;
+ case 8:
+ if (! gtk_parse_args (is->argc, is->argv))
+ {
+ perror ("Error parsing arguments");
+ exit (1);
+ }
+ break;
+ case 9:
+ journal_init ();
+ break;
+ case 10:
+ textdomain (PACKAGE);
+ break;
+ default:
+ return TRUE;
+ break;
}
+ return FALSE;
}
-int
-main (int argc, char *argv[])
+void
+de_initialize (void)
{
- struct casefile_factory *factory;
- PsppireDict *dictionary = 0;
-
- gchar *filename=0;
- GError *err = 0;
- gchar *vers;
-
- set_program_name (argv[0]);
-
- if ( ! gtk_parse_args (&argc, &argv) )
- {
- perror ("Error parsing arguments");
- exit (1);
- }
-
- if ( (vers = gtk_check_version (GTK_MAJOR_VERSION,
- GTK_MINOR_VERSION,
- GTK_MICRO_VERSION)) )
- {
- g_critical (vers);
- }
-
-
- /* gtk_init messes with the locale.
- So unset the bits we want to control ourselves */
- setlocale (LC_NUMERIC, "C");
-
- bindtextdomain (PACKAGE, locale_dir);
-
- textdomain (PACKAGE);
-
- if ( ! parse_command_line (&argc, &argv, &filename, &err) )
- {
- g_clear_error (&err);
- return 0;
- }
-
- glade_init ();
-
- fmt_init ();
- settings_init ();
- fh_init ();
- factory = flexifile_factory_create ();
- the_source_stream = create_source_stream (
- fn_getenv_default ("STAT_INCLUDE_PATH", include_path)
- );
-
- the_dataset = create_dataset (factory,
- replace_flexifile,
- replace_dictionary);
-
- message_dialog_init (the_source_stream);
-
- dictionary = psppire_dict_new_from_dict (
- dataset_dict (the_dataset)
- );
-
- bind_textdomain_codeset (PACKAGE, "UTF-8");
-
- gdk_init (&argc, &argv);
-
- /* Create the model for the var_sheet */
- the_var_store = psppire_var_store_new (dictionary);
-
-
- the_data_store = psppire_data_store_new (dictionary);
-
- proc_set_source (the_dataset,
- storage_source_create (the_data_store->case_file->flexifile)
- );
-
- create_icon_factory ();
-
- new_data_window (NULL, NULL);
-
- /* start the event loop */
- gtk_main ();
-
- destroy_source_stream (the_source_stream);
- message_dialog_done ();
-
settings_done ();
-
- return 0;
+ output_engine_pop ();
+ i18n_done ();
}
-
-/* Parses the command line specified by ARGC and ARGV as received by
- main (). Returns true if normal execution should proceed,
- false if the command-line indicates that PSPP should exit. */
-static bool
-parse_command_line (int *argc, char ***argv, gchar **filename, GError **err)
+void
+psppire_quit (GApplication *app)
{
- static struct option long_options[] =
- {
- {"help", no_argument, NULL, 'h'},
- {"version", no_argument, NULL, 'V'},
- {0, 0, 0, 0},
- };
+ g_application_quit (app);
+}
- int c;
+struct icon_size
+{
+ int resolution; /* The dimension of the images which will be used */
+ size_t n_sizes; /* The number of items in the array below. */
+ const GtkIconSize *usage; /* An array determining for what the icon set is used */
+};
+
+static void
+handle_msg (const struct msg *m_, void *lexer_)
+{
+ struct lexer *lexer = lexer_;
+ struct msg m = *m_;
- for (;;)
+ if (lexer != NULL && m.file_name == NULL)
{
- c = getopt_long (*argc, *argv, "hV", long_options, NULL);
- if (c == -1)
- break;
-
- switch (c)
- {
- case 'h':
- g_print ("Usage: psppire {|--help|--version}\n");
- return false;
- case 'V':
- g_print (version);
- g_print ("\n");
- g_print (legal);
- return false;
- default:
- return false;
- }
+ m.file_name = CONST_CAST (char *, lex_get_file_name (lexer));
+ m.first_line = lex_get_first_line_number (lexer, 0);
+ m.last_line = lex_get_last_line_number (lexer, 0);
+ m.first_column = lex_get_first_column (lexer, 0);
+ m.last_column = lex_get_last_column (lexer, 0);
}
+ m.command_name = output_get_command_name ();
- if ( optind < *argc)
- {
- *filename = (*argv)[optind];
- }
+ message_item_submit (message_item_create (&m));
- return true;
+ free (m.command_name);
}
-#define PIXBUF_NEW_FROM_FILE(FILE) \
- gdk_pixbuf_new_from_file (relocate (PKGDATADIR "/" FILE), 0)
-
-
void
-create_icon_factory (void)
+psppire_set_lexer (struct lexer *lexer)
{
- GtkIconFactory *factory = gtk_icon_factory_new ();
-
- GtkIconSet *icon_set;
-
- GdkPixbuf *pixbuf;
-
- pixbuf = PIXBUF_NEW_FROM_FILE ("value-labels.png");
- icon_set = gtk_icon_set_new_from_pixbuf (pixbuf);
- g_object_unref (pixbuf);
- gtk_icon_factory_add ( factory, "pspp-value-labels", icon_set);
-
- pixbuf = PIXBUF_NEW_FROM_FILE ("weight-cases.png");
- icon_set = gtk_icon_set_new_from_pixbuf (pixbuf);
- g_object_unref (pixbuf);
- gtk_icon_factory_add ( factory, "pspp-weight-cases", icon_set);
-
- pixbuf = PIXBUF_NEW_FROM_FILE ("goto-variable.png");
- icon_set = gtk_icon_set_new_from_pixbuf (pixbuf);
- g_object_unref (pixbuf);
- gtk_icon_factory_add ( factory, "pspp-goto-variable", icon_set);
-
- pixbuf = PIXBUF_NEW_FROM_FILE ("insert-variable.png");
- icon_set = gtk_icon_set_new_from_pixbuf (pixbuf);
- g_object_unref (pixbuf);
- gtk_icon_factory_add ( factory, "pspp-insert-variable", icon_set);
-
- pixbuf = PIXBUF_NEW_FROM_FILE ("insert-case.png");
- icon_set = gtk_icon_set_new_from_pixbuf (pixbuf);
- g_object_unref (pixbuf);
- gtk_icon_factory_add ( factory, "pspp-insert-case", icon_set);
+ msg_set_handler (handle_msg, lexer);
+}
- pixbuf = PIXBUF_NEW_FROM_FILE ("split-file.png");
- icon_set = gtk_icon_set_new_from_pixbuf (pixbuf);
- g_object_unref (pixbuf);
- gtk_icon_factory_add ( factory, "pspp-split-file", icon_set);
- pixbuf = PIXBUF_NEW_FROM_FILE ("select-cases.png");
- icon_set = gtk_icon_set_new_from_pixbuf (pixbuf);
- g_object_unref (pixbuf);
- gtk_icon_factory_add ( factory, "pspp-select-cases", icon_set);
+GtkWindow *
+psppire_preload_file (const gchar *file, GtkWindow *victim)
+{
+ const gchar *local_encoding = "UTF-8";
+
+ struct file_handle *fh = fh_create_file (NULL,
+ file,
+ local_encoding,
+ fh_default_properties ());
+ const char *filename = fh_get_file_name (fh);
+
+ int retval = any_reader_detect (fh, NULL);
+
+ GtkWindow *w = NULL;
+ /* Check to see if the file is a .sav or a .por file. If not
+ assume that it is a syntax file */
+ if (retval == 1)
+ w = open_data_window (PSPPIRE_WINDOW (victim), filename, NULL, NULL);
+ else if (retval == 0)
+ {
+ char *error = spv_detect (filename);
+ if (!error)
+ read_spv_file (filename);
+ else
+ {
+ free (error);
+ create_data_window ();
+ open_syntax_window (filename, NULL);
+ }
+ }
- gtk_icon_factory_add_default (factory);
+ fh_unref (fh);
+ return w;
}
-