Skip to content

Commit 279cfe3

Browse files
delphidabblerdelphidabbler
committed
Merge branch 'develop' into belvedere
# Conflicts: # README.md - resolved using "mine", so unchanged.
2 parents dc234cd + 6dd17a4 commit 279cfe3

40 files changed

+942
-261
lines changed

‎Build.html

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,13 @@ <h2>
8787
XE. Compilation with other compilers is not guaranteed.
8888
</p>
8989

90+
<p class="note">
91+
For an explanation of why <em>CodeSnip</em> still uses Delphi XE see
92+
<a
93+
href="https://github.com/delphidabbler/codesnip-faq/blob/master/SourceCode.md#faq-11"
94+
>FAQ 11</a> of the CodeSnip Compiling &amp; Source Code FAQs.
95+
</p>
96+
9097
<p>
9198
The are currently two editions of <em>CodeSnip</em>: the standard edition and
9299
the portable edition. They both share the same code base: the different

‎CHANGELOG.md

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,22 @@ This change log begins with the first ever pre-release version of _CodeSnip_. Re
1010
1111
From v4.1.0 the version numbering has attempted to adhere to the principles of [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
1212

13+
## Release v4.20.0 of 15 May 2022
14+
15+
* Added an option to delete the user defined database.
16+
* Fixed bug that enabled the user to attempt to move, or back up, the user database when it doesn't exist. These options are now disabled when there is no user database.
17+
* Added facility to customise the size of font used in the details pane for all items except the source code font (which could already be modified separately). A new preference was added to the Display pane of the Preferences dialogue box to be used to set the font size.
18+
* Rearranged the controls on the Preferences dialogue box's Display pane.
19+
* Changed the default font used for the overview pane from a fixed value to the default size for the underlying operating system.
20+
* Changed the description of "Delphi 11 Alexandria" to "Delphi 11.x Alexandria" to reflect the fact the Delphi 11 updates have different minor version numbers, but can't be installed alongside each other.
21+
* Widened the compiler list box in the Configure Compilers dialogue box to accommodate the longer name used for Delphi 11.x compilers.
22+
* Refactored some font handling code.
23+
* Operating system detection code was updated to (a) fix some bugs and (b) detect some Dev channel builds of Windows 11.
24+
* Bumped the version of the per-user config file to 18 following the addition of a new preference.
25+
* Help file updated re the changes in this release.
26+
* Documentation updated to reflect changes in this release.
27+
* Updated `README.md` and `Build.html`
28+
1329
## Release v4.19.0 of 31 December 2021
1430

1531
* Improved user-friendliness of Preferences dialogue box:

‎Docs/Design/FileFormats/config.html

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* v. 2.0. If a copy of the MPL was not distributed with this file, You can
66
* obtain one at https://mozilla.org/MPL/2.0/
77
*
8-
* Copyright (C) 2012-2021, Peter Johnson (gravatar.com/delphidabbler).
8+
* Copyright (C) 2012-2022, Peter Johnson (gravatar.com/delphidabbler).
99
*
1010
* CodeSnip File Format Documentation: Configuration Files
1111
-->
@@ -167,7 +167,7 @@ <h3>
167167
</p>
168168

169169
<p>
170-
There have been several versions of this file. The current one is version 17. The change to version 17 came with CodeSnip v4.19.0 and the addition of the [Prefs] section.
170+
There have been several versions of this file. The current one is version 18. The change to version 18 came with CodeSnip v4.20.0 and the addition of the [Prefs] section.
171171
</p>
172172

173173
<p>
@@ -257,7 +257,7 @@ <h4>
257257
<em>D104S</em> &ndash; Delphi 10.4 Sydney
258258
</li>
259259
<li>
260-
<em>D11A</em> &ndash; Delphi 11 Alexandria
260+
<em>D11A</em> &ndash; Delphi 11.x Alexandria
261261
</li>
262262
<li>
263263
<em>FPC</em> &ndash; Free Pascal
@@ -570,7 +570,7 @@ <h4>
570570
<code class="key">D11A</code> (Boolean)
571571
</dt>
572572
<dd>
573-
Indicates whether Delphi 11 Alexandria was included in the search.
573+
Indicates whether Delphi 11.x Alexandria was included in the search.
574574
</dd>
575575
<dt>
576576
<code class="key">FPC</code> (Boolean)
@@ -917,7 +917,13 @@ <h4>
917917
<code class="key">OverviewFontSize</code> (Integer)
918918
</dt>
919919
<dd>
920-
Size of font to be used in overview pane tree view. If missing or empty the default value is <code class="value">9</code>.
920+
Size of font to be used in overview pane tree view. If missing or empty the default value is the default font size of the operationg system.
921+
</dd>
922+
<dt>
923+
<code class="key">DetailFontSize</code> (Integer)
924+
</dt>
925+
<dd>
926+
Size of font to be used in detail pane for all text except for source code. If missing or empty the default value is the default content font size of the operating system.
921927
</dd>
922928
</dl>
923929

‎Docs/Design/FileFormats/export.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* v. 2.0. If a copy of the MPL was not distributed with this file, You can
66
* obtain one at https://mozilla.org/MPL/2.0/
77
*
8-
* Copyright (C) 2012-2021, Peter Johnson (gravatar.com/delphidabbler).
8+
* Copyright (C) 2012-2022, Peter Johnson (gravatar.com/delphidabbler).
99
*
1010
* CodeSnip File Format Documentation: Export
1111
-->
@@ -597,7 +597,7 @@ <h2>
597597
<em>d104s</em> &ndash; Delphi 10.4 Sydney compiler <span class="highlight">(v7.1 &amp; later)</span>
598598
</li>
599599
<li>
600-
<em>d11a</em> &ndash; Delphi 11 Alexandria compiler <span class="highlight">(v7.2 &amp; later)</span>
600+
<em>d11a</em> &ndash; Delphi 11.x Alexandria compiler <span class="highlight">(v7.2 &amp; later)</span>
601601
</li>
602602
<li>
603603
<em>fpc</em> &ndash; Free Pascal compiler <span class="highlight">(all versions)</span>
@@ -969,7 +969,7 @@ <h2>
969969
<em>Version 7.2 - 13 September 2021</em>
970970
</dt>
971971
<dd>
972-
Updated with CodeSnip v4.18.0 to add support for Delphi 11 Alexandria.
972+
Updated with CodeSnip v4.18.0 to add support for Delphi 11.x Alexandria.
973973
</dd>
974974
</dl>
975975
</dd>

‎Docs/Design/FileFormats/main-db.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* v. 2.0. If a copy of the MPL was not distributed with this file, You can
66
* obtain one at https://mozilla.org/MPL/2.0/
77
*
8-
* Copyright (C) 2012-2021, Peter Johnson (gravatar.com/delphidabbler).
8+
* Copyright (C) 2012-2022, Peter Johnson (gravatar.com/delphidabbler).
99
*
1010
* CodeSnip File Format Documentation: Main Database
1111
-->
@@ -417,7 +417,7 @@ <h4>
417417
<code class="key">Delphi104S</code> – Delphi 10.4 Sydney compiler *
418418
</li>
419419
<li>
420-
<code class="key">Delphi11A</code> – Delphi 11 Alexandria compiler *
420+
<code class="key">Delphi11A</code> – Delphi 11.x Alexandria compiler *
421421
</li>
422422
<li>
423423
<code class="key">FPC</code> – Free Pascal compiler

‎Docs/Design/FileFormats/user-db.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* v. 2.0. If a copy of the MPL was not distributed with this file, You can
66
* obtain one at https://mozilla.org/MPL/2.0/
77
*
8-
* Copyright (C) 2012-2021, Peter Johnson (gravatar.com/delphidabbler).
8+
* Copyright (C) 2012-2022, Peter Johnson (gravatar.com/delphidabbler).
99
*
1010
* CodeSnip File Format Documentation: User Database
1111
-->
@@ -622,7 +622,7 @@ <h3 id="xml-file">
622622
<em>d104s</em> &ndash; Delphi 10.4 Sydney compiler <span class="highlight">(v6.9 &amp; later)</span>
623623
</li>
624624
<li>
625-
<em>d11a</em> &ndash; Delphi 11 Alexandria compiler <span class="highlight">(v6.10 &amp; later)</span>
625+
<em>d11a</em> &ndash; Delphi 11.x Alexandria compiler <span class="highlight">(v6.10 &amp; later)</span>
626626
</li>
627627
<li>
628628
<em>fpc</em> &ndash; Free Pascal compiler <span class="highlight">(all versions)</span>
@@ -1005,7 +1005,7 @@ <h2>
10051005
<em>Version 6.10 - 13 September 2021</em>
10061006
</dt>
10071007
<dd>
1008-
Updated with CodeSnip v4.18.0 to add support for Delphi 11 Alexandria.
1008+
Updated with CodeSnip v4.18.0 to add support for Delphi 11.x Alexandria.
10091009
</dd>
10101010
</dl>
10111011
</dd>

‎Docs/ReadMe.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ online DelphiDabbler Code Snippets database as well as maintain a database of
1414
user-defined snippets.
1515

1616
It displays details of each snippet in the database and can test-compile them
17-
with each installed Win32 version of Delphi from Delphi 2 to Delphi 11
17+
with each installed Win32 version of Delphi from Delphi 2 to Delphi 11.x
1818
Alexandria and Free Pascal.
1919

2020
Compilable Pascal units can be created that contain selected snippets.
@@ -201,7 +201,7 @@ Configuring CodeSnip to Work With Your Compilers
201201
================================================================================
202202

203203
A feature of CodeSnip is its ability to test compile snippets with any installed
204-
Windows 32 version of Delphi (from Delphi 2 to Delphi 11 Alexandria) and
204+
Windows 32 version of Delphi (from Delphi 2 to Delphi 11.x Alexandria) and
205205
FreePascal, providing some simple rules are followed.
206206

207207
When CodeSnip is first installed it knows nothing about the available compilers

0 commit comments

Comments
 (0)