diff --git a/additional.html b/additional.html index 10a310d3..c3031791 100644 --- a/additional.html +++ b/additional.html @@ -76,10 +76,6 @@ Relative path Action - - components/edbimage/packages/delphi11/EDBImage.groupproj - Build All + Install "DCLSer" - components/tntunictrls/packages/delphi11/TntUnicodeVcl.groupproj Build All + Install "TntUnicodeVcl_Design" @@ -92,10 +88,6 @@ components/zeosdbo/packages/delphi11/ZeosDbo.groupproj Build All + Install "ZComponentDesign" - - components/heidisql/packages/delphi11/HeidiComponents.groupproj - Build All + Install "HeidiComponents" - components/virtualtreeview/packages/delphi11/VirtualTrees.groupproj Build All + Install "VirtualTreesD" diff --git a/components/heidisql/packages/delphi11/HeidiComponents.dpk b/components/heidisql/packages/delphi11/HeidiComponents.dpk deleted file mode 100644 index 96cf7277..00000000 --- a/components/heidisql/packages/delphi11/HeidiComponents.dpk +++ /dev/null @@ -1,40 +0,0 @@ -package HeidiComponents; - -{$ALIGN 8} -{$ASSERTIONS ON} -{$BOOLEVAL OFF} -{$DEBUGINFO ON} -{$EXTENDEDSYNTAX ON} -{$IMPORTEDDATA ON} -{$IOCHECKS ON} -{$LOCALSYMBOLS ON} -{$LONGSTRINGS ON} -{$OPENSTRINGS ON} -{$OPTIMIZATION ON} -{$OVERFLOWCHECKS ON} -{$RANGECHECKS ON} -{$REFERENCEINFO ON} -{$SAFEDIVIDE OFF} -{$STACKFRAMES ON} -{$TYPEDADDRESS ON} -{$VARSTRINGCHECKS ON} -{$WRITEABLECONST OFF} -{$MINENUMSIZE 1} -{$IMAGEBASE $400000} -{$DESCRIPTION 'HeidiSQL helper components'} -{$LIBSUFFIX '110'} -{$IMPLICITBUILD OFF} - -requires - rtl, - dbrtl, - ZComponent, - ZParseSql, - ZCore, - ZDbc, - ZPlain; - -contains - heidicomp in '..\..\source\heidicomp.pas'; - -end. diff --git a/components/heidisql/packages/delphi11/HeidiComponents.dproj b/components/heidisql/packages/delphi11/HeidiComponents.dproj deleted file mode 100644 index 1e1e58f3..00000000 --- a/components/heidisql/packages/delphi11/HeidiComponents.dproj +++ /dev/null @@ -1,61 +0,0 @@ - - - {f078868a-5705-4a52-9f9a-52ce033b732a} - HeidiComponents.dpk - Debug - AnyCPU - DCC32 - - - 7.0 - False - False - 0 - ..\..\build - ..\..\build - ..\..\build - ..\..\build - ..\..\build - RELEASE - ..\..\..\zeosdbo\build;..\..\..\..\source;..\..\include - ..\..\..\zeosdbo\build;..\..\..\..\source;..\..\include - ..\..\..\zeosdbo\build;..\..\..\..\source;..\..\include - ..\..\..\zeosdbo\build;..\..\..\..\source;..\..\include - - - 7.0 - ..\..\build - ..\..\build - ..\..\build - ..\..\build - ..\..\build - ..\..\..\zeosdbo\build;..\..\..\..\source;..\..\include - ..\..\..\zeosdbo\build;..\..\..\..\source;..\..\include - ..\..\..\zeosdbo\build;..\..\..\..\source;..\..\include - ..\..\..\zeosdbo\build;..\..\..\..\source;..\..\include - True - True - True - True - - - Delphi.Personality - Package - -FalseTrueFalseHeidiSQL helper componentsFalseFalseFalse110TrueFalse1000FalseFalseFalseFalseFalse103312521.0.0.01.0.0.0HeidiComponents.dpk - - - - - MainSource - - - - - - - - - - - diff --git a/components/heidisql/packages/delphi11/HeidiComponents.groupproj b/components/heidisql/packages/delphi11/HeidiComponents.groupproj deleted file mode 100644 index 0919981c..00000000 --- a/components/heidisql/packages/delphi11/HeidiComponents.groupproj +++ /dev/null @@ -1,31 +0,0 @@ - - - {385a0b5c-fb03-4a06-afbe-f6c17c6c7b9c} - - - - - Default.Personality - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/components/heidisql/source/heidicomp.pas b/components/heidisql/source/heidicomp.pas deleted file mode 100644 index 2e97b444..00000000 --- a/components/heidisql/source/heidicomp.pas +++ /dev/null @@ -1,73 +0,0 @@ -unit heidicomp; - -interface - -uses - Classes, ZDataset; - -{$I const.inc} - -type - TDeferDataSet = class; - TAsyncPostRunner = procedure(ds: TDeferDataSet) of object; - - TDeferDataSet = class(TZQuery) - private - callback: TAsyncPostRunner; - kind: Integer; - protected - procedure InternalPost; override; - procedure InternalRefresh; override; - public - constructor Create(AOwner: TComponent; PostCallback: TAsyncPostRunner); reintroduce; - procedure ExecSQL; override; - procedure DoAsync; - procedure DoAsyncExecSql; - end; - - -implementation - -procedure TDeferDataSet.InternalPost; -begin - kind := 1; - if @callback = nil then DoAsync - else callback(self); -end; - -procedure TDeferDataSet.InternalRefresh; -begin - kind := 3; - if @callback = nil then DoAsync - else callback(self); -end; - -procedure TDeferDataSet.ExecSql; -begin - kind := 2; - if @callback = nil then DoAsync - else callback(self); -end; - -constructor TDeferDataSet.Create(AOwner: TComponent; PostCallback: TAsyncPostRunner); -begin - callback := PostCallback; - inherited Create(AOwner); -end; - -procedure TDeferDataSet.DoAsync; -begin - case kind of - 1: inherited InternalPost; - 2: inherited ExecSQL; - 3: inherited InternalRefresh; - end; -end; - -procedure TDeferDataSet.DoAsyncExecSql; -begin - inherited ExecSql; -end; - - -end. diff --git a/components/pngcomponents/packages/delphi11/PngComponents.dproj b/components/pngcomponents/packages/delphi11/PngComponents.dproj index cd87490a..039a028b 100644 --- a/components/pngcomponents/packages/delphi11/PngComponents.dproj +++ b/components/pngcomponents/packages/delphi11/PngComponents.dproj @@ -17,10 +17,10 @@ 7.0 - ..\..\..\compilerdetection\include;..\..\build - ..\..\..\compilerdetection\include;..\..\build - ..\..\..\compilerdetection\include;..\..\build - ..\..\..\compilerdetection\include;..\..\build + ..\..\..\source;..\..\build + ..\..\..\..\source;..\..\build + ..\..\..\..\source;..\..\build + ..\..\..\..\source;..\..\build ..\..\build ..\..\build ..\..\build diff --git a/components/pngcomponents/packages/delphi11/PngComponentsD.dproj b/components/pngcomponents/packages/delphi11/PngComponentsD.dproj index 5db64190..2de8c910 100644 --- a/components/pngcomponents/packages/delphi11/PngComponentsD.dproj +++ b/components/pngcomponents/packages/delphi11/PngComponentsD.dproj @@ -17,10 +17,10 @@ 7.0 - ..\..\..\compilerdetection\include;..\..\build - ..\..\..\compilerdetection\include;..\..\build - ..\..\..\compilerdetection\include;..\..\build - ..\..\..\compilerdetection\include;..\..\build + ..\..\..\..\source;..\..\build + ..\..\..\..\source;..\..\build + ..\..\..\..\source;..\..\build + ..\..\..\..\source;..\..\build ..\..\build ..\..\build ..\..\build diff --git a/components/synedit/Packages/delphi11/SynEditD.dproj b/components/synedit/Packages/delphi11/SynEditD.dproj index cf44a8d9..6e420c26 100644 --- a/components/synedit/Packages/delphi11/SynEditD.dproj +++ b/components/synedit/Packages/delphi11/SynEditD.dproj @@ -17,10 +17,10 @@ ..\..\build ..\..\build ..\..\build - ..\..\resources;..\..\..\compilerdetection\include;..\..\build - ..\..\resources;..\..\..\compilerdetection\include;..\..\build - ..\..\resources;..\..\..\compilerdetection\include;..\..\build - ..\..\resources;..\..\..\compilerdetection\include;..\..\build + ..\..\resources;..\..\..\..\source;..\..\build + ..\..\resources;..\..\..\..\source;..\..\build + ..\..\resources;..\..\..\..\source;..\..\build + ..\..\resources;..\..\..\..\source;..\..\build RELEASE @@ -30,10 +30,10 @@ ..\..\build ..\..\build ..\..\build - ..\..\resources;..\..\..\compilerdetection\include;..\..\build - ..\..\resources;..\..\..\compilerdetection\include;..\..\build - ..\..\resources;..\..\..\compilerdetection\include;..\..\build - ..\..\resources;..\..\..\compilerdetection\include;..\..\build + ..\..\resources;..\..\..\..\source;..\..\build + ..\..\resources;..\..\..\..\source;..\..\build + ..\..\resources;..\..\..\..\source;..\..\build + ..\..\resources;..\..\..\..\source;..\..\build True True True @@ -56,4 +56,4 @@ - + \ No newline at end of file diff --git a/components/synedit/Packages/delphi11/SynEditR.dproj b/components/synedit/Packages/delphi11/SynEditR.dproj index 96d58e8d..a15530d3 100644 --- a/components/synedit/Packages/delphi11/SynEditR.dproj +++ b/components/synedit/Packages/delphi11/SynEditR.dproj @@ -17,10 +17,10 @@ ..\..\build ..\..\build ..\..\build - ..\..\resources;..\..\..\compilerdetection\include - ..\..\resources;..\..\..\compilerdetection\include - ..\..\resources;..\..\..\compilerdetection\include - ..\..\resources;..\..\..\compilerdetection\include + ..\..\resources;..\..\..\..\source + ..\..\resources;..\..\..\..\source + ..\..\resources;..\..\..\..\source + ..\..\resources;..\..\..\..\source RELEASE @@ -30,10 +30,10 @@ ..\..\build ..\..\build ..\..\build - ..\..\resources;..\..\..\compilerdetection\include - ..\..\resources;..\..\..\compilerdetection\include - ..\..\resources;..\..\..\compilerdetection\include - ..\..\resources;..\..\..\compilerdetection\include + ..\..\resources;..\..\..\..\source + ..\..\resources;..\..\..\..\source + ..\..\resources;..\..\..\..\source + ..\..\resources;..\..\..\..\source True True True diff --git a/components/tntunictrls/packages/delphi11/TntUnicodeVcl.dproj b/components/tntunictrls/packages/delphi11/TntUnicodeVcl.dproj index 7bf2be77..c917203e 100644 --- a/components/tntunictrls/packages/delphi11/TntUnicodeVcl.dproj +++ b/components/tntunictrls/packages/delphi11/TntUnicodeVcl.dproj @@ -16,10 +16,10 @@ True 0 RELEASE - ..\..\..\compilerdetection\include - ..\..\..\compilerdetection\include - ..\..\..\compilerdetection\include - ..\..\..\compilerdetection\include + ..\..\..\..\source + ..\..\..\..\source + ..\..\..\..\source + ..\..\..\..\source False ..\..\build\ ..\..\build\ @@ -35,10 +35,10 @@ ..\..\build\ ..\..\build\ ..\..\build\ - ..\..\..\compilerdetection\include - ..\..\..\compilerdetection\include - ..\..\..\compilerdetection\include - ..\..\..\compilerdetection\include + ..\..\..\..\source + ..\..\..\..\source + ..\..\..\..\source + ..\..\..\..\source ..\..\build\ ..\..\build\ True diff --git a/components/tntunictrls/packages/delphi11/TntUnicodeVcl_Design.dproj b/components/tntunictrls/packages/delphi11/TntUnicodeVcl_Design.dproj index 4b07f625..683d9022 100644 --- a/components/tntunictrls/packages/delphi11/TntUnicodeVcl_Design.dproj +++ b/components/tntunictrls/packages/delphi11/TntUnicodeVcl_Design.dproj @@ -16,10 +16,10 @@ True 0 RELEASE - ..\..\..\compilerdetection\include;..\..\build\ - ..\..\..\compilerdetection\include;..\..\build\ - ..\..\..\compilerdetection\include;..\..\build\ - ..\..\..\compilerdetection\include;..\..\build\ + ..\..\..\..\source;..\..\build\ + ..\..\..\..\source;..\..\build\ + ..\..\..\..\source;..\..\build\ + ..\..\..\..\source;..\..\build\ False ..\..\build\ ..\..\build\ @@ -35,10 +35,10 @@ ..\..\build\ ..\..\build\ ..\..\build\ - ..\..\..\compilerdetection\include;..\..\build\ - ..\..\..\compilerdetection\include;..\..\build\ - ..\..\..\compilerdetection\include;..\..\build\ - ..\..\..\compilerdetection\include;..\..\build\ + ..\..\..\..\source;..\..\build\ + ..\..\..\..\source;..\..\build\ + ..\..\..\..\source;..\..\build\ + ..\..\..\..\source;..\..\build\ ..\..\build\ ..\..\build\ True diff --git a/components/virtualtreeview/packages/delphi11/VirtualTreesD.dproj b/components/virtualtreeview/packages/delphi11/VirtualTreesD.dproj index d7fa4a29..b6c533f7 100644 --- a/components/virtualtreeview/packages/delphi11/VirtualTreesD.dproj +++ b/components/virtualtreeview/packages/delphi11/VirtualTreesD.dproj @@ -21,10 +21,10 @@ ..\..\build ..\..\build ..\..\build - ..\..\source;..\..\..\compilerdetection\include;..\..\resources;..\..\build;..\..\..\tntunictrls\build - ..\..\source;..\..\..\compilerdetection\include;..\..\resources;..\..\build;..\..\..\tntunictrls\build - ..\..\source;..\..\..\compilerdetection\include;..\..\resources;..\..\build;..\..\..\tntunictrls\build - ..\..\source;..\..\..\compilerdetection\include;..\..\resources;..\..\build;..\..\..\tntunictrls\build + ..\..\source;..\..\..\..\source;..\..\resources;..\..\build;..\..\..\tntunictrls\build + ..\..\source;..\..\..\..\source;..\..\resources;..\..\build;..\..\..\tntunictrls\build + ..\..\source;..\..\..\..\source;..\..\resources;..\..\build;..\..\..\tntunictrls\build + ..\..\source;..\..\..\..\source;..\..\resources;..\..\build;..\..\..\tntunictrls\build 7.0 @@ -37,10 +37,10 @@ ..\..\build ..\..\build ..\..\build - ..\..\source;..\..\..\compilerdetection\include;..\..\resources;..\..\build;..\..\..\tntunictrls\build - ..\..\source;..\..\..\compilerdetection\include;..\..\resources;..\..\build;..\..\..\tntunictrls\build - ..\..\source;..\..\..\compilerdetection\include;..\..\resources;..\..\build;..\..\..\tntunictrls\build - ..\..\source;..\..\..\compilerdetection\include;..\..\resources;..\..\build;..\..\..\tntunictrls\build + ..\..\source;..\..\..\..\source;..\..\resources;..\..\build;..\..\..\tntunictrls\build + ..\..\source;..\..\..\..\source;..\..\resources;..\..\build;..\..\..\tntunictrls\build + ..\..\source;..\..\..\..\source;..\..\resources;..\..\build;..\..\..\tntunictrls\build + ..\..\source;..\..\..\..\source;..\..\resources;..\..\build;..\..\..\tntunictrls\build True True @@ -102,4 +102,4 @@ - + \ No newline at end of file diff --git a/components/virtualtreeview/packages/delphi11/VirtualTreesR.dproj b/components/virtualtreeview/packages/delphi11/VirtualTreesR.dproj index 61a48c6a..21a8782a 100644 --- a/components/virtualtreeview/packages/delphi11/VirtualTreesR.dproj +++ b/components/virtualtreeview/packages/delphi11/VirtualTreesR.dproj @@ -31,10 +31,10 @@ ..\..\build ..\..\build ..\..\build - ..\..\..\compilerdetection\include;..\..\resources;..\..\..\tntunictrls\build - ..\..\..\compilerdetection\include;..\..\resources;..\..\..\tntunictrls\build - ..\..\..\compilerdetection\include;..\..\resources;..\..\..\tntunictrls\build - ..\..\..\compilerdetection\include;..\..\resources;..\..\..\tntunictrls\build + ..\..\..\..\source;..\..\resources;..\..\..\tntunictrls\build + ..\..\..\..\source;..\..\resources;..\..\..\tntunictrls\build + ..\..\..\..\source;..\..\resources;..\..\..\tntunictrls\build + ..\..\..\..\source;..\..\resources;..\..\..\tntunictrls\build True True True diff --git a/components/zeosdbo/packages/delphi11/ZComponent.dproj b/components/zeosdbo/packages/delphi11/ZComponent.dproj index 30e4585d..5a77c185 100644 --- a/components/zeosdbo/packages/delphi11/ZComponent.dproj +++ b/components/zeosdbo/packages/delphi11/ZComponent.dproj @@ -15,10 +15,10 @@ ..\..\build ..\..\build ..\..\build - $(BDS)\RaveReports\Lib;$(BDS)\lib\Debug;.\..\..\..\compilerdetection\include;..\..\build - $(BDS)\RaveReports\Lib;$(BDS)\lib\Debug;.\..\..\..\compilerdetection\include;..\..\build - $(BDS)\RaveReports\Lib;$(BDS)\lib\Debug;.\..\..\..\compilerdetection\include;..\..\build - $(BDS)\RaveReports\Lib;$(BDS)\lib\Debug;.\..\..\..\compilerdetection\include;..\..\build + $(BDS)\RaveReports\Lib;$(BDS)\lib\Debug;.\..\..\..\..\source;..\..\build + $(BDS)\RaveReports\Lib;$(BDS)\lib\Debug;.\..\..\..\..\source;..\..\build + $(BDS)\RaveReports\Lib;$(BDS)\lib\Debug;.\..\..\..\..\source;..\..\build + $(BDS)\RaveReports\Lib;$(BDS)\lib\Debug;.\..\..\..\..\source;..\..\build RELEASE True True @@ -32,10 +32,10 @@ ..\..\build ..\..\build ..\..\build - $(BDS)\RaveReports\Lib;$(BDS)\lib\Debug;.\..\..\..\compilerdetection\include;..\..\build - $(BDS)\RaveReports\Lib;$(BDS)\lib\Debug;.\..\..\..\compilerdetection\include;..\..\build - $(BDS)\RaveReports\Lib;$(BDS)\lib\Debug;.\..\..\..\compilerdetection\include;..\..\build - $(BDS)\RaveReports\Lib;$(BDS)\lib\Debug;.\..\..\..\compilerdetection\include;..\..\build + $(BDS)\RaveReports\Lib;$(BDS)\lib\Debug;.\..\..\..\..\source;..\..\build + $(BDS)\RaveReports\Lib;$(BDS)\lib\Debug;.\..\..\..\..\source;..\..\build + $(BDS)\RaveReports\Lib;$(BDS)\lib\Debug;.\..\..\..\..\source;..\..\build + $(BDS)\RaveReports\Lib;$(BDS)\lib\Debug;.\..\..\..\..\source;..\..\build Delphi.Personality diff --git a/components/zeosdbo/packages/delphi11/ZComponentDesign.dproj b/components/zeosdbo/packages/delphi11/ZComponentDesign.dproj index 2e2aacd8..5074df97 100644 --- a/components/zeosdbo/packages/delphi11/ZComponentDesign.dproj +++ b/components/zeosdbo/packages/delphi11/ZComponentDesign.dproj @@ -19,10 +19,10 @@ ..\..\build ..\..\build ..\..\build - $(BDS)\RaveReports\Lib;$(BDS)\lib\Debug;.\..\..\..\compilerdetection\include;..\..\build - $(BDS)\RaveReports\Lib;$(BDS)\lib\Debug;.\..\..\..\compilerdetection\include;..\..\build - $(BDS)\RaveReports\Lib;$(BDS)\lib\Debug;.\..\..\..\compilerdetection\include;..\..\build - $(BDS)\RaveReports\Lib;$(BDS)\lib\Debug;.\..\..\..\compilerdetection\include;..\..\build + $(BDS)\RaveReports\Lib;$(BDS)\lib\Debug;.\..\..\..\..\source;..\..\build + $(BDS)\RaveReports\Lib;$(BDS)\lib\Debug;.\..\..\..\..\source;..\..\build + $(BDS)\RaveReports\Lib;$(BDS)\lib\Debug;.\..\..\..\..\source;..\..\build + $(BDS)\RaveReports\Lib;$(BDS)\lib\Debug;.\..\..\..\..\source;..\..\build RELEASE @@ -34,10 +34,10 @@ ..\..\build ..\..\build ..\..\build - $(BDS)\RaveReports\Lib;$(BDS)\lib\Debug;.\..\..\..\compilerdetection\include;..\..\build - $(BDS)\RaveReports\Lib;$(BDS)\lib\Debug;.\..\..\..\compilerdetection\include;..\..\build - $(BDS)\RaveReports\Lib;$(BDS)\lib\Debug;.\..\..\..\compilerdetection\include;..\..\build - $(BDS)\RaveReports\Lib;$(BDS)\lib\Debug;.\..\..\..\compilerdetection\include;..\..\build + $(BDS)\RaveReports\Lib;$(BDS)\lib\Debug;.\..\..\..\..\source;..\..\build + $(BDS)\RaveReports\Lib;$(BDS)\lib\Debug;.\..\..\..\..\source;..\..\build + $(BDS)\RaveReports\Lib;$(BDS)\lib\Debug;.\..\..\..\..\source;..\..\build + $(BDS)\RaveReports\Lib;$(BDS)\lib\Debug;.\..\..\..\..\source;..\..\build True True @@ -67,4 +67,4 @@ - + \ No newline at end of file diff --git a/components/zeosdbo/packages/delphi11/ZCore.dproj b/components/zeosdbo/packages/delphi11/ZCore.dproj index ca59930f..f435369b 100644 --- a/components/zeosdbo/packages/delphi11/ZCore.dproj +++ b/components/zeosdbo/packages/delphi11/ZCore.dproj @@ -18,10 +18,10 @@ ..\..\build ..\..\build ..\..\build - $(BDS)\RaveReports\Lib;$(BDS)\lib\Debug;.\..\..\..\compilerdetection\include - $(BDS)\RaveReports\Lib;$(BDS)\lib\Debug;.\..\..\..\compilerdetection\include - $(BDS)\RaveReports\Lib;$(BDS)\lib\Debug;.\..\..\..\compilerdetection\include - $(BDS)\RaveReports\Lib;$(BDS)\lib\Debug;.\..\..\..\compilerdetection\include + $(BDS)\RaveReports\Lib;$(BDS)\lib\Debug;.\..\..\..\..\source + $(BDS)\RaveReports\Lib;$(BDS)\lib\Debug;.\..\..\..\..\source + $(BDS)\RaveReports\Lib;$(BDS)\lib\Debug;.\..\..\..\..\source + $(BDS)\RaveReports\Lib;$(BDS)\lib\Debug;.\..\..\..\..\source RELEASE @@ -33,10 +33,10 @@ ..\..\build ..\..\build ..\..\build - $(BDS)\Lib\Debug\Indy10;$(BDS)\RaveReports\Lib;$(BDS)\lib\Debug;.\..\..\..\compilerdetection\include - $(BDS)\Lib\Debug\Indy10;$(BDS)\RaveReports\Lib;$(BDS)\lib\Debug;.\..\..\..\compilerdetection\include - $(BDS)\Lib\Debug\Indy10;$(BDS)\RaveReports\Lib;$(BDS)\lib\Debug;.\..\..\..\compilerdetection\include - $(BDS)\Lib\Debug\Indy10;$(BDS)\RaveReports\Lib;$(BDS)\lib\Debug;.\..\..\..\compilerdetection\include + $(BDS)\Lib\Debug\Indy10;$(BDS)\RaveReports\Lib;$(BDS)\lib\Debug;.\..\..\..\..\source + $(BDS)\Lib\Debug\Indy10;$(BDS)\RaveReports\Lib;$(BDS)\lib\Debug;.\..\..\..\..\source + $(BDS)\Lib\Debug\Indy10;$(BDS)\RaveReports\Lib;$(BDS)\lib\Debug;.\..\..\..\..\source + $(BDS)\Lib\Debug\Indy10;$(BDS)\RaveReports\Lib;$(BDS)\lib\Debug;.\..\..\..\..\source True True diff --git a/components/zeosdbo/packages/delphi11/ZDbc.dproj b/components/zeosdbo/packages/delphi11/ZDbc.dproj index bb3bdbeb..c9a63723 100644 --- a/components/zeosdbo/packages/delphi11/ZDbc.dproj +++ b/components/zeosdbo/packages/delphi11/ZDbc.dproj @@ -15,10 +15,10 @@ ..\..\build ..\..\build ..\..\build - $(BDS)\RaveReports\Lib;$(BDS)\lib\Debug;.\..\..\..\compilerdetection\include;..\..\build - $(BDS)\RaveReports\Lib;$(BDS)\lib\Debug;.\..\..\..\compilerdetection\include;..\..\build - $(BDS)\RaveReports\Lib;$(BDS)\lib\Debug;.\..\..\..\compilerdetection\include;..\..\build - $(BDS)\RaveReports\Lib;$(BDS)\lib\Debug;.\..\..\..\compilerdetection\include;..\..\build + $(BDS)\RaveReports\Lib;$(BDS)\lib\Debug;.\..\..\..\..\source;..\..\build + $(BDS)\RaveReports\Lib;$(BDS)\lib\Debug;.\..\..\..\..\source;..\..\build + $(BDS)\RaveReports\Lib;$(BDS)\lib\Debug;.\..\..\..\..\source;..\..\build + $(BDS)\RaveReports\Lib;$(BDS)\lib\Debug;.\..\..\..\..\source;..\..\build RELEASE True True @@ -32,10 +32,10 @@ ..\..\build ..\..\build ..\..\build - $(BDS)\RaveReports\Lib;$(BDS)\lib\Debug;.\..\..\..\compilerdetection\include;..\..\build - $(BDS)\RaveReports\Lib;$(BDS)\lib\Debug;.\..\..\..\compilerdetection\include;..\..\build - $(BDS)\RaveReports\Lib;$(BDS)\lib\Debug;.\..\..\..\compilerdetection\include;..\..\build - $(BDS)\RaveReports\Lib;$(BDS)\lib\Debug;.\..\..\..\compilerdetection\include;..\..\build + $(BDS)\RaveReports\Lib;$(BDS)\lib\Debug;.\..\..\..\..\source;..\..\build + $(BDS)\RaveReports\Lib;$(BDS)\lib\Debug;.\..\..\..\..\source;..\..\build + $(BDS)\RaveReports\Lib;$(BDS)\lib\Debug;.\..\..\..\..\source;..\..\build + $(BDS)\RaveReports\Lib;$(BDS)\lib\Debug;.\..\..\..\..\source;..\..\build Delphi.Personality @@ -104,4 +104,4 @@ - + \ No newline at end of file diff --git a/components/zeosdbo/packages/delphi11/ZParseSql.dproj b/components/zeosdbo/packages/delphi11/ZParseSql.dproj index 130b9c4a..c1b8b978 100644 --- a/components/zeosdbo/packages/delphi11/ZParseSql.dproj +++ b/components/zeosdbo/packages/delphi11/ZParseSql.dproj @@ -18,10 +18,10 @@ ..\..\build ..\..\build ..\..\build - $(BDS)\RaveReports\Lib;$(BDS)\lib\Debug;.\..\..\..\compilerdetection\include;..\..\build - $(BDS)\RaveReports\Lib;$(BDS)\lib\Debug;.\..\..\..\compilerdetection\include;..\..\build - $(BDS)\RaveReports\Lib;$(BDS)\lib\Debug;.\..\..\..\compilerdetection\include;..\..\build - $(BDS)\RaveReports\Lib;$(BDS)\lib\Debug;.\..\..\..\compilerdetection\include;..\..\build + $(BDS)\RaveReports\Lib;$(BDS)\lib\Debug;.\..\..\..\..\source;..\..\build + $(BDS)\RaveReports\Lib;$(BDS)\lib\Debug;.\..\..\..\..\source;..\..\build + $(BDS)\RaveReports\Lib;$(BDS)\lib\Debug;.\..\..\..\..\source;..\..\build + $(BDS)\RaveReports\Lib;$(BDS)\lib\Debug;.\..\..\..\..\source;..\..\build RELEASE @@ -33,10 +33,10 @@ ..\..\build ..\..\build ..\..\build - $(BDS)\RaveReports\Lib;$(BDS)\lib\Debug;.\..\..\..\compilerdetection\include;..\..\build - $(BDS)\RaveReports\Lib;$(BDS)\lib\Debug;.\..\..\..\compilerdetection\include;..\..\build - $(BDS)\RaveReports\Lib;$(BDS)\lib\Debug;.\..\..\..\compilerdetection\include;..\..\build - $(BDS)\RaveReports\Lib;$(BDS)\lib\Debug;.\..\..\..\compilerdetection\include;..\..\build + $(BDS)\RaveReports\Lib;$(BDS)\lib\Debug;.\..\..\..\..\source;..\..\build + $(BDS)\RaveReports\Lib;$(BDS)\lib\Debug;.\..\..\..\..\source;..\..\build + $(BDS)\RaveReports\Lib;$(BDS)\lib\Debug;.\..\..\..\..\source;..\..\build + $(BDS)\RaveReports\Lib;$(BDS)\lib\Debug;.\..\..\..\..\source;..\..\build True True @@ -69,4 +69,4 @@ - + \ No newline at end of file diff --git a/components/zeosdbo/packages/delphi11/ZPlain.dproj b/components/zeosdbo/packages/delphi11/ZPlain.dproj index 8e59f369..a413c5f0 100644 --- a/components/zeosdbo/packages/delphi11/ZPlain.dproj +++ b/components/zeosdbo/packages/delphi11/ZPlain.dproj @@ -20,10 +20,10 @@ ..\..\build ..\..\build ..\..\build - $(BDS)\RaveReports\Lib;$(BDS)\lib\Debug;.\..\..\..\compilerdetection\include;..\..\build - $(BDS)\RaveReports\Lib;$(BDS)\lib\Debug;.\..\..\..\compilerdetection\include;..\..\build - $(BDS)\RaveReports\Lib;$(BDS)\lib\Debug;.\..\..\..\compilerdetection\include;..\..\build - $(BDS)\RaveReports\Lib;$(BDS)\lib\Debug;.\..\..\..\compilerdetection\include;..\..\build + $(BDS)\RaveReports\Lib;$(BDS)\lib\Debug;.\..\..\..\..\source;..\..\build + $(BDS)\RaveReports\Lib;$(BDS)\lib\Debug;.\..\..\..\..\source;..\..\build + $(BDS)\RaveReports\Lib;$(BDS)\lib\Debug;.\..\..\..\..\source;..\..\build + $(BDS)\RaveReports\Lib;$(BDS)\lib\Debug;.\..\..\..\..\source;..\..\build RELEASE @@ -36,10 +36,10 @@ ..\..\build ..\..\build ..\..\build - $(BDS)\RaveReports\Lib;$(BDS)\lib\Debug;.\..\..\..\compilerdetection\include;..\..\build - $(BDS)\RaveReports\Lib;$(BDS)\lib\Debug;.\..\..\..\compilerdetection\include;..\..\build - $(BDS)\RaveReports\Lib;$(BDS)\lib\Debug;.\..\..\..\compilerdetection\include;..\..\build - $(BDS)\RaveReports\Lib;$(BDS)\lib\Debug;.\..\..\..\compilerdetection\include;..\..\build + $(BDS)\RaveReports\Lib;$(BDS)\lib\Debug;.\..\..\..\..\source;..\..\build + $(BDS)\RaveReports\Lib;$(BDS)\lib\Debug;.\..\..\..\..\source;..\..\build + $(BDS)\RaveReports\Lib;$(BDS)\lib\Debug;.\..\..\..\..\source;..\..\build + $(BDS)\RaveReports\Lib;$(BDS)\lib\Debug;.\..\..\..\..\source;..\..\build True diff --git a/extra/build_everything.cmd b/extra/build_everything.cmd index 9ef832c5..6cb3433e 100644 --- a/extra/build_everything.cmd +++ b/extra/build_everything.cmd @@ -101,9 +101,9 @@ set compiler=dcc32.exe set params=--no-config set params=%params% -aWinTypes=Windows;WinProcs=Windows;DbiProcs=BDE;DbiTypes=BDE;DbiErrs=BDE set params=%params% -B -set params=%params% -i"%base_dir%\components\compilerdetection\include;%base_dir%\components\heidisql\include" -set params=%params% -r"%base_dir%\components\synedit\resources;%base_dir%\components\virtualtreeview\Resources;%base_dir%\components\edbimage\resources" -set params=%params% -u"%compiler_dir%\lib;%compiler_dir%\lib\obj;%base_dir%\components\zeosdbo\build;%base_dir%\components\virtualtreeview\build;%base_dir%\components\synedit\build;%base_dir%\components\heidisql\build;%base_dir%\components\edbimage\build;%base_dir%\components\tntunictrls\build;%base_dir%\components\pngcomponents\build" +set params=%params% -i"%base_dir%\source" +set params=%params% -r"%base_dir%\components\synedit\resources;%base_dir%\components\virtualtreeview\Resources" +set params=%params% -u"%compiler_dir%\lib;%compiler_dir%\lib\obj;%base_dir%\components\zeosdbo\build;%base_dir%\components\virtualtreeview\build;%base_dir%\components\synedit\build;%base_dir%\components\tntunictrls\build;%base_dir%\components\pngcomponents\build" set params=%params% -N0"..\..\build" set params=%params% -LE"..\..\build" set params=%params% -LN"..\..\build" @@ -196,11 +196,6 @@ call :compile zeosdbo ZComponentDesign if not %err% == 0 goto end -rem Build HeidiComponents -call :compile heidisql HeidiComponents -if not %err% == 0 goto end - - rem Build TNT Unicode Controls call :compile tntunictrls TntUnicodeVcl if not %err% == 0 goto end diff --git a/extra/install_ide_components.cmd b/extra/install_ide_components.cmd index 12163e1b..78aa4589 100644 --- a/extra/install_ide_components.cmd +++ b/extra/install_ide_components.cmd @@ -111,11 +111,6 @@ call :install zeosdbo ZComponentDesign if not %err% == 0 goto end -rem Install HeidiComponents -call :install heidisql HeidiComponents -if not %err% == 0 goto end - - rem Install TNTUnicodeControls call :install tntunictrls TntUnicodeVcl_Design if not %err% == 0 goto end diff --git a/packages/delphi11/heidisql.dproj b/packages/delphi11/heidisql.dproj index 1a0b2ca7..ee40dad3 100644 --- a/packages/delphi11/heidisql.dproj +++ b/packages/delphi11/heidisql.dproj @@ -19,10 +19,10 @@ ..\..\build ..\..\build ..\..\build - ..\..\components\compilerdetection\include;..\..\components\heidisql\include;..\..\components\edbimage\build;..\..\components\heidisql\build;..\..\components\synedit\build;..\..\components\synedit\resources;..\..\components\zeosdbo\build;..\..\components\virtualtreeview\build;..\..\components\virtualtreeview\Resources;..\..\components\tntunictrls\build - ..\..\components\compilerdetection\include;..\..\components\heidisql\include;..\..\components\edbimage\build;..\..\components\heidisql\build;..\..\components\synedit\build;..\..\components\synedit\resources;..\..\components\zeosdbo\build;..\..\components\virtualtreeview\build;..\..\components\virtualtreeview\Resources;..\..\components\tntunictrls\build - ..\..\components\compilerdetection\include;..\..\components\heidisql\include;..\..\components\edbimage\build;..\..\components\heidisql\build;..\..\components\synedit\build;..\..\components\synedit\resources;..\..\components\zeosdbo\build;..\..\components\virtualtreeview\build;..\..\components\virtualtreeview\Resources;..\..\components\tntunictrls\build - ..\..\components\compilerdetection\include;..\..\components\heidisql\include;..\..\components\edbimage\build;..\..\components\heidisql\build;..\..\components\synedit\build;..\..\components\synedit\resources;..\..\components\zeosdbo\build;..\..\components\virtualtreeview\build;..\..\components\virtualtreeview\Resources;..\..\components\tntunictrls\build + ..\..\components\synedit\build;..\..\components\synedit\resources;..\..\components\zeosdbo\build;..\..\components\virtualtreeview\build;..\..\components\virtualtreeview\Resources;..\..\components\tntunictrls\build + ..\..\components\synedit\build;..\..\components\synedit\resources;..\..\components\zeosdbo\build;..\..\components\virtualtreeview\build;..\..\components\virtualtreeview\Resources;..\..\components\tntunictrls\build + ..\..\components\synedit\build;..\..\components\synedit\resources;..\..\components\zeosdbo\build;..\..\components\virtualtreeview\build;..\..\components\virtualtreeview\Resources;..\..\components\tntunictrls\build + ..\..\components\synedit\build;..\..\components\synedit\resources;..\..\components\zeosdbo\build;..\..\components\virtualtreeview\build;..\..\components\virtualtreeview\Resources;..\..\components\tntunictrls\build RELEASE HeidiSQL False @@ -38,10 +38,10 @@ ..\..\build ..\..\build ..\..\build - $(BDS)\RaveReports\Lib;$(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10;..\..\components\compilerdetection\include;..\..\components\heidisql\include;..\..\components\edbimage\build;..\..\components\heidisql\build;..\..\components\synedit\build;..\..\components\synedit\resources;..\..\components\zeosdbo\build;..\..\components\virtualtreeview\build;..\..\components\virtualtreeview\resources;..\..\components\tntunictrls\build;..\..\components\pngcomponents\build - $(BDS)\RaveReports\Lib;$(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10;..\..\components\compilerdetection\include;..\..\components\heidisql\include;..\..\components\edbimage\build;..\..\components\heidisql\build;..\..\components\synedit\build;..\..\components\synedit\resources;..\..\components\zeosdbo\build;..\..\components\virtualtreeview\build;..\..\components\virtualtreeview\resources;..\..\components\tntunictrls\build;..\..\components\pngcomponents\build - $(BDS)\RaveReports\Lib;$(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10;..\..\components\compilerdetection\include;..\..\components\heidisql\include;..\..\components\edbimage\build;..\..\components\heidisql\build;..\..\components\synedit\build;..\..\components\synedit\resources;..\..\components\zeosdbo\build;..\..\components\virtualtreeview\build;..\..\components\virtualtreeview\resources;..\..\components\tntunictrls\build;..\..\components\pngcomponents\build - $(BDS)\RaveReports\Lib;$(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10;..\..\components\compilerdetection\include;..\..\components\heidisql\include;..\..\components\edbimage\build;..\..\components\heidisql\build;..\..\components\synedit\build;..\..\components\synedit\resources;..\..\components\zeosdbo\build;..\..\components\virtualtreeview\build;..\..\components\virtualtreeview\resources;..\..\components\tntunictrls\build;..\..\components\pngcomponents\build + $(BDS)\RaveReports\Lib;$(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10;..\..\components\synedit\build;..\..\components\synedit\resources;..\..\components\zeosdbo\build;..\..\components\virtualtreeview\build;..\..\components\virtualtreeview\resources;..\..\components\tntunictrls\build;..\..\components\pngcomponents\build + $(BDS)\RaveReports\Lib;$(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10;..\..\components\synedit\build;..\..\components\synedit\resources;..\..\components\zeosdbo\build;..\..\components\virtualtreeview\build;..\..\components\virtualtreeview\resources;..\..\components\tntunictrls\build;..\..\components\pngcomponents\build + $(BDS)\RaveReports\Lib;$(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10;..\..\components\synedit\build;..\..\components\synedit\resources;..\..\components\zeosdbo\build;..\..\components\virtualtreeview\build;..\..\components\virtualtreeview\resources;..\..\components\tntunictrls\build;..\..\components\pngcomponents\build + $(BDS)\RaveReports\Lib;$(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10;..\..\components\synedit\build;..\..\components\synedit\resources;..\..\components\zeosdbo\build;..\..\components\virtualtreeview\build;..\..\components\virtualtreeview\resources;..\..\components\tntunictrls\build;..\..\components\pngcomponents\build DEBUG HeidiSQL True @@ -54,7 +54,7 @@ - ..\..;..\..\components\compilerdetection\include;..\..\components\heidisql\include;..\..\components\edbimage\source;..\..\components\heidisql\source;..\..\components\synedit\source;..\..\components\zeosdbo\src;..\..\components\zeosdbo\src\plain;..\..\components\zeosdbo\src\component;..\..\components\zeosdbo\src\core;..\..\components\zeosdbo\src\dbc;..\..\components\zeosdbo\src\parsesql + ..\..;..\..\components\synedit\source;..\..\components\zeosdbo\src;..\..\components\zeosdbo\src\plain;..\..\components\zeosdbo\src\component;..\..\components\zeosdbo\src\core;..\..\components\zeosdbo\src\dbc;..\..\components\zeosdbo\src\parsesql False True False diff --git a/components/compilerdetection/include/compilers.inc b/source/compilers.inc similarity index 100% rename from components/compilerdetection/include/compilers.inc rename to source/compilers.inc diff --git a/components/heidisql/include/const.inc b/source/const.inc similarity index 100% rename from components/heidisql/include/const.inc rename to source/const.inc diff --git a/source/helpers.pas b/source/helpers.pas index 1ea637b4..fc284fe2 100644 --- a/source/helpers.pas +++ b/source/helpers.pas @@ -103,6 +103,23 @@ type // General purpose editing status flag TEditingStatus = (esUntouched, esModified, esDeleted, esAddedUntouched, esAddedModified, esAddedDeleted); + TDeferDataSet = class; + TAsyncPostRunner = procedure(ds: TDeferDataSet) of object; + + TDeferDataSet = class(TZQuery) + private + callback: TAsyncPostRunner; + kind: Integer; + protected + procedure InternalPost; override; + procedure InternalRefresh; override; + public + constructor Create(AOwner: TComponent; PostCallback: TAsyncPostRunner); reintroduce; + procedure ExecSQL; override; + procedure DoAsync; + procedure DoAsyncExecSql; + end; + {$I const.inc} function implodestr(seperator: WideString; a: TWideStringList) :WideString; @@ -3083,6 +3100,48 @@ begin end; +procedure TDeferDataSet.InternalPost; +begin + kind := 1; + if @callback = nil then DoAsync + else callback(self); +end; + +procedure TDeferDataSet.InternalRefresh; +begin + kind := 3; + if @callback = nil then DoAsync + else callback(self); +end; + +procedure TDeferDataSet.ExecSql; +begin + kind := 2; + if @callback = nil then DoAsync + else callback(self); +end; + +constructor TDeferDataSet.Create(AOwner: TComponent; PostCallback: TAsyncPostRunner); +begin + callback := PostCallback; + inherited Create(AOwner); +end; + +procedure TDeferDataSet.DoAsync; +begin + case kind of + 1: inherited InternalPost; + 2: inherited ExecSQL; + 3: inherited InternalRefresh; + end; +end; + +procedure TDeferDataSet.DoAsyncExecSql; +begin + inherited ExecSql; +end; + + end. diff --git a/source/insertfiles_progress.pas b/source/insertfiles_progress.pas index 61622bc2..3a2d7757 100644 --- a/source/insertfiles_progress.pas +++ b/source/insertfiles_progress.pas @@ -32,8 +32,7 @@ type implementation -uses main, helpers,insertfiles, - HeidiComp; +uses main, helpers,insertfiles; {$I const.inc} {$R *.DFM} diff --git a/source/main.pas b/source/main.pas index 0728e691..0b18ae8a 100644 --- a/source/main.pas +++ b/source/main.pas @@ -16,7 +16,7 @@ uses StdCtrls, Dialogs, Buttons, Messages, ExtCtrls, ComCtrls, StdActns, ActnList, ImgList, ShellApi, ToolWin, Clipbrd, db, SynMemo, synedit, SynEditTypes, ZDataSet, ZSqlProcessor, - HeidiComp, sqlhelp, MysqlQueryThread, VirtualTrees, + sqlhelp, MysqlQueryThread, VirtualTrees, DateUtils, PngImageList, TableTools, View, Usermanager, SelectDBObject, Widestrings, ShlObj, SynEditMiscClasses, SynEditSearch, SynCompletionProposal, ZSqlMonitor, SynEditHighlighter, SynHighlighterSQL, diff --git a/source/mysqlquery.pas b/source/mysqlquery.pas index ec1a1870..786c542e 100644 --- a/source/mysqlquery.pas +++ b/source/mysqlquery.pas @@ -2,8 +2,7 @@ unit MysqlQuery; interface -uses Windows, Messages, Classes, Db, ZConnection, ZDataSet, MysqlQueryThread, - HeidiComp; +uses Windows, Messages, Classes, Db, ZConnection, ZDataSet, MysqlQueryThread, helpers; const // Thread notification events @@ -69,8 +68,7 @@ implementation uses SysUtils, - Dialogs, - helpers; + Dialogs; {*** diff --git a/source/mysqlquerythread.pas b/source/mysqlquerythread.pas index 7463088d..6a89c40b 100644 --- a/source/mysqlquerythread.pas +++ b/source/mysqlquerythread.pas @@ -5,7 +5,7 @@ interface uses Windows, Messages, Forms, Db, Classes, ZConnection, ZDataSet, StdCtrls, SysUtils, ZMessages, - HeidiComp, SynRegExpr, mysql_structures; + helpers, SynRegExpr, mysql_structures; {$IFDEF EXAMPLE_APP} const @@ -83,7 +83,7 @@ type implementation uses - MysqlQuery, Dialogs, helpers, communication + MysqlQuery, Dialogs, communication {$IFNDEF EXAMPLE_APP} , Main {$ENDIF} diff --git a/source/texteditor.pas b/source/texteditor.pas index 1661884e..73bea987 100644 --- a/source/texteditor.pas +++ b/source/texteditor.pas @@ -4,13 +4,14 @@ interface uses Windows, Classes, Graphics, Forms, Controls, helpers, StdCtrls, TntStdCtrls, VirtualTrees, - ComCtrls, ToolWin, Dialogs, SysUtils, Menus, WideStrUtils; + ComCtrls, ToolWin, Dialogs, SysUtils, Menus, WideStrUtils, RichEdit, + TntComCtrls; {$I const.inc} type TfrmTextEditor = class(TForm) - memoText: TTntMemo; + memoText: TTntRichEdit; tlbStandard: TToolBar; btnWrap: TToolButton; btnLoadText: TToolButton; @@ -151,6 +152,7 @@ procedure TfrmTextEditor.SetMaxLength(len: integer); begin // Input: Length in number of bytes. memoText.MaxLength := len; + SendMessage(memoText.Handle, EM_EXLIMITTEXT, 0, $1000000); end; procedure TfrmTextEditor.SetFont(font: TFont); diff --git a/superpackages/delphi11/heidisql.groupproj b/superpackages/delphi11/heidisql.groupproj index 3a2abb04..074050f8 100644 --- a/superpackages/delphi11/heidisql.groupproj +++ b/superpackages/delphi11/heidisql.groupproj @@ -80,15 +80,6 @@ - - - - - - - - - @@ -162,12 +153,12 @@ - + - + - +