Commit 6d708832 authored by Michael Natterer's avatar Michael Natterer 😴 Committed by Michael Natterer

app/menus/windows-menu.c app/actions/windows-actions.c move the list of

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.


svn path=/trunk/; revision=25666
parent 8a85b95e
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.
2008-05-14 Michael Natterer <mitch@gimp.org>
* app/gegl/gimpcurvesconfig.c (gimp_curves_config_copy): also
......
......@@ -69,9 +69,9 @@ static void windows_actions_dock_notify (GimpDock *dock,
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_setup (GimpActionGroup *group)
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);
......
......@@ -204,7 +204,7 @@ windows_menu_dock_added (GimpDialogFactory *factory,
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));
......
......@@ -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">
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment