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

LCL: TValueListEditor: update TitleCaptions when loading from file.

Browse Source 
git-svn-id: trunk@62117 -
This commit is contained in:
bart 2019-10-25 16:36:39 +00:00
parent 4f81e53b18
commit a4df0d88cf
1 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
lcl/valedit.pas
View File

@ -145,6 +145,7 @@ type
procedure SetOptions(AValue: TGridOptions); procedure SetOptions(AValue: TGridOptions);
procedure SetStrings(const AValue: TValueListStrings); procedure SetStrings(const AValue: TValueListStrings);
procedure SetTitleCaptions(const AValue: TStrings); procedure SetTitleCaptions(const AValue: TStrings);
procedure UpdateTitleCaptions(const KeyCap, ValCap: String);
protected protected
class procedure WSRegisterClass; override; class procedure WSRegisterClass; override;
procedure SetFixedCols(const AValue: Integer); override; procedure SetFixedCols(const AValue: Integer); override;
@ -1050,6 +1051,13 @@ begin
FTitleCaptions.Assign(AValue); FTitleCaptions.Assign(AValue);
end; end;
procedure TValueListEditor.UpdateTitleCaptions(const KeyCap, ValCap: String);
begin
FTitleCaptions.Clear;
FTitleCaptions.Add(KeyCap);
FTitleCaptions.Add(ValCap);
end;
function TValueListEditor.GetKey(Index: Integer): string; function TValueListEditor.GetKey(Index: Integer): string;
begin begin
Result:=Cells[0,Index]; Result:=Cells[0,Index];
@ -1295,7 +1303,10 @@ procedure TValueListEditor.LoadContent(cfg: TXMLConfig; Version: Integer);
var var
ContentSaved, HasColumnTitles, AlwaysShowEditor, HasSaveContent: Boolean; ContentSaved, HasColumnTitles, AlwaysShowEditor, HasSaveContent: Boolean;
i,j,k, RC: Integer; i,j,k, RC: Integer;
KeyCap, ValCap, S: String;
begin begin
KeyCap := '';
ValCap := '';
BeginUpdate; BeginUpdate;
try try
AlwaysShowEditor := (goAlwaysShowEditor in Options); AlwaysShowEditor := (goAlwaysShowEditor in Options);
@ -1312,7 +1323,7 @@ begin
ContentSaved:=Cfg.GetValue('grid/saveoptions/content', false); ContentSaved:=Cfg.GetValue('grid/saveoptions/content', false);
if ContentSaved then if ContentSaved then
begin begin
Clean(0,0,ColCount-1,RowCount-1,[]); //need if the to be loaded grid has no entries Clean(0,0,ColCount-1,RowCount-1,[]); //needed if the to be loaded grid has no entries
HasColumnTitles := cfg.getValue('grid/content/hascolumntitles', False); HasColumnTitles := cfg.getValue('grid/content/hascolumntitles', False);
if HasColumnTitles then if HasColumnTitles then
DisplayOptions := DisplayOptions + [doColumnTitles] DisplayOptions := DisplayOptions + [doColumnTitles]
@ -1334,15 +1345,21 @@ begin
k:=cfg.getValue('grid/content/cells/cellcount', 0); k:=cfg.getValue('grid/content/cells/cellcount', 0);
while k>0 do while k>0 do
begin begin
i:=cfg.GetValue('grid/content/cells/cell'+IntToStr(k)+'/column', -1); i := cfg.GetValue('grid/content/cells/cell'+IntToStr(k)+'/column', -1);
j:=cfg.GetValue('grid/content/cells/cell'+IntTostr(k)+'/row',-1); j := cfg.GetValue('grid/content/cells/cell'+IntTostr(k)+'/row',-1);
if not IsRowIndexValid(j) then if not IsRowIndexValid(j) then
raise EStreamError.CreateFmt(rsVLERowIndexOutOfBounds,[cfg.Filename,j]); raise EStreamError.CreateFmt(rsVLERowIndexOutOfBounds,[cfg.Filename,j]);
if not IsColumnIndexValid(i) then if not IsColumnIndexValid(i) then
raise EStreamError.CreateFmt(rsVLEColIndexOutOfBounds,[cfg.Filename,i]); raise EStreamError.CreateFmt(rsVLEColIndexOutOfBounds,[cfg.Filename,i]);
Cells[i,j]:=UTF8Encode(cfg.GetValue('grid/content/cells/cell'+IntToStr(k)+'/text','')); S := cfg.GetValue('grid/content/cells/cell'+IntToStr(k)+'/text','');
Cells[i,j] := S;
if HasColumnTitles and (i = 0) and (j = 0) then
KeyCap := S
else if HasColumnTitles and (i = 1) and (j = 0) then
ValCap := S;
Dec(k); Dec(k);
end; end;
if HasColumnTitles then UpdateTitleCaptions(KeyCap, ValCap);
end; end;
end; end;
finally finally