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=fe2bf09e402c86d998113e4f297a3d651b3b0136;hpb=bd5bcd62b73df2eec17bc9a273bfb52f80b3f2fe;p=pspp-builds.git diff --git a/src/ui/gui/psppire.c b/src/ui/gui/psppire.c index fe2bf09e..84489c07 100644 --- a/src/ui/gui/psppire.c +++ b/src/ui/gui/psppire.c @@ -22,10 +22,13 @@ #include #include +#include "relocatable.h" #include "data-editor.h" -#include -#include + +#include "psppire.h" + + #include #include #include @@ -36,9 +39,8 @@ #include #include #include +#include -#include -#include #include #include #include "psppire-dict.h" @@ -54,12 +56,14 @@ PsppireDataStore *the_data_store = 0; static bool parse_command_line (int *argc, char ***argv, - gchar **filename, GError **err); + gchar **filename, + gboolean *show_splash, + GError **err); 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; @@ -67,8 +71,7 @@ struct dataset * the_dataset = NULL; static void replace_dictionary (struct dictionary *d) { - psppire_dict_replace_dictionary (the_data_store->dict, - d); + psppire_dict_replace_dictionary (the_data_store->dict, d); } @@ -90,30 +93,13 @@ replace_flexifile (struct case_source *s) } -int -main (int argc, char *argv[]) + +void +initialize (void) { struct casefile_factory *factory; PsppireDict *dictionary = 0; - gchar *filename=0; - GError *err = 0; - gchar *vers; - - if ( ! gtk_parse_args (&argc, &argv) ) - { - perror ("Error parsing arguments"); - exit (1); - } - - 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"); @@ -122,19 +108,14 @@ 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) ); @@ -150,7 +131,6 @@ main (int argc, char *argv[]) bind_textdomain_codeset (PACKAGE, "UTF-8"); - gdk_init (&argc, &argv); /* Create the model for the var_sheet */ the_var_store = psppire_var_store_new (dictionary); @@ -165,66 +145,23 @@ main (int argc, char *argv[]) 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 (); @@ -233,41 +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); }