X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire-dict.c;h=7a8245f2bd21ae09d20b1e1329bc711875285274;hb=4790395fad95f64a4cffa76faf4478ffe3bfb5a2;hp=a461f4fa37b0faf262711156b0bab0c1ffb6034f;hpb=5b554160e62a99de7a6c0cb41b127727b06e7c0b;p=pspp diff --git a/src/ui/gui/psppire-dict.c b/src/ui/gui/psppire-dict.c index a461f4fa37..7a8245f2bd 100644 --- a/src/ui/gui/psppire-dict.c +++ b/src/ui/gui/psppire-dict.c @@ -1,5 +1,6 @@ /* PSPPIRE - a graphical user interface for PSPP. - Copyright (C) 2004, 2006, 2007, 2009, 2010, 2011, 2012 Free Software Foundation + Copyright (C) 2004, 2006, 2007, 2009, 2010, 2011, 2012, + 2016, 2017 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 @@ -33,17 +34,20 @@ #include "ui/gui/psppire-marshal.h" #include "ui/gui/psppire-var-ptr.h" -#include "ui/gui/efficient-sheet/jmd-datum.h" - +#include #include #define _(msgid) gettext (msgid) #define N_(msgid) msgid -enum { - ITEMS_CHANGED, - BACKEND_CHANGED, + +GType align_enum_type; +GType measure_enum_type; +GType role_enum_type; + + +enum { VARIABLE_CHANGED, VARIABLE_INSERTED, VARIABLE_DELETED, @@ -75,34 +79,52 @@ gni (GListModel *list) static GType git (GListModel *list) { - return JMD_TYPE_DATUM; + return GTK_TYPE_BUTTON; } static gpointer gi (GListModel *list, guint id) { - JmdDatum *gd = JMD_DATUM (g_object_new (JMD_TYPE_DATUM, NULL)); + GtkWidget *button = gtk_button_new (); PsppireDict *dict = PSPPIRE_DICT (list); - + if (id >= psppire_dict_get_var_cnt (dict)) { - gd->text = g_strdup (_("Var")); + gtk_button_set_label (GTK_BUTTON (button), _("Var")); } else { const struct variable *v = psppire_dict_get_variable (dict, id); - gd->text = g_strdup (var_get_name (v)); - gd->label = g_strdup (var_get_label (v)); + gtk_button_set_label (GTK_BUTTON (button), var_get_name (v)); + gtk_widget_set_tooltip_text (button, var_get_label (v)); + + { + PangoContext *context = gtk_widget_create_pango_context (button); + 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)); + + gtk_widget_set_size_request (button, + (0.25 + var_get_display_width (v)) + * rect.width / PANGO_SCALE, + -1); + } } - return gd; + return button; } static void -jmd_init_iface (GListModelInterface *iface) +ssw_init_iface (GListModelInterface *iface) { iface->get_n_items = gni; iface->get_item = gi; @@ -146,7 +168,7 @@ psppire_dict_get_type (void) }; static const GInterfaceInfo list_model_info = { - (GInterfaceInitFunc) jmd_init_iface, + (GInterfaceInitFunc) ssw_init_iface, NULL, NULL }; @@ -154,7 +176,7 @@ psppire_dict_get_type (void) object_type = g_type_register_static (G_TYPE_OBJECT, "PsppireDict", &object_info, 0); - + g_type_add_interface_static (object_type, GTK_TYPE_TREE_MODEL, &tree_model_info); @@ -175,30 +197,6 @@ psppire_dict_class_init (PsppireDictClass *class) object_class->dispose = psppire_dict_dispose; - signals [BACKEND_CHANGED] = - g_signal_new ("backend-changed", - G_TYPE_FROM_CLASS (class), - G_SIGNAL_RUN_FIRST, - 0, - NULL, NULL, - g_cclosure_marshal_VOID__VOID, - G_TYPE_NONE, - 0); - - signals [ITEMS_CHANGED] = - g_signal_new ("changed", - G_TYPE_FROM_CLASS (class), - G_SIGNAL_RUN_FIRST, - 0, - NULL, NULL, - psppire_marshal_VOID__UINT_UINT_UINT, - G_TYPE_NONE, - 3, - G_TYPE_UINT, - G_TYPE_UINT, - G_TYPE_UINT); - - signals [VARIABLE_CHANGED] = g_signal_new ("variable-changed", G_TYPE_FROM_CLASS (class), @@ -210,10 +208,7 @@ psppire_dict_class_init (PsppireDictClass *class) 3, G_TYPE_INT, G_TYPE_UINT, - G_TYPE_POINTER - ); - - + G_TYPE_POINTER); signals [VARIABLE_INSERTED] = g_signal_new ("variable-inserted", @@ -226,7 +221,6 @@ psppire_dict_class_init (PsppireDictClass *class) 1, G_TYPE_INT); - signals [VARIABLE_DELETED] = g_signal_new ("variable-deleted", G_TYPE_FROM_CLASS (class), @@ -240,7 +234,6 @@ psppire_dict_class_init (PsppireDictClass *class) G_TYPE_INT, G_TYPE_INT); - signals [WEIGHT_CHANGED] = g_signal_new ("weight-changed", G_TYPE_FROM_CLASS (class), @@ -252,7 +245,6 @@ psppire_dict_class_init (PsppireDictClass *class) 1, G_TYPE_INT); - signals [FILTER_CHANGED] = g_signal_new ("filter-changed", G_TYPE_FROM_CLASS (class), @@ -264,7 +256,6 @@ psppire_dict_class_init (PsppireDictClass *class) 1, G_TYPE_INT); - signals [SPLIT_CHANGED] = g_signal_new ("split-changed", G_TYPE_FROM_CLASS (class), @@ -296,7 +287,7 @@ addcb (struct dictionary *d, int idx, void *pd) if ( ! dict->disable_insert_signal) { g_signal_emit (dict, signals [VARIABLE_INSERTED], 0, idx); - g_signal_emit (dict, signals [ITEMS_CHANGED], 0, idx, 1, 1); + g_signal_emit_by_name (dict, "items-changed", idx, 1, 1); } } @@ -306,14 +297,14 @@ delcb (struct dictionary *d, const struct variable *var, { g_signal_emit (pd, signals [VARIABLE_DELETED], 0, var, dict_idx, case_idx); - g_signal_emit (pd, signals [ITEMS_CHANGED], 0, dict_idx, 1, 0); + g_signal_emit_by_name (pd, "items-changed", dict_idx, 1, 0); } static void mutcb (struct dictionary *d, int idx, unsigned int what, const struct variable *oldvar, void *pd) { g_signal_emit (pd, signals [VARIABLE_CHANGED], 0, idx, what, oldvar); - g_signal_emit (pd, signals [ITEMS_CHANGED], 0, idx, 1, 1); + g_signal_emit_by_name (pd, "items-changed", idx, 1, 1); } static void @@ -362,7 +353,7 @@ psppire_dict_new_from_dict (struct dictionary *d) { PsppireDict *new_dict = g_object_new (PSPPIRE_TYPE_DICT, NULL); new_dict->dict = d; - + dict_set_callbacks (new_dict->dict, &gui_callbacks, new_dict); return new_dict; @@ -376,7 +367,7 @@ psppire_dict_replace_dictionary (PsppireDict *dict, struct dictionary *d) guint old_n = dict_get_var_cnt (dict->dict); guint new_n = dict_get_var_cnt (d); - + dict->dict = d; weight_changed_callback (d, var ? var_get_dict_index (var) : -1, dict); @@ -388,8 +379,7 @@ psppire_dict_replace_dictionary (PsppireDict *dict, struct dictionary *d) dict_set_callbacks (dict->dict, &gui_callbacks, dict); - g_signal_emit (dict, signals [BACKEND_CHANGED], 0); - g_signal_emit (dict, signals [ITEMS_CHANGED], 0, 0, old_n, new_n); + g_signal_emit_by_name (dict, "items-changed", 0, old_n, new_n); } @@ -409,7 +399,7 @@ psppire_dict_generate_name (const PsppireDict *dict, char *name, size_t size) - 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 '_' + - The final character may not be '.' or '_' */ len = snprintf (name, size, _("Var%04d"), d); if (len + 1 >= size) @@ -453,8 +443,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); - g_signal_emit (d, signals [ITEMS_CHANGED], 0, idx, 0, 1); - + g_signal_emit_by_name (d, "items-changed", idx, 0, 1); + return var; } @@ -582,7 +572,7 @@ psppire_dict_clear (PsppireDict *d) } -/* Return true is NAME would be a valid name of a variable to add to the +/* Return true if NAME would be a valid name of a variable to add to the dictionary. False otherwise. If REPORT is true, then invalid names will be reported as such as errors */ @@ -700,20 +690,34 @@ tree_model_column_type (GtkTreeModel *model, gint index) { g_return_val_if_fail (PSPPIRE_IS_DICT (model), (GType) 0); + GType t = 0; + switch (index) { case DICT_TVM_COL_NAME: - return G_TYPE_STRING; + case DICT_TVM_COL_LABEL: + t = G_TYPE_STRING; + break; + case DICT_TVM_COL_DECIMAL: + case DICT_TVM_COL_WIDTH: + case DICT_TVM_COL_COLUMNS: + t = G_TYPE_INT; break; case DICT_TVM_COL_VAR: - return PSPPIRE_VAR_PTR_TYPE; + t = PSPPIRE_VAR_PTR_TYPE; break; - case DICT_TVM_COL_LABEL: - return G_TYPE_STRING; + case DICT_TVM_COL_ALIGNMENT: + t = align_enum_type; + break; + case DICT_TVM_COL_MEASURE: + t = measure_enum_type; + break; + case DICT_TVM_COL_ROLE: + t = role_enum_type; break; } - return ((GType)0); + return t; } static gboolean @@ -759,11 +763,11 @@ tree_model_iter_next (GtkTreeModel *model, GtkTreeIter *iter) struct variable *var; gint idx; - g_return_val_if_fail (iter->stamp == dict->stamp, FALSE); - if ( iter == NULL || iter->user_data == NULL) return FALSE; + g_return_val_if_fail (iter->stamp == dict->stamp, FALSE); + var = iter->user_data; idx = var_get_dict_index (var); @@ -815,7 +819,7 @@ tree_model_get_value (GtkTreeModel *model, GtkTreeIter *iter, var = iter->user_data; const struct fmt_spec *fs = var_get_write_format (var); - + switch (column) { case DICT_TVM_COL_NAME: @@ -839,16 +843,16 @@ tree_model_get_value (GtkTreeModel *model, GtkTreeIter *iter, g_value_set_int (value, var_get_display_width (var)); break; case DICT_TVM_COL_ALIGNMENT: - g_value_init (value, G_TYPE_INT); - g_value_set_int (value, var_get_alignment (var)); + g_value_init (value, align_enum_type); + g_value_set_enum (value, var_get_alignment (var)); break; case DICT_TVM_COL_MEASURE: - g_value_init (value, G_TYPE_INT); - g_value_set_int (value, var_get_measure (var)); + g_value_init (value, measure_enum_type); + g_value_set_enum (value, var_get_measure (var)); break; case DICT_TVM_COL_ROLE: - g_value_init (value, G_TYPE_INT); - g_value_set_int (value, var_get_role (var)); + g_value_init (value, role_enum_type); + g_value_set_enum (value, var_get_role (var)); break; case DICT_TVM_COL_VAR: g_value_init (value, PSPPIRE_VAR_PTR_TYPE); @@ -953,8 +957,6 @@ psppire_dict_dump (const PsppireDict *dict) #endif - - const gchar * psppire_dict_encoding (const PsppireDict *dict) {