Thread: [GExperts-Checkins] SF.net SVN: gexperts:[4096] branches/dark-mode

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 454-5900

Revision: 4096
          http://sourceforge.net/p/gexperts/code/4096
Author:   akalwahome
Date:     2023-11-11 16:53:39 +0000 (Sat, 11 Nov 2023)
Log Message:
-----------
Merged with trunk

Modified Paths:
--------------
    branches/dark-mode/BuildInstall/GExperts.iss
    branches/dark-mode/BuildInstall/MakeInstallers.cmd
    branches/dark-mode/BuildTools/doGetDelphiPath.cmd
    branches/dark-mode/Documentation/License.txt
    branches/dark-mode/ExternalSource/Abbrevia/AbDfEnc.pas
    branches/dark-mode/ExternalSource/dzlib/u_dzCompilerAndRtlVersions.pas
    branches/dark-mode/Projects/DelphiXx110Alexandria/GExpertsRS110.dpr
    branches/dark-mode/Projects/DelphiXx120/GExpertsRS120.dpr
    branches/dark-mode/Projects/DelphiXx120/GExpertsRS120.dproj
    branches/dark-mode/Source/Editor/GX_eIfDef.pas
    branches/dark-mode/Source/FavoriteFiles/GX_FavFiles.pas
    branches/dark-mode/Source/Framework/GX_GetIdeVersion.pas
    branches/dark-mode/Source/Framework/GX_VerDepConst.pas

Added Paths:
-----------
    branches/dark-mode/Projects/DelphiXx110Alexandria/GExperts_manifest.res

Property Changed:
----------------
    branches/dark-mode/
    branches/dark-mode/Projects/DelphiXx120/
    branches/dark-mode/Projects/DelphiXx120/dcu/Win32/Debug/
    branches/dark-mode/Projects/DelphiXx120/dcu/Win32/Release/

Index: branches/dark-mode
===================================================================

--- branches/dark-mode	2023-11-08 20:30:54 UTC (rev 4095)
+++ branches/dark-mode	2023-11-11 16:53:39 UTC (rev 4096)

Property changes on: branches/dark-mode
___________________________________________________________________
Added: svn:mergeinfo
## -0,0 +1 ##
+/trunk:4085-4095
\ No newline at end of property
Modified: branches/dark-mode/BuildInstall/GExperts.iss
===================================================================
--- branches/dark-mode/BuildInstall/GExperts.iss	2023-11-08 20:30:54 UTC (rev 4095)
+++ branches/dark-mode/BuildInstall/GExperts.iss	2023-11-11 16:53:39 UTC (rev 4096)
@@ -202,6 +202,14 @@
   #define IDERegName   "BDS"
   #define IDERegVer    "22"
 #endif
+#ifdef RS120
+  #define IDEShortName "RADStudio"
+  #define IDELongName  "RAD Studio"
+  #define IDEVer       "12"
+  #define DLLSuffix    "RS120"
+  #define IDERegName   "BDS"
+  #define IDERegVer    "23"
+#endif
 
 #ifndef IDEShortName
   #error Usage: "isppcc.exe GExperts.iss /dDelphi7 /dVersion=1.38"

Modified: branches/dark-mode/BuildInstall/MakeInstallers.cmd
===================================================================
--- branches/dark-mode/BuildInstall/MakeInstallers.cmd	2023-11-08 20:30:54 UTC (rev 4095)
+++ branches/dark-mode/BuildInstall/MakeInstallers.cmd	2023-11-11 16:53:39 UTC (rev 4096)
@@ -14,7 +14,7 @@
 call :getdate
 set special=%dateYYYYMMDD%
 
-rem call :makeinst RS103 RS10.3
+rem call :makeinst RS120 RS12
 rem pause
 rem goto :eof
 
@@ -39,6 +39,7 @@
 call :makeinst RS103 RS10.3
 call :makeinst RS104 RS10.4
 call :makeinst RS110 RS11
+call :makeinst RS120 RS12
 goto :eof
 
 :makeinst

