POChecker: store PoFamilyList in one place

git-svn-id: trunk@62829 -
This commit is contained in:
maxim 2020-03-31 13:02:44 +00:00
parent 42c1f05392
commit 30f1ec9708
5 changed files with 37 additions and 74 deletions

View File

@ -53,7 +53,6 @@ type
procedure RefreshCurrMenuItemClick(Sender: TObject);
private
{ private declarations }
FPoFamilyList: TPoFamilyList;
FPoFamilyStats: TPoFamilyStats;
FImgList: TImageList;
FOldHintHidePause: Integer;
@ -71,7 +70,6 @@ type
procedure ConfigureContextPopUp(AdvancedMode: boolean);
public
{ public declarations }
property PoFamilyList: TPoFamilyList read FPoFamilyList write FPoFamilyList;
property PoFamilyStats: TPoFamilyStats read FPoFamilyStats write FPoFamilyStats;
property Settings: TPoCheckerSettings read FSettings write FSettings;
end;

View File

@ -257,71 +257,36 @@ object PoCheckerForm: TPoCheckerForm
left = 460
top = 435
Bitmap = {
4C69020000001000000010000000FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
FF00FFFFFF00FFFFFF00659CA803B0A18EC4BFAE97FFC9AB8FFFCDAF95FFBEAB
98FF3174930AFFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
FF00FFFFFF00FFFFFF00AFA08EC4DDC3ABFFF4E6DAFFF8ECDFFFF2DDC9FFE3C9
B2FFB29D8BC4FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
FF00FFFFFF00FFFFFF00CAAE95FFF2E3D5FFF6E0CAFFF5DEC6FFF5DEC5FFF7E5
D2FFC5AA94FFFFFFFF00FFFFFF0034B4D9D05EC2E1FA60C3E2FA60C3E2FA60C3
E2FA5FC3E2FA3CB6DBDDC8A98DFFF8EADCFFF4DDC6FFF4DCC4FFF3D8BDFFF8E2
CDFFCCAD93FFFFFFFF00FFFFFF0036B3DAF8FDFEFEFFFEFFFFFFFEFEFFFFFDFE
FFFFFEFFFFFFEAF7FBFFC9AC94FFF3E3D4FFF4DAC1FFF3D8BDFFF3D8BDFFF8E3
CCFFC4A48BFFFFFFFF00FFFFFF0035AFDAF0F7FCFEFF8EE4F8FF91DEF5FF9FE0
F5FFACE1F6FFEFFBFEFFC6B8AAFFE2CDBCFFF5E0CCFFF7E0C7FFF8E2CBFFF3D1
B3FFA7998FFF35628F5FFFFFFF0036AADAF2F1FAFDFF94DEF5FF93DCF4FF81D5
F2FF6ACAEDFF6CCBEAFF87C8DDFF98B2B4FFC7AC94FFCDAF96FFC8A88DFFAB99
8EFF96B1CBFF5486B4F220507C5835ABDAFAE8F6FBFF94D4EFFF88CEEEFF73C1
E9FFC9E9F6FFF2FCFEFFF3FCFEFFF2FCFEFFF0FCFEFFEFFBFEFFEEFBFEFFB0C1
D1FF568BB7FE8CB1D4FF3E6F9BF537A6DAFAFEFFFFFFF8FDFFFFF6FDFFFFF5FC
FFFFF3FCFEFFD8F6FCFF94E6F8FF85E3F7FF76DFF6FF68DBF5FF5CD8F4FFD7F4
FCFF2D86B8FA4777A0F6416F96FF36A1DAF9F6FCFEFFC8F2FCFFB9EFFBFFACEC
FAFF9CE8F9FF8BE3F7FF7CE0F6FF6CDCF6FF5DD9F5FF4FD6F4FF44D3F3FFD0F3
FCFF359FDAF7FFFFFF00FFFFFF00369ADAF8F2FAFDFFB3EDFAFFA4E9F9FF95E6
F8FF85E2F7FF76DEF6FF65DBF5FF57D7F4FF49D4F3FF3BD1F2FF30CEF1FFCCF2
FBFF3598DAF7FFFFFF00FFFFFF003594DAF7EFFAFEFFA1E9F9FF91E5F8FF81E1
F7FF72DEF6FF63DAF5FF54D7F4FF47D3F3FF39D0F2FF2ECDF1FF26CBF0FFCAF2
FBFF3594DAF7FFFFFF00FFFFFF00338ED9E6DCF0FAF0A7DDF4FD9EDBF4FF96DA
F3FF8ED8F3FF86D7F3FF7FD4F2FF79D3F2FF72D2F1FF6CD0F1FF69CFF1FFC2EA
F8FE338ED9F0FFFFFF00FFFFFF002C86D8002D88D8A62D87D8EA2D88D8F72D88
D8F72D88D8F72D88D8F72D88D8F72D88D8F72D88D8F72D88D8F72D87D8F72D88
D8F12C86D893FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF000B77
423F0B77423FFFFFFF00FFFFFF00000000000000000000000000000000000000
000000000000000000000000000000000000FFFFFF00FFFFFF000B77423D54A0
7AFF54A07AFF0B774247FFFFFF00000000000000000000000000000000000000
000000000000000000000000000000000000FFFFFF000B77424C54A07AFF7BCC
AFFF81CBAFFF54A07AFF0B77423F000000000000000000000000000000000000
0000000000000000000000000000000000000B77424054A07AFF6DC9A8FF57C7
A2FF7BCCAFFF54A07AFF0B774239000000000B7742203A9166F60B7742200000
00000000000000000000FFFFFF000B77424054A07AFF7CCAAEFF52C39DFF81BD
A2FF54A07AFF0B77423F54A07A000B7742303A9166FC7FBBA0FF3A9166FC0B77
423000000000000000000B77426054A07AFF7BC5A9FF4EBE99FF5CC2A0FF54A0
7AFF0B77423F0B77421054A07A0054A07AFF7FC3A8FF5FBB9BFF7FBBA0FF3A91
66FF0B7742600B7742404D9C75FF7BC5A9FF4EBC97FF7BBEA2FF54A07AFF0B77
42400B77421054A07A00FFFFFF0054A07A0054A07AFF7DC1A7FF4DB391FF7FBB
9FFF4D9C75FF3E946AFF7BC5A9FF40B18BFF7BBEA2FF54A07AFF0B77424054A0
7A0054A07A00FFFFFF00FFFFFF00FFFFFF0054A07A0054A07AFF7CC0A6FF3CA9
85FF76BDA1FF7FBBA0FF4FB592FF7BBEA2FF54A07AFF0B77424054A07A0054A0
7A00FFFFFF00FFFFFF00FFFFFF0000000000FFFFFF00FFFFFF0054A07AFF7BBE
A4FF39A681FF55B191FF7AB698FF399166FF0B774240FFFFFF00FFFFFF00FFFF
FF00FFFFFF00FFFFFF00FFFFFF00000000000000000000000000FFFFFF0054A0
7AFF78BCA1FF7DB99EFF368F63FF0B774240FFFFFF00FFFFFF00FFFFFF00FFFF
FF00FFFFFF00FFFFFF00FFFFFF0000000000000000000000000000000000FFFF
FF0046986FFF379064FF0B774240FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
FF00FFFFFF00FFFFFF00FFFFFF00
4C7A0200000010000000100000008C0300000000000078DACD93DD6F537518C7
49BCD31BFF04AEBC7206A31D99224C635C4C448899E205BA45C4289959820A0A
234B2FD8482A9D75DDE864B0962C7BEB5CD98B08619B6EEB5EFA861B14D69DB5
A35B65610DB0F6BCAF6F5F9FDF612DC3E098773BC937CFF99DDFF379BECF73CE
EF00D8824DAA838D6DCF5CB4199D7F749D81CB5E039FA30E83760B5EFEB6F6D9
8DF00EABD1191AB1435CE4A0DEBB0D3EE442C4D5839E7306E7467877571DF8C8
4DC86137A4B931D228943BD731DA614636E7D5BE99C94F87E713A5230B399590
765C9A0D4DB49F861A0D420C8D410C3A210406A02EF8E0FDB536C7E7F7726A3A
93418616149026B1FBA89284ABD30C21E287C80D69ACC647BC70361B72BCCEC1
C5945406C6BF5598E62434852574CECB584E663076B9030BBE7E48612F94F038
797B204CF5A2B5A106BACF6A4A34FF0E8E8F27D230135B1B14A1BFC9E390FB3E
CA3C51544F8460E9E9C338F5E173D463A2ED34EC0D46D4777B505CD5C76FDD5B
F1B1CECE25EECA4998FDCB3875ED01BE195A826B49064F3D0924166324D6CF03
D2C5A1297C64F83DF363B71F3BCBCF4ADB5BB8049B574D0332494A41E302720A
E6451527230A8EDC96F1E5AC84FD0111D3620A795597134547ADF29BE5F5C8B7
712B32E54FF0295C594EA2F35E028D77576020AE222CA32C28E39319097B6E89
78FB86804921055D13A7E4DEFF2F9CCAD3FCBDF713685E5A411DF35C20CF3919
07C973DFB48877FD025E9FE2B1ED5A1C5E3E099DE511AF3373CA324D6023D674
47857E5EC161620F70128A892D22CF82491E2FF9E278C113839BF1E647FC2BC6
99C5602C116B0D89E9F3B322EA3901C68080AA6901957E1E3FDCE071F87A1C65
93717CF5571CC35135434C2CCBBF5815D892772AD092571D885254D655B516E3
C4D46213FFF7EBE9B9A36FED62CAAE3772AD61DF28B61E0313DD17FD1F9EF2DF
63DC71AF037A8F235B63D74678CA2B64F95FBBDAB06FFC825663952F58DDDFFA
9AE90B99C527F86A6C85BB0B1F8C9C837EE042CE9B22DBDF466CAAF2AA152CB2
F51ADF52ADE7D176BC3FD880FDC3D61C4B7A9EF16C5D39D28692AB67B15A83ED
9732DFDD8DDF3D64FBCFE0F860CEB730CBB2FEB2354E0CB56277AF896A348171
3BCD8734B6B0DBF018BB9AFFD837CDD6A8F8B3053BDA4FE2C8804DEB65CF6F3F
3F955DFB7DB559079B51D0A2C787DD261CBB6441C1C3790AFFEB3CFDFB7DB31A
DFF7DB70E2CA79E4D71C58977DD2F961CFDEB19463FB4F9F3F95DD0CFA079B54
4812
}
end
end

