X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire-data-sheet.c;h=4b7df0dc287f5919b4b69a00e988976397ea9746;hb=ca1382f24fd0a8a90dd65daf98a279d6a549d9da;hp=59268d21f431a3e569e8f7f3a4ddff654ebad02e;hpb=37cd3133c06caf3fce7e449a939098f62bd41a55;p=pspp

diff --git a/src/ui/gui/psppire-data-sheet.c b/src/ui/gui/psppire-data-sheet.c
index 59268d21f4..4b7df0dc28 100644
--- a/src/ui/gui/psppire-data-sheet.c
+++ b/src/ui/gui/psppire-data-sheet.c
@@ -17,6 +17,7 @@
 
 #include <config.h>
 #include "psppire-data-sheet.h"
+#include <math.h>
 
 #include <gettext.h>
 #define _(msgid) gettext (msgid)
@@ -103,14 +104,11 @@ change_data_value (PsppireDataSheet *sheet, gint col, gint row, GValue *value)
   value_destroy_from_variant (&v, vrnt);
 }
 
-gboolean myreversefunc (GtkTreeModel *model, gint col, gint row, const gchar *in,
-		    GValue *out);
-
 
 
 static void
 show_cases_row_popup (PsppireDataSheet *sheet, int row,
-		      uint button, uint state, gpointer p)
+		      guint button, guint state, gpointer p)
 {
   GListModel *vmodel = NULL;
   g_object_get (sheet, "vmodel", &vmodel, NULL);
@@ -186,7 +184,7 @@ create_data_row_header_popup_menu (PsppireDataSheet *sheet)
 
 
 static void
-show_cases_column_popup (PsppireDataSheet *sheet, int column, uint button, uint state,
+show_cases_column_popup (PsppireDataSheet *sheet, int column, guint button, guint state,
 			 gpointer p)
 {
   GListModel *hmodel = NULL;
@@ -350,7 +348,9 @@ psppire_data_sheet_new (void)
   GObject *obj =
     g_object_new (PSPPIRE_TYPE_DATA_SHEET,
 		  "forward-conversion", psppire_data_store_value_to_string,
-		  "reverse-conversion", myreversefunc,
+		  "reverse-conversion", psppire_data_store_string_to_value,
+		  "editable", TRUE,
+		  "horizontal-draggable", TRUE,
 		  NULL);
 
   return GTK_WIDGET (obj);
@@ -360,7 +360,7 @@ psppire_data_sheet_new (void)
 static gboolean
 indicate_filtered_case (GtkWidget *widget, cairo_t *cr, PsppireDataStore *store)
 {
-  guint row = g_object_get_data (widget, "row");
+  guint row = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (widget), "row"));
 
   if (!psppire_data_store_filtered (store, row))
     return FALSE;
@@ -376,12 +376,39 @@ indicate_filtered_case (GtkWidget *widget, cairo_t *cr, PsppireDataStore *store)
 }
 
 static void
-button_post_create (GtkWidget *button, uint i, gpointer user_data)
+button_post_create (GtkWidget *button, guint i, gpointer user_data)
 {
   PsppireDataStore *data_store = PSPPIRE_DATA_STORE (user_data);
 
-  g_object_set_data (button, "row", GUINT_TO_POINTER (i));
-  g_signal_connect_after (button, "draw", indicate_filtered_case, data_store);
+  g_object_set_data (G_OBJECT (button), "row", GUINT_TO_POINTER (i));
+  g_signal_connect_after (button, "draw", G_CALLBACK (indicate_filtered_case), data_store);
+}
+
+
+static gboolean
+resize_display_width (PsppireDict *dict, gint pos, gint size, gpointer user_data)
+{
+  if (pos < 0)
+    return FALSE;
+
+  PsppireDataSheet *sheet = PSPPIRE_DATA_SHEET (user_data);
+  PangoContext *context = gtk_widget_create_pango_context (GTK_WIDGET (sheet));
+  PangoLayout *layout = pango_layout_new (context);
+  PangoRectangle rect;
+  
+  pango_layout_set_text (layout, "M", 1);
+  pango_layout_get_extents (layout, NULL, &rect);
+  
+  gdouble width_of_M = rect.width / (gdouble) PANGO_SCALE;
+  
+  g_object_unref (G_OBJECT (layout));
+  g_object_unref (G_OBJECT (context));
+  
+  gint Ms = round ((size / width_of_M) - 0.25);
+  struct variable *var = psppire_dict_get_variable (dict, pos);
+  g_return_val_if_fail (var, TRUE);
+  var_set_display_width (var, Ms);
+  return TRUE;
 }
 
 static void
@@ -393,6 +420,8 @@ set_dictionary (PsppireDataSheet *sheet)
   PsppireDataStore *store = PSPPIRE_DATA_STORE (data_model);
   g_object_set (sheet, "hmodel", store->dict, NULL);
 
+  g_signal_connect (store->dict, "resize-item", G_CALLBACK (resize_display_width),
+		    sheet);
 
   SswAxisModel *vmodel = NULL;
   g_object_get (sheet, "vmodel", &vmodel, NULL);