Added glade catalog.

diff --git a/Makefile.am b/Makefile.am
index 7135ed6e86ec45124e61e9fbe6c690f50e816364..406f43f5e590f9573891ed808a308f864c6a14a0 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,10 @@
-SUBDIRS = src tests
+if GLADEUI_FOUND
+SUBDIRS_GLADE = glade
+else
+SUBDIRS_GLADE =
+endif
+
+SUBDIRS = src tests $(SUBDIRS_GLADE)
 
 ACLOCAL_AMFLAGS = -I m4
 

diff --git a/autogen.sh b/autogen.sh
index 2bfbe7fd02803c469be28390838acad962373bed..83f5de2eff99d76076f1d617e180c5f07d309433 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -32,8 +32,10 @@ cd $olddir
 if [ "$NOCONFIGURE" = "" ]; then
         $srcdir/configure "$@" || exit 1
 
-        if [ "$1" = "--help" ]; then exit 0 else
-                echo "Now type \`make\' to compile $PKG_NAME" || exit 1
+        if [ "$1" = "--help" ]; then
+                       exit 0
+               else
+            echo "Now type \`make\' to compile $PKG_NAME" || exit 1
         fi
 else
         echo "Skipping configure process."

diff --git a/configure.ac b/configure.ac
index 266ad4e762e5111785a91098d0b805fdda28c311..562cf823584498a719cd427b41ffafcf9bfbcada 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -46,6 +46,10 @@ PKG_CHECK_MODULES(GTKMAPSERVER, [gtk+-3.0 >= 3
 AC_SUBST(GTKMAPSERVER_CFLAGS)
 AC_SUBST(GTKMAPSERVER_LIBS)
 
+PKG_CHECK_EXISTS(gladeui-2.0 >= 3.10.0, [GLADEUI_FOUND=yes], [GLADEUI_FOUND=no])
+
+AM_CONDITIONAL(GLADEUI_FOUND, test $GLADEUI_FOUND = yes)
+
 # Checks for header files.
 AC_HEADER_STDC
 
@@ -77,4 +81,17 @@ AC_CONFIG_FILES([
        src/Makefile
        tests/Makefile
 ])
+
+if test $GLADEUI_FOUND = yes; then
+AC_CONFIG_FILES([
+       glade/Makefile
+       glade/icons/Makefile
+       glade/icons/hicolor/Makefile
+       glade/icons/hicolor/16x16/Makefile
+       glade/icons/hicolor/16x16/actions/Makefile
+       glade/icons/hicolor/22x22/Makefile
+       glade/icons/hicolor/22x22/actions/Makefile
+])
+fi
+
 AC_OUTPUT

diff --git a/glade/Makefile.am b/glade/Makefile.am
new file mode 100644 (file)
index 0000000..becca9c
--- /dev/null
+++ b/glade/Makefile.am
@@ -0,0 +1,26 @@
+SUBDIRS = icons
+
+glademodulesdir = `pkg-config --variable=moduledir gladeui-2.0`
+
+gladecatalogsdir = `pkg-config --variable=catalogdir gladeui-2.0`
+
+gladecatalogs_DATA = gtkmapserver.xml
+
+EXTRA_DIST = $(gladecatalogs_DATA)
+
+if PLATFORM_WIN32
+libmodulesext = -0.dll
+libmodulesextglade = .dll
+libmodulesdir = $(bindir)
+else
+libmodulesext = .so
+libmodulesextglade = $(libmodulesext)
+libmodulesdir = $(libdir)
+endif
+
+install-exec-hook:
+       cd $(glademodulesdir) && \
+       ln -s -f $(libmodulesdir)/libgtkmapserver$(libmodulesext) libgtkmapserver$(libmodulesextglade)
+
+uninstall-hook:
+       rm -f $(glademodulesdir)/libgtkmapserver$(libmodulesext)

diff --git a/glade/gtkmapserver.xml b/glade/gtkmapserver.xml
new file mode 100644 (file)
index 0000000..0577eae
--- /dev/null
+++ b/glade/gtkmapserver.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<glade-catalog name="gtkmapserver" library="gtkmapserver" depends="gtk+" domain="gtkmapserver" book="gtkmapserver">
+
+       <glade-widget-classes>
+               <glade-widget-class name="GtkMapserver" generic-name="gtkmapserver" title="Mapserver">
+                       <properties>
+                               <!--<property name="Separator" id="separator" />-->
+                       </properties>
+               </glade-widget-class>
+       </glade-widget-classes>
+
+       <glade-widget-group name="gtk-control-display" title="Control and Display">
+               <glade-widget-class-ref name="GtkMapserver" />
+       </glade-widget-group>
+
+</glade-catalog>

diff --git a/glade/icons/Makefile.am b/glade/icons/Makefile.am
new file mode 100644 (file)
index 0000000..658356b
--- /dev/null
+++ b/glade/icons/Makefile.am
@@ -0,0 +1 @@
+SUBDIRS = hicolor

diff --git a/glade/icons/hicolor/16x16/Makefile.am b/glade/icons/hicolor/16x16/Makefile.am
new file mode 100644 (file)
index 0000000..0224d45
--- /dev/null
+++ b/glade/icons/hicolor/16x16/Makefile.am
@@ -0,0 +1 @@
+SUBDIRS = actions

diff --git a/glade/icons/hicolor/16x16/actions/Makefile.am b/glade/icons/hicolor/16x16/actions/Makefile.am
new file mode 100644 (file)
index 0000000..aa80902
--- /dev/null
+++ b/glade/icons/hicolor/16x16/actions/Makefile.am
@@ -0,0 +1,5 @@
+iconsdir = `pkg-config --variable=pixmapdir gladeui-2.0`/hicolor/16x16/actions
+
+icons_DATA = widget-gtkmapserver-gtkmapserver.png
+
+EXTRA_DIST = $(icons_DATA)

diff --git a/glade/icons/hicolor/16x16/actions/widget-gtkmapserver-gtkmapserver.png b/glade/icons/hicolor/16x16/actions/widget-gtkmapserver-gtkmapserver.png
new file mode 100644 (file)
index 0000000..53e2360
Binary files /dev/null and b/glade/icons/hicolor/16x16/actions/widget-gtkmapserver-gtkmapserver.png differ

diff --git a/glade/icons/hicolor/22x22/Makefile.am b/glade/icons/hicolor/22x22/Makefile.am
new file mode 100644 (file)
index 0000000..0224d45
--- /dev/null
+++ b/glade/icons/hicolor/22x22/Makefile.am
@@ -0,0 +1 @@
+SUBDIRS = actions

diff --git a/glade/icons/hicolor/22x22/actions/Makefile.am b/glade/icons/hicolor/22x22/actions/Makefile.am
new file mode 100644 (file)
index 0000000..9e270b0
--- /dev/null
+++ b/glade/icons/hicolor/22x22/actions/Makefile.am
@@ -0,0 +1,5 @@
+iconsdir = `pkg-config --variable=pixmapdir gladeui-2.0`/hicolor/22x22/actions
+
+icons_DATA = widget-gtkmapserver-gtkmapserver.png
+
+EXTRA_DIST = $(icons_DATA)

diff --git a/glade/icons/hicolor/22x22/actions/widget-gtkmapserver-gtkmapserver.png b/glade/icons/hicolor/22x22/actions/widget-gtkmapserver-gtkmapserver.png
new file mode 100644 (file)
index 0000000..78da171
Binary files /dev/null and b/glade/icons/hicolor/22x22/actions/widget-gtkmapserver-gtkmapserver.png differ

diff --git a/glade/icons/hicolor/Makefile.am b/glade/icons/hicolor/Makefile.am
new file mode 100644 (file)
index 0000000..fc1d169
--- /dev/null
+++ b/glade/icons/hicolor/Makefile.am
@@ -0,0 +1 @@
+SUBDIRS = 16x16 22x22