View File

@ -62,8 +62,6 @@ type
procedure SelectAllMasterFilesBtnClick(Sender: TObject);
procedure UnselectAllMasterFilesBtnClick(Sender: TObject);
private
//PoFamily: TPoFamily;
PoFamilyList: TPoFamilyList;
FPoCheckerSettings: TPoCheckerSettings;
procedure OnTestStart(const ATestName, APoFileName: string);
procedure OnTestEnd(const {%H-}ATestName: string; const {%H-}ErrorCount: integer);
@ -435,7 +433,6 @@ begin
ResultDlg.DupLog.Assign(PoFamilyList.DupLog);
ResultDlg.PoFamilyList := PoFamilyList;
ResultDlg.PoFamilyStats := PoFamilyList.PoFamilyStats;
ResultDlg.Settings := FPoCheckerSettings;
mr := ResultDlg.ShowModal;

View File

@ -43,6 +43,9 @@ type
property OnTestEnd: TTestEndEvent read FOnTestEnd write FOnTestEnd;
end;
var
PoFamilyList: TPoFamilyList;
implementation
{ TPoFamilyList }
@ -181,5 +184,8 @@ begin
DupLog.Add(Format(sTotalWarnings, [WarningCount]));
end;
initialization
PoFamilyList := nil;
end.