Modified: branches/dark-mode/BuildTools/doGetDelphiPath.cmd
===================================================================
--- branches/dark-mode/BuildTools/doGetDelphiPath.cmd	2023-11-08 20:30:54 UTC (rev 4095)
+++ branches/dark-mode/BuildTools/doGetDelphiPath.cmd	2023-11-11 16:53:39 UTC (rev 4096)
@@ -118,6 +118,12 @@
 :DelphiXX110Alexandria
   call :ReadReg Embarcadero\BDS\22.0
   goto :DelphiEndCase
+:Delphi12
+:Delphi120
+:DelphiXX12
+:DelphiXX120
+  call :ReadReg Embarcadero\BDS\23.0
+  goto :DelphiEndCase
 :DelphiEndCase
 
 echo DelphiPath: "%DelphiPath%"

Modified: branches/dark-mode/Documentation/License.txt
===================================================================
--- branches/dark-mode/Documentation/License.txt	2023-11-08 20:30:54 UTC (rev 4095)
+++ branches/dark-mode/Documentation/License.txt	2023-11-11 16:53:39 UTC (rev 4096)
@@ -1,6 +1,6 @@
 GExperts License Agreement
 
-  GExperts is copyright 1996-2021 by Thomas Mueller, Erik Berry and the GExperts development team.  This license agreement only covers code written by Erik Berry and the rest of the GExperts development team who have specifically submitted their code for inclusion with GExperts.  You should contact the other third-party authors concerning their respective copyrights and conditions.
+  GExperts is copyright 1996-2023 by Thomas Mueller, Erik Berry and the GExperts development team.  This license agreement only covers code written by Erik Berry and the rest of the GExperts development team who have specifically submitted their code for inclusion with GExperts.  You should contact the other third-party authors concerning their respective copyrights and conditions.
 
   The rules governing the use of GExperts and the GExperts source code are derived from the official Open Source Definition, available at http://www.opensource.org.  The conditions and limitations are as follows:
 

Modified: branches/dark-mode/ExternalSource/Abbrevia/AbDfEnc.pas
===================================================================
--- branches/dark-mode/ExternalSource/Abbrevia/AbDfEnc.pas	2023-11-08 20:30:54 UTC (rev 4095)
+++ branches/dark-mode/ExternalSource/Abbrevia/AbDfEnc.pas	2023-11-11 16:53:39 UTC (rev 4096)
@@ -812,7 +812,7 @@
     {$IFNDEF VER330} // Delphi 10.3 Tokyo / BDS 20 does not need this
     {$IFNDEF VER340} // Delphi 10.4 Sydney / BDS 21 does not need this
     {$IFNDEF VER350} // Delphi 11 Alexandria / BDS 22 does not need this
-    {$IFNDEF VER360} // Delphi 12 Yukon / BDS 23 does not need this
+    {$IFNDEF VER360} // Delphi 12 Athens / BDS 23 does not need this
   Result := 0;
     {$ENDIF}
     {$ENDIF}

Modified: branches/dark-mode/ExternalSource/dzlib/u_dzCompilerAndRtlVersions.pas
===================================================================
--- branches/dark-mode/ExternalSource/dzlib/u_dzCompilerAndRtlVersions.pas	2023-11-08 20:30:54 UTC (rev 4095)
+++ branches/dark-mode/ExternalSource/dzlib/u_dzCompilerAndRtlVersions.pas	2023-11-11 16:53:39 UTC (rev 4096)
@@ -45,9 +45,9 @@
   CompilerVersionDelphiRio = 33;
   CompilerVersionDelphiSydney = 34;
   CompilerVersionDelphiAlexandria = 35;
-  CompilerVersionDelphiYukon = 36; // don't know release name yet; maybe "Athens"
+  CompilerVersionDelphiAthens = 36;
 
-{$IF CompilerVersion > CompilerVersionDelphiYukon}
+{$IF CompilerVersion > CompilerVersionDelphiAthens}
 {$MESSAGE HINT 'Add new CompilerVersion(s) here'}
 {$IFEND}
 
@@ -90,9 +90,9 @@
   RtlVersionDelphiRio = 33;
   RtlVersionDelphiSydney = 34;
   RtlVersionDelphiAlexandria = 35;
-  RtlVersionDelphiYukon = 36;
+  RtlVersionDelphiAthens= 36;
 
