Many adjustments to integrate with new glade catalog format.

diff --git a/Makefile.am b/Makefile.am
index 4729614e1d5cad1a58028a0b9ddda32d275e6140..4a18e59e9cba5ac2eac95499817658bfbe517790 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,10 +2,12 @@ ACLOCAL_AMFLAGS = -I m4
 
 DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc
 
-SUBDIRS = src tests docs
-if test "$(GLADEUI_FOUND)" = "yes"; then \
-       SUBDIRS = $(SUBDIRS) glade; \
-fi
+if GLADEUI_FOUND
+SUBDIRS_GLADE = glade
+else
+SUBDIRS_GLADE =
+endif
+SUBDIRS = src tests docs $(SUBDIRS_GLADE)
 
 EXTRA_DIST = libgtkmaskedentry.pc.in
 

diff --git a/configure.ac b/configure.ac
index e96e92cfd3871e94fcf6de797ebd0d92100ef514..38915cec80f2c98dc4a03faa6645eb90c50bd18d 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -35,6 +35,7 @@ PKG_CHECK_EXISTS(libgtkform >= 0.2.0, [LIBGTKFORM_FOUND=yes], [LIBGTKFORM_FOUND=
 AC_SUBST(GTK_CFLAGS)
 AC_SUBST(GTK_LIBS)
 
+AM_CONDITIONAL(GLADEUI_FOUND, test $GLADEUI_FOUND = yes)
 AM_CONDITIONAL(LIBGTKFORM_FOUND, test $LIBGTKFORM_FOUND = yes)
 
 if test $LIBGTKFORM_FOUND = yes; then
@@ -59,8 +60,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/gtkmaskedentry-decl-list.txt b/docs/reference/gtkmaskedentry-decl-list.txt
index 2fb0ba190ed48bfcff70e3ce85acc574637f60f9..807202484a834675e998e49a9ca39b04f0558a11 100644 (file)
--- a/docs/reference/gtkmaskedentry-decl-list.txt
+++ b/docs/reference/gtkmaskedentry-decl-list.txt
@@ -2,6 +2,7 @@
 <FILE>gtkmaskedentry</FILE>
 <TITLE>GtkMaskedEntry</TITLE>
 GtkMaskedEntry
+GtkMaskedEntryClass
 gtk_masked_entry_new
 gtk_masked_entry_new_with_mask
 gtk_masked_entry_set_mask
@@ -17,10 +18,30 @@ GTK_IS_MASKED_ENTRY_CLASS
 GTK_MASKED_ENTRY_GET_CLASS
 </SECTION>
 
+<SECTION>
+<FILE>gtkformwidgetmaskedentry</FILE>
+<TITLE>GtkFormWidgetMaskedEntry</TITLE>
+GtkFormWidgetMaskedEntry
+GtkFormWidgetMaskedEntryClass
+gtk_form_widget_masked_entry_new
+gtk_form_widget_masked_entry_get_value_stringify
+gtk_form_widget_masked_entry_set_value_stringify
+gtk_form_widget_masked_entry_set_editable
+<SUBSECTION Standard>
+GTK_FORM_WIDGET_MASKED_ENTRY
+GTK_FORM_IS_WIDGET_MASKED_ENTRY
+GTK_FORM_TYPE_WIDGET_MASKED_ENTRY
+gtk_form_widget_masked_entry_get_type
+GTK_FORM_WIDGET_MASKED_ENTRY_CLASS
+GTK_FORM_IS_WIDGET_MASKED_ENTRY_CLASS
+GTK_FORM_WIDGET_MASKED_ENTRY_GET_CLASS
+</SECTION>
+
 <SECTION>
 <FILE>gtkcellrenderermasked</FILE>
 <TITLE>GtkCellRendererMasked</TITLE>
 GtkCellRendererMasked
+GtkCellRendererMaskedClass
 gtk_cell_renderer_masked_new
 gtk_cell_renderer_masked_new_with_mask
 gtk_cell_renderer_masked_set_mask

diff --git a/docs/reference/gtkmaskedentry-decl.txt b/docs/reference/gtkmaskedentry-decl.txt
index 11c8a4f2b71028288d97c3abda0bef1bf8314205..1f77ab121a487b37bbc7a4be2e88cb3ee0d9c8d8 100644 (file)
--- a/docs/reference/gtkmaskedentry-decl.txt
+++ b/docs/reference/gtkmaskedentry-decl.txt
@@ -45,32 +45,101 @@ struct _GtkMaskedEntryClass
 <FUNCTION>
 <NAME>gtk_masked_entry_get_type</NAME>
 <RETURNS>GType </RETURNS>
-void
+void 
 </FUNCTION>
 <FUNCTION>
 <NAME>gtk_masked_entry_new</NAME>
 <RETURNS>GtkWidget *</RETURNS>
-void
+void 
 </FUNCTION>
 <FUNCTION>
 <NAME>gtk_masked_entry_new_with_mask</NAME>
 <RETURNS>GtkWidget *</RETURNS>
-const gchar *mask
+const gchar *mask 
 </FUNCTION>
 <FUNCTION>
 <NAME>gtk_masked_entry_set_mask</NAME>
 <RETURNS>void </RETURNS>
-GtkMaskedEntry *masked_entry,const gchar *mask
+GtkMaskedEntry *masked_entry, const gchar *mask 
 </FUNCTION>
 <FUNCTION>
 <NAME>gtk_masked_entry_get_mask</NAME>
 <RETURNS>G_CONST_RETURN gchar *</RETURNS>
-GtkMaskedEntry *masked_entry
+GtkMaskedEntry *masked_entry 
 </FUNCTION>
 <FUNCTION>
 <NAME>gtk_masked_entry_get_text</NAME>
 <RETURNS>G_CONST_RETURN gchar *</RETURNS>
-GtkMaskedEntry *masked_entry
+GtkMaskedEntry *masked_entry 
+</FUNCTION>
+<MACRO>
+<NAME>GTK_FORM_TYPE_WIDGET_MASKED_ENTRY</NAME>
+#define GTK_FORM_TYPE_WIDGET_MASKED_ENTRY                 (gtk_form_widget_masked_entry_get_type ())
+</MACRO>
+<MACRO>
+<NAME>GTK_FORM_WIDGET_MASKED_ENTRY</NAME>
+#define GTK_FORM_WIDGET_MASKED_ENTRY(obj)                 (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_FORM_TYPE_WIDGET_MASKED_ENTRY, GtkFormWidgetMaskedEntry))
+</MACRO>
+<MACRO>
+<NAME>GTK_FORM_WIDGET_MASKED_ENTRY_CLASS</NAME>
+#define GTK_FORM_WIDGET_MASKED_ENTRY_CLASS(klass)         (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_FORM_TYPE_WIDGET_MASKED_ENTRY, GtkFormWidgetMaskedEntryClass))
+</MACRO>
+<MACRO>
+<NAME>GTK_FORM_IS_WIDGET_MASKED_ENTRY</NAME>
+#define GTK_FORM_IS_WIDGET_MASKED_ENTRY(obj)              (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_FORM_TYPE_WIDGET_MASKED_ENTRY))
+</MACRO>
+<MACRO>
+<NAME>GTK_FORM_IS_WIDGET_MASKED_ENTRY_CLASS</NAME>
+#define GTK_FORM_IS_WIDGET_MASKED_ENTRY_CLASS(klass)      (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_FORM_TYPE_WIDGET_MASKED_ENTRY))
+</MACRO>
+<MACRO>
+<NAME>GTK_FORM_WIDGET_MASKED_ENTRY_GET_CLASS</NAME>
+#define GTK_FORM_WIDGET_MASKED_ENTRY_GET_CLASS(obj)       (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_FORM_TYPE_WIDGET_MASKED_ENTRY, GtkFormWidgetMaskedEntryClass))
+</MACRO>
+<STRUCT>
+<NAME>GtkFormWidgetMaskedEntry</NAME>
+</STRUCT>
+<STRUCT>
+<NAME>GtkFormWidgetMaskedEntryClass</NAME>
+</STRUCT>
+<STRUCT>
+<NAME>GtkFormWidgetMaskedEntry</NAME>
+struct _GtkFormWidgetMaskedEntry
+       {
+               GtkFormWidget parent;
+       };
+</STRUCT>
+<STRUCT>
+<NAME>GtkFormWidgetMaskedEntryClass</NAME>
+struct _GtkFormWidgetMaskedEntryClass
+       {
+               GtkFormWidgetClass parent_class;
+       };
+</STRUCT>
+<FUNCTION>
+<NAME>gtk_form_widget_masked_entry_get_type</NAME>
+<RETURNS>GType </RETURNS>
+void 
+</FUNCTION>
+<FUNCTION>
+<NAME>gtk_form_widget_masked_entry_new</NAME>
+<RETURNS>GtkFormWidget *</RETURNS>
+void 
+</FUNCTION>
+<FUNCTION>
+<NAME>gtk_form_widget_masked_entry_get_value_stringify</NAME>
+<RETURNS>gchar *</RETURNS>
+GtkFormWidget *widget 
+</FUNCTION>
+<FUNCTION>
+<NAME>gtk_form_widget_masked_entry_set_value_stringify</NAME>
+<RETURNS>gboolean </RETURNS>
+GtkFormWidget *fwidget, const gchar *value 
+</FUNCTION>
+<FUNCTION>
+<NAME>gtk_form_widget_masked_entry_set_editable</NAME>
+<RETURNS>void </RETURNS>
+GtkFormWidget *fwidget, gboolean editable 
 </FUNCTION>
 <MACRO>
 <NAME>GTK_TYPE_CELL_RENDERER_MASKED</NAME>
@@ -119,20 +188,20 @@ struct _GtkCellRendererMaskedClass
 <FUNCTION>
 <NAME>gtk_cell_renderer_masked_get_type</NAME>
 <RETURNS>GType </RETURNS>
-void
+void 
 </FUNCTION>
 <FUNCTION>
 <NAME>gtk_cell_renderer_masked_new</NAME>
 <RETURNS>GtkCellRenderer *</RETURNS>
-void
+void 
 </FUNCTION>
 <FUNCTION>
 <NAME>gtk_cell_renderer_masked_new_with_mask</NAME>
 <RETURNS>GtkCellRenderer *</RETURNS>
-const gchar *mask
+const gchar *mask 
 </FUNCTION>
 <FUNCTION>
 <NAME>gtk_cell_renderer_masked_set_mask</NAME>
 <RETURNS>void </RETURNS>
-GtkCellRendererMasked *renderer, const gchar *mask
+GtkCellRendererMasked *renderer, const gchar *mask 
 </FUNCTION>

diff --git a/docs/reference/tmpl/gtkcellrenderermasked.sgml b/docs/reference/tmpl/gtkcellrenderermasked.sgml
index d4c9a5a7f1f1113d3c4b3bcbcc0e64dd14ae7616..e6ff53344941d74c38890bd12f2705f4e8607460 100644 (file)
--- a/docs/reference/tmpl/gtkcellrenderermasked.sgml
+++ b/docs/reference/tmpl/gtkcellrenderermasked.sgml
@@ -17,6 +17,9 @@ GtkCellRendererMasked
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### STRUCT GtkCellRendererMasked ##### -->
 <para>
 
@@ -33,6 +36,7 @@ GtkCellRendererMasked
 
 </para>
 
+@void: 
 @Returns: 
 
 

diff --git a/docs/reference/tmpl/gtkmaskedentry.sgml b/docs/reference/tmpl/gtkmaskedentry.sgml
index 8b10f8f303e9cd4b4afb25edb2b6914a59df6c71..e7837482618d9fe2a9c6baef76639dc11f8a15da 100644 (file)
--- a/docs/reference/tmpl/gtkmaskedentry.sgml
+++ b/docs/reference/tmpl/gtkmaskedentry.sgml
@@ -17,6 +17,9 @@ GtkMaskedEntry
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### STRUCT GtkMaskedEntry ##### -->
 <para>
 
@@ -38,6 +41,7 @@ GtkMaskedEntry
 
 </para>
 
+@void: 
 @Returns: 
 
 

diff --git a/glade/Makefile.am b/glade/Makefile.am
index d07671a2be547e9f8a70f38764134b385f86a035..681c2424b260acbf4ba74ae23092a91c84771920 100644 (file)
--- a/glade/Makefile.am
+++ b/glade/Makefile.am
@@ -10,7 +10,7 @@ EXTRA_DIST = $(catalogs_DATA)
 
 install-exec-hook:
        cd $(moduledir) && \
-       ln -s $(libdir)/libgtkmaskedentry.so .
+       ln -s -f $(libdir)/libgtkmaskedentry.so .
 
 uninstall-hook:
        rm -f $(moduledir)/libgtkmaskedentry.so

diff --git a/glade/icons/16x16/Makefile.am b/glade/icons/16x16/Makefile.am
deleted file mode 100644 (file)
index 7f99eb1..0000000
--- a/glade/icons/16x16/Makefile.am
+++ /dev/null
@@ -1,5 +0,0 @@
-iconsdir = `pkg-config --variable=pixmapdir gladeui-1.0`/16x16
-
-icons_DATA = gtkmaskedentry.png
-
-EXTRA_DIST = $(icons_DATA)

diff --git a/glade/icons/16x16/gtkmaskedentry.png b/glade/icons/16x16/gtkmaskedentry.png
deleted file mode 100644 (file)
index 53e2360..0000000
Binary files a/glade/icons/16x16/gtkmaskedentry.png and /dev/null differ

diff --git a/glade/icons/22x22/Makefile.am b/glade/icons/22x22/Makefile.am
deleted file mode 100644 (file)
index 2442c73..0000000
--- a/glade/icons/22x22/Makefile.am
+++ /dev/null
@@ -1,5 +0,0 @@
-iconsdir = `pkg-config --variable=pixmapdir gladeui-1.0`/22x22
-
-icons_DATA = gtkmaskedentry.png
-
-EXTRA_DIST = $(icons_DATA)

diff --git a/glade/icons/22x22/gtkmaskedentry.png b/glade/icons/22x22/gtkmaskedentry.png
deleted file mode 100644 (file)
index 78da171..0000000
Binary files a/glade/icons/22x22/gtkmaskedentry.png and /dev/null differ

diff --git a/glade/icons/Makefile.am b/glade/icons/Makefile.am
index fc1d169fdd474ce6ce96e5fdba1bd4f701ba3758..658356b20f95e68cc55e5d5d22f61bc2adfdcf5f 100644 (file)
--- a/glade/icons/Makefile.am
+++ b/glade/icons/Makefile.am
@@ -1 +1 @@
-SUBDIRS = 16x16 22x22
+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..a9ffc4d
--- /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-gtkmaskedentry-gtkmaskedentry.png
+
+EXTRA_DIST = $(icons_DATA)

diff --git a/glade/icons/hicolor/16x16/actions/widget-gtkmaskedentry-gtkmaskedentry.png b/glade/icons/hicolor/16x16/actions/widget-gtkmaskedentry-gtkmaskedentry.png
new file mode 100644 (file)
index 0000000..53e2360
Binary files /dev/null and b/glade/icons/hicolor/16x16/actions/widget-gtkmaskedentry-gtkmaskedentry.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..555d073
--- /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-gtkmaskedentry-gtkmaskedentry.png
+
+EXTRA_DIST = $(icons_DATA)

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