suzanne.soy/zotero
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

WIP: Toggling works

Browse Source
This commit is contained in:
Georges Dupéron 2018-06-16 17:31:04 +02:00
parent eab2ba3cea
commit f8d4230cfd
3 changed files with 24 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
chrome/content/zotero/zoteroPane.js
View File

@ -406,6 +406,7 @@ var ZoteroPane = new function()
_madeVisible = true;
this.unserializePersist();
this.updateCollectionLookupToolbarButton();
this.updateLayout();
this.updateToolbarPosition();
this.updateTagSelectorSize();
@ -947,6 +948,17 @@ var ZoteroPane = new function()
return collection.saveTx();
});
this.showCollectionLookup = Zotero.Promise.coroutine(function* (parentKey) {
var collectionsLookupTextbox = document.getElementById('zotero-collection-lookup-textbox');
collectionsLookupTextbox.hidden = !collectionsLookupTextbox.hidden;
this.updateCollectionLookupToolbarButton();
});
this.updateCollectionLookupToolbarButton = function () {
var collectionsLookupTextbox = document.getElementById('zotero-collection-lookup-textbox');
var toolbarButton = document.getElementById('zotero-tb-show-collection-lookup');
toolbarButton.checked = !collectionsLookupTextbox.hidden;
};
this.importFeedsFromOPML = Zotero.Promise.coroutine(function* (event) {
var nsIFilePicker = Components.interfaces.nsIFilePicker;
while (true) {
@ -2445,6 +2457,10 @@ var ZoteroPane = new function()
id: "newCollection",
command: "cmd_zotero_newCollection"
},
{
id: "showCollectionLookup",
command: "cmd_zotero_showCollectionLookup"
},
{
id: "newSavedSearch",
command: "cmd_zotero_newSavedSearch"
@ -4947,6 +4963,9 @@ var ZoteroPane = new function()
var serializedValues = Zotero.Prefs.get("pane.persist");
if(!serializedValues) return;
serializedValues = JSON.parse(serializedValues);
if (!serializedValues["zotero-collection-lookup-textbox"]) {
serializedValues["zotero-collection-lookup-textbox"] = { hidden: true }; // hidden by default.
}
for(var id in serializedValues) {
var el = document.getElementById(id);
if(!el) return;

5
chrome/content/zotero/zoteroPane.xul
View File

@ -62,6 +62,7 @@
<command id="cmd_zotero_createTimeline" oncommand="Zotero_Timeline_Interface.loadTimeline();"/>
<command id="cmd_zotero_rtfScan" oncommand="window.openDialog('chrome://zotero/content/rtfScan.xul', 'rtfScan', 'chrome,centerscreen')"/>
<command id="cmd_zotero_newCollection" oncommand="ZoteroPane_Local.newCollection()"/>
<command id="cmd_zotero_showCollectionLookup" oncommand="ZoteroPane_Local.showCollectionLookup()"/>
<command id="cmd_zotero_newFeed_fromURL" oncommand="ZoteroPane_Local.newFeedFromURL()"/>
<command id="cmd_zotero_newSavedSearch" oncommand="ZoteroPane_Local.newSearch()"/>
<command id="cmd_zotero_newStandaloneNote" oncommand="ZoteroPane_Local.newNote(event.shiftKey);"/>
@ -285,6 +286,7 @@
<menuseparator/>
<menuitem class="zotero-menuitem-show-duplicates" label="&zotero.toolbar.duplicate.label;"/>
<menuitem class="zotero-menuitem-show-unfiled" label="&zotero.collections.showUnfiledItems;"/>
<menuitem class="zotero-menuitem-show-collection-lookup" label="&zotero.toolbar.showCollectionLookup.label;"/>
<menuitem class="zotero-menuitem-edit-collection"/>
<menuitem class="zotero-menuitem-mark-read-feed" label="&zotero.toolbar.markFeedRead.label;"/>
<menuitem class="zotero-menuitem-edit-feed" label="&zotero.toolbar.feeds.edit;"/>
@ -344,7 +346,8 @@
<box id="zotero-collections-tree-shim"/>
<!-- This extra vbox prevents the toolbar from getting compressed when resizing
the tag selector to max height -->
<textbox id="collections-lookup-textbox" flex="0" type="search" timeout="250" dir="reverse"
<textbox id="zotero-collection-lookup-textbox" flex="0" type="search" timeout="250" dir="reverse"
zotero-persist="hidden"
oncommand="document.getBindingParent(this).handleKeyPress(); event.stopPropagation()"
onkeypress="if (event.keyCode == event.DOM_VK_ESCAPE) { document.getBindingParent(this).handleKeyPress(true); }"/>
<tree id="zotero-collections-tree"

2
chrome/skin/default/zotero/overlay.css
View File

@ -375,7 +375,7 @@
list-style-image: url('chrome://zotero/skin/library_add.png');
}
#zotero-tb-collection-lookup
#zotero-tb-show-collection-lookup
{
list-style-image: url('chrome://zotero/skin/toolbar-advanced-search.png');
}