-{$IF RtlVersion > RtlVersionDelphiYukon}
+{$IF RtlVersion > RtlVersionDelphiAthens}
 {$MESSAGE HINT 'Add new RtlVersion(s) here'}
 {$IFEND}
 

Modified: branches/dark-mode/Projects/DelphiXx110Alexandria/GExpertsRS110.dpr
===================================================================
--- branches/dark-mode/Projects/DelphiXx110Alexandria/GExpertsRS110.dpr	2023-11-08 20:30:54 UTC (rev 4095)
+++ branches/dark-mode/Projects/DelphiXx110Alexandria/GExpertsRS110.dpr	2023-11-11 16:53:39 UTC (rev 4096)
@@ -1,6 +1,7 @@
 library GExpertsRS110;
 
 {$E dll}
+{$R 'GExperts_manifest.res' '..\..\Source\GExperts_manifest.rc'}
 
 uses
   GX_About in '..\..\source\Framework\GX_About.pas' {fmAbout},
@@ -260,7 +261,6 @@
 {$R '..\..\images\GXIcons.res' '..\..\images\GXIcons.rc'}
 {$R '..\..\Binaries\CodeProofreaderDefault.res' '..\..\Binaries\CodeProofreaderDefault.rc'}
 {$R '..\..\Binaries\ConvertStrings.res' '..\..\Binaries\ConvertStrings.rc'}
-{$R 'GExperts_manifest.res' '..\..\Source\GExperts_manifest.rc'}
 
 {$R *_version.res}
 

Copied: branches/dark-mode/Projects/DelphiXx110Alexandria/GExperts_manifest.res (from rev 4095, trunk/Projects/DelphiXx110Alexandria/GExperts_manifest.res)
===================================================================
(Binary files differ)

Index: branches/dark-mode/Projects/DelphiXx120
===================================================================
--- branches/dark-mode/Projects/DelphiXx120	2023-11-08 20:30:54 UTC (rev 4095)
+++ branches/dark-mode/Projects/DelphiXx120	2023-11-11 16:53:39 UTC (rev 4096)

Property changes on: branches/dark-mode/Projects/DelphiXx120
___________________________________________________________________
Added: svn:ignore
## -0,0 +1,5 ##
+GExperts_manifest.res
+GExpertsRS120.res
+GExpertsRS120_Version.rc
+GExpertsRS120_Version.RES
+GXIcons.res
Modified: branches/dark-mode/Projects/DelphiXx120/GExpertsRS120.dpr
===================================================================
--- branches/dark-mode/Projects/DelphiXx120/GExpertsRS120.dpr	2023-11-08 20:30:54 UTC (rev 4095)
+++ branches/dark-mode/Projects/DelphiXx120/GExpertsRS120.dpr	2023-11-11 16:53:39 UTC (rev 4096)
@@ -1,7 +1,6 @@
 library GExpertsRS120;
 
 {$E dll}
-
 uses
   GX_About in '..\..\source\Framework\GX_About.pas' {fmAbout},
   GX_AboutExperimental in '..\..\source\Formatter\GX_AboutExperimental.pas' {fmAboutExperimental},
@@ -257,10 +256,10 @@
   GX_XmlUtils in '..\..\source\Utils\GX_XmlUtils.pas',
   GX_Zipper in '..\..\source\BackupProject\GX_Zipper.pas';
 
+{$R 'GExperts_manifest.res' '..\..\Source\GExperts_manifest.rc'}
 {$R '..\..\images\GXIcons.res' '..\..\images\GXIcons.rc'}
 {$R '..\..\Binaries\CodeProofreaderDefault.res' '..\..\Binaries\CodeProofreaderDefault.rc'}
 {$R '..\..\Binaries\ConvertStrings.res' '..\..\Binaries\ConvertStrings.rc'}
-{$R 'GExperts_manifest.res' '..\..\Source\GExperts_manifest.rc'}
 {$R *_version.res}
 
 begin

