gimp r25666 - in trunk: . app/actions app/menus menus

[mitch svn gnome org]

Author: mitch
Date: Wed May 14 13:39:24 2008
New Revision: 25666
URL: http://svn.gnome.org/viewvc/gimp?rev=25666&view=rev

Log:
2008-05-14  Michael Natterer  <mitch gimp org>

	* app/menus/windows-menu.c
	* app/actions/windows-actions.c
	* menus/image-menu.xml.in: move the list of dockable dialogs and
	the list of recent docks to submenus and keep the list of open
	image windows and docks at the "Windows" menu toplevel. The list
	of recent docks doesn't exist yet, its contents are fake.



Modified:
   trunk/ChangeLog
   trunk/app/actions/windows-actions.c
   trunk/app/menus/windows-menu.c
   trunk/menus/image-menu.xml.in

Modified: trunk/app/actions/windows-actions.c
==============================================================================
--- trunk/app/actions/windows-actions.c	(original)
+++ trunk/app/actions/windows-actions.c	Wed May 14 13:39:24 2008
@@ -69,9 +69,9 @@
 
 static const GimpActionEntry windows_actions[] =
 {
-  { "windows-menu",        NULL, N_("_Windows") },
-  { "windows-images-menu", NULL, N_("_Images")  },
-  { "windows-docks-menu",  NULL, N_("Doc_ks")   },
+  { "windows-menu",         NULL, N_("_Windows")          },
+  { "windows-docks-menu",   NULL, N_("Recent Doc_ks")     },
+  { "windows-dialogs-menu", NULL, N_("_Dockable Dialogs") },
 
   { "windows-show-toolbox", NULL,
     N_("Tool_box"), "<control>B",
@@ -90,9 +90,6 @@
                                  windows_actions,
                                  G_N_ELEMENTS (windows_actions));
 
-  gimp_action_group_set_action_hide_empty (group, "windows-images-menu",
-                                           FALSE);
-
   g_signal_connect_object (group->gimp->displays, "add",
                            G_CALLBACK (windows_actions_display_add),
                            group, 0);

Modified: trunk/app/menus/windows-menu.c
==============================================================================
--- trunk/app/menus/windows-menu.c	(original)
+++ trunk/app/menus/windows-menu.c	Wed May 14 13:39:24 2008
@@ -204,7 +204,7 @@
   ui_path = g_object_get_data (G_OBJECT (manager), "image-menu-ui-path");
 
   action_name = g_strdup_printf ("windows-dock-%04d", dock->ID);
-  action_path = g_strdup_printf ("%s/Windows/Docks/Docks", ui_path);
+  action_path = g_strdup_printf ("%s/Windows/Docks", ui_path);
 
   merge_key = g_strdup_printf ("windows-dock-%04d-merge-id", dock->ID);
   merge_id = gtk_ui_manager_new_merge_id (GTK_UI_MANAGER (manager));

Modified: trunk/menus/image-menu.xml.in
==============================================================================
--- trunk/menus/image-menu.xml.in	(original)
+++ trunk/menus/image-menu.xml.in	Wed May 14 13:39:24 2008
@@ -559,17 +559,20 @@
     </menu>
 
     <menu action="windows-menu" name="Windows">
-      <menu action="windows-images-menu" name="Images" />
-      <menu action="windows-docks-menu" name="Docks">
-	<placeholder name="Docks">
-	  <menuitem action="windows-show-toolbox" />
-	</placeholder>
-	<separator />
+      <menu action="windows-docks-menu" name="Recent Docks">
 	<menuitem action="dialogs-new-dock-lcp" />
 	<menuitem action="dialogs-new-dock-data" />
 	<menuitem action="dialogs-new-dock-stuff" />
       </menu>
-      <xi:include href="dialogs-menuitems.xml" />
+      <menu action="windows-dialogs-menu" name="Dockable Dialogs">
+	<xi:include href="dialogs-menuitems.xml" />
+      </menu>
+      <separator />
+      <placeholder name="Images" />
+      <separator />
+      <placeholder name="Docks">
+	<menuitem action="windows-show-toolbox" />
+      </placeholder>
     </menu>
 
     <menu action="plug-in-menu" name="Filters">