v1.5.5.1 release

Artanemus · Mar 24, 2023 · ba87bf6 · ba87bf6
1 parent 31960a4
commit ba87bf6
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 19 deletions.
diff --git a/SwimClubMeet.dpr b/SwimClubMeet.dpr
@@ -5,7 +5,6 @@ uses
   frmMain in 'frmMain.pas' {Main},
   Vcl.Themes,
   Vcl.Styles,
-  dlgAbout in 'dlgAbout.pas' {About},
   dlgBootProgress in 'dlgBootProgress.pas' {BootProgress},
   dlgCloneSession in 'dlgCloneSession.pas' {CloneSession},
   dlgDivision in 'dlgDivision.pas' {Division},
@@ -47,22 +46,23 @@ uses
   dlgSelectPrinter in 'dlgSelectPrinter.pas' {SelectPrinter},
   dlgBatchProgress in 'dlgBatchProgress.pas' {BatchProgress},
   dlgAutoBuildPref in 'dlgAutoBuildPref.pas' {AutoBuildPref},
-  UEnvVars in 'UEnvVars.pas',
   dlgEntrantPicker in 'dlgEntrantPicker.pas' {EntrantPicker},
   dlgEntrantPickerCTRL in 'dlgEntrantPickerCTRL.pas' {EntrantPickerCTRL},
   rptMemberDetail in 'MEMBERS\rptMemberDetail.pas' {MemberDetail: TDataModule},
   rptMembersSummary in 'MEMBERS\rptMembersSummary.pas' {MembersSummary: TDataModule},
   rptMembersDetail in 'MEMBERS\rptMembersDetail.pas' {MembersDetail: TDataModule},
   rptMemberHistory in 'MEMBERS\rptMemberHistory.pas' {MemberHistory: TDataModule},
   rptMembersList in 'MEMBERS\rptMembersList.pas' {MembersList: TDataModule},
-  Vcl.PlatformVclStylesActnCtrls in 'Vcl.PlatformVclStylesActnCtrls.pas',
   rptHeatReportA in 'REPORTS\rptHeatReportA.pas' {HeatReportA: TDataModule},
   rptHeatReportB in 'REPORTS\rptHeatReportB.pas' {HeatReportB: TDataModule},
   SCMDefines in '..\SCM_SHARED\SCMDefines.pas',
   exeinfo in '..\SCM_SHARED\exeinfo.pas',
   SCMSimpleConnect in '..\SCM_SHARED\SCMSimpleConnect.pas',
   SCMUtility in '..\SCM_SHARED\SCMUtility.pas',
-  dlgBasicLogin in '..\SCM_SHARED\dlgBasicLogin.pas' {BasicLogin};
+  dlgBasicLogin in '..\SCM_SHARED\dlgBasicLogin.pas' {BasicLogin},
+  UEnvVars in '..\SCM_SHARED\UEnvVars.pas',
+  Vcl.PlatformVclStylesActnCtrls in '..\SCM_SHARED\Vcl.PlatformVclStylesActnCtrls.pas',
+  dlgAbout in '..\SCM_SHARED\dlgAbout.pas' {About};
 
 {$R *.res}
 

diff --git a/SwimClubMeet.dproj b/SwimClubMeet.dproj
@@ -4,7 +4,7 @@
         <ProjectVersion>19.5</ProjectVersion>
         <FrameworkType>VCL</FrameworkType>
         <Base>True</Base>
-        <Config Condition="'$(Config)'==''">Debug</Config>
+        <Config Condition="'$(Config)'==''">Release</Config>
         <Platform Condition="'$(Platform)'==''">Win32</Platform>
         <TargetedPlatforms>1</TargetedPlatforms>
         <AppType>Application</AppType>
@@ -104,14 +104,14 @@
         <DCC_DebugInformation>0</DCC_DebugInformation>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Cfg_2_Win32)'!=''">
-        <AppEnableRuntimeThemes>true</AppEnableRuntimeThemes>
         <AppDPIAwarenessMode>PerMonitorV2</AppDPIAwarenessMode>
         <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
         <VerInfo_Locale>1033</VerInfo_Locale>
         <VerInfo_MinorVer>5</VerInfo_MinorVer>
         <VerInfo_Release>5</VerInfo_Release>
