X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire.c;h=ed4c790b95a38797dbbe8e730ffa9cfa1c9b0fe4;hb=687adf53eae434e88a47bb3409f946f3a26115a4;hp=9a341ec424da1922d5246d2b9e1042f86c1c290a;hpb=2c71feac2da7abc2cd178b1ff30e0f217c3b6d86;p=pspp diff --git a/src/ui/gui/psppire.c b/src/ui/gui/psppire.c index 9a341ec424..ed4c790b95 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,12 +17,21 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ +#include + #include #include + #include #include +#include +#include #include +#include +#include +#include +#include #include #include @@ -36,15 +44,13 @@ #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; PsppireDict *the_dictionary = 0; -PsppireCaseArray *the_cases = 0; - PsppireDataStore *data_store = 0; @@ -74,9 +80,17 @@ give_help(void) PsppireVarStore *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[]) { + struct casefile_factory *factory; GtkWidget *data_editor ; GtkSheet *var_sheet ; @@ -84,8 +98,16 @@ main(int argc, char *argv[]) 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. So unset the bits we want to control ourselves */ @@ -98,32 +120,38 @@ main(int argc, char *argv[]) if ( ! parse_command_line(&argc, &argv, &filename, &err) ) { g_clear_error(&err); - return 1; + return 0; } - glade_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_lexer = lex_create (the_source_stream); - /* - set_pspp_locale("da_DK"); - */ + the_dataset = create_dataset (factory); - message_dialog_init(); + message_dialog_init (the_source_stream); - the_dictionary = psppire_dict_new(); + the_dictionary = + psppire_dict_new_from_dict ( + dataset_dict (the_dataset) + ); bind_textdomain_codeset(PACKAGE, "UTF-8"); /* Create the model for the var_sheet */ var_store = psppire_var_store_new(the_dictionary); - /* Create the model for the data sheet */ - the_cases = psppire_case_array_new(100000, 20); + data_store = psppire_data_store_new(the_dictionary); - data_store = psppire_data_store_new(the_dictionary, the_cases); + create_icon_factory(); /* load the interface */ xml = glade_xml_new(PKGDATADIR "/psppire.glade", NULL, NULL); @@ -131,7 +159,7 @@ main(int argc, char *argv[]) if ( !xml ) return 1; data_editor = get_widget_assert(xml, "data_editor"); - gtk_window_set_icon_from_file(GTK_WINDOW(data_editor), + gtk_window_set_icon_from_file(GTK_WINDOW(data_editor), PKGDATADIR "/psppicon.png",0); /* connect the signals in the interface */ @@ -141,7 +169,7 @@ main(int argc, char *argv[]) data_sheet = GTK_SHEET(get_widget_assert(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)); if (filename) @@ -163,6 +191,7 @@ main(int argc, char *argv[]) /* start the event loop */ gtk_main(); + destroy_source_stream (the_source_stream); message_dialog_done(); settings_done(); @@ -195,12 +224,12 @@ 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; @@ -216,3 +245,50 @@ parse_command_line (int *argc, char ***argv, gchar **filename, GError **err) } + +void +create_icon_factory (void) +{ + GtkIconFactory *factory = gtk_icon_factory_new(); + + GtkIconSet *icon_set; + + GdkPixbuf *pixbuf; + + pixbuf = gdk_pixbuf_new_from_file (PKGDATADIR "/value-labels.png", 0); + 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); + 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); + 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); + 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); + 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); + 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); + icon_set = gtk_icon_set_new_from_pixbuf (pixbuf); + g_object_unref (pixbuf); + gtk_icon_factory_add ( factory, "pspp-select-cases", icon_set); + + gtk_icon_factory_add_default (factory); +}