From 1f96355bb2969877c075fbef3f94ab95dcc10deb Mon Sep 17 00:00:00 2001 From: alexs75 Date: Thu, 14 Feb 2013 14:44:52 +0000 Subject: [PATCH] RxDBGrid - fix caption rxFilterByForm git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@2682 8e941d3f-bd1b-0410-a28a-d453659cc2b4 --- components/rx/rxfilterby.lfm | 140 +++++++++++++++++------------------ components/rx/rxfilterby.pas | 2 +- 2 files changed, 71 insertions(+), 71 deletions(-) diff --git a/components/rx/rxfilterby.lfm b/components/rx/rxfilterby.lfm index c0e5f1558..a9f7ba09c 100644 --- a/components/rx/rxfilterby.lfm +++ b/components/rx/rxfilterby.lfm @@ -88,7 +88,7 @@ object rxFilterByForm: TrxFilterByForm AnchorSideBottom.Side = asrBottom Left = 527 Height = 15 - Top = 358 + Top = 340 Width = 33 Anchors = [akLeft, akBottom] Caption = 'End.' @@ -102,7 +102,7 @@ object rxFilterByForm: TrxFilterByForm AnchorSideTop.Control = Label2 AnchorSideTop.Side = asrBottom Left = 6 - Height = 29 + Height = 27 Top = 48 Width = 153 BorderSpacing.Around = 6 @@ -114,7 +114,7 @@ object rxFilterByForm: TrxFilterByForm AnchorSideTop.Control = Label2 AnchorSideTop.Side = asrBottom Left = 168 - Height = 29 + Height = 27 Top = 48 Width = 96 BorderSpacing.Around = 6 @@ -143,7 +143,7 @@ object rxFilterByForm: TrxFilterByForm AnchorSideRight.Control = Owner AnchorSideRight.Side = asrBottom Left = 527 - Height = 29 + Height = 27 Top = 48 Width = 111 Anchors = [akTop, akRight] @@ -163,8 +163,8 @@ object rxFilterByForm: TrxFilterByForm AnchorSideRight.Control = ComboBox1 AnchorSideRight.Side = asrBottom Left = 8 - Height = 29 - Top = 85 + Height = 27 + Top = 83 Width = 149 Anchors = [akTop, akLeft, akRight] BorderSpacing.Left = 6 @@ -181,8 +181,8 @@ object rxFilterByForm: TrxFilterByForm AnchorSideRight.Control = ComboBox2 AnchorSideRight.Side = asrBottom Left = 168 - Height = 29 - Top = 83 + Height = 27 + Top = 81 Width = 96 Anchors = [akTop, akLeft, akRight] BorderSpacing.Top = 6 @@ -200,7 +200,7 @@ object rxFilterByForm: TrxFilterByForm AnchorSideRight.Control = ComboBox3 Left = 270 Height = 25 - Top = 83 + Top = 81 Width = 251 Anchors = [akTop, akLeft, akRight] BorderSpacing.Left = 6 @@ -214,8 +214,8 @@ object rxFilterByForm: TrxFilterByForm AnchorSideRight.Control = Owner AnchorSideRight.Side = asrBottom Left = 527 - Height = 29 - Top = 83 + Height = 27 + Top = 81 Width = 111 Anchors = [akTop, akRight] BorderSpacing.Around = 6 @@ -234,8 +234,8 @@ object rxFilterByForm: TrxFilterByForm AnchorSideRight.Control = ComboBox1 AnchorSideRight.Side = asrBottom Left = 8 - Height = 29 - Top = 122 + Height = 27 + Top = 118 Width = 149 Anchors = [akTop, akLeft, akRight] BorderSpacing.Left = 6 @@ -252,8 +252,8 @@ object rxFilterByForm: TrxFilterByForm AnchorSideRight.Control = ComboBox2 AnchorSideRight.Side = asrBottom Left = 168 - Height = 29 - Top = 120 + Height = 27 + Top = 116 Width = 96 Anchors = [akTop, akLeft, akRight] BorderSpacing.Top = 6 @@ -271,7 +271,7 @@ object rxFilterByForm: TrxFilterByForm AnchorSideRight.Control = ComboBox3 Left = 270 Height = 25 - Top = 120 + Top = 116 Width = 251 Anchors = [akTop, akLeft, akRight] BorderSpacing.Left = 6 @@ -285,8 +285,8 @@ object rxFilterByForm: TrxFilterByForm AnchorSideRight.Control = Owner AnchorSideRight.Side = asrBottom Left = 527 - Height = 29 - Top = 120 + Height = 27 + Top = 116 Width = 111 Anchors = [akTop, akRight] BorderSpacing.Around = 6 @@ -305,8 +305,8 @@ object rxFilterByForm: TrxFilterByForm AnchorSideRight.Control = ComboBox1 AnchorSideRight.Side = asrBottom Left = 8 - Height = 29 - Top = 159 + Height = 27 + Top = 153 Width = 149 Anchors = [akTop, akLeft, akRight] BorderSpacing.Left = 6 @@ -323,8 +323,8 @@ object rxFilterByForm: TrxFilterByForm AnchorSideRight.Control = ComboBox2 AnchorSideRight.Side = asrBottom Left = 168 - Height = 29 - Top = 157 + Height = 27 + Top = 151 Width = 96 Anchors = [akTop, akLeft, akRight] BorderSpacing.Top = 6 @@ -342,7 +342,7 @@ object rxFilterByForm: TrxFilterByForm AnchorSideRight.Control = ComboBox3 Left = 270 Height = 25 - Top = 157 + Top = 151 Width = 251 Anchors = [akTop, akLeft, akRight] BorderSpacing.Left = 6 @@ -356,8 +356,8 @@ object rxFilterByForm: TrxFilterByForm AnchorSideRight.Control = Owner AnchorSideRight.Side = asrBottom Left = 527 - Height = 29 - Top = 157 + Height = 27 + Top = 151 Width = 111 Anchors = [akTop, akRight] BorderSpacing.Around = 6 @@ -376,8 +376,8 @@ object rxFilterByForm: TrxFilterByForm AnchorSideRight.Control = ComboBox1 AnchorSideRight.Side = asrBottom Left = 8 - Height = 29 - Top = 196 + Height = 27 + Top = 188 Width = 149 Anchors = [akTop, akLeft, akRight] BorderSpacing.Left = 6 @@ -394,8 +394,8 @@ object rxFilterByForm: TrxFilterByForm AnchorSideRight.Control = ComboBox2 AnchorSideRight.Side = asrBottom Left = 168 - Height = 29 - Top = 194 + Height = 27 + Top = 186 Width = 96 Anchors = [akTop, akLeft, akRight] BorderSpacing.Top = 6 @@ -413,7 +413,7 @@ object rxFilterByForm: TrxFilterByForm AnchorSideRight.Control = ComboBox3 Left = 270 Height = 25 - Top = 194 + Top = 186 Width = 251 Anchors = [akTop, akLeft, akRight] BorderSpacing.Left = 6 @@ -427,8 +427,8 @@ object rxFilterByForm: TrxFilterByForm AnchorSideRight.Control = Owner AnchorSideRight.Side = asrBottom Left = 527 - Height = 29 - Top = 194 + Height = 27 + Top = 186 Width = 111 Anchors = [akTop, akRight] BorderSpacing.Around = 6 @@ -447,8 +447,8 @@ object rxFilterByForm: TrxFilterByForm AnchorSideRight.Control = ComboBox1 AnchorSideRight.Side = asrBottom Left = 8 - Height = 29 - Top = 233 + Height = 27 + Top = 223 Width = 149 Anchors = [akTop, akLeft, akRight] BorderSpacing.Left = 6 @@ -465,8 +465,8 @@ object rxFilterByForm: TrxFilterByForm AnchorSideRight.Control = ComboBox2 AnchorSideRight.Side = asrBottom Left = 168 - Height = 29 - Top = 231 + Height = 27 + Top = 221 Width = 96 Anchors = [akTop, akLeft, akRight] BorderSpacing.Top = 6 @@ -484,7 +484,7 @@ object rxFilterByForm: TrxFilterByForm AnchorSideRight.Control = ComboBox3 Left = 270 Height = 25 - Top = 231 + Top = 221 Width = 251 Anchors = [akTop, akLeft, akRight] BorderSpacing.Left = 6 @@ -498,8 +498,8 @@ object rxFilterByForm: TrxFilterByForm AnchorSideRight.Control = Owner AnchorSideRight.Side = asrBottom Left = 527 - Height = 29 - Top = 231 + Height = 27 + Top = 221 Width = 111 Anchors = [akTop, akRight] BorderSpacing.Around = 6 @@ -518,8 +518,8 @@ object rxFilterByForm: TrxFilterByForm AnchorSideRight.Control = ComboBox1 AnchorSideRight.Side = asrBottom Left = 8 - Height = 29 - Top = 270 + Height = 27 + Top = 258 Width = 149 Anchors = [akTop, akLeft, akRight] BorderSpacing.Left = 6 @@ -536,8 +536,8 @@ object rxFilterByForm: TrxFilterByForm AnchorSideRight.Control = ComboBox2 AnchorSideRight.Side = asrBottom Left = 168 - Height = 29 - Top = 268 + Height = 27 + Top = 256 Width = 96 Anchors = [akTop, akLeft, akRight] BorderSpacing.Top = 6 @@ -555,7 +555,7 @@ object rxFilterByForm: TrxFilterByForm AnchorSideRight.Control = ComboBox3 Left = 270 Height = 25 - Top = 268 + Top = 256 Width = 251 Anchors = [akTop, akLeft, akRight] BorderSpacing.Left = 6 @@ -569,8 +569,8 @@ object rxFilterByForm: TrxFilterByForm AnchorSideRight.Control = Owner AnchorSideRight.Side = asrBottom Left = 527 - Height = 29 - Top = 268 + Height = 27 + Top = 256 Width = 111 Anchors = [akTop, akRight] BorderSpacing.Around = 6 @@ -589,8 +589,8 @@ object rxFilterByForm: TrxFilterByForm AnchorSideRight.Control = ComboBox1 AnchorSideRight.Side = asrBottom Left = 8 - Height = 29 - Top = 307 + Height = 27 + Top = 293 Width = 149 Anchors = [akTop, akLeft, akRight] BorderSpacing.Left = 6 @@ -607,8 +607,8 @@ object rxFilterByForm: TrxFilterByForm AnchorSideRight.Control = ComboBox2 AnchorSideRight.Side = asrBottom Left = 168 - Height = 29 - Top = 305 + Height = 27 + Top = 291 Width = 96 Anchors = [akTop, akLeft, akRight] BorderSpacing.Top = 6 @@ -626,7 +626,7 @@ object rxFilterByForm: TrxFilterByForm AnchorSideRight.Control = ComboBox3 Left = 270 Height = 25 - Top = 305 + Top = 291 Width = 251 Anchors = [akTop, akLeft, akRight] BorderSpacing.Left = 6 @@ -640,8 +640,8 @@ object rxFilterByForm: TrxFilterByForm AnchorSideRight.Control = Owner AnchorSideRight.Side = asrBottom Left = 527 - Height = 29 - Top = 305 + Height = 27 + Top = 291 Width = 111 Anchors = [akTop, akRight] BorderSpacing.Around = 6 @@ -660,8 +660,8 @@ object rxFilterByForm: TrxFilterByForm AnchorSideRight.Control = ComboBox1 AnchorSideRight.Side = asrBottom Left = 8 - Height = 29 - Top = 344 + Height = 27 + Top = 328 Width = 149 Anchors = [akTop, akLeft, akRight] BorderSpacing.Left = 6 @@ -678,8 +678,8 @@ object rxFilterByForm: TrxFilterByForm AnchorSideRight.Control = ComboBox2 AnchorSideRight.Side = asrBottom Left = 168 - Height = 29 - Top = 342 + Height = 27 + Top = 326 Width = 96 Anchors = [akTop, akLeft, akRight] BorderSpacing.Top = 6 @@ -697,7 +697,7 @@ object rxFilterByForm: TrxFilterByForm AnchorSideRight.Control = ComboBox3 Left = 270 Height = 25 - Top = 342 + Top = 326 Width = 251 Anchors = [akTop, akLeft, akRight] BorderSpacing.Left = 6 @@ -710,8 +710,8 @@ object rxFilterByForm: TrxFilterByForm AnchorSideBottom.Control = Owner AnchorSideBottom.Side = asrBottom Left = 6 - Height = 29 - Top = 410 + Height = 27 + Top = 412 Width = 58 Anchors = [akLeft, akBottom] BorderSpacing.Around = 6 @@ -729,10 +729,10 @@ object rxFilterByForm: TrxFilterByForm AnchorSideRight.Side = asrBottom AnchorSideBottom.Control = Owner AnchorSideBottom.Side = asrBottom - Left = 592 - Height = 27 - Top = 412 - Width = 46 + Left = 593 + Height = 25 + Top = 414 + Width = 45 Anchors = [akRight, akBottom] AutoSize = True BorderSpacing.Around = 6 @@ -745,9 +745,9 @@ object rxFilterByForm: TrxFilterByForm AnchorSideRight.Control = Button1 AnchorSideBottom.Control = Owner AnchorSideBottom.Side = asrBottom - Left = 533 - Height = 27 - Top = 412 + Left = 534 + Height = 25 + Top = 414 Width = 53 Anchors = [akRight, akBottom] AutoSize = True @@ -761,9 +761,9 @@ object rxFilterByForm: TrxFilterByForm AnchorSideRight.Control = Button2 AnchorSideBottom.Control = Owner AnchorSideBottom.Side = asrBottom - Left = 452 - Height = 27 - Top = 412 + Left = 453 + Height = 25 + Top = 414 Width = 75 Anchors = [akRight, akBottom] AutoSize = True diff --git a/components/rx/rxfilterby.pas b/components/rx/rxfilterby.pas index ebffc9999..17e6e46ce 100644 --- a/components/rx/rxfilterby.pas +++ b/components/rx/rxfilterby.pas @@ -164,7 +164,7 @@ end; procedure TrxFilterByForm.FormCreate(Sender: TObject); begin Label1.Caption:=sRxFilterFormSelectExp; - Label2.Caption:=sRxFilterFormSelectExp; + Label2.Caption:=sRxFilterFormOnField; Label3.Caption:=sRxFilterFormOperaion; Label4.Caption:=sRxFilterFormCondition; Label5.Caption:=sRxFilterFormOperand;