- Timestamp:
- May 3, 2013, 3:45:16 PM (12 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
AE/Setup/Windows/AEI.iss
r818 r855 1 1 #define AppId "{{B67333BB-1CF9-4EFD-A40B-E25B5CB4C8A7}}" 2 #define AppVersion "1 "2 #define AppVersion "1.1" 3 3 #define AppLongName "Anniversary Edition of Oni" 4 4 #define AppShortName "Anniversary-Edition-Setup" … … 65 65 66 66 [Run] 67 Filename: "{app}\AE\AEInstaller\JRE\bin\javaw.exe"; WorkingDir: "{app}\AE\AEInstaller"; Parameters: "-Dsun.java2d.d3d=false -jar AEInstaller2Updater.jar"; Flags: runasoriginaluser; Check: not IsJavaInstalled 68 Filename: "{code:GetJavaPath}\bin\javaw.exe"; WorkingDir: "{app}\AE\AEInstaller"; Parameters: "-Dsun.java2d.d3d=false -jar AEInstaller2Updater.jar"; Flags: runasoriginaluser; Check: IsJavaInstalled 67 Filename: "{app}\AE\AEInstaller\JRE\bin\javaw.exe"; WorkingDir: "{app}\AE\AEInstaller"; Parameters: "-Dsun.java2d.d3d=false -jar AEInstaller2Updater.jar"; Flags: runasoriginaluser; Check: not IsJavaInstalled; BeforeInstall: WriteProxyData 68 Filename: "{code:GetJavaPath}\bin\javaw.exe"; WorkingDir: "{app}\AE\AEInstaller"; Parameters: "-Dsun.java2d.d3d=false -jar AEInstaller2Updater.jar"; Flags: runasoriginaluser; Check: IsJavaInstalled; BeforeInstall: WriteProxyData 69 69 70 70 71 71 [Code] 72 72 var 73 PageUseProxy: TInputOptionWizardPage; 74 PageProxyData: TInputQueryWizardPage; 73 75 javaPath: String; 74 76 … … 185 187 Components.Checked[i] := true; 186 188 end; 189 190 PageUseProxy := CreateInputOptionPage(wpSelectTasks, 'Internet connection type', '', 'Do you require to use a proxy to connect to the internet?', true, false); 191 PageUseProxy.Add('Direct connection'); 192 PageUseProxy.Add('Use proxy'); 193 PageUseProxy.Values[0] := true; 194 195 PageProxyData := CreateInputQueryPage(PageUseProxy.ID, 'Proxy data', '', 'Please enter the data required to connect to your proxy.'); 196 PageProxyData.Add('Hostname or IP:', False); 197 PageProxyData.Add('Port:', False); 187 198 end; 188 199 … … 207 218 208 219 220 function EnterProxyData(): Boolean; 221 begin 222 Result := PageUseProxy.SelectedValueIndex = 1; 223 end; 224 209 225 function ShouldSkipPage(PageID: Integer): Boolean; 210 226 begin 211 Result := PageID = wpSelectComponents; 212 end; 227 Result := false; 228 if (PageID = wpSelectComponents) then 229 Result := true; 230 if (PageID = PageProxyData.ID) then 231 Result := not EnterProxyData(); 232 end; 233 213 234 214 235 function UpdateReadyMemo(Space, NewLine, MemoUserInfoInfo, MemoDirInfo, MemoTypeInfo, MemoComponentsInfo, MemoGroupInfo, MemoTasksInfo: String): String; … … 218 239 Result := Result + MemoGroupInfo + NewLine; 219 240 Result := Result + MemoTasksInfo + NewLine; 220 end; 221 241 242 if (EnterProxyData()) then 243 Result := Result + NewLine + 'Set proxy configuration'; 244 end; 245 246 247 procedure WriteProxyData(); 248 begin 249 if (EnterProxyData()) then 250 begin 251 SaveStringToFile(ExpandConstant('{app}') + '\AE\AEInstaller\AEI-ProxySettings.xml', 252 '<?xml version="1.0" ?><Proxy><useProxy>true</useProxy><hostOrIp>'+PageProxyData.Values[0]+'</hostOrIp><port>'+PageProxyData.Values[1]+'</port></Proxy>', 253 False); 254 end; 255 end;
Note:
See TracChangeset
for help on using the changeset viewer.