X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire-dict.c;h=e6291b69c465535ee94434908070a9b78772d031;hb=0a2ee97da7736d31c23b6b2cac91303b925dab50;hp=bc31022a5d7056876007cb9b95a6f1fa1e2fa48a;hpb=ddb7b52128d8f1f54d9632dc3a15c7869e0fbcce;p=pspp diff --git a/src/ui/gui/psppire-dict.c b/src/ui/gui/psppire-dict.c index bc31022a5d..e6291b69c4 100644 --- a/src/ui/gui/psppire-dict.c +++ b/src/ui/gui/psppire-dict.c @@ -1,5 +1,5 @@ /* PSPPIRE - a graphical user interface for PSPP. - Copyright (C) 2004, 2006, 2007, 2009 Free Software Foundation + Copyright (C) 2004, 2006, 2007, 2009, 2010, 2011, 2012 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 @@ -23,6 +23,7 @@ #include #include "data/dictionary.h" +#include "data/identifier.h" #include "data/missing-values.h" #include "data/value-labels.h" #include "data/variable.h" @@ -32,6 +33,10 @@ #include "ui/gui/psppire-marshal.h" #include "ui/gui/psppire-var-ptr.h" +#include +#define _(msgid) gettext (msgid) +#define N_(msgid) msgid + enum { BACKEND_CHANGED, @@ -51,7 +56,7 @@ enum { /* --- prototypes --- */ static void psppire_dict_class_init (PsppireDictClass *class); static void psppire_dict_init (PsppireDict *dict); -static void psppire_dict_finalize (GObject *object); +static void psppire_dict_dispose (GObject *object); static void dictionary_tree_model_init (GtkTreeModelIface *iface); @@ -110,7 +115,7 @@ psppire_dict_class_init (PsppireDictClass *class) parent_class = g_type_class_peek_parent (class); - object_class->finalize = psppire_dict_finalize; + object_class->dispose = psppire_dict_dispose; signals [BACKEND_CHANGED] = g_signal_new ("backend-changed", @@ -124,7 +129,7 @@ psppire_dict_class_init (PsppireDictClass *class) signals [VARIABLE_CHANGED] = - g_signal_new ("variable_changed", + g_signal_new ("variable-changed", G_TYPE_FROM_CLASS (class), G_SIGNAL_RUN_FIRST, 0, @@ -137,7 +142,7 @@ psppire_dict_class_init (PsppireDictClass *class) signals [VARIABLE_INSERTED] = - g_signal_new ("variable_inserted", + g_signal_new ("variable-inserted", G_TYPE_FROM_CLASS (class), G_SIGNAL_RUN_FIRST, 0, @@ -154,10 +159,10 @@ psppire_dict_class_init (PsppireDictClass *class) G_SIGNAL_RUN_FIRST, 0, NULL, NULL, - psppire_marshal_VOID__INT_INT_INT, + psppire_marshal_VOID__POINTER_INT_INT, G_TYPE_NONE, 3, - G_TYPE_INT, + G_TYPE_POINTER, G_TYPE_INT, G_TYPE_INT); @@ -222,13 +227,13 @@ psppire_dict_class_init (PsppireDictClass *class) } static void -psppire_dict_finalize (GObject *object) +psppire_dict_dispose (GObject *object) { PsppireDict *d = PSPPIRE_DICT (object); - dict_destroy (d->dict); + dict_set_callbacks (d->dict, NULL, NULL); - G_OBJECT_CLASS (parent_class)->finalize (object); + G_OBJECT_CLASS (parent_class)->dispose (object); } /* Pass on callbacks from src/data/dictionary, as @@ -243,10 +248,11 @@ addcb (struct dictionary *d, int idx, void *pd) } static void -delcb (struct dictionary *d, int dict_idx, int case_idx, int width, void *pd) +delcb (struct dictionary *d, const struct variable *var, + int dict_idx, int case_idx, void *pd) { g_signal_emit (pd, signals [VARIABLE_DELETED], 0, - dict_idx, case_idx, width ); + var, dict_idx, case_idx); } static void @@ -344,34 +350,56 @@ psppire_dict_replace_dictionary (PsppireDict *dict, struct dictionary *d) } -/* Returns a valid name for a new variable in DICT. - The return value is statically allocated */ -static gchar * -auto_generate_var_name (PsppireDict *dict) +/* Stores a valid name for a new variable in DICT into the SIZE bytes in NAME. + Returns true if successful, false if SIZE is insufficient. */ +bool +psppire_dict_generate_name (const PsppireDict *dict, char *name, size_t size) { - gint d = 0; - static gchar name[10]; + gint d; - while (g_snprintf (name, 10, "VAR%05d",d++), - psppire_dict_lookup_var (dict, name)) - ; + for (d = 1; ; d++) + { + int len; + + /* TRANSLATORS: This string must be a valid variable name. That means: + - The string must be at most 64 bytes (not characters) long. + - The string may not contain whitespace. + - The first character may not be '$' + - The first character may not be a digit + - The final charactor may not be '.' or '_' + */ + len = snprintf (name, size, _("Var%04d"), d); + if (len + 1 >= size) + return false; + + if (psppire_dict_lookup_var (dict, name) == NULL) + return true; + } return name; } -/* Insert a new variable at posn IDX, with the name NAME. +/* Insert a new variable at posn IDX, with the name NAME, and return the + new variable. If NAME is null, then a name will be automatically assigned. */ -void +struct variable * psppire_dict_insert_variable (PsppireDict *d, gint idx, const gchar *name) { - struct variable *var ; - g_return_if_fail (idx >= 0); - g_return_if_fail (d); - g_return_if_fail (PSPPIRE_IS_DICT (d)); + struct variable *var; + char tmpname[64]; + + g_return_val_if_fail (idx >= 0, NULL); + g_return_val_if_fail (d, NULL); + g_return_val_if_fail (PSPPIRE_IS_DICT (d), NULL); - if ( ! name ) - name = auto_generate_var_name (d); + if (name == NULL) + { + if (!psppire_dict_generate_name (d, tmpname, sizeof tmpname)) + g_return_val_if_reached (NULL); + + name = tmpname; + } d->disable_insert_signal = TRUE; @@ -382,6 +410,8 @@ psppire_dict_insert_variable (PsppireDict *d, gint idx, const gchar *name) d->disable_insert_signal = FALSE; g_signal_emit (d, signals[VARIABLE_INSERTED], 0, idx); + + return var; } /* Delete N variables beginning at FIRST */ @@ -414,7 +444,7 @@ psppire_dict_set_name (PsppireDict* d, gint idx, const gchar *name) g_assert (d); g_assert (PSPPIRE_IS_DICT (d)); - if ( ! var_is_valid_name (name, false)) + if ( ! dict_id_is_valid (d->dict, name, false)) return FALSE; if ( idx < dict_get_var_cnt (d->dict)) @@ -516,13 +546,13 @@ gboolean psppire_dict_check_name (const PsppireDict *dict, const gchar *name, gboolean report) { - if ( ! var_is_valid_name (name, report ) ) + if ( ! dict_id_is_valid (dict->dict, name, report ) ) return FALSE; if (psppire_dict_lookup_var (dict, name)) { if ( report ) - msg (ME,"Duplicate variable name."); + msg (ME, _("Duplicate variable name.")); return FALSE; } @@ -824,7 +854,7 @@ gboolean psppire_dict_rename_var (PsppireDict *dict, struct variable *v, const gchar *name) { - if ( ! var_is_valid_name (name, false)) + if ( ! dict_id_is_valid (dict->dict, name, false)) return FALSE; /* Make sure no other variable has this name */ @@ -856,7 +886,7 @@ psppire_dict_dump (const PsppireDict *dict) { const struct variable *v = psppire_dict_get_variable (dict, i); int di = var_get_dict_index (v); - g_print ("\"%s\" idx=%d, fv=%d\n", + g_print ("`%s' idx=%d, fv=%d\n", var_get_name(v), di, var_get_case_index(v));