Modified: branches/dark-mode/Projects/DelphiXx120/GExpertsRS120.dproj
===================================================================
--- branches/dark-mode/Projects/DelphiXx120/GExpertsRS120.dproj	2023-11-08 20:30:54 UTC (rev 4095)
+++ branches/dark-mode/Projects/DelphiXx120/GExpertsRS120.dproj	2023-11-11 16:53:39 UTC (rev 4096)
@@ -14,31 +14,31 @@
         <Base>true</Base>
     </PropertyGroup>
     <PropertyGroup Condition="('$(Platform)'=='Win32' and '$(Base)'=='true') or '$(Base_Win32)'!=''">
+        <Base>true</Base>
+        <CfgParent>Base</CfgParent>
         <Base_Win32>true</Base_Win32>
-        <CfgParent>Base</CfgParent>
-        <Base>true</Base>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Config)'=='Release' or '$(Cfg_1)'!=''">
+        <Base>true</Base>
+        <CfgParent>Base</CfgParent>
         <Cfg_1>true</Cfg_1>
-        <CfgParent>Base</CfgParent>
-        <Base>true</Base>
     </PropertyGroup>
     <PropertyGroup Condition="('$(Platform)'=='Win32' and '$(Cfg_1)'=='true') or '$(Cfg_1_Win32)'!=''">
-        <Cfg_1_Win32>true</Cfg_1_Win32>
+        <Base>true</Base>
         <CfgParent>Cfg_1</CfgParent>
         <Cfg_1>true</Cfg_1>
-        <Base>true</Base>
+        <Cfg_1_Win32>true</Cfg_1_Win32>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Config)'=='Debug' or '$(Cfg_2)'!=''">
+        <Base>true</Base>
+        <CfgParent>Base</CfgParent>
         <Cfg_2>true</Cfg_2>
-        <CfgParent>Base</CfgParent>
-        <Base>true</Base>
     </PropertyGroup>
     <PropertyGroup Condition="('$(Platform)'=='Win32' and '$(Cfg_2)'=='true') or '$(Cfg_2_Win32)'!=''">
-        <Cfg_2_Win32>true</Cfg_2_Win32>
+        <Base>true</Base>
         <CfgParent>Cfg_2</CfgParent>
         <Cfg_2>true</Cfg_2>
-        <Base>true</Base>
+        <Cfg_2_Win32>true</Cfg_2_Win32>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Base)'!=''">
         <SanitizedProjectName>GExpertsRS120</SanitizedProjectName>
@@ -56,10 +56,12 @@
         <DCC_UsePackage>rtl;vcl;designide;$(DCC_UsePackage)</DCC_UsePackage>
         <GenDll>true</GenDll>
         <Manifest_File>(None)</Manifest_File>
-        <PreBuildEvent><![CDATA[call ..\..\images\_CreateGXIconsRc.cmd
+        <PreBuildEvent>
+            <![CDATA[call ..\..\images\_CreateGXIconsRc.cmd
 call ..\..\buildtools\prebuild.cmd "$(PROJECTPATH)"
 call ..\..\buildtools\movedll.cmd "$(OUTPUTPATH)"
-$(PreBuildEvent)]]></PreBuildEvent>
+$(PreBuildEvent)]]>
+        </PreBuildEvent>
         <UsePackages>True</UsePackages>
         <VerInfo_Keys>FileVersion=1.0.0.0</VerInfo_Keys>
         <VerInfo_Locale>2057</VerInfo_Locale>
@@ -752,7 +754,9 @@
     <Import Project="$(BDS)\Bin\CodeGear.Delphi.Targets" Condition="Exists('$(BDS)\Bin\CodeGear.Delphi.Targets')"/>
     <Import Project="$(APPDATA)\Embarcadero\$(BDSAPPDATABASEDIR)\$(PRODUCTVERSION)\UserTools.proj" Condition="Exists('$(APPDATA)\Embarcadero\$(BDSAPPDATABASEDIR)\$(PRODUCTVERSION)\UserTools.proj')"/>
     <Import Project="$(MSBuildProjectName).deployproj" Condition="Exists('$(MSBuildProjectName).deployproj')"/>
-    <PropertyGroup Condition="'$(Config)'=='Release' And '$(Platform)'=='Win32'">
+    <PropertyGroup Condition="'$(Config)'=='Release' And '$(Platform)'=='Win64'">
+        <PostBuildEvent/>
+        <PostBuildEventIgnoreExitCode>False</PostBuildEventIgnoreExitCode>
         <PreBuildEvent>call ..\..\images\_CreateGXIconsRc.cmd
 &amp;&amp;call ..\..\buildtools\prebuild.cmd &quot;$(PROJECTPATH)&quot;
 &amp;&amp;call ..\..\buildtools\movedll.cmd &quot;$(OUTPUTPATH)&quot;
