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

Fix dialog window titlebar on macOS (#4011)

Browse source 
After #4010
This commit is contained in:
windingwind 2024-04-19 19:32:50 +08:00 committed by GitHub
parent dfaa0ce129
commit 3e30ae1797
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
12 changed files with 24 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/scripts/fetch_xulrunner
View file

@ -325,7 +325,7 @@ function modify_omni {
# Import style into built-in dialogs # Import style into built-in dialogs
replace_line 'id=\"commonDialogWindow\"' \ replace_line 'id=\"commonDialogWindow\"' \
'id=\"commonDialogWindow\" class=\"zotero-dialog\"' \ 'id=\"commonDialogWindow\" class=\"zotero-dialog\" drawintitlebar-platforms=\"mac\"' \
chrome/toolkit/content/global/commonDialog.xhtml chrome/toolkit/content/global/commonDialog.xhtml
replace_line '<\?xml-stylesheet href=\"chrome:\/\/global\/skin\/commonDialog.css\" type=\"text\/css\"\?>' \ replace_line '<\?xml-stylesheet href=\"chrome:\/\/global\/skin\/commonDialog.css\" type=\"text\/css\"\?>' \
'<\?xml-stylesheet href=\"chrome:\/\/global\/skin\/commonDialog.css\" type=\"text\/css\"\?> '<\?xml-stylesheet href=\"chrome:\/\/global\/skin\/commonDialog.css\" type=\"text\/css\"\?>
@ -337,6 +337,7 @@ function modify_omni {
try { try {
Services.dirsvc.get(\"ProfD\", Ci.nsIFile); Services.dirsvc.get(\"ProfD\", Ci.nsIFile);
Services.scriptloader.loadSubScript(\"chrome:\/\/zotero\/content\/include.js\", this); Services.scriptloader.loadSubScript(\"chrome:\/\/zotero\/content\/include.js\", this);
Services.scriptloader.loadSubScript(\"chrome:\/\/zotero\/content\/titlebar.js\", this);
Services.scriptloader.loadSubScript(\"chrome:\/\/zotero\/content\/customElements.js\", this); Services.scriptloader.loadSubScript(\"chrome:\/\/zotero\/content\/customElements.js\", this);
} catch (e) {}' \ } catch (e) {}' \
chrome/toolkit/content/global/commonDialog.xhtml chrome/toolkit/content/global/commonDialog.xhtml

2
chrome/content/scaffold/load.xhtml
View file

@ -32,12 +32,14 @@
<window <window
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
title="&scaffold.load.title;" title="&scaffold.load.title;"
drawintitlebar-platforms="mac"
onload="Scaffold_Load.onLoad()" onload="Scaffold_Load.onLoad()"
class="zotero-dialog" class="zotero-dialog"
style="min-width: 500px;"> style="min-width: 500px;">
<dialog buttons="cancel,accept" <dialog buttons="cancel,accept"
id="scaffold-load"> id="scaffold-load">
<script src="load.js"/> <script src="load.js"/>
<script src="chrome://zotero/content/titlebar.js"/>
<richlistbox id="listbox" class="theme-listbox"/> <richlistbox id="listbox" class="theme-listbox"/>
</dialog> </dialog>
</window> </window>

2
chrome/content/zotero/attachLink.xhtml
View file

@ -8,12 +8,14 @@
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" xmlns:html="http://www.w3.org/1999/xhtml"
title="&zotero.attachLink.title;" title="&zotero.attachLink.title;"
drawintitlebar-platforms="mac"
onload="Zotero_AttachLink.load()"> onload="Zotero_AttachLink.load()">
<dialog <dialog
buttons="accept,cancel" buttons="accept,cancel"
id="zotero-attach-uri-dialog"> id="zotero-attach-uri-dialog">
<script src="include.js"/> <script src="include.js"/>
<script src="titlebar.js"/>
<script src="attachLink.js"/> <script src="attachLink.js"/>
<vbox id="zotero-attach-uri-container"> <vbox id="zotero-attach-uri-container">

2
chrome/content/zotero/bibliography.xhtml
View file

@ -11,12 +11,14 @@
id="bibliography-window" id="bibliography-window"
class="bibliography-window" class="bibliography-window"
title="&zotero.bibliography.title;" title="&zotero.bibliography.title;"
drawintitlebar-platforms="mac"
onload="Zotero_File_Interface_Bibliography.init()"> onload="Zotero_File_Interface_Bibliography.init()">
<dialog <dialog
buttons="cancel,accept" buttons="cancel,accept"
id="zotero-bibliography"> id="zotero-bibliography">
<script src="include.js"/> <script src="include.js"/>
<script src="titlebar.js"/>
<script src="bibliography.js"/> <script src="bibliography.js"/>
<vbox id="zotero-bibliography-container"> <vbox id="zotero-bibliography-container">

2
chrome/content/zotero/createParentDialog.xhtml
View file

@ -13,6 +13,7 @@
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" xmlns:html="http://www.w3.org/1999/xhtml"
title="&zotero.createParent.title;" title="&zotero.createParent.title;"
drawintitlebar-platforms="mac"
onload="doLoad();" onload="doLoad();"
onunload="doUnload();"> onunload="doUnload();">
<dialog <dialog
@ -27,6 +28,7 @@
<script src="chrome://global/content/globalOverlay.js"/> <script src="chrome://global/content/globalOverlay.js"/>
<script src="chrome://global/content/editMenuOverlay.js"/> <script src="chrome://global/content/editMenuOverlay.js"/>
<script src="include.js"/> <script src="include.js"/>
<script src="titlebar.js"/>
<script src="editMenuOverlay.js"/> <script src="editMenuOverlay.js"/>
<script src="lookup.js"/> <script src="lookup.js"/>
<script src="createParentDialog.js"/> <script src="createParentDialog.js"/>

2
chrome/content/zotero/exportOptions.xhtml
View file

@ -10,6 +10,7 @@
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:html="http://www.w3.org/1999/xhtml" xmlns:html="http://www.w3.org/1999/xhtml"
title="&zotero.exportOptions.title;" title="&zotero.exportOptions.title;"
drawintitlebar-platforms="mac"
onload="Zotero_File_Interface_Export.init()"> onload="Zotero_File_Interface_Export.init()">
<dialog <dialog
buttons="cancel,accept" buttons="cancel,accept"
@ -18,6 +19,7 @@
<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/include.js", this); Services.scriptloader.loadSubScript("chrome://zotero/content/include.js", this);
Services.scriptloader.loadSubScript("chrome://zotero/content/titlebar.js", this);
Services.scriptloader.loadSubScript("chrome://zotero/content/customElements.js", this); Services.scriptloader.loadSubScript("chrome://zotero/content/customElements.js", this);
</script> </script>
<script src="charsetMenu.js"/> <script src="charsetMenu.js"/>

2
chrome/content/zotero/feedSettings.xhtml
View file

@ -11,11 +11,13 @@
title="&zotero.feedSettings.title;" buttons="cancel,accept" title="&zotero.feedSettings.title;" buttons="cancel,accept"
buttonlabelaccept="&zotero.feedSettings.saveButton.label;" buttonlabelaccept="&zotero.feedSettings.saveButton.label;"
id="zotero-feed-settings" id="zotero-feed-settings"
drawintitlebar-platforms="mac"
onload="Zotero_Feed_Settings.init()"> onload="Zotero_Feed_Settings.init()">
<dialog> <dialog>
<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/include.js", this); Services.scriptloader.loadSubScript("chrome://zotero/content/include.js", this);
Services.scriptloader.loadSubScript("chrome://zotero/content/titlebar.js", this);
Services.scriptloader.loadSubScript("chrome://zotero/content/customElements.js", this); Services.scriptloader.loadSubScript("chrome://zotero/content/customElements.js", this);
Services.scriptloader.loadSubScript("chrome://zotero/content/feedSettings.js", this); Services.scriptloader.loadSubScript("chrome://zotero/content/feedSettings.js", this);
</script> </script>

2
chrome/content/zotero/ingester/selectitems.xhtml
View file

@ -34,6 +34,7 @@
class="zotero-dialog" class="zotero-dialog"
title="&zotero.selectitems.title;" width="400" height="330" title="&zotero.selectitems.title;" width="400" height="330"
persist="width height screenX screenY" persist="width height screenX screenY"
drawintitlebar-platforms="mac"
onload="Zotero_Ingester_Interface_SelectItems.init()"> onload="Zotero_Ingester_Interface_SelectItems.init()">
<dialog <dialog
buttons="cancel,accept" buttons="cancel,accept"
@ -42,6 +43,7 @@
<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/include.js", this); Services.scriptloader.loadSubScript("chrome://zotero/content/include.js", this);
Services.scriptloader.loadSubScript("chrome://zotero/content/titlebar.js", this);
Services.scriptloader.loadSubScript("chrome://zotero/content/ingester/selectitems.js", this); Services.scriptloader.loadSubScript("chrome://zotero/content/ingester/selectitems.js", this);
Services.scriptloader.loadSubScript("chrome://zotero/content/customElements.js", this); Services.scriptloader.loadSubScript("chrome://zotero/content/customElements.js", this);
</script> </script>

2
chrome/content/zotero/longTagFixer.xhtml
View file

@ -10,6 +10,7 @@
title="&zotero.sync.error;" title="&zotero.sync.error;"
id="zotero-long-tag-fixer-window" id="zotero-long-tag-fixer-window"
class="zotero-dialog" class="zotero-dialog"
drawintitlebar-platforms="mac"
onload="Zotero_Long_Tag_Fixer.init()"> onload="Zotero_Long_Tag_Fixer.init()">
<dialog <dialog
id="zotero-long-tag-fixer" id="zotero-long-tag-fixer"
@ -64,6 +65,7 @@
</tabpanels> </tabpanels>
</tabbox> </tabbox>
<script src="include.js"/> <script src="include.js"/>
<script src="titlebar.js"/>
<script src="longTagFixer.js"/> <script src="longTagFixer.js"/>
</dialog> </dialog>
</window> </window>

2
chrome/content/zotero/newCollectionDialog.xhtml
View file

@ -38,11 +38,13 @@
data-l10n-id="new-collection-dialog" data-l10n-id="new-collection-dialog"
data-l10n-attrs="title" data-l10n-attrs="title"
width="350" width="350"
drawintitlebar-platforms="mac"
onload="Zotero_New_Collection_Dialog._handleLoad()" onload="Zotero_New_Collection_Dialog._handleLoad()"
> >
<script> <script>
const { Services } = ChromeUtils.import('resource://gre/modules/Services.jsm'); const { Services } = ChromeUtils.import('resource://gre/modules/Services.jsm');
Services.scriptloader.loadSubScript('chrome://zotero/content/include.js', this); Services.scriptloader.loadSubScript('chrome://zotero/content/include.js', this);
Services.scriptloader.loadSubScript('chrome://zotero/content/titlebar.js', this);
Services.scriptloader.loadSubScript('chrome://zotero/content/customElements.js', this); Services.scriptloader.loadSubScript('chrome://zotero/content/customElements.js', this);
Services.scriptloader.loadSubScript('chrome://zotero/content/newCollectionDialog.js', this); Services.scriptloader.loadSubScript('chrome://zotero/content/newCollectionDialog.js', this);
</script> </script>

2
chrome/content/zotero/searchDialog.xhtml
View file

@ -11,6 +11,7 @@
orient="vertical" orient="vertical"
onload="doLoad();" onload="doLoad();"
onunload="doUnload();" onunload="doUnload();"
drawintitlebar-platforms="mac"
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" xmlns:html="http://www.w3.org/1999/xhtml"
style="padding:2em"> style="padding:2em">
@ -21,6 +22,7 @@
<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/include.js", this); Services.scriptloader.loadSubScript("chrome://zotero/content/include.js", this);
Services.scriptloader.loadSubScript("chrome://zotero/content/titlebar.js", this);
Services.scriptloader.loadSubScript("chrome://zotero/content/customElements.js", this); Services.scriptloader.loadSubScript("chrome://zotero/content/customElements.js", this);
Services.scriptloader.loadSubScript("chrome://zotero/content/searchDialog.js", this); Services.scriptloader.loadSubScript("chrome://zotero/content/searchDialog.js", this);
</script> </script>

2
chrome/content/zotero/tagColorChooser.xhtml
View file

@ -34,6 +34,7 @@
xmlns:html="http://www.w3.org/1999/xhtml" xmlns:html="http://www.w3.org/1999/xhtml"
title="&zotero.tagColorChooser.title;" title="&zotero.tagColorChooser.title;"
onload="Zotero_Tag_Color_Chooser.init()" onload="Zotero_Tag_Color_Chooser.init()"
drawintitlebar-platforms="mac"
width="350" width="350"
height="140"> height="140">
<dialog <dialog
@ -45,6 +46,7 @@
var { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); var { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
Services.scriptloader.loadSubScript("chrome://zotero/content/include.js", this); Services.scriptloader.loadSubScript("chrome://zotero/content/include.js", this);
Services.scriptloader.loadSubScript("chrome://zotero/content/titlebar.js", this);
Services.scriptloader.loadSubScript("chrome://zotero/content/tagColorChooser.js", this); Services.scriptloader.loadSubScript("chrome://zotero/content/tagColorChooser.js", this);
// Custom elements // Custom elements