Commit 661f6dde authored by Michael Natterer's avatar Michael Natterer 😴 Committed by Michael Natterer

removed...

2004-04-20  Michael Natterer  <mitch@gimp.org>

	* app/gui/*-commands.[ch]: removed...

	* app/actions/*-commands.[ch]: ...and added here.

	* app/gui/Makefile.am
	* app/gui/*-menu.c
	* app/gui/dialogs-constructors.c
	* app/gui/gui.c
	* app/gui/menus.c
	* app/actions/Makefile.am
	* app/actions/*-actions.c: changed accordingly.

	* app/actions/plug-in-actions.[ch]
	* app/actions/tools-actions.[ch]: new files.

	* app/Makefile.am: had to add more -u evilness because gui/
	and actions/ have cyclic dependencies.

	* menus/image-menu.xml: added some more items.
parent 5e3b9ec3
2004-04-20 Michael Natterer <mitch@gimp.org>
* app/gui/*-commands.[ch]: removed...
* app/actions/*-commands.[ch]: ...and added here.
* app/gui/Makefile.am
* app/gui/*-menu.c
* app/gui/dialogs-constructors.c
* app/gui/gui.c
* app/gui/menus.c
* app/actions/Makefile.am
* app/actions/*-actions.c: changed accordingly.
* app/actions/plug-in-actions.[ch]
* app/actions/tools-actions.[ch]: new files.
* app/Makefile.am: had to add more -u evilness because gui/
and actions/ have cyclic dependencies.
* menus/image-menu.xml: added some more items.
2004-04-20 Sven Neumann <sven@gimp.org>
* app/widgets/gimpwidgets-constructors.[ch]: added new function
......
......@@ -76,10 +76,22 @@ INCLUDES = \
-I$(includedir)
gimp_2_1_LDFLAGS = \
$(mwindows) \
-u $(SYMPREFIX)gimp_container_filter \
-u $(SYMPREFIX)gimp_xml_parser_new \
-u $(SYMPREFIX)gimp_drawable_stroke_vectors
$(mwindows) \
-u $(SYMPREFIX)gimp_container_filter \
-u $(SYMPREFIX)gimp_xml_parser_new \
-u $(SYMPREFIX)gimp_drawable_stroke_vectors \
\
-u $(SYMPREFIX)convert_to_indexed \
-u $(SYMPREFIX)grid_dialog_new \
-u $(SYMPREFIX)info_dialog_new \
-u $(SYMPREFIX)info_window_create \
-u $(SYMPREFIX)offset_dialog_create \
-u $(SYMPREFIX)palette_import_dialog_show \
-u $(SYMPREFIX)resize_widget_new \
-u $(SYMPREFIX)stroke_dialog_new \
-u $(SYMPREFIX)file_open_dialog_show \
-u $(SYMPREFIX)file_save_dialog_show \
-u $(SYMPREFIX)color_notebook_new
gimp_2_1_LDADD = \
config/libappconfig.a \
......
......@@ -9,58 +9,120 @@ libappactions_a_SOURCES = \
brushes-actions.h \
buffers-actions.c \
buffers-actions.h \
buffers-commands.c \
buffers-commands.h \
channels-actions.c \
channels-actions.h \
channels-commands.c \
channels-commands.h \
colormap-editor-actions.c \
colormap-editor-actions.h \
colormap-editor-commands.c \
colormap-editor-commands.h \
data-commands.c \
data-commands.h \
debug-actions.c \
debug-actions.h \
debug-commands.c \
debug-commands.h \
dialogs-actions.c \
dialogs-actions.h \
dialogs-commands.c \
dialogs-commands.h \
dockable-actions.c \
dockable-actions.h \
dockable-commands.c \
dockable-commands.h \
documents-actions.c \
documents-actions.h \
documents-commands.c \
documents-commands.h \
drawable-actions.c \
drawable-actions.h \
drawable-commands.c \
drawable-commands.h \
edit-actions.c \
edit-actions.h \
edit-commands.c \
edit-commands.h \
error-console-actions.c \
error-console-actions.h \
error-console-commands.c \
error-console-commands.h \
file-actions.c \
file-actions.h \
file-commands.c \
file-commands.h \
fonts-actions.c \
fonts-actions.h \
fonts-commands.c \
fonts-commands.h \
gradient-editor-actions.c \
gradient-editor-actions.h \
gradient-editor-commands.c \
gradient-editor-commands.h \
gradients-actions.c \
gradients-actions.h \
gradients-commands.c \
gradients-commands.h \
help-actions.c \
help-actions.h \
help-commands.c \
help-commands.h \
image-actions.c \
image-actions.h \
image-commands.c \
image-commands.h \
images-actions.c \
images-actions.h \
images-commands.c \
images-commands.h \
layers-actions.c \
layers-actions.h \
layers-commands.c \
layers-commands.h \
palette-editor-actions.c \
palette-editor-actions.h \
palette-editor-commands.c \
palette-editor-commands.h \
palettes-actions.c \
palettes-actions.h \
palettes-commands.c \
palettes-commands.h \
patterns-actions.c \
patterns-actions.h \
plug-in-actions.c \
plug-in-actions.h \
plug-in-commands.c \
plug-in-commands.h \
qmask-actions.c \
qmask-actions.h \
qmask-commands.c \
qmask-commands.h \
select-actions.c \
select-actions.h \
select-commands.c \
select-commands.h \
templates-actions.c \
templates-actions.h \
templates-commands.c \
templates-commands.h \
tool-options-actions.c \
tool-options-actions.h \
tool-options-commands.c \
tool-options-commands.h \
tools-actions.c \
tools-actions.h \
tools-commands.c \
tools-commands.h \
vectors-actions.c \
vectors-actions.h \
vectors-commands.c \
vectors-commands.h \
view-actions.c \
view-actions.h
view-actions.h \
view-commands.c \
view-commands.h
EXTRA_DIST = makefile.msc
......
......@@ -34,7 +34,7 @@
#include "widgets/gimphelp-ids.h"
#include "brushes-actions.h"
#include "gui/data-commands.h"
#include "data-commands.h"
#include "gimp-intl.h"
......
......@@ -32,7 +32,7 @@
#include "widgets/gimphelp-ids.h"
#include "buffers-actions.h"
#include "gui/buffers-commands.h"
#include "buffers-commands.h"
#include "gimp-intl.h"
......
......@@ -20,7 +20,7 @@
#include <gtk/gtk.h>
#include "gui-types.h"
#include "actions-types.h"
#include "widgets/gimpbufferview.h"
......
......@@ -33,7 +33,7 @@
#include "widgets/gimpitemtreeview.h"
#include "channels-actions.h"
#include "gui/channels-commands.h"
#include "channels-commands.h"
#include "gimp-intl.h"
......
......@@ -25,7 +25,7 @@
#include "libgimpcolor/gimpcolor.h"
#include "libgimpwidgets/gimpwidgets.h"
#include "gui-types.h"
#include "actions-types.h"
#include "core/gimp.h"
#include "core/gimpchannel.h"
......
......@@ -31,7 +31,7 @@
#include "widgets/gimphelp-ids.h"
#include "colormap-editor-actions.h"
#include "gui/colormap-editor-commands.h"
#include "colormap-editor-commands.h"
#include "gimp-intl.h"
......
......@@ -22,7 +22,7 @@
#include "libgimpwidgets/gimpwidgets.h"
#include "gui-types.h"
#include "actions-types.h"
#include "widgets/gimpcolormapeditor.h"
......
......@@ -31,7 +31,7 @@
#include "widgets/gimphelp-ids.h"
#include "colormap-editor-actions.h"
#include "gui/colormap-editor-commands.h"
#include "colormap-editor-commands.h"
#include "gimp-intl.h"
......
......@@ -22,7 +22,7 @@
#include "libgimpwidgets/gimpwidgets.h"
#include "gui-types.h"
#include "actions-types.h"
#include "widgets/gimpcolormapeditor.h"
......
......@@ -20,7 +20,7 @@
#include <gtk/gtk.h>
#include "gui-types.h"
#include "actions-types.h"
#include "widgets/gimpdatafactoryview.h"
......
......@@ -27,7 +27,7 @@
#include "widgets/gimpactiongroup.h"
#include "debug-actions.h"
#include "gui/debug-commands.h"
#include "debug-commands.h"
static GimpActionEntry debug_actions[] =
......
......@@ -24,7 +24,7 @@
#include "libgimpbase/gimpbase.h"
#include "gui-types.h"
#include "actions-types.h"
#include "core/gimpobject.h"
......@@ -32,7 +32,7 @@
#include "widgets/gimpmenufactory.h"
#include "debug-commands.h"
#include "menus.h"
#include "gui/menus.h"
#ifdef ENABLE_DEBUG_MENU
......
......@@ -28,7 +28,7 @@
#include "widgets/gimphelp-ids.h"
#include "dialogs-actions.h"
#include "gui/dialogs-commands.h"
#include "dialogs-commands.h"
#include "gimp-intl.h"
......
......@@ -24,14 +24,14 @@
#include "libgimpwidgets/gimpwidgets.h"
#include "gui-types.h"
#include "actions-types.h"
#include "widgets/gimpdialogfactory.h"
#include "widgets/gimpdockable.h"
#include "widgets/gimpdockbook.h"
#include "widgets/gimpimagedock.h"
#include "dialogs.h"
#include "gui/dialogs.h"
#include "dialogs-commands.h"
......
......@@ -38,7 +38,7 @@
#include "dialogs-actions.h"
#include "dockable-actions.h"
#include "gui/dockable-commands.h"
#include "dockable-commands.h"
#include "gimp-intl.h"
......
......@@ -24,7 +24,7 @@
#include "libgimpwidgets/gimpwidgets.h"
#include "gui-types.h"
#include "actions-types.h"
#include "widgets/gimpcontainerview.h"
#include "widgets/gimpcontainerview-utils.h"
......@@ -34,7 +34,7 @@
#include "widgets/gimpimagedock.h"
#include "widgets/gimpsessioninfo.h"
#include "dialogs.h"
#include "gui/dialogs.h"
#include "dockable-commands.h"
......
......@@ -32,7 +32,7 @@
#include "widgets/gimphelp-ids.h"
#include "documents-actions.h"
#include "gui/documents-commands.h"
#include "documents-commands.h"
#include "gimp-intl.h"
......
......@@ -22,7 +22,7 @@
#include "libgimpwidgets/gimpwidgets.h"
#include "gui-types.h"
#include "actions-types.h"
#include "widgets/gimpdocumentview.h"
......
......@@ -37,7 +37,7 @@
#include "display/gimpdisplayshell.h"
#include "drawable-actions.h"
#include "gui/drawable-commands.h"
#include "drawable-commands.h"
#include "gimp-intl.h"
......
......@@ -24,7 +24,7 @@
#include "libgimpwidgets/gimpwidgets.h"
#include "gui-types.h"
#include "actions-types.h"
#include "core/gimp.h"
#include "core/gimpcontext.h"
......@@ -42,7 +42,7 @@
#include "display/gimpdisplay.h"
#include "drawable-commands.h"
#include "offset-dialog.h"
#include "gui/offset-dialog.h"
#include "gimp-intl.h"
......
......@@ -42,7 +42,7 @@
#include "display/gimpdisplayshell-selection.h"
#include "edit-actions.h"
#include "gui/edit-commands.h"
#include "edit-commands.h"
#include "gimp-intl.h"
......
......@@ -24,7 +24,7 @@
#include "libgimpwidgets/gimpwidgets.h"
#include "gui-types.h"
#include "actions-types.h"
#include "core/gimp.h"
#include "core/gimp-edit.h"
......@@ -44,9 +44,10 @@
#include "widgets/gimphelp-ids.h"
#include "widgets/gimpdialogfactory.h"
#include "dialogs.h"
#include "gui/dialogs.h"
#include "gui/stroke-dialog.h"
#include "edit-commands.h"
#include "stroke-dialog.h"
#include "gimp-intl.h"
......
......@@ -29,7 +29,7 @@
#include "widgets/gimphelp-ids.h"
#include "error-console-actions.h"
#include "gui/error-console-commands.h"
#include "error-console-commands.h"
#include "gimp-intl.h"
......
......@@ -22,7 +22,7 @@
#include "libgimpwidgets/gimpwidgets.h"
#include "gui-types.h"
#include "actions-types.h"
#include "widgets/gimperrorconsole.h"
......
......@@ -39,7 +39,7 @@
#include "display/gimpdisplayshell.h"
#include "file-actions.h"
#include "gui/file-commands.h"
#include "file-commands.h"
#include "gimp-intl.h"
......
......@@ -24,7 +24,7 @@
#include "libgimpwidgets/gimpwidgets.h"
#include "gui-types.h"
#include "actions-types.h"
#include "config/gimpguiconfig.h"
......@@ -48,12 +48,13 @@
#include "display/gimpdisplay-foreach.h"
#include "display/gimpdisplayshell.h"
#include "dialogs.h"
#include "gui/dialogs.h"
#include "gui/file-new-dialog.h"
#include "gui/file-open-dialog.h"
#include "gui/file-save-dialog.h"
#include "gui/menus.h"
#include "file-commands.h"
#include "file-new-dialog.h"
#include "file-open-dialog.h"
#include "file-save-dialog.h"
#include "menus.h"
#include "gimp-intl.h"
......
......@@ -34,7 +34,7 @@
#include "widgets/gimphelp-ids.h"
#include "fonts-actions.h"
#include "gui/fonts-commands.h"
#include "fonts-commands.h"
#include "gimp-intl.h"
......
......@@ -20,7 +20,7 @@
#include <gtk/gtk.h>
#include "gui-types.h"
#include "actions-types.h"
#include "widgets/gimpfontview.h"
......
......@@ -35,7 +35,7 @@
#include "widgets/gimphelp-ids.h"
#include "gradient-editor-actions.h"
#include "gui/gradient-editor-commands.h"
#include "gradient-editor-commands.h"
#include "gimp-intl.h"
......
......@@ -22,7 +22,7 @@
#include "libgimpwidgets/gimpwidgets.h"
#include "gui-types.h"
#include "actions-types.h"
#include "core/gimp.h"
#include "core/gimpcontext.h"
......@@ -33,8 +33,9 @@
#include "widgets/gimphelp-ids.h"
#include "widgets/gimpviewabledialog.h"
#include "color-notebook.h"
#include "dialogs.h"
#include "gui/color-notebook.h"
#include "gui/dialogs.h"
#include "gradient-editor-commands.h"
#include "gimp-intl.h"
......
......@@ -33,9 +33,9 @@
#include "widgets/gimpdatafactoryview.h"
#include "widgets/gimphelp-ids.h"
#include "gui/data-commands.h"
#include "data-commands.h"
#include "gradients-actions.h"
#include "gui/gradients-commands.h"
#include "gradients-commands.h"
#include "gimp-intl.h"
......
......@@ -22,7 +22,7 @@
#include "libgimpwidgets/gimpwidgets.h"
#include "gui-types.h"
#include "actions-types.h"
#include "core/gimpgradient.h"
#include "core/gimpcontext.h"
......
......@@ -28,7 +28,7 @@
#include "widgets/gimphelp-ids.h"
#include "help-actions.h"
#include "gui/help-commands.h"
#include "help-commands.h"
#include "gimp-intl.h"
......
......@@ -22,7 +22,7 @@
#include "libgimpwidgets/gimpwidgets.h"
#include "gui-types.h"
#include "actions-types.h"
#include "help-commands.h"
......
......@@ -38,7 +38,7 @@
#include "display/gimpdisplayshell.h"
#include "image-actions.h"
#include "gui/image-commands.h"
#include "image-commands.h"
#include "gimp-intl.h"
......
......@@ -23,7 +23,7 @@
#include "libgimpbase/gimputils.h"
#include "libgimpwidgets/gimpwidgets.h"
#include "gui-types.h"
#include "actions-types.h"
#include "config/gimpguiconfig.h"
......@@ -49,10 +49,11 @@
#include "display/gimpdisplayshell.h"
#include "display/gimpprogress.h"
#include "convert-dialog.h"
#include "gui/convert-dialog.h"
#include "gui/grid-dialog.h"
#include "gui/resize-dialog.h"
#include "image-commands.h"
#include "grid-dialog.h"
#include "resize-dialog.h"
#include "gimp-intl.h"
......
......@@ -32,7 +32,7 @@
#include "widgets/gimpcontainerview.h"
#include "images-actions.h"
#include "gui/images-commands.h"
#include "images-commands.h"
#include "gimp-intl.h"
......
......@@ -20,7 +20,7 @@
#include <gtk/gtk.h>
#include "gui-types.h"
#include "actions-types.h"
#include "core/gimp.h"
#include "core/gimpimage.h"
......
......@@ -38,7 +38,7 @@
#include "display/gimpdisplayshell.h"
#include "layers-actions.h"
#include "gui/layers-commands.h"
#include "layers-commands.h"
#include "gimp-intl.h"
......
......@@ -26,7 +26,7 @@
#include "libgimpbase/gimpbase.h"
#include "libgimpwidgets/gimpwidgets.h"
#include "gui-types.h"
#include "actions-types.h"
#include "core/gimp.h"
#include "core/gimpchannel-select.h"
......@@ -58,9 +58,10 @@
#include "tools/gimptexttool.h"
#include "tools/tool_manager.h"
#include "gui/resize-dialog.h"
#include "layers-commands.h"
#include "image-commands.h"
#include "resize-dialog.h"
#include "gimp-intl.h"
......
......@@ -29,7 +29,7 @@
#include "widgets/gimppaletteeditor.h"
#include "palette-editor-actions.h"
#include "gui/palette-editor-commands.h"
#include "palette-editor-commands.h"
#include "gimp-intl.h"
......
......@@ -22,7 +22,7 @@
#include "libgimpwidgets/gimpwidgets.h"
#include "gui-types.h"
#include "actions-types.h"
#include "widgets/gimppaletteeditor.h"
......
......@@ -33,9 +33,9 @@
#include "widgets/gimpdatafactoryview.h"
#include "widgets/gimphelp-ids.h"
#include "gui/data-commands.h"
#include "data-commands.h"
#include "palettes-actions.h"
#include "gui/palettes-commands.h"
#include "palettes-commands.h"
#include "gimp-intl.h"
......
......@@ -22,7 +22,7 @@
#include "libgimpwidgets/gimpwidgets.h"
#include "gui-types.h"
#include "actions-types.h"