@@ -760,10 +764,10 @@
         <PreBuildEventIgnoreExitCode>False</PreBuildEventIgnoreExitCode>
         <PreLinkEvent/>
         <PreLinkEventIgnoreExitCode>False</PreLinkEventIgnoreExitCode>
+    </PropertyGroup>
+    <PropertyGroup Condition="'$(Config)'=='Release' And '$(Platform)'=='Win32'">
         <PostBuildEvent/>
         <PostBuildEventIgnoreExitCode>False</PostBuildEventIgnoreExitCode>
-    </PropertyGroup>
-    <PropertyGroup Condition="'$(Config)'=='Release' And '$(Platform)'=='Win64'">
         <PreBuildEvent>call ..\..\images\_CreateGXIconsRc.cmd
 &amp;&amp;call ..\..\buildtools\prebuild.cmd &quot;$(PROJECTPATH)&quot;
 &amp;&amp;call ..\..\buildtools\movedll.cmd &quot;$(OUTPUTPATH)&quot;
@@ -771,10 +775,10 @@
         <PreBuildEventIgnoreExitCode>False</PreBuildEventIgnoreExitCode>
         <PreLinkEvent/>
         <PreLinkEventIgnoreExitCode>False</PreLinkEventIgnoreExitCode>
+    </PropertyGroup>
+    <PropertyGroup Condition="'$(Config)'=='Debug' And '$(Platform)'=='Win64'">
         <PostBuildEvent/>
         <PostBuildEventIgnoreExitCode>False</PostBuildEventIgnoreExitCode>
-    </PropertyGroup>
-    <PropertyGroup Condition="'$(Config)'=='Debug' And '$(Platform)'=='Win32'">
         <PreBuildEvent>call ..\..\images\_CreateGXIconsRc.cmd
 &amp;&amp;call ..\..\buildtools\prebuild.cmd &quot;$(PROJECTPATH)&quot;
 &amp;&amp;call ..\..\buildtools\movedll.cmd &quot;$(OUTPUTPATH)&quot;
@@ -782,10 +786,10 @@
         <PreBuildEventIgnoreExitCode>False</PreBuildEventIgnoreExitCode>
         <PreLinkEvent/>
         <PreLinkEventIgnoreExitCode>False</PreLinkEventIgnoreExitCode>
+    </PropertyGroup>
+    <PropertyGroup Condition="'$(Config)'=='Debug' And '$(Platform)'=='Win32'">
         <PostBuildEvent/>
         <PostBuildEventIgnoreExitCode>False</PostBuildEventIgnoreExitCode>
-    </PropertyGroup>
-    <PropertyGroup Condition="'$(Config)'=='Debug' And '$(Platform)'=='Win64'">
         <PreBuildEvent>call ..\..\images\_CreateGXIconsRc.cmd
 &amp;&amp;call ..\..\buildtools\prebuild.cmd &quot;$(PROJECTPATH)&quot;
 &amp;&amp;call ..\..\buildtools\movedll.cmd &quot;$(OUTPUTPATH)&quot;
@@ -793,7 +797,5 @@
         <PreBuildEventIgnoreExitCode>False</PreBuildEventIgnoreExitCode>
         <PreLinkEvent/>
         <PreLinkEventIgnoreExitCode>False</PreLinkEventIgnoreExitCode>
-        <PostBuildEvent/>
-        <PostBuildEventIgnoreExitCode>False</PostBuildEventIgnoreExitCode>
     </PropertyGroup>
 </Project>

Index: branches/dark-mode/Projects/DelphiXx120/dcu/Win32/Debug
===================================================================
--- branches/dark-mode/Projects/DelphiXx120/dcu/Win32/Debug	2023-11-08 20:30:54 UTC (rev 4095)
+++ branches/dark-mode/Projects/DelphiXx120/dcu/Win32/Debug	2023-11-11 16:53:39 UTC (rev 4096)

