paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-04-07 04:18:48 +02:00
Code Issues Packages Projects Releases Wiki Activity

PoChecker: reload last used file on start.

Browse Source 
git-svn-id: trunk@46274 -
This commit is contained in:
bart 2014-09-21 16:53:18 +00:00
parent 12755f715c
commit cd5a2ec6c4
2 changed files with 119 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

167
components/pochecker/pocheckermain.pp
View File

@ -40,8 +40,7 @@ type
TPoCheckerForm = class(TForm)
private
PoFamily: TPoFamily;
FChosenMasterName: string;
FChosenChildName: string;
FSelectedPoName: String;
FPoCheckerSettings: TPoCheckerSettings;
procedure OnTestStart(const ATestName, APoFileName: string);
procedure OnTestEnd(const ATestName: string; const ErrorCount: integer);
@ -51,9 +50,11 @@ type
procedure SetTestTypeCheckBoxes(TestTypes: TPoTestTypes);
procedure SetTestOptionCheckBoxes(TestOptions: TPoTestOptions);
procedure ShowError(const Msg: string);
function TrySelectFile: boolean;
function TrySelectFile(out Filename: String): Boolean;
function TryCreatePoFamily(Filename: String): Boolean;
procedure RunSelectedTests;
procedure ClearAndDisableStatusPanel;
procedure SetSelectedPoName(AFilename: String);
published
IgnoreFuzzyCheckBox: TCheckBox;
UnselectAllBtn: TButton;
@ -148,7 +149,14 @@ begin
//DebugLn(' ',DbgS(FPoCheckerSettings.TestTypes));
SetTestTypeCheckBoxes(FPoCheckerSettings.TestTypes);
SetTestOptionCheckBoxes(FPoCheckerSettings.TestOptions);
if (FPoCheckerSettings.LastSelectedFile <> '') then
begin
//debugln('Trying to load ',FPoCheckerSettings.LastSelectedFile);
if TryCreatePoFamily(FPoCheckerSettings.LastSelectedFile) then
SetSelectedPoName(FPoCheckerSettings.LastSelectedFile)
else
SetSelectedPoName('');
end;
end;
@ -159,6 +167,7 @@ begin
if Assigned(FPoCheckerSettings) then
begin
FPoCheckerSettings.SaveSettingsOnExit := True; //ToDo: create a checkbox for this
FPoCheckerSettings.LastSelectedFile := FSelectedPoName;
FPoCheckerSettings.TestTypes := GetTestTypesFromListBox;
FPoCheckerSettings.TestOptions := GetTestOptions;
FPoCheckerSettings.SaveConfig;
@ -168,22 +177,16 @@ end;
procedure TPoCheckerForm.OpenBtnClick(Sender: TObject);
var
Fn: String;
begin
if TrySelectFile then
if TrySelectFile(Fn) then
begin
RunBtn.Enabled := True;
TestListBox.Enabled := True;
SelectAllBtn.Enabled := True;
SelectBasicBtn.Enabled := True;
UnselectAllBtn.Enabled := True;
SetSelectedPoName(Fn);
end
else
begin
RunBtn.Enabled := False;
TestListBox.Enabled := False;
SelectAllBtn.Enabled := False;
SelectBasicBtn.Enabled := False;
UnselectAllBtn.Enabled := False;
SetSelectedPoName('');
end;
end;
@ -310,72 +313,76 @@ begin
end;
function TPoCheckerForm.TrySelectFile: boolean;
var
Fn: string;
ShortFn: string;
OK: boolean;
function TPoCheckerForm.TrySelectFile(out Filename: String): boolean;
begin
NoErrLabel.Visible := False;
OK := False;
Result := False;
Filename := '';
if OpenDialog.Execute then
begin
Fn := OpenDialog.FileName;
ShortFn := ExtractFileName(Fn);
if IsMasterPoName(Fn) then
Filename := OpenDialog.FileName;
Result := TryCreatePoFamily(Filename);
end;
end;
function TPoCheckerForm.TryCreatePoFamily(Filename: String): Boolean;
var
ChosenMasterName, ChosenChildName, ShortFn: String;
begin
Result := False;
ShortFn := ExtractFileName(Filename);
if IsMasterPoName(Filename) then
begin
ChosenMasterName := Filename;
ChosenChildName := '';
end
else
begin //not a mastername, may be a child
ChosenChildName := Filename;
ChosenMasterName := ExtractMasterNameFromChildName(Filename);
if (ChosenMasterName = '') then
begin
FChosenMasterName := Fn;
FChosenChildName := '';
ChosenMasterName := '';
ChosenChildName := '';
ShowError(Format(sNotAProperFileName, [ShortFn]));
end
else
begin //not a mastername, may be a child
FChosenChildName := Fn;
FChosenMasterName := ExtractMasterNameFromChildName(Fn);
if (FChosenMasterName = '') then
begin
FChosenMasterName := '';
FChosenChildName := '';
ShowError(Format(sNotAProperFileName, [ShortFn]));
end
else
if not FileExistsUtf8(FChosenMasterName) then
begin
ShowError(Format(sCannotFindMaster,
[ExtractFileName(FChosenMasterName), ShortFn]));
FChosenMasterName := '';
FChosenChildName := '';
end;
end;
OK := (FChosenMasterName <> '');
if OK then
if not FileExistsUtf8(ChosenMasterName) then
begin
if Assigned(PoFamily) then
PoFamily.Free;
try
PoFamily := TPoFamily.Create(FChosenMasterName, FChosenChildName);
PoFamily.OnTestStart := @OnTestStart;
PoFamily.OnTestEnd := @OnTestEnd;
except
on E: Exception do
ShowError(Format(sCannotFindMaster,
[ExtractFileName(ChosenMasterName), ShortFn]));
ChosenMasterName := '';
ChosenChildName := '';
end;
end;
Result := (ChosenMasterName <> '');
if Result then
begin
if Assigned(PoFamily) then
PoFamily.Free;
try
PoFamily := TPoFamily.Create(ChosenMasterName, ChosenChildName);
PoFamily.OnTestStart := @OnTestStart;
PoFamily.OnTestEnd := @OnTestEnd;
except
on E: Exception do
begin
Result := False;
ShowError(Format(sErrorOnCreate, [E.Message]));
if Assigned(PoFamily) then
begin
OK := False;
ShowError(Format(sErrorOnCreate, [E.Message]));
if Assigned(PoFamily) then
begin
try
PoFamily.Free;
except
on E: Exception do
begin
ShowError(Format(sErrorOnCleanUp, [E.Message]));
end;
try
PoFamily.Free;
except
on E: Exception do
begin
ShowError(Format(sErrorOnCleanUp, [E.Message]));
end;
end;
end;
end;
end;
end;
Result := OK;
end;
@ -400,8 +407,8 @@ begin
try
StatusPanel.Enabled := True;
if (not (ptoFindAllChildren in TestOptions)) and Assigned(PoFamily.Child) and
(PoFamily.ChildName <> FChosenChildName) then
PoFamily.ChildName := FChosenChildName;
(PoFamily.ChildName <> FSelectedPoName) then
PoFamily.ChildName := FSelectedPoName;
PoFamily.RunTests(TestTypes, TestOptions, ErrorCount, WarningCount, SL);
debugln('RunSelectedTests: ', Format(sTotalErrors, [ErrorCount]));
debugln(' ', Format(sTotalWarnings, [WarningCount]));
@ -439,6 +446,30 @@ begin
StatusPanel.Enabled := False;
end;
procedure TPoCheckerForm.SetSelectedPoName(AFilename: String);
begin
if (FSelectedPoName = AFilename) then Exit;
FSelectedPoName := AFilename;
if (AFilename <> '') then
begin
RunBtn.Enabled := True;
TestListBox.Enabled := True;
SelectAllBtn.Enabled := True;
SelectBasicBtn.Enabled := True;
UnselectAllBtn.Enabled := True;
Caption := sGUIPoFileCheckingTool + ' [' + ExtractFileName(AFilename) + ']';
end
else
begin
RunBtn.Enabled := False;
TestListBox.Enabled := False;
SelectAllBtn.Enabled := False;
SelectBasicBtn.Enabled := False;
UnselectAllBtn.Enabled := False;
Caption := sGUIPoFileCheckingTool;
end;
end;
function SameItem(Item1, Item2: TPoFileItem): boolean;
begin

