- Put all Zotero buttons in one contiguous toolbar. This seems to be the only way to get a unified window on OS X. It also means that if the window is too small, the search box pushes over the metadata pane buttons, instead of getting truncated.
- Firefox 3.6 fixes
This commit is contained in:
Simon Kornblith
parent
9312300420
commit
fd9e25fa29
|
|
@ -12,14 +12,6 @@
|
|||
background-image: none;
|
||||
}
|
||||
|
||||
#zotero-pane .toolbar {
|
||||
/* This will be ignored on FF <3.5 */
|
||||
-moz-appearance: -moz-mac-unified-toolbar;
|
||||
/* This will be ignored on FF >=3.5 */
|
||||
background: url("chrome://zotero/skin/mac/toolbar-background.png") left center repeat-x;
|
||||
margin-left: -1px;
|
||||
}
|
||||
|
||||
#zotero-items-toolbar[state=collapsed]
|
||||
{
|
||||
margin-left: -8px !important;
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
#zotero-pane .toolbar {
|
||||
#zotero-toolbar {
|
||||
-moz-appearance: none !important;
|
||||
background-color: -moz-mac-chrome-active !important;
|
||||
background: url("chrome://zotero/skin/mac/toolbar-background.png") left center repeat-x;
|
||||
}
|
||||
|
|
@ -803,13 +803,13 @@
|
|||
// appropriately truncate lastName
|
||||
|
||||
// get item box width
|
||||
var computedStyle = window.getComputedStyle(this);
|
||||
var computedStyle = window.getComputedStyle(this, null);
|
||||
var boxWidth = computedStyle.getPropertyValue('width');
|
||||
// get field label width
|
||||
var computedStyle = window.getComputedStyle(row.firstChild);
|
||||
var computedStyle = window.getComputedStyle(row.firstChild, null);
|
||||
var leftHboxWidth = computedStyle.getPropertyValue('width');
|
||||
// get last name width
|
||||
computedStyle = window.getComputedStyle(lastName);
|
||||
computedStyle = window.getComputedStyle(lastName, null);
|
||||
var lastNameWidth = computedStyle.getPropertyValue('width');
|
||||
if(boxWidth.substr(-2) === 'px'
|
||||
&& leftHboxWidth.substr(-2) === 'px'
|
||||
|
|
|
|||
|
|
@ -212,7 +212,6 @@
|
|||
context="toolbar-context-menu"
|
||||
defaultset="personal-bookmarks"
|
||||
customizable="true"/>-->
|
||||
|
||||
<hbox flex="1" id="browser">
|
||||
<vbox id="appcontent" flex="1">
|
||||
<stack id="zotero-pane-stack" fullscreenmode="true" flex="1"/>
|
||||
|
|
|
|||
|
|
@ -115,7 +115,9 @@ var ZoteroPane = new function()
|
|||
_loaded = true;
|
||||
|
||||
var zp = document.getElementById('zotero-pane');
|
||||
Zotero.setFontSize(zp)
|
||||
Zotero.setFontSize(zp);
|
||||
ZoteroPane.updateToolbarPosition();
|
||||
window.addEventListener("resize", this.updateToolbarPosition, false);
|
||||
|
||||
if (Zotero.isMac) {
|
||||
//document.getElementById('zotero-tb-actions-zeroconf-update').setAttribute('hidden', false);
|
||||
|
|
@ -3481,4 +3483,18 @@ var ZoteroPane = new function()
|
|||
}
|
||||
Zotero.Prefs.set("pane.persist", JSON.stringify(serializedValues));
|
||||
}
|
||||
|
||||
/**
|
||||
* Moves around the toolbar when the user moves around the pane
|
||||
*/
|
||||
this.updateToolbarPosition = function() {
|
||||
const PANES = ["collections", "items"];
|
||||
for each(var paneName in PANES) {
|
||||
var pane = document.getElementById("zotero-"+paneName+"-pane");
|
||||
var toolbar = document.getElementById("zotero-"+paneName+"-toolbar");
|
||||
|
||||
computedStyle = window.getComputedStyle(pane, null);
|
||||
toolbar.style.width = computedStyle.getPropertyValue("width");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -76,10 +76,140 @@
|
|||
<checkbox/>
|
||||
</box>
|
||||
|
||||
<hbox id="zotero-pane"
|
||||
<vbox id="zotero-pane"
|
||||
onkeydown="ZoteroPane.handleKeyDown(event, this.id)"
|
||||
onkeyup="ZoteroPane.handleKeyUp(event, this.id)"
|
||||
chromedir="&locale.dir;">
|
||||
|
||||
<toolbar id="zotero-toolbar" class="toolbar">
|
||||
<hbox id="zotero-collections-toolbar">
|
||||
<toolbarbutton id="zotero-tb-collection-add" class="zotero-tb-button" tooltiptext="&zotero.toolbar.newCollection.label;" oncommand="ZoteroPane.newCollection()"/>
|
||||
<toolbarbutton id="zotero-tb-group-add" class="zotero-tb-button" tooltiptext="&zotero.toolbar.newGroup;" oncommand="ZoteroPane.newGroup()"/>
|
||||
<spacer flex="1"/>
|
||||
<toolbarbutton id="zotero-tb-actions-menu" class="zotero-tb-button" tooltiptext="&zotero.toolbar.actions.label;" type="menu">
|
||||
<menupopup id="zotero-tb-actions-popup" onpopupshowing="document.getElementById('cmd_zotero_reportErrors').setAttribute('disabled', Zotero.getErrors().length == 0)">
|
||||
<menuitem id="zotero-tb-actions-import" label="&zotero.toolbar.import.label;" oncommand="Zotero_File_Interface.importFile();"/>
|
||||
<menuitem id="zotero-tb-actions-import-clipboard" label="&zotero.toolbar.importFromClipboard;" oncommand="Zotero_File_Interface.importFromClipboard();" />
|
||||
<menuitem id="zotero-tb-actions-export" label="&zotero.toolbar.export.label;" oncommand="Zotero_File_Interface.exportFile();"/>
|
||||
<menuitem id="zotero-tb-actions-rtfScan" label="&zotero.toolbar.rtfScan.label;" oncommand="window.openDialog('chrome://zotero/content/rtfScan.xul', 'rtfScan', 'chrome,centerscreen')"/>
|
||||
<menuitem hidden="true" id="zotero-tb-actions-zeroconf-update"
|
||||
label="Search for Shared Libraries" oncommand="Zotero.Zeroconf.findInstances()"/>
|
||||
<menuseparator id="zotero-tb-actions-plugins-separator"/>
|
||||
<menuitem id="zotero-tb-actions-timeline" label="&zotero.toolbar.timeline.label;" oncommand="Zotero_Timeline_Interface.loadTimeline()"/>
|
||||
<!-- TODO: localize <menuitem id="zotero-tb-actions-duplicate" label="&zotero.toolbar.duplicate.label;" oncommand="ZoteroPane.showDuplicates()"/>-->
|
||||
<menuitem id="zotero-tb-actions-showDuplicates" label="Show Duplicates" oncommand="ZoteroPane.showDuplicates()" hidden="true"/>
|
||||
<menuseparator hidden="true" id="zotero-tb-actions-sync-separator"/>
|
||||
<menuitem hidden="true" label="WebDAV Sync Debugging" disabled="true"/>
|
||||
<menuitem hidden="true" label=" Purge Deleted Storage Files" oncommand="Zotero.Sync.Storage.purgeDeletedStorageFiles('webdav', function(results) { Zotero.debug(results); })"/>
|
||||
<menuitem hidden="true" label=" Purge Orphaned Storage Files" oncommand="Zotero.Sync.Storage.purgeOrphanedStorageFiles('webdav', function(results) { Zotero.debug(results); })"/>
|
||||
<menuseparator id="zotero-tb-actions-separator"/>
|
||||
<menuitem id="zotero-tb-actions-prefs" label="&zotero.toolbar.preferences.label;"
|
||||
oncommand="ZoteroPane.openPreferences()"/>
|
||||
<menuitem id="zotero-tb-actions-reportErrors" command="cmd_zotero_reportErrors" disabled="true"/>
|
||||
<menuitem id="zotero-tb-actions-support" label="&zotero.toolbar.supportAndDocumentation;" oncommand="gBrowser.selectedTab = gBrowser.addTab('http://www.zotero.org/support/')"/>
|
||||
<menuitem id="zotero-tb-actions-about" label="&zotero.toolbar.about.label;" oncommand="window.openDialog('chrome://zotero/content/about.xul', 'about', 'chrome')"/>
|
||||
</menupopup>
|
||||
</toolbarbutton>
|
||||
</hbox>
|
||||
|
||||
<hbox id="zotero-items-toolbar" align="center">
|
||||
<toolbarbutton id="zotero-tb-add" class="zotero-tb-button" tooltiptext="&zotero.toolbar.newItem.label;" type="menu">
|
||||
<!-- New Item drop-down built in overlay.js::onLoad() -->
|
||||
<menupopup>
|
||||
<menuseparator/>
|
||||
<menuitem label="&zotero.toolbar.attachment.linked;" oncommand="ZoteroPane.addAttachmentFromDialog(true);" tooltiptext=""/>
|
||||
<menuitem label="&zotero.toolbar.attachment.add;" oncommand="ZoteroPane.addAttachmentFromDialog();" tooltiptext=""/>
|
||||
<menuseparator/>
|
||||
<menu label="&zotero.toolbar.moreItemTypes.label;" tooltiptext="">
|
||||
<menupopup id="zotero-tb-add-more"/>
|
||||
</menu>
|
||||
</menupopup>
|
||||
</toolbarbutton>
|
||||
<toolbarbutton id="zotero-tb-item-from-page" class="zotero-tb-button" tooltiptext="&zotero.toolbar.newItemFromPage.label;" oncommand="ZoteroPane.addItemFromPage('temporaryPDFHack', event.shiftKey ? !Zotero.Prefs.get('automaticSnapshots') : null)"/>
|
||||
<toolbarbutton id="zotero-tb-lookup" class="zotero-tb-button" tooltiptext="&zotero.toolbar.lookup.label;" oncommand="ZoteroPane.openLookupWindow()"/>
|
||||
<!--<toolbarbutton id="zotero-tb-note-add" class="zotero-tb-button" tooltiptext="&zotero.toolbar.note.standalone;" oncommand="ZoteroPane.newNote(event.shiftKey);"/>-->
|
||||
<toolbarbutton id="zotero-tb-note-add" class="zotero-tb-button" tooltiptext="New Note" type="menu">
|
||||
<menupopup onpopupshowing="ZoteroPane.updateNoteButtonMenu()">
|
||||
<menuitem label="Add Standalone Note" oncommand="ZoteroPane.newNote(event.shiftKey);"/>
|
||||
<menuitem id="zotero-tb-add-child-note" label="Add Child Note" oncommand="var selected = ZoteroPane.getSelectedItems()[0]; var parent = selected.getSource(); parent = parent ? parent : selected.id; ZoteroPane.newNote(event.shiftKey, parent);"/>
|
||||
</menupopup>
|
||||
</toolbarbutton>
|
||||
<toolbarbutton id="zotero-tb-attachment-add" class="zotero-tb-button" tooltiptext="New Child Attachment" type="menu">
|
||||
<menupopup onpopupshowing="ZoteroPane.updateAttachmentButtonMenu(this)">
|
||||
<menuitem class="menuitem-iconic zotero-menuitem-attachments-snapshot" label="&zotero.items.menu.attach.snapshot;" oncommand="var itemID = ZoteroPane.getSelectedItems()[0].id; ZoteroPane.addAttachmentFromPage(false, itemID)"/>
|
||||
<menuitem class="menuitem-iconic zotero-menuitem-attachments-web-link" label="&zotero.items.menu.attach.link;" oncommand="var itemID = ZoteroPane.getSelectedItems()[0].id; ZoteroPane.addAttachmentFromPage(true, itemID)"/>
|
||||
<menuitem class="menuitem-iconic zotero-menuitem-attachments-file" label="Attach Stored Copy of File..." oncommand="var itemID = ZoteroPane.getSelectedItems()[0].id; ZoteroPane.addAttachmentFromDialog(false, itemID);"/>
|
||||
<menuitem class="menuitem-iconic zotero-menuitem-attachments-link" label="Attach Link to File..." oncommand="var itemID = ZoteroPane.getSelectedItems()[0].id; ZoteroPane.addAttachmentFromDialog(true, itemID);"/>
|
||||
</menupopup>
|
||||
</toolbarbutton>
|
||||
<toolbarseparator/>
|
||||
<toolbarbutton id="zotero-tb-advanced-search" class="zotero-tb-button" tooltiptext="&zotero.toolbar.advancedSearch;" oncommand="ZoteroPane.openAdvancedSearchWindow()"/>
|
||||
<spacer flex="1"/>
|
||||
<textbox id="zotero-tb-search" type="search" timeout="250" command="cmd_zotero_search" dir="reverse"
|
||||
onkeypress="ZoteroPane.handleSearchKeypress(this, event)"
|
||||
oninput="ZoteroPane.handleSearchInput(this, event)">
|
||||
</textbox>
|
||||
</hbox>
|
||||
|
||||
<hbox id="zotero-item-toolbar" align="center" flex="1">
|
||||
<hbox align="center" pack="start" flex="1">
|
||||
<toolbarbutton id="zotero-tb-locate" class="zotero-tb-button" tooltiptext="&zotero.toolbar.openURL.label;" type="menu">
|
||||
<menupopup id="zotero-tb-locate-menu" onpopupshowing="Zotero_LocateMenu.buildLocateMenu()"/>
|
||||
</toolbarbutton>
|
||||
</hbox>
|
||||
<hbox align="center" pack="end">
|
||||
<hbox id="zotero-tb-sync-progress-box" hidden="true" align="center">
|
||||
<toolbarbutton id="zotero-tb-sync-storage-cancel"
|
||||
tooltiptext="Cancel Storage Sync"
|
||||
oncommand="Zotero.Sync.Storage.QueueManager.cancel()"/>
|
||||
<progressmeter id="zotero-tb-sync-progress" mode="determined"
|
||||
value="0" tooltip="zotero-tb-sync-progress-tooltip">
|
||||
</progressmeter>
|
||||
<tooltip id="zotero-tb-sync-progress-tooltip" noautohide="true">
|
||||
<grid>
|
||||
<columns>
|
||||
<column/>
|
||||
<column/>
|
||||
</columns>
|
||||
<rows>
|
||||
<row>
|
||||
<label value="&zotero.sync.storage.progress;"/>
|
||||
<label id="zotero-tb-sync-progress-tooltip-progress"/>
|
||||
</row>
|
||||
<row>
|
||||
<label value="&zotero.sync.storage.downloads;"/>
|
||||
<label
|
||||
id="zotero-tb-sync-progress-tooltip-downloads"/>
|
||||
</row>
|
||||
<row>
|
||||
<label value="&zotero.sync.storage.uploads;"/>
|
||||
<label
|
||||
id="zotero-tb-sync-progress-tooltip-uploads"/>
|
||||
</row>
|
||||
</rows>
|
||||
</grid>
|
||||
</tooltip>
|
||||
</hbox>
|
||||
</hbox>
|
||||
<toolbarbutton id="zotero-tb-sync-warning" hidden="true"/>
|
||||
<toolbarbutton id="zotero-tb-sync" class="zotero-tb-button" tooltip="_child"
|
||||
oncommand="Zotero.Sync.Server.canAutoResetClient = true; Zotero.Sync.Server.manualSyncRequired = false; Zotero.Sync.Runner.sync()">
|
||||
<tooltip
|
||||
id="zotero-tb-sync-tooltip"
|
||||
onpopupshowing="Zotero.Sync.Runner.registerSyncStatusLabel(this.firstChild.nextSibling, this.firstChild.nextSibling.nextSibling)"
|
||||
onpopuphiding="Zotero.Sync.Runner.registerSyncStatusLabel()"
|
||||
noautohide="true">
|
||||
<label value="&zotero.sync.button;"/>
|
||||
<label id="zotero-tb-sync-status" hidden="true"/>
|
||||
<label id="zotero-tb-sync-last-sync"/>
|
||||
</tooltip>
|
||||
</toolbarbutton>
|
||||
<toolbarseparator id="zotero-fullscreen-close-separator"/>
|
||||
<toolbarbutton id="zotero-tb-fullscreen" tooltiptext="&zotero.toolbar.tab.tooltip;" oncommand="ZoteroPane.toggleTab();" class="zotero-tb-button"/>
|
||||
<toolbarbutton id="zotero-close-button" class="tabs-closebutton" oncommand="ZoteroOverlay.toggleDisplay()"/>
|
||||
</hbox>
|
||||
</toolbar>
|
||||
|
||||
<popupset>
|
||||
<menupopup id="zotero-collectionmenu" onpopupshowing="ZoteroPane.buildCollectionContextMenu();">
|
||||
<menuitem label="&zotero.toolbar.newCollection.label;" oncommand="ZoteroPane.newCollection()"/>
|
||||
|
|
@ -126,39 +256,11 @@
|
|||
</menupopup>
|
||||
</popupset>
|
||||
|
||||
|
||||
<hbox id="zotero-trees" flex="1">
|
||||
<vbox id="zotero-collections-pane" zotero-persist="width" flex="1">
|
||||
<!-- This extra vbox prevents the toolbar from getting compressed when resizing
|
||||
the tag selector to max height -->
|
||||
<vbox flex="1">
|
||||
<hbox class="toolbar">
|
||||
<toolbarbutton id="zotero-tb-collection-add" class="zotero-tb-button" tooltiptext="&zotero.toolbar.newCollection.label;" oncommand="ZoteroPane.newCollection()"/>
|
||||
<toolbarbutton id="zotero-tb-group-add" class="zotero-tb-button" tooltiptext="&zotero.toolbar.newGroup;" oncommand="ZoteroPane.newGroup()"/>
|
||||
<spacer flex="1"/>
|
||||
<toolbarbutton id="zotero-tb-actions-menu" class="zotero-tb-button" tooltiptext="&zotero.toolbar.actions.label;" type="menu">
|
||||
<menupopup id="zotero-tb-actions-popup" onpopupshowing="document.getElementById('cmd_zotero_reportErrors').setAttribute('disabled', Zotero.getErrors().length == 0)">
|
||||
<menuitem id="zotero-tb-actions-import" label="&zotero.toolbar.import.label;" oncommand="Zotero_File_Interface.importFile();"/>
|
||||
<menuitem id="zotero-tb-actions-import-clipboard" label="&zotero.toolbar.importFromClipboard;" oncommand="Zotero_File_Interface.importFromClipboard();" />
|
||||
<menuitem id="zotero-tb-actions-export" label="&zotero.toolbar.export.label;" oncommand="Zotero_File_Interface.exportFile();"/>
|
||||
<menuitem id="zotero-tb-actions-rtfScan" label="&zotero.toolbar.rtfScan.label;" oncommand="window.openDialog('chrome://zotero/content/rtfScan.xul', 'rtfScan', 'chrome,centerscreen')"/>
|
||||
<menuitem hidden="true" id="zotero-tb-actions-zeroconf-update"
|
||||
label="Search for Shared Libraries" oncommand="Zotero.Zeroconf.findInstances()"/>
|
||||
<menuseparator id="zotero-tb-actions-plugins-separator"/>
|
||||
<menuitem id="zotero-tb-actions-timeline" label="&zotero.toolbar.timeline.label;" oncommand="Zotero_Timeline_Interface.loadTimeline()"/>
|
||||
<!-- TODO: localize <menuitem id="zotero-tb-actions-duplicate" label="&zotero.toolbar.duplicate.label;" oncommand="ZoteroPane.showDuplicates()"/>-->
|
||||
<menuitem id="zotero-tb-actions-showDuplicates" label="Show Duplicates" oncommand="ZoteroPane.showDuplicates()" hidden="true"/>
|
||||
<menuseparator hidden="true" id="zotero-tb-actions-sync-separator"/>
|
||||
<menuitem hidden="true" label="WebDAV Sync Debugging" disabled="true"/>
|
||||
<menuitem hidden="true" label=" Purge Deleted Storage Files" oncommand="Zotero.Sync.Storage.purgeDeletedStorageFiles('webdav', function(results) { Zotero.debug(results); })"/>
|
||||
<menuitem hidden="true" label=" Purge Orphaned Storage Files" oncommand="Zotero.Sync.Storage.purgeOrphanedStorageFiles('webdav', function(results) { Zotero.debug(results); })"/>
|
||||
<menuseparator id="zotero-tb-actions-separator"/>
|
||||
<menuitem id="zotero-tb-actions-prefs" label="&zotero.toolbar.preferences.label;"
|
||||
oncommand="ZoteroPane.openPreferences()"/>
|
||||
<menuitem id="zotero-tb-actions-reportErrors" command="cmd_zotero_reportErrors" disabled="true"/>
|
||||
<menuitem id="zotero-tb-actions-support" label="&zotero.toolbar.supportAndDocumentation;" oncommand="gBrowser.selectedTab = gBrowser.addTab('http://www.zotero.org/support/')"/>
|
||||
<menuitem id="zotero-tb-actions-about" label="&zotero.toolbar.about.label;" oncommand="window.openDialog('chrome://zotero/content/about.xul', 'about', 'chrome')"/>
|
||||
</menupopup>
|
||||
</toolbarbutton>
|
||||
</hbox>
|
||||
<tree id="zotero-collections-tree" hidecolumnpicker="true" context="zotero-collectionmenu"
|
||||
onmouseover="ZoteroPane.collectionsView.setHighlightedRows();"
|
||||
onkeypress="ZoteroPane.handleKeyPress(event, this.id)"
|
||||
|
|
@ -177,7 +279,6 @@
|
|||
</treecols>
|
||||
<treechildren/>
|
||||
</tree>
|
||||
</vbox>
|
||||
<splitter id="zotero-tags-splitter" onmouseup="ZoteroPane.updateTagSelectorSize()" collapse="after">
|
||||
<grippy oncommand="ZoteroPane.toggleTagSelector()"/>
|
||||
</splitter>
|
||||
|
|
@ -186,50 +287,12 @@
|
|||
</vbox>
|
||||
|
||||
<splitter id="zotero-tree-splitter" resizebefore="closest" resizeafter="closest" collapse="before"
|
||||
onmousemove="document.getElementById('zotero-items-toolbar').setAttribute('state', this.getAttribute('state'));">
|
||||
onmousemove="document.getElementById('zotero-items-toolbar').setAttribute('state', this.getAttribute('state'));ZoteroPane.updateToolbarPosition();"
|
||||
oncommand="ZoteroPane.updateToolbarPosition()">
|
||||
<grippy/>
|
||||
</splitter>
|
||||
|
||||
<vbox id="zotero-items-pane" zotero-persist="width" flex="1">
|
||||
<hbox class="toolbar" id="zotero-items-toolbar" align="center">
|
||||
<toolbarbutton id="zotero-tb-add" class="zotero-tb-button" tooltiptext="&zotero.toolbar.newItem.label;" type="menu">
|
||||
<!-- New Item drop-down built in overlay.js::onLoad() -->
|
||||
<menupopup>
|
||||
<menuseparator/>
|
||||
<menuitem label="&zotero.toolbar.attachment.linked;" oncommand="ZoteroPane.addAttachmentFromDialog(true);" tooltiptext=""/>
|
||||
<menuitem label="&zotero.toolbar.attachment.add;" oncommand="ZoteroPane.addAttachmentFromDialog();" tooltiptext=""/>
|
||||
<menuseparator/>
|
||||
<menu label="&zotero.toolbar.moreItemTypes.label;" tooltiptext="">
|
||||
<menupopup id="zotero-tb-add-more"/>
|
||||
</menu>
|
||||
</menupopup>
|
||||
</toolbarbutton>
|
||||
<toolbarbutton id="zotero-tb-item-from-page" class="zotero-tb-button" tooltiptext="&zotero.toolbar.newItemFromPage.label;" oncommand="ZoteroPane.addItemFromPage('temporaryPDFHack', event.shiftKey ? !Zotero.Prefs.get('automaticSnapshots') : null)"/>
|
||||
<toolbarbutton id="zotero-tb-lookup" class="zotero-tb-button" tooltiptext="&zotero.toolbar.lookup.label;" oncommand="ZoteroPane.openLookupWindow()"/>
|
||||
<!--<toolbarbutton id="zotero-tb-note-add" class="zotero-tb-button" tooltiptext="&zotero.toolbar.note.standalone;" oncommand="ZoteroPane.newNote(event.shiftKey);"/>-->
|
||||
<toolbarbutton id="zotero-tb-note-add" class="zotero-tb-button" tooltiptext="New Note" type="menu">
|
||||
<menupopup onpopupshowing="ZoteroPane.updateNoteButtonMenu()">
|
||||
<menuitem label="Add Standalone Note" oncommand="ZoteroPane.newNote(event.shiftKey);"/>
|
||||
<menuitem id="zotero-tb-add-child-note" label="Add Child Note" oncommand="var selected = ZoteroPane.getSelectedItems()[0]; var parent = selected.getSource(); parent = parent ? parent : selected.id; ZoteroPane.newNote(event.shiftKey, parent);"/>
|
||||
</menupopup>
|
||||
</toolbarbutton>
|
||||
<toolbarbutton id="zotero-tb-attachment-add" class="zotero-tb-button" tooltiptext="New Child Attachment" type="menu">
|
||||
<menupopup onpopupshowing="ZoteroPane.updateAttachmentButtonMenu(this)">
|
||||
<menuitem class="menuitem-iconic zotero-menuitem-attachments-snapshot" label="&zotero.items.menu.attach.snapshot;" oncommand="var itemID = ZoteroPane.getSelectedItems()[0].id; ZoteroPane.addAttachmentFromPage(false, itemID)"/>
|
||||
<menuitem class="menuitem-iconic zotero-menuitem-attachments-web-link" label="&zotero.items.menu.attach.link;" oncommand="var itemID = ZoteroPane.getSelectedItems()[0].id; ZoteroPane.addAttachmentFromPage(true, itemID)"/>
|
||||
<menuitem class="menuitem-iconic zotero-menuitem-attachments-file" label="Attach Stored Copy of File..." oncommand="var itemID = ZoteroPane.getSelectedItems()[0].id; ZoteroPane.addAttachmentFromDialog(false, itemID);"/>
|
||||
<menuitem class="menuitem-iconic zotero-menuitem-attachments-link" label="Attach Link to File..." oncommand="var itemID = ZoteroPane.getSelectedItems()[0].id; ZoteroPane.addAttachmentFromDialog(true, itemID);"/>
|
||||
</menupopup>
|
||||
</toolbarbutton>
|
||||
<toolbarseparator/>
|
||||
<toolbarbutton id="zotero-tb-advanced-search" class="zotero-tb-button" tooltiptext="&zotero.toolbar.advancedSearch;" oncommand="ZoteroPane.openAdvancedSearchWindow()"/>
|
||||
<spacer flex="1"/>
|
||||
<textbox id="zotero-tb-search" type="search" timeout="250" command="cmd_zotero_search" dir="reverse"
|
||||
onkeypress="ZoteroPane.handleSearchKeypress(this, event)"
|
||||
oninput="ZoteroPane.handleSearchInput(this, event)">
|
||||
</textbox>
|
||||
</hbox>
|
||||
|
||||
<deck id="zotero-items-pane-content" selectedIndex="0" flex="1">
|
||||
<tree
|
||||
id="zotero-items-tree" context="zotero-itemmenu"
|
||||
|
|
@ -332,66 +395,11 @@
|
|||
</deck>
|
||||
</vbox>
|
||||
|
||||
<splitter id="zotero-view-splitter" resizebefore="closest" resizeafter="closest"/>
|
||||
<splitter id="zotero-view-splitter" resizebefore="closest" resizeafter="closest"
|
||||
onmousemove="ZoteroPane.updateToolbarPosition()"
|
||||
oncommand="ZoteroPane.updateToolbarPosition()"/>
|
||||
|
||||
<vbox id="zotero-item-pane" zotero-persist="width">
|
||||
<hbox class="toolbar" align="center">
|
||||
<hbox align="center" pack="start" flex="1">
|
||||
<toolbarbutton id="zotero-tb-locate" class="zotero-tb-button" tooltiptext="&zotero.toolbar.openURL.label;" type="menu">
|
||||
<menupopup id="zotero-tb-locate-menu" onpopupshowing="Zotero_LocateMenu.buildLocateMenu()"/>
|
||||
</toolbarbutton>
|
||||
</hbox>
|
||||
<hbox align="center" pack="end">
|
||||
<hbox id="zotero-tb-sync-progress-box" hidden="true" align="center">
|
||||
<toolbarbutton id="zotero-tb-sync-storage-cancel"
|
||||
tooltiptext="Cancel Storage Sync"
|
||||
oncommand="Zotero.Sync.Storage.QueueManager.cancel()"/>
|
||||
<progressmeter id="zotero-tb-sync-progress" mode="determined"
|
||||
value="0" tooltip="zotero-tb-sync-progress-tooltip">
|
||||
</progressmeter>
|
||||
<tooltip id="zotero-tb-sync-progress-tooltip" noautohide="true">
|
||||
<grid>
|
||||
<columns>
|
||||
<column/>
|
||||
<column/>
|
||||
</columns>
|
||||
<rows>
|
||||
<row>
|
||||
<label value="&zotero.sync.storage.progress;"/>
|
||||
<label id="zotero-tb-sync-progress-tooltip-progress"/>
|
||||
</row>
|
||||
<row>
|
||||
<label value="&zotero.sync.storage.downloads;"/>
|
||||
<label
|
||||
id="zotero-tb-sync-progress-tooltip-downloads"/>
|
||||
</row>
|
||||
<row>
|
||||
<label value="&zotero.sync.storage.uploads;"/>
|
||||
<label
|
||||
id="zotero-tb-sync-progress-tooltip-uploads"/>
|
||||
</row>
|
||||
</rows>
|
||||
</grid>
|
||||
</tooltip>
|
||||
</hbox>
|
||||
</hbox>
|
||||
<toolbarbutton id="zotero-tb-sync-warning" hidden="true"/>
|
||||
<toolbarbutton id="zotero-tb-sync" class="zotero-tb-button" tooltip="_child"
|
||||
oncommand="Zotero.Sync.Server.canAutoResetClient = true; Zotero.Sync.Server.manualSyncRequired = false; Zotero.Sync.Runner.sync()">
|
||||
<tooltip
|
||||
id="zotero-tb-sync-tooltip"
|
||||
onpopupshowing="Zotero.Sync.Runner.registerSyncStatusLabel(this.firstChild.nextSibling, this.firstChild.nextSibling.nextSibling)"
|
||||
onpopuphiding="Zotero.Sync.Runner.registerSyncStatusLabel()"
|
||||
noautohide="true">
|
||||
<label value="&zotero.sync.button;"/>
|
||||
<label id="zotero-tb-sync-status" hidden="true"/>
|
||||
<label id="zotero-tb-sync-last-sync"/>
|
||||
</tooltip>
|
||||
</toolbarbutton>
|
||||
<toolbarseparator id="zotero-fullscreen-close-separator"/>
|
||||
<toolbarbutton id="zotero-tb-fullscreen" tooltiptext="&zotero.toolbar.tab.tooltip;" oncommand="ZoteroPane.toggleTab();" class="zotero-tb-button"/>
|
||||
<toolbarbutton id="zotero-close-button" class="tabs-closebutton" oncommand="ZoteroOverlay.toggleDisplay()"/>
|
||||
</hbox>
|
||||
<!-- TODO: localize -->
|
||||
<button id="zotero-item-restore-button" label="Restore to Library"
|
||||
oncommand="ZoteroPane.restoreSelectedItems()" hidden="true"/>
|
||||
|
|
@ -423,6 +431,7 @@
|
|||
</deck>
|
||||
</vbox>
|
||||
</hbox>
|
||||
</vbox>
|
||||
|
||||
<!-- Barrier to prevent tabbing into Zotero pane when busy -->
|
||||
<box id="zotero-pane-tab-catcher-bottom" hidden="true" align="center" pack="center" style="opacity: 0">
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user