From 4da7c67406fc15d635cad875ccd01e18785a87f2 Mon Sep 17 00:00:00 2001 From: zhenfeng zhao Date: Sun, 2 Aug 2009 17:18:09 -0300 Subject: [PATCH] Debug dynamics editor, and solve many bugs. --- app/dialogs/dialogs-constructors.c | 5 ++-- app/widgets/gimpdynamicseditor.c | 48 +++++++++++++++++------------- app/widgets/gimpdynamicseditor.h | 5 ++-- devel-docs/app/app-sections.txt | 16 ++++++++++ 4 files changed, 50 insertions(+), 24 deletions(-) diff --git a/app/dialogs/dialogs-constructors.c b/app/dialogs/dialogs-constructors.c index 6babfbf834..68abf8cac4 100644 --- a/app/dialogs/dialogs-constructors.c +++ b/app/dialogs/dialogs-constructors.c @@ -675,8 +675,9 @@ dialogs_dynamics_editor_get (GimpDialogFactory *factory, GimpContext *context, gint view_size) { - return gimp_dynamics_editor_new (context, - factory->menu_factory); + return gimp_dynamics_editor_new (factory->menu_factory); + //return gimp_dynamics_editor_new (context, + // factory->menu_factory); } GtkWidget * diff --git a/app/widgets/gimpdynamicseditor.c b/app/widgets/gimpdynamicseditor.c index e81d554d5a..7374f2eeb9 100644 --- a/app/widgets/gimpdynamicseditor.c +++ b/app/widgets/gimpdynamicseditor.c @@ -28,16 +28,23 @@ #include "widgets-types.h" #include "core/gimp.h" -#include "core/gimpbrushgenerated.h" +//#include "core/gimpbrushgenerated.h" #include "core/gimpcontext.h" -#include "gimpbrusheditor.h" #include "gimpdocked.h" #include "gimpview.h" #include "gimpviewrenderer.h" #include "gimp-intl.h" +#include "gimpdynamicseditor.h" +//To do: +// discard unneeded ones. +// needs to be fixed to gimppaintdynamics.h when that works. + +/* +#include "paint/gimppaintoptions.h" + #include "core/gimptoolinfo.h" #include "widgets/gimppropwidgets.h" @@ -57,13 +64,7 @@ #include "tools/gimpsmudgetool.h" #include "tools/gimptooloptions-gui.h" -//To do: -// discard unneeded ones. -// needs to be fixed to gimppaintdynamics.h when that works. -#include "paint/gimppaintoptions.h" -#include "gimpdynamicseditor.h" - - +*/ /* local function prototypes */ @@ -81,7 +82,7 @@ static void gimp_dynamics_editor_set_context (GimpDocked *docked, GimpContext *context); /*dynamics options gui*/ - +/* static gboolean tool_has_opacity_dynamics (GType tool_type); static gboolean tool_has_hardness_dynamics (GType tool_type); static gboolean tool_has_rate_dynamics (GType tool_type); @@ -111,12 +112,12 @@ static void random_options_gui (GimpPaintOptions *paint_options, GType tool_type, GtkTable *table, gint row); -/**/ + static void fading_options_gui (GimpPaintOptions *paint_options, GType tool_type, GtkTable *table, gint row); -/**/ +*/ G_DEFINE_TYPE_WITH_CODE (GimpDynamicsEditor, gimp_dynamics_editor, @@ -175,9 +176,6 @@ gimp_dynamics_editor_init (GimpDynamicsEditor *editor) gtk_widget_show (frame); } - - - static GObject * gimp_dynamics_editor_constructor (GType type, @@ -209,11 +207,20 @@ gimp_dynamics_editor_set_context (GimpDocked *docked, GtkWidget * -gimp_dynamics_editor_new (GimpContext *context, - GimpMenuFactory *menu_factory) +gimp_dynamics_editor_new (GimpMenuFactory *menu_factory) +//gimp_dynamics_editor_new (GimpContext *context, +// GimpMenuFactory *menu_factory) { - g_return_val_if_fail (GIMP_IS_CONTEXT (context), NULL); + g_return_val_if_fail (GIMP_IS_MENU_FACTORY (menu_factory), NULL); + //g_return_val_if_fail (GIMP_IS_CONTEXT (context), NULL); + return g_object_new (GIMP_TYPE_DYNAMICS_EDITOR, + "menu-factory", menu_factory, + "menu-identifier", "", + "ui-path", "/dynamics-editor-popup", + NULL); + +/* return g_object_new (GIMP_TYPE_DYNAMICS_EDITOR, "menu-factory", menu_factory, "menu-identifier", "", @@ -222,12 +229,13 @@ gimp_dynamics_editor_new (GimpContext *context, "context", context, "data", gimp_context_get_brush (context), NULL); +*/ } /* private functions */ - +/* static gboolean tool_has_opacity_dynamics (GType tool_type) { @@ -720,7 +728,7 @@ fading_options_gui (GimpPaintOptions *paint_options, gtk_widget_show (scalebutton); } - +*/ /* GtkWidget * gimp_paint_options_gui (GimpToolOptions *tool_options) diff --git a/app/widgets/gimpdynamicseditor.h b/app/widgets/gimpdynamicseditor.h index eb0e97ca0f..edcc0ea826 100644 --- a/app/widgets/gimpdynamicseditor.h +++ b/app/widgets/gimpdynamicseditor.h @@ -50,8 +50,9 @@ struct _GimpDynamicsEditorClass GType gimp_dynamics_editor_get_type (void) G_GNUC_CONST; -GtkWidget * gimp_dynamics_editor_new (GimpContext *context, - GimpMenuFactory *menu_factory); +GtkWidget * gimp_dynamics_editor_new (GimpMenuFactory *menu_factory) +//gimp_dynamics_editor_new (GimpContext *context, +// GimpMenuFactory *menu_factory); diff --git a/devel-docs/app/app-sections.txt b/devel-docs/app/app-sections.txt index a5048cf0e1..a33f1f26c6 100644 --- a/devel-docs/app/app-sections.txt +++ b/devel-docs/app/app-sections.txt @@ -5614,6 +5614,22 @@ GIMP_IS_BLOB_EDITOR_CLASS GIMP_BLOB_EDITOR_GET_CLASS +
+gimpdynamicseditor +GimpDynamicsEditor +GimpDynamicsEditor +gimp_dynamics_editor_new + +GimpDynamicsEditorClass +GIMP_Dynamics_EDITOR +GIMP_IS_DYNAMICS_EDITOR +GIMP_TYPE_DYNAMICS_EDITOR +gimp_dynamics_editor_get_type +GIMP_DYNAMICS_EDITOR_CLASS +GIMP_IS_DYNAMICS_EDITOR_CLASS +GIMP_DYNAMICS_EDITOR_GET_CLASS +
+
gimpbrusheditor GimpBrushEditor