improed layout of unitinfodlg from Darius

git-svn-id: trunk@8441 -

ide/unitinfodlg.lfm

@@ -29,22 +29,6 @@ object UnitInfoDialog: TUnitInfoDialog
     Top = 239
     Width = 68
   end
-  object HelpButton: TBitBtn
-    Anchors = [akRight, akBottom]
-    AutoSize = True
-    BorderSpacing.Right = 6
-    BorderSpacing.InnerBorder = 2
-    Caption = '&Help'
-    Enabled = False
-    Kind = bkHelp
-    NumGlyphs = 0
-    TabOrder = 1
-    AnchorSideRight.Control = OkButton
-    Left = 345
-    Height = 34
-    Top = 239
-    Width = 75
-  end
   object Notebook: TNotebook
     Align = alTop
     Anchors = [akTop, akLeft, akRight, akBottom]
@@ -209,6 +193,7 @@ object UnitInfoDialog: TUnitInfoDialog
         Color = clNone
         Font.Style = [fsBold]
         ParentColor = False
+        OnResize = UnitInfoDlgResize
         Left = 12
         Height = 14
         Top = 12
@@ -285,7 +270,7 @@ object UnitInfoDialog: TUnitInfoDialog
     BorderSpacing.InnerBorder = 2
     Caption = 'CodeToolsDefsButton'
     OnClick = CodeToolsDefsButtonClick
-    TabOrder = 3
+    TabOrder = 2
     Left = 6
     Height = 29
     Top = 240

ide/unitinfodlg.lrs

