sharpetronics/glade
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glade.git synced 2025-09-24 00:04:33 -04:00
Code Issues Projects Releases Wiki Activity

fixed conditionally building gnome & python.

Browse Source 
* Makefile.am, configure.ac, plugins/Makefile.am, bindings/Makefile.am:
	  fixed conditionally building gnome & python.

	* data/libgladeui-1.0.pc.in: Renamed to gladeui-1.0.pc.in.
	  Updated for change in location of header files.

	* gladeui/glade.h, gladeui/glade-xml-utils.c: Cleaned up 'glade.h'.     
	  - Moved GLADE_TAG_* defines to glade-xml-utils.h.
	  - Nuked GLADE_GENERIC_BORDER_WIDTH.

	* gladeui/*.h, plugins/gtk+/glade-gtk.[ch],
	  plugins/gnome/glade-gnome.ch, bindings/python/*.[ch]:
	  Changed header files location for libgladeui. 	


svn path=/trunk/; revision=1054
This commit is contained in:
Tristan Van Berkom 2007-01-25 19:29:08 +00:00
parent 3c5eb7fa33
commit a769fa158c
48 changed files with 278 additions and 261 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
ChangeLog
View File

@ -1,3 +1,8 @@
2007-01-25 Tristan Van Berkom <tvb@gnome.org>
* Makefile.am, configure.ac, plugins/Makefile.am, bindings/Makefile.am:
fixed conditionally building gnome & python.
2007-01-25 Vincent Geddes <vincent.geddes@gmail.com>
* set 'svn:ignore' properties for the directory tree.
@ -5,6 +10,17 @@
* src/glade-project-window.c: Change window title in line with HIG.
* data/libgladeui-1.0.pc.in: Renamed to gladeui-1.0.pc.in.
Updated for change in location of header files.
* gladeui/glade.h, gladeui/glade-xml-utils.c: Cleaned up 'glade.h'.
- Moved GLADE_TAG_* defines to glade-xml-utils.h.
- Nuked GLADE_GENERIC_BORDER_WIDTH.
* gladeui/*.h, plugins/gtk+/glade-gtk.[ch],
plugins/gnome/glade-gnome.ch, bindings/python/*.[ch]:
Changed header files location for libgladeui.
2007-01-23 Vincent Geddes <vincent.geddes@gmail.com>
* Reorganised package structure, moved a lot of files

7
Makefile.am
View File

@ -1,9 +1,10 @@
## Process this file with automake to produce Makefile.in
if DISABLE_USER_MANUAL
SUBDIRS = po data gladeui src plugins bindings doc
else
SUBDIRS = po data gladeui src plugins bindings help doc
if BUILD_USER_MANUAL
SUBDIRS += help
endif
ACLOCAL_AMFLAGS = -I m4

7
bindings/Makefile.am
View File

@ -1,3 +1,8 @@
## Process this file with automake to produce Makefile.in
SUBDIRS = python
SUBDIRS =
if BUILD_PYTHON
SUBDIRS += python
endif

4
bindings/python/Makefile.am
View File

@ -16,8 +16,8 @@ libgladepython_la_CPPFLAGS = \
libgladepython_la_CFLAGS = \
-g -Wall \
$(top_srcdir) \
-I$(top_srcdir)/gladeui \
-I$(top_builddir)/gladeui \
-I$(top_srcdir) \
-I$(top_builddir) \
$(PYTHON_CFLAGS) \
$(GTK_CFLAGS) \
$(AM_CFLAGS)

2
bindings/python/glade-python-gwa.c
View File

@ -7,7 +7,7 @@
#line 23 "glade-python-gwa.override"
#include <Python.h>
#include <pygobject.h>
#include <glade.h>
#include <gladeui/glade.h>
static gboolean
glade_python_support_init_value (GObject *object,

2
bindings/python/glade-python-gwa.override
View File

@ -20,7 +20,7 @@
*/
%%
headers
#include <glade.h>
#include <gladeui/glade.h>
#include <Python.h>
#include <pygobject.h>

7
bindings/python/glade-python.c
View File

@ -23,8 +23,8 @@
#include <config.h>
#include <glade.h>
#include <glade-binding.h>
#include <gladeui/glade.h>
#include <gladeui/glade-binding.h>
#include <Python.h>
#include <pygobject.h>
@ -451,8 +451,7 @@ glade_python_binding_console_new (void)
gulong handler_id;
vbox = gtk_vbox_new (FALSE, 4);
gtk_container_set_border_width (GTK_CONTAINER (vbox),
GLADE_GENERIC_BORDER_WIDTH);
gtk_container_set_border_width (GTK_CONTAINER (vbox), 6);
sw = gtk_scrolled_window_new (NULL, NULL);
gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (sw),

4
configure.ac
View File

