Add changes version 2.61

2020-09-21 23:31:56 +00:00
parent fa01ec3931
commit dc4e9a3a68
21 changed files with 258 additions and 223 deletions
--- a/Demo2/Main.ddp
+++ b/Demo2/Main.ddp
--- a/Demo2/reSourceDemo2.cfg
+++ b/Demo2/reSourceDemo2.cfg
@@ -1,4 +1,4 @@
-$A+
+-$A8
 -$B-
 -$C+
 -$D+
@@ -31,5 +31,11 @@
 -M
 -$M16384,1048576
 -K$00400000
-LE"c:\borland\delphi5\Projects\Bpl"
-LN"c:\borland\delphi5\Projects\Bpl"
+-E"c:\temp\rs"
+-N"c:\temp\rs"
+-LE"c:\program files\borland\delphi6\Projects\Bpl"
+-LN"c:\program files\borland\delphi6\Projects\Bpl"
+-U"..\component\"
+-O"..\component\"
+-I"..\component\"
+-R"..\component\"
--- a/Demo2/reSourceDemo2.dof
+++ b/Demo2/reSourceDemo2.dof
@@ -1,5 +1,8 @@
+[FileVersion]
+Version=6.0
+
 [Compiler]
-A=1
+A=8
 B=0
 C=1
 D=1
@@ -41,11 +44,11 @@ ImageBase=4194304
 ExeDescription=

 [Directories]
-OutputDir=
-UnitOutputDir=
+OutputDir=c:\temp\rs
+UnitOutputDir=c:\temp\rs
 PackageDLLOutputDir=
 PackageDCPOutputDir=
-SearchPath=
+SearchPath=..\component\
 Packages=VCL50;VCLX50;VCLSMP50;VCLDB50;VCLADO50;ibevnt50;VCLBDE50;VCLDBX50;QRPT50;TEEUI50;TEEDB50;TEE50;DSS50;TEEQR50;VCLIB50;VCLMID50;VCLIE50;INETDB50;INET50;NMFAST50;WEBMID50;dclocx50;dclaxserver50;ColorPicker;preview;Icsdel50;galoled;NtfyIcon
 Conditionals=
 DebugSourceDirs=
@@ -54,6 +57,9 @@ UsePackages=0
 [Parameters]
 RunParams=
 HostApplication=
+Launcher=
+UseLauncher=0
+DebugCWD=

 [Language]
 ActiveLang=
@@ -92,9 +98,11 @@ Count=1
 Item0=WinTypes=Windows;WinProcs=Windows;DbiTypes=BDE;DbiProcs=BDE;DbiErrs=BDE;

 [HistoryLists\hlSearchPath]
-Count=2
-Item0=c:\temp\rs
-Item1=C:\Save\Delphi\resource\Component
+Count=4
+Item0=..\component\
+Item1=..\components\
+Item2=c:\temp\rs
+Item3=C:\Save\Delphi\resource\Component

 [HistoryLists\hlUnitOutputDirectory]
 Count=1
--- a/Demo2/reSourceDemo2.dsk
+++ b/Demo2/reSourceDemo2.dsk
@@ -1,33 +1,51 @@
 [Closed Files]
