X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire.c;h=06b1488762f9ba195e98210291b9041619996b51;hb=1c9e32859d6da9505e1904d5b0f95cfd276a734e;hp=cd2783c32d7afc837540f5700619b539dcf84145;hpb=75fe94ea24fd7b12a0d99b8f36a79d8423e668d4;p=pspp-builds.git diff --git a/src/ui/gui/psppire.c b/src/ui/gui/psppire.c index cd2783c3..06b14887 100644 --- a/src/ui/gui/psppire.c +++ b/src/ui/gui/psppire.c @@ -22,10 +22,15 @@ #include #include +#include "relocatable.h" #include "data-editor.h" -#include -#include + +#include "psppire.h" + + +#include +#include #include #include #include @@ -33,9 +38,8 @@ #include #include #include +#include -#include -#include #include #include #include "psppire-dict.h" @@ -45,62 +49,35 @@ #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); - - -#define _(msgid) gettext (msgid) -#define N_(msgid) msgid +struct source_stream *the_source_stream ; +struct dataset * the_dataset = NULL; static void -give_help (void) +replace_dictionary (struct dictionary *d) { - 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.")); - - popup_message (&m); + psppire_dict_replace_dictionary (the_data_store->dict, d); } -PsppireVarStore *the_var_store = 0; - -void create_icon_factory (void); -struct source_stream *the_source_stream ; -struct dataset * the_dataset = NULL; +static void +replace_casereader (struct casereader *s) +{ + PsppireCaseFile *pcf = psppire_case_file_new (s); + psppire_data_store_set_case_file (the_data_store, pcf); +} -int -main (int argc, char *argv[]) +void +initialize (void) { - struct casefile_factory *factory; PsppireDict *dictionary = 0; - - 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 */ setlocale (LC_NUMERIC, "C"); @@ -109,132 +86,56 @@ 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 (replace_casereader, + 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); + replace_casereader (NULL); - 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 (); - - { - 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}, - }; - - 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; -} - +#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 (); @@ -243,40 +144,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); } +