X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire.c;h=f6bf1de36cdd7346360d69bd8315228b977125e5;hb=1d5a97ba2afec23855a8294ff2814ab052f6777a;hp=e252acdefb84f69cb6b9ba96db26574a36c7c8ed;hpb=1ce1429567835f83a712a8a76ab80db64360d742;p=pspp-builds.git diff --git a/src/ui/gui/psppire.c b/src/ui/gui/psppire.c index e252acde..f6bf1de3 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,112 +17,174 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -/* - * Initial main.c file generated by Glade. Edit as required. - * Glade will not overwrite this file. - */ +#include #include +#include + +#include "progname.h" +#include "relocatable.h" + +#include "data-editor.h" + #include #include +#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" - #include "helper.h" #include "data-sheet.h" #include "var-sheet.h" -#include "psppire-case-array.h" #include "message-dialog.h" +#include "flexifile-factory.h" -GladeXML *xml; +PsppireDataStore *the_data_store = 0; -PsppireDict *the_dictionary = 0; -PsppireCaseArray *the_cases = 0; +static bool parse_command_line (int *argc, char ***argv, + gchar **filename, GError **err); -PsppireDataStore *data_store = 0; +PsppireVarStore *the_var_store = 0; +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; + +static void +replace_dictionary (struct dictionary *d) +{ + psppire_dict_replace_dictionary (the_data_store->dict, + d); +} -int -main(int argc, char *argv[]) +static void +replace_flexifile (struct case_source *s) { - PsppireVarStore *var_store ; - GtkWidget *data_editor ; - GtkSheet *var_sheet ; - GtkSheet *data_sheet ; + 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[]) +{ + 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 ( ! parse_command_line(&argc, &argv, &filename, &err) ) + if ( ! gtk_parse_args (&argc, &argv) ) { - g_clear_error(&err); - return 1; + perror ("Error parsing arguments"); + exit (1); } + if ( (vers = gtk_check_version (GTK_MAJOR_VERSION, + GTK_MINOR_VERSION, + GTK_MICRO_VERSION)) ) + { + g_critical (vers); + } - glade_init(); - message_dialog_init(); + /* gtk_init messes with the locale. + So unset the bits we want to control ourselves */ + setlocale (LC_NUMERIC, "C"); - the_dictionary = psppire_dict_new(); + bindtextdomain (PACKAGE, locale_dir); - /* Create the model for the var_sheet */ - var_store = psppire_var_store_new(the_dictionary); + textdomain (PACKAGE); - /* Create the model for the data sheet */ - the_cases = psppire_case_array_new(100000, 20); + if ( ! parse_command_line (&argc, &argv, &filename, &err) ) + { + g_clear_error (&err); + return 0; + } - data_store = psppire_data_store_new(the_dictionary, the_cases); + glade_init (); - /* load the interface */ - xml = glade_xml_new(PKGDATADIR "/psppire.glade", NULL, NULL); + fmt_init (); + settings_init (); + fh_init (); + factory = flexifile_factory_create (); + the_source_stream = create_source_stream ( + fn_getenv_default ("STAT_INCLUDE_PATH", include_path) + ); - if ( !xml ) return 1; + the_dataset = create_dataset (factory, + replace_flexifile, + replace_dictionary); - 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")); + bind_textdomain_codeset (PACKAGE, "UTF-8"); - gtk_sheet_set_model(var_sheet, G_SHEET_MODEL(var_store)); - - gtk_sheet_set_model(data_sheet, G_SHEET_MODEL(data_store)); + gdk_init (&argc, &argv); - gtk_init_add(callbacks_on_init, 0); + /* Create the model for the var_sheet */ + the_var_store = psppire_var_store_new (dictionary); - if (filename) - gtk_init_add((GtkFunction)load_system_file, filename); + + 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); /* start the event loop */ - gtk_main(); + gtk_main (); + + destroy_source_stream (the_source_stream); + message_dialog_done (); - 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, + 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) @@ -146,22 +207,81 @@ 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; } } - if ( optind < *argc) + if ( optind < *argc) { *filename = (*argv)[optind]; } return true; } + +#define PIXBUF_NEW_FROM_FILE(FILE) \ + gdk_pixbuf_new_from_file (relocate (PKGDATADIR "/" FILE), 0) + + +void +create_icon_factory (void) +{ + GtkIconFactory *factory = gtk_icon_factory_new (); + + GtkIconSet *icon_set; + + GdkPixbuf *pixbuf; + + 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 = 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 = 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 = 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 = 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 = 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 = 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); + + + + gtk_icon_factory_add_default (factory); +} +