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=f0041eba4ec07b0f57ff072226a8695f54338600;hpb=13d1b533c6ce0545a4b06e5e30c73211591034c5;p=pspp-builds.git diff --git a/src/ui/gui/psppire.c b/src/ui/gui/psppire.c index f0041eba..f6bf1de3 100644 --- a/src/ui/gui/psppire.c +++ b/src/ui/gui/psppire.c @@ -1,4 +1,4 @@ -/* +/* PSPPIRE --- A Graphical User Interface for PSPP Copyright (C) 2004, 2005, 2006 Free Software Foundation @@ -22,17 +22,23 @@ #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 @@ -50,62 +56,70 @@ PsppireDataStore *the_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); -#define _(msgid) gettext (msgid) -#define N_(msgid) msgid +PsppireVarStore *the_var_store = 0; -static void -give_help(void) -{ - static struct msg m = { - MSG_GENERAL, - MSG_NOTE, - {0, -1}, - 0, - }; +void create_icon_factory (void); - if (! m.text) - m.text=g_strdup(_("Sorry. The help system hasn't yet been implemented.")); +struct source_stream *the_source_stream ; +struct dataset * the_dataset = NULL; - popup_message(&m); +static void +replace_dictionary (struct dictionary *d) +{ + psppire_dict_replace_dictionary (the_data_store->dict, + d); } -PsppireVarStore *the_var_store = 0; -void create_icon_factory (void); +static void +replace_flexifile (struct case_source *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 ; -struct source_stream *the_source_stream ; -struct dataset * the_dataset = NULL; + psppire_case_file_replace_flexifile (the_data_store->case_file, + (struct flexifile *) + storage_source_get_casefile (s)); + } +} -int -main(int argc, char *argv[]) +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, + 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); + 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"); @@ -113,87 +127,64 @@ 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 (); - fmt_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) ); - the_dataset = create_dataset (factory); + the_dataset = create_dataset (factory, + replace_flexifile, + replace_dictionary); 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"); + 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_var_store = psppire_var_store_new (dictionary); the_data_store = psppire_data_store_new (dictionary); - create_icon_factory(); - -#if 0 - /* load the interface */ - data_editor_xml = glade_xml_new(PKGDATADIR "/data-editor.glade", NULL, NULL); - - if ( !data_editor_xml ) return 1; - - data_editor = get_widget_assert(data_editor_xml, "data_editor"); - - /* connect the signals in the interface */ - glade_xml_signal_autoconnect(data_editor_xml); - - 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(the_var_store)); - - gtk_sheet_set_model(data_sheet, G_SHEET_MODEL(the_data_store)); + proc_set_source (the_dataset, + storage_source_create (the_data_store->case_file->flexifile) + ); - var_data_selection_init(); - - { - 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); - } - -#endif + 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(); + 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) @@ -228,7 +219,7 @@ parse_command_line (int *argc, char ***argv, gchar **filename, GError **err) } } - if ( optind < *argc) + if ( optind < *argc) { *filename = (*argv)[optind]; } @@ -236,51 +227,61 @@ parse_command_line (int *argc, char ***argv, gchar **filename, GError **err) return true; } +#define PIXBUF_NEW_FROM_FILE(FILE) \ + gdk_pixbuf_new_from_file (relocate (PKGDATADIR "/" FILE), 0) -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); + 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); + + + gtk_icon_factory_add_default (factory); } +