@ -93,7 +93,7 @@ ENABLE_SK_TRUE="#"
ENABLE_SK_FALSE=""
fi
AM_CONDITIONAL(DISABLE_USER_MANUAL, test x"$enable_user_manual" = "xno")
AM_CONDITIONAL(BUILD_USER_MANUAL, test x"$enable_user_manual" = "xyes")
dnl ================================================================
dnl Scrollkeeper
@ -160,7 +160,7 @@ AC_SUBST([AM_LDFLAGS])
AC_CONFIG_FILES([
Makefile
data/libgladeui-1.0.pc
data/gladeui-1.0.pc
data/glade-3.desktop.in
data/Makefile
data/icons/Makefile

4
data/Makefile.am
View File

@ -8,11 +8,11 @@ desktop_DATA = $(desktop_in_files:.desktop.in.in=.desktop)
@INTLTOOL_DESKTOP_RULE@
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = libgladeui-1.0.pc
pkgconfig_DATA = gladeui-1.0.pc
EXTRA_DIST = \
$(desktop_in_files) \
libgladeui-1.0.pc.in
gladeui-1.0.pc.in
CLEANFILES = \
$(desktop_DATA) \

2
data/libgladeui-1.0.pc.in → data/gladeui-1.0.pc.in
View File

@ -3,7 +3,7 @@ exec_prefix=@exec_prefix@
libdir=@libdir@
datarootdir=@datarootdir@
datadir=@datadir@
includedir=@includedir@/libgladeui-1.0/libgladeui
includedir=@includedir@/libgladeui-1.0
catalogdir=@datadir@/@PACKAGE@/catalogs
pixmapdir=@datadir@/@PACKAGE@/pixmaps
moduledir=@libdir@/@PACKAGE@/modules

3
gladeui/Makefile.am
View File

@ -8,7 +8,6 @@ common_defines = \
-DGLADE_BINDINGSDIR="\"$(pkglibdir)/bindings\"" \
-DGLADE_PIXMAPSDIR="\"$(pkgdatadir)/pixmaps\"" \
-DGLADE_SCRIPTSDIR="\"$(pkgdatadir)/scripts\"" \
-DGLADE_ICONDIR="\"$(datadir)/pixmaps\"" \
-DGLADE_LOCALEDIR="\"$(datadir)/locale\""
lib_LTLIBRARIES = libgladeui-1.la
@ -74,7 +73,7 @@ libgladeui_1_la_CFLAGS = \
libgladeui_1_la_LDFLAGS = -version-info $(GLADE_CURRENT):$(GLADE_REVISION):$(GLADE_AGE) $(AM_LDFLAGS)
libgladeui_1_la_LIBADD = $(GTK_LIBS)
libgladeuiincludedir=$(includedir)/libgladeui-1.0/libgladeui
libgladeuiincludedir=$(includedir)/libgladeui-1.0/gladeui
libgladeuiinclude_HEADERS = \
glade.h \
glade-debug.h \

12
gladeui/glade-app.c
View File

@ -80,14 +80,13 @@ enum
static guint glade_app_signals[LAST_SIGNAL] = { 0 };
gchar *glade_pixmaps_dir = GLADE_PIXMAPSDIR;
gchar *glade_scripts_dir = GLADE_SCRIPTSDIR;
gchar *glade_catalogs_dir = GLADE_CATALOGSDIR;
gchar *glade_modules_dir = GLADE_MODULESDIR;
gchar *glade_bindings_dir = GLADE_BINDINGSDIR;
gchar *glade_plugins_dir = GLADE_PLUGINSDIR;
gchar *glade_pixmaps_dir = GLADE_PIXMAPSDIR;
gchar *glade_locale_dir = GLADE_LOCALEDIR;
gchar *glade_icon_dir = GLADE_ICONDIR;
gboolean glade_verbose = FALSE;
static GObjectClass * parent_class = NULL;
@ -152,13 +151,13 @@ glade_app_finalize (GObject *app)
{
#ifdef G_OS_WIN32
g_free (glade_pixmaps_dir);
g_free (glade_scripts_dir);
g_free (glade_catalogs_dir);
g_free (glade_modules_dir);
g_free (glade_bindings_dir);
g_free (glade_bindings_dir);
g_free (glade_pixmaps_dir);
g_free (glade_locale_dir);
g_free (glade_icon_dir);
#endif
glade_binding_unload_all ();
@ -314,13 +313,12 @@ glade_app_init (GladeApp *app)
gchar *prefix;
prefix = g_win32_get_package_installation_directory (NULL, NULL);
glade_pixmaps_dir = g_build_filename (prefix, "share", PACKAGE, "pixmaps", NULL);
glade_scripts_dir = g_build_filename (prefix, "share", PACKAGE, GLADE_BINDING_SCRIPT_DIR, NULL);
glade_pixmaps_dir = g_build_filename (prefix, "share", PACKAGE, "pixmaps", NULL);
glade_catalogs_dir = g_build_filename (prefix, "share", PACKAGE, "catalogs", NULL);
glade_modules_dir = g_build_filename (prefix, "lib", PACKAGE, "modules", NULL);
glade_bindings_dir = g_build_filename (prefix, "lib", PACKAGE, "bindings", NULL);
glade_locale_dir = g_build_filename (prefix, "share", "locale", NULL);
glade_icon_dir = g_build_filename (prefix, "share", "pixmaps", NULL);
g_free (prefix);
#endif

8
gladeui/glade-app.h
View File

@ -22,10 +22,10 @@
#ifndef __GLADE_APP_H__
#define __GLADE_APP_H__
#include "glade-editor.h"
#include "glade-palette.h"
#include "glade-clipboard.h"
#include "glade-project-view.h"
#include <gladeui/glade-editor.h>
#include <gladeui/glade-palette.h>
#include <gladeui/glade-clipboard.h>
#include <gladeui/glade-project-view.h>
G_BEGIN_DECLS

2
gladeui/glade-base-editor.c
View File

@ -1857,7 +1857,7 @@ glade_base_editor_pack_new_window (GladeBaseEditor *editor,
gtk_button_box_set_child_secondary (GTK_BUTTON_BOX (buttonbox), button, TRUE);
}
gtk_container_set_border_width (GTK_CONTAINER (editor), GLADE_GENERIC_BORDER_WIDTH);
gtk_container_set_border_width (GTK_CONTAINER (editor), 6);
gtk_container_add (GTK_CONTAINER (window), GTK_WIDGET (editor));
gtk_window_set_default_size (GTK_WINDOW (window), 640, 480);

4
gladeui/glade-base-editor.h
View File

@ -26,8 +26,8 @@
#include <config.h>
#endif
#include "glade-widget.h"
#include "glade-marshallers.h"
#include <gladeui/glade-widget.h>
#include <gladeui/glade-marshallers.h>
#include <gtk/gtk.h>
G_BEGIN_DECLS

2
gladeui/glade-builtins.h
View File

@ -3,7 +3,7 @@
#define __GLADE_BUILTINS_H__
#include <glib-object.h>
#include "glade.h"
#include <gladeui/glade.h>
G_BEGIN_DECLS

2
gladeui/glade-clipboard-view.c
View File

@ -251,7 +251,7 @@ glade_clipboard_view_construct (GladeClipboardView *view)
gtk_scrolled_window_set_shadow_type
(GTK_SCROLLED_WINDOW (scrolled_window), GTK_SHADOW_IN);
gtk_container_set_border_width (GTK_CONTAINER (scrolled_window),
GLADE_GENERIC_BORDER_WIDTH);
6);
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window),
GTK_POLICY_AUTOMATIC,
GTK_POLICY_AUTOMATIC);

