X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire.c;h=3555463f88e4d353c84bcd366b223955d4217604;hb=b5c82cc9aabe7e641011130240ae1b2e84348e23;hp=9dd3b71372f6334fea60115c325aa35724353f06;hpb=6d077bbfd3230959846621bbfb1447410e17dd8c;p=pspp-builds.git diff --git a/src/ui/gui/psppire.c b/src/ui/gui/psppire.c index 9dd3b713..3555463f 100644 --- a/src/ui/gui/psppire.c +++ b/src/ui/gui/psppire.c @@ -16,17 +16,19 @@ #include -#include +#include #include #include #include +#include #include #include #include "relocatable.h" -#include "data-editor.h" +#include "psppire-data-window.h" #include "psppire.h" +#include "widgets.h" #include #include @@ -44,21 +46,22 @@ #include #include -#include #include "psppire-dict.h" #include "psppire-var-store.h" #include "psppire-data-store.h" -#include "helper.h" +#include "executor.h" #include "message-dialog.h" #include -#include "output-viewer.h" +#include "psppire-window-register.h" +#include "psppire-output-window.h" #include #include #include +GtkRecentManager *the_recent_mgr = 0; PsppireDataStore *the_data_store = 0; PsppireVarStore *the_var_store = 0; @@ -67,6 +70,7 @@ static void create_icon_factory (void); struct source_stream *the_source_stream ; struct dataset * the_dataset = NULL; +static GtkWidget *the_data_window; static void replace_casereader (struct casereader *s) @@ -77,19 +81,18 @@ replace_casereader (struct casereader *s) #define _(msgid) gettext (msgid) #define N_(msgid) msgid + + + void initialize (struct command_line_processor *clp, int argc, char **argv) { PsppireDict *dictionary = 0; - /* gtk_init messes with the locale. - So unset the bits we want to control ourselves */ - setlocale (LC_NUMERIC, "C"); - - bindtextdomain (PACKAGE, locale_dir); + i18n_init (); - glade_init (); + preregister_widgets (); gsl_set_error_handler_off (); fn_init (); @@ -116,8 +119,6 @@ initialize (struct command_line_processor *clp, int argc, char **argv) the_data_store = psppire_data_store_new (dictionary); replace_casereader (NULL); - - create_icon_factory (); { @@ -143,14 +144,19 @@ initialize (struct command_line_processor *clp, int argc, char **argv) journal_enable (); textdomain (PACKAGE); + + the_recent_mgr = gtk_recent_manager_get_default (); + + the_data_window = psppire_data_window_new (); + command_line_processor_replace_aux (clp, &post_init_argp, the_source_stream); command_line_processor_replace_aux (clp, &non_option_argp, the_source_stream); command_line_processor_parse (clp, argc, argv); - new_data_window (NULL, NULL); - execute_syntax (create_syntax_string_source ("")); + + gtk_widget_show (the_data_window); } @@ -161,8 +167,27 @@ de_initialize (void) message_dialog_done (); settings_done (); outp_done (); + i18n_done (); +} + + +static void +func (gpointer key, gpointer value, gpointer data) +{ + gboolean rv; + PsppireWindow *window = PSPPIRE_WINDOW (value); + + g_signal_emit_by_name (window, "delete-event", 0, &rv); } +void +psppire_quit (void) +{ + PsppireWindowRegister *reg = psppire_window_register_new (); + psppire_window_register_foreach (reg, func, NULL); + + gtk_main_quit (); +} struct icon_info @@ -251,43 +276,59 @@ parse_non_options (int key, char *arg, struct argp_state *state) { case ARGP_KEY_ARG: { - struct string syntax; - FILE *fp = fopen (arg, "r"); - if (NULL == fp) + gchar *filename = NULL; + gchar *utf8 = NULL; + const gchar *local_encoding = NULL; + gsize written = -1; + const gboolean local_is_utf8 = g_get_charset (&local_encoding); + + /* There seems to be no Glib function to convert from local encoding + to filename encoding. Therefore it has to be done in two steps: + the intermediate encoding is UTF8. + + Either step could fail. However, in many cases the file can still + be loaded even if the conversion fails. So in those cases, after showing + a warning, we simply copy the locally encoded filename to the destination + and hope for the best. + */ + + if ( local_is_utf8) { - const int errnum = errno; - fprintf (state->err_stream, _("Cannot open %s: %s.\n"), - arg, strerror (errnum)); - return 0; + utf8 = xstrdup (arg); } - if ( sfm_detect (fp)) + else { - ds_init_cstr (&syntax, "GET FILE="); - goto close; + GError *err = NULL; + utf8 = g_locale_to_utf8 (arg, -1, NULL, &written, &err); + if ( NULL == utf8) + { + g_warning ("Cannot convert filename from local encoding \"%s\" to UTF-8: %s", + local_encoding, + err->message); + g_clear_error (&err); + } } - rewind (fp); - if (pfm_detect (fp)) + + if ( NULL != utf8) { - ds_init_cstr (&syntax, "IMPORT FILE="); - goto close; + GError *err = NULL; + filename = g_filename_from_utf8 (utf8, written, NULL, NULL, &err); + if ( NULL == filename) + { + g_warning ("Cannot convert filename from UTF8 to filename encoding: %s", + err->message); + g_clear_error (&err); + } } - fclose (fp); - msg (ME, _("%s is neither a system nor portable file"), arg); - break; + g_free (utf8); - close: - fclose (fp); + if ( filename == NULL) + filename = xstrdup (arg); - syntax_gen_string (&syntax, ss_cstr (arg)); - ds_put_cstr (&syntax, "."); + psppire_window_load (PSPPIRE_WINDOW (the_data_window), filename); - getl_append_source (ss, - create_syntax_string_source (ds_cstr (&syntax)), - GETL_BATCH, - ERRMODE_CONTINUE); - - ds_destroy (&syntax); + g_free (filename); break; } default: @@ -298,3 +339,16 @@ parse_non_options (int key, char *arg, struct argp_state *state) const struct argp non_option_argp = {NULL, parse_non_options, 0, 0, 0, 0, 0}; + + +const char * +output_file_name (void) +{ + const char *dir = default_output_path (); + static char *filename = NULL; + + if ( NULL == filename ) + filename = xasprintf ("%s%s", dir, OUTPUT_FILE_NAME); + + return filename; +}