gimp r25414 - in trunk: . app/actions app/plug-in menus

[mitch svn gnome org]

Author: mitch
Date: Tue Apr  8 19:18:59 2008
New Revision: 25414
URL: http://svn.gnome.org/viewvc/gimp?rev=25414&view=rev

Log:
2008-04-08  Michael Natterer  <mitch gimp org>

	Start getting rid of the "Xtns" menu:

	* app/actions/dialogs-actions.c (dialogs_toplevel_actions):
	renamed "Module Manager" to "Modules".

	* menus/image-menu.xml.in: move it to "Edit/Preferences" for the
	time being so it doesn't block the removal of the "Xtns" menu.

	Move "Languages" placeholder from "Xtns" to "Filters".

	* app/plug-in/plug-in-menu-path.c (menu_path_mappings): map
	"Xtns/Languages" to "Filters/Languages".



Modified:
   trunk/ChangeLog
   trunk/app/actions/dialogs-actions.c
   trunk/app/plug-in/plug-in-menu-path.c
   trunk/menus/image-menu.xml.in

Modified: trunk/app/actions/dialogs-actions.c
==============================================================================
--- trunk/app/actions/dialogs-actions.c	(original)
+++ trunk/app/actions/dialogs-actions.c	Tue Apr  8 19:18:59 2008
@@ -227,7 +227,7 @@
     GIMP_HELP_KEYBOARD_SHORTCUTS },
 
   { "dialogs-module-dialog", GTK_STOCK_EXECUTE,
-    N_("_Module Manager"), NULL,
+    N_("_Modules"), NULL,
     N_("Open the module manager dialog"),
     "gimp-module-dialog",
     GIMP_HELP_MODULE_DIALOG },

Modified: trunk/app/plug-in/plug-in-menu-path.c
==============================================================================
--- trunk/app/plug-in/plug-in-menu-path.c	(original)
+++ trunk/app/plug-in/plug-in-menu-path.c	Tue Apr  8 19:18:59 2008
@@ -40,9 +40,10 @@
 
 static const MenuPathMapping menu_path_mappings[] =
 {
-  { "<Toolbox>/Xtns", "<Image>/Xtns" },
-  { "<Toolbox>/Help", "<Image>/Help" },
-  { NULL, NULL                       }
+  { "<Toolbox>/Xtns/Languages", "<Image>/Filters/Languages" },
+  { "<Toolbox>/Xtns",           "<Image>/Xtns"              },
+  { "<Toolbox>/Help",           "<Image>/Help"              },
+  { NULL, NULL                                              }
 };
 
 

Modified: trunk/menus/image-menu.xml.in
==============================================================================
--- trunk/menus/image-menu.xml.in	(original)
+++ trunk/menus/image-menu.xml.in	Tue Apr  8 19:18:59 2008
@@ -199,6 +199,7 @@
       <placeholder name="Preferences">
         <menuitem action="dialogs-preferences" />      
         <menuitem action="dialogs-keyboard-shortcuts" />
+        <menuitem action="dialogs-module-dialog"/>
       </placeholder>
       <separator />
     </menu>
@@ -571,6 +572,8 @@
       </menu>
       <menuitem action="plug-in-reset-all" />
       <separator />
+      <placeholder name="Languages" />
+      <separator />
       <menu action="plug-in-blur-menu" name="Blur" />
       <menu action="plug-in-enhance-menu" name="Enhance" />
       <menu action="plug-in-distorts-menu" name="Distorts" />
@@ -605,10 +608,7 @@
     <placeholder name="Menus" />
 
     <menu action="extensions-menu" name="Xtns">
-      <placeholder name="Extensions">
-	<menuitem action="dialogs-module-dialog"/>
-      </placeholder>
-      <placeholder name="Languages"/>
+      <placeholder name="Extensions" />
       <separator/>
     </menu>