-File_0=SourceModule,'C:\Save\Delphi\resource\Archiver Demo2\Main.pas',0,1,14,3,23,0,0
-File_1=SourceModule,'C:\Save\Delphi\resource\Component\BWTExpandUnit.pas',0,1,226,35,234,0,0
-File_2=SourceModule,'C:\Save\Delphi\resource\Component\ResourceCompUnit.pas',0,1,268,2,274,0,0
-File_3=SourceModule,'C:\Save\Delphi\resource\Component\ArchiveManagerUnit.pas',0,1,479,30,479,0,0
-File_4=SourceModule,'C:\Save\Delphi\resource\Component\BWTBaseUnit.pas',0,1,1,1,1,0,0
-File_5=SourceModule,'C:\Save\Delphi\resource\Component\BWTCompressUnit.pas',0,1,1,1,1,0,0
-File_6=SourceModule,'C:\Save\Delphi\resource\Archiver Demo\main.pas',0,1,1956,14,1959,1,0
-File_7=SourceModule,'C:\Save\Delphi\newr2\Component\StructsUnit.pas',0,1,1,1,7,0,0
-File_8=SourceModule,'C:\Save\Delphi\newr2\Component\StrucAriEncoderUnit.pas',0,1,1,1,9,0,0
-File_9=SourceModule,'C:\Save\Delphi\newr2\Component\StrucAriDecoderUnit.pas',0,1,1,1,9,0,0
+File_0=SourceModule,'C:\Save\Delphi\resource\Component\BWTExpandUnit.pas',0,1,226,35,234,0,0
+File_1=SourceModule,'C:\Save\Delphi\resource\Component\BWTBaseUnit.pas',0,1,1,1,1,0,0
+File_2=SourceModule,'C:\Save\Delphi\resource\Component\BWTCompressUnit.pas',0,1,1,1,1,0,0
+File_3=SourceModule,'C:\Save\Delphi\resource\Archiver Demo\main.pas',0,1,1956,14,1959,1,0
+File_4=SourceModule,'C:\Save\Delphi\newr2\Component\StructsUnit.pas',0,1,1,1,7,0,0
+File_5=SourceModule,'C:\Save\Delphi\newr2\Component\StrucAriEncoderUnit.pas',0,1,1,1,9,0,0
+File_6=SourceModule,'C:\Save\Delphi\newr2\Component\StrucAriDecoderUnit.pas',0,1,1,1,9,0,0

 [Modules]
-Module0=C:\Save\Delphi\resource\Archiver Demo2\reSourceDemo2.dpr
-Count=1
+Module0=C:\Save\Delphi\resource\Archiver Demo2\Main.pas
+Module1=C:\Save\Delphi\resource\component\ArchiveManagerUnit.pas
+Module2=C:\Save\Delphi\resource\component\ResourceCompUnit.pas
+Module3=C:\Save\Delphi\resource\Archiver Demo2\reSourceDemo2.dpr
+Count=4
 EditWindowCount=1

+[C:\Save\Delphi\resource\Archiver Demo2\Main.pas]
+ModuleType=SourceModule
+FormState=1
+FormOnTop=0
+
+[C:\Save\Delphi\resource\component\ArchiveManagerUnit.pas]
+ModuleType=SourceModule
+FormState=0
+FormOnTop=0
+
+[C:\Save\Delphi\resource\component\ResourceCompUnit.pas]
+ModuleType=SourceModule
+FormState=0
+FormOnTop=0
+
 [C:\Save\Delphi\resource\Archiver Demo2\reSourceDemo2.dpr]
 ModuleType=SourceModule
 FormState=0
 FormOnTop=0

-[C:\Save\Delphi\resource\Archiver Demo2\ProjectGroup1.bpg]
+[C:\Save\Delphi\test\r1\ProjectGroup1.bpg]
 FormState=0
 FormOnTop=0

 [EditWindow0]
-ViewCount=1
-CurrentView=0
+ViewCount=4
+CurrentView=1
 View0=0
+View1=1
+View2=2
+View3=3
 CodeExplorer=CodeExplorer@EditWindow0
 MessageView=MessageView@EditWindow0
 Create=1
@@ -35,29 +53,50 @@ Visible=1
 State=2
 Left=229
 Top=232
-Width=564
+Width=795
 Height=334
 MaxLeft=-4
 MaxTop=100
-MaxWidth=808
-MaxHeight=476
-ClientWidth=800
-ClientHeight=449
+MaxWidth=1032
+MaxHeight=619
+ClientWidth=1024
+ClientHeight=592
 LeftPanelSize=0
 LeftPanelClients=CodeExplorer@EditWindow0
 LeftPanelData=00000400010000000C000000436F64654578706C6F7265720000000000000000000000000000000000FFFFFFFF
 RightPanelSize=0
-BottomPanelSize=0
+BottomPanelSize=77
 BottomPanelClients=CallStackWindow,WatchWindow,MessageView@EditWindow0
