X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire.c;h=f6bf1de36cdd7346360d69bd8315228b977125e5;hb=1d5a97ba2afec23855a8294ff2814ab052f6777a;hp=cd2783c32d7afc837540f5700619b539dcf84145;hpb=75fe94ea24fd7b12a0d99b8f36a79d8423e668d4;p=pspp-builds.git diff --git a/src/ui/gui/psppire.c b/src/ui/gui/psppire.c index cd2783c3..f6bf1de3 100644 --- a/src/ui/gui/psppire.c +++ b/src/ui/gui/psppire.c @@ -22,17 +22,23 @@ #include #include +#include "progname.h" +#include "relocatable.h" #include "data-editor.h" + #include #include #include #include +#include +#include #include #include #include #include #include +#include #include #include @@ -54,31 +60,37 @@ static bool parse_command_line (int *argc, char ***argv, gchar **filename, GError **err); -#define _(msgid) gettext (msgid) -#define N_(msgid) msgid +PsppireVarStore *the_var_store = 0; -static void -give_help (void) -{ - static struct msg m = { - MSG_GENERAL, - MSG_NOTE, - {0, -1}, - 0, - }; +void create_icon_factory (void); - if (! m.text) - m.text=g_strdup (_("Sorry. The help system hasn't yet been implemented.")); +struct source_stream *the_source_stream ; +struct dataset * the_dataset = NULL; - popup_message (&m); +static void +replace_dictionary (struct dictionary *d) +{ + psppire_dict_replace_dictionary (the_data_store->dict, + d); } -PsppireVarStore *the_var_store = 0; -void create_icon_factory (void); +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 + { + if ( ! case_source_is_class (s, &storage_source_class)) + return ; -struct source_stream *the_source_stream ; -struct dataset * the_dataset = NULL; + psppire_case_file_replace_flexifile (the_data_store->case_file, + (struct flexifile *) + storage_source_get_casefile (s)); + } +} int @@ -87,12 +99,18 @@ main (int argc, char *argv[]) struct casefile_factory *factory; PsppireDict *dictionary = 0; - gchar *filename=0; GError *err = 0; gchar *vers; - gtk_init (&argc, &argv); + set_program_name (argv[0]); + + 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)) ) @@ -125,54 +143,31 @@ main (int argc, char *argv[]) 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"); + gdk_init (&argc, &argv); + /* 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)); + proc_set_source (the_dataset, + storage_source_create (the_data_store->case_file->flexifile) + ); - 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); @@ -232,6 +227,8 @@ parse_command_line (int *argc, char ***argv, gchar **filename, GError **err) return true; } +#define PIXBUF_NEW_FROM_FILE(FILE) \ + gdk_pixbuf_new_from_file (relocate (PKGDATADIR "/" FILE), 0) void @@ -243,40 +240,48 @@ 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); + + + gtk_icon_factory_add_default (factory); } +