X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire.c;h=b99f2896074217beed1fc3672dd0cd0a4338019f;hb=35c4cb8cfb59bf6e1eb770114850e1184cfafc9b;hp=cd2783c32d7afc837540f5700619b539dcf84145;hpb=75fe94ea24fd7b12a0d99b8f36a79d8423e668d4;p=pspp-builds.git

diff --git a/src/ui/gui/psppire.c b/src/ui/gui/psppire.c
index cd2783c3..b99f2896 100644
--- a/src/ui/gui/psppire.c
+++ b/src/ui/gui/psppire.c
@@ -28,11 +28,14 @@
 #include <libpspp/copyleft.h>
 #include <data/file-handle-def.h>
 #include <data/format.h>
+#include <data/storage-stream.h>
+#include <data/case-source.h>
 #include <data/settings.h>
 #include <data/file-name.h>
 #include <data/procedure.h>
 #include <libpspp/getl.h>
 #include <language/lexer/lexer.h>
+#include <ui/flexifile.h>
 
 #include <getopt.h>
 #include <gtk/gtk.h>
@@ -54,31 +57,37 @@ static bool parse_command_line (int *argc, char ***argv,
 				gchar **filename, GError **err);
 
 
-#define _(msgid) gettext (msgid)
-#define N_(msgid) msgid
+PsppireVarStore *the_var_store = 0;
 
-static void
-give_help (void)
-{
-  static struct msg m = {
-    MSG_GENERAL,
-    MSG_NOTE,
-    {0, -1},
-    0,
-  };
+void create_icon_factory (void);
 
-  if (! m.text)
-    m.text=g_strdup (_("Sorry. The help system hasn't yet been implemented."));
+struct source_stream *the_source_stream ;
+struct dataset * the_dataset = NULL;
 
-  popup_message (&m);
+static void
+replace_dictionary (struct dictionary *d)
+{
+  psppire_dict_replace_dictionary (the_data_store->dict,
+				   d);
 }
 
-PsppireVarStore *the_var_store = 0;
 
-void create_icon_factory (void);
+static void
+replace_flexifile (struct case_source *s)
+{
+  if ( NULL == s )
+    psppire_case_file_replace_flexifile (the_data_store->case_file,
+					 (struct flexifile *) flexifile_create (0));
+  else
+    {
+      if ( ! case_source_is_class (s, &storage_source_class))
+	return ;
 
-struct source_stream *the_source_stream ;
-struct dataset * the_dataset = NULL;
+      psppire_case_file_replace_flexifile (the_data_store->case_file,
+					   (struct flexifile *)
+					   storage_source_get_casefile (s));
+    }
+}
 
 
 int
@@ -125,14 +134,15 @@ main (int argc, char *argv[])
 			  fn_getenv_default ("STAT_INCLUDE_PATH", include_path)
 			  );
 
-  the_dataset = create_dataset (factory);
+  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)
-				);
+  dictionary = psppire_dict_new_from_dict (
+					   dataset_dict (the_dataset)
+					   );
 
   bind_textdomain_codeset (PACKAGE, "UTF-8");
 
@@ -142,37 +152,11 @@ main (int argc, char *argv[])
 
   the_data_store = psppire_data_store_new (dictionary);
 
-  create_icon_factory ();
-
-#if 0
-  /* load the interface */
-  data_editor_xml = glade_xml_new (PKGDATADIR "/data-editor.glade", NULL, NULL);
-
-  if ( !data_editor_xml ) return 1;
-
-  data_editor = get_widget_assert (data_editor_xml, "data_editor");
-
-  /* connect the signals in the interface */
-  glade_xml_signal_autoconnect (data_editor_xml);
-
-  var_sheet  = GTK_SHEET (get_widget_assert (data_editor_xml, "variable_sheet"));
-  data_sheet = GTK_SHEET (get_widget_assert (data_editor_xml, "data_sheet"));
-
-  gtk_sheet_set_model (var_sheet, G_SHEET_MODEL (the_var_store));
+  proc_set_source (the_dataset,
+		   storage_source_create (the_data_store->case_file->flexifile)
+		   );
 
-  gtk_sheet_set_model (data_sheet, G_SHEET_MODEL (the_data_store));
-
-  var_data_selection_init ();
-
-  {
-  GList *helps = glade_xml_get_widget_prefix (data_editor_xml, "help_button_");
-
-  GList *i;
-  for ( i = g_list_first (helps); i ; i = g_list_next (i))
-      g_signal_connect (GTK_WIDGET (i->data), "clicked", give_help, 0);
-  }
-
-#endif
+  create_icon_factory ();
 
   new_data_window (NULL, NULL);
 
@@ -280,3 +264,6 @@ create_icon_factory (void)
 
   gtk_icon_factory_add_default (factory);
 }
+
+
+