Property changes on: branches/dark-mode/Projects/DelphiXx120/dcu/Win32/Debug
___________________________________________________________________
Added: svn:ignore
## -0,0 +1 ##
+*.dcu
Index: branches/dark-mode/Projects/DelphiXx120/dcu/Win32/Release
===================================================================
--- branches/dark-mode/Projects/DelphiXx120/dcu/Win32/Release	2023-11-08 20:30:54 UTC (rev 4095)
+++ branches/dark-mode/Projects/DelphiXx120/dcu/Win32/Release	2023-11-11 16:53:39 UTC (rev 4096)

Property changes on: branches/dark-mode/Projects/DelphiXx120/dcu/Win32/Release
___________________________________________________________________
Added: svn:ignore
## -0,0 +1 ##
+*.dcu
Modified: branches/dark-mode/Source/Editor/GX_eIfDef.pas
===================================================================
--- branches/dark-mode/Source/Editor/GX_eIfDef.pas	2023-11-08 20:30:54 UTC (rev 4095)
+++ branches/dark-mode/Source/Editor/GX_eIfDef.pas	2023-11-11 16:53:39 UTC (rev 4096)
@@ -674,7 +674,7 @@
 {$ENDIF}
   def := TIfdefTabDefinition.Create(Self, pc_IfClasses, '&VERxxx', 4, 1, '{$IFNDEF %s}');
   FTabDefinitions.Add(def);
-  def.AddEntry('VER360', 'Delphi 12 / BDS 23');
+  def.AddEntry('VER360', 'Delphi 12 Athens / BDS 23');
   def.AddEntry('VER350', 'Delphi 11 Alexandria / BDS 22');
   def.AddEntry('VER340', 'Delphi 10.4 Sydney / BDS 21');
   def.AddEntry('VER330', 'Delphi 10.3 Rio / BDS 20');
@@ -716,7 +716,7 @@
 {$IFEND}
   def := TIfdefTabDefinition.Create(Self, pc_IfClasses, '&RtlVersion', 16, 2, '{$IF RtlVersion >= %s}');
   FTabDefinitions.Add(def);
-  def.AddEntry(IntToStr(RtlVersionDelphiX120), 'Delphi 12 / BDS 23');
+  def.AddEntry(IntToStr(RtlVersionDelphiX120), 'Delphi 12 Athens / BDS 23');
   def.AddEntry(IntToStr(RtlVersionDelphiX110), 'Delphi 11 Alexandria / BDS 22');
   def.AddEntry(IntToStr(RtlVersionDelphiX104), 'Delphi 10.4 Sydney / BDS 21');
   def.AddEntry(IntToStr(RtlVersionDelphiX103), 'Delphi 10.3 Rio / BDS 20');
@@ -753,7 +753,7 @@
 {$IF CompilerVersion > CompilerVersionDelphiX120}
 {$MESSAGE HINT 'Add a new Delphi version here'}
 {$IFEND}
-  def.AddEntry(IntToStr(CompilerVersionDelphiX120), 'Delphi 12 / BDS 23');
+  def.AddEntry(IntToStr(CompilerVersionDelphiX120), 'Delphi 12 Athens / BDS 23');
   def.AddEntry(IntToStr(CompilerVersionDelphiX110), 'Delphi 11 Alexandria/ BDS 22');
   def.AddEntry(IntToStr(CompilerVersionDelphiX104), 'Delphi 10.4 Sydney / BDS 21');
   def.AddEntry(IntToStr(CompilerVersionDelphiX103), 'Delphi 10.3 Rio / BDS 20');

Modified: branches/dark-mode/Source/FavoriteFiles/GX_FavFiles.pas
===================================================================
--- branches/dark-mode/Source/FavoriteFiles/GX_FavFiles.pas	2023-11-08 20:30:54 UTC (rev 4095)
+++ branches/dark-mode/Source/FavoriteFiles/GX_FavFiles.pas	2023-11-11 16:53:39 UTC (rev 4096)
@@ -696,7 +696,10 @@
 resourcestring
   SSaveWarning = 'The file for storing the list of your favorite files does not exist:'#13#10
     + '"%s"'#13#10
