Revive psppire's glade compatibility
authorJohn Darrington <john@darrington.wattle.id.au>
Mon, 10 Aug 2020 07:15:09 +0000 (09:15 +0200)
committerJohn Darrington <john@darrington.wattle.id.au>
Sun, 16 Aug 2020 07:14:40 +0000 (09:14 +0200)
16 files changed:
Makefile.am
configure.ac
glade/automake.mk [deleted file]
glade/icons/16x16/widget-psppire-psppire-acr.png [deleted file]
glade/icons/16x16/widget-psppire-psppire-dialog.png [deleted file]
glade/icons/16x16/widget-psppire-psppire-keypad.png [deleted file]
glade/icons/16x16/widget-psppire-psppire-selector.png [deleted file]
glade/icons/22x22/widget-psppire-psppire-acr.png [deleted file]
glade/icons/22x22/widget-psppire-psppire-dialog.png [deleted file]
glade/icons/22x22/widget-psppire-psppire-keypad.png [deleted file]
glade/icons/22x22/widget-psppire-psppire-selector.png [deleted file]
glade/psppire.xml [deleted file]
src/ui/gui/automake.mk
src/ui/gui/dummy.c [new file with mode: 0644]
src/ui/gui/glade-wrapper.in [new file with mode: 0644]
src/ui/gui/psppire.xml [new file with mode: 0644]

index be5c7ae9dfa1193f2c60bb3e1089ea3818a1e32e..ae1905f4c64645fe5a4c17b5fafa4870eb9ac579 100644 (file)
@@ -92,10 +92,6 @@ include $(top_srcdir)/src/automake.mk
 include $(top_srcdir)/utilities/automake.mk
 include $(top_srcdir)/tests/automake.mk
 
-if WITH_GUI_TOOLS
-include $(top_srcdir)/glade/automake.mk
-endif
-
 if WITH_PERL_MODULE
 include $(top_srcdir)/perl-module/automake.mk
 endif
