X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire-var-sheet-header.c;h=c3c25042ecb0a4862fa876eaee870bd3b01b7c4d;hb=0931dbb924b98df79989e2b4017f538f2ab6b23c;hp=e7770dedb5a8912801ec41838150f0f327642e48;hpb=193090d0821d84eee24d5d340c91bc069bb55827;p=pspp

diff --git a/src/ui/gui/psppire-var-sheet-header.c b/src/ui/gui/psppire-var-sheet-header.c
index e7770dedb5..c3c25042ec 100644
--- a/src/ui/gui/psppire-var-sheet-header.c
+++ b/src/ui/gui/psppire-var-sheet-header.c
@@ -1,5 +1,4 @@
-/*
-    A candidate replacement for Pspp's sheet
+/*  PSPPIRE - a graphical user interface for PSPP.
     Copyright (C) 2016  John Darrington
 
     This program is free software: you can redistribute it and/or modify
@@ -21,8 +20,10 @@
 
 #include "psppire-var-sheet-header.h"
 
-#include "efficient-sheet/src/ssw-axis-model.h"
-#include "efficient-sheet/src/ssw-datum.h"
+#include <gettext.h>
+
+#define _(msgid) gettext (msgid)
+#define N_(msgid) msgid
 
 enum  {CHANGED,
        n_SIGNALS};
@@ -38,56 +39,59 @@ gni (GListModel *list)
 static GType
 git (GListModel *list)
 {
-  return SSW_TYPE_DATUM;
+  return GTK_TYPE_BUTTON;
 }
 
+
 static gpointer
 gi (GListModel *list, guint position)
 {
-  SswDatum *gd = SSW_DATUM (g_object_new (SSW_TYPE_DATUM, NULL));
+  GtkWidget *button = gtk_button_new ();
+  gchar *text = NULL;
 
   switch (position)
     {
     case 0:
-      gd->text = g_strdup ("Name");
+      text = N_("Name");
       break;
     case 1:
-      gd->text = g_strdup ("Type");
+      text = N_("Type");
       break;
     case 2:
-      gd->text = g_strdup ("Width");
+      text = N_("Width");
       break;
     case 3:
-      gd->text = g_strdup ("Decimal");
+      text = N_("Decimal");
       break;
     case 4:
-      gd->text = g_strdup ("Label");
+      text = N_("Label");
       break;
     case 5:
-      gd->text = g_strdup ("Value Labels");
+      text = N_("Value Labels");
       break;
     case 6:
-      gd->text = g_strdup ("Missing Values");
+      text = N_("Missing Values");
       break;
     case 7:
-      gd->text = g_strdup ("Columns");
+      text = N_("Columns");
       break;
     case 8:
-      gd->text = g_strdup ("Align");
+      text = N_("Align");
       break;
     case 9:
-      gd->text = g_strdup ("Measure");
+      text = N_("Measure");
       break;
     case 10:
-      gd->text = g_strdup ("Role");
+      text = N_("Role");
       break;
     default:
-      //      g_assert_not_reached ();
-      g_print ("Bug: Request for item %d\n", position);
       break;
     }
 
-  return gd;
+  if (text)
+    gtk_button_set_label (GTK_BUTTON (button), gettext (text));
+
+  return button;
 }