mirrors/zotero
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Fix Ctrl-Q on Linux

Browse source 
Fixes #3199
This commit is contained in:
Dan Stillman 2023-07-06 19:21:11 -04:00
parent cb5ef83f0a
commit fb3466b392
2 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
chrome/content/zotero/platformKeys.js
View file

@ -4,6 +4,7 @@ window.addEventListener('DOMContentLoaded', () => {
let isMac = AppConstants.platform == 'macosx'; let isMac = AppConstants.platform == 'macosx';
let redoKey = document.getElementById('key_redo'); let redoKey = document.getElementById('key_redo');
let macUnixQuitKey = document.getElementById('key_quitApplication');
let fileQuitSeparator = document.getElementById('menu_fileQuitSeparatorNonMac'); let fileQuitSeparator = document.getElementById('menu_fileQuitSeparatorNonMac');
let fileQuitItemWin = document.getElementById('menu_fileQuitItemWin'); let fileQuitItemWin = document.getElementById('menu_fileQuitItemWin');
@ -22,6 +23,7 @@ window.addEventListener('DOMContentLoaded', () => {
redoKey.setAttribute('data-l10n-id', 'text-action-redo-shortcut'); redoKey.setAttribute('data-l10n-id', 'text-action-redo-shortcut');
redoKey.setAttribute('modifiers', 'accel'); redoKey.setAttribute('modifiers', 'accel');
} }
if (macUnixQuitKey) macUnixQuitKey.disabled = true;
} }
else { else {
// Set behavior on all non-Windows platforms // Set behavior on all non-Windows platforms

10
chrome/content/zotero/zoteroPane.xhtml
View file

@ -104,6 +104,11 @@
<keyset id="mainKeyset"> <keyset id="mainKeyset">
<key id="key_close" key="&closeCmd.key;" command="cmd_close" modifiers="accel"/> <key id="key_close" key="&closeCmd.key;" command="cmd_close" modifiers="accel"/>
<key id="key_quitApplication"
key="&quitApplicationCmdMac.key;"
command="cmd_quitApplication"
modifiers="accel"
internal="true"/>
<key id="key_import" <key id="key_import"
key="&importCmd.key;" key="&importCmd.key;"
command="cmd_zotero_import" command="cmd_zotero_import"
@ -576,11 +581,6 @@
oncommand="ZoteroStandalone.openHelp();" oncommand="ZoteroStandalone.openHelp();"
key="&helpMac.commandkey;" key="&helpMac.commandkey;"
modifiers="accel"/> modifiers="accel"/>
<key id="key_quitApplication"
key="&quitApplicationCmdMac.key;"
command="cmd_quitApplication"
modifiers="accel"
internal="true"/>
</keyset> </keyset>
<menu id="windowMenu" <menu id="windowMenu"