diff --git a/DxAutoInstaller.dproj b/DxAutoInstaller.dproj index 10deaad..c0522fd 100644 --- a/DxAutoInstaller.dproj +++ b/DxAutoInstaller.dproj @@ -1,7 +1,7 @@  {5FC1B1D2-CCEA-4C74-B248-EADD6A5E7EBB} - 19.5 + 20.3 VCL DxAutoInstaller.dpr True @@ -9,6 +9,7 @@ Win32 1 Application + DxAutoInstaller true @@ -50,9 +51,8 @@ $(BDS)\bin\default_app.manifest true 2 - 3 - 8 - CompanyName=;FileDescription=;FileVersion=2.3.8.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=2.3;Comments= + 4 + CompanyName=;FileDescription=;FileVersion=2.4.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=2.3;Comments= 1033 DxAutoInstaller System;Xml;Data;Datasnap;Web;Soap;Vcl;Vcl.Imaging;Vcl.Touch;Vcl.Samples;Vcl.Shell;$(DCC_Namespace) @@ -88,6 +88,7 @@ false + Debug false @@ -97,6 +98,7 @@ Debug + Resources\DxAutoInstaller.ico @@ -132,7 +134,6 @@ Readme - ResourceItem RCDATA IconVCL @@ -157,11 +158,11 @@ DxAutoInstaller.dpr - Microsoft Office 2000 Sample Automation Server Wrapper Components - Microsoft Office XP Sample Automation Server Wrapper Components + Microsoft Office 2000 Sample Automation Server Wrapper Components + Microsoft Office XP Sample Automation Server Wrapper Components - + @@ -181,16 +182,6 @@ 0 - - - classes - 64 - - - classes - 64 - - res\xml @@ -201,12 +192,6 @@ 1 - - - library\lib\armeabi-v7a - 1 - - library\lib\armeabi @@ -259,6 +244,16 @@ 1 + + + res\drawable-anydpi-v21 + 1 + + + res\drawable-anydpi-v21 + 1 + + res\values @@ -279,6 +274,76 @@ 1 + + + res\values-v31 + 1 + + + res\values-v31 + 1 + + + + + res\values-v35 + 1 + + + res\values-v35 + 1 + + + + + res\drawable-anydpi-v26 + 1 + + + res\drawable-anydpi-v26 + 1 + + + + + res\drawable + 1 + + + res\drawable + 1 + + + + + res\drawable + 1 + + + res\drawable + 1 + + + + + res\drawable + 1 + + + res\drawable + 1 + + + + + res\drawable-anydpi-v33 + 1 + + + res\drawable-anydpi-v33 + 1 + + res\values @@ -289,6 +354,16 @@ 1 + + + res\values-night-v21 + 1 + + + res\values-night-v21 + 1 + + res\drawable @@ -459,6 +534,56 @@ 1 + + + res\drawable-anydpi-v24 + 1 + + + res\drawable-anydpi-v24 + 1 + + + + + res\drawable + 1 + + + res\drawable + 1 + + + + + res\drawable-night-anydpi-v21 + 1 + + + res\drawable-night-anydpi-v21 + 1 + + + + + res\drawable-anydpi-v31 + 1 + + + res\drawable-anydpi-v31 + 1 + + + + + res\drawable-night-anydpi-v31 + 1 + + + res\drawable-night-anydpi-v31 + 1 + + 1 @@ -699,6 +824,9 @@ 1 + + 1 + @@ -992,6 +1120,7 @@ + True diff --git a/DxAutoInstaller.res b/DxAutoInstaller.res index f325985..44a7e84 100644 Binary files a/DxAutoInstaller.res and b/DxAutoInstaller.res differ diff --git a/Resources/Images/DxAutoInstaller.png b/Resources/Images/DxAutoInstaller.png index 69d52bc..b4aa687 100644 Binary files a/Resources/Images/DxAutoInstaller.png and b/Resources/Images/DxAutoInstaller.png differ diff --git a/Sources/DxIDE.pas b/Sources/DxIDE.pas index 095ee72..981d876 100644 --- a/Sources/DxIDE.pas +++ b/Sources/DxIDE.pas @@ -38,7 +38,11 @@ TDxIDEs = class(TJclBorRADToolInstallations) const Win32 = bpWin32; Win64 = bpWin64; - DxIDEPlatformNames: array[TDxIDEPlatform] of String = (BDSPlatformWin32, BDSPlatformWin64, BDSPlatformOSX32, BDSPlatformOSX64, BDSPlatformAndroid32, BDSPlatformAndroid64, BDSPlatformiOSDevice32, BDSPlatformiOSDevice64, BDSPlatformiOSSimulator, BDSPlatformLinux64); + DxIDEPlatformNames: array[TDxIDEPlatform] of String = ( + BDSPlatformWin32, BDSPlatformWin32, BDSPlatformWin64, BDSPlatformWin64x, + BDSPlatformOSX32, BDSPlatformOSX64, BDSPlatformAndroid32, + BDSPlatformAndroid64, BDSPlatformiOSDevice32, BDSPlatformiOSDevice64, + BDSPlatformiOSSimulator, BDSPlatformLinux64); BPLExtName = '.bpl'; IDEEnvironmentVariablesSectionName = 'Environment Variables'; diff --git a/Sources/DxInstaller.pas b/Sources/DxInstaller.pas index f74fe94..1e371ab 100644 --- a/Sources/DxInstaller.pas +++ b/Sources/DxInstaller.pas @@ -118,8 +118,9 @@ procedure TDxInstaller.DetectionThirdPartyComponents(IDE: TDxIDE); Components: TDxThirdPartyComponents; begin Components := []; - for I := 0 to IDE.IdePackages.Count - 1 do begin - FileName := IDE.IdePackages.PackageFileNames[I]; + for I := 0 to IDE.IdePackages.Count[false] - 1 do + begin + FileName := IDE.IdePackages.PackageFileNames[I, false]; if (not(dxtpcIBX in Components)) and (Pos('\dclib', FileName) > 0) then Include(Components, dxtpcIBX) else if (not(dxtpcTeeChart in Components)) and (Pos('\dcltee', FileName) > 0) then Include(Components, dxtpcTeeChart) else if (not(dxtpcFireDAC in Components)) and ((Pos('\dclFireDAC', FileName) > 0) or (Pos('\AnyDAC_', FileName) > 0)) then Include(Components, dxtpcFireDAC) diff --git a/Sources/MainFrm.dfm b/Sources/MainFrm.dfm index b3c5613..d10c020 100644 --- a/Sources/MainFrm.dfm +++ b/Sources/MainFrm.dfm @@ -54,14 +54,14 @@ object MainForm: TMainForm object Label2: TLabel Left = 24 Top = 60 - Width = 258 + Width = 257 Height = 15 Caption = 'DevExpress VCL Components Automatic Installer' end object LblVersion: TLabel Left = 203 Top = 37 - Width = 21 + Width = 20 Height = 15 Caption = 'v2.x' end @@ -158,7 +158,7 @@ object MainForm: TMainForm AlignWithMargins = True Left = 8 Top = 10 - Width = 343 + Width = 342 Height = 15 Margins.Left = 8 Margins.Top = 10 @@ -316,7 +316,7 @@ object MainForm: TMainForm object Label6: TLabel Left = 8 Top = 69 - Width = 229 + Width = 228 Height = 15 Caption = 'Download DevExpress VCL Documentation:' end diff --git a/Sources/MainFrm.pas b/Sources/MainFrm.pas index edb1cc0..accd809 100644 --- a/Sources/MainFrm.pas +++ b/Sources/MainFrm.pas @@ -16,7 +16,7 @@ interface Dialogs, ExtCtrls, dxGDIPlusClasses, StdCtrls, ComCtrls, ImgList, cxGraphics, ActnList, Buttons, DxQuantumTreeList, DxInstaller, DxProgress, DxIDE, DxUtils, System.Actions, System.ImageList, cxLookAndFeels, cxLookAndFeelPainters, - Vcl.Menus, cxImageList, cxButtons; + Vcl.Menus, cxImageList, cxButtons, dxUIAClasses; {$WARN UNIT_PLATFORM OFF}