-        <VerInfo_Keys>CompanyName=Artanemus;FileDescription=$(MSBuildProjectName) - Manage club members and run your club nights.;FileVersion=1.5.5.0;InternalName=SwimClubMeet;LegalCopyright=Copyright (C) 2019-2023 Artanemus.  All rights reserved.;LegalTrademarks=;OriginalFilename=SwimClubMeet.exe;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=1.5;Comments=Manage club members and run your club nights.</VerInfo_Keys>
+        <VerInfo_Keys>CompanyName=Artanemus;FileDescription=$(MSBuildProjectName) - Manage club members and run your club nights.;FileVersion=1.5.5.1;InternalName=SwimClubMeet;LegalCopyright=Copyright (C) 2019-2023 Artanemus.  All rights reserved.;LegalTrademarks=;OriginalFilename=SwimClubMeet.exe;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=1.5;Comments=Manage club members and run your club nights.</VerInfo_Keys>
         <Icon_MainIcon>SwimClubMeet.ico</Icon_MainIcon>
+        <VerInfo_Build>1</VerInfo_Build>
     </PropertyGroup>
     <ItemGroup>
         <DelphiCompile Include="$(MainSource)">
@@ -121,10 +121,6 @@
             <Form>Main</Form>
             <FormType>dfm</FormType>
         </DCCReference>
-        <DCCReference Include="dlgAbout.pas">
-            <Form>About</Form>
-            <FormType>dfm</FormType>
-        </DCCReference>
         <DCCReference Include="dlgBootProgress.pas">
             <Form>BootProgress</Form>
             <FormType>dfm</FormType>
@@ -308,7 +304,6 @@
             <Form>AutoBuildPref</Form>
             <FormType>dfm</FormType>
         </DCCReference>
-        <DCCReference Include="UEnvVars.pas"/>
         <DCCReference Include="dlgEntrantPicker.pas">
             <Form>EntrantPicker</Form>
             <FormType>dfm</FormType>
@@ -342,7 +337,6 @@
             <FormType>dfm</FormType>
             <DesignClass>TDataModule</DesignClass>
         </DCCReference>
-        <DCCReference Include="Vcl.PlatformVclStylesActnCtrls.pas"/>
         <DCCReference Include="REPORTS\rptHeatReportA.pas">
             <Form>HeatReportA</Form>
             <FormType>dfm</FormType>
@@ -361,6 +355,12 @@
             <Form>BasicLogin</Form>
             <FormType>dfm</FormType>
         </DCCReference>
+        <DCCReference Include="..\SCM_SHARED\UEnvVars.pas"/>
+        <DCCReference Include="..\SCM_SHARED\Vcl.PlatformVclStylesActnCtrls.pas"/>
+        <DCCReference Include="..\SCM_SHARED\dlgAbout.pas">
+            <Form>About</Form>
+            <FormType>dfm</FormType>
+        </DCCReference>
         <BuildConfiguration Include="Base">
             <Key>Base</Key>
         </BuildConfiguration>

diff --git a/SwimClubMeet.res b/SwimClubMeet.res
diff --git a/frmMain.dfm b/frmMain.dfm
@@ -1032,8 +1032,6 @@ object Main: TMain
           BevelOuter = bvNone
           Caption = 'HeatRightPanel'
           TabOrder = 0
-          ExplicitWidth = 1100
-          ExplicitHeight = 605
           object Entrant_Grid: TDBGrid
             Left = 0
             Top = 0
@@ -1128,8 +1126,6 @@ object Main: TMain
             Anchors = []
             BevelOuter = bvNone
             TabOrder = 1
-            ExplicitLeft = 1040
-            ExplicitHeight = 605
             DesignSize = (
               60
               606)
@@ -1256,7 +1252,6 @@ object Main: TMain
           Align = alTop
           BevelOuter = bvNone
           TabOrder = 1
-          ExplicitWidth = 1402
           DesignSize = (
             1406
             117)
@@ -1597,7 +1592,6 @@ object Main: TMain
             Align = alRight
             BevelOuter = bvNone
             TabOrder = 0
-            ExplicitHeight = 605
             DesignSize = (
               60
               606)

diff --git a/frmMain.pas b/frmMain.pas
@@ -1880,6 +1880,8 @@ procedure TMain.FormCreate(Sender: TObject);
   // to the FireDAC connection definition file
   // -----------------------------------------------------------
   aBasicLogin := TBasicLogin.Create(self);
+  aBasicLogin.DBName := 'SwimClubMeet';
+  aBasicLogin.DBConnection := SCM.scmConnection;
   result := aBasicLogin.ShowModal;
   aBasicLogin.Free;
 
@@ -3127,6 +3129,8 @@ procedure TMain.Help_AboutExecute(Sender: TObject);
   dlg: TAbout;
 begin
   dlg := TAbout.Create(self);
+  dlg.DBName := 'SwimClubMeet'; // DEFAULT
+  // Note: Safe to call TAbout without connection params assigned.
   if AssertConnection then
     dlg.DBConnection := SCM.scmConnection;
   dlg.ShowModal;