Skip to content

Commit 63e73ef

Browse files
René HoffmannRené Hoffmann
René Hoffmann
authored and
René Hoffmann
committed
Merge branch 'origin/V7_stable' into refix-725
2 parents 8df8d69 + 49c9364 commit 63e73ef

File tree

96 files changed

+19197
-18366
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

96 files changed

+19197
-18366
lines changed

‎.gitignore‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@
99
*.rsm
1010
*.stat
1111
*.map
12+
*.d
13+
*.o
1214

1315
# Generated source #
1416
###################
@@ -42,3 +44,11 @@
4244
VirtualTreeView.zip
4345
*.#00
4446
*.pch
47+
*.skincfg
48+
*.a
49+
Packages/RAD Studio XE3/VirtualTreesR.lib
50+
*.lib
51+
52+
# Folder with repro projects #
53+
##############################
54+
/#*

‎CHANGES.txt‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
1-
V7.0: (22 Jul 2018)
1+
V7.x:
2+
https://github.com/JAM-Software/Virtual-TreeView/milestones?state=closed
3+
4+
V7.0: (22 Jul 2018)
25
* The support for Windows XP/2003 has been dropped (issue #707). This means:
36
- We did not intentionally break XP support.
47
- We do no longer test on Windows XP/2003

‎Delphinus.Install.json‎

Lines changed: 55 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -1,63 +1,56 @@
11
{
2-
"search_pathes":
3-
[
4-
{
5-
"pathes": "Source",
6-
"platforms": "Win32;Win64"
7-
}
8-
],
9-
10-
"browsing_pathes":
11-
[
12-
{
13-
"pathes": "Source",
14-
"platforms": "Win32;Win64"
15-
}
16-
],
17-
18-
"source_folders":
19-
[
20-
{
21-
"folder": "source",
22-
"base": "",
23-
"recursive": true,
24-
"filter": "*;*.*"
25-
},
26-
{
27-
"folder": "Packages",
28-
"base": "",
29-
"recursive": true,
30-
"filter": "*;*.*"
31-
},
32-
{
33-
"folder": "Design",
34-
"base": "",
35-
"recursive": true,
36-
"filter": "*;*.*"
37-
}
38-
],
39-
40-
"projects":
41-
[
42-
{
43-
"project": "Packages\\RAD Studio XE3\\VirtualTreeView.groupproj"
44-
"compiler_max": 26
45-
},
46-
{
47-
"project": "Packages\\RAD Studio XE6\\VirtualTreeView.groupproj"
48-
"compiler": 27
49-
},
50-
{
51-
"project": "Packages\\RAD Studio XE7\\VirtualTreeView.groupproj"
52-
"compiler": 28
53-
},
54-
{
55-
"project": "Packages\\RAD Studio XE8\\VirtualTreeView.groupproj"
56-
"compiler": 29
57-
},
58-
{
59-
"project": "Packages\\RAD Studio 10\\VirtualTreeView.groupproj"
60-
"compiler_min": 30
61-
}
62-
]
63-
}
2+
"search_pathes": [
3+
{
4+
"pathes": "Source",
5+
"platforms": "Win32;Win64"
6+
}
7+
],
8+
"browsing_pathes": [
9+
{
10+
"pathes": "Source",
11+
"platforms": "Win32;Win64"
12+
}
13+
],
14+
"source_folders": [
15+
{
16+
"folder": "source",
17+
"base": "",
18+
"recursive": true,
19+
"filter": "*;*.*"
20+
},
21+
{
22+
"folder": "Packages",
23+
"base": "",
24+
"recursive": true,
25+
"filter": "*;*.*"
26+
},
27+
{
28+
"folder": "Design",
29+
"base": "",
30+
"recursive": true,
31+
"filter": "*;*.*"
32+
}
33+
],
34+
"projects": [
35+
{
36+
"project": "Packages\\RAD Studio XE3\\VirtualTreeView.groupproj",
37+
"compiler_max": 26
38+
},
39+
{
40+
"project": "Packages\\RAD Studio XE6\\VirtualTreeView.groupproj",
41+
"compiler": 27
42+
},
43+
{
44+
"project": "Packages\\RAD Studio XE7\\VirtualTreeView.groupproj",
45+
"compiler": 28
46+
},
47+
{
48+
"project": "Packages\\RAD Studio XE8\\VirtualTreeView.groupproj",
49+
"compiler": 29
50+
},
51+
{
52+
"project": "Packages\\RAD Studio 10\\VirtualTreeView.groupproj",
53+
"compiler_min": 30
54+
}
55+
]
56+
}

‎Demos/Advanced/Advanced.dproj‎

