X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire.c;h=f0041eba4ec07b0f57ff072226a8695f54338600;hb=13e7983c183d6448d09cd8ed9644351b676af4d3;hp=78b56752f0d39ea42c34acd3676af4be79abe185;hpb=9711bd03dcc19d39c08e0d5bc52ff909f592db6b;p=pspp-builds.git diff --git a/src/ui/gui/psppire.c b/src/ui/gui/psppire.c index 78b56752..f0041eba 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,18 +17,27 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ +#include + #include #include + +#include "data-editor.h" #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" @@ -37,13 +45,9 @@ #include "data-sheet.h" #include "var-sheet.h" #include "message-dialog.h" +#include "flexifile-factory.h" -GladeXML *xml; - - -PsppireDict *the_dictionary = 0; - -PsppireDataStore *data_store = 0; +PsppireDataStore *the_data_store = 0; static bool parse_command_line (int *argc, char ***argv, @@ -69,11 +73,20 @@ give_help(void) popup_message(&m); } -PsppireVarStore *var_store = 0; +PsppireVarStore *the_var_store = 0; + +void create_icon_factory (void); + +struct source_stream *the_source_stream ; +struct dataset * the_dataset = NULL; + int main(int argc, char *argv[]) { + struct casefile_factory *factory; + PsppireDict *dictionary = 0; + GtkWidget *data_editor ; GtkSheet *var_sheet ; @@ -106,65 +119,71 @@ main(int argc, char *argv[]) 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) + ); - /* - set_pspp_locale("da_DK"); - */ + the_dataset = create_dataset (factory); - message_dialog_init(); + message_dialog_init (the_source_stream); - the_dictionary = psppire_dict_new(); + 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); + the_var_store = psppire_var_store_new(dictionary); + + + the_data_store = psppire_data_store_new (dictionary); - data_store = psppire_data_store_new(the_dictionary); + create_icon_factory(); +#if 0 /* load the interface */ - xml = glade_xml_new(PKGDATADIR "/psppire.glade", NULL, NULL); + data_editor_xml = glade_xml_new(PKGDATADIR "/data-editor.glade", NULL, NULL); - if ( !xml ) return 1; + if ( !data_editor_xml ) return 1; - data_editor = get_widget_assert(xml, "data_editor"); - gtk_window_set_icon_from_file(GTK_WINDOW(data_editor), - PKGDATADIR "/psppicon.png",0); + data_editor = get_widget_assert(data_editor_xml, "data_editor"); /* connect the signals in the interface */ - glade_xml_signal_autoconnect(xml); + glade_xml_signal_autoconnect(data_editor_xml); - var_sheet = GTK_SHEET(get_widget_assert(xml, "variable_sheet")); - data_sheet = GTK_SHEET(get_widget_assert(xml, "data_sheet")); + 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(var_store)); - - gtk_sheet_set_model(data_sheet, G_SHEET_MODEL(data_store)); + gtk_sheet_set_model(var_sheet, G_SHEET_MODEL(the_var_store)); - if (filename) - gtk_init_add((GtkFunction)load_system_file, filename); - else - gtk_init_add((GtkFunction)clear_file, 0); + gtk_sheet_set_model(data_sheet, G_SHEET_MODEL(the_data_store)); var_data_selection_init(); { - GList *helps = glade_xml_get_widget_prefix(xml, "help_button_"); + 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 + + new_data_window (NULL, NULL); /* start the event loop */ gtk_main(); + destroy_source_stream (the_source_stream); message_dialog_done(); settings_done(); @@ -218,3 +237,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); +}