X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fhelper.c;h=4ec4bb0c1a9601601b0e02b2f1cc2b7a185856f6;hb=82217038368a953179398d9ecc7b80169a1b9ddc;hp=6a3a0f9e6ce0b83ee360f62ca9f790205084da7e;hpb=8953baa61127d6d3b91f763663ea647bf3e4e793;p=pspp-builds.git diff --git a/src/ui/gui/helper.c b/src/ui/gui/helper.c index 6a3a0f9e..4ec4bb0c 100644 --- a/src/ui/gui/helper.c +++ b/src/ui/gui/helper.c @@ -1,5 +1,5 @@ /* PSPPIRE - a graphical user interface for PSPP. - Copyright (C) 2007 Free Software Foundation + Copyright (C) 2007, 2009 Free Software Foundation This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -20,8 +20,6 @@ */ #include -#include "psppire-syntax-window.h" - #include #include @@ -33,7 +31,7 @@ #include #include #include - +#include "psppire-syntax-window.h" #include #include @@ -42,13 +40,7 @@ #include #include -#include -#include -#include -#include #include "psppire-data-store.h" -#include -#include "psppire-output-window.h" #include "xalloc.h" @@ -57,13 +49,11 @@ /* Formats a value according to FORMAT The returned string must be freed when no longer required */ gchar * -value_to_text (union value v, struct fmt_spec format) +value_to_text (union value v, const PsppireDict *dict, struct fmt_spec format) { gchar *s = 0; - s = g_new (gchar, format.w + 1); - data_out (&v, &format, s); - s[format.w]='\0'; + s = data_out (&v, dict_get_encoding (dict->dict), &format); g_strchug (s); return s; @@ -119,34 +109,65 @@ builder_new_real (const gchar *name) } - -GtkWidget * -get_widget_assert (gpointer x, const gchar *name) +GObject * +get_object_assert (GtkBuilder *builder, const gchar *name, GType type) { - GObject *obj = G_OBJECT (x); - GtkWidget *w = NULL; + GObject *o = NULL; g_assert (name); - if (GTK_IS_BUILDER (obj)) - w = GTK_WIDGET (gtk_builder_get_object (GTK_BUILDER (obj), name)); + o = gtk_builder_get_object (builder, name); + + if ( !o ) + g_critical ("Object \"%s\" could not be found\n", name); - if (GLADE_IS_XML (obj)) - w = glade_xml_get_widget (GLADE_XML (obj), name); + if ( ! g_type_is_a (G_OBJECT_TYPE (o), type)) + { + g_critical ("Object \"%s\" was expected to have type %s, but in fact has type %s", + name, g_type_name (type), G_OBJECT_TYPE_NAME (o)); + } + + return o; +} - if ( !w ) - g_critical ("Widget \"%s\" could not be found\n", name); - return w; +GtkAction * +get_action_assert (GtkBuilder *builder, const gchar *name) +{ + return GTK_ACTION (get_object_assert (builder, name, GTK_TYPE_ACTION)); +} + +GtkWidget * +get_widget_assert (GtkBuilder *builder, const gchar *name) +{ + return GTK_WIDGET (get_object_assert (builder, name, GTK_TYPE_WIDGET)); } -/* Converts a string in the pspp locale to utf-8. - The return value must be freed when no longer required*/ +/* This function must be used whenever a filename generated by glib, + (eg, from gtk_file_chooser_get_filename) and passed to the C library, + (eg through a pspp syntax string). +*/ gchar * -pspp_locale_to_utf8 (const gchar *text, gssize len, GError **err) +convert_glib_filename_to_system_filename (const gchar *fname, GError **err) { - return recode_string (CONV_PSPP_TO_UTF8, text, len); + gchar *output_name; + +#ifdef G_OS_WIN32 + const gchar *target_encoding; + gchar *utf8_name = NULL; + + g_get_charset (&target_encoding); + + output_name = g_convert (fname, -1, target_encoding, + "UTF-8", NULL, NULL, err); +#else + output_name = xstrdup (fname); +#endif + + return output_name; } + + #define _(msgid) gettext (msgid) #define N_(msgid) msgid @@ -167,116 +188,52 @@ give_help (void) } void -connect_help (GladeXML *xml) +connect_help (GtkBuilder *xml) { - GList *helps = glade_xml_get_widget_prefix (xml, "help_button_"); + GSList *helps = gtk_builder_get_objects (xml); - 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); - - g_list_free (helps); -} + GSList *i; + for ( i = helps; i ; i = g_slist_next (i)) + { + GObject *o = i->data; + if ( GTK_IS_WIDGET (o) ) + { + gchar *name = NULL; + gchar s[12] = {0}; + g_object_get (o, "name", &name, NULL); + if ( name) + strncpy (s, name, 11); + s[11] = '\0'; -void -reference_manual (GtkMenuItem *menu, gpointer data) -{ - GError *err = NULL; - if ( ! g_spawn_command_line_async ("yelp info:pspp", &err) ) - { - msg (ME, _("Cannot open reference manual: %s"), err->message); + if ( 0 == strcmp ("help_button", s)) + { + g_signal_connect (o, "clicked", give_help, 0); + } + } } - g_clear_error (&err); -} + g_slist_free (helps); +} -extern struct dataset *the_dataset; -extern struct source_stream *the_source_stream; -extern PsppireDataStore *the_data_store; -/* Lazy casereader callback function used by execute_syntax. */ -static struct casereader * -create_casereader_from_data_store (void *data_store_) +void +reference_manual (GtkMenuItem *menu, gpointer data) { - PsppireDataStore *data_store = data_store_; - return psppire_data_store_get_reader (data_store); -} + GError *err = NULL; + gchar *cmd = g_strdup_printf ("yelp file://%s", relocate (DOCDIR "/pspp.xml")); -gboolean -execute_syntax (struct getl_interface *sss) -{ - struct lexer *lexer; - gboolean retval = TRUE; - - struct casereader *reader; - size_t value_cnt; - casenumber case_cnt; - unsigned long int lazy_serial; - - /* When the user executes a number of snippets of syntax in a - row, none of which read from the active file, the GUI becomes - progressively less responsive. The reason is that each syntax - execution encapsulates the active file data in another - datasheet layer. The cumulative effect of having a number of - layers of datasheets wastes time and space. - - To solve the problem, we use a "lazy casereader", a wrapper - around the casereader obtained from the data store, that - only actually instantiates that casereader when it is - needed. If the data store casereader is never needed, then - it is reused the next time syntax is run, without wrapping - it in another layer. */ - value_cnt = psppire_data_store_get_value_count (the_data_store); - case_cnt = psppire_data_store_get_case_count (the_data_store); - reader = lazy_casereader_create (value_cnt, case_cnt, - create_casereader_from_data_store, - the_data_store, &lazy_serial); - proc_set_active_file_data (the_dataset, reader); - - g_return_val_if_fail (proc_has_active_file (the_dataset), FALSE); - - lexer = lex_create (the_source_stream); - - getl_append_source (the_source_stream, sss, GETL_BATCH, ERRMODE_CONTINUE); - - for (;;) + if ( ! g_spawn_command_line_async (cmd, &err) ) { - enum cmd_result result = cmd_parse (lexer, the_dataset); - - if ( cmd_result_is_failure (result)) - { - retval = FALSE; - if ( source_stream_current_error_mode (the_source_stream) - == ERRMODE_STOP ) - break; - } - - if ( result == CMD_EOF || result == CMD_FINISH) - break; + msg (ME, _("Cannot open reference manual: %s"), err->message); } - getl_abort_noninteractive (the_source_stream); - - lex_destroy (lexer); - - psppire_dict_replace_dictionary (the_data_store->dict, - dataset_dict (the_dataset)); - - reader = proc_extract_active_file_data (the_dataset); - if (!lazy_casereader_destroy (reader, lazy_serial)) - psppire_data_store_set_reader (the_data_store, reader); - - som_flush (); - - psppire_output_window_reload (); - - return retval; + g_free (cmd); + g_clear_error (&err); } - /* Create a deep copy of SRC */ GtkListStore * clone_list_store (const GtkListStore *src) @@ -321,7 +278,6 @@ clone_list_store (const GtkListStore *src) } - void paste_syntax_in_new_window (const gchar *syntax) {