IDE: Improve CheckCompilerOptions layout. Issue #29072, patch from Alexey Torgashin.

git-svn-id: trunk@50483 -
This commit is contained in:
juha 2015-11-23 17:15:51 +00:00
parent e41b6abb11
commit f6a9f6862e
2 changed files with 63 additions and 73 deletions

View File

@ -1,79 +1,27 @@
object CheckCompilerOptsDlg: TCheckCompilerOptsDlg object CheckCompilerOptsDlg: TCheckCompilerOptsDlg
Left = 322 Left = 653
Height = 307 Height = 389
Top = 220 Top = 418
Width = 624 Width = 624
BorderIcons = [biSystemMenu] BorderIcons = [biSystemMenu]
Caption = 'CheckCompilerOptsDlg' Caption = 'CheckCompilerOptsDlg'
ClientHeight = 307 ClientHeight = 389
ClientWidth = 624 ClientWidth = 624
Position = poScreenCenter Position = poScreenCenter
LCLVersion = '0.9.31' LCLVersion = '1.5'
object OutputGroupBox: TGroupBox
Left = 6
Height = 145
Top = 116
Width = 612
Align = alClient
Anchors = [akBottom]
BorderSpacing.Left = 6
BorderSpacing.Right = 6
BorderSpacing.Bottom = 6
Caption = 'Output'
ClientHeight = 129
ClientWidth = 608
TabOrder = 0
object OutputTreeView: TTreeView
Left = 0
Height = 129
Top = 0
Width = 608
Align = alClient
DefaultItemHeight = 16
PopupMenu = OutputPopupMenu
ReadOnly = True
TabOrder = 0
Options = [tvoAutoItemHeight, tvoHideSelection, tvoKeepCollapsedNodes, tvoReadOnly, tvoShowButtons, tvoShowLines, tvoShowRoot, tvoToolTips, tvoThemedDraw]
end
end
object TestGroupbox: TGroupBox
Left = 6
Height = 105
Top = 6
Width = 612
Align = alTop
Anchors = [akRight]
BorderSpacing.Left = 6
BorderSpacing.Top = 6
BorderSpacing.Right = 6
Caption = 'Test'
ClientHeight = 89
ClientWidth = 608
TabOrder = 1
object TestMemo: TMemo
Left = 6
Height = 77
Top = 6
Width = 596
Align = alClient
BorderSpacing.Around = 6
ScrollBars = ssAutoBoth
TabOrder = 0
end
end
object Splitter1: TSplitter object Splitter1: TSplitter
Cursor = crVSplit Cursor = crVSplit
Left = 0 Left = 0
Height = 5 Height = 5
Top = 111 Top = 174
Width = 624 Width = 624
Align = alTop Align = alTop
ResizeAnchor = akTop ResizeAnchor = akTop
end end
object ButtonPanel: TButtonPanel object ButtonPanel: TButtonPanel
Left = 6 Left = 6
Height = 34 Height = 29
Top = 267 Top = 354
Width = 612 Width = 612
OKButton.Name = 'OKButton' OKButton.Name = 'OKButton'
OKButton.DefaultCaption = True OKButton.DefaultCaption = True
@ -87,9 +35,51 @@ object CheckCompilerOptsDlg: TCheckCompilerOptsDlg
ShowButtons = [pbClose] ShowButtons = [pbClose]
ShowBevel = False ShowBevel = False
end end
object OutputTreeView: TTreeView
Left = 6
Height = 140
Top = 208
Width = 612
Align = alClient
BorderSpacing.Around = 6
PopupMenu = OutputPopupMenu
ReadOnly = True
TabOrder = 2
Options = [tvoAutoItemHeight, tvoHideSelection, tvoKeepCollapsedNodes, tvoReadOnly, tvoShowButtons, tvoShowLines, tvoShowRoot, tvoToolTips, tvoThemedDraw]
end
object TestMemo: TMemo
Left = 6
Height = 139
Top = 29
Width = 612
Align = alTop
BorderSpacing.Around = 6
ScrollBars = ssAutoBoth
TabOrder = 0
end
object LabelTest: TLabel
Left = 6
Height = 17
Top = 6
Width = 612
Align = alTop
BorderSpacing.Around = 6
Caption = 'LabelTest'
ParentColor = False
end
object LabelOutput: TLabel
Left = 6
Height = 17
Top = 185
Width = 612
Align = alTop
BorderSpacing.Around = 6
Caption = 'LabelOutput'
ParentColor = False
end
object OutputPopupMenu: TPopupMenu object OutputPopupMenu: TPopupMenu
left = 160 left = 472
top = 175 top = 392
object CopyOutputMenuItem: TMenuItem object CopyOutputMenuItem: TMenuItem
Caption = 'CopyOutputMenuItem' Caption = 'CopyOutputMenuItem'
OnClick = CopyOutputMenuItemClick OnClick = CopyOutputMenuItemClick

