Merge branch 'feature/issue#48-delphi-alexandria-name-update' into develop

delphidabbler · delphidabbler · commit 74c1ad4a8e62 · 2022-05-15T09:45:06.000+01:00
Fixes #48
diff --git a/Docs/Design/FileFormats/config.html b/Docs/Design/FileFormats/config.html
@@ -257,7 +257,7 @@ <h4>
     <em>D104S</em> &ndash; Delphi 10.4 Sydney
   </li>
   <li>
-    <em>D11A</em> &ndash; Delphi 11 Alexandria
+    <em>D11A</em> &ndash; Delphi 11.x Alexandria
   </li>
   <li>
     <em>FPC</em> &ndash; Free Pascal
@@ -570,7 +570,7 @@ <h4>
     <code class="key">D11A</code> (Boolean)
   </dt>
   <dd>
-    Indicates whether Delphi 11 Alexandria was included in the search.
+    Indicates whether Delphi 11.x Alexandria was included in the search.
   </dd>
   <dt>
     <code class="key">FPC</code> (Boolean)
diff --git a/Docs/Design/FileFormats/export.html b/Docs/Design/FileFormats/export.html
@@ -5,7 +5,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2012-2021, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2012-2022, Peter Johnson (gravatar.com/delphidabbler).
  *
  * CodeSnip File Format Documentation: Export
 -->
@@ -597,7 +597,7 @@ <h2>
             <em>d104s</em> &ndash; Delphi 10.4 Sydney compiler <span class="highlight">(v7.1 &amp; later)</span>
           </li>
           <li>
-            <em>d11a</em> &ndash; Delphi 11 Alexandria compiler <span class="highlight">(v7.2 &amp; later)</span>
+            <em>d11a</em> &ndash; Delphi 11.x Alexandria compiler <span class="highlight">(v7.2 &amp; later)</span>
           </li>
           <li>
             <em>fpc</em> &ndash; Free Pascal compiler <span class="highlight">(all versions)</span>
@@ -969,7 +969,7 @@ <h2>
         <em>Version 7.2 - 13 September 2021</em>
       </dt>
       <dd>
-        Updated with CodeSnip v4.18.0 to add support for Delphi 11 Alexandria.
+        Updated with CodeSnip v4.18.0 to add support for Delphi 11.x Alexandria.
       </dd>
     </dl>
   </dd>
diff --git a/Docs/Design/FileFormats/main-db.html b/Docs/Design/FileFormats/main-db.html
@@ -5,7 +5,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2012-2021, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2012-2022, Peter Johnson (gravatar.com/delphidabbler).
  *
  * CodeSnip File Format Documentation: Main Database
 -->
@@ -417,7 +417,7 @@ <h4>
         <code class="key">Delphi104S</code> – Delphi 10.4 Sydney compiler *
       </li>
       <li>
-        <code class="key">Delphi11A</code> – Delphi 11 Alexandria compiler *
+        <code class="key">Delphi11A</code> – Delphi 11.x Alexandria compiler *
       </li>
       <li>
         <code class="key">FPC</code> – Free Pascal compiler
diff --git a/Docs/Design/FileFormats/user-db.html b/Docs/Design/FileFormats/user-db.html
@@ -5,7 +5,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2012-2021, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2012-2022, Peter Johnson (gravatar.com/delphidabbler).
  *
  * CodeSnip File Format Documentation: User Database
 -->
@@ -622,7 +622,7 @@ <h3 id="xml-file">
             <em>d104s</em> &ndash; Delphi 10.4 Sydney compiler <span class="highlight">(v6.9 &amp; later)</span>
           </li>
           <li>
-            <em>d11a</em> &ndash; Delphi 11 Alexandria compiler <span class="highlight">(v6.10 &amp; later)</span>
+            <em>d11a</em> &ndash; Delphi 11.x Alexandria compiler <span class="highlight">(v6.10 &amp; later)</span>
           </li>
           <li>
             <em>fpc</em> &ndash; Free Pascal compiler <span class="highlight">(all versions)</span>
@@ -1005,7 +1005,7 @@ <h2>
         <em>Version 6.10 - 13 September 2021</em>
       </dt>
       <dd>
-        Updated with CodeSnip v4.18.0 to add support for Delphi 11 Alexandria.
+        Updated with CodeSnip v4.18.0 to add support for Delphi 11.x Alexandria.
       </dd>
     </dl>
   </dd>
diff --git a/Docs/ReadMe.txt b/Docs/ReadMe.txt
@@ -14,7 +14,7 @@ online DelphiDabbler Code Snippets database as well as maintain a database of
 user-defined snippets.
 
 It displays details of each snippet in the database and can test-compile them
-with each installed Win32 version of Delphi from Delphi 2 to Delphi 11
+with each installed Win32 version of Delphi from Delphi 2 to Delphi 11.x
 Alexandria and Free Pascal.
 
 Compilable Pascal units can be created that contain selected snippets.
@@ -201,7 +201,7 @@ Configuring CodeSnip to Work With Your Compilers
 ================================================================================
 
 A feature of CodeSnip is its ability to test compile snippets with any installed
-Windows 32 version of Delphi (from Delphi 2 to Delphi 11 Alexandria) and
+Windows 32 version of Delphi (from Delphi 2 to Delphi 11.x Alexandria) and
 FreePascal, providing some simple rules are followed.
 
 When CodeSnip is first installed it knows nothing about the available compilers
