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

PoChecker: refactor.

Browse Source 
git-svn-id: trunk@46378 -
This commit is contained in:
bart 2014-09-30 19:13:06 +00:00
parent 27c2885608
commit e02126bcdd
1 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
components/pochecker/pocheckermain.pp
View File

@ -41,7 +41,6 @@ type
private private
PoFamily: TPoFamily; PoFamily: TPoFamily;
FSelectedPoName: String; FSelectedPoName: String;
FNewRun: boolean;
FPoCheckerSettings: TPoCheckerSettings; FPoCheckerSettings: TPoCheckerSettings;
procedure OnTestStart(const ATestName, APoFileName: string); procedure OnTestStart(const ATestName, APoFileName: string);
procedure OnTestEnd(const ATestName: string; const ErrorCount: integer); procedure OnTestEnd(const ATestName: string; const ErrorCount: integer);
@ -170,15 +169,17 @@ begin
begin begin
SetSelectedPoName(''); SetSelectedPoName('');
end; end;
FNewRun:= False;
end; end;
procedure TPoCheckerForm.RunBtnClick(Sender: TObject); procedure TPoCheckerForm.RunBtnClick(Sender: TObject);
begin begin
if FNewRun then TryCreatePoFamily(FSelectedPoName); if TryCreatePoFamily(FSelectedPoName) then
RunSelectedTests; RunSelectedTests
FNewRun:= True; else
begin
if Assigned(PoFamily) then FreeAndNil(PoFamily);
end;
end; end;
procedure TPoCheckerForm.SelectAllBtnClick(Sender: TObject); procedure TPoCheckerForm.SelectAllBtnClick(Sender: TObject);
@ -300,13 +301,13 @@ end;
function TPoCheckerForm.TrySelectFile(out Filename: String): boolean; function TPoCheckerForm.TrySelectFile(out Filename: String): boolean;
begin begin
NoErrLabel.Visible := False;
Result := False; Result := False;
Filename := ''; Filename := '';
if OpenDialog.Execute then if OpenDialog.Execute then
begin begin
Filename := OpenDialog.FileName; Filename := OpenDialog.FileName;
Result := TryCreatePoFamily(Filename); Result := (CompareText(ExtractFileExt(Filename), '.po') = 0);
if not Result then Filename := '';
end; end;
end; end;
@ -436,6 +437,7 @@ end;
procedure TPoCheckerForm.SetSelectedPoName(AFilename: String); procedure TPoCheckerForm.SetSelectedPoName(AFilename: String);
begin begin
NoErrLabel.Visible := False;
if (FSelectedPoName = AFilename) then Exit; if (FSelectedPoName = AFilename) then Exit;
FSelectedPoName := AFilename; FSelectedPoName := AFilename;
if (AFilename <> '') then if (AFilename <> '') then
@ -482,14 +484,10 @@ begin
//DebugLn(' ',DbgS(FPoCheckerSettings.TestTypes)); //DebugLn(' ',DbgS(FPoCheckerSettings.TestTypes));
SetTestTypeCheckBoxes(FPoCheckerSettings.TestTypes); SetTestTypeCheckBoxes(FPoCheckerSettings.TestTypes);
SetTestOptionCheckBoxes(FPoCheckerSettings.TestOptions); SetTestOptionCheckBoxes(FPoCheckerSettings.TestOptions);
if (FPoCheckerSettings.LastSelectedFile <> '') then if (CompareText(ExtractFileExt(FPoCheckerSettings.LastSelectedFile), '.po') = 0) then
begin SetSelectedPoName(FPoCheckerSettings.LastSelectedFile)
//debugln('Trying to load ',FPoCheckerSettings.LastSelectedFile); else
if TryCreatePoFamily(FPoCheckerSettings.LastSelectedFile) then SetSelectedPoName('');
SetSelectedPoName(FPoCheckerSettings.LastSelectedFile)
else
SetSelectedPoName('');
end;
end; end;
procedure TPoCheckerForm.SaveConfig; procedure TPoCheckerForm.SaveConfig;