www

commit e36b41f6c2862467dfdcb00dba549ced280c2d23
parent 61e1131fc154dab6b0de53c3c7181f888827dd5e
Author: Dan Stillman <dstillman@zotero.org>
Date:   Sat, 31 Jan 2009 06:19:14 +0000

Display trash can all the time, unless showTrashWhenEmpty is set to false

- Icon isn't currently reset to empty state when all trashed items are removed
- Dragging doesn't yet work

Addresses #513


Diffstat:
M
chrome/content/zotero/xpcom/collectionTreeView.js
 | 
6
+++++-
A
chrome/skin/default/zotero/treesource-trash-full.png
 | 
0

A
chrome/skin/default/zotero/treesource-trash.png
 | 
0

M
defaults/preferences/zotero.js
 | 
1
+

4 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/chrome/content/zotero/xpcom/collectionTreeView.js b/chrome/content/zotero/xpcom/collectionTreeView.js
@@ -165,9 +165,10 @@ Zotero.CollectionTreeView.prototype.refresh = function()
 	}
 	
 	var deletedItems = Zotero.Items.getDeleted();
-	if (deletedItems) {
+	if (deletedItems || Zotero.Prefs.get("showTrashWhenEmpty")) {
 		this._showItem(new Zotero.ItemGroup('trash', null), 0, this._dataItems.length);
 	}
+	this.trashNotEmpty = !!deletedItems;
 	
 	this._refreshHashMap();
 	
@@ -375,6 +376,9 @@ Zotero.CollectionTreeView.prototype.getCellText = function(row, column)
 Zotero.CollectionTreeView.prototype.getImageSrc = function(row, col)
 {
 	var collectionType = this._getItemAtRow(row).type;
+	if (collectionType == 'trash' && this.trashNotEmpty) {
+		collectionType += "-full";
+	}
 	return "chrome://zotero/skin/treesource-" + collectionType + ".png";
 }
 
diff --git a/chrome/skin/default/zotero/treesource-trash-full.png b/chrome/skin/default/zotero/treesource-trash-full.png
Binary files differ.
diff --git a/chrome/skin/default/zotero/treesource-trash.png b/chrome/skin/default/zotero/treesource-trash.png
Binary files differ.
diff --git a/defaults/preferences/zotero.js b/defaults/preferences/zotero.js
@@ -33,6 +33,7 @@ pref("extensions.zotero.capitalizeTitles", true);
 pref("extensions.zotero.launchNonNativeFiles", false);
 pref("extensions.zotero.sortNotesChronologically", false);
 pref("extensions.zotero.sortAttachmentsChronologically", false);
+pref("extensions.zotero.showTrashWhenEmpty", true);
 
 pref("extensions.zotero.lastCreatorFieldMode",0);
 pref("extensions.zotero.lastAbstractExpand",0);