-    + 'Resetting it to the default:'#13#10
+    + #13#10
+    + 'This is normal on first run after installation. '#13#10
+    + #13#10
+    + 'A new empty favorites file list will be created:'#13#10
     + '"%s"';
   SMissingRootFolder =
     'Error: Missing root folder in file "%s"!' + sLineBreak + sLineBreak +
@@ -712,7 +715,7 @@
   Node := nil;
   if not FileExists(FEntryFile) then begin
     ErrorMsg := Format(SSaveWarning, [FEntryFile, GetDefaultEntryFileName]);
-    MessageDlg(ErrorMsg, mtError, [mbOK], 0);
+    MessageDlg(ErrorMsg, mtInformation, [mbOK], 0);
     FEntryFile := GetDefaultEntryFileName;
   end;
 

Modified: branches/dark-mode/Source/Framework/GX_GetIdeVersion.pas
===================================================================
--- branches/dark-mode/Source/Framework/GX_GetIdeVersion.pas	2023-11-08 20:30:54 UTC (rev 4095)
+++ branches/dark-mode/Source/Framework/GX_GetIdeVersion.pas	2023-11-11 16:53:39 UTC (rev 4096)
@@ -48,7 +48,7 @@
      ideRS11U1, // Rad Studio 11 Alexandria Update 1 (aka version 11.1)
      ideRS11U2, // Rad Studio 11 Alexandria Update 2 (aka version 11.2)
      ideRS11U3, // Rad Studio 11 Alexandria Update 3 (aka version 11.3)
-     ideRS12,   // Rad Studio 12
+     ideRS12,   // Rad Studio 12 Athens
      // C# Builder
      ideCSB100,
      // C++Builder
@@ -845,9 +845,9 @@
 }
 function GetRS101Version: TBorlandIdeVersion;
 const
-  CoreIde2400: TVersionNumber = (Minor: 24; Major: 0; Build: 6822; Release: 22858);
-  CoreIde2400Upd1: TVersionNumber = (Minor: 24; Major: 0; Build: 8770; Release: 24468);
-  CoreIde2400Upd2: TVersionNumber = (Minor: 24; Major: 0; Build: 9432; Release: 25048);
+  CoreIde2400: TVersionNumber = (Minor: 0; Major: 24; Build: 6822; Release: 22858);
+  CoreIde2400Upd1: TVersionNumber = (Minor: 0; Major: 24; Build: 8770; Release: 24468);
+  CoreIde2400Upd2: TVersionNumber = (Minor: 0; Major: 24; Build: 9432; Release: 25048);
 var
   CoreIdeFileVersion: TVersionNumber;
   VersionNumber: Integer;
@@ -875,7 +875,7 @@
 }
 function GetRS102Version: TBorlandIdeVersion;
 const
-  CoreIde2500: TVersionNumber = (Minor: 25; Major: 0; Build: 314; Release: 26309);
+  CoreIde2500: TVersionNumber = (Minor: 0; Major: 25; Build: 314; Release: 26309);
 begin
   Result := ideRS102;
 end;
@@ -911,10 +911,10 @@
 }
 function GetRS103Version: TBorlandIdeVersion;
 const
-  CoreIde2600: TVersionNumber = (Minor: 26; Major: 0; Build: 4364; Release: 32429);
-  CoreIde2600Upd1: TVersionNumber = (Minor: 26; Major: 0; Build: 4899; Release: 33219);
-  CoreIde2600Upd2: TVersionNumber = (Minor: 26; Major: 0; Build: 6593; Release: 34749);
-  CoreIde2600Upd3: TVersionNumber = (Minor: 26; Major: 0; Build: 7899; Release: 36039);
+  CoreIde2600: TVersionNumber = (Minor: 0; Major: 26; Build: 4364; Release: 32429);
+  CoreIde2600Upd1: TVersionNumber = (Minor: 0; Major: 26; Build: 4899; Release: 33219);
+  CoreIde2600Upd2: TVersionNumber = (Minor: 0; Major: 26; Build: 6593; Release: 34749);
+  CoreIde2600Upd3: TVersionNumber = (Minor: 0; Major: 26; Build: 7899; Release: 36039);
 var
   CoreIdeFileVersion: TVersionNumber;
   VersionNumber: Integer;
