From f6a9f6862ee48604bce2d4af8fe3948d8aaa7ca4 Mon Sep 17 00:00:00 2001 From: juha Date: Mon, 23 Nov 2015 17:15:51 +0000 Subject: [PATCH] IDE: Improve CheckCompilerOptions layout. Issue #29072, patch from Alexey Torgashin. git-svn-id: trunk@50483 - --- ide/checkcompileropts.lfm | 114 +++++++++++++++++--------------------- ide/checkcompileropts.pas | 22 ++++---- 2 files changed, 63 insertions(+), 73 deletions(-) diff --git a/ide/checkcompileropts.lfm b/ide/checkcompileropts.lfm index 284e3e845f..e380ae200d 100644 --- a/ide/checkcompileropts.lfm +++ b/ide/checkcompileropts.lfm @@ -1,79 +1,27 @@ object CheckCompilerOptsDlg: TCheckCompilerOptsDlg - Left = 322 - Height = 307 - Top = 220 + Left = 653 + Height = 389 + Top = 418 Width = 624 BorderIcons = [biSystemMenu] Caption = 'CheckCompilerOptsDlg' - ClientHeight = 307 + ClientHeight = 389 ClientWidth = 624 Position = poScreenCenter - LCLVersion = '0.9.31' - 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 + LCLVersion = '1.5' object Splitter1: TSplitter Cursor = crVSplit Left = 0 Height = 5 - Top = 111 + Top = 174 Width = 624 Align = alTop ResizeAnchor = akTop end object ButtonPanel: TButtonPanel Left = 6 - Height = 34 - Top = 267 + Height = 29 + Top = 354 Width = 612 OKButton.Name = 'OKButton' OKButton.DefaultCaption = True @@ -87,9 +35,51 @@ object CheckCompilerOptsDlg: TCheckCompilerOptsDlg ShowButtons = [pbClose] ShowBevel = False 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 - left = 160 - top = 175 + left = 472 + top = 392 object CopyOutputMenuItem: TMenuItem Caption = 'CopyOutputMenuItem' OnClick = CopyOutputMenuItemClick diff --git a/ide/checkcompileropts.pas b/ide/checkcompileropts.pas index 69b029cc2c..954ab5e261 100644 --- a/ide/checkcompileropts.pas +++ b/ide/checkcompileropts.pas @@ -72,8 +72,8 @@ type OutputTreeView: TTreeView; Splitter1: TSplitter; TestMemo: TMemo; - TestGroupbox: TGroupBox; - OutputGroupBox: TGroupBox; + LabelTest: TLabel; + LabelOutput: TLabel; procedure ApplicationOnIdle(Sender: TObject; var {%H-}Done: Boolean); procedure CopyOutputMenuItemClick(Sender: TObject); private @@ -262,7 +262,7 @@ var CompilerFiles: TStrings; begin FTest:=cotCheckCompilerExe; - TestGroupbox.Caption:=dlgCCOTestCheckingCompiler; + LabelTest.Caption:=dlgCCOTestCheckingCompiler; try CheckIfFileIsExecutable(CompilerFilename); except @@ -304,7 +304,7 @@ var begin // compile bogus file FTest:=cotCompileBogusFiles; - TestGroupbox.Caption:=dlgCCOTestCompilingEmptyFile; + LabelTest.Caption:=dlgCCOTestCompilingEmptyFile; // get Test directory TestDir:=AppendPathDelim(LazarusIDE.GetTestBuildDirectory); @@ -418,7 +418,7 @@ var CfgCount: Integer; begin FTest:=cotCheckCompilerConfig; - TestGroupbox.Caption:=dlgCCOTestCheckingCompilerConfig; + LabelTest.Caption:=dlgCCOTestCheckingCompilerConfig; CfgCount:=0; for i:=0 to CfgCache.ConfigFiles.Count-1 do begin @@ -500,7 +500,7 @@ function TCheckCompilerOptsDlg.CheckMissingFPCPPUs( begin FTest:=cotCheckMissingFPCPPUs; - TestGroupbox.Caption:=dlgCCOTestMissingPPU; + LabelTest.Caption:=dlgCCOTestMissingPPU; Result:=mrCancel; @@ -560,7 +560,7 @@ begin if CfgCache.Units=nil then exit(mrOK); FTest:=cotCheckCompilerDate; - TestGroupbox.Caption:=dlgCCOTestCompilerDate; + LabelTest.Caption:=dlgCCOTestCompilerDate; Result:=mrCancel; @@ -672,7 +672,7 @@ var WarnedDirectories: TStringList; begin FTest:=cotCheckFPCUnitPathsContainSources; - TestGroupbox.Caption:=dlgCCOTestSrcInPPUPaths; + LabelTest.Caption:=dlgCCOTestSrcInPPUPaths; Result:=mrCancel; WarnedDirectories:=TStringList.Create; @@ -957,7 +957,7 @@ begin CompilerFiles.Free; CompileTool.Free; FTest:=cotNone; - TestGroupbox.Caption:=dlgCCOTest; + LabelTest.Caption:=dlgCCOTest; FPC_PPUs.Free; Target_PPUs.Free; end; @@ -969,8 +969,8 @@ begin inherited Create(TheOwner); IdleConnected:=true; Caption:=dlgCCOCaption; - TestGroupbox.Caption:=dlgCCOTest; - OutputGroupBox.Caption:=dlgCCOResults; + LabelTest.Caption:=dlgCCOTest; + LabelOutput.Caption:=dlgCCOResults; CopyOutputMenuItem.Caption:=lisCCOCopyOutputToCliboard; end;