X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=inline;f=src%2Fui%2Fgui%2Fpsppire.c;h=05a1acc4b75b5cde56bf93d68ba6c063bdab18cf;hb=d52355bcda20563736bd83aed3ab58e534672cb5;hp=557130d355f3ae838a3dd0d9e5376cb96f265658;hpb=732b6a86124e89e24d685ed785d2df55728eb01b;p=pspp
diff --git a/src/ui/gui/psppire.c b/src/ui/gui/psppire.c
index 557130d355..05a1acc4b7 100644
--- a/src/ui/gui/psppire.c
+++ b/src/ui/gui/psppire.c
@@ -1,10 +1,9 @@
-/*
- PSPPIRE --- A Graphical User Interface for PSPP
+/* PSPPIRE - a graphical user interface for PSPP.
Copyright (C) 2004, 2005, 2006 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,35 +12,31 @@
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 "psppire.h"
+
+
+#include
+#include
#include
#include
-#include
-#include
#include
#include
#include
#include
#include
-#include
+#include
-#include
-#include
#include
#include
#include "psppire-dict.h"
@@ -51,74 +46,29 @@
#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;
-void create_icon_factory (void);
+static 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)
+replace_casereader (struct casereader *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));
- }
-}
+ PsppireCaseFile *pcf = psppire_case_file_new (s);
+ psppire_data_store_set_case_file (the_data_store, pcf);
+}
-int
-main (int argc, char *argv[])
+void
+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");
@@ -127,111 +77,54 @@ main (int argc, char *argv[])
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 (
+ the_source_stream =
+ create_source_stream (
fn_getenv_default ("STAT_INCLUDE_PATH", include_path)
);
- the_dataset = create_dataset (factory,
- replace_flexifile,
- replace_dictionary);
+ the_dataset = create_dataset (NULL, NULL);
+
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);
+ replace_casereader (NULL);
- 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 ();
+void
+de_initialize (void)
+{
destroy_source_stream (the_source_stream);
message_dialog_done ();
-
settings_done ();
-
- return 0;
}
-/* 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)
-{
- static struct option long_options[] =
- {
- {"help", no_argument, NULL, 'h'},
- {"version", no_argument, NULL, 'V'},
- {0, 0, 0, 0},
- };
-
- int c;
-
- for (;;)
- {
- 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;
- }
- }
-
- if ( optind < *argc)
- {
- *filename = (*argv)[optind];
- }
-
- return true;
-}
-
#define PIXBUF_NEW_FROM_FILE(FILE) \
gdk_pixbuf_new_from_file (relocate (PKGDATADIR "/" FILE), 0)
-void
+static void
create_icon_factory (void)
{
GtkIconFactory *factory = gtk_icon_factory_new ();
@@ -275,6 +168,37 @@ create_icon_factory (void)
g_object_unref (pixbuf);
gtk_icon_factory_add ( factory, "pspp-select-cases", icon_set);
+ 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);
+
+ pixbuf = PIXBUF_NEW_FROM_FILE ("nominal.png");
+ icon_set = gtk_icon_set_new_from_pixbuf (pixbuf);
+ g_object_unref (pixbuf);
+ gtk_icon_factory_add ( factory, "var-nominal", icon_set);
+
+ pixbuf = PIXBUF_NEW_FROM_FILE ("ordinal.png");
+ icon_set = gtk_icon_set_new_from_pixbuf (pixbuf);
+ g_object_unref (pixbuf);
+ gtk_icon_factory_add ( factory, "var-ordinal", icon_set);
+
+ pixbuf = PIXBUF_NEW_FROM_FILE ("scale.png");
+ icon_set = gtk_icon_set_new_from_pixbuf (pixbuf);
+ g_object_unref (pixbuf);
+ gtk_icon_factory_add ( factory, "var-scale", icon_set);
+
+ pixbuf = PIXBUF_NEW_FROM_FILE ("string.png");
+ icon_set = gtk_icon_set_new_from_pixbuf (pixbuf);
+ g_object_unref (pixbuf);
+ gtk_icon_factory_add ( factory, "var-string", icon_set);
+
+ pixbuf = PIXBUF_NEW_FROM_FILE ("date-scale.png");
+ icon_set = gtk_icon_set_new_from_pixbuf (pixbuf);
+ g_object_unref (pixbuf);
+ gtk_icon_factory_add ( factory, "var-date-scale", icon_set);
+
+
gtk_icon_factory_add_default (factory);
}