added action_data_get_context() and macro return_if_no_context().
2004-05-11 Michael Natterer <mitch@gimp.org> * app/actions/actions.[ch]: added action_data_get_context() and macro return_if_no_context(). * app/actions/brushes-actions.c * app/actions/buffers-actions.c * app/actions/buffers-commands.c * app/actions/data-commands.c * app/actions/fonts-actions.c * app/actions/fonts-commands.c * app/actions/gradients-actions.c * app/actions/images-actions.c * app/actions/images-commands.c * app/actions/palettes-actions.c * app/actions/patterns-actions.c * app/actions/templates-actions.c * app/actions/templates-commands.[ch] * app/actions/tools-actions.c * app/actions/tools-commands.c: moved lots of code from widgets/ to the resp. action callbacks. * app/widgets/gimpeditor.[ch]: added gimp_editor_add_action_button() which creates a GtkButton connected to the resp. action. * app/widgets/gimpdatafactoryview.[ch]: added "action_group" parameters so we can distinguish brushes, patterns etc. actions. * app/widgets/gimpimageview.[ch] * app/widgets/gimpbrushfactoryview.c * app/widgets/gimpbufferview.c * app/widgets/gimpfontview.c * app/widgets/gimpgradienteditor.c * app/widgets/gimppatternfactoryview.c * app/widgets/gimptemplateview.[ch] * app/widgets/gimptoolview.c: removed tons of GtkButton::clicked() callbacks and use gimp_editor_add_action_button() instead of simply _add_button(). * app/gui/dialogs-constructors.c * app/gui/gradient-select.c * app/gui/palette-select.c * app/gui/pattern-select.c: changed accordingly.
This commit is contained in:
committed by
Michael Natterer
parent
e53a7cb423
commit
11fa092588
@ -73,9 +73,7 @@
|
||||
#include "actions/channels-commands.h"
|
||||
#include "actions/edit-commands.h"
|
||||
#include "actions/file-commands.h"
|
||||
#include "actions/images-commands.h"
|
||||
#include "actions/layers-commands.h"
|
||||
#include "actions/templates-commands.h"
|
||||
#include "actions/vectors-commands.h"
|
||||
|
||||
#include "about-dialog.h"
|
||||
@ -254,8 +252,6 @@ dialogs_image_list_view_new (GimpDialogFactory *factory,
|
||||
preview_size, 1,
|
||||
factory->menu_factory);
|
||||
|
||||
GIMP_IMAGE_VIEW (view)->raise_displays_func = images_raise_views;
|
||||
|
||||
return dialogs_dockable_new (view,
|
||||
_("Images"), NULL,
|
||||
GIMP_STOCK_IMAGES,
|
||||
@ -311,12 +307,13 @@ dialogs_gradient_list_view_new (GimpDialogFactory *factory,
|
||||
GtkWidget *view;
|
||||
|
||||
view = gimp_data_factory_view_new (GIMP_VIEW_TYPE_LIST,
|
||||
context->gimp->gradient_factory,
|
||||
dialogs_edit_gradient_func,
|
||||
context,
|
||||
preview_size, 1,
|
||||
context->gimp->gradient_factory,
|
||||
dialogs_edit_gradient_func,
|
||||
context,
|
||||
preview_size, 1,
|
||||
factory->menu_factory, "<Gradients>",
|
||||
"/gradients-popup");
|
||||
"/gradients-popup",
|
||||
"gradients");
|
||||
|
||||
return dialogs_dockable_new (view,
|
||||
_("Gradients"), NULL,
|
||||
@ -332,12 +329,13 @@ dialogs_palette_list_view_new (GimpDialogFactory *factory,
|
||||
GtkWidget *view;
|
||||
|
||||
view = gimp_data_factory_view_new (GIMP_VIEW_TYPE_LIST,
|
||||
context->gimp->palette_factory,
|
||||
dialogs_edit_palette_func,
|
||||
context,
|
||||
preview_size, 1,
|
||||
context->gimp->palette_factory,
|
||||
dialogs_edit_palette_func,
|
||||
context,
|
||||
preview_size, 1,
|
||||
factory->menu_factory, "<Palettes>",
|
||||
"/palettes-popup");
|
||||
"/palettes-popup",
|
||||
"palettes");
|
||||
|
||||
return dialogs_dockable_new (view,
|
||||
_("Palettes"), NULL,
|
||||
@ -427,8 +425,7 @@ dialogs_template_list_new (GimpDialogFactory *factory,
|
||||
GimpContext *context,
|
||||
gint preview_size)
|
||||
{
|
||||
GtkWidget *view;
|
||||
GimpTemplateView *template_view;
|
||||
GtkWidget *view;
|
||||
|
||||
view = gimp_template_view_new (GIMP_VIEW_TYPE_LIST,
|
||||
context->gimp->templates,
|
||||
@ -436,12 +433,6 @@ dialogs_template_list_new (GimpDialogFactory *factory,
|
||||
preview_size, 0,
|
||||
factory->menu_factory);
|
||||
|
||||
template_view = GIMP_TEMPLATE_VIEW (view);
|
||||
|
||||
template_view->create_image_func = templates_file_new_dialog;
|
||||
template_view->new_template_func = templates_new_template_dialog;
|
||||
template_view->edit_template_func = templates_edit_template_dialog;
|
||||
|
||||
return dialogs_dockable_new (view,
|
||||
_("Templates"), _("Image Templates"),
|
||||
GIMP_STOCK_TEMPLATE,
|
||||
@ -464,8 +455,6 @@ dialogs_image_grid_view_new (GimpDialogFactory *factory,
|
||||
preview_size, 1,
|
||||
factory->menu_factory);
|
||||
|
||||
GIMP_IMAGE_VIEW (view)->raise_displays_func = images_raise_views;
|
||||
|
||||
return dialogs_dockable_new (view,
|
||||
_("Images"), NULL,
|
||||
GIMP_STOCK_IMAGES,
|
||||
@ -521,12 +510,13 @@ dialogs_gradient_grid_view_new (GimpDialogFactory *factory,
|
||||
GtkWidget *view;
|
||||
|
||||
view = gimp_data_factory_view_new (GIMP_VIEW_TYPE_GRID,
|
||||
context->gimp->gradient_factory,
|
||||
dialogs_edit_gradient_func,
|
||||
context,
|
||||
preview_size, 1,
|
||||
context->gimp->gradient_factory,
|
||||
dialogs_edit_gradient_func,
|
||||
context,
|
||||
preview_size, 1,
|
||||
factory->menu_factory, "<Gradients>",
|
||||
"/gradients-popup");
|
||||
"/gradients-popup",
|
||||
"gradients");
|
||||
|
||||
return dialogs_dockable_new (view,
|
||||
_("Gradients"), NULL,
|
||||
@ -542,12 +532,13 @@ dialogs_palette_grid_view_new (GimpDialogFactory *factory,
|
||||
GtkWidget *view;
|
||||
|
||||
view = gimp_data_factory_view_new (GIMP_VIEW_TYPE_GRID,
|
||||
context->gimp->palette_factory,
|
||||
dialogs_edit_palette_func,
|
||||
context,
|
||||
preview_size, 1,
|
||||
context->gimp->palette_factory,
|
||||
dialogs_edit_palette_func,
|
||||
context,
|
||||
preview_size, 1,
|
||||
factory->menu_factory, "<Palettes>",
|
||||
"/palettes-popup");
|
||||
"/palettes-popup",
|
||||
"palettes");
|
||||
|
||||
return dialogs_dockable_new (view,
|
||||
_("Palettes"), NULL,
|
||||
|
||||
Reference in New Issue
Block a user