23
components/pochecker/pocheckersettings.pp
View File

@ -27,10 +27,13 @@ type
FSaveSettingsOnExit: Boolean;
FMasterPoList: TStrings;
FChildrenPoList: TStrings;
FLastSelectedFile: String;
function LoadLastSelectedFile: String;
function LoadTestTypes: TPoTestTypes;
function LoadTestOptions: TPoTestOptions;
procedure LoadMasterPoList(List: TStrings);
procedure LoadChildrenPoList(List: TStrings);
procedure SaveLastSelectedFile;
procedure SaveTestTypes;
procedure SaveTestOptions;
procedure SaveMasterPoList;
@ -49,6 +52,7 @@ type
property TestOptions: TPoTestOptions read FTestOptions write FTestOptions;
property MasterPoList: TStrings read FMasterPoList write FMasterPoList;
property ChildrenPoList: TStrings read FChildrenPoList write FChildrenPoList;
property LastSelectedFile: String read FLastSelectedFile write FLastSelectedFile;
end;
function DbgS(PoTestTypes: TPoTestTypes): String; overload;
@ -107,10 +111,11 @@ const
);
pLoadSettings = 'General/LoadSettings/';
pLastSelected = 'LastSelected/';
pTestTypes = 'TestTypes/';
pTestOptions = 'TestOptions/';
pMasterPoFiles = 'MasterPoFiles';
pChildrenPoFiles = 'ChildrenPoFiles';
pMasterPoFiles = 'MasterPoFiles/';
pChildrenPoFiles = 'ChildrenPoFiles/';
function DbgS(PoTestTypes: TPoTestTypes): String; overload;
var
@ -138,6 +143,11 @@ begin
Result := Result + ']';
end;
function TPoCheckerSettings.LoadLastSelectedFile: String;
begin
Result := FConfig.GetValue(pLastSelected+'Value','');
end;
function TPoCheckerSettings.LoadTestTypes: TPoTestTypes;
var
tt: TPoTestType;
@ -180,6 +190,11 @@ begin
List.Clear;
end;
procedure TPoCheckerSettings.SaveLastSelectedFile;
begin
FConfig.SetDeleteValue(pLastSelected+'Value',FLastSelectedFile,'');
end;
procedure TPoCheckerSettings.SaveTestTypes;
var
tt: TPoTestType;
@ -233,7 +248,7 @@ begin
FFilename := 'pochecker.xml';
FConfig := GetIDEConfigStorage(FFilename, True);
{$endif}
DebugLn('TPoCheckerSettings.Create: FConfig = ',DbgSName(FConfig));
//DebugLn('TPoCheckerSettings.Create: FConfig = ',DbgSName(FConfig));
except
Debugln('PoCheckerSettings.Create: failed to create ConfigStorage:');
Debugln(' - Filename = ',FFilename);
@ -255,6 +270,7 @@ begin
begin
FTestTypes := LoadTestTypes;
FTestOptions := LoadTestOptions;
FLastSelectedFile := LoadLastSelectedFile;
LoadMasterPoList(FMasterPoList);
LoadChildrenPoList(FChildrenPoList);
end;
@ -272,6 +288,7 @@ begin
FConfig.SetValue(pLoadSettings+'Value',FSaveSettingsOnExit);
if FSaveSettingsOnExit then
begin
SaveLastSelectedFile;
SaveTestTypes;
SaveTestOptions;
SaveMasterPoList;