-BottomPanelData=00000400030000000F00000043616C6C537461636B57696E646F770B000000576174636857696E646F770B0000004D657373616765566965772003000000000000004D00000000000000FFFFFFFF
+BottomPanelData=00000400020000000F00000043616C6C537461636B57696E646F770B000000576174636857696E646F772003000000000000004D000000000000000100000000200300000B0000004D65737361676556696577FFFFFFFF

 [View0]
 Module=C:\Save\Delphi\resource\Archiver Demo2\reSourceDemo2.dpr
-CursorX=52
-CursorY=10
+CursorX=60
+CursorY=9
 TopLine=1
 LeftCol=1

+[View1]
+Module=C:\Save\Delphi\resource\Archiver Demo2\Main.pas
+CursorX=47
+CursorY=82
+TopLine=77
+LeftCol=1
+
+[View2]
+Module=C:\Save\Delphi\resource\component\ResourceCompUnit.pas
+CursorX=20
+CursorY=208
+TopLine=206
+LeftCol=1
+
+[View3]
+Module=C:\Save\Delphi\resource\component\ArchiveManagerUnit.pas
+CursorX=11
+CursorY=197
+TopLine=192
+LeftCol=1
+
 [Watches]
 Count=2
 Watch0='CFH.FileName',256,0,18,1,0
@@ -75,13 +114,13 @@ Visible=1
 State=2
 Left=0
 Top=28
-Width=777
+Width=1024
 Height=105
 MaxLeft=-1
 MaxTop=-1
-MaxWidth=808
+MaxWidth=1032
 MaxHeight=105
-ClientWidth=800
+ClientWidth=1024
 ClientHeight=78

 [ProjectManager]
@@ -95,7 +134,7 @@ Height=413
 MaxLeft=-1
 MaxTop=-1
 ClientWidth=440
-ClientHeight=391
+ClientHeight=389
 TBDockHeight=303
 LRDockWidth=510
 Dockable=1
@@ -124,7 +163,7 @@ State=0
 Left=50
 Top=119
 Width=156
-Height=80
+Height=82
 MaxLeft=-1
 MaxTop=-1
 ClientWidth=150
@@ -140,17 +179,16 @@ Width=236
 Height=303
 MaxLeft=-1
 MaxTop=-1
-ClientWidth=226
+ClientWidth=228
 ClientHeight=279
 TBDockHeight=494
 LRDockWidth=164
 Dockable=0
 SplitPos=108
 ArrangeBy=Name
-SelectedItem=
+SelectedItem=Caption
 ExpandedItems=BorderIcons,Brush,Dragtypes,Font.Style,Options,Pen
 HiddenCategories=Legacy
-ShowStatusBar=1

 [WatchWindow]
 Create=1
@@ -179,7 +217,7 @@ Height=197
 MaxLeft=-1
 MaxTop=-1
 ClientWidth=445
-ClientHeight=175
+ClientHeight=173
 TBDockHeight=197
 LRDockWidth=453
 Dockable=1
@@ -206,6 +244,22 @@ TBDockHeight=77
 LRDockWidth=379
 Dockable=1

+[ObjectTree]
+Create=1
+Visible=0
+State=0
+Left=0
+Top=105
+Width=190
+Height=242
+MaxLeft=-1
+MaxTop=-1
+ClientWidth=182
+ClientHeight=218
+TBDockHeight=242
+LRDockWidth=190
+Dockable=1
+
 [LocalVarsWindow]
 Create=1
 Visible=0
@@ -217,7 +271,7 @@ Height=192
 MaxLeft=-1
 MaxTop=-1
 ClientWidth=413
-ClientHeight=170
+ClientHeight=168
 TBDockHeight=192
 LRDockWidth=421
 Dockable=1
@@ -233,7 +287,7 @@ Height=250
 MaxLeft=-1
 MaxTop=-1
 ClientWidth=462
-ClientHeight=228
+ClientHeight=226
 TBDockHeight=250
 LRDockWidth=470
 Dockable=1
@@ -264,15 +318,15 @@ Dockable=1

 [MessageView@EditWindow0]
 Create=1
-Visible=0
+Visible=1
 State=0
 Left=12
 Top=0
-Width=788
+Width=1012
 Height=77
 MaxLeft=-1
 MaxTop=-1
-ClientWidth=788
+ClientWidth=1012
 ClientHeight=77
 TBDockHeight=77
 LRDockWidth=443