2
gladeui/glade-clipboard-view.h
View File

@ -2,7 +2,7 @@
#ifndef __GLADE_CLIPBOARD_VIEW_H__
#define __GLADE_CLIPBOARD_VIEW_H__
#include "glade.h"
#include <gladeui/glade.h>
G_BEGIN_DECLS

2
gladeui/glade-clipboard.h
View File

@ -2,7 +2,7 @@
#ifndef __GLADE_CLIPBOARD_H__
#define __GLADE_CLIPBOARD_H__
#include "glade.h"
#include <gladeui/glade.h>
G_BEGIN_DECLS

10
gladeui/glade-command.h
View File

@ -2,12 +2,12 @@
#ifndef __GLADE_COMMAND_H__
#define __GLADE_COMMAND_H__
#include <gladeui/glade-placeholder.h>
#include <gladeui/glade-widget.h>
#include <gladeui/glade-signal.h>
#include <gladeui/glade-property.h>
#include <gladeui/glade-project.h>
#include <glib-object.h>
#include "glade-placeholder.h"
#include "glade-widget.h"
#include "glade-signal.h"
#include "glade-property.h"
#include "glade-project.h"
G_BEGIN_DECLS

2
gladeui/glade-custom.h
View File

@ -2,8 +2,8 @@
#ifndef __GLADE_CUSTOM_H__
#define __GLADE_CUSTOM_H__
#include <gladeui/glade.h>
#include <gtk/gtk.h>
#include "glade.h"
G_BEGIN_DECLS

6
gladeui/glade-design-view.h
View File

@ -25,9 +25,9 @@
#ifndef __GLADE_DESIGN_VIEW_H__
#define __GLADE_DESIGN_VIEW_H__
#include "glade.h"
#include "glade-project.h"
#include "glade-design-layout.h"
#include <gladeui/glade.h>
#include <gladeui/glade-project.h>
#include <gladeui/glade-design-layout.h>
#include <gtk/gtkvbox.h>

4
gladeui/glade-editor-property.c
View File

@ -2645,7 +2645,7 @@ glade_eprop_objects_show_dialog (GtkWidget *dialog_button,
vbox = gtk_vbox_new (FALSE, 6);
gtk_widget_show (vbox);
gtk_container_set_border_width (GTK_CONTAINER (vbox), GLADE_GENERIC_BORDER_WIDTH);
gtk_container_set_border_width (GTK_CONTAINER (vbox), 6);
gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), vbox, TRUE, TRUE, 0);
@ -3560,7 +3560,7 @@ glade_eprop_accel_show_dialog (GtkWidget *dialog_button,
vbox = gtk_vbox_new (FALSE, 6);
gtk_widget_show (vbox);
gtk_container_set_border_width (GTK_CONTAINER (vbox), GLADE_GENERIC_BORDER_WIDTH);
gtk_container_set_border_width (GTK_CONTAINER (vbox), 6);
gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), vbox, TRUE, TRUE, 0);

12
gladeui/glade-editor.c
View File

@ -190,7 +190,7 @@ glade_editor_notebook_page (GladeEditor *editor, const gchar *name)
/* alignment is needed to ensure property labels have some padding on the left */
alignment = gtk_alignment_new (0.5, 0, 1, 0);
gtk_alignment_set_padding (GTK_ALIGNMENT (alignment), 0, 0, GLADE_GENERIC_BORDER_WIDTH, 0);
gtk_alignment_set_padding (GTK_ALIGNMENT (alignment), 0, 0, 6, 0);
/* construct tab label widget */
if (g_utf8_collate (name, _("Accessibility")) == 0)
@ -214,7 +214,7 @@ glade_editor_notebook_page (GladeEditor *editor, const gchar *name)
gtk_alignment_set (GTK_ALIGNMENT (alignment), 0.5, 0.5, 1, 1);
gtk_alignment_set_padding (GTK_ALIGNMENT (alignment), 0, 0, 0, 0);
gtk_container_set_border_width (GTK_CONTAINER (alignment), GLADE_GENERIC_BORDER_WIDTH);
gtk_container_set_border_width (GTK_CONTAINER (alignment), 6);
gtk_notebook_insert_page (GTK_NOTEBOOK (editor->notebook), alignment,
label_widget, page++);
}
@ -226,7 +226,7 @@ glade_editor_notebook_page (GladeEditor *editor, const gchar *name)
GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (sw),
GTK_WIDGET (alignment));
gtk_container_set_border_width (GTK_CONTAINER (sw), GLADE_GENERIC_BORDER_WIDTH);
gtk_container_set_border_width (GTK_CONTAINER (sw), 6);
gtk_notebook_insert_page (GTK_NOTEBOOK (editor->notebook), sw,
label_widget, page++);
@ -1369,7 +1369,7 @@ glade_editor_reset_dialog (GladeEditor *editor)
vbox = gtk_vbox_new (FALSE, 6);
gtk_widget_show (vbox);
gtk_container_set_border_width (GTK_CONTAINER (vbox), GLADE_GENERIC_BORDER_WIDTH);
gtk_container_set_border_width (GTK_CONTAINER (vbox), 6);
gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), vbox, TRUE, TRUE, 0);
@ -1406,14 +1406,14 @@ glade_editor_reset_dialog (GladeEditor *editor)
button = gtk_button_new_with_mnemonic (_("_Select All"));
gtk_widget_show (button);
gtk_box_pack_start (GTK_BOX (hbox), button, TRUE, TRUE, 0);
gtk_container_set_border_width (GTK_CONTAINER (button), GLADE_GENERIC_BORDER_WIDTH);
gtk_container_set_border_width (GTK_CONTAINER (button), 6);
g_signal_connect (G_OBJECT (button), "clicked",
G_CALLBACK (glade_editor_reset_select_all_clicked), tree_view);
button = gtk_button_new_with_mnemonic (_("_Unselect All"));
gtk_widget_show (button);
gtk_box_pack_start (GTK_BOX (hbox), button, TRUE, TRUE, 0);
gtk_container_set_border_width (GTK_CONTAINER (button), GLADE_GENERIC_BORDER_WIDTH);
gtk_container_set_border_width (GTK_CONTAINER (button), 6);
g_signal_connect (G_OBJECT (button), "clicked",
G_CALLBACK (glade_editor_reset_unselect_all_clicked), tree_view);

