OSDN Git Service

Merge branch 'develop' version0.3
authoryuki <kimaira7@gmail.com>
Wed, 11 Sep 2013 03:34:50 +0000 (12:34 +0900)
committeryuki <kimaira7@gmail.com>
Wed, 11 Sep 2013 03:34:50 +0000 (12:34 +0900)
42 files changed:
.classpath
lib/h2-1.3.158.jar [deleted file]
lib/h2-1.3.163.jar [new file with mode: 0644]
lib/h2-lucene-ex-1.3.163.jar [new file with mode: 0644]
lib/lucene-analyzers-3.6.2.jar [new file with mode: 0644]
lib/lucene-core-3.6.2.jar [new file with mode: 0644]
neighbornote-osx
neighbornote.bat
neighbornote.sh
src/cx/fbn/nevernote/Global.java
src/cx/fbn/nevernote/NeverNote.java
src/cx/fbn/nevernote/dialog/ConfigDialog.java
src/cx/fbn/nevernote/dialog/ConfigIndexPage.java
src/cx/fbn/nevernote/dialog/ConfigRensoNoteListPage.java
src/cx/fbn/nevernote/dialog/DatabaseStatus.java
src/cx/fbn/nevernote/gui/BrowserWindow.java
src/cx/fbn/nevernote/gui/MainMenuBar.java
src/cx/fbn/nevernote/gui/RensoNoteList.java
src/cx/fbn/nevernote/gui/RensoNoteListDock.java [new file with mode: 0644]
src/cx/fbn/nevernote/gui/RensoNoteListItem.java
src/cx/fbn/nevernote/gui/TabBrowserWidget.java
src/cx/fbn/nevernote/icons/haltLog.png [new file with mode: 0644]
src/cx/fbn/nevernote/sql/DatabaseConnection.java
src/cx/fbn/nevernote/sql/HistoryTable.java
src/cx/fbn/nevernote/sql/NoteResourceTable.java
src/cx/fbn/nevernote/sql/NoteTable.java
src/cx/fbn/nevernote/sql/REnSearch.java
src/cx/fbn/nevernote/threads/IndexRunner.java
src/cx/fbn/nevernote/xml/NoteFormatter.java
src/cx/fbn/nevernote/xml/XMLInsertHilight.java
translations/neighbornote_ca.ts
translations/neighbornote_da.ts
translations/neighbornote_de.ts
translations/neighbornote_es.ts
translations/neighbornote_fr.ts
translations/neighbornote_ja.ts
translations/neighbornote_pl.ts
translations/neighbornote_pt.ts
translations/neighbornote_ru.ts
translations/neighbornote_sk.ts
translations/neighbornote_zh_CN.ts
translations/neighbornote_zh_TW.ts

index 1fe293f..f45324d 100644 (file)
@@ -3,7 +3,6 @@
        <classpathentry kind="src" path="src"/>
        <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
        <classpathentry kind="lib" path="lib/evernote-api-1.25.0.jar"/>
-       <classpathentry kind="lib" path="lib/h2-1.3.158.jar"/>
        <classpathentry kind="lib" path="lib/libthrift.jar"/>
        <classpathentry kind="lib" path="lib/log4j-1.2.14.jar"/>
        <classpathentry kind="lib" path="lib/commons-lang3-3.0.jar"/>
        <classpathentry kind="lib" path="lib/httpcore-4.1.jar"/>
        <classpathentry kind="lib" path="lib/httpmime-4.1.1.jar"/>
        <classpathentry kind="lib" path="lib/pdfbox-app-1.6.0.jar"/>
-       <classpathentry kind="lib" path="C:/pleiades/scribe-1.3.0.jar"/>
-       <classpathentry kind="lib" path="C:/pleiades/qtjambi-win32-lgpl-4.5.2_01/qtjambi-4.5.2_01.jar"/>
-       <classpathentry kind="lib" path="C:/pleiades/qtjambi-win32-lgpl-4.5.2_01/qtjambi-win32-msvc2005-4.5.2_01.jar"/>
+       <classpathentry kind="lib" path="lib/scribe-1.3.0.jar"/>
+       <classpathentry kind="lib" path="C:/Users/Yuki/Desktop/pleiades/qtjambi-win64-4.5.2_01.jar"/>
+       <classpathentry kind="lib" path="C:/Users/Yuki/Desktop/pleiades/qtjambi-win64-msvc2005x64-4.5.2_01.jar"/>
+       <classpathentry kind="lib" path="lib/lucene-core-3.6.2.jar"/>
+       <classpathentry kind="lib" path="lib/h2-1.3.163.jar"/>
+       <classpathentry kind="lib" path="lib/h2-lucene-ex-1.3.163.jar"/>
+       <classpathentry kind="lib" path="lib/lucene-analyzers-3.6.2.jar"/>
        <classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/lib/h2-1.3.158.jar b/lib/h2-1.3.158.jar
deleted file mode 100644 (file)
index b62b456..0000000
Binary files a/lib/h2-1.3.158.jar and /dev/null differ
diff --git a/lib/h2-1.3.163.jar b/lib/h2-1.3.163.jar
new file mode 100644 (file)
index 0000000..ea557bd
Binary files /dev/null and b/lib/h2-1.3.163.jar differ
diff --git a/lib/h2-lucene-ex-1.3.163.jar b/lib/h2-lucene-ex-1.3.163.jar
new file mode 100644 (file)
index 0000000..a1683dc
Binary files /dev/null and b/lib/h2-lucene-ex-1.3.163.jar differ
diff --git a/lib/lucene-analyzers-3.6.2.jar b/lib/lucene-analyzers-3.6.2.jar
new file mode 100644 (file)
index 0000000..752c714
Binary files /dev/null and b/lib/lucene-analyzers-3.6.2.jar differ
diff --git a/lib/lucene-core-3.6.2.jar b/lib/lucene-core-3.6.2.jar
new file mode 100644 (file)
index 0000000..bdc96ab
Binary files /dev/null and b/lib/lucene-core-3.6.2.jar differ
index 56475de..879aeda 100644 (file)
@@ -92,7 +92,8 @@ NN_CLASSPATH=$NN_CLASSPATH:$NEIGHBORNOTE/lib/commons-compress-1.2.jar
 NN_CLASSPATH=$NN_CLASSPATH:$NEIGHBORNOTE/lib/commons-lang3-3.0.jar
 NN_CLASSPATH=$NN_CLASSPATH:$NEIGHBORNOTE/lib/commons-logging-1.1.1.jar
 NN_CLASSPATH=$NN_CLASSPATH:$NEIGHBORNOTE/lib/evernote-api-1.25.0.jar
-NN_CLASSPATH=$NN_CLASSPATH:$NEIGHBORNOTE/lib/h2-1.3.158.jar
+NN_CLASSPATH=$NN_CLASSPATH:$NEIGHBORNOTE/lib/h2-1.3.163.jar
+NN_CLASSPATH=$NN_CLASSPATH:$NEIGHBORNOTE/lib/h2-lucene-ex-1.3.163.jar
 NN_CLASSPATH=$NN_CLASSPATH:$NEIGHBORNOTE/lib/httpclient-4.1.1.jar
 NN_CLASSPATH=$NN_CLASSPATH:$NEIGHBORNOTE/lib/httpcore-4.1.jar
 NN_CLASSPATH=$NN_CLASSPATH:$NEIGHBORNOTE/lib/httpmime-4.1.1.jar
@@ -101,6 +102,8 @@ NN_CLASSPATH=$NN_CLASSPATH:$NEIGHBORNOTE/lib/jazzy.jar
 NN_CLASSPATH=$NN_CLASSPATH:$NEIGHBORNOTE/lib/jtidy-r938.jar
 NN_CLASSPATH=$NN_CLASSPATH:$NEIGHBORNOTE/lib/libthrift.jar
 NN_CLASSPATH=$NN_CLASSPATH:$NEIGHBORNOTE/lib/log4j-1.2.14.jar
+NN_CLASSPATH=$NN_CLASSPATH:$NEIGHBORNTOE/lib/lucene-analyzers-3.6.2.jar
+NN_CLASSPATH=$NN_CLASSPATH;$NEIGHBORNOTE/lib/lucene-core-3.6.2.jar
 NN_CLASSPATH=$NN_CLASSPATH:$NEIGHBORNOTE/lib/pdfbox-app-1.6.0.jar
 NN_CLASSPATH=$NN_CLASSPATH:$NEIGHBORNOTE/lib/poi-3.7-20101029.jar
 NN_CLASSPATH=$NN_CLASSPATH:$NEIGHBORNOTE/lib/poi-ooxml-3.7.jar
index 2f9ec91..b7303d8 100755 (executable)
@@ -85,7 +85,8 @@ set NN_CLASSPATH=%NN_CLASSPATH%;%NEIGHBORNOTE%lib\commons-compress-1.2.jar
 set NN_CLASSPATH=%NN_CLASSPATH%;%NEIGHBORNOTE%lib\commons-lang3-3.0.jar\r
 set NN_CLASSPATH=%NN_CLASSPATH%;%NEIGHBORNOTE%lib\commons-logging-1.1.1.jar\r
 set NN_CLASSPATH=%NN_CLASSPATH%;%NEIGHBORNOTE%lib\evernote-api-1.25.0.jar\r
-set NN_CLASSPATH=%NN_CLASSPATH%;%NEIGHBORNOTE%lib\h2-1.3.158.jar\r
+set NN_CLASSPATH=%NN_CLASSPATH%;%NEIGHBORNOTE%lib\h2-1.3.163.jar\r
+set NN_CLASSPATH=%NN_CLASSPATH%;%NEIGHBORNOTE%lib\h2-lucene-ex-1.3.163.jar\r
 set NN_CLASSPATH=%NN_CLASSPATH%;%NEIGHBORNOTE%lib\httpclient-4.1.1.jar\r
 set NN_CLASSPATH=%NN_CLASSPATH%;%NEIGHBORNOTE%lib\httpcore-4.1.jar\r
 set NN_CLASSPATH=%NN_CLASSPATH%;%NEIGHBORNOTE%lib\httpmime-4.1.1.jar\r
@@ -94,6 +95,8 @@ set NN_CLASSPATH=%NN_CLASSPATH%;%NEIGHBORNOTE%lib\jazzy.jar
 set NN_CLASSPATH=%NN_CLASSPATH%;%NEIGHBORNOTE%lib\jtidy-r938.jar\r
 set NN_CLASSPATH=%NN_CLASSPATH%;%NEIGHBORNOTE%lib\libthrift.jar\r
 set NN_CLASSPATH=%NN_CLASSPATH%;%NEIGHBORNOTE%lib\log4j-1.2.14.jar\r
+set NN_CLASSPATH=%NN_CLASSPATH%;%NEIGHBORNOTE%lib\lucene-analyzers-3.6.2.jar\r
+set NN_CLASSPATH=%NN_CLASSPATH%;%NEIGHBORNOTE%lib\lucene-core-3.6.2.jar\r
 set NN_CLASSPATH=%NN_CLASSPATH%;%NEIGHBORNOTE%lib\pdfbox-app-1.6.0.jar\r
 set NN_CLASSPATH=%NN_CLASSPATH%;%NEIGHBORNOTE%lib\poi-3.7-20101029.jar\r
 set NN_CLASSPATH=%NN_CLASSPATH%;%NEIGHBORNOTE%lib\poi-ooxml-3.7.jar\r
index a72d7d2..b0dcc05 100644 (file)
@@ -87,7 +87,8 @@ NN_CLASSPATH=$NN_CLASSPATH:$NEIGHBORNOTE/lib/commons-compress-1.2.jar
 NN_CLASSPATH=$NN_CLASSPATH:$NEIGHBORNOTE/lib/commons-lang3-3.0.jar
 NN_CLASSPATH=$NN_CLASSPATH:$NEIGHBORNOTE/lib/commons-logging-1.1.1.jar
 NN_CLASSPATH=$NN_CLASSPATH:$NEIGHBORNOTE/lib/evernote-api-1.25.0.jar
-NN_CLASSPATH=$NN_CLASSPATH:$NEIGHBORNOTE/lib/h2-1.3.158.jar
+NN_CLASSPATH=$NN_CLASSPATH:$NEIGHBORNOTE/lib/h2-1.3.163.jar
+NN_CLASSPATH=$NN_CLASSPATH:$NEIGHBORNOTE/lib/h2-lucene-ex-1.3.163.jar
 NN_CLASSPATH=$NN_CLASSPATH:$NEIGHBORNOTE/lib/httpclient-4.1.1.jar
 NN_CLASSPATH=$NN_CLASSPATH:$NEIGHBORNOTE/lib/httpcore-4.1.jar
 NN_CLASSPATH=$NN_CLASSPATH:$NEIGHBORNOTE/lib/httpmime-4.1.1.jar
@@ -96,6 +97,8 @@ NN_CLASSPATH=$NN_CLASSPATH:$NEIGHBORNOTE/lib/jazzy.jar
 NN_CLASSPATH=$NN_CLASSPATH:$NEIGHBORNOTE/lib/jtidy-r938.jar
 NN_CLASSPATH=$NN_CLASSPATH:$NEIGHBORNOTE/lib/libthrift.jar
 NN_CLASSPATH=$NN_CLASSPATH:$NEIGHBORNOTE/lib/log4j-1.2.14.jar
+NN_CLASSPATH=$NN_CLASSPATH:$NEIGHBORNOTE/lib/lucene-analyzers-3.6.2.jar
+NN_CLASSPATH=$NN_CLASSPATH:$NEIGHBORNOTE/lib/lucene-core-3.6.2.jar
 NN_CLASSPATH=$NN_CLASSPATH:$NEIGHBORNOTE/lib/scribe-1.3.0.jar
 NN_CLASSPATH=$NN_CLASSPATH:$NEIGHBORNOTE/lib/pdfbox-app-1.6.0.jar
 NN_CLASSPATH=$NN_CLASSPATH:$NEIGHBORNOTE/lib/poi-3.7-20101029.jar
index 544d3cf..b6e0e4b 100644 (file)
@@ -53,6 +53,8 @@ import cx.fbn.nevernote.config.StartupConfig;
 import cx.fbn.nevernote.gui.ContainsAttributeFilterTable;
 import cx.fbn.nevernote.gui.DateAttributeFilterTable;
 import cx.fbn.nevernote.gui.ShortcutKeys;
+import cx.fbn.nevernote.sql.DatabaseConnection;
+import cx.fbn.nevernote.sql.driver.NSqlQuery;
 import cx.fbn.nevernote.utilities.ApplicationLogger;
 import cx.fbn.nevernote.utilities.Pair;
 
