Bug 1354119 - Add a Find in Page and Help subview button and panel to the photon app menu. r?Gijs
MozReview-Commit-ID: EU1QiAkGkZo
--- a/browser/components/customizableui/content/panelUI.inc.xul
+++ b/browser/components/customizableui/content/panelUI.inc.xul
@@ -571,26 +571,36 @@
oncommand="openPreferences()"
/>
<toolbarbutton id="appMenu-customize-button"
class="subviewbutton subviewbutton-iconic"
label="&viewCustomizeToolbar.label;"
command="cmd_CustomizeToolbars"
/>
<toolbarseparator/>
+ <toolbarbutton id="appMenu-find-button"
+ class="subviewbutton subviewbutton-iconic"
+ label="&findOnCmd.label;"
+ key="key_find"
+ command="cmd_find"/>
<toolbarbutton id="appMenu-more-button"
class="subviewbutton subviewbutton-nav"
label="&moreMenu.label;"
closemenu="none"
oncommand="PanelUI.showSubView('appMenu-moreView', this)"/>
<toolbarbutton id="appMenu-developer-button"
class="subviewbutton subviewbutton-nav"
label="&webDeveloperMenu.label;"
closemenu="none"
oncommand="PanelUI.showSubView('PanelUI-developer', this, null, true)"/>
+ <toolbarbutton id="appMenu-help-button"
+ class="subviewbutton subviewbutton-iconic subviewbutton-nav"
+ label="&appMenuHelp.label;"
+ closemenu="none"
+ oncommand="PanelUI.showSubView('PanelUI-helpView', this, null, true)"/>
</vbox>
</panelview>
<panelview id="appMenu-moreView" title="&moreMenu.label;" class="PanelUI-subView">
<vbox class="panel-subview-body">
<toolbarbutton id="appMenu-characterencoding-button"
class="subviewbutton subviewbutton-nav"
label="&charsetMenu2.label;"
closemenu="none"
--- a/browser/locales/en-US/chrome/browser/browser.dtd
+++ b/browser/locales/en-US/chrome/browser/browser.dtd
@@ -346,16 +346,17 @@ These should match what Safari and other
<!ENTITY appMenuCustomize.tooltip "Customize the Menu and Toolbars">
<!ENTITY appMenuCustomizeExit.label "Exit Customize">
<!ENTITY appMenuCustomizeExit.tooltip "Finish Customizing">
<!ENTITY appMenuHistory.label "History">
<!ENTITY appMenuHistory.showAll.label "Show All History">
<!ENTITY appMenuHistory.clearRecent.label "Clear Recent History…">
<!ENTITY appMenuHistory.restoreSession.label "Restore Previous Session">
<!ENTITY appMenuHistory.viewSidebar.label "View History Sidebar">
+<!ENTITY appMenuHelp.label "Help">
<!ENTITY appMenuHelp.tooltip "Open Help Menu">
<!ENTITY appMenuRemoteTabs.label "Synced Tabs">
<!-- LOCALIZATION NOTE (appMenuRemoteTabs.notabs.label): This is shown beneath
the name of a device when that device has no open tabs -->
<!ENTITY appMenuRemoteTabs.notabs.label "No open tabs">
<!-- LOCALIZATION NOTE (appMenuRemoteTabs.showMore.label, appMenuRemoteTabs.showMore.tooltip):
This is shown after the tabs list if we can display more tabs by clicking on the button -->
--- a/browser/themes/shared/jar.inc.mn
+++ b/browser/themes/shared/jar.inc.mn
@@ -197,13 +197,15 @@
skin/classic/browser/page-action.svg (../shared/icons/page-action.svg)
skin/classic/browser/copy-url.svg (../shared/icons/copy-url.svg)
skin/classic/browser/email-link.svg (../shared/icons/email-link.svg)
skin/classic/browser/menu-icons/back.svg (../shared/menu-icons/back.svg)
skin/classic/browser/menu-icons/back-small.svg (../shared/menu-icons/back-small.svg)
skin/classic/browser/menu-icons/addons.svg (../shared/menu-icons/addons.svg)
skin/classic/browser/menu-icons/check.svg (../shared/menu-icons/check.svg)
skin/classic/browser/menu-icons/customize.svg (../shared/menu-icons/customize.svg)
+ skin/classic/browser/menu-icons/find.svg (../shared/menu-icons/find.svg)
+ skin/classic/browser/menu-icons/help.svg (../shared/menu-icons/help.svg)
skin/classic/browser/menu-icons/library.svg (../shared/menu-icons/library.svg)
skin/classic/browser/menu-icons/new-window.svg (../shared/menu-icons/new-window.svg)
skin/classic/browser/menu-icons/print.svg (../shared/menu-icons/print.svg)
skin/classic/browser/menu-icons/private-window.svg (../shared/menu-icons/private-window.svg)
skin/classic/browser/menu-icons/settings.svg (../shared/menu-icons/settings.svg)
new file mode 100644
--- /dev/null
+++ b/browser/themes/shared/menu-icons/find.svg
@@ -0,0 +1,6 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+ <path fill="context-fill" d="M15.707 14.293l-4.822-4.822a6.019 6.019 0 1 0-1.414 1.414l4.822 4.822a1 1 0 0 0 1.414-1.414zM6 10a4 4 0 1 1 4-4 4 4 0 0 1-4 4z"/>
+</svg>
new file mode 100644
--- /dev/null
+++ b/browser/themes/shared/menu-icons/help.svg
@@ -0,0 +1,6 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+ <path fill="context-fill" d="M8 1a7 7 0 1 0 7 7 7.008 7.008 0 0 0-7-7zm0 13a6 6 0 1 1 6-6 6.007 6.007 0 0 1-6 6zM8 3.125A2.7 2.7 0 0 0 5.125 6a.875.875 0 0 0 1.75 0c0-1 .6-1.125 1.125-1.125a1.105 1.105 0 0 1 1.13.744.894.894 0 0 1-.53 1.016A2.738 2.738 0 0 0 7.125 9v.337a.875.875 0 0 0 1.75 0v-.37a1.041 1.041 0 0 1 .609-.824A2.637 2.637 0 0 0 10.82 5.16 2.838 2.838 0 0 0 8 3.125zm0 7.625A1.25 1.25 0 1 0 9.25 12 1.25 1.25 0 0 0 8 10.75z"/>
+</svg>
--- a/browser/themes/shared/menupanel.inc.css
+++ b/browser/themes/shared/menupanel.inc.css
@@ -211,8 +211,18 @@ toolbarpaletteitem[place="palette"] > #z
list-style-image: url(chrome://browser/skin/menu-icons/settings.svg);
-moz-context-properties: fill;
}
#appMenu-customize-button {
list-style-image: url(chrome://browser/skin/menu-icons/customize.svg);
-moz-context-properties: fill;
}
+
+#appMenu-find-button {
+ list-style-image: url(chrome://browser/skin/menu-icons/find.svg);
+ -moz-context-properties: fill;
+}
+
+#appMenu-help-button {
+ list-style-image: url(chrome://browser/skin/menu-icons/help.svg);
+ -moz-context-properties: fill;
+}