PsppireDict: Add a quarter of a unit to the displayed width.

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

diff --git a/src/ui/gui/psppire-dict.c b/src/ui/gui/psppire-dict.c
index 5368538fe30ccc8816f816127ca093a79f066d27..7a8245f2bd21ae09d20b1e1329bc711875285274 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/src/jmd-datum.h"
-
 #include <gobject/genums.h>
 
 #include <gettext.h>
@@ -81,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;
@@ -152,7 +168,7 @@ psppire_dict_get_type (void)
       };
 
       static const GInterfaceInfo list_model_info = {
-       (GInterfaceInitFunc) jmd_init_iface,
+       (GInterfaceInitFunc) ssw_init_iface,
        NULL,
        NULL
       };
@@ -192,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",
@@ -208,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),
@@ -222,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),
@@ -234,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),
@@ -246,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),
@@ -390,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)
@@ -948,8 +957,6 @@ psppire_dict_dump (const PsppireDict *dict)
 #endif
 
 
-
-
 const gchar *
 psppire_dict_encoding (const PsppireDict *dict)
 {