@@ -67,8 +69,8 @@ import cx.fbn.nevernote.utilities.Pair;
 public class Global {
        // Set current version and the known versions.
        // ICHANGED 自分用に変更
-       public static String version = "0.2";
-       public static String[] validVersions = {"0.2", "0.1.3", "0.1.2", "0.1.1", "0.1"};
+       public static String version = "0.3";
+       public static String[] validVersions = {"0.3", "0.2", "0.1.3", "0.1.2", "0.1.1", "0.1"};
        
     public static String username = ""; 
     //public static String password = "";     
@@ -139,7 +141,7 @@ public class Global {
     //public static int minimumWordCount = 2;
     
     // Regular expression to parse text with when indexing
-    private static String wordRegex;
+//    private static String wordRegex;
     
     // Experimental fixes.  Set via Edit/Preferences/Debugging
     public static boolean enableCarriageReturnFix = false;
@@ -221,10 +223,10 @@ public class Global {
                getServer();  // Setup URL to connect to
                
                // Get regular expressions used to parse out words
-               settings.beginGroup("General");
-               String regex = (String) settings.value("regex", "[,\\s]+");
-               setWordRegex(regex);
-               settings.endGroup();
+//             settings.beginGroup("General");
+//             String regex = (String) settings.value("regex", "[,\\s]+");
+//             setWordRegex(regex);
+//             settings.endGroup();
                
                //Setup debugging information
                settings.beginGroup("Debug");
@@ -251,12 +253,12 @@ public class Global {
     }
 
     // Get/Set word parsing regular expression
-    public static String getWordRegex() {
-       return wordRegex;
-    }
-    public static void setWordRegex(String r) {
-       wordRegex = r;
-    }
+//    public static String getWordRegex() {
+//     return wordRegex;
+//    }
+//    public static void setWordRegex(String r) {
+//     wordRegex = r;
+//    }
 
    // Set the debug message level
    public static void setMessageLevel(String msglevel) {
@@ -1880,18 +1882,18 @@ public class Global {
                settings.endGroup();    
     }
     // Get/Set characters that shouldn't be removed from a word
-    public static String getSpecialIndexCharacters() {
-               settings.beginGroup("Index");
-               String text = (String)settings.value("specialCharacters", "");
-               settings.endGroup();    
-               return text;
-    }
-    public static void setSpecialIndexCharacters(String value) {
-               settings.beginGroup("Index");
-               settings.setValue("specialCharacters", value);
-               settings.endGroup();    
-               databaseCache = value;
-    }
+//    public static String getSpecialIndexCharacters() {
+//             settings.beginGroup("Index");
+//             String text = (String)settings.value("specialCharacters", "");
+//             settings.endGroup();    
+//             return text;
+//    }
+//    public static void setSpecialIndexCharacters(String value) {
+//             settings.beginGroup("Index");
+//             settings.setValue("specialCharacters", value);
+//             settings.endGroup();    
+//             databaseCache = value;
+//    }
     
     //*****************************************************************************
     // Control how tag selection behaves (should they be "and" or "or" selections
@@ -2018,27 +2020,27 @@ public class Global {
     }
     
     // If we should automatically wildcard searches
-    public static boolean automaticWildcardSearches() {
-               settings.beginGroup("General");
-               try {
-                       String value = (String)settings.value("automaticWildcard", "false");
-                       settings.endGroup();
-                       if (value.equals("true"))
-                               return true;
-                       else
-                               return false;
-               } catch (java.lang.ClassCastException e) {
-                       Boolean value = (Boolean) settings.value("automaticWildcard", false);
-                       settings.endGroup();
-                       return value;
-               }
-
-    }
-    public static void setAutomaticWildcardSearches(boolean value) {
-               settings.beginGroup("General");
-               settings.setValue("automaticWildcard", value);
-               settings.endGroup();    
-    }
+//    public static boolean automaticWildcardSearches() {
+//             settings.beginGroup("General");
+//             try {
+//                     String value = (String)settings.value("automaticWildcard", "false");
+//                     settings.endGroup();
+//                     if (value.equals("true"))
+//                             return true;
+//                     else
+//                             return false;
+//             } catch (java.lang.ClassCastException e) {
+//                     Boolean value = (Boolean) settings.value("automaticWildcard", false);
+//                     settings.endGroup();
+//                     return value;
+//             }
+//
+//    }
+//    public static void setAutomaticWildcardSearches(boolean value) {
+//             settings.beginGroup("General");
+//             settings.setValue("automaticWildcard", value);
+//             settings.endGroup();    
+//    }
 
     // If we should automatically select the children of any tag
     public static boolean displayRightToLeft() {
@@ -2139,11 +2141,11 @@ public class Global {
                settings.beginGroup("RensoNoteList");
                Integer value;
                try {
-                       String val  = (String)settings.value("addNewNoteWeight", 1);
+                       String val  = (String)settings.value("addNewNoteWeight", 3);
                        value = new Integer(val.trim());
                } catch (Exception e) {
                        try {
-                               value = (Integer)settings.value("addNewNoteWeight", 1);
+                               value = (Integer)settings.value("addNewNoteWeight", 3);
                        } catch (Exception e1) {
                                value = 1;
                        }
@@ -2234,11 +2236,11 @@ public class Global {
                settings.beginGroup("RensoNoteList");
                Integer value;
                try {
-                       String val = (String)settings.value("enRelatedNotesWeight", 10);
+                       String val = (String)settings.value("enRelatedNotesWeight", 5);
                        value = new Integer(val.trim());
                } catch (Exception e) {
                        try {
-                               value = (Integer)settings.value("enRelatedNotesWeight", 10);
+                               value = (Integer)settings.value("enRelatedNotesWeight", 5);
                        } catch (Exception e1) {
                                value = 10;
                        }
@@ -2345,5 +2347,271 @@ public class Global {
                settings.endGroup();
                return value;
        }
+       
+       // タグを排除してプレーンテキストを抽出
+       public static String extractPlainText(String sourceText) {
+               String plainText = sourceText.replaceAll("<.+?>", "");  // タグを除去
+               plainText = plainText.replaceAll("\\s{2,}", " ");               // 2個以上の空白文字を1文字の空白に変換
+               String kaigyo = System.getProperty("line.separator");
+               plainText = plainText.replaceAll(kaigyo, "");                   // 改行を除去
+//             plainText = plainText.replaceAll("&lt;.+?&gt;", "");    // &lt;で始まり&gt;で終わる文字列を除去
+               
+               // HTML特殊文字のサニタイジングを解除
+               plainText = plainText.replaceAll("&#39;", "'");
+               plainText = plainText.replaceAll("&quot;", "\"");
+               plainText = plainText.replaceAll("&gt;", ">");
+               plainText = plainText.replaceAll("&lt;", "<");
+               plainText = plainText.replaceAll("&amp;", "&");
+               
+               plainText = plainText.replaceAll("&.+?;", "");                  // その他HTML特殊文字があれば除去
+               
+               return plainText;
+       }
+       
+       // 全文検索機能の対象となるテーブルとカラムを再構築
+       public static boolean rebuildFullTextNoteTarget(DatabaseConnection dbConn) {
+               NSqlQuery nQuery = new NSqlQuery(dbConn.getConnection());
+               StringBuilder noteTableTarget = new StringBuilder();
+               boolean success = true;
+               
+               if (Global.indexNoteBody()) {
+                       noteTableTarget.append("CONTENTTEXT");
+               }
+               if (Global.indexNoteTitle()) {
+                       if (noteTableTarget.length() > 0) {
+                               noteTableTarget.append(", ");
+                       }
+                       noteTableTarget.append("TITLE");
+               }
+               
+               if (noteTableTarget.length() > 0) {
+                       nQuery.prepare("CALL FTL_CREATE_INDEX('PUBLIC', 'NOTE', :column);");
+                       nQuery.bindValue(":column", noteTableTarget.toString());
+                       if (!nQuery.exec()) {
+                               success = false;
+                       }
+               }
+               
+               return success;
+       }
+       
+       public static boolean rebuildFullTextResourceTarget(DatabaseConnection dbConn) {
+               NSqlQuery rQuery = new NSqlQuery(dbConn.getResourceConnection());
+               StringBuilder resourceTableTarget = new StringBuilder();
+               boolean success = true;
+               
+               if (Global.indexAttachmentsLocally()) {
+                       resourceTableTarget.append("RESOURCETEXT");
+               }
+               
+               if (resourceTableTarget.length() > 0) {
+                       rQuery.prepare("CALL FTL_CREATE_INDEX('PUBLIC', 'NOTERESOURCES', :column);");
+                       rQuery.bindValue(":column", resourceTableTarget.toString());
+                       if (!rQuery.exec()) {
+                               success = false;
+                       }
+               }
+               
+               return success;
+       }
+       
+    // 操作ログを取らないモードのボタン状態
+    public static boolean isHaltLogButton() {
+               settings.beginGroup("RensoNoteList");
+               try {
+                       String text = (String)settings.value("haltOperationLog", "false");
+                       settings.endGroup();
+                       if (text.equalsIgnoreCase("true"))
+                               return true;
+                       else
+                               return false;
+               } catch (java.lang.ClassCastException e) {
+                       Boolean value = (Boolean) settings.value("haltOperationLog", true);
+                       settings.endGroup();
+                       return value;
+               }
+    }
+    public static void saveHaltLogButton(boolean val) {
+               settings.beginGroup("RensoNoteList");
+               if (val)
+                       settings.setValue("haltOperationLog", "true");
+               else
+                       settings.setValue("haltOperationLog", "false");
+               settings.endGroup();
+    }
+    
+    // 連想ノートリストの重み付けモードの状態
+    public static String rensoWeightingSelect() {
+               settings.beginGroup("RensoNoteList");
+               String text = (String)settings.value("rensoWeightingSelect", "Standard");
+               settings.endGroup();
+               return text;
+    }
+    public static void saveRensoWeightingSelect(String val) {
+               settings.beginGroup("RensoNoteList");
+               settings.setValue("rensoWeightingSelect", val);
+               settings.endGroup();
+    }
+    
+    //ordinal から指定した Enum の要素に変換する汎用関数
+       public static <E extends Enum<E>> E fromOrdinal(Class<E> enumClass, int ordinal) {
+           E[] enumArray = enumClass.getEnumConstants();
+           return enumArray[ordinal];
+       }
+       
+       // 連想ノートリスト重み付けモード:カスタムの設定値(同時閲覧)
+    public static int customBrowseWeight() {
+               settings.beginGroup("RensoNoteList");
+               Integer value;
+               try {
+                       String val  = (String)settings.value("customBrowseWeight", 1);
+                       value = new Integer(val.trim());
+               } catch (Exception e) {
+                       try {
+                               value = (Integer)settings.value("customBrowseWeight", 1);
+                       } catch (Exception e1) {
+                               value = 1;
+                       }
+               }
+               settings.endGroup();
+               return value;
+    }
+       public static void saveCustomBrowseWeight(int weight) {
+               settings.beginGroup("RensoNoteList");
+               settings.setValue("customBrowseWeight", weight);
+               settings.endGroup();
+       }
+       // 連想ノートリスト重み付けモード:カスタムの設定値(コピー&ペースト)
+    public static int customCopyPasteWeight() {
+               settings.beginGroup("RensoNoteList");
+               Integer value;
+               try {
+                       String val  = (String)settings.value("customCopyPasteWeight", 3);
+                       value = new Integer(val.trim());
+               } catch (Exception e) {
+                       try {
+                               value = (Integer)settings.value("customCopyPasteWeight", 3);
+                       } catch (Exception e1) {
+                               value = 3;
+                       }
+               }
+               settings.endGroup();
+               return value;
+    }
+       public static void saveCustomCopyPasteWeight(int weight) {
+               settings.beginGroup("RensoNoteList");
+               settings.setValue("customCopyPasteWeight", weight);
+               settings.endGroup();
+       }
+       // 連想ノートリスト重み付けモード:カスタムの設定値(新規ノート追加)
+    public static int customAddNewNoteWeight() {
+               settings.beginGroup("RensoNoteList");
+               Integer value;
+               try {
+                       String val  = (String)settings.value("customAddNewNoteWeight", 3);
+                       value = new Integer(val.trim());
+               } catch (Exception e) {
+                       try {
+                               value = (Integer)settings.value("customAddNewNoteWeight", 3);
+                       } catch (Exception e1) {
+                               value = 3;
+                       }
+               }
+               settings.endGroup();
+               return value;
+    }
+       public static void saveCustomAddNewNoteWeight(int weight) {
+               settings.beginGroup("RensoNoteList");
+               settings.setValue("customAddNewNoteWeight", weight);
+               settings.endGroup();
+       }
+       // 連想ノートリスト重み付けモード:カスタムの設定値(連想ノートクリック)
+    public static int customRensoItemClickWeight() {
+               settings.beginGroup("RensoNoteList");
+               Integer value;
+               try {
+                       String val  = (String)settings.value("customRensoItemClickWeight", 10);
+                       value = new Integer(val.trim());
+               } catch (Exception e) {
+                       try {
+                               value = (Integer)settings.value("customRensoItemClickWeight", 10);
+                       } catch (Exception e1) {
+                               value = 10;
+                       }
+               }
+               settings.endGroup();
+               return value;
+    }
+       public static void saveCustomRensoItemClickWeight(int weight) {
+               settings.beginGroup("RensoNoteList");
+               settings.setValue("customRensoItemClickWeight", weight);
+               settings.endGroup();
+       }
+       // 連想ノートリスト重み付けモード:カスタムの設定値(同じタグ)
+    public static int customSameTagWeight() {
+               settings.beginGroup("RensoNoteList");
+               Integer value;
+               try {
+                       String val  = (String)settings.value("customSameTagWeight", 2);
+                       value = new Integer(val.trim());
+               } catch (Exception e) {
+                       try {
+                               value = (Integer)settings.value("customSameTagWeight", 2);
+                       } catch (Exception e1) {
+                               value = 2;
+                       }
+               }
+               settings.endGroup();
+               return value;
+    }
+       public static void saveCustomSameTagWeight(int weight) {
+               settings.beginGroup("RensoNoteList");
+               settings.setValue("customSameTagWeight", weight);
+               settings.endGroup();
+       }
+       // 連想ノートリスト重み付けモード:カスタムの設定値(同じノートブック)
+    public static int customSameNotebookWeight() {
+               settings.beginGroup("RensoNoteList");
+               Integer value;
+               try {
+                       String val  = (String)settings.value("customSameNotebookWeight", 2);
+                       value = new Integer(val.trim());
+               } catch (Exception e) {
+                       try {
+                               value = (Integer)settings.value("customSameNotebookWeight", 2);
+                       } catch (Exception e1) {
+                               value = 2;
+                       }
+               }
+               settings.endGroup();
+               return value;
+    }
+       public static void saveCustomSameNotebookWeight(int weight) {
+               settings.beginGroup("RensoNoteList");
+               settings.setValue("customSameNotebookWeight", weight);
+               settings.endGroup();
+       }
+       // 連想ノートリスト重み付けモード:カスタムの設定値(Evernote関連ノート)
+    public static int customENRelatedNotesWeight() {
+               settings.beginGroup("RensoNoteList");
+               Integer value;
+               try {
+                       String val  = (String)settings.value("customENRelatedNotesWeight", 5);
+                       value = new Integer(val.trim());
+               } catch (Exception e) {
+                       try {
+                               value = (Integer)settings.value("customENRelatedNotesWeight", 5);
+                       } catch (Exception e1) {
+                               value = 5;
+                       }
+               }
+               settings.endGroup();
+               return value;
+    }
+       public static void saveCustomENRelatedNotesWeight(int weight) {
+               settings.beginGroup("RensoNoteList");
+               settings.setValue("customENRelatedNotesWeight", weight);
+               settings.endGroup();
+       }
 }
 
index ff17b0d..2c73548 100644 (file)
@@ -106,7 +106,6 @@ import com.trolltech.qt.gui.QComboBox;
 import com.trolltech.qt.gui.QCursor;
 import com.trolltech.qt.gui.QDesktopServices;
 import com.trolltech.qt.gui.QDialog;
-import com.trolltech.qt.gui.QDockWidget;
 import com.trolltech.qt.gui.QFileDialog;
 import com.trolltech.qt.gui.QFileDialog.AcceptMode;
 import com.trolltech.qt.gui.QFileDialog.FileMode;
@@ -181,6 +180,7 @@ import cx.fbn.nevernote.gui.ExternalBrowse;
 import cx.fbn.nevernote.gui.MainMenuBar;
 import cx.fbn.nevernote.gui.NotebookTreeWidget;
 import cx.fbn.nevernote.gui.RensoNoteList;
+import cx.fbn.nevernote.gui.RensoNoteListDock;
 import cx.fbn.nevernote.gui.SavedSearchTreeWidget;
 import cx.fbn.nevernote.gui.SearchPanel;
 import cx.fbn.nevernote.gui.TabBrowse;
@@ -329,12 +329,14 @@ public class NeverNote extends QMainWindow{
     int                                        tagDeadCount=0;                         // number of consecutive dead times for the tag thread
     int                                        trashDeadCount=0;                       // number of consecutive dead times for the trash thread
     int                                saveThreadDeadCount=0;          // number of consecutive dead times for the save thread
+    int                                enRelatedNotesThreadDeadCount=0;        // number of consecutive dead times for the EvernoteRelatedNotes Thread
     boolean                            disableTagThreadCheck=false;
     boolean                            disableNotebookThreadCheck=false;
     boolean                            disableTrashThreadCheck=false;
     boolean                            disableSaveThreadCheck=false;
     boolean                            disableSyncThreadCheck=false;
     boolean                            disableIndexThreadCheck=false;
+    boolean                            disableENRelatedNotesThreadCheck=false;
     
     HashMap<String, String>            noteCache;                      // Cash of note content 
     HashMap<String, Boolean>   readOnlyCache;          // List of cashe notes that are read-only
@@ -364,8 +366,7 @@ public class NeverNote extends QMainWindow{
        // ICHANGED
        private final TabBrowserWidget tabBrowser; // ブラウザウィンドウをタブ化
        private final HashMap<Integer, TabBrowse> tabWindows; // タブウィンドウ
-       private final RensoNoteList rensoNoteList; // 連想ノートリスト
-       private final QDockWidget rensoNoteListDock; // 連想ノートリストドックウィジェット
+       private final RensoNoteListDock rensoNoteListDock; // 連想ノートリストドックウィジェット
        ClipBoardObserver cbObserver;
        String rensoNotePressedItemGuid;
        
@@ -454,9 +455,9 @@ public class NeverNote extends QMainWindow{
                indexThread = new QThread(indexRunner, "Index Thread");
         indexRunner.indexAttachmentsLocally = Global.indexAttachmentsLocally();
         indexRunner.indexImageRecognition = Global.indexImageRecognition();
-        indexRunner.indexNoteBody = Global.indexNoteBody();
-        indexRunner.indexNoteTitle = Global.indexNoteTitle();
-        indexRunner.specialIndexCharacters = Global.getSpecialIndexCharacters();
+//        indexRunner.indexNoteBody = Global.indexNoteBody();
+//        indexRunner.indexNoteTitle = Global.indexNoteTitle();
+//        indexRunner.specialIndexCharacters = Global.getSpecialIndexCharacters();
                indexThread.start();
                
         synchronizeAnimationTimer = new QTimer();
@@ -601,11 +602,11 @@ public class NeverNote extends QMainWindow{
                tabBrowser = new TabBrowserWidget(this);
                tabBrowser.setStyleSheet("QTabBar::tab{width:150px;}");
                tabBrowser.setMovable(true);
+               tabBrowser.setTabsClosable(true);
                TabBrowse tab = new TabBrowse(conn, tabBrowser, cbObserver);
                browserWindow = tab.getBrowserWindow();
                int index = tabBrowser.addNewTab(tab, "");
                tabWindows.put(index, tab);
-               tabBrowser.setTabsClosable(true);
                tabBrowser.currentChanged.connect(this, "tabWindowChanged(int)");
                tabBrowser.tabCloseRequested.connect(this, "tabWindowClosing(int)");
                
@@ -626,11 +627,7 @@ public class NeverNote extends QMainWindow{
         
                // ICHANGED
                // 連想ノートリストをセットアップ
-               rensoNoteList = new RensoNoteList(conn, this, syncRunner);
-               rensoNoteList.itemPressed.connect(this,
-                               "rensoNoteItemPressed(QListWidgetItem)");
-               rensoNoteListDock = new QDockWidget(tr("Renso Note List"), this);
-               rensoNoteListDock.setWidget(rensoNoteList);
+        rensoNoteListDock = new RensoNoteListDock(conn, this, syncRunner, iconPath, tr("Renso Note List"));
                addDockWidget(DockWidgetArea.RightDockWidgetArea, rensoNoteListDock);
 
                if (Global.getListView() == Global.View_List_Wide) {
@@ -1253,7 +1250,7 @@ public class NeverNote extends QMainWindow{
                saveWindowState();
                
                // 連想ノートリストのEvernote関連ノート取得スレッドを終了
-               rensoNoteList.stopThread();
+               rensoNoteListDock.getRensoNoteList().stopThread();
 
                if (tempFiles != null)
                        tempFiles.clear();
@@ -1456,7 +1453,7 @@ public class NeverNote extends QMainWindow{
                saveNoteColumnPositions();
                saveNoteIndexWidth();
                showColumns();
-        ConfigDialog settings = new ConfigDialog(this);
+        ConfigDialog settings = new ConfigDialog(this, conn);
         String dateFormat = Global.getDateFormat();
         String timeFormat = Global.getTimeFormat();
         
@@ -1465,9 +1462,9 @@ public class NeverNote extends QMainWindow{
         
         settings.exec();
         indexRunner.indexAttachmentsLocally = Global.indexAttachmentsLocally();
-        indexRunner.indexNoteBody = Global.indexNoteBody();
-        indexRunner.indexNoteTitle = Global.indexNoteTitle();
-        indexRunner.specialIndexCharacters = Global.getSpecialIndexCharacters();
+//        indexRunner.indexNoteBody = Global.indexNoteBody();
+//        indexRunner.indexNoteTitle = Global.indexNoteTitle();
+//        indexRunner.specialIndexCharacters = Global.getSpecialIndexCharacters();
         indexRunner.indexImageRecognition = Global.indexImageRecognition();
         if (Global.showTrayIcon() || Global.minimizeOnClose())
                trayIcon.show();
@@ -2968,6 +2965,7 @@ public class NeverNote extends QMainWindow{
                status.setResourceCount(conn.getNoteTable().noteResourceTable.getResourceCount());
                status.setWordCount(conn.getWordsTable().getWordCount());
                status.setHistoryCount(conn.getHistoryTable().getHistoryCount());
+               status.setRensoClickCount(conn.getHistoryTable().getRensoClickCount());
                waitCursor(false);
                status.exec();
        }
@@ -3750,6 +3748,7 @@ public class NeverNote extends QMainWindow{
 
                Global.isConnected = syncRunner.isConnected;
                
+               boolean autoLoginMessageFlag = false;
                if (!Global.isConnected) {
                OAuthWindow window = new OAuthWindow(logger);
                if (window.error) {
@@ -3776,6 +3775,7 @@ public class NeverNote extends QMainWindow{
                syncRunner.authToken = tokenizer.oauth_token;
                        syncRunner.enConnect();
                        Global.isConnected = syncRunner.isConnected;
+                       autoLoginMessageFlag = true;
                }
 //             Global.username = syncRunner.username;
                        
@@ -3783,9 +3783,16 @@ public class NeverNote extends QMainWindow{
                        return;
                setupOnlineMenu();
                setupConnectMenuOptions();
+               
+               // 初回ログイン時に自動ログインが無効だったら、有効化するか確認する
+               if (autoLoginMessageFlag && !Global.automaticLogin()) {
+                       if (QMessageBox.question(this, tr("Confirmation"), tr("Are you sure you want to enable the auto-login feature?"), 
+                                       QMessageBox.StandardButton.Yes, QMessageBox.StandardButton.No) == StandardButton.Yes.value()) {
+                               Global.setAutomaticLogin(true);
+                       }
+               }
+               
                logger.log(logger.HIGH, "Leaving NeverNote.remoteConnect");
-
-
     }
     private void setupConnectMenuOptions() {
        logger.log(logger.HIGH, "entering NeverNote.setupConnectMenuOptions");
@@ -4060,7 +4067,7 @@ public class NeverNote extends QMainWindow{
 
                // ICHANGED
                // 連想ノートリストを更新
-               rensoNoteList.refreshRensoNoteList(currentNoteGuid);
+               rensoNoteListDock.getRensoNoteList().refreshRensoNoteList(currentNoteGuid);
                
                waitCursor(false);
                logger.log(logger.HIGH, "Leaving NeverNote.noteTableSelection");
@@ -4909,6 +4916,11 @@ public class NeverNote extends QMainWindow{
                        fromHistory.remove(i + 1);
                }
                
+               // タブが残り1つになったら、閉じるボタンを消す
+               if (tabBrowser.count() == 1) {
+                       tabBrowser.hideTabCloseButton(0);
+               }
+               
                // タブの閉じるボタンを押すと、tabWindowClosingより先にtabWindowChangedが呼ばれてしまうので、手動で呼びなおす
                tabWindowChanged(tabBrowser.currentIndex());
        }
@@ -6746,7 +6758,15 @@ public class NeverNote extends QMainWindow{
                } else
                        indexThreadDeadCount=0;
 
-               
+               if (!rensoNoteListDock.getRensoNoteList().getEnRelatedNotesThread().isAlive()) {
+                       enRelatedNotesThreadDeadCount++;
+                       if (enRelatedNotesThreadDeadCount > MAX && !disableENRelatedNotesThreadCheck) {
+                               QMessageBox.information(this, tr("A thread has died."), tr("It appears as the Evernote Related Notes thread has died.  I recommend "+
+                                       "checking stopping NeighborNote, saving the logs for later viewing, and restarting.  Sorry."));
+                               disableENRelatedNotesThreadCheck = true;
+                       }
+               } else
+                       enRelatedNotesThreadDeadCount=0;
        }
 
        private void thumbnailTimer() {
@@ -7554,7 +7574,7 @@ public class NeverNote extends QMainWindow{
                refreshEvernoteNote(true);
 
                // 連想ノートリストを更新
-               rensoNoteList.refreshRensoNoteList(currentNoteGuid);
+               rensoNoteListDock.getRensoNoteList().refreshRensoNoteList(currentNoteGuid);
        }
        
        // ICHANGD
@@ -7614,7 +7634,7 @@ public class NeverNote extends QMainWindow{
        private void rensoNoteItemPressed(QListWidgetItem current) {
                logger.log(logger.HIGH, "Nevernote.rensoNoteSelectionChangeに入った");
 
-               rensoNotePressedItemGuid = rensoNoteList.getNoteGuid(current);
+               rensoNotePressedItemGuid = rensoNoteListDock.getRensoNoteList().getNoteGuid(current);
                
                // 右クリックだったら終了
                if (QApplication.mouseButtons().isSet(MouseButton.RightButton)) {
@@ -7681,7 +7701,7 @@ public class NeverNote extends QMainWindow{
                // 除外ノートテーブルに追加
                conn.getExcludedTable().addExclusion(guid, currentNoteGuid);
                
-               rensoNoteList.refreshRensoNoteList(currentNoteGuid);
+               rensoNoteListDock.getRensoNoteList().refreshRensoNoteList(currentNoteGuid);
        }
        
        // ICHANGED
@@ -7700,7 +7720,7 @@ public class NeverNote extends QMainWindow{
                // スター付きノートテーブルに追加
                conn.getStaredTable().addStaredItem(currentNoteGuid, guid);
                
-               rensoNoteList.refreshRensoNoteList(currentNoteGuid);
+               rensoNoteListDock.getRensoNoteList().refreshRensoNoteList(currentNoteGuid);
        }
        
        // ICHANGED
@@ -7719,7 +7739,7 @@ public class NeverNote extends QMainWindow{
                // スター付きノートテーブルから削除
                conn.getStaredTable().removeStaredItem(currentNoteGuid, guid);
                
-               rensoNoteList.refreshRensoNoteList(currentNoteGuid);
+               rensoNoteListDock.getRensoNoteList().refreshRensoNoteList(currentNoteGuid);
        }
        
        // ICHANGED
@@ -7763,6 +7783,6 @@ public class NeverNote extends QMainWindow{
        
        // 連想ノートリストのgetter
        public RensoNoteList getRensoNoteList() {
-               return rensoNoteList;
+               return rensoNoteListDock.getRensoNoteList();
        }
 }
index d313565..2e601aa 100644 (file)
@@ -44,6 +44,8 @@ import com.trolltech.qt.gui.QVBoxLayout;
 \r
 import cx.fbn.nevernote.Global;\r
 import cx.fbn.nevernote.NeverNote;\r
+import cx.fbn.nevernote.sql.DatabaseConnection;\r
+import cx.fbn.nevernote.sql.driver.NSqlQuery;\r
 public class ConfigDialog extends QDialog {\r
        private final QListWidget                               contentsWidget;\r
        private final ConfigFontPage                    fontPage;\r
@@ -55,11 +57,13 @@ public class ConfigDialog extends QDialog {
        private final ConfigIndexPage                   indexPage;\r
        private final ConfigRensoNoteListPage   rensoNoteListPage;\r
        private final NeverNote                                 parent;\r
+       private final DatabaseConnection conn;\r
        \r
-    private final String iconPath = new String("classpath:cx/fbn/nevernote/icons/");\r
-       \r
-       public ConfigDialog(NeverNote parent) {\r
+       private final String iconPath = new String("classpath:cx/fbn/nevernote/icons/");\r
+    \r
+       public ConfigDialog(NeverNote parent, DatabaseConnection conn) {\r
                this.parent = parent;\r
+               this.conn = conn;\r
                \r
                contentsWidget = new QListWidget(this);\r
                setWindowIcon(new QIcon(iconPath+"config.png"));\r
@@ -176,13 +180,13 @@ public class ConfigDialog extends QDialog {
                Global.setIndexNoteBody(indexPage.getIndexNoteBody());\r
                Global.setIndexNoteTitle(indexPage.getIndexNoteTitle());\r
                Global.setIndexImageRecognition(indexPage.getIndexImageRecognition());\r
-               Global.setAutomaticWildcardSearches(indexPage.getAutomaticWildcardSearches());\r
-               Global.setSpecialIndexCharacters(indexPage.getSpecialCharacters());\r
+//             Global.setAutomaticWildcardSearches(indexPage.getAutomaticWildcardSearches());\r
+//             Global.setSpecialIndexCharacters(indexPage.getSpecialCharacters());\r
                Global.setIncludeTagChildren(appearancePage.getIncludeTagChildren());\r
                Global.setDisplayRightToLeft(appearancePage.getDisplayRightToLeft());\r
                \r
                Global.userStoreUrl = "https://"+debugPage.getServer()+"/edam/user";\r
-               Global.setWordRegex(indexPage.getRegex());\r
+//             Global.setWordRegex(indexPage.getRegex());\r
                Global.setRecognitionWeight(indexPage.getRecognitionWeight());\r
                Global.setIndexThreadSleepInterval(indexPage.getSleepInterval());\r
                Global.setMessageLevel( debugPage.getDebugLevel());\r
@@ -225,16 +229,26 @@ public class ConfigDialog extends QDialog {
                Global.setDefaultFontSize(fontPage.getFontSize());\r
                Global.setDatabaseCache(debugPage.getDatabaseCacheSize());\r
                \r
-               // ICHANGED\r
                Global.setBrowseWeight(rensoNoteListPage.getBrowseWeight());\r
                Global.setCopyPasteWeight(rensoNoteListPage.getCopyPasteWeight());\r
                Global.setAddNewNoteWeight(rensoNoteListPage.getAddNewNoteWeight());\r
-               Global.setRensoItemClickWeight(rensoNoteListPage.getRensoItemClickWeight());
-               Global.setSameTagWeight(rensoNoteListPage.getSameTagWeight());
+               Global.setRensoItemClickWeight(rensoNoteListPage.getRensoItemClickWeight());\r
+               Global.setSameTagWeight(rensoNoteListPage.getSameTagWeight());\r
                Global.setSameNotebookWeight(rensoNoteListPage.getSameNotebookWeight());\r
                Global.setENRelatedNotesWeight(rensoNoteListPage.getENRelatedNotesWeight());\r
                \r
-               // ICHANGED\r
+               // 現在カスタムモードなら、カスタムモードの設定値として保存\r
+               String mode = new String(Global.rensoWeightingSelect());\r
+               if (mode.equals("Custom")) {\r
+                       Global.saveCustomBrowseWeight(rensoNoteListPage.getBrowseWeight());\r
+                       Global.saveCustomCopyPasteWeight(rensoNoteListPage.getCopyPasteWeight());\r
+                       Global.saveCustomAddNewNoteWeight(rensoNoteListPage.getAddNewNoteWeight());\r
+                       Global.saveCustomRensoItemClickWeight(rensoNoteListPage.getRensoItemClickWeight());\r
+                       Global.saveCustomSameTagWeight(rensoNoteListPage.getSameTagWeight());\r
+                       Global.saveCustomSameNotebookWeight(rensoNoteListPage.getSameNotebookWeight());\r
+                       Global.saveCustomENRelatedNotesWeight(rensoNoteListPage.getENRelatedNotesWeight());\r
+               }\r
+               \r
                Global.setMergeRensoNote(rensoNoteListPage.getMergeChecked());\r
                Global.setDuplicateRensoNote(rensoNoteListPage.getDuplicateChecked());\r
                Global.setVerifyExclude(rensoNoteListPage.getVerifyExcludeChecked());\r
@@ -243,6 +257,16 @@ public class ConfigDialog extends QDialog {
                // 連想ノートリストをリフレッシュ\r
                parent.getRensoNoteList().refreshRensoNoteList(parent.getCurrentNoteGuid());\r
                \r
+               // 全文検索の対象項目を再設定\r
+               NSqlQuery nQuery = new NSqlQuery(conn.getConnection());\r
+               NSqlQuery rQuery = new NSqlQuery(conn.getResourceConnection()); \r
+               // カラム単位で削除できないので一度全部消す\r
+               nQuery.exec("CALL FTL_DROP_ALL();");\r
+               rQuery.exec("CALL FTL_DROP_ALL();");\r
+               // 再構築\r
+               Global.rebuildFullTextNoteTarget(conn);\r
+               Global.rebuildFullTextResourceTarget(conn);\r
+               \r
                close();\r
        }\r
        \r
@@ -351,7 +375,7 @@ public class ConfigDialog extends QDialog {
                appearancePage.setDisplayRightToLeft(Global.displayRightToLeft());\r
                appearancePage.setStartupNotebook(Global.getStartupNotebook());\r
                \r
-               indexPage.setRegex(Global.getWordRegex());\r
+//             indexPage.setRegex(Global.getWordRegex());\r
                indexPage.setSleepInterval(Global.getIndexThreadSleepInterval());\r
                connectionPage.setSyncInterval(Global.getSyncInterval());\r
                \r
index cad505a..2420a9f 100644 (file)
@@ -44,10 +44,10 @@ public class ConfigIndexPage extends QWidget {
        private final QCheckBox indexAttachmentsLocally;\r
        private final QCheckBox indexImageRecognition;\r
        private final QCheckBox indexTitle;\r
-       private final QCheckBox automaticWildcard;\r
-       private final QLineEdit specialStrip;\r
+//     private final QCheckBox automaticWildcard;\r
+//     private final QLineEdit specialStrip;\r
        private final QCheckBox indexBody;\r
-       private final QLineEdit regexEdit;\r
+//     private final QLineEdit regexEdit;\r
        \r
        public ConfigIndexPage(QWidget parent) {\r
 //             super(parent);\r
@@ -76,23 +76,23 @@ public class ConfigIndexPage extends QWidget {
                indexImageRecognition = new QCheckBox(tr("Index Image Recognition"));\r
                indexImageRecognition.setChecked(Global.indexImageRecognition());\r
                \r
-               automaticWildcard = new QCheckBox(tr("Automatically Wildcard All Searches"));\r
-               automaticWildcard.setChecked(Global.automaticWildcardSearches());\r
+//             automaticWildcard = new QCheckBox(tr("Automatically Wildcard All Searches"));\r
+//             automaticWildcard.setChecked(Global.automaticWildcardSearches());\r
                \r
-               specialStrip = new QLineEdit();\r
-               specialStrip.setText(Global.getSpecialIndexCharacters());\r
+//             specialStrip = new QLineEdit();\r
+//             specialStrip.setText(Global.getSpecialIndexCharacters());\r
                \r
                QVBoxLayout attachmentLayout = new QVBoxLayout();\r
                attachmentLayout.addWidget(indexBody);\r
                attachmentLayout.addWidget(indexTitle);\r
                attachmentLayout.addWidget(indexAttachmentsLocally);\r
                attachmentLayout.addWidget(indexImageRecognition);\r
-               attachmentLayout.addWidget(automaticWildcard);\r
+//             attachmentLayout.addWidget(automaticWildcard);\r
                \r
-               QHBoxLayout specialCharLayout = new QHBoxLayout();\r
-               specialCharLayout.addWidget(new QLabel(tr("Special Word Characters")));\r
-               specialCharLayout.addWidget(specialStrip);\r
-               attachmentLayout.addLayout(specialCharLayout);\r
+//             QHBoxLayout specialCharLayout = new QHBoxLayout();\r
+//             specialCharLayout.addWidget(new QLabel(tr("Special Word Characters")));\r
+//             specialCharLayout.addWidget(specialStrip);\r
+//             attachmentLayout.addLayout(specialCharLayout);\r
                attachmentGroup.setLayout(attachmentLayout);\r
 \r
                // Index sleep interval\r
@@ -109,22 +109,22 @@ public class ConfigIndexPage extends QWidget {
                sleepGroup.setLayout(sleepLayout);\r
                \r
                // Regular Expressions for word parsing\r
-               QGroupBox regexGroup = new QGroupBox(tr("Word Parse"));\r
-               QLabel regexLabel = new QLabel(tr("Regular Expression"));\r
-               regexEdit = new QLineEdit();\r
-               regexEdit.setText(Global.getWordRegex());\r
-\r
-               QHBoxLayout regexLayout = new QHBoxLayout();\r
-               regexLayout.addWidget(regexLabel);\r
-               regexLayout.addWidget(regexEdit);               \r
-               regexGroup.setLayout(regexLayout);\r
+//             QGroupBox regexGroup = new QGroupBox(tr("Word Parse"));\r
+//             QLabel regexLabel = new QLabel(tr("Regular Expression"));\r
+//             regexEdit = new QLineEdit();\r
+//             regexEdit.setText(Global.getWordRegex());\r
+//\r
+//             QHBoxLayout regexLayout = new QHBoxLayout();\r
+//             regexLayout.addWidget(regexLabel);\r
+//             regexLayout.addWidget(regexEdit);               \r
+//             regexGroup.setLayout(regexLayout);\r
                \r
                \r
                QVBoxLayout mainLayout = new QVBoxLayout();\r
                mainLayout.addWidget(sleepGroup);\r
                mainLayout.addWidget(weightGroup);\r
                mainLayout.addWidget(attachmentGroup);\r
-               mainLayout.addWidget(regexGroup);\r
+//             mainLayout.addWidget(regexGroup);\r
                mainLayout.addStretch(1);\r
                setLayout(mainLayout);\r
 \r
@@ -144,15 +144,15 @@ public class ConfigIndexPage extends QWidget {
        public boolean getIndexNoteTitle() {\r
                return indexTitle.isChecked();\r
        }\r
-       public String getSpecialCharacters() {\r
-               return specialStrip.text();\r
-       }\r
+//     public String getSpecialCharacters() {\r
+//             return specialStrip.text();\r
+//     }\r
        public boolean getIndexImageRecognition() {\r
                return indexImageRecognition.isChecked();\r
        }\r
-       public boolean getAutomaticWildcardSearches() {\r
-               return automaticWildcard.isChecked();\r
-       }\r
+//     public boolean getAutomaticWildcardSearches() {\r
+//             return automaticWildcard.isChecked();\r
+//     }\r
        \r
        //*****************************************\r
        //* Word length get/set methods \r
@@ -181,11 +181,11 @@ public class ConfigIndexPage extends QWidget {
        //*****************************************\r
        //* Regex get/set methods \r
        //*****************************************\r
-       public void setRegex(String s) {\r
-               regexEdit.setText(s);\r
-       }\r
-       public String getRegex() {\r
-               return regexEdit.text();\r
-       }\r
+//     public void setRegex(String s) {\r
+//             regexEdit.setText(s);\r
+//     }\r
+//     public String getRegex() {\r
+//             return regexEdit.text();\r
+//     }\r
 \r
 }\r
index 646b571..1b888bf 100644 (file)
@@ -25,6 +25,7 @@ import com.trolltech.qt.gui.QCheckBox;
 import com.trolltech.qt.gui.QFormLayout;
 import com.trolltech.qt.gui.QGroupBox;
 import com.trolltech.qt.gui.QHBoxLayout;
+import com.trolltech.qt.gui.QLabel;
 import com.trolltech.qt.gui.QSlider;
 import com.trolltech.qt.gui.QSpinBox;
 import com.trolltech.qt.gui.QVBoxLayout;
@@ -208,19 +209,45 @@ public class ConfigRensoNoteListPage extends QWidget {
                enRelatedNotesLayout.addWidget(enRelatedNotesSpinner);
                
                // 重み付け設定部分のレイアウト
+               QVBoxLayout vLayout = new QVBoxLayout();
                QFormLayout styleLayout = new QFormLayout();
                styleLayout.setHorizontalSpacing(10);
                styleLayout.setVerticalSpacing(30);
-               styleLayout.addRow(tr("Browse Weight"), browseLayout);
+               styleLayout.addRow(tr("Concurrent Browse Weight"), browseLayout);
                styleLayout.addRow(tr("Copy&Paste Weight"), copyPasteLayout);
                styleLayout.addRow(tr("Add New Note Weight"), addNewNoteLayout);
                styleLayout.addRow(tr("Renso Item Click Weight"), rensoItemClickLayout);
                styleLayout.addRow(tr("Same Tag Weight"), sameTagLayout);
                styleLayout.addRow(tr("Same Notebook Weight"), sameNotebookLayout);
-               styleLayout.addRow(tr("Evernote Related Notes Integration"), enRelatedNotesLayout);
+               styleLayout.addRow(tr("Evernote Related Notes Weight"), enRelatedNotesLayout);
+               vLayout.addLayout(styleLayout);
 
                QGroupBox weightingGroup = new QGroupBox(tr("Weighting"));
-               weightingGroup.setLayout(styleLayout);
+               weightingGroup.setLayout(vLayout);
+               
+               // プリセットモードがカスタム以外ならば設定不可能にする
+               String mode = new String(Global.rensoWeightingSelect());
+               if (!mode.equals("Custom")) {
+                       QLabel attention = new QLabel(tr("You can change these settings if you select \"Custom\" Mode."));
+                       attention.setStyleSheet("color : red");
+                       vLayout.insertWidget(0, attention);
+                       vLayout.insertSpacing(1, 20);
+                       
+                       browseSlider.setEnabled(false);
+                       browseSpinner.setEnabled(false);
+                       copyPasteSlider.setEnabled(false);
+                       copyPasteSpinner.setEnabled(false);
+                       addNewNoteSlider.setEnabled(false);
+                       addNewNoteSpinner.setEnabled(false);
+                       rensoItemClickSlider.setEnabled(false);
+                       rensoItemClickSpinner.setEnabled(false);
+                       sameTagSlider.setEnabled(false);
+                       sameTagSpinner.setEnabled(false);
+                       sameNotebookSlider.setEnabled(false);
+                       sameNotebookSpinner.setEnabled(false);
+                       enRelatedNotesSlider.setEnabled(false);
+                       enRelatedNotesSpinner.setEnabled(false);
+               }
                
                // ノートのマージ・複製の関連ノートリストへの適用
                mergeCheck = new QCheckBox(tr("When you merge the notes, also merge RensoNoteList"));
index c13b54e..6d3f189 100644 (file)
@@ -44,6 +44,7 @@ public class DatabaseStatus extends QDialog {
        QLabel indexCount;\r
        QLabel resourceIndexNeeded;\r
        QLabel historyCount;\r
+       QLabel rensoClickCount;\r
        private final QPushButton ok;\r
     private final String iconPath = new String("classpath:cx/fbn/nevernote/icons/");\r
        \r
@@ -63,6 +64,7 @@ public class DatabaseStatus extends QDialog {
                resourceIndexNeeded = new QLabel();\r
                indexCount = new QLabel();\r
                historyCount = new QLabel();\r
+               rensoClickCount = new QLabel();\r
                \r
                grid.addWidget(new QLabel(tr("Notebooks:")), 0,0);\r
                grid.addWidget(notebookCount, 0,1);\r
@@ -94,11 +96,14 @@ public class DatabaseStatus extends QDialog {
                grid.addWidget(new QLabel(tr("Tobal Behavior History:")), 9, 0);\r
                grid.addWidget(historyCount, 9,1);\r
                \r
+               grid.addWidget(new QLabel(tr("Renso Note Click:")), 10, 0);\r
+               grid.addWidget(rensoClickCount, 10, 1);\r
+               \r
                QGridLayout buttonLayout = new QGridLayout();\r
                ok = new QPushButton(tr("OK"));\r
                ok.clicked.connect(this, "okPushed()");\r
                buttonLayout.addWidget(ok, 1, 1);\r
-               grid.addLayout(buttonLayout,10,1);\r
+               grid.addLayout(buttonLayout,11,1);\r
        }\r
        \r
        @SuppressWarnings("unused")\r
@@ -135,6 +140,9 @@ public class DatabaseStatus extends QDialog {
        public void setHistoryCount(int d) {\r
                historyCount.setText(NumberFormat.getInstance().format(d));\r
        }\r
+       public void setRensoClickCount(int d) {\r
+               rensoClickCount.setText(NumberFormat.getInstance().format(d));\r
+       }\r
        public QPushButton getOkButton() {\r
                return ok;\r
        }\r
index 7a5e5f5..cf0bf91 100644 (file)
@@ -548,6 +548,8 @@ public class BrowserWindow extends QWidget {
                buttonLayout.addWidget(newSeparator());
                fontList = new QComboBox();
                fontSize = new QComboBox();
+               fontList.setMaximumWidth(130);
+               fontSize.setMaximumWidth(45);
                fontList.setToolTip("Font");
                fontSize.setToolTip("Font Size");
                fontList.activated.connect(this, "fontChanged(String)");
index 44fc5f8..3fdc158 100644 (file)
@@ -225,7 +225,8 @@ public class MainMenuBar extends QMenuBar {
                noteDuplicateAction = new QAction(tr("Duplicate"), this);
                noteDuplicateAction.setToolTip(tr("Duplicate this note"));
                noteDuplicateAction.triggered.connect(parent, "duplicateNote()");
-               setupShortcut(noteReindex, "File_Note_Duplicate");
+               // IFIXED
+               setupShortcut(noteDuplicateAction, "File_Note_Duplicate");
                
                noteMergeAction = new QAction(tr("Merge Notes"), this);
                noteMergeAction.setToolTip(tr("Merge Multiple notes"));
index 9355541..ba8ed62 100644 (file)
@@ -65,9 +65,9 @@ public class RensoNoteList extends QListWidget {
        private String guid;
        private int allPointSum;
 
-       public RensoNoteList(DatabaseConnection c, NeverNote p, SyncRunner syncRunner) {
-               logger = new ApplicationLogger("rensoNoteList.log");
-               logger.log(logger.HIGH, "Setting up rensoNoteList");
+       public RensoNoteList(DatabaseConnection c, NeverNote p, SyncRunner syncRunner, ApplicationLogger logger) {
+               this.logger = logger;
+               this.logger.log(this.logger.HIGH, "Setting up rensoNoteList");
                allPointSum = 0;
 
                this.conn = c;
@@ -77,10 +77,10 @@ public class RensoNoteList extends QListWidget {
                this.guid = new String();
                mergedHistory = new HashMap<String, Integer>();
                enRelatedNotesCache = new HashMap<String, List<String>>();
-               this.enRelatedNotesRunner = new ENRelatedNotesRunner(this.syncRunner, logger);
+               this.enRelatedNotesRunner = new ENRelatedNotesRunner(this.syncRunner, this.logger);
                this.enRelatedNotesRunner.enRelatedNotesSignal.getENRelatedNotesFinished.connect(this, "enRelatedNotesComplete()");
                this.enRelatedNotesThread = new QThread(enRelatedNotesRunner, "ENRelatedNotes Thread");
-               this.enRelatedNotesThread.start();
+               this.getEnRelatedNotesThread().start();
                
                rensoNoteListItems = new HashMap<QListWidgetItem, String>();
                rensoNoteListTrueItems = new ArrayList<RensoNoteListItem>();
@@ -110,12 +110,18 @@ public class RensoNoteList extends QListWidget {
                menu.addAction(excludeNoteAction);
                menu.aboutToHide.connect(this, "contextMenuHidden()");
                
-               logger.log(logger.HIGH, "rensoNoteList setup complete");
+               this.logger.log(this.logger.HIGH, "rensoNoteList setup complete");
+       }
+       
+       // オーバーロード
+       // 現在開いているノートの連想ノートリストをリフレッシュ
+       public void refreshRensoNoteList() {
+               refreshRensoNoteList(guid);
        }
 
        // 連想ノートリストをリフレッシュ
        public void refreshRensoNoteList(String guid) {
-               logger.log(logger.HIGH, "Entering RensoNoteList.refreshRensoNoteList");
+               logger.log(logger.HIGH, "Entering RensoNoteList.refreshRensoNoteList guid = " + guid);
 
                this.clear();
                rensoNoteListItems.clear();
@@ -149,6 +155,8 @@ public class RensoNoteList extends QListWidget {
        
        // 操作履歴をデータベースから取得してノートごとの関連度を算出、その後mergedHistoryに追加
        private void calculateHistory(String guid) {
+               logger.log(logger.EXTREME, "Entering RensoNoteList.calculateHistory guid = " + guid);
+               
                // browseHistory<guid, 回数(ポイント)>
                HashMap<String, Integer> browseHistory = conn.getHistoryTable().getBehaviorHistory("browse", guid);
                addWeight(browseHistory, Global.getBrowseWeight());
@@ -178,20 +186,27 @@ public class RensoNoteList extends QListWidget {
                HashMap<String, Integer> sameNotebookHistory = conn.getHistoryTable().getBehaviorHistory("sameNotebook", guid);
                addWeight(sameNotebookHistory, Global.getSameNotebookWeight());
                mergedHistory = mergeHistory(sameNotebookHistory, mergedHistory);
+               logger.log(logger.EXTREME, "Leaving RensoNoteList.calculateHistory");
        }
        
        // 操作回数に重み付けする
        private void addWeight(HashMap<String, Integer> history, int weight){
+               logger.log(logger.EXTREME, "Entering RensoNoteList.addWeight");
+               
                Set<String> keySet = history.keySet();
                Iterator<String> hist_iterator = keySet.iterator();
                while(hist_iterator.hasNext()){
                        String key = hist_iterator.next();
                        history.put(key, history.get(key) * weight);
                }
+               
+               logger.log(logger.EXTREME, "Leaving RensoNoteList.addWeight");
        }
        
        // 連想ノートリストを再描画
        private void repaintRensoNoteList(boolean needClear) {
+               logger.log(logger.EXTREME, "Entering RensoNoteList.repaintRensoNoteList");
+               
                if (needClear) {
                        this.clear();
                        rensoNoteListItems.clear();
@@ -209,10 +224,14 @@ public class RensoNoteList extends QListWidget {
                }
                
                addRensoNoteList(mergedHistory);
+               
+               logger.log(logger.EXTREME, "Leaving RensoNoteList.repaintRensoNoteList");
        }
        
        // 引数1と引数2をマージしたハッシュマップを返す
        private HashMap<String, Integer> mergeHistory(HashMap<String, Integer> History1, HashMap<String, Integer> History2){
+               logger.log(logger.EXTREME, "Entering RensoNoteList.mergeHistory");
+               
                HashMap<String, Integer> mergedHistory = new HashMap<String, Integer>();
                
                mergedHistory.putAll(History1);
@@ -227,12 +246,15 @@ public class RensoNoteList extends QListWidget {
                                mergedHistory.put(key, History2.get(key));
                        }
                }
-
+               
+               logger.log(logger.EXTREME, "Leaving RensoNoteList.mergeHistory");
                return mergedHistory;
        }
        
        // 連想ノートリストにハッシュマップのデータを追加
        private void addRensoNoteList(HashMap<String, Integer> History){
+               logger.log(logger.EXTREME, "Entering RensoNoteList.addRensoNoteList");
+               
                String currentNoteGuid = new String(parent.getCurrentNoteGuid());
                
                // スター付きノートとスター無しノートを分ける
@@ -301,6 +323,7 @@ public class RensoNoteList extends QListWidget {
                                }
                        }
                }
+               logger.log(logger.EXTREME, "Leaving RensoNoteList.addRensoNoteList");
        }
 
        // リストのアイテムから対象ノートのguidを取得
@@ -311,6 +334,8 @@ public class RensoNoteList extends QListWidget {
        // 関連ノートリストの右クリックメニュー
        @Override
        public void contextMenuEvent(QContextMenuEvent event){
+               logger.log(logger.EXTREME, "Entering RensoNoteList.contextMenuEvent");
+               
                if (rensoNotePressedItemGuid == null || rensoNotePressedItemGuid.equals("")) {
                        return;
                }
@@ -337,6 +362,8 @@ public class RensoNoteList extends QListWidget {
                menu.exec(event.globalPos());
                
                rensoNotePressedItemGuid = null;
+               
+               logger.log(logger.EXTREME, "Leaving RensoNoteList.contextMenuEvent");
        }
        
        // コンテキストメニューが表示されているかどうか
@@ -356,16 +383,22 @@ public class RensoNoteList extends QListWidget {
        // ユーザが連想ノートリストのアイテムを選択した時の処理
        @SuppressWarnings("unused")
        private void rensoNoteItemPressed(QListWidgetItem current) {
+               logger.log(logger.HIGH, "Entering RensoNoteList.rensoNoteItemPressed");
+               
                rensoNotePressedItemGuid = null;
                // 右クリックだったときの処理
                if (QApplication.mouseButtons().isSet(MouseButton.RightButton)) {
                        rensoNotePressedItemGuid = getNoteGuid(current);
                }
+               
+               logger.log(logger.HIGH, "Leaving RensoNoteList.rensoNoteItemPressed");
        }
        
        // Evernoteの関連ノートの取得が完了
        @SuppressWarnings("unused")
        private void enRelatedNotesComplete() {
+               logger.log(logger.HIGH, "Entering RensoNoteList.enRelatedNotesComplete");
+               
                Pair<String, List<String>> enRelatedNoteGuidPair = enRelatedNotesRunner.getENRelatedNoteGuids();        // <元ノートguid, 関連ノートguidリスト>
                
                if (enRelatedNoteGuidPair == null) {
@@ -388,10 +421,14 @@ public class RensoNoteList extends QListWidget {
                                }
                        }
                }
+               
+               logger.log(logger.HIGH, "Leaving RensoNoteList.enRelatedNotesComplete");
        }
        
        // Evernote関連ノートの関連度情報をmergedHistoryに追加
        private void addENRelatedNotes(List<String> relatedNoteGuids) {
+               logger.log(logger.EXTREME, "Entering RensoNoteList.addENRelatedNotes");
+               
                // Evernote関連ノート<guid, 関連ポイント>
                HashMap<String, Integer> enRelatedNotes = new HashMap<String, Integer>();
                
@@ -400,13 +437,27 @@ public class RensoNoteList extends QListWidget {
                }
                
                mergedHistory = mergeHistory(enRelatedNotes, mergedHistory);
+               
+               logger.log(logger.EXTREME, "Leaving RensoNoteList.addENRelatedNotes");
        }
        
        // Evernoteの関連ノート取得スレッドを終了させる
        public boolean stopThread() {
+               logger.log(logger.HIGH, "Entering RensoNoteList.stopThread");
+               
                if (enRelatedNotesRunner.addStop()) {
+                       logger.log(logger.HIGH, "RensoNoteList.stopThread succeeded");
                        return true;
                }
+               logger.log(logger.HIGH, "RensoNoteList.stopThread failed");
                return false;
        }
+
+       public QThread getEnRelatedNotesThread() {
+               return enRelatedNotesThread;
+       }
+       
+       public String getGuid() {
+               return guid;
+       }
 }
diff --git a/src/cx/fbn/nevernote/gui/RensoNoteListDock.java b/src/cx/fbn/nevernote/gui/RensoNoteListDock.java
new file mode 100644 (file)
index 0000000..69d11c3
--- /dev/null
@@ -0,0 +1,177 @@
+/*
+ * This file is part of NeighborNote
+ * Copyright 2013 Yuki Takahashi
+ * 
+ * This file may be licensed under the terms of of the
+ * GNU General Public License Version 2 (the ``GPL'').
+ *
+ * Software distributed under the License is distributed
+ * on an ``AS IS'' basis, WITHOUT WARRANTY OF ANY KIND, either
+ * express or implied. See the GPL for the specific language
+ * governing rights and limitations.
+ *
+ * You should have received a copy of the GPL along with this
+ * program. If not, go to http://www.gnu.org/licenses/gpl.html
+ * or write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+*/
+
+package cx.fbn.nevernote.gui;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.EnumMap;
+import java.util.List;
+import java.util.Map;
+
+import com.trolltech.qt.core.QSize;
+import com.trolltech.qt.gui.QComboBox;
+import com.trolltech.qt.gui.QDockWidget;
+import com.trolltech.qt.gui.QIcon;
+import com.trolltech.qt.gui.QLabel;
+import com.trolltech.qt.gui.QMessageBox;
+import com.trolltech.qt.gui.QPushButton;
+import com.trolltech.qt.gui.QSizePolicy;
+import com.trolltech.qt.gui.QToolBar;
+import com.trolltech.qt.gui.QVBoxLayout;
+import com.trolltech.qt.gui.QWidget;
+
+import cx.fbn.nevernote.Global;
+import cx.fbn.nevernote.NeverNote;
+import cx.fbn.nevernote.sql.DatabaseConnection;
+import cx.fbn.nevernote.threads.SyncRunner;
+import cx.fbn.nevernote.utilities.ApplicationLogger;
+
+public class RensoNoteListDock extends QDockWidget {
+       private final DatabaseConnection        conn;
+       private final NeverNote                         parent;
+       private final SyncRunner                        syncRunner;
+       private final ApplicationLogger         logger;
+       private final QPushButton                       haltLogButton;                  // 操作ログの取得を停止ボタン
+       private final QComboBox                         weightingModeSelect;    // 連想ノートリストの重み付けプリセットモード
+       private final RensoNoteList                     rensoNoteList;                  // 連想ノートリスト
+       private final QToolBar                          rensoToolBar;                   // 連想ノートリストドックのツールバー
+       private enum PresetMode {Standard, ConcurrentBrowse, OperationToOrganize, ContentSimilarity, Custom};   // プリセットモード一覧
+       
+       private final String                            iconPath;
+       
+       public RensoNoteListDock(DatabaseConnection conn, NeverNote parent, SyncRunner syncRunner, String iconPath, String title) {
+               super(title);
+               
+               this.logger = new ApplicationLogger("rensoNoteList.log");
+               this.logger.log(this.logger.HIGH, "Setting up rensoNoteListDock");
+               
+               this.conn = conn;
+               this.parent = parent;
+               this.iconPath = iconPath;
+               this.syncRunner = syncRunner;
+               
+               QVBoxLayout vLayout = new QVBoxLayout();
+               rensoToolBar = new QToolBar();
+               vLayout.addWidget(rensoToolBar);
+               
+               QLabel modeLabel = new QLabel(tr("Mode: "));
+               modeLabel.setToolTip(tr("Preset Weighting Mode"));
+               rensoToolBar.addWidget(modeLabel);
+               
+               weightingModeSelect = new QComboBox();
+               weightingModeSelect.setMaximumWidth(150);
+               weightingModeSelect.setToolTip(tr("Preset Weighting Mode"));
+               weightingModeSelect.insertItem(PresetMode.Standard.ordinal(), tr("Standard"));
+               weightingModeSelect.insertItem(PresetMode.ConcurrentBrowse.ordinal(), tr("Concurrent Browse"));
+               weightingModeSelect.insertItem(PresetMode.OperationToOrganize.ordinal(), ("Operation to Organize"));
+               weightingModeSelect.insertItem(PresetMode.ContentSimilarity.ordinal(), tr("Content Similarity"));
+               weightingModeSelect.insertItem(PresetMode.Custom.ordinal(), tr("Custom"));
+               int savedModeIndex = 0;
+               try {
+                       savedModeIndex = PresetMode.valueOf(Global.rensoWeightingSelect()).ordinal();
+               } catch (Exception e) {
+                       this.logger.log(this.logger.EXTREME, "Exception in weightingModeSelect = " + e);
+               }
+               if (savedModeIndex >= 0) {
+                       weightingModeSelect.setCurrentIndex(savedModeIndex);
+               } else {
+                       weightingModeSelect.setCurrentIndex(0);
+               }
+               weightingModeSelect.currentIndexChanged.connect(this, "weightingModeChanged(int)");
+               rensoToolBar.addWidget(weightingModeSelect);
+               
+               haltLogButton = new QPushButton();
+               QIcon haltLogIcon = new QIcon(this.iconPath + "haltLog.png");
+               haltLogButton.setIcon(haltLogIcon);
+               haltLogButton.setIconSize(new QSize(24, 24));
+               haltLogButton.setToolTip(tr("Halt Collectiong Operation Log"));
+               haltLogButton.setCheckable(true);
+               haltLogButton.setChecked(Global.isHaltLogButton());
+               haltLogButton.toggled.connect(this, "haltLogToggled(boolean)");
+               
+               // ログ取得停止ボタンを右寄せするためのスペーサ
+               QWidget spacer = new QWidget();
+               spacer.setSizePolicy(QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Expanding);
+               rensoToolBar.addWidget(spacer);
+               rensoToolBar.addWidget(haltLogButton);
+               
+               rensoNoteList = new RensoNoteList(this.conn, this.parent, this.syncRunner, this.logger);
+               getRensoNoteList().itemPressed.connect(this.parent, "rensoNoteItemPressed(QListWidgetItem)");
+               vLayout.addWidget(getRensoNoteList());
+
+               QWidget w = new QWidget();
+               w.setLayout(vLayout);
+               this.setWidget(w);
+       }
+       
+       @SuppressWarnings("unused")
+       private void weightingModeChanged(int modeIndex) {
+               logger.log(logger.EXTREME, "RensoNoteListDock.weightingModeChanged modeIndex = " + modeIndex);
+               
+               PresetMode mode = Global.fromOrdinal(PresetMode.class, modeIndex);
+               
+               // プリセットの重み付けマップを用意
+               // 値は同時閲覧、コピペ、新規ノート追加、連想ノートクリック、同じタグ、同じノートブック、Evernote関連ノートの順
+               Map<PresetMode, List<Integer>> presetMap = new EnumMap<PresetMode, List<Integer>>(PresetMode.class);
+               presetMap.put(PresetMode.Standard, Arrays.asList(1, 3, 3, 10, 2, 2, 5));
+               presetMap.put(PresetMode.ConcurrentBrowse, Arrays.asList(5, 2, 3, 10, 1, 1, 2));
+               presetMap.put(PresetMode.OperationToOrganize, Arrays.asList(1, 2, 3, 10, 5, 5, 2));
+               presetMap.put(PresetMode.ContentSimilarity, Arrays.asList(1, 2, 2, 10, 1, 1, 10));
+               presetMap.put(PresetMode.Custom, Arrays.asList(Global.customBrowseWeight(), Global.customCopyPasteWeight(), 
+                               Global.customAddNewNoteWeight(), Global.customRensoItemClickWeight(), Global.customSameTagWeight(), 
+                               Global.customSameNotebookWeight(), Global.customENRelatedNotesWeight()));
+               
+               List<Integer> weightList = new ArrayList<Integer>(presetMap.get(mode));
+               Global.setBrowseWeight(weightList.get(0));
+               Global.setCopyPasteWeight(weightList.get(1));
+               Global.setAddNewNoteWeight(weightList.get(2));
+               Global.setRensoItemClickWeight(weightList.get(3));
+               Global.setSameTagWeight(weightList.get(4));
+               Global.setSameNotebookWeight(weightList.get(5));
+               Global.setENRelatedNotesWeight(weightList.get(6));
+               
+               Global.saveRensoWeightingSelect(mode.name());
+               
+               // 連想ノートリストをリフレッシュ
+               if (rensoNoteList != null && rensoNoteList.getGuid() != null ) {
+                       rensoNoteList.refreshRensoNoteList();
+                       
+                       // カスタムモードかつアプリ起動時以外なら、メッセージ表示
+                       if (mode == PresetMode.Custom) {
+                               QMessageBox.information(this, tr("Information"), tr("Custom mode was selected.\nYou can customize weighting manually in the Edit/Preferences/Renso Note List."));
+                       }
+               }
+       }
+       
+       @SuppressWarnings("unused")
+       private void haltLogToggled(boolean checked) {
+               logger.log(logger.EXTREME, "RensoNoteListDock.haltLogToggled");
+               
+               if (checked) {
+                       QMessageBox.information(this, tr("Information"), tr("Collecting operation log halted.\nYou can resume, if you press this button again."));
+               }
+               Global.saveHaltLogButton(checked);
+       }
+
+       public RensoNoteList getRensoNoteList() {
+               return rensoNoteList;
+       }
+       
+}
index 294495b..732a0ef 100644 (file)
@@ -48,7 +48,7 @@ public class RensoNoteListItem extends QWidget{
        private final int relationPoints;
        private final String noteCreated;
        private final String tagNames;
-       private String noteContent;
+       private final String noteContent;
        private final RensoNoteList parent;
        private final boolean isStared;
        private final int allPointSum;
@@ -81,12 +81,8 @@ public class RensoNoteListItem extends QWidget{
                this.tagNames = new String(sb);
                
                // this.noteContent = new String(note.getContent());
-               this.noteContent = conn.getNoteTable().getNoteContentNoUTFConversion(note.getGuid());
-               this.noteContent = this.noteContent.replaceAll("<.+?>", "");
-               this.noteContent = this.noteContent.replaceAll("\\s{2,}", " ");
-               String kaigyo = System.getProperty("line.separator");
-               this.noteContent = this.noteContent.replaceAll(kaigyo, "");
-               
+//             this.noteContent = Global.extractPlainText(conn.getNoteTable().getNoteContentNoUTFConversion(note.getGuid()));
+               this.noteContent = conn.getNoteTable().getNoteContentText(note.getGuid());
                palette = new QPalette();
                palette.setColor(QPalette.ColorRole.Window, new QColor(255, 255, 255));
                this.setPalette(palette);
index 83debac..4d4535a 100644 (file)
@@ -20,6 +20,8 @@
 // ICHANGED
 package cx.fbn.nevernote.gui;
 
+import com.trolltech.qt.core.QSize;
+import com.trolltech.qt.gui.QTabBar;
 import com.trolltech.qt.gui.QTabWidget;
 import com.trolltech.qt.gui.QWidget;
 
@@ -28,6 +30,7 @@ import cx.fbn.nevernote.NeverNote;
 public class TabBrowserWidget extends QTabWidget {
        private final TabBrowserBar bar;
        private final NeverNote parent;
+       private QSize closeButtonSize;
        
        public TabBrowserWidget(NeverNote parent) {
                super(parent);
@@ -41,6 +44,18 @@ public class TabBrowserWidget extends QTabWidget {
                int index = this.addTab(widget, new String());
                bar.addNewTab(index, title);
                this.setTabToolTip(index, title);
+               
+               // タブが1個(多分これが発生するのはアプリ起動時だけ)なら閉じるボタンを隠す
+               // タブが2個以上あったら、一番左のタブの閉じるボタンを復元する
+               int tabCnt = this.count();
+               if (tabCnt == 1) {
+                       hideTabCloseButton(0);
+               } else if (tabCnt >= 2) {
+                       if (closeButtonSize != null && !bar.tabButton(0, QTabBar.ButtonPosition.RightSide).size().equals(closeButtonSize)) {
+                               showTabCloseButton(0);
+                       }
+               }
+               
                return index;
        }
 
@@ -49,4 +64,20 @@ public class TabBrowserWidget extends QTabWidget {
                this.setTabToolTip(index, title);
        }
        
+       // タブを閉じるボタンを隠す
+       public void hideTabCloseButton(int index) {
+               if (closeButtonSize == null) {
+                       closeButtonSize = bar.tabButton(index, QTabBar.ButtonPosition.RightSide).size();
+               }
+               bar.tabButton(index, QTabBar.ButtonPosition.RightSide).resize(0, 0);
+       }
+       
+       // タブを閉じるボタンを復元する
+       public void showTabCloseButton(int index) {
+               if (closeButtonSize != null) {
+                       bar.tabButton(index, QTabBar.ButtonPosition.RightSide).resize(closeButtonSize);
+               } else {
+                       bar.tabButton(index, QTabBar.ButtonPosition.RightSide).resize(16, 16);
+               }
+       }
 }
diff --git a/src/cx/fbn/nevernote/icons/haltLog.png b/src/cx/fbn/nevernote/icons/haltLog.png
new file mode 100644 (file)
index 0000000..8c0df76
Binary files /dev/null and b/src/cx/fbn/nevernote/icons/haltLog.png differ
index ef314b5..965896a 100644 (file)
@@ -290,6 +290,44 @@ public class DatabaseConnection {
                        executeSql("alter table note add column attributeContentClass VarChar");
                        executeSql("update note set attributeContentClass = ''");
                }
+               
+               // Apache Luceneを使った日本語検索のためのプレーンテキストノートコンテンツカラムを準備
+               if (!dbTableColumnExists("NOTE", "CONTENTTEXT")) {
+                       executeSql("alter table note add column contentText VarChar");
+                       executeSql("update note set contentText = ''");
+                       NSqlQuery query = new NSqlQuery(conn);
+                       query.exec("Select guid, content from Note where contentText = ''");
+                       while (query.next()) {
+                               String guid = query.valueString(0);
+                               String content = query.valueString(1);
+                               String contentText = Global.extractPlainText(content);
+                               NSqlQuery query2 = new NSqlQuery(conn);
+                               query2.prepare("update note set contentText=:contentText where guid=:guid");
+                               query2.bindValue(":contentText", contentText);
+                               query2.bindValue(":guid", guid);
+                               query2.exec();
+                       }
+                       
+                       // Apache Luceneを使った全文検索のための準備
+                       query.exec("CREATE ALIAS IF NOT EXISTS FTL_INIT FOR \"org.h2.fulltext.FullTextLuceneEx.init\"");
+                       query.exec("CALL FTL_INIT()");
+                       
+                       Global.rebuildFullTextNoteTarget(this);
+               }
+               
+               // Apache Luceneを使った日本語検索のためのプレーンテキストノートリソースカラムを準備
+               NSqlQuery rQuery = new NSqlQuery(resourceConn);
+               rQuery.exec("select TABLE_NAME from INFORMATION_SCHEMA.COLUMNS where TABLE_NAME='NOTERESOURCES' and COLUMN_NAME='RESOURCETEXT'");
+               if (!rQuery.next()) {
+                       rQuery.exec("alter table noteResources add column resourceText VarChar");
+                       rQuery.exec("update noteResources set resourceText = ''");
+                       
+                       // Apache Luceneを使った全文検索のための準備
+                       rQuery.exec("CREATE ALIAS IF NOT EXISTS FTL_INIT FOR \"org.h2.fulltext.FullTextLuceneEx.init\"");
+                       rQuery.exec("CALL FTL_INIT()");
+                       
+                       Global.rebuildFullTextResourceTarget(this);
+               }
        }
        
        public void executeSql(String sql) {
index 3ba31bf..0d16a11 100644 (file)
@@ -24,6 +24,7 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 
+import cx.fbn.nevernote.Global;
 import cx.fbn.nevernote.sql.driver.NSqlQuery;
 import cx.fbn.nevernote.utilities.ApplicationLogger;
 
@@ -58,6 +59,11 @@ public class HistoryTable {
                NSqlQuery query = new NSqlQuery(db.getBehaviorConnection());
                boolean excludedCheck = false;
                
+               // 操作ログの取得を停止中
+               if (Global.isHaltLogButton()) {
+                       return;
+               }
+               
                if (behaviorType == null) {
                        return;
                }
@@ -309,4 +315,13 @@ public class HistoryTable {
                int returnValue = new Integer(query.valueString(0));
                return returnValue;
        }
+       
+       // 連想ノートクリック回数を取得
+       public int getRensoClickCount() {
+               NSqlQuery query = new NSqlQuery(db.getBehaviorConnection());
+               query.exec("Select count(*) from History where behaviorType='rensoItemClick'");
+               query.next();
+               int returnValue = new Integer(query.valueString(0));
+               return returnValue;
+       }
 }
index 99746c6..d5507aa 100644 (file)
@@ -675,5 +675,27 @@ public class NoteResourceTable  {
                NSqlQuery query = new NSqlQuery(db.getResourceConnection());\r
                query.exec("update noteresources set isdirty=false");\r
        }\r
+       \r
+       // リソーステキストを更新\r
+       public void updateResourceText(String guid, String text) {\r
+               logger.log(logger.HIGH, "Entering NoteResourceTable.updateResourceText");\r
+               NSqlQuery query = new NSqlQuery(db.getResourceConnection());\r
+               boolean check = query.prepare("Update noteResources set resourceText=:resourceText where guid=:guid");\r
+               if (!check) {\r
+                       logger.log(logger.EXTREME, "Update resourceText sql prepare has failed.");\r
+                       logger.log(logger.MEDIUM, query.lastError());\r
+               }\r
+               \r
+               query.bindValue(":resourceText", text);\r
+               query.bindValue(":guid", guid);\r
+               \r
+               check = query.exec();\r
+               if (!check) {\r
+                       logger.log(logger.EXTREME, "Update resourceText has failed.");\r
+                       logger.log(logger.MEDIUM, query.lastError());\r
+               }\r
+               logger.log(logger.HIGH, "Leaving NoteResourceTable.updateResourceText");\r
+               query.exec();\r
+       }\r
 }\r
 \r
index 0710817..36c0dca 100644 (file)
@@ -111,13 +111,13 @@ public class NoteTable {
                                +"contentHash, contentLength, created, updated, deleted, active, notebookGuid, "
                                +"attributeSubjectDate, attributeLatitude, attributeLongitude, attributeAltitude, "
                                +"attributeAuthor, attributeSource, attributeSourceUrl, attributeSourceApplication, "
-                               +"indexNeeded, isExpunged, isDirty, titlecolor, thumbnailneeded" 
+                               +"indexNeeded, isExpunged, isDirty, titlecolor, thumbnailneeded, contentText
                                +") Values("
                                +":guid, :updateSequenceNumber, :title, :content, "
                                +":contentHash, :contentLength, :created, :updated, :deleted, :active, :notebookGuid, "
                                +":attributeSubjectDate, :attributeLatitude, :attributeLongitude, :attributeAltitude, "
                                +":attributeAuthor, :attributeSource, :attributeSourceUrl, :attributeSourceApplication, "
-                               +":indexNeeded, :isExpunged, :isDirty, -1, true) ");
+                               +":indexNeeded, :isExpunged, :isDirty, -1, true, :contentText) ");
 
                StringBuilder created = new StringBuilder(simple.format(n.getCreated()));                       
                StringBuilder updated = new StringBuilder(simple.format(n.getUpdated()));                       
@@ -130,10 +130,18 @@ public class NoteTable {
                query.bindValue(":title", n.getTitle());
                if (isDirty) {
                        EnmlConverter enml = new EnmlConverter(logger);
+                       String contentText = Global.extractPlainText(enml.fixEnXMLCrap(enml.fixEnMediaCrap(n.getContent())));
+
                        query.bindValue(":content", enml.fixEnXMLCrap(enml.fixEnMediaCrap(n.getContent())));
+                       query.bindValue(":contentText", contentText);
                }
-               else
+               else {
+                       String contentText = Global.extractPlainText(n.getContent());
+                       
                        query.bindValue(":content", n.getContent());
+                       query.bindValue(":contentText", contentText);
+                       
+               }
                query.bindValue(":contentHash", n.getContentHash());
                query.bindValue(":contentLength", n.getContentLength());
                query.bindValue(":created", created.toString());
@@ -567,7 +575,7 @@ public class NoteTable {
        public void updateNoteContent(String guid, String content) {
                logger.log(logger.HIGH, "Entering NoteTable.updateNoteContent");
                NSqlQuery query = new NSqlQuery(db.getConnection());
-               boolean check = query.prepare("Update Note set content=:content, updated=CURRENT_TIMESTAMP(), isDirty=true, indexNeeded=true, " +
+               boolean check = query.prepare("Update Note set content=:content, contentText=:contentText, updated=CURRENT_TIMESTAMP(), isDirty=true, indexNeeded=true, " +
                                " thumbnailneeded=true where guid=:guid");
                if (!check) {
                        logger.log(logger.EXTREME, "Update note content sql prepare has failed.");
@@ -578,6 +586,7 @@ public class NoteTable {
 //             codec = QTextCodec.codecForName("UTF-8");
 //             query.bindValue(":content", codec.fromUnicode(content).toString());
                query.bindValue(":content", content);
+               query.bindValue(":contentText", Global.extractPlainText(content));
                query.bindValue(":guid", guid);
 
                check = query.exec();
@@ -1594,8 +1603,9 @@ public class NoteTable {
                                                 newSegment +
                                                 n.getContent().substring(endPos);
                                NSqlQuery query = new NSqlQuery(db.getConnection());
-                               query.prepare("update note set isdirty=true, thumbnailneeded=true, content=:content where guid=:guid");
+                               query.prepare("update note set isdirty=true, thumbnailneeded=true, content=:content, contentText=:contentText where guid=:guid");
                                query.bindValue(":content", content);
+                               query.bindValue(":contentText", Global.extractPlainText(content));
                                query.bindValue(":guid", n.getGuid());
                                query.exec();
                        }
@@ -1760,7 +1770,35 @@ public class NoteTable {
         *
         * boolean retVal = query.valueBoolean(0, false); return retVal; }
         */
+       
+       // ノートコンテンツのプレーンテキストを取得
+       public String getNoteContentText(String noteGuid) {
+
+               if (noteGuid == null)
+                       return null;
+               if (noteGuid.trim().equals(""))
+                       return null;
+
+               NSqlQuery query = new NSqlQuery(db.getConnection());
+               query.prepare("Select contentText from Note where guid=:guid");
+               query.bindValue(":guid", noteGuid);
+               if (!query.exec()) {
+                       logger.log(logger.MEDIUM, "Noteテーブルからプレーンコンテンツの取得失敗");
+                       logger.log(logger.MEDIUM, query.lastError());
+                       return null;
+               }
+               if (!query.next()) {
+                       logger.log(logger.EXTREME, "SQL Retrieve failed for note guid "
+                                       + noteGuid + " in getNotePlainContent()");
+                       logger.log(logger.EXTREME, " -> " + query.lastError().toString());
+                       logger.log(logger.EXTREME, " -> " + query.lastError());
+                       return null;
+               }
+
+               String noteContentText = query.valueString(0);
 
+               return noteContentText;
+       }
 }      
 
 
index 1a0ec5b..46f2edf 100644 (file)
@@ -33,7 +33,6 @@ import com.evernote.edam.type.Note;
 import com.evernote.edam.type.Notebook;\r
 import com.evernote.edam.type.Tag;\r
 \r
-import cx.fbn.nevernote.Global;\r
 import cx.fbn.nevernote.sql.driver.NSqlQuery;\r
 import cx.fbn.nevernote.utilities.ApplicationLogger;\r
 \r
@@ -392,16 +391,16 @@ public class REnSearch {
                                searchPhrases.add(word.toLowerCase());\r
                        }\r
                        if (!searchPhrase && pos < 0) {\r
-                               if (word != null && word.length() > 0 && !Global.automaticWildcardSearches())\r
+                               if (word != null && word.length() > 0/* && !Global.automaticWildcardSearches()*/)\r
                                        getWords().add(word); \r
-                               if (word != null && word.length() > 0 && Global.automaticWildcardSearches()) {\r
-                                       String wildcardWord = word;\r
-                                       if (!wildcardWord.startsWith("*"))\r
-                                               wildcardWord = "*"+wildcardWord;\r
-                                       if (!wildcardWord.endsWith("*"))\r
-                                               wildcardWord = wildcardWord+"*";\r
-                                       getWords().add(wildcardWord); \r
-                               }\r
+//                             if (word != null && word.length() > 0 && Global.automaticWildcardSearches()) {\r
+//                                     String wildcardWord = word;\r
+//                                     if (!wildcardWord.startsWith("*"))\r
+//                                             wildcardWord = "*"+wildcardWord;\r
+//                                     if (!wildcardWord.endsWith("*"))\r
+//                                             wildcardWord = wildcardWord+"*";\r
+//                                     getWords().add(wildcardWord); \r
+//                             }\r
 //                             getWords().add("*"+word+"*");           //// WILDCARD\r
                        }\r
                        if (word.startsWith("intitle:")) \r
@@ -705,12 +704,17 @@ public class REnSearch {
                NSqlQuery indexQuery = new NSqlQuery(conn.getIndexConnection());\r
                NSqlQuery mergeQuery = new NSqlQuery(conn.getConnection());\r
                NSqlQuery deleteQuery = new NSqlQuery(conn.getConnection());\r
+               NSqlQuery ftlNoteQuery = new NSqlQuery(conn.getConnection());\r
+               NSqlQuery ftlResourceQuery = new NSqlQuery(conn.getResourceConnection());\r
+               ftlNoteQuery.prepare("SELECT N.GUID AS GUID FROM FTL_SEARCH_DATA(:text, 0, 0) FT, NOTE N WHERE FT.TABLE='NOTE' AND N.GUID=FT.KEYS[0]");\r
+               ftlResourceQuery.prepare("SELECT R.GUID AS GUID FROM FTL_SEARCH_DATA(:text, 0, 0) FT, NOTERESOURCES R WHERE FT.TABLE='NOTERESOURCES' AND R.GUID=FT.KEYS[0]");\r
                \r
                insertQuery.prepare("Insert into SEARCH_RESULTS (guid) values (:guid)");\r
                mergeQuery.prepare("Insert into SEARCH_RESULTS_MERGE (guid) values (:guid)");\r
                \r
                if (subSelect) {\r
                        for (int i=0; i<getWords().size(); i++) {\r
+                               // wordsテーブルから検索\r
                                if (getWords().get(i).indexOf("*") == -1) {\r
                                        indexQuery.prepare("Select distinct guid from words where weight >= " +minimumRecognitionWeight +\r
                                                        " and word=:word");\r
@@ -732,6 +736,43 @@ public class REnSearch {
                                                mergeQuery.exec();\r
                                        }\r
                                }\r
+                               \r
+                               // luceneによる全文検索 ノートテーブル\r
+                               ftlNoteQuery.bindValue(":text", getWords().get(i));\r
+                               ftlNoteQuery.exec();\r
+                               while(ftlNoteQuery.next()) {\r
+                                       guid = ftlNoteQuery.valueString(0);\r
+                                       if (i==0 || any) {\r
+                                               insertQuery.bindValue(":guid", guid);\r
+                                               insertQuery.exec();\r
+                                       } else {\r
+                                               mergeQuery.bindValue(":guid", guid);\r
+                                               mergeQuery.exec();\r
+                                       }\r
+                               }\r
+                               // luceneによる全文検索 リソーステーブル\r
+                               NSqlQuery rQuery = new NSqlQuery(conn.getResourceConnection());\r
+                               ftlResourceQuery.bindValue(":text", getWords().get(i));\r
+                               ftlResourceQuery.exec();\r
+                               while(ftlResourceQuery.next()) {\r
+                                       guid = ftlResourceQuery.valueString(0);\r
+                                       \r
+                                       // リソースguidからノートguidを算出\r
+                                       rQuery.prepare("Select noteGuid from noteResources where guid=:guid");\r
+                                       rQuery.bindValue(":guid", guid);\r
+                                       rQuery.exec();\r
+                                       while(rQuery.next()) {\r
+                                               guid = rQuery.valueString(0);\r
+                                               if (i==0 || any) {\r
+                                                       insertQuery.bindValue(":guid", guid);\r
+                                                       insertQuery.exec();\r
+                                               } else {\r
+                                                       mergeQuery.bindValue(":guid", guid);\r
+                                                       mergeQuery.exec();\r
+                                               }\r
+                                       }\r
+                               }\r
+                               \r
                                if (i>0 && !any) {\r
                                        deleteQuery.exec("Delete from SEARCH_RESULTS where guid not in (select guid from SEARCH_RESULTS_MERGE)");\r
                                        deleteQuery.exec("Delete from SEARCH_RESULTS_MERGE");\r
index c6a8dc3..ad26cd6 100644 (file)
@@ -30,7 +30,6 @@ import java.util.TreeSet;
 import java.util.concurrent.LinkedBlockingQueue;
 import java.util.concurrent.locks.LockSupport;
 
-import org.apache.commons.lang3.StringEscapeUtils;
 import org.apache.tika.exception.TikaException;
 import org.apache.tika.metadata.Metadata;
 import org.apache.tika.parser.ParseContext;
@@ -44,7 +43,6 @@ import org.xml.sax.ContentHandler;
 import org.xml.sax.SAXException;
 
 import com.evernote.edam.type.Data;
-import com.evernote.edam.type.Note;
 import com.evernote.edam.type.Resource;
 import com.trolltech.qt.core.QByteArray;
 import com.trolltech.qt.core.QIODevice.OpenModeFlag;
@@ -74,10 +72,10 @@ public class IndexRunner extends QObject implements Runnable {
        public final int                                        REINDEXNOTE=3;
        public boolean                                          keepRunning;
        private final QDomDocument                      doc;
-       private static String                           regex = Global.getWordRegex();
-       public String                                           specialIndexCharacters = "";
-       public boolean                                          indexNoteBody = true;
-       public boolean                                          indexNoteTitle = true;
+//     private static String                           regex = Global.getWordRegex();
+//     public String                                           specialIndexCharacters = "";
+//     public boolean                                          indexNoteBody = true;
+//     public boolean                                          indexNoteTitle = true;
        public boolean                                          indexImageRecognition = true;
        private final DatabaseConnection        conn;
        private volatile LinkedBlockingQueue<String> workQueue;
@@ -163,62 +161,62 @@ public class IndexRunner extends QObject implements Runnable {
        }
        
        // Reindex a note
-       public void indexNoteContent() {
-               foundWords.clear();
-               
-               logger.log(logger.EXTREME, "Entering indexRunner.indexNoteContent()");
-               
-               logger.log(logger.EXTREME, "Getting note content");
-               Note n = conn.getNoteTable().getNote(guid,true,false,true,true, true);
-               String data;
-               if (indexNoteBody) {
-                       data = n.getContent();
-                       data = conn.getNoteTable().getNoteContentNoUTFConversion(n.getGuid());
-               
-                       logger.log(logger.EXTREME, "Removing any encrypted data");
-                       data = removeEnCrypt(data.toString());
-                       logger.log(logger.EXTREME, "Removing xml markups");
-               } else
-                       data = "";
-               String text;
-               if (indexNoteTitle)
-                       text =  removeTags(StringEscapeUtils.unescapeHtml4(data) +" "+ n.getTitle());
-               else
-                       text = removeTags(StringEscapeUtils.unescapeHtml4(data));
-                               
-               logger.log(logger.EXTREME, "Splitting words");
-               String[] result = text.toString().split(regex);
-               conn.commitTransaction();
-               conn.beginTransaction();
-               logger.log(logger.EXTREME, "Deleting existing words for note from index");
-               conn.getWordsTable().expungeFromWordIndex(guid, "CONTENT");
-               
-               logger.log(logger.EXTREME, "Number of words found: " +result.length);
-               for (int j=0; j<result.length && keepRunning; j++) {
-                       if (interrupt) {
-                               processInterrupt();
-                       }
-                       if (!result[j].trim().equals("")) {
-                               logger.log(logger.EXTREME, "Result word: " +result[j].trim());
-                               addToIndex(guid, result[j], "CONTENT");
-                       }
-               }
-               
-               // Add tags
-               for (int j=0; j<n.getTagNamesSize(); j++) {
-                       if (n.getTagNames() != null && n.getTagNames().get(j) != null && !n.getTagNames().get(j).trim().equals(""))
-                               addToIndex(guid, n.getTagNames().get(j), "CONTENT");
-               }
-               
-               // If we were interrupted, we will reindex this note next time
-               if (Global.keepRunning) {
-                       logger.log(logger.EXTREME, "Resetting note guid needed");
-                       conn.getNoteTable().setIndexNeeded(guid, false);
-               } 
-               conn.commitTransaction();
-               uncommittedCount = 0;
-               logger.log(logger.EXTREME, "Leaving indexRunner.indexNoteContent()");
-       }
+//     public void indexNoteContent() {
+//             foundWords.clear();
+//             
+//             logger.log(logger.EXTREME, "Entering indexRunner.indexNoteContent()");
+//             
+//             logger.log(logger.EXTREME, "Getting note content");
+//             Note n = conn.getNoteTable().getNote(guid,true,false,true,true, true);
+//             String data;
+//             if (indexNoteBody) {
+//                     data = n.getContent();
+//                     data = conn.getNoteTable().getNoteContentNoUTFConversion(n.getGuid());
+//             
+//                     logger.log(logger.EXTREME, "Removing any encrypted data");
+//                     data = removeEnCrypt(data.toString());
+//                     logger.log(logger.EXTREME, "Removing xml markups");
+//             } else
+//                     data = "";
+//             String text;
+//             if (indexNoteTitle)
+//                     text =  removeTags(StringEscapeUtils.unescapeHtml4(data) +" "+ n.getTitle());
+//             else
+//                     text = removeTags(StringEscapeUtils.unescapeHtml4(data));
+//                             
+//             logger.log(logger.EXTREME, "Splitting words");
+//             String[] result = text.toString().split(regex);
+//             conn.commitTransaction();
+//             conn.beginTransaction();
+//             logger.log(logger.EXTREME, "Deleting existing words for note from index");
+//             conn.getWordsTable().expungeFromWordIndex(guid, "CONTENT");
+//             
+//             logger.log(logger.EXTREME, "Number of words found: " +result.length);
+//             for (int j=0; j<result.length && keepRunning; j++) {
+//                     if (interrupt) {
+//                             processInterrupt();
+//                     }
+//                     if (!result[j].trim().equals("")) {
+//                             logger.log(logger.EXTREME, "Result word: " +result[j].trim());
+//                             addToIndex(guid, result[j], "CONTENT");
+//                     }
+//             }
+//             
+//             // Add tags
+//             for (int j=0; j<n.getTagNamesSize(); j++) {
+//                     if (n.getTagNames() != null && n.getTagNames().get(j) != null && !n.getTagNames().get(j).trim().equals(""))
+//                             addToIndex(guid, n.getTagNames().get(j), "CONTENT");
+//             }
+//             
+//             // If we were interrupted, we will reindex this note next time
+//             if (Global.keepRunning) {
+//                     logger.log(logger.EXTREME, "Resetting note guid needed");
+//                     conn.getNoteTable().setIndexNeeded(guid, false);
+//             } 
+//             conn.commitTransaction();
+//             uncommittedCount = 0;
+//             logger.log(logger.EXTREME, "Leaving indexRunner.indexNoteContent()");
+//     }
        
        
        private String removeTags(String text) {
@@ -368,10 +366,11 @@ public class IndexRunner extends QObject implements Runnable {
                        RTFParser parser = new RTFParser();     
                        ParseContext context = new ParseContext();
                        parser.parse(input, textHandler, metadata, context);
-                       String[] result = textHandler.toString().split(regex);
-                       for (int i=0; i<result.length && keepRunning; i++) {
-                               addToIndex(r.getNoteGuid(), result[i], "RESOURCE");
-                       }
+//                     String[] result = textHandler.toString().split(regex);
+//                     for (int i=0; i<result.length && keepRunning; i++) {
+//                             addToIndex(r.getNoteGuid(), result[i], "RESOURCE");
+//                     }
+                       updateResourceText(r.getGuid(), textHandler.toString());
                        input.close();
                
                        f.close();
@@ -415,13 +414,14 @@ public class IndexRunner extends QObject implements Runnable {
                        OpenDocumentParser parser = new OpenDocumentParser();   
                        ParseContext context = new ParseContext();
                        parser.parse(input, textHandler, metadata, context);
-                       String[] result = textHandler.toString().split(regex);
-                       for (int i=0; i<result.length && keepRunning; i++) {
-                               if (interrupt) {
-                                       processInterrupt();
-                               }
-                               addToIndex(r.getNoteGuid(), result[i], "RESOURCE");
-                       }
+//                     String[] result = textHandler.toString().split(regex);
+//                     for (int i=0; i<result.length && keepRunning; i++) {
+//                             if (interrupt) {
+//                                     processInterrupt();
+//                             }
+//                             addToIndex(r.getNoteGuid(), result[i], "RESOURCE");
+//                     }
+                       updateResourceText(r.getGuid(), textHandler.toString());
                        input.close();
                
                        f.close();
@@ -465,13 +465,14 @@ public class IndexRunner extends QObject implements Runnable {
                        OfficeParser parser = new OfficeParser();       
                        ParseContext context = new ParseContext();
                        parser.parse(input, textHandler, metadata, context);
-                       String[] result = textHandler.toString().split(regex);
-                       for (int i=0; i<result.length && keepRunning; i++) {
-                               if (interrupt) {
-                                       processInterrupt();
-                               }
-                               addToIndex(r.getNoteGuid(), result[i], "RESOURCE");
-                       }
+//                     String[] result = textHandler.toString().split(regex);
+//                     for (int i=0; i<result.length && keepRunning; i++) {
+//                             if (interrupt) {
+//                                     processInterrupt();
+//                             }
+//                             addToIndex(r.getNoteGuid(), result[i], "RESOURCE");
+//                     }
+                       updateResourceText(r.getGuid(), textHandler.toString());
                        input.close();
                
                        f.close();
@@ -516,13 +517,14 @@ public class IndexRunner extends QObject implements Runnable {
                        PDFParser parser = new PDFParser();     
                        ParseContext context = new ParseContext();
                        parser.parse(input, textHandler, metadata, context);
-                       String[] result = textHandler.toString().split(regex);
-                       for (int i=0; i<result.length && keepRunning; i++) {
-                               if (interrupt) {
-                                       processInterrupt();
-                               }
-                               addToIndex(r.getNoteGuid(), result[i], "RESOURCE");
-                       }
+//                     String[] result = textHandler.toString().split(regex);
+//                     for (int i=0; i<result.length && keepRunning; i++) {
+//                             if (interrupt) {
+//                                     processInterrupt();
+//                             }
+//                             addToIndex(r.getNoteGuid(), result[i], "RESOURCE");
+//                     }
+                       updateResourceText(r.getGuid(), textHandler.toString());
                        input.close();
                
                        f.close();
@@ -566,13 +568,14 @@ public class IndexRunner extends QObject implements Runnable {
                        OOXMLParser parser = new OOXMLParser(); 
                        ParseContext context = new ParseContext();
                        parser.parse(input, textHandler, metadata, context);
-                       String[] result = textHandler.toString().split(regex);
-                       for (int i=0; i<result.length && keepRunning; i++) {
-                               if (interrupt) {
-                                       processInterrupt();
-                               }
-                               addToIndex(r.getNoteGuid(), result[i], "RESOURCE");
-                       }
+//                     String[] result = textHandler.toString().split(regex);
+//                     for (int i=0; i<result.length && keepRunning; i++) {
+//                             if (interrupt) {
+//                                     processInterrupt();
+//                             }
+//                             addToIndex(r.getNoteGuid(), result[i], "RESOURCE");
+//                     }
+                       updateResourceText(r.getGuid(), textHandler.toString());
                        input.close();
                
                        f.close();
@@ -625,57 +628,62 @@ public class IndexRunner extends QObject implements Runnable {
        }
 
        
-       private void addToIndex(String guid, String word, String type) {
-               if (foundWords.contains(word))
-                       return;
-               StringBuffer buffer = new StringBuffer(word.toLowerCase());
-               for (int i=buffer.length()-1; i>=0; i--) {
-                       if (!Character.isLetterOrDigit(buffer.charAt(i)) && specialIndexCharacters.indexOf(buffer.charAt(i)) == -1)
-                               buffer.deleteCharAt(i);
-                       else
-                               break;
-               }
-               buffer = buffer.reverse();
-               for (int i=buffer.length()-1; i>=0; i--) {
-                       if (!Character.isLetterOrDigit(buffer.charAt(i)))
-                               buffer.deleteCharAt(i);
-                       else
-                               break;
-               }
-               buffer = buffer.reverse();
-               if (buffer.length() > 0) {
-                       // We have a good word, now let's trim off junk at the beginning or end
-                       if (!foundWords.contains(buffer.toString())) {
-                               foundWords.add(buffer.toString());
-                               foundWords.add(word);
-                               conn.getWordsTable().addWordToNoteIndex(guid, buffer.toString(), type, 100);
-                               uncommittedCount++;
-                               if (uncommittedCount > 100) {
-                                       conn.commitTransaction();
-                                       uncommittedCount=0;
-                               }
-                       }
-               }
-               return;
+//     private void addToIndex(String guid, String word, String type) {
+//             if (foundWords.contains(word))
+//                     return;
+//             StringBuffer buffer = new StringBuffer(word.toLowerCase());
+//             for (int i=buffer.length()-1; i>=0; i--) {
+//                     if (!Character.isLetterOrDigit(buffer.charAt(i)) && specialIndexCharacters.indexOf(buffer.charAt(i)) == -1)
+//                             buffer.deleteCharAt(i);
+//                     else
+//                             break;
+//             }
+//             buffer = buffer.reverse();
+//             for (int i=buffer.length()-1; i>=0; i--) {
+//                     if (!Character.isLetterOrDigit(buffer.charAt(i)))
+//                             buffer.deleteCharAt(i);
+//                     else
+//                             break;
+//             }
+//             buffer = buffer.reverse();
+//             if (buffer.length() > 0) {
+//                     // We have a good word, now let's trim off junk at the beginning or end
+//                     if (!foundWords.contains(buffer.toString())) {
+//                             foundWords.add(buffer.toString());
+//                             foundWords.add(word);
+//                             conn.getWordsTable().addWordToNoteIndex(guid, buffer.toString(), type, 100);
+//                             uncommittedCount++;
+//                             if (uncommittedCount > 100) {
+//                                     conn.commitTransaction();
+//                                     uncommittedCount=0;
+//                             }
+//                     }
+//             }
+//             return;
+//     }
+       
+       // ノートリソーステーブルのリソーステキストに追加
+       private void updateResourceText(String guid, String text) {
+               conn.getNoteTable().noteResourceTable.updateResourceText(guid, text);
        }
        
        private void scanUnindexed() {
-               List<String> notes = conn.getNoteTable().getUnindexed();
+//             List<String> notes = conn.getNoteTable().getUnindexed();
                guid = null;
                boolean started = false;
-               if (notes.size() > 0) {
-                       signal.indexStarted.emit();
-                       started = true;
-               }
-               for (int i=0; i<notes.size() && keepRunning; i++) {
-                       if (interrupt) {
-                               processInterrupt();
-                       }
-                       guid = notes.get(i);
-                       if (guid != null && keepRunning) {
-                               indexNoteContent();
-                       }
-               }
+//             if (notes.size() > 0) {
+//                     signal.indexStarted.emit();
+//                     started = true;
+//             }
+//             for (int i=0; i<notes.size() && keepRunning; i++) {
+//                     if (interrupt) {
+//                             processInterrupt();
+//                     }
+//                     guid = notes.get(i);
+//                     if (guid != null && keepRunning) {
+//                             indexNoteContent();
+//                     }
+//             }
                
                List<String> unindexedResources = conn.getNoteTable().noteResourceTable.getUnindexed();
                if (unindexedResources.size() > 0 && !started) {
index 17674e1..9a62abd 100644 (file)
@@ -123,8 +123,9 @@ public class NoteFormatter {
                logger.log(logger.EXTREME, "Note guid: " +currentNoteGuid);\r
                logger.log(logger.EXTREME, "Note Text:" +currentNote);\r
                QDomDocument doc = new QDomDocument();\r
-               QDomDocument.Result result = doc.setContent(currentNote.getContent());\r
-\r
+//             QDomDocument.Result result = doc.setContent(currentNote.getContent());\r
+               QDomDocument.Result result = doc.setContent(conn.getNoteTable().getNoteContentNoUTFConversion(currentNote.getGuid()));\r
+               \r
                // Handle any errors\r
                if (!result.success) {\r
                        logger.log(logger.LOW, "Error parsing document.  Attempting to restructure");\r
@@ -197,8 +198,13 @@ public class NoteFormatter {
                        for (int j=z-1; j>i+1; j--) \r
                                html.deleteCharAt(j);\r
                } \r
+               \r
+               QTextCodec codec;\r
+               codec = QTextCodec.codecForName("UTF-8");\r
+               String value = codec.fromUnicode(html.toString()).toString();\r
+               return value;\r
 \r
-               return html.toString(); //.replace("<Body", "<Body dir=\"rtl\"");\r
+//             return html.toString(); //.replace("<Body", "<Body dir=\"rtl\"");\r
        }       \r
 \r
        private void addImageHilight(String resGuid, QFile f) {\r
index 179d9ed..6b90cc6 100644 (file)
@@ -86,8 +86,9 @@ public class XMLInsertHilight {
        }\r
        \r
        // We found a text node, so we need to search for things to hilight\r
-       private void scanWords(QDomNode node) {\r
+       private void scanWords(QDomNode node) { \r
                String value = node.nodeValue();\r
+               \r
                QDomDocumentFragment fragment = doc.createDocumentFragment();\r
                boolean matchFound = false;\r
                int previousPosition = 0;\r
@@ -151,9 +152,9 @@ public class XMLInsertHilight {
                        String term = terms.get(i);\r
                        if (term.indexOf("*") > -1) {\r
                                term = term.replace("*", "");\r
-                       } else {\r
+                       }/* else {\r
                                term = "\\b"+term+"\\b";\r
-                       }\r
+                       }*/\r
                        regex.append(term);\r
                        if (i<terms.size()-1)\r
                                regex.append("|"); \r
index 8922ec5..a23ad3a 100644 (file)
@@ -4,12 +4,12 @@
 <context>
     <name>cx.fbn.nevernote.NeverNote</name>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="1216"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="1213"/>
         <source>Beginning shutdown.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="1239"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="1236"/>
         <source>Performing synchronization before closing.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -36,37 +36,38 @@ Please delete the notes or move them to another notebook before deleting any not
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="1125"/>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="1146"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="1122"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="1143"/>
         <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="2072"/>
         <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="2393"/>
         <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="2773"/>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="2974"/>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="5446"/>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="6794"/>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="6925"/>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="7667"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="2976"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3789"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="5462"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="6818"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="6949"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="7691"/>
         <source>Confirmation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="1126"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="1123"/>
         <source>Are you sure</source>
         <comment>Are you sure you wish to decrypt the database?</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="1134"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="1131"/>
         <source>Decryption Complete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="1134"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="1131"/>
         <source>Decryption is complete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="1150"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="1147"/>
         <source>Encrypting the database is usedto enhance security and is performed
 upon shutdown, but please be aware that if you lose the password your
 is lost forever.
@@ -78,7 +79,7 @@ Do you wish to proceed?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="1169"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="1166"/>
         <source>Incorrect Password</source>
         <translation type="unfinished"></translation>
     </message>
@@ -93,71 +94,71 @@ Do you wish to proceed?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3014"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3016"/>
         <source>Release Notes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3220"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3222"/>
         <source>Tool Bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3681"/>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3789"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3683"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3800"/>
         <source>Connect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3682"/>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3790"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3684"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3801"/>
         <source>Connect to Evernote</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3793"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3804"/>
         <source>Disconnect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3794"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3805"/>
         <source>Disconnect from Evernote</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="5406"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="5422"/>
         <source>Database will be reindexed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="5417"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="5433"/>
         <source>Notes will be reindexed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="5419"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="5435"/>
         <source>Note will be reindexed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="6134"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="6150"/>
         <source>Error Saving Note</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="6186"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="6202"/>
         <source>Note has never been synchronized.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="5210"/>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="6187"/>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="6209"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="5226"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="6203"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="6225"/>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="389"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="391"/>
         <source>Unable to connect to the database.
 
 The most probable reason is that some other process
@@ -169,58 +170,58 @@ Exiting program.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="391"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="393"/>
         <source>Database Connection Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="424"/>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="792"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="426"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="790"/>
         <source>NeighborNote</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="631"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="630"/>
         <source>Renso Note List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="777"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="775"/>
         <source>Show/Hide</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="778"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="776"/>
         <source>Exit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="779"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="777"/>
         <source>Add Note</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="1091"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="1088"/>
         <source>Are you sure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="1092"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="1089"/>
         <source>Are you sure you wish to encrypt the database?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="1107"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="1104"/>
         <source>Encryption Complete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="1107"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="1104"/>
         <source>Encryption is complete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="1164"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="1161"/>
         <source>Database Decryption</source>
         <translation type="unfinished"></translation>
     </message>
@@ -276,183 +277,188 @@ Exiting program.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="2976"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="2978"/>
         <source>This will free unused space in the database, but please be aware that depending upon the size of your database this can be time consuming and NeighborNote will be unresponsive until it is complete.  Do you wish to continue?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3033"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3035"/>
         <source>About NeighborNote</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3035"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3037"/>
         <source>&lt;h4&gt;&lt;center&gt;&lt;b&gt;NeighborNote&lt;/b&gt;&lt;/center&gt;&lt;/h4&gt;&lt;hr&gt;&lt;center&gt;Version </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3048"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3050"/>
         <source>&lt;hr&gt;Open Source Evernote Client.&lt;br&gt;&lt;br&gt;Licensed under GPL v2.  &lt;br&gt;&lt;hr&gt;&lt;br&gt;&lt;/center&gt;Evernote is copyright 2001-2012 by Evernote Corporation&lt;br&gt;Jambi and QT are the licensed trademark of Nokia Corporation&lt;br&gt;PDFRenderer is licened under the LGPL&lt;br&gt;JTidy is copyrighted under the World Wide Web Consortium&lt;br&gt;Apache Common Utilities licensed under the Apache License Version 2.0&lt;br&gt;Jazzy is licened under the LGPL&lt;br&gt;Java is a registered trademark of Oracle Corporation.&lt;br&gt;&lt;hr&gt;Special thanks to:&lt;br&gt;BitRock InstallBuilder for the Windows installer&lt;br&gt;CodeCogs (www.codecogs.com) for the LaTeX image rendering.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3231"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3233"/>
         <source>Previous</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3237"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3239"/>
         <source>Next</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3243"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3245"/>
         <source>Up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3250"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3252"/>
         <source>Down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3256"/>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3355"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3258"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3357"/>
         <source>Synchronize</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3262"/>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3359"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3264"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3361"/>
         <source>Print</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3268"/>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3363"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3270"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3365"/>
         <source>Tag</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3274"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3276"/>
         <source>Attributes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3280"/>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3371"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3282"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3373"/>
         <source>Email</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3286"/>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3375"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3288"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3377"/>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3292"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3294"/>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3298"/>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3383"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3300"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3385"/>
         <source>All Notes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3339"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3341"/>
         <source>Previous Arrow</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3343"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3345"/>
         <source>Next Arrow</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3347"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3349"/>
         <source>Up Arrow</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3351"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3353"/>
         <source>Down Arrow</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3367"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3369"/>
         <source>Attribute</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3379"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3381"/>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3387"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3389"/>
         <source>Search Clear</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3762"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3765"/>
         <source>Invalid authorization token received.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4702"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3789"/>
+        <source>Are you sure you want to enable the auto-login feature?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4713"/>
         <source>Note Not Found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4703"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4714"/>
         <source>Sorry, but I can&apos;t seem to find that note.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="5212"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="5228"/>
         <source>NeighborNote had issues formatting this note. To protect your data this note is being marked as read-only.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="5439"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="5455"/>
         <source>Delete </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="5442"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="5458"/>
         <source>Delete note &quot;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="5444"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="5460"/>
         <source>Delete note selected note?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="5463"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="5479"/>
         <source>Permanently delete </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="5466"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="5482"/>
         <source>Permanently delete note &quot;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="5468"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="5484"/>
         <source>Permanently delete note selected note?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="6128"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="6144"/>
         <source>An error has happened while saving the note &quot;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="6132"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="6148"/>
         <source>&quot;.
 
 This is probably due to a document that is too complex for NeighborNote to process.  As a result, changes to the note may not be saved properly in the database.
@@ -462,57 +468,57 @@ be lost.  Please review the note to recover any critical data before restarting.
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="6187"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="6203"/>
         <source>This note has never been sent to Evernote, so there is no history.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="6191"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="6207"/>
         <source>Getting Note History</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="6208"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="6224"/>
         <source>Note not found on server.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="6209"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="6225"/>
         <source>This note could not be found on Evernote&apos;s servers.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="6234"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="6250"/>
         <source>History retrieved</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="6292"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="6308"/>
         <source>Restoring as new note.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="6294"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="6310"/>
         <source>Note has been restored as a new note.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="6298"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="6314"/>
         <source>Restoring note.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="6312"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="6328"/>
         <source>Note has been restored.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="6462"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="6478"/>
         <source>DOUGH!!!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="6471"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="6487"/>
         <source>Well, this is embarrassing.
 
 Some attachments or images for this note appear to be missing from my database.
@@ -531,135 +537,141 @@ Who knows, you might get lucky.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="6516"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="6532"/>
         <source>Finalizing Synchronization</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="6561"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="6577"/>
         <source>Synchronization Complete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="6563"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="6579"/>
         <source>Synchronization completed with errors.  Please check the log for details.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="6657"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="6673"/>
         <source>Indexing notes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="6661"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="6677"/>
         <source>Index complete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="6685"/>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="6696"/>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="6707"/>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="6718"/>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="6728"/>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="6738"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="6701"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="6712"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="6723"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="6734"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="6744"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="6754"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="6764"/>
         <source>A thread has died.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="6686"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="6702"/>
         <source>It appears as the tag counter thread has died.  I recommend checking stopping NeighborNote, saving the logs for later viewing, and restarting.  Sorry.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="6697"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="6713"/>
         <source>It appears as the notebook counter thread has died.  I recommend checking stopping NeighborNote, saving the logs for later viewing, and restarting.  Sorry.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="6719"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="6735"/>
         <source>It appears as the note saver thread has died.  I recommend checking stopping NeighborNote, saving the logs for later viewing, and restarting.  Sorry.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="6729"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="6745"/>
         <source>It appears as the synchronization thread has died.  I recommend checking stopping NeighborNote, saving the logs for later viewing, and restarting.  Sorry.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="6739"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="6755"/>
         <source>It appears as the index thread has died.  I recommend checking stopping NeighborNote, saving the logs for later viewing, and restarting.  Sorry.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="6763"/>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="6809"/>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="6847"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="6765"/>
+        <source>It appears as the Evernote Related Notes thread has died.  I recommend checking stopping NeighborNote, saving the logs for later viewing, and restarting.  Sorry.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="6787"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="6833"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="6871"/>
         <source>NixNote Export (*.nnex);;All Files (*.*)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="6950"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="6974"/>
         <source>Import completed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="7011"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="7035"/>
         <source>Please Synchronize</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="7012"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="7036"/>
         <source>Please either synchronize or move any new notes to a local notebook.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="7449"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="7473"/>
         <source>No Response from CodeCogs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="7449"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="7473"/>
         <source>Unable to contact CodeCogs for LaTeX formula.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="7662"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="7686"/>
         <source>Exclude note &quot;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="7664"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="7688"/>
         <source>Exclude note selected note?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="6668"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="6684"/>
         <source>Indexing is now enabled.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="6670"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="6686"/>
         <source>Indexing is now disabled.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="6762"/>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="6846"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="6786"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="6870"/>
         <source>Backup Database</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="6777"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="6801"/>
         <source>Backing up database</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="6787"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="6811"/>
         <source>Database backup completed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="6798"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="6822"/>
         <source>This is used to restore a database from backups.
 It is HIGHLY recommened that this only be used to populate
 an empty database.  Restoring into a database that
@@ -669,52 +681,52 @@ Are you sure you want to continue?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="6808"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="6832"/>
         <source>Restore Database</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="6824"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="6848"/>
         <source>Restoring database</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="6838"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="6862"/>
         <source>Database has been restored.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="6856"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="6880"/>
         <source>Exporting Notes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="6868"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="6892"/>
         <source>Export completed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="6879"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="6903"/>
         <source>Import Notes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="6880"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="6904"/>
         <source>NixNote Export (*.nnex);;Evernote Export (*.enex);;All Files (*.*)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="6892"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="6916"/>
         <source>Importing Notes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="6926"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="6950"/>
         <source>Create new tags from import?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="6947"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="6971"/>
         <source>Notes have been imported.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1039,52 +1051,52 @@ Are you sure you want to continue?</source>
 <context>
     <name>cx.fbn.nevernote.dialog.ConfigDialog</name>
     <message>
-        <location filename="../src/cx/fbn/nevernote/dialog/ConfigDialog.java" line="90"/>
+        <location filename="../src/cx/fbn/nevernote/dialog/ConfigDialog.java" line="95"/>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/dialog/ConfigDialog.java" line="91"/>
+        <location filename="../src/cx/fbn/nevernote/dialog/ConfigDialog.java" line="96"/>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/dialog/ConfigDialog.java" line="106"/>
+        <location filename="../src/cx/fbn/nevernote/dialog/ConfigDialog.java" line="111"/>
         <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/dialog/ConfigDialog.java" line="268"/>
+        <location filename="../src/cx/fbn/nevernote/dialog/ConfigDialog.java" line="296"/>
         <source>Appearance</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/dialog/ConfigDialog.java" line="274"/>
+        <location filename="../src/cx/fbn/nevernote/dialog/ConfigDialog.java" line="302"/>
         <source>Fonts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/dialog/ConfigDialog.java" line="280"/>
+        <location filename="../src/cx/fbn/nevernote/dialog/ConfigDialog.java" line="308"/>
         <source>Indexing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/dialog/ConfigDialog.java" line="286"/>
+        <location filename="../src/cx/fbn/nevernote/dialog/ConfigDialog.java" line="314"/>
         <source>Spell Check</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/dialog/ConfigDialog.java" line="292"/>
+        <location filename="../src/cx/fbn/nevernote/dialog/ConfigDialog.java" line="320"/>
         <source>Connection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/dialog/ConfigDialog.java" line="298"/>
+        <location filename="../src/cx/fbn/nevernote/dialog/ConfigDialog.java" line="326"/>
         <source>Debugging</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/dialog/ConfigDialog.java" line="305"/>
+        <location filename="../src/cx/fbn/nevernote/dialog/ConfigDialog.java" line="333"/>
         <source>Renso Note List</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1150,16 +1162,6 @@ Are you sure you want to continue?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/dialog/ConfigIndexPage.java" line="79"/>
-        <source>Automatically Wildcard All Searches</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/cx/fbn/nevernote/dialog/ConfigIndexPage.java" line="93"/>
-        <source>Special Word Characters</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../src/cx/fbn/nevernote/dialog/ConfigIndexPage.java" line="99"/>
         <source>Index Interval</source>
         <translation type="unfinished"></translation>
@@ -1169,76 +1171,76 @@ Are you sure you want to continue?</source>
         <source>Seconds between looking for unindexed notes</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../src/cx/fbn/nevernote/dialog/ConfigIndexPage.java" line="112"/>
-        <source>Word Parse</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/cx/fbn/nevernote/dialog/ConfigIndexPage.java" line="113"/>
-        <source>Regular Expression</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>cx.fbn.nevernote.dialog.ConfigRensoNoteListPage</name>
     <message>
-        <location filename="../src/cx/fbn/nevernote/dialog/ConfigRensoNoteListPage.java" line="190"/>
-        <source>Browse Weight</source>
+        <location filename="../src/cx/fbn/nevernote/dialog/ConfigRensoNoteListPage.java" line="216"/>
+        <source>Concurrent Browse Weight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/dialog/ConfigRensoNoteListPage.java" line="191"/>
+        <location filename="../src/cx/fbn/nevernote/dialog/ConfigRensoNoteListPage.java" line="217"/>
         <source>Copy&amp;Paste Weight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/dialog/ConfigRensoNoteListPage.java" line="192"/>
+        <location filename="../src/cx/fbn/nevernote/dialog/ConfigRensoNoteListPage.java" line="218"/>
         <source>Add New Note Weight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/dialog/ConfigRensoNoteListPage.java" line="193"/>
+        <location filename="../src/cx/fbn/nevernote/dialog/ConfigRensoNoteListPage.java" line="219"/>
         <source>Renso Item Click Weight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/dialog/ConfigRensoNoteListPage.java" line="194"/>
+        <location filename="../src/cx/fbn/nevernote/dialog/ConfigRensoNoteListPage.java" line="220"/>
         <source>Same Tag Weight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/dialog/ConfigRensoNoteListPage.java" line="195"/>
+        <location filename="../src/cx/fbn/nevernote/dialog/ConfigRensoNoteListPage.java" line="221"/>
         <source>Same Notebook Weight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/dialog/ConfigRensoNoteListPage.java" line="197"/>
+        <location filename="../src/cx/fbn/nevernote/dialog/ConfigRensoNoteListPage.java" line="222"/>
+        <source>Evernote Related Notes Weight</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/cx/fbn/nevernote/dialog/ConfigRensoNoteListPage.java" line="225"/>
         <source>Weighting</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/dialog/ConfigRensoNoteListPage.java" line="201"/>
+        <location filename="../src/cx/fbn/nevernote/dialog/ConfigRensoNoteListPage.java" line="231"/>
+        <source>You can change these settings if you select &quot;Custom&quot; Mode.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/cx/fbn/nevernote/dialog/ConfigRensoNoteListPage.java" line="253"/>
         <source>When you merge the notes, also merge RensoNoteList</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/dialog/ConfigRensoNoteListPage.java" line="203"/>
+        <location filename="../src/cx/fbn/nevernote/dialog/ConfigRensoNoteListPage.java" line="255"/>
         <source>When you duplicate the notes, also duplicate RensoNoteList</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/dialog/ConfigRensoNoteListPage.java" line="205"/>
+        <location filename="../src/cx/fbn/nevernote/dialog/ConfigRensoNoteListPage.java" line="257"/>
         <source>Verify when you exclude the note</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/dialog/ConfigRensoNoteListPage.java" line="215"/>
+        <location filename="../src/cx/fbn/nevernote/dialog/ConfigRensoNoteListPage.java" line="267"/>
         <source>Renso Note List Item Maximum</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/dialog/ConfigRensoNoteListPage.java" line="224"/>
+        <location filename="../src/cx/fbn/nevernote/dialog/ConfigRensoNoteListPage.java" line="276"/>
         <source>Others</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1565,57 +1567,67 @@ Are you sure you want to continue?</source>
 <context>
     <name>cx.fbn.nevernote.dialog.DatabaseStatus</name>
     <message>
-        <location filename="../src/cx/fbn/nevernote/dialog/DatabaseStatus.java" line="51"/>
+        <location filename="../src/cx/fbn/nevernote/dialog/DatabaseStatus.java" line="53"/>
         <source>Current Database Status</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/dialog/DatabaseStatus.java" line="65"/>
+        <location filename="../src/cx/fbn/nevernote/dialog/DatabaseStatus.java" line="69"/>
         <source>Notebooks:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/dialog/DatabaseStatus.java" line="68"/>
+        <location filename="../src/cx/fbn/nevernote/dialog/DatabaseStatus.java" line="72"/>
         <source>Tags:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/dialog/DatabaseStatus.java" line="71"/>
+        <location filename="../src/cx/fbn/nevernote/dialog/DatabaseStatus.java" line="75"/>
         <source>Total Notes:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/dialog/DatabaseStatus.java" line="74"/>
+        <location filename="../src/cx/fbn/nevernote/dialog/DatabaseStatus.java" line="78"/>
         <source>Unsynchronized Notes:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/dialog/DatabaseStatus.java" line="77"/>
+        <location filename="../src/cx/fbn/nevernote/dialog/DatabaseStatus.java" line="81"/>
         <source>Unindexed Notes:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/dialog/DatabaseStatus.java" line="80"/>
+        <location filename="../src/cx/fbn/nevernote/dialog/DatabaseStatus.java" line="84"/>
         <source>Attachments/Images:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/dialog/DatabaseStatus.java" line="83"/>
+        <location filename="../src/cx/fbn/nevernote/dialog/DatabaseStatus.java" line="87"/>
         <source>Unindexed Attachments/Images:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/dialog/DatabaseStatus.java" line="86"/>
+        <location filename="../src/cx/fbn/nevernote/dialog/DatabaseStatus.java" line="90"/>
         <source>Saved Searches:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/dialog/DatabaseStatus.java" line="89"/>
+        <location filename="../src/cx/fbn/nevernote/dialog/DatabaseStatus.java" line="93"/>
         <source>Words In Index</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/dialog/DatabaseStatus.java" line="93"/>
+        <location filename="../src/cx/fbn/nevernote/dialog/DatabaseStatus.java" line="96"/>
+        <source>Tobal Behavior History:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/cx/fbn/nevernote/dialog/DatabaseStatus.java" line="99"/>
+        <source>Renso Note Click:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/cx/fbn/nevernote/dialog/DatabaseStatus.java" line="103"/>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2616,15 +2628,30 @@ If you don&apos;t wish to use Evernote&apos;s then please check the option at th
 <context>
     <name>cx.fbn.nevernote.dialog.UpgradeAvailableDialog</name>
     <message>
-        <location filename="../src/cx/fbn/nevernote/dialog/UpgradeAvailableDialog.java" line="51"/>
+        <location filename="../src/cx/fbn/nevernote/dialog/UpgradeAvailableDialog.java" line="56"/>
         <source>Upgrade Available</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/dialog/UpgradeAvailableDialog.java" line="62"/>
+        <location filename="../src/cx/fbn/nevernote/dialog/UpgradeAvailableDialog.java" line="67"/>
         <source>Automatically check for updates at startup</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../src/cx/fbn/nevernote/dialog/UpgradeAvailableDialog.java" line="73"/>
+        <source>Do you want to download now?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/cx/fbn/nevernote/dialog/UpgradeAvailableDialog.java" line="82"/>
+        <source>Yes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/cx/fbn/nevernote/dialog/UpgradeAvailableDialog.java" line="84"/>
+        <source>No</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>cx.fbn.nevernote.dialog.WatchFolder</name>
@@ -2984,43 +3011,43 @@ If you don&apos;t wish to use Evernote&apos;s then please check the option at th
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="569"/>
+        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="571"/>
         <source>Font Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="577"/>
+        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="579"/>
         <source>Font Hilight Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="748"/>
+        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="750"/>
         <source>Source URL:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="824"/>
+        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="826"/>
         <source>Source URL:    </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="835"/>
-        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="836"/>
+        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="837"/>
+        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="838"/>
         <source>http://</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="844"/>
+        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="846"/>
         <source>Author:        </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="962"/>
+        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="964"/>
         <source>Unable Open</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="964"/>
+        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="966"/>
         <source>This is an ink note.
 Ink notes are not supported since Evernote has not
  published any specifications on them
@@ -3028,97 +3055,97 @@ and I&apos;m too lazy to figure them out by myself.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="1419"/>
+        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="1421"/>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="1419"/>
+        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="1421"/>
         <source>Error Encrypting String</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="1454"/>
+        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="1456"/>
         <source>No Matches Found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="1454"/>
+        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="1456"/>
         <source>No matching notes found.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="1808"/>
+        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="1810"/>
         <source>Incorrect Password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="1808"/>
+        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="1810"/>
         <source>The password entered is not correct</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="2085"/>
-        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="2201"/>
-        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="2209"/>
+        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="2087"/>
+        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="2203"/>
+        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="2211"/>
         <source>Untitled Note</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="3408"/>
-        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="3412"/>
+        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="3410"/>
+        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="3414"/>
         <source>Dictionary </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="3409"/>
+        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="3411"/>
         <source>.dic was not found.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="3413"/>
+        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="3415"/>
         <source>.dic is invalid.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="3472"/>
+        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="3474"/>
         <source>No Errors Found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="2592"/>
+        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="2594"/>
         <source>A file attachment may not exceed 25MB.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="2593"/>
+        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="2595"/>
         <source>Attachment Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="2680"/>
-        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="2733"/>
+        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="2682"/>
+        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="2735"/>
         <source>Save File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="2858"/>
+        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="2860"/>
         <source>Insert Hyperlink</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="3015"/>
+        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="3017"/>
         <source>Edit Hyperlink</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="3407"/>
-        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="3411"/>
+        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="3409"/>
+        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="3413"/>
         <source>Spell Check Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="3471"/>
+        <location filename="../src/cx/fbn/nevernote/gui/BrowserWindow.java" line="3473"/>
         <source>Spell Check Complete</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3689,506 +3716,506 @@ and I&apos;m too lazy to figure them out by myself.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/MainMenuBar.java" line="230"/>
+        <location filename="../src/cx/fbn/nevernote/gui/MainMenuBar.java" line="231"/>
         <source>Merge Notes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/MainMenuBar.java" line="231"/>
+        <location filename="../src/cx/fbn/nevernote/gui/MainMenuBar.java" line="232"/>
         <source>Merge Multiple notes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/MainMenuBar.java" line="235"/>
+        <location filename="../src/cx/fbn/nevernote/gui/MainMenuBar.java" line="236"/>
         <source>Export Selected Notes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/MainMenuBar.java" line="236"/>
+        <location filename="../src/cx/fbn/nevernote/gui/MainMenuBar.java" line="237"/>
         <source>Export selected notes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/MainMenuBar.java" line="240"/>
         <location filename="../src/cx/fbn/nevernote/gui/MainMenuBar.java" line="241"/>
+        <location filename="../src/cx/fbn/nevernote/gui/MainMenuBar.java" line="242"/>
         <source>Copy as URL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/MainMenuBar.java" line="245"/>
+        <location filename="../src/cx/fbn/nevernote/gui/MainMenuBar.java" line="246"/>
         <source>Import Notes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/MainMenuBar.java" line="246"/>
+        <location filename="../src/cx/fbn/nevernote/gui/MainMenuBar.java" line="247"/>
         <source>Import notes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/MainMenuBar.java" line="250"/>
-        <location filename="../src/cx/fbn/nevernote/gui/MainMenuBar.java" line="506"/>
-        <location filename="../src/cx/fbn/nevernote/gui/MainMenuBar.java" line="548"/>
-        <location filename="../src/cx/fbn/nevernote/gui/MainMenuBar.java" line="572"/>
+        <location filename="../src/cx/fbn/nevernote/gui/MainMenuBar.java" line="251"/>
+        <location filename="../src/cx/fbn/nevernote/gui/MainMenuBar.java" line="507"/>
+        <location filename="../src/cx/fbn/nevernote/gui/MainMenuBar.java" line="549"/>
+        <location filename="../src/cx/fbn/nevernote/gui/MainMenuBar.java" line="573"/>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/MainMenuBar.java" line="251"/>
+        <location filename="../src/cx/fbn/nevernote/gui/MainMenuBar.java" line="252"/>
         <source>Add a new note</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/MainMenuBar.java" line="255"/>
+        <location filename="../src/cx/fbn/nevernote/gui/MainMenuBar.java" line="256"/>
         <source>Modify Tags</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/MainMenuBar.java" line="256"/>
+        <location filename="../src/cx/fbn/nevernote/gui/MainMenuBar.java" line="257"/>
         <source>Change the tags assigned to this note</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/MainMenuBar.java" line="260"/>
-        <location filename="../src/cx/fbn/nevernote/gui/MainMenuBar.java" line="515"/>
-        <location filename="../src/cx/fbn/nevernote/gui/MainMenuBar.java" line="557"/>
-        <location filename="../src/cx/fbn/nevernote/gui/MainMenuBar.java" line="581"/>
+        <location filename="../src/cx/fbn/nevernote/gui/MainMenuBar.java" line="261"/>
+        <location filename="../src/cx/fbn/nevernote/gui/MainMenuBar.java" line="516"/>
+        <location filename="../src/cx/fbn/nevernote/gui/MainMenuBar.java" line="558"/>
+        <location filename="../src/cx/fbn/nevernote/gui/MainMenuBar.java" line="582"/>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/MainMenuBar.java" line="261"/>
+        <location filename="../src/cx/fbn/nevernote/gui/MainMenuBar.java" line="262"/>
         <source>Delete this note</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/MainMenuBar.java" line="266"/>
+        <location filename="../src/cx/fbn/nevernote/gui/MainMenuBar.java" line="267"/>
         <source>Open in New Tab</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/MainMenuBar.java" line="267"/>
+        <location filename="../src/cx/fbn/nevernote/gui/MainMenuBar.java" line="268"/>
         <source>Open this note in new tab</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/MainMenuBar.java" line="272"/>
+        <location filename="../src/cx/fbn/nevernote/gui/MainMenuBar.java" line="273"/>
         <source>Add in New Tab</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/MainMenuBar.java" line="273"/>
+        <location filename="../src/cx/fbn/nevernote/gui/MainMenuBar.java" line="274"/>
         <source>Add a new note in new tab</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/MainMenuBar.java" line="277"/>
+        <location filename="../src/cx/fbn/nevernote/gui/MainMenuBar.java" line="278"/>
         <source>Find In Note</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/MainMenuBar.java" line="278"/>
+        <location filename="../src/cx/fbn/nevernote/gui/MainMenuBar.java" line="279"/>
         <source>Find a string in the current note</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/MainMenuBar.java" line="283"/>
         <location filename="../src/cx/fbn/nevernote/gui/MainMenuBar.java" line="284"/>
+        <location filename="../src/cx/fbn/nevernote/gui/MainMenuBar.java" line="285"/>
         <source>Undo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/MainMenuBar.java" line="289"/>
         <location filename="../src/cx/fbn/nevernote/gui/MainMenuBar.java" line="290"/>
+        <location filename="../src/cx/fbn/nevernote/gui/MainMenuBar.java" line="291"/>
         <source>Redo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/MainMenuBar.java" line="295"/>
         <location filename="../src/cx/fbn/nevernote/gui/MainMenuBar.java" line="296"/>
+        <location filename="../src/cx/fbn/nevernote/gui/MainMenuBar.java" line="297"/>
         <source>Cut</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/MainMenuBar.java" line="301"/>
         <location filename="../src/cx/fbn/nevernote/gui/MainMenuBar.java" line="302"/>
+        <location filename="../src/cx/fbn/nevernote/gui/MainMenuBar.java" line="303"/>
         <source>Copy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/MainMenuBar.java" line="308"/>
         <location filename="../src/cx/fbn/nevernote/gui/MainMenuBar.java" line="309"/>
+        <location filename="../src/cx/fbn/nevernote/gui/MainMenuBar.java" line="310"/>
         <source>Paste</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/MainMenuBar.java" line="313"/>
         <location filename="../src/cx/fbn/nevernote/gui/MainMenuBar.java" line="314"/>
+        <location filename="../src/cx/fbn/nevernote/gui/MainMenuBar.java" line="315"/>
         <source>Paste Without Formatting</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/MainMenuBar.java" line="318"/>
+        <location filename="../src/cx/fbn/nevernote/gui/MainMenuBar.java" line="319"/>
         <source>Show Note List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/MainMenuBar.java" line="319"/>
+        <location filename="../src/cx/fbn/nevernote/gui/MainMenuBar.java" line="320"/>
         <source>Show/Hide Note List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/MainMenuBar.java" line="325"/>
+        <location filename="../src/cx/fbn/nevernote/gui/MainMenuBar.java" line="326"/>
         <source>Show Tags</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/MainMenuBar.java" line="326"/>
+        <location filename="../src/cx/fbn/nevernote/gui/MainMenuBar.java" line="327"/>
         <source>Show/Hide Tags</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/MainMenuBar.java" line="332"/>
+        <location filename="../src/cx/fbn/nevernote/gui/MainMenuBar.java" line="333"/>
         <source>Show Notebooks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/MainMenuBar.java" line="333"/>
+        <location filename="../src/cx/fbn/nevernote/gui/MainMenuBar.java" line="334"/>
         <source>Show/Hide Notebooks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/MainMenuBar.java" line="339"/>
+        <location filename="../src/cx/fbn/nevernote/gui/MainMenuBar.java" line="340"/>
         <source>Show Zoom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/MainMenuBar.java" line="340"/>
+        <location filename="../src/cx/fbn/nevernote/gui/MainMenuBar.java" line="341"/>
         <source>Show/Hide Zoom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/MainMenuBar.java" line="346"/>
+        <location filename="../src/cx/fbn/nevernote/gui/MainMenuBar.java" line="347"/>
         <source>Show Quota Bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/MainMenuBar.java" line="347"/>
+        <location filename="../src/cx/fbn/nevernote/gui/MainMenuBar.java" line="348"/>
         <source>Show/Hide Quota</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/MainMenuBar.java" line="353"/>
+        <location filename="../src/cx/fbn/nevernote/gui/MainMenuBar.java" line="354"/>
         <source>Show Search Box</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/MainMenuBar.java" line="354"/>
+        <location filename="../src/cx/fbn/nevernote/gui/MainMenuBar.java" line="355"/>
         <source>Show/Hide Search Box</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/MainMenuBar.java" line="360"/>
         <location filename="../src/cx/fbn/nevernote/gui/MainMenuBar.java" line="361"/>
+        <location filename="../src/cx/fbn/nevernote/gui/MainMenuBar.java" line="362"/>
         <source>Wide List View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/MainMenuBar.java" line="366"/>
         <location filename="../src/cx/fbn/nevernote/gui/MainMenuBar.java" line="367"/>
+        <location filename="../src/cx/fbn/nevernote/gui/MainMenuBar.java" line="368"/>
         <source>Narrow List View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/MainMenuBar.java" line="372"/>
+        <location filename="../src/cx/fbn/nevernote/gui/MainMenuBar.java" line="373"/>
         <source>Preview</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/MainMenuBar.java" line="373"/>
+        <location filename="../src/cx/fbn/nevernote/gui/MainMenuBar.java" line="374"/>
         <source>Preview Notes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/MainMenuBar.java" line="377"/>
+        <location filename="../src/cx/fbn/nevernote/gui/MainMenuBar.java" line="378"/>
         <source>Show Saved Searches</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/MainMenuBar.java" line="378"/>
+        <location filename="../src/cx/fbn/nevernote/gui/MainMenuBar.java" line="379"/>
         <source>Show/Hide Saved Searches</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/MainMenuBar.java" line="384"/>
+        <location filename="../src/cx/fbn/nevernote/gui/MainMenuBar.java" line="385"/>
         <source>Show Attribute Searches</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/MainMenuBar.java" line="385"/>
+        <location filename="../src/cx/fbn/nevernote/gui/MainMenuBar.java" line="386"/>
         <source>Show/Hide Attribute Searches</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/MainMenuBar.java" line="391"/>
+        <location filename="../src/cx/fbn/nevernote/gui/MainMenuBar.java" line="392"/>
         <source>Show Trash</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/MainMenuBar.java" line="392"/>
+        <location filename="../src/cx/fbn/nevernote/gui/MainMenuBar.java" line="393"/>
         <source>Show/Hide Trash Tree</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/MainMenuBar.java" line="399"/>
+        <location filename="../src/cx/fbn/nevernote/gui/MainMenuBar.java" line="400"/>
         <source>Show Editor Button Bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/MainMenuBar.java" line="400"/>
+        <location filename="../src/cx/fbn/nevernote/gui/MainMenuBar.java" line="401"/>
         <source>Show/Hide Editor Button Bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/MainMenuBar.java" line="407"/>
+        <location filename="../src/cx/fbn/nevernote/gui/MainMenuBar.java" line="408"/>
         <source>Hide Left Side Panels</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/MainMenuBar.java" line="408"/>
+        <location filename="../src/cx/fbn/nevernote/gui/MainMenuBar.java" line="409"/>
         <source>Hide The Entire Left Side</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/MainMenuBar.java" line="415"/>
+        <location filename="../src/cx/fbn/nevernote/gui/MainMenuBar.java" line="416"/>
         <source>View Source</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/MainMenuBar.java" line="416"/>
+        <location filename="../src/cx/fbn/nevernote/gui/MainMenuBar.java" line="417"/>
         <source>View the source HTML for a note</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/MainMenuBar.java" line="423"/>
+        <location filename="../src/cx/fbn/nevernote/gui/MainMenuBar.java" line="424"/>
         <source>Left</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/MainMenuBar.java" line="424"/>
+        <location filename="../src/cx/fbn/nevernote/gui/MainMenuBar.java" line="425"/>
         <source>Left Align</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/MainMenuBar.java" line="429"/>
+        <location filename="../src/cx/fbn/nevernote/gui/MainMenuBar.java" line="430"/>
         <source>Right</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/MainMenuBar.java" line="430"/>
+        <location filename="../src/cx/fbn/nevernote/gui/MainMenuBar.java" line="431"/>
         <source>Right Align</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/MainMenuBar.java" line="435"/>
+        <location filename="../src/cx/fbn/nevernote/gui/MainMenuBar.java" line="436"/>
         <source>Center</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/MainMenuBar.java" line="436"/>
+        <location filename="../src/cx/fbn/nevernote/gui/MainMenuBar.java" line="437"/>
         <source>Center Align</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/MainMenuBar.java" line="441"/>
         <location filename="../src/cx/fbn/nevernote/gui/MainMenuBar.java" line="442"/>
+        <location filename="../src/cx/fbn/nevernote/gui/MainMenuBar.java" line="443"/>
         <source>Bold</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/MainMenuBar.java" line="447"/>
         <location filename="../src/cx/fbn/nevernote/gui/MainMenuBar.java" line="448"/>
+        <location filename="../src/cx/fbn/nevernote/gui/MainMenuBar.java" line="449"/>
         <source>Italic</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/MainMenuBar.java" line="453"/>
         <location filename="../src/cx/fbn/nevernote/gui/MainMenuBar.java" line="454"/>
+        <location filename="../src/cx/fbn/nevernote/gui/MainMenuBar.java" line="455"/>
         <source>Underline</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/MainMenuBar.java" line="460"/>
         <location filename="../src/cx/fbn/nevernote/gui/MainMenuBar.java" line="461"/>
+        <location filename="../src/cx/fbn/nevernote/gui/MainMenuBar.java" line="462"/>
         <source>Superscript</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/MainMenuBar.java" line="466"/>
         <location filename="../src/cx/fbn/nevernote/gui/MainMenuBar.java" line="467"/>
+        <location filename="../src/cx/fbn/nevernote/gui/MainMenuBar.java" line="468"/>
         <source>Subscript</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/MainMenuBar.java" line="472"/>
         <location filename="../src/cx/fbn/nevernote/gui/MainMenuBar.java" line="473"/>
+        <location filename="../src/cx/fbn/nevernote/gui/MainMenuBar.java" line="474"/>
         <source>Strikethrough</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/MainMenuBar.java" line="477"/>
         <location filename="../src/cx/fbn/nevernote/gui/MainMenuBar.java" line="478"/>
+        <location filename="../src/cx/fbn/nevernote/gui/MainMenuBar.java" line="479"/>
         <source>Horizontal Line</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/MainMenuBar.java" line="482"/>
+        <location filename="../src/cx/fbn/nevernote/gui/MainMenuBar.java" line="483"/>
         <source>Bulleted List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/MainMenuBar.java" line="488"/>
+        <location filename="../src/cx/fbn/nevernote/gui/MainMenuBar.java" line="489"/>
         <source>Numbered List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/MainMenuBar.java" line="489"/>
+        <location filename="../src/cx/fbn/nevernote/gui/MainMenuBar.java" line="490"/>
         <source>Numbered list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/MainMenuBar.java" line="494"/>
         <location filename="../src/cx/fbn/nevernote/gui/MainMenuBar.java" line="495"/>
+        <location filename="../src/cx/fbn/nevernote/gui/MainMenuBar.java" line="496"/>
         <source>&gt;&gt; Increase</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/MainMenuBar.java" line="500"/>
         <location filename="../src/cx/fbn/nevernote/gui/MainMenuBar.java" line="501"/>
+        <location filename="../src/cx/fbn/nevernote/gui/MainMenuBar.java" line="502"/>
         <source>&lt;&lt; Decrease</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/MainMenuBar.java" line="510"/>
-        <location filename="../src/cx/fbn/nevernote/gui/MainMenuBar.java" line="552"/>
-        <location filename="../src/cx/fbn/nevernote/gui/MainMenuBar.java" line="576"/>
+        <location filename="../src/cx/fbn/nevernote/gui/MainMenuBar.java" line="511"/>
+        <location filename="../src/cx/fbn/nevernote/gui/MainMenuBar.java" line="553"/>
+        <location filename="../src/cx/fbn/nevernote/gui/MainMenuBar.java" line="577"/>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/MainMenuBar.java" line="520"/>
+        <location filename="../src/cx/fbn/nevernote/gui/MainMenuBar.java" line="521"/>
         <source>Share With The World</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/MainMenuBar.java" line="526"/>
+        <location filename="../src/cx/fbn/nevernote/gui/MainMenuBar.java" line="527"/>
         <source>Share With Individuals</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/MainMenuBar.java" line="533"/>
+        <location filename="../src/cx/fbn/nevernote/gui/MainMenuBar.java" line="534"/>
         <source>Open/Close Notebooks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/MainMenuBar.java" line="538"/>
-        <location filename="../src/cx/fbn/nevernote/gui/MainMenuBar.java" line="562"/>
-        <location filename="../src/cx/fbn/nevernote/gui/MainMenuBar.java" line="586"/>
+        <location filename="../src/cx/fbn/nevernote/gui/MainMenuBar.java" line="539"/>
+        <location filename="../src/cx/fbn/nevernote/gui/MainMenuBar.java" line="563"/>
+        <location filename="../src/cx/fbn/nevernote/gui/MainMenuBar.java" line="587"/>
         <source>Change Icon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/MainMenuBar.java" line="543"/>
+        <location filename="../src/cx/fbn/nevernote/gui/MainMenuBar.java" line="544"/>
         <source>Set Stack</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/MainMenuBar.java" line="567"/>
+        <location filename="../src/cx/fbn/nevernote/gui/MainMenuBar.java" line="568"/>
         <source>Merge Tags</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/MainMenuBar.java" line="591"/>
+        <location filename="../src/cx/fbn/nevernote/gui/MainMenuBar.java" line="592"/>
         <source>Connect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/MainMenuBar.java" line="596"/>
+        <location filename="../src/cx/fbn/nevernote/gui/MainMenuBar.java" line="597"/>
         <source>Synchronize with Evernote</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/MainMenuBar.java" line="603"/>
+        <location filename="../src/cx/fbn/nevernote/gui/MainMenuBar.java" line="604"/>
         <source>Note History</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/MainMenuBar.java" line="608"/>
+        <location filename="../src/cx/fbn/nevernote/gui/MainMenuBar.java" line="609"/>
         <source>Selective Synchronize</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/MainMenuBar.java" line="616"/>
         <location filename="../src/cx/fbn/nevernote/gui/MainMenuBar.java" line="617"/>
+        <location filename="../src/cx/fbn/nevernote/gui/MainMenuBar.java" line="618"/>
         <source>Account Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/MainMenuBar.java" line="626"/>
+        <location filename="../src/cx/fbn/nevernote/gui/MainMenuBar.java" line="627"/>
         <source>Database Status</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/MainMenuBar.java" line="627"/>
+        <location filename="../src/cx/fbn/nevernote/gui/MainMenuBar.java" line="628"/>
         <source>Show current database information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/MainMenuBar.java" line="632"/>
+        <location filename="../src/cx/fbn/nevernote/gui/MainMenuBar.java" line="633"/>
         <source>Disable Note Indexing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/MainMenuBar.java" line="633"/>
+        <location filename="../src/cx/fbn/nevernote/gui/MainMenuBar.java" line="634"/>
         <source>Manually Stop Note Indexing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/MainMenuBar.java" line="640"/>
+        <location filename="../src/cx/fbn/nevernote/gui/MainMenuBar.java" line="641"/>
         <source>Automatic Folder Importing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/MainMenuBar.java" line="641"/>
+        <location filename="../src/cx/fbn/nevernote/gui/MainMenuBar.java" line="642"/>
         <source>Import Files Automatically</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/MainMenuBar.java" line="645"/>
+        <location filename="../src/cx/fbn/nevernote/gui/MainMenuBar.java" line="646"/>
         <source>Spell Check</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/MainMenuBar.java" line="646"/>
+        <location filename="../src/cx/fbn/nevernote/gui/MainMenuBar.java" line="647"/>
         <source>Check for spelling errors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/MainMenuBar.java" line="650"/>
+        <location filename="../src/cx/fbn/nevernote/gui/MainMenuBar.java" line="651"/>
         <source>Encrypt Database</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/MainMenuBar.java" line="651"/>
+        <location filename="../src/cx/fbn/nevernote/gui/MainMenuBar.java" line="652"/>
         <source>Encrypt the database upon shutdown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/MainMenuBar.java" line="659"/>
+        <location filename="../src/cx/fbn/nevernote/gui/MainMenuBar.java" line="660"/>
         <source>Logs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/MainMenuBar.java" line="660"/>
+        <location filename="../src/cx/fbn/nevernote/gui/MainMenuBar.java" line="661"/>
         <source>Show the detailed application log</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4208,22 +4235,22 @@ and I&apos;m too lazy to figure them out by myself.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/MainMenuBar.java" line="664"/>
+        <location filename="../src/cx/fbn/nevernote/gui/MainMenuBar.java" line="665"/>
         <source>Release Notes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/MainMenuBar.java" line="665"/>
+        <location filename="../src/cx/fbn/nevernote/gui/MainMenuBar.java" line="666"/>
         <source>Release notes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/MainMenuBar.java" line="669"/>
+        <location filename="../src/cx/fbn/nevernote/gui/MainMenuBar.java" line="670"/>
         <source>Check For Updates</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/MainMenuBar.java" line="670"/>
+        <location filename="../src/cx/fbn/nevernote/gui/MainMenuBar.java" line="671"/>
         <source>Check for newer versions</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4334,47 +4361,104 @@ and I&apos;m too lazy to figure them out by myself.</source>
 <context>
     <name>cx.fbn.nevernote.gui.RensoNoteList</name>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/RensoNoteList.java" line="74"/>
+        <location filename="../src/cx/fbn/nevernote/gui/RensoNoteList.java" line="93"/>
         <source>Open in New Tab</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/RensoNoteList.java" line="75"/>
+        <location filename="../src/cx/fbn/nevernote/gui/RensoNoteList.java" line="94"/>
         <source>Open this note in new tab</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/RensoNoteList.java" line="78"/>
-        <source>STAR</source>
+        <location filename="../src/cx/fbn/nevernote/gui/RensoNoteList.java" line="97"/>
+        <source>Add Star</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/RensoNoteList.java" line="79"/>
-        <source>Star this item</source>
+        <location filename="../src/cx/fbn/nevernote/gui/RensoNoteList.java" line="98"/>
+        <source>Add Star to this item</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/RensoNoteList.java" line="82"/>
-        <source>UNSTAR</source>
+        <location filename="../src/cx/fbn/nevernote/gui/RensoNoteList.java" line="101"/>
+        <source>Remove Star</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/RensoNoteList.java" line="83"/>
-        <source>Unstar this item</source>
+        <location filename="../src/cx/fbn/nevernote/gui/RensoNoteList.java" line="102"/>
+        <source>Remove Star from this item</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/RensoNoteList.java" line="86"/>
+        <location filename="../src/cx/fbn/nevernote/gui/RensoNoteList.java" line="105"/>
         <source>Exclude</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/gui/RensoNoteList.java" line="87"/>
+        <location filename="../src/cx/fbn/nevernote/gui/RensoNoteList.java" line="106"/>
         <source>Exclude this note from RensoNoteList</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
+    <name>cx.fbn.nevernote.gui.RensoNoteListDock</name>
+    <message>
+        <location filename="../src/cx/fbn/nevernote/gui/RensoNoteListDock.java" line="74"/>
+        <source>Mode: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/cx/fbn/nevernote/gui/RensoNoteListDock.java" line="75"/>
+        <location filename="../src/cx/fbn/nevernote/gui/RensoNoteListDock.java" line="80"/>
+        <source>Preset Weighting Mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/cx/fbn/nevernote/gui/RensoNoteListDock.java" line="81"/>
+        <source>Standard</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/cx/fbn/nevernote/gui/RensoNoteListDock.java" line="82"/>
+        <source>Concurrent Browse</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/cx/fbn/nevernote/gui/RensoNoteListDock.java" line="84"/>
+        <source>Content Similarity</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/cx/fbn/nevernote/gui/RensoNoteListDock.java" line="85"/>
+        <source>Custom</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/cx/fbn/nevernote/gui/RensoNoteListDock.java" line="104"/>
+        <source>Halt Collectiong Operation Log</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/cx/fbn/nevernote/gui/RensoNoteListDock.java" line="158"/>
+        <location filename="../src/cx/fbn/nevernote/gui/RensoNoteListDock.java" line="168"/>
+        <source>Information</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/cx/fbn/nevernote/gui/RensoNoteListDock.java" line="158"/>
+        <source>Custom mode was selected.
+You can customize weighting manually in the Edit/Preferences/Renso Note List.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/cx/fbn/nevernote/gui/RensoNoteListDock.java" line="168"/>
+        <source>Collecting operation log halted.
+You can resume, if you press this button again.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>cx.fbn.nevernote.gui.SavedSearchTreeWidget</name>
     <message>
         <location filename="../src/cx/fbn/nevernote/gui/SavedSearchTreeWidget.java" line="52"/>
@@ -4613,224 +4697,224 @@ and I&apos;m too lazy to figure them out by myself.</source>
 <context>
     <name>cx.fbn.nevernote.threads.SyncRunner</name>
     <message>
-        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="235"/>
+        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="237"/>
         <source>Error synchronizing - see log for details.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="309"/>
+        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="311"/>
         <source>Synchronizing with Evernote</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="319"/>
+        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="321"/>
         <source>User exception getting user account information.  Aborting sync and disconnecting</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="326"/>
+        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="328"/>
         <source>System error user account information.  Aborting sync and disconnecting!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="335"/>
+        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="337"/>
         <source>Transaction error getting user account information.  Aborting sync and disconnecting!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="350"/>
-        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="356"/>
-        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="362"/>
+        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="352"/>
+        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="358"/>
+        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="364"/>
         <source>Error getting sync state! Aborting sync and disconnecting!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="370"/>
+        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="372"/>
         <source>Syncronization Error!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="446"/>
+        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="448"/>
         <source>Cleaning up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="461"/>
+        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="463"/>
         <source>Synchronizing complete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="463"/>
+        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="465"/>
         <source>Download syncronization complete.  Uploads have been disabled.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="544"/>
+        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="546"/>
         <source>Synchronizing deleted notes.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="588"/>
-        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="672"/>
-        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="702"/>
-        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="707"/>
-        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="712"/>
-        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="792"/>
-        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="797"/>
-        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="802"/>
-        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="902"/>
-        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="908"/>
-        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="914"/>
-        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="920"/>
-        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="939"/>
-        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="944"/>
-        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="949"/>
+        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="590"/>
+        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="674"/>
+        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="704"/>
+        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="709"/>
+        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="714"/>
+        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="794"/>
+        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="799"/>
+        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="804"/>
+        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="904"/>
+        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="910"/>
+        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="916"/>
+        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="922"/>
+        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="941"/>
+        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="946"/>
+        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="951"/>
         <source>Error: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="598"/>
-        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="667"/>
-        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="677"/>
-        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="682"/>
+        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="600"/>
+        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="669"/>
+        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="679"/>
+        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="684"/>
         <source>Error sending local note: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="608"/>
-        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="621"/>
+        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="610"/>
+        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="623"/>
         <source>Sending local notes.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="695"/>
+        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="697"/>
         <source>Sending local notebooks.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="785"/>
+        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="787"/>
         <source>Sending local tags.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="932"/>
+        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="934"/>
         <source>Sending saved searches.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="1037"/>
+        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="1039"/>
         <source>Downloading 0% complete.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="1104"/>
+        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="1106"/>
         <source>Downloading </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="1104"/>
+        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="1106"/>
         <source>% complete.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="1598"/>
+        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="1601"/>
         <source>Connection Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="1598"/>
+        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="1601"/>
         <source>Error retrieving user information.  Synchronization not complete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="1755"/>
+        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="1758"/>
         <source>User exception Listing shared notebooks.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="1760"/>
+        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="1763"/>
         <source>System exception Listing shared notebooks.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="1765"/>
+        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="1768"/>
         <source>Transaction exception Listing shared notebooks.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="1770"/>
+        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="1773"/>
         <source>EDAM Not Found exception Listing shared notebooks.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="1784"/>
+        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="1787"/>
         <source>User exception Listing notebooks.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="1789"/>
+        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="1792"/>
         <source>System exception Listing notebooks.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="1794"/>
+        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="1797"/>
         <source>Transaction exception Listing notebooks.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="1809"/>
+        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="1812"/>
         <source>User exception Listing linked notebooks.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="1814"/>
+        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="1817"/>
         <source>System exception Listing linked notebooks.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="1819"/>
+        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="1822"/>
         <source>Transaction exception Listing lineked notebooks.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="1824"/>
+        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="1827"/>
         <source>EDAM Not Found exception Listing linked notebooks.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="1901"/>
+        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="1904"/>
         <source>Synchronizing shared notebooks.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="2032"/>
+        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="2035"/>
         <source>EDAM UserException synchronizing linked notbook.  See the log for datails.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="2034"/>
+        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="2037"/>
         <source>EDAM UserException synchronizing linked notbook </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="2037"/>
+        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="2040"/>
         <source>EDAM SystemException synchronizing linked notbook.  See the log for datails.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="2039"/>
+        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="2042"/>
         <source>EDAM SystemException synchronizing linked notbook.  See the log for datails</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="2042"/>
         <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="2045"/>
+        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="2048"/>
         <source>Notebook URL not found. Removing notobook </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="2048"/>
-        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="2050"/>
+        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="2051"/>
+        <location filename="../src/cx/fbn/nevernote/threads/SyncRunner.java" line="2053"/>
         <source>EDAM TException synchronizing linked notbook.  See the log for datails.</source>
         <translation type="unfinished"></translation>
     </message>
index 48ef5c0..8b01d20 100644 (file)
@@ -4,12 +4,12 @@
 <context>
     <name>cx.fbn.nevernote.NeverNote</name>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="1216"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="1213"/>
         <source>Beginning shutdown.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="1239"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="1236"/>
         <source>Performing synchronization before closing.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -36,37 +36,38 @@ Please delete the notes or move them to another notebook before deleting any not
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="1125"/>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="1146"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="1122"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="1143"/>
         <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="2072"/>
         <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="2393"/>
         <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="2773"/>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="2974"/>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="5446"/>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="6794"/>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="6925"/>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="7667"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="2976"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3789"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="5462"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="6818"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="6949"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="7691"/>
         <source>Confirmation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="1126"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="1123"/>
         <source>Are you sure</source>
         <comment>Are you sure you wish to decrypt the database?</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="1134"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="1131"/>
         <source>Decryption Complete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="1134"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="1131"/>
         <source>Decryption is complete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="1150"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="1147"/>
         <source>Encrypting the database is usedto enhance security and is performed
 upon shutdown, but please be aware that if you lose the password your
 is lost forever.
@@ -78,7 +79,7 @@ Do you wish to proceed?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="1169"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="1166"/>
         <source>Incorrect Password</source>
         <translation type="unfinished"></translation>
     </message>
@@ -93,71 +94,71 @@ Do you wish to proceed?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3014"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3016"/>
         <source>Release Notes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3220"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3222"/>
         <source>Tool Bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3681"/>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3789"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3683"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3800"/>
         <source>Connect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3682"/>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3790"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3684"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3801"/>
         <source>Connect to Evernote</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3793"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3804"/>
         <source>Disconnect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3794"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3805"/>
         <source>Disconnect from Evernote</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="5406"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="5422"/>
         <source>Database will be reindexed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="5417"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="5433"/>
         <source>Notes will be reindexed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="5419"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="5435"/>
         <source>Note will be reindexed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="6134"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="6150"/>
         <source>Error Saving Note</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="6186"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="6202"/>
         <source>Note has never been synchronized.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="5210"/>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="6187"/>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="6209"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="5226"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="6203"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="6225"/>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="389"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="391"/>
         <source>Unable to connect to the database.
 
 The most probable reason is that some other process
@@ -169,58 +170,58 @@ Exiting program.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="391"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="393"/>
         <source>Database Connection Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="424"/>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="792"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="426"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="790"/>
         <source>NeighborNote</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="631"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="630"/>
         <source>Renso Note List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="777"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="775"/>
         <source>Show/Hide</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="778"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="776"/>
         <source>Exit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="779"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="777"/>
         <source>Add Note</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="1091"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="1088"/>
         <source>Are you sure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="1092"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="1089"/>
         <source>Are you sure you wish to encrypt the database?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="1107"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="1104"/>
         <source>Encryption Complete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="1107"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="1104"/>
         <source>Encryption is complete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="1164"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="1161"/>
         <source>Database Decryption</source>
         <translation type="unfinished"></translation>
     </message>
@@ -276,183 +277,188 @@ Exiting program.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="2976"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="2978"/>
         <source>This will free unused space in the database, but please be aware that depending upon the size of your database this can be time consuming and NeighborNote will be unresponsive until it is complete.  Do you wish to continue?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3033"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3035"/>
         <source>About NeighborNote</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3035"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3037"/>
         <source>&lt;h4&gt;&lt;center&gt;&lt;b&gt;NeighborNote&lt;/b&gt;&lt;/center&gt;&lt;/h4&gt;&lt;hr&gt;&lt;center&gt;Version </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3048"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3050"/>
         <source>&lt;hr&gt;Open Source Evernote Client.&lt;br&gt;&lt;br&gt;Licensed under GPL v2.  &lt;br&gt;&lt;hr&gt;&lt;br&gt;&lt;/center&gt;Evernote is copyright 2001-2012 by Evernote Corporation&lt;br&gt;Jambi and QT are the licensed trademark of Nokia Corporation&lt;br&gt;PDFRenderer is licened under the LGPL&lt;br&gt;JTidy is copyrighted under the World Wide Web Consortium&lt;br&gt;Apache Common Utilities licensed under the Apache License Version 2.0&lt;br&gt;Jazzy is licened under the LGPL&lt;br&gt;Java is a registered trademark of Oracle Corporation.&lt;br&gt;&lt;hr&gt;Special thanks to:&lt;br&gt;BitRock InstallBuilder for the Windows installer&lt;br&gt;CodeCogs (www.codecogs.com) for the LaTeX image rendering.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3231"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3233"/>
         <source>Previous</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3237"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3239"/>
         <source>Next</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3243"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3245"/>
         <source>Up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3250"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3252"/>
         <source>Down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3256"/>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3355"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3258"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3357"/>
         <source>Synchronize</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3262"/>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3359"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3264"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3361"/>
         <source>Print</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3268"/>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3363"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3270"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3365"/>
         <source>Tag</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3274"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3276"/>
         <source>Attributes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3280"/>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3371"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3282"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3373"/>
         <source>Email</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3286"/>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3375"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3288"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3377"/>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3292"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3294"/>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3298"/>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3383"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3300"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3385"/>
         <source>All Notes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3339"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3341"/>
         <source>Previous Arrow</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3343"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3345"/>
         <source>Next Arrow</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3347"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3349"/>
         <source>Up Arrow</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3351"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3353"/>
         <source>Down Arrow</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3367"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3369"/>
         <source>Attribute</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3379"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3381"/>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3387"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3389"/>
         <source>Search Clear</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3762"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3765"/>
         <source>Invalid authorization token received.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4702"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="3789"/>
+        <source>Are you sure you want to enable the auto-login feature?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4713"/>
         <source>Note Not Found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4703"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="4714"/>
         <source>Sorry, but I can&apos;t seem to find that note.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="5212"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="5228"/>
         <source>NeighborNote had issues formatting this note. To protect your data this note is being marked as read-only.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="5439"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="5455"/>
         <source>Delete </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="5442"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="5458"/>
         <source>Delete note &quot;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="5444"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="5460"/>
         <source>Delete note selected note?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="5463"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="5479"/>
         <source>Permanently delete </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="5466"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="5482"/>
         <source>Permanently delete note &quot;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="5468"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="5484"/>
         <source>Permanently delete note selected note?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="6128"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="6144"/>
         <source>An error has happened while saving the note &quot;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="6132"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="6148"/>
         <source>&quot;.
 
 This is probably due to a document that is too complex for NeighborNote to process.  As a result, changes to the note may not be saved properly in the database.
@@ -462,57 +468,57 @@ be lost.  Please review the note to recover any critical data before restarting.
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="6187"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="6203"/>
         <source>This note has never been sent to Evernote, so there is no history.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="6191"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="6207"/>
         <source>Getting Note History</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="6208"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="6224"/>
         <source>Note not found on server.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="6209"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="6225"/>
         <source>This note could not be found on Evernote&apos;s servers.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="6234"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="6250"/>
         <source>History retrieved</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="6292"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="6308"/>
         <source>Restoring as new note.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="6294"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="6310"/>
         <source>Note has been restored as a new note.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="6298"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="6314"/>
         <source>Restoring note.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="6312"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="6328"/>
         <source>Note has been restored.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="6462"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="6478"/>
         <source>DOUGH!!!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="6471"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="6487"/>
         <source>Well, this is embarrassing.
 
 Some attachments or images for this note appear to be missing from my database.
@@ -531,135 +537,141 @@ Who knows, you might get lucky.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="6516"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="6532"/>
         <source>Finalizing Synchronization</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="6561"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="6577"/>
         <source>Synchronization Complete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="6563"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="6579"/>
         <source>Synchronization completed with errors.  Please check the log for details.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="6657"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="6673"/>
         <source>Indexing notes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="6661"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="6677"/>
         <source>Index complete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="6685"/>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="6696"/>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="6707"/>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="6718"/>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="6728"/>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="6738"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="6701"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="6712"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="6723"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="6734"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="6744"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="6754"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="6764"/>
         <source>A thread has died.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="6686"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="6702"/>
         <source>It appears as the tag counter thread has died.  I recommend checking stopping NeighborNote, saving the logs for later viewing, and restarting.  Sorry.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="6697"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="6713"/>
         <source>It appears as the notebook counter thread has died.  I recommend checking stopping NeighborNote, saving the logs for later viewing, and restarting.  Sorry.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="6719"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="6735"/>
         <source>It appears as the note saver thread has died.  I recommend checking stopping NeighborNote, saving the logs for later viewing, and restarting.  Sorry.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="6729"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="6745"/>
         <source>It appears as the synchronization thread has died.  I recommend checking stopping NeighborNote, saving the logs for later viewing, and restarting.  Sorry.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="6739"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="6755"/>
         <source>It appears as the index thread has died.  I recommend checking stopping NeighborNote, saving the logs for later viewing, and restarting.  Sorry.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="6763"/>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="6809"/>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="6847"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="6765"/>
+        <source>It appears as the Evernote Related Notes thread has died.  I recommend checking stopping NeighborNote, saving the logs for later viewing, and restarting.  Sorry.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="6787"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="6833"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="6871"/>
         <source>NixNote Export (*.nnex);;All Files (*.*)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="6950"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="6974"/>
         <source>Import completed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="7011"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="7035"/>
         <source>Please Synchronize</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="7012"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="7036"/>
         <source>Please either synchronize or move any new notes to a local notebook.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="7449"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="7473"/>
         <source>No Response from CodeCogs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="7449"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="7473"/>
         <source>Unable to contact CodeCogs for LaTeX formula.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="7662"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="7686"/>
         <source>Exclude note &quot;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="7664"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="7688"/>
         <source>Exclude note selected note?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="6668"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="6684"/>
         <source>Indexing is now enabled.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="6670"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="6686"/>
         <source>Indexing is now disabled.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="6762"/>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="6846"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="6786"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="6870"/>
         <source>Backup Database</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="6777"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="6801"/>
         <source>Backing up database</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="6787"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="6811"/>
         <source>Database backup completed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="6798"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="6822"/>
         <source>This is used to restore a database from backups.
 It is HIGHLY recommened that this only be used to populate
 an empty database.  Restoring into a database that
@@ -669,52 +681,52 @@ Are you sure you want to continue?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="6808"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="6832"/>
         <source>Restore Database</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="6824"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="6848"/>
         <source>Restoring database</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="6838"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="6862"/>
         <source>Database has been restored.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="6856"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="6880"/>
         <source>Exporting Notes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="6868"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="6892"/>
         <source>Export completed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="6879"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="6903"/>
         <source>Import Notes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="6880"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="6904"/>
         <source>NixNote Export (*.nnex);;Evernote Export (*.enex);;All Files (*.*)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="6892"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="6916"/>
         <source>Importing Notes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="6926"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="6950"/>
         <source>Create new tags from import?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="6947"/>
+        <location filename="../src/cx/fbn/nevernote/NeverNote.java" line="6971"/>
         <source>Notes have been imported.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1039,52 +1051,52 @@ Are you sure you want to continue?</source>
 <context>
     <name>cx.fbn.nevernote.dialog.ConfigDialog</name>
     <message>
-        <location filename="../src/cx/fbn/nevernote/dialog/ConfigDialog.java" line="90"/>
+        <location filename="../src/cx/fbn/nevernote/dialog/ConfigDialog.java" line="95"/>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/dialog/ConfigDialog.java" line="91"/>
+        <location filename="../src/cx/fbn/nevernote/dialog/ConfigDialog.java" line="96"/>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/dialog/ConfigDialog.java" line="106"/>
+        <location filename="../src/cx/fbn/nevernote/dialog/ConfigDialog.java" line="111"/>
         <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/dialog/ConfigDialog.java" line="268"/>
+        <location filename="../src/cx/fbn/nevernote/dialog/ConfigDialog.java" line="296"/>
         <source>Appearance</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/dialog/ConfigDialog.java" line="274"/>
+        <location filename="../src/cx/fbn/nevernote/dialog/ConfigDialog.java" line="302"/>
         <source>Fonts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/dialog/ConfigDialog.java" line="280"/>
+        <location filename="../src/cx/fbn/nevernote/dialog/ConfigDialog.java" line="308"/>
         <source>Indexing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/dialog/ConfigDialog.java" line="286"/>
+        <location filename="../src/cx/fbn/nevernote/dialog/ConfigDialog.java" line="314"/>
         <source>Spell Check</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/dialog/ConfigDialog.java" line="292"/>
+        <location filename="../src/cx/fbn/nevernote/dialog/ConfigDialog.java" line="320"/>
         <source>Connection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/dialog/ConfigDialog.java" line="298"/>
+        <location filename="../src/cx/fbn/nevernote/dialog/ConfigDialog.java" line="326"/>
         <source>Debugging</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/dialog/ConfigDialog.java" line="305"/>
+        <location filename="../src/cx/fbn/nevernote/dialog/ConfigDialog.java" line="333"/>
         <source>Renso Note List</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1150,16 +1162,6 @@ Are you sure you want to continue?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/dialog/ConfigIndexPage.java" line="79"/>
-        <source>Automatically Wildcard All Searches</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/cx/fbn/nevernote/dialog/ConfigIndexPage.java" line="93"/>
-        <source>Special Word Characters</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../src/cx/fbn/nevernote/dialog/ConfigIndexPage.java" line="99"/>
         <source>Index Interval</source>
         <translation type="unfinished"></translation>
@@ -1169,76 +1171,76 @@ Are you sure you want to continue?</source>
         <source>Seconds between looking for unindexed notes</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../src/cx/fbn/nevernote/dialog/ConfigIndexPage.java" line="112"/>
-        <source>Word Parse</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/cx/fbn/nevernote/dialog/ConfigIndexPage.java" line="113"/>
-        <source>Regular Expression</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>cx.fbn.nevernote.dialog.ConfigRensoNoteListPage</name>
     <message>
-        <location filename="../src/cx/fbn/nevernote/dialog/ConfigRensoNoteListPage.java" line="190"/>
-        <source>Browse Weight</source>
+        <location filename="../src/cx/fbn/nevernote/dialog/ConfigRensoNoteListPage.java" line="216"/>
+        <source>Concurrent Browse Weight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/dialog/ConfigRensoNoteListPage.java" line="191"/>
+        <location filename="../src/cx/fbn/nevernote/dialog/ConfigRensoNoteListPage.java" line="217"/>
         <source>Copy&amp;Paste Weight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/dialog/ConfigRensoNoteListPage.java" line="192"/>
+        <location filename="../src/cx/fbn/nevernote/dialog/ConfigRensoNoteListPage.java" line="218"/>
         <source>Add New Note Weight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/dialog/ConfigRensoNoteListPage.java" line="193"/>
+        <location filename="../src/cx/fbn/nevernote/dialog/ConfigRensoNoteListPage.java" line="219"/>
         <source>Renso Item Click Weight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/dialog/ConfigRensoNoteListPage.java" line="194"/>
+        <location filename="../src/cx/fbn/nevernote/dialog/ConfigRensoNoteListPage.java" line="220"/>
         <source>Same Tag Weight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/dialog/ConfigRensoNoteListPage.java" line="195"/>
+        <location filename="../src/cx/fbn/nevernote/dialog/ConfigRensoNoteListPage.java" line="221"/>
         <source>Same Notebook Weight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/dialog/ConfigRensoNoteListPage.java" line="197"/>
+        <location filename="../src/cx/fbn/nevernote/dialog/ConfigRensoNoteListPage.java" line="222"/>
+        <source>Evernote Related Notes Weight</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/cx/fbn/nevernote/dialog/ConfigRensoNoteListPage.java" line="225"/>
         <source>Weighting</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/dialog/ConfigRensoNoteListPage.java" line="201"/>
+        <location filename="../src/cx/fbn/nevernote/dialog/ConfigRensoNoteListPage.java" line="231"/>
+        <source>You can change these settings if you select &quot;Custom&quot; Mode.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/cx/fbn/nevernote/dialog/ConfigRensoNoteListPage.java" line="253"/>
         <source>When you merge the notes, also merge RensoNoteList</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/dialog/ConfigRensoNoteListPage.java" line="203"/>
+        <location filename="../src/cx/fbn/nevernote/dialog/ConfigRensoNoteListPage.java" line="255"/>
         <source>When you duplicate the notes, also duplicate RensoNoteList</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/dialog/ConfigRensoNoteListPage.java" line="205"/>
+        <location filename="../src/cx/fbn/nevernote/dialog/ConfigRensoNoteListPage.java" line="257"/>
         <source>Verify when you exclude the note</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/dialog/ConfigRensoNoteListPage.java" line="215"/>
+        <location filename="../src/cx/fbn/nevernote/dialog/ConfigRensoNoteListPage.java" line="267"/>
         <source>Renso Note List Item Maximum</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/dialog/ConfigRensoNoteListPage.java" line="224"/>
+        <location filename="../src/cx/fbn/nevernote/dialog/ConfigRensoNoteListPage.java" line="276"/>
         <source>Others</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1565,57 +1567,67 @@ Are you sure you want to continue?</source>
 <context>
     <name>cx.fbn.nevernote.dialog.DatabaseStatus</name>
     <message>
-        <location filename="../src/cx/fbn/nevernote/dialog/DatabaseStatus.java" line="51"/>
+        <location filename="../src/cx/fbn/nevernote/dialog/DatabaseStatus.java" line="53"/>
         <source>Current Database Status</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/dialog/DatabaseStatus.java" line="65"/>
+        <location filename="../src/cx/fbn/nevernote/dialog/DatabaseStatus.java" line="69"/>
         <source>Notebooks:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/cx/fbn/nevernote/dialog/DatabaseStatus.java" line="68"/>
+        <location filename="../src/cx/fbn/nevernote/dialog/DatabaseStatus.java" line="72"/>
         &l