graphics/gimp
graphics/gimp
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/gimp synced 2024-10-21 03:52:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Solve errors in gimpcontext for dynamics.

Browse source
This commit is contained in:
zhenfeng zhao 2009-08-18 22:38:45 -03:00
parent f48a7e4a8b
commit 6aa4d55315
4 changed files with 18 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/core/core-enums.h
View file

@ -608,6 +608,7 @@ typedef enum /*< pdb-skip, skip >*/
GIMP_CONTEXT_PROP_BUFFER = 15,
GIMP_CONTEXT_PROP_IMAGEFILE = 16,
GIMP_CONTEXT_PROP_TEMPLATE = 17,
GIMP_CONTEXT_PROP_DYNAMICS = 18,
GIMP_CONTEXT_LAST_PROP = GIMP_CONTEXT_PROP_TEMPLATE
} GimpContextPropType;

19
app/core/gimpcontext.c
View file

@ -165,7 +165,7 @@ static void gimp_context_real_set_brush (GimpContext *context,
static void gimp_context_dynamics_dirty (GimpDynamicsOptions *dynamics,
GimpContext *context);
static void gimp_context_dynamics_removed (GimpContainer *dynamics_list,
static void gimp_context_dynamics_removed (GimpContainer *container,
GimpDynamicsOptions *dynamics,
GimpContext *context);
static void gimp_context_dynamics_list_thaw (GimpContainer *container,
@ -348,6 +348,7 @@ static guint gimp_context_signals[LAST_SIGNAL] = { 0 };
static GimpToolInfo *standard_tool_info = NULL;
static GimpPaintInfo *standard_paint_info = NULL;
static GimpBrush *standard_brush = NULL;
static GimpDynamicsOptions *standard_dynamics = NULL;
static GimpPattern *standard_pattern = NULL;
static GimpGradient *standard_gradient = NULL;
static GimpPalette *standard_palette = NULL;
@ -2469,7 +2470,7 @@ gimp_context_real_set_brush (GimpContext *context,
/* dynamics *****************************************************************/
GimpBrush *
GimpDynamicsOptions *
gimp_context_get_dynamics (GimpContext *context)
{
g_return_val_if_fail (GIMP_IS_CONTEXT (context), NULL);
@ -2482,7 +2483,7 @@ gimp_context_set_dynamics (GimpContext *context,
GimpDynamicsOptions *dynamics)
{
g_return_if_fail (GIMP_IS_CONTEXT (context));
g_return_if_fail (! dynamics || GIMP_IS_DYNAMICS (dynamics));
g_return_if_fail (! dynamics || GIMP_IS_DYNAMICS_OPTIONS (dynamics));
context_find_defined (context, GIMP_CONTEXT_PROP_DYNAMICS);
gimp_context_real_set_dynamics (context, dynamics);
@ -2506,9 +2507,9 @@ gimp_context_dynamics_dirty (GimpDynamicsOptions *dynamics,
context->dynamics_name = g_strdup (GIMP_OBJECT (dynamics)->name);
}
static void gimp_context_dynamics_removed (GimpContainer *dynamics_list,
static void gimp_context_dynamics_removed (GimpContainer *container,
GimpDynamicsOptions *dynamics,
GimpContext *context);
GimpContext *context)
{
if (dynamics == context->dynamics)
{
@ -2526,7 +2527,7 @@ static void gimp_context_dynamics_removed (GimpContainer *dynamics_list,
static void gimp_context_dynamics_list_thaw (GimpContainer *container,
GimpContext *context);
GimpContext *context)
{
GimpDynamicsOptions *dynamics;
/*
@ -2545,9 +2546,9 @@ static void
gimp_context_real_set_dynamics (GimpContext *context,
GimpDynamicsOptions *dynamics)
{
/* if (! standard_dynamics)
standard_dynamics = GIMP_BRUSH (gimp_dynamics_get_standard ());
*/
if (! standard_dynamics)
standard_dynamics = GIMP_DYNAMICS_OPTIONS (gimp_dynamics_get_standard ());
if (context->dynamics == dynamics)
return;

7
app/core/gimpcontext.h
View file

@ -262,13 +262,6 @@ void gimp_context_set_brush (GimpContext *context,
GimpBrush *brush);
void gimp_context_brush_changed (GimpContext *context);
/* brush */
GimpBrush * gimp_context_get_brush (GimpContext *context);
void gimp_context_set_brush (GimpContext *context,
GimpBrush *brush);
void gimp_context_brush_changed (GimpContext *context);
/* dynamics */
GimpDynamicsOptions * gimp_context_get_dynamics (GimpContext *context);
void gimp_context_set_dynamics (GimpContext *context,

12
app/widgets/gimpdynamicseditor.c
View file

@ -17,6 +17,7 @@
*/
#define DYNAMICS_VIEW_SIZE 96
#include "config.h"
@ -170,9 +171,9 @@ static void
gimp_dynamics_editor_init (GimpDynamicsEditor *editor)
{
GimpDataEditor *data_editor = GIMP_DATA_EDITOR (editor);
GtkWidget *frame;
GtkWidget *box;
/*GtkWidget *box;
gint row = 0;
GtkWidget *table;
GtkWidget *menu;
@ -183,6 +184,7 @@ gimp_dynamics_editor_init (GimpDynamicsEditor *editor)
gint n_dynamics = 0;
GtkWidget *dynamics_labels[7];
GType tool_type;
*/
//add a frame
frame = gtk_frame_new (NULL);
@ -281,9 +283,9 @@ gimp_dynamics_editor_new (GimpContext *context,
"ui-path", "/dynamics-editor-popup",
"data-factory", context->gimp->dynamics_factory,
"context", context,
"data", gimp_context_get_dynamics (context),*/
"data", gimp_context_get_dynamics (context),
NULL);
/*
GtkWidget *vbox;
GtkWidget *table;
GtkWidget *menu;
@ -296,7 +298,7 @@ gimp_dynamics_editor_new (GimpContext *context,
GType tool_type;
//tool_type = tool_options->tool_info->tool_type;
*/
}