diff --git a/Src/Compilers.UBDS.pas b/Src/Compilers.UBDS.pas
@@ -3,7 +3,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2006-2021, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2006-2022, Peter Johnson (gravatar.com/delphidabbler).
  *
  * Class that controls and provides information about Borland CodeGear and
  * Embarcadero "BDS" Win32 compilers.
@@ -175,7 +175,7 @@ function TBDSCompiler.GetName: string;
   sDelphi102T = 'Delphi 10.2 Tokyo';
   sDelphi103R = 'Delphi 10.3 Rio';
   sDelphi104S = 'Delphi 10.4 Sydney';
-  sDelphi11A =  'Delphi 11 Alexandria';
+  sDelphi11A =  'Delphi 11.x Alexandria';
 begin
   case GetID of
     ciDXE:
diff --git a/Src/Compilers.UGlobals.pas b/Src/Compilers.UGlobals.pas
@@ -3,7 +3,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2005-2021, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2005-2022, Peter Johnson (gravatar.com/delphidabbler).
  *
  * Declares various types that describe the compiler and compilation results and
  * defines interfaces to compiler objects.
@@ -43,7 +43,7 @@ interface
     ciD102T,                            // Delphi 10.2 Tokyo
     ciD103R,                            // Delphi 10.3 Rio
     ciD104S,                            // Delphi 10.4 Sydney,
-    ciD11A,                             // Delphi 11 Alexandria
+    ciD11A,                             // Delphi 11.x Alexandria
     ciFPC                               // Free Pascal
   );
 
diff --git a/Src/FmCompilersDlg.dfm b/Src/FmCompilersDlg.dfm
@@ -1,16 +1,16 @@
 inherited CompilersDlg: TCompilersDlg
   Caption = 'Configure Compilers'
   ClientHeight = 381
-  ClientWidth = 547
-  ExplicitWidth = 553
+  ClientWidth = 588
+  ExplicitWidth = 594
   ExplicitHeight = 410
   PixelsPerInch = 96
   TextHeight = 13
   inherited pnlBody: TPanel
-    Width = 531
-    ExplicitWidth = 531
+    Width = 539
+    ExplicitWidth = 539
     object pbBanner: TPaintBox
-      Left = 161
+      Left = 169
       Top = 0
       Width = 370
       Height = 23
@@ -26,7 +26,7 @@ inherited CompilersDlg: TCompilersDlg
     object lbCompilers: TListBox
       Left = 0
       Top = 0
-      Width = 155
+      Width = 163
       Height = 292
       Style = lbOwnerDrawFixed
       Ctl3D = True
@@ -36,7 +36,7 @@ inherited CompilersDlg: TCompilersDlg
       TabOrder = 0
     end
     object pcCompiler: TPageControl
-      Left = 161
+      Left = 169
       Top = 29
       Width = 370
       Height = 263
@@ -52,8 +52,6 @@ inherited CompilersDlg: TCompilersDlg
           Height = 235
           Align = alClient
           TabOrder = 0
-          ExplicitLeft = -4
-          ExplicitTop = 2
         end
       end
       object tsSwitches: TTabSheet
diff --git a/Src/FrCodeGenPrefs.pas b/Src/FrCodeGenPrefs.pas
@@ -3,7 +3,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2010-2021, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2010-2022, Peter Johnson (gravatar.com/delphidabbler).
  *
  * Implements a frame that allows user to set source code generation
  * preferences.
@@ -685,7 +685,7 @@ procedure TCodeGenPrefsFrame.PopulatePreDefCompilerMenu;
   AddMenuItem('Delphi 10.2 Tokyo', 32.0);
   AddMenuItem('Delphi 10.3 Rio', 33.0);
   AddMenuItem('Delphi 10.4 Sydney', 34.0);
-  AddMenuItem('Delphi 11 Alexandria', 35.0);
+  AddMenuItem('Delphi 11.x Alexandria', 35.0);
 end;
 
 procedure TCodeGenPrefsFrame.PreDefCompilerMenuClick(Sender: TObject);
diff --git a/Src/Help/HTML/about_compiler_checks.htm b/Src/Help/HTML/about_compiler_checks.htm
@@ -4,7 +4,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2005-2021, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2005-2022, Peter Johnson (gravatar.com/delphidabbler).
  *
  * Help topic explaining compiler checks.
 -->
@@ -34,7 +34,7 @@ <h1>
     </p>
     <p>
       The supported compilers are the Win32 Delphi compilers from Delphi 2 to
-      Delphi 11 Alexandria and Free Pascal.
+      Delphi 11.x Alexandria and Free Pascal.
     </p>
     <h2>
       Configuring CodeSnip
diff --git a/Src/Help/HTML/dlg_configcompilers.htm b/Src/Help/HTML/dlg_configcompilers.htm
@@ -4,7 +4,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2005-2021, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2005-2022, Peter Johnson (gravatar.com/delphidabbler).
  *
  * Help topic for Configure Compilers dialogue box.
 -->
@@ -281,7 +281,7 @@ <h2>
     </h2>
     <p>
       <em>CodeSnip</em> can automatically detect the presence of Win 32 Delphi
-      compilers from Delphi 2 to Delphi 11 Alexandria. Click the <em>Detect
+      compilers from Delphi 2 to Delphi 11.x Alexandria. Click the <em>Detect
       Delphi Compilers</em> button to do this. Any supported installed version
       of Delphi will be recorded. This can save considerable time and avoid
       errors.
