iniファイルをプログラムディレクトリからホームディレクトリに移動させる記述を追加。

[neighbornote/NeighborNote.git] / src / cx / fbn / nevernote / Global.java

diff --git a/src/cx/fbn/nevernote/Global.java b/src/cx/fbn/nevernote/Global.java
index 6d00824..c8f7222 100644 (file)
--- a/src/cx/fbn/nevernote/Global.java
+++ b/src/cx/fbn/nevernote/Global.java
@@ -23,6 +23,7 @@ package cx.fbn.nevernote;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
+import java.io.File;
 import java.io.IOException;
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
@@ -40,6 +41,7 @@ import com.evernote.edam.type.User;
 import com.evernote.edam.type.UserAttributes;
 import com.swabunga.spell.engine.Configuration;
 import com.trolltech.qt.core.QByteArray;
+import com.trolltech.qt.core.QFile;
 import com.trolltech.qt.core.QSettings;
 import com.trolltech.qt.core.QSize;
 import com.trolltech.qt.gui.QPalette;
@@ -65,8 +67,8 @@ import cx.fbn.nevernote.utilities.Pair;
 public class Global {
        // Set current version and the known versions.
        // ICHANGED 自分用に変更
-       public static String version = "0.1";
-       public static String[] validVersions = {"0.1"};
+       public static String version = "0.1.2";
+       public static String[] validVersions = {"0.1.2", "0.1.1", "0.1"};
        
     public static String username = ""; 
     //public static String password = "";     
@@ -196,8 +198,20 @@ public class Global {
        
     // Do initial setup 
     public static void setup(StartupConfig startupConfig) throws InitializationException  {
-       // ICHANGED 設定値の保存先を変更
-        settings = new QSettings("NeighborNote.ini", QSettings.Format.IniFormat);
+       String settingFileName = new String("NeighborNote.ini");
+       
+       // バージョン0.1.2以下では設定ファイルをプログラムディレクトリに置いていたので、それを見つけたらホームディレクトリに移動させる。
+       File programDir = new File(FileManager.toPlatformPathSeparator(startupConfig.getProgramDirPath()));
+       String programPath = FileManager.slashTerminatePath(programDir.getPath());
+       File homeDir = new File(FileManager.toPlatformPathSeparator(startupConfig.getHomeDirPath()));
+       String homePath = FileManager.slashTerminatePath(homeDir.getPath());
+       if (QFile.exists(programPath + settingFileName)) {
+               QFile file = new QFile(programPath + settingFileName);
+               file.copy(homePath + settingFileName);
+               file.remove();
+       }
+       
+        settings = new QSettings(homePath + settingFileName, QSettings.Format.IniFormat);
         
         disableViewing = startupConfig.getDisableViewing();
         syncOnly = startupConfig.isSyncOnly();
@@ -1763,13 +1777,13 @@ public class Global {
     }
     public static String getUpdatesAvailableUrl() {
                settings.beginGroup("Upgrade");
-               String text = (String)settings.value("avialableUrl", "http://nevernote.sourceforge.net/versions.txt");
+               String text = (String)settings.value("avialableUrl", "http://puma.cis.ibaraki.ac.jp/products/neighbornote/develop/versions.txt");
                settings.endGroup();    
                return text;
     }
     public static String getUpdateAnnounceUrl() {
                settings.beginGroup("Upgrade");
-               String text = (String)settings.value("announceUrl", "http://nevernote.sourceforge.net/upgrade.html");
+               String text = (String)settings.value("announceUrl", "http://puma.cis.ibaraki.ac.jp/products/neighbornote/develop/upgrade.html");
                settings.endGroup();    
                return text;
     }