X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire.c;h=9dd3b71372f6334fea60115c325aa35724353f06;hb=6d077bbfd3230959846621bbfb1447410e17dd8c;hp=d18788150fbb97eb5f66edac01ffebe1efade87d;hpb=ad024edf80de3f4d8c720eb3e9af80d3cd8a18f3;p=pspp-builds.git

diff --git a/src/ui/gui/psppire.c b/src/ui/gui/psppire.c
index d1878815..9dd3b713 100644
--- a/src/ui/gui/psppire.c
+++ b/src/ui/gui/psppire.c
@@ -1,11 +1,9 @@
-/* 
-   PSPPIRE --- A Graphical User Interface for PSPP
-   Copyright (C) 2004, 2005, 2006  Free Software Foundation
-   Written by John Darrington
+/* PSPPIRE - a graphical user interface for PSPP.
+   Copyright (C) 2004, 2005, 2006, 2009  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,
@@ -14,128 +12,289 @@
    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 <http://www.gnu.org/licenses/>. */
 
-/*
- * Initial main.c file generated by Glade. Edit as required.
- * Glade will not overwrite this file.
- */
+#include <config.h>
 
+#include <locale.h>
 #include <assert.h>
+#include <libintl.h>
+#include <gsl/gsl_errno.h>
+
+#include <argp.h>
+#include <ui/command-line.h>
+#include "relocatable.h"
+
+#include "data-editor.h"
+#include "psppire.h"
+
+#include <libpspp/getl.h>
+#include <unistd.h>
+#include <data/casereader.h>
+#include <data/datasheet.h>
+#include <data/file-handle-def.h>
+#include <data/settings.h>
+#include <data/file-name.h>
+#include <data/procedure.h>
+#include <libpspp/getl.h>
+#include <language/lexer/lexer.h>
 #include <libpspp/version.h>
-#include <libpspp/copyleft.h>
-#include <getopt.h>
-#include <gtk/gtk.h>
+#include <output/output.h>
+#include <output/journal.h>
+#include <language/syntax-string-source.h>
+
 #include <gtk/gtk.h>
 #include <glade/glade.h>
-#include "menu-actions.h"
 #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 "psppire-case-array.h"
+#include "message-dialog.h"
+#include <ui/syntax-gen.h>
 
-GladeXML *xml;
+#include "output-viewer.h"
 
+#include <data/sys-file-reader.h>
+#include <data/por-file-reader.h>
 
-PsppireDict *the_dictionary = 0;
-PsppireCaseArray *the_cases = 0;
+#include <ui/source-init-opts.h>
 
+PsppireDataStore *the_data_store = 0;
+PsppireVarStore *the_var_store = 0;
 
-PsppireDataStore *data_store = 0;
+static void create_icon_factory (void);
 
+struct source_stream *the_source_stream ;
+struct dataset * the_dataset = NULL;
 
-static bool parse_command_line (int *argc, char ***argv);
 
+static void
+replace_casereader (struct casereader *s)
+{
+  psppire_data_store_set_reader (the_data_store, s);
+}
+
+#define _(msgid) gettext (msgid)
+#define N_(msgid) msgid
 
