From c18b6554b1a6634755e923803624b9bde9996a7d Mon Sep 17 00:00:00 2001 From: Michael Natterer Date: Sat, 3 May 2003 09:56:25 +0000 Subject: [PATCH] app/gui/dialogs.c app/tools/gimphistogramtool.c register their dialogs 2003-05-03 Michael Natterer * app/gui/dialogs.c * app/tools/gimphistogramtool.c * app/tools/gimpmeasuretool.c: register their dialogs too. --- ChangeLog | 6 ++++++ app/dialogs/dialogs.c | 4 ++++ app/gui/dialogs.c | 4 ++++ app/tools/gimphistogramtool.c | 12 ++++++++++++ app/tools/gimpmeasuretool.c | 6 ++++++ 5 files changed, 32 insertions(+) diff --git a/ChangeLog b/ChangeLog index 9f58143b29..e29dcb3b85 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2003-05-03 Michael Natterer + + * app/gui/dialogs.c + * app/tools/gimphistogramtool.c + * app/tools/gimpmeasuretool.c: register their dialogs too. + 2003-05-02 Michael Natterer * app/widgets/gimpdialogfactory.[ch]: added new function diff --git a/app/dialogs/dialogs.c b/app/dialogs/dialogs.c index 2b08ac413e..21199d1416 100644 --- a/app/dialogs/dialogs.c +++ b/app/dialogs/dialogs.c @@ -51,10 +51,14 @@ static const GimpDialogFactoryEntry toplevel_entries[] = NULL, 0, TRUE, TRUE, FALSE, FALSE }, { "gimp-color-balance-tool-dialog", NULL, 0, TRUE, TRUE, FALSE, FALSE }, + { "gimp-histogram-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-measure-tool-dialog", + NULL, 0, TRUE, TRUE, FALSE, FALSE }, { "gimp-posterize-tool-dialog", NULL, 0, TRUE, TRUE, FALSE, FALSE }, { "gimp-rotate-tool-dialog", diff --git a/app/gui/dialogs.c b/app/gui/dialogs.c index 2b08ac413e..21199d1416 100644 --- a/app/gui/dialogs.c +++ b/app/gui/dialogs.c @@ -51,10 +51,14 @@ static const GimpDialogFactoryEntry toplevel_entries[] = NULL, 0, TRUE, TRUE, FALSE, FALSE }, { "gimp-color-balance-tool-dialog", NULL, 0, TRUE, TRUE, FALSE, FALSE }, + { "gimp-histogram-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-measure-tool-dialog", + NULL, 0, TRUE, TRUE, FALSE, FALSE }, { "gimp-posterize-tool-dialog", NULL, 0, TRUE, TRUE, FALSE, FALSE }, { "gimp-rotate-tool-dialog", diff --git a/app/tools/gimphistogramtool.c b/app/tools/gimphistogramtool.c index 600208e6dd..86cf02213d 100644 --- a/app/tools/gimphistogramtool.c +++ b/app/tools/gimphistogramtool.c @@ -25,6 +25,11 @@ #include "tools-types.h" +#ifdef __GNUC__ +#warning FIXME #include "gui/gui-types.h" +#endif +#include "gui/gui-types.h" + #include "base/gimphistogram.h" #include "base/pixel-region.h" @@ -36,6 +41,7 @@ #include "core/gimptoolinfo.h" #include "widgets/gimpenummenu.h" +#include "widgets/gimpdialogfactory.h" #include "widgets/gimphistogrambox.h" #include "widgets/gimphistogramview.h" #include "widgets/gimppropwidgets.h" @@ -43,6 +49,8 @@ #include "display/gimpdisplay.h" +#include "gui/dialogs.h" + #include "gimphistogramtool.h" #include "tool_manager.h" @@ -430,6 +438,10 @@ histogram_tool_dialog_new (GimpToolInfo *tool_info) gtk_widget_show (htd->info_labels[i]); } + gimp_dialog_factory_add_foreign (global_dialog_factory, + "gimp-histogram-tool-dialog", + htd->shell); + return htd; } diff --git a/app/tools/gimpmeasuretool.c b/app/tools/gimpmeasuretool.c index c349b16cb3..b9bf8e4294 100644 --- a/app/tools/gimpmeasuretool.c +++ b/app/tools/gimpmeasuretool.c @@ -42,11 +42,13 @@ #include "core/gimpimage-undo-push.h" #include "core/gimptoolinfo.h" +#include "widgets/gimpdialogfactory.h" #include "widgets/gimpviewabledialog.h" #include "display/gimpdisplay.h" #include "display/gimpdisplayshell.h" +#include "gui/dialogs.h" #include "gui/info-dialog.h" #include "gimpmeasureoptions.h" @@ -395,6 +397,10 @@ gimp_measure_tool_button_press (GimpTool *tool, measure_tool_info, NULL, NULL, TRUE, TRUE, NULL); + + gimp_dialog_factory_add_foreign (global_dialog_factory, + "gimp-measure-tool-dialog", + measure_tool_info->shell); } if (measure_tool_info)