Commit faf64653 authored by William Jon McCann's avatar William Jon McCann

Migrate menu bar to a view menu button

https://bugzilla.gnome.org/show_bug.cgi?id=676531
parent 2c3191c5
<?xml version="1.0" encoding="utf-8"?>
<ui>
<accelerator action="OpenAccel"/>
<accelerator action="OpenCloseParent"/>
<accelerator action="PropertiesAccel"/>
<accelerator action="RenameSelectAll"/>
<menubar name="MenuBar">
<menu action="File">
<placeholder name="New Items Placeholder">
<menuitem name="New Folder" action="New Folder"/>
<menuitem name="New Folder with Selection" action="New Folder with Selection"/>
<menu action="New Documents">
<placeholder name="New Documents Placeholder"/>
<separator name="After New Documents"/>
<menuitem name="New Empty Document" action="New Empty Document"/>
</menu>
</placeholder>
<placeholder name="Open Placeholder">
<menuitem name="Open" action="Open"/>
<menuitem name="OpenInNewTab" action="OpenInNewTab"/>
<menuitem name="OpenAlternate" action="OpenAlternate"/>
<placeholder name="Applications Placeholder">
</placeholder>
<menu action="Open With">
<placeholder name="Applications Placeholder"/>
<separator name="Open With Separator"/>
<menuitem name="OtherApplication" action="OtherApplication1"/>
</menu>
<placeholder name="OtherApplicationPlaceholder">
<menuitem name="OtherApplication" action="OtherApplication2"/>
</placeholder>
<menu action="Scripts">
<placeholder name="Scripts Placeholder"/>
<separator name="After Scripts"/>
<menuitem name="Open Scripts Folder" action="Open Scripts Folder"/>
</menu>
</placeholder>
<placeholder name="File Items Placeholder">
<menuitem name="Self Mount Volume" action="Self Mount Volume"/>
<menuitem name="Self Unmount Volume" action="Self Unmount Volume"/>
<menuitem name="Self Eject Volume" action="Self Eject Volume"/>
<menuitem name="Self Start Volume" action="Self Start Volume"/>
<menuitem name="Self Stop Volume" action="Self Stop Volume"/>
<menuitem name="Self Poll" action="Self Poll"/>
<separator name="Properties Separator"/>
<menuitem name="Properties" action="Properties"/>
</placeholder>
<placeholder name="Global File Items Placeholder">
<menuitem name="Empty Trash" action="Empty Trash"/>
<menuitem name="Save Search" action="Save Search"/>
<menuitem name="Save Search As" action="Save Search As"/>
</placeholder>
</menu>
<menu action="Edit">
<placeholder name="Clipboard Actions">
<menuitem name="Cut" action="Cut"/>
<menuitem name="Copy" action="Copy"/>
<menuitem name="Paste" action="Paste"/>
</placeholder>
<placeholder name="Undostack Actions">
<menuitem name="Undo" action="Undo"/>
<menuitem name="Redo" action="Redo"/>
</placeholder>
<placeholder name="Select Items">
<menuitem name="Select All" action="Select All"/>
<menuitem name="Select Pattern" action="Select Pattern"/>
<menuitem name="Invert Selection" action="Invert Selection"/>
</placeholder>
<placeholder name="File Items Placeholder">
<menuitem name="Duplicate" action="Duplicate"/>
<menuitem name="Create Link" action="Create Link"/>
<menuitem name="Rename" action="Rename"/>
</placeholder>
<placeholder name="Dangerous File Items Placeholder">
<menuitem name="Trash" action="Trash"/>
<menuitem name="Delete" action="Delete"/>
<menuitem name="Restore From Trash" action="Restore From Trash"/>
</placeholder>
<placeholder name="Extension Actions"/>
</menu>
<menu action="View">
<placeholder name="View Preferences Placeholder">
<menuitem name="Reset to Defaults" action="Reset to Defaults"/>
<menuitem name="Show Hidden Files" action="Show Hidden Files"/>
</placeholder>
</menu>
</menubar>
<popup name="ViewMenu">
<placeholder name="New Items Placeholder">
<menuitem name="New Folder" action="New Folder"/>
<menuitem name="New Folder with Selection" action="New Folder with Selection"/>
<menu action="New Documents">
<placeholder name="New Documents Placeholder"/>
<separator name="After New Documents"/>
<menuitem name="New Empty Document" action="New Empty Document"/>
</menu>
</placeholder>
<placeholder name="Open Placeholder">
<menuitem name="Open" action="Open"/>
<menuitem name="OpenInNewTab" action="OpenInNewTab"/>
<menuitem name="OpenAlternate" action="OpenAlternate"/>
<placeholder name="Applications Placeholder">
</placeholder>
<menu action="Open With">
<placeholder name="Applications Placeholder"/>
<separator name="Open With Separator"/>
<menuitem name="OtherApplication" action="OtherApplication1"/>
</menu>
<placeholder name="OtherApplicationPlaceholder">
<menuitem name="OtherApplication" action="OtherApplication2"/>
</placeholder>
<menu action="Scripts">
<placeholder name="Scripts Placeholder"/>
<separator name="After Scripts"/>
<menuitem name="Open Scripts Folder" action="Open Scripts Folder"/>
</menu>
</placeholder>
<placeholder name="File Items Placeholder">
<menuitem name="Self Mount Volume" action="Self Mount Volume"/>
<menuitem name="Self Unmount Volume" action="Self Unmount Volume"/>
<menuitem name="Self Eject Volume" action="Self Eject Volume"/>
<menuitem name="Self Start Volume" action="Self Start Volume"/>
<menuitem name="Self Stop Volume" action="Self Stop Volume"/>
<menuitem name="Self Poll" action="Self Poll"/>
<separator name="Properties Separator"/>
<menuitem name="Properties" action="Properties"/>
</placeholder>
<placeholder name="Global File Items Placeholder">
<menuitem name="Empty Trash" action="Empty Trash"/>
<menuitem name="Save Search" action="Save Search"/>
<menuitem name="Save Search As" action="Save Search As"/>
</placeholder>
<menu action="Edit">
<placeholder name="Clipboard Actions">
<menuitem name="Cut" action="Cut"/>
<menuitem name="Copy" action="Copy"/>
<menuitem name="Paste" action="Paste"/>
</placeholder>
<placeholder name="Undostack Actions">
<menuitem name="Undo" action="Undo"/>
<menuitem name="Redo" action="Redo"/>
</placeholder>
<placeholder name="Select Items">
<menuitem name="Select All" action="Select All"/>
<menuitem name="Select Pattern" action="Select Pattern"/>
<menuitem name="Invert Selection" action="Invert Selection"/>
</placeholder>
<placeholder name="File Items Placeholder">
<menuitem name="Duplicate" action="Duplicate"/>
<menuitem name="Create Link" action="Create Link"/>
<menuitem name="Rename" action="Rename"/>
</placeholder>
<placeholder name="Dangerous File Items Placeholder">
<menuitem name="Trash" action="Trash"/>
<menuitem name="Delete" action="Delete"/>
<menuitem name="Restore From Trash" action="Restore From Trash"/>
</placeholder>
<placeholder name="Extension Actions"/>
</menu>
<menu action="View">
<placeholder name="View Preferences Placeholder">
<menuitem name="Reset to Defaults" action="Reset to Defaults"/>
<menuitem name="Show Hidden Files" action="Show Hidden Files"/>
</placeholder>
</menu>
</popup>
<popup name="background">
<placeholder name="Before Zoom Items">
<placeholder name="New Object Items">
<menuitem name="New Folder" action="New Folder"/>
<menu action="New Documents">
<placeholder name="New Documents Placeholder"/>
<separator name="After New Documents"/>
<menuitem name="New Empty Document" action="New Empty Document"/>
</menu>
<menu action="Scripts">
<placeholder name="Scripts Placeholder"/>
<separator name="After Scripts"/>
<menuitem name="Open Scripts Folder" action="Open Scripts Folder"/>
</menu>
</placeholder>
<separator name="View items separator"/>
<placeholder name="View Items"/>
<separator name="Clipboard separator"/>
<placeholder name="File Clipboard Actions">
<menuitem name="Paste" action="Paste"/>
</placeholder>
</placeholder>
<placeholder name="Before Zoom Items">
<placeholder name="New Object Items">
<menuitem name="New Folder" action="New Folder"/>
<menu action="New Documents">
<placeholder name="New Documents Placeholder"/>
<separator name="After New Documents"/>
<menuitem name="New Empty Document" action="New Empty Document"/>
</menu>
<menu action="Scripts">
<placeholder name="Scripts Placeholder"/>
<separator name="After Scripts"/>
<menuitem name="Open Scripts Folder" action="Open Scripts Folder"/>
</menu>
</placeholder>
<separator name="View items separator"/>
<placeholder name="View Items"/>
<separator name="Clipboard separator"/>
<placeholder name="File Clipboard Actions">
<menuitem name="Paste" action="Paste"/>
</placeholder>
</placeholder>
<separator name="Folder Items separator"/>
<placeholder name="Folder Items Placeholder">
<menuitem name="Self Mount Volume" action="Self Mount Volume"/>
<menuitem name="Self Unmount Volume" action="Self Unmount Volume"/>
<menuitem name="Self Eject Volume" action="Self Eject Volume"/>
<menuitem name="Self Start Volume" action="Self Start Volume"/>
<menuitem name="Self Stop Volume" action="Self Stop Volume"/>
<menuitem name="Self Poll" action="Self Poll"/>
<separator name="Properties separator"/>
<menuitem name="Properties" action="Properties"/>
</placeholder>
<separator name="Folder Items separator"/>
<placeholder name="Folder Items Placeholder">
<menuitem name="Self Mount Volume" action="Self Mount Volume"/>
<menuitem name="Self Unmount Volume" action="Self Unmount Volume"/>
<menuitem name="Self Eject Volume" action="Self Eject Volume"/>
<menuitem name="Self Start Volume" action="Self Start Volume"/>
<menuitem name="Self Stop Volume" action="Self Stop Volume"/>
<menuitem name="Self Poll" action="Self Poll"/>
<separator name="Properties separator"/>
<menuitem name="Properties" action="Properties"/>
</placeholder>
</popup>
<popup name="selection">
<placeholder name="New Object Items">
<menuitem name="New Folder with Selection" action="New Folder with Selection"/>
<separator name="new folder with selection separator"/>
</placeholder>
<placeholder name="Open Placeholder">
<menuitem name="Open" action="Open"/>
<menuitem name="OpenInNewTab" action="OpenInNewTab"/>
<menuitem name="OpenAlternate" action="OpenAlternate"/>
<separator name="applications separator"/>
<placeholder name="Applications Placeholder"/>
<menu action="Open With">
<placeholder name="Applications Placeholder"/>
<separator name="open with separator"/>
<menuitem name="OtherApplication" action="OtherApplication1"/>
</menu>
<placeholder name="OtherApplicationPlaceholder">
<menuitem name="OtherApplication2" action="OtherApplication2"/>
</placeholder>
<menu action="Scripts">
<placeholder name="Scripts Placeholder"/>
<separator name="After Scripts"/>
<menuitem name="Open Scripts Folder" action="Open Scripts Folder"/>
</menu>
</placeholder>
<separator name="Clipboard separator"/>
<placeholder name="File Clipboard Actions">
<menuitem name="Cut" action="Cut"/>
<menuitem name="Copy" action="Copy"/>
<menuitem name="Paste Files Into" action="Paste Files Into"/>
</placeholder>
<separator name="File actions separator"/>
<placeholder name="File Actions">
<menuitem name="Properties" action="Properties"/>
<menuitem name="Rename" action="Rename"/>
</placeholder>
<separator name="Dangerous separator"/>
<placeholder name="Dangerous File Actions">
<menuitem name="Trash" action="Trash"/>
<menuitem name="Delete" action="Delete"/>
<menuitem name="Restore From Trash" action="Restore From Trash"/>
</placeholder>
<separator name="Appearance separator"/>
<placeholder name="Icon Appearance Items">
</placeholder>
<separator name="Extension actions separator"/>
<placeholder name="Extension Actions"/>
<separator name="Removable separator"/>
<placeholder name="Removable Media Placeholder">
<menuitem name="Mount Volume" action="Mount Volume"/>
<menuitem name="Unmount Volume" action="Unmount Volume"/>
<menuitem name="Eject Volume" action="Eject Volume"/>
<menuitem name="Start Volume" action="Start Volume"/>
<menuitem name="Stop Volume" action="Stop Volume"/>
<menuitem name="Poll" action="Poll"/>
</placeholder>
<menuitem name="Connect To Server Link" action="Connect To Server Link"/>
<placeholder name="New Object Items">
<menuitem name="New Folder with Selection" action="New Folder with Selection"/>
<separator name="new folder with selection separator"/>
</placeholder>
<placeholder name="Open Placeholder">
<menuitem name="Open" action="Open"/>
<menuitem name="OpenInNewTab" action="OpenInNewTab"/>
<menuitem name="OpenAlternate" action="OpenAlternate"/>
<separator name="applications separator"/>
<placeholder name="Applications Placeholder"/>
<menu action="Open With">
<placeholder name="Applications Placeholder"/>
<separator name="open with separator"/>
<menuitem name="OtherApplication" action="OtherApplication1"/>
</menu>
<placeholder name="OtherApplicationPlaceholder">
<menuitem name="OtherApplication2" action="OtherApplication2"/>
</placeholder>
<menu action="Scripts">
<placeholder name="Scripts Placeholder"/>
<separator name="After Scripts"/>
<menuitem name="Open Scripts Folder" action="Open Scripts Folder"/>
</menu>
</placeholder>
<separator name="Clipboard separator"/>
<placeholder name="File Clipboard Actions">
<menuitem name="Cut" action="Cut"/>
<menuitem name="Copy" action="Copy"/>
<menuitem name="Paste Files Into" action="Paste Files Into"/>
</placeholder>
<separator name="File actions separator"/>
<placeholder name="File Actions">
<menuitem name="Properties" action="Properties"/>
<menuitem name="Rename" action="Rename"/>
</placeholder>
<separator name="Dangerous separator"/>
<placeholder name="Dangerous File Actions">
<menuitem name="Trash" action="Trash"/>
<menuitem name="Delete" action="Delete"/>
<menuitem name="Restore From Trash" action="Restore From Trash"/>
</placeholder>
<separator name="Appearance separator"/>
<placeholder name="Icon Appearance Items">
</placeholder>
<separator name="Extension actions separator"/>
<placeholder name="Extension Actions"/>
<separator name="Removable separator"/>
<placeholder name="Removable Media Placeholder">
<menuitem name="Mount Volume" action="Mount Volume"/>
<menuitem name="Unmount Volume" action="Unmount Volume"/>
<menuitem name="Eject Volume" action="Eject Volume"/>
<menuitem name="Start Volume" action="Start Volume"/>
<menuitem name="Stop Volume" action="Stop Volume"/>
<menuitem name="Poll" action="Poll"/>
</placeholder>
<menuitem name="Connect To Server Link" action="Connect To Server Link"/>
</popup>
<popup name="location">
<placeholder name="Open Placeholder">
<menuitem name="LocationOpenInNewTab" action="LocationOpenInNewTab"/>
<menuitem name="LocationOpenAlternate" action="LocationOpenAlternate"/>
</placeholder>
<separator name="Location After Open Separator"/>
<placeholder name="Clipboard Actions">
<menuitem name="Cut" action="LocationCut"/>
<menuitem name="Copy" action="LocationCopy"/>
<menuitem name="LocationPasteFilesInto" action="LocationPasteFilesInto"/>
</placeholder>
<separator name="Location After Clipboard Separator"/>
<placeholder name="Dangerous File Actions">
<menuitem name="Trash" action="LocationTrash"/>
<menuitem name="Delete" action="LocationDelete"/>
<menuitem name="Restore From Trash" action="LocationRestoreFromTrash"/>
</placeholder>
<separator name="Location After Dangerous Separator"/>
<menuitem name="Location Mount Volume" action="Location Mount Volume"/>
<menuitem name="Location Unmount Volume" action="Location Unmount Volume"/>
<menuitem name="Location Eject Volume" action="Location Eject Volume"/>
<menuitem name="Location Start Volume" action="Location Start Volume"/>
<menuitem name="Location Stop Volume" action="Location Stop Volume"/>
<menuitem name="Location Poll" action="Location Poll"/>
<separator name="Properties Separator"/>
<menuitem name="LocationProperties" action="LocationProperties"/>
<placeholder name="Open Placeholder">
<menuitem name="LocationOpenInNewTab" action="LocationOpenInNewTab"/>
<menuitem name="LocationOpenAlternate" action="LocationOpenAlternate"/>
</placeholder>
<separator name="Location After Open Separator"/>
<placeholder name="Clipboard Actions">
<menuitem name="Cut" action="LocationCut"/>
<menuitem name="Copy" action="LocationCopy"/>
<menuitem name="LocationPasteFilesInto" action="LocationPasteFilesInto"/>
</placeholder>
<separator name="Location After Clipboard Separator"/>
<placeholder name="Dangerous File Actions">
<menuitem name="Trash" action="LocationTrash"/>
<menuitem name="Delete" action="LocationDelete"/>
<menuitem name="Restore From Trash" action="LocationRestoreFromTrash"/>
</placeholder>
<separator name="Location After Dangerous Separator"/>
<menuitem name="Location Mount Volume" action="Location Mount Volume"/>
<menuitem name="Location Unmount Volume" action="Location Unmount Volume"/>
<menuitem name="Location Eject Volume" action="Location Eject Volume"/>
<menuitem name="Location Start Volume" action="Location Start Volume"/>
<menuitem name="Location Stop Volume" action="Location Stop Volume"/>
<menuitem name="Location Poll" action="Location Poll"/>
<separator name="Properties Separator"/>
<menuitem name="LocationProperties" action="LocationProperties"/>
</popup>
</ui>
<ui>
<menubar name="MenuBar">
<menu action="Edit">
<placeholder name="Edit Items Placeholder">
<menuitem name="Stretch" action="Stretch"/>
<menuitem name="Unstretch" action="Unstretch"/>
</placeholder>
</menu>
<menu action="View">
<placeholder name="View Items Placeholder">
<menu action="Arrange Items">
<menuitem name="Manual Layout" action="Manual Layout"/>
<placeholder name="Auto Layout">
<menuitem name="Sort by Name" action="Sort by Name"/>
<menuitem name="Sort by Size" action="Sort by Size"/>
<menuitem name="Sort by Type" action="Sort by Type"/>
<menuitem name="Sort by Modification Date" action="Sort by Modification Date"/>
<menuitem name="Sort by Trash Time" action="Sort by Trash Time"/>
</placeholder>
<separator name="Layout separator"/>
<menuitem name="Reversed Order" action="Reversed Order"/>
</menu>
<menuitem name="Clean Up" action="Clean Up"/>
<menuitem name="Keep Aligned" action="Keep Aligned"/>
</placeholder>
</menu>
</menubar>
<popup name="background">
<placeholder name="Before Zoom Items">
<placeholder name="View Items">
<menu action="Arrange Items">
<menuitem name="Manual Layout" action="Manual Layout"/>
<placeholder name="Auto Layout">
<menuitem name="Sort by Name" action="Sort by Name"/>
<menuitem name="Sort by Size" action="Sort by Size"/>
<menuitem name="Sort by Type" action="Sort by Type"/>
<menuitem name="Sort by Modification Date" action="Sort by Modification Date"/>
<menuitem name="Sort by Trash Time" action="Sort by Trash Time"/>
</placeholder>
<separator name="Layout separator"/>
<menuitem name="Reversed Order" action="Reversed Order"/>
</menu>
<menuitem name="Clean Up" action="Clean Up"/>
<menuitem name="Keep Aligned" action="Keep Aligned"/>
</placeholder>
</placeholder>
</popup>
<popup name="selection">
<placeholder name="Icon Appearance Items"/>
</popup>
<popup name="ViewMenu">
<menu action="Edit">
<placeholder name="Edit Items Placeholder">
<menuitem name="Stretch" action="Stretch"/>
<menuitem name="Unstretch" action="Unstretch"/>
</placeholder>
</menu>
<menu action="View">
<placeholder name="View Items Placeholder">
<menu action="Arrange Items">
<menuitem name="Manual Layout" action="Manual Layout"/>
<placeholder name="Auto Layout">
<menuitem name="Sort by Name" action="Sort by Name"/>
<menuitem name="Sort by Size" action="Sort by Size"/>
<menuitem name="Sort by Type" action="Sort by Type"/>
<menuitem name="Sort by Modification Date" action="Sort by Modification Date"/>
<menuitem name="Sort by Trash Time" action="Sort by Trash Time"/>
</placeholder>
<separator name="Layout separator"/>
<menuitem name="Reversed Order" action="Reversed Order"/>
</menu>
<menuitem name="Clean Up" action="Clean Up"/>
<menuitem name="Keep Aligned" action="Keep Aligned"/>
</placeholder>
</menu>
</popup>
<popup name="background">
<placeholder name="Before Zoom Items">
<placeholder name="View Items">
<menu action="Arrange Items">
<menuitem name="Manual Layout" action="Manual Layout"/>
<placeholder name="Auto Layout">
<menuitem name="Sort by Name" action="Sort by Name"/>
<menuitem name="Sort by Size" action="Sort by Size"/>
<menuitem name="Sort by Type" action="Sort by Type"/>
<menuitem name="Sort by Modification Date" action="Sort by Modification Date"/>
<menuitem name="Sort by Trash Time" action="Sort by Trash Time"/>
</placeholder>
<separator name="Layout separator"/>
<menuitem name="Reversed Order" action="Reversed Order"/>
</menu>
<menuitem name="Clean Up" action="Clean Up"/>
<menuitem name="Keep Aligned" action="Keep Aligned"/>
</placeholder>
</placeholder>
</popup>
<popup name="selection">
<placeholder name="Icon Appearance Items"/>
</popup>
</ui>
<ui>
<menubar name="MenuBar">
<menu action="View">
<placeholder name="View Items Placeholder">
<menuitem name="Visible Columns" action="Visible Columns"/>
</placeholder>
</menu>
</menubar>
<popup name="ViewMenu">
<menu action="View">
<placeholder name="View Items Placeholder">
<menuitem name="Visible Columns" action="Visible Columns"/>
</placeholder>
</menu>
</popup>
</ui>
......@@ -7,88 +7,74 @@
<accelerator action="ZoomInAccel"/>
<accelerator action="ZoomInAccel2"/>
<accelerator action="ZoomOutAccel"/>
<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"/>
</placeholder>
<separator/>
<placeholder name="Open Placeholder"/>
<separator/>
<placeholder name="Location Placeholder"/>
<menuitem name="Connect to Server" action="Connect to Server"/>
<separator/>
<placeholder name="File Items Placeholder"/>
<separator/>
<placeholder name="Global File Items Placeholder"/>
<separator/>
<placeholder name="Extension Actions"/>
<separator/>
<placeholder name="Close Items Placeholder">
<menuitem name="Close All Windows" action="Close All Windows"/>
</placeholder>
<menuitem name="Close" action="Close"/>
</menu>
<menu action="Edit">
<placeholder name="Undostack Actions"/>
<separator/>
<placeholder name="Clipboard Actions">
</placeholder>
<separator/>
<placeholder name="Select Items"/>
<separator/>
<placeholder name="File Items Placeholder"/>
<separator/>
<placeholder name="Dangerous File Items Placeholder"/>
<separator/>
<placeholder name="Edit Items Placeholder"/>
<placeholder name="Global Edit Items Placeholder"/>
<separator/>
<placeholder name="Extension Actions"/>
<separator/>
<menuitem name="Preferences" action="Preferences"/>
</menu>
<menu action="View">
<menuitem name="Stop" action="Stop"/>
<menuitem name="Reload" action="Reload"/>
<separator/>
<menuitem name="Show Hide Sidebar" action="Show Hide Sidebar"/>
<separator/>
<placeholder name="View Preferences Placeholder"/>
<separator/>
<placeholder name="View Items Placeholder"/>
<separator/>
<placeholder name="Zoom Items Placeholder">
<menuitem name="Zoom In" action="Zoom In"/>
<menuitem name="Zoom Out" action="Zoom Out"/>
<menuitem name="Zoom Normal" action="Zoom Normal"/>
</placeholder>
<placeholder name="View Choices">
<separator name="Before Short List"/>
<placeholder name="Short List"/>
</placeholder>
</menu>
<placeholder name="Other Menus">
<menu action="Bookmarks">
<menuitem name="Add Bookmark" action="Add Bookmark"/>
<menuitem name="Edit Bookmark" action="Edit Bookmarks"/>
<menuitem name="Go to Location" action="Go to Location"/>
<separator/>
<placeholder name="Bookmarks Placeholder"/>
</menu>
</placeholder>
<menu action="Help">
<menuitem action="NautilusHelp"/>
<menuitem action="NautilusHelpSearch"/>
<menuitem action="NautilusHelpSort"/>
<menuitem action="NautilusHelpLost"/>
<menuitem action="NautilusHelpShare"/>
<separator/>
<menuitem name="About Nautilus" action="About Nautilus"/>
</menu>
</menubar>
<popup name="ViewMenu">
<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/>
<placeholder name="Location Placeholder"/>
<menuitem name="Connect to Server" action="Connect to Server"/>
<separator/>
<placeholder name="File Items Placeholder"/>
<separator/>
<placeholder name="Global File Items Placeholder"/>
<separator/>
<menu action="Edit">
<placeholder name="Undostack Actions"/>
<separator/>
<placeholder name="Clipboard Actions">
</placeholder>
<separator/>
<placeholder name="Select Items"/>
<separator/>
<placeholder name="File Items Placeholder"/>
<separator/>
<placeholder name="Dangerous File Items Placeholder"/>
<separator/>
<placeholder name="Edit Items Placeholder"/>
<placeholder name="Global Edit Items Placeholder"/>
<separator/>
<placeholder name="Extension Actions"/>
<separator/>
<menuitem name="Preferences" action="Preferences"/>
</menu>
<menu action="View">
<menuitem name="Stop" action="Stop"/>
<menuitem name="Reload" action="Reload"/>
<separator/>
<menuitem name="Show Hide Sidebar" action="Show Hide Sidebar"/>
<separator/>
<placeholder name="View Preferences Placeholder"/>
<separator/>
<placeholder name="View Items Placeholder"/>
<separator/>
<placeholder name="Zoom Items Placeholder">
<menuitem name="Zoom In" action="Zoom In"/>
<menuitem name="Zoom Out" action="Zoom Out"/>
<menuitem name="Zoom Normal" action="Zoom Normal"/>
</placeholder>
<placeholder name="View Choices">
<separator name="Before Short List"/>
<placeholder name="Short List"/>
</placeholder>
</menu>
<menu action="Bookmarks">
<menuitem name="Add Bookmark" action="Add Bookmark"/>
<menuitem name="Edit Bookmark" action="Edit Bookmarks"/>
<menuitem name="Go to Location" action="Go to Location"/>
<separator/>
<placeholder name="Bookmarks Placeholder"/>
</menu>
<placeholder name="Extension Actions"/>
<separator/>
<placeholder name="Close Items Placeholder">
<menuitem name="Close All Windows" action="Close All Windows"/>
</placeholder>
<menuitem name="Close" action="Close"/>
</popup>
<popup name="background">
<placeholder name="Before Zoom Items">
<placeholder name="New Window Items"/>
......
......@@ -54,6 +54,7 @@ struct _NautilusToolbarPriv {
enum {
PROP_ACTION_GROUP = 1,
PROP_UI_MANAGER,
PROP_SHOW_LOCATION_ENTRY,
PROP_SHOW_SEARCH_BAR,
PROP_SHOW_MAIN_BAR,
......@@ -88,12 +89,14 @@ static void
nautilus_toolbar_constructed (GObject *obj)
{
NautilusToolbar *self = NAUTILUS_TOOLBAR (obj);
GtkToolItem *item;
GtkWidget *hbox, *toolbar;
GtkStyleContext *context;
GtkWidget *tool_button, *box;
GtkWidget *tool_button;
GtkWidget *menu;
GtkWidget *image;
GtkWidget *box;
GtkToolItem *back_forward;
GtkToolItem *search;
GtkToolItem *tool_item;
GtkActionGroup *action_group;
GtkAction *action;
......@@ -159,14 +162,14 @@ nautilus_toolbar_constructed (GObject *obj)
self->priv->location_bar = nautilus_location_bar_new ();
gtk_box_pack_start (GTK_BOX (hbox), self->priv->location_bar, TRUE, TRUE, 0);
item = gtk_tool_item_new ();
gtk_tool_item_set_expand (item, TRUE);