dnrops
/
gimp
mirror of https://github.com/GNOME/gimp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

app/widgets/gimpcolormapeditor.[ch] app/widgets/gimphistogrameditor.[ch] 

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

	* app/widgets/gimpcolormapeditor.[ch]
	* app/widgets/gimphistogrameditor.[ch]
	* app/widgets/gimpselectioneditor.[ch]: removed redundant "gimage"
	parameters from public constructors. They are all GimpImageEditor
	widgets which get their image via gimp_docked_set_context() and
	gimp_image_editor_set_image() later anyway. Fixes uglyness as well
	as problems where the editors had an image but no context, causing
	strange behavior in their foo_actions_update() functions.

	* app/dialogs/dialogs-constructors.c: changed accordingly. Removed
	redundant calls to gimp_dockable_set_context() on newly created
	dockables because they will get a context when added to their
	containers.
This commit is contained in:
Michael Natterer 2004-09-25 12:48:41 +00:00 committed by Michael Natterer
parent ed35eedb9f
commit 28f7c94dbf
8 changed files with 79 additions and 134 deletions

16
ChangeLog
View File

@ -1,3 +1,19 @@
2004-09-25 Michael Natterer <mitch@gimp.org>
* app/widgets/gimpcolormapeditor.[ch]
* app/widgets/gimphistogrameditor.[ch]
* app/widgets/gimpselectioneditor.[ch]: removed redundant "gimage"
parameters from public constructors. They are all GimpImageEditor
widgets which get their image via gimp_docked_set_context() and
gimp_image_editor_set_image() later anyway. Fixes uglyness as well
as problems where the editors had an image but no context, causing
strange behavior in their foo_actions_update() functions.
* app/dialogs/dialogs-constructors.c: changed accordingly. Removed
redundant calls to gimp_dockable_set_context() on newly created
dockables because they will get a context when added to their
containers.
2004-09-25 Michael Natterer <mitch@gimp.org>
* app/widgets/gimpcolormapeditor.c: moved stuff from

120
app/dialogs/dialogs-constructors.c
View File

