X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fhelper.c;h=09bfe7acae61d81e285ab9762a1b58a93c4c1a8b;hb=e30f5e6b6bf7a3b862dacce6b17635e8bf0d909d;hp=b09a2f58c3f1cc7bff73e36aecbb4775a81c1049;hpb=bd17d2af982332ee1791998361b1ac6731fe14fa;p=pspp-builds.git diff --git a/src/ui/gui/helper.c b/src/ui/gui/helper.c index b09a2f58..09bfe7ac 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 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 @@ -41,20 +40,31 @@ #include #include "psppire-data-store.h" +#include "psppire.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 PsppireDict *dict, struct fmt_spec format) +value_to_text (union value v, const struct variable *var) { - gchar *s = 0; + gchar *s; - s = data_out (&v, dict_get_encoding (dict->dict), &format); - g_strchug (s); + s = data_out (&v, var_get_encoding (var), var_get_print_format (var)); + if (var_is_numeric (var)) + g_strchug (s); + else + g_strchomp (s); return s; } @@ -64,14 +74,12 @@ value_to_text (union value v, const PsppireDict *dict, struct fmt_spec format) 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) { @@ -96,11 +104,8 @@ text_to_value (const gchar *text, } value_init (val, width); - msg_disable (); - data_in (ss_cstr (text), UTF8, format->type, 0, 0, 0, - dict->dict, - val, width); - msg_enable (); + free (data_in (ss_cstr (text), UTF8, format->type, val, width, + var_get_encoding (var))); return val; } @@ -131,11 +136,10 @@ get_object_assert (GtkBuilder *builder, const gchar *name, GType type) 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' could not be found\n", name); + else 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", + 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)); } @@ -211,9 +215,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); @@ -231,22 +234,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) @@ -291,12 +278,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) { - GtkWidget *se = psppire_syntax_window_new (); + *addr = NULL; - gtk_text_buffer_insert_at_cursor (PSPPIRE_SYNTAX_WINDOW (se)->buffer, syntax, -1); + 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_widget_show (se); + 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_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); }