/* PSPPIRE - a graphical user interface for PSPP.
- Copyright (C) 2007, 2009, 2010, 2011, 2012 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
#include <data/settings.h>
#include "psppire-data-store.h"
-#include "psppire.h"
#include "gl/configmake.h"
#include "xalloc.h"
#include <gettext.h>
-/* 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
{
gchar *s;
- s = data_out (&v, encoding, format);
+ s = data_out_stretchy (&v, encoding, format, settings_get_fmt_settings (),
+ NULL);
if (fmt_is_numeric (format->type))
g_strchug (s);
else
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);
+}
- if ( format->type != FMT_A)
+/* 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 ( ! 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);
- free (data_in (ss_cstr (text), UTF8, format->type, val, width,
- var_get_encoding (var)));
-
- return val;
-}
-
-
-/* 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;
+ char *err = data_in (ss_cstr (text), UTF8, format->type,
+ settings_get_fmt_settings (), val, width, encoding);
- g_get_charset (&target_encoding);
-
- output_name = g_convert (fname, -1, target_encoding,
- "UTF-8", NULL, NULL, err);
-#else
- output_name = xstrdup (fname);
-#endif
+ if (err)
+ {
+ value_destroy (val, width);
+ val = NULL;
+ free (err);
+ }
- 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) )
- {
- const gchar *name = gtk_buildable_get_name (GTK_BUILDABLE (o));
- gchar s[12] = {0};
-
- 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);
-}
-
-
/* Create a deep copy of SRC */
GtkListStore *
clone_list_store (const GtkListStore *src)
const gint n_cols = gtk_tree_model_get_n_columns (GTK_TREE_MODEL (src));
GType *types = g_malloc (sizeof (*types) * n_cols);
- 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);
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};
g_value_unset (&val);
}
- row++;
}
g_free (types);
-static gboolean
+static gboolean
on_delete (GtkWindow *window, GdkEvent *e, GtkWindow **addr)
{
*addr = NULL;
GtkTextBuffer *buffer = NULL;
- if ( NULL == the_syntax_pasteboard)
+ 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),
}
-/* 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)
+/* Return the width of an upper case M (in pixels) when rendered onto
+ WIDGET with its current style. */
+gdouble
+width_of_m (GtkWidget *widget)
{
- gtk_box_pack_start (box, widget, TRUE, TRUE, 0);
+ PangoContext *context = gtk_widget_create_pango_context (widget);
+ PangoLayout *layout = pango_layout_new (context);
+ PangoRectangle rect;
+
+ pango_layout_set_text (layout, "M", 1);
+ pango_layout_get_extents (layout, NULL, &rect);
+
+ g_object_unref (G_OBJECT (layout));
+ g_object_unref (G_OBJECT (context));
+
+ return rect.width / (gdouble) PANGO_SCALE;
}
+
projects / pspp / blobdiff