--- trunk/installer/teraterm.iss	2010/08/01 00:06:19	3961
+++ trunk/installer/teraterm.iss	2010/12/09 10:46:43	4209
@@ -1,5 +1,5 @@
 #define AppName "Tera Term"
-#define AppVer "4.66"
+#define AppVer "4.68"
 #define snapshot GetDateTimeString('yyyymmdd_hhnnss', '', '');
 
 [Setup]
@@ -64,6 +64,7 @@
 Source: release\screencapture.ttl; DestDir: {app}; Components: TeraTerm
 Source: release\ssh2login.ttl; DestDir: {app}; Components: TeraTerm
 Source: release\wait_regex.ttl; DestDir: {app}; Components: TeraTerm
+Source: release\lang\Default.lng; DestDir: {app}\lang; Components: TeraTerm; Flags: onlyifdoesntexist uninsneveruninstall; Permissions: authusers-modify
 Source: release\lang\Japanese.lng; DestDir: {app}\lang; Components: TeraTerm; Attribs: readonly; Flags: uninsremovereadonly overwritereadonly
 Source: release\lang\German.lng; DestDir: {app}\lang; Components: TeraTerm; Attribs: readonly; Flags: uninsremovereadonly overwritereadonly
 Source: release\lang\French.lng; DestDir: {app}\lang; Components: TeraTerm; Attribs: readonly; Flags: uninsremovereadonly overwritereadonly
@@ -363,21 +364,24 @@
 
 procedure SetIniFile(iniFile: String);
 var
-  Language : String;
-  Locale   : String;
-  CodePage : integer;
-  VTFont   : String;
-  TEKFont  : String;
-  FileDir  : String;
-  TCPPort  : integer;
+  Language      : String;
+  Locale        : String;
+  CodePage      : integer;
+  VTFont        : String;
+  TEKFont       : String;
+  FileDir       : String;
+  TCPPort       : integer;
+  ViewlogEditor : String;
 
 begin
-  Language := GetIniString('Tera Term', 'Language', '', iniFile);
-  Locale   := GetIniString('Tera Term', 'Locale', '', iniFile);
-  CodePage := GetIniInt('Tera Term', 'CodePage', 0, 0, 0, iniFile);
-  VTFont   := GetIniString('Tera Term', 'VTFont', '', iniFile);
-  TEKFont  := GetIniString('Tera Term', 'TEKFont', '', iniFile);
-  FileDir  := GetIniString('Tera Term', 'FileDir', '', iniFile);
+  Language       := GetIniString('Tera Term', 'Language', '', iniFile);
+  Locale         := GetIniString('Tera Term', 'Locale', '', iniFile);
+  CodePage       := GetIniInt('Tera Term', 'CodePage', 0, 0, 0, iniFile);
+  VTFont         := GetIniString('Tera Term', 'VTFont', '', iniFile);
+  TEKFont        := GetIniString('Tera Term', 'TEKFont', '', iniFile);
+  FileDir        := GetIniString('Tera Term', 'FileDir', '', iniFile);
+  FileDir        := GetIniString('Tera Term', 'FileDir', '', iniFile);
+  ViewlogEditor  := GetIniString('Tera Term', 'ViewlogEditor', '', iniFile);
 
   case GetUILanguage and $3FF of
   $04: // Chinese
@@ -470,7 +474,7 @@
     3:
       SetIniString('Tera Term', 'UILanguageFile', 'lang\French.lng', iniFile);
     else
-      SetIniString('Tera Term', 'UILanguageFile', 'lang\English.lng', iniFile);
+      SetIniString('Tera Term', 'UILanguageFile', 'lang\Default.lng', iniFile);
   end;
 
   if Length(FileDir) = 0 then begin
@@ -485,6 +489,11 @@
       SetIniInt('Tera Term', 'TCPPort', 23, iniFile);
   end;
 
+  if ViewlogEditor = 'notepad.exe' then begin
+    ViewlogEditor := ExpandConstant('{win}') + '\' + 'notepad.exe';
+    SetIniString('Tera Term', 'ViewlogEditor', ViewlogEditor, iniFile);
+  end;
+
 end;
 
 procedure InitializeWizard;
@@ -563,15 +572,18 @@
     wpSelectComponents:
       begin
 
-        iniFile := GetIniString('Tera Term', 'UILanguageFile', '', GetDefaultIniFilename());
-        if iniFile = 'lang\Japanese.lng' then
-          UILangFilePage.SelectedValueIndex := 1
-        else if iniFile = 'lang\German.lng' then
-          UILangFilePage.SelectedValueIndex := 2
-        else if iniFile = 'lang\French.lng' then
-          UILangFilePage.SelectedValueIndex := 3
-        else
-          UILangFilePage.SelectedValueIndex := 0;
+        if FileExists(GetDefaultIniFileName()) then
+        begin
+          iniFile := Lowercase(GetIniString('Tera Term', 'UILanguageFile', '', GetDefaultIniFilename()));
+          if iniFile = 'lang\japanese.lng' then
+            UILangFilePage.SelectedValueIndex := 1
+          else if iniFile = 'lang\german.lng' then
+            UILangFilePage.SelectedValueIndex := 2
+          else if iniFile = 'lang\french.lng' then
+            UILangFilePage.SelectedValueIndex := 3
+          else
+            UILangFilePage.SelectedValueIndex := 0;
+        end;
 
       end;
   end;
@@ -694,7 +706,7 @@
 Name: {app}\copyfont.pif; Type: files
 Name: {app}\libeay.txt; Type: files
 
-[_ISToolPreCompile]
+[InnoIDE_PreCompile]
 Name: makechm.bat
 ; Name: build.bat; Parameters: rebuild
 Name: build.bat