@@ -10,73 +10,69 @@ LazarusResources.Add('TUnitInfoDialog','FORMDATA',[
   +'itBtn'#8'OkButton'#7'Anchors'#11#7'akRight'#8'akBottom'#0#8'AutoSize'#9#25
   +'BorderSpacing.InnerBorder'#2#2#7'Caption'#6#3'&OK'#7'Default'#9#4'Kind'#7#4
   +'bkOK'#11'ModalResult'#2#1#9'NumGlyphs'#2#0#8'TabOrder'#2#0#4'Left'#3#170#1#6
-  +'Height'#2'"'#3'Top'#3#239#0#5'Width'#2'D'#0#0#7'TBitBtn'#10'HelpButton'#7'A'
+  +'Height'#2'"'#3'Top'#3#239#0#5'Width'#2'D'#0#0#9'TNotebook'#8'Notebook'#5'Al'
-  +'nchors'#11#7'akRight'#8'akBottom'#0#8'AutoSize'#9#19'BorderSpacing.Right'#2
+  +'ign'#7#5'alTop'#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#8'akBottom'#0#20
-  +#6#25'BorderSpacing.InnerBorder'#2#2#7'Caption'#6#5'&Help'#7'Enabled'#8#4'Ki'
+  +'BorderSpacing.Around'#2#6#9'PageIndex'#2#0#4'Left'#2#6#6'Height'#3#226#0#3
-  +'nd'#7#6'bkHelp'#9'NumGlyphs'#2#0#8'TabOrder'#2#1#23'AnchorSideRight.Control'
+  +'Top'#2#6#5'Width'#3#232#1#0#5'TPage'#5'Page1'#7'Caption'#6#5'Page1'#11'Clie'
-  +#7#8'OkButton'#4'Left'#3'Y'#1#6'Height'#2'"'#3'Top'#3#239#0#5'Width'#2'K'#0#0
+  +'ntWidth'#3#224#1#12'ClientHeight'#3#200#0#6'Height'#3#200#0#5'Width'#3#224#1
-  +#9'TNotebook'#8'Notebook'#5'Align'#7#5'alTop'#7'Anchors'#11#5'akTop'#6'akLef'
+  +#0#6'TLabel'#6'ULines'#9'Alignment'#7#14'taRightJustify'#7'Caption'#6#6'ULin'
-  +'t'#7'akRight'#8'akBottom'#0#20'BorderSpacing.Around'#2#6#9'PageIndex'#2#0#4
+  +'es'#5'Color'#7#6'clNone'#10'Font.Style'#11#6'fsBold'#0#11'ParentColor'#8#4
-  +'Left'#2#6#6'Height'#3#226#0#3'Top'#2#6#5'Width'#3#232#1#0#5'TPage'#5'Page1'
+  +'Left'#2#12#6'Height'#2#14#3'Top'#2'\'#5'Width'#2'&'#0#0#6'TLabel'#8'OutLine'
-  +#7'Caption'#6#5'Page1'#11'ClientWidth'#3#224#1#12'ClientHeight'#3#200#0#6'He'
+  +'s'#18'BorderSpacing.Left'#2#12#7'Caption'#6#8'OutLines'#5'Color'#7#6'clNone'
-  +'ight'#3#200#0#5'Width'#3#224#1#0#6'TLabel'#6'ULines'#9'Alignment'#7#14'taRi'
+  +#11'ParentColor'#8#22'AnchorSideLeft.Control'#7#6'ULines'#4'Left'#2'>'#6'Hei'
-  +'ghtJustify'#7'Caption'#6#6'ULines'#5'Color'#7#6'clNone'#10'Font.Style'#11#6
+  +'ght'#2#14#3'Top'#2'\'#5'Width'#2'+'#0#0#6'TLabel'#7'OutPath'#18'BorderSpaci'
-  +'fsBold'#0#11'ParentColor'#8#4'Left'#2#12#6'Height'#2#14#3'Top'#2'\'#5'Width'
+  +'ng.Left'#2#12#7'Caption'#6#7'OutPath'#5'Color'#7#6'clNone'#11'ParentColor'#8
-  +#2'&'#0#0#6'TLabel'#8'OutLines'#18'BorderSpacing.Left'#2#12#7'Caption'#6#8'O'
+  +#22'AnchorSideLeft.Control'#7#5'UPath'#4'Left'#2';'#6'Height'#2#14#3'Top'#2
-  +'utLines'#5'Color'#7#6'clNone'#11'ParentColor'#8#22'AnchorSideLeft.Control'#7
+  +'p'#5'Width'#2')'#0#0#6'TLabel'#5'UPath'#9'Alignment'#7#14'taRightJustify'#7
-  +#6'ULines'#4'Left'#2'>'#6'Height'#2#14#3'Top'#2'\'#5'Width'#2'+'#0#0#6'TLabe'
+  +'Caption'#6#5'UPath'#5'Color'#7#6'clNone'#10'Font.Style'#11#6'fsBold'#0#11'P'
-  +'l'#7'OutPath'#18'BorderSpacing.Left'#2#12#7'Caption'#6#7'OutPath'#5'Color'#7
+  +'arentColor'#8#4'Left'#2#12#6'Height'#2#14#3'Top'#2'p'#5'Width'#2'#'#0#0#6'T'
-  +#6'clNone'#11'ParentColor'#8#22'AnchorSideLeft.Control'#7#5'UPath'#4'Left'#2
+  +'Label'#11'UIncludedBy'#9'Alignment'#7#14'taRightJustify'#7'Caption'#6#11'UI'
-  +';'#6'Height'#2#14#3'Top'#2'p'#5'Width'#2')'#0#0#6'TLabel'#5'UPath'#9'Alignm'
+  +'ncludedBy'#5'Color'#7#6'clNone'#10'Font.Style'#11#6'fsBold'#0#11'ParentColo'
-  +'ent'#7#14'taRightJustify'#7'Caption'#6#5'UPath'#5'Color'#7#6'clNone'#10'Fon'
+  +'r'#8#4'Left'#2#12#6'Height'#2#14#3'Top'#3#132#0#5'Width'#2'H'#0#0#6'TLabel'
-  +'t.Style'#11#6'fsBold'#0#11'ParentColor'#8#4'Left'#2#12#6'Height'#2#14#3'Top'
+  +#13'OutIncludedBy'#18'BorderSpacing.Left'#2#12#7'Caption'#6#13'OutIncludedBy'
-  +#2'p'#5'Width'#2'#'#0#0#6'TLabel'#11'UIncludedBy'#9'Alignment'#7#14'taRightJ'
+  +#5'Color'#7#6'clNone'#11'ParentColor'#8#22'AnchorSideLeft.Control'#7#11'UInc'
-  +'ustify'#7'Caption'#6#11'UIncludedBy'#5'Color'#7#6'clNone'#10'Font.Style'#11
+  +'ludedBy'#4'Left'#2'`'#6'Height'#2#14#3'Top'#3#132#0#5'Width'#2'H'#0#0#6'TLa'
-  +#6'fsBold'#0#11'ParentColor'#8#4'Left'#2#12#6'Height'#2#14#3'Top'#3#132#0#5
+  +'bel'#7'OutSize'#18'BorderSpacing.Left'#2#12#7'Caption'#6#7'OutSize'#5'Color'
-  +'Width'#2'H'#0#0#6'TLabel'#13'OutIncludedBy'#18'BorderSpacing.Left'#2#12#7'C'
+  +#7#6'clNone'#11'ParentColor'#8#22'AnchorSideLeft.Control'#7#5'USize'#4'Left'
-  +'aption'#6#13'OutIncludedBy'#5'Color'#7#6'clNone'#11'ParentColor'#8#22'Ancho'
+  +#2'8'#6'Height'#2#14#3'Top'#2'H'#5'Width'#2'&'#0#0#6'TLabel'#5'USize'#9'Alig'
-  +'rSideLeft.Control'#7#11'UIncludedBy'#4'Left'#2'`'#6'Height'#2#14#3'Top'#3
+  +'nment'#7#14'taRightJustify'#7'Caption'#6#5'USize'#5'Color'#7#6'clNone'#10'F'
-  +#132#0#5'Width'#2'H'#0#0#6'TLabel'#7'OutSize'#18'BorderSpacing.Left'#2#12#7
+  +'ont.Style'#11#6'fsBold'#0#11'ParentColor'#8#4'Left'#2#12#6'Height'#2#14#3'T'
-  +'Caption'#6#7'OutSize'#5'Color'#7#6'clNone'#11'ParentColor'#8#22'AnchorSideL'
+  +'op'#2'H'#5'Width'#2' '#0#0#6'TLabel'#10'UInProject'#9'Alignment'#7#14'taRig'
-  +'eft.Control'#7#5'USize'#4'Left'#2'8'#6'Height'#2#14#3'Top'#2'H'#5'Width'#2
+  +'htJustify'#7'Caption'#6#10'UInProject'#5'Color'#7#6'clNone'#10'Font.Style'
-  +'&'#0#0#6'TLabel'#5'USize'#9'Alignment'#7#14'taRightJustify'#7'Caption'#6#5
+  +#11#6'fsBold'#0#11'ParentColor'#8#4'Left'#2#12#6'Height'#2#14#3'Top'#2'4'#5
-  +'USize'#5'Color'#7#6'clNone'#10'Font.Style'#11#6'fsBold'#0#11'ParentColor'#8
+  +'Width'#2'>'#0#0#6'TLabel'#12'OutInProject'#18'BorderSpacing.Left'#2#12#7'Ca'
-  +#4'Left'#2#12#6'Height'#2#14#3'Top'#2'H'#5'Width'#2' '#0#0#6'TLabel'#10'UInP'
+  +'ption'#6#12'OutInProject'#5'Color'#7#6'clNone'#11'ParentColor'#8#22'AnchorS'
-  +'roject'#9'Alignment'#7#14'taRightJustify'#7'Caption'#6#10'UInProject'#5'Col'
+  +'ideLeft.Control'#7#10'UInProject'#4'Left'#2'V'#6'Height'#2#14#3'Top'#2'4'#5
-  +'or'#7#6'clNone'#10'Font.Style'#11#6'fsBold'#0#11'ParentColor'#8#4'Left'#2#12
+  +'Width'#2'?'#0#0#6'TLabel'#7'OutType'#18'BorderSpacing.Left'#2#12#7'Caption'
-  +#6'Height'#2#14#3'Top'#2'4'#5'Width'#2'>'#0#0#6'TLabel'#12'OutInProject'#18
+  +#6#7'OutType'#5'Color'#7#6'clNone'#11'ParentColor'#8#22'AnchorSideLeft.Contr'
-  +'BorderSpacing.Left'#2#12#7'Caption'#6#12'OutInProject'#5'Color'#7#6'clNone'
+  +'ol'#7#5'UType'#4'Left'#2'='#6'Height'#2#14#3'Top'#2' '#5'Width'#2'+'#0#0#6
-  +#11'ParentColor'#8#22'AnchorSideLeft.Control'#7#10'UInProject'#4'Left'#2'V'#6
+  +'TLabel'#5'UType'#9'Alignment'#7#14'taRightJustify'#7'Caption'#6#5'UType'#5
-  +'Height'#2#14#3'Top'#2'4'#5'Width'#2'?'#0#0#6'TLabel'#7'OutType'#18'BorderSp'
+  +'Color'#7#6'clNone'#10'Font.Style'#11#6'fsBold'#0#11'ParentColor'#8#4'Left'#2
-  +'acing.Left'#2#12#7'Caption'#6#7'OutType'#5'Color'#7#6'clNone'#11'ParentColo'
+  +#12#6'Height'#2#14#3'Top'#2' '#5'Width'#2'%'#0#0#6'TLabel'#7'OutName'#18'Bor'
-  +'r'#8#22'AnchorSideLeft.Control'#7#5'UType'#4'Left'#2'='#6'Height'#2#14#3'To'
+  +'derSpacing.Left'#2#12#7'Caption'#6#7'OutName'#5'Color'#7#6'clNone'#11'Paren'
-  +'p'#2' '#5'Width'#2'+'#0#0#6'TLabel'#5'UType'#9'Alignment'#7#14'taRightJusti'
+  +'tColor'#8#22'AnchorSideLeft.Control'#7#5'UName'#4'Left'#2'A'#6'Height'#2#14
-  +'fy'#7'Caption'#6#5'UType'#5'Color'#7#6'clNone'#10'Font.Style'#11#6'fsBold'#0
+  +#3'Top'#2#12#5'Width'#2'.'#0#0#6'TLabel'#5'UName'#9'Alignment'#7#14'taRightJ'
-  +#11'ParentColor'#8#4'Left'#2#12#6'Height'#2#14#3'Top'#2' '#5'Width'#2'%'#0#0
+  +'ustify'#7'Caption'#6#5'UName'#5'Color'#7#6'clNone'#10'Font.Style'#11#6'fsBo'
-  +#6'TLabel'#7'OutName'#18'BorderSpacing.Left'#2#12#7'Caption'#6#7'OutName'#5
+  +'ld'#0#11'ParentColor'#8#8'OnResize'#7#17'UnitInfoDlgResize'#4'Left'#2#12#6
-  +'Color'#7#6'clNone'#11'ParentColor'#8#22'AnchorSideLeft.Control'#7#5'UName'#4
+  +'Height'#2#14#3'Top'#2#12#5'Width'#2')'#0#0#7'TButton'#15'ClearIncludedBy'#8
-  +'Left'#2'A'#6'Height'#2#14#3'Top'#2#12#5'Width'#2'.'#0#0#6'TLabel'#5'UName'#9
+  +'AutoSize'#9#17'BorderSpacing.Top'#2#18#25'BorderSpacing.InnerBorder'#2#2#7
-  +'Alignment'#7#14'taRightJustify'#7'Caption'#6#5'UName'#5'Color'#7#6'clNone'
+  +'Caption'#6#15'ClearIncludedBy'#7'OnClick'#7#20'clearIncludedByClick'#8'TabO'
-  +#10'Font.Style'#11#6'fsBold'#0#11'ParentColor'#8#4'Left'#2#12#6'Height'#2#14
+  +'rder'#2#0#21'AnchorSideTop.Control'#7#11'UIncludedBy'#4'Left'#2#12#6'Height'
-  +#3'Top'#2#12#5'Width'#2')'#0#0#7'TButton'#15'ClearIncludedBy'#8'AutoSize'#9
+  +#2#29#3'Top'#3#164#0#5'Width'#2'e'#0#0#0#5'TPage'#5'Page2'#7'Caption'#6#5'Pa'
-  +#17'BorderSpacing.Top'#2#18#25'BorderSpacing.InnerBorder'#2#2#7'Caption'#6#15
+  +'ge2'#11'ClientWidth'#3#224#1#12'ClientHeight'#3#200#0#6'Height'#3#200#0#5'W'
-  +'ClearIncludedBy'#7'OnClick'#7#20'clearIncludedByClick'#8'TabOrder'#2#0#21'A'
+  +'idth'#3#224#1#0#5'TMemo'#12'UnitPathMemo'#5'Align'#7#8'alClient'#20'BorderS'
-  +'nchorSideTop.Control'#7#11'UIncludedBy'#4'Left'#2#12#6'Height'#2#29#3'Top'#3
+  +'pacing.Around'#2#6#10'ScrollBars'#7#10'ssAutoBoth'#8'TabOrder'#2#0#4'Left'#2
-  +#164#0#5'Width'#2'e'#0#0#0#5'TPage'#5'Page2'#7'Caption'#6#5'Page2'#11'Client'
+  +#6#6'Height'#3#188#0#3'Top'#2#6#5'Width'#3#212#1#0#0#0#5'TPage'#5'Page3'#7'C'
-  +'Width'#3#224#1#12'ClientHeight'#3#200#0#6'Height'#3#200#0#5'Width'#3#224#1#0
+  +'aption'#6#5'Page3'#11'ClientWidth'#3#224#1#12'ClientHeight'#3#200#0#6'Heigh'
-  +#5'TMemo'#12'UnitPathMemo'#5'Align'#7#8'alClient'#20'BorderSpacing.Around'#2
+  +'t'#3#200#0#5'Width'#3#224#1#0#5'TMemo'#15'IncludePathMemo'#5'Align'#7#8'alC'
-  ,#6#10'ScrollBars'#7#10'ssAutoBoth'#8'TabOrder'#2#0#4'Left'#2#6#6'Height'#3
+  ,'lient'#20'BorderSpacing.Around'#2#6#10'ScrollBars'#7#10'ssAutoBoth'#8'TabOr'
-  +#188#0#3'Top'#2#6#5'Width'#3#212#1#0#0#0#5'TPage'#5'Page3'#7'Caption'#6#5'Pa'
+  +'der'#2#0#4'Left'#2#6#6'Height'#3#204#0#3'Top'#2#6#5'Width'#3#212#1#0#0#0#5
-  +'ge3'#11'ClientWidth'#3#224#1#12'ClientHeight'#3#200#0#6'Height'#3#200#0#5'W'
+  +'TPage'#5'Page4'#7'Caption'#6#5'Page4'#11'ClientWidth'#3#224#1#12'ClientHeig'
-  +'idth'#3#224#1#0#5'TMemo'#15'IncludePathMemo'#5'Align'#7#8'alClient'#20'Bord'
+  +'ht'#3#200#0#6'Height'#3#200#0#5'Width'#3#224#1#0#5'TMemo'#11'SrcPathMemo'#5
-  +'erSpacing.Around'#2#6#10'ScrollBars'#7#10'ssAutoBoth'#8'TabOrder'#2#0#4'Lef'
+  +'Align'#7#8'alClient'#20'BorderSpacing.Around'#2#6#10'ScrollBars'#7#10'ssAut'
-  +'t'#2#6#6'Height'#3#204#0#3'Top'#2#6#5'Width'#3#212#1#0#0#0#5'TPage'#5'Page4'
+  +'oBoth'#8'TabOrder'#2#0#4'Left'#2#6#6'Height'#3#180#0#3'Top'#2#6#5'Width'#3
-  +#7'Caption'#6#5'Page4'#11'ClientWidth'#3#224#1#12'ClientHeight'#3#200#0#6'He'
+  +#212#1#0#0#0#0#7'TButton'#19'CodeToolsDefsButton'#8'AutoSize'#9#25'BorderSpa'
-  +'ight'#3#200#0#5'Width'#3#224#1#0#5'TMemo'#11'SrcPathMemo'#5'Align'#7#8'alCl'
+  +'cing.InnerBorder'#2#2#7'Caption'#6#19'CodeToolsDefsButton'#7'OnClick'#7#24
-  +'ient'#20'BorderSpacing.Around'#2#6#10'ScrollBars'#7#10'ssAutoBoth'#8'TabOrd'
+  +'CodeToolsDefsButtonClick'#8'TabOrder'#2#2#4'Left'#2#6#6'Height'#2#29#3'Top'
-  +'er'#2#0#4'Left'#2#6#6'Height'#3#180#0#3'Top'#2#6#5'Width'#3#212#1#0#0#0#0#7
+  +#3#240#0#5'Width'#3#128#0#0#0#0
-  +'TButton'#19'CodeToolsDefsButton'#8'AutoSize'#9#25'BorderSpacing.InnerBorder'
-  +#2#2#7'Caption'#6#19'CodeToolsDefsButton'#7'OnClick'#7#24'CodeToolsDefsButto'
-  +'nClick'#8'TabOrder'#2#3#4'Left'#2#6#6'Height'#2#29#3'Top'#3#240#0#5'Width'#3
-  +#128#0#0#0#0
 ]);

