Skip to content

Commit 1f6ede2

Browse files
author
Markus Humm
committed
Merge branch 'development'
# Conflicts: # Demos/Hash_FMX/Hash_FMX.deployproj # Unit Tests/DECDUnitXTestSuite.dproj.local
2 parents ef7a0c7 + 908eea8 commit 1f6ede2

File tree

95 files changed

+2194
-239
lines changed

Some content is hidden

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

95 files changed

+2194
-239
lines changed

‎Demos/Cipher_Console/Cipher_Console.dproj‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
22
<PropertyGroup>
33
<ProjectGuid>{BC13B21E-5E59-450C-A11D-EA58C8E05628}</ProjectGuid>
4-
<ProjectVersion>19.1</ProjectVersion>
4+
<ProjectVersion>19.2</ProjectVersion>
55
<FrameworkType>None</FrameworkType>
66
<MainSource>Cipher_Console.dpr</MainSource>
77
<Base>True</Base>
@@ -160,6 +160,12 @@
160160
</Source>
161161
</Delphi.Personality>
162162
<Deployment Version="3">
163+
<DeployFile LocalName="..\..\Compiled\BIN_IDExx.x_Win32__Demos\Cipher_Console.exe" Configuration="Debug" Class="ProjectOutput">
164+
<Platform Name="Win32">
165+
<RemoteName>Cipher_Console.exe</RemoteName>
166+
<Overwrite>true</Overwrite>
167+
</Platform>
168+
</DeployFile>
163169
<DeployFile LocalName="$(BDS)\Redist\osx32\libcgunwind.1.0.dylib" Class="DependencyModule">
164170
<Platform Name="OSX32">
165171
<Overwrite>true</Overwrite>
@@ -190,12 +196,6 @@
190196
<Overwrite>true</Overwrite>
191197
</Platform>
192198
</DeployFile>
193-
<DeployFile LocalName="..\..\Compiled\BIN_IDExx.x_Win32__Demos\Cipher_Console.exe" Configuration="Debug" Class="ProjectOutput">
194-
<Platform Name="Win32">
195-
<RemoteName>Cipher_Console.exe</RemoteName>
196-
<Overwrite>true</Overwrite>
197-
</Platform>
198-
</DeployFile>
199199
<DeployClass Name="AdditionalDebugSymbols">
200200
<Platform Name="iOSSimulator">
201201
<Operation>1</Operation>

‎Demos/Cipher_FMX/Cipher_FMX.deployproj‎

Lines changed: 210 additions & 44 deletions
Large diffs are not rendered by default.

‎Demos/Cipher_FMX/Cipher_FMX.dproj‎

Lines changed: 174 additions & 46 deletions
Large diffs are not rendered by default.

‎Demos/Cipher_FMX/Cipher_FMX.res‎

-110 KB
Binary file not shown.

‎Demos/Cipher_FMX/CryptoIcon_192.png‎

31.3 KB
Loading

‎Demos/Cipher_FMX/MainForm.fmx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ object FormMain: TFormMain
1818
Size.PlatformDefault = False
1919
StyleLookup = 'scrollboxstyle'
2020
TabOrder = 0
21-
Viewport.Width = 409.000000000000000000
21+
Viewport.Width = 425.000000000000000000
2222
Viewport.Height = 711.000000000000000000
2323
object LayoutTop: TLayout
2424
Size.Width = 425.000000000000000000
@@ -209,8 +209,8 @@ object FormMain: TFormMain
209209
Size.PlatformDefault = False
210210
StyleLookup = 'gridstyle'
211211
TabOrder = 8
212-
Viewport.Width = 365.000000000000000000
213-
Viewport.Height = 75.000000000000000000
212+
Viewport.Width = 385.000000000000000000
213+
Viewport.Height = 100.000000000000000000
214214
object StringColumn1: TStringColumn
215215
Header = 'Property'
216216
Size.Width = 250.000000000000000000

‎Demos/Cipher_FMX/MainForm.pas‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ TFormMain = class(TForm)
7777
end;
7878

7979
var
80-
FormMain: TMainForm;
80+
FormMain: TFormMain;
8181

8282
implementation
8383

