Fixed the refresh button on the dialogs.

[pspp-builds.git] / src / ui / gui / psppire.c

diff --git a/src/ui/gui/psppire.c b/src/ui/gui/psppire.c
index b0de6cfa1bdfddc5a5cfc6b7d0fb4d995f5fb80c..f6bf1de36cdd7346360d69bd8315228b977125e5 100644 (file)
--- a/src/ui/gui/psppire.c
+++ b/src/ui/gui/psppire.c
@@ -22,17 +22,23 @@
 #include <assert.h>
 #include <libintl.h>
 
+#include "progname.h"
+#include "relocatable.h"
 
 #include "data-editor.h"
+
 #include <libpspp/version.h>
 #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>
@@ -61,6 +67,31 @@ void create_icon_factory (void);
 struct source_stream *the_source_stream ;
 struct dataset * the_dataset = NULL;
 
+static void
+replace_dictionary (struct dictionary *d)
+{
+  psppire_dict_replace_dictionary (the_data_store->dict,
+                                  d);
+}
+
+
+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 ;
+
+      psppire_case_file_replace_flexifile (the_data_store->case_file,
+                                          (struct flexifile *)
+                                          storage_source_get_casefile (s));
+    }
+}
+
 
 int
 main (int argc, char *argv[])
@@ -68,12 +99,18 @@ main (int argc, char *argv[])
   struct casefile_factory *factory;
   PsppireDict *dictionary = 0;
 
-
   gchar *filename=0;
   GError *err = 0;
   gchar *vers;
 
-  gtk_init (&argc, &argv);
+  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)) )
@@ -106,23 +143,30 @@ 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");
 
+  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);
@@ -183,6 +227,8 @@ parse_command_line (int *argc, char ***argv, gchar **filename, GError **err)
   return true;
 }
 
+#define PIXBUF_NEW_FROM_FILE(FILE) \
+  gdk_pixbuf_new_from_file (relocate (PKGDATADIR "/" FILE), 0)
 
 
 void
@@ -194,43 +240,48 @@ create_icon_factory (void)
 
   GdkPixbuf *pixbuf;
 
-  pixbuf = gdk_pixbuf_new_from_file (PKGDATADIR "/value-labels.png", 0);
+  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 = gdk_pixbuf_new_from_file (PKGDATADIR "/weight-cases.png", 0);
+  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 = gdk_pixbuf_new_from_file (PKGDATADIR "/goto-variable.png", 0);
+  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 = gdk_pixbuf_new_from_file (PKGDATADIR "/insert-variable.png", 0);
+  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 = gdk_pixbuf_new_from_file (PKGDATADIR "/insert-case.png", 0);
+  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);
 
-  pixbuf = gdk_pixbuf_new_from_file (PKGDATADIR "/split-file.png", 0);
+  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 = gdk_pixbuf_new_from_file (PKGDATADIR "/select-cases.png", 0);
+  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);
 
-  gtk_icon_factory_add_default (factory);
-}
+  pixbuf = PIXBUF_NEW_FROM_FILE ("recent-dialogs.png");
+  icon_set = gtk_icon_set_new_from_pixbuf (pixbuf);
+  g_object_unref (pixbuf);
+  gtk_icon_factory_add ( factory, "pspp-recent-dialogs", icon_set);
 
 
 
+  gtk_icon_factory_add_default (factory);
+}
+