From: Andrea Zagli Date: Sun, 27 Jun 2010 09:13:17 +0000 (+0200) Subject: Many adjustments to integrate with new glade catalog format. X-Git-Tag: 0.0.3~7 X-Git-Url: https://saetta.ns0.it/gitweb?a=commitdiff_plain;h=2a1860917d6d0cb9bbb3eb00968db9eb112967ea;p=libgtkdateentry Many adjustments to integrate with new glade catalog format. --- diff --git a/Makefile.am b/Makefile.am index 06028c1..a070418 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,14 +1,19 @@ ACLOCAL_AMFLAGS = -I m4 -SUBDIRS = src tests docs +DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc + +if GLADEUI +SUBDIRS_GLADE = glade +else +SUBDIRS_GLADE = +endif +SUBDIRS = src tests docs $(SUBDIRS_GLADE) EXTRA_DIST = libgtkdateentry.pc.in pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = libgtkdateentry.pc -DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc - distclean-local: if test "$(srcdir)" = "."; then :; else \ rm -f ChangeLog; \ diff --git a/configure.ac b/configure.ac index 6299df3..de26c58 100644 --- a/configure.ac +++ b/configure.ac @@ -33,6 +33,8 @@ PKG_CHECK_MODULES(GTKDATEENTRY, [gtk+-2.0 >= 2.6.8 libgtkmaskedentry >= 0.0.1]) PKG_CHECK_EXISTS(gladeui-1.0 >= 3.2.0, [GLADEUI_FOUND=yes], [GLADEUI_FOUND=no]) +AM_CONDITIONAL(GLADEUI, test $GLADEUI_FOUND = yes) + AC_SUBST(GTKDATEENTRY_CFLAGS) AC_SUBST(GTKDATEENTRY_LIBS) @@ -51,8 +53,11 @@ if test $GLADEUI_FOUND = yes; then AC_CONFIG_FILES([ glade/Makefile glade/icons/Makefile - glade/icons/16x16/Makefile - glade/icons/22x22/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 diff --git a/docs/reference/gtkdateentry-decl-list.txt b/docs/reference/gtkdateentry-decl-list.txt index b060f65..5ea4575 100644 --- a/docs/reference/gtkdateentry-decl-list.txt +++ b/docs/reference/gtkdateentry-decl-list.txt @@ -1,11 +1,12 @@
gtkdateentry +GtkDateEntry GTK_TYPE_DATE_ENTRY GTK_DATE_ENTRY GTK_DATE_ENTRY_CLASS GTK_DATE_ENTRY_GET_CLASS -GtkDateEntry GtkDateEntry +GtkDateEntryClass gtk_date_entry_new gtk_date_entry_set_separator gtk_date_entry_set_format diff --git a/docs/reference/gtkdateentry-decl.txt b/docs/reference/gtkdateentry-decl.txt index b34e66d..a5958a2 100644 --- a/docs/reference/gtkdateentry-decl.txt +++ b/docs/reference/gtkdateentry-decl.txt @@ -45,75 +45,75 @@ struct _GtkDateEntryClass gtk_date_entry_get_type GType -void +void gtk_date_entry_new GtkWidget * -const gchar *format,const gchar separator,gboolean calendar_button_is_visible +const gchar *format, const gchar separator, gboolean calendar_button_is_visible gtk_date_entry_set_separator void -GtkDateEntry *date,const gchar separator +GtkDateEntry *date, const gchar separator gtk_date_entry_set_format gboolean -GtkDateEntry *date,const gchar *format +GtkDateEntry *date, const gchar *format gtk_date_entry_get_text const gchar * -GtkDateEntry *date +GtkDateEntry *date gtk_date_entry_get_strf const gchar * -GtkDateEntry *date,const gchar *format,gchar separator +GtkDateEntry *date, const gchar *format, gchar separator gtk_date_entry_get_tm struct tm * -GtkDateEntry *date +GtkDateEntry *date gtk_date_entry_get_gdate GDate * -GtkDateEntry *date +GtkDateEntry *date gtk_date_entry_set_date_strf gboolean -GtkDateEntry *date,const gchar *str,const gchar *format,const gchar separator +GtkDateEntry *date, const gchar *str, const gchar *format, const gchar separator gtk_date_entry_set_date_tm void -GtkDateEntry *date,const struct tm tmdate +GtkDateEntry *date, const struct tm tmdate gtk_date_entry_set_date_gdate void -GtkDateEntry *date,const GDate *gdate +GtkDateEntry *date, const GDate *gdate gtk_date_entry_is_valid gboolean -GtkDateEntry *date +GtkDateEntry *date gtk_date_entry_set_editable void -GtkDateEntry *date,gboolean is_editable +GtkDateEntry *date, gboolean is_editable gtk_date_entry_set_editable_with_calendar void -GtkDateEntry *date,gboolean is_editable_with_calendar +GtkDateEntry *date, gboolean is_editable_with_calendar gtk_date_entry_set_calendar_button_visible void -GtkDateEntry *date,gboolean is_visible +GtkDateEntry *date, gboolean is_visible diff --git a/docs/reference/gtkdateentry-unused.txt b/docs/reference/gtkdateentry-unused.txt index ccad406..9646cae 100644 --- a/docs/reference/gtkdateentry-unused.txt +++ b/docs/reference/gtkdateentry-unused.txt @@ -1,4 +1,3 @@ -GtkDateEntryClass gtk_date_entry_get_gdate gtk_date_entry_get_tm gtk_date_entry_is_valid diff --git a/docs/reference/gtkdateentry.interfaces b/docs/reference/gtkdateentry.interfaces index 71f971d..6ecc93e 100644 --- a/docs/reference/gtkdateentry.interfaces +++ b/docs/reference/gtkdateentry.interfaces @@ -1,5 +1,5 @@ -GtkWidget GtkBuildable AtkImplementorIface -GtkContainer GtkBuildable AtkImplementorIface -GtkBox GtkBuildable GtkOrientable AtkImplementorIface -GtkHBox GtkBuildable GtkOrientable AtkImplementorIface -GtkDateEntry GtkBuildable GtkOrientable AtkImplementorIface +GtkWidget AtkImplementorIface GtkBuildable +GtkContainer AtkImplementorIface GtkBuildable +GtkBox AtkImplementorIface GtkBuildable GtkOrientable +GtkHBox AtkImplementorIface GtkBuildable GtkOrientable +GtkDateEntry AtkImplementorIface GtkBuildable GtkOrientable diff --git a/docs/reference/tmpl/gtkdateentry.sgml b/docs/reference/tmpl/gtkdateentry.sgml index 6460425..5594d3d 100644 --- a/docs/reference/tmpl/gtkdateentry.sgml +++ b/docs/reference/tmpl/gtkdateentry.sgml @@ -17,6 +17,9 @@ A Gtk+ widget that simplifies date input. + + + The #GtkDateEntry struct contains private data only, and should be manipulated diff --git a/glade/Makefile.am b/glade/Makefile.am new file mode 100644 index 0000000..adec8b7 --- /dev/null +++ b/glade/Makefile.am @@ -0,0 +1,16 @@ +SUBDIRS = icons + +moduledir = `pkg-config --variable=moduledir gladeui-1.0` + +catalogsdir = `pkg-config --variable=catalogdir gladeui-1.0` + +catalogs_DATA = gtkdateentry.xml + +EXTRA_DIST = $(catalogs_DATA) + +install-exec-hook: + cd $(moduledir) && \ + ln -s -f $(libdir)/libgtkdateentry.so . + +uninstall-hook: + rm -f $(moduledir)/libgtkdateentry.so diff --git a/glade/gtkdateentry.xml b/glade/gtkdateentry.xml new file mode 100644 index 0000000..b263365 --- /dev/null +++ b/glade/gtkdateentry.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + 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..2105dcd --- /dev/null +++ b/glade/icons/hicolor/16x16/actions/Makefile.am @@ -0,0 +1,5 @@ +iconsdir = `pkg-config --variable=pixmapdir gladeui-1.0`/hicolor/16x16/actions + +icons_DATA = widget-gtkdateentry-gtkdateentry.png + +EXTRA_DIST = $(icons_DATA) diff --git a/glade/icons/hicolor/16x16/actions/widget-gtkdateentry-gtkdateentry.png b/glade/icons/hicolor/16x16/actions/widget-gtkdateentry-gtkdateentry.png new file mode 100644 index 0000000..53e2360 Binary files /dev/null and b/glade/icons/hicolor/16x16/actions/widget-gtkdateentry-gtkdateentry.png differ diff --git a/glade/icons/hicolor/22x22/Makefile.am b/glade/icons/hicolor/22x22/Makefile.am new file mode 100644 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 index 0000000..e49eb8d --- /dev/null +++ b/glade/icons/hicolor/22x22/actions/Makefile.am @@ -0,0 +1,5 @@ +iconsdir = `pkg-config --variable=pixmapdir gladeui-1.0`/hicolor/22x22/actions + +icons_DATA = widget-gtkdateentry-gtkdateentry.png + +EXTRA_DIST = $(icons_DATA) diff --git a/glade/icons/hicolor/22x22/actions/widget-gtkdateentry-gtkdateentry.png b/glade/icons/hicolor/22x22/actions/widget-gtkdateentry-gtkdateentry.png new file mode 100644 index 0000000..78da171 Binary files /dev/null and b/glade/icons/hicolor/22x22/actions/widget-gtkdateentry-gtkdateentry.png differ 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