From e36b41f6c2862467dfdcb00dba549ced280c2d23 Mon Sep 17 00:00:00 2001
From: Dan Stillman <dstillman@zotero.org>
Date: Sat, 31 Jan 2009 06:19:14 +0000
Subject: [PATCH] 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
---
 chrome/content/zotero/xpcom/collectionTreeView.js |   6 +++++-
 .../skin/default/zotero/treesource-trash-full.png | Bin 0 -> 476 bytes
 chrome/skin/default/zotero/treesource-trash.png   | Bin 0 -> 363 bytes
 defaults/preferences/zotero.js                    |   1 +
 4 files changed, 6 insertions(+), 1 deletion(-)
 create mode 100644 chrome/skin/default/zotero/treesource-trash-full.png
 create mode 100644 chrome/skin/default/zotero/treesource-trash.png

diff --git a/chrome/content/zotero/xpcom/collectionTreeView.js b/chrome/content/zotero/xpcom/collectionTreeView.js
index a6e6deb3b..b26bf5d29 100644
--- 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
new file mode 100644
index 0000000000000000000000000000000000000000..ebad933c8b3729a9b27dc34c5a111600b8d46fdb
GIT binary patch
literal 476
zcmV<20VDp2P)<h;3K|Lk000e1NJLTq000mG000mO1ONa4wfZ;e00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUzZb?KzR2Ufr
z!M{sXaR31D&wF0Vo!1pb7By6;L}U@&($FA8fo(=@_6MY!)z;cnTQocLgBHnJf@lfE
z{s0>!P6q=I0_iwCeRuEs-nY*ui2wlBo{da&-rimXk_dpOx8l9Y2eXq^TiLre{gv0N
zh@vQpp3E(_zQv8WAB*@mevb>S`MD?sAf3NIKIx==eZ#Jr9#7|~0H2e>)YKJ;10yn{
zb~SBXr^1(^@_cc&7(P~SnNU?q95~@CRVtL1isxZE)U%{&!=XelB6GnODxd1btErjO
zj_6poZCs)d1RVpU;qKVX8HX|rHyyQURHCLW%8}-eFWR-IYhR*iQ<NGq5ameoQx$(?
zGCc?Cy8eNILXLE>-E&#nFI_$K^_5DwQb0QR_*>mIH#Cqd99N2l)Z|DPKCCbQ(9lp-
zvu47Wa~kew3p-R8Jp8%booy=RR$@JQDF}+Z*eRMM5iCB+Uxaqp3-6bf0D%9<g`Zv*
S8HAw#0000<MNUMnLSTZQJj}uX

literal 0
HcmV?d00001

diff --git a/chrome/skin/default/zotero/treesource-trash.png b/chrome/skin/default/zotero/treesource-trash.png
new file mode 100644
index 0000000000000000000000000000000000000000..afe22ba99ee8e124ef1ef685064b320f26ec1553
GIT binary patch
literal 363
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!60wlNoGJgf6SkfJR9T^zbpD<_bdI{u9mbgZg
z1m~xflqVLYGB~E>C#5QQ<|d}62BjvZR2H60wE-&n>*?YcA|c6o&|A+rkb&Vsas2(@
zRZChzd<-rL%s+C)K`AUj&@4exERnTGr7g|ufjFlYo2X-lQc?W<Qa=x%0Sz(@n_IWn
zT7Uf+C3xl1b7!l$b~maxI1hYGtzP+%sWq{<?#sHe>BS5|%h$H~-pP=>{CWcO1^&sC
zas{(rHNEeVX?R|+D*2koKAT-1TVxuXF7Gt2pCrhe%W27Qah0e`>%4W-qEi^2ys8L$
zkzFy>C52%M!-~#H9Xt(<TnrZ-T-Y2mnO02EQZ-_*tKWTff~275Gv&SiCNO>|Evme3
znsTM3@O9jy7lMk63GZ(u8Hac+{l2Nv{)WYyc2KzeV81veQkLz}aZs=_c)I$ztaD0e
F0sv?9ij)8V

literal 0
HcmV?d00001

diff --git a/defaults/preferences/zotero.js b/defaults/preferences/zotero.js
index da2b0247a..94ae19358 100644
--- 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);