Honour the display width variable property

[pspp] / src / ui / gui / psppire-dict.c

diff --git a/src/ui/gui/psppire-dict.c b/src/ui/gui/psppire-dict.c
index ff30d64c69a0d74211ab1ba5853d5f1ba85a604f..f491ebff7161c71a6064eb25172c2752cca07434 100644 (file)
--- a/src/ui/gui/psppire-dict.c
+++ b/src/ui/gui/psppire-dict.c
@@ -34,8 +34,6 @@
 #include "ui/gui/psppire-marshal.h"
 #include "ui/gui/psppire-var-ptr.h"
 
-#include "ui/gui/efficient-sheet/jmd-datum.h"
-
 #include <gobject/genums.h>
 
 #include <gettext.h>
@@ -81,34 +79,50 @@ 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));
+
+      PangoRectangle rect;
+      
+      PangoContext *context = gtk_widget_create_pango_context (button);
+      PangoLayout *layout = pango_layout_new (context);
+      
+      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,
+                                  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;
@@ -152,7 +166,7 @@ psppire_dict_get_type (void)
       };
 
       static const GInterfaceInfo list_model_info = {
-       (GInterfaceInitFunc) jmd_init_iface,
+       (GInterfaceInitFunc) ssw_init_iface,
        NULL,
        NULL
       };
@@ -160,7 +174,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);
 
@@ -180,7 +194,7 @@ psppire_dict_class_init (PsppireDictClass *class)
   parent_class = g_type_class_peek_parent (class);
 
   object_class->dispose = psppire_dict_dispose;
-  
+
   signals [VARIABLE_CHANGED] =
     g_signal_new ("variable-changed",
                  G_TYPE_FROM_CLASS (class),
@@ -344,7 +358,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;
@@ -358,7 +372,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);
@@ -390,7 +404,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)
@@ -435,7 +449,7 @@ psppire_dict_insert_variable (PsppireDict *d, gint idx, const gchar *name)
 
   g_signal_emit (d, signals[VARIABLE_INSERTED], 0, idx);
   g_signal_emit_by_name (d, "items-changed", idx, 0, 1);
-  
+
   return var;
 }
 
@@ -682,7 +696,7 @@ 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:
@@ -810,7 +824,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: