X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire.c;h=84489c073c983a47b4cd033fea84b9b8c3cdc791;hb=ee08e284e9722ddc0fb785c5f9af09bcb6fa8a47;hp=bae77e87b67056ea082bfe4de666d3ff397b90d0;hpb=bc02bc027697df3207f827de722c26d8cc87e824;p=pspp-builds.git diff --git a/src/ui/gui/psppire.c b/src/ui/gui/psppire.c index bae77e87..84489c07 100644 --- a/src/ui/gui/psppire.c +++ b/src/ui/gui/psppire.c @@ -22,20 +22,25 @@ #include #include +#include "relocatable.h" #include "data-editor.h" -#include -#include + +#include "psppire.h" + + #include #include +#include +#include #include #include #include #include #include +#include +#include -#include -#include #include #include #include "psppire-dict.h" @@ -51,60 +56,50 @@ PsppireDataStore *the_data_store = 0; 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) -{ - static struct msg m = { - MSG_GENERAL, - MSG_NOTE, - {0, -1}, - 0, - }; + gchar **filename, + gboolean *show_splash, + GError **err); - if (! m.text) - m.text=g_strdup (_("Sorry. The help system hasn't yet been implemented.")); - - popup_message (&m); -} PsppireVarStore *the_var_store = 0; -void create_icon_factory (void); +static void create_icon_factory (void); struct source_stream *the_source_stream ; struct dataset * the_dataset = NULL; - -int -main (int argc, char *argv[]) +static void +replace_dictionary (struct dictionary *d) { - struct casefile_factory *factory; - PsppireDict *dictionary = 0; - - - GtkWidget *data_editor ; - GtkSheet *var_sheet ; - GtkSheet *data_sheet ; + psppire_dict_replace_dictionary (the_data_store->dict, d); +} - 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)) ) +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 { - g_critical (vers); + if ( ! case_source_is_class (s, &storage_source_class)) + return ; + + psppire_case_file_replace_flexifile (the_data_store->case_file, + (struct flexifile *) + storage_source_get_casefile (s)); } +} + +void +initialize (void) +{ + struct casefile_factory *factory; + PsppireDict *dictionary = 0; + /* gtk_init messes with the locale. So unset the bits we want to control ourselves */ setlocale (LC_NUMERIC, "C"); @@ -113,132 +108,60 @@ main (int argc, char *argv[]) textdomain (PACKAGE); - if ( ! parse_command_line (&argc, &argv, &filename, &err) ) - { - g_clear_error (&err); - return 0; - } - glade_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_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"); + /* 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"); - - /* 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)); - - var_data_selection_init (); + proc_set_source (the_dataset, + storage_source_create (the_data_store->case_file->flexifile) + ); - { - 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 (); +void +de_initialize (void) +{ 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) -{ - static struct option long_options[] = - { - {"help", no_argument, NULL, 'h'}, - {"version", no_argument, NULL, 'V'}, - {0, 0, 0, 0}, - }; +#define PIXBUF_NEW_FROM_FILE(FILE) \ + gdk_pixbuf_new_from_file (relocate (PKGDATADIR "/" FILE), 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; -} - - - -void +static void create_icon_factory (void) { GtkIconFactory *factory = gtk_icon_factory_new (); @@ -247,40 +170,72 @@ create_icon_factory (void) 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); } +