OSDN Git Service

バージョン記述を更新
[neighbornote/NeighborNote.git] / src / cx / fbn / nevernote / Global.java
index 38b615c..54f0075 100644 (file)
@@ -52,6 +52,7 @@ import cx.fbn.nevernote.config.InitializationException;
 import cx.fbn.nevernote.config.StartupConfig;
 import cx.fbn.nevernote.gui.ContainsAttributeFilterTable;
 import cx.fbn.nevernote.gui.DateAttributeFilterTable;
+import cx.fbn.nevernote.gui.SearchEdit.SearchTarget;
 import cx.fbn.nevernote.gui.ShortcutKeys;
 import cx.fbn.nevernote.sql.DatabaseConnection;
 import cx.fbn.nevernote.sql.driver.NSqlQuery;
@@ -68,9 +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.5.3";
+       public static String[] validVersions = {"0.5.3", "0.5.2", "0.5.1", "0.5", "0.4.1", "0.4", "0.3", "0.2", "0.1.3", "0.1.2", "0.1.1", "0.1"};
        
     public static String username = ""; 
     //public static String password = "";     
@@ -161,8 +161,6 @@ public class Global {
        public static String    databaseName = new String("NeverNote");  // database name.  used for multiple databases to separate settings.
        public static String    indexDatabaseName = new String("Index"); // searchable words database
        public static String    resourceDatabaseName = new String("Resources");  // attachments database
-       
-       // ICHANGED
        public static String behaviorDatabaseName = new String("Behavior"); // 操作履歴データベース   
        
        public static DateAttributeFilterTable createdSinceFilter;
@@ -237,8 +235,8 @@ public class Global {
                //messageLevel = 1;
                setMessageLevel(msglevel);
                keepRunning = true;  // Make sure child threads stay running
-               disableUploads = disableUploads();  // Should we upload anything?  Normally false.\r
-               //disableUploads = true;  //***** DELETE THIS LINE *******\r
+               disableUploads = disableUploads();  // Should we upload anything?  Normally false.
+               //disableUploads = true;  //***** DELETE THIS LINE *******
                enableCarriageReturnFix = enableCarriageReturnFix();  // Enable test fix?
                enableHTMLEntitiesFix = enableHtmlEntitiesFix();  // Enable test fix?
                
@@ -745,9 +743,9 @@ public class Global {
                settings.beginGroup("General");
                Integer len;
                try {
-                       len = (Integer)settings.value("recognitionWeight", 30);\r
+                       len = (Integer)settings.value("recognitionWeight", 30);
                } catch (Exception e) {
-                       len = 80;\r
+                       len = 80;
                }
                settings.endGroup();
                return len;
@@ -1244,7 +1242,6 @@ public class Global {
                return val;
     }
     
-       // ICHANGED
        // 操作履歴データベースのURL(フルパス)をゲット
        public static String getBehaviorDatabaseUrl() {
                settings.beginGroup("General");
@@ -1273,7 +1270,6 @@ public class Global {
                settings.endGroup();
     }
     
-       // ICHANGED
        public static void setBehaviorDatabaseUrl(String value) {
                settings.beginGroup("General");
                settings.setValue("BehaviorDatabaseURL", value);
@@ -1531,17 +1527,17 @@ public class Global {
 
     
        // Should the toolbar be visible?
-       public static boolean isToolbarButtonVisible(String window) {
+       public static boolean isToolbarButtonVisible(String window, Boolean val) {
                settings.beginGroup("ToolbarButtonsVisible");
                try {
-                       String text = (String)settings.value(window, "true");
+                       String text = (String)settings.value(window, val.toString());
                        settings.endGroup();
                        if (text.equalsIgnoreCase("true"))
                                return true;
                        else
                                return false;   
                } catch (java.lang.ClassCastException e) {
-                       Boolean value = (Boolean) settings.value(window, true);
+                       Boolean value = (Boolean) settings.value(window, val);
                        settings.endGroup();
                        return value;
                }
@@ -2082,7 +2078,6 @@ public class Global {
                databaseCache = value;
     }
     
-    // ICHANGED
     // 複数ノート同時閲覧操作に対する重み付け
     public static void setBrowseWeight(int weight) {
                settings.beginGroup("RensoNoteList");
@@ -2106,7 +2101,6 @@ public class Global {
                return value;
     }
     
-    // ICHANGED
     // ノート内容のコピー&ペースト操作に対する重み付け
     public static void setCopyPasteWeight(int weight) {
                settings.beginGroup("RensoNoteList");
@@ -2130,7 +2124,6 @@ public class Global {
                return value;
     }
     
-    // ICHANGED
     // 新規ノート追加操作に対する重み付け
     public static void setAddNewNoteWeight(int weight) {
                settings.beginGroup("RensoNoteList");
@@ -2154,7 +2147,6 @@ public class Global {
                return value;
        }
        
-       // ICHANGED
        // 連想ノートクリック操作に対する重み付け
     public static void setRensoItemClickWeight(int weight) {
                settings.beginGroup("RensoNoteList");
@@ -2178,7 +2170,6 @@ public class Global {
                return value;
        }
        
-       // ICHANGED
        // タグ付け操作に対する重み付け
     public static void setSameTagWeight(int weight) {
                settings.beginGroup("RensoNoteList");
@@ -2202,7 +2193,6 @@ public class Global {
                return value;
        }
        
-       // ICHANGED
        // ノートブック変更操作に対する重み付け
     public static void setSameNotebookWeight(int weight) {
                settings.beginGroup("RensoNoteList");
@@ -2252,13 +2242,12 @@ public class Global {
     //*******************
     // ノートのマージ・複製の関連ノートリストへの適用
     //*******************
-    // ICHANGED
     public static void setMergeRensoNote(boolean value) {
                settings.beginGroup("RensoNoteList");
                settings.setValue("mergeRensoNoteList", value);
                settings.endGroup();    
     }
-    // ICHANGED
+    
     public static boolean getMergeRensoNote() {
                settings.beginGroup("RensoNoteList");
                try {
@@ -2274,13 +2263,13 @@ public class Global {
                        return value;
                }
     }
-    // ICHANGED
+    
     public static void setDuplicateRensoNote(boolean value) {
                settings.beginGroup("RensoNoteList");
                settings.setValue("duplicateRensoNoteList", value);
                settings.endGroup();    
     }
-    // ICHANGED
+    
     public static boolean getDuplicateRensoNote() {
                settings.beginGroup("RensoNoteList");
                try {
@@ -2297,7 +2286,6 @@ public class Global {
                }
     }
     
-    // ICHANGED
     // 連想ノートリストからノートを除外するときに確認メッセージを表示するかどうか
     public static boolean verifyExclude() {
                settings.beginGroup("RensoNoteList");
@@ -2314,7 +2302,7 @@ public class Global {
                        return value;
                }
     }
-    // ICHANGED
+    
     public static void setVerifyExclude(boolean val) {
                settings.beginGroup("RensoNoteList");
                if (val)
@@ -2324,7 +2312,6 @@ public class Global {
                settings.endGroup();
     }
     
-       // ICHANGED
        // 連想ノートリスト最大表示アイテム数
     public static void setRensoListItemMaximum(int maximum) {
                settings.beginGroup("RensoNoteList");
@@ -2335,13 +2322,13 @@ public class Global {
                settings.beginGroup("RensoNoteList");
                Integer value;
                try {
-                       String val  = (String)settings.value("rensoListMaximum", 20);
+                       String val  = (String)settings.value("rensoListMaximum", 10);
                        value = new Integer(val.trim());
                } catch (Exception e) {
                        try {
-                               value = (Integer)settings.value("rensoListMaximum", 20);
+                               value = (Integer)settings.value("rensoListMaximum", 10);
                        } catch (Exception e1) {
-                               value = 20;
+                               value = 10;
                        }
                }
                settings.endGroup();
@@ -2453,7 +2440,7 @@ public class Global {
                settings.endGroup();
     }
     
-    //ordinal から指定した Enum の要素に変換する汎用関数
+    // ordinal から指定した Enum の要素に変換する汎用関数
        public static <E extends Enum<E>> E fromOrdinal(Class<E> enumClass, int ordinal) {
            E[] enumArray = enumClass.getEnumConstants();
            return enumArray[ordinal];
@@ -2613,5 +2600,50 @@ public class Global {
                settings.setValue("customENRelatedNotesWeight", weight);
                settings.endGroup();
        }
+
+       // ツールバーの「新規」ボタンを押した時、新規ノートをタブで開くかどうか
+       public static boolean toolBarNewAction() {
+               settings.beginGroup("General");
+               try {
+                       String text = (String)settings.value("toolBarNewAction", "true");
+                       settings.endGroup();
+                       if (text.equalsIgnoreCase("true"))
+                               return true;
+                       else
+                               return false;
+               } catch (java.lang.ClassCastException e) {
+                       Boolean value = (Boolean) settings.value("toolBarNewAction", true);
+                       settings.endGroup();
+                       return value;
+               }
+       }
+       public static void setToolBarNewAction(boolean value) {
+               settings.beginGroup("General");
+               settings.setValue("toolBarNewAction", value);
+               settings.endGroup();    
+       }
+       
+       // 全文検索の範囲
+       public static SearchTarget searchTarget() {
+               settings.beginGroup("General");
+               try {
+                       String text = (String)settings.value("searchTarget", "0");
+                       settings.endGroup();
+                       int ordinal = Integer.parseInt(text);
+                       SearchTarget target = fromOrdinal(SearchTarget.class, ordinal);
+                       return target;
+               } catch (java.lang.ClassCastException e) {
+                       int value = (Integer) settings.value("searchTarget", 0);
+                       settings.endGroup();;
+                       SearchTarget target = fromOrdinal(SearchTarget.class, value);
+                       return target;
+               }
+       }
+       
+       public static void setSearchTarget(SearchTarget target) {
+               settings.beginGroup("General");
+               settings.setValue("searchTarget", target.ordinal());
+               settings.endGroup();
+       }
 }