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

fx-compat: Copy over fx115 Window menu changes (#3899)

Browse source
This commit is contained in:
Abe Jellinek 2024-03-30 00:56:55 -04:00 • committed by Dan Stillman
parent 1b646fb6e2
commit 4e912b84c0
6 changed files with 56 additions and 100 deletions
Download patch file Download diff file Expand all files Collapse all files

32
chrome/content/scaffold/scaffold.xhtml
View file

@ -48,6 +48,7 @@
<linkset> <linkset>
<html:link rel="localization" href="browser/menubar.ftl"/> <html:link rel="localization" href="browser/menubar.ftl"/>
<html:link rel="localization" href="browser/browserSets.ftl"/>
<html:link rel="localization" href="toolkit/global/textActions.ftl"/> <html:link rel="localization" href="toolkit/global/textActions.ftl"/>
<html:link rel="localization" href="zotero.ftl" /> <html:link rel="localization" href="zotero.ftl" />
</linkset> </linkset>
@ -267,18 +268,19 @@
<commandset id="macCommandSet"> <!-- was mainCommandSet --> <commandset id="macCommandSet"> <!-- was mainCommandSet -->
<command id="minimizeWindow" <command id="minimizeWindow"
label="&minimizeWindow.label;" data-l10n-id="window-minimize-command"
oncommand="window.minimize();" /> oncommand="window.minimize();" />
<command id="zoomWindow" <command id="zoomWindow"
label="&zoomWindow.label;" data-l10n-id="window-zoom-command"
oncommand="zoomWindow();" /> oncommand="zoomWindow();" />
</commandset> </commandset>
<keyset id="macKeyset"> <!-- was mainKeySet --> <keyset id="macKeyset"> <!-- was mainKeySet -->
<key id="key_minimizeWindow" <key id="key_minimizeWindow"
command="minimizeWindow" command="minimizeWindow"
key="&minimizeWindow.key;" data-l10n-id="window-minimize-shortcut"
modifiers="accel"/> modifiers="accel"
internal="true"/>
<key id="key_quitApplication" <key id="key_quitApplication"
key="&quitApplicationCmdMac.key;" key="&quitApplicationCmdMac.key;"
command="cmd_quitApplication" command="cmd_quitApplication"
@ -309,25 +311,11 @@
</menupopup> </menupopup>
<menu id="windowMenu" <menu id="windowMenu"
label="&windowMenu.label;" data-l10n-id="menu-window-menu">
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"> <menupopup id="windowPopup">
<menuitem command="minimizeWindow" label="&minimizeWindow.label;" key="key_minimizeWindow"/> <menuseparator/>
<menuitem command="zoomWindow" label="&zoomWindow.label;"/> <menuitem command="minimizeWindow" key="key_minimizeWindow"/>
<menuitem command="zoomWindow"/>
<!-- decomment when "BringAllToFront" is implemented <!-- decomment when "BringAllToFront" is implemented
<menuseparator/> <menuseparator/>
<menuitem label="&bringAllToFront.label;" disabled="true"/> --> <menuitem label="&bringAllToFront.label;" disabled="true"/> -->

32
chrome/content/zotero/reader.xhtml
View file

@ -24,6 +24,7 @@
> >
<linkset> <linkset>
<html:link rel="localization" href="browser/menubar.ftl"/> <html:link rel="localization" href="browser/menubar.ftl"/>
<html:link rel="localization" href="browser/browserSets.ftl"/>
<html:link rel="localization" href="toolkit/global/textActions.ftl"/> <html:link rel="localization" href="toolkit/global/textActions.ftl"/>
<html:link rel="localization" href="zotero.ftl" /> <html:link rel="localization" href="zotero.ftl" />
</linkset> </linkset>
@ -57,10 +58,10 @@
<!--WINDOW--> <!--WINDOW-->
<command id="minimizeWindow" <command id="minimizeWindow"
label="&minimizeWindow.label;" data-l10n-id="window-minimize-command"
oncommand="window.minimize();" /> oncommand="window.minimize();" />
<command id="zoomWindow" <command id="zoomWindow"
label="&zoomWindow.label;" data-l10n-id="window-zoom-command"
oncommand="zoomWindow();" /> oncommand="zoomWindow();" />
</commandset> </commandset>
@ -69,8 +70,9 @@
<key id="key_forward"/> <key id="key_forward"/>
<key id="key_minimizeWindow" <key id="key_minimizeWindow"
command="minimizeWindow" command="minimizeWindow"
key="&minimizeWindow.key;" data-l10n-id="window-minimize-shortcut"
modifiers="accel"/> modifiers="accel"
internal="true"/>
<key id="key_close" key="&closeCmd.key;" command="cmd_close" modifiers="accel"/> <key id="key_close" key="&closeCmd.key;" command="cmd_close" modifiers="accel"/>
</keyset> </keyset>
@ -319,25 +321,11 @@
</menupopup> </menupopup>
</menu> </menu>
<menu id="windowMenu" <menu id="windowMenu"
label="&windowMenu.label;" data-l10n-id="menu-window-menu">
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"> <menupopup id="windowPopup">
<menuitem command="minimizeWindow" label="&minimizeWindow.label;" key="key_minimizeWindow"/> <menuseparator/>
<menuitem command="zoomWindow" label="&zoomWindow.label;"/> <menuitem command="minimizeWindow" key="key_minimizeWindow"/>
<menuitem command="zoomWindow"/>
<!-- decomment when "BringAllToFront" is implemented <!-- decomment when "BringAllToFront" is implemented
<menuseparator/> <menuseparator/>
<menuitem label="&bringAllToFront.label;" disabled="true"/> --> <menuitem label="&bringAllToFront.label;" disabled="true"/> -->

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

@ -49,6 +49,7 @@
<linkset> <linkset>
<html:link rel="localization" href="browser/menubar.ftl"/> <html:link rel="localization" href="browser/menubar.ftl"/>
<html:link rel="localization" href="browser/browserSets.ftl"/>
<html:link rel="localization" href="toolkit/global/textActions.ftl"/> <html:link rel="localization" href="toolkit/global/textActions.ftl"/>
</linkset> </linkset>
@ -178,33 +179,29 @@
</menupopup> </menupopup>
</menu> </menu>
<commandset id="macCommandSet"> <!-- was mainCommandSet -->
<command id="minimizeWindow"
data-l10n-id="window-minimize-command"
oncommand="window.minimize();" />
<command id="zoomWindow"
data-l10n-id="window-zoom-command"
oncommand="zoomWindow();" />
</commandset>
<keyset id="macKeyset"> <!-- was mainKeySet --> <keyset id="macKeyset"> <!-- was mainKeySet -->
<key id="key_minimizeWindow" <key id="key_minimizeWindow"
command="minimizeWindow" command="minimizeWindow"
key="&minimizeWindow.key;" data-l10n-id="window-minimize-shortcut"
modifiers="accel"/> modifiers="accel"
internal="true"/>
</keyset> </keyset>
<menu id="windowMenu" <menu id="windowMenu"
label="&windowMenu.label;" data-l10n-id="menu-window-menu">
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"> <menupopup id="windowPopup">
<menuitem command="minimizeWindow" label="&minimizeWindow.label;" key="key_minimizeWindow"/> <menuseparator/>
<menuitem command="zoomWindow" label="&zoomWindow.label;"/> <menuitem command="minimizeWindow" key="key_minimizeWindow"/>
<menuitem command="zoomWindow"/>
<!-- decomment when "BringAllToFront" is implemented <!-- decomment when "BringAllToFront" is implemented
<menuseparator/> <menuseparator/>
<menuitem label="&bringAllToFront.label;" disabled="true"/> --> <menuitem label="&bringAllToFront.label;" disabled="true"/> -->

19
chrome/content/zotero/standalone/hiddenWindow.xhtml
View file

@ -147,17 +147,16 @@
</menupopup> </menupopup>
</menu> </menu>
<menu id="windowMenu" label="&windowMenu.label;"> <menu id="windowMenu"
<menupopup> data-l10n-id="menu-window-menu">
<menuitem command="minimizeWindow" label="&minimizeWindow.label;" key="key_minimizeWindow"/> <menupopup id="windowPopup">
<menuitem command="zoomWindow" label="&zoomWindow.label;"/>
<menuseparator/> <menuseparator/>
<menuitem command="cmd_mainWindow" label="&brandShortName;" key="key_mainWindow"/> <menuitem command="minimizeWindow" key="key_minimizeWindow"/>
<!-- <menuitem command="zoomWindow"/>
Prevent error from macWindowMenuDidShow(), which is called from a built-in <!-- decomment when "BringAllToFront" is implemented
nWindowMenuShowing(), when opening menu <menuseparator/>
--> <menuitem label="&bringAllToFront.label;" disabled="true"/> -->
<menuseparator id="sep-window-list" hidden="true"/> <menuseparator id="sep-window-list"/>
</menupopup> </menupopup>
</menu> </menu>
</menubar> </menubar>

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

@ -51,6 +51,7 @@
<linkset> <linkset>
<html:link rel="localization" href="browser/menubar.ftl"/> <html:link rel="localization" href="browser/menubar.ftl"/>
<html:link rel="localization" href="browser/browserSets.ftl"/>
</linkset> </linkset>
<script> <script>
@ -125,18 +126,19 @@
<commandset id="macCommandSet"> <!-- was mainCommandSet --> <commandset id="macCommandSet"> <!-- was mainCommandSet -->
<command id="minimizeWindow" <command id="minimizeWindow"
label="&minimizeWindow.label;" data-l10n-id="window-minimize-command"
oncommand="window.minimize();" /> oncommand="window.minimize();" />
<command id="zoomWindow" <command id="zoomWindow"
label="&zoomWindow.label;" data-l10n-id="window-zoom-command"
oncommand="zoomWindow();" /> oncommand="zoomWindow();" />
</commandset> </commandset>
<keyset id="macKeyset"> <!-- was mainKeySet --> <keyset id="macKeyset"> <!-- was mainKeySet -->
<key id="key_minimizeWindow" <key id="key_minimizeWindow"
command="minimizeWindow" command="minimizeWindow"
key="&minimizeWindow.key;" data-l10n-id="window-minimize-shortcut"
modifiers="accel"/> modifiers="accel"
internal="true"/>
<key id="key_openHelpMac" <key id="key_openHelpMac"
oncommand="ZoteroStandalone.openHelp();" oncommand="ZoteroStandalone.openHelp();"
key="&helpMac.commandkey;" key="&helpMac.commandkey;"
@ -702,25 +704,11 @@
<!-- Only on macOS --> <!-- Only on macOS -->
<menu id="windowMenu" <menu id="windowMenu"
label="&windowMenu.label;" data-l10n-id="menu-window-menu">
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"> <menupopup id="windowPopup">
<menuitem command="minimizeWindow" label="&minimizeWindow.label;" key="key_minimizeWindow"/> <menuseparator/>
<menuitem command="zoomWindow" label="&zoomWindow.label;"/> <menuitem command="minimizeWindow" key="key_minimizeWindow"/>
<menuitem command="zoomWindow"/>
<!-- decomment when "BringAllToFront" is implemented <!-- decomment when "BringAllToFront" is implemented
<menuseparator/> <menuseparator/>
<menuitem label="&bringAllToFront.label;" disabled="true"/> --> <menuitem label="&bringAllToFront.label;" disabled="true"/> -->

4
chrome/locale/en-US/zotero/standalone.dtd
View file

@ -70,11 +70,7 @@
<!ENTITY developer.label "Developer"> <!ENTITY developer.label "Developer">
<!--WINDOW MENU--> <!--WINDOW MENU-->
<!ENTITY minimizeWindow.key "m">
<!ENTITY minimizeWindow.label "Minimize">
<!ENTITY bringAllToFront.label "Bring All to Front"> <!ENTITY bringAllToFront.label "Bring All to Front">
<!ENTITY zoomWindow.label "Zoom">
<!ENTITY windowMenu.label "Window">
<!--HELP MENU--> <!--HELP MENU-->
<!ENTITY helpMenu.label "Help"> <!ENTITY helpMenu.label "Help">