X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire.c;h=ff155d68fe71cc66e97dff9572a06435adae7045;hb=d96e59d1c5f17bd3b4b3b757640851731fde3c78;hp=6e7c6e0a5ea05d25e149bea74eef9415fc031f5b;hpb=e1afbdf98986678c42673ecb76224790f355926a;p=pspp-builds.git diff --git a/src/ui/gui/psppire.c b/src/ui/gui/psppire.c index 6e7c6e0a..ff155d68 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,34 @@ 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 #include #include -#include "menu-actions.h" #include "psppire-dict.h" #include "psppire-var-store.h" #include "psppire-data-store.h" @@ -38,61 +48,31 @@ #include "var-sheet.h" #include "message-dialog.h" -GladeXML *xml; +#include "output-viewer.h" +PsppireDataStore *the_data_store = 0; +PsppireVarStore *the_var_store = 0; -PsppireDict *the_dictionary = 0; +static void create_icon_factory (void); -PsppireDataStore *data_store = 0; +struct source_stream *the_source_stream ; +struct dataset * the_dataset = NULL; -static bool parse_command_line (int *argc, char ***argv, - gchar **filename, GError **err); - - -#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; - -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"); @@ -100,121 +80,108 @@ main(int argc, char *argv[]) textdomain (PACKAGE); - if ( ! parse_command_line(&argc, &argv, &filename, &err) ) - { - g_clear_error(&err); - return 1; - } - + glade_init (); - glade_init(); + fmt_init (); + fn_init (); + outp_init (); + settings_init (); + fh_init (); + the_source_stream = + create_source_stream ( + fn_getenv_default ("STAT_INCLUDE_PATH", include_path) + ); + the_dataset = create_dataset (); - settings_init(); - /* - set_pspp_locale("da_DK"); - */ + message_dialog_init (the_source_stream); - message_dialog_init(); + dictionary = psppire_dict_new_from_dict (dataset_dict (the_dataset)); - the_dictionary = psppire_dict_new(); - - 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); - - data_store = psppire_data_store_new(the_dictionary); + the_var_store = psppire_var_store_new (dictionary); - /* load the interface */ - xml = glade_xml_new(PKGDATADIR "/psppire.glade", NULL, NULL); + the_data_store = psppire_data_store_new (dictionary); + replace_casereader (NULL); - if ( !xml ) return 1; + create_icon_factory (); - data_editor = get_widget_assert(xml, "data_editor"); - gtk_window_set_icon_from_file(GTK_WINDOW(data_editor), - PKGDATADIR "/psppicon.png",0); + outp_configure_driver_line ( + ss_cstr ("gui:ascii:screen:squeeze=on headers=off top-margin=0 " + "bottom-margin=0 paginate=off length=50 " + "width=" OUTPUT_LINE_WIDTH_str " emphasis=none " + "output-file=\"" OUTPUT_FILE_NAME "\" append=yes")); - /* connect the signals in the interface */ - glade_xml_signal_autoconnect(xml); + unlink (OUTPUT_FILE_NAME); - var_sheet = GTK_SHEET(get_widget_assert(xml, "variable_sheet")); - data_sheet = GTK_SHEET(get_widget_assert(xml, "data_sheet")); + journal_enable (); - gtk_sheet_set_model(var_sheet, G_SHEET_MODEL(var_store)); - - gtk_sheet_set_model(data_sheet, G_SHEET_MODEL(data_store)); - - 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); - } + 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 (); + outp_done (); +} - message_dialog_done(); - settings_done(); +struct icon_info +{ + const char *file_name; + const gchar *id; +}; - return 0; -} +static const struct icon_info icons[] = + { + {PKGDATADIR "/value-labels.png", "pspp-value-labels"}, + {PKGDATADIR "/weight-cases.png", "pspp-weight-cases"}, + {PKGDATADIR "/goto-variable.png", "pspp-goto-variable"}, + {PKGDATADIR "/insert-variable.png", "pspp-insert-variable"}, + {PKGDATADIR "/insert-case.png", "pspp-insert-case"}, + {PKGDATADIR "/split-file.png", "pspp-split-file"}, + {PKGDATADIR "/select-cases.png", "pspp-select-cases"}, + {PKGDATADIR "/recent-dialogs.png", "pspp-recent-dialogs"}, + {PKGDATADIR "/nominal.png", "var-nominal"}, + {PKGDATADIR "/ordinal.png", "var-ordinal"}, + {PKGDATADIR "/scale.png", "var-scale"}, + {PKGDATADIR "/string.png", "var-string"}, + {PKGDATADIR "/date-scale.png", "var-date-scale"} + }; -/* 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 void +create_icon_factory (void) { - static struct option long_options[] = - { - {"help", no_argument, NULL, 'h'}, - {"version", no_argument, NULL, 'V'}, - {0, 0, 0, 0}, - }; + gint i; + GtkIconFactory *factory = gtk_icon_factory_new (); - int c; - - for (;;) + for (i = 0 ; i < sizeof (icons) / sizeof(icons[0]); ++i) { - c = getopt_long (*argc, *argv, "hV", long_options, NULL); - if (c == -1) - break; + GError *err = NULL; + GdkPixbuf *pixbuf = + gdk_pixbuf_new_from_file (relocate (icons[i].file_name), &err); - switch (c) + if ( pixbuf ) { - case 'h': - g_printerr("Usage: psppire {|--help|--version}\n"); - return false; - case 'V': - g_print(version); - g_print("\n"); - g_print(legal); - return false; - default: - return false; + GtkIconSet *icon_set = gtk_icon_set_new_from_pixbuf (pixbuf); + g_object_unref (pixbuf); + gtk_icon_factory_add ( factory, icons[i].id, icon_set); + } + else + { + g_warning ("Cannot create icon: %s", err->message); + g_clear_error (&err); } } - if ( optind < *argc) - { - *filename = (*argv)[optind]; - } - - return true; + gtk_icon_factory_add_default (factory); } -