From 6462b81ca75ba6b05bcbf4a00704920435f15bc3 Mon Sep 17 00:00:00 2001 From: maxim Date: Sun, 14 Nov 2010 18:51:12 +0000 Subject: [PATCH] IDE, Build Lazarus dialog: increase its default size to make this dialog look better with e.g. GTK2 git-svn-id: trunk@28219 - --- ide/buildlazdialog.lfm | 224 ++++++++++++++++++++--------------------- ide/buildlazdialog.pas | 9 +- 2 files changed, 117 insertions(+), 116 deletions(-) diff --git a/ide/buildlazdialog.lfm b/ide/buildlazdialog.lfm index 9238cfebef..ece32442db 100644 --- a/ide/buildlazdialog.lfm +++ b/ide/buildlazdialog.lfm @@ -2,12 +2,12 @@ object ConfigureBuildLazarusDlg: TConfigureBuildLazarusDlg Left = 333 Height = 529 Top = 113 - Width = 664 + Width = 700 VertScrollBar.Visible = False BorderIcons = [biSystemMenu] Caption = 'ConfigureBuildLazarusDlg' ClientHeight = 529 - ClientWidth = 664 + ClientWidth = 700 Constraints.MinHeight = 500 Constraints.MinWidth = 462 OnCreate = FormCreate @@ -17,19 +17,19 @@ object ConfigureBuildLazarusDlg: TConfigureBuildLazarusDlg LCLVersion = '0.9.29' object DetailsPanel: TPanel Left = 0 - Height = 486 + Height = 491 Top = 0 - Width = 664 + Width = 700 Align = alClient - ClientHeight = 486 - ClientWidth = 664 + ClientHeight = 491 + ClientWidth = 700 TabOrder = 0 object BuildProfileLabel: TLabel AnchorSideTop.Control = DetailsPanel Left = 8 - Height = 16 + Height = 14 Top = 12 - Width = 89 + Width = 69 BorderSpacing.Top = 5 BorderSpacing.Around = 6 Caption = 'Profile to Build' @@ -41,8 +41,8 @@ object ConfigureBuildLazarusDlg: TConfigureBuildLazarusDlg AnchorSideTop.Side = asrBottom Left = 6 Height = 24 - Top = 38 - Width = 354 + Top = 36 + Width = 410 DragReorder = False Sections = <> OnSectionClick = MakeModeListHeaderSectionClick @@ -57,9 +57,9 @@ object ConfigureBuildLazarusDlg: TConfigureBuildLazarusDlg AnchorSideRight.Side = asrBottom AnchorSideBottom.Control = LCLWidgetTypeComboBox Left = 4 - Height = 181 - Top = 62 - Width = 356 + Height = 198 + Top = 60 + Width = 412 Anchors = [akTop, akLeft, akRight, akBottom] BorderSpacing.Bottom = 6 ItemHeight = 25 @@ -77,15 +77,15 @@ object ConfigureBuildLazarusDlg: TConfigureBuildLazarusDlg AnchorSideTop.Control = BuildProfileLabel AnchorSideTop.Side = asrCenter AnchorSideRight.Control = BuildProfileButton - Left = 103 - Height = 24 + Left = 83 + Height = 21 Hint = 'Name of the active profile.' - Top = 8 - Width = 513 + Top = 9 + Width = 566 Anchors = [akTop, akLeft, akRight] BorderSpacing.Left = 6 BorderSpacing.Right = 6 - ItemHeight = 0 + ItemHeight = 13 OnSelect = BuildProfileComboBoxSelect ParentShowHint = False ShowHint = True @@ -98,11 +98,11 @@ object ConfigureBuildLazarusDlg: TConfigureBuildLazarusDlg AnchorSideRight.Control = DetailsPanel AnchorSideRight.Side = asrBottom AnchorSideBottom.Side = asrBottom - Left = 622 - Height = 24 + Left = 655 + Height = 23 Hint = 'Manage profiles' Top = 8 - Width = 35 + Width = 38 Anchors = [akTop, akRight] AutoSize = True BorderSpacing.Left = 6 @@ -117,9 +117,9 @@ object ConfigureBuildLazarusDlg: TConfigureBuildLazarusDlg AnchorSideLeft.Control = LCLWidgetTypeLabel AnchorSideTop.Control = OptionsMemo Left = 6 - Height = 16 - Top = 283 - Width = 49 + Height = 14 + Top = 295 + Width = 38 Alignment = taRightJustify BorderSpacing.Top = 4 Caption = 'Options' @@ -132,11 +132,11 @@ object ConfigureBuildLazarusDlg: TConfigureBuildLazarusDlg AnchorSideRight.Control = BuildProfileButton AnchorSideRight.Side = asrBottom AnchorSideBottom.Control = TargetDirectoryComboBox - Left = 140 + Left = 120 Height = 56 Hint = 'Options passed to compiler' - Top = 279 - Width = 517 + Top = 291 + Width = 573 Anchors = [akLeft, akRight, akBottom] BorderSpacing.Bottom = 6 Lines.Strings = ( @@ -153,10 +153,10 @@ object ConfigureBuildLazarusDlg: TConfigureBuildLazarusDlg AnchorSideLeft.Side = asrBottom AnchorSideTop.Control = MakeModeListHeader AnchorSideTop.Side = asrCenter - Left = 367 - Height = 16 - Top = 42 - Width = 47 + Left = 423 + Height = 14 + Top = 41 + Width = 37 BorderSpacing.Left = 7 Caption = 'Defines' ParentColor = False @@ -169,11 +169,11 @@ object ConfigureBuildLazarusDlg: TConfigureBuildLazarusDlg AnchorSideRight.Side = asrBottom AnchorSideBottom.Control = MakeModeListBox AnchorSideBottom.Side = asrBottom - Left = 367 - Height = 183 + Left = 423 + Height = 201 Hint = 'Defines without -d' - Top = 60 - Width = 290 + Top = 57 + Width = 270 Anchors = [akTop, akLeft, akRight, akBottom] BorderSpacing.Top = 2 ItemHeight = 0 @@ -187,9 +187,9 @@ object ConfigureBuildLazarusDlg: TConfigureBuildLazarusDlg AnchorSideTop.Control = LCLWidgetTypeComboBox AnchorSideTop.Side = asrCenter Left = 6 - Height = 16 - Top = 253 - Width = 102 + Height = 14 + Top = 267 + Width = 82 BorderSpacing.Left = 5 Caption = 'LCL Widget Type' ParentColor = False @@ -200,14 +200,14 @@ object ConfigureBuildLazarusDlg: TConfigureBuildLazarusDlg AnchorSideTop.Side = asrBottom AnchorSideRight.Side = asrBottom AnchorSideBottom.Control = OptionsMemo - Left = 140 - Height = 24 - Top = 249 + Left = 120 + Height = 21 + Top = 264 Width = 163 Anchors = [akLeft, akBottom] BorderSpacing.Left = 32 BorderSpacing.Bottom = 6 - ItemHeight = 0 + ItemHeight = 13 Style = csDropDownList TabOrder = 4 end @@ -216,9 +216,9 @@ object ConfigureBuildLazarusDlg: TConfigureBuildLazarusDlg AnchorSideTop.Control = TargetDirectoryComboBox AnchorSideTop.Side = asrCenter Left = 6 - Height = 16 - Top = 344 - Width = 102 + Height = 14 + Top = 356 + Width = 80 Alignment = taRightJustify Caption = 'Target Directory' ParentColor = False @@ -228,14 +228,14 @@ object ConfigureBuildLazarusDlg: TConfigureBuildLazarusDlg AnchorSideTop.Side = asrBottom AnchorSideRight.Control = TargetDirectoryButton AnchorSideBottom.Control = TargetOSComboBox - Left = 140 - Height = 23 - Top = 341 - Width = 476 + Left = 120 + Height = 21 + Top = 353 + Width = 529 Anchors = [akLeft, akRight, akBottom] BorderSpacing.Right = 6 BorderSpacing.Bottom = 6 - ItemHeight = 0 + ItemHeight = 13 TabOrder = 6 end object TargetOSLabel: TLabel @@ -243,9 +243,9 @@ object ConfigureBuildLazarusDlg: TConfigureBuildLazarusDlg AnchorSideTop.Control = TargetOSComboBox AnchorSideTop.Side = asrCenter Left = 6 - Height = 16 - Top = 373 - Width = 63 + Height = 14 + Top = 383 + Width = 50 Alignment = taRightJustify Caption = 'Target OS' ParentColor = False @@ -255,9 +255,9 @@ object ConfigureBuildLazarusDlg: TConfigureBuildLazarusDlg AnchorSideTop.Control = TargetCPUComboBox AnchorSideTop.Side = asrCenter Left = 6 - Height = 16 - Top = 402 - Width = 69 + Height = 14 + Top = 410 + Width = 56 Alignment = taRightJustify Caption = 'Target CPU' ParentColor = False @@ -268,11 +268,11 @@ object ConfigureBuildLazarusDlg: TConfigureBuildLazarusDlg AnchorSideTop.Control = CleanAllCheckBox AnchorSideTop.Side = asrCenter AnchorSideBottom.Side = asrBottom - Left = 467 - Height = 21 + Left = 417 + Height = 17 Hint = 'Increment revision? (ToDo: get a better hint)' - Top = 371 - Width = 199 + Top = 382 + Width = 155 BorderSpacing.Left = 12 BorderSpacing.Top = 6 Caption = 'UpdateRevisionIncCheckBox' @@ -286,11 +286,11 @@ object ConfigureBuildLazarusDlg: TConfigureBuildLazarusDlg AnchorSideTop.Control = TargetOSComboBox AnchorSideTop.Side = asrCenter AnchorSideRight.Side = asrBottom - Left = 322 - Height = 21 + Left = 302 + Height = 17 Hint = 'Like "make clean" on cmd line' - Top = 371 - Width = 133 + Top = 382 + Width = 103 BorderSpacing.Left = 19 Caption = 'CleanAllCheckBox' ParentShowHint = False @@ -303,13 +303,13 @@ object ConfigureBuildLazarusDlg: TConfigureBuildLazarusDlg AnchorSideRight.Control = TargetOSComboBox AnchorSideRight.Side = asrBottom AnchorSideBottom.Control = CommonsDividerBevel - Left = 140 - Height = 23 - Top = 399 + Left = 120 + Height = 21 + Top = 407 Width = 163 Anchors = [akLeft, akRight, akBottom] BorderSpacing.Bottom = 6 - ItemHeight = 0 + ItemHeight = 13 TabOrder = 9 end object WithStaticPackagesCheckBox: TCheckBox @@ -317,11 +317,11 @@ object ConfigureBuildLazarusDlg: TConfigureBuildLazarusDlg AnchorSideTop.Control = TargetCPUComboBox AnchorSideTop.Side = asrCenter AnchorSideBottom.Side = asrBottom - Left = 322 - Height = 21 + Left = 302 + Height = 17 Hint = 'Compile selected static packages into Lazarus binary' - Top = 400 - Width = 207 + Top = 409 + Width = 159 Caption = 'WithStaticPackagesCheckBox' ParentShowHint = False ShowHint = True @@ -333,8 +333,8 @@ object ConfigureBuildLazarusDlg: TConfigureBuildLazarusDlg AnchorSideBottom.Control = DefinesButton Left = 8 Height = 17 - Top = 428 - Width = 650 + Top = 434 + Width = 686 Caption = 'CommonsDividerBevel' Anchors = [akLeft, akRight, akBottom] BorderSpacing.Left = 7 @@ -347,10 +347,10 @@ object ConfigureBuildLazarusDlg: TConfigureBuildLazarusDlg AnchorSideTop.Side = asrCenter AnchorSideBottom.Side = asrBottom Left = 8 - Height = 21 + Height = 17 Hint = 'Restart Lazarus automatically after building the IDE. Has no effect when building other parts' - Top = 453 - Width = 190 + Top = 460 + Width = 148 BorderSpacing.Top = 4 Caption = 'RestartAfterBuildCheckBox' ParentShowHint = False @@ -361,11 +361,11 @@ object ConfigureBuildLazarusDlg: TConfigureBuildLazarusDlg AnchorSideLeft.Control = RestartAfterBuildCheckBox AnchorSideLeft.Side = asrBottom AnchorSideTop.Control = RestartAfterBuildCheckBox - Left = 210 - Height = 21 + Left = 168 + Height = 17 Hint = 'Show confirmation dialog when building directly from Tools menu' - Top = 453 - Width = 160 + Top = 460 + Width = 124 BorderSpacing.Left = 12 Caption = 'ConfirmBuildCheckBox' ParentShowHint = False @@ -378,11 +378,11 @@ object ConfigureBuildLazarusDlg: TConfigureBuildLazarusDlg AnchorSideRight.Side = asrBottom AnchorSideBottom.Control = DetailsPanel AnchorSideBottom.Side = asrBottom - Left = 558 - Height = 24 + Left = 610 + Height = 23 Hint = 'Edit list of defines which can be used by any profile' - Top = 451 - Width = 99 + Top = 457 + Width = 83 Anchors = [akRight, akBottom] AutoSize = True BorderSpacing.Bottom = 10 @@ -399,10 +399,10 @@ object ConfigureBuildLazarusDlg: TConfigureBuildLazarusDlg AnchorSideRight.Control = DetailsPanel AnchorSideRight.Side = asrBottom AnchorSideBottom.Side = asrBottom - Left = 622 - Height = 24 - Top = 340 - Width = 35 + Left = 655 + Height = 23 + Top = 352 + Width = 38 Anchors = [akTop, akRight] AutoSize = True BorderSpacing.Left = 6 @@ -417,33 +417,33 @@ object ConfigureBuildLazarusDlg: TConfigureBuildLazarusDlg AnchorSideRight.Control = LCLWidgetTypeComboBox AnchorSideRight.Side = asrBottom AnchorSideBottom.Control = TargetCPUComboBox - Left = 140 - Height = 23 - Top = 370 + Left = 120 + Height = 21 + Top = 380 Width = 163 Anchors = [akLeft, akRight, akBottom] BorderSpacing.Bottom = 6 - ItemHeight = 0 + ItemHeight = 13 TabOrder = 8 end end object CBLDBtnPanel: TPanel AnchorSideTop.Side = asrBottom Left = 0 - Height = 43 - Top = 486 - Width = 664 + Height = 38 + Top = 491 + Width = 700 Align = alBottom AutoSize = True BevelOuter = bvNone - ClientHeight = 43 - ClientWidth = 664 + ClientHeight = 38 + ClientWidth = 700 TabOrder = 1 object CancelButton: TBitBtn - Left = 563 - Height = 31 + Left = 617 + Height = 26 Top = 6 - Width = 95 + Width = 77 Align = alRight AutoSize = True BorderSpacing.Around = 6 @@ -455,10 +455,10 @@ object ConfigureBuildLazarusDlg: TConfigureBuildLazarusDlg TabOrder = 4 end object SaveSettingsButton: TBitBtn - Left = 446 - Height = 31 + Left = 520 + Height = 26 Top = 6 - Width = 111 + Width = 91 Align = alRight AutoSize = True BorderSpacing.Around = 6 @@ -468,10 +468,10 @@ object ConfigureBuildLazarusDlg: TConfigureBuildLazarusDlg TabOrder = 3 end object CompileButton: TBitBtn - Left = 219 - Height = 31 + Left = 331 + Height = 26 Top = 6 - Width = 75 + Width = 63 Align = alRight AutoSize = True BorderSpacing.Around = 6 @@ -482,9 +482,9 @@ object ConfigureBuildLazarusDlg: TConfigureBuildLazarusDlg end object HelpButton: TBitBtn Left = 6 - Height = 31 + Height = 26 Top = 6 - Width = 82 + Width = 66 Align = alLeft AutoSize = True BorderSpacing.Around = 6 @@ -495,10 +495,10 @@ object ConfigureBuildLazarusDlg: TConfigureBuildLazarusDlg TabOrder = 0 end object CompileAdvancedButton: TBitBtn - Left = 300 - Height = 31 + Left = 400 + Height = 26 Top = 6 - Width = 140 + Width = 114 Align = alRight AutoSize = True BorderSpacing.Around = 6 diff --git a/ide/buildlazdialog.pas b/ide/buildlazdialog.pas index 3bef33a9f7..7bfc1cf969 100644 --- a/ide/buildlazdialog.pas +++ b/ide/buildlazdialog.pas @@ -175,6 +175,7 @@ implementation const DefaultIDEMakeOptionFilename = 'idemake.cfg'; ButtonSize = 24; + ModeColumnWidth = 170; function GetTranslatedMakeModes(MakeMode: TMakeMode): string; begin @@ -751,14 +752,14 @@ begin end; with MakeModeListHeader.Sections.Add do begin - Width := MakeModeListHeader.Width - 120 - 3 * ButtonSize; + Width := MakeModeListHeader.Width - ModeColumnWidth - 3 * ButtonSize; MinWidth := Width; MaxWidth := Width; Text := lisLazBuildABOPart; end; with MakeModeListHeader.Sections.Add do begin - Width := 120; + Width := ModeColumnWidth; MinWidth := Width; MaxWidth := Width; Text := lisLazBuildABOAction; @@ -882,7 +883,7 @@ end; procedure TConfigureBuildLazarusDlg.MakeModeListHeaderResize(Sender: TObject); begin if MakeModeListHeader.Sections.Count >= 3 then - MakeModeListHeader.Sections[3].Width := MakeModeListHeader.Width - 120 - 3 * ButtonSize; + MakeModeListHeader.Sections[3].Width := MakeModeListHeader.Width - ModeColumnWidth - 3 * ButtonSize; end; procedure TConfigureBuildLazarusDlg.MakeModeListHeaderSectionClick( @@ -958,7 +959,7 @@ begin MakeModeListBox.Canvas.TextOut(x+2, ARect.Top+(ARect.Bottom-ARect.Top-TxtH) div 2, CurMmDef.Description); // draw make mode text - x:=MakeModeListBox.ClientWidth-120; + x:=MakeModeListBox.ClientWidth-ModeColumnWidth; MakeModeListBox.Canvas.TextOut(x+2, ARect.Top+(ARect.Bottom-ARect.Top-TxtH) div 2, GetTranslatedMakeModes(CurMmVal)); end;