IDE: Improved layout and i18n of Conditional Defines dialog, bug #27966

git-svn-id: trunk@48965 -

ide/condef.lfm

@@ -11,22 +11,22 @@ object CondForm: TCondForm
   OnCreate = CondFormCREATE
   OnShow = FormShow
   Position = poScreenCenter
-  LCLVersion = '1.1'
+  LCLVersion = '1.5'
   object NewTestGroupBox: TGroupBox
     Left = 6
-    Height = 149
+    Height = 135
     Top = 6
     Width = 344
     Align = alTop
     AutoSize = True
     BorderSpacing.Around = 6
     Caption = 'NewTestGroupBox'
-    ClientHeight = 130
+    ClientHeight = 117
     ClientWidth = 340
     TabOrder = 0
     object FirstLabel: TLabel
       Left = 6
-      Height = 15
+      Height = 13
       Top = 6
       Width = 328
       Align = alTop
@@ -39,8 +39,8 @@ object CondForm: TCondForm
     object SecondLabel: TLabel
       AnchorSideTop.Side = asrBottom
       Left = 6
-      Height = 15
-      Top = 52
+      Height = 13
+      Top = 46
       Width = 328
       Align = alTop
       BorderSpacing.Left = 6
@@ -52,14 +52,14 @@ object CondForm: TCondForm
     object FirstTest: TComboBox
       AnchorSideTop.Side = asrBottom
       Left = 6
-      Height = 25
-      Top = 21
+      Height = 21
+      Top = 19
       Width = 328
       Align = alTop
       BorderSpacing.Left = 6
       BorderSpacing.Right = 6
       BorderSpacing.Bottom = 6
-      ItemHeight = 0
+      ItemHeight = 13
       ItemIndex = 0
       Items.Strings = (
         'MSWINDOWS'
@@ -80,14 +80,14 @@ object CondForm: TCondForm
     object SecondTest: TComboBox
       AnchorSideTop.Side = asrBottom
       Left = 6
-      Height = 25
-      Top = 67
+      Height = 21
+      Top = 59
       Width = 328
       Align = alTop
       BorderSpacing.Left = 6
       BorderSpacing.Right = 6
       BorderSpacing.Bottom = 6
-      ItemHeight = 0
+      ItemHeight = 13
       ItemIndex = 0
       Items.Strings = (
         'NONE'
@@ -101,9 +101,9 @@ object CondForm: TCondForm
       AnchorSideTop.Control = SecondTest
       AnchorSideTop.Side = asrBottom
       AnchorSideRight.Control = AddInverse
-      Left = 85
-      Height = 26
-      Top = 98
+      Left = 87
+      Height = 25
+      Top = 86
       Width = 75
       Anchors = [akTop, akRight]
       AutoSize = True
@@ -121,8 +121,8 @@ object CondForm: TCondForm
       AnchorSideRight.Control = NewTestGroupBox
       AnchorSideRight.Side = asrBottom
       Left = 259
-      Height = 26
-      Top = 98
+      Height = 25
+      Top = 86
       Width = 75
       Anchors = [akTop, akRight]
       AutoSize = True
@@ -138,10 +138,10 @@ object CondForm: TCondForm
       AnchorSideTop.Control = SecondTest
       AnchorSideTop.Side = asrBottom
       AnchorSideRight.Control = RemoveBtn
-      Left = 166
-      Height = 26
-      Top = 98
-      Width = 87
+      Left = 168
+      Height = 25
+      Top = 86
+      Width = 85
       HelpType = htKeyword
       Anchors = [akTop, akRight]
       AutoSize = True
@@ -155,8 +155,8 @@ object CondForm: TCondForm
   end
   object ListBox: TListBox
     Left = 6
-    Height = 113
-    Top = 161
+    Height = 127
+    Top = 147
     Width = 344
     Align = alClient
     Anchors = [akTop, akBottom]
@@ -181,10 +181,10 @@ object CondForm: TCondForm
       AnchorSideTop.Side = asrCenter
       AnchorSideRight.Control = ButtonPanel
       AnchorSideRight.Side = asrBottom
-      Left = 290
-      Height = 27
+      Left = 288
+      Height = 26
       Top = 10
-      Width = 59
+      Width = 61
       Anchors = [akTop, akRight]
       AutoSize = True
       BorderSpacing.Around = 6
@@ -197,13 +197,14 @@ object CondForm: TCondForm
     end
     object btnSave: TBitBtn
       AnchorSideTop.Control = btnOk
-      AnchorSideTop.Side = asrCenter
       AnchorSideRight.Control = btnOk
-      Left = 219
+      AnchorSideBottom.Control = btnOk
+      AnchorSideBottom.Side = asrBottom
+      Left = 216
       Height = 26
       Top = 10
-      Width = 65
-      Anchors = [akTop, akRight]
+      Width = 66
+      Anchors = [akTop, akRight, akBottom]
       AutoSize = True
       BorderSpacing.Right = 6
       Caption = 'btnSave'
@@ -215,10 +216,10 @@ object CondForm: TCondForm
       AnchorSideTop.Control = btnSave
       AnchorSideTop.Side = asrCenter
       AnchorSideRight.Control = btnSave
-      Left = 123
-      Height = 33
-      Top = 7
-      Width = 90
+      Left = 126
+      Height = 26
+      Top = 10
+      Width = 84
       Anchors = [akTop, akRight]
       AutoSize = True
       BorderSpacing.Right = 6
@@ -233,9 +234,10 @@ object CondForm: TCondForm
       AnchorSideTop.Control = ButtonPanel
       AnchorSideTop.Side = asrCenter
       Left = 7
-      Height = 30
-      Top = 8
-      Width = 75
+      Height = 26
+      Top = 10
+      Width = 89
+      AutoSize = True
       BorderSpacing.Around = 6
       DefaultCaption = True
       Kind = bkHelp

ide/condef.pas

@@ -233,6 +233,8 @@ var
 begin
   NewTestGroupBox.Caption := rsCreateNewDefine;
   Caption := rsConditionalDefines;
+  FirstLabel.Caption := lisFirstTest;
+  SecondLabel.Caption := lisSecondTest;
   AddBtn.Caption := lisBtnAdd;
   AddBtn.LoadGlyphFromResourceName(HInstance, 'laz_add');
   AddInverse.Caption := rsAddInverse;

ide/lazarusidestrconsts.pas

@@ -4948,6 +4948,8 @@ resourcestring
   //conditional defines dialog
   rsCreateNewDefine = 'Create new define';
   rsConditionalDefines = 'Conditional defines';
+  lisFirstTest = '&First test';
+  lisSecondTest = '&Second test';
   rsAddInverse = 'Add Inverse';
   lisAutomaticallyOnLineBreak = 'line break';
   lisAutomaticallyOnSpace = 'space';