Patch #5209

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

diff --git a/src/ui/gui/psppire.c b/src/ui/gui/psppire.c
index 9a341ec424da1922d5246d2b9e1042f86c1c290a..67ace893386b2854b9157115e7f71646636dda67 100644 (file)
--- a/src/ui/gui/psppire.c
+++ b/src/ui/gui/psppire.c
@@ -36,15 +36,12 @@
 #include "helper.h"
 #include "data-sheet.h"
 #include "var-sheet.h"
-#include "psppire-case-array.h"
 #include "message-dialog.h"
 
 GladeXML *xml;
 
 
 PsppireDict *the_dictionary = 0;
-PsppireCaseArray *the_cases = 0;
-
 
 PsppireDataStore *data_store = 0;
 
@@ -74,6 +71,8 @@ give_help(void)
 
 PsppireVarStore *var_store = 0;
 
+void create_icon_factory (void);
+
 int 
 main(int argc, char *argv[]) 
 {
@@ -84,8 +83,16 @@ main(int argc, char *argv[])
 
   gchar *filename=0;
   GError *err = 0;
+  gchar *vers;
 
   gtk_init(&argc, &argv);
+  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 */
@@ -98,18 +105,14 @@ main(int argc, char *argv[])
   if ( ! parse_command_line(&argc, &argv, &filename, &err) ) 
     {
       g_clear_error(&err);
-      return 1;
+      return 0;
     }
 
-
   glade_init();
 
 
-  settings_init();
 
-  /* 
-  set_pspp_locale("da_DK");
-  */
+  settings_init();
 
   message_dialog_init();
 
@@ -120,10 +123,9 @@ main(int argc, char *argv[])
   /* Create the model for the var_sheet */
   var_store = psppire_var_store_new(the_dictionary);
 
-  /* Create the model for the data sheet */
-  the_cases = psppire_case_array_new(100000, 20);
+  data_store = psppire_data_store_new(the_dictionary);
 
-  data_store = psppire_data_store_new(the_dictionary, the_cases);
+  create_icon_factory();
 
   /* load the interface */
   xml = glade_xml_new(PKGDATADIR "/psppire.glade", NULL, NULL);
@@ -195,12 +197,12 @@ parse_command_line (int *argc, char ***argv, gchar **filename, GError **err)
       switch (c)
        {
        case 'h':
-         g_printerr("Usage: psppire {|--help|--version}\n");
+         g_print ("Usage: psppire {|--help|--version}\n");
           return false;
        case 'V':
-         g_print(version);
-         g_print("\n");
-         g_print(legal);
+         g_print (version);
+         g_print ("\n");
+         g_print (legal);
          return false;
        default:
          return false;
@@ -216,3 +218,50 @@ parse_command_line (int *argc, char ***argv, gchar **filename, GError **err)
 }
 
 
+
+void 
+create_icon_factory (void)
+{
+  GtkIconFactory *factory = gtk_icon_factory_new();
+
+  GtkIconSet *icon_set;
+  
+  GdkPixbuf *pixbuf;
+
+  pixbuf = gdk_pixbuf_new_from_file (PKGDATADIR "/value-labels.png", 0);
+  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);
+  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);
+  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);
+  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);
+  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);
+  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);
+  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);
+}