X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fhelper.c;h=c7cfaebe8df57e334f93fbb82e14a576a64ec557;hb=fb224459eed00514cbc36ecbc311c644f8b22def;hp=31633de9fff3ae8ded4105b44cab4d3d682f41cd;hpb=729b96a6bd9342c45e6f65a113fd87c70da85b0a;p=pspp diff --git a/src/ui/gui/helper.c b/src/ui/gui/helper.c index 31633de9ff..c7cfaebe8d 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,34 +41,105 @@ #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 */ +/* Returns a copy of IN with each underscore doubled. The caller should free + the returned string (with free()) when it is no longer needed. */ +char * +escape_underscores (const char *in) +{ + char *out = xmalloc (2 * strlen (in) + 1); + char *p; + + p = out; + for (; *in != '\0'; in++) + { + if (*in == '_') + *p++ = '_'; + *p++ = *in; + } + *p = '\0'; + + return out; +} + +/* 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 dictionary *dict, struct fmt_spec format) +value_to_text (union value v, const struct variable *var) { - gchar *s = 0; + return value_to_text__ (v, var_get_print_format (var), + var_get_encoding (var)); +} - s = data_out (&v, dict_get_encoding (dict), &format); - g_strchug (s); +/* 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 struct fmt_spec *format, const char *encoding) +{ + gchar *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 must be the variable with which VAL is associated. -gboolean -text_to_value (const gchar *text, union value *v, - struct fmt_spec format) + On success, VAL is returned, NULL otherwise. +*/ +union value * +text_to_value (const gchar *text, + const struct variable *var, + union value *val) { - bool ok; + 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. - if ( format.type != FMT_A) + 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 ( ! text ) return FALSE; + if ( ! text ) return NULL; { const gchar *s = text; @@ -80,68 +150,24 @@ text_to_value (const gchar *text, union value *v, s++; } - if ( !*s) return FALSE; + if ( !*s) return NULL; } } - msg_disable (); - ok = data_in (ss_cstr (text), LEGACY_NATIVE, format.type, 0, 0, 0, - v, fmt_var_width (&format)); - msg_enable (); - - return ok; -} - - -GtkBuilder * -builder_new_real (const gchar *name) -{ - GtkBuilder *builder = gtk_builder_new (); + value_init (val, width); + char *err = data_in (ss_cstr (text), UTF8, format->type, val, width, encoding); - 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; + return val; } -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). @@ -198,9 +224,8 @@ connect_help (GtkBuilder *xml) GObject *o = i->data; if ( GTK_IS_WIDGET (o) ) { - gchar *name = NULL; + const gchar *name = gtk_buildable_get_name (GTK_BUILDABLE (o)); gchar s[12] = {0}; - g_object_get (o, "name", &name, NULL); if ( name) strncpy (s, name, 11); @@ -218,22 +243,6 @@ connect_help (GtkBuilder *xml) } -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) @@ -278,12 +287,47 @@ 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) +{ + *addr = NULL; + + return FALSE; +} + +char * +paste_syntax_to_window (gchar *syntax) { - GtkWidget *se = psppire_syntax_window_new (); + 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_widget_show (the_syntax_pasteboard); + + return syntax; +} - gtk_text_buffer_insert_at_cursor (PSPPIRE_SYNTAX_WINDOW (se)->buffer, syntax, -1); - gtk_widget_show (se); +/* gtk_box_pack_start_defaults is deprecated. + Therefore we roll our own until a better solution is found */ +void +psppire_box_pack_start_defaults (GtkBox *box, GtkWidget *widget) +{ + gtk_box_pack_start (box, widget, TRUE, TRUE, 0); }