From: Andrea Zagli Date: Sun, 27 Jun 2010 09:18:58 +0000 (+0200) Subject: Many adjustments to integrate with new glade catalog format. X-Git-Tag: v0.0.3~8 X-Git-Url: https://saetta.ns0.it/gitweb?a=commitdiff_plain;h=166f8b88d863541405b6c014d2c9de2436cd6f19;p=libgtkmaskedentry Many adjustments to integrate with new glade catalog format. --- diff --git a/Makefile.am b/Makefile.am index 4729614..4a18e59 100644 --- 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 e96e92c..38915ce 100644 --- 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 2fb0ba1..8072024 100644 --- a/docs/reference/gtkmaskedentry-decl-list.txt +++ b/docs/reference/gtkmaskedentry-decl-list.txt @@ -2,6 +2,7 @@ gtkmaskedentry GtkMaskedEntry 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 +
+gtkformwidgetmaskedentry +GtkFormWidgetMaskedEntry +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 + +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 +
+
gtkcellrenderermasked GtkCellRendererMasked 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 11c8a4f..1f77ab1 100644 --- a/docs/reference/gtkmaskedentry-decl.txt +++ b/docs/reference/gtkmaskedentry-decl.txt @@ -45,32 +45,101 @@ struct _GtkMaskedEntryClass gtk_masked_entry_get_type GType -void +void gtk_masked_entry_new GtkWidget * -void +void gtk_masked_entry_new_with_mask GtkWidget * -const gchar *mask +const gchar *mask gtk_masked_entry_set_mask void -GtkMaskedEntry *masked_entry,const gchar *mask +GtkMaskedEntry *masked_entry, const gchar *mask gtk_masked_entry_get_mask G_CONST_RETURN gchar * -GtkMaskedEntry *masked_entry +GtkMaskedEntry *masked_entry gtk_masked_entry_get_text G_CONST_RETURN gchar * -GtkMaskedEntry *masked_entry +GtkMaskedEntry *masked_entry + + +GTK_FORM_TYPE_WIDGET_MASKED_ENTRY +#define GTK_FORM_TYPE_WIDGET_MASKED_ENTRY (gtk_form_widget_masked_entry_get_type ()) + + +GTK_FORM_WIDGET_MASKED_ENTRY +#define GTK_FORM_WIDGET_MASKED_ENTRY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_FORM_TYPE_WIDGET_MASKED_ENTRY, GtkFormWidgetMaskedEntry)) + + +GTK_FORM_WIDGET_MASKED_ENTRY_CLASS +#define GTK_FORM_WIDGET_MASKED_ENTRY_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_FORM_TYPE_WIDGET_MASKED_ENTRY, GtkFormWidgetMaskedEntryClass)) + + +GTK_FORM_IS_WIDGET_MASKED_ENTRY +#define GTK_FORM_IS_WIDGET_MASKED_ENTRY(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_FORM_TYPE_WIDGET_MASKED_ENTRY)) + + +GTK_FORM_IS_WIDGET_MASKED_ENTRY_CLASS +#define GTK_FORM_IS_WIDGET_MASKED_ENTRY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_FORM_TYPE_WIDGET_MASKED_ENTRY)) + + +GTK_FORM_WIDGET_MASKED_ENTRY_GET_CLASS +#define GTK_FORM_WIDGET_MASKED_ENTRY_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_FORM_TYPE_WIDGET_MASKED_ENTRY, GtkFormWidgetMaskedEntryClass)) + + +GtkFormWidgetMaskedEntry + + +GtkFormWidgetMaskedEntryClass + + +GtkFormWidgetMaskedEntry +struct _GtkFormWidgetMaskedEntry + { + GtkFormWidget parent; + }; + + +GtkFormWidgetMaskedEntryClass +struct _GtkFormWidgetMaskedEntryClass + { + GtkFormWidgetClass parent_class; + }; + + +gtk_form_widget_masked_entry_get_type +GType +void + + +gtk_form_widget_masked_entry_new +GtkFormWidget * +void + + +gtk_form_widget_masked_entry_get_value_stringify +gchar * +GtkFormWidget *widget + + +gtk_form_widget_masked_entry_set_value_stringify +gboolean +GtkFormWidget *fwidget, const gchar *value + + +gtk_form_widget_masked_entry_set_editable +void +GtkFormWidget *fwidget, gboolean editable GTK_TYPE_CELL_RENDERER_MASKED @@ -119,20 +188,20 @@ struct _GtkCellRendererMaskedClass gtk_cell_renderer_masked_get_type GType -void +void gtk_cell_renderer_masked_new GtkCellRenderer * -void +void gtk_cell_renderer_masked_new_with_mask GtkCellRenderer * -const gchar *mask +const gchar *mask gtk_cell_renderer_masked_set_mask void -GtkCellRendererMasked *renderer, const gchar *mask +GtkCellRendererMasked *renderer, const gchar *mask diff --git a/docs/reference/tmpl/gtkcellrenderermasked.sgml b/docs/reference/tmpl/gtkcellrenderermasked.sgml index d4c9a5a..e6ff533 100644 --- a/docs/reference/tmpl/gtkcellrenderermasked.sgml +++ b/docs/reference/tmpl/gtkcellrenderermasked.sgml @@ -17,6 +17,9 @@ GtkCellRendererMasked + + + @@ -33,6 +36,7 @@ GtkCellRendererMasked +@void: @Returns: diff --git a/docs/reference/tmpl/gtkmaskedentry.sgml b/docs/reference/tmpl/gtkmaskedentry.sgml index 8b10f8f..e783748 100644 --- a/docs/reference/tmpl/gtkmaskedentry.sgml +++ b/docs/reference/tmpl/gtkmaskedentry.sgml @@ -17,6 +17,9 @@ GtkMaskedEntry + + + @@ -38,6 +41,7 @@ GtkMaskedEntry +@void: @Returns: diff --git a/glade/Makefile.am b/glade/Makefile.am index d07671a..681c242 100644 --- 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 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 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 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 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 fc1d169..658356b 100644 --- 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 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..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 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 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..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 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 index 0000000..fc1d169 --- /dev/null +++ b/glade/icons/hicolor/Makefile.am @@ -0,0 +1 @@ +SUBDIRS = 16x16 22x22