[gimp/soc-2009-dynamics] Fix menu issues.
- From: zhenfeng zhao <zhenfengz src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [gimp/soc-2009-dynamics] Fix menu issues.
- Date: Fri, 31 Jul 2009 08:41:34 +0000 (UTC)
commit 441d287008ee588e1c2cb529bb760984f4fbc756
Author: zhenfeng zhao <zhzzf_0808 hotmail com>
Date: Fri Jul 31 05:39:46 2009 -0300
Fix menu issues.
actions/dynamics-editor-actions.c
dialogs/dialogs-constructors.c
../menus/dialogs-menuitems.xml
../menus/image-menu.xml.in
app/actions/dynamics-editor-actions.c | 7 ++++---
app/dialogs/dialogs-constructors.c | 4 ++--
menus/dialogs-menuitems.xml | 2 +-
menus/image-menu.xml.in | 7 +++++++
4 files changed, 14 insertions(+), 6 deletions(-)
---
diff --git a/app/actions/dynamics-editor-actions.c b/app/actions/dynamics-editor-actions.c
index 478a0f3..80902dd 100644
--- a/app/actions/dynamics-editor-actions.c
+++ b/app/actions/dynamics-editor-actions.c
@@ -35,14 +35,14 @@
#include "gimp-intl.h"
-
static const GimpActionEntry dynamics_editor_actions[] =
{
- { "dynamics-editor-popup", GIMP_STOCK_BRUSH,
+ { "dynamics-editor-popup", GIMP_STOCK_DYNAMICS,
NC_("dynamics-editor-action", "Dynamics Editor Menu"), NULL, NULL, NULL,
GIMP_HELP_BRUSH_EDITOR_DIALOG }
};
+
static const GimpToggleActionEntry dynamics_editor_toggle_actions[] =
{
{ "dynamics-editor-edit-active", GIMP_STOCK_LINKED,
@@ -60,9 +60,10 @@ dynamics_editor_actions_setup (GimpActionGroup *group)
dynamics_editor_actions,
G_N_ELEMENTS (dynamics_editor_actions));
- gimp_action_group_add_toggle_actions (group, "dynamics-editor-action",
+ gimp_action_group_add_toggle_actions (group, "dynamics-editor-action",
dynamics_editor_toggle_actions,
G_N_ELEMENTS (dynamics_editor_toggle_actions));
+
}
void
diff --git a/app/dialogs/dialogs-constructors.c b/app/dialogs/dialogs-constructors.c
index 811d685..cb9b5f0 100644
--- a/app/dialogs/dialogs-constructors.c
+++ b/app/dialogs/dialogs-constructors.c
@@ -675,8 +675,8 @@ dialogs_dynamics_editor_get (GimpDialogFactory *factory,
GimpContext *context,
gint view_size)
{
- //return gimp_dynamics_editor_new (context,
- // factory->menu_factory);
+ return gimp_brush_editor_new (context,
+ factory->menu_factory);
}
GtkWidget *
diff --git a/menus/dialogs-menuitems.xml b/menus/dialogs-menuitems.xml
index 6208afa..c9f8b1a 100644
--- a/menus/dialogs-menuitems.xml
+++ b/menus/dialogs-menuitems.xml
@@ -17,7 +17,7 @@
<separator />
<menuitem action="dialogs-colors" />
<menuitem action="dialogs-brushes" />
- <menuitem action="dialogs-dynamics-editor" />
+ <menuitem action="dialogs-dynamics" />
<menuitem action="dialogs-patterns" />
<menuitem action="dialogs-gradients" />
<menuitem action="dialogs-palettes" />
diff --git a/menus/image-menu.xml.in b/menus/image-menu.xml.in
index 85b7ac8..e557b49 100644
--- a/menus/image-menu.xml.in
+++ b/menus/image-menu.xml.in
@@ -138,6 +138,13 @@
<menuitem action="context-brush-angle-increase-skip" />
</menu>
</menu>
+ <menu action="context-dynamics-menu" name="Pattern">
+ <menuitem action="context-dynamics-select-first" />
+ <menuitem action="context-dynamics-select-last" />
+ <menuitem action="context-dynamics-select-previous" />
+ <menuitem action="context-dynamics-select-next" />
+ </menu>
+ </menu>
<menu action="context-pattern-menu" name="Pattern">
<menuitem action="context-pattern-select-first" />
<menuitem action="context-pattern-select-last" />
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]