Commit 4bf81e0d authored by Cosimo Cecchi's avatar Cosimo Cecchi

window: merge the navigation window XML into the shell XML

There's no such distinction anymore.
parent df516e1f
......@@ -210,7 +210,6 @@ TESTS=check-nautilus
uidir = $(datadir)/nautilus/ui
ui_DATA = \
nautilus-shell-ui.xml \
nautilus-navigation-window-ui.xml \
nautilus-file-management-properties.ui \
nautilus-bookmarks-window.ui \
nautilus-desktop-icon-view-ui.xml \
......
<ui>
<accelerator action="ShowSearch"/>
<accelerator action="SplitViewNextPane"/>
<accelerator action="TabsPrevious"/>
<accelerator action="TabsNext"/>
<accelerator action="TabsMoveLeft"/>
<accelerator action="TabsMoveRight"/>
<menubar name="MenuBar">
<menu action="File">
<placeholder name="New Items Placeholder">
<menuitem name="New Tab" action="New Tab"/>
<menuitem name="New Window" action="New Window"/>
<separator/>
</placeholder>
<placeholder name="Close Items Placeholder">
<menuitem name="Close All Windows" action="Close All Windows"/>
</placeholder>
</menu>
<menu action="View">
<placeholder name="Show Hide Placeholder">
<menu action="Sidebar List">
<menuitem name="Sidebar Places" action="Sidebar Places"/>
<menuitem name="Sidebar Tree" action="Sidebar Tree"/>
<separator/>
<menuitem name="Show Hide Sidebar" action="Show Hide Sidebar"/>
</menu>
<menuitem name="Show Hide Toolbar" action="Show Hide Toolbar"/>
<menuitem name="Show Hide Statusbar" action="Show Hide Statusbar"/>
<menuitem name="Show Hide Extra Pane" action="Show Hide Extra Pane"/>
</placeholder>
</menu>
<placeholder name="Other Menus">
<menu action="Go">
<placeholder name="Navigation Items">
<menuitem name="Up" action="Up"/>
<menuitem name="Back" action="Back"/>
<menuitem name="Forward" action="Forward"/>
<menuitem name="SplitViewSameLocationMenu" action="SplitViewSameLocation"/>
</placeholder>
<separator/>
<menuitem name="Home" action="Home"/>
<menuitem name="Computer" action="Go to Computer"/>
<menuitem name="Go to Templates" action="Go to Templates"/>
<menuitem name="Go to Trash" action="Go to Trash"/>
<menuitem name="Go to Network" action="Go to Network"/>
<menuitem name="Go to Location" action="Go to Location"/>
<menuitem name="Search" action="Search"/>
<separator/>
<menuitem name="Clear History" action="Clear History"/>
<separator/>
<placeholder name="History Placeholder"/>
</menu>
<menu action="Bookmarks">
<menuitem name="Add Bookmark" action="Add Bookmark"/>
<menuitem name="Edit Bookmark" action="Edit Bookmarks"/>
<separator/>
<placeholder name="Bookmarks Placeholder"/>
</menu>
</placeholder>
</menubar>
</ui>
<ui>
<accelerator action="ShowSearch"/>
<accelerator action="SplitViewNextPane"/>
<accelerator action="TabsPrevious"/>
<accelerator action="TabsNext"/>
<accelerator action="TabsMoveLeft"/>
<accelerator action="TabsMoveRight"/>
<accelerator action="ZoomInAccel"/>
<accelerator action="ZoomInAccel2"/>
<accelerator action="ZoomOutAccel"/>
<menubar name="MenuBar">
<menu action="File">
<placeholder name="New Items Placeholder"/>
<placeholder name="New Items Placeholder">
<menuitem name="New Tab" action="New Tab"/>
<menuitem name="New Window" action="New Window"/>
</placeholder>
<separator/>
<placeholder name="Open Placeholder"/>
<separator/>
......@@ -17,7 +26,9 @@
<separator/>
<placeholder name="Extension Actions"/>
<separator/>
<placeholder name="Close Items Placeholder"/>
<placeholder name="Close Items Placeholder">
<menuitem name="Close All Windows" action="Close All Windows"/>
</placeholder>
<menuitem name="Close" action="Close"/>
</menu>
<menu action="Edit">
......@@ -43,7 +54,17 @@
<menuitem name="Stop" action="Stop"/>
<menuitem name="Reload" action="Reload"/>
<separator/>
<placeholder name="Show Hide Placeholder"/>
<placeholder name="Show Hide Placeholder">
<menu action="Sidebar List">
<menuitem name="Sidebar Places" action="Sidebar Places"/>
<menuitem name="Sidebar Tree" action="Sidebar Tree"/>
<separator/>
<menuitem name="Show Hide Sidebar" action="Show Hide Sidebar"/>
</menu>
<menuitem name="Show Hide Toolbar" action="Show Hide Toolbar"/>
<menuitem name="Show Hide Statusbar" action="Show Hide Statusbar"/>
<menuitem name="Show Hide Extra Pane" action="Show Hide Extra Pane"/>
</placeholder>
<separator/>
<placeholder name="View Preferences Placeholder"/>
<separator/>
......@@ -61,7 +82,35 @@
<placeholder name="Short List"/>
</placeholder>
</menu>
<placeholder name="Other Menus"/>
<placeholder name="Other Menus">
<menu action="Go">
<placeholder name="Navigation Items">
<menuitem name="Up" action="Up"/>
<menuitem name="Back" action="Back"/>
<menuitem name="Forward" action="Forward"/>
<menuitem name="SplitViewSameLocationMenu" action="SplitViewSameLocation"/>
</placeholder>
<separator/>
<menuitem name="Home" action="Home"/>
<menuitem name="Computer" action="Go to Computer"/>
<menuitem name="Go to Templates" action="Go to Templates"/>
<menuitem name="Go to Trash" action="Go to Trash"/>
<menuitem name="Go to Network" action="Go to Network"/>
<menuitem name="Go to Location" action="Go to Location"/>
<menuitem name="Search" action="Search"/>
<separator/>
<menuitem name="Clear History" action="Clear History"/>
<separator/>
<placeholder name="History Placeholder"/>
</menu>
<menu action="Bookmarks">
<menuitem name="Add Bookmark" action="Add Bookmark"/>
<menuitem name="Edit Bookmark" action="Edit Bookmarks"/>
<separator/>
<placeholder name="Bookmarks Placeholder"/>
</menu>
</placeholder>
<menu action="Help">
<menuitem name="Nautilus Manual" action="Nautilus Manual"/>
<menuitem name="About Nautilus" action="About Nautilus"/>
......
......@@ -1394,9 +1394,6 @@ nautilus_window_initialize_menus (NautilusWindow *window)
ui = nautilus_ui_string_get ("nautilus-shell-ui.xml");
gtk_ui_manager_add_ui_from_string (ui_manager, ui, -1, NULL);
ui = nautilus_ui_string_get ("nautilus-navigation-window-ui.xml");
gtk_ui_manager_add_ui_from_string (ui_manager, ui, -1, NULL);
nautilus_window_initialize_trash_icon_monitor (window);
nautilus_window_initialize_go_menu (window);
}
......
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