-int 
-main(int argc, char *argv[]) 
+void
+initialize (struct command_line_processor *clp, int argc, char **argv)
 {
-  if ( ! parse_command_line(&argc, &argv) ) 
-    return 0;
+  PsppireDict *dictionary = 0;
+
+  /* gtk_init messes with the locale.
+     So unset the bits we want to control ourselves */
+  setlocale (LC_NUMERIC, "C");
+
+  bindtextdomain (PACKAGE, locale_dir);
+
+
+  glade_init ();
+
+  gsl_set_error_handler_off ();
+  fn_init ();
+  outp_init ();
+  settings_init (&viewer_width, &viewer_length);
+  fh_init ();
+  the_source_stream =
+    create_source_stream (
+			  fn_getenv_default ("STAT_INCLUDE_PATH", include_path)
+			  );
+
+  the_dataset = create_dataset ();
+
 
-  gtk_init(&argc, &argv);
+  message_dialog_init (the_source_stream);
 
-  glade_init();
+  dictionary = psppire_dict_new_from_dict (dataset_dict (the_dataset));
 
-  the_dictionary = psppire_dict_new();
+  bind_textdomain_codeset (PACKAGE, "UTF-8");
 
   /* Create the model for the var_sheet */
-  PsppireVarStore *var_store = psppire_var_store_new(the_dictionary);
+  the_var_store = psppire_var_store_new (dictionary);
 
-  /* Create the model for the data sheet */
-  the_cases = psppire_case_array_new(100, 20);
+  the_data_store = psppire_data_store_new (dictionary);
+  replace_casereader (NULL);
 
-  data_store = psppire_data_store_new(the_dictionary, the_cases);
 
-  /* load the interface */
-  xml = glade_xml_new(PKGDATADIR "/psppire.glade", NULL, NULL);
 
-  if ( !xml ) return 1;
+  create_icon_factory ();
 
-  GtkWidget *data_editor = get_widget_assert(xml, "data_editor");
-  gtk_window_set_icon_from_file(GTK_WINDOW(data_editor), 
-				PKGDATADIR "/psppicon.png",0);
+  {
+    const char *filename = output_file_name ();
 
-  /* connect the signals in the interface */
-  glade_xml_signal_autoconnect(xml);
+    struct string config_string;
 
-  GtkSheet *var_sheet  = GTK_SHEET(get_widget_assert(xml, "variable_sheet"));
-  GtkSheet *data_sheet = GTK_SHEET(get_widget_assert(xml, "data_sheet"));
+    ds_init_empty (&config_string);
 
-  gtk_sheet_set_model(var_sheet, G_SHEET_MODEL(var_store));
-  
-  gtk_sheet_set_model(data_sheet, G_SHEET_MODEL(data_store));
+    ds_put_format (&config_string,
+		   "gui:ascii:screen:squeeze=on headers=off top-margin=0 "
+		   "bottom-margin=0 paginate=off length=auto width=auto "
+		   "emphasis=none "
+		   "output-file=\"%s\" append=yes", filename);
 
+    outp_configure_driver_line (ds_ss (&config_string));
 
-  gtk_init_add(callbacks_on_init, 0);
+    unlink (filename);
 
-  /* start the event loop */
-  gtk_main();
-  return 0;
+    ds_destroy (&config_string);
+  }
+
+  journal_enable ();
+  textdomain (PACKAGE);
+
+  command_line_processor_replace_aux (clp, &post_init_argp, the_source_stream);
+  command_line_processor_replace_aux (clp, &non_option_argp, the_source_stream);
+
+  command_line_processor_parse (clp, argc, argv);
+
+  new_data_window (NULL, NULL);
+
+  execute_syntax (create_syntax_string_source (""));
 }
 
 