2
gladeui/glade-editor.h
View File

@ -2,7 +2,7 @@
#ifndef __GLADE_EDITOR_H__
#define __GLADE_EDITOR_H__
#include "glade-signal-editor.h"
#include <gladeui/glade-signal-editor.h>
G_BEGIN_DECLS

4
gladeui/glade-fixed.h
View File

@ -5,8 +5,8 @@
#include <glib-object.h>
#include <gdk/gdk.h>
#include "glade-widget.h"
#include "glade-cursor.h"
#include <gladeui/glade-widget.h>
#include <gladeui/glade-cursor.h>
G_BEGIN_DECLS

6
gladeui/glade-palette-item.h
View File

@ -27,9 +27,9 @@
#ifndef __GLADE_PALETTE_ITEM_H__
#define __GLADE_PALETTE_ITEM_H__
#include "glade.h"
#include "glade-palette.h"
#include "glade-widget-adaptor.h"
#include <gladeui/glade.h>
#include <gladeui/glade-palette.h>
#include <gladeui/glade-widget-adaptor.h>
#include <gtk/gtktogglebutton.h>

4
gladeui/glade-palette.h
View File

@ -29,8 +29,8 @@
#ifndef __GLADE_PALETTE_H__
#define __GLADE_PALETTE_H__
#include "glade.h"
#include "glade-palette-item.h"
#include <gladeui/glade.h>
#include <gladeui/glade-palette-item.h>
#include <gtk/gtkvbox.h>

2
gladeui/glade-placeholder.h
View File

@ -2,8 +2,8 @@
#ifndef __GLADE_PLACEHOLDER_H__
#define __GLADE_PLACEHOLDER_H__
#include <gladeui/glade-widget.h>
#include <gtk/gtk.h>
#include "glade-widget.h"
G_BEGIN_DECLS

4
gladeui/glade-project.h
View File

@ -2,8 +2,8 @@
#ifndef __GLADE_PROJECT_H__
#define __GLADE_PROJECT_H__
#include "glade-widget.h"
#include "glade-command.h"
#include <gladeui/glade-widget.h>
#include <gladeui/glade-command.h>
G_BEGIN_DECLS

13
gladeui/glade-property-class.c
View File

