Update Windows packages again (save Terrasync dir location and update install summary)

diff --git a/package/Win32-Inno/FlightGear.iss b/package/Win32-Inno/FlightGear.iss
index c0222e861aa6e01a9020fa86b54af02f76c7d909..eb662a268ff796952e92f6da3d0acb8191033ef7 100644 (file)
--- a/package/Win32-Inno/FlightGear.iss
+++ b/package/Win32-Inno/FlightGear.iss
@@ -94,6 +94,9 @@ filename: "{app}\bin\Win32\fgadmin.exe"; WorkingDir: "{app}\bin\Win32"; Paramete
 Filename: "{app}\bin\OpenAL\oalinst.exe"; WorkingDir: "{app}"; Description: "Installing OpenAL"; Tasks: insoal
 ;Filename: "{app}\bin\Win32\fgrun.exe"; WorkingDir: "{app}"; Description: "Launch FlightGear"; Flags: postinstall skipifsilent
 
+[Registry]
+Root: HKLM; Subkey: "Software\flightgear.org"; ValueType: string; ValueName: "TerrasyncDir"; ValueData: "{code:TerrasyncDir}"
+
 [Code]
 var
   TerrasyncDirPage: TInputDirWizardPage;
@@ -126,7 +129,7 @@ begin
   TerrasyncDirPage := CreateInputDirPage(wpSelectDir,
     'Select Terrasync Directory', 'Where should scenery downloaded by Terrasync be put?',
     'Select the folder in which Terrasync would download additional scenery, then click Next.',
-    False, 'New Folder');
+    False, 'Terrasync Folder');
   TerrasyncDirPage.Add('');
 
   CreateURLLabel(WizardForm, WizardForm.CancelButton);
@@ -135,7 +138,7 @@ end;
 function NextButtonClick(CurPageID: Integer): Boolean;
 begin
   if CurPageID = wpSelectDir then begin
-    TerrasyncDirPage.Values[0] := GetPreviousData( 'TerrasyncDir', ExpandConstant('{app}\terrasync') );
+    TerrasyncDirPage.Values[0] := GetPreviousData( 'TerrasyncDir', ExpandConstant('{reg:HKLM\Software\flightgear.org,TerrasyncDir|{app}\terrasync}') );
   end;
   Result := True;
 end;
@@ -151,3 +154,17 @@ begin
   SetPreviousData(PreviousDataKey, 'TerrasyncDir', TerrasyncDirPage.Values[0]);
 end;
 
+function UpdateReadyMemo(Space, NewLine, MemoUserInfoInfo, MemoDirInfo, MemoTypeInfo, MemoComponentsInfo, MemoGroupInfo, MemoTasksInfo: String): String;
+var
+  S: String;
+begin
+  S := '';
+  S := S + MemoDirInfo + NewLine + NewLine;
+  S := S + 'Terrasync folder:' + NewLine;
+  S := S + Space + TerrasyncDirPage.Values[0] + NewLine + NewLine;
+  S := S + MemoGroupInfo + NewLine + NewLine;
+  S := S + MemoTasksInfo + NewLine + NewLine;
+
+  Result := S;
+end;
+