@@ -975,9 +975,9 @@
 function GetRS104Version: TBorlandIdeVersion;
 const
   RegKey = 'Software\Embarcadero\BDS\21.0\CatalogRepository\Elements\10.4Patch2pro-10';
-  CoreIde2700:     TVersionNumber = (Minor: 27; Major: 0; Build: 9797; Release:  37829);
-  CoreIde2700UPd1: TVersionNumber = (Minor: 27; Major: 0; Build: 1461; Release:  38860);
-  CoreIde2700UPd2: TVersionNumber = (Minor: 27; Major: 0; Build: 4203; Release:  40680);
+  CoreIde2700:     TVersionNumber = (Minor: 0; Major: 27; Build: 9797; Release:  37829);
+  CoreIde2700UPd1: TVersionNumber = (Minor: 0; Major: 27; Build: 1461; Release:  38860);
+  CoreIde2700UPd2: TVersionNumber = (Minor: 0; Major: 27; Build: 4203; Release:  40680);
 var
   RegValue: Integer;
   CoreIdeFileVersion: TVersionNumber;
@@ -1031,10 +1031,10 @@
 }
 function GetRS11Version: TBorlandIdeVersion;
 const
-  CoreIde2800: TVersionNumber =     (Minor: 28; Major: 0; Build: 6491; Release: 42600);
-  CoreIde2800Upd1: TVersionNumber = (Minor: 28; Major: 0; Build: 8973; Release: 44500);
-  CoreIde2800Upd2: TVersionNumber = (Minor: 28; Major: 0; Build: 0937; Release: 46141);
-  CoreIde2800Upd3: TVersionNumber = (Minor: 28; Major: 0; Build: 2819; Release: 47991);
+  CoreIde2800: TVersionNumber =     (Minor: 0; Major: 28; Build: 6491; Release: 42600);
+  CoreIde2800Upd1: TVersionNumber = (Minor: 0; Major: 28; Build: 8973; Release: 44500);
+  CoreIde2800Upd2: TVersionNumber = (Minor: 0; Major: 28; Build: 0937; Release: 46141);
+  CoreIde2800Upd3: TVersionNumber = (Minor: 0; Major: 28; Build: 2819; Release: 47991);
 var
   CoreIdeFileVersion: TVersionNumber;
 begin
@@ -1052,7 +1052,7 @@
 
 function GetRS12Version: TBorlandIdeVersion;
 const
-  BdsIde2900: TVersionNumber =     (Minor: 29; Major: 0; Build: 5667; Release: 50371);
+  BdsIde2900: TVersionNumber =     (Minor: 0; Major: 29; Build: 5718; Release: 50491);
 var
   BdsIdeFileVersion: TVersionNumber;
 begin

Modified: branches/dark-mode/Source/Framework/GX_VerDepConst.pas
===================================================================
--- branches/dark-mode/Source/Framework/GX_VerDepConst.pas	2023-11-08 20:30:54 UTC (rev 4095)
+++ branches/dark-mode/Source/Framework/GX_VerDepConst.pas	2023-11-11 16:53:39 UTC (rev 4096)
@@ -232,7 +232,7 @@
     ClassBrowserStorageFolder = 'Classes.RADStudio11.0';
   {$ENDIF VER350}
 
-  {$IFDEF VER360} // Delphi/RAD Studio 12
+  {$IFDEF VER360} // Delphi/RAD Studio 12 "Athens"
     GExpertsDll = 'GExpertsRS120.dll';
     TTabDockHostFormClassContainer = 'designide290.bpl';
     MajorVersionNumberChar = '29';
@@ -241,7 +241,8 @@
     ClassBrowserStorageFolder = 'Classes.RADStudio12.0';
   {$ENDIF VER360}
 
-{$IF CompilerVersion > 36} // new Delphi version  'Add the information for the new Delphi version above and increase the CompilerVersion in this conditional'
+{$IF CompilerVersion > 36} // new Delphi version
+  'Add the information for the new Delphi version above and increase the CompilerVersion in this conditional'
 {$IFEND}
 
 implementation

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.





Thread: [GExperts-Checkins] SF.net SVN: gexperts:[4096] branches/dark-mode

gexperts-checkins