Added glade catalog/icons.

diff --git a/Makefile.am b/Makefile.am
index 91fe1d55cc2719b7be309acd11508d176f609d44..96568387693c7099b3bac4fcd2947cc968c3acb8 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = src tests
+SUBDIRS = glade src tests
 
 ACLOCAL_AMFLAGS = -I m4
 

diff --git a/configure.ac b/configure.ac
index aeaf6cf8a29e8b97ecfc7432b0cf1e09d490e291..48dee930cca2b23bc798c9dc57aea989f1d40a2f 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -39,6 +39,19 @@ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE",
 AM_GLIB_GNU_GETTEXT
 
 # Checks for libraries.
+PKG_CHECK_EXISTS(gladeui-2.0 >= 3.14.0, [GLADEUI_FOUND=yes], [GLADEUI_FOUND=no])
+
+if test "x$GLADEUI_FOUND" = "xyes"; then
+       GLADE_CATALOG_DIR=`$PKG_CONFIG --variable=catalogdir gladeui-2.0`
+       GLADE_MODULE_DIR=`$PKG_CONFIG --variable=moduledir gladeui-2.0`
+       GLADE_ICONS_DIR=`$PKG_CONFIG --variable=pixmapdir gladeui-2.0`
+       AC_SUBST(GLADE_CATALOG_DIR)
+       AC_SUBST(GLADE_MODULE_DIR)
+       AC_SUBST(GLADE_ICONS_DIR)
+fi
+
+AM_CONDITIONAL(GLADEUI, test $GLADEUI_FOUND = yes)
+
 PKG_CHECK_MODULES(ZAKGTKDECODER, [gtk+-3.0])
 
 AC_SUBST(ZAKGTKDECODER_CFLAGS)
@@ -75,4 +88,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..5988ae3
--- /dev/null
+++ b/glade/Makefile.am
@@ -0,0 +1,26 @@
+SUBDIRS = icons
+
+glademodulesdir = $(GLADE_MODULE_DIR)
+
+gladecatalogsdir = $(GLADE_CATALOG_DIR)
+
+gladecatalogs_DATA = zakgtkdecoder.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)/libzakgtkdecoder$(libmodulesext) libzakgtkdecoder$(libmodulesextglade)
+
+uninstall-hook:
+       rm -f $(glademodulesdir)/libzakgtkdecoder$(libmodulesextglade)

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..afe00b9
--- /dev/null
+++ b/glade/icons/hicolor/16x16/actions/Makefile.am
@@ -0,0 +1,6 @@
+gladeiconsdir = $(GLADE_ICONS_DIR)
+iconsdir = $(gladeiconsdir)/hicolor/16x16/actions
+
+icons_DATA = widget-zakgtkdecoder-decoder.png
+
+EXTRA_DIST = $(icons_DATA)

diff --git a/glade/icons/hicolor/16x16/actions/widget-zakgtkdecoder-decoder.png b/glade/icons/hicolor/16x16/actions/widget-zakgtkdecoder-decoder.png
new file mode 100644 (file)
index 0000000..9796233
Binary files /dev/null and b/glade/icons/hicolor/16x16/actions/widget-zakgtkdecoder-decoder.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..3a3537e
--- /dev/null
+++ b/glade/icons/hicolor/22x22/actions/Makefile.am
@@ -0,0 +1,6 @@
+gladeiconsdir = $(GLADE_ICONS_DIR)
+iconsdir = $(gladeiconsdir)/hicolor/22x22/actions
+
+icons_DATA = widget-zakgtkdecoder-decoder.png
+
+EXTRA_DIST = $(icons_DATA)

diff --git a/glade/icons/hicolor/22x22/actions/widget-zakgtkdecoder-decoder.png b/glade/icons/hicolor/22x22/actions/widget-zakgtkdecoder-decoder.png
new file mode 100644 (file)
index 0000000..d26591a
Binary files /dev/null and b/glade/icons/hicolor/22x22/actions/widget-zakgtkdecoder-decoder.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

diff --git a/glade/zakgtkdecoder.xml b/glade/zakgtkdecoder.xml
new file mode 100644 (file)
index 0000000..0fb0d73
--- /dev/null
+++ b/glade/zakgtkdecoder.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<glade-catalog name="zakgtkdecoder" library="zakgtkdecoder" depends="gtk+" domain="zakgtkdecoder" book="zakgtkdecoder">
+
+       <glade-widget-classes>
+               <glade-widget-class name="ZakGtkDecoder" generic-name="zakgtkdecoder" title="Decoder">
+                       <properties>
+                               <property name="Show clean icon" id="show-btn-clean" />
+                               <property name="Show new button" id="show-btn-new" />
+                               <property name="Show open button" id="show-btn-open" />
+                               <property name="Show browse button" id="show-btn-browse" />
+                       </properties>
+               </glade-widget-class>
+       </glade-widget-classes>
+
+       <glade-widget-group name="gtk-control-display" title="Control and Display">
+               <glade-widget-class-ref name="ZakGtkDecoder" />
+       </glade-widget-group>
+
+</glade-catalog>