ide/unitinfodlg.pp

@@ -34,10 +34,9 @@ type
 
   { TUnitInfoDialog }
 
-  TUnitInfoDialog = class(TFORM)
+  TUnitInfoDialog = class(TForm)
     CodeToolsDefsButton: TButton;
     OkButton: TBitBtn;
-    HelpButton: TBitBtn;
     ClearIncludedBy: TButton;
     UnitPathMemo: TMemo;
     IncludePathMemo: TMemo;
@@ -71,13 +70,12 @@ type
     FFilePath: string;
     function getIncludedBy: string;
   public
-    constructor Create(AOwner:TComponent); override;
+    constructor Create(AOwner: TComponent); override;
   end;
 
 function ShowUnitInfoDlg(const AnUnitName, AType: string;
   IsPartOfProject: boolean; SizeInBytes, LineCount: integer;
-  const FilePath: string;
+  const FilePath: string; const IncludedBy: string; var ClearIncludedBy: boolean;
-  const IncludedBy: string; var ClearIncludedBy: boolean;
   const UnitPath, IncludePath, SrcPath: string): TModalResult;
 
 implementation
@@ -86,8 +84,7 @@ uses LResources;
 
 function ShowUnitInfoDlg(const AnUnitName, AType: string;
   IsPartOfProject: boolean; SizeInBytes, LineCount: integer;
-  const FilePath: string;
+  const FilePath: string; const IncludedBy: string; var ClearIncludedBy: boolean;
-  const IncludedBy: string; var ClearIncludedBy: boolean;
   const UnitPath, IncludePath, SrcPath: string): TModalResult;
 var Dlg: TUnitInfoDialog;
 begin
@@ -214,4 +211,3 @@ initialization
   {$I unitinfodlg.lrs}
   
 end.
-