diff --git a/lcpdb/bin/lisezmoi.txt b/lcpdb/bin/lisezmoi.txt
index b3e4378..a540d28 100644
--- a/lcpdb/bin/lisezmoi.txt
+++ b/lcpdb/bin/lisezmoi.txt
@@ -72,6 +72,12 @@ versions ant
HISTORIQUE DES VERSIONS
+[Version 1.3.2 - 06/06/2020]
+ - Sous Windows XP, le fichier Lcpdb.ini est désormais stocké dans
+ %UserProfile%\Local Settings\Application Data\Patquoi.fr\lcpdb.
+ Il faut exécuter impcfgcpt.exe lors de l'installation pour récupérer le
+ fichier ini depuis l'ancien chemin (le même que celui du programme exe).
+
[Version 1.3.1 - 02/05/2020]
- Icône en haute résolution
@@ -227,4 +233,4 @@ INFORMATIONS SUR INTERNET
mailto:lcpdb@patquoi.fr
http://patquoi.fr/#jm
-Dernière mise à jour le 2 mai 2020.
+Dernière mise à jour le 6 juin 2020.
diff --git a/lcpdb/impcfgcpt/src/impcfgcpt.dproj b/lcpdb/impcfgcpt/src/impcfgcpt.dproj
index ce27468..ef3182c 100644
--- a/lcpdb/impcfgcpt/src/impcfgcpt.dproj
+++ b/lcpdb/impcfgcpt/src/impcfgcpt.dproj
@@ -63,13 +63,13 @@
Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace)
Debug
true
- CompanyName=;FileDescription=$(MSBuildProjectName);FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=$(MSBuildProjectName);ProductVersion=1.0.0.0;Comments=;ProgramID=com.embarcadero.$(MSBuildProjectName)
- 1033
+ CompanyName=;FileDescription=$(MSBuildProjectName);FileVersion=1.1.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=$(MSBuildProjectName);ProductVersion=1.1;Comments=;ProgramID=com.embarcadero.$(MSBuildProjectName)
$(BDS)\bin\default_app.manifest
impcfgcpt_Icon.ico
true
..\img\impcfgcpt44.png
..\img\impcfgcpt150.png
+ 1
$(BDS)\bin\default_app.manifest
@@ -88,8 +88,7 @@
true
PerMonitorV2
true
- 1033
- CompanyName=;FileDescription=$(MSBuildProjectName);FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=$(MSBuildProjectName);ProductVersion=1.0.0.0;Comments=;ProgramID=com.embarcadero.$(MSBuildProjectName)
+ CompanyName=;FileDescription=$(MSBuildProjectName);FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=$(MSBuildProjectName);ProductVersion=1.1;Comments=;ProgramID=com.embarcadero.$(MSBuildProjectName)
DEBUG;$(DCC_Define)
@@ -100,8 +99,8 @@
true
PerMonitorV2
true
- 1033
- CompanyName=;FileDescription=$(MSBuildProjectName);FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=$(MSBuildProjectName);ProductVersion=1.0.0.0;Comments=;ProgramID=com.embarcadero.$(MSBuildProjectName)
+ CompanyName=;FileDescription=$(MSBuildProjectName);FileVersion=1.1.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=$(MSBuildProjectName);ProductVersion=1.1;Comments=;ProgramID=com.embarcadero.$(MSBuildProjectName)
+ 1
diff --git a/lcpdb/impcfgcpt/src/impcfgcpt.res b/lcpdb/impcfgcpt/src/impcfgcpt.res
index 87c21b9..0d5e155 100644
Binary files a/lcpdb/impcfgcpt/src/impcfgcpt.res and b/lcpdb/impcfgcpt/src/impcfgcpt.res differ
diff --git a/lcpdb/impcfgcpt/src/main_f.pas b/lcpdb/impcfgcpt/src/main_f.pas
index ee4c333..9a824c6 100644
--- a/lcpdb/impcfgcpt/src/main_f.pas
+++ b/lcpdb/impcfgcpt/src/main_f.pas
@@ -338,40 +338,50 @@ procedure TFormMain.TimerTimer(Sender: TObject);
//---------------------------------------------------------------------------
const stTitreMessage = 'Import de configuration lcpdb';
//---------------------------------------------------------------------------
-function GetLocalAppDataDupFolder : String;
-const stVarLocalAppData = 'LocalAppData';
- stRepLocAppDataDup = '\Patquoi.fr\lcpdb';
-var n : DWord;
-begin
-n:=0;
-n:=GetEnvironmentVariable(pChar(stVarLocalAppData), nil, n);
-if n>0 then
+function GetLocalAppDataLcpdbFolder : String;
+const stVarLocalAppData = 'LocalAppData';
+ stVarUserProfile = 'USERPROFILE'; // v1.1
+ stRepLocAppDataLcpdb = '\Patquoi.fr\lcpdb';
+var stExePath : String; // v1.1
+begin // v1.1 fonction réécrite
+stExePath := ExtractFilePath(ParamStr(0));
+Result := GetEnvironmentVariable(stVarLocalAppData);
+if Result = '' then
begin
- SetLength(Result, n-1);
- if GetEnvironmentVariable(pChar(stVarLocalAppData), pChar(Result), n)<>n-1 then
- Result:=''
+ Result := GetEnvironmentVariable(stVarUserProfile);
+ if Result = '' then
+ Result := stExePath // Dossier de Duplicata.exe
else
begin
- Result:=Result+stRepLocAppDataDup;
- if not DirectoryExists(Result) then
- if not ForceDirectories(Result) then
- Result:=''
+ Result := Result + '\Local Settings\Application Data' + stRepLocAppDataLcpdb;
+ if not DirectoryExists(Result) then
+ if not ForceDirectories(Result) then
+ Result := stExePath // Dossier de Duplicata.exe
else
Result:=Result+'\'
else
Result:=Result+'\';
- end
+ end;
end
else
- Result:=''
-end{function stRepLocalAppDataDup};
+ begin
+ Result := Result + stRepLocAppDataLcpdb;
+ if not DirectoryExists(Result) then
+ if not ForceDirectories(Result) then
+ Result:=stExePath // Dossier de Duplicata.exe
+ else
+ Result:=Result+'\'
+ else
+ Result:=Result+'\';
+ end
+end{function GetLocalAppDataLcpdbFolder};
//---------------------------------------------------------------------------
begin{function TFormMain.TimerTimer}
if Tag>0 then Exit; // Busy?
case Timer.Tag of
0: begin // 1. EXISTENCE DE %LocalAppData% ?
Tag:=1; // Busy
- LabeledEditLocalAppData.Text:=GetLocalAppDataDupFolder;
+ LabeledEditLocalAppData.Text:=GetLocalAppDataLcpdbFolder;
if LabeledEditLocalAppData.Text = '' then
begin
AffecteImage(1, False);
diff --git a/lcpdb/ins/lcpdb.iss b/lcpdb/ins/lcpdb.iss
index 18f47d1..5612429 100644
--- a/lcpdb/ins/lcpdb.iss
+++ b/lcpdb/ins/lcpdb.iss
@@ -2,7 +2,7 @@
; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
#define MyAppName "Le Compte Pour De Bon"
-#define MyAppVersion "1.3.1.1"
+#define MyAppVersion "1.3.2.4"
#define MyAppPublisher "Patquoi.fr"
#define MyAppURL "http://patquoi.fr"
diff --git a/lcpdb/src/IA.pas b/lcpdb/src/IA.pas
index f3dae5a..b86ff54 100644
--- a/lcpdb/src/IA.pas
+++ b/lcpdb/src/IA.pas
@@ -906,30 +906,40 @@ end;
//-----------------------------------------------------------------------------
procedure InitialiseRepLocalAppData; // v1.3 : stRepLocalAppData remplace ExtractFilePath(ParamStr(0))
const stVarLocalAppData = 'LOCALAPPDATA';
- stRepLocAppDataDup = '\Patquoi.fr\lcpdb';
-var n : DWord;
-begin
-n:=0;
-n:=GetEnvironmentVariable(pChar(stVarLocalAppData), nil, n);
-if n>0 then
+ stVarUserProfile = 'USERPROFILE'; // v1.3.2
+ stRepLocAppDataLcpdb = '\Patquoi.fr\lcpdb';
+var stExePath : String; // v1.3.2
+begin // v1.3.2 procédure réécrite
+stExePath := ExtractFilePath(ParamStr(0));
+stRepLocalAppData := GetEnvironmentVariable(stVarLocalAppData);
+if stRepLocalAppData = '' then
begin
- SetLength(stRepLocalAppData, n-1);
- if GetEnvironmentVariable(pChar(stVarLocalAppData), pChar(stRepLocalAppData), n)<>n-1 then
- stRepLocalAppData:=ExtractFilePath(ParamStr(0)) // Dossier de lcpdb.exe
+ stRepLocalAppData := GetEnvironmentVariable(stVarUserProfile);
+ if stRepLocalAppData = '' then
+ stRepLocalAppData := stExePath // Dossier de Paradice.exe
else
begin
- stRepLocalAppData:=stRepLocalAppData+stRepLocAppDataDup;
- if not DirectoryExists(stRepLocalAppData) then
- if not ForceDirectories(stRepLocalAppData) then
- stRepLocalAppData:=ExtractFilePath(ParamStr(0)) // Dossier de lcpdb.exe
+ stRepLocalAppData := stRepLocalAppData + '\Local Settings\Application Data' + stRepLocAppDataLcpdb;
+ if not DirectoryExists(stRepLocalAppData) then
+ if not ForceDirectories(stRepLocalAppData) then
+ stRepLocalAppData := stExePath // Dossier de Paradice.exe
else
stRepLocalAppData:=stRepLocalAppData+'\'
else
stRepLocalAppData:=stRepLocalAppData+'\';
- end
+ end;
end
else
- stRepLocalAppData:=ExtractFilePath(ParamStr(0)); // Dossier de lcpdb.exe
+ begin
+ stRepLocalAppData := stRepLocalAppData + stRepLocAppDataLcpdb;
+ if not DirectoryExists(stRepLocalAppData) then
+ if not ForceDirectories(stRepLocalAppData) then
+ stRepLocalAppData:=stExePath // Dossier de Paradice.exe
+ else
+ stRepLocalAppData:=stRepLocalAppData+'\'
+ else
+ stRepLocalAppData:=stRepLocalAppData+'\';
+ end
end;
//-----------------------------------------------------------------------------
diff --git a/lcpdb/src/LeCompte.groupproj b/lcpdb/src/LeCompte.groupproj
index 881c988..1b42a82 100644
--- a/lcpdb/src/LeCompte.groupproj
+++ b/lcpdb/src/LeCompte.groupproj
@@ -1,6 +1,6 @@

