Bug 1368734 - Part 2 - Add a Quit button to the Photon app menu on Windows and Linux. r?Gijs
MozReview-Commit-ID: L9GoCWcJrfL
--- a/browser/components/customizableui/content/panelUI.inc.xul
+++ b/browser/components/customizableui/content/panelUI.inc.xul
@@ -638,16 +638,29 @@
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)"/>
+#ifndef XP_MACOSX
+ <toolbarseparator/>
+ <toolbarbutton id="appMenu-quit-button"
+ class="subviewbutton subviewbutton-iconic"
+#ifdef XP_WIN
+ label="&quitApplicationCmdWin2.label;"
+ tooltiptext="&quitApplicationCmdWin2.tooltip;"
+#else
+ label="&quitApplicationCmd.label;"
+#endif
+ key="key_quitApplication"
+ command="cmd_quitApplication"/>
+#endif
</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"
new file mode 100644
--- /dev/null
+++ b/browser/themes/shared/icons/quit.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 6a1 1 0 0 0 1-1V1a1 1 0 0 0-2 0v4a1 1 0 0 0 1 1zm3.5-4.032a1 1 0 0 0-1 1.732A4.946 4.946 0 0 1 13 8 5 5 0 0 1 3 8a4.946 4.946 0 0 1 2.5-4.3 1 1 0 0 0-1-1.732 7 7 0 1 0 7.006 0z"/>
+</svg>
--- a/browser/themes/shared/jar.inc.mn
+++ b/browser/themes/shared/jar.inc.mn
@@ -131,16 +131,17 @@
skin/classic/browser/mail.svg (../shared/icons/mail.svg)
skin/classic/browser/menu.svg (../shared/icons/menu.svg)
skin/classic/browser/new-tab.svg (../shared/icons/new-tab.svg)
skin/classic/browser/new-window.svg (../shared/icons/new-window.svg)
skin/classic/browser/open.svg (../shared/icons/open.svg)
skin/classic/browser/page-action.svg (../shared/icons/page-action.svg)
skin/classic/browser/print.svg (../shared/icons/print.svg)
skin/classic/browser/privateBrowsing.svg (../shared/icons/privateBrowsing.svg)
+ skin/classic/browser/quit.svg (../shared/icons/quit.svg)
skin/classic/browser/reload.svg (../shared/icons/reload.svg)
skin/classic/browser/save.svg (../shared/icons/save.svg)
skin/classic/browser/settings.svg (../shared/icons/settings.svg)
skin/classic/browser/share.svg (../shared/icons/share.svg)
skin/classic/browser/sidebars.svg (../shared/icons/sidebars.svg)
skin/classic/browser/stop.svg (../shared/icons/stop.svg)
skin/classic/browser/sync.svg (../shared/icons/sync.svg)
skin/classic/browser/webIDE.svg (../shared/icons/webIDE.svg)
--- a/browser/themes/shared/menupanel.inc.css
+++ b/browser/themes/shared/menupanel.inc.css
@@ -215,20 +215,21 @@ toolbarpaletteitem[place="palette"] > #z
}
#appMenu-help-button {
list-style-image: url(chrome://browser/skin/help.svg);
}
#appMenu-cut-button {
list-style-image: url(chrome://browser/skin/edit-cut.svg);
- -moz-context-properties: fill;
}
#appMenu-copy-button {
list-style-image: url(chrome://browser/skin/edit-copy.svg);
- -moz-context-properties: fill;
}
#appMenu-paste-button {
list-style-image: url(chrome://browser/skin/edit-paste.svg);
- -moz-context-properties: fill;
}
+
+#appMenu-quit-button {
+ list-style-image: url(chrome://browser/skin/quit.svg);
+}