diff options
-rw-r--r-- | browser/base/content/browser-menubar.inc | 3 | ||||
-rw-r--r-- | browser/base/content/browser-sets.inc | 2 | ||||
-rw-r--r-- | browser/base/content/browser.css | 4 | ||||
-rw-r--r-- | browser/base/content/browser.xul | 65 | ||||
-rw-r--r-- | browser/themes/linux/browser.css | 20 | ||||
-rw-r--r-- | browser/themes/osx/browser.css | 3 | ||||
-rw-r--r-- | browser/themes/shared/browser.inc | 2 | ||||
-rw-r--r-- | browser/themes/windows/browser.css | 3 |
8 files changed, 92 insertions, 10 deletions
diff --git a/browser/base/content/browser-menubar.inc b/browser/base/content/browser-menubar.inc index 774511df1..975ce5693 100644 --- a/browser/base/content/browser-menubar.inc +++ b/browser/base/content/browser-menubar.inc @@ -202,7 +202,8 @@ <menupopup id="viewSidebarMenu"> <menuitem id="menu_bookmarksSidebar" key="viewBookmarksSidebarKb" - observes="viewBookmarksSidebar"/> + observes="viewBookmarksSidebar" + label="&bookmarksButton.label;"/> <menuitem id="menu_historySidebar" key="key_gotoHistory" observes="viewHistorySidebar" diff --git a/browser/base/content/browser-sets.inc b/browser/base/content/browser-sets.inc index b8a639fe6..5f9080ec7 100644 --- a/browser/base/content/browser-sets.inc +++ b/browser/base/content/browser-sets.inc @@ -122,7 +122,7 @@ </commandset> <broadcasterset id="mainBroadcasterSet"> - <broadcaster id="viewBookmarksSidebar" autoCheck="false" label="&bookmarksButton.label;" + <broadcaster id="viewBookmarksSidebar" autoCheck="false" sidebartitle="&bookmarksButton.label;" type="checkbox" group="sidebar" sidebarurl="chrome://browser/content/bookmarks/bookmarksPanel.xul" oncommand="toggleSidebar('viewBookmarksSidebar');"/> diff --git a/browser/base/content/browser.css b/browser/base/content/browser.css index a44b46195..b54f790b2 100644 --- a/browser/base/content/browser.css +++ b/browser/base/content/browser.css @@ -325,7 +325,9 @@ toolbarbutton.bookmark-item { %ifdef MENUBAR_CAN_AUTOHIDE #toolbar-menubar:not([autohide="true"]) ~ toolbar > #bookmarks-menu-button, -#toolbar-menubar:not([autohide="true"]) > #bookmarks-menu-button { +#toolbar-menubar:not([autohide="true"]) > #bookmarks-menu-button, +#toolbar-menubar:not([autohide="true"]) ~ toolbar > #history-menu-button, +#toolbar-menubar:not([autohide="true"]) > #history-menu-button { display: none; } %endif diff --git a/browser/base/content/browser.xul b/browser/base/content/browser.xul index 858060225..8aa4a5ec1 100644 --- a/browser/base/content/browser.xul +++ b/browser/base/content/browser.xul @@ -356,7 +356,7 @@ toolbarname="&navbarCmd.label;" accesskey="&navbarCmd.accesskey;" fullscreentoolbar="true" mode="icons" customizable="true" iconsize="large" - defaultset="unified-back-forward-button,reload-button,stop-button,home-button,urlbar-container,search-container,bookmarks-menu-button,downloads-button,window-controls" + defaultset="unified-back-forward-button,reload-button,stop-button,home-button,urlbar-container,search-container,bookmarks-menu-button,history-menu-button,downloads-button,window-controls" context="toolbar-context-menu"> <toolbaritem id="unified-back-forward-button" class="chromeclass-toolbar-additional" @@ -528,6 +528,8 @@ persist="class" removable="true" type="menu" + onclick="if (event.button == 1) + toggleSidebar('viewBookmarksSidebar');" label="&bookmarksMenuButton.label;" tooltiptext="&bookmarksMenuButton.tooltip;" ondragenter="PlacesMenuDNDHandler.onDragEnter(event);" @@ -605,6 +607,65 @@ </menupopup> </toolbarbutton> + <toolbarbutton id="history-menu-button" + class="toolbarbutton-1 chromeclass-toolbar-additional" + type="menu" + label="&historyButton.label;" + onclick="if (event.button == 1) + toggleSidebar('viewHistorySidebar');" + tooltiptext="&historyButton.tooltip;"> + <menupopup id="HMB_historyPopup" + placespopup="true" + context="placesContext" + oncommand="this.parentNode._placesView._onCommand(event);" + onclick="checkForMiddleClick(this, event);" + onpopupshowing="if (!this.parentNode._placesView) + new HistoryMenu(event);" + tooltip="bhTooltip" + popupsinherittooltip="true"> + <menuitem id="HMB_showAllHistory" + label="&showAllHistoryCmd2.label;" +#ifndef XP_MACOSX + key="showAllHistoryKb" +#endif + command="Browser:ShowAllHistory"/> + <menuitem id="HMB_sanitizeItem" + label="&clearRecentHistory.label;" + key="key_sanitize" + command="Tools:Sanitize"/> + <menuseparator id="HMB_sanitizeSeparator"/> +#ifdef MOZ_SERVICES_SYNC + <menuitem id="HMB_sync-tabs-menuitem" + class="syncTabsMenuItem" + label="&syncTabsMenu2.label;" + oncommand="BrowserOpenSyncTabs();" + disabled="true"/> +#endif + <menuitem id="HMB_historyRestoreLastSession" + label="&historyRestoreLastSession.label;" + command="Browser:RestoreLastSession"/> + <menu id="HMB_historyUndoMenu" + class="recentlyClosedTabsMenu" + label="&historyUndoMenu.label;" + disabled="true"> + <menupopup id="HMB_historyUndoPopup" + placespopup="true" + onpopupshowing="document.getElementById('history-menu-button')._placesView.populateUndoSubmenu();"/> + </menu> + <menu id="HMB_historyUndoWindowMenu" + class="recentlyClosedWindowsMenu" + label="&historyUndoWindowMenu.label;" + disabled="true"> + <menupopup id="HMB_historyUndoWindowPopup" + placespopup="true" + onpopupshowing="document.getElementById('history-menu-button')._placesView.populateUndoWindowSubmenu();"/> + </menu> + <menuseparator id="HMB_startHistorySeparator" + class="hide-if-empty-places-result"/> + <!-- History menu items --> + </menupopup> + </toolbarbutton> + <hbox id="window-controls" hidden="true" pack="end"> <toolbarbutton id="minimize-button" tooltiptext="&fullScreenMinimize.tooltip;" @@ -769,7 +830,7 @@ tooltiptext="&historyButton.tooltip;"/> <toolbarbutton id="bookmarks-button" class="toolbarbutton-1 chromeclass-toolbar-additional" - observes="viewBookmarksSidebar" + observes="viewBookmarksSidebar" label="&bookmarksButton.label;" tooltiptext="&bookmarksButton.tooltip;" ondrop="bookmarksButtonObserver.onDrop(event)" ondragover="bookmarksButtonObserver.onDragOver(event)" diff --git a/browser/themes/linux/browser.css b/browser/themes/linux/browser.css index 74f942442..6e400bb7b 100644 --- a/browser/themes/linux/browser.css +++ b/browser/themes/linux/browser.css @@ -634,10 +634,15 @@ toolbar[mode="full"] .toolbarbutton-1 > .toolbarbutton-menubutton-button { -moz-image-region: rect(0px 24px 24px 0px); } -#history-button { +#history-button, +#history-menu-button { -moz-image-region: rect(0px 48px 24px 24px); } +#history-menu-button.toolbarbutton-1 { + -moz-box-orient: horizontal; +} + #bookmarks-button, #bookmarks-menu-button { -moz-image-region: rect(0px 72px 24px 48px); @@ -800,7 +805,8 @@ toolbar[iconsize="small"] #downloads-button { } toolbar[iconsize="small"] #webrtc-status-button /* temporary placeholder (bug 824825) */, -toolbar[iconsize="small"] #history-button { +toolbar[iconsize="small"] #history-button, +toolbar[iconsize=small] > #history-menu-button { -moz-image-region: rect(0px 32px 16px 16px); } @@ -1538,6 +1544,16 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action- opacity: .4; } +/* history menu-button */ + +#history-menu-button[disabled] > .toolbarbutton-icon, +#history-menu-button[disabled] > .toolbarbutton-menu-dropmarker, +#history-menu-button[disabled] > .toolbarbutton-menubutton-dropmarker, +#history-menu-button[disabled] > .toolbarbutton-menubutton-button > .toolbarbutton-icon, +#history-menu-button > .toolbarbutton-menubutton-button[disabled] > .toolbarbutton-icon { + opacity: .4; +} + /* Bookmarking panel */ #editBookmarkPanelStarIcon { list-style-image: url("chrome://browser/skin/places/starred48.png"); diff --git a/browser/themes/osx/browser.css b/browser/themes/osx/browser.css index 01b60260e..5f80e35cb 100644 --- a/browser/themes/osx/browser.css +++ b/browser/themes/osx/browser.css @@ -601,7 +601,8 @@ toolbar[mode=full] .toolbarbutton-1 > .toolbarbutton-menubutton-button { -moz-image-region: rect(0, 108px, 18px, 90px); } -#history-button { +#history-button, +#history-menu-button { -moz-image-region: rect(0, 126px, 18px, 108px); } diff --git a/browser/themes/shared/browser.inc b/browser/themes/shared/browser.inc index 4bb24e9f9..cd17903ce 100644 --- a/browser/themes/shared/browser.inc +++ b/browser/themes/shared/browser.inc @@ -1,3 +1,3 @@ %filter substitution -%define primaryToolbarButtons #back-button, #forward-button, #reload-button, #stop-button, #home-button, #print-button, #downloads-button, #downloads-indicator, #history-button, #bookmarks-button, #bookmarks-menu-button, #new-tab-button, #new-window-button, #cut-button, #copy-button, #paste-button, #fullscreen-button, #zoom-out-button, #zoom-in-button, #sync-button, #feed-button, #alltabs-button, #webrtc-status-button +%define primaryToolbarButtons #back-button, #forward-button, #reload-button, #stop-button, #home-button, #print-button, #downloads-button, #downloads-indicator, #history-button, #history-menu-button, #bookmarks-button, #bookmarks-menu-button, #new-tab-button, #new-window-button, #cut-button, #copy-button, #paste-button, #fullscreen-button, #zoom-out-button, #zoom-in-button, #sync-button, #feed-button, #alltabs-button, #webrtc-status-button diff --git a/browser/themes/windows/browser.css b/browser/themes/windows/browser.css index 9e3bbed5a..82d8ceb9b 100644 --- a/browser/themes/windows/browser.css +++ b/browser/themes/windows/browser.css @@ -1123,7 +1123,8 @@ toolbar[mode=full] .toolbarbutton-1 > .toolbarbutton-menubutton-button { -moz-image-region: rect(0, 108px, 18px, 90px); } -#history-button { +#history-button, +#history-menu-button { -moz-image-region: rect(0, 126px, 18px, 108px); } |