-/* 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)
+void
+de_initialize (void)
 {
-  static struct option long_options[] =
-    {
-      {"help", no_argument, NULL, 'h'},
-      {"version", no_argument, NULL, 'V'},
-      {0, 0, 0, 0},
-    };
+  destroy_source_stream (the_source_stream);
+  message_dialog_done ();
+  settings_done ();
+  outp_done ();
+}
+
 
-  int c;
 
-  for (;;)
+struct icon_info
+{
+  const char *file_name;
+  const gchar *id;
+};
+
+
+static const struct icon_info icons[] =
+  {
+    {PKGDATADIR "/value-labels.png",    "pspp-value-labels"},
+    {PKGDATADIR "/weight-cases.png",    "pspp-weight-cases"},
+    {PKGDATADIR "/goto-variable.png",   "pspp-goto-variable"},
+    {PKGDATADIR "/insert-variable.png", "pspp-insert-variable"},
+    {PKGDATADIR "/insert-case.png",     "pspp-insert-case"},
+    {PKGDATADIR "/split-file.png",      "pspp-split-file"},
+    {PKGDATADIR "/select-cases.png",    "pspp-select-cases"},
+    {PKGDATADIR "/recent-dialogs.png",  "pspp-recent-dialogs"},
+    {PKGDATADIR "/nominal.png",         "var-nominal"},
+    {PKGDATADIR "/ordinal.png",         "var-ordinal"},
+    {PKGDATADIR "/scale.png",           "var-scale"},
+    {PKGDATADIR "/string.png",          "var-string"},
+    {PKGDATADIR "/date-scale.png",      "var-date-scale"}
+  };
+
+static void
+create_icon_factory (void)
+{
+  gint i;
+  GtkIconFactory *factory = gtk_icon_factory_new ();
+
+  for (i = 0 ; i < sizeof (icons) / sizeof(icons[0]); ++i)
     {
-      c = getopt_long (*argc, *argv, "hV", long_options, NULL);
-      if (c == -1)
-	break;
+      GError *err = NULL;
+      GdkPixbuf *pixbuf =
+	gdk_pixbuf_new_from_file (relocate (icons[i].file_name), &err);
 
-      switch (c)
+      if ( pixbuf )
+	{
+	  GtkIconSet *icon_set = gtk_icon_set_new_from_pixbuf (pixbuf);
+	  g_object_unref (pixbuf);
+	  gtk_icon_factory_add ( factory, icons[i].id, icon_set);
+	}
+      else
 	{
-	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:
-	  assert (0);
+	  g_warning ("Cannot create icon: %s", err->message);
+	  g_clear_error (&err);
 	}
     }
 
-  return true;
+  {
+    /* Create our own "pspp-stock-reset" item, using the
+       GTK_STOCK_REFRESH icon set */
+
+    GtkStockItem items[] = {
+      {"pspp-stock-reset", N_("_Reset"), 0, 0, PACKAGE},
+      {"pspp-stock-select", N_("_Select"), 0, 0, PACKAGE}
+    };
+
+
+    gtk_stock_add (items, 2);
+    gtk_icon_factory_add (factory, "pspp-stock-reset",
+			  gtk_icon_factory_lookup_default (GTK_STOCK_REFRESH)
+			  );
+
+    gtk_icon_factory_add (factory, "pspp-stock-select",
+			  gtk_icon_factory_lookup_default (GTK_STOCK_INDEX)
+			  );
+  }
+
+  gtk_icon_factory_add_default (factory);
 }
+
+
+
+static error_t
+parse_non_options (int key, char *arg, struct argp_state *state)
+{
+  struct source_stream *ss = state->input;
+
+  if ( NULL == ss )
+    return 0;
+
+  switch (key)
+    {
+    case ARGP_KEY_ARG:
+      {
+	struct string syntax;
+	FILE *fp = fopen (arg, "r");
+	if (NULL == fp)
+	  {
+	    const int errnum = errno;
+	    fprintf (state->err_stream, _("Cannot open %s: %s.\n"),
+		     arg, strerror (errnum));
+	    return 0;
+	  }
+	if ( sfm_detect (fp))
+	  {
+	    ds_init_cstr (&syntax, "GET FILE=");
+	    goto close;
+	  }
+	rewind (fp);
+	if (pfm_detect (fp))
+	  {
+	    ds_init_cstr (&syntax, "IMPORT FILE=");
+	    goto close;
+	  }
+
+	fclose (fp);
+	msg (ME, _("%s is neither a system nor portable file"), arg);
+	break;
+
+      close:
+	fclose (fp);
+
+	syntax_gen_string (&syntax, ss_cstr (arg));
+	ds_put_cstr (&syntax, ".");
+
+	getl_append_source (ss,
+			    create_syntax_string_source (ds_cstr (&syntax)),
+			    GETL_BATCH,
+			    ERRMODE_CONTINUE);
+
+	ds_destroy (&syntax);
+	break;
+      }
+    default:
+      return ARGP_ERR_UNKNOWN;
+    }
+  return 0;
+}
+
+
+const struct argp non_option_argp = {NULL, parse_non_options, 0, 0, 0, 0, 0};