Lines changed: 39 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
22
<PropertyGroup>
3-
<ProjectGuid>{E5FD8257-AE07-4A8D-AB79-44170493F9A2}</ProjectGuid>
4-
<MainSource>Advanced.dpr</MainSource>
53
<Base>True</Base>
6-
<Config Condition="'$(Config)'==''">Debug</Config>
7-
<TargetedPlatforms>1</TargetedPlatforms>
84
<AppType>Application</AppType>
5+
<Config Condition="'$(Config)'==''">Debug</Config>
96
<FrameworkType>VCL</FrameworkType>
10-
<ProjectVersion>17.2</ProjectVersion>
7+
<MainSource>Advanced.dpr</MainSource>
118
<Platform Condition="'$(Platform)'==''">Win32</Platform>
9+
<ProjectGuid>{E5FD8257-AE07-4A8D-AB79-44170493F9A2}</ProjectGuid>
10+
<ProjectVersion>19.5</ProjectVersion>
11+
<TargetedPlatforms>1</TargetedPlatforms>
1212
</PropertyGroup>
1313
<PropertyGroup Condition="'$(Config)'=='Base' or '$(Base)'!=''">
1414
<Base>true</Base>
@@ -18,11 +18,6 @@
1818
<CfgParent>Base</CfgParent>
1919
<Base>true</Base>
2020
</PropertyGroup>
21-
<PropertyGroup Condition="('$(Platform)'=='Win64' and '$(Base)'=='true') or '$(Base_Win64)'!=''">
22-
<Base_Win64>true</Base_Win64>
23-
<CfgParent>Base</CfgParent>
24-
<Base>true</Base>
25-
</PropertyGroup>
2621
<PropertyGroup Condition="'$(Config)'=='Release' or '$(Cfg_1)'!=''">
2722
<Cfg_1>true</Cfg_1>
2823
<CfgParent>Base</CfgParent>
@@ -33,42 +28,51 @@
3328
<CfgParent>Base</CfgParent>
3429
<Base>true</Base>
3530
</PropertyGroup>
31+
<PropertyGroup Condition="('$(Platform)'=='Win32' and '$(Cfg_2)'=='true') or '$(Cfg_2_Win32)'!=''">
32+
<Cfg_2_Win32>true</Cfg_2_Win32>
33+
<CfgParent>Cfg_2</CfgParent>
34+
<Cfg_2>true</Cfg_2>
35+
<Base>true</Base>
36+
</PropertyGroup>
3637
<PropertyGroup Condition="'$(Base)'!=''">
3738
<SanitizedProjectName>Advanced</SanitizedProjectName>
38-
<DCC_F>false</DCC_F>
39-
<DCC_RangeChecking>true</DCC_RangeChecking>
40-
<VerInfo_Keys>FileVersion=1.0.0.0</VerInfo_Keys>
41-
<VerInfo_Locale>1031</VerInfo_Locale>
42-
<DCC_E>false</DCC_E>
43-
<DCC_UsePackage>C:\windows\microsoft.net\framework\v1.1.4322\system.dll;C:\windows\microsoft.net\framework\v1.1.4322\system.data.dll;C:\windows\microsoft.net\framework\v1.1.4322\system.drawing.dll;C:\windows\microsoft.net\framework\v1.1.4322\system.windows.forms.dll;C:\windows\microsoft.net\framework\v1.1.4322\system.xml.dll;vcl;rtl;$(DCC_UsePackage)</DCC_UsePackage>
44-
<DCC_MinStackSize>4096</DCC_MinStackSize>
45-
<DCC_IntegerOverflowCheck>true</DCC_IntegerOverflowCheck>
4639
<DCC_ImageBase>00400000</DCC_ImageBase>
47-
<DCC_N>true</DCC_N>
48-
<DCC_K>false</DCC_K>
40+
<DCC_IntegerOverflowCheck>true</DCC_IntegerOverflowCheck>
41+
<DCC_MinStackSize>4096</DCC_MinStackSize>
4942
<DCC_Namespace>Vcl;Vcl.Imaging;Vcl.Touch;Vcl.Samples;Vcl.Shell;System;Xml;Data;Datasnap;Web;Soap;Winapi;$(DCC_Namespace)</DCC_Namespace>
50-
<DCC_S>false</DCC_S>
5143
<DCC_Optimize>false</DCC_Optimize>
44+
<DCC_RangeChecking>true</DCC_RangeChecking>
5245
<DCC_UnitSearchPath>..\..\Source;..\..\Common;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
46+
<DCC_UsePackage>C:\windows\microsoft.net\framework\v1.1.4322\system.dll;C:\windows\microsoft.net\framework\v1.1.4322\system.data.dll;C:\windows\microsoft.net\framework\v1.1.4322\system.drawing.dll;C:\windows\microsoft.net\framework\v1.1.4322\system.windows.forms.dll;C:\windows\microsoft.net\framework\v1.1.4322\system.xml.dll;vcl;rtl;$(DCC_UsePackage)</DCC_UsePackage>
47+
<VerInfo_Keys>FileVersion=1.0.0.0</VerInfo_Keys>
48+
<VerInfo_Locale>1031</VerInfo_Locale>
5349
</PropertyGroup>
5450
<PropertyGroup Condition="'$(Base_Win32)'!=''">
55-
<VerInfo_Locale>1033</VerInfo_Locale>
56-
<VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
51+
<AppEnableRuntimeThemes>true</AppEnableRuntimeThemes>
5752
<DCC_Namespace>System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace)</DCC_Namespace>
5853
<Manifest_File>$(BDS)\bin\default_app.manifest</Manifest_File>
59-
<VerInfo_Keys>CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=</VerInfo_Keys>
60-
</PropertyGroup>
61-
<PropertyGroup Condition="'$(Base_Win64)'!=''">
62-
<Icon_MainIcon>Advanced_Icon.ico</Icon_MainIcon>
54+
<UWP_DelphiLogo150>$(BDS)\bin\Artwork\Windows\UWP\delphi_UwpDefault_150.png</UWP_DelphiLogo150>
55+
<UWP_DelphiLogo44>$(BDS)\bin\Artwork\Windows\UWP\delphi_UwpDefault_44.png</UWP_DelphiLogo44>
56+
<VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
57+
<VerInfo_Keys>CompanyName=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductVersion=1.0.0.0;Comments=;ProgramID=com.embarcadero.$(MSBuildProjectName);FileDescription=$(MSBuildProjectName);ProductName=$(MSBuildProjectName)</VerInfo_Keys>
58+
<VerInfo_Locale>1033</VerInfo_Locale>
6359
</PropertyGroup>
6460
<PropertyGroup Condition="'$(Cfg_1)'!=''">
65-
<DCC_SymbolReferenceInfo>0</DCC_SymbolReferenceInfo>
66-
<DCC_LocalDebugSymbols>false</DCC_LocalDebugSymbols>
6761
<DCC_Define>RELEASE;$(DCC_Define)</DCC_Define>
62+
<DCC_LocalDebugSymbols>false</DCC_LocalDebugSymbols>
63+
<DCC_SymbolReferenceInfo>0</DCC_SymbolReferenceInfo>
6864
</PropertyGroup>
6965
<PropertyGroup Condition="'$(Cfg_2)'!=''">
70-
<DCC_GenerateStackFrames>true</DCC_GenerateStackFrames>
7166
<DCC_Define>DEBUG;$(DCC_Define)</DCC_Define>
67+
<DCC_GenerateStackFrames>true</DCC_GenerateStackFrames>
68+
</PropertyGroup>
69+
<PropertyGroup Condition="'$(Cfg_2_Win32)'!=''">
70+
<AppDPIAwarenessMode>PerMonitorV2</AppDPIAwarenessMode>
71+
<AppEnableRuntimeThemes>true</AppEnableRuntimeThemes>
72+
<BT_BuildType>Debug</BT_BuildType>
73+
<VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
74+
<VerInfo_Keys>CompanyName=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductVersion=1.0.0.0;Comments=;ProgramID=com.embarcadero.$(MSBuildProjectName);FileDescription=$(MSBuildProjectName);ProductName=$(MSBuildProjectName)</VerInfo_Keys>
75+
<VerInfo_Locale>1033</VerInfo_Locale>
7276
</PropertyGroup>
7377
<ItemGroup>
7478
<DelphiCompile Include="$(MainSource)">
@@ -114,17 +118,17 @@
114118
<DCCReference Include="States.pas">
115119
<Form>StateForm</Form>
116120
</DCCReference>
117-
<BuildConfiguration Include="Debug">
118-
<Key>Cfg_2</Key>
119-
<CfgParent>Base</CfgParent>
120-
</BuildConfiguration>
121121
<BuildConfiguration Include="Base">
122122
<Key>Base</Key>
123123
</BuildConfiguration>
124124
<BuildConfiguration Include="Release">
125125
<Key>Cfg_1</Key>
126126
<CfgParent>Base</CfgParent>
127127
</BuildConfiguration>
128+
<BuildConfiguration Include="Debug">
129+
<Key>Cfg_2</Key>
130+
<CfgParent>Base</CfgParent>
131+
</BuildConfiguration>
128132
</ItemGroup>
129133
<ProjectExtensions>
130134
<Borland.Personality>Delphi.Personality.12</Borland.Personality>
@@ -134,6 +138,7 @@
134138
<Source>
135139
<Source Name="MainSource">Advanced.dpr</Source>
136140
</Source>
141+
<Excluded_Packages/>
137142
<VersionInfo>
138143
<VersionInfo Name="IncludeVerInfo">False</VersionInfo>
139144
<VersionInfo Name="AutoIncBuild">False</VersionInfo>

‎Demos/Advanced/Advanced.dsv‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
[ClosedView_RDpcUHJvamVjdHNcVmlydHVhbC1UcmVlVmlld1xTb3VyY2VcVmlydHVhbFRyZWVzLnBhcw==]
2+
Module=D:\Projects\Virtual-TreeView\Source\VirtualTrees.pas
3+
CursorX=42
4+
CursorY=667
5+
TopLine=611
6+
LeftCol=1
7+
Elisions=
8+
Bookmarks=
9+
EditViewName=D:\Projects\Virtual-TreeView\Source\VirtualTrees.pas
10+

0 commit comments

Comments
 (0)