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

IDE: View Package Links: changed grid columns, showing state and error messages, fixed facet captions

Browse Source 
git-svn-id: trunk@39997 -
This commit is contained in:
mattias 2013-01-28 09:51:14 +00:00
parent 6681fcd954
commit 61ea5d6afb
3 changed files with 69 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ide/lazarusidestrconsts.pas
View File

@ -74,7 +74,6 @@ resourcestring
lisCancel = 'Cancel';
lisImportPackageListXml = 'Import package list (*.xml)';
lisExportPackageListXml = 'Export package list (*.xml)';
// lisYes = 'Yes';
lisNo = 'No';
lisContinue = 'Continue';
lisBreak = 'Break';
@ -239,8 +238,8 @@ resourcestring
lisConvert = 'Convert';
lisPLDShowGlobalLinks = 'Show global links';
lisPLDShowUserLinks = 'Show user links';
lrsPLDLpkFileValid = 'lpk file valid %s';
lrsPLDLpkFileInvalid = 'lpk file invalid %s';
lrsPLDLpkFileValid = 'lpk file valid (%s)';
lrsPLDLpkFileInvalid = 'lpk file invalid (%s)';
lisPLDGlobal = 'Global';
lisCTDefDefineTemplates = 'Define templates';
lisMenuCloseAll = 'Close A&ll';
@ -2313,8 +2312,6 @@ resourcestring
dlgPromptOnReplace = '&Prompt on replace';
lisAskBeforeReplacingEachFoundText = 'Ask before replacing each found text';
dlgSROrigin = 'Origin';
dlgPLDPackageGroup = 'Package group';
lisPLDExists = 'Exists';
dlgFromCursor = '&From cursor';
dlgFromBeginning = 'From b&eginning';
dlgScope = 'Scope';
@ -2368,6 +2365,8 @@ resourcestring
lisFRIRenameAllReferences = 'Rename all References';
dlgGlobal = '&Global';
lisPLDUser = 'User';
lrsPLDValid = 'valid';
lrsPLDInvalid = 'invalid';
dlgSelectedText = '&Selected text';
dlgDirection = 'Direction';
lisFRForwardSearch = 'Forwar&d search';

25
packager/pkglinksdlg.lfm
View File

@ -108,10 +108,33 @@ object PackageLinksDialog: TPackageLinksDialog
Width = 659
Align = alTop
Anchors = [akTop, akLeft, akRight, akBottom]
ColCount = 4
ColCount = 6
Columns = <
item
ButtonStyle = cbsCheckboxColumn
Title.Caption = 'Select'
end
item
Title.Caption = 'Name'
end
item
Title.Caption = 'Version'
end
item
Title.Caption = 'Group'
end
item
Title.Caption = 'State'
end
item
Title.Caption = 'Filename'
end>
FixedCols = 0
Options = [goFixedVertLine, goFixedHorzLine, goVertLine, goHorzLine, goRangeSelect, goColSizing, goTabs, goColSpanning, goDblClickAutoSize, goSmoothScroll]
TabOrder = 1
OnCheckboxToggled = PkgStringGridCheckboxToggled
OnSelection = PkgStringGridSelection
OnValidateEntry = PkgStringGridValidateEntry
end
object BtnPanel: TPanel
Left = 0

52
packager/pkglinksdlg.pas
View File

@ -87,6 +87,11 @@ type
procedure LPKFileInvalidCheckBoxChange(Sender: TObject);
procedure LPKParsingTimerTimer(Sender: TObject);
procedure OnAllLPKParsed(Sender: TObject);
procedure PkgStringGridCheckboxToggled(sender: TObject; aCol,
aRow: Integer; aState: TCheckboxState);
procedure PkgStringGridSelection(Sender: TObject; aCol, aRow: Integer);
procedure PkgStringGridValidateEntry(sender: TObject; aCol, aRow: Integer;
const OldValue: string; var NewValue: String);
procedure ShowGlobalLinksCheckBoxChange(Sender: TObject);
procedure ShowUserLinksCheckBoxChange(Sender: TObject);
procedure UpdateGlobalLinksButtonClick(Sender: TObject);
@ -191,6 +196,24 @@ begin
UpdatePackageList;
end;
procedure TPackageLinksDialog.PkgStringGridCheckboxToggled(sender: TObject;
aCol, aRow: Integer; aState: TCheckboxState);
begin
end;
procedure TPackageLinksDialog.PkgStringGridSelection(Sender: TObject; aCol,
aRow: Integer);
begin
end;
procedure TPackageLinksDialog.PkgStringGridValidateEntry(sender: TObject; aCol,
aRow: Integer; const OldValue: string; var NewValue: String);
begin
end;
procedure TPackageLinksDialog.ShowGlobalLinksCheckBoxChange(Sender: TObject);
begin
UpdatePackageList;
@ -237,6 +260,7 @@ var
OriginStr: String;
Info: TLPKInfo;
NextNode: TAvgLvlTreeNode;
s: String;
begin
// collect links
ClearLinks;
@ -312,13 +336,13 @@ begin
end;
// fill/update grid
PkgStringGrid.ColCount:=5;
PkgStringGrid.RowCount:=FLinks.Count+1;
PkgStringGrid.Cells[0, 0]:=lisName;
PkgStringGrid.Cells[1, 0]:=lisVersion;
PkgStringGrid.Cells[2, 0]:=dlgPLDPackageGroup;
PkgStringGrid.Cells[3, 0]:=lisPLDExists;
PkgStringGrid.Cells[4, 0]:=lisA2PFilename2;
PkgStringGrid.Columns[0].Title.Caption:=lisMenuSelect;
PkgStringGrid.Columns[1].Title.Caption:=lisName;
PkgStringGrid.Columns[2].Title.Caption:=lisVersion;
PkgStringGrid.Columns[3].Title.Caption:=lisGroup;
PkgStringGrid.Columns[4].Title.Caption:=lisOIPState;
PkgStringGrid.Columns[5].Title.Caption:=lisA2PFilename2;
i:=1;
Node:=FLinks.FindLowest;
@ -331,15 +355,21 @@ begin
end;
PkgStringGrid.Cells[0,i]:=Link.Name;
PkgStringGrid.Cells[1,i]:=Link.Version.AsString;
PkgStringGrid.Cells[1,i]:=Link.Name;
PkgStringGrid.Cells[2,i]:=Link.Version.AsString;
if Link.Origin=ploGlobal then
OriginStr:=lisPLDGlobal
else
OriginStr:=lisPLDUser;
PkgStringGrid.Cells[2,i]:=OriginStr;
PkgStringGrid.Cells[3,i]:=dbgs(FileExistsCached(Link.EffectiveFilename));
PkgStringGrid.Cells[4,i]:=Link.EffectiveFilename;
PkgStringGrid.Cells[3,i]:=OriginStr;
if Link.IsValid then
s:=lrsPLDValid
else if (Info<>nil) and (Info.LPKError<>'') then
s:=Info.LPKError
else
s:=lrsPLDInvalid;
PkgStringGrid.Cells[4,i]:=s;
PkgStringGrid.Cells[5,i]:=Link.EffectiveFilename;
inc(i);
end;