bc034089a6
https://forums.zotero.org/discussion/63869/5-0-beta-standalone-blank-ui-upon-restart
https://forums.zotero.org/discussion/63865/5-0-beta-library-wont-load
Adding include.js to hiddenWindow.xul in 66549f9e6d
seems to have
created a race condition in which the Zotero service would fail on the
third startup after the JS cache was cleared (e.g., on a new version,
-purgecaches, or other changes in the profile). So, don't do that.
Hopefully this isn't caused by other uses (e.g., in plugins) of
include.js and was only happening because the hidden window is launched
concurrently with standalone.xul on macOS.
128 lines
4.6 KiB
XML
128 lines
4.6 KiB
XML
<?xml version="1.0"?>
|
|
<!--
|
|
***** BEGIN LICENSE BLOCK *****
|
|
|
|
Copyright © 2009 Center for History and New Media
|
|
George Mason University, Fairfax, Virginia, USA
|
|
http://zotero.org
|
|
|
|
The Original Code is Mozilla.org Code.
|
|
|
|
The Initial Developer of the Original Code is Netscape
|
|
Communications Corporation. Portions created by Netscape are
|
|
Copyright (C) 1998-2000 Netscape Communications Corporation. All
|
|
Rights Reserved.
|
|
|
|
This file is part of Zotero.
|
|
|
|
Zotero is free software: you can redistribute it and/or modify
|
|
it under the terms of the GNU Affero General Public License as published by
|
|
the Free Software Foundation, either version 3 of the License, or
|
|
(at your option) any later version.
|
|
|
|
Zotero is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU Affero General Public License for more details.
|
|
|
|
You should have received a copy of the GNU Affero General Public License
|
|
along with Zotero. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
***** END LICENSE BLOCK *****
|
|
-->
|
|
|
|
|
|
<!DOCTYPE overlay [
|
|
<!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd"> %brandDTD;
|
|
<!ENTITY % standaloneDTD SYSTEM "chrome://zotero/locale/standalone.dtd"> %standaloneDTD;
|
|
<!ENTITY % browserDTD SYSTEM "chrome://zotero/locale/mozilla/browser.dtd"> %browserDTD;
|
|
]>
|
|
<overlay id="menuOverlay"
|
|
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
|
|
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
|
|
|
|
<script type="application/javascript" src="chrome://global/content/macWindowMenu.js"/>
|
|
|
|
<commandset id="mainCommandSet">
|
|
<command id="minimizeWindow"
|
|
label="&minimizeWindow.label;"
|
|
oncommand="window.minimize();" />
|
|
<command id="zoomWindow"
|
|
label="&zoomWindow.label;"
|
|
oncommand="zoomWindow();" />
|
|
</commandset>
|
|
|
|
<keyset id="mainKeyset">
|
|
<key id="key_minimizeWindow"
|
|
command="minimizeWindow"
|
|
key="&minimizeWindow.key;"
|
|
modifiers="accel"/>
|
|
<key id="key_openHelpMac"
|
|
oncommand="ZoteroStandalone.openHelp();"
|
|
key="&helpMac.commandkey;"
|
|
modifiers="accel"/>
|
|
|
|
<!-- These are used to build the Application menu under Cocoa widgets -->
|
|
<key id="key_preferencesCmdMac"
|
|
key="&preferencesCmdMac.commandkey;"
|
|
modifiers="accel"/>
|
|
<key id="key_hideThisAppCmdMac"
|
|
key="&hideThisAppCmdMac.commandkey;"
|
|
modifiers="accel"/>
|
|
<key id="key_hideOtherAppsCmdMac"
|
|
key="&hideOtherAppsCmdMac.commandkey;"
|
|
modifiers="accel,alt"/>
|
|
<key id="key_quitApplication"
|
|
key="&quitApplicationCmdMac.key;"
|
|
command="cmd_quitApplication"
|
|
modifiers="accel"/>
|
|
</keyset>
|
|
|
|
<!-- nsMenuBarX hides these and uses them to build the Application menu. -->
|
|
<menupopup id="menu_FilePopup">
|
|
<menuitem id="menu_preferences"
|
|
label="&preferencesCmdMac.label;"
|
|
key="key_preferencesCmdMac"
|
|
oncommand="Components.classes['@mozilla.org/appshell/window-mediator;1'].getService(Components.interfaces.nsIWindowMediator).getMostRecentWindow('navigator:browser').Zotero.Utilities.Internal.openPreferences();"/>
|
|
<menuitem id="menu_mac_services"
|
|
label="&servicesMenuMac.label;"/>
|
|
<menuitem id="menu_mac_hide_app"
|
|
label="&hideThisAppCmdMac.label;"
|
|
key="key_hideThisAppCmdMac"/>
|
|
<menuitem id="menu_mac_hide_others"
|
|
label="&hideOtherAppsCmdMac.label;"
|
|
key="key_hideOtherAppsCmdMac"/>
|
|
<menuitem id="menu_mac_show_all"
|
|
label="&showAllAppsCmdMac.label;"/>
|
|
<menuitem id="menu_FileQuitItem"
|
|
label="&quitApplicationCmdMac.label;"
|
|
key="key_quitApplication"
|
|
command="cmd_quitApplication"/>
|
|
</menupopup>
|
|
|
|
<menu id="windowMenu"
|
|
label="&windowMenu.label;"
|
|
datasources="rdf:window-mediator" ref="NC:WindowMediatorRoot"
|
|
onpopupshowing="macWindowMenuDidShow();"
|
|
hidden="false">
|
|
<template>
|
|
<rule>
|
|
<menupopup>
|
|
<menuitem uri="rdf:*"
|
|
label="rdf:http://home.netscape.com/NC-rdf#Name"
|
|
type="radio"
|
|
name="windowList"
|
|
oncommand="ShowWindowFromResource(event.target)"/>
|
|
</menupopup>
|
|
</rule>
|
|
</template>
|
|
<menupopup id="menu_windowPopup">
|
|
<menuitem command="minimizeWindow" label="&minimizeWindow.label;" key="key_minimizeWindow"/>
|
|
<menuitem command="zoomWindow" label="&zoomWindow.label;"/>
|
|
<!-- decomment when "BringAllToFront" is implemented
|
|
<menuseparator/>
|
|
<menuitem label="&bringAllToFront.label;" disabled="true"/> -->
|
|
<menuseparator id="sep-window-list"/>
|
|
</menupopup>
|
|
</menu>
|
|
</overlay>
|