IDE: pckage links dlg: added filenames

git-svn-id: trunk@12813 -

packager/packagelinks.pas

@@ -140,6 +140,7 @@ type
     destructor Destroy; override;
     procedure Clear;
     function GetUserLinkFile: string;
+    function GetGlobalLinkDirectory: string;
     procedure UpdateGlobalLinks;
     procedure UpdateUserLinks;
     procedure UpdateAll;
@@ -315,6 +316,12 @@ begin
   Result:=AppendPathDelim(GetPrimaryConfigPath)+'packagefiles.xml';
 end;
 
+function TPackageLinks.GetGlobalLinkDirectory: string;
+begin
+  Result:=AppendPathDelim(EnvironmentOptions.LazarusDirectory)
+                                  +'packager'+PathDelim+'globallinks'+PathDelim;
+end;
+
 procedure TPackageLinks.UpdateGlobalLinks;
 
   function ParseFilename(const Filename: string;
@@ -382,8 +389,7 @@ begin
   Exclude(FStates,plsGlobalLinksNeedUpdate);
   
   FGlobalLinks.FreeAndClear;
-  GlobalLinksDir:=AppendPathDelim(EnvironmentOptions.LazarusDirectory)
+  GlobalLinksDir:=GetGlobalLinkDirectory;
-                                  +'packager'+PathDelim+'globallinks'+PathDelim;
   //debugln('UpdateGlobalLinks A ',GlobalLinksDir);
   if FindFirst(GlobalLinksDir+'*.lpl', faAnyFile, FileInfo)=0 then begin
     PkgVersion:=TPkgVersion.Create;

packager/pkglinksdlg.lfm

@@ -5,6 +5,7 @@ object PackageLinksDialog: TPackageLinksDialog
   Width = 659
   HorzScrollBar.Page = 658
   VertScrollBar.Page = 450
+  ActiveControl = CloseBitBtn
   Caption = 'PackageLinksDialog'
   ClientHeight = 451
   ClientWidth = 659
@@ -28,7 +29,7 @@ object PackageLinksDialog: TPackageLinksDialog
     TabOrder = 0
   end
   object ScopeGroupBox: TGroupBox
-    Height = 53
+    Height = 109
     Width = 659
     Align = alTop
     AutoSize = True
@@ -38,23 +39,22 @@ object PackageLinksDialog: TPackageLinksDialog
     ChildSizing.HorizontalSpacing = 6
     ChildSizing.VerticalSpacing = 6
     ChildSizing.Layout = cclLeftToRightThenTopToBottom
-    ChildSizing.ControlsPerLine = 3
+    ClientHeight = 90
-    ClientHeight = 34
     ClientWidth = 655
     TabOrder = 1
     object FileMustExistCheckBox: TCheckBox
       Left = 6
       Height = 22
       Top = 6
-      Width = 168
+      Width = 193
       Caption = 'FileMustExistCheckBox'
       OnChange = FileMustExistCheckBoxChange
       TabOrder = 0
     end
     object ShowGlobalLinksCheckBox: TCheckBox
-      Left = 180
+      Left = 6
       Height = 22
-      Top = 6
+      Top = 34
       Width = 193
       Caption = 'ShowGlobalLinksCheckBox'
       Checked = True
@@ -63,10 +63,10 @@ object PackageLinksDialog: TPackageLinksDialog
       TabOrder = 1
     end
     object ShowUserLinksCheckBox: TCheckBox
-      Left = 379
+      Left = 6
       Height = 22
-      Top = 6
+      Top = 62
-      Width = 183
+      Width = 193
       Caption = 'ShowUserLinksCheckBox'
       Checked = True
       OnChange = ShowUserLinksCheckBoxChange
@@ -76,8 +76,8 @@ object PackageLinksDialog: TPackageLinksDialog
   end
   object PkgStringGrid: TStringGrid
     AnchorSideBottom.Control = CloseBitBtn
-    Height = 350
+    Height = 294
-    Top = 53
+    Top = 109
     Width = 659
     Align = alTop
     Anchors = [akTop, akLeft, akRight, akBottom]

packager/pkglinksdlg.lrs

@@ -3,34 +3,34 @@
 LazarusResources.Add('TPackageLinksDialog','FORMDATA',[
   'TPF0'#19'TPackageLinksDialog'#18'PackageLinksDialog'#4'Left'#3'"'#1#6'Height'
   +#3#195#1#3'Top'#3#189#0#5'Width'#3#147#2#18'HorzScrollBar.Page'#3#146#2#18'V'
-  +'ertScrollBar.Page'#3#194#1#7'Caption'#6#18'PackageLinksDialog'#12'ClientHei'
+  +'ertScrollBar.Page'#3#194#1#13'ActiveControl'#7#11'CloseBitBtn'#7'Caption'#6
-  +'ght'#3#195#1#11'ClientWidth'#3#147#2#8'OnCreate'#7#10'FormCreate'#0#7'TBitB'
+  +#18'PackageLinksDialog'#12'ClientHeight'#3#195#1#11'ClientWidth'#3#147#2#8'O'
-  +'tn'#11'CloseBitBtn'#23'AnchorSideRight.Control'#7#5'Owner'#20'AnchorSideRig'
+  +'nCreate'#7#10'FormCreate'#0#7'TBitBtn'#11'CloseBitBtn'#23'AnchorSideRight.C'
-  +'ht.Side'#7#9'asrBottom'#24'AnchorSideBottom.Control'#7#5'Owner'#21'AnchorSi'
+  +'ontrol'#7#5'Owner'#20'AnchorSideRight.Side'#7#9'asrBottom'#24'AnchorSideBot'
-  +'deBottom.Side'#7#9'asrBottom'#4'Left'#3'C'#2#6'Height'#2'$'#3'Top'#3#153#1#5
+  +'tom.Control'#7#5'Owner'#21'AnchorSideBottom.Side'#7#9'asrBottom'#4'Left'#3
-  +'Width'#2'J'#7'Anchors'#11#7'akRight'#8'akBottom'#0#8'AutoSize'#9#20'BorderS'
+  +'C'#2#6'Height'#2'$'#3'Top'#3#153#1#5'Width'#2'J'#7'Anchors'#11#7'akRight'#8
-  +'pacing.Around'#2#6#7'Caption'#6#6'&Close'#4'Kind'#7#7'bkClose'#11'ModalResu'
+  +'akBottom'#0#8'AutoSize'#9#20'BorderSpacing.Around'#2#6#7'Caption'#6#6'&Clos'
-  +'lt'#2#1#9'NumGlyphs'#2#0#8'TabOrder'#2#0#0#0#9'TGroupBox'#13'ScopeGroupBox'
+  +'e'#4'Kind'#7#7'bkClose'#11'ModalResult'#2#1#9'NumGlyphs'#2#0#8'TabOrder'#2#0
-  +#6'Height'#2'5'#5'Width'#3#147#2#5'Align'#7#5'alTop'#8'AutoSize'#9#7'Caption'
+  +#0#0#9'TGroupBox'#13'ScopeGroupBox'#6'Height'#2'm'#5'Width'#3#147#2#5'Align'
-  +#6#13'ScopeGroupBox'#28'ChildSizing.LeftRightSpacing'#2#6#28'ChildSizing.Top'
+  +#7#5'alTop'#8'AutoSize'#9#7'Caption'#6#13'ScopeGroupBox'#28'ChildSizing.Left'
-  +'BottomSpacing'#2#6#29'ChildSizing.HorizontalSpacing'#2#6#27'ChildSizing.Ver'
+  +'RightSpacing'#2#6#28'ChildSizing.TopBottomSpacing'#2#6#29'ChildSizing.Horiz'
-  +'ticalSpacing'#2#6#18'ChildSizing.Layout'#7#29'cclLeftToRightThenTopToBottom'
+  +'ontalSpacing'#2#6#27'ChildSizing.VerticalSpacing'#2#6#18'ChildSizing.Layout'
-  +#27'ChildSizing.ControlsPerLine'#2#3#12'ClientHeight'#2'"'#11'ClientWidth'#3
+  +#7#29'cclLeftToRightThenTopToBottom'#12'ClientHeight'#2'Z'#11'ClientWidth'#3
   +#143#2#8'TabOrder'#2#1#0#9'TCheckBox'#21'FileMustExistCheckBox'#4'Left'#2#6#6
-  +'Height'#2#22#3'Top'#2#6#5'Width'#3#168#0#7'Caption'#6#21'FileMustExistCheck'
+  +'Height'#2#22#3'Top'#2#6#5'Width'#3#193#0#7'Caption'#6#21'FileMustExistCheck'
   +'Box'#8'OnChange'#7#27'FileMustExistCheckBoxChange'#8'TabOrder'#2#0#0#0#9'TC'
-  +'heckBox'#23'ShowGlobalLinksCheckBox'#4'Left'#3#180#0#6'Height'#2#22#3'Top'#2
+  +'heckBox'#23'ShowGlobalLinksCheckBox'#4'Left'#2#6#6'Height'#2#22#3'Top'#2'"'
-  +#6#5'Width'#3#193#0#7'Caption'#6#23'ShowGlobalLinksCheckBox'#7'Checked'#9#8
+  +#5'Width'#3#193#0#7'Caption'#6#23'ShowGlobalLinksCheckBox'#7'Checked'#9#8'On'
-  +'OnChange'#7#29'ShowGlobalLinksCheckBoxChange'#5'State'#7#9'cbChecked'#8'Tab'
+  +'Change'#7#29'ShowGlobalLinksCheckBoxChange'#5'State'#7#9'cbChecked'#8'TabOr'
-  +'Order'#2#1#0#0#9'TCheckBox'#21'ShowUserLinksCheckBox'#4'Left'#3'{'#1#6'Heig'
+  +'der'#2#1#0#0#9'TCheckBox'#21'ShowUserLinksCheckBox'#4'Left'#2#6#6'Height'#2
-  +'ht'#2#22#3'Top'#2#6#5'Width'#3#183#0#7'Caption'#6#21'ShowUserLinksCheckBox'
+  +#22#3'Top'#2'>'#5'Width'#3#193#0#7'Caption'#6#21'ShowUserLinksCheckBox'#7'Ch'
-  +#7'Checked'#9#8'OnChange'#7#27'ShowUserLinksCheckBoxChange'#5'State'#7#9'cbC'
+  +'ecked'#9#8'OnChange'#7#27'ShowUserLinksCheckBoxChange'#5'State'#7#9'cbCheck'
-  +'hecked'#8'TabOrder'#2#2#0#0#0#11'TStringGrid'#13'PkgStringGrid'#24'AnchorSi'
+  +'ed'#8'TabOrder'#2#2#0#0#0#11'TStringGrid'#13'PkgStringGrid'#24'AnchorSideBo'
-  +'deBottom.Control'#7#11'CloseBitBtn'#6'Height'#3'^'#1#3'Top'#2'5'#5'Width'#3
+  +'ttom.Control'#7#11'CloseBitBtn'#6'Height'#3'&'#1#3'Top'#2'm'#5'Width'#3#147
-  +#147#2#5'Align'#7#5'alTop'#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#8'akB'
+  +#2#5'Align'#7#5'alTop'#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#8'akBotto'
-  +'ottom'#0#8'ColCount'#2#4#10'FixedColor'#7#9'clBtnFace'#9'FixedCols'#2#0#7'O'
+  +'m'#0#8'ColCount'#2#4#10'FixedColor'#7#9'clBtnFace'#9'FixedCols'#2#0#7'Optio'
-  +'ptions'#11#15'goFixedVertLine'#15'goFixedHorzLine'#10'goVertLine'#10'goHorz'
+  +'ns'#11#15'goFixedVertLine'#15'goFixedHorzLine'#10'goVertLine'#10'goHorzLine'
-  +'Line'#13'goRangeSelect'#11'goColSizing'#6'goTabs'#13'goColSpanning'#18'goDb'
+  +#13'goRangeSelect'#11'goColSizing'#6'goTabs'#13'goColSpanning'#18'goDblClick'
-  +'lClickAutoSize'#14'goSmoothScroll'#0#8'RowCount'#2#5#10'ScrollBars'#7#10'ss'
+  +'AutoSize'#14'goSmoothScroll'#0#8'RowCount'#2#5#10'ScrollBars'#7#10'ssAutoBo'
-  +'AutoBoth'#8'TabOrder'#2#2#7'TabStop'#9#0#0#0
+  +'th'#8'TabOrder'#2#2#7'TabStop'#9#0#0#0
 ]);

packager/pkglinksdlg.pas

@@ -100,8 +100,10 @@ begin
   Caption:=lisPLDPackageLinks;
   CloseBitBtn.Caption:=lisMenuClose;
   FileMustExistCheckBox.Caption:=lisPLDOnlyExistingFiles;
-  ShowGlobalLinksCheckBox.Caption:=lisPLDShowGlobalLinks;
+  ShowGlobalLinksCheckBox.Caption:=lisPLDShowGlobalLinks
-  ShowUserLinksCheckBox.Caption:=lisPLDShowUserLinks;
+                                 +' ('+PkgLinks.GetGlobalLinkDirectory+'*.lpl)';
+  ShowUserLinksCheckBox.Caption:=lisPLDShowUserLinks
+                                      +' ('+PkgLinks.GetUserLinkFile+')';
   UpdateAll;
 end;