Tweaks for application menu on OS X
- Restore About Zotero item - Fix Quit item - Close Standalone when Standalone window is closed (we did this before, but apparently having our own hidden window breaks that mechanism)
This commit is contained in:
parent
b69e6fc3ab
commit
3420b4874a
|
@ -1 +1 @@
|
|||
Subproject commit 17bc27f4a1835b9f23e5daea98fb61ee2af94072
|
||||
Subproject commit d2b612f8a6f764cbd66e67238636fac3888a7736
|
|
@ -36,11 +36,11 @@
|
|||
<!ENTITY % zoteroDTD SYSTEM "chrome://zotero/locale/zotero.dtd"> %zoteroDTD;
|
||||
]>
|
||||
|
||||
<window id="main-window" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
|
||||
<window id="main-window" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
|
||||
<script type="application/javascript" src="chrome://global/content/globalOverlay.js"/>
|
||||
<commandset id="mainCommandSet">
|
||||
<!--FILE-->
|
||||
<command id="cmd_quitApplication" oncommand="goQuitApplication();"/>
|
||||
<command id="cmd_close" oncommand="window.close();"/>
|
||||
</commandset>
|
||||
|
||||
<keyset id="mainKeyset">
|
||||
|
@ -49,7 +49,12 @@
|
|||
|
||||
<menubar id="main-menubar">
|
||||
<menu id="fileMenu" label="&fileMenu.label;" accesskey="&fileMenu.accesskey;">
|
||||
<menupopup id="menu_FilePopup"/>
|
||||
<menupopup id="menu_FilePopup">
|
||||
<menuitem id="aboutName"
|
||||
accesskey="&aboutProduct.accesskey;"
|
||||
label="&aboutProduct.label;"
|
||||
oncommand="Components.classes['@mozilla.org/appshell/window-mediator;1'].getService(Components.interfaces.nsIWindowMediator).getMostRecentWindow('navigator:browser').ZoteroPane.openAboutDialog();"/>
|
||||
</menupopup>
|
||||
</menu>
|
||||
</menubar>
|
||||
</window>
|
||||
|
|
|
@ -144,7 +144,7 @@ const ZoteroStandalone = new function() {
|
|||
* Called before standalone window is closed
|
||||
*/
|
||||
this.onUnload = function() {
|
||||
ZoteroPane.destroy();
|
||||
goQuitApplication();
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue
Block a user