From 9aa19985f06615a69dd51d1978c83c8f8df8be1e Mon Sep 17 00:00:00 2001
From: Randy Baumgarte <randy@fbn.cx>
Date: Thu, 7 Oct 2010 14:48:18 -0400
Subject: [PATCH] Change spell check defaults and allow options to be changed
 without a restart.

---
 src/cx/fbn/nevernote/Global.java            |  2 ++
 src/cx/fbn/nevernote/dialog/SpellCheck.java | 13 +++--------
 src/cx/fbn/nevernote/gui/BrowserWindow.java | 34 +++++++++++++++--------------
 3 files changed, 23 insertions(+), 26 deletions(-)

diff --git a/src/cx/fbn/nevernote/Global.java b/src/cx/fbn/nevernote/Global.java
index a13f695..d9da6fb 100644
--- a/src/cx/fbn/nevernote/Global.java
+++ b/src/cx/fbn/nevernote/Global.java
@@ -1062,6 +1062,8 @@ public class Global {
 			return true;
 		if (value.equalsIgnoreCase(Configuration.SPELL_IGNOREUPPERCASE))
 			return true;
+		if (value.equalsIgnoreCase(Configuration.SPELL_IGNORESENTENCECAPITALIZATION))
+			return true;
 		return false;
     }
     public static void setSpellSetting(String setting, boolean val) {
diff --git a/src/cx/fbn/nevernote/dialog/SpellCheck.java b/src/cx/fbn/nevernote/dialog/SpellCheck.java
index e400bba..beb3ced 100644
--- a/src/cx/fbn/nevernote/dialog/SpellCheck.java
+++ b/src/cx/fbn/nevernote/dialog/SpellCheck.java
@@ -182,16 +182,9 @@ public class SpellCheck extends QDialog {
 		replacementWord.setText(word);
 	}
 	
-	public void setNoSuggestions(boolean enable) {
-		if (enable) {
-			replacementWord.setEnabled(true);
-			replace.setEnabled(true);
-			suggestions.setEnabled(true);
-		} else {
-			replacementWord.setEnabled(false);
-			replace.setEnabled(false);
-			suggestions.setEnabled(false);
-		}
+	// Empty out the list
+	public void clearSuggestions() {
+		suggestions.clear();
 	}
 	
 	public void setSelectedSuggestion(int index) {
diff --git a/src/cx/fbn/nevernote/gui/BrowserWindow.java b/src/cx/fbn/nevernote/gui/BrowserWindow.java
index 3c35f98..e9005dd 100644
--- a/src/cx/fbn/nevernote/gui/BrowserWindow.java
+++ b/src/cx/fbn/nevernote/gui/BrowserWindow.java
@@ -244,14 +244,14 @@ public class BrowserWindow extends QWidget {
 			spellCheckDialog = new SpellCheck(checker);
 		}
 		public void spellingError(SpellCheckEvent event) {
+			System.out.println("**" +event.getInvalidWord());
 			errorsFound = true;
 			spellCheckDialog.setWord(event.getInvalidWord());
 
 		    List<Word> suggestions = event.getSuggestions();
-		    if (suggestions.isEmpty()) {
-		       spellCheckDialog.setNoSuggestions(true);
-		    } else {
-		       spellCheckDialog.setCurrentSuggestion(suggestions.get(0).getWord());
+		    spellCheckDialog.clearSuggestions();
+		    if (!suggestions.isEmpty()) {
+//		       spellCheckDialog.setCurrentSuggestion(suggestions.get(0).getWord());
 		       for (int i=0; i<suggestions.size(); i++) {
 		          spellCheckDialog.addSuggestion(suggestions.get(i).getWord());
 		       }
@@ -260,6 +260,7 @@ public class BrowserWindow extends QWidget {
 		    spellCheckDialog.exec();
 		    if (spellCheckDialog.cancelPressed()) {
 		    	abortSpellCheck = true;
+		    	event.cancel();
 		    	return;
 		    }
 		    if (spellCheckDialog.replacePressed()) {
@@ -267,6 +268,7 @@ public class BrowserWindow extends QWidget {
 		    	clipboard.setText(spellCheckDialog.getReplacementWord()); 
 		    	parent.pasteClicked();
 		    }
+		    event.cancel();
 		 }
 	}
 
@@ -2681,18 +2683,6 @@ public class BrowserWindow extends QWidget {
 			dictionary = new SpellDictionaryHashMap(wordList);
 			spellChecker = new SpellChecker(dictionary);
 			
-			// Read user settings
-			spellChecker.getConfiguration().setBoolean(Configuration.SPELL_IGNOREDIGITWORDS, 
-					Global.getSpellSetting(Configuration.SPELL_IGNOREDIGITWORDS));
-			spellChecker.getConfiguration().setBoolean(Configuration.SPELL_IGNOREINTERNETADDRESSES, 
-					Global.getSpellSetting(Configuration.SPELL_IGNOREINTERNETADDRESSES));
-			spellChecker.getConfiguration().setBoolean(Configuration.SPELL_IGNOREMIXEDCASE, 
-					Global.getSpellSetting(Configuration.SPELL_IGNOREMIXEDCASE));
-			spellChecker.getConfiguration().setBoolean(Configuration.SPELL_IGNOREUPPERCASE, 
-					Global.getSpellSetting(Configuration.SPELL_IGNOREUPPERCASE));
-			spellChecker.getConfiguration().setBoolean(Configuration.SPELL_IGNORESENTENCECAPITALIZATION, 
-					Global.getSpellSetting(Configuration.SPELL_IGNORESENTENCECAPITALIZATION));
-			
 			File userWordList;
 			userWordList = new File(Global.getFileManager().getSpellDirPathUser()+"user.dic");
 			
@@ -2731,6 +2721,18 @@ public class BrowserWindow extends QWidget {
 		if (spellChecker == null) {
 			setupDictionary();	
 		}
+		
+		// Read user settings
+		spellChecker.getConfiguration().setBoolean(Configuration.SPELL_IGNOREDIGITWORDS, 
+				Global.getSpellSetting(Configuration.SPELL_IGNOREDIGITWORDS));
+		spellChecker.getConfiguration().setBoolean(Configuration.SPELL_IGNOREINTERNETADDRESSES, 
+				Global.getSpellSetting(Configuration.SPELL_IGNOREINTERNETADDRESSES));
+		spellChecker.getConfiguration().setBoolean(Configuration.SPELL_IGNOREMIXEDCASE, 
+				Global.getSpellSetting(Configuration.SPELL_IGNOREMIXEDCASE));
+		spellChecker.getConfiguration().setBoolean(Configuration.SPELL_IGNOREUPPERCASE, 
+				Global.getSpellSetting(Configuration.SPELL_IGNOREUPPERCASE));
+		spellChecker.getConfiguration().setBoolean(Configuration.SPELL_IGNORESENTENCECAPITALIZATION, 
+				Global.getSpellSetting(Configuration.SPELL_IGNORESENTENCECAPITALIZATION));
 
 		spellListener.abortSpellCheck = false;
 		spellListener.errorsFound = false;
-- 
2.11.0