Many adjustments to integrate with new glade catalog format.

diff --git a/Makefile.am b/Makefile.am
index 06028c1cb46bbe045011a2242228ab4d4ba6c510..a07041849a225a0e46d9077889ed74aad5321c43 100644 (file)
--- 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 6299df3fcb3516267c2485a4c5ec328cdaa61e74..de26c58654353e0dfac9181446bab22246205cef 100644 (file)
--- 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 b060f65cd3b7f36839fa71eafde1bf6ab3498aec..5ea4575bb362d3b8faebcb8be48a980386752cf0 100644 (file)
--- a/docs/reference/gtkdateentry-decl-list.txt
+++ b/docs/reference/gtkdateentry-decl-list.txt
@@ -1,11 +1,12 @@
 <SECTION>
 <FILE>gtkdateentry</FILE>
+<TITLE>GtkDateEntry</TITLE>
 GTK_TYPE_DATE_ENTRY
 GTK_DATE_ENTRY
 GTK_DATE_ENTRY_CLASS
 GTK_DATE_ENTRY_GET_CLASS
-<TITLE>GtkDateEntry</TITLE>
 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 b34e66de6b1c1c55e1159a4504cefe03e528a100..a5958a2fef68ba73bc4405878b5b832affb6b990 100644 (file)
--- a/docs/reference/gtkdateentry-decl.txt
+++ b/docs/reference/gtkdateentry-decl.txt
@@ -45,75 +45,75 @@ struct _GtkDateEntryClass
 <FUNCTION>
 <NAME>gtk_date_entry_get_type</NAME>
 <RETURNS>GType </RETURNS>
-void
+void 
 </FUNCTION>
 <FUNCTION>
 <NAME>gtk_date_entry_new</NAME>
 <RETURNS>GtkWidget *</RETURNS>
-const gchar *format,const gchar separator,gboolean calendar_button_is_visible
+const gchar *format, const gchar separator, gboolean calendar_button_is_visible 
 </FUNCTION>
 <FUNCTION>
 <NAME>gtk_date_entry_set_separator</NAME>
 <RETURNS>void </RETURNS>
-GtkDateEntry *date,const gchar separator
+GtkDateEntry *date, const gchar separator 
 </FUNCTION>
 <FUNCTION>
 <NAME>gtk_date_entry_set_format</NAME>
 <RETURNS>gboolean </RETURNS>
-GtkDateEntry *date,const gchar *format
+GtkDateEntry *date, const gchar *format 
 </FUNCTION>
 <FUNCTION>
 <NAME>gtk_date_entry_get_text</NAME>
 <RETURNS>const gchar *</RETURNS>
-GtkDateEntry *date
+GtkDateEntry *date 
 </FUNCTION>
 <FUNCTION>
 <NAME>gtk_date_entry_get_strf</NAME>
 <RETURNS>const gchar *</RETURNS>
-GtkDateEntry *date,const gchar *format,gchar separator
+GtkDateEntry *date, const gchar *format, gchar separator 
 </FUNCTION>
 <FUNCTION>
 <NAME>gtk_date_entry_get_tm</NAME>
 <RETURNS>struct tm *</RETURNS>
-GtkDateEntry *date
+GtkDateEntry *date 
 </FUNCTION>
 <FUNCTION>
 <NAME>gtk_date_entry_get_gdate</NAME>
 <RETURNS>GDate *</RETURNS>
-GtkDateEntry *date
+GtkDateEntry *date 
 </FUNCTION>
 <FUNCTION>
 <NAME>gtk_date_entry_set_date_strf</NAME>
 <RETURNS>gboolean </RETURNS>
-GtkDateEntry *date,const gchar *str,const gchar *format,const gchar separator
+GtkDateEntry *date, const gchar *str, const gchar *format, const gchar separator 
 </FUNCTION>
 <FUNCTION>
 <NAME>gtk_date_entry_set_date_tm</NAME>
 <RETURNS>void </RETURNS>
-GtkDateEntry *date,const struct tm tmdate
+GtkDateEntry *date, const struct tm tmdate 
 </FUNCTION>
 <FUNCTION>
 <NAME>gtk_date_entry_set_date_gdate</NAME>
 <RETURNS>void </RETURNS>
-GtkDateEntry *date,const GDate *gdate
+GtkDateEntry *date, const GDate *gdate 
 </FUNCTION>
 <FUNCTION>
 <NAME>gtk_date_entry_is_valid</NAME>
 <RETURNS>gboolean </RETURNS>
-GtkDateEntry *date
+GtkDateEntry *date 
 </FUNCTION>
 <FUNCTION>
 <NAME>gtk_date_entry_set_editable</NAME>
 <RETURNS>void </RETURNS>
-GtkDateEntry *date,gboolean is_editable
+GtkDateEntry *date, gboolean is_editable 
 </FUNCTION>
 <FUNCTION>
 <NAME>gtk_date_entry_set_editable_with_calendar</NAME>
 <RETURNS>void </RETURNS>
-GtkDateEntry *date,gboolean is_editable_with_calendar
+GtkDateEntry *date, gboolean is_editable_with_calendar 
 </FUNCTION>
 <FUNCTION>
 <NAME>gtk_date_entry_set_calendar_button_visible</NAME>
 <RETURNS>void </RETURNS>
-GtkDateEntry *date,gboolean is_visible
+GtkDateEntry *date, gboolean is_visible 
 </FUNCTION>

diff --git a/docs/reference/gtkdateentry-unused.txt b/docs/reference/gtkdateentry-unused.txt
index ccad406bf893ba3f0173c0419c7d16c31722280b..9646cae1ddec326b075c7f761b8c6518529f3890 100644 (file)
--- 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 71f971d1b06ff8b32b8db32b14c55476aed992fd..6ecc93e3ceab2edf51636ee5a75d1f4876d3f074 100644 (file)
--- 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 646042585dc75a19b5b78a3fd9575b7abf03eef8..5594d3d9a00fc573483a31805184c81a6bc8762a 100644 (file)
--- a/docs/reference/tmpl/gtkdateentry.sgml
+++ b/docs/reference/tmpl/gtkdateentry.sgml
@@ -17,6 +17,9 @@ A Gtk+ widget that simplifies date input.
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### STRUCT GtkDateEntry ##### -->
 <para>
 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 (file)
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 (file)
index 0000000..b263365
--- /dev/null
+++ b/glade/gtkdateentry.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<glade-catalog name="gtkdateentry" library="gtkdateentry" depends="gtk+" domain="gtkdateentry" book="gtkdatedentry">
+
+       <glade-widget-classes>
+               <glade-widget-class name="GtkDateEntry" generic-name="gtkdateentry" title="Date Entry">
+                       <properties>
+                               <property name="Editable with calendar" id="editable_with_calendar" />
+                       </properties>
+               </glade-widget-class>
+       </glade-widget-classes>
+  
+       <glade-widget-group name="gtk-control-display" title="Control and Display">
+               <glade-widget-class-ref name="GtkDateEntry" />
+       </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..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 (file)
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 (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..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 (file)
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 (file)
index 0000000..fc1d169
--- /dev/null
+++ b/glade/icons/hicolor/Makefile.am
@@ -0,0 +1 @@
+SUBDIRS = 16x16 22x22