index cac18c36fb2a6abcbd627daad9e019ad891b6594..9780d7393fddc7c9b3637dbb6a8d28294b72b1a0 100644 (file)
@@ -231,14 +231,6 @@ AC_DEFINE(
   [crc32], [gl_crc32],
   [Avoid making zlib call gnulib's crc32() instead of its own.])
 
-AC_ARG_WITH(
-  gui_tools,
-  [AS_HELP_STRING([--with-gui-tools], [build the gui developer tools.  For DEVELOPERS only! There is no reason why users will need this flag.])])
-if test x"$with_gui_tools" = x"yes" ; then
-       PKG_CHECK_MODULES(GLADE_UI, gladeui-2.0)
-fi
-AM_CONDITIONAL(WITH_GUI_TOOLS, test x"$with_gui_tools" = x"yes")
-
 AC_ARG_WITH(
   [perl-module],
   [AS_HELP_STRING([--without-perl-module], [do not build the Perl module])],
diff --git a/glade/automake.mk b/glade/automake.mk
deleted file mode 100644 (file)
index 374c015..0000000
+++ /dev/null
@@ -1,70 +0,0 @@
-# PSPP - a program for statistical analysis.
-# Copyright (C) 2017 Free Software Foundation, Inc.
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-## Process this file with automake to produce Makefile.in  -*- makefile -*-
-
-module_LTLIBRARIES = libglade-psppire.la
-
-moduledir = `pkg-config --variable=moduledir gladeui-2.0`
-catalogdir = `pkg-config --variable=catalogdir gladeui-2.0`
-pixmapdir = `pkg-config --variable=pixmapdir gladeui-2.0`
-
-small_pixmapdir = $(pixmapdir)/hicolor/16x16/actions
-large_pixmapdir = $(pixmapdir)/hicolor/22x22/actions
-
-# format.c for psppire-value-entry.c
-
-libglade_psppire_la_SOURCES = \
-       src/ui/gui/helper.c \
-       src/ui/gui/dialog-common.c \
-       src/ui/gui/psppire-var-ptr.c \
-       src/data/format.c \
-       src/ui/gui/psppire-format.c \
-       src/data/value-labels.c \
-       src/ui/gui/psppire-conf.c \
-       src/ui/gui/psppire-acr.c \
-       src/ui/gui/psppire-buttonbox.c \
-       src/ui/gui/psppire-dialog.c \
-       src/ui/gui/psppire-keypad.c \
-       src/ui/gui/psppire-dictview.c \
-       src/ui/gui/psppire-selector.c \
-       src/ui/gui/psppire-select-dest.c \
-       src/ui/gui/psppire-var-view.c \
-       src/ui/gui/psppire-checkbox-treeview.c \
-       src/ui/gui/psppire-val-chooser.c \
-       src/ui/gui/psppire-value-entry.c \
-       src/ui/gui/psppire-window-base.c
-
-dist_catalog_DATA = \
-       glade/psppire.xml
-
-dist_small_pixmap_DATA = \
-       glade/icons/16x16/widget-psppire-psppire-acr.png \
-       glade/icons/16x16/widget-psppire-psppire-dialog.png \
-       glade/icons/16x16/widget-psppire-psppire-keypad.png \
-       glade/icons/16x16/widget-psppire-psppire-selector.png
-
-dist_large_pixmap_DATA = \
-       glade/icons/22x22/widget-psppire-psppire-acr.png \
-       glade/icons/22x22/widget-psppire-psppire-dialog.png \
-       glade/icons/22x22/widget-psppire-psppire-keypad.png \
-       glade/icons/22x22/widget-psppire-psppire-selector.png
-
-
-libglade_psppire_la_CFLAGS = $(GLADE_UI_CFLAGS) $(GLADE_CFLAGS) \
-       $(GTKSOURCEVIEW_CFLAGS) -I $(top_srcdir)/src/ui/gui -DDEBUGGING
-
-libglade_psppire_la_LIBADD = gl/libgl.la
diff --git a/glade/icons/16x16/widget-psppire-psppire-acr.png b/glade/icons/16x16/widget-psppire-psppire-acr.png
deleted file mode 100644 (file)
index 717e088..0000000
Binary files a/glade/icons/16x16/widget-psppire-psppire-acr.png and /dev/null differ
diff --git a/glade/icons/16x16/widget-psppire-psppire-dialog.png b/glade/icons/16x16/widget-psppire-psppire-dialog.png
deleted file mode 100644 (file)
index 0d5cf63..0000000
Binary files a/glade/icons/16x16/widget-psppire-psppire-dialog.png and /dev/null differ
diff --git a/glade/icons/16x16/widget-psppire-psppire-keypad.png b/glade/icons/16x16/widget-psppire-psppire-keypad.png
deleted file mode 100644 (file)
index be9f749..0000000
Binary files a/glade/icons/16x16/widget-psppire-psppire-keypad.png and /dev/null differ
diff --git a/glade/icons/16x16/widget-psppire-psppire-selector.png b/glade/icons/16x16/widget-psppire-psppire-selector.png
deleted file mode 100644 (file)
index d4fe2f2..0000000
Binary files a/glade/icons/16x16/widget-psppire-psppire-selector.png and /dev/null differ
diff --git a/glade/icons/22x22/widget-psppire-psppire-acr.png b/glade/icons/22x22/widget-psppire-psppire-acr.png
deleted file mode 100644 (file)
index 624ba4e..0000000
Binary files a/glade/icons/22x22/widget-psppire-psppire-acr.png and /dev/null differ
diff --git a/glade/icons/22x22/widget-psppire-psppire-dialog.png b/glade/icons/22x22/widget-psppire-psppire-dialog.png
deleted file mode 100644 (file)
index 575ebf5..0000000
Binary files a/glade/icons/22x22/widget-psppire-psppire-dialog.png and /dev/null differ
diff --git a/glade/icons/22x22/widget-psppire-psppire-keypad.png b/glade/icons/22x22/widget-psppire-psppire-keypad.png
deleted file mode 100644 (file)
index be61044..0000000
Binary files a/glade/icons/22x22/widget-psppire-psppire-keypad.png and /dev/null differ
diff --git a/glade/icons/22x22/widget-psppire-psppire-selector.png b/glade/icons/22x22/widget-psppire-psppire-selector.png
deleted file mode 100644 (file)
index ea13309..0000000
Binary files a/glade/icons/22x22/widget-psppire-psppire-selector.png and /dev/null differ
diff --git a/glade/psppire.xml b/glade/psppire.xml
deleted file mode 100644 (file)
index 62c609a..0000000
+++ /dev/null
@@ -1,265 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- PSPP - a program for statistical analysis. -->
-<!-- Copyright (C) 2017 Free Software Foundation, Inc. -->
-
-<!-- This program is free software: you can redistribute it and/or modify -->
-<!-- it under the terms of the GNU General Public License as published by -->
-<!-- the Free Software Foundation, either version 3 of the License, or -->
-<!-- (at your option) any later version. -->
-
-<!-- This program is distributed in the hope that it will be useful, -->
-<!-- but WITHOUT ANY WARRANTY; without even the implied warranty of -->
-<!-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the -->
-<!-- GNU General Public License for more details. -->
-
-<!-- You should have received a copy of the GNU General Public License -->
-<!-- along with this program.  If not, see <http://www.gnu.org/licenses/>. -->
-
-<glade-catalog name="psppire" library="glade-psppire">
-
-  <glade-widget-classes>
-
-    <glade-widget-class name="PsppireDialog"
-                       generic-name="psppire-dialog"
-                       toplevel="True"
-                       default-width="320"
-                       default-height="260"
-                       title="Dialog Box">
-
-     <properties>
-        <property id="accept-focus"         disabled="True" />
-        <property id="allow-grow"           disabled="True" />
-        <property id="allow-shrink"         disabled="True" />
-        <property id="decorated"            disabled="True" />
-       <property id="default-height"       disabled="True" />
-       <property id="default-width"        disabled="True" />
-       <property id="deletable"            disabled="True" />
-       <property id="destroy-with-parent"  disabled="True" />
-       <property id="focus-on-map"         disabled="True" />
-       <property id="gravity"              disabled="True" />
-       <property id="has-toplevel-focus"   disabled="True" />
-       <property id="icon"                 disabled="True" />
-       <property id="icon-name"            disabled="True" />
-       <property id="is-active"            disabled="True" />
-
-       <property id="resizable"            disabled="True" />
-       <property id="role"                 disabled="True" />
-       <property id="screen"               disabled="True" />
-       <property id="skip-pager-hint"      disabled="True" />
-       <property id="skip-taskbar-hint"    disabled="True" />
-       <property id="transient-for"        disabled="True" />
-       <property id="type"                 disabled="True" />
-       <property id="type-hint"            disabled="True" />
-       <property id="urgency-hint"         disabled="True" />
-       <property id="window-position"      disabled="True" />
-
-       <property id="child"                disabled="True" />
-        <property id="resize-mode"          disabled="True" />
-       <property id="border-width"         disabled="True" />
-
-       <property id="modal" ignore="True" default="True" />
-       <property id="visible" ignore="True" default="False" />
-    </properties>
-
-    </glade-widget-class>
-
-
-    <glade-widget-class name="PsppireVButtonBox" generic-name="psppire-vbuttonbox" title="Vertical Button Box">
-
-    <properties>
-      <property id="child"  disabled="True" />
-      <property id="visible" ignore="True" default="True" />
-      <property id="border-width" default="5" optional-default="True"/>
-      <property id="buttons">
-         <displayable-values>
-           <value id="PSPPIRE_BUTTON_OK_MASK"     name="OK"></value>
-           <value id="PSPPIRE_BUTTON_CANCEL_MASK" name="Cancel"></value>
-           <value id="PSPPIRE_BUTTON_HELP_MASK"   name="Help"></value>
-           <value id="PSPPIRE_BUTTON_RESET_MASK"  name="Reset"></value>
-           <value id="PSPPIRE_BUTTON_PASTE_MASK"  name="Paste"></value>
-         </displayable-values>
-      </property>
-
-    </properties>
-
-    <packing-defaults>
-      <parent-class name="GtkHBox">
-       <child-property id="expand" default="False"/>
-       <child-property id="fill" default="False"/>
-       <child-property id="pack-type" default="GTK_PACK_END"/>
-      </parent-class>
-    </packing-defaults>
-
-    </glade-widget-class>
-
-    <glade-widget-class name="PsppireHButtonBox" generic-name="psppire-hbuttonbox" title="Horizontal Button Box">
-
-    <properties>
-      <property id="child"                disabled="True" />
-      <property id="visible" ignore="True" default="True" />
-      <property id="border-width" default="5" optional-default="True"/>
-    </properties>
-
-    <packing-defaults>
-      <parent-class name="GtkVBox">
-       <child-property id="expand" default="False"/>
-       <child-property id="fill" default="False"/>
-       <child-property id="pack-type" default="GTK_PACK_END"/>
-      </parent-class>
-    </packing-defaults>
-
-    </glade-widget-class>
-
-    <glade-widget-class name="PsppireKeypad"
-                        get-type-function="psppire_keypad_get_type"
-                       generic-name="psppire-keypad"
-                       fixed="True"
-                       title="Keypad">
-
-     <properties>
-       <property id="child"       disabled="True"/>
-       <property id="homogeneous" disabled="True"/>
-       <property id="n-columns"   disabled="True"/>
-       <property id="n-rows"      disabled="True"/>
-
-       <property id="above-child"    disabled="True"/>
-       <property id="visible-window" disabled="True"/>
-       <property id="resize-mode"    disabled="True"/>
-       <property id="border-width"   disabled="True"/>
-
-       <property id="visible" ignore="True" default="True" />
-     </properties>
-
-    </glade-widget-class>
-
-
-    <glade-widget-class name="PsppireSelector" generic-name="psppire-selector" title="Selector Button">
-
-     <properties>
-       <property id="child"           disabled="True"/>
-       <property id="label"           disabled="True"/>
-        <property id="focus-on-click"  disabled="True"/>
-        <property id="image"           disabled="True"/>
-        <property id="image-position"  disabled="True"/>
-        <property id="label"           disabled="True"/>
-        <property id="relief"          disabled="True"/>
-        <property id="use-stock"       disabled="True"/>
-        <property id="use-underline"   disabled="True"/>
-        <property id="xalign"          disabled="True"/>
-        <property id="yalign"          disabled="True"/>
-        <property id="resize-mode"     disabled="True"/>
-        <property id="border-width" default="5" optional-default="True"/>
-       <property id="orientation">
-         <displayable-values>
-           <value id="PSPPIRE_SOURCE_BEFORE_DEST"
-              name="Source Before Destination"></value>
-           <value id="PSPPIRE_AFTER_BEFORE_DEST"
-              name="Source After Destination"></value>
-           <value id="PSPPIRE_ABOVE_BEFORE_DEST"
-              name="Source Above Destination"></value>
-           <value id="PSPPIRE_BELOW_BEFORE_DEST"
-              name="Source Below Destination"></value>
-         </displayable-values>
-       </property>
-
-       <property id="source-widget"     ignore="True" />
-       <property id="dest-widget"       ignore="True" />
-       <property id="visible"           ignore="True" default="True" />
-       <property id="primary"           default="False" />
-     </properties>
-
-    </glade-widget-class>
-
-    <glade-widget-class name="PsppireAcr" generic-name="psppire-acr" title="Add-Change-Remove">
-
-    <properties>
-      <property id="child"                disabled="True" />
-      <property id="homogeneous"          disabled="True" />
-      <property id="visible" ignore="True" default="True" />
-      <property id="border-width" default="5" optional-default="True"/>
-    </properties>
-
-    </glade-widget-class>
-
-
-
-    <glade-widget-class name="PsppireDictView"
-                       generic-name="psppire-dictview"
-                       title="Dictionary Treeview">
-
-    <properties>
-      <property id="child"                disabled="True" />
-      <property id="homogeneous"          disabled="True" />
-      <property id="visible" ignore="True" default="True" />
-      <property id="model"                visible="False"  query="False" />
-      <property id="border-width" default="5" optional-default="True"/>
-    </properties>
-
-    </glade-widget-class>
-
-
-    <glade-widget-class name="PsppireVarView"
-                       generic-name="psppire-var-view"
-                       title="Variable Treeview">
-
-    <properties>
-      <property id="child"                disabled="True" />
-      <property id="homogeneous"          disabled="True" />
-      <property id="visible" ignore="True" default="True" />
-      <property id="model"                visible="False"  query="False" disabled="True" />
-      <property id="n-cols"    ignore="True" />
-      <property id="border-width" default="5" optional-default="True"/>
-    </properties>
-
-    </glade-widget-class>
-
-    <glade-widget-class name="PsppireCheckboxTreeview"
-                       generic-name="psppire-checkbox-treeview"
-                       title="Checkbox Treeview">
-      <properties>
-        <property id="child"                disabled="True" />
-        <property id="homogeneous"          disabled="True" />
-        <property id="visible" ignore="True" default="True" />
-      </properties>
-    </glade-widget-class>
-
-    <glade-widget-class name="PsppireValChooser"
-                       generic-name="psppire-val-chooser"
-                       title="Value Chooser"
-                       icon-name="widget-gtk-recentchooser">
-      <properties>
-        <property id="child"                disabled="True" />
-        <property id="homogeneous"          disabled="True" />
-        <property id="visible" ignore="True" default="True" />
-      </properties>
-    </glade-widget-class>
-
-    <glade-widget-class name="PsppireValueEntry"
-                       generic-name="psppire-value-entry"
-                       title="Value Entry"
-                       icon-name="widget-gtk-entry">
-      <properties>
-        <property id="child"                disabled="True" />
-        <property id="homogeneous"          disabled="True" />
-        <property id="visible" ignore="True" default="True" />
-      </properties>
-    </glade-widget-class>
-
-  </glade-widget-classes>
-
- <glade-widget-group name="psppire" title="Psppire">
-  <glade-widget-class-ref name="PsppireDialog"/>
-  <glade-widget-class-ref name="PsppireHButtonBox"/>
-  <glade-widget-class-ref name="PsppireVButtonBox"/>
-  <glade-widget-class-ref name="PsppireDictView"/>
-  <glade-widget-class-ref name="PsppireVarView"/>
-  <glade-widget-class-ref name="PsppireSelector"/>
-  <glade-widget-class-ref name="PsppireKeypad"/>
-  <glade-widget-class-ref name="PsppireAcr"/>
-  <glade-widget-class-ref name="PsppireCheckboxTreeview"/>
-  <glade-widget-class-ref name="PsppireValChooser"/>
-  <glade-widget-class-ref name="PsppireValueEntry"/>
- </glade-widget-group>
-
-</glade-catalog>
index 9826d9b8d0e342b8b55c6f8fcdbd47ab41952903..ead491f394a70fc0bacd7166fed306442dbcc3b4 100644 (file)
@@ -141,49 +141,15 @@ dist_src_ui_gui_psppire_DATA = \
        $(UI_FILES) \
        $(top_srcdir)/src/ui/gui/pspp.lang
 
-src_ui_gui_psppire_SOURCES = \
-       src/ui/gui/builder-wrapper.c \
-       src/ui/gui/builder-wrapper.h \
-       src/ui/gui/dialog-common.c \
-       src/ui/gui/dialog-common.h \
-       src/ui/gui/dict-display.c \
-       src/ui/gui/dict-display.h \
-       src/ui/gui/entry-dialog.c \
-       src/ui/gui/entry-dialog.h \
-       src/ui/gui/executor.c \
-       src/ui/gui/executor.h \
-       src/ui/gui/find-dialog.c \
-       src/ui/gui/find-dialog.h \
-       src/ui/gui/goto-case-dialog.c \
-       src/ui/gui/goto-case-dialog.h \
-       src/ui/gui/helper.c \
-       src/ui/gui/helper.h \
-       src/ui/gui/help-menu.c \
-       src/ui/gui/help-menu.h \
-       src/ui/gui/main.c \
-       src/ui/gui/missing-val-dialog.c \
-       src/ui/gui/missing-val-dialog.h \
-       src/ui/gui/options-dialog.c \
-       src/ui/gui/options-dialog.h \
+UI_WIDGETS_ESSENTIAL= \
        src/ui/gui/psppire-acr.c \
        src/ui/gui/psppire-acr.h \
        src/ui/gui/psppire-buttonbox.c \
        src/ui/gui/psppire-buttonbox.h \
-       src/ui/gui/psppire.c \
        src/ui/gui/psppire-checkbox-treeview.c \
        src/ui/gui/psppire-checkbox-treeview.h \
        src/ui/gui/psppire-conf.c \
        src/ui/gui/psppire-conf.h \
-       src/ui/gui/psppire-data-editor.c \
-       src/ui/gui/psppire-data-editor.h \
-       src/ui/gui/psppire-data-sheet.c \
-       src/ui/gui/psppire-data-sheet.h \
-       src/ui/gui/psppire-data-store.c \
-       src/ui/gui/psppire-data-store.h \
-       src/ui/gui/psppire-data-window.c \
-       src/ui/gui/psppire-data-window.h \
-       src/ui/gui/psppire-delimited-text.c \
-       src/ui/gui/psppire-delimited-text.h \
        src/ui/gui/psppire-dialog-action-1sks.c \
        src/ui/gui/psppire-dialog-action-1sks.h \
        src/ui/gui/psppire-dialog-action-aggregate.c \
@@ -276,49 +242,87 @@ src_ui_gui_psppire_SOURCES = \
        src/ui/gui/psppire-dict.h \
        src/ui/gui/psppire-dictview.c \
        src/ui/gui/psppire-dictview.h \
-       src/ui/gui/psppire-encoding-selector.c \
-       src/ui/gui/psppire-encoding-selector.h \
        src/ui/gui/psppire-format.c \
        src/ui/gui/psppire-format.h \
+       src/ui/gui/psppire-keypad.c \
+       src/ui/gui/psppire-keypad.h \
+       src/ui/gui/psppire-means-layer.c \
+       src/ui/gui/psppire-means-layer.h \
+       src/ui/gui/psppire-select-dest.c \
+       src/ui/gui/psppire-select-dest.h \
+       src/ui/gui/psppire-selector.c \
+       src/ui/gui/psppire-selector.h \
+       src/ui/gui/psppire-text-file.c \
+       src/ui/gui/psppire-text-file.h \
+       src/ui/gui/psppire-val-chooser.c \
+       src/ui/gui/psppire-val-chooser.h \
+       src/ui/gui/psppire-var-ptr.c \
+       src/ui/gui/psppire-var-ptr.h \
+       src/ui/gui/psppire-var-view.c \
+       src/ui/gui/psppire-var-view.h \
+       src/ui/gui/psppire-window-base.c \
+       src/ui/gui/psppire-window-base.h \
+       src/ui/gui/dialog-common.c \
+       src/ui/gui/dialog-common.h \
+       src/ui/gui/widgets.c \
+       src/ui/gui/widgets.h \
+       src/ui/gui/dict-display.c \
+       src/ui/gui/dict-display.h
+
+src_ui_gui_psppire_SOURCES = $(UI_WIDGETS_ESSENTIAL) \
+       src/ui/gui/builder-wrapper.c \
+       src/ui/gui/builder-wrapper.h \
+       src/ui/gui/entry-dialog.c \
+       src/ui/gui/entry-dialog.h \
+       src/ui/gui/executor.c \
+       src/ui/gui/executor.h \
+       src/ui/gui/find-dialog.c \
+       src/ui/gui/find-dialog.h \
+       src/ui/gui/goto-case-dialog.c \
+       src/ui/gui/goto-case-dialog.h \
+       src/ui/gui/helper.c \
+       src/ui/gui/helper.h \
+       src/ui/gui/help-menu.c \
+       src/ui/gui/help-menu.h \
+       src/ui/gui/main.c \
+       src/ui/gui/missing-val-dialog.c \
+       src/ui/gui/missing-val-dialog.h \
+       src/ui/gui/options-dialog.c \
+       src/ui/gui/options-dialog.h \
+       src/ui/gui/psppire.c \
+       src/ui/gui/psppire-data-editor.c \
+       src/ui/gui/psppire-data-editor.h \
+       src/ui/gui/psppire-data-sheet.c \
+       src/ui/gui/psppire-data-sheet.h \
+       src/ui/gui/psppire-data-store.c \
+       src/ui/gui/psppire-data-store.h \
+       src/ui/gui/psppire-data-window.c \
+       src/ui/gui/psppire-data-window.h \
+       src/ui/gui/psppire-delimited-text.c \
+       src/ui/gui/psppire-delimited-text.h \
+       src/ui/gui/psppire-encoding-selector.c \
+       src/ui/gui/psppire-encoding-selector.h \
        src/ui/gui/psppire.h \
        src/ui/gui/psppire-import-assistant.c \
        src/ui/gui/psppire-import-assistant.h \
-       src/ui/gui/psppire-keypad.c \
-       src/ui/gui/psppire-keypad.h \
        src/ui/gui/psppire-lex-reader.c \
        src/ui/gui/psppire-lex-reader.h \
-       src/ui/gui/psppire-means-layer.c \
-       src/ui/gui/psppire-means-layer.h \
        src/ui/gui/psppire-output-view.c \
        src/ui/gui/psppire-output-view.h \
        src/ui/gui/psppire-output-window.c \
        src/ui/gui/psppire-output-window.h \
        src/ui/gui/psppire-scanf.c \
        src/ui/gui/psppire-scanf.h \
-       src/ui/gui/psppire-select-dest.c \
-       src/ui/gui/psppire-select-dest.h \
-       src/ui/gui/psppire-selector.c \
-       src/ui/gui/psppire-selector.h \
        src/ui/gui/psppire-spreadsheet-model.c \
        src/ui/gui/psppire-spreadsheet-model.h \
        src/ui/gui/psppire-syntax-window.c \
        src/ui/gui/psppire-syntax-window.h \
-       src/ui/gui/psppire-text-file.c \
-       src/ui/gui/psppire-text-file.h \
-       src/ui/gui/psppire-val-chooser.c \
-       src/ui/gui/psppire-val-chooser.h \
        src/ui/gui/psppire-value-entry.c \
        src/ui/gui/psppire-value-entry.h \
        src/ui/gui/psppire-variable-sheet.c \
        src/ui/gui/psppire-variable-sheet.h \
-       src/ui/gui/psppire-var-ptr.c \
-       src/ui/gui/psppire-var-ptr.h \
        src/ui/gui/psppire-var-sheet-header.c \
        src/ui/gui/psppire-var-sheet-header.h \
-       src/ui/gui/psppire-var-view.c \
-       src/ui/gui/psppire-var-view.h \
-       src/ui/gui/psppire-window-base.c \
-       src/ui/gui/psppire-window-base.h \
        src/ui/gui/psppire-window.c \
        src/ui/gui/psppire-window.h \
        src/ui/gui/psppire-window-register.c \
@@ -335,8 +339,6 @@ src_ui_gui_psppire_SOURCES = \
        src/ui/gui/var-type-dialog.h \
        src/ui/gui/widget-io.c \
        src/ui/gui/widget-io.h \
-       src/ui/gui/widgets.c \
-       src/ui/gui/widgets.h \
        src/ui/gui/windows-menu.c \
        src/ui/gui/windows-menu.h
 
@@ -427,3 +429,27 @@ include $(top_srcdir)/src/ui/gui/icons/automake.mk
 UNINSTALL_DATA_HOOKS += update-icon-cache
 INSTALL_DATA_HOOKS += update-icon-cache
 
+#############################################
+
+EXTRA_pkgdir = $(abs_builddir)/src/ui/gui
+
+EXTRA_pkg_LTLIBRARIES = src/ui/gui/libpsppire-glade.la
+
+src_ui_gui_libpsppire_glade_la_SOURCES = \
+       $(UI_WIDGETS_ESSENTIAL)  \
+       src/ui/gui/dummy.c
+
+src_ui_gui_libpsppire_glade_la_LIBADD = \
+       src/ui/gui/psppire-marshal.lo
+
+src_ui_gui_libpsppire_glade_la_CFLAGS = $(GTK_CFLAGS) $(GTKSOURCEVIEW_CFLAGS)
+src_ui_gui_libpsppire_glade_la_LDFLAGS = -release $(VERSION)
+
+EXTRA_DIST += src/ui/gui/psppire.xml src/ui/gui/glade-wrapper.in
+
+src/ui/gui/glade-wrapper: src/ui/gui/glade-wrapper.in
+       $(SED) -e 's%\@abs_top_srcdir\@%@abs_top_srcdir@%g' -e 's%\@abs_top_builddir\@%@abs_top_builddir@%g'  $< > $@
+       chmod a+x $@
+
+.PHONY: glade-tools
+glade-tools: src/ui/gui/glade-wrapper src/ui/gui/libpsppire-glade.la
diff --git a/src/ui/gui/dummy.c b/src/ui/gui/dummy.c
new file mode 100644 (file)
index 0000000..fa28d20
--- /dev/null
@@ -0,0 +1,47 @@
+/* PSPPIRE - a graphical user interface for PSPP.
+   Copyright (C) 2020  Free Software Foundation
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+
+/* This file exists merely to keep the dynamic linker happy when
+   trying to resolve symbols in the libpsppire-glade.so library
+   (used to define psppire's custom widgets in glade).  This
+   file should not be linked into any binary or library used by
+   pspp or psppire themsleves.  */
+
+
+#include <config.h>
+
+#include <gtk/gtk.h>
+
+#include "src/language/stats/chart-category.h"
+
+const GEnumValue align[1];
+const GEnumValue measure[1];
+const GEnumValue role[1];
+
+
+const int N_AG_FUNCS = 0;
+const struct ag_func ag_func[1];
+
+int F_8_0;
+
+int var_is_numeric () {}
+
+
+int tt_options_dialog_run () {}
+
+int agr_func_tab () {}
diff --git a/src/ui/gui/glade-wrapper.in b/src/ui/gui/glade-wrapper.in
new file mode 100644 (file)
index 0000000..0e175ae
--- /dev/null
@@ -0,0 +1,3 @@
+GLADE_CATALOG_SEARCH_PATH=@abs_top_srcdir@/src/ui/gui \
+GLADE_MODULE_SEARCH_PATH=@abs_top_builddir@/src/ui/gui/.libs \
+glade "$@"
diff --git a/src/ui/gui/psppire.xml b/src/ui/gui/psppire.xml
new file mode 100644 (file)
index 0000000..c0ca929
--- /dev/null
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<glade-catalog name="psppire" library="psppire-glade" depends="gtk+">
+  <!-- <init-function>my_catalog_init</init-function> -->
+
+  <glade-widget-classes>
+    <glade-widget-class name="PsppireDialog"    generic-name="dialog" title="Psppire Dialog"/>
+    <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-classes>
+
+  <glade-widget-group name="psppire" title="Psppire">
+    <glade-widget-class-ref name="PsppireDialog"/>
+    <glade-widget-class-ref name="PsppireDictView"/>
+    <glade-widget-class-ref name="PsppireVarView"/>
+    <glade-widget-class-ref name="PsppireSelector"/>
+  </glade-widget-group>
+
+</glade-catalog>