From f7aef7afe085c9e04c1ce2eaca0cc2a7f2a7f699 Mon Sep 17 00:00:00 2001
From: juha <juha@lazarus-ide.org>
Date: Tue, 16 Jun 2015 11:32:46 +0000
Subject: [PATCH] IDE: BuildModeDiff dialog layout improvements. Issue #28297,
 patch from Alexey Torgashin.

git-svn-id: trunk@49348 -
---
 ide/buildmodediffdlg.lfm | 79 ++++++++++++++++++++--------------------
 ide/buildmodediffdlg.pas |  4 +-
 2 files changed, 42 insertions(+), 41 deletions(-)

diff --git a/ide/buildmodediffdlg.lfm b/ide/buildmodediffdlg.lfm
index 7006925d06..44086f93f3 100644
--- a/ide/buildmodediffdlg.lfm
+++ b/ide/buildmodediffdlg.lfm
@@ -1,27 +1,32 @@
 object BuildModeDiffDialog: TBuildModeDiffDialog
-  Left = 453
-  Height = 316
-  Top = 261
-  Width = 493
+  Left = 407
+  Height = 409
+  Top = 266
+  Width = 476
+  BorderIcons = [biSystemMenu, biMaximize]
   Caption = 'BuildModeDiffDialog'
-  ClientHeight = 316
-  ClientWidth = 493
+  ClientHeight = 409
+  ClientWidth = 476
   OnCreate = FormCreate
   Position = poScreenCenter
-  LCLVersion = '0.9.29'
+  LCLVersion = '1.5'
   object ButtonPanel: TButtonPanel
     Left = 6
-    Height = 34
-    Top = 276
-    Width = 481
+    Height = 26
+    Top = 377
+    Width = 464
     OKButton.Name = 'OKButton'
+    OKButton.DefaultCaption = True
     OKButton.Enabled = False
     HelpButton.Name = 'HelpButton'
+    HelpButton.DefaultCaption = True
     HelpButton.Enabled = False
     CloseButton.Name = 'CloseButton'
+    CloseButton.DefaultCaption = True
     CancelButton.Name = 'CancelButton'
+    CancelButton.DefaultCaption = True
     CancelButton.Enabled = False
-    TabOrder = 0
+    TabOrder = 2
     ShowButtons = [pbClose]
     ShowBevel = False
   end
@@ -30,9 +35,9 @@ object BuildModeDiffDialog: TBuildModeDiffDialog
     AnchorSideTop.Control = ModeComboBox
     AnchorSideTop.Side = asrCenter
     Left = 6
-    Height = 14
-    Top = 9
-    Width = 52
+    Height = 15
+    Top = 10
+    Width = 59
     BorderSpacing.Left = 6
     Caption = 'ModeLabel'
     ParentColor = False
@@ -43,40 +48,36 @@ object BuildModeDiffDialog: TBuildModeDiffDialog
     AnchorSideTop.Control = Owner
     AnchorSideRight.Control = Owner
     AnchorSideRight.Side = asrBottom
-    Left = 64
-    Height = 21
+    Left = 71
+    Height = 23
     Top = 6
-    Width = 423
+    Width = 399
     Anchors = [akTop, akLeft, akRight]
     BorderSpacing.Around = 6
-    ItemHeight = 13
+    ItemHeight = 15
     OnChange = ModeComboBoxChange
-    TabOrder = 1
-    Text = 'ModeComboBox'
+    Style = csDropDownList
+    TabOrder = 0
   end
-  object DiffsGroupBox: TGroupBox
-    AnchorSideTop.Control = ModeComboBox
+  object DiffLabel: TLabel
+    Left = 6
+    Height = 15
+    Top = 33
+    Width = 47
+    Caption = 'DiffLabel'
+    ParentColor = False
+  end
+  object DiffTreeView: TTreeView
+    AnchorSideTop.Control = DiffLabel
     AnchorSideTop.Side = asrBottom
     Left = 6
-    Height = 237
-    Top = 33
-    Width = 481
+    Height = 317
+    Top = 54
+    Width = 464
     Align = alBottom
     Anchors = [akTop, akLeft, akRight, akBottom]
     BorderSpacing.Around = 6
-    Caption = 'DiffsGroupBox'
-    ClientHeight = 219
-    ClientWidth = 477
-    TabOrder = 2
-    object DiffTreeView: TTreeView
-      Left = 6
-      Height = 207
-      Top = 6
-      Width = 465
-      Align = alClient
-      BorderSpacing.Around = 6
-      DefaultItemHeight = 15
-      TabOrder = 0
-    end
+    DefaultItemHeight = 18
+    TabOrder = 1
   end
 end
diff --git a/ide/buildmodediffdlg.pas b/ide/buildmodediffdlg.pas
index 65c395a10d..7d30c03b52 100644
--- a/ide/buildmodediffdlg.pas
+++ b/ide/buildmodediffdlg.pas
@@ -41,7 +41,7 @@ type
 
   TBuildModeDiffDialog = class(TForm)
     ButtonPanel: TButtonPanel;
-    DiffsGroupBox: TGroupBox;
+    DiffLabel: TLabel;
     DiffTreeView: TTreeView;
     ModeComboBox: TComboBox;
     ModeLabel: TLabel;
@@ -84,7 +84,7 @@ begin
   Caption:=lisBuildModeDiffDifferencesBetweenBuildModes;
 
   ModeLabel.Caption:=lisBuildModeDiffMode;
-  DiffsGroupBox.Caption:=lisBuildModeDiffDifferencesToOtherBuildModes;
+  DiffLabel.Caption:=lisBuildModeDiffDifferencesToOtherBuildModes;
   ButtonPanel.CloseButton.Caption:=lisBtnClose;
 end;