@ -37,6 +37,11 @@
#include "glade-editor-property.h"
#include "glade-debug.h"
#define NUMERICAL_STEP_INCREMENT 1
#define FLOATING_STEP_INCREMENT 0.01F
#define NUMERICAL_PAGE_INCREMENT 10
#define NUMERICAL_PAGE_SIZE 1
/* Hardcoded recognized atk actions
*/
@ -1492,10 +1497,10 @@ glade_property_class_make_adjustment (GladePropertyClass *property_class)
return (GtkAdjustment *)gtk_adjustment_new (def, min, max,
float_range ?
GLADE_FLOATING_STEP_INCREMENT :
GLADE_NUMERICAL_STEP_INCREMENT,
GLADE_NUMERICAL_PAGE_INCREMENT,
GLADE_NUMERICAL_PAGE_SIZE);
FLOATING_STEP_INCREMENT :
NUMERICAL_STEP_INCREMENT,
NUMERICAL_PAGE_INCREMENT,
NUMERICAL_PAGE_SIZE);
}
/**

4
gladeui/glade-property-class.h
View File

@ -2,6 +2,10 @@
#ifndef __GLADE_PROPERTY_CLASS_H__
#define __GLADE_PROPERTY_CLASS_H__
#include <glib.h>
#include <glib-object.h>
#include <gtk/gtkadjustment.h>
G_BEGIN_DECLS
/* The GladePropertyClass structure parameters of a GladeProperty.

2
gladeui/glade-signal-editor.h
View File

@ -2,7 +2,7 @@
#ifndef __GLADE_SIGNAL_EDITOR_H__
#define __GLADE_SIGNAL_EDITOR_H__
#include "glade.h"
#include <gladeui/glade.h>
G_BEGIN_DECLS

45
gladeui/glade-widget-adaptor.c
View File

@ -20,20 +20,7 @@
* Tristan Van Berkom <tvb@gnome.org>
*/
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
/* For g_file_exists */
#include <sys/types.h>
#include <string.h>
#include <glib/gdir.h>
#include <gmodule.h>
#include <ctype.h>
#include <glib/gi18n-lib.h>
#include "glade.h"
#include "glade-widget-adaptor.h"
@ -44,6 +31,20 @@
#include "glade-accumulators.h"
#include "glade-binding.h"
/* For g_file_exists */
#include <sys/types.h>
#include <string.h>
#include <glib/gdir.h>
#include <glib/gi18n-lib.h>
#include <gmodule.h>
#include <ctype.h>
#define LARGE_ICON_SUBDIR "22x22"
#define LARGE_ICON_SIZE 22
#define SMALL_ICON_SUBDIR "16x16"
#define SMALL_ICON_SIZE 16
struct _GladeWidgetAdaptorPriv {
gchar *catalog; /* The name of the widget catalog this class
@ -167,15 +168,15 @@ gwa_load_icons (GladeWidgetAdaptor *adaptor)
/* load large 22x22 icon */
icon_path = g_strdup_printf ("%s" G_DIR_SEPARATOR_S
GLADE_LARGE_ICON_SUBDIR
LARGE_ICON_SUBDIR
G_DIR_SEPARATOR_S "%s.png",
glade_pixmaps_dir,
adaptor->generic_name);
adaptor->priv->large_icon =
gdk_pixbuf_new_from_file_at_size (icon_path,
GLADE_LARGE_ICON_SIZE,
GLADE_LARGE_ICON_SIZE,
LARGE_ICON_SIZE,
LARGE_ICON_SIZE,
&error);
if (adaptor->priv->large_icon == NULL)
@ -190,7 +191,7 @@ gwa_load_icons (GladeWidgetAdaptor *adaptor)
adaptor->priv->large_icon =
gtk_icon_theme_load_icon (gtk_icon_theme_get_default (),
GTK_STOCK_MISSING_IMAGE,
GLADE_LARGE_ICON_SIZE,
LARGE_ICON_SIZE,
GTK_ICON_LOOKUP_USE_BUILTIN,
&error);
if (adaptor->priv->large_icon == NULL)
@ -207,15 +208,15 @@ gwa_load_icons (GladeWidgetAdaptor *adaptor)
/* load small 16x16 icon */
icon_path = g_strdup_printf ("%s" G_DIR_SEPARATOR_S
GLADE_SMALL_ICON_SUBDIR
SMALL_ICON_SUBDIR
G_DIR_SEPARATOR_S "%s.png",
glade_pixmaps_dir,
adaptor->generic_name);
adaptor->priv->small_icon =
gdk_pixbuf_new_from_file_at_size (icon_path,
GLADE_SMALL_ICON_SIZE,
GLADE_SMALL_ICON_SIZE,
SMALL_ICON_SIZE,
SMALL_ICON_SIZE,
&error);
if (adaptor->priv->small_icon == NULL)
@ -230,7 +231,7 @@ gwa_load_icons (GladeWidgetAdaptor *adaptor)
adaptor->priv->small_icon =
gtk_icon_theme_load_icon (gtk_icon_theme_get_default (),
GTK_STOCK_MISSING_IMAGE,
GLADE_SMALL_ICON_SIZE,
SMALL_ICON_SIZE,
GTK_ICON_LOOKUP_USE_BUILTIN,
&error);
if (adaptor->priv->small_icon == NULL)
@ -1480,7 +1481,7 @@ gwa_extend_with_node (GladeWidgetAdaptor *adaptor,
/* Check if this class is toplevel */
adaptor_class->toplevel =
glade_xml_get_property_boolean
(node, GLADE_XML_TAG_TOPLEVEL, adaptor_class->toplevel);
(node, GLADE_TAG_TOPLEVEL, adaptor_class->toplevel);
/* Override the special-child-type here */
if ((child_type =

4
gladeui/glade-widget-adaptor.h
View File

@ -2,11 +2,11 @@
#ifndef __GLADE_WIDGET_ADAPTOR_H__
#define __GLADE_WIDGET_ADAPTOR_H__
#include <gladeui/glade-xml-utils.h>
#include <gladeui/glade-property-class.h>
#include <glib-object.h>
#include <gmodule.h>
#include <gtk/gtk.h>
#include "glade-xml-utils.h"
#include "glade-property-class.h"
G_BEGIN_DECLS

8
gladeui/glade-widget.h
View File

@ -2,13 +2,13 @@
#ifndef __GLADE_WIDGET_H__
#define __GLADE_WIDGET_H__
#include <gladeui/glade-widget-adaptor.h>
#include <gladeui/glade-signal.h>
#include <gladeui/glade-property.h>
#include <glib.h>
#include <glib-object.h>
#include "glade-widget-adaptor.h"
#include "glade-signal.h"
#include "glade-property.h"
G_BEGIN_DECLS
#define GLADE_TYPE_WIDGET (glade_widget_get_type ())

96
gladeui/glade-xml-utils.h
View File

@ -3,7 +3,7 @@
#ifndef __GLADE_XML_UTILS_H__
#define __GLADE_XML_UTILS_H__
#include "glade-parser.h"
#include <gladeui/glade-parser.h>
G_BEGIN_DECLS
@ -14,6 +14,100 @@ typedef struct _GladeXmlContext GladeXmlContext;
typedef struct _GladeXmlNode GladeXmlNode;
typedef struct _GladeXmlDoc GladeXmlDoc;
/* Used for catalog tags and attributes */
#define GLADE_XML_TAG_PROJECT "glade-interface"
#define GLADE_XML_TAG_REQUIRES "requires"
#define GLADE_XML_TAG_WIDGET "widget"
#define GLADE_XML_TAG_PROPERTY "property"
#define GLADE_XML_TAG_CLASS "class"
#define GLADE_XML_TAG_ID "id"
#define GLADE_XML_TAG_SIGNAL "signal"
#define GLADE_XML_TAG_HANDLER "handler"
#define GLADE_XML_TAG_NAME "name"
#define GLADE_XML_TAG_CHILD "child"
#define GLADE_XML_TAG_SIGNAL "signal"
#define GLADE_XML_TAG_AFTER "after"
#define GLADE_XML_TAG_PACKING "packing"
#define GLADE_XML_TAG_PLACEHOLDER "placeholder"
#define GLADE_XML_TAG_INTERNAL_CHILD "internal-child"
#define GLADE_TAG_GLADE_CATALOG "glade-catalog"
#define GLADE_TAG_GLADE_WIDGET_CLASSES "glade-widget-classes"
#define GLADE_TAG_GLADE_WIDGET_CLASS "glade-widget-class"
#define GLADE_TAG_GLADE_WIDGET_GROUP "glade-widget-group"
#define GLADE_TAG_GLADE_WIDGET_CLASS_REF "glade-widget-class-ref"
#define GLADE_TAG_LANGUAGE "language"
#define GLADE_TAG_ADAPTOR "adaptor"
#define GLADE_TAG_LIBRARY "library"
#define GLADE_TAG_DEPENDS "depends"
#define GLADE_TAG_DOMAIN "domain"
#define GLADE_TAG_BOOK "book"
#define GLADE_TAG_SIGNAL_NAME "signal-name"
#define GLADE_TAG_DEFAULT "default"
#define GLADE_TAG_DISABLED "disabled"
#define GLADE_TAG_DEFAULT_PALETTE_STATE "default-palette-state"
#define GLADE_TAG_REPLACE_CHILD_FUNCTION "replace-child-function"
#define GLADE_TAG_POST_CREATE_FUNCTION "post-create-function"
#define GLADE_TAG_GET_INTERNAL_CHILD_FUNCTION "get-internal-child-function"
#define GLADE_TAG_LAUNCH_EDITOR_FUNCTION "launch-editor-function"
#define GLADE_TAG_ADD_CHILD_FUNCTION "add-child-function"
#define GLADE_TAG_REMOVE_CHILD_FUNCTION "remove-child-function"
#define GLADE_TAG_GET_CHILDREN_FUNCTION "get-children-function"
#define GLADE_TAG_CHILD_SET_PROP_FUNCTION "child-set-property-function"
#define GLADE_TAG_CHILD_GET_PROP_FUNCTION "child-get-property-function"
#define GLADE_TAG_CHILD_VERIFY_FUNCTION "child-verify-function"
#define GLADE_TAG_PROPERTIES "properties"
#define GLADE_TAG_PACKING_PROPERTIES "packing-properties"
#define GLADE_TAG_PROPERTY "property"
#define GLADE_TAG_TYPE "type"
#define GLADE_TAG_SPEC "spec"
#define GLADE_TAG_TOOLTIP "tooltip"
#define GLADE_TAG_PARAMETERS "parameters"
#define GLADE_TAG_PARAMETER "parameter"
#define GLADE_TAG_SET_FUNCTION "set-property-function"
#define GLADE_TAG_GET_FUNCTION "get-property-function"
#define GLADE_TAG_VERIFY_FUNCTION "verify-function"
#define GLADE_TAG_QUERY "query"
#define GLADE_TAG_COMMON "common"
#define GLADE_TAG_OPTIONAL "optional"
#define GLADE_TAG_OPTIONAL_DEFAULT "optional-default"
#define GLADE_TAG_VISIBLE "visible"
#define GLADE_TAG_EXPANDED "expanded"
#define GLADE_TAG_GENERIC_NAME "generic-name"
#define GLADE_TAG_NAME "name"
#define GLADE_TAG_TITLE "title"
#define GLADE_TAG_ID "id"
#define GLADE_TAG_KEY "key"
#define GLADE_TAG_VALUE "value"
#define GLADE_TAG_TRANSLATABLE "translatable"
#define GLADE_TAG_PACKING_DEFAULTS "packing-defaults"
#define GLADE_TAG_PARENT_CLASS "parent-class"
#define GLADE_TAG_CHILD_PROPERTY "child-property"
#define GLADE_TAG_DISPLAYABLE_VALUES "displayable-values"
#define GLADE_TAG_NICK "nick"
#define GLADE_TAG_SPECIAL_CHILD_TYPE "special-child-type"
#define GLADE_TAG_SAVE "save"
#define GLADE_TAG_EDITABLE "editable"
#define GLADE_TAG_IGNORE "ignore"
#define GLADE_TAG_VISIBLE_LINES "visible-lines"
#define GLADE_TAG_RESOURCE "resource"
#define GLADE_TAG_INIT_FUNCTION "init-function"
#define GLADE_TAG_ATK_ACTION "atk-action"
#define GLADE_TAG_ATK_PROPERTY "atk-property"
#define GLADE_TAG_FIXED "fixed"
#define GLADE_TAG_TRANSFER_ON_PASTE "transfer-on-paste"
#define GLADE_TAG_WEIGHT "weight"
#define GLADE_TAG_ACTION_GROUP "action-group"
#define GLADE_TAG_ACTION "action"
#define GLADE_TAG_STOCK "stock"
#define GLADE_TAG_GET_TYPE_FUNCTION "get-type-function"
#define GLADE_TAG_TOPLEVEL "toplevel"
#define GLADE_TAG_EVENT_HANDLER_CONNECTED "EventHandlerConnected"
#define GLADE_TAG_FALSE "False"
#define GLADE_TAG_TRUE "True"
#define GLADE_TAG_YES "Yes"
#define GLADE_TAG_NO "No"
#define GLADE_ENUM_DATA_TAG "GladeEnumDataTag"
/* search child */
GladeXmlNode * glade_xml_search_child (GladeXmlNode * node, const gchar *name);

158
gladeui/glade.h
View File

@ -2,8 +2,8 @@
#ifndef __GLADE_H__
#define __GLADE_H__
#include <gtk/gtk.h>
/* symbol export attributes
*/
#ifndef __GNUC__
# define __DLL_IMPORT__ __declspec(dllimport)
# define __DLL_EXPORT__ __declspec(dllexport)
@ -22,150 +22,40 @@
# define LIBGLADEUI_API extern
#endif
/* Circular header dependancie are fixed here with forward
* declarations.
/* fix circular header dependencies with forward declarations.
*/
typedef struct _GladeWidget GladeWidget;
typedef struct _GladeProperty GladeProperty;
typedef struct _GladeProject GladeProject;
#include "glade-widget-adaptor.h"
#include "glade-widget.h"
#include "glade-property-class.h"
#include "glade-property.h"
#include "glade-project.h"
#include "glade-app.h"
#include "glade-command.h"
#include "glade-editor.h"
#include "glade-palette.h"
#include "glade-clipboard.h"
#include "glade-project-view.h"
#include "glade-placeholder.h"
#include "glade-utils.h"
#include "glade-builtins.h"
#include "glade-xml-utils.h"
#include "glade-fixed.h"
#define GLADE_TAG_FALSE "False"
#define GLADE_TAG_TRUE "True"
#define GLADE_TAG_YES "Yes"
#define GLADE_TAG_NO "No"
#define GLADE_ENUM_DATA_TAG "GladeEnumDataTag"
#define GLADE_LARGE_ICON_SUBDIR "22x22"
#define GLADE_LARGE_ICON_SIZE 22
#define GLADE_SMALL_ICON_SUBDIR "16x16"
#define GLADE_SMALL_ICON_SIZE 16
#define GLADE_TAG_EVENT_HANDLER_CONNECTED "EventHandlerConnected"
#define GLADE_XML_TAG_PROJECT "glade-interface"
#define GLADE_XML_TAG_REQUIRES "requires"
#define GLADE_XML_TAG_WIDGET "widget"
#define GLADE_XML_TAG_PROPERTY "property"
#define GLADE_XML_TAG_CLASS "class"
#define GLADE_XML_TAG_ID "id"
#define GLADE_XML_TAG_SIGNAL "signal"
#define GLADE_XML_TAG_HANDLER "handler"
#define GLADE_XML_TAG_NAME "name"
#define GLADE_XML_TAG_CHILD "child"
#define GLADE_XML_TAG_SIGNAL "signal"
#define GLADE_XML_TAG_AFTER "after"
#define GLADE_XML_TAG_PACKING "packing"
#define GLADE_XML_TAG_PLACEHOLDER "placeholder"
#define GLADE_XML_TAG_INTERNAL_CHILD "internal-child"
#define GLADE_XML_TAG_TOPLEVEL "toplevel"
/* Used for catalog tags and attributes */
#define GLADE_TAG_GLADE_CATALOG "glade-catalog"
#define GLADE_TAG_GLADE_WIDGET_CLASSES "glade-widget-classes"
#define GLADE_TAG_GLADE_WIDGET_CLASS "glade-widget-class"
#define GLADE_TAG_GLADE_WIDGET_GROUP "glade-widget-group"
#define GLADE_TAG_GLADE_WIDGET_CLASS_REF "glade-widget-class-ref"
#define GLADE_TAG_LANGUAGE "language"
#define GLADE_TAG_ADAPTOR "adaptor"
#define GLADE_TAG_LIBRARY "library"
#define GLADE_TAG_DEPENDS "depends"
#define GLADE_TAG_DOMAIN "domain"
#define GLADE_TAG_BOOK "book"
#define GLADE_TAG_SIGNAL_NAME "signal-name"
#define GLADE_TAG_DEFAULT "default"
#define GLADE_TAG_DISABLED "disabled"
#define GLADE_TAG_DEFAULT_PALETTE_STATE "default-palette-state"
#define GLADE_TAG_REPLACE_CHILD_FUNCTION "replace-child-function"
#define GLADE_TAG_POST_CREATE_FUNCTION "post-create-function"
#define GLADE_TAG_GET_INTERNAL_CHILD_FUNCTION "get-internal-child-function"
#define GLADE_TAG_LAUNCH_EDITOR_FUNCTION "launch-editor-function"
#define GLADE_TAG_ADD_CHILD_FUNCTION "add-child-function"
#define GLADE_TAG_REMOVE_CHILD_FUNCTION "remove-child-function"
#define GLADE_TAG_GET_CHILDREN_FUNCTION "get-children-function"
#define GLADE_TAG_CHILD_SET_PROP_FUNCTION "child-set-property-function"
#define GLADE_TAG_CHILD_GET_PROP_FUNCTION "child-get-property-function"
#define GLADE_TAG_CHILD_VERIFY_FUNCTION "child-verify-function"
#define GLADE_TAG_PROPERTIES "properties"
#define GLADE_TAG_PACKING_PROPERTIES "packing-properties"
#define GLADE_TAG_PROPERTY "property"
#define GLADE_TAG_TYPE "type"
#define GLADE_TAG_SPEC "spec"
#define GLADE_TAG_TOOLTIP "tooltip"
#define GLADE_TAG_PARAMETERS "parameters"
#define GLADE_TAG_PARAMETER "parameter"
#define GLADE_TAG_SET_FUNCTION "set-property-function"
#define GLADE_TAG_GET_FUNCTION "get-property-function"
#define GLADE_TAG_VERIFY_FUNCTION "verify-function"
#define GLADE_TAG_QUERY "query"
#define GLADE_TAG_COMMON "common"
#define GLADE_TAG_OPTIONAL "optional"
#define GLADE_TAG_OPTIONAL_DEFAULT "optional-default"
#define GLADE_TAG_VISIBLE "visible"
#define GLADE_TAG_EXPANDED "expanded"
#define GLADE_TAG_GENERIC_NAME "generic-name"
#define GLADE_TAG_NAME "name"
#define GLADE_TAG_TITLE "title"
#define GLADE_TAG_ID "id"
#define GLADE_TAG_KEY "key"
#define GLADE_TAG_VALUE "value"
#define GLADE_TAG_TRANSLATABLE "translatable"
#define GLADE_TAG_PACKING_DEFAULTS "packing-defaults"
#define GLADE_TAG_PARENT_CLASS "parent-class"
#define GLADE_TAG_CHILD_PROPERTY "child-property"
#define GLADE_TAG_DISPLAYABLE_VALUES "displayable-values"
#define GLADE_TAG_NICK "nick"
#define GLADE_TAG_SPECIAL_CHILD_TYPE "special-child-type"
#define GLADE_TAG_SAVE "save"
#define GLADE_TAG_EDITABLE "editable"
#define GLADE_TAG_IGNORE "ignore"
#define GLADE_TAG_VISIBLE_LINES "visible-lines"
#define GLADE_TAG_RESOURCE "resource"
#define GLADE_TAG_INIT_FUNCTION "init-function"
#define GLADE_TAG_ATK_ACTION "atk-action"
#define GLADE_TAG_ATK_PROPERTY "atk-property"
#define GLADE_TAG_FIXED "fixed"
#define GLADE_TAG_TRANSFER_ON_PASTE "transfer-on-paste"
#define GLADE_TAG_WEIGHT "weight"
#define GLADE_TAG_ACTION_GROUP "action-group"
#define GLADE_TAG_ACTION "action"
#define GLADE_TAG_STOCK "stock"
#define GLADE_TAG_GET_TYPE_FUNCTION "get-type-function"
#define GLADE_NUMERICAL_STEP_INCREMENT 1
#define GLADE_FLOATING_STEP_INCREMENT 0.01F
#define GLADE_NUMERICAL_PAGE_INCREMENT 10
#define GLADE_NUMERICAL_PAGE_SIZE 1
#define GLADE_GENERIC_BORDER_WIDTH 6
#include <gladeui/glade-widget-adaptor.h>
#include <gladeui/glade-widget.h>
#include <gladeui/glade-property-class.h>
#include <gladeui/glade-property.h>
#include <gladeui/glade-project.h>
#include <gladeui/glade-app.h>
#include <gladeui/glade-command.h>
#include <gladeui/glade-editor.h>
#include <gladeui/glade-palette.h>
#include <gladeui/glade-clipboard.h>
#include <gladeui/glade-project-view.h>
#include <gladeui/glade-placeholder.h>
#include <gladeui/glade-utils.h>
#include <gladeui/glade-builtins.h>
#include <gladeui/glade-xml-utils.h>
#include <gladeui/glade-fixed.h>
/* FIXME: should not expose variables in the public interface.
It would be better if these were implemented as
private methods on GladeApp.
*/
LIBGLADEUI_API gboolean glade_verbose;
LIBGLADEUI_API gchar* glade_pixmaps_dir;
LIBGLADEUI_API gchar* glade_scripts_dir;
LIBGLADEUI_API gchar* glade_catalogs_dir;
LIBGLADEUI_API gchar* glade_modules_dir;
LIBGLADEUI_API gchar* glade_plugins_dir;
LIBGLADEUI_API gchar* glade_bindings_dir;
LIBGLADEUI_API gchar* glade_pixmaps_dir;
LIBGLADEUI_API gchar* glade_locale_dir;
LIBGLADEUI_API gchar* glade_icon_dir;
#endif /* __GLADE_H__ */

6
plugins/Makefile.am
View File

@ -1,3 +1,7 @@
## Process this file with automake to produce Makefile.in
SUBDIRS = gtk+ gnome
SUBDIRS = gtk+
if BUILD_GNOME
SUBDIRS += gnome
endif

6
plugins/gnome/Makefile.am
View File

@ -14,10 +14,10 @@ libgladegnome_la_SOURCES = glade-gnome.c
libgladegnome_la_CPPFLAGS = $(AM_CPPFLAGS)
libgladegnome_la_CFLAGS = \
-g -Wall \
-I$(top_srcdir)/gladeui \
-I$(top_builddir)/gladeui \
-I$(top_srcdir) \
-I$(top_builddir) \
-I$(top_srcdir)/plugins/gtk+ \
$(GNOME_CFLAGS) \
$(GNOME_CFLAGS) \
$(AM_CPPFLAGS)
libgladegnome_la_LDFLAGS = -module -avoid-version $(GNOME_LIBS) $(AM_LDFLAGS)
libgladegnome_la_LIBADD = $(libgladeui) $(GLADE_LIBS)

5
plugins/gnome/glade-gnome.c
View File

@ -22,8 +22,9 @@
#include <config.h>
#include <glade.h>
#include <glade-editor-property.h>
#include <gladeui/glade.h>
#include <gladeui/glade-editor-property.h>
#include <glade-gtk.h>
#include <libbonoboui.h>

4
plugins/gtk+/Makefile.am
View File

@ -18,8 +18,8 @@ libgladegtk_la_CPPLAGS = \
libgladegtk_la_CFLAGS = \
-g -Wall \
-I$(top_srcdir) \
-I$(top_srcdir)/gladeui \
-I$(top_builddir)/gladeui \
-I$(top_srcdir) \
-I$(top_builddir) \
$(GTK_CFLAGS) \
$(AM_CFLAGS)

6
plugins/gtk+/glade-gtk.c
View File

@ -26,9 +26,9 @@
#include "glade-gtk.h"
#include <glade-editor-property.h>
#include <glade-base-editor.h>
#include <fixed_bg.xpm>
#include <gladeui/glade-editor-property.h>
#include <gladeui/glade-base-editor.h>
#include <gladeui/fixed_bg.xpm>
#include <gtk/gtk.h>
#include <glib/gi18n-lib.h>

2
plugins/gtk+/glade-gtk.h
View File

@ -2,7 +2,7 @@
#ifndef __GLADE_GTK_H__
#define __GLADE_GTK_H__
#include <glade.h>
#include <gladeui/glade.h>
#include <glib-object.h>
#ifdef G_OS_WIN32

4
src/Makefile.am
View File

@ -3,8 +3,8 @@
bin_PROGRAMS = glade-3
glade_3_CPPFLAGS = \
-I$(top_srcdir)/gladeui \
-I$(top_builddir)/gladeui \
-I$(top_srcdir) \
-I$(top_builddir) \
-DGLADE_GNOMEHELPDIR="\"$(HELP_DIR)\""
$(AM_CPPFLAGS)

11
src/glade-project-window.c
View File

@ -25,17 +25,18 @@
#include <config.h>
#endif
#include "glade-project-window.h"
#include <gladeui/glade.h>
#include <gladeui/glade-design-view.h>
#include <gladeui/glade-binding.h>
#include <string.h>
#include <glib/gstdio.h>
#include <glib/gi18n.h>
#include <gdk/gdkkeysyms.h>
#include <gtk/gtkstock.h>
#include "glade.h"
#include "glade-design-view.h"
#include "glade-project-window.h"
#include "glade-binding.h"
#define GLADE_ACTION_GROUP_STATIC "GladeStatic"
#define GLADE_ACTION_GROUP_PROJECT "GladeProject"
#define GLADE_ACTION_GROUP_PROJECTS_LIST_MENU "GladeProjectsList"

2
src/glade-project-window.h
View File

@ -2,7 +2,7 @@
#ifndef __GLADE_PROJECT_WINDOW_H__
#define __GLADE_PROJECT_WINDOW_H__
#include "glade-app.h"
#include <gladeui/glade-app.h>
G_BEGIN_DECLS

15
src/main.c
View File

@ -25,17 +25,16 @@
#include <config.h>
#endif
#include <glib.h>
#include <glib/gi18n.h>
#include "glade-project-window.h"
#include <locale.h>
#include <gmodule.h>
#include <gladeui/glade.h>
#include <gladeui/glade-debug.h>
#include <stdlib.h> /* defines __argc & __argv on the windows build */
#include "glade.h"
#include "glade-project-window.h"
#include "glade-debug.h"
#include <locale.h>
#include <glib.h>
#include <glib/gi18n.h>
#include <gmodule.h>
#define APPLICATION_NAME (_("Glade"))