View File

@ -72,8 +72,8 @@ type
OutputTreeView: TTreeView; OutputTreeView: TTreeView;
Splitter1: TSplitter; Splitter1: TSplitter;
TestMemo: TMemo; TestMemo: TMemo;
TestGroupbox: TGroupBox; LabelTest: TLabel;
OutputGroupBox: TGroupBox; LabelOutput: TLabel;
procedure ApplicationOnIdle(Sender: TObject; var {%H-}Done: Boolean); procedure ApplicationOnIdle(Sender: TObject; var {%H-}Done: Boolean);
procedure CopyOutputMenuItemClick(Sender: TObject); procedure CopyOutputMenuItemClick(Sender: TObject);
private private
@ -262,7 +262,7 @@ var
CompilerFiles: TStrings; CompilerFiles: TStrings;
begin begin
FTest:=cotCheckCompilerExe; FTest:=cotCheckCompilerExe;
TestGroupbox.Caption:=dlgCCOTestCheckingCompiler; LabelTest.Caption:=dlgCCOTestCheckingCompiler;
try try
CheckIfFileIsExecutable(CompilerFilename); CheckIfFileIsExecutable(CompilerFilename);
except except
@ -304,7 +304,7 @@ var
begin begin
// compile bogus file // compile bogus file
FTest:=cotCompileBogusFiles; FTest:=cotCompileBogusFiles;
TestGroupbox.Caption:=dlgCCOTestCompilingEmptyFile; LabelTest.Caption:=dlgCCOTestCompilingEmptyFile;
// get Test directory // get Test directory
TestDir:=AppendPathDelim(LazarusIDE.GetTestBuildDirectory); TestDir:=AppendPathDelim(LazarusIDE.GetTestBuildDirectory);
@ -418,7 +418,7 @@ var
CfgCount: Integer; CfgCount: Integer;
begin begin
FTest:=cotCheckCompilerConfig; FTest:=cotCheckCompilerConfig;
TestGroupbox.Caption:=dlgCCOTestCheckingCompilerConfig; LabelTest.Caption:=dlgCCOTestCheckingCompilerConfig;
CfgCount:=0; CfgCount:=0;
for i:=0 to CfgCache.ConfigFiles.Count-1 do begin for i:=0 to CfgCache.ConfigFiles.Count-1 do begin
@ -500,7 +500,7 @@ function TCheckCompilerOptsDlg.CheckMissingFPCPPUs(
begin begin
FTest:=cotCheckMissingFPCPPUs; FTest:=cotCheckMissingFPCPPUs;
TestGroupbox.Caption:=dlgCCOTestMissingPPU; LabelTest.Caption:=dlgCCOTestMissingPPU;
Result:=mrCancel; Result:=mrCancel;
@ -560,7 +560,7 @@ begin
if CfgCache.Units=nil then exit(mrOK); if CfgCache.Units=nil then exit(mrOK);
FTest:=cotCheckCompilerDate; FTest:=cotCheckCompilerDate;
TestGroupbox.Caption:=dlgCCOTestCompilerDate; LabelTest.Caption:=dlgCCOTestCompilerDate;
Result:=mrCancel; Result:=mrCancel;
@ -672,7 +672,7 @@ var
WarnedDirectories: TStringList; WarnedDirectories: TStringList;
begin begin
FTest:=cotCheckFPCUnitPathsContainSources; FTest:=cotCheckFPCUnitPathsContainSources;
TestGroupbox.Caption:=dlgCCOTestSrcInPPUPaths; LabelTest.Caption:=dlgCCOTestSrcInPPUPaths;
Result:=mrCancel; Result:=mrCancel;
WarnedDirectories:=TStringList.Create; WarnedDirectories:=TStringList.Create;
@ -957,7 +957,7 @@ begin
CompilerFiles.Free; CompilerFiles.Free;
CompileTool.Free; CompileTool.Free;
FTest:=cotNone; FTest:=cotNone;
TestGroupbox.Caption:=dlgCCOTest; LabelTest.Caption:=dlgCCOTest;
FPC_PPUs.Free; FPC_PPUs.Free;
Target_PPUs.Free; Target_PPUs.Free;
end; end;
@ -969,8 +969,8 @@ begin
inherited Create(TheOwner); inherited Create(TheOwner);
IdleConnected:=true; IdleConnected:=true;
Caption:=dlgCCOCaption; Caption:=dlgCCOCaption;
TestGroupbox.Caption:=dlgCCOTest; LabelTest.Caption:=dlgCCOTest;
OutputGroupBox.Caption:=dlgCCOResults; LabelOutput.Caption:=dlgCCOResults;
CopyOutputMenuItem.Caption:=lisCCOCopyOutputToCliboard; CopyOutputMenuItem.Caption:=lisCCOCopyOutputToCliboard;
end; end;