From 8ce80361a582f88b22449b2d277873f7770155a0 Mon Sep 17 00:00:00 2001
From: John Darrington <john@darrington.wattle.id.au>
Date: Sun, 27 Sep 2020 11:29:15 +0200
Subject: [PATCH] psppire.xml: Replace placeholder strings, add missing widgets
 and sort

---
 src/ui/gui/psppire.xml | 27 +++++++++++++++++++--------
 src/ui/gui/widgets.c   |  9 +++++++++
 2 files changed, 28 insertions(+), 8 deletions(-)

diff --git a/src/ui/gui/psppire.xml b/src/ui/gui/psppire.xml
index 4a0cd60c1f..3c0d43a64e 100644
--- a/src/ui/gui/psppire.xml
+++ b/src/ui/gui/psppire.xml
@@ -3,22 +3,33 @@
   <!-- <init-function>my_catalog_init</init-function> -->
 
   <glade-widget-classes>
-    <glade-widget-class name="PsppireAcr"    generic-name="acr" title="Psppire Add/Change/Remove"/>
-    <glade-widget-class name="PsppireValChooser"    generic-name="val-chooser" title="Psppire Value Chooser"/>
+    <glade-widget-class name="PsppireAcr"       generic-name="acr" title="Psppire Add/Change/Remove"/>
+    <glade-widget-class name="PsppireButtonBox" generic-name="button-box" title="Psppire Button Box"/>
+    <glade-widget-class name="PsppireCheckboxTreeview"  generic-name="checkbox-treeview" title="Psppire Checkbox Treeview"/>
+    <glade-widget-class name="PsppireDataSheet" generic-name="data-sheet" title="Psppire Data Sheet"/>
     <glade-widget-class name="PsppireDialog"    generic-name="dialog" title="Psppire Dialog"/>
-    <glade-widget-class name="PsppireKeypad"    generic-name="dialog" title="Psppire Keypad"/>
     <glade-widget-class name="PsppireDictView"  generic-name="dictview" title="Psppire Dict View"/>
-    <glade-widget-class name="PsppireCheckboxTreeview"  generic-name="checkbox-treeview" title="Psppire Checkbox Treeview"/>
-    <glade-widget-class name="PsppireVarView"  generic-name="var-view" title="Psppire Variable View"/>
-    <glade-widget-class name="PsppireSelector"  generic-name="frobnicator" title="Frobnicator"/>
-    <glade-widget-class name="PsppireButtonBox" generic-name="frobnicator" title="Frobnicator"/>
+    <glade-widget-class name="PsppireKeypad"    generic-name="dialog" title="Psppire Keypad"/>
+    <glade-widget-class name="PsppireSelector"  generic-name="selector" title="Psppire Selector"/>
+    <glade-widget-class name="PsppireValChooser"    generic-name="val-chooser" title="Psppire Value Chooser"/>
+    <glade-widget-class name="PsppireVarView"   generic-name="var-view" title="Psppire Variable View"/>
+    <glade-widget-class name="PsppireVariableSheet" generic-name="variable-sheet" title="Psppire Variable Sheet"/>
+    <glade-widget-class name="SswSheet" generic-name="variable-sheet" title="Spread Sheet"/>
   </glade-widget-classes>
 
   <glade-widget-group name="psppire" title="Psppire">
+    <glade-widget-class-ref name="PsppireAcr"/>
+    <glade-widget-class-ref name="PsppireButtonBox"/>
+    <glade-widget-class-ref name="PsppireCheckboxTreeview"/>
+    <glade-widget-class-ref name="PsppireDataSheet"/>
     <glade-widget-class-ref name="PsppireDialog"/>
     <glade-widget-class-ref name="PsppireDictView"/>
-    <glade-widget-class-ref name="PsppireVarView"/>
+    <glade-widget-class-ref name="PsppireKeypad"/>
     <glade-widget-class-ref name="PsppireSelector"/>
+    <glade-widget-class-ref name="PsppireValChooser"/>
+    <glade-widget-class-ref name="PsppireVarView"/>
+    <glade-widget-class-ref name="PsppireVariableSheet"/>
+    <glade-widget-class-ref name="SswSheet"/>
   </glade-widget-group>
 
 </glade-catalog>
diff --git a/src/ui/gui/widgets.c b/src/ui/gui/widgets.c
index 0bf7e979cb..7b308c0e3f 100644
--- a/src/ui/gui/widgets.c
+++ b/src/ui/gui/widgets.c
@@ -77,6 +77,11 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "psppire-dialog-action-var-info.h"
 #include "psppire-dialog-action-weight.h"
 #include "psppire-value-entry.h"
+#include "psppire-data-sheet.h"
+#include "psppire-var-sheet-header.h"
+#include "psppire-variable-sheet.h"
+#include <ssw-sheet.h>
+
 
 static  volatile GType kludge;
 
@@ -215,6 +220,10 @@ preregister_widgets (void)
   psppire_value_entry_get_type ();
   psppire_checkbox_treeview_get_type ();
   psppire_means_layer_get_type ();
+  ssw_sheet_get_type ();
+  psppire_data_sheet_get_type ();
+  psppire_var_sheet_header_get_type ();
+  psppire_variable_sheet_get_type ();
 
   preregister_actions ();
   preregister_misc ();
-- 
2.30.2