paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-08-14 02:59:21 +02:00
Code Issues Packages Projects Releases Wiki Activity

added GetAppConfigDirUTF8

Browse Source 
git-svn-id: trunk@16286 -
This commit is contained in:
mattias 2008-08-28 18:50:04 +00:00
parent dd76d864f1
commit 3d4746734c
5 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ide/lazarusidestrconsts.pas
View File

@ -669,6 +669,9 @@ resourcestring
lisInfoBuildBuild = 'Build'; lisInfoBuildBuild = 'Build';
lisInfoBuildComplile = 'Compiling...'; lisInfoBuildComplile = 'Compiling...';
lisInfoBuildError = 'Error...'; lisInfoBuildError = 'Error...';
lisCreateDirectory = 'Create directory?';
lisTheOutputDirectoryIsMissing = 'The output directory %s%s%s is missing.';
lisCreateIt = 'Create it';
lisInfoBuildSuccess = 'Success...'; lisInfoBuildSuccess = 'Success...';
lisInfoBuildAbort = 'Aborted...'; lisInfoBuildAbort = 'Aborted...';
lisInfoBuildCaption = 'Compile Project'; lisInfoBuildCaption = 'Compile Project';

7
ide/main.pp
View File

@ -9327,9 +9327,10 @@ begin
UnitOutputDirectory:=Project1.CompilerOptions.GetUnitOutPath(false); UnitOutputDirectory:=Project1.CompilerOptions.GetUnitOutPath(false);
if not DirPathExistsCached(UnitOutputDirectory) then begin if not DirPathExistsCached(UnitOutputDirectory) then begin
if not FileIsInPath(UnitOutputDirectory,WorkingDir) then begin if not FileIsInPath(UnitOutputDirectory,WorkingDir) then begin
Result:=IDEQuestionDialog('Create directory?', Result:=IDEQuestionDialog(lisCreateDirectory,
'The output directory "'+UnitOutputDirectory+'" is missing.', Format(lisTheOutputDirectoryIsMissing, ['"', UnitOutputDirectory, '"']
mtConfirmation,[mrYes,'Create it',mrCancel],''); ),
mtConfirmation, [mrYes, lisCreateIt, mrCancel], '');
if Result<>mrYes then exit; if Result<>mrYes then exit;
end; end;
Result:=ForceDirectoryInteractive(UnitOutputDirectory,[mbRetry]); Result:=ForceDirectoryInteractive(UnitOutputDirectory,[mbRetry]);

5
lcl/fileutil.pas
View File

@ -200,8 +200,9 @@ function ForceDirectoriesUTF8(const Dir: string): Boolean;
// environment // environment
function ParamStrUTF8(Param: Integer): string; function ParamStrUTF8(Param: Integer): string;
function GetEnvironmentStringUTF8(Index : Integer): String; function GetEnvironmentStringUTF8(Index: Integer): string;
function GetEnvironmentVariableUTF8(const EnvVar: String): String; function GetEnvironmentVariableUTF8(const EnvVar: string): String;
function GetAppConfigDirUTF8(Global: Boolean): string;
implementation implementation

5
lcl/include/fileutil.inc
View File

@ -209,6 +209,11 @@ begin
Result:=SysToUTF8(SysUtils.GetEnvironmentVariable(UTF8ToSys(EnvVar))); Result:=SysToUTF8(SysUtils.GetEnvironmentVariable(UTF8ToSys(EnvVar)));
end; end;
function GetAppConfigDirUTF8(Global: Boolean): string;
begin
Result:=SysToUTF8(SysUtils.GetAppConfigDir(Global));
end;
{------------------------------------------------------------------------------ {------------------------------------------------------------------------------
DirPathExists DirPathExists
------------------------------------------------------------------------------} ------------------------------------------------------------------------------}

2
tools/lazdatadesktop/frmmain.pp
View File

@ -305,7 +305,7 @@ begin
RegisterStdFormats; RegisterStdFormats;
FRecentDicts:=TRecentDataDicts.Create(TRecentDataDict); FRecentDicts:=TRecentDataDicts.Create(TRecentDataDict);
FRecentConnections:=TRecentConnections.Create(TRecentConnection); FRecentConnections:=TRecentConnections.Create(TRecentConnection);
FN:=GetAppConfigDir(False); FN:=GetAppConfigDirUTF8(False);
ForceDirectoriesUTF8(FN); ForceDirectoriesUTF8(FN);
FN:=GetAppConfigFile(False); FN:=GetAppConfigFile(False);
FRecentDicts.LoadFromFile(UTF8ToSys(FN,'RecentDicts')); FRecentDicts.LoadFromFile(UTF8ToSys(FN,'RecentDicts'));