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

fx-compat: Basic viewer: Fix menus

Browse source 
- Add strings and items to previously empty and untitled Edit and Window menus
- Add basic context menu to the browser
This commit is contained in:
Abe Jellinek 2023-04-10 16:47:08 -04:00
parent 72ec5c64d9
commit e747c089fc
1 changed files with 95 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

143
chrome/content/zotero/standalone/basicViewer.xhtml
View file

@ -33,7 +33,7 @@
<!DOCTYPE window [ <!DOCTYPE window [
<!ENTITY % globalDTD SYSTEM "chrome://global/locale/global.dtd"> %globalDTD; <!ENTITY % globalDTD SYSTEM "chrome://global/locale/global.dtd"> %globalDTD;
<!--<!ENTITY % textcontextDTD SYSTEM "chrome://global/locale/textcontext.dtd" > %textcontextDTD;--> <!ENTITY % editMenuOverlayDTD SYSTEM "chrome://zotero/locale/mozilla/editMenuOverlay.dtd" > %editMenuOverlayDTD;
<!ENTITY % standaloneDTD SYSTEM "chrome://zotero/locale/standalone.dtd" > %standaloneDTD; <!ENTITY % standaloneDTD SYSTEM "chrome://zotero/locale/standalone.dtd" > %standaloneDTD;
<!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd" > %brandDTD; <!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd" > %brandDTD;
<!ENTITY % zoteroDTD SYSTEM "chrome://zotero/locale/zotero.dtd"> %zoteroDTD; <!ENTITY % zoteroDTD SYSTEM "chrome://zotero/locale/zotero.dtd"> %zoteroDTD;
@ -41,20 +41,25 @@
<window id="main-window" <window id="main-window"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
xmlns:html="http://www.w3.org/1999/xhtml"
onload="window.sizeToContent()" onload="window.sizeToContent()"
windowtype="zotero:basicViewer" windowtype="zotero:basicViewer"
title="&brandShortName;" title="&brandShortName;"
width="1000" height="700" width="1000" height="700"
persist="screenX screenY width height sizemode"> persist="screenX screenY width height sizemode">
<html:link rel="localization" href="mozilla/menubar.ftl"/>
<html:link rel="localization" href="mozilla/textActions.ftl"/>
<script> <script>
var { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); var { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
Services.scriptloader.loadSubScript("chrome://zotero/content/platformKeys.js", this);
Services.scriptloader.loadSubScript("chrome://zotero/content/editMenuOverlay.js", this);
Services.scriptloader.loadSubScript("chrome://zotero/content/include.js", this); Services.scriptloader.loadSubScript("chrome://zotero/content/include.js", this);
// Mozilla scripts // Mozilla scripts
Services.scriptloader.loadSubScript("chrome://global/content/globalOverlay.js", this); Services.scriptloader.loadSubScript("chrome://global/content/globalOverlay.js", this);
Services.scriptloader.loadSubScript("chrome://global/content/editMenuOverlay.js", this);
Services.scriptloader.loadSubScript("chrome://global/content/contentAreaUtils.js", this); Services.scriptloader.loadSubScript("chrome://global/content/contentAreaUtils.js", this);
Services.scriptloader.loadSubScript("chrome://global/content/printUtils.js", this); Services.scriptloader.loadSubScript("chrome://global/content/printUtils.js", this);
if (Zotero.isMac) { if (Zotero.isMac) {
@ -65,8 +70,6 @@
} else { } else {
Services.scriptloader.loadSubScript("chrome://zotero/content/standalone/basicViewer.js", this); Services.scriptloader.loadSubScript("chrome://zotero/content/standalone/basicViewer.js", this);
} }
</script> </script>
<commandset id="mainCommandSet"> <commandset id="mainCommandSet">
@ -87,36 +90,37 @@
<key id="key_print" key="&printCmd.key;" command="cmd_print" modifiers="accel"/> <key id="key_print" key="&printCmd.key;" command="cmd_print" modifiers="accel"/>
<key id="key_save" key="&saveCmd.key;" command="cmd_save" modifiers="accel"/> <key id="key_save" key="&saveCmd.key;" command="cmd_save" modifiers="accel"/>
</keyset> </keyset>
<keyset id="editMenuKeys"/>
<!--<popup id="contentAreaContextMenu"> <keyset id="editMenuKeys">
<menuitem id="context-undo" <key id="key_undo" data-l10n-id="text-action-undo-shortcut" modifiers="accel" command="cmd_undo"/>
label="&undoCmd.label;" <!-- l10n and modifiers set in platformKeys.js -->
accesskey="&undoCmd.accesskey;" <key id="key_redo" command="cmd_redo"/>
command="cmd_undo"/> <key id="key_cut" data-l10n-id="text-action-cut-shortcut" modifiers="accel" command="cmd_cut"/>
<menuseparator id="context-sep-undo"/> <key id="key_copy" data-l10n-id="text-action-copy-shortcut" modifiers="accel" command="cmd_copy"/>
<menuitem id="context-cut" <key id="key_paste" data-l10n-id="text-action-paste-shortcut" modifiers="accel" command="cmd_paste"/>
label="&cutCmd.label;" <key id="key_delete" keycode="VK_DELETE" command="cmd_delete"/>
accesskey="&cutCmd.accesskey;" <key id="key_selectAll" data-l10n-id="text-action-select-all-shortcut" modifiers="accel" command="cmd_selectAll"/>
command="cmd_cut"/> <key id="key_switchTextDirection" data-l10n-id="bidi-switch-direction-shortcut" command="cmd_switchTextDirection" modifiers="accel,shift" />
<menuitem id="context-copy" <key id="key_find" key="&findCmd.key;" modifiers="accel" command="cmd_find"/>
label="&copyCmd.label;" <key id="key_findAgain" key="&findAgainCmd.key;" modifiers="accel" command="cmd_findAgain"/>
accesskey="&copyCmd.accesskey;" <key id="key_findPrevious" key="&findAgainCmd.key;" modifiers="shift,accel" command="cmd_findPrevious"/>
command="cmd_copy"/> <key id="key_findAgain2" keycode="&findAgainCmd.key2;" command="cmd_findAgain"/>
<menuitem id="context-paste" <key id="key_findPrevious2" keycode="&findAgainCmd.key2;" modifiers="shift" command="cmd_findPrevious"/>
label="&pasteCmd.label;" </keyset>
accesskey="&pasteCmd.accesskey;"
command="cmd_paste"/> <popupset id="contentAreaContextSet">
<menuitem id="context-delete" <menupopup id="contentAreaContextMenu"
label="&deleteCmd.label;" onpopupshowing="goUpdateCommand('cmd_copy')">
accesskey="&deleteCmd.accesskey;" <menuitem id="context-copy"
command="cmd_delete"/> data-l10n-id="text-action-copy"
<menuseparator id="context-sep-paste"/> command="cmd_copy"
<menuitem id="context-selectall" disabled="true"/>
label="&selectAllCmd.label;" <menuitem id="context-selectall"
accesskey="&selectAllCmd.accesskey;" data-l10n-id="text-action-select-all"
command="cmd_selectAll"/> command="cmd_selectAll"/>
</popup>--> </menupopup>
</popupset>
<toolbox id="navigator-toolbox" class="toolbox-top" mode="icons" defaultmode="icons"> <toolbox id="navigator-toolbox" class="toolbox-top" mode="icons" defaultmode="icons">
<!-- Menu --> <!-- Menu -->
<toolbar type="menubar" id="toolbar-menubar" class="chromeclass-menubar" customizable="true" <toolbar type="menubar" id="toolbar-menubar" class="chromeclass-menubar" customizable="true"
@ -140,30 +144,72 @@
</menupopup> </menupopup>
</menu> </menu>
<menu id="menu_edit"> <menu id="edit-menu" data-l10n-id="menu-edit">
<menupopup id="menu_EditPopup"> <menupopup id="menu_EditPopup">
<menuitem id="menu_undo"/> <menuitem id="menu_undo"
<menuitem id="menu_redo"/> key="key_undo"
command="cmd_undo" data-l10n-id="text-action-undo"/>
<menuitem id="menu_redo"
key="key_redo"
command="cmd_redo" data-l10n-id="text-action-redo"/>
<menuseparator/> <menuseparator/>
<menuitem id="menu_cut"/> <menuitem id="menu_cut"
<menuitem id="menu_copy"/> key="key_cut"
<menuitem id="menu_paste"/> command="cmd_cut" data-l10n-id="text-action-cut"/>
<menuitem id="menu_delete"/> <menuitem id="menu_copy"
key="key_copy"
command="cmd_copy" data-l10n-id="text-action-copy"/>
<menuitem id="menu_paste"
key="key_paste"
command="cmd_paste" data-l10n-id="text-action-paste"/>
<menuitem id="menu_delete"
key="key_delete"
command="cmd_delete" data-l10n-id="text-action-delete"/>
<menuseparator/> <menuseparator/>
<menuitem id="menu_selectAll"/> <menuitem id="menu_selectAll"
<menuseparator/> key="key_selectAll"
<menuitem id="menu_find"/> command="cmd_selectAll" data-l10n-id="text-action-select-all"/>
<menuseparator hidden="true" id="textfieldDirection-separator"/> <menuseparator hidden="true" id="textfieldDirection-separator"/>
<menuitem id="textfieldDirection-swap" <menuitem id="textfieldDirection-swap"
command="cmd_switchTextDirection" command="cmd_switchTextDirection"
key="key_switchTextDirection" key="key_switchTextDirection"
label="&bidiSwitchTextDirectionItem.label;" hidden="true" data-l10n-id="menu-edit-bidi-switch-text-direction"/>
accesskey="&bidiSwitchTextDirectionItem.accesskey;"
hidden="true"/>
</menupopup> </menupopup>
</menu> </menu>
<menu id="windowMenu" /> <keyset id="macKeyset"> <!-- was mainKeySet -->
<key id="key_minimizeWindow"
command="minimizeWindow"
key="&minimizeWindow.key;"
modifiers="accel"/>
</keyset>
<menu id="windowMenu"
label="&windowMenu.label;"
datasources="rdf:window-mediator" ref="NC:WindowMediatorRoot"
onpopupshowing="macWindowMenuDidShow();"
onpopuphidden="macWindowMenuDidHide();"
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="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>
</menubar> </menubar>
</toolbaritem> </toolbaritem>
</toolbar> </toolbar>
@ -176,7 +222,8 @@
flex="1" flex="1"
remote="false" remote="false"
disableglobalhistory="true" disableglobalhistory="true"
maychangeremoteness="true"/> maychangeremoteness="true"
context="contentAreaContextMenu"/>
</vbox> </vbox>
</hbox> </hbox>
</window> </window>