‎Demos/Format_Console/Format_Console.dproj‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
22
<PropertyGroup>
33
<ProjectGuid>{A36C5DFF-C1BF-493E-93AC-4D6170321A4C}</ProjectGuid>
4-
<ProjectVersion>19.1</ProjectVersion>
4+
<ProjectVersion>19.2</ProjectVersion>
55
<FrameworkType>None</FrameworkType>
66
<MainSource>Format_Console.dpr</MainSource>
77
<Base>True</Base>
@@ -165,14 +165,14 @@
165165
<Overwrite>true</Overwrite>
166166
</Platform>
167167
</DeployFile>
168-
<DeployFile LocalName="..\..\Compiled\BIN_IDExx.x_Win32__Demos\Format_Console.exe" Configuration="Debug" Class="ProjectOutput">
169-
<Platform Name="Win32">
170-
<RemoteName>Format_Console.exe</RemoteName>
168+
<DeployFile LocalName="$(BDS)\Redist\osx64\libcgsqlite3.dylib" Class="DependencyModule">
169+
<Platform Name="OSX64">
171170
<Overwrite>true</Overwrite>
172171
</Platform>
173172
</DeployFile>
174-
<DeployFile LocalName="$(BDS)\Redist\osx64\libcgsqlite3.dylib" Class="DependencyModule">
175-
<Platform Name="OSX64">
173+
<DeployFile LocalName="..\..\Compiled\BIN_IDExx.x_Win32__Demos\Format_Console.exe" Configuration="Debug" Class="ProjectOutput">
174+
<Platform Name="Win32">
175+
<RemoteName>Format_Console.exe</RemoteName>
176176
<Overwrite>true</Overwrite>
177177
</Platform>
178178
</DeployFile>

‎Demos/Hash_Console/Hash_Console.dproj‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
22
<PropertyGroup>
33
<ProjectGuid>{3617401D-D6AC-4F43-9D1D-B217C40C973D}</ProjectGuid>
4-
<ProjectVersion>19.1</ProjectVersion>
4+
<ProjectVersion>19.2</ProjectVersion>
55
<FrameworkType>None</FrameworkType>
66
<MainSource>Hash_Console.dpr</MainSource>
77
<Base>True</Base>
@@ -165,12 +165,6 @@
165165
<Overwrite>true</Overwrite>
166166
</Platform>
167167
</DeployFile>
168-
<DeployFile LocalName="..\..\Compiled\BIN_IDExx.x_Win32__Demos\Hash_Console.exe" Configuration="Debug" Class="ProjectOutput">
169-
<Platform Name="Win32">
170-
<RemoteName>Hash_Console.exe</RemoteName>
171-
<Overwrite>true</Overwrite>
172-
</Platform>
173-
</DeployFile>
174168
<DeployFile LocalName="$(BDS)\Redist\osx64\libcgsqlite3.dylib" Class="DependencyModule">
175169
<Platform Name="OSX64">
176170
<Overwrite>true</Overwrite>
@@ -181,6 +175,12 @@
181175
<Overwrite>true</Overwrite>
182176
</Platform>
183177
</DeployFile>
178+
<DeployFile LocalName="..\..\Compiled\BIN_IDExx.x_Win32__Demos\Hash_Console.exe" Configuration="Debug" Class="ProjectOutput">
179+
<Platform Name="Win32">
180+
<RemoteName>Hash_Console.exe</RemoteName>
181+
<Overwrite>true</Overwrite>
182+
</Platform>
183+
</DeployFile>
184184
<DeployFile LocalName="$(BDS)\Redist\iossimulator\libcgunwind.1.0.dylib" Class="DependencyModule">
185185
<Platform Name="iOSSimulator">
186186
<Overwrite>true</Overwrite>

‎Demos/Hash_FMX/AndroidManifest.template.xml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@
66
android:versionName="%versionName%"
77
android:installLocation="%installLocation%">
88

9-
<uses-sdk android:minSdkVersion="%minSdkVersion%" android:targetSdkVersion="%targetSdkVersion%" />
9+
<uses-sdk android:minSdkVersion="19" android:targetSdkVersion="%targetSdkVersion%" />
10+
<!--<uses-sdk android:minSdkVersion="%minSdkVersion%" android:targetSdkVersion="%targetSdkVersion%" /> -->
1011
<%uses-permission%>
1112
<uses-feature android:glEsVersion="0x00020000" android:required="True"/>
1213
<application android:persistent="%persistent%"

0 commit comments

Comments
 (0)