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

IDE: Use "case" in code for EnvironmentOptions.CharcaseFileAction enumerator.

Browse Source 
git-svn-id: trunk@60749 -
This commit is contained in:
juha 2019-03-23 17:54:47 +00:00
parent c04a7aae6b
commit 1cfba6a6de
2 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ide/sourcefilemanager.pas
View File

@ -4359,8 +4359,7 @@ begin
if NewUnitName='' then if NewUnitName='' then
NewUnitName:=ExtractFileNameOnly(NewFilename); NewUnitName:=ExtractFileNameOnly(NewFilename);
if EnvironmentOptions.CharcaseFileAction in [ccfaAsk, ccfaAutoRename] then if EnvironmentOptions.CharcaseFileAction in [ccfaAsk, ccfaAutoRename] then
NewFilename:=ExtractFilePath(NewFilename) NewFilename:=ExtractFilePath(NewFilename)+lowercase(ExtractFileName(NewFilename));
+lowercase(ExtractFileName(NewFilename));
end; end;
NewCodeBuffer:=CodeToolBoss.CreateFile(NewFilename); NewCodeBuffer:=CodeToolBoss.CreateFile(NewFilename);
@ -4682,7 +4681,8 @@ begin
if FilenameIsPascalUnit(NewFilename) then begin if FilenameIsPascalUnit(NewFilename) then begin
AText:=ExtractFileName(NewFilename); AText:=ExtractFileName(NewFilename);
// check if file should be auto renamed // check if file should be auto renamed
if EnvironmentOptions.CharcaseFileAction = ccfaAsk then begin case EnvironmentOptions.CharcaseFileAction of
ccfaAsk:
if LowerCase(AText)<>AText then begin if LowerCase(AText)<>AText then begin
Result:=IDEQuestionDialogAb(lisRenameFile, Result:=IDEQuestionDialogAb(lisRenameFile,
Format(lisThisLooksLikeAPascalFileItIsRecommendedToUseLowerC, Format(lisThisLooksLikeAPascalFileItIsRecommendedToUseLowerC,
@ -4696,9 +4696,9 @@ begin
end; end;
Result:=mrOk; Result:=mrOk;
end; end;
end else begin ccfaAutoRename:
if EnvironmentOptions.CharcaseFileAction = ccfaAutoRename then NewFileName:=ExtractFilePath(NewFilename)+LowerCase(AText);
NewFileName:=ExtractFilePath(NewFilename)+LowerCase(AText); ccfaIgnore: ;
end; end;
end; end;

10
packager/pkgmanager.pas
View File

@ -1209,17 +1209,15 @@ begin
if lowercase(NewPkgName) <> NewPkgName then if lowercase(NewPkgName) <> NewPkgName then
begin begin
LowerFilename:=ExtractFilePath(NewFilename)+lowercase(ExtractFileName(NewFilename)); LowerFilename:=ExtractFilePath(NewFilename)+lowercase(ExtractFileName(NewFilename));
if EnvironmentOptions.CharcaseFileAction = ccfaAsk then case EnvironmentOptions.CharcaseFileAction of
begin ccfaAsk:
if IDEMessageDialog(lisPkgMangRenameFileLowercase, if IDEMessageDialog(lisPkgMangRenameFileLowercase,
Format(lisPkgMangShouldTheFileRenamedLowercaseTo,[LineEnding, LowerFilename]), Format(lisPkgMangShouldTheFileRenamedLowercaseTo,[LineEnding, LowerFilename]),
mtConfirmation,[mbYes,mbNo])=mrYes mtConfirmation,[mbYes,mbNo])=mrYes
then then
NewFileName:=LowerFilename; NewFileName:=LowerFilename;
end ccfaAutoRename: NewFileName:=LowerFilename;
else ccfaIgnore: ;
begin
if EnvironmentOptions.CharcaseFileAction = ccfaAutoRename then NewFileName:=LowerFilename;
end; end;
end; end;