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> <ui>
<accelerator action="OpenAccel"/> <accelerator action="OpenAccel"/>
<accelerator action="OpenCloseParent"/> <accelerator action="OpenCloseParent"/>
<accelerator action="PropertiesAccel"/> <accelerator action="PropertiesAccel"/>
<accelerator action="RenameSelectAll"/> <accelerator action="RenameSelectAll"/>
<menubar name="MenuBar"> <popup name="ViewMenu">
<menu action="File"> <placeholder name="New Items Placeholder">
<placeholder name="New Items Placeholder"> <menuitem name="New Folder" action="New Folder"/>
<menuitem name="New Folder" action="New Folder"/> <menuitem name="New Folder with Selection" action="New Folder with Selection"/>
<menuitem name="New Folder with Selection" action="New Folder with Selection"/> <menu action="New Documents">
<menu action="New Documents"> <placeholder name="New Documents Placeholder"/>
<placeholder name="New Documents Placeholder"/> <separator name="After New Documents"/>
<separator name="After New Documents"/> <menuitem name="New Empty Document" action="New Empty Document"/>
<menuitem name="New Empty Document" action="New Empty Document"/> </menu>
</menu> </placeholder>
</placeholder> <placeholder name="Open Placeholder">
<placeholder name="Open Placeholder"> <menuitem name="Open" action="Open"/>
<menuitem name="Open" action="Open"/> <menuitem name="OpenInNewTab" action="OpenInNewTab"/>
<menuitem name="OpenInNewTab" action="OpenInNewTab"/> <menuitem name="OpenAlternate" action="OpenAlternate"/>
<menuitem name="OpenAlternate" action="OpenAlternate"/> <placeholder name="Applications Placeholder">
<placeholder name="Applications Placeholder"> </placeholder>
</placeholder> <menu action="Open With">
<menu action="Open With"> <placeholder name="Applications Placeholder"/>
<placeholder name="Applications Placeholder"/> <separator name="Open With Separator"/>
<separator name="Open With Separator"/> <menuitem name="OtherApplication" action="OtherApplication1"/>
<menuitem name="OtherApplication" action="OtherApplication1"/> </menu>
</menu> <placeholder name="OtherApplicationPlaceholder">
<placeholder name="OtherApplicationPlaceholder"> <menuitem name="OtherApplication" action="OtherApplication2"/>
<menuitem name="OtherApplication" action="OtherApplication2"/> </placeholder>
</placeholder> <menu action="Scripts">
<menu action="Scripts"> <placeholder name="Scripts Placeholder"/>
<placeholder name="Scripts Placeholder"/> <separator name="After Scripts"/>
<separator name="After Scripts"/> <menuitem name="Open Scripts Folder" action="Open Scripts Folder"/>
<menuitem name="Open Scripts Folder" action="Open Scripts Folder"/> </menu>
</menu> </placeholder>
</placeholder> <placeholder name="File Items Placeholder">
<placeholder name="File Items Placeholder"> <menuitem name="Self Mount Volume" action="Self Mount Volume"/>
<menuitem name="Self Mount Volume" action="Self Mount Volume"/> <menuitem name="Self Unmount Volume" action="Self Unmount Volume"/>
<menuitem name="Self Unmount Volume" action="Self Unmount Volume"/> <menuitem name="Self Eject Volume" action="Self Eject Volume"/>
<menuitem name="Self Eject Volume" action="Self Eject Volume"/> <menuitem name="Self Start Volume" action="Self Start Volume"/>
<menuitem name="Self Start Volume" action="Self Start Volume"/> <menuitem name="Self Stop Volume" action="Self Stop Volume"/>
<menuitem name="Self Stop Volume" action="Self Stop Volume"/> <menuitem name="Self Poll" action="Self Poll"/>
<menuitem name="Self Poll" action="Self Poll"/> <separator name="Properties Separator"/>
<separator name="Properties Separator"/> <menuitem name="Properties" action="Properties"/>
<menuitem name="Properties" action="Properties"/> </placeholder>
</placeholder> <placeholder name="Global File Items Placeholder">
<placeholder name="Global File Items Placeholder"> <menuitem name="Empty Trash" action="Empty Trash"/>
<menuitem name="Empty Trash" action="Empty Trash"/> <menuitem name="Save Search" action="Save Search"/>
<menuitem name="Save Search" action="Save Search"/> <menuitem name="Save Search As" action="Save Search As"/>
<menuitem name="Save Search As" action="Save Search As"/> </placeholder>
</placeholder> <menu action="Edit">
</menu> <placeholder name="Clipboard Actions">
<menu action="Edit"> <menuitem name="Cut" action="Cut"/>
<placeholder name="Clipboard Actions"> <menuitem name="Copy" action="Copy"/>
<menuitem name="Cut" action="Cut"/> <menuitem name="Paste" action="Paste"/>
<menuitem name="Copy" action="Copy"/> </placeholder>
<menuitem name="Paste" action="Paste"/> <placeholder name="Undostack Actions">
</placeholder> <menuitem name="Undo" action="Undo"/>
<placeholder name="Undostack Actions"> <menuitem name="Redo" action="Redo"/>
<menuitem name="Undo" action="Undo"/> </placeholder>
<menuitem name="Redo" action="Redo"/> <placeholder name="Select Items">
</placeholder> <menuitem name="Select All" action="Select All"/>
<placeholder name="Select Items"> <menuitem name="Select Pattern" action="Select Pattern"/>
<menuitem name="Select All" action="Select All"/> <menuitem name="Invert Selection" action="Invert Selection"/>
<menuitem name="Select Pattern" action="Select Pattern"/> </placeholder>
<menuitem name="Invert Selection" action="Invert Selection"/> <placeholder name="File Items Placeholder">
</placeholder> <menuitem name="Duplicate" action="Duplicate"/>
<placeholder name="File Items Placeholder"> <menuitem name="Create Link" action="Create Link"/>
<menuitem name="Duplicate" action="Duplicate"/> <menuitem name="Rename" action="Rename"/>
<menuitem name="Create Link" action="Create Link"/> </placeholder>
<menuitem name="Rename" action="Rename"/> <placeholder name="Dangerous File Items Placeholder">
</placeholder> <menuitem name="Trash" action="Trash"/>
<placeholder name="Dangerous File Items Placeholder"> <menuitem name="Delete" action="Delete"/>
<menuitem name="Trash" action="Trash"/> <menuitem name="Restore From Trash" action="Restore From Trash"/>
<menuitem name="Delete" action="Delete"/> </placeholder>
<menuitem name="Restore From Trash" action="Restore From Trash"/> <placeholder name="Extension Actions"/>
</placeholder> </menu>
<placeholder name="Extension Actions"/> <menu action="View">
</menu> <placeholder name="View Preferences Placeholder">
<menu action="View"> <menuitem name="Reset to Defaults" action="Reset to Defaults"/>
<placeholder name="View Preferences Placeholder"> <menuitem name="Show Hidden Files" action="Show Hidden Files"/>
<menuitem name="Reset to Defaults" action="Reset to Defaults"/> </placeholder>
<menuitem name="Show Hidden Files" action="Show Hidden Files"/> </menu>
</placeholder> </popup>
</menu>
</menubar>
<popup name="background"> <popup name="background">
<placeholder name="Before Zoom Items"> <placeholder name="Before Zoom Items">
<placeholder name="New Object Items"> <placeholder name="New Object Items">
<menuitem name="New Folder" action="New Folder"/> <menuitem name="New Folder" action="New Folder"/>
<menu action="New Documents"> <menu action="New Documents">
<placeholder name="New Documents Placeholder"/> <placeholder name="New Documents Placeholder"/>
<separator name="After New Documents"/> <separator name="After New Documents"/>
<menuitem name="New Empty Document" action="New Empty Document"/> <menuitem name="New Empty Document" action="New Empty Document"/>
</menu> </menu>
<menu action="Scripts"> <menu action="Scripts">
<placeholder name="Scripts Placeholder"/> <placeholder name="Scripts Placeholder"/>
<separator name="After Scripts"/> <separator name="After Scripts"/>
<menuitem name="Open Scripts Folder" action="Open Scripts Folder"/> <menuitem name="Open Scripts Folder" action="Open Scripts Folder"/>
</menu> </menu>
</placeholder> </placeholder>
<separator name="View items separator"/> <separator name="View items separator"/>
<placeholder name="View Items"/> <placeholder name="View Items"/>
<separator name="Clipboard separator"/> <separator name="Clipboard separator"/>
<placeholder name="File Clipboard Actions"> <placeholder name="File Clipboard Actions">
<menuitem name="Paste" action="Paste"/> <menuitem name="Paste" action="Paste"/>
</placeholder> </placeholder>
</placeholder> </placeholder>
<separator name="Folder Items separator"/> <separator name="Folder Items separator"/>
<placeholder name="Folder Items Placeholder"> <placeholder name="Folder Items Placeholder">
<menuitem name="Self Mount Volume" action="Self Mount Volume"/> <menuitem name="Self Mount Volume" action="Self Mount Volume"/>
<menuitem name="Self Unmount Volume" action="Self Unmount Volume"/> <menuitem name="Self Unmount Volume" action="Self Unmount Volume"/>
<menuitem name="Self Eject Volume" action="Self Eject Volume"/> <menuitem name="Self Eject Volume" action="Self Eject Volume"/>
<menuitem name="Self Start Volume" action="Self Start Volume"/> <menuitem name="Self Start Volume" action="Self Start Volume"/>
<menuitem name="Self Stop Volume" action="Self Stop Volume"/> <menuitem name="Self Stop Volume" action="Self Stop Volume"/>
<menuitem name="Self Poll" action="Self Poll"/> <menuitem name="Self Poll" action="Self Poll"/>
<separator name="Properties separator"/> <separator name="Properties separator"/>
<menuitem name="Properties" action="Properties"/> <menuitem name="Properties" action="Properties"/>
</placeholder> </placeholder>
</popup> </popup>
<popup name="selection"> <popup name="selection">
<placeholder name="New Object Items"> <placeholder name="New Object Items">
<menuitem name="New Folder with Selection" action="New Folder with Selection"/> <menuitem name="New Folder with Selection" action="New Folder with Selection"/>
<separator name="new folder with selection separator"/> <separator name="new folder with selection separator"/>
</placeholder> </placeholder>
<placeholder name="Open Placeholder"> <placeholder name="Open Placeholder">
<menuitem name="Open" action="Open"/> <menuitem name="Open" action="Open"/>
<menuitem name="OpenInNewTab" action="OpenInNewTab"/> <menuitem name="OpenInNewTab" action="OpenInNewTab"/>
<menuitem name="OpenAlternate" action="OpenAlternate"/> <menuitem name="OpenAlternate" action="OpenAlternate"/>
<separator name="applications separator"/> <separator name="applications separator"/>
<placeholder name="Applications Placeholder"/> <placeholder name="Applications Placeholder"/>
<menu action="Open With"> <menu action="Open With">
<placeholder name="Applications Placeholder"/> <placeholder name="Applications Placeholder"/>
<separator name="open with separator"/> <separator name="open with separator"/>
<menuitem name="OtherApplication" action="OtherApplication1"/> <menuitem name="OtherApplication" action="OtherApplication1"/>
</menu> </menu>
<placeholder name="OtherApplicationPlaceholder"> <placeholder name="OtherApplicationPlaceholder">
<menuitem name="OtherApplication2" action="OtherApplication2"/> <menuitem name="OtherApplication2" action="OtherApplication2"/>
</placeholder> </placeholder>
<menu action="Scripts"> <menu action="Scripts">
<placeholder name="Scripts Placeholder"/> <placeholder name="Scripts Placeholder"/>
<separator name="After Scripts"/> <separator name="After Scripts"/>
<menuitem name="Open Scripts Folder" action="Open Scripts Folder"/> <menuitem name="Open Scripts Folder" action="Open Scripts Folder"/>
</menu> </menu>
</placeholder> </placeholder>
<separator name="Clipboard separator"/> <separator name="Clipboard separator"/>
<placeholder name="File Clipboard Actions"> <placeholder name="File Clipboard Actions">
<menuitem name="Cut" action="Cut"/> <menuitem name="Cut" action="Cut"/>
<menuitem name="Copy" action="Copy"/> <menuitem name="Copy" action="Copy"/>
<menuitem name="Paste Files Into" action="Paste Files Into"/> <menuitem name="Paste Files Into" action="Paste Files Into"/>
</placeholder> </placeholder>
<separator name="File actions separator"/> <separator name="File actions separator"/>
<placeholder name="File Actions"> <placeholder name="File Actions">
<menuitem name="Properties" action="Properties"/> <menuitem name="Properties" action="Properties"/>
<menuitem name="Rename" action="Rename"/> <menuitem name="Rename" action="Rename"/>
</placeholder> </placeholder>
<separator name="Dangerous separator"/> <separator name="Dangerous separator"/>
<placeholder name="Dangerous File Actions"> <placeholder name="Dangerous File Actions">
<menuitem name="Trash" action="Trash"/> <menuitem name="Trash" action="Trash"/>
<menuitem name="Delete" action="Delete"/> <menuitem name="Delete" action="Delete"/>
<menuitem name="Restore From Trash" action="Restore From Trash"/> <menuitem name="Restore From Trash" action="Restore From Trash"/>
</placeholder> </placeholder>
<separator name="Appearance separator"/> <separator name="Appearance separator"/>
<placeholder name="Icon Appearance Items"> <placeholder name="Icon Appearance Items">
</placeholder> </placeholder>
<separator name="Extension actions separator"/> <separator name="Extension actions separator"/>
<placeholder name="Extension Actions"/> <placeholder name="Extension Actions"/>
<separator name="Removable separator"/> <separator name="Removable separator"/>
<placeholder name="Removable Media Placeholder"> <placeholder name="Removable Media Placeholder">
<menuitem name="Mount Volume" action="Mount Volume"/> <menuitem name="Mount Volume" action="Mount Volume"/>
<menuitem name="Unmount Volume" action="Unmount Volume"/> <menuitem name="Unmount Volume" action="Unmount Volume"/>
<menuitem name="Eject Volume" action="Eject Volume"/> <menuitem name="Eject Volume" action="Eject Volume"/>
<menuitem name="Start Volume" action="Start Volume"/> <menuitem name="Start Volume" action="Start Volume"/>
<menuitem name="Stop Volume" action="Stop Volume"/> <menuitem name="Stop Volume" action="Stop Volume"/>
<menuitem name="Poll" action="Poll"/> <menuitem name="Poll" action="Poll"/>
</placeholder> </placeholder>
<menuitem name="Connect To Server Link" action="Connect To Server Link"/> <menuitem name="Connect To Server Link" action="Connect To Server Link"/>
</popup> </popup>
<popup name="location"> <popup name="location">
<placeholder name="Open Placeholder"> <placeholder name="Open Placeholder">
<menuitem name="LocationOpenInNewTab" action="LocationOpenInNewTab"/> <menuitem name="LocationOpenInNewTab" action="LocationOpenInNewTab"/>
<menuitem name="LocationOpenAlternate" action="LocationOpenAlternate"/> <menuitem name="LocationOpenAlternate" action="LocationOpenAlternate"/>
</placeholder> </placeholder>
<separator name="Location After Open Separator"/> <separator name="Location After Open Separator"/>
<placeholder name="Clipboard Actions"> <placeholder name="Clipboard Actions">
<menuitem name="Cut" action="LocationCut"/> <menuitem name="Cut" action="LocationCut"/>
<menuitem name="Copy" action="LocationCopy"/> <menuitem name="Copy" action="LocationCopy"/>
<menuitem name="LocationPasteFilesInto" action="LocationPasteFilesInto"/> <menuitem name="LocationPasteFilesInto" action="LocationPasteFilesInto"/>
</placeholder> </placeholder>
<separator name="Location After Clipboard Separator"/> <separator name="Location After Clipboard Separator"/>
<placeholder name="Dangerous File Actions"> <placeholder name="Dangerous File Actions">
<menuitem name="Trash" action="LocationTrash"/> <menuitem name="Trash" action="LocationTrash"/>
<menuitem name="Delete" action="LocationDelete"/> <menuitem name="Delete" action="LocationDelete"/>
<menuitem name="Restore From Trash" action="LocationRestoreFromTrash"/> <menuitem name="Restore From Trash" action="LocationRestoreFromTrash"/>
</placeholder> </placeholder>
<separator name="Location After Dangerous Separator"/> <separator name="Location After Dangerous Separator"/>
<menuitem name="Location Mount Volume" action="Location Mount Volume"/> <menuitem name="Location Mount Volume" action="Location Mount Volume"/>
<menuitem name="Location Unmount Volume" action="Location Unmount Volume"/> <menuitem name="Location Unmount Volume" action="Location Unmount Volume"/>
<menuitem name="Location Eject Volume" action="Location Eject Volume"/> <menuitem name="Location Eject Volume" action="Location Eject Volume"/>
<menuitem name="Location Start Volume" action="Location Start Volume"/> <menuitem name="Location Start Volume" action="Location Start Volume"/>
<menuitem name="Location Stop Volume" action="Location Stop Volume"/> <menuitem name="Location Stop Volume" action="Location Stop Volume"/>
<menuitem name="Location Poll" action="Location Poll"/> <menuitem name="Location Poll" action="Location Poll"/>
<separator name="Properties Separator"/> <separator name="Properties Separator"/>
<menuitem name="LocationProperties" action="LocationProperties"/> <menuitem name="LocationProperties" action="LocationProperties"/>
</popup> </popup>
</ui> </ui>
<ui> <ui>
<menubar name="MenuBar"> <popup name="ViewMenu">
<menu action="Edit"> <menu action="Edit">
<placeholder name="Edit Items Placeholder"> <placeholder name="Edit Items Placeholder">
<menuitem name="Stretch" action="Stretch"/> <menuitem name="Stretch" action="Stretch"/>
<menuitem name="Unstretch" action="Unstretch"/> <menuitem name="Unstretch" action="Unstretch"/>
</placeholder> </placeholder>
</menu> </menu>
<menu action="View"> <menu action="View">
<placeholder name="View Items Placeholder"> <placeholder name="View Items Placeholder">
<menu action="Arrange Items"> <menu action="Arrange Items">
<menuitem name="Manual Layout" action="Manual Layout"/> <menuitem name="Manual Layout" action="Manual Layout"/>
<placeholder name="Auto Layout"> <placeholder name="Auto Layout">
<menuitem name="Sort by Name" action="Sort by Name"/> <menuitem name="Sort by Name" action="Sort by Name"/>
<menuitem name="Sort by Size" action="Sort by Size"/> <menuitem name="Sort by Size" action="Sort by Size"/>
<menuitem name="Sort by Type" action="Sort by Type"/> <menuitem name="Sort by Type" action="Sort by Type"/>
<menuitem name="Sort by Modification Date" action="Sort by Modification Date"/> <menuitem name="Sort by Modification Date" action="Sort by Modification Date"/>
<menuitem name="Sort by Trash Time" action="Sort by Trash Time"/> <menuitem name="Sort by Trash Time" action="Sort by Trash Time"/>
</placeholder> </placeholder>
<separator name="Layout separator"/> <separator name="Layout separator"/>
<menuitem name="Reversed Order" action="Reversed Order"/> <menuitem name="Reversed Order" action="Reversed Order"/>
</menu> </menu>
<menuitem name="Clean Up" action="Clean Up"/> <menuitem name="Clean Up" action="Clean Up"/>
<menuitem name="Keep Aligned" action="Keep Aligned"/> <menuitem name="Keep Aligned" action="Keep Aligned"/>
</placeholder> </placeholder>
</menu>
</menu> </popup>
</menubar> <popup name="background">
<popup name="background"> <placeholder name="Before Zoom Items">
<placeholder name="Before Zoom Items"> <placeholder name="View Items">
<placeholder name="View Items"> <menu action="Arrange Items">
<menu action="Arrange Items"> <menuitem name="Manual Layout" action="Manual Layout"/>
<menuitem name="Manual Layout" action="Manual Layout"/> <placeholder name="Auto Layout">
<placeholder name="Auto Layout"> <menuitem name="Sort by Name" action="Sort by Name"/>
<menuitem name="Sort by Name" action="Sort by Name"/> <menuitem name="Sort by Size" action="Sort by Size"/>
<menuitem name="Sort by Size" action="Sort by Size"/> <menuitem name="Sort by Type" action="Sort by Type"/>
<menuitem name="Sort by Type" action="Sort by Type"/> <menuitem name="Sort by Modification Date" action="Sort by Modification Date"/>
<menuitem name="Sort by Modification Date" action="Sort by Modification Date"/> <menuitem name="Sort by Trash Time" action="Sort by Trash Time"/>
<menuitem name="Sort by Trash Time" action="Sort by Trash Time"/> </placeholder>
</placeholder> <separator name="Layout separator"/>
<separator name="Layout separator"/> <menuitem name="Reversed Order" action="Reversed Order"/>
<menuitem name="Reversed Order" action="Reversed Order"/> </menu>
</menu> <menuitem name="Clean Up" action="Clean Up"/>
<menuitem name="Clean Up" action="Clean Up"/> <menuitem name="Keep Aligned" action="Keep Aligned"/>
<menuitem name="Keep Aligned" action="Keep Aligned"/> </placeholder>
</placeholder> </placeholder>
</placeholder> </popup>
</popup> <popup name="selection">
<popup name="selection"> <placeholder name="Icon Appearance Items"/>
<placeholder name="Icon Appearance Items"/> </popup>
</popup>
</ui> </ui>
<ui> <ui>
<menubar name="MenuBar"> <popup name="ViewMenu">
<menu action="View"> <menu action="View">
<placeholder name="View Items Placeholder"> <placeholder name="View Items Placeholder">
<menuitem name="Visible Columns" action="Visible Columns"/> <menuitem name="Visible Columns" action="Visible Columns"/>
</placeholder> </placeholder>
</menu> </menu>
</menubar> </popup>
</ui> </ui>
...@@ -7,88 +7,74 @@ ...@@ -7,88 +7,74 @@
<accelerator action="ZoomInAccel"/> <accelerator action="ZoomInAccel"/>
<accelerator action="ZoomInAccel2"/> <accelerator action="ZoomInAccel2"/>
<accelerator action="ZoomOutAccel"/> <accelerator action="ZoomOutAccel"/>
<menubar name="MenuBar"> <popup name="ViewMenu">
<menu action="File"> <placeholder name="New Items Placeholder">
<placeholder name="New Items Placeholder"> <menuitem name="New Tab" action="New Tab"/>
<menuitem name="New Tab" action="New Tab"/> <menuitem name="New Window" action="New Window"/>
<menuitem name="New Window" action="New Window"/> </placeholder>
</placeholder> <separator/>
<separator/> <placeholder name="Open Placeholder"/>
<placeholder name="Open Placeholder"/> <separator/>
<separator/> <placeholder name="Location Placeholder"/>
<placeholder name="Location Placeholder"/> <menuitem name="Connect to Server" action="Connect to Server"/>
<menuitem name="Connect to Server" action="Connect to Server"/> <separator/>
<separator/> <placeholder name="File Items Placeholder"/>
<placeholder name="File Items Placeholder"/> <separator/>
<separator/> <placeholder name="Global File Items Placeholder"/>
<placeholder name="Global File Items Placeholder"/> <separator/>
<separator/> <menu action="Edit">
<placeholder name="Extension Actions"/> <placeholder name="Undostack Actions"/>
<separator/> <separator/>
<placeholder name="Close Items Placeholder"> <placeholder name="Clipboard Actions">
<menuitem name="Close All Windows" action="Close All Windows"/> </placeholder>
</placeholder> <separator/>
<menuitem name="Close" action="Close"/> <placeholder name="Select Items"/>
</menu> <separator/>
<menu action="Edit"> <placeholder name="File Items Placeholder"/>
<placeholder name="Undostack Actions"/> <separator/>
<separator/> <placeholder name="Dangerous File Items Placeholder"/>
<placeholder name="Clipboard Actions"> <separator/>
</placeholder> <placeholder name="Edit Items Placeholder"/>
<separator/> <placeholder name="Global Edit Items Placeholder"/>
<placeholder name="Select Items"/> <separator/>
<separator/> <placeholder name="Extension Actions"/>
<placeholder name="File Items Placeholder"/> <separator/>
<separator/> <menuitem name="Preferences" action="Preferences"/>
<placeholder name="Dangerous File Items Placeholder"/> </menu>
<separator/> <menu action="View">
<placeholder name="Edit Items Placeholder"/> <menuitem name="Stop" action="Stop"/>
<placeholder name="Global Edit Items Placeholder"/> <menuitem name="Reload" action="Reload"/>
<separator/> <separator/>
<placeholder name="Extension Actions"/> <menuitem name="Show Hide Sidebar" action="Show Hide Sidebar"/>
<separator/> <separator/>
<menuitem name="Preferences" action="Preferences"/> <placeholder name="View Preferences Placeholder"/>
</menu> <separator/>
<menu action="View"> <placeholder name="View Items Placeholder"/>
<menuitem name="Stop" action="Stop"/> <separator/>
<menuitem name="Reload" action="Reload"/> <placeholder name="Zoom Items Placeholder">
<separator/> <menuitem name="Zoom In" action="Zoom In"/>
<menuitem name="Show Hide Sidebar" action="Show Hide Sidebar"/> <menuitem name="Zoom Out" action="Zoom Out"/>
<separator/> <menuitem name="Zoom Normal" action="Zoom Normal"/>
<placeholder name="View Preferences Placeholder"/> </placeholder>
<separator/> <placeholder name="View Choices">
<placeholder name="View Items Placeholder"/> <separator name="Before Short List"/>
<separator/> <placeholder name="Short List"/>
<placeholder name="Zoom Items Placeholder"> </placeholder>
<menuitem name="Zoom In" action="Zoom In"/> </menu>
<menuitem name="Zoom Out" action="Zoom Out"/> <menu action="Bookmarks">
<menuitem name="Zoom Normal" action="Zoom Normal"/> <menuitem name="Add Bookmark" action="Add Bookmark"/>
</placeholder> <menuitem name="Edit Bookmark" action="Edit Bookmarks"/>
<placeholder name="View Choices"> <menuitem name="Go to Location" action="Go to Location"/>
<separator name="Before Short List"/> <separator/>
<placeholder name="Short List"/> <placeholder name="Bookmarks Placeholder"/>
</placeholder> </menu>
</menu> <placeholder name="Extension Actions"/>
<placeholder name="Other Menus"> <separator/>
<menu action="Bookmarks"> <placeholder name="Close Items Placeholder">
<menuitem name="Add Bookmark" action="Add Bookmark"/> <menuitem name="Close All Windows" action="Close All Windows"/>
<menuitem name="Edit Bookmark" action="Edit Bookmarks"/> </placeholder>
<menuitem name="Go to Location" action="Go to Location"/> <menuitem name="Close" action="Close"/>
<separator/> </popup>
<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="background"> <popup name="background">
<placeholder name="Before Zoom Items"> <placeholder name="Before Zoom Items">
<placeholder name="New Window Items"/> <placeholder name="New Window Items"/>
......
...@@ -54,6 +54,7 @@ struct _NautilusToolbarPriv { ...@@ -54,6 +54,7 @@ struct _NautilusToolbarPriv {
enum { enum {
PROP_ACTION_GROUP = 1, PROP_ACTION_GROUP = 1,
PROP_UI_MANAGER,
PROP_SHOW_LOCATION_ENTRY, PROP_SHOW_LOCATION_ENTRY,
PROP_SHOW_SEARCH_BAR, PROP_SHOW_SEARCH_BAR,
PROP_SHOW_MAIN_BAR, PROP_SHOW_MAIN_BAR,
...@@ -88,12 +89,14 @@ static void ...@@ -88,12 +89,14 @@ static void
nautilus_toolbar_constructed (GObject *obj) nautilus_toolbar_constructed (GObject *obj)
{ {
NautilusToolbar *self = NAUTILUS_TOOLBAR (obj); NautilusToolbar *self = NAUTILUS_TOOLBAR (obj);
GtkToolItem *item;
GtkWidget *hbox, *toolbar; GtkWidget *hbox, *toolbar;
GtkStyleContext *context; GtkStyleContext *context;
GtkWidget *tool_button, *box; GtkWidget *tool_button;
GtkWidget *menu;
GtkWidget *image;
GtkWidget *box;
GtkToolItem *back_forward; GtkToolItem *back_forward;
GtkToolItem *search; GtkToolItem *tool_item;
GtkActionGroup *action_group; GtkActionGroup *action_group;
GtkAction *action; GtkAction *action;
...@@ -159,14 +162,14 @@ nautilus_toolbar_constructed (GObject *obj) ...@@ -159,14 +162,14 @@ nautilus_toolbar_constructed (GObject *obj)
self->priv->location_bar = nautilus_location_bar_new (); self->priv->location_bar = nautilus_location_bar_new ();
gtk_box_pack_start (GTK_BOX (hbox), self->priv->location_bar, TRUE, TRUE, 0); gtk_box_pack_start (GTK_BOX (hbox), self->priv->location_bar, TRUE, TRUE, 0);
item = gtk_tool_item_new (); tool_item = gtk_tool_item_new ();
gtk_tool_item_set_expand (item, TRUE); gtk_tool_item_set_expand (tool_item, TRUE);
gtk_container_add (GTK_CONTAINER (item), hbox); gtk_container_add (GTK_CONTAINER (tool_item), hbox);
gtk_container_add (GTK_CONTAINER (self->priv->toolbar), GTK_WIDGET (item)); gtk_container_add (GTK_CONTAINER (self->priv->toolbar), GTK_WIDGET (tool_item));
gtk_widget_show (GTK_WIDGET (item)); gtk_widget_show (GTK_WIDGET (tool_item));
/* search */ /* search */
search = gtk_tool_item_new (); tool_item = gtk_tool_item_new ();
tool_button = gtk_button_new (); tool_button = gtk_button_new ();
gtk_button_set_image (GTK_BUTTON (tool_button), gtk_image_new ()); gtk_button_set_image (GTK_BUTTON (tool_button), gtk_image_new ());
action = gtk_action_group_get_action (action_group, NAUTILUS_ACTION_SEARCH); action = gtk_action_group_get_action (action_group, NAUTILUS_ACTION_SEARCH);
...@@ -174,10 +177,23 @@ nautilus_toolbar_constructed (GObject *obj) ...@@ -174,10 +177,23 @@ nautilus_toolbar_constructed (GObject *obj)
action); action);
gtk_button_set_label (GTK_BUTTON (tool_button), NULL); gtk_button_set_label (GTK_BUTTON (tool_button), NULL);
gtk_widget_set_name (tool_button, "nautilus-search-button"); gtk_widget_set_name (tool_button, "nautilus-search-button");
gtk_container_add (GTK_CONTAINER (search), GTK_WIDGET (tool_button)); gtk_container_add (GTK_CONTAINER (tool_item), GTK_WIDGET (tool_button));
gtk_container_add (GTK_CONTAINER (self->priv->toolbar), GTK_WIDGET (search)); gtk_container_add (GTK_CONTAINER (self->priv->toolbar), GTK_WIDGET (tool_item));
gtk_widget_show_all (GTK_WIDGET (search)); gtk_widget_show_all (GTK_WIDGET (tool_item));
gtk_widget_set_margin_left (GTK_WIDGET (search), 12); gtk_widget_set_margin_left (GTK_WIDGET (tool_item), 12);
/* Page Menu */
tool_item = gtk_tool_item_new ();
tool_button = gtk_menu_button_new ();
menu = gtk_ui_manager_get_widget (self->priv->ui_manager, "/ViewMenu");
gtk_menu_button_set_menu (GTK_MENU_BUTTON (tool_button), menu);
image = gtk_image_new ();
gtk_image_set_from_icon_name (GTK_IMAGE (image), "emblem-system-symbolic", GTK_ICON_SIZE_MENU);