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

added new function gimp_dialog_factory_add_foreign() which adds a dialog

2003-05-02  Michael Natterer  <mitch@gimp.org>

	* app/widgets/gimpdialogfactory.[ch]: added new function
	gimp_dialog_factory_add_foreign() which adds a dialog that was not
	created by the factory itself. Its identifier however must be
	registered with the factory. Connect to all toplevel dialogs'
	"configure_event" and remember the resulting window geometry so we
	get session management for *all* dialogs, not only for those which
	were open on exit.

	* app/gui/dialogs.c: added the "File New" dialog. Added foreign
	entries (without constructor) for all dialogs opened by tools.

	* app/gui/dialogs-constructors.[ch]: added a constructor for
	the file_new dialog.

	* app/gui/file-new-dialog.[ch]: renamed file_new_dialog_create()
	to file_new_dialog_new() and removed the gimage and template
	paramaters. Adder new function file_new_dialog_set() to set
	gimage and template after creation.

	* app/gui/file-commands.c
	* app/gui/templates-commands.c: changed accordingly.

	* app/tools/gimpimagemaptool.[ch]
	* app/tools/gimptransformtool.[ch]: added
	"const gchar *shell_identifier" to the tool structs. Register the
	tool dialogs using gimp_dialog_factory_add_foreign().

	* app/tools/gimpbrightnesscontrasttool.c
	* app/tools/gimpcolorbalancetool.c
	* app/tools/gimpcurvestool.c
	* app/tools/gimphuesaturationtool.c
	* app/tools/gimplevelstool.c
	* app/tools/gimpperspectivetool.c
	* app/tools/gimpposterizetool.c
	* app/tools/gimprotatetool.c
	* app/tools/gimpscaletool.c
	* app/tools/gimpsheartool.c
	* app/tools/gimpthresholdtool.c: set "shell_identifier" so the
	dialogs become session managed. Fixes bug #61091.

	* app/tools/gimpcroptool.c: register the crop dialog with the
	dialog factory. Fixes bug #52849.

	* app/tools/gimpcolorpickertool.c: ditto.

	Unrelated:

	* app/tools/gimptool.c: no need to cast the return value of
	g_object_new().
parent a115c7b5
2003-05-02 Michael Natterer <mitch@gimp.org>
* app/widgets/gimpdialogfactory.[ch]: added new function
gimp_dialog_factory_add_foreign() which adds a dialog that was not
created by the factory itself. Its identifier however must be
registered with the factory. Connect to all toplevel dialogs'
"configure_event" and remember the resulting window geometry so we
get session management for *all* dialogs, not only for those which
were open on exit.
* app/gui/dialogs.c: added the "File New" dialog. Added foreign
entries (without constructor) for all dialogs opened by tools.
* app/gui/dialogs-constructors.[ch]: added a constructor for
the file_new dialog.
* app/gui/file-new-dialog.[ch]: renamed file_new_dialog_create()
to file_new_dialog_new() and removed the gimage and template
paramaters. Adder new function file_new_dialog_set() to set
gimage and template after creation.
* app/gui/file-commands.c
* app/gui/templates-commands.c: changed accordingly.
* app/tools/gimpimagemaptool.[ch]
* app/tools/gimptransformtool.[ch]: added
"const gchar *shell_identifier" to the tool structs. Register the
tool dialogs using gimp_dialog_factory_add_foreign().
* app/tools/gimpbrightnesscontrasttool.c
* app/tools/gimpcolorbalancetool.c
* app/tools/gimpcurvestool.c
* app/tools/gimphuesaturationtool.c
* app/tools/gimplevelstool.c
* app/tools/gimpperspectivetool.c
* app/tools/gimpposterizetool.c
* app/tools/gimprotatetool.c
* app/tools/gimpscaletool.c
* app/tools/gimpsheartool.c
* app/tools/gimpthresholdtool.c: set "shell_identifier" so the
dialogs become session managed. Fixes bug #61091.
* app/tools/gimpcroptool.c: register the crop dialog with the
dialog factory. Fixes bug #52849.
* app/tools/gimpcolorpickertool.c: ditto.
Unrelated:
* app/tools/gimptool.c: no need to cast the return value of
g_object_new().
2003-05-02 Pedro Gimeno <pggimeno@wanadoo.es>
 
