From: Randy Baumgarte <randy@fbn.cx>
Date: Mon, 21 Mar 2011 16:34:16 +0000 (-0400)
Subject: Correct trash counts.
X-Git-Tag: version0.1.1~176
X-Git-Url: http://git.sourceforge.jp/view?p=neighbornote%2FNeighborNote.git;a=commitdiff_plain;h=d32cec960c1ff48868b7322cc39a69149ae12164;hp=39039c6b55d21ab76eddc309f873ba07dd38bedf;ds=sidebyside

Correct trash counts.
---

diff --git a/src/cx/fbn/nevernote/NeverNote.java b/src/cx/fbn/nevernote/NeverNote.java
index 8ac26d2..df7890e 100644
--- a/src/cx/fbn/nevernote/NeverNote.java
+++ b/src/cx/fbn/nevernote/NeverNote.java
@@ -2624,7 +2624,9 @@ public class NeverNote extends QMainWindow{
 								+"JTidy is copyrighted under the World Wide Web Consortium<br>"
 								+"Apache Common Utilities licensed under the Apache License Version 2.0<br>"
 								+"Jazzy is licened under the LGPL<br>"
-								+"Java is a registered trademark of Oracle Corporation.<br><hr>"));	
+								+"Java is a registered trademark of Oracle Corporation.<br><hr>"
+								+"Special thanks to:<br>BitRock InstallBuilder for the Windows installer"
+								+"<br>CodeCogs (www.codecogs.com) for the LaTeX image rendering."));
 		logger.log(logger.HIGH, "Leaving NeverNote.about");
 	}
 	// Hide the entire left hand side
diff --git a/src/cx/fbn/nevernote/threads/CounterRunner.java b/src/cx/fbn/nevernote/threads/CounterRunner.java
index 7978804..3531964 100644
--- a/src/cx/fbn/nevernote/threads/CounterRunner.java
+++ b/src/cx/fbn/nevernote/threads/CounterRunner.java
@@ -172,13 +172,13 @@ public class CounterRunner extends QObject implements Runnable {
 			for (int j=0; j<nCounter.size(); j++) {
 				if (abortCount)
 					return;
-				if (nCounter.get(j).getGuid().equals(records.get(i).notebookGuid)) {
+				if (records.get(i).active && nCounter.get(j).getGuid().equals(records.get(i).notebookGuid)) {
 					nCounter.get(j).setCount(nCounter.get(j).getCount()+1);
 					found = true;
 					j=nCounter.size();
 				}
 			}
-			if (!found) {
+			if (!found && records.get(i).active) {
 				NotebookCounter newCounter = new NotebookCounter();
 				newCounter.setGuid(records.get(i).notebookGuid);
 				newCounter.setCount(1);
@@ -313,6 +313,7 @@ public class CounterRunner extends QObject implements Runnable {
 		if (abortCount)
 			return;
 
+		System.out.println("***"+tCounter);
 		trashSignal.countChanged.emit(tCounter);
 		logger.log(logger.EXTREME, "Leaving CounterRunner.countTrashResults()");
 	}
diff --git a/src/cx/fbn/nevernote/utilities/ListManager.java b/src/cx/fbn/nevernote/utilities/ListManager.java
index 1edad42..3ed0039 100644
--- a/src/cx/fbn/nevernote/utilities/ListManager.java
+++ b/src/cx/fbn/nevernote/utilities/ListManager.java
@@ -1022,7 +1022,7 @@ public class ListManager  {
 	public void reloadTrashCount() {
 		logger.log(logger.EXTREME, "Entering ListManager.reloadTrashCount");
 		trashCounterRunner.abortCount = true;
-		trashCounterRunner.setNoteIndex(getNoteIndex());
+		trashCounterRunner.setNoteIndex(getMasterNoteIndex());
 		trashCounterRunner.release(CounterRunner.TRASH);
 		logger.log(logger.EXTREME, "Leaving ListManager.reloadTrashCount");
 	}