2012-03-24 18:39:14 +00:00
|
|
|
<?xml version="1.0"?>
|
2006-09-11 01:05:26 +00:00
|
|
|
<!--
|
2006-10-04 17:16:56 +00:00
|
|
|
***** BEGIN LICENSE BLOCK *****
|
|
|
|
|
|
2009-12-28 09:47:49 +00:00
|
|
|
Copyright © 2009 Center for History and New Media
|
|
|
|
|
George Mason University, Fairfax, Virginia, USA
|
|
|
|
|
http://zotero.org
|
2006-10-04 17:16:56 +00:00
|
|
|
|
2009-12-28 09:47:49 +00:00
|
|
|
This file is part of Zotero.
|
2006-10-04 17:16:56 +00:00
|
|
|
|
2009-12-28 09:47:49 +00:00
|
|
|
Zotero is free software: you can redistribute it and/or modify
|
2011-05-18 18:34:22 +00:00
|
|
|
it under the terms of the GNU Affero General Public License as published by
|
2009-12-28 09:47:49 +00:00
|
|
|
the Free Software Foundation, either version 3 of the License, or
|
|
|
|
|
(at your option) any later version.
|
2006-10-04 17:16:56 +00:00
|
|
|
|
2009-12-28 09:47:49 +00:00
|
|
|
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
|
2011-05-18 18:34:22 +00:00
|
|
|
GNU Affero General Public License for more details.
|
2009-12-28 09:47:49 +00:00
|
|
|
|
2011-05-18 18:34:22 +00:00
|
|
|
You should have received a copy of the GNU Affero General Public License
|
2009-12-28 09:47:49 +00:00
|
|
|
along with Zotero. If not, see <http://www.gnu.org/licenses/>.
|
2006-10-04 17:16:56 +00:00
|
|
|
|
|
|
|
|
***** END LICENSE BLOCK *****
|
2006-09-11 01:05:26 +00:00
|
|
|
-->
|
|
|
|
|
<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
|
2009-09-25 08:30:07 +00:00
|
|
|
<?xml-stylesheet href="chrome://global/skin/dialog.css" type="text/css"?>
|
2006-10-02 23:15:27 +00:00
|
|
|
<?xml-stylesheet href="chrome://zotero/skin/zotero.css" type="text/css"?>
|
|
|
|
|
<?xml-stylesheet href="chrome://zotero/skin/overlay.css" type="text/css"?>
|
2011-04-26 17:43:00 +00:00
|
|
|
<?xml-stylesheet href="chrome://zotero-platform/content/overlay.css" type="text/css"?>
|
XUL -> JS tree megacommit
- Just a single huge commit. This has been developed over too long a
time, required many tiny changes across too many files and has seen too
many iterations to be separated into separate commits.
The original branch with all the messy commits will be kept around for
posterity
https://github.com/zotero/zotero/compare/bb220ad0f2d6bf0eca6df6d225d3d358cb50a27b...adomasven:feature/react-item-tree
- Replaces XUL <tree> element across the whole zotero client codebase
with a custom supermegafast virtualized-table inspired by
react-virtualized yet mimicking old XUL treeview API. The
virtualized-table sits on top on a raw-to-the-metal,
interpreted-at-runtime JS based windowing solution inspired by
react-window. React-based solutions could not be used because they were
slow and Zotero UI needs to be responsive and be able to
display thousands of rows in a treeview without any slowdowns.
- Attempts were made at making this screen-reader friendly, but yet to
be tested with something like JAWS
- RTL-friendly
- Styling and behaviour across all platforms was copied as closely as
possible to the original XUL tree
- Instead of row-based scroll snapping this has smooth-scrolling. If
you're using arrow keys to browse through the tree then it effectively
snap-scrolls. Current CSS snap scroll attributes do not seem to work in
the way we would require even on up-to-date browsers, yet alone the ESR
version of FX that Zotero is on. JS solutions are either terrible for
performance or produce inexcusable jitter.
- When dragging-and-dropping items the initial drag freezes the UI for
a fairly jarring amount of time. Does not seem to be fixable due to
the synchronous code that needs to be run in the dragstart handler.
Used to be possible to run that code async with the XUL tree.
- Item tree column picker no longer has a dedicated button. Just
right-click the columns. The column preferences (width, order, etc) are
no longer handled by XUL, which required a custom serialization and
storage solution that throws warnings in the developer console due to
the amount of data being stored. Might cause temporary freezing on HDDs
upon column resize/reorder/visibility toggling.
- Context menu handling code basically unchanged, but any UI changes
that plugins may have wanted to do (including adding new columns) will
have to be redone by them. No serious thought has gone into how plugin
developers would achieve that yet.
- Opens up the possibility for awesome alternative ways to render the
tree items, including things like multiple-row view for the item tree,
which has been requested for a long while especially by users switching
from other referencing software
2020-06-03 07:29:46 +00:00
|
|
|
<?xml-stylesheet href="chrome://zotero-platform/content/zotero-react-client.css"?>
|
2007-10-23 07:11:59 +00:00
|
|
|
<?xml-stylesheet href="chrome://zotero/skin/integration.css" type="text/css"?>
|
2006-10-02 23:15:27 +00:00
|
|
|
<!DOCTYPE window SYSTEM "chrome://zotero/locale/zotero.dtd">
|
2006-09-11 01:05:26 +00:00
|
|
|
|
|
|
|
|
<dialog
|
Merged revisions 2190-2192,2194,2196-2199,2202-2205,2209,2212,2214-2215,2227-2228,2230,2232-2243,2245,2247-2256,2263-2272,2276,2278-2279,2281,2284-2286,2292,2296-2297,2299-2302,2304-2305,2309-2310,2314,2317-2323,2325-2329,2331-2337,2339,2341-2342,2344,2347-2366,2370-2371,2373-2377,2379-2391,2393-2402,2405-2410,2413,2415-2416,2418,2420-2421,2423,2427-2429,2431-2433,2437,2440-2441,2443-2450,2453,2455-2459,2461-2467,2471,2475-2480,2482-2490,2493,2495-2499,2501-2506,2511,2513-2519,2521,2525-2536,2540,2543-2553,2555-2559,2561-2576,2578,2580-2603,2606-2609,2611-2616,2618-2620,2624-2630,2632-2633 to trunk via svnmerge from 1.0 branch
2008-05-05 07:19:34 +00:00
|
|
|
id="zotero-add-citation-dialog"
|
2011-10-03 02:27:42 +00:00
|
|
|
windowtype="zotero:item-selector"
|
2006-09-11 01:05:26 +00:00
|
|
|
orient="vertical"
|
2007-10-23 07:11:59 +00:00
|
|
|
title="&zotero.integration.addEditCitation.title;"
|
2006-09-11 01:05:26 +00:00
|
|
|
width="600" height="450"
|
2006-10-02 23:15:27 +00:00
|
|
|
onload="Zotero_Citation_Dialog.load();"
|
2006-09-11 01:05:26 +00:00
|
|
|
onunload="doUnload();"
|
2011-07-22 07:09:40 +00:00
|
|
|
ondialogaccept="return Zotero_Citation_Dialog.accept();"
|
|
|
|
|
ondialogcancel="Zotero_Citation_Dialog.cancel();"
|
2013-04-01 01:54:04 +00:00
|
|
|
onclose="Zotero_Citation_Dialog.cancel();"
|
2006-09-11 01:05:26 +00:00
|
|
|
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
|
XUL -> JS tree megacommit
- Just a single huge commit. This has been developed over too long a
time, required many tiny changes across too many files and has seen too
many iterations to be separated into separate commits.
The original branch with all the messy commits will be kept around for
posterity
https://github.com/zotero/zotero/compare/bb220ad0f2d6bf0eca6df6d225d3d358cb50a27b...adomasven:feature/react-item-tree
- Replaces XUL <tree> element across the whole zotero client codebase
with a custom supermegafast virtualized-table inspired by
react-virtualized yet mimicking old XUL treeview API. The
virtualized-table sits on top on a raw-to-the-metal,
interpreted-at-runtime JS based windowing solution inspired by
react-window. React-based solutions could not be used because they were
slow and Zotero UI needs to be responsive and be able to
display thousands of rows in a treeview without any slowdowns.
- Attempts were made at making this screen-reader friendly, but yet to
be tested with something like JAWS
- RTL-friendly
- Styling and behaviour across all platforms was copied as closely as
possible to the original XUL tree
- Instead of row-based scroll snapping this has smooth-scrolling. If
you're using arrow keys to browse through the tree then it effectively
snap-scrolls. Current CSS snap scroll attributes do not seem to work in
the way we would require even on up-to-date browsers, yet alone the ESR
version of FX that Zotero is on. JS solutions are either terrible for
performance or produce inexcusable jitter.
- When dragging-and-dropping items the initial drag freezes the UI for
a fairly jarring amount of time. Does not seem to be fixable due to
the synchronous code that needs to be run in the dragstart handler.
Used to be possible to run that code async with the XUL tree.
- Item tree column picker no longer has a dedicated button. Just
right-click the columns. The column preferences (width, order, etc) are
no longer handled by XUL, which required a custom serialization and
storage solution that throws warnings in the developer console due to
the amount of data being stored. Might cause temporary freezing on HDDs
upon column resize/reorder/visibility toggling.
- Context menu handling code basically unchanged, but any UI changes
that plugins may have wanted to do (including adding new columns) will
have to be redone by them. No serious thought has gone into how plugin
developers would achieve that yet.
- Opens up the possibility for awesome alternative ways to render the
tree items, including things like multiple-row view for the item tree,
which has been requested for a long while especially by users switching
from other referencing software
2020-06-03 07:29:46 +00:00
|
|
|
xmlns:html="http://www.w3.org/1999/xhtml"
|
2009-09-25 08:30:07 +00:00
|
|
|
persist="screenX screenY width height"
|
2011-07-22 07:09:40 +00:00
|
|
|
resizable="true"
|
2009-09-25 08:30:07 +00:00
|
|
|
buttons="extra1,extra2,accept,cancel"
|
|
|
|
|
ondialogextra2="Zotero_Citation_Dialog.toggleEditor()"
|
|
|
|
|
ondialogextra1="Zotero_Citation_Dialog.toggleMultipleSources()">
|
2006-09-11 01:05:26 +00:00
|
|
|
|
2013-02-18 21:15:44 +00:00
|
|
|
<script src="../include.js"/>
|
|
|
|
|
<script src="../selectItemsDialog.js"/>
|
|
|
|
|
<script src="addCitationDialog.js"/>
|
2006-09-11 01:05:26 +00:00
|
|
|
|
2011-07-22 07:09:40 +00:00
|
|
|
<vbox id="zotero-select-items-container" flex="1">
|
2006-09-11 01:05:26 +00:00
|
|
|
<vbox flex="1">
|
|
|
|
|
<hbox flex="1">
|
2007-10-23 07:11:59 +00:00
|
|
|
<vbox align="stretch" flex="1">
|
|
|
|
|
<hbox align="center" pack="end">
|
2011-04-26 17:43:00 +00:00
|
|
|
<textbox id="zotero-tb-search" type="search" timeout="250" oncommand="onSearch()" tabindex="1"
|
|
|
|
|
onkeypress="if(event.keyCode == event.DOM_VK_ESCAPE) { if (this.value == '') { cancelDialog(); return false; } this.value = ''; onSearch(); return false; } return true;"/>
|
2007-10-23 07:11:59 +00:00
|
|
|
</hbox>
|
|
|
|
|
<hbox flex="1" style="margin-top: 5px">
|
XUL -> JS tree megacommit
- Just a single huge commit. This has been developed over too long a
time, required many tiny changes across too many files and has seen too
many iterations to be separated into separate commits.
The original branch with all the messy commits will be kept around for
posterity
https://github.com/zotero/zotero/compare/bb220ad0f2d6bf0eca6df6d225d3d358cb50a27b...adomasven:feature/react-item-tree
- Replaces XUL <tree> element across the whole zotero client codebase
with a custom supermegafast virtualized-table inspired by
react-virtualized yet mimicking old XUL treeview API. The
virtualized-table sits on top on a raw-to-the-metal,
interpreted-at-runtime JS based windowing solution inspired by
react-window. React-based solutions could not be used because they were
slow and Zotero UI needs to be responsive and be able to
display thousands of rows in a treeview without any slowdowns.
- Attempts were made at making this screen-reader friendly, but yet to
be tested with something like JAWS
- RTL-friendly
- Styling and behaviour across all platforms was copied as closely as
possible to the original XUL tree
- Instead of row-based scroll snapping this has smooth-scrolling. If
you're using arrow keys to browse through the tree then it effectively
snap-scrolls. Current CSS snap scroll attributes do not seem to work in
the way we would require even on up-to-date browsers, yet alone the ESR
version of FX that Zotero is on. JS solutions are either terrible for
performance or produce inexcusable jitter.
- When dragging-and-dropping items the initial drag freezes the UI for
a fairly jarring amount of time. Does not seem to be fixable due to
the synchronous code that needs to be run in the dragstart handler.
Used to be possible to run that code async with the XUL tree.
- Item tree column picker no longer has a dedicated button. Just
right-click the columns. The column preferences (width, order, etc) are
no longer handled by XUL, which required a custom serialization and
storage solution that throws warnings in the developer console due to
the amount of data being stored. Might cause temporary freezing on HDDs
upon column resize/reorder/visibility toggling.
- Context menu handling code basically unchanged, but any UI changes
that plugins may have wanted to do (including adding new columns) will
have to be redone by them. No serious thought has gone into how plugin
developers would achieve that yet.
- Opens up the possibility for awesome alternative ways to render the
tree items, including things like multiple-row view for the item tree,
which has been requested for a long while especially by users switching
from other referencing software
2020-06-03 07:29:46 +00:00
|
|
|
<vbox id="zotero-collections-tree-container" class="virtualized-table-container" style="min-width: 200px">
|
|
|
|
|
<html:div id="zotero-collections-tree"></html:div>
|
|
|
|
|
</vbox>
|
|
|
|
|
|
|
|
|
|
<hbox id="zotero-items-pane-content" class="virtualized-table-container" flex="1">
|
|
|
|
|
<html:div id="zotero-items-tree"></html:div>
|
|
|
|
|
</hbox>
|
2007-10-23 07:11:59 +00:00
|
|
|
</hbox>
|
|
|
|
|
</vbox>
|
|
|
|
|
|
2010-06-06 00:01:11 +00:00
|
|
|
<hbox hidden="true" id="multiple-sources" align="stretch">
|
|
|
|
|
<vbox align="center" pack="center" id="citation-buttons">
|
|
|
|
|
<toolbarbutton id="up" oncommand="Zotero_Citation_Dialog.up()" disabled="true"/>
|
2007-10-23 07:11:59 +00:00
|
|
|
<toolbarbutton id="add" oncommand="Zotero_Citation_Dialog.add()" disabled="true"/>
|
|
|
|
|
<toolbarbutton id="remove" oncommand="Zotero_Citation_Dialog.remove()" disabled="true"/>
|
2010-06-06 00:01:11 +00:00
|
|
|
<toolbarbutton id="down" oncommand="Zotero_Citation_Dialog.down()" disabled="true"/>
|
2007-10-23 07:11:59 +00:00
|
|
|
</vbox>
|
2010-06-06 00:01:11 +00:00
|
|
|
<vbox align="left">
|
2010-06-29 06:34:20 +00:00
|
|
|
<checkbox id="keepSorted" hidden="true" checked="false" oncommand="Zotero_Citation_Dialog.citationSortUnsort()" label="&zotero.citation.keepSorted.label;"/>
|
2007-10-23 07:11:59 +00:00
|
|
|
<listbox id="citation-list" flex="1" align="stretch" seltype="single"
|
2010-06-06 00:01:11 +00:00
|
|
|
onselect="Zotero_Citation_Dialog.listItemSelected();"/>
|
2007-10-23 07:11:59 +00:00
|
|
|
</vbox>
|
|
|
|
|
</hbox>
|
2006-09-11 01:05:26 +00:00
|
|
|
</hbox>
|
|
|
|
|
|
2007-10-23 07:11:59 +00:00
|
|
|
<hbox align="stretch" style="margin-top: 8px">
|
|
|
|
|
<vbox flex="1">
|
|
|
|
|
<hbox align="center">
|
|
|
|
|
<label value="&zotero.citation.prefix.label;"/>
|
2010-06-06 01:37:10 +00:00
|
|
|
<textbox oninput="Zotero_Citation_Dialog.confirmRegenerate(false)" onchange="Zotero_Citation_Dialog.confirmRegenerate(true)" class="fix" id="prefix" align="stretch" flex="1" tabindex="3"/>
|
2007-10-23 07:11:59 +00:00
|
|
|
</hbox>
|
|
|
|
|
<hbox align="center">
|
|
|
|
|
<label value="&zotero.citation.suffix.label;"/>
|
2010-06-06 01:37:10 +00:00
|
|
|
<textbox oninput="Zotero_Citation_Dialog.confirmRegenerate(false)" onchange="Zotero_Citation_Dialog.confirmRegenerate(true)" class="fix" id="suffix" align="stretch" flex="1" tabindex="4"/>
|
2007-10-23 07:11:59 +00:00
|
|
|
</hbox>
|
|
|
|
|
<spacer flex="1"/>
|
|
|
|
|
</vbox>
|
|
|
|
|
<separator flex="4"/>
|
|
|
|
|
<vbox flex="1">
|
|
|
|
|
<hbox align="stretch">
|
2010-06-06 01:37:10 +00:00
|
|
|
<menulist onchange="Zotero_Citation_Dialog.confirmRegenerate(true)" id="label" tabindex="5">
|
2007-10-23 07:11:59 +00:00
|
|
|
<menupopup id="locator-type-popup"/>
|
|
|
|
|
</menulist>
|
2010-06-06 01:37:10 +00:00
|
|
|
<textbox oninput="Zotero_Citation_Dialog.confirmRegenerate(false)" onchange="Zotero_Citation_Dialog.confirmRegenerate(true)" id="locator" tabindex="2" flex="1"/>
|
2007-10-23 07:11:59 +00:00
|
|
|
</hbox>
|
|
|
|
|
<separator style="height: 2px" flex="1"/>
|
2010-06-06 01:37:10 +00:00
|
|
|
<checkbox oncommand="Zotero_Citation_Dialog.confirmRegenerate(true)" id="suppress-author" label="&zotero.citation.suppressAuthor.label;" tabindex="6"/>
|
2007-10-23 07:11:59 +00:00
|
|
|
</vbox>
|
2006-09-11 01:05:26 +00:00
|
|
|
</hbox>
|
|
|
|
|
</vbox>
|
|
|
|
|
|
2008-10-13 19:51:53 +00:00
|
|
|
<textbox id="editor" type="styled" mode="integration" hidden="true" flex="1"/>
|
2012-03-08 14:01:45 +00:00
|
|
|
<description id="zotero-editor-warning" style="margin: 9px 1px 0" hidden="true">&zotero.citation.editorWarning.label;</description>
|
2007-10-23 07:11:59 +00:00
|
|
|
</vbox>
|
2006-09-11 01:05:26 +00:00
|
|
|
</dialog>
|