diff --git a/ChangeLog b/ChangeLog index cb0b5550..1e2695f4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2007-01-23 Vincent Geddes + + * Reorganised package structure, moved a lot of files + and directories. Modified the Makefile.am in most directories. + + * po/POTFILES.in, po/POTFILES.skip: Update for reorganisation. + + * configure.ac: Add files to AC_CONFIG_FILES. Change AC_CONFIG_SRCDIR. + 2007-01-22 Jeff Westerinen Fix for bug 345603: @@ -8,7 +17,7 @@ - glade_command_cut - glade_command_copy - glade_command_paste - These are now command aliases. + These are now command aliases. - Added a new drag-and-drop command, glade_command_dnd, to replace former glade_command_cut/glade_command_paste command pairs. - Added the following set of canonical commands which comprise the implementation diff --git a/Makefile.am b/Makefile.am index b7fa4177..7cad6b01 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,48 +1,23 @@ ## Process this file with automake to produce Makefile.in if DISABLE_USER_MANUAL -SUBDIRS = src po pixmaps widgets doc +SUBDIRS = po data gladeui src plugins bindings doc else -SUBDIRS = src po pixmaps widgets doc help +SUBDIRS = po data gladeui src plugins bindings help doc endif ACLOCAL_AMFLAGS = -I m4 -@INTLTOOL_DESKTOP_RULE@ - -desktop_in_files = glade-3.desktop.in.in - -desktopdir = $(datadir)/applications -desktop_DATA = $(desktop_in_files:.desktop.in.in=.desktop) - -appicondir = $(datadir)/icons/hicolor/48x48/apps -appicon_DATA = glade-3.png - -gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor - -install-data-hook: update-icon-cache -uninstall-hook: update-icon-cache -update-icon-cache: - @-if test -z "$(DESTDIR)"; then \ - echo "Updating Gtk icon cache."; \ - $(gtk_update_icon_cache); \ - else \ - echo "*** Icon cache not updated. After (un)install, run this:"; \ - echo "*** $(gtk_update_icon_cache)"; \ - fi - EXTRA_DIST = \ + autogen.sh \ COPYING.GPL \ COPYING.LGPL \ m4 \ - glade-3.png \ intltool-extract.in \ intltool-merge.in \ intltool-update.in \ gnome-doc-utils.make -CLEANFILES = $(desktop_DATA) - DISTCLEANFILES = intltool-extract \ intltool-merge \ intltool-update \ diff --git a/bindings/Makefile.am b/bindings/Makefile.am new file mode 100644 index 00000000..0cda9810 --- /dev/null +++ b/bindings/Makefile.am @@ -0,0 +1,3 @@ +## Process this file with automake to produce Makefile.in + +SUBDIRS = python diff --git a/bindings/python/Makefile.am b/bindings/python/Makefile.am new file mode 100644 index 00000000..9be73cdc --- /dev/null +++ b/bindings/python/Makefile.am @@ -0,0 +1,29 @@ +## Process this file with automake to produce Makefile.in + +libgladeui = $(top_builddir)/gladeui/libgladeui-1.la + + +# libgladepython + +gladepython_LTLIBRARIES = libgladepython.la +gladepythondir = $(pkglibdir)/bindings + +libgladepython_la_SOURCES = glade-python.c glade-python-gwa.c +libgladepython_la_CPPFLAGS = \ + -I$(top_srcdir) \ + -I$(top_builddir) \ + $(AM_CPPFLAGS) +libgladepython_la_CFLAGS = \ + -g -Wall \ + $(top_srcdir) \ + -I$(top_srcdir)/gladeui \ + -I$(top_builddir)/gladeui \ + $(PYTHON_CFLAGS) \ + $(GTK_CFLAGS) \ + $(AM_CFLAGS) +libgladepython_la_LDFLAGS = -module -avoid-version $(PYTHON_LIBS) $(AM_LDFLAGS) +libgladepython_la_LIBADD = $(libgladeui) $(PYTHON_LIBS) + +if WITH_WIN32 + libgladepython_la_LDFLAGS += -no-undefined +endif diff --git a/src/glade-python-gwa.c b/bindings/python/glade-python-gwa.c similarity index 99% rename from src/glade-python-gwa.c rename to bindings/python/glade-python-gwa.c index 8cd3d699..64e0f06d 100644 --- a/src/glade-python-gwa.c +++ b/bindings/python/glade-python-gwa.c @@ -7,7 +7,7 @@ #line 23 "glade-python-gwa.override" #include #include -#include "glade.h" +#include static gboolean glade_python_support_init_value (GObject *object, diff --git a/src/glade-python-gwa.defs b/bindings/python/glade-python-gwa.defs similarity index 100% rename from src/glade-python-gwa.defs rename to bindings/python/glade-python-gwa.defs diff --git a/src/glade-python-gwa.override b/bindings/python/glade-python-gwa.override similarity index 99% rename from src/glade-python-gwa.override rename to bindings/python/glade-python-gwa.override index ac5b2b59..d9ab5093 100644 --- a/src/glade-python-gwa.override +++ b/bindings/python/glade-python-gwa.override @@ -20,9 +20,9 @@ */ %% headers +#include #include #include -#include "glade.h" static gboolean glade_python_support_init_value (GObject *object, diff --git a/src/glade-python.c b/bindings/python/glade-python.c similarity index 99% rename from src/glade-python.c rename to bindings/python/glade-python.c index 7228cccf..5e98e531 100644 --- a/src/glade-python.c +++ b/bindings/python/glade-python.c @@ -20,14 +20,15 @@ * Juan Pablo Ugarte */ -#ifdef HAVE_CONFIG_H #include -#endif + + +#include +#include #include #include -#include "glade.h" -#include "glade-binding.h" + static GtkTextBuffer *PythonBuffer = NULL; static GtkTextMark *PythonBufferEnd; diff --git a/configure.ac b/configure.ac index dc589526..293ca60c 100644 --- a/configure.ac +++ b/configure.ac @@ -5,7 +5,7 @@ AC_INIT([glade3], [3.1.4], [http://bugzilla.gnome.org/enter_bug.cgi?product=glade3]) AC_CONFIG_HEADERS([config.h]) -AC_CONFIG_SRCDIR([src/glade.h]) +AC_CONFIG_SRCDIR([gladeui/glade.h]) AC_CONFIG_MACRO_DIR([m4]) AC_CANONICAL_SYSTEM @@ -160,14 +160,24 @@ AC_SUBST([AM_LDFLAGS]) AC_CONFIG_FILES([ Makefile -glade-3.desktop.in -pixmaps/Makefile -pixmaps/16x16/Makefile -pixmaps/22x22/Makefile -widgets/Makefile -po/Makefile.in +data/libgladeui-1.0.pc +data/glade-3.desktop.in +data/Makefile +data/icons/Makefile +gladeui/Makefile src/Makefile -src/libgladeui-1.0.pc +plugins/Makefile +plugins/gtk+/Makefile +plugins/gtk+/icons/Makefile +plugins/gtk+/icons/16x16/Makefile +plugins/gtk+/icons/22x22/Makefile +plugins/gnome/Makefile +plugins/gnome/icons/Makefile +plugins/gnome/icons/16x16/Makefile +plugins/gnome/icons/22x22/Makefile +bindings/Makefile +bindings/python/Makefile +po/Makefile.in doc/Makefile doc/version.xml help/Makefile diff --git a/data/Makefile.am b/data/Makefile.am new file mode 100644 index 00000000..cc6cb98d --- /dev/null +++ b/data/Makefile.am @@ -0,0 +1,19 @@ +## Process this file with automake to produce Makefile.in + +SUBDIRS = icons + +desktopdir = $(datadir)/applications +desktop_in_files = glade-3.desktop.in.in +desktop_DATA = $(desktop_in_files:.desktop.in.in=.desktop) +@INTLTOOL_DESKTOP_RULE@ + +pkgconfigdir = $(libdir)/pkgconfig +pkgconfig_DATA = libgladeui-1.0.pc + +EXTRA_DIST = \ + $(desktop_in_files) \ + libgladeui-1.0.pc.in + +CLEANFILES = \ + $(desktop_DATA) \ + $(pkgconfig_DATA) diff --git a/glade-3.desktop.in.in b/data/glade-3.desktop.in.in similarity index 100% rename from glade-3.desktop.in.in rename to data/glade-3.desktop.in.in diff --git a/data/icons/Makefile.am b/data/icons/Makefile.am new file mode 100644 index 00000000..4060931f --- /dev/null +++ b/data/icons/Makefile.am @@ -0,0 +1,24 @@ +## Process this file with automake to produce Makefile.in + +appicondir = $(datadir)/icons/hicolor/48x48/apps +appicon_DATA = glade-3.png + +gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor + +install-data-hook: update-icon-cache +uninstall-hook: update-icon-cache +update-icon-cache: + @-if test -z "$(DESTDIR)"; then \ + echo "Updating Gtk icon cache."; \ + $(gtk_update_icon_cache); \ + else \ + echo "*** Icon cache not updated. After (un)install, run this:"; \ + echo "*** $(gtk_update_icon_cache)"; \ + fi + + +pixmapsdir = $(pkgdatadir)/pixmaps +pixmaps_DATA = selector.png devhelp.png plus.png + + +EXTRA_DIST = glade-3.png $(pixmaps_DATA) diff --git a/pixmaps/devhelp.png b/data/icons/devhelp.png similarity index 100% rename from pixmaps/devhelp.png rename to data/icons/devhelp.png diff --git a/glade-3.png b/data/icons/glade-3.png similarity index 100% rename from glade-3.png rename to data/icons/glade-3.png diff --git a/pixmaps/plus.png b/data/icons/plus.png similarity index 100% rename from pixmaps/plus.png rename to data/icons/plus.png diff --git a/pixmaps/selector.png b/data/icons/selector.png similarity index 100% rename from pixmaps/selector.png rename to data/icons/selector.png diff --git a/src/libgladeui-1.0.pc.in b/data/libgladeui-1.0.pc.in similarity index 100% rename from src/libgladeui-1.0.pc.in rename to data/libgladeui-1.0.pc.in diff --git a/doc/Makefile.am b/doc/Makefile.am index 20ac89e7..c318559a 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -1,7 +1,7 @@ ## Process this file with automake to produce Makefile.in # We require automake 1.6 at least. -AUTOMAKE_OPTIONS = 1.6 +AUTOMAKE_OPTIONS = 1.9 # This is a blank Makefile.am for using gtk-doc. # Copy this to your project's API docs directory and modify the variables to @@ -17,7 +17,7 @@ DOC_MAIN_SGML_FILE=$(DOC_MODULE)-docs.sgml # The directory containing the source code. Relative to $(srcdir). # gtk-doc will search all .c & .h files beneath here for inline comments # documenting the functions and macros. -DOC_SOURCE_DIR=../src +DOC_SOURCE_DIR=../gladeui # Extra options to pass to gtkdoc-scangobj. Not normally needed. SCANGOBJ_OPTIONS= @@ -42,8 +42,8 @@ FIXXREF_OPTIONS= # Used for dependencies. The docs will be rebuilt if any of these change. # e.g. HFILE_GLOB=$(top_srcdir)/gtk/*.h # e.g. CFILE_GLOB=$(top_srcdir)/gtk/*.c -HFILE_GLOB=$(top_srcdir)/src/*.h -CFILE_GLOB=$(top_srcdir)/src/*.c +HFILE_GLOB=$(top_srcdir)/gladeui/*.h +CFILE_GLOB=$(top_srcdir)/gladeui/*.c # Header files to ignore when scanning. # e.g. IGNORE_HFILES=gtkdebug.h gtkintl.h @@ -53,7 +53,6 @@ IGNORE_HFILES=\ glade-accumulators.h \ glade-marshallers.h \ glade-paths.h \ - glade-project-window.h \ glade-custom.h \ glade-cursor.h \ glade-id-allocator.h \ @@ -94,8 +93,14 @@ expand_content_files=\ # signals and properties. # e.g. INCLUDES=-I$(top_srcdir) -I$(top_builddir) $(GTK_DEBUG_FLAGS) # e.g. GTKDOC_LIBS=$(top_builddir)/gtk/$(gtktargetlib) -INCLUDES=-I$(top_srcdir)/src `pkg-config --cflags gtk+-2.0` -GTKDOC_LIBS=${top_builddir}/src/libgladeui-1.la +GTKDOC_CFLAGS= \ + -I$(top_srcdir)/gladeui \ + -I$(top_builddir)/gladeui \ + -I$(top_srcdir) \ + -I$(top_builddir) \ + `pkg-config --cflags gtk+-2.0` + +GTKDOC_LIBS=${top_builddir}/gladeui/libgladeui-1.la # This includes the standard gtk-doc make rules, copied by gtkdocize. include $(top_srcdir)/gtk-doc.make diff --git a/gladeui/Makefile.am b/gladeui/Makefile.am new file mode 100644 index 00000000..a30649a1 --- /dev/null +++ b/gladeui/Makefile.am @@ -0,0 +1,135 @@ + +common_defines = \ + -DGLADE_DATADIR="\"$(pkgdatadir)\"" \ + -DGLADE_LIBDIR="\"$(pkglibdir)\"" \ + -DGLADE_CATALOGSDIR="\"$(pkgdatadir)/catalogs\""\ + -DGLADE_MODULESDIR="\"$(pkglibdir)/modules\"" \ + -DGLADE_PLUGINSDIR="\"$(pkglibdir)/plugins\"" \ + -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 + +BUILT_SOURCES = glade-marshallers.c glade-marshallers.h + +CLEANFILES = $(BUILT_SOURCES) +EXTRA_DIST = glade-marshallers.list + +# The glade-3 core library +libgladeui_1_la_SOURCES = \ + glade-widget-adaptor.c \ + glade-debug.c \ + glade-project.c \ + glade-parameter.c \ + glade-placeholder.c \ + glade-custom.c \ + glade-project-view.c \ + glade-xml-utils.c \ + glade-palette.c \ + glade-palette-item.c \ + glade-palette-box.c \ + glade-palette-expander.c \ + glade-design-layout.c \ + glade-design-view.c \ + glade-cursor.c \ + glade-property.c \ + glade-property-class.c \ + glade-popup.c \ + glade-widget.c \ + glade-catalog.c \ + glade-editor-property.c \ + glade-editor.c \ + glade-utils.c \ + glade-signal.c \ + glade-signal-editor.c \ + glade-clipboard.c \ + glade-clipboard-view.c \ + glade-command.c \ + glade-id-allocator.c \ + glade-marshallers.c \ + glade-accumulators.c \ + glade-parser.c \ + glade-builtins.c \ + glade-app.c \ + glade-keysyms.c \ + glade-fixed.c \ + glade-binding.c \ + glade-base-editor.c + +libgladeui_1_la_CPPFLAGS = \ + -DINSIDE_LIBGLADEUI \ + $(common_defines) \ + -I$(top_srcdir) \ + -I$(top_builddir) \ + $(AM_CPPFLAGS) + +libgladeui_1_la_CFLAGS = \ + -g -Wall \ + $(GTK_CFLAGS) \ + $(AM_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 +libgladeuiinclude_HEADERS = \ + glade.h \ + glade-debug.h \ + glade-project.h \ + glade-project-view.h \ + glade-parameter.h \ + glade-placeholder.h \ + glade-custom.h \ + glade-editor.h \ + glade-editor-property.h \ + glade-signal-editor.h \ + glade-palette.h \ + glade-palette-item.h \ + glade-palette-box.h \ + glade-palette-expander.h \ + glade-design-layout.h \ + glade-design-view.h \ + glade-cursor.h \ + glade-widget.h \ + glade-widget-adaptor.h \ + glade-property.h \ + glade-property-class.h \ + glade-popup.h \ + glade-catalog.h \ + glade-utils.h \ + glade-signal.h \ + glade-xml-utils.h \ + glade-clipboard.h \ + glade-clipboard-view.h \ + glade-command.h \ + glade-id-allocator.h \ + glade-marshallers.h \ + glade-accumulators.h \ + glade-parser.h \ + glade-app.h \ + glade-builtins.h \ + glade-fixed.h \ + glade-binding.h \ + glade-base-editor.h \ + fixed_bg.xpm \ + atk.xpm + + +if WITH_WIN32 + libgladeui_1_la_LDFLAGS += -no-undefined +endif + +# +# Marshaller generation +# +glade-marshallers.h: glade-marshallers.list $(GLIB_GENMARSHAL) + $(GLIB_GENMARSHAL) --prefix=glade_marshal $(srcdir)/glade-marshallers.list --header > glade-marshallers-h.tmp \ + && mv glade-marshallers-h.tmp glade-marshallers.h \ + || ( rm -f glade-marshallers-h.tmp && exit 1) +glade-marshallers.c: glade-marshallers.list $(GLIB_GENMARSHAL) + $(GLIB_GENMARSHAL) --prefix=glade_marshal $(srcdir)/glade-marshallers.list --body > glade-marshallers-c.tmp \ + && mv glade-marshallers-c.tmp glade-marshallers.c \ + || ( rm -f glade-marshallers-c.tmp && exit 1 ) diff --git a/src/atk.xpm b/gladeui/atk.xpm similarity index 100% rename from src/atk.xpm rename to gladeui/atk.xpm diff --git a/src/fixed_bg.xpm b/gladeui/fixed_bg.xpm similarity index 100% rename from src/fixed_bg.xpm rename to gladeui/fixed_bg.xpm diff --git a/src/glade-accumulators.c b/gladeui/glade-accumulators.c similarity index 100% rename from src/glade-accumulators.c rename to gladeui/glade-accumulators.c diff --git a/src/glade-accumulators.h b/gladeui/glade-accumulators.h similarity index 100% rename from src/glade-accumulators.h rename to gladeui/glade-accumulators.h diff --git a/src/glade-app.c b/gladeui/glade-app.c similarity index 100% rename from src/glade-app.c rename to gladeui/glade-app.c diff --git a/src/glade-app.h b/gladeui/glade-app.h similarity index 100% rename from src/glade-app.h rename to gladeui/glade-app.h diff --git a/src/glade-base-editor.c b/gladeui/glade-base-editor.c similarity index 100% rename from src/glade-base-editor.c rename to gladeui/glade-base-editor.c diff --git a/src/glade-base-editor.h b/gladeui/glade-base-editor.h similarity index 100% rename from src/glade-base-editor.h rename to gladeui/glade-base-editor.h diff --git a/src/glade-binding.c b/gladeui/glade-binding.c similarity index 100% rename from src/glade-binding.c rename to gladeui/glade-binding.c diff --git a/src/glade-binding.h b/gladeui/glade-binding.h similarity index 100% rename from src/glade-binding.h rename to gladeui/glade-binding.h diff --git a/src/glade-builtins.c b/gladeui/glade-builtins.c similarity index 100% rename from src/glade-builtins.c rename to gladeui/glade-builtins.c diff --git a/src/glade-builtins.h b/gladeui/glade-builtins.h similarity index 100% rename from src/glade-builtins.h rename to gladeui/glade-builtins.h diff --git a/src/glade-catalog.c b/gladeui/glade-catalog.c similarity index 100% rename from src/glade-catalog.c rename to gladeui/glade-catalog.c diff --git a/src/glade-catalog.h b/gladeui/glade-catalog.h similarity index 100% rename from src/glade-catalog.h rename to gladeui/glade-catalog.h diff --git a/src/glade-clipboard-view.c b/gladeui/glade-clipboard-view.c similarity index 100% rename from src/glade-clipboard-view.c rename to gladeui/glade-clipboard-view.c diff --git a/src/glade-clipboard-view.h b/gladeui/glade-clipboard-view.h similarity index 100% rename from src/glade-clipboard-view.h rename to gladeui/glade-clipboard-view.h diff --git a/src/glade-clipboard.c b/gladeui/glade-clipboard.c similarity index 100% rename from src/glade-clipboard.c rename to gladeui/glade-clipboard.c diff --git a/src/glade-clipboard.h b/gladeui/glade-clipboard.h similarity index 100% rename from src/glade-clipboard.h rename to gladeui/glade-clipboard.h diff --git a/src/glade-command.c b/gladeui/glade-command.c similarity index 100% rename from src/glade-command.c rename to gladeui/glade-command.c diff --git a/src/glade-command.h b/gladeui/glade-command.h similarity index 100% rename from src/glade-command.h rename to gladeui/glade-command.h diff --git a/src/glade-cursor.c b/gladeui/glade-cursor.c similarity index 100% rename from src/glade-cursor.c rename to gladeui/glade-cursor.c diff --git a/src/glade-cursor.h b/gladeui/glade-cursor.h similarity index 100% rename from src/glade-cursor.h rename to gladeui/glade-cursor.h diff --git a/src/glade-custom.c b/gladeui/glade-custom.c similarity index 100% rename from src/glade-custom.c rename to gladeui/glade-custom.c diff --git a/src/glade-custom.h b/gladeui/glade-custom.h similarity index 100% rename from src/glade-custom.h rename to gladeui/glade-custom.h diff --git a/src/glade-debug.c b/gladeui/glade-debug.c similarity index 100% rename from src/glade-debug.c rename to gladeui/glade-debug.c diff --git a/src/glade-debug.h b/gladeui/glade-debug.h similarity index 100% rename from src/glade-debug.h rename to gladeui/glade-debug.h diff --git a/src/glade-design-layout.c b/gladeui/glade-design-layout.c similarity index 100% rename from src/glade-design-layout.c rename to gladeui/glade-design-layout.c diff --git a/src/glade-design-layout.h b/gladeui/glade-design-layout.h similarity index 100% rename from src/glade-design-layout.h rename to gladeui/glade-design-layout.h diff --git a/src/glade-design-view.c b/gladeui/glade-design-view.c similarity index 100% rename from src/glade-design-view.c rename to gladeui/glade-design-view.c diff --git a/src/glade-design-view.h b/gladeui/glade-design-view.h similarity index 100% rename from src/glade-design-view.h rename to gladeui/glade-design-view.h diff --git a/src/glade-editor-property.c b/gladeui/glade-editor-property.c similarity index 100% rename from src/glade-editor-property.c rename to gladeui/glade-editor-property.c diff --git a/src/glade-editor-property.h b/gladeui/glade-editor-property.h similarity index 100% rename from src/glade-editor-property.h rename to gladeui/glade-editor-property.h diff --git a/src/glade-editor.c b/gladeui/glade-editor.c similarity index 100% rename from src/glade-editor.c rename to gladeui/glade-editor.c diff --git a/src/glade-editor.h b/gladeui/glade-editor.h similarity index 100% rename from src/glade-editor.h rename to gladeui/glade-editor.h diff --git a/src/glade-fixed.c b/gladeui/glade-fixed.c similarity index 100% rename from src/glade-fixed.c rename to gladeui/glade-fixed.c diff --git a/src/glade-fixed.h b/gladeui/glade-fixed.h similarity index 100% rename from src/glade-fixed.h rename to gladeui/glade-fixed.h diff --git a/src/glade-id-allocator.c b/gladeui/glade-id-allocator.c similarity index 100% rename from src/glade-id-allocator.c rename to gladeui/glade-id-allocator.c diff --git a/src/glade-id-allocator.h b/gladeui/glade-id-allocator.h similarity index 100% rename from src/glade-id-allocator.h rename to gladeui/glade-id-allocator.h diff --git a/src/glade-keysyms.c b/gladeui/glade-keysyms.c similarity index 100% rename from src/glade-keysyms.c rename to gladeui/glade-keysyms.c diff --git a/src/glade-marshallers.list b/gladeui/glade-marshallers.list similarity index 100% rename from src/glade-marshallers.list rename to gladeui/glade-marshallers.list diff --git a/src/glade-palette-box.c b/gladeui/glade-palette-box.c similarity index 100% rename from src/glade-palette-box.c rename to gladeui/glade-palette-box.c diff --git a/src/glade-palette-box.h b/gladeui/glade-palette-box.h similarity index 100% rename from src/glade-palette-box.h rename to gladeui/glade-palette-box.h diff --git a/src/glade-palette-expander.c b/gladeui/glade-palette-expander.c similarity index 100% rename from src/glade-palette-expander.c rename to gladeui/glade-palette-expander.c diff --git a/src/glade-palette-expander.h b/gladeui/glade-palette-expander.h similarity index 100% rename from src/glade-palette-expander.h rename to gladeui/glade-palette-expander.h diff --git a/src/glade-palette-item.c b/gladeui/glade-palette-item.c similarity index 100% rename from src/glade-palette-item.c rename to gladeui/glade-palette-item.c diff --git a/src/glade-palette-item.h b/gladeui/glade-palette-item.h similarity index 100% rename from src/glade-palette-item.h rename to gladeui/glade-palette-item.h diff --git a/src/glade-palette.c b/gladeui/glade-palette.c similarity index 100% rename from src/glade-palette.c rename to gladeui/glade-palette.c diff --git a/src/glade-palette.h b/gladeui/glade-palette.h similarity index 100% rename from src/glade-palette.h rename to gladeui/glade-palette.h diff --git a/src/glade-parameter.c b/gladeui/glade-parameter.c similarity index 100% rename from src/glade-parameter.c rename to gladeui/glade-parameter.c diff --git a/src/glade-parameter.h b/gladeui/glade-parameter.h similarity index 100% rename from src/glade-parameter.h rename to gladeui/glade-parameter.h diff --git a/src/glade-parser.c b/gladeui/glade-parser.c similarity index 100% rename from src/glade-parser.c rename to gladeui/glade-parser.c diff --git a/src/glade-parser.h b/gladeui/glade-parser.h similarity index 100% rename from src/glade-parser.h rename to gladeui/glade-parser.h diff --git a/src/glade-placeholder.c b/gladeui/glade-placeholder.c similarity index 100% rename from src/glade-placeholder.c rename to gladeui/glade-placeholder.c diff --git a/src/glade-placeholder.h b/gladeui/glade-placeholder.h similarity index 100% rename from src/glade-placeholder.h rename to gladeui/glade-placeholder.h diff --git a/src/glade-popup.c b/gladeui/glade-popup.c similarity index 100% rename from src/glade-popup.c rename to gladeui/glade-popup.c diff --git a/src/glade-popup.h b/gladeui/glade-popup.h similarity index 100% rename from src/glade-popup.h rename to gladeui/glade-popup.h diff --git a/src/glade-project-view.c b/gladeui/glade-project-view.c similarity index 100% rename from src/glade-project-view.c rename to gladeui/glade-project-view.c diff --git a/src/glade-project-view.h b/gladeui/glade-project-view.h similarity index 100% rename from src/glade-project-view.h rename to gladeui/glade-project-view.h diff --git a/src/glade-project.c b/gladeui/glade-project.c similarity index 100% rename from src/glade-project.c rename to gladeui/glade-project.c diff --git a/src/glade-project.h b/gladeui/glade-project.h similarity index 100% rename from src/glade-project.h rename to gladeui/glade-project.h diff --git a/src/glade-property-class.c b/gladeui/glade-property-class.c similarity index 100% rename from src/glade-property-class.c rename to gladeui/glade-property-class.c diff --git a/src/glade-property-class.h b/gladeui/glade-property-class.h similarity index 100% rename from src/glade-property-class.h rename to gladeui/glade-property-class.h diff --git a/src/glade-property.c b/gladeui/glade-property.c similarity index 100% rename from src/glade-property.c rename to gladeui/glade-property.c diff --git a/src/glade-property.h b/gladeui/glade-property.h similarity index 100% rename from src/glade-property.h rename to gladeui/glade-property.h diff --git a/src/glade-signal-editor.c b/gladeui/glade-signal-editor.c similarity index 100% rename from src/glade-signal-editor.c rename to gladeui/glade-signal-editor.c diff --git a/src/glade-signal-editor.h b/gladeui/glade-signal-editor.h similarity index 100% rename from src/glade-signal-editor.h rename to gladeui/glade-signal-editor.h diff --git a/src/glade-signal.c b/gladeui/glade-signal.c similarity index 100% rename from src/glade-signal.c rename to gladeui/glade-signal.c diff --git a/src/glade-signal.h b/gladeui/glade-signal.h similarity index 100% rename from src/glade-signal.h rename to gladeui/glade-signal.h diff --git a/src/glade-utils.c b/gladeui/glade-utils.c similarity index 99% rename from src/glade-utils.c rename to gladeui/glade-utils.c index b8f03e62..6c003835 100644 --- a/src/glade-utils.c +++ b/gladeui/glade-utils.c @@ -33,7 +33,6 @@ #include "glade.h" #include "glade-project.h" -#include "glade-project-window.h" #include "glade-command.h" #include "glade-debug.h" #include "glade-placeholder.h" diff --git a/src/glade-utils.h b/gladeui/glade-utils.h similarity index 100% rename from src/glade-utils.h rename to gladeui/glade-utils.h diff --git a/src/glade-widget-adaptor.c b/gladeui/glade-widget-adaptor.c similarity index 100% rename from src/glade-widget-adaptor.c rename to gladeui/glade-widget-adaptor.c diff --git a/src/glade-widget-adaptor.h b/gladeui/glade-widget-adaptor.h similarity index 100% rename from src/glade-widget-adaptor.h rename to gladeui/glade-widget-adaptor.h diff --git a/src/glade-widget.c b/gladeui/glade-widget.c similarity index 100% rename from src/glade-widget.c rename to gladeui/glade-widget.c diff --git a/src/glade-widget.h b/gladeui/glade-widget.h similarity index 100% rename from src/glade-widget.h rename to gladeui/glade-widget.h diff --git a/src/glade-xml-utils.c b/gladeui/glade-xml-utils.c similarity index 100% rename from src/glade-xml-utils.c rename to gladeui/glade-xml-utils.c diff --git a/src/glade-xml-utils.h b/gladeui/glade-xml-utils.h similarity index 100% rename from src/glade-xml-utils.h rename to gladeui/glade-xml-utils.h diff --git a/src/glade.h b/gladeui/glade.h similarity index 100% rename from src/glade.h rename to gladeui/glade.h diff --git a/src/glade_plugin.def b/gladeui/glade_plugin.def similarity index 100% rename from src/glade_plugin.def rename to gladeui/glade_plugin.def diff --git a/pixmaps/Makefile.am b/pixmaps/Makefile.am deleted file mode 100644 index a291a229..00000000 --- a/pixmaps/Makefile.am +++ /dev/null @@ -1,8 +0,0 @@ - -SUBDIRS = 16x16 22x22 - -pixmapsdir = $(pkgdatadir)/pixmaps -pixmaps_DATA = selector.png devhelp.png plus.png - - -EXTRA_DIST = $(pixmaps_DATA) diff --git a/plugins/Makefile.am b/plugins/Makefile.am new file mode 100644 index 00000000..a65e7a2b --- /dev/null +++ b/plugins/Makefile.am @@ -0,0 +1,3 @@ +## Process this file with automake to produce Makefile.in + +SUBDIRS = gtk+ gnome diff --git a/widgets/glade-catalog.dtd b/plugins/glade-catalog.dtd similarity index 100% rename from widgets/glade-catalog.dtd rename to plugins/glade-catalog.dtd diff --git a/plugins/gnome/Makefile.am b/plugins/gnome/Makefile.am new file mode 100644 index 00000000..879751ef --- /dev/null +++ b/plugins/gnome/Makefile.am @@ -0,0 +1,44 @@ +## Process this file with automake to produce Makefile.in + +SUBDIRS = icons + +libgladeui = $(top_builddir)/gladeui/libgladeui-1.la + + +# libgladegnome + +gladegnome_LTLIBRARIES = libgladegnome.la +gladegnomedir = $(pkglibdir)/modules + +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)/plugins/gtk+ \ + $(GNOME_CFLAGS) \ + $(AM_CPPFLAGS) +libgladegnome_la_LDFLAGS = -module -avoid-version $(GNOME_LIBS) $(AM_LDFLAGS) +libgladegnome_la_LIBADD = $(libgladeui) $(GLADE_LIBS) + +if WITH_WIN32 + libgladegnome_la_LDFLAGS += -no-undefined +endif + + +# catalog data + +catalogsdir = $(pkgdatadir)/catalogs +catalogs_DATA = bonobo.xml \ + canvas.xml \ + gnome.xml \ + bonobo.xml.in \ + canvas.xml.in \ + gnome.xml.in +@INTLTOOL_XML_NOMERGE_RULE@ + + +CLEANFILES = bonobo.xml canvas.xml gnome.xml + +EXTRA_DIST = $(catalogs_DATA) diff --git a/widgets/bonobo.xml.in b/plugins/gnome/bonobo.xml.in similarity index 100% rename from widgets/bonobo.xml.in rename to plugins/gnome/bonobo.xml.in diff --git a/widgets/canvas.xml.in b/plugins/gnome/canvas.xml.in similarity index 100% rename from widgets/canvas.xml.in rename to plugins/gnome/canvas.xml.in diff --git a/src/glade-gnome.c b/plugins/gnome/glade-gnome.c similarity index 99% rename from src/glade-gnome.c rename to plugins/gnome/glade-gnome.c index 4949ad60..893145f7 100644 --- a/src/glade-gnome.c +++ b/plugins/gnome/glade-gnome.c @@ -20,16 +20,21 @@ * Juan Pablo Ugarte */ -#include "config.h" +#include + +#include +#include +#include -#include "glade.h" -#include "glade-editor-property.h" #include #include #include -#include "glade-gtk.h" -#define GLADEGNOME_API GLADEGTK_API +#ifdef G_OS_WIN32 +#define GLADEGNOME_API __declspec(dllexport) +#else +#define GLADEGNOME_API +#endif /* This function does absolutely nothing * (and is for use in overriding post_create functions). diff --git a/widgets/gnome.xml.in b/plugins/gnome/gnome.xml.in similarity index 100% rename from widgets/gnome.xml.in rename to plugins/gnome/gnome.xml.in diff --git a/plugins/gnome/icons/16x16/Makefile.am b/plugins/gnome/icons/16x16/Makefile.am new file mode 100644 index 00000000..985dd7c0 --- /dev/null +++ b/plugins/gnome/icons/16x16/Makefile.am @@ -0,0 +1,31 @@ +## Process this file with automake to produce Makefile.in + +iconsdir = $(pkgdatadir)/pixmaps/16x16 + +icons_DATA = \ + bonobodock.png \ + bonobodockitem.png \ + gnomehref.png \ + gnomeapp.png \ + gnomeappbar.png \ + gnomecanvas.png \ + gnomedateedit.png \ + gnomeiconentry.png \ + gnomeiconselection.png \ + gnomedruid.png \ + gnomedruidpageedge.png \ + gnomedruidpagestandard.png \ + gnomepixmap.png \ + gnomepropertybox.png \ + gnomecolorpicker.png \ + gnomepixmapentry.png \ + gnomeabout.png \ + gnomeentry.png \ + gnomeappbar.png \ + gnomedialog.png \ + gnomefileentry.png \ + gnomefontpicker.png \ + gnomeiconlist.png \ + gnomemessagebox.png + +EXTRA_DIST = $(icons_DATA) diff --git a/pixmaps/16x16/bonobodock.png b/plugins/gnome/icons/16x16/bonobodock.png similarity index 100% rename from pixmaps/16x16/bonobodock.png rename to plugins/gnome/icons/16x16/bonobodock.png diff --git a/pixmaps/16x16/bonobodockitem.png b/plugins/gnome/icons/16x16/bonobodockitem.png similarity index 100% rename from pixmaps/16x16/bonobodockitem.png rename to plugins/gnome/icons/16x16/bonobodockitem.png diff --git a/pixmaps/16x16/gnomeabout.png b/plugins/gnome/icons/16x16/gnomeabout.png similarity index 100% rename from pixmaps/16x16/gnomeabout.png rename to plugins/gnome/icons/16x16/gnomeabout.png diff --git a/pixmaps/16x16/gnomeapp.png b/plugins/gnome/icons/16x16/gnomeapp.png similarity index 100% rename from pixmaps/16x16/gnomeapp.png rename to plugins/gnome/icons/16x16/gnomeapp.png diff --git a/pixmaps/16x16/gnomeappbar.png b/plugins/gnome/icons/16x16/gnomeappbar.png similarity index 100% rename from pixmaps/16x16/gnomeappbar.png rename to plugins/gnome/icons/16x16/gnomeappbar.png diff --git a/pixmaps/16x16/gnomecanvas.png b/plugins/gnome/icons/16x16/gnomecanvas.png similarity index 100% rename from pixmaps/16x16/gnomecanvas.png rename to plugins/gnome/icons/16x16/gnomecanvas.png diff --git a/pixmaps/16x16/gnomecolorpicker.png b/plugins/gnome/icons/16x16/gnomecolorpicker.png similarity index 100% rename from pixmaps/16x16/gnomecolorpicker.png rename to plugins/gnome/icons/16x16/gnomecolorpicker.png diff --git a/pixmaps/16x16/gnomedateedit.png b/plugins/gnome/icons/16x16/gnomedateedit.png similarity index 100% rename from pixmaps/16x16/gnomedateedit.png rename to plugins/gnome/icons/16x16/gnomedateedit.png diff --git a/pixmaps/16x16/gnomedialog.png b/plugins/gnome/icons/16x16/gnomedialog.png similarity index 100% rename from pixmaps/16x16/gnomedialog.png rename to plugins/gnome/icons/16x16/gnomedialog.png diff --git a/pixmaps/16x16/gnomedruid.png b/plugins/gnome/icons/16x16/gnomedruid.png similarity index 100% rename from pixmaps/16x16/gnomedruid.png rename to plugins/gnome/icons/16x16/gnomedruid.png diff --git a/pixmaps/16x16/gnomedruidpageedge.png b/plugins/gnome/icons/16x16/gnomedruidpageedge.png similarity index 100% rename from pixmaps/16x16/gnomedruidpageedge.png rename to plugins/gnome/icons/16x16/gnomedruidpageedge.png diff --git a/pixmaps/16x16/gnomedruidpagestandard.png b/plugins/gnome/icons/16x16/gnomedruidpagestandard.png similarity index 100% rename from pixmaps/16x16/gnomedruidpagestandard.png rename to plugins/gnome/icons/16x16/gnomedruidpagestandard.png diff --git a/pixmaps/16x16/gnomeentry.png b/plugins/gnome/icons/16x16/gnomeentry.png similarity index 100% rename from pixmaps/16x16/gnomeentry.png rename to plugins/gnome/icons/16x16/gnomeentry.png diff --git a/pixmaps/16x16/gnomefileentry.png b/plugins/gnome/icons/16x16/gnomefileentry.png similarity index 100% rename from pixmaps/16x16/gnomefileentry.png rename to plugins/gnome/icons/16x16/gnomefileentry.png diff --git a/pixmaps/16x16/gnomefontpicker.png b/plugins/gnome/icons/16x16/gnomefontpicker.png similarity index 100% rename from pixmaps/16x16/gnomefontpicker.png rename to plugins/gnome/icons/16x16/gnomefontpicker.png diff --git a/pixmaps/16x16/gnomehref.png b/plugins/gnome/icons/16x16/gnomehref.png similarity index 100% rename from pixmaps/16x16/gnomehref.png rename to plugins/gnome/icons/16x16/gnomehref.png diff --git a/pixmaps/16x16/gnomeiconentry.png b/plugins/gnome/icons/16x16/gnomeiconentry.png similarity index 100% rename from pixmaps/16x16/gnomeiconentry.png rename to plugins/gnome/icons/16x16/gnomeiconentry.png diff --git a/pixmaps/16x16/gnomeiconlist.png b/plugins/gnome/icons/16x16/gnomeiconlist.png similarity index 100% rename from pixmaps/16x16/gnomeiconlist.png rename to plugins/gnome/icons/16x16/gnomeiconlist.png diff --git a/pixmaps/16x16/gnomeiconselection.png b/plugins/gnome/icons/16x16/gnomeiconselection.png similarity index 100% rename from pixmaps/16x16/gnomeiconselection.png rename to plugins/gnome/icons/16x16/gnomeiconselection.png diff --git a/pixmaps/16x16/gnomemessagebox.png b/plugins/gnome/icons/16x16/gnomemessagebox.png similarity index 100% rename from pixmaps/16x16/gnomemessagebox.png rename to plugins/gnome/icons/16x16/gnomemessagebox.png diff --git a/pixmaps/16x16/gnomepixmap.png b/plugins/gnome/icons/16x16/gnomepixmap.png similarity index 100% rename from pixmaps/16x16/gnomepixmap.png rename to plugins/gnome/icons/16x16/gnomepixmap.png diff --git a/pixmaps/16x16/gnomepixmapentry.png b/plugins/gnome/icons/16x16/gnomepixmapentry.png similarity index 100% rename from pixmaps/16x16/gnomepixmapentry.png rename to plugins/gnome/icons/16x16/gnomepixmapentry.png diff --git a/pixmaps/16x16/gnomepropertybox.png b/plugins/gnome/icons/16x16/gnomepropertybox.png similarity index 100% rename from pixmaps/16x16/gnomepropertybox.png rename to plugins/gnome/icons/16x16/gnomepropertybox.png diff --git a/plugins/gnome/icons/22x22/Makefile.am b/plugins/gnome/icons/22x22/Makefile.am new file mode 100644 index 00000000..3e1629b7 --- /dev/null +++ b/plugins/gnome/icons/22x22/Makefile.am @@ -0,0 +1,31 @@ +## Process this file with automake to produce Makefile.in + +iconsdir = $(pkgdatadir)/pixmaps/22x22 + +icons_DATA = \ + bonobodock.png \ + bonobodockitem.png \ + gnomehref.png \ + gnomeapp.png \ + gnomeappbar.png \ + gnomecanvas.png \ + gnomedateedit.png \ + gnomeiconentry.png \ + gnomeiconselection.png \ + gnomedruid.png \ + gnomedruidpageedge.png \ + gnomedruidpagestandard.png \ + gnomepixmap.png \ + gnomepropertybox.png \ + gnomecolorpicker.png \ + gnomepixmapentry.png \ + gnomeabout.png \ + gnomeentry.png \ + gnomeappbar.png \ + gnomedialog.png \ + gnomefileentry.png \ + gnomefontpicker.png \ + gnomeiconlist.png \ + gnomemessagebox.png + +EXTRA_DIST = $(icons_DATA) diff --git a/pixmaps/22x22/bonobodock.png b/plugins/gnome/icons/22x22/bonobodock.png similarity index 100% rename from pixmaps/22x22/bonobodock.png rename to plugins/gnome/icons/22x22/bonobodock.png diff --git a/pixmaps/22x22/bonobodockitem.png b/plugins/gnome/icons/22x22/bonobodockitem.png similarity index 100% rename from pixmaps/22x22/bonobodockitem.png rename to plugins/gnome/icons/22x22/bonobodockitem.png diff --git a/pixmaps/22x22/gnomeabout.png b/plugins/gnome/icons/22x22/gnomeabout.png similarity index 100% rename from pixmaps/22x22/gnomeabout.png rename to plugins/gnome/icons/22x22/gnomeabout.png diff --git a/pixmaps/22x22/gnomeapp.png b/plugins/gnome/icons/22x22/gnomeapp.png similarity index 100% rename from pixmaps/22x22/gnomeapp.png rename to plugins/gnome/icons/22x22/gnomeapp.png diff --git a/pixmaps/22x22/gnomeappbar.png b/plugins/gnome/icons/22x22/gnomeappbar.png similarity index 100% rename from pixmaps/22x22/gnomeappbar.png rename to plugins/gnome/icons/22x22/gnomeappbar.png diff --git a/pixmaps/22x22/gnomecanvas.png b/plugins/gnome/icons/22x22/gnomecanvas.png similarity index 100% rename from pixmaps/22x22/gnomecanvas.png rename to plugins/gnome/icons/22x22/gnomecanvas.png diff --git a/pixmaps/22x22/gnomecolorpicker.png b/plugins/gnome/icons/22x22/gnomecolorpicker.png similarity index 100% rename from pixmaps/22x22/gnomecolorpicker.png rename to plugins/gnome/icons/22x22/gnomecolorpicker.png diff --git a/pixmaps/22x22/gnomedateedit.png b/plugins/gnome/icons/22x22/gnomedateedit.png similarity index 100% rename from pixmaps/22x22/gnomedateedit.png rename to plugins/gnome/icons/22x22/gnomedateedit.png diff --git a/pixmaps/22x22/gnomedialog.png b/plugins/gnome/icons/22x22/gnomedialog.png similarity index 100% rename from pixmaps/22x22/gnomedialog.png rename to plugins/gnome/icons/22x22/gnomedialog.png diff --git a/pixmaps/22x22/gnomedruid.png b/plugins/gnome/icons/22x22/gnomedruid.png similarity index 100% rename from pixmaps/22x22/gnomedruid.png rename to plugins/gnome/icons/22x22/gnomedruid.png diff --git a/pixmaps/22x22/gnomedruidpageedge.png b/plugins/gnome/icons/22x22/gnomedruidpageedge.png similarity index 100% rename from pixmaps/22x22/gnomedruidpageedge.png rename to plugins/gnome/icons/22x22/gnomedruidpageedge.png diff --git a/pixmaps/22x22/gnomedruidpagestandard.png b/plugins/gnome/icons/22x22/gnomedruidpagestandard.png similarity index 100% rename from pixmaps/22x22/gnomedruidpagestandard.png rename to plugins/gnome/icons/22x22/gnomedruidpagestandard.png diff --git a/pixmaps/22x22/gnomeentry.png b/plugins/gnome/icons/22x22/gnomeentry.png similarity index 100% rename from pixmaps/22x22/gnomeentry.png rename to plugins/gnome/icons/22x22/gnomeentry.png diff --git a/pixmaps/22x22/gnomefileentry.png b/plugins/gnome/icons/22x22/gnomefileentry.png similarity index 100% rename from pixmaps/22x22/gnomefileentry.png rename to plugins/gnome/icons/22x22/gnomefileentry.png diff --git a/pixmaps/22x22/gnomefontpicker.png b/plugins/gnome/icons/22x22/gnomefontpicker.png similarity index 100% rename from pixmaps/22x22/gnomefontpicker.png rename to plugins/gnome/icons/22x22/gnomefontpicker.png diff --git a/pixmaps/22x22/gnomehref.png b/plugins/gnome/icons/22x22/gnomehref.png similarity index 100% rename from pixmaps/22x22/gnomehref.png rename to plugins/gnome/icons/22x22/gnomehref.png diff --git a/pixmaps/22x22/gnomeiconentry.png b/plugins/gnome/icons/22x22/gnomeiconentry.png similarity index 100% rename from pixmaps/22x22/gnomeiconentry.png rename to plugins/gnome/icons/22x22/gnomeiconentry.png diff --git a/pixmaps/22x22/gnomeiconlist.png b/plugins/gnome/icons/22x22/gnomeiconlist.png similarity index 100% rename from pixmaps/22x22/gnomeiconlist.png rename to plugins/gnome/icons/22x22/gnomeiconlist.png diff --git a/pixmaps/22x22/gnomeiconselection.png b/plugins/gnome/icons/22x22/gnomeiconselection.png similarity index 100% rename from pixmaps/22x22/gnomeiconselection.png rename to plugins/gnome/icons/22x22/gnomeiconselection.png diff --git a/pixmaps/22x22/gnomemessagebox.png b/plugins/gnome/icons/22x22/gnomemessagebox.png similarity index 100% rename from pixmaps/22x22/gnomemessagebox.png rename to plugins/gnome/icons/22x22/gnomemessagebox.png diff --git a/pixmaps/22x22/gnomepixmap.png b/plugins/gnome/icons/22x22/gnomepixmap.png similarity index 100% rename from pixmaps/22x22/gnomepixmap.png rename to plugins/gnome/icons/22x22/gnomepixmap.png diff --git a/pixmaps/22x22/gnomepixmapentry.png b/plugins/gnome/icons/22x22/gnomepixmapentry.png similarity index 100% rename from pixmaps/22x22/gnomepixmapentry.png rename to plugins/gnome/icons/22x22/gnomepixmapentry.png diff --git a/pixmaps/22x22/gnomepropertybox.png b/plugins/gnome/icons/22x22/gnomepropertybox.png similarity index 100% rename from pixmaps/22x22/gnomepropertybox.png rename to plugins/gnome/icons/22x22/gnomepropertybox.png diff --git a/plugins/gnome/icons/Makefile.am b/plugins/gnome/icons/Makefile.am new file mode 100644 index 00000000..bd39c36e --- /dev/null +++ b/plugins/gnome/icons/Makefile.am @@ -0,0 +1,3 @@ +## Process this file with automake to produce Makefile.in + +SUBDIRS = 16x16 22x22 diff --git a/plugins/gtk+/Makefile.am b/plugins/gtk+/Makefile.am new file mode 100644 index 00000000..2200ee4c --- /dev/null +++ b/plugins/gtk+/Makefile.am @@ -0,0 +1,44 @@ +## Process this file with automake to produce Makefile.in + +SUBDIRS = icons + +libgladeui = $(top_builddir)/gladeui/libgladeui-1.la + + +# libgladegtk + +gladegtk_LTLIBRARIES = libgladegtk.la +gladegtkdir = $(pkglibdir)/modules + +libgladegtk_la_CPPLAGS = \ + -I$(top_srcdir) \ + -I$(top_builddir) \ + $(AM_CPPFLAGS) + +libgladegtk_la_CFLAGS = \ + -g -Wall \ + -I$(top_srcdir) \ + -I$(top_srcdir)/gladeui \ + -I$(top_builddir)/gladeui \ + $(GTK_CFLAGS) \ + $(AM_CFLAGS) + +libgladegtk_la_SOURCES = glade-gtk.c glade-gtk.h +libgladegtk_la_LDFLAGS = -module -avoid-version $(AM_LDFLAGS) +libgladegtk_la_LIBADD = $(libgladeui) $(GTK_LIBS) + +if WITH_WIN32 + libgladegtk_la_LDFLAGS += -no-undefined +endif + + +# catalog data + +catalogsdir = $(pkgdatadir)/catalogs +catalogs_DATA = gtk+.xml gtk+.xml.in +@INTLTOOL_XML_NOMERGE_RULE@ + + +CLEANFILES = gtk+.xml + +EXTRA_DIST = $(catalogs_DATA) diff --git a/src/glade-gtk.c b/plugins/gtk+/glade-gtk.c similarity index 99% rename from src/glade-gtk.c rename to plugins/gtk+/glade-gtk.c index c947a29d..fdceffce 100644 --- a/src/glade-gtk.c +++ b/plugins/gtk+/glade-gtk.c @@ -22,20 +22,18 @@ * Juan Pablo Ugarte */ -#include -#include +#include #include "glade-gtk.h" -#include "glade-editor-property.h" -#include "glade-base-editor.h" -#include "fixed_bg.xpm" - -#ifdef HAVE_CONFIG_H -#include -#endif +#include +#include +#include +#include #include +#include +#include /* --------------------------------- Constants ------------------------------ */ #define FIXED_DEFAULT_CHILD_WIDTH 100 diff --git a/src/glade-gtk.h b/plugins/gtk+/glade-gtk.h similarity index 93% rename from src/glade-gtk.h rename to plugins/gtk+/glade-gtk.h index 1396b41c..d5666cdc 100644 --- a/src/glade-gtk.h +++ b/plugins/gtk+/glade-gtk.h @@ -2,7 +2,8 @@ #ifndef __GLADE_GTK_H__ #define __GLADE_GTK_H__ -#include "glade.h" +#include +#include #ifdef G_OS_WIN32 #define GLADEGTK_API __declspec(dllexport) diff --git a/widgets/gtk+.xml.in b/plugins/gtk+/gtk+.xml.in similarity index 100% rename from widgets/gtk+.xml.in rename to plugins/gtk+/gtk+.xml.in diff --git a/pixmaps/.cvsignore b/plugins/gtk+/icons/.cvsignore similarity index 100% rename from pixmaps/.cvsignore rename to plugins/gtk+/icons/.cvsignore diff --git a/pixmaps/22x22/Makefile.am b/plugins/gtk+/icons/16x16/Makefile.am similarity index 69% rename from pixmaps/22x22/Makefile.am rename to plugins/gtk+/icons/16x16/Makefile.am index a958ad09..4af8d58a 100644 --- a/pixmaps/22x22/Makefile.am +++ b/plugins/gtk+/icons/16x16/Makefile.am @@ -1,6 +1,8 @@ -largeiconsdir = $(pkgdatadir)/pixmaps/22x22 +## Process this file with automake to produce Makefile.in -largeicons_DATA = \ +iconsdir = $(pkgdatadir)/pixmaps/16x16 + +icons_DATA = \ alignment.png \ aspectframe.png \ accellabel.png \ @@ -43,24 +45,24 @@ largeicons_DATA = \ hseparator.png \ iconview.png \ image.png \ - imagemenuitem.png \ inputdialog.png \ + imagemenuitem.png \ label.png \ layout.png \ list.png \ listitem.png \ menu.png \ menuitem.png \ - menubar.png \ menutoolbutton.png \ + menubar.png \ messagedialog.png \ notebook.png \ optionmenu.png \ progressbar.png \ radiobutton.png \ - ruler.png \ radiomenuitem.png \ radiotoolbutton.png \ + ruler.png \ scrolledwindow.png \ spinbutton.png \ statusbar.png \ @@ -84,30 +86,4 @@ largeicons_DATA = \ vseparator.png \ window.png -if BUILD_GNOME -largeicons_DATA += bonobodockitem.png \ - gnomecanvas.png \ - gnomedruidpageedge.png \ - gnomefontpicker.png \ - gnomepixmap.png \ - bonobodock.png \ - gnomecolorpicker.png \ - gnomedruidpagestandard.png \ - gnomehref.png \ - gnomepixmapentry.png \ - gnomeabout.png \ - gnomedruid.png \ - gnomeiconentry.png \ - gnomeiconselection.png \ - gnomeapp.png \ - gnomedateedit.png \ - gnomeentry.png \ - gnomeiconlist.png \ - gnomeappbar.png \ - gnomedialog.png \ - gnomefileentry.png \ - gnomemessagebox.png \ - gnomepropertybox.png -endif - -EXTRA_DIST = $(largeicons_DATA) +EXTRA_DIST = $(icons_DATA) diff --git a/pixmaps/16x16/aboutdialog.png b/plugins/gtk+/icons/16x16/aboutdialog.png similarity index 100% rename from pixmaps/16x16/aboutdialog.png rename to plugins/gtk+/icons/16x16/aboutdialog.png diff --git a/pixmaps/16x16/accellabel.png b/plugins/gtk+/icons/16x16/accellabel.png similarity index 100% rename from pixmaps/16x16/accellabel.png rename to plugins/gtk+/icons/16x16/accellabel.png diff --git a/pixmaps/16x16/alignment.png b/plugins/gtk+/icons/16x16/alignment.png similarity index 100% rename from pixmaps/16x16/alignment.png rename to plugins/gtk+/icons/16x16/alignment.png diff --git a/pixmaps/16x16/arrow.png b/plugins/gtk+/icons/16x16/arrow.png similarity index 100% rename from pixmaps/16x16/arrow.png rename to plugins/gtk+/icons/16x16/arrow.png diff --git a/pixmaps/16x16/aspectframe.png b/plugins/gtk+/icons/16x16/aspectframe.png similarity index 100% rename from pixmaps/16x16/aspectframe.png rename to plugins/gtk+/icons/16x16/aspectframe.png diff --git a/pixmaps/16x16/button.png b/plugins/gtk+/icons/16x16/button.png similarity index 100% rename from pixmaps/16x16/button.png rename to plugins/gtk+/icons/16x16/button.png diff --git a/pixmaps/16x16/calendar.png b/plugins/gtk+/icons/16x16/calendar.png similarity index 100% rename from pixmaps/16x16/calendar.png rename to plugins/gtk+/icons/16x16/calendar.png diff --git a/pixmaps/16x16/checkbutton.png b/plugins/gtk+/icons/16x16/checkbutton.png similarity index 100% rename from pixmaps/16x16/checkbutton.png rename to plugins/gtk+/icons/16x16/checkbutton.png diff --git a/pixmaps/16x16/checkmenuitem.png b/plugins/gtk+/icons/16x16/checkmenuitem.png similarity index 100% rename from pixmaps/16x16/checkmenuitem.png rename to plugins/gtk+/icons/16x16/checkmenuitem.png diff --git a/pixmaps/16x16/clist.png b/plugins/gtk+/icons/16x16/clist.png similarity index 100% rename from pixmaps/16x16/clist.png rename to plugins/gtk+/icons/16x16/clist.png diff --git a/pixmaps/16x16/colorbutton.png b/plugins/gtk+/icons/16x16/colorbutton.png similarity index 100% rename from pixmaps/16x16/colorbutton.png rename to plugins/gtk+/icons/16x16/colorbutton.png diff --git a/pixmaps/16x16/colorselection.png b/plugins/gtk+/icons/16x16/colorselection.png similarity index 100% rename from pixmaps/16x16/colorselection.png rename to plugins/gtk+/icons/16x16/colorselection.png diff --git a/pixmaps/16x16/colorselectiondialog.png b/plugins/gtk+/icons/16x16/colorselectiondialog.png similarity index 100% rename from pixmaps/16x16/colorselectiondialog.png rename to plugins/gtk+/icons/16x16/colorselectiondialog.png diff --git a/pixmaps/16x16/combo.png b/plugins/gtk+/icons/16x16/combo.png similarity index 100% rename from pixmaps/16x16/combo.png rename to plugins/gtk+/icons/16x16/combo.png diff --git a/pixmaps/16x16/combobox.png b/plugins/gtk+/icons/16x16/combobox.png similarity index 100% rename from pixmaps/16x16/combobox.png rename to plugins/gtk+/icons/16x16/combobox.png diff --git a/pixmaps/16x16/comboboxentry.png b/plugins/gtk+/icons/16x16/comboboxentry.png similarity index 100% rename from pixmaps/16x16/comboboxentry.png rename to plugins/gtk+/icons/16x16/comboboxentry.png diff --git a/pixmaps/16x16/curve.png b/plugins/gtk+/icons/16x16/curve.png similarity index 100% rename from pixmaps/16x16/curve.png rename to plugins/gtk+/icons/16x16/curve.png diff --git a/pixmaps/16x16/custom.png b/plugins/gtk+/icons/16x16/custom.png similarity index 100% rename from pixmaps/16x16/custom.png rename to plugins/gtk+/icons/16x16/custom.png diff --git a/pixmaps/16x16/default.png b/plugins/gtk+/icons/16x16/default.png similarity index 100% rename from pixmaps/16x16/default.png rename to plugins/gtk+/icons/16x16/default.png diff --git a/pixmaps/16x16/dialog.png b/plugins/gtk+/icons/16x16/dialog.png similarity index 100% rename from pixmaps/16x16/dialog.png rename to plugins/gtk+/icons/16x16/dialog.png diff --git a/pixmaps/16x16/drawingarea.png b/plugins/gtk+/icons/16x16/drawingarea.png similarity index 100% rename from pixmaps/16x16/drawingarea.png rename to plugins/gtk+/icons/16x16/drawingarea.png diff --git a/pixmaps/16x16/entry.png b/plugins/gtk+/icons/16x16/entry.png similarity index 100% rename from pixmaps/16x16/entry.png rename to plugins/gtk+/icons/16x16/entry.png diff --git a/pixmaps/16x16/eventbox.png b/plugins/gtk+/icons/16x16/eventbox.png similarity index 100% rename from pixmaps/16x16/eventbox.png rename to plugins/gtk+/icons/16x16/eventbox.png diff --git a/pixmaps/16x16/expander.png b/plugins/gtk+/icons/16x16/expander.png similarity index 100% rename from pixmaps/16x16/expander.png rename to plugins/gtk+/icons/16x16/expander.png diff --git a/pixmaps/16x16/filechooserbutton.png b/plugins/gtk+/icons/16x16/filechooserbutton.png similarity index 100% rename from pixmaps/16x16/filechooserbutton.png rename to plugins/gtk+/icons/16x16/filechooserbutton.png diff --git a/pixmaps/16x16/filechooserdialog.png b/plugins/gtk+/icons/16x16/filechooserdialog.png similarity index 100% rename from pixmaps/16x16/filechooserdialog.png rename to plugins/gtk+/icons/16x16/filechooserdialog.png diff --git a/pixmaps/16x16/fileselection.png b/plugins/gtk+/icons/16x16/fileselection.png similarity index 100% rename from pixmaps/16x16/fileselection.png rename to plugins/gtk+/icons/16x16/fileselection.png diff --git a/pixmaps/16x16/fileselectiondialog.png b/plugins/gtk+/icons/16x16/fileselectiondialog.png similarity index 100% rename from pixmaps/16x16/fileselectiondialog.png rename to plugins/gtk+/icons/16x16/fileselectiondialog.png diff --git a/pixmaps/16x16/fixed.png b/plugins/gtk+/icons/16x16/fixed.png similarity index 100% rename from pixmaps/16x16/fixed.png rename to plugins/gtk+/icons/16x16/fixed.png diff --git a/pixmaps/16x16/fontbutton.png b/plugins/gtk+/icons/16x16/fontbutton.png similarity index 100% rename from pixmaps/16x16/fontbutton.png rename to plugins/gtk+/icons/16x16/fontbutton.png diff --git a/pixmaps/16x16/fontselection.png b/plugins/gtk+/icons/16x16/fontselection.png similarity index 100% rename from pixmaps/16x16/fontselection.png rename to plugins/gtk+/icons/16x16/fontselection.png diff --git a/pixmaps/16x16/fontselectiondialog.png b/plugins/gtk+/icons/16x16/fontselectiondialog.png similarity index 100% rename from pixmaps/16x16/fontselectiondialog.png rename to plugins/gtk+/icons/16x16/fontselectiondialog.png diff --git a/pixmaps/16x16/frame.png b/plugins/gtk+/icons/16x16/frame.png similarity index 100% rename from pixmaps/16x16/frame.png rename to plugins/gtk+/icons/16x16/frame.png diff --git a/pixmaps/16x16/gammacurve.png b/plugins/gtk+/icons/16x16/gammacurve.png similarity index 100% rename from pixmaps/16x16/gammacurve.png rename to plugins/gtk+/icons/16x16/gammacurve.png diff --git a/pixmaps/16x16/gtktextview.png b/plugins/gtk+/icons/16x16/gtktextview.png similarity index 100% rename from pixmaps/16x16/gtktextview.png rename to plugins/gtk+/icons/16x16/gtktextview.png diff --git a/pixmaps/16x16/handlebox.png b/plugins/gtk+/icons/16x16/handlebox.png similarity index 100% rename from pixmaps/16x16/handlebox.png rename to plugins/gtk+/icons/16x16/handlebox.png diff --git a/pixmaps/16x16/hbox.png b/plugins/gtk+/icons/16x16/hbox.png similarity index 100% rename from pixmaps/16x16/hbox.png rename to plugins/gtk+/icons/16x16/hbox.png diff --git a/pixmaps/16x16/hbuttonbox.png b/plugins/gtk+/icons/16x16/hbuttonbox.png similarity index 100% rename from pixmaps/16x16/hbuttonbox.png rename to plugins/gtk+/icons/16x16/hbuttonbox.png diff --git a/pixmaps/16x16/hpaned.png b/plugins/gtk+/icons/16x16/hpaned.png similarity index 100% rename from pixmaps/16x16/hpaned.png rename to plugins/gtk+/icons/16x16/hpaned.png diff --git a/pixmaps/16x16/hruler.png b/plugins/gtk+/icons/16x16/hruler.png similarity index 100% rename from pixmaps/16x16/hruler.png rename to plugins/gtk+/icons/16x16/hruler.png diff --git a/pixmaps/16x16/hscale.png b/plugins/gtk+/icons/16x16/hscale.png similarity index 100% rename from pixmaps/16x16/hscale.png rename to plugins/gtk+/icons/16x16/hscale.png diff --git a/pixmaps/16x16/hscrollbar.png b/plugins/gtk+/icons/16x16/hscrollbar.png similarity index 100% rename from pixmaps/16x16/hscrollbar.png rename to plugins/gtk+/icons/16x16/hscrollbar.png diff --git a/pixmaps/16x16/hseparator.png b/plugins/gtk+/icons/16x16/hseparator.png similarity index 100% rename from pixmaps/16x16/hseparator.png rename to plugins/gtk+/icons/16x16/hseparator.png diff --git a/pixmaps/16x16/iconview.png b/plugins/gtk+/icons/16x16/iconview.png similarity index 100% rename from pixmaps/16x16/iconview.png rename to plugins/gtk+/icons/16x16/iconview.png diff --git a/pixmaps/16x16/image.png b/plugins/gtk+/icons/16x16/image.png similarity index 100% rename from pixmaps/16x16/image.png rename to plugins/gtk+/icons/16x16/image.png diff --git a/pixmaps/16x16/imagemenuitem.png b/plugins/gtk+/icons/16x16/imagemenuitem.png similarity index 100% rename from pixmaps/16x16/imagemenuitem.png rename to plugins/gtk+/icons/16x16/imagemenuitem.png diff --git a/pixmaps/16x16/inputdialog.png b/plugins/gtk+/icons/16x16/inputdialog.png similarity index 100% rename from pixmaps/16x16/inputdialog.png rename to plugins/gtk+/icons/16x16/inputdialog.png diff --git a/pixmaps/16x16/label.png b/plugins/gtk+/icons/16x16/label.png similarity index 100% rename from pixmaps/16x16/label.png rename to plugins/gtk+/icons/16x16/label.png diff --git a/pixmaps/16x16/layout.png b/plugins/gtk+/icons/16x16/layout.png similarity index 100% rename from pixmaps/16x16/layout.png rename to plugins/gtk+/icons/16x16/layout.png diff --git a/pixmaps/16x16/list.png b/plugins/gtk+/icons/16x16/list.png similarity index 100% rename from pixmaps/16x16/list.png rename to plugins/gtk+/icons/16x16/list.png diff --git a/pixmaps/16x16/listitem.png b/plugins/gtk+/icons/16x16/listitem.png similarity index 100% rename from pixmaps/16x16/listitem.png rename to plugins/gtk+/icons/16x16/listitem.png diff --git a/pixmaps/16x16/menu.png b/plugins/gtk+/icons/16x16/menu.png similarity index 100% rename from pixmaps/16x16/menu.png rename to plugins/gtk+/icons/16x16/menu.png diff --git a/pixmaps/16x16/menubar.png b/plugins/gtk+/icons/16x16/menubar.png similarity index 100% rename from pixmaps/16x16/menubar.png rename to plugins/gtk+/icons/16x16/menubar.png diff --git a/pixmaps/16x16/menuitem.png b/plugins/gtk+/icons/16x16/menuitem.png similarity index 100% rename from pixmaps/16x16/menuitem.png rename to plugins/gtk+/icons/16x16/menuitem.png diff --git a/pixmaps/16x16/menutoolbutton.png b/plugins/gtk+/icons/16x16/menutoolbutton.png similarity index 100% rename from pixmaps/16x16/menutoolbutton.png rename to plugins/gtk+/icons/16x16/menutoolbutton.png diff --git a/pixmaps/16x16/messagedialog.png b/plugins/gtk+/icons/16x16/messagedialog.png similarity index 100% rename from pixmaps/16x16/messagedialog.png rename to plugins/gtk+/icons/16x16/messagedialog.png diff --git a/pixmaps/16x16/notebook.png b/plugins/gtk+/icons/16x16/notebook.png similarity index 100% rename from pixmaps/16x16/notebook.png rename to plugins/gtk+/icons/16x16/notebook.png diff --git a/pixmaps/16x16/optionmenu.png b/plugins/gtk+/icons/16x16/optionmenu.png similarity index 100% rename from pixmaps/16x16/optionmenu.png rename to plugins/gtk+/icons/16x16/optionmenu.png diff --git a/pixmaps/16x16/progressbar.png b/plugins/gtk+/icons/16x16/progressbar.png similarity index 100% rename from pixmaps/16x16/progressbar.png rename to plugins/gtk+/icons/16x16/progressbar.png diff --git a/pixmaps/16x16/radiobutton.png b/plugins/gtk+/icons/16x16/radiobutton.png similarity index 100% rename from pixmaps/16x16/radiobutton.png rename to plugins/gtk+/icons/16x16/radiobutton.png diff --git a/pixmaps/16x16/radiomenuitem.png b/plugins/gtk+/icons/16x16/radiomenuitem.png similarity index 100% rename from pixmaps/16x16/radiomenuitem.png rename to plugins/gtk+/icons/16x16/radiomenuitem.png diff --git a/pixmaps/16x16/radiotoolbutton.png b/plugins/gtk+/icons/16x16/radiotoolbutton.png similarity index 100% rename from pixmaps/16x16/radiotoolbutton.png rename to plugins/gtk+/icons/16x16/radiotoolbutton.png diff --git a/pixmaps/16x16/ruler.png b/plugins/gtk+/icons/16x16/ruler.png similarity index 100% rename from pixmaps/16x16/ruler.png rename to plugins/gtk+/icons/16x16/ruler.png diff --git a/pixmaps/16x16/scrolledwindow.png b/plugins/gtk+/icons/16x16/scrolledwindow.png similarity index 100% rename from pixmaps/16x16/scrolledwindow.png rename to plugins/gtk+/icons/16x16/scrolledwindow.png diff --git a/pixmaps/16x16/separatormenuitem.png b/plugins/gtk+/icons/16x16/separatormenuitem.png similarity index 100% rename from pixmaps/16x16/separatormenuitem.png rename to plugins/gtk+/icons/16x16/separatormenuitem.png diff --git a/pixmaps/16x16/separatortoolitem.png b/plugins/gtk+/icons/16x16/separatortoolitem.png similarity index 100% rename from pixmaps/16x16/separatortoolitem.png rename to plugins/gtk+/icons/16x16/separatortoolitem.png diff --git a/pixmaps/16x16/spinbutton.png b/plugins/gtk+/icons/16x16/spinbutton.png similarity index 100% rename from pixmaps/16x16/spinbutton.png rename to plugins/gtk+/icons/16x16/spinbutton.png diff --git a/pixmaps/16x16/statusbar.png b/plugins/gtk+/icons/16x16/statusbar.png similarity index 100% rename from pixmaps/16x16/statusbar.png rename to plugins/gtk+/icons/16x16/statusbar.png diff --git a/pixmaps/16x16/table.png b/plugins/gtk+/icons/16x16/table.png similarity index 100% rename from pixmaps/16x16/table.png rename to plugins/gtk+/icons/16x16/table.png diff --git a/pixmaps/16x16/textview.png b/plugins/gtk+/icons/16x16/textview.png similarity index 100% rename from pixmaps/16x16/textview.png rename to plugins/gtk+/icons/16x16/textview.png diff --git a/pixmaps/16x16/togglebutton.png b/plugins/gtk+/icons/16x16/togglebutton.png similarity index 100% rename from pixmaps/16x16/togglebutton.png rename to plugins/gtk+/icons/16x16/togglebutton.png diff --git a/pixmaps/16x16/toggletoolbutton.png b/plugins/gtk+/icons/16x16/toggletoolbutton.png similarity index 100% rename from pixmaps/16x16/toggletoolbutton.png rename to plugins/gtk+/icons/16x16/toggletoolbutton.png diff --git a/pixmaps/16x16/toolbar.png b/plugins/gtk+/icons/16x16/toolbar.png similarity index 100% rename from pixmaps/16x16/toolbar.png rename to plugins/gtk+/icons/16x16/toolbar.png diff --git a/pixmaps/16x16/toolbutton.png b/plugins/gtk+/icons/16x16/toolbutton.png similarity index 100% rename from pixmaps/16x16/toolbutton.png rename to plugins/gtk+/icons/16x16/toolbutton.png diff --git a/pixmaps/16x16/toolitem.png b/plugins/gtk+/icons/16x16/toolitem.png similarity index 100% rename from pixmaps/16x16/toolitem.png rename to plugins/gtk+/icons/16x16/toolitem.png diff --git a/pixmaps/16x16/treeview.png b/plugins/gtk+/icons/16x16/treeview.png similarity index 100% rename from pixmaps/16x16/treeview.png rename to plugins/gtk+/icons/16x16/treeview.png diff --git a/pixmaps/16x16/vbox.png b/plugins/gtk+/icons/16x16/vbox.png similarity index 100% rename from pixmaps/16x16/vbox.png rename to plugins/gtk+/icons/16x16/vbox.png diff --git a/pixmaps/16x16/vbuttonbox.png b/plugins/gtk+/icons/16x16/vbuttonbox.png similarity index 100% rename from pixmaps/16x16/vbuttonbox.png rename to plugins/gtk+/icons/16x16/vbuttonbox.png diff --git a/pixmaps/16x16/viewport.png b/plugins/gtk+/icons/16x16/viewport.png similarity index 100% rename from pixmaps/16x16/viewport.png rename to plugins/gtk+/icons/16x16/viewport.png diff --git a/pixmaps/16x16/vpaned.png b/plugins/gtk+/icons/16x16/vpaned.png similarity index 100% rename from pixmaps/16x16/vpaned.png rename to plugins/gtk+/icons/16x16/vpaned.png diff --git a/pixmaps/16x16/vruler.png b/plugins/gtk+/icons/16x16/vruler.png similarity index 100% rename from pixmaps/16x16/vruler.png rename to plugins/gtk+/icons/16x16/vruler.png diff --git a/pixmaps/16x16/vscale.png b/plugins/gtk+/icons/16x16/vscale.png similarity index 100% rename from pixmaps/16x16/vscale.png rename to plugins/gtk+/icons/16x16/vscale.png diff --git a/pixmaps/16x16/vscrollbar.png b/plugins/gtk+/icons/16x16/vscrollbar.png similarity index 100% rename from pixmaps/16x16/vscrollbar.png rename to plugins/gtk+/icons/16x16/vscrollbar.png diff --git a/pixmaps/16x16/vseparator.png b/plugins/gtk+/icons/16x16/vseparator.png similarity index 100% rename from pixmaps/16x16/vseparator.png rename to plugins/gtk+/icons/16x16/vseparator.png diff --git a/pixmaps/16x16/window.png b/plugins/gtk+/icons/16x16/window.png similarity index 100% rename from pixmaps/16x16/window.png rename to plugins/gtk+/icons/16x16/window.png diff --git a/pixmaps/16x16/Makefile.am b/plugins/gtk+/icons/22x22/Makefile.am similarity index 68% rename from pixmaps/16x16/Makefile.am rename to plugins/gtk+/icons/22x22/Makefile.am index 5647b5cc..34975783 100644 --- a/pixmaps/16x16/Makefile.am +++ b/plugins/gtk+/icons/22x22/Makefile.am @@ -1,6 +1,8 @@ -smalliconsdir = $(pkgdatadir)/pixmaps/16x16 +## Process this file with automake to produce Makefile.in -smallicons_DATA = \ +iconsdir = $(pkgdatadir)/pixmaps/22x22 + +icons_DATA = \ alignment.png \ aspectframe.png \ accellabel.png \ @@ -43,24 +45,24 @@ smallicons_DATA = \ hseparator.png \ iconview.png \ image.png \ - inputdialog.png \ imagemenuitem.png \ + inputdialog.png \ label.png \ layout.png \ list.png \ listitem.png \ menu.png \ menuitem.png \ - menutoolbutton.png \ menubar.png \ + menutoolbutton.png \ messagedialog.png \ notebook.png \ optionmenu.png \ progressbar.png \ radiobutton.png \ + ruler.png \ radiomenuitem.png \ radiotoolbutton.png \ - ruler.png \ scrolledwindow.png \ spinbutton.png \ statusbar.png \ @@ -84,31 +86,4 @@ smallicons_DATA = \ vseparator.png \ window.png -if BUILD_GNOME -smallicons_DATA += bonobodock.png \ - bonobodockitem.png \ - gnomehref.png \ - gnomeapp.png \ - gnomeappbar.png \ - gnomecanvas.png \ - gnomedateedit.png \ - gnomeiconentry.png \ - gnomeiconselection.png \ - gnomedruid.png \ - gnomedruidpageedge.png \ - gnomedruidpagestandard.png \ - gnomepixmap.png \ - gnomepropertybox.png \ - gnomecolorpicker.png \ - gnomepixmapentry.png \ - gnomeabout.png \ - gnomeentry.png \ - gnomeappbar.png \ - gnomedialog.png \ - gnomefileentry.png \ - gnomefontpicker.png \ - gnomeiconlist.png \ - gnomemessagebox.png -endif - -EXTRA_DIST = $(smallicons_DATA) +EXTRA_DIST = $(icons_DATA) diff --git a/pixmaps/22x22/aboutdialog.png b/plugins/gtk+/icons/22x22/aboutdialog.png similarity index 100% rename from pixmaps/22x22/aboutdialog.png rename to plugins/gtk+/icons/22x22/aboutdialog.png diff --git a/pixmaps/22x22/accellabel.png b/plugins/gtk+/icons/22x22/accellabel.png similarity index 100% rename from pixmaps/22x22/accellabel.png rename to plugins/gtk+/icons/22x22/accellabel.png diff --git a/pixmaps/22x22/alignment.png b/plugins/gtk+/icons/22x22/alignment.png similarity index 100% rename from pixmaps/22x22/alignment.png rename to plugins/gtk+/icons/22x22/alignment.png diff --git a/pixmaps/22x22/arrow.png b/plugins/gtk+/icons/22x22/arrow.png similarity index 100% rename from pixmaps/22x22/arrow.png rename to plugins/gtk+/icons/22x22/arrow.png diff --git a/pixmaps/22x22/aspectframe.png b/plugins/gtk+/icons/22x22/aspectframe.png similarity index 100% rename from pixmaps/22x22/aspectframe.png rename to plugins/gtk+/icons/22x22/aspectframe.png diff --git a/pixmaps/22x22/button.png b/plugins/gtk+/icons/22x22/button.png similarity index 100% rename from pixmaps/22x22/button.png rename to plugins/gtk+/icons/22x22/button.png diff --git a/pixmaps/22x22/calendar.png b/plugins/gtk+/icons/22x22/calendar.png similarity index 100% rename from pixmaps/22x22/calendar.png rename to plugins/gtk+/icons/22x22/calendar.png diff --git a/pixmaps/22x22/checkbutton.png b/plugins/gtk+/icons/22x22/checkbutton.png similarity index 100% rename from pixmaps/22x22/checkbutton.png rename to plugins/gtk+/icons/22x22/checkbutton.png diff --git a/pixmaps/22x22/checkmenuitem.png b/plugins/gtk+/icons/22x22/checkmenuitem.png similarity index 100% rename from pixmaps/22x22/checkmenuitem.png rename to plugins/gtk+/icons/22x22/checkmenuitem.png diff --git a/pixmaps/22x22/clist.png b/plugins/gtk+/icons/22x22/clist.png similarity index 100% rename from pixmaps/22x22/clist.png rename to plugins/gtk+/icons/22x22/clist.png diff --git a/pixmaps/22x22/colorbutton.png b/plugins/gtk+/icons/22x22/colorbutton.png similarity index 100% rename from pixmaps/22x22/colorbutton.png rename to plugins/gtk+/icons/22x22/colorbutton.png diff --git a/pixmaps/22x22/colorselection.png b/plugins/gtk+/icons/22x22/colorselection.png similarity index 100% rename from pixmaps/22x22/colorselection.png rename to plugins/gtk+/icons/22x22/colorselection.png diff --git a/pixmaps/22x22/colorselectiondialog.png b/plugins/gtk+/icons/22x22/colorselectiondialog.png similarity index 100% rename from pixmaps/22x22/colorselectiondialog.png rename to plugins/gtk+/icons/22x22/colorselectiondialog.png diff --git a/pixmaps/22x22/combo.png b/plugins/gtk+/icons/22x22/combo.png similarity index 100% rename from pixmaps/22x22/combo.png rename to plugins/gtk+/icons/22x22/combo.png diff --git a/pixmaps/22x22/combobox.png b/plugins/gtk+/icons/22x22/combobox.png similarity index 100% rename from pixmaps/22x22/combobox.png rename to plugins/gtk+/icons/22x22/combobox.png diff --git a/pixmaps/22x22/comboboxentry.png b/plugins/gtk+/icons/22x22/comboboxentry.png similarity index 100% rename from pixmaps/22x22/comboboxentry.png rename to plugins/gtk+/icons/22x22/comboboxentry.png diff --git a/pixmaps/22x22/curve.png b/plugins/gtk+/icons/22x22/curve.png similarity index 100% rename from pixmaps/22x22/curve.png rename to plugins/gtk+/icons/22x22/curve.png diff --git a/pixmaps/22x22/custom.png b/plugins/gtk+/icons/22x22/custom.png similarity index 100% rename from pixmaps/22x22/custom.png rename to plugins/gtk+/icons/22x22/custom.png diff --git a/pixmaps/22x22/default.png b/plugins/gtk+/icons/22x22/default.png similarity index 100% rename from pixmaps/22x22/default.png rename to plugins/gtk+/icons/22x22/default.png diff --git a/pixmaps/22x22/dialog.png b/plugins/gtk+/icons/22x22/dialog.png similarity index 100% rename from pixmaps/22x22/dialog.png rename to plugins/gtk+/icons/22x22/dialog.png diff --git a/pixmaps/22x22/drawingarea.png b/plugins/gtk+/icons/22x22/drawingarea.png similarity index 100% rename from pixmaps/22x22/drawingarea.png rename to plugins/gtk+/icons/22x22/drawingarea.png diff --git a/pixmaps/22x22/entry.png b/plugins/gtk+/icons/22x22/entry.png similarity index 100% rename from pixmaps/22x22/entry.png rename to plugins/gtk+/icons/22x22/entry.png diff --git a/pixmaps/22x22/eventbox.png b/plugins/gtk+/icons/22x22/eventbox.png similarity index 100% rename from pixmaps/22x22/eventbox.png rename to plugins/gtk+/icons/22x22/eventbox.png diff --git a/pixmaps/22x22/expander.png b/plugins/gtk+/icons/22x22/expander.png similarity index 100% rename from pixmaps/22x22/expander.png rename to plugins/gtk+/icons/22x22/expander.png diff --git a/pixmaps/22x22/filechooserbutton.png b/plugins/gtk+/icons/22x22/filechooserbutton.png similarity index 100% rename from pixmaps/22x22/filechooserbutton.png rename to plugins/gtk+/icons/22x22/filechooserbutton.png diff --git a/pixmaps/22x22/filechooserdialog.png b/plugins/gtk+/icons/22x22/filechooserdialog.png similarity index 100% rename from pixmaps/22x22/filechooserdialog.png rename to plugins/gtk+/icons/22x22/filechooserdialog.png diff --git a/pixmaps/22x22/fileselection.png b/plugins/gtk+/icons/22x22/fileselection.png similarity index 100% rename from pixmaps/22x22/fileselection.png rename to plugins/gtk+/icons/22x22/fileselection.png diff --git a/pixmaps/22x22/fixed.png b/plugins/gtk+/icons/22x22/fixed.png similarity index 100% rename from pixmaps/22x22/fixed.png rename to plugins/gtk+/icons/22x22/fixed.png diff --git a/pixmaps/22x22/fontbutton.png b/plugins/gtk+/icons/22x22/fontbutton.png similarity index 100% rename from pixmaps/22x22/fontbutton.png rename to plugins/gtk+/icons/22x22/fontbutton.png diff --git a/pixmaps/22x22/fontselection.png b/plugins/gtk+/icons/22x22/fontselection.png similarity index 100% rename from pixmaps/22x22/fontselection.png rename to plugins/gtk+/icons/22x22/fontselection.png diff --git a/pixmaps/22x22/fontselectiondialog.png b/plugins/gtk+/icons/22x22/fontselectiondialog.png similarity index 100% rename from pixmaps/22x22/fontselectiondialog.png rename to plugins/gtk+/icons/22x22/fontselectiondialog.png diff --git a/pixmaps/22x22/frame.png b/plugins/gtk+/icons/22x22/frame.png similarity index 100% rename from pixmaps/22x22/frame.png rename to plugins/gtk+/icons/22x22/frame.png diff --git a/pixmaps/22x22/gammacurve.png b/plugins/gtk+/icons/22x22/gammacurve.png similarity index 100% rename from pixmaps/22x22/gammacurve.png rename to plugins/gtk+/icons/22x22/gammacurve.png diff --git a/pixmaps/22x22/handlebox.png b/plugins/gtk+/icons/22x22/handlebox.png similarity index 100% rename from pixmaps/22x22/handlebox.png rename to plugins/gtk+/icons/22x22/handlebox.png diff --git a/pixmaps/22x22/hbox.png b/plugins/gtk+/icons/22x22/hbox.png similarity index 100% rename from pixmaps/22x22/hbox.png rename to plugins/gtk+/icons/22x22/hbox.png diff --git a/pixmaps/22x22/hbuttonbox.png b/plugins/gtk+/icons/22x22/hbuttonbox.png similarity index 100% rename from pixmaps/22x22/hbuttonbox.png rename to plugins/gtk+/icons/22x22/hbuttonbox.png diff --git a/pixmaps/22x22/hpaned.png b/plugins/gtk+/icons/22x22/hpaned.png similarity index 100% rename from pixmaps/22x22/hpaned.png rename to plugins/gtk+/icons/22x22/hpaned.png diff --git a/pixmaps/22x22/hruler.png b/plugins/gtk+/icons/22x22/hruler.png similarity index 100% rename from pixmaps/22x22/hruler.png rename to plugins/gtk+/icons/22x22/hruler.png diff --git a/pixmaps/22x22/hscale.png b/plugins/gtk+/icons/22x22/hscale.png similarity index 100% rename from pixmaps/22x22/hscale.png rename to plugins/gtk+/icons/22x22/hscale.png diff --git a/pixmaps/22x22/hscrollbar.png b/plugins/gtk+/icons/22x22/hscrollbar.png similarity index 100% rename from pixmaps/22x22/hscrollbar.png rename to plugins/gtk+/icons/22x22/hscrollbar.png diff --git a/pixmaps/22x22/hseparator.png b/plugins/gtk+/icons/22x22/hseparator.png similarity index 100% rename from pixmaps/22x22/hseparator.png rename to plugins/gtk+/icons/22x22/hseparator.png diff --git a/pixmaps/22x22/iconview.png b/plugins/gtk+/icons/22x22/iconview.png similarity index 100% rename from pixmaps/22x22/iconview.png rename to plugins/gtk+/icons/22x22/iconview.png diff --git a/pixmaps/22x22/image.png b/plugins/gtk+/icons/22x22/image.png similarity index 100% rename from pixmaps/22x22/image.png rename to plugins/gtk+/icons/22x22/image.png diff --git a/pixmaps/22x22/imagemenuitem.png b/plugins/gtk+/icons/22x22/imagemenuitem.png similarity index 100% rename from pixmaps/22x22/imagemenuitem.png rename to plugins/gtk+/icons/22x22/imagemenuitem.png diff --git a/pixmaps/22x22/inputdialog.png b/plugins/gtk+/icons/22x22/inputdialog.png similarity index 100% rename from pixmaps/22x22/inputdialog.png rename to plugins/gtk+/icons/22x22/inputdialog.png diff --git a/pixmaps/22x22/label.png b/plugins/gtk+/icons/22x22/label.png similarity index 100% rename from pixmaps/22x22/label.png rename to plugins/gtk+/icons/22x22/label.png diff --git a/pixmaps/22x22/layout.png b/plugins/gtk+/icons/22x22/layout.png similarity index 100% rename from pixmaps/22x22/layout.png rename to plugins/gtk+/icons/22x22/layout.png diff --git a/pixmaps/22x22/list.png b/plugins/gtk+/icons/22x22/list.png similarity index 100% rename from pixmaps/22x22/list.png rename to plugins/gtk+/icons/22x22/list.png diff --git a/pixmaps/22x22/listitem.png b/plugins/gtk+/icons/22x22/listitem.png similarity index 100% rename from pixmaps/22x22/listitem.png rename to plugins/gtk+/icons/22x22/listitem.png diff --git a/pixmaps/22x22/menu.png b/plugins/gtk+/icons/22x22/menu.png similarity index 100% rename from pixmaps/22x22/menu.png rename to plugins/gtk+/icons/22x22/menu.png diff --git a/pixmaps/22x22/menubar.png b/plugins/gtk+/icons/22x22/menubar.png similarity index 100% rename from pixmaps/22x22/menubar.png rename to plugins/gtk+/icons/22x22/menubar.png diff --git a/pixmaps/22x22/menuitem.png b/plugins/gtk+/icons/22x22/menuitem.png similarity index 100% rename from pixmaps/22x22/menuitem.png rename to plugins/gtk+/icons/22x22/menuitem.png diff --git a/pixmaps/22x22/menutoolbutton.png b/plugins/gtk+/icons/22x22/menutoolbutton.png similarity index 100% rename from pixmaps/22x22/menutoolbutton.png rename to plugins/gtk+/icons/22x22/menutoolbutton.png diff --git a/pixmaps/22x22/messagedialog.png b/plugins/gtk+/icons/22x22/messagedialog.png similarity index 100% rename from pixmaps/22x22/messagedialog.png rename to plugins/gtk+/icons/22x22/messagedialog.png diff --git a/pixmaps/22x22/notebook.png b/plugins/gtk+/icons/22x22/notebook.png similarity index 100% rename from pixmaps/22x22/notebook.png rename to plugins/gtk+/icons/22x22/notebook.png diff --git a/pixmaps/22x22/optionmenu.png b/plugins/gtk+/icons/22x22/optionmenu.png similarity index 100% rename from pixmaps/22x22/optionmenu.png rename to plugins/gtk+/icons/22x22/optionmenu.png diff --git a/pixmaps/22x22/progressbar.png b/plugins/gtk+/icons/22x22/progressbar.png similarity index 100% rename from pixmaps/22x22/progressbar.png rename to plugins/gtk+/icons/22x22/progressbar.png diff --git a/pixmaps/22x22/radiobutton.png b/plugins/gtk+/icons/22x22/radiobutton.png similarity index 100% rename from pixmaps/22x22/radiobutton.png rename to plugins/gtk+/icons/22x22/radiobutton.png diff --git a/pixmaps/22x22/radiomenuitem.png b/plugins/gtk+/icons/22x22/radiomenuitem.png similarity index 100% rename from pixmaps/22x22/radiomenuitem.png rename to plugins/gtk+/icons/22x22/radiomenuitem.png diff --git a/pixmaps/22x22/radiotoolbutton.png b/plugins/gtk+/icons/22x22/radiotoolbutton.png similarity index 100% rename from pixmaps/22x22/radiotoolbutton.png rename to plugins/gtk+/icons/22x22/radiotoolbutton.png diff --git a/pixmaps/22x22/ruler.png b/plugins/gtk+/icons/22x22/ruler.png similarity index 100% rename from pixmaps/22x22/ruler.png rename to plugins/gtk+/icons/22x22/ruler.png diff --git a/pixmaps/22x22/scrolledwindow.png b/plugins/gtk+/icons/22x22/scrolledwindow.png similarity index 100% rename from pixmaps/22x22/scrolledwindow.png rename to plugins/gtk+/icons/22x22/scrolledwindow.png diff --git a/pixmaps/22x22/separatormenuitem.png b/plugins/gtk+/icons/22x22/separatormenuitem.png similarity index 100% rename from pixmaps/22x22/separatormenuitem.png rename to plugins/gtk+/icons/22x22/separatormenuitem.png diff --git a/pixmaps/22x22/separatortoolitem.png b/plugins/gtk+/icons/22x22/separatortoolitem.png similarity index 100% rename from pixmaps/22x22/separatortoolitem.png rename to plugins/gtk+/icons/22x22/separatortoolitem.png diff --git a/pixmaps/22x22/spinbutton.png b/plugins/gtk+/icons/22x22/spinbutton.png similarity index 100% rename from pixmaps/22x22/spinbutton.png rename to plugins/gtk+/icons/22x22/spinbutton.png diff --git a/pixmaps/22x22/statusbar.png b/plugins/gtk+/icons/22x22/statusbar.png similarity index 100% rename from pixmaps/22x22/statusbar.png rename to plugins/gtk+/icons/22x22/statusbar.png diff --git a/pixmaps/22x22/table.png b/plugins/gtk+/icons/22x22/table.png similarity index 100% rename from pixmaps/22x22/table.png rename to plugins/gtk+/icons/22x22/table.png diff --git a/pixmaps/22x22/textview.png b/plugins/gtk+/icons/22x22/textview.png similarity index 100% rename from pixmaps/22x22/textview.png rename to plugins/gtk+/icons/22x22/textview.png diff --git a/pixmaps/22x22/togglebutton.png b/plugins/gtk+/icons/22x22/togglebutton.png similarity index 100% rename from pixmaps/22x22/togglebutton.png rename to plugins/gtk+/icons/22x22/togglebutton.png diff --git a/pixmaps/22x22/toggletoolbutton.png b/plugins/gtk+/icons/22x22/toggletoolbutton.png similarity index 100% rename from pixmaps/22x22/toggletoolbutton.png rename to plugins/gtk+/icons/22x22/toggletoolbutton.png diff --git a/pixmaps/22x22/toolbar.png b/plugins/gtk+/icons/22x22/toolbar.png similarity index 100% rename from pixmaps/22x22/toolbar.png rename to plugins/gtk+/icons/22x22/toolbar.png diff --git a/pixmaps/22x22/toolbutton.png b/plugins/gtk+/icons/22x22/toolbutton.png similarity index 100% rename from pixmaps/22x22/toolbutton.png rename to plugins/gtk+/icons/22x22/toolbutton.png diff --git a/pixmaps/22x22/toolitem.png b/plugins/gtk+/icons/22x22/toolitem.png similarity index 100% rename from pixmaps/22x22/toolitem.png rename to plugins/gtk+/icons/22x22/toolitem.png diff --git a/pixmaps/22x22/treeview.png b/plugins/gtk+/icons/22x22/treeview.png similarity index 100% rename from pixmaps/22x22/treeview.png rename to plugins/gtk+/icons/22x22/treeview.png diff --git a/pixmaps/22x22/vbox.png b/plugins/gtk+/icons/22x22/vbox.png similarity index 100% rename from pixmaps/22x22/vbox.png rename to plugins/gtk+/icons/22x22/vbox.png diff --git a/pixmaps/22x22/vbuttonbox.png b/plugins/gtk+/icons/22x22/vbuttonbox.png similarity index 100% rename from pixmaps/22x22/vbuttonbox.png rename to plugins/gtk+/icons/22x22/vbuttonbox.png diff --git a/pixmaps/22x22/viewport.png b/plugins/gtk+/icons/22x22/viewport.png similarity index 100% rename from pixmaps/22x22/viewport.png rename to plugins/gtk+/icons/22x22/viewport.png diff --git a/pixmaps/22x22/vpaned.png b/plugins/gtk+/icons/22x22/vpaned.png similarity index 100% rename from pixmaps/22x22/vpaned.png rename to plugins/gtk+/icons/22x22/vpaned.png diff --git a/pixmaps/22x22/vruler.png b/plugins/gtk+/icons/22x22/vruler.png similarity index 100% rename from pixmaps/22x22/vruler.png rename to plugins/gtk+/icons/22x22/vruler.png diff --git a/pixmaps/22x22/vscale.png b/plugins/gtk+/icons/22x22/vscale.png similarity index 100% rename from pixmaps/22x22/vscale.png rename to plugins/gtk+/icons/22x22/vscale.png diff --git a/pixmaps/22x22/vscrollbar.png b/plugins/gtk+/icons/22x22/vscrollbar.png similarity index 100% rename from pixmaps/22x22/vscrollbar.png rename to plugins/gtk+/icons/22x22/vscrollbar.png diff --git a/pixmaps/22x22/vseparator.png b/plugins/gtk+/icons/22x22/vseparator.png similarity index 100% rename from pixmaps/22x22/vseparator.png rename to plugins/gtk+/icons/22x22/vseparator.png diff --git a/pixmaps/22x22/window.png b/plugins/gtk+/icons/22x22/window.png similarity index 100% rename from pixmaps/22x22/window.png rename to plugins/gtk+/icons/22x22/window.png diff --git a/plugins/gtk+/icons/Makefile.am b/plugins/gtk+/icons/Makefile.am new file mode 100644 index 00000000..bd39c36e --- /dev/null +++ b/plugins/gtk+/icons/Makefile.am @@ -0,0 +1,3 @@ +## Process this file with automake to produce Makefile.in + +SUBDIRS = 16x16 22x22 diff --git a/po/POTFILES.in b/po/POTFILES.in index 7c7f9f0f..22740a9d 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -3,46 +3,46 @@ # Main application -glade-3.desktop.in.in +data/glade-3.desktop.in.in src/main.c src/glade-project-window.c # libgladeui shared core library -src/glade-app.c -src/glade-builtins.c -src/glade-base-editor.c -src/glade-catalog.c -src/glade-clipboard-view.c -src/glade-clipboard.c -src/glade-command.c -src/glade-cursor.c -src/glade-debug.c -src/glade-editor-property.c -src/glade-editor.c -src/glade-fixed.c -src/glade-palette.c -src/glade-parameter.c -src/glade-parser.c -src/glade-placeholder.c -src/glade-popup.c -src/glade-project.c -src/glade-property-class.c -src/glade-property.c -src/glade-signal-editor.c -src/glade-signal.c -src/glade-utils.c -src/glade-widget.c -src/glade-widget-adaptor.c -src/glade-xml-utils.c -src/glade-project-view.c -src/glade-custom.c +gladeui/glade-app.c +gladeui/glade-builtins.c +gladeui/glade-base-editor.c +gladeui/glade-catalog.c +gladeui/glade-clipboard-view.c +gladeui/glade-clipboard.c +gladeui/glade-command.c +gladeui/glade-cursor.c +gladeui/glade-debug.c +gladeui/glade-editor-property.c +gladeui/glade-editor.c +gladeui/glade-fixed.c +gladeui/glade-palette.c +gladeui/glade-parameter.c +gladeui/glade-parser.c +gladeui/glade-placeholder.c +gladeui/glade-popup.c +gladeui/glade-project.c +gladeui/glade-property-class.c +gladeui/glade-property.c +gladeui/glade-signal-editor.c +gladeui/glade-signal.c +gladeui/glade-utils.c +gladeui/glade-widget.c +gladeui/glade-widget-adaptor.c +gladeui/glade-xml-utils.c +gladeui/glade-project-view.c +gladeui/glade-custom.c # gtk plugin backend -src/glade-gtk.c -widgets/gtk+.xml.in +plugins/gtk+/glade-gtk.c +plugins/gtk+/gtk+.xml.in # gnome plugin backend -src/glade-gnome.c -widgets/gnome.xml.in -widgets/bonobo.xml.in -widgets/canvas.xml.in +plugins/gnome/glade-gnome.c +plugins/gnome/gnome.xml.in +plugins/gnome/bonobo.xml.in +plugins/gnome/canvas.xml.in diff --git a/po/POTFILES.skip b/po/POTFILES.skip index c8db99ac..7946cb24 100644 --- a/po/POTFILES.skip +++ b/po/POTFILES.skip @@ -1 +1 @@ -glade-3.desktop.in +data/glade-3.desktop.in diff --git a/src/Makefile.am b/src/Makefile.am index b439dd00..f803dcf4 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,35 +1,11 @@ -SUBDIRS= - -common_defines = \ - -DGLADE_DATADIR="\"$(pkgdatadir)\"" \ - -DGLADE_LIBDIR="\"$(pkglibdir)\"" \ - -DGLADE_CATALOGSDIR="\"$(pkgdatadir)/catalogs\""\ - -DGLADE_MODULESDIR="\"$(pkglibdir)/modules\"" \ - -DGLADE_PLUGINSDIR="\"$(pkglibdir)/plugins\"" \ - -DGLADE_BINDINGSDIR="\"$(pkglibdir)/bindings\"" \ - -DGLADE_PIXMAPSDIR="\"$(pkgdatadir)/pixmaps\"" \ - -DGLADE_SCRIPTSDIR="\"$(pkgdatadir)/scripts\"" \ - -DGLADE_ICONDIR="\"$(datadir)/pixmaps\"" \ - -DGLADE_LOCALEDIR="\"$(datadir)/locale\"" \ - -DGLADE_GNOMEHELPDIR="\"$(HELP_DIR)\"" +## Process this file with automake to produce Makefile.in bin_PROGRAMS = glade-3 -lib_LTLIBRARIES = libgladeui-1.la -BUILT_SOURCES = \ - glade-marshallers.c \ - glade-marshallers.h - -CLEANFILES = $(BUILT_SOURCES) -EXTRA_DIST = glade-marshallers.list - - -# The main application code -# glade_3_CPPFLAGS = \ - $(common_defines) \ - -I$(top_srcdir) \ - -I$(top_builddir) \ + -I$(top_srcdir)/gladeui \ + -I$(top_builddir)/gladeui \ + -DGLADE_GNOMEHELPDIR="\"$(HELP_DIR)\"" $(AM_CPPFLAGS) glade_3_CFLAGS = \ @@ -37,185 +13,15 @@ glade_3_CFLAGS = \ $(GTK_CFLAGS) \ $(AM_CFLAGS) -glade_3_LDFLAGS = \ - $(AM_LDFLAGS) +glade_3_LDFLAGS = $(AM_LDFLAGS) -glade_3_LDADD = libgladeui-1.la +glade_3_LDADD = $(top_builddir)/gladeui/libgladeui-1.la glade_3_SOURCES = \ - glade-project-window.c glade-project-window.h \ + glade-project-window.c \ + glade-project-window.h \ main.c if WITH_WIN32 -glade_3_LDFLAGS += -mwindows + glade_3_LDFLAGS += -mwindows endif - -# The GTK catalog backend -gladegtk_LTLIBRARIES = libgladegtk.la -gladegtkdir = $(pkglibdir)/modules - -libgladegtk_la_CPPLAGS = \ - $(common_defines) \ - -I$(top_srcdir) \ - -I$(top_builddir) \ - $(AM_CPPFLAGS) - -libgladegtk_la_CFLAGS = \ - -g -Wall \ - $(GTK_CFLAGS) \ - $(AM_CFLAGS) - -libgladegtk_la_SOURCES = glade-gtk.c -libgladegtk_la_LDFLAGS = -module -avoid-version $(AM_LDFLAGS) -libgladegtk_la_LIBADD = libgladeui-1.la $(GTK_LIBS) -libgladegtkincludedir = $(includedir)/libgladeui-1.0/libgladeui -libgladegtkinclude_HEADERS = glade-gtk.h - -# The glade-3 core library -libgladeui_1_la_SOURCES = \ - glade-widget-adaptor.c \ - glade-debug.c \ - glade-project.c \ - glade-parameter.c \ - glade-placeholder.c \ - glade-custom.c \ - glade-project-view.c \ - glade-xml-utils.c \ - glade-palette.c \ - glade-palette-item.c \ - glade-palette-box.c \ - glade-palette-expander.c \ - glade-design-layout.c \ - glade-design-view.c \ - glade-cursor.c \ - glade-property.c \ - glade-property-class.c \ - glade-popup.c \ - glade-widget.c \ - glade-catalog.c \ - glade-editor-property.c \ - glade-editor.c \ - glade-utils.c \ - glade-signal.c \ - glade-signal-editor.c \ - glade-clipboard.c \ - glade-clipboard-view.c \ - glade-command.c \ - glade-id-allocator.c \ - glade-marshallers.c \ - glade-accumulators.c \ - glade-parser.c \ - glade-builtins.c \ - glade-app.c \ - glade-keysyms.c \ - glade-fixed.c \ - glade-binding.c \ - glade-base-editor.c - -libgladeui_1_la_CPPFLAGS = \ - -DINSIDE_LIBGLADEUI \ - $(common_defines) \ - -I$(top_srcdir) \ - -I$(top_builddir) \ - $(AM_CPPFLAGS) - -libgladeui_1_la_CFLAGS = \ - -g -Wall \ - $(GTK_CFLAGS) \ - $(AM_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 -libgladeuiinclude_HEADERS = \ - glade.h \ - glade-debug.h \ - glade-project.h \ - glade-project-view.h \ - glade-parameter.h \ - glade-placeholder.h \ - glade-custom.h \ - glade-editor.h \ - glade-editor-property.h \ - glade-signal-editor.h \ - glade-palette.h \ - glade-palette-item.h \ - glade-palette-box.h \ - glade-palette-expander.h \ - glade-design-layout.h \ - glade-design-view.h \ - glade-cursor.h \ - glade-widget.h \ - glade-widget-adaptor.h \ - glade-property.h \ - glade-property-class.h \ - glade-popup.h \ - glade-catalog.h \ - glade-utils.h \ - glade-signal.h \ - glade-xml-utils.h \ - glade-clipboard.h \ - glade-clipboard-view.h \ - glade-command.h \ - glade-id-allocator.h \ - glade-marshallers.h \ - glade-accumulators.h \ - glade-parser.h \ - glade-app.h \ - glade-builtins.h \ - glade-fixed.h \ - glade-binding.h \ - glade-base-editor.h \ - fixed_bg.xpm \ - atk.xpm - -pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = libgladeui-1.0.pc - -if BUILD_PYTHON -gladepython_LTLIBRARIES = libgladepython.la -gladepythondir = $(pkglibdir)/bindings -libgladepython_la_SOURCES = glade-python.c glade-python-gwa.c -libgladepython_la_CPPFLAGS = $(common_defines) $(AM_CPPFLAGS) -libgladepython_la_CFLAGS = -g -Wall $(PYTHON_CFLAGS) $(GTK_CFLAGS) $(AM_CFLAGS) -libgladepython_la_LDFLAGS = -module -avoid-version $(PYTHON_LIBS) $(AM_LDFLAGS) -libgladepython_la_LIBADD = libgladeui-1.la $(PYTHON_LIBS) - -endif - -if BUILD_GNOME -gladegnome_LTLIBRARIES = libgladegnome.la -gladegnomedir = $(pkglibdir)/modules -libgladegnome_la_SOURCES = glade-gnome.c -libgladegnome_la_CPPFLAGS = $(common_defines) $(AM_CPPFLAGS) -libgladegnome_la_CFLAGS = -g -Wall $(GNOME_CFLAGS) $(AM_CPPFLAGS) -libgladegnome_la_LDFLAGS = -module -avoid-version $(GNOME_LIBS) $(AM_LDFLAGS) -libgladegnome_la_LIBADD = libgladeui-1.la $(GLADE_LIBS) -endif - -if WITH_WIN32 - libgladegtk_la_LDFLAGS += -no-undefined - libgladeui_1_la_LDFLAGS += -no-undefined - -if BUILD_GNOME - libgladegnome_la_LDFLAGS += -no-undefined -endif - -if BUILD_PYTHON - libgladepython_la_LDFLAGS += -no-undefined -endif - -endif - -# -# Marshaller generation -# -glade-marshallers.h: glade-marshallers.list $(GLIB_GENMARSHAL) - $(GLIB_GENMARSHAL) --prefix=glade_marshal $(srcdir)/glade-marshallers.list --header > glade-marshallers-h.tmp \ - && mv glade-marshallers-h.tmp glade-marshallers.h \ - || ( rm -f glade-marshallers-h.tmp && exit 1) -glade-marshallers.c: glade-marshallers.list $(GLIB_GENMARSHAL) - $(GLIB_GENMARSHAL) --prefix=glade_marshal $(srcdir)/glade-marshallers.list --body > glade-marshallers-c.tmp \ - && mv glade-marshallers-c.tmp glade-marshallers.c \ - || ( rm -f glade-marshallers-c.tmp && exit 1 ) diff --git a/widgets/.cvsignore b/widgets/.cvsignore deleted file mode 100644 index df37519e..00000000 --- a/widgets/.cvsignore +++ /dev/null @@ -1,3 +0,0 @@ -Makefile -Makefile.in -gtk+.xml diff --git a/widgets/Makefile.am b/widgets/Makefile.am deleted file mode 100644 index 7110cedd..00000000 --- a/widgets/Makefile.am +++ /dev/null @@ -1,17 +0,0 @@ -@INTLTOOL_XML_NOMERGE_RULE@ - -CLEANFILES = gtk+.xml - -catalogsdir = $(pkgdatadir)/catalogs - -catalogs_DATA = gtk+.xml gtk+.xml.in - -if BUILD_GNOME -GNOME_CATALOGS = bonobo.xml canvas.xml gnome.xml -CLEANFILES += $(GNOME_CATALOGS) -catalogs_DATA += $(GNOME_CATALOGS) bonobo.xml.in canvas.xml.in gnome.xml.in -endif - -EXTRA_DIST = \ - $(catalogs_DATA) -