X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire.c;h=05a1acc4b75b5cde56bf93d68ba6c063bdab18cf;hb=c427e8ca6b4c5d3d365b4ff3bb58a81e34efd217;hp=67ace893386b2854b9157115e7f71646636dda67;hpb=57b436a22d9ae0e395fb2e3ce101c2b5c2e6939e;p=pspp-builds.git
diff --git a/src/ui/gui/psppire.c b/src/ui/gui/psppire.c
index 67ace893..05a1acc4 100644
--- a/src/ui/gui/psppire.c
+++ b/src/ui/gui/psppire.c
@@ -1,11 +1,9 @@
-/*
- PSPPIRE --- A Graphical User Interface for PSPP
+/* PSPPIRE - a graphical user interface for PSPP.
Copyright (C) 2004, 2005, 2006 Free Software Foundation
- Written by John Darrington
- 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,22 +12,33 @@
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
-#include
+#include "relocatable.h"
+
+#include "data-editor.h"
+
+#include "psppire.h"
+
+
+#include
+#include
+#include
+#include
#include
+#include
+#include
+#include
+#include
+#include
-#include
-#include
#include
#include
-#include "menu-actions.h"
#include "psppire-dict.h"
#include "psppire-var-store.h"
#include "psppire-data-store.h"
@@ -38,63 +47,29 @@
#include "var-sheet.h"
#include "message-dialog.h"
-GladeXML *xml;
-
-
-PsppireDict *the_dictionary = 0;
-
-PsppireDataStore *data_store = 0;
+PsppireDataStore *the_data_store = 0;
+PsppireVarStore *the_var_store = 0;
+static void create_icon_factory (void);
-static bool parse_command_line (int *argc, char ***argv,
- gchar **filename, GError **err);
+struct source_stream *the_source_stream ;
+struct dataset * the_dataset = NULL;
-#define _(msgid) gettext (msgid)
-#define N_(msgid) msgid
-
static void
-give_help(void)
+replace_casereader (struct casereader *s)
{
- static struct msg m = {
- MSG_GENERAL,
- MSG_NOTE,
- {0, -1},
- 0,
- };
-
- if (! m.text)
- m.text=g_strdup(_("Sorry. The help system hasn't yet been implemented."));
+ PsppireCaseFile *pcf = psppire_case_file_new (s);
- popup_message(&m);
+ psppire_data_store_set_case_file (the_data_store, pcf);
}
-PsppireVarStore *var_store = 0;
-
-void create_icon_factory (void);
-
-int
-main(int argc, char *argv[])
+void
+initialize (void)
{
+ PsppireDict *dictionary = 0;
- GtkWidget *data_editor ;
- GtkSheet *var_sheet ;
- GtkSheet *data_sheet ;
-
- 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.
+ /* gtk_init messes with the locale.
So unset the bits we want to control ourselves */
setlocale (LC_NUMERIC, "C");
@@ -102,166 +77,128 @@ main(int argc, char *argv[])
textdomain (PACKAGE);
- if ( ! parse_command_line(&argc, &argv, &filename, &err) )
- {
- g_clear_error(&err);
- return 0;
- }
-
- glade_init();
-
-
-
- settings_init();
-
- message_dialog_init();
-
- the_dictionary = psppire_dict_new();
-
- bind_textdomain_codeset(PACKAGE, "UTF-8");
-
- /* Create the model for the var_sheet */
- var_store = psppire_var_store_new(the_dictionary);
-
- data_store = psppire_data_store_new(the_dictionary);
+ glade_init ();
- create_icon_factory();
+ fmt_init ();
+ settings_init ();
+ fh_init ();
+ the_source_stream =
+ create_source_stream (
+ fn_getenv_default ("STAT_INCLUDE_PATH", include_path)
+ );
- /* load the interface */
- xml = glade_xml_new(PKGDATADIR "/psppire.glade", NULL, NULL);
+ the_dataset = create_dataset (NULL, NULL);
- if ( !xml ) return 1;
- data_editor = get_widget_assert(xml, "data_editor");
- gtk_window_set_icon_from_file(GTK_WINDOW(data_editor),
- PKGDATADIR "/psppicon.png",0);
+ message_dialog_init (the_source_stream);
- /* connect the signals in the interface */
- glade_xml_signal_autoconnect(xml);
+ dictionary = psppire_dict_new_from_dict (dataset_dict (the_dataset));
- var_sheet = GTK_SHEET(get_widget_assert(xml, "variable_sheet"));
- data_sheet = GTK_SHEET(get_widget_assert(xml, "data_sheet"));
- gtk_sheet_set_model(var_sheet, G_SHEET_MODEL(var_store));
-
- gtk_sheet_set_model(data_sheet, G_SHEET_MODEL(data_store));
+ bind_textdomain_codeset (PACKAGE, "UTF-8");
- if (filename)
- gtk_init_add((GtkFunction)load_system_file, filename);
- else
- gtk_init_add((GtkFunction)clear_file, 0);
-
- var_data_selection_init();
-
- {
- GList *helps = glade_xml_get_widget_prefix(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);
- }
+ /* Create the model for the var_sheet */
+ the_var_store = psppire_var_store_new (dictionary);
- /* start the event loop */
- gtk_main();
+ the_data_store = psppire_data_store_new (dictionary);
+ replace_casereader (NULL);
- message_dialog_done();
- settings_done();
+ create_icon_factory ();
- return 0;
+ new_data_window (NULL, NULL);
}
-/* 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)
+void
+de_initialize (void)
{
- 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;
+ destroy_source_stream (the_source_stream);
+ message_dialog_done ();
+ settings_done ();
}
+#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();
+ GtkIconFactory *factory = gtk_icon_factory_new ();
GtkIconSet *icon_set;
-
+
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);
+ 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);
}
+