* app/paint/gimppaintcore-stroke.c (gimp_paint_core_stroke,
......@@ -40,10 +40,13 @@
#include "file/file-save.h"
#include "file/file-utils.h"
#include "widgets/gimpdialogfactory.h"
#include "display/gimpdisplay.h"
#include "display/gimpdisplay-foreach.h"
#include "display/gimpdisplayshell.h"
#include "dialogs.h"
#include "file-commands.h"
#include "file-new-dialog.h"
#include "file-open-dialog.h"
......@@ -97,6 +100,7 @@ file_new_cmd_callback (GtkWidget *widget,
{
Gimp *gimp;
GimpImage *gimage;
GtkWidget *dialog;
return_if_no_gimp (gimp, data);
/* if called from the image menu */
......@@ -105,7 +109,11 @@ file_new_cmd_callback (GtkWidget *widget,
else
gimage = NULL;
file_new_dialog_create (gimp, gimage, NULL);
dialog = gimp_dialog_factory_dialog_new (global_dialog_factory,
"gimp-file-new-dialog", -1);
if (dialog)
file_new_dialog_set (dialog, gimage, NULL);
}
void
......
......@@ -31,10 +31,12 @@
#include "core/gimplist.h"
#include "core/gimptemplate.h"
#include "widgets/gimpdialogfactory.h"
#include "widgets/gimptemplateeditor.h"
#include "widgets/gimptemplateview.h"
#include "widgets/gimpviewabledialog.h"
#include "dialogs.h"
#include "file-new-dialog.h"
#include "templates-commands.h"
......@@ -235,5 +237,11 @@ void
templates_file_new_dialog (Gimp *gimp,
GimpTemplate *template)
{
file_new_dialog_create (gimp, NULL, template);
GtkWidget *dialog;
dialog = gimp_dialog_factory_dialog_new (global_dialog_factory,
"gimp-file-new-dialog", -1);
if (dialog)
file_new_dialog_set (dialog, NULL, template);
}
......@@ -80,6 +80,7 @@
#include "dialogs-constructors.h"
#include "error-console-dialog.h"
#include "file-commands.h"
#include "file-new-dialog.h"
#include "layers-commands.h"
#include "module-browser.h"
#include "paths-dialog.h"
......@@ -155,6 +156,14 @@ static void dialogs_navigation_display_changed (GimpContext *context
/* toplevel dialogs */
/**********************/
GtkWidget *
dialogs_file_new_new (GimpDialogFactory *factory,
GimpContext *context,
gint preview_size)
{
return file_new_dialog_new (context->gimp);
}
GtkWidget *
dialogs_device_status_get (GimpDialogFactory *factory,
GimpContext *context,
......
......@@ -22,6 +22,9 @@
/* toplevel dialogs */
GtkWidget * dialogs_file_new_new (GimpDialogFactory *factory,
GimpContext *context,
gint preview_size);
GtkWidget * dialogs_device_status_get (GimpDialogFactory *factory,
GimpContext *context,
gint preview_size);
......
......@@ -40,27 +40,62 @@ GimpDialogFactory *global_toolbox_factory = NULL;
static const GimpDialogFactoryEntry toplevel_entries[] =
{
/* foreign toplevels without constructor */
{ "gimp-brightness-contrast-tool-dialog",
NULL, 0, TRUE, TRUE, FALSE, FALSE },
{ "gimp-color-picker-tool-dialog",
NULL, 0, TRUE, TRUE, FALSE, FALSE },
{ "gimp-crop-tool-dialog",
NULL, 0, TRUE, TRUE, FALSE, FALSE },
{ "gimp-curves-tool-dialog",
NULL, 0, TRUE, TRUE, FALSE, FALSE },
{ "gimp-color-balance-tool-dialog",
NULL, 0, TRUE, TRUE, FALSE, FALSE },
{ "gimp-hue-saturation-tool-dialog",
NULL, 0, TRUE, TRUE, FALSE, FALSE },
{ "gimp-levels-tool-dialog",
NULL, 0, TRUE, TRUE, FALSE, FALSE },
{ "gimp-posterize-tool-dialog",
NULL, 0, TRUE, TRUE, FALSE, FALSE },
{ "gimp-rotate-tool-dialog",
NULL, 0, TRUE, TRUE, FALSE, FALSE },
{ "gimp-scale-tool-dialog",
NULL, 0, TRUE, TRUE, FALSE, FALSE },
{ "gimp-shear-tool-dialog",
NULL, 0, TRUE, TRUE, FALSE, FALSE },
{ "gimp-threshold-tool-dialog",
NULL, 0, TRUE, TRUE, FALSE, FALSE },
{ "gimp-perspective-tool-dialog",
NULL, 0, TRUE, TRUE, FALSE, FALSE },
/* ordinary toplevels */
{ "gimp-file-new-dialog", dialogs_file_new_new,
0, FALSE, TRUE, FALSE, FALSE },
/* singleton toplevels */
{ "gimp-device-status-dialog", dialogs_device_status_get,
0, TRUE, TRUE, FALSE, TRUE },
{ "gimp-preferences-dialog", dialogs_preferences_get,
0, TRUE, FALSE, FALSE, TRUE },
0, TRUE, TRUE, FALSE, FALSE },
{ "gimp-module-browser-dialog", dialogs_module_browser_get,
0, TRUE, FALSE, FALSE, TRUE },
0, TRUE, TRUE, FALSE, FALSE },
{ "gimp-display-filters-dialog", dialogs_display_filters_get,
0, FALSE, FALSE, FALSE, TRUE },
0, FALSE, TRUE, FALSE, FALSE },
{ "gimp-tips-dialog", dialogs_tips_get,
0, TRUE, FALSE, FALSE, TRUE },
0, TRUE, FALSE, FALSE, FALSE },
{ "gimp-about-dialog", dialogs_about_get,
0, TRUE, FALSE, FALSE, TRUE }
0, TRUE, FALSE, FALSE, FALSE }
};
static const GimpDialogFactoryEntry dock_entries[] =
{
/* singleton dockables */
{ "gimp-tool-options", dialogs_tool_options_get,
0, TRUE, FALSE, FALSE, TRUE },
{ "gimp-error-console", dialogs_error_console_get,
0, TRUE, FALSE, FALSE, TRUE },
/* list views */
{ "gimp-image-list", dialogs_image_list_view_new,
GIMP_PREVIEW_SIZE_MEDIUM, FALSE, FALSE, FALSE, TRUE },
{ "gimp-brush-list", dialogs_brush_list_view_new,
......@@ -77,7 +112,12 @@ static const GimpDialogFactoryEntry dock_entries[] =
GIMP_PREVIEW_SIZE_SMALL, FALSE, FALSE, FALSE, TRUE },
{ "gimp-buffer-list", dialogs_buffer_list_view_new,
GIMP_PREVIEW_SIZE_MEDIUM, FALSE, FALSE, FALSE, TRUE },
{ "gimp-document-list", dialogs_document_list_new,
GIMP_PREVIEW_SIZE_LARGE, FALSE, FALSE, FALSE, TRUE },
{ "gimp-template-list", dialogs_template_list_new,
GIMP_PREVIEW_SIZE_SMALL, FALSE, FALSE, FALSE, TRUE },
/* grid views */
{ "gimp-image-grid", dialogs_image_grid_view_new,
GIMP_PREVIEW_SIZE_MEDIUM, FALSE, FALSE, FALSE, TRUE },
{ "gimp-brush-grid", dialogs_brush_grid_view_new,
......@@ -94,7 +134,10 @@ static const GimpDialogFactoryEntry dock_entries[] =
GIMP_PREVIEW_SIZE_SMALL, FALSE, FALSE, FALSE, TRUE },
{ "gimp-buffer-grid", dialogs_buffer_grid_view_new,
GIMP_PREVIEW_SIZE_MEDIUM, FALSE, FALSE, FALSE, TRUE },
{ "gimp-document-grid", dialogs_document_grid_new,
GIMP_PREVIEW_SIZE_LARGE, FALSE, FALSE, FALSE, TRUE },
/* image related */
{ "gimp-layer-list", dialogs_layer_list_view_new,
0, FALSE, FALSE, FALSE, TRUE },
{ "gimp-channel-list", dialogs_channel_list_view_new,
......@@ -110,26 +153,21 @@ static const GimpDialogFactoryEntry dock_entries[] =
{ "gimp-undo-history", dialogs_undo_history_new,
0, FALSE, FALSE, FALSE, TRUE },
{ "gimp-color-editor", dialogs_color_editor_new,
/* display related */
{ "gimp-navigation-view", dialogs_navigation_view_new,
0, FALSE, FALSE, FALSE, TRUE },
{ "gimp-document-list", dialogs_document_list_new,
GIMP_PREVIEW_SIZE_LARGE, FALSE, FALSE, FALSE, TRUE },
{ "gimp-document-grid", dialogs_document_grid_new,
GIMP_PREVIEW_SIZE_LARGE, FALSE, FALSE, FALSE, TRUE },
{ "gimp-template-list", dialogs_template_list_new,
GIMP_PREVIEW_SIZE_SMALL, FALSE, FALSE, FALSE, TRUE },
/* editors */
{ "gimp-color-editor", dialogs_color_editor_new,
0, FALSE, FALSE, FALSE, TRUE },
/* singleton editors */
{ "gimp-brush-editor", dialogs_brush_editor_get,
0, TRUE, FALSE, FALSE, TRUE },
{ "gimp-gradient-editor", dialogs_gradient_editor_get,
0, TRUE, FALSE, FALSE, TRUE },
{ "gimp-palette-editor", dialogs_palette_editor_get,
0, TRUE, FALSE, FALSE, TRUE },
{ "gimp-navigation-view", dialogs_navigation_view_new,
0, FALSE, FALSE, FALSE, TRUE }
};
......
......@@ -76,19 +76,15 @@ static void file_new_create_image (FileNewDialog *dialog);
/* public functions */
void
file_new_dialog_create (Gimp *gimp,
GimpImage *gimage,
GimpTemplate *template)
GtkWidget *
file_new_dialog_new (Gimp *gimp)
{
FileNewDialog *dialog;
GtkWidget *main_vbox;
GtkWidget *table;
GtkWidget *optionmenu;
g_return_if_fail (GIMP_IS_GIMP (gimp));
g_return_if_fail (gimage == NULL || GIMP_IS_IMAGE (gimage));
g_return_if_fail (template == NULL || GIMP_IS_TEMPLATE (template));
g_return_val_if_fail (GIMP_IS_GIMP (gimp), NULL);
dialog = g_new0 (FileNewDialog, 1);
......@@ -114,6 +110,10 @@ file_new_dialog_create (Gimp *gimp,
NULL);
g_object_set_data_full (G_OBJECT (dialog->dialog),
"gimp-file-new-dialog", dialog,
(GDestroyNotify) g_free);
gtk_window_set_resizable (GTK_WINDOW (dialog->dialog), FALSE);
/* vbox holding the rest of the dialog */
......@@ -154,6 +154,26 @@ file_new_dialog_create (Gimp *gimp,
G_CALLBACK (file_new_template_notify),
dialog);
gimp_size_entry_grab_focus (GIMP_SIZE_ENTRY (GIMP_TEMPLATE_EDITOR (dialog->editor)->size_se));
return dialog->dialog;
}
void
file_new_dialog_set (GtkWidget *widget,
GimpImage *gimage,
GimpTemplate *template)
{
FileNewDialog *dialog;
g_return_if_fail (GTK_IS_WIDGET (widget));
g_return_if_fail (gimage == NULL || GIMP_IS_IMAGE (gimage));
g_return_if_fail (template == NULL || GIMP_IS_TEMPLATE (template));
dialog = g_object_get_data (G_OBJECT (widget), "gimp-file-new-dialog");
g_return_if_fail (dialog != NULL);
if (template)
{
gimp_container_menu_select_item (GIMP_CONTAINER_MENU (dialog->template_menu),
......@@ -161,15 +181,11 @@ file_new_dialog_create (Gimp *gimp,
}
else
{
template = gimp_image_new_get_last_template (gimp, gimage);
template = gimp_image_new_get_last_template (dialog->gimp, gimage);
gimp_template_editor_set_template (GIMP_TEMPLATE_EDITOR (dialog->editor),
template);
g_object_unref (template);
}
gimp_size_entry_grab_focus (GIMP_SIZE_ENTRY (GIMP_TEMPLATE_EDITOR (dialog->editor)->size_se));
gtk_widget_show (dialog->dialog);
}
......@@ -191,7 +207,6 @@ file_new_cancel_callback (GtkWidget *widget,
FileNewDialog *dialog)
{
gtk_widget_destroy (dialog->dialog);
g_free (dialog);
}
static void
......@@ -299,15 +314,16 @@ static void
file_new_create_image (FileNewDialog *dialog)
{
GimpTemplate *template;
Gimp *gimp;
template =
gimp_template_editor_get_template (GIMP_TEMPLATE_EDITOR (dialog->editor));
gimp = dialog->gimp;
gtk_widget_destroy (dialog->dialog);
gimp_template_create_image (dialog->gimp, template);
gimp_image_new_set_last_template (dialog->gimp, template);
gimp_template_create_image (gimp, template);
gimp_image_new_set_last_template (gimp, template);
g_object_unref (template);
g_free (dialog);
}
......@@ -20,9 +20,11 @@
#define __FILE_NEW_DIALOG_H__
void file_new_dialog_create (Gimp *gimp,
GimpImage *gimage,
GimpTemplate *template);
GtkWidget * file_new_dialog_new (Gimp *gimp);
void file_new_dialog_set (GtkWidget *widget,
GimpImage *gimage,
GimpTemplate *template);
#endif /* __FILE_NEW_DIALOG_H__ */
......@@ -80,6 +80,7 @@
#include "dialogs-constructors.h"
#include "error-console-dialog.h"
#include "file-commands.h"
#include "file-new-dialog.h"
#include "layers-commands.h"
#include "module-browser.h"
#include "paths-dialog.h"
......@@ -155,6 +156,14 @@ static void dialogs_navigation_display_changed (GimpContext *context
/* toplevel dialogs */
/**********************/
GtkWidget *
dialogs_file_new_new (GimpDialogFactory *factory,
GimpContext *context,
gint preview_size)
{
return file_new_dialog_new (context->gimp);
}
GtkWidget *
dialogs_device_status_get (GimpDialogFactory *factory,
GimpContext *context,
......
......@@ -22,6 +22,9 @@
/* toplevel dialogs */
GtkWidget * dialogs_file_new_new (GimpDialogFactory *factory,
GimpContext *context,
gint preview_size);
GtkWidget * dialogs_device_status_get (GimpDialogFactory *factory,
GimpContext *context,
gint preview_size);
......
......@@ -40,27 +40,62 @@ GimpDialogFactory *global_toolbox_factory = NULL;
static const GimpDialogFactoryEntry toplevel_entries[] =
{
/* foreign toplevels without constructor */
{ "gimp-brightness-contrast-tool-dialog",
NULL, 0, TRUE, TRUE, FALSE, FALSE },
{ "gimp-color-picker-tool-dialog",
NULL, 0, TRUE, TRUE, FALSE, FALSE },
{ "gimp-crop-tool-dialog",
NULL, 0, TRUE, TRUE, FALSE, FALSE },
{ "gimp-curves-tool-dialog",
NULL, 0, TRUE, TRUE, FALSE, FALSE },
{ "gimp-color-balance-tool-dialog",
NULL, 0, TRUE, TRUE, FALSE, FALSE },
{ "gimp-hue-saturation-tool-dialog",
NULL, 0, TRUE, TRUE, FALSE, FALSE },
{ "gimp-levels-tool-dialog",
NULL, 0, TRUE, TRUE, FALSE, FALSE },
{ "gimp-posterize-tool-dialog",
NULL, 0, TRUE, TRUE, FALSE, FALSE },
{ "gimp-rotate-tool-dialog",
NULL, 0, TRUE, TRUE, FALSE, FALSE },
{ "gimp-scale-tool-dialog",
NULL, 0, TRUE, TRUE, FALSE, FALSE },
{ "gimp-shear-tool-dialog",
NULL, 0, TRUE, TRUE, FALSE, FALSE },
{ "gimp-threshold-tool-dialog",
NULL, 0, TRUE, TRUE, FALSE, FALSE },
{ "gimp-perspective-tool-dialog",
NULL, 0, TRUE, TRUE, FALSE, FALSE },
/* ordinary toplevels */
{ "gimp-file-new-dialog", dialogs_file_new_new,
0, FALSE, TRUE, FALSE, FALSE },
/* singleton toplevels */
{ "gimp-device-status-dialog", dialogs_device_status_get,
0, TRUE, TRUE, FALSE, TRUE },
{ "gimp-preferences-dialog", dialogs_preferences_get,
0, TRUE, FALSE, FALSE, TRUE },
0, TRUE, TRUE, FALSE, FALSE },
{ "gimp-module-browser-dialog", dialogs_module_browser_get,
0, TRUE, FALSE, FALSE, TRUE },
0, TRUE, TRUE, FALSE, FALSE },
{ "gimp-display-filters-dialog", dialogs_display_filters_get,
0, FALSE, FALSE, FALSE, TRUE },
0, FALSE, TRUE, FALSE, FALSE },
{ "gimp-tips-dialog", dialogs_tips_get,
0, TRUE, FALSE, FALSE, TRUE },
0, TRUE, FALSE, FALSE, FALSE },
{ "gimp-about-dialog", dialogs_about_get,
0, TRUE, FALSE, FALSE, TRUE }
0, TRUE, FALSE, FALSE, FALSE }
};
static const GimpDialogFactoryEntry dock_entries[] =
{
/* singleton dockables */
{ "gimp-tool-options", dialogs_tool_options_get,
0, TRUE, FALSE, FALSE, TRUE },
{ "gimp-error-console", dialogs_error_console_get,
0, TRUE, FALSE, FALSE, TRUE },
/* list views */
{ "gimp-image-list", dialogs_image_list_view_new,
GIMP_PREVIEW_SIZE_MEDIUM, FALSE, FALSE, FALSE, TRUE },
{ "gimp-brush-list", dialogs_brush_list_view_new,
......@@ -77,7 +112,12 @@ static const GimpDialogFactoryEntry dock_entries[] =
GIMP_PREVIEW_SIZE_SMALL, FALSE, FALSE, FALSE, TRUE },
{ "gimp-buffer-list", dialogs_buffer_list_view_new,
GIMP_PREVIEW_SIZE_MEDIUM, FALSE, FALSE, FALSE, TRUE },
{ "gimp-document-list", dialogs_document_list_new,
GIMP_PREVIEW_SIZE_LARGE, FALSE, FALSE, FALSE, TRUE },
{ "gimp-template-list", dialogs_template_list_new,
GIMP_PREVIEW_SIZE_SMALL, FALSE, FALSE, FALSE, TRUE },
/* grid views */
{ "gimp-image-grid", dialogs_image_grid_view_new,
GIMP_PREVIEW_SIZE_MEDIUM, FALSE, FALSE, FALSE, TRUE },
{ "gimp-brush-grid", dialogs_brush_grid_view_new,
......@@ -94,7 +134,10 @@ static const GimpDialogFactoryEntry dock_entries[] =
GIMP_PREVIEW_SIZE_SMALL, FALSE, FALSE, FALSE, TRUE },
{ "gimp-buffer-grid", dialogs_buffer_grid_view_new,
GIMP_PREVIEW_SIZE_MEDIUM, FALSE, FALSE, FALSE, TRUE },
{ "gimp-document-grid", dialogs_document_grid_new,
GIMP_PREVIEW_SIZE_LARGE, FALSE, FALSE, FALSE, TRUE },
/* image related */
{ "gimp-layer-list", dialogs_layer_list_view_new,
0, FALSE, FALSE, FALSE, TRUE },
{ "gimp-channel-list", dialogs_channel_list_view_new,
......@@ -110,26 +153,21 @@ static const GimpDialogFactoryEntry dock_entries[] =
{ "gimp-undo-history", dialogs_undo_history_new,
0, FALSE, FALSE, FALSE, TRUE },
{ "gimp-color-editor", dialogs_color_editor_new,
/* display related */
{ "gimp-navigation-view", dialogs_navigation_view_new,
0, FALSE, FALSE, FALSE, TRUE },
{ "gimp-document-list", dialogs_document_list_new,
GIMP_PREVIEW_SIZE_LARGE, FALSE, FALSE, FALSE, TRUE },
{ "gimp-document-grid", dialogs_document_grid_new,
GIMP_PREVIEW_SIZE_LARGE, FALSE, FALSE, FALSE, TRUE },
{ "gimp-template-list", dialogs_template_list_new,
GIMP_PREVIEW_SIZE_SMALL, FALSE, FALSE, FALSE, TRUE },
/* editors */
{ "gimp-color-editor", dialogs_color_editor_new,
0, FALSE, FALSE, FALSE, TRUE },
/* singleton editors */
{ "gimp-brush-editor", dialogs_brush_editor_get,
0, TRUE, FALSE, FALSE, TRUE },
{ "gimp-gradient-editor", dialogs_gradient_editor_get,
0, TRUE, FALSE, FALSE, TRUE },
{ "gimp-palette-editor", dialogs_palette_editor_get,
0, TRUE, FALSE, FALSE, TRUE },
{ "gimp-navigation-view", dialogs_navigation_view_new,
0, FALSE, FALSE, FALSE, TRUE }
};
......
......@@ -40,10 +40,13 @@
#include "file/file-save.h"
#include "file/file-utils.h"
#include "widgets/gimpdialogfactory.h"
#include "display/gimpdisplay.h"
#include "display/gimpdisplay-foreach.h"
#include "display/gimpdisplayshell.h"
#include "dialogs.h"
#include "file-commands.h"
#include "file-new-dialog.h"
#include "file-open-dialog.h"
......@@ -97,6 +100,7 @@ file_new_cmd_callback (GtkWidget *widget,
{
Gimp *gimp;
GimpImage *gimage;
GtkWidget *dialog;
return_if_no_gimp (gimp, data);
/* if called from the image menu */
......@@ -105,7 +109,11 @@ file_new_cmd_callback (GtkWidget *widget,
else
gimage = NULL;
file_new_dialog_create (gimp, gimage, NULL);
dialog = gimp_dialog_factory_dialog_new (global_dialog_factory,
"gimp-file-new-dialog", -1);
if (dialog)
file_new_dialog_set (dialog, gimage, NULL);
}
void
......
......@@ -76,19 +76,15 @@ static void file_new_create_image (FileNewDialog *dialog);
/* public functions */
void
file_new_dialog_create (Gimp *gimp,
GimpImage *gimage,
GimpTemplate *template)
GtkWidget *
file_new_dialog_new (Gimp *gimp)
{
FileNewDialog *dialog;
GtkWidget *main_vbox;
GtkWidget *table;
GtkWidget *optionmenu;
g_return_if_fail (GIMP_IS_GIMP (gimp));
g_return_if_fail (gimage == NULL || GIMP_IS_IMAGE (gimage));
g_return_if_fail (template == NULL || GIMP_IS_TEMPLATE (template));
g_return_val_if_fail (GIMP_IS_GIMP (gimp), NULL);
dialog = g_new0 (FileNewDialog, 1);
......@@ -114,6 +110,10 @@ file_new_dialog_create (Gimp *gimp,