From 817dec7871df8a5de4441133a6b60f94535ecb2e Mon Sep 17 00:00:00 2001 From: Andrea Zagli Date: Sat, 19 Dec 2015 13:17:43 +0100 Subject: [PATCH] Added glade catalog/icons. --- Makefile.am | 2 +- configure.ac | 26 ++++++++++++++++++ glade/Makefile.am | 26 ++++++++++++++++++ glade/icons/Makefile.am | 1 + glade/icons/hicolor/16x16/Makefile.am | 1 + glade/icons/hicolor/16x16/actions/Makefile.am | 6 ++++ .../actions/widget-zakgtkdecoder-decoder.png | Bin 0 -> 225 bytes glade/icons/hicolor/22x22/Makefile.am | 1 + glade/icons/hicolor/22x22/actions/Makefile.am | 6 ++++ .../actions/widget-zakgtkdecoder-decoder.png | Bin 0 -> 258 bytes glade/icons/hicolor/Makefile.am | 1 + glade/zakgtkdecoder.xml | 19 +++++++++++++ 12 files changed, 88 insertions(+), 1 deletion(-) create mode 100644 glade/Makefile.am create mode 100644 glade/icons/Makefile.am create mode 100644 glade/icons/hicolor/16x16/Makefile.am create mode 100644 glade/icons/hicolor/16x16/actions/Makefile.am create mode 100644 glade/icons/hicolor/16x16/actions/widget-zakgtkdecoder-decoder.png create mode 100644 glade/icons/hicolor/22x22/Makefile.am create mode 100644 glade/icons/hicolor/22x22/actions/Makefile.am create mode 100644 glade/icons/hicolor/22x22/actions/widget-zakgtkdecoder-decoder.png create mode 100644 glade/icons/hicolor/Makefile.am create mode 100644 glade/zakgtkdecoder.xml diff --git a/Makefile.am b/Makefile.am index 91fe1d5..9656838 100644 --- 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 aeaf6cf..48dee93 100644 --- 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 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 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 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 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 index 0000000000000000000000000000000000000000..9796233187884bf4dd8cfdaf861354ff82c914eb GIT binary patch literal 225 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|*pj^6U4S$Y z{B+)352QE?JR*x37`TN&n2}-D90{Nxdx@v7EBkF$Ms_KIoFzfYK%qoW7sn8b({Cs3 z=4~+Gahb1Nw#UaIt%=ttrAVZMPwAs(W$)~A_0vXw_Nb|xJz!MewYGHc2d+srPLmpg z{U=?%d^I|o;f`Jhhf>qM-YsIMg+{WgSq5qyw{~xmF2$}d8ENqw;1+Eak-ar*6~ zi<}1(1e_O_v8HzmUy&EjGB4OR+i`vTUjdz`8edMc3k3+DQ`ivkr%ib$vjxw*m~7kl z8cCI_OrER^leCmBy9WKeuHG)N?6>oVRkNJu+uRP=QM~NIwOfyG8Wg_28{^tjxXO9M v_iv|MQ&veg%n358-5%|&dHnR;qmTIYj(p8wyx`;*26DEitDnm{r-UW|m26ng literal 0 HcmV?d00001 diff --git a/glade/icons/hicolor/Makefile.am b/glade/icons/hicolor/Makefile.am new file mode 100644 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 index 0000000..0fb0d73 --- /dev/null +++ b/glade/zakgtkdecoder.xml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + -- 2.49.0