From bc3bd4d63f6897af98a73a9516625c966a512593 Mon Sep 17 00:00:00 2001
From: Michael Natterer <mitch@gimp.org>
Date: Fri, 28 Oct 2005 21:51:41 +0000
Subject: [PATCH] removed "colors-transform-menu".

2005-10-28  Michael Natterer  <mitch@gimp.org>

	* app/actions/image-actions.c: removed "colors-transform-menu".

	* menus/image-menu.xml.in: revamped again: Moved desaturate and
	the invert items to the toplevel, into a separator-enclosed group.
	Changed Modify to a placeholder again. Things that have no useful
	category can't go to a sub-menu, so please don't invent one just
	for the sake of it.

	* plug-ins/common/channel_mixer.c: -> Colors/Components
	* plug-ins/common/vinvert.c: -> Colors/Invert
---
 ChangeLog                       | 13 +++++++++++++
 app/actions/image-actions.c     |  1 -
 menus/image-menu.xml.in         | 18 +++++++++---------
 plug-ins/common/channel_mixer.c |  2 +-
 plug-ins/common/vinvert.c       |  2 +-
 5 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index c99e4bc68f..bd18fcc944 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2005-10-28  Michael Natterer  <mitch@gimp.org>
+
+	* app/actions/image-actions.c: removed "colors-transform-menu".
+
+	* menus/image-menu.xml.in: revamped again: Moved desaturate and
+	the invert items to the toplevel, into a separator-enclosed group.
+	Changed Modify to a placeholder again. Things that have no useful
+	category can't go to a sub-menu, so please don't invent one just
+	for the sake of it.
+
+	* plug-ins/common/channel_mixer.c: -> Colors/Components
+	* plug-ins/common/vinvert.c: -> Colors/Invert
+
 2005-10-28  Carol Spears  <carol@gimp.org>
 
 	* app/actions/image-actions.c: Changed colors-modify-menu to 
diff --git a/app/actions/image-actions.c b/app/actions/image-actions.c
index b9533d6c61..a44427d082 100644
--- a/app/actions/image-actions.c
+++ b/app/actions/image-actions.c
@@ -67,7 +67,6 @@ static GimpActionEntry image_actions[] =
   { "colors-auto-menu",       NULL, N_("_Auto")       },
   { "colors-map-menu",        NULL, N_("Ma_p")        },
   { "colors-components-menu", NULL, N_("_Components") },
-  { "colors-transform-menu",  NULL, N_("Trans_form")  },
 
   { "image-new", GTK_STOCK_NEW,
     N_("_New..."), "<control>N", NULL,
diff --git a/menus/image-menu.xml.in b/menus/image-menu.xml.in
index b438265309..5e6fc70407 100644
--- a/menus/image-menu.xml.in
+++ b/menus/image-menu.xml.in
@@ -441,23 +441,23 @@
       <menuitem action="tools-levels" />
       <menuitem action="tools-curves" />
       <menuitem action="tools-posterize" />
-      <menuitem action="drawable-desaturate"/>
+      <separator />
+      <menuitem action="drawable-desaturate" />
       <placeholder name="Invert">
-        <menuitem action="drawable-invert"/>
+        <menuitem action="drawable-invert" />
       </placeholder>
       <separator />
       <menu action="colors-auto-menu" name="Auto">
-        <menuitem action="drawable-equalize"/>
-        <menuitem action="drawable-levels-stretch"/>
-      </menu>
-      <menu action="colors-components-menu" name="Components"/>
-      <menu action="colors-map-menu" name="Map"/>
-      <menu action="colors-transform-menu" name="Transform">
+        <menuitem action="drawable-equalize" />
+        <menuitem action="drawable-levels-stretch" />
       </menu>
+      <menu action="colors-components-menu" name="Components" />
+      <menu action="colors-map-menu" name="Map" />
       <menu action="colors-info-menu" name="Info">
-        <menuitem action="dialogs-histogram"/>
+        <menuitem action="dialogs-histogram" />
       </menu>
       <separator />
+      <placeholder name="Modify" />
     </menu>
 
     <menu action="tools-menu" name="Tools">
diff --git a/plug-ins/common/channel_mixer.c b/plug-ins/common/channel_mixer.c
index 02deab691b..4d615d24c8 100644
--- a/plug-ins/common/channel_mixer.c
+++ b/plug-ins/common/channel_mixer.c
@@ -186,7 +186,7 @@ query (void)
                           G_N_ELEMENTS (args), 0,
                           args, NULL);
 
-  gimp_plugin_menu_register (PLUG_IN_PROC, "<Image>/Colors/Modify");
+  gimp_plugin_menu_register (PLUG_IN_PROC, "<Image>/Colors/Components");
 }
 
 static void
diff --git a/plug-ins/common/vinvert.c b/plug-ins/common/vinvert.c
index 82afe8c278..b373f5ba28 100644
--- a/plug-ins/common/vinvert.c
+++ b/plug-ins/common/vinvert.c
@@ -87,7 +87,7 @@ query (void)
 			  G_N_ELEMENTS (args), 0,
 			  args, NULL);
 
-  gimp_plugin_menu_register (PLUG_IN_PROC, "<Image>/Colors/Modify/Invert");
+  gimp_plugin_menu_register (PLUG_IN_PROC, "<Image>/Colors/Invert");
 }
 
 static void