Commit 7d065360 authored by Michael Natterer's avatar Michael Natterer 😴 Committed by Michael Natterer
Browse files

configure.in added new directory app/dialogs and link libappdialogs.c into

2004-09-13  Michael Natterer  <mitch@gimp.org>

	* configure.in
	* app/Makefile.am: added new directory app/dialogs and link
	libappdialogs.c into the gimp binary.

	* app/gui/Makefile.am
	* app/gui/gui-types.h
	* app/gui/gui-vtable.c
	* app/gui/gui.c

	* app/gui/about-dialog.[ch]
	* app/gui/authors.h
	* app/gui/color-notebook.[ch]
	* app/gui/convert-dialog.[ch]
	* app/gui/dialogs-constructors.[ch]
	* app/gui/dialogs.[ch]
	* app/gui/file-dialog-utils.[ch]
	* app/gui/file-new-dialog.[ch]
	* app/gui/file-open-dialog.[ch]
	* app/gui/file-open-location-dialog.[ch]
	* app/gui/file-save-dialog.[ch]
	* app/gui/grid-dialog.[ch]
	* app/gui/info-dialog.[ch]
	* app/gui/info-window.[ch]
	* app/gui/module-browser.[ch]
	* app/gui/offset-dialog.[ch]
	* app/gui/palette-import-dialog.[ch]
	* app/gui/preferences-dialog.[ch]
	* app/gui/quit-dialog.[ch]
	* app/gui/resize-dialog.[ch]
	* app/gui/resolution-calibrate-dialog.[ch]
	* app/gui/stroke-dialog.[ch]
	* app/gui/tips-dialog.[ch]
	* app/gui/tips-parser.[ch]
	* app/gui/user-install-dialog.[ch]: removed these files...

	* app/dialogs/Makefile.am
	* app/dialogs/dialogs-types.h

	* app/dialogs/*.[ch]: ...and added them here. Changed some
	filenames like module-browser -> module-dialog.

	* app/app_procs.c
	* app/actions/actions-types.h
	* app/actions/actions.c
	* app/actions/dialogs-actions.c
	* app/actions/dialogs-commands.c
	* app/actions/dockable-commands.c
	* app/actions/drawable-commands.c
	* app/actions/edit-commands.c
	* app/actions/file-commands.c
	* app/actions/gradient-editor-commands.c
	* app/actions/image-commands.c
	* app/actions/layers-commands.c
	* app/actions/palettes-commands.c
	* app/actions/select-commands.c
	* app/actions/templates-commands.c
	* app/actions/templates-commands.h
	* app/actions/vectors-commands.c
	* app/actions/view-commands.c
	* app/display/gimpdisplayshell-cursor.c
	* app/display/gimpdisplayshell-title.c
	* app/display/gimpdisplayshell.[ch]
	* app/tools/gimpcroptool.c
	* app/tools/gimpperspectivetool.c
	* app/tools/gimprotatetool.c
	* app/tools/gimpscaletool.c
	* app/tools/gimpsheartool.c
	* app/tools/gimptransformtool.[ch]
	* app/tools/gimpvectortool.c
	* app/widgets/gimpcolormapeditor.[ch]
	* app/widgets/gimpcolorpanel.c
	* app/widgets/gimpgradienteditor.[ch]
	* app/widgets/gimppaletteeditor.[ch]
	* app/widgets/gimptoolbox-color-area.c
	* menus/toolbox-menu.xml.in
	* tools/authorsgen/authorsgen.pl: changed accordingly.
parent 95da4fd6
2004-09-13 Michael Natterer <mitch@gimp.org>
* configure.in
* app/Makefile.am: added new directory app/dialogs and link
libappdialogs.c into the gimp binary.
* app/gui/Makefile.am
* app/gui/gui-types.h
* app/gui/gui-vtable.c
* app/gui/gui.c
* app/gui/about-dialog.[ch]
* app/gui/authors.h
* app/gui/color-notebook.[ch]
* app/gui/convert-dialog.[ch]
* app/gui/dialogs-constructors.[ch]
* app/gui/dialogs.[ch]
* app/gui/file-dialog-utils.[ch]
* app/gui/file-new-dialog.[ch]
* app/gui/file-open-dialog.[ch]
* app/gui/file-open-location-dialog.[ch]
* app/gui/file-save-dialog.[ch]
* app/gui/grid-dialog.[ch]
* app/gui/info-dialog.[ch]
* app/gui/info-window.[ch]
* app/gui/module-browser.[ch]
* app/gui/offset-dialog.[ch]
* app/gui/palette-import-dialog.[ch]
* app/gui/preferences-dialog.[ch]
* app/gui/quit-dialog.[ch]
* app/gui/resize-dialog.[ch]
* app/gui/resolution-calibrate-dialog.[ch]
* app/gui/stroke-dialog.[ch]
* app/gui/tips-dialog.[ch]
* app/gui/tips-parser.[ch]
* app/gui/user-install-dialog.[ch]: removed these files...
* app/dialogs/Makefile.am
* app/dialogs/dialogs-types.h
* app/dialogs/*.[ch]: ...and added them here. Changed some
filenames like module-browser -> module-dialog.
* app/app_procs.c
* app/actions/actions-types.h
* app/actions/actions.c
* app/actions/dialogs-actions.c
* app/actions/dialogs-commands.c
* app/actions/dockable-commands.c
* app/actions/drawable-commands.c
* app/actions/edit-commands.c
* app/actions/file-commands.c
* app/actions/gradient-editor-commands.c
* app/actions/image-commands.c
* app/actions/layers-commands.c
* app/actions/palettes-commands.c
* app/actions/select-commands.c
* app/actions/templates-commands.c
* app/actions/templates-commands.h
* app/actions/vectors-commands.c
* app/actions/view-commands.c
* app/display/gimpdisplayshell-cursor.c
* app/display/gimpdisplayshell-title.c
* app/display/gimpdisplayshell.[ch]
* app/tools/gimpcroptool.c
* app/tools/gimpperspectivetool.c
* app/tools/gimprotatetool.c
* app/tools/gimpscaletool.c
* app/tools/gimpsheartool.c
* app/tools/gimptransformtool.[ch]
* app/tools/gimpvectortool.c
* app/widgets/gimpcolormapeditor.[ch]
* app/widgets/gimpcolorpanel.c
* app/widgets/gimpgradienteditor.[ch]
* app/widgets/gimppaletteeditor.[ch]
* app/widgets/gimptoolbox-color-area.c
* menus/toolbox-menu.xml.in
* tools/authorsgen/authorsgen.pl: changed accordingly.
2004-09-13 Michael Natterer <mitch@gimp.org> 2004-09-13 Michael Natterer <mitch@gimp.org>
Restore binary compatibility of the wire protocol that was Restore binary compatibility of the wire protocol that was
......
...@@ -22,6 +22,7 @@ SUBDIRS = \ ...@@ -22,6 +22,7 @@ SUBDIRS = \
tools \ tools \
widgets \ widgets \
display \ display \
dialogs \
actions \ actions \
menus \ menus \
gui \ gui \
...@@ -103,11 +104,12 @@ gimp_2_1_LDFLAGS = \ ...@@ -103,11 +104,12 @@ gimp_2_1_LDFLAGS = \
-u $(SYMPREFIX)file_open_dialog_show \ -u $(SYMPREFIX)file_open_dialog_show \
-u $(SYMPREFIX)file_open_location_dialog_show \ -u $(SYMPREFIX)file_open_location_dialog_show \
-u $(SYMPREFIX)file_save_dialog_show \ -u $(SYMPREFIX)file_save_dialog_show \
-u $(SYMPREFIX)color_notebook_new -u $(SYMPREFIX)color_dialog_new
gimp_2_1_LDADD = \ gimp_2_1_LDADD = \
config/libappconfig.a \ config/libappconfig.a \
gui/libappgui.a \ gui/libappgui.a \
dialogs/libappdialogs.a \
menus/libappmenus.a \ menus/libappmenus.a \
actions/libappactions.a \ actions/libappactions.a \
display/libappdisplay.a \ display/libappdisplay.a \
......
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
#define __ACTIONS_TYPES_H__ #define __ACTIONS_TYPES_H__
#include "gui/gui-types.h" #include "tools/tools-types.h"
typedef enum typedef enum
......
...@@ -42,7 +42,7 @@ ...@@ -42,7 +42,7 @@
#include "display/gimpdisplay.h" #include "display/gimpdisplay.h"
#include "display/gimpdisplayshell.h" #include "display/gimpdisplayshell.h"
#include "gui/dialogs.h" #include "dialogs/dialogs.h"
#include "brushes-actions.h" #include "brushes-actions.h"
#include "buffers-actions.h" #include "buffers-actions.h"
......
...@@ -181,9 +181,9 @@ static GimpStringActionEntry dialogs_toplevel_actions[] = ...@@ -181,9 +181,9 @@ static GimpStringActionEntry dialogs_toplevel_actions[] =
"gimp-preferences-dialog", "gimp-preferences-dialog",
GIMP_HELP_PREFS_DIALOG }, GIMP_HELP_PREFS_DIALOG },
{ "dialogs-module-manager", GTK_STOCK_EXECUTE, { "dialogs-module-dialog", GTK_STOCK_EXECUTE,
N_("_Module Manager"), NULL, NULL, N_("_Module Manager"), NULL, NULL,
"gimp-module-manager-dialog", "gimp-module-dialog",
GIMP_HELP_MODULE_DIALOG }, GIMP_HELP_MODULE_DIALOG },
{ "dialogs-tips", GIMP_STOCK_INFO, { "dialogs-tips", GIMP_STOCK_INFO,
......
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
#include "widgets/gimpdockbook.h" #include "widgets/gimpdockbook.h"
#include "widgets/gimpimagedock.h" #include "widgets/gimpimagedock.h"
#include "gui/dialogs.h" #include "dialogs/dialogs.h"
#include "actions.h" #include "actions.h"
#include "dialogs-commands.h" #include "dialogs-commands.h"
......
...@@ -34,7 +34,8 @@ ...@@ -34,7 +34,8 @@
#include "widgets/gimpimagedock.h" #include "widgets/gimpimagedock.h"
#include "widgets/gimpsessioninfo.h" #include "widgets/gimpsessioninfo.h"
#include "gui/dialogs.h" #include "dialogs/dialogs.h"
#include "dockable-commands.h" #include "dockable-commands.h"
......
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
#include "core/gimpimage-undo.h" #include "core/gimpimage-undo.h"
#include "core/gimpitem-linked.h" #include "core/gimpitem-linked.h"
#include "gui/offset-dialog.h" #include "dialogs/offset-dialog.h"
#include "actions.h" #include "actions.h"
#include "drawable-commands.h" #include "drawable-commands.h"
......
...@@ -42,7 +42,7 @@ ...@@ -42,7 +42,7 @@
#include "widgets/gimphelp-ids.h" #include "widgets/gimphelp-ids.h"
#include "widgets/gimpdialogfactory.h" #include "widgets/gimpdialogfactory.h"
#include "gui/dialogs.h" #include "dialogs/dialogs.h"
#include "actions.h" #include "actions.h"
#include "edit-commands.h" #include "edit-commands.h"
......
...@@ -47,9 +47,9 @@ ...@@ -47,9 +47,9 @@
#include "menus/menus.h" #include "menus/menus.h"
#include "gui/dialogs.h" #include "dialogs/dialogs.h"
#include "gui/file-open-dialog.h" #include "dialogs/file-open-dialog.h"
#include "gui/file-save-dialog.h" #include "dialogs/file-save-dialog.h"
#include "actions.h" #include "actions.h"
#include "file-commands.h" #include "file-commands.h"
......
...@@ -33,8 +33,8 @@ ...@@ -33,8 +33,8 @@
#include "widgets/gimphelp-ids.h" #include "widgets/gimphelp-ids.h"
#include "widgets/gimpviewabledialog.h" #include "widgets/gimpviewabledialog.h"
#include "gui/color-notebook.h" #include "dialogs/dialogs.h"
#include "gui/dialogs.h" #include "dialogs/color-dialog.h"
#include "gradient-editor-commands.h" #include "gradient-editor-commands.h"
...@@ -43,13 +43,13 @@ ...@@ -43,13 +43,13 @@
/* local function prototypes */ /* local function prototypes */
static void gradient_editor_left_color_changed (ColorNotebook *cnb, static void gradient_editor_left_color_changed (ColorDialog *cnb,
const GimpRGB *color, const GimpRGB *color,
ColorNotebookState state, ColorDialogState state,
gpointer data); gpointer data);
static void gradient_editor_right_color_changed (ColorNotebook *cnb, static void gradient_editor_right_color_changed (ColorDialog *cnb,
const GimpRGB *color, const GimpRGB *color,
ColorNotebookState state, ColorDialogState state,
gpointer data); gpointer data);
static GimpGradientSegment * static GimpGradientSegment *
...@@ -79,8 +79,8 @@ gradient_editor_left_color_cmd_callback (GtkAction *action, ...@@ -79,8 +79,8 @@ gradient_editor_left_color_cmd_callback (GtkAction *action,
editor->left_saved_dirty = GIMP_DATA (gradient)->dirty; editor->left_saved_dirty = GIMP_DATA (gradient)->dirty;
editor->left_saved_segments = gradient_editor_save_selection (editor); editor->left_saved_segments = gradient_editor_save_selection (editor);
editor->color_notebook = editor->color_dialog =
color_notebook_new (GIMP_VIEWABLE (gradient), color_dialog_new (GIMP_VIEWABLE (gradient),
_("Left Endpoint Color"), _("Left Endpoint Color"),
GIMP_STOCK_GRADIENT, GIMP_STOCK_GRADIENT,
_("Gradient Segment's Left Endpoint Color"), _("Gradient Segment's Left Endpoint Color"),
...@@ -172,8 +172,8 @@ gradient_editor_right_color_cmd_callback (GtkAction *action, ...@@ -172,8 +172,8 @@ gradient_editor_right_color_cmd_callback (GtkAction *action,
editor->right_saved_dirty = GIMP_DATA (gradient)->dirty; editor->right_saved_dirty = GIMP_DATA (gradient)->dirty;
editor->right_saved_segments = gradient_editor_save_selection (editor); editor->right_saved_segments = gradient_editor_save_selection (editor);
editor->color_notebook = editor->color_dialog =
color_notebook_new (GIMP_VIEWABLE (gradient), color_dialog_new (GIMP_VIEWABLE (gradient),
_("Right Endpoint Color"), _("Right Endpoint Color"),
GIMP_STOCK_GRADIENT, GIMP_STOCK_GRADIENT,
_("Gradient Segment's Right Endpoint Color"), _("Gradient Segment's Right Endpoint Color"),
...@@ -559,9 +559,9 @@ gradient_editor_blend_opacity_cmd_callback (GtkAction *action, ...@@ -559,9 +559,9 @@ gradient_editor_blend_opacity_cmd_callback (GtkAction *action,
/* private functions */ /* private functions */
static void static void
gradient_editor_left_color_changed (ColorNotebook *cnb, gradient_editor_left_color_changed (ColorDialog *cnb,
const GimpRGB *color, const GimpRGB *color,
ColorNotebookState state, ColorDialogState state,
gpointer data) gpointer data)
{ {
GimpGradientEditor *editor = GIMP_GRADIENT_EDITOR (data); GimpGradientEditor *editor = GIMP_GRADIENT_EDITOR (data);
...@@ -571,7 +571,7 @@ gradient_editor_left_color_changed (ColorNotebook *cnb, ...@@ -571,7 +571,7 @@ gradient_editor_left_color_changed (ColorNotebook *cnb,
switch (state) switch (state)
{ {
case COLOR_NOTEBOOK_UPDATE: case COLOR_DIALOG_UPDATE:
gimp_gradient_segment_range_blend (gradient, gimp_gradient_segment_range_blend (gradient,
editor->control_sel_l, editor->control_sel_l,
editor->control_sel_r, editor->control_sel_r,
...@@ -580,7 +580,7 @@ gradient_editor_left_color_changed (ColorNotebook *cnb, ...@@ -580,7 +580,7 @@ gradient_editor_left_color_changed (ColorNotebook *cnb,
TRUE, TRUE); TRUE, TRUE);
break; break;
case COLOR_NOTEBOOK_OK: case COLOR_DIALOG_OK:
gimp_gradient_segment_range_blend (gradient, gimp_gradient_segment_range_blend (gradient,
editor->control_sel_l, editor->control_sel_l,
editor->control_sel_r, editor->control_sel_r,
...@@ -588,26 +588,26 @@ gradient_editor_left_color_changed (ColorNotebook *cnb, ...@@ -588,26 +588,26 @@ gradient_editor_left_color_changed (ColorNotebook *cnb,
&editor->control_sel_r->right_color, &editor->control_sel_r->right_color,
TRUE, TRUE); TRUE, TRUE);
gimp_gradient_segments_free (editor->left_saved_segments); gimp_gradient_segments_free (editor->left_saved_segments);
color_notebook_free (cnb); color_dialog_free (cnb);
editor->color_notebook = NULL; editor->color_dialog = NULL;
gtk_widget_set_sensitive (GTK_WIDGET (editor), TRUE); gtk_widget_set_sensitive (GTK_WIDGET (editor), TRUE);
break; break;
case COLOR_NOTEBOOK_CANCEL: case COLOR_DIALOG_CANCEL:
gradient_editor_replace_selection (editor, editor->left_saved_segments); gradient_editor_replace_selection (editor, editor->left_saved_segments);
GIMP_DATA (gradient)->dirty = editor->left_saved_dirty; GIMP_DATA (gradient)->dirty = editor->left_saved_dirty;
gimp_viewable_invalidate_preview (GIMP_VIEWABLE (gradient)); gimp_viewable_invalidate_preview (GIMP_VIEWABLE (gradient));
color_notebook_free (cnb); color_dialog_free (cnb);
editor->color_notebook = NULL; editor->color_dialog = NULL;
gtk_widget_set_sensitive (GTK_WIDGET (editor), TRUE); gtk_widget_set_sensitive (GTK_WIDGET (editor), TRUE);
break; break;
} }
} }
static void static void
gradient_editor_right_color_changed (ColorNotebook *cnb, gradient_editor_right_color_changed (ColorDialog *cnb,
const GimpRGB *color, const GimpRGB *color,
ColorNotebookState state, ColorDialogState state,
gpointer data) gpointer data)
{ {
GimpGradientEditor *editor = GIMP_GRADIENT_EDITOR (data); GimpGradientEditor *editor = GIMP_GRADIENT_EDITOR (data);
...@@ -617,7 +617,7 @@ gradient_editor_right_color_changed (ColorNotebook *cnb, ...@@ -617,7 +617,7 @@ gradient_editor_right_color_changed (ColorNotebook *cnb,
switch (state) switch (state)
{ {
case COLOR_NOTEBOOK_UPDATE: case COLOR_DIALOG_UPDATE:
gimp_gradient_segment_range_blend (gradient, gimp_gradient_segment_range_blend (gradient,
editor->control_sel_l, editor->control_sel_l,
editor->control_sel_r, editor->control_sel_r,
...@@ -626,7 +626,7 @@ gradient_editor_right_color_changed (ColorNotebook *cnb, ...@@ -626,7 +626,7 @@ gradient_editor_right_color_changed (ColorNotebook *cnb,
TRUE, TRUE); TRUE, TRUE);
break; break;
case COLOR_NOTEBOOK_OK: case COLOR_DIALOG_OK:
gimp_gradient_segment_range_blend (gradient, gimp_gradient_segment_range_blend (gradient,
editor->control_sel_l, editor->control_sel_l,
editor->control_sel_r, editor->control_sel_r,
...@@ -634,17 +634,17 @@ gradient_editor_right_color_changed (ColorNotebook *cnb, ...@@ -634,17 +634,17 @@ gradient_editor_right_color_changed (ColorNotebook *cnb,
color, color,
TRUE, TRUE); TRUE, TRUE);
gimp_gradient_segments_free (editor->right_saved_segments); gimp_gradient_segments_free (editor->right_saved_segments);
color_notebook_free (cnb); color_dialog_free (cnb);
editor->color_notebook = NULL; editor->color_dialog = NULL;
gtk_widget_set_sensitive (GTK_WIDGET (editor), TRUE); gtk_widget_set_sensitive (GTK_WIDGET (editor), TRUE);
break; break;
case COLOR_NOTEBOOK_CANCEL: case COLOR_DIALOG_CANCEL:
gradient_editor_replace_selection (editor, editor->right_saved_segments); gradient_editor_replace_selection (editor, editor->right_saved_segments);
GIMP_DATA (gradient)->dirty = editor->right_saved_dirty; GIMP_DATA (gradient)->dirty = editor->right_saved_dirty;
gimp_viewable_invalidate_preview (GIMP_VIEWABLE (gradient)); gimp_viewable_invalidate_preview (GIMP_VIEWABLE (gradient));
color_notebook_free (cnb); color_dialog_free (cnb);
editor->color_notebook = NULL; editor->color_dialog = NULL;
gtk_widget_set_sensitive (GTK_WIDGET (editor), TRUE); gtk_widget_set_sensitive (GTK_WIDGET (editor), TRUE);
break; break;
} }
......
...@@ -51,11 +51,11 @@ ...@@ -51,11 +51,11 @@
#include "display/gimpdisplay.h" #include "display/gimpdisplay.h"
#include "display/gimpdisplayshell.h" #include "display/gimpdisplayshell.h"
#include "gui/convert-dialog.h" #include "dialogs/convert-dialog.h"
#include "gui/dialogs.h" #include "dialogs/dialogs.h"
#include "gui/file-new-dialog.h" #include "dialogs/grid-dialog.h"
#include "gui/grid-dialog.h" #include "dialogs/image-new-dialog.h"
#include "gui/resize-dialog.h" #include "dialogs/resize-dialog.h"
#include "actions.h" #include "actions.h"
#include "image-commands.h" #include "image-commands.h"
...@@ -117,11 +117,11 @@ image_new_cmd_callback (GtkAction *action, ...@@ -117,11 +117,11 @@ image_new_cmd_callback (GtkAction *action,
dialog = gimp_dialog_factory_dialog_new (global_dialog_factory, dialog = gimp_dialog_factory_dialog_new (global_dialog_factory,
gtk_widget_get_screen (widget), gtk_widget_get_screen (widget),
"gimp-file-new-dialog", -1, FALSE); "gimp-image-new-dialog", -1, FALSE);
if (dialog) if (dialog)
{ {
file_new_dialog_set (dialog, NULL, NULL); image_new_dialog_set (dialog, NULL, NULL);
gtk_window_present (GTK_WINDOW (dialog)); gtk_window_present (GTK_WINDOW (dialog));
} }
...@@ -137,14 +137,14 @@ image_new_from_image_cmd_callback (GtkAction *action, ...@@ -137,14 +137,14 @@ image_new_from_image_cmd_callback (GtkAction *action,
dialog = gimp_dialog_factory_dialog_new (global_dialog_factory, dialog = gimp_dialog_factory_dialog_new (global_dialog_factory,
gtk_widget_get_screen (widget), gtk_widget_get_screen (widget),
"gimp-file-new-dialog", -1, FALSE); "gimp-image-new-dialog", -1, FALSE);
if (dialog) if (dialog)
{ {
GimpImage *gimage = action_data_get_image (data); GimpImage *gimage = action_data_get_image (data);
if (gimage) if (gimage)
file_new_dialog_set (dialog, gimage, NULL); image_new_dialog_set (dialog, gimage, NULL);
gtk_window_present (GTK_WINDOW (dialog)); gtk_window_present (GTK_WINDOW (dialog));
} }
......
...@@ -61,7 +61,7 @@ ...@@ -61,7 +61,7 @@
#include "tools/gimptexttool.h" #include "tools/gimptexttool.h"
#include "tools/tool_manager.h" #include "tools/tool_manager.h"
#include "gui/resize-dialog.h" #include "dialogs/resize-dialog.h"
#include "actions.h" #include "actions.h"
#include "layers-commands.h" #include "layers-commands.h"
......
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
#include "widgets/gimphelp-ids.h" #include "widgets/gimphelp-ids.h"
#include "widgets/gimpview.h" #include "widgets/gimpview.h"
#include "gui/palette-import-dialog.h" #include "dialogs/palette-import-dialog.h"
#include "palettes-commands.h" #include "palettes-commands.h"
......
...@@ -36,8 +36,8 @@ ...@@ -36,8 +36,8 @@
#include "display/gimpdisplay.h" #include "display/gimpdisplay.h"
#include "display/gimpdisplayshell.h" #include "display/gimpdisplayshell.h"
#include "gui/dialogs.h" #include "dialogs/dialogs.h"
#include "gui/stroke-dialog.h" #include "dialogs/stroke-dialog.h"
#include "actions.h" #include "actions.h"
#include "select-commands.h" #include "select-commands.h"
......
...@@ -40,8 +40,8 @@ ...@@ -40,8 +40,8 @@
#include "widgets/gimptemplateview.h" #include "widgets/gimptemplateview.h"
#include "widgets/gimpviewabledialog.h" #include "widgets/gimpviewabledialog.h"
#include "gui/dialogs.h" #include "dialogs/dialogs.h"
#include "gui/file-new-dialog.h" #include "dialogs/image-new-dialog.h"
#include "templates-commands.h" #include "templates-commands.h"
...@@ -66,7 +66,7 @@ templates_create_image_cmd_callback (GtkAction *action, ...@@ -66,7 +66,7 @@ templates_create_image_cmd_callback (GtkAction *action,
if (template && gimp_container_have (container, GIMP_OBJECT (template))) if (template && gimp_container_have (container, GIMP_OBJECT (template)))
{ {
templates_file_new_dialog (context->gimp, template, GTK_WIDGET (editor)); templates_image_new_dialog (context->gimp, template, GTK_WIDGET (editor));
} }
} }
...@@ -359,7 +359,7 @@ templates_edit_template_dialog (Gimp *gimp, ...@@ -359,7 +359,7 @@ templates_edit_template_dialog (Gimp *gimp,
} }
void void
templates_file_new_dialog (Gimp *gimp, templates_image_new_dialog (Gimp *gimp,
GimpTemplate *template,