- {6517C5E7-4250-4082-B3DE-9DCADD4CA40C}
+ {C0F25294-D60E-46C9-A669-1A0237692663}
diff --git a/lcpdb/src/lcpdb.dproj b/lcpdb/src/lcpdb.dproj
index bcdae6b..e3db3b9 100644
--- a/lcpdb/src/lcpdb.dproj
+++ b/lcpdb/src/lcpdb.dproj
@@ -70,13 +70,13 @@
$(BDS)\bin\Artwork\Windows\UWP\delphi_UwpDefault_44.png
$(BDS)\bin\Artwork\Windows\UWP\delphi_UwpDefault_150.png
1036
- CompanyName=Patquoi.fr;FileDescription=$(MSBuildProjectName);FileVersion=1.3.1.1;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProgramID=com.patquoi.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=1.3.1;Comments=GPL 2.0
+ CompanyName=Patquoi.fr;FileDescription=$(MSBuildProjectName);FileVersion=1.3.2.4;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProgramID=com.patquoi.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=1.3.2;Comments=GPL 2.0
lcpdb
true
3
true
- 1
- 1
+ 4
+ 2
DBXSqliteDriver;IndyIPCommon;RESTComponents;bindcompdbx;DBXInterBaseDriver;vcl;IndyIPServer;vclactnband;vclFireDAC;IndySystem;tethering;svnui;dsnapcon;FireDACADSDriver;FireDACMSAccDriver;fmxFireDAC;vclimg;FireDAC;vcltouch;vcldb;bindcompfmx;svn;FireDACSqliteDriver;FireDACPgDriver;inetdb;soaprtl;DbxCommonDriver;fmx;FireDACIBDriver;fmxdae;xmlrtl;soapmidas;fmxobj;vclwinx;rtl;DbxClientDriver;CustomIPTransport;vcldsnap;dbexpress;IndyCore;vclx;bindcomp;appanalytics;dsnap;FireDACCommon;IndyIPClient;bindcompvcl;RESTBackendComponents;VCLRESTComponents;soapserver;dbxcds;VclSmp;adortl;vclie;bindengine;DBXMySQLDriver;CloudService;dsnapxml;FireDACMySQLDriver;dbrtl;IndyProtocols;inetdbxpress;FireDACCommonODBC;FireDACCommonDriver;inet;fmxase;$(DCC_UsePackage)
@@ -112,7 +112,7 @@
false
true
- CompanyName=;FileDescription=$(MSBuildProjectName);FileVersion=1.3.1.1;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProgramID=com.patquoi.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=1.3;Comments=GPL 2.0
+ CompanyName=;FileDescription=$(MSBuildProjectName);FileVersion=1.3.2.4;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProgramID=com.patquoi.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=1.3.2;Comments=GPL 2.0
lcpdb_Icon.ico
@@ -129,15 +129,15 @@
true
- CompanyName=;FileDescription=$(MSBuildProjectName);FileVersion=1.3.1.2;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProgramID=com.patquoi.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=1.3;Comments=GPL 2.0
+ CompanyName=;FileDescription=$(MSBuildProjectName);FileVersion=1.3.2.5;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProgramID=com.patquoi.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=1.3.2;Comments=GPL 2.0
lcpdb_Icon.ico
- 2
+ 5
true
- 2
- CompanyName=Patquoi.fr;FileDescription=$(MSBuildProjectName);FileVersion=1.3.1.2;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProgramID=com.patquoi.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=1.3;Comments=GPL 2.0
+ 5
lcpdb_Icon.ico
+ CompanyName=Patquoi.fr;FileDescription=$(MSBuildProjectName);FileVersion=1.3.2.5;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProgramID=com.patquoi.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=1.3.2;Comments=GPL 2.0
@@ -186,28 +186,7 @@
-
-
- Assets\
- Logo44x44.png
- true
-
-
-
-
- Assets\
- Logo44x44.png
- true
-
-
-
-
- Assets\
- Logo44x44.png
- true
-
-
-
+
Assets\
Logo150x150.png
@@ -221,34 +200,13 @@
true
-
+
Assets\
Logo150x150.png
true
-
-
- Assets\
- Logo44x44.png
- true
-
-
-
-
- Assets\
- Logo44x44.png
- true
-
-
-
-
- Assets\
- Logo44x44.png
- true
-
-
lcpdb.exe
diff --git a/lcpdb/src/lcpdb.res b/lcpdb/src/lcpdb.res
index 73a5a40..30984cb 100644
Binary files a/lcpdb/src/lcpdb.res and b/lcpdb/src/lcpdb.res differ
diff --git a/lcpdb/src/main_f.pas b/lcpdb/src/main_f.pas
index c319ab3..59e9af9 100644
--- a/lcpdb/src/main_f.pas
+++ b/lcpdb/src/main_f.pas
@@ -306,7 +306,8 @@ var
//-----------------------------------------------------------------------------
implementation
//-----------------------------------------------------------------------------
-uses StrUtils, ShellApi,
+uses UITypes, // v1.3.2
+ StrUtils, ShellApi,
tableau_f, pavenum_f, propos_f;
//-----------------------------------------------------------------------------
{$R *.dfm}
diff --git a/lcpdb/src/tableau_f.pas b/lcpdb/src/tableau_f.pas
index 9c0d767..0b33ddf 100644
--- a/lcpdb/src/tableau_f.pas
+++ b/lcpdb/src/tableau_f.pas
@@ -221,7 +221,8 @@ const //(27,18,28,25,30,24,
//-----------------------------------------------------------------------------
implementation
//-----------------------------------------------------------------------------
-uses StdCtrls, // Pour TLabel
+uses UITypes, // v1.3.2
+ StdCtrls, // Pour TLabel
Math, // Pour Min
main_f;
//-----------------------------------------------------------------------------