X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire.c;h=05a1acc4b75b5cde56bf93d68ba6c063bdab18cf;hb=338a3ecb26f25819c1cb1667a39ab40065f72fdb;hp=59dde1b082f44fe96191361a16bb01db33cd6c3d;hpb=a486e7cbf4f95d19bb208796e4c92a040cf48f65;p=pspp-builds.git diff --git a/src/ui/gui/psppire.c b/src/ui/gui/psppire.c index 59dde1b0..05a1acc4 100644 --- a/src/ui/gui/psppire.c +++ b/src/ui/gui/psppire.c @@ -1,10 +1,9 @@ -/* - PSPPIRE --- A Graphical User Interface for PSPP +/* PSPPIRE - a graphical user interface for PSPP. Copyright (C) 2004, 2005, 2006 Free Software Foundation - 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, @@ -13,19 +12,22 @@ 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 "relocatable.h" #include "data-editor.h" -#include -#include + +#include "psppire.h" + + +#include +#include #include #include #include @@ -33,9 +35,8 @@ #include #include #include +#include -#include -#include #include #include #include "psppire-dict.h" @@ -45,68 +46,30 @@ #include "data-sheet.h" #include "var-sheet.h" #include "message-dialog.h" -#include "flexifile-factory.h" 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 *the_var_store = 0; - -void create_icon_factory (void); - -struct source_stream *the_source_stream ; -struct lexer *the_lexer; -struct dataset * the_dataset = NULL; - - -int -main(int argc, char *argv[]) +void +initialize (void) { - 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_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"); @@ -114,176 +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(); + glade_init (); - fmt_init(); - settings_init(); + fmt_init (); + settings_init (); fh_init (); - factory = flexifile_factory_create (); - the_source_stream = create_source_stream ( + the_source_stream = + create_source_stream ( fn_getenv_default ("STAT_INCLUDE_PATH", include_path) ); - the_lexer = lex_create (the_source_stream); + the_dataset = create_dataset (NULL, NULL); - the_dataset = create_dataset (factory); message_dialog_init (the_source_stream); - dictionary = - psppire_dict_new_from_dict ( - dataset_dict (the_dataset) - ); - - bind_textdomain_codeset(PACKAGE, "UTF-8"); - - /* Create the model for the var_sheet */ - 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"); + dictionary = psppire_dict_new_from_dict (dataset_dict (the_dataset)); - /* 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")); + bind_textdomain_codeset (PACKAGE, "UTF-8"); - gtk_sheet_set_model(var_sheet, G_SHEET_MODEL(the_var_store)); - gtk_sheet_set_model(data_sheet, G_SHEET_MODEL(the_data_store)); - - var_data_selection_init(); + /* Create the model for the var_sheet */ + the_var_store = psppire_var_store_new (dictionary); - { - GList *helps = glade_xml_get_widget_prefix(data_editor_xml, "help_button_"); + the_data_store = psppire_data_store_new (dictionary); + replace_casereader (NULL); - 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(); - - destroy_source_stream (the_source_stream); - 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, - 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); } +