@ -100,7 +100,7 @@ static GtkWidget * dialogs_dockable_new (GtkWidget *widget,
static void dialogs_indexed_palette_selected (GimpColormapEditor *editor,
GdkModifierType state,
GimpDockable *dockable);
gpointer data);
/**********************/
@ -672,7 +672,6 @@ dialogs_layer_list_view_new (GimpDialogFactory *factory,
gint preview_size)
{
GtkWidget *view;
GtkWidget *dockable;
if (preview_size < 1)
preview_size = context->gimp->config->layer_preview_size;
@ -688,14 +687,10 @@ dialogs_layer_list_view_new (GimpDialogFactory *factory,
factory->menu_factory, "<Layers>",
"/layers-popup");
dockable = dialogs_dockable_new (view,
_("Layers"), NULL,
GIMP_STOCK_LAYERS,
GIMP_HELP_LAYER_DIALOG);
gimp_dockable_set_context (GIMP_DOCKABLE (dockable), context);
return dockable;
return dialogs_dockable_new (view,
_("Layers"), NULL,
GIMP_STOCK_LAYERS,
GIMP_HELP_LAYER_DIALOG);
}
GtkWidget *
@ -704,7 +699,6 @@ dialogs_channel_list_view_new (GimpDialogFactory *factory,
gint preview_size)
{
GtkWidget *view;
GtkWidget *dockable;
if (preview_size < 1)
preview_size = context->gimp->config->layer_preview_size;
@ -720,14 +714,10 @@ dialogs_channel_list_view_new (GimpDialogFactory *factory,
factory->menu_factory, "<Channels>",
"/channels-popup");
dockable = dialogs_dockable_new (view,
_("Channels"), NULL,
GIMP_STOCK_CHANNELS,
GIMP_HELP_CHANNEL_DIALOG);
gimp_dockable_set_context (GIMP_DOCKABLE (dockable), context);
return dockable;
return dialogs_dockable_new (view,
_("Channels"), NULL,
GIMP_STOCK_CHANNELS,
GIMP_HELP_CHANNEL_DIALOG);
}
GtkWidget *
@ -736,7 +726,6 @@ dialogs_vectors_list_view_new (GimpDialogFactory *factory,
gint preview_size)
{
GtkWidget *view;
GtkWidget *dockable;
if (preview_size < 1)
preview_size = context->gimp->config->layer_preview_size;
@ -752,14 +741,10 @@ dialogs_vectors_list_view_new (GimpDialogFactory *factory,
factory->menu_factory, "<Vectors>",
"/vectors-popup");
dockable = dialogs_dockable_new (view,
_("Paths"), NULL,
GIMP_STOCK_PATHS,
GIMP_HELP_PATH_DIALOG);
gimp_dockable_set_context (GIMP_DOCKABLE (dockable), context);
return dockable;
return dialogs_dockable_new (view,
_("Paths"), NULL,
GIMP_STOCK_PATHS,
GIMP_HELP_PATH_DIALOG);
}
GtkWidget *
@ -768,23 +753,17 @@ dialogs_indexed_palette_new (GimpDialogFactory *factory,
gint preview_size)
{
GtkWidget *view;
GtkWidget *dockable;
view = gimp_colormap_editor_new (gimp_context_get_image (context),
factory->menu_factory);
dockable = dialogs_dockable_new (view,
_("Colormap"), _("Indexed Palette"),
GIMP_STOCK_INDEXED_PALETTE,
GIMP_HELP_INDEXED_PALETTE_DIALOG);
gimp_dockable_set_context (GIMP_DOCKABLE (dockable), context);
view = gimp_colormap_editor_new (factory->menu_factory);
g_signal_connect (view, "selected",
G_CALLBACK (dialogs_indexed_palette_selected),
dockable);
NULL);
return dockable;
return dialogs_dockable_new (view,
_("Colormap"), _("Indexed Palette"),
GIMP_STOCK_INDEXED_PALETTE,
GIMP_HELP_INDEXED_PALETTE_DIALOG);
}
GtkWidget *
@ -793,18 +772,13 @@ dialogs_histogram_editor_new (GimpDialogFactory *factory,
gint preview_size)
{
GtkWidget *view;
GtkWidget *dockable;
view = gimp_histogram_editor_new (gimp_context_get_image (context));
view = gimp_histogram_editor_new ();
dockable = dialogs_dockable_new (view,
_("Histogram"), NULL,
GIMP_STOCK_HISTOGRAM,
GIMP_HELP_HISTOGRAM_DIALOG);
gimp_dockable_set_context (GIMP_DOCKABLE (dockable), context);
return dockable;
return dialogs_dockable_new (view,
_("Histogram"), NULL,
GIMP_STOCK_HISTOGRAM,
GIMP_HELP_HISTOGRAM_DIALOG);
}
GtkWidget *
@ -813,19 +787,13 @@ dialogs_selection_editor_new (GimpDialogFactory *factory,
gint preview_size)
{
GtkWidget *view;
GtkWidget *dockable;
view = gimp_selection_editor_new (gimp_context_get_image (context),
factory->menu_factory);
view = gimp_selection_editor_new (factory->menu_factory);
dockable = dialogs_dockable_new (view,
_("Selection"), _("Selection Editor"),
GIMP_STOCK_TOOL_RECT_SELECT,
GIMP_HELP_SELECTION_DIALOG);
gimp_dockable_set_context (GIMP_DOCKABLE (dockable), context);
return dockable;
return dialogs_dockable_new (view,
_("Selection"), _("Selection Editor"),
GIMP_STOCK_TOOL_RECT_SELECT,
GIMP_HELP_SELECTION_DIALOG);
}
GtkWidget *
@ -834,24 +802,14 @@ dialogs_undo_history_new (GimpDialogFactory *factory,
gint preview_size)
{
GtkWidget *editor;
GtkWidget *dockable;
GimpImage *gimage;
editor = gimp_undo_editor_new (context->gimp->config,
factory->menu_factory);
gimage = gimp_context_get_image (context);
if (gimage)
gimp_image_editor_set_image (GIMP_IMAGE_EDITOR (editor), gimage);
dockable = dialogs_dockable_new (editor,
_("Undo"), _("Undo History"),
GIMP_STOCK_UNDO_HISTORY,
GIMP_HELP_UNDO_DIALOG);
gimp_dockable_set_context (GIMP_DOCKABLE (dockable), context);
return dockable;
return dialogs_dockable_new (editor,
_("Undo"), _("Undo History"),
GIMP_STOCK_UNDO_HISTORY,
GIMP_HELP_UNDO_DIALOG);
}
@ -1014,22 +972,22 @@ dialogs_dockable_new (GtkWidget *widget,
static void
dialogs_indexed_palette_selected (GimpColormapEditor *editor,
GdkModifierType state,
GimpDockable *dockable)
gpointer data)
{
GimpImage *gimage = GIMP_IMAGE_EDITOR (editor)->gimage;
GimpImageEditor *image_editor = GIMP_IMAGE_EDITOR (editor);
if (gimage)
if (image_editor->gimage)
{
GimpRGB color;
gint index;
index = gimp_colormap_editor_col_index (editor);
gimp_image_get_colormap_entry (gimage, index, &color);
gimp_image_get_colormap_entry (image_editor->gimage, index, &color);
if (state & GDK_CONTROL_MASK)
gimp_context_set_background (dockable->context, &color);
gimp_context_set_background (image_editor->context, &color);
else
gimp_context_set_foreground (dockable->context, &color);
gimp_context_set_foreground (image_editor->context, &color);
}
}

21
app/widgets/gimpcolormapeditor.c
View File

