try to fix gettext support. Duno why translations are not working. Feel

2001-08-11  Chema Celorio  <chema@celorio.com>

	* src/glade.h: try to fix gettext support. Duno why translations are not
	working. Feel free to fix it ;-).

	* src/glade-widget.c (glade_property_refresh): implement
	(glade_widget_new): clean widget creation
	(glade_widget_new_full): ditto
	(glade_widget_get_from_gtk_widget): ditto
	(glade_widget_apply_property_from_node): impl.
	(glade_widget_new_from_node): impl.

	* src/glade-property.c : port to GValue
	* src/glade-property.h: ditto

	* src/glade-property-class.c : port to GValue
	* src/glade-property-class.h : ditto

	* src/glade-project.c (glade_project_new_from_node): implement.
	(glade_project_open_from_file): implement.
	(glade_project_open): implemnt.

	* src/glade-project-view.h (struct _GladeProjectViewClass): add a
	selection_update signal.

	* src/glade-project-view.c (glade_project_view_populate_model_real): add a
	add_childs parameter
	(glade_project_view_selection_update): implment (not yet working)

	* src/glade-parameter.c (glade_parameter_adjustment_new): port to GValue

	* src/glade-palette.c (glade_palette_clear): impl.

	* src/glade-gtk.c: port to GValue from string
	(glade_gtk_box_set_size): impl.

	* src/glade-editor.c (glade_editor_property_changed_*): use g_property_set_foo
	rather than g_property_changed_foo.
	port to GValues from string

	* src/glade-choice.c (glade_choice_list_new_from_node): use _TAG_ENUM and
	not _CHOICES

	* src/glade-catalog.c: remove <config.h>

	* src/Makefile.am (SUBDIRS): remove tests

1 files changed, 36 insertions, 7 deletions

diff --git a/src/glade.h b/src/glade.h
index 77f2f0d3..bd7b1813 100644
--- a/src/glade.h
+++ b/src/glade.h
@@ -1,11 +1,37 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-#if 0
-#include <gnome.h>
-#else
+#ifndef __GLADE_H__
+#define __GLADE_H__
+
+#include <config.h>
 #include <gtk/gtk.h>
-gchar * _ (gchar * name);
+#include <libintl.h>
+
+/* Borrow from libgnome/libgnome.h */
+#ifdef ENABLE_NLS
+#    include <libintl.h>
+#    ifdef GNOME_EXPLICIT_TRANSLATION_DOMAIN
+#        undef _
+#        define _(String) dgettext (GNOME_EXPLICIT_TRANSLATION_DOMAIN, String)
+#    else 
+#        define _(String) gettext (String)
+#    endif
+#    ifdef gettext_noop
+#        define N_(String) gettext_noop (String)
+#    else
+#        define N_(String) (String)
+#    endif
+#else
+/* Stubs that do something close enough.  */
+#    define textdomain(String) (String)
+#    define gettext(String) (String)
+#    define dgettext(Domain,Message) (Message)
+#    define dcgettext(Domain,Message,Type) (Message)
+#    define bindtextdomain(Domain,Directory) (Domain)
+#    define _(String) (String)
+#    define N_(String) (String)
 #endif
 
+
 #define g_ok_print g_print
 /* I always grep for g_print to find left over debuging print's
  * so for now, use g_ok_print on the code that is ment to do a g_print
@@ -29,19 +55,22 @@ gchar * _ (gchar * name);
 #define GLADE_TAG_PROPERTIES   "Properties"
 #define GLADE_TAG_PROPERTY     "Property"
 #define GLADE_TAG_COMMON       "Common"
+#define GLADE_TAG_OPTIONAL     "Optional"
+#define GLADE_TAG_OPTIONAL_DEFAULT "OptionalDefault"
+#define GLADE_TAG_APPLY_FIRST_TIME "ApplyFirstTime"
 #define GLADE_TAG_TYPE         "Type"
 #define GLADE_TAG_TOOLTIP      "Tooltip"
 #define GLADE_TAG_GTKARG       "GtkArg"
 #define GLADE_TAG_PARAMETERS   "Parameters"
 #define GLADE_TAG_PARAMETER    "Parameter"
 #define GLADE_TAG_SYMBOL       "Symbol"
-#define GLADE_TAG_CHOICES      "Choices"
+#define GLADE_TAG_ENUM         "Enum"
 #define GLADE_TAG_CHOICE       "Choice"
 #define GLADE_TAG_FALSE        "False"
 #define GLADE_TAG_TRUE         "True"
 #define GLADE_TAG_YES          "Yes"
 #define GLADE_TAG_NO           "No"
-#define GLADE_TAG_TEXT         "Text"
+#define GLADE_TAG_STRING       "String"
 #define GLADE_TAG_BOOLEAN      "Boolean"
 #define GLADE_TAG_FLOAT        "Float"
 #define GLADE_TAG_INTEGER      "Integer"
@@ -66,7 +95,6 @@ gchar * _ (gchar * name);
 
 #define GLADE_WIDGET_DATA_TAG "GladeWidgetDataTag"
 
-#define GLADE_GET_DEFAULT_FROM_WIDGET "GladeGetDefaultFromWidget"
 #define GLADE_MODIFY_PROPERTY_DATA "GladeModifyPropertyData"
 
 #define GLADE_XML_TAG_PROJECT  "glade-interface"
@@ -83,3 +111,4 @@ gchar * _ (gchar * name);
 #define GLADE_XML_TAG_PACKING  "packing"
 
 
+#endif /* __GLADE_H__ */