From 98f62c6d3faf2a9fe1220648b52bd103fb1e7abe Mon Sep 17 00:00:00 2001
From: Dan Stillman <dstillman@zotero.org>
Date: Sun, 3 Mar 2013 05:13:40 -0500
Subject: [PATCH] Switch notes column back to counts, and hide by default

While the attachment icon helps with on-demand download, a count is
probably more useful for notes, and between tag colors and the two
dot columns things were getting a little Dance Dance Revolution.
---
 chrome/content/zotero/selectItemsDialog.xul |  2 +-
 chrome/content/zotero/xpcom/itemTreeView.js | 36 +++++++++------------
 chrome/content/zotero/zoteroPane.xul        |  2 +-
 chrome/skin/default/zotero/overlay.css      |  7 ++--
 4 files changed, 23 insertions(+), 24 deletions(-)

diff --git a/chrome/content/zotero/selectItemsDialog.xul b/chrome/content/zotero/selectItemsDialog.xul
index 9b39d3c74..3021a5f4b 100644
--- a/chrome/content/zotero/selectItemsDialog.xul
+++ b/chrome/content/zotero/selectItemsDialog.xul
@@ -239,7 +239,7 @@
 					zotero-persist="width ordinal hidden sortActive sortDirection"/>
 				<splitter class="tree-splitter"/>
 				<treecol
-					id="zotero-items-column-hasNote"
+					id="zotero-items-column-numNotes" hidden="true"
 					class="treecol-image"
 					label="&zotero.tabs.notes.label;"
 					src="chrome://zotero/skin/treeitem-note-small.png"
diff --git a/chrome/content/zotero/xpcom/itemTreeView.js b/chrome/content/zotero/xpcom/itemTreeView.js
index b454ed149..a45c0d491 100644
--- a/chrome/content/zotero/xpcom/itemTreeView.js
+++ b/chrome/content/zotero/xpcom/itemTreeView.js
@@ -335,7 +335,7 @@ Zotero.ItemTreeView.prototype._refreshGenerator = function()
 		var field = visibleFields[i];
 		switch (field) {
 			case 'hasAttachment':
-			case 'hasNote':
+			case 'numNotes':
 				continue;
 			
 			case 'year':
@@ -897,7 +897,7 @@ Zotero.ItemTreeView.prototype.getCellText = function(row, column)
 	var val;
 	
 	// Image only
-	if (column.id === "zotero-items-column-hasAttachment" || column.id === "zotero-items-column-hasNote") {
+	if (column.id === "zotero-items-column-hasAttachment") {
 		return;
 	}
 	else if(column.id == "zotero-items-column-type")
@@ -908,6 +908,9 @@ Zotero.ItemTreeView.prototype.getCellText = function(row, column)
 	else if (column.id == "zotero-items-column-year") {
 		val = obj.getField('date', true).substr(0, 4)
 	}
+	else if (column.id === "zotero-items-column-numNotes") {
+		val = obj.numNotes();
+	}
 	else {
 		var col = column.id.substring(20);
 		
@@ -1061,19 +1064,6 @@ Zotero.ItemTreeView.prototype.getImageSrc = function(row, col)
 			}
 		}
 	}
-	else if (col.id == 'zotero-items-column-hasNote') {
-		if (this._itemGroup.isTrash()) return false;
-		
-		var treerow = this._getItemAtRow(row);
-		if (treerow.level === 0 && treerow.ref.isRegularItem() && treerow.ref.numNotes(false, true)) {
-			return "chrome://zotero/skin/bullet_yellow.png";
-		}
-		else if (treerow.ref.isAttachment()) {
-			if (treerow.ref.hasNote()) {
-				return "chrome://zotero/skin/bullet_yellow.png";
-			}
-		}
-	}
 }
 
 Zotero.ItemTreeView.prototype.isContainer = function(row)
@@ -1330,12 +1320,11 @@ Zotero.ItemTreeView.prototype.sort = function(itemID)
 			};
 			break;
 		
-		case 'hasNote':
+		case 'numNotes':
 			getField = function (row) {
-				if (!row.ref.isRegularItem()) {
-					return 0;
-				}
-				return row.ref.numNotes(false, true) ? 1 : 0;
+				// Sort descending by default
+				order = !order;
+				return row.numNotes(false, true) || 0;
 			};
 			break;
 		
@@ -3007,3 +2996,10 @@ Zotero.ItemTreeView.TreeRow.prototype.getField = function(field, unformatted)
 {
 	return this.ref.getField(field, unformatted, true);
 }
+
+Zotero.ItemTreeView.TreeRow.prototype.numNotes = function() {
+	if (!this.ref.isRegularItem()) {
+		return '';
+	}
+	return this.ref.numNotes(false, true) || '';
+}
diff --git a/chrome/content/zotero/zoteroPane.xul b/chrome/content/zotero/zoteroPane.xul
index f703c8de3..a1be11f07 100644
--- a/chrome/content/zotero/zoteroPane.xul
+++ b/chrome/content/zotero/zoteroPane.xul
@@ -507,7 +507,7 @@
 									zotero-persist="width ordinal hidden sortActive sortDirection"/>
 								<splitter class="tree-splitter"/>
 								<treecol
-									id="zotero-items-column-hasNote"
+									id="zotero-items-column-numNotes" hidden="true"
 									class="treecol-image"
 									label="&zotero.tabs.notes.label;"
 									src="chrome://zotero/skin/treeitem-note-small.png"
diff --git a/chrome/skin/default/zotero/overlay.css b/chrome/skin/default/zotero/overlay.css
index f7ff12791..3a8be142c 100644
--- a/chrome/skin/default/zotero/overlay.css
+++ b/chrome/skin/default/zotero/overlay.css
@@ -52,11 +52,14 @@
 	background-image: none;
 }
 
-#zotero-items-column-hasAttachment, #zotero-items-column-hasNote
-{
+#zotero-items-column-hasAttachment, #zotero-items-column-numNotes {
 	min-width: 21px;
 }
 
+#zotero-items-column-numNotes {
+	text-align: center;
+}
+
 #zotero-items-tree treechildren::-moz-tree-image
 {
 	margin-right: 5px;