@ -394,24 +394,15 @@ gimp_colormap_editor_set_image (GimpImageEditor *image_editor,
/* public functions */
GtkWidget *
gimp_colormap_editor_new (GimpImage *gimage,
GimpMenuFactory *menu_factory)
gimp_colormap_editor_new (GimpMenuFactory *menu_factory)
{
GtkWidget *editor;
g_return_val_if_fail (gimage == NULL || GIMP_IS_IMAGE (gimage), NULL);
g_return_val_if_fail (GIMP_IS_MENU_FACTORY (menu_factory), NULL);
editor = g_object_new (GIMP_TYPE_COLORMAP_EDITOR,
"menu-factory", menu_factory,
"menu-identifier", "<ColormapEditor>",
"ui-path", "/colormap-editor-popup",
NULL);
if (gimage)
gimp_image_editor_set_image (GIMP_IMAGE_EDITOR (editor), gimage);
return editor;
return g_object_new (GIMP_TYPE_COLORMAP_EDITOR,
"menu-factory", menu_factory,
"menu-identifier", "<ColormapEditor>",
"ui-path", "/colormap-editor-popup",
NULL);
}
void

3
app/widgets/gimpcolormapeditor.h
View File

@ -65,8 +65,7 @@ struct _GimpColormapEditorClass
GType gimp_colormap_editor_get_type (void) G_GNUC_CONST;
GtkWidget * gimp_colormap_editor_new (GimpImage *gimage,
GimpMenuFactory *menu_factory);
GtkWidget * gimp_colormap_editor_new (GimpMenuFactory *menu_factory);
void gimp_colormap_editor_selected (GimpColormapEditor *editor,
GdkModifierType state);

13
app/widgets/gimphistogrameditor.c
View File

@ -310,18 +310,9 @@ gimp_histogram_editor_set_image (GimpImageEditor *image_editor,
}
GtkWidget *
gimp_histogram_editor_new (GimpImage *gimage)
gimp_histogram_editor_new (void)
{
GimpImageEditor *editor;
g_return_val_if_fail (gimage == NULL || GIMP_IS_IMAGE (gimage), NULL);
editor = g_object_new (GIMP_TYPE_HISTOGRAM_EDITOR, NULL);
if (gimage)
gimp_image_editor_set_image (editor, gimage);
return GTK_WIDGET (editor);
return g_object_new (GIMP_TYPE_HISTOGRAM_EDITOR, NULL);
}
static void

4
app/widgets/gimphistogrameditor.h
View File

@ -54,9 +54,9 @@ struct _GimpHistogramEditorClass
};
GType gimp_histogram_editor_get_type (void) G_GNUC_CONST;
GType gimp_histogram_editor_get_type (void) G_GNUC_CONST;
GtkWidget * gimp_histogram_editor_new (GimpImage *gimage);
GtkWidget * gimp_histogram_editor_new (void);
#endif /* __GIMP_HISTOGRAM_EDITOR_H__ */

31
app/widgets/gimpselectioneditor.c
View File

@ -24,11 +24,7 @@
#include "libgimpmath/gimpmath.h"
#include "libgimpwidgets/gimpwidgets.h"
#ifdef __GNUC__
#warning #include "tools/tools-types.h"
#endif
#include "tools/tools-types.h"
#include "widgets-types.h"
#include "config/gimpcoreconfig.h"
@ -40,6 +36,10 @@
#include "core/gimpselection.h"
#include "core/gimptoolinfo.h"
#ifdef __GNUC__
#warning #include "tools/tools-types.h"
#endif
#include "tools/tools-types.h"
#include "tools/gimpselectionoptions.h"
#include "gimpselectioneditor.h"
@ -236,24 +236,15 @@ gimp_selection_editor_set_image (GimpImageEditor *image_editor,
/* public functions */
GtkWidget *
gimp_selection_editor_new (GimpImage *gimage,
GimpMenuFactory *menu_factory)
gimp_selection_editor_new (GimpMenuFactory *menu_factory)
{
GimpSelectionEditor *editor;
g_return_val_if_fail (gimage == NULL || GIMP_IS_IMAGE (gimage), NULL);
g_return_val_if_fail (GIMP_IS_MENU_FACTORY (menu_factory), NULL);
editor = g_object_new (GIMP_TYPE_SELECTION_EDITOR,
"menu-factory", menu_factory,
"menu-identifier", "<SelectionEditor>",
"ui-path", "/selection-editor-popup",
NULL);
if (gimage)
gimp_image_editor_set_image (GIMP_IMAGE_EDITOR (editor), gimage);
return GTK_WIDGET (editor);
return g_object_new (GIMP_TYPE_SELECTION_EDITOR,
"menu-factory", menu_factory,
"menu-identifier", "<SelectionEditor>",
"ui-path", "/selection-editor-popup",
NULL);
}
static gboolean

5
app/widgets/gimpselectioneditor.h
View File

@ -53,10 +53,9 @@ struct _GimpSelectionEditorClass
};
GType gimp_selection_editor_get_type (void) G_GNUC_CONST;
GType gimp_selection_editor_get_type (void) G_GNUC_CONST;
GtkWidget * gimp_selection_editor_new (GimpImage *gimage,
GimpMenuFactory *menu_factory);
GtkWidget * gimp_selection_editor_new (GimpMenuFactory *menu_factory);
#endif /* __GIMP_SELECTION_EDITOR_H__ */