X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire.c;h=cd2783c32d7afc837540f5700619b539dcf84145;hb=75fe94ea24fd7b12a0d99b8f36a79d8423e668d4;hp=162f5bbcf7a045fa2cf2cd880b6ae397a13133b7;hpb=877f476198562db5a61f3055ad0c68e39f384174;p=pspp-builds.git diff --git a/src/ui/gui/psppire.c b/src/ui/gui/psppire.c index 162f5bbc..cd2783c3 100644 --- a/src/ui/gui/psppire.c +++ b/src/ui/gui/psppire.c @@ -1,7 +1,6 @@ -/* +/* 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 it under the terms of the GNU General Public License as published by @@ -18,18 +17,27 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ +#include + #include #include + +#include "data-editor.h" #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" @@ -37,16 +45,12 @@ #include "data-sheet.h" #include "var-sheet.h" #include "message-dialog.h" +#include "flexifile-factory.h" -GladeXML *xml; - +PsppireDataStore *the_data_store = 0; -PsppireDict *the_dictionary = 0; -PsppireDataStore *data_store = 0; - - -static bool parse_command_line (int *argc, char ***argv, +static bool parse_command_line (int *argc, char ***argv, gchar **filename, GError **err); @@ -54,47 +58,50 @@ static bool parse_command_line (int *argc, char ***argv, #define N_(msgid) msgid static void -give_help(void) +give_help (void) { static struct msg m = { - MSG_GENERAL, + MSG_GENERAL, MSG_NOTE, {0, -1}, - 0, + 0, }; - if (! m.text) - m.text=g_strdup(_("Sorry. The help system hasn't yet been implemented.")); + if (! m.text) + m.text=g_strdup (_("Sorry. The help system hasn't yet been implemented.")); - popup_message(&m); + popup_message (&m); } -PsppireVarStore *var_store = 0; +PsppireVarStore *the_var_store = 0; void create_icon_factory (void); -int -main(int argc, char *argv[]) +struct source_stream *the_source_stream ; +struct dataset * the_dataset = NULL; + + +int +main (int argc, char *argv[]) { + struct casefile_factory *factory; + 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_init (&argc, &argv); + if ( (vers = gtk_check_version (GTK_MAJOR_VERSION, + GTK_MINOR_VERSION, GTK_MICRO_VERSION)) ) { - g_critical(vers); + 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,82 +109,87 @@ main(int argc, char *argv[]) textdomain (PACKAGE); - if ( ! parse_command_line(&argc, &argv, &filename, &err) ) + if ( ! parse_command_line (&argc, &argv, &filename, &err) ) { - g_clear_error(&err); + g_clear_error (&err); return 0; } - glade_init(); - + glade_init (); - settings_init(); + fmt_init (); + settings_init (); + fh_init (); + factory = flexifile_factory_create (); + the_source_stream = create_source_stream ( + fn_getenv_default ("STAT_INCLUDE_PATH", include_path) + ); - /* - set_pspp_locale("da_DK"); - */ + the_dataset = create_dataset (factory); - message_dialog_init(); + message_dialog_init (the_source_stream); - the_dictionary = psppire_dict_new(); + dictionary = + psppire_dict_new_from_dict ( + dataset_dict (the_dataset) + ); - bind_textdomain_codeset(PACKAGE, "UTF-8"); + bind_textdomain_codeset (PACKAGE, "UTF-8"); /* Create the model for the var_sheet */ - var_store = psppire_var_store_new(the_dictionary); + the_var_store = psppire_var_store_new (dictionary); - data_store = psppire_data_store_new(the_dictionary); - create_icon_factory(); + the_data_store = psppire_data_store_new (dictionary); + create_icon_factory (); + +#if 0 /* load the interface */ - xml = glade_xml_new(PKGDATADIR "/psppire.glade", NULL, NULL); + data_editor_xml = glade_xml_new (PKGDATADIR "/data-editor.glade", NULL, NULL); - if ( !xml ) return 1; + if ( !data_editor_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); + data_editor = get_widget_assert (data_editor_xml, "data_editor"); /* connect the signals in the interface */ - glade_xml_signal_autoconnect(xml); + glade_xml_signal_autoconnect (data_editor_xml); - var_sheet = GTK_SHEET(get_widget_assert(xml, "variable_sheet")); - data_sheet = GTK_SHEET(get_widget_assert(xml, "data_sheet")); + 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(var_store)); - - gtk_sheet_set_model(data_sheet, G_SHEET_MODEL(data_store)); + gtk_sheet_set_model (var_sheet, G_SHEET_MODEL (the_var_store)); - if (filename) - gtk_init_add((GtkFunction)load_system_file, filename); - else - gtk_init_add((GtkFunction)clear_file, 0); + gtk_sheet_set_model (data_sheet, G_SHEET_MODEL (the_data_store)); - var_data_selection_init(); + var_data_selection_init (); { - GList *helps = glade_xml_get_widget_prefix(xml, "help_button_"); + 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); + for ( i = g_list_first (helps); i ; i = g_list_next (i)) + g_signal_connect (GTK_WIDGET (i->data), "clicked", give_help, 0); } +#endif + + new_data_window (NULL, NULL); /* start the event loop */ - gtk_main(); + gtk_main (); - message_dialog_done(); + destroy_source_stream (the_source_stream); + message_dialog_done (); - settings_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, + 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) @@ -212,7 +224,7 @@ parse_command_line (int *argc, char ***argv, gchar **filename, GError **err) } } - if ( optind < *argc) + if ( optind < *argc) { *filename = (*argv)[optind]; } @@ -222,13 +234,13 @@ parse_command_line (int *argc, char ***argv, gchar **filename, GError **err) -void +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);