X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fhelper.c;h=cde9d92b8f186a29525a00b24fb55e09b3707771;hb=3990e1c55ccb6b246aff730309ae8efeaf7562da;hp=b09a2f58c3f1cc7bff73e36aecbb4775a81c1049;hpb=d8659cda7d193dd3e6e035cd0b1b40493d360f0b;p=pspp diff --git a/src/ui/gui/helper.c b/src/ui/gui/helper.c index b09a2f58c3..cde9d92b8f 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, 2009 Free Software Foundation + Copyright (C) 2007, 2009, 2010, 2011, 2012, 2013 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 @@ -24,7 +24,6 @@ #include #include "helper.h" -#include "message-dialog.h" #include #include #include @@ -32,7 +31,7 @@ #include #include #include "psppire-syntax-window.h" -#include +#include #include #include @@ -42,211 +41,116 @@ #include "psppire-data-store.h" +#include "gl/configmake.h" #include "xalloc.h" #include -/* Formats a value according to FORMAT - The returned string must be freed when no longer required */ +/* Formats a value according to VAR's print format and strips white space + appropriately for VAR's type. That is, if VAR is numeric, strips leading + white space (because numbers are right-justified within their fields), and + if VAR is string, strips trailing white space (because spaces pad out string + values on the right). + + Returns an allocated string. The returned string must be freed when no + longer required. */ +gchar * +value_to_text (union value v, const struct variable *var) +{ + return value_to_text__ (v, var_get_print_format (var), + var_get_encoding (var)); +} + +/* Formats a value with format FORMAT and strips white space appropriately for + FORMATs' type. That is, if FORMAT is numeric, strips leading white space + (because numbers are right-justified within their fields), and if FORMAT is + string, strips trailing white space (because spaces pad out string values on + the right). + + Returns an allocated string. The returned string must be freed when no + longer required. */ gchar * -value_to_text (union value v, const PsppireDict *dict, struct fmt_spec format) +value_to_text__ (union value v, + const struct fmt_spec *format, const char *encoding) { - gchar *s = 0; + gchar *s; - s = data_out (&v, dict_get_encoding (dict->dict), &format); - g_strchug (s); + s = data_out_stretchy (&v, encoding, format, NULL); + if (fmt_is_numeric (format->type)) + g_strchug (s); + else + g_strchomp (s); return s; } - /* Converts TEXT to a value. VAL will be initialised and filled by this function. It is the caller's responsibility to destroy VAL when no longer needed. - VAR and DICT must be the variable and dictionary with which VAL - is associated. + VAR must be the variable with which VAL is associated. On success, VAL is returned, NULL otherwise. */ union value * text_to_value (const gchar *text, - const PsppireDict *dict, const struct variable *var, union value *val) { - const struct fmt_spec *format = var_get_print_format (var); - int width = var_get_width (var); + return text_to_value__ (text, var_get_print_format (var), + var_get_encoding (var), val); +} + +/* Converts TEXT, which contains a value in the given FORMAT encoding in + ENCODING, into a value. + + VAL will be initialised and filled by this function. + It is the caller's responsibility to destroy VAL when no longer needed. + + On success, VAL is returned, NULL otherwise. +*/ +union value * +text_to_value__ (const gchar *text, + const struct fmt_spec *format, + const gchar *encoding, + union value *val) +{ + int width = fmt_var_width (format); - if ( format->type != FMT_A) + if (format->type != FMT_A) { - if ( ! text ) return NULL; + if (! text) return NULL; { const gchar *s = text; while (*s) { - if ( !isspace (*s)) + if (!isspace (*s)) break; s++; } - if ( !*s) return NULL; + if (!*s) return NULL; } } value_init (val, width); - msg_disable (); - data_in (ss_cstr (text), UTF8, format->type, 0, 0, 0, - dict->dict, - val, width); - msg_enable (); + char *err = data_in (ss_cstr (text), UTF8, format->type, val, width, encoding); - return val; -} - - -GtkBuilder * -builder_new_real (const gchar *name) -{ - GtkBuilder *builder = gtk_builder_new (); - - GError *err = NULL; - if ( ! gtk_builder_add_from_file (builder, name, &err)) + if (err) { - g_critical ("Couldnt open user interface file %s: %s", name, err->message); - g_clear_error (&err); + value_destroy (val, width); + val = NULL; + free (err); } - return builder; -} - - -GObject * -get_object_assert (GtkBuilder *builder, const gchar *name, GType type) -{ - GObject *o = NULL; - g_assert (name); - - o = gtk_builder_get_object (builder, name); - - if ( !o ) - g_critical ("Object \"%s\" could not be found\n", 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; -} - - -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)); -} - -/* 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 * -convert_glib_filename_to_system_filename (const gchar *fname, GError **err) -{ - 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; + return val; } - #define _(msgid) gettext (msgid) #define N_(msgid) msgid - -static void -give_help (void) -{ - GtkWidget *dialog; - - dialog = gtk_message_dialog_new (NULL, - GTK_DIALOG_MODAL, - GTK_MESSAGE_INFO, - GTK_BUTTONS_CLOSE, - _("Sorry. The help system hasn't yet " - "been implemented.")); - gtk_dialog_run (GTK_DIALOG (dialog)); - gtk_widget_destroy (dialog); -} - -void -connect_help (GtkBuilder *xml) -{ - GSList *helps = gtk_builder_get_objects (xml); - - 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'; - - - if ( 0 == strcmp ("help_button", s)) - { - g_signal_connect (o, "clicked", give_help, 0); - } - } - } - - g_slist_free (helps); -} - - -void -reference_manual (GtkMenuItem *menu, gpointer data) -{ - GError *err = NULL; - gchar *cmd = g_strdup_printf ("yelp file://%s", relocate (DOCDIR "/pspp.xml")); - - if ( ! g_spawn_command_line_async (cmd, &err) ) - { - msg (ME, _("Cannot open reference manual: %s"), err->message); - } - - g_free (cmd); - g_clear_error (&err); -} - - /* Create a deep copy of SRC */ GtkListStore * clone_list_store (const GtkListStore *src) @@ -260,7 +164,7 @@ clone_list_store (const GtkListStore *src) int row = 0; GtkListStore *dest; - for (i = 0 ; i < n_cols; ++i ) + for (i = 0 ; i < n_cols; ++i) types[i] = gtk_tree_model_get_column_type (GTK_TREE_MODEL (src), i); dest = gtk_list_store_newv (n_cols, types); @@ -273,7 +177,7 @@ clone_list_store (const GtkListStore *src) GtkTreeIter dest_iter; gtk_list_store_append (dest, &dest_iter); - for (i = 0 ; i < n_cols; ++i ) + for (i = 0 ; i < n_cols; ++i) { GValue val = {0}; @@ -291,12 +195,38 @@ clone_list_store (const GtkListStore *src) } -void -paste_syntax_in_new_window (const gchar *syntax) + + +static gboolean +on_delete (GtkWindow *window, GdkEvent *e, GtkWindow **addr) { - GtkWidget *se = psppire_syntax_window_new (); + *addr = NULL; + + return FALSE; +} + +char * +paste_syntax_to_window (gchar *syntax) +{ + static GtkWidget *the_syntax_pasteboard = NULL; + + GtkTextBuffer *buffer = NULL; + + if (NULL == the_syntax_pasteboard) + { + the_syntax_pasteboard = psppire_syntax_window_new (NULL); + g_signal_connect (the_syntax_pasteboard, "delete-event", G_CALLBACK (on_delete), + &the_syntax_pasteboard); + } + + buffer = GTK_TEXT_BUFFER (PSPPIRE_SYNTAX_WINDOW (the_syntax_pasteboard)->buffer); + + gtk_text_buffer_begin_user_action (buffer); + gtk_text_buffer_insert_at_cursor (buffer, syntax, -1); + gtk_text_buffer_insert_at_cursor (buffer, "\n", 1); + gtk_text_buffer_end_user_action (buffer); - gtk_text_buffer_insert_at_cursor (PSPPIRE_SYNTAX_WINDOW (se)->buffer, syntax, -1); + gtk_widget_show (the_syntax_pasteboard); - gtk_widget_show (se); + return syntax; }