View File

@ -42,7 +42,6 @@ type
procedure SaveAsMenuItemClick(Sender: TObject);
private
PoHL: TSynPoSyn;
FPoFamilyList: TPoFamilyList;
FPoFamilyStats: TPoFamilyStats;
FSettings: TPoCheckerSettings;
procedure GetCurrentMemo(var CurrentMemo: TSynEdit);
@ -58,7 +57,6 @@ type
property Log: TStringList read FLog write FLog;
property StatLog: TStringList read FStatLog write FStatLog;
property DupLog: TStringList read FDupLog write FDupLog;
property PoFamilyList: TPoFamilyList read FPoFamilyList write FPoFamilyList;
property PoFamilyStats: TPoFamilyStats read FPoFamilyStats write FPoFamilyStats;
property Settings: TPoCheckerSettings read FSettings write FSettings;
end;
@ -147,11 +145,10 @@ var
begin
GraphStatForm := TGraphStatForm.Create(nil);
try
GraphStatForm.PoFamilyList := Self.PoFamilyList;
GraphStatForm.PoFamilyStats := Self.PoFamilyStats;
GraphStatForm.Settings := Self.Settings;
if Self.PoFamilyList.LangID <> lang_all then
if PoFamilyList.LangID <> lang_all then
begin
GraphStatForm.TranslatedLabel.Caption := Format(sTranslatedStringsTotal, [
IntToStr(FTotalTranslated), FTotalPercTranslated]);