1. RxLockupCombo - fix paint control whith color for null values

2. RxDBGrid find dialog - improved localization
3. RxDBGrid - clear quick search data after mouse click


git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@2522 8e941d3f-bd1b-0410-a28a-d453659cc2b4

components/rx/Demos/RxDBGrid/RxDBGridDemo.lpi

@@ -54,17 +54,15 @@
         <MinVersion Major="1" Release="18" Build="56" Valid="True"/>
       </Item4>
     </RequiredPackages>
-    <Units Count="74">
+    <Units Count="76">
       <Unit0>
         <Filename Value="RxDBGridDemo.lpr"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="RxDBGridDemo"/>
-        <EditorIndex Value="6"/>
         <WindowIndex Value="0"/>
         <TopLine Value="1"/>
         <CursorPos X="9" Y="16"/>
         <UsageCount Value="60"/>
-        <Loaded Value="True"/>
       </Unit0>
       <Unit1>
         <Filename Value="rxdbgridmainunit.pas"/>
@@ -75,8 +73,8 @@
         <UnitName Value="RxDBGridMainUnit"/>
         <EditorIndex Value="0"/>
         <WindowIndex Value="0"/>
-        <TopLine Value="196"/>
-        <CursorPos X="21" Y="201"/>
+        <TopLine Value="1"/>
+        <CursorPos X="21" Y="18"/>
         <UsageCount Value="60"/>
         <Loaded Value="True"/>
         <LoadedDesigner Value="True"/>
@@ -501,8 +499,8 @@
         <IsVisibleTab Value="True"/>
         <EditorIndex Value="1"/>
         <WindowIndex Value="0"/>
-        <TopLine Value="3384"/>
-        <CursorPos X="35" Y="3405"/>
+        <TopLine Value="1242"/>
+        <CursorPos X="1" Y="1274"/>
         <UsageCount Value="13"/>
         <Bookmarks Count="3">
           <Item0 X="3" Y="73" ID="1"/>
@@ -553,12 +551,10 @@
       <Unit64>
         <Filename Value="/usr/local/share/lazarus/components/rxnew/vclutils.pas"/>
         <UnitName Value="vclutils"/>
-        <EditorIndex Value="5"/>
         <WindowIndex Value="0"/>
         <TopLine Value="1"/>
         <CursorPos X="1" Y="35"/>
         <UsageCount Value="12"/>
-        <Loaded Value="True"/>
       </Unit64>
       <Unit65>
         <Filename Value="/usr/local/share/lazarus/lcl/include/canvas.inc"/>
@@ -595,13 +591,10 @@
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
         <UnitName Value="rxsortby"/>
-        <EditorIndex Value="4"/>
         <WindowIndex Value="0"/>
         <TopLine Value="50"/>
         <CursorPos X="14" Y="65"/>
         <UsageCount Value="12"/>
-        <Loaded Value="True"/>
-        <LoadedDesigner Value="True"/>
       </Unit69>
       <Unit70>
         <Filename Value="/usr/local/share/lazarus/components/rxnew/rxfilterby.pas"/>
@@ -609,13 +602,10 @@
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
         <UnitName Value="rxfilterby"/>
-        <EditorIndex Value="2"/>
         <WindowIndex Value="0"/>
         <TopLine Value="315"/>
         <CursorPos X="1" Y="350"/>
         <UsageCount Value="10"/>
-        <Loaded Value="True"/>
-        <LoadedDesigner Value="True"/>
       </Unit70>
       <Unit71>
         <Filename Value="../../../../../../install/source/fpcsrc/rtl/objpas/classes/classesh.inc"/>
@@ -634,134 +624,152 @@
       <Unit73>
         <Filename Value="/usr/local/share/lazarus/components/rxnew/rxstrutils.pas"/>
         <UnitName Value="rxstrutils"/>
-        <EditorIndex Value="3"/>
         <WindowIndex Value="0"/>
         <TopLine Value="140"/>
         <CursorPos X="23" Y="168"/>
         <UsageCount Value="10"/>
-        <Loaded Value="True"/>
       </Unit73>
+      <Unit74>
+        <Filename Value="/usr/local/share/lazarus/components/rxnew/rxlookup.pas"/>
+        <UnitName Value="rxlookup"/>
+        <EditorIndex Value="3"/>
+        <WindowIndex Value="0"/>
+        <TopLine Value="797"/>
+        <CursorPos X="17" Y="805"/>
+        <UsageCount Value="10"/>
+        <Loaded Value="True"/>
+      </Unit74>
+      <Unit75>
+        <Filename Value="../../../../../../install/source/fpcsrc/packages/fcl-db/src/base/db.pas"/>
+        <UnitName Value="db"/>
+        <EditorIndex Value="2"/>
+        <WindowIndex Value="0"/>
+        <TopLine Value="1776"/>
+        <CursorPos X="14" Y="1796"/>
+        <UsageCount Value="10"/>
+        <Loaded Value="True"/>
+      </Unit75>
     </Units>
-    <JumpHistory Count="30" HistoryIndex="29">
+    <JumpHistory Count="30" HistoryIndex="28">
       <Position1>
-        <Filename Value="/usr/local/share/lazarus/components/rxnew/rxsortby.pas"/>
-        <Caret Line="72" Column="7" TopLine="53"/>
+        <Filename Value="/usr/local/share/lazarus/components/rxnew/rxdbgrid.pas"/>
+        <Caret Line="1172" Column="29" TopLine="1136"/>
       </Position1>
       <Position2>
-        <Filename Value="/usr/local/share/lazarus/components/rxnew/rxsortby.pas"/>
-        <Caret Line="87" Column="14" TopLine="52"/>
+        <Filename Value="/usr/local/share/lazarus/components/rxnew/rxdbgrid.pas"/>
+        <Caret Line="1175" Column="37" TopLine="1138"/>
       </Position2>
       <Position3>
-        <Filename Value="/usr/local/share/lazarus/components/rxnew/rxsortby.pas"/>
-        <Caret Line="245" Column="64" TopLine="222"/>
+        <Filename Value="/usr/local/share/lazarus/components/rxnew/rxdbgrid.pas"/>
+        <Caret Line="1190" Column="37" TopLine="1153"/>
       </Position3>
       <Position4>
         <Filename Value="/usr/local/share/lazarus/components/rxnew/rxdbgrid.pas"/>
-        <Caret Line="3476" Column="64" TopLine="3441"/>
+        <Caret Line="1258" Column="37" TopLine="1220"/>
       </Position4>
       <Position5>
-        <Filename Value="/usr/local/share/lazarus/components/rxnew/rxsortby.pas"/>
-        <Caret Line="96" Column="25" TopLine="67"/>
+        <Filename Value="/usr/local/share/lazarus/components/rxnew/rxdbgrid.pas"/>
+        <Caret Line="1261" Column="37" TopLine="1225"/>
       </Position5>
       <Position6>
-        <Filename Value="/usr/local/share/lazarus/components/rxnew/rxsortby.pas"/>
-        <Caret Line="69" Column="7" TopLine="41"/>
+        <Filename Value="/usr/local/share/lazarus/components/rxnew/rxdbgrid.pas"/>
+        <Caret Line="1268" Column="39" TopLine="1231"/>
       </Position6>
       <Position7>
-        <Filename Value="/usr/local/share/lazarus/components/rxnew/rxsortby.pas"/>
-        <Caret Line="118" Column="45" TopLine="94"/>
+        <Filename Value="/usr/local/share/lazarus/components/rxnew/rxdbgrid.pas"/>
+        <Caret Line="1275" Column="38" TopLine="1239"/>
       </Position7>
       <Position8>
-        <Filename Value="/usr/local/share/lazarus/components/rxnew/rxsortby.pas"/>
-        <Caret Line="256" Column="3" TopLine="235"/>
+        <Filename Value="/usr/local/share/lazarus/components/rxnew/rxdbgrid.pas"/>
+        <Caret Line="3660" Column="29" TopLine="3626"/>
       </Position8>
       <Position9>
-        <Filename Value="/usr/local/share/lazarus/components/rxnew/rxsortby.pas"/>
-        <Caret Line="260" Column="1" TopLine="238"/>
+        <Filename Value="/usr/local/share/lazarus/components/rxnew/rxdbgrid.pas"/>
+        <Caret Line="3676" Column="40" TopLine="3640"/>
       </Position9>
       <Position10>
         <Filename Value="/usr/local/share/lazarus/components/rxnew/rxdbgrid.pas"/>
-        <Caret Line="3476" Column="29" TopLine="3455"/>
+        <Caret Line="1" Column="1" TopLine="1"/>
       </Position10>
       <Position11>
-        <Filename Value="/usr/local/share/lazarus/components/rxnew/rxsortby.pas"/>
-        <Caret Line="223" Column="1" TopLine="181"/>
+        <Filename Value="/usr/local/share/lazarus/components/rxnew/rxdbgrid.pas"/>
+        <Caret Line="469" Column="31" TopLine="436"/>
       </Position11>
       <Position12>
-        <Filename Value="/usr/local/share/lazarus/components/rxnew/rxsortby.pas"/>
-        <Caret Line="70" Column="21" TopLine="50"/>
+        <Filename Value="/usr/local/share/lazarus/components/rxnew/rxdbgrid.pas"/>
+        <Caret Line="3189" Column="45" TopLine="3154"/>
       </Position12>
       <Position13>
         <Filename Value="/usr/local/share/lazarus/components/rxnew/rxdbgrid.pas"/>
-        <Caret Line="3477" Column="34" TopLine="3455"/>
+        <Caret Line="3600" Column="46" TopLine="3565"/>
       </Position13>
       <Position14>
         <Filename Value="/usr/local/share/lazarus/components/rxnew/rxdbgrid.pas"/>
-        <Caret Line="1483" Column="3" TopLine="1465"/>
+        <Caret Line="3606" Column="47" TopLine="3571"/>
       </Position14>
       <Position15>
         <Filename Value="/usr/local/share/lazarus/components/rxnew/rxdbgrid.pas"/>
-        <Caret Line="3400" Column="3" TopLine="3394"/>
+        <Caret Line="3658" Column="59" TopLine="3624"/>
       </Position15>
       <Position16>
-        <Filename Value="/usr/local/share/lazarus/components/rxnew/rxfilterby.pas"/>
-        <Caret Line="240" Column="2" TopLine="223"/>
+        <Filename Value="/usr/local/share/lazarus/components/rxnew/rxdbgrid.pas"/>
+        <Caret Line="1" Column="1" TopLine="1"/>
       </Position16>
       <Position17>
-        <Filename Value="/usr/local/share/lazarus/components/rxnew/rxfilterby.pas"/>
-        <Caret Line="277" Column="1" TopLine="264"/>
+        <Filename Value="/usr/local/share/lazarus/components/rxnew/rxdbgrid.pas"/>
+        <Caret Line="781" Column="31" TopLine="743"/>
       </Position17>
       <Position18>
-        <Filename Value="/usr/local/share/lazarus/components/rxnew/rxfilterby.pas"/>
-        <Caret Line="104" Column="41" TopLine="84"/>
+        <Filename Value="/usr/local/share/lazarus/components/rxnew/rxdbgrid.pas"/>
+        <Caret Line="1274" Column="29" TopLine="1239"/>
       </Position18>
       <Position19>
-        <Filename Value="/usr/local/share/lazarus/components/rxnew/rxfilterby.pas"/>
-        <Caret Line="105" Column="5" TopLine="88"/>
+        <Filename Value="/usr/local/share/lazarus/components/rxnew/rxlookup.pas"/>
+        <Caret Line="1049" Column="3" TopLine="1042"/>
       </Position19>
       <Position20>
-        <Filename Value="/usr/local/share/lazarus/components/rxnew/rxfilterby.pas"/>
-        <Caret Line="182" Column="37" TopLine="181"/>
+        <Filename Value="/usr/local/share/lazarus/components/rxnew/rxlookup.pas"/>
+        <Caret Line="1210" Column="3" TopLine="1172"/>
       </Position20>
       <Position21>
-        <Filename Value="/usr/local/share/lazarus/components/rxnew/rxfilterby.pas"/>
-        <Caret Line="129" Column="17" TopLine="107"/>
+        <Filename Value="/usr/local/share/lazarus/components/rxnew/rxdbgrid.pas"/>
+        <Caret Line="791" Column="62" TopLine="772"/>
       </Position21>
       <Position22>
-        <Filename Value="/usr/local/share/lazarus/components/rxnew/rxfilterby.pas"/>
-        <Caret Line="182" Column="36" TopLine="161"/>
+        <Filename Value="/usr/local/share/lazarus/components/rxnew/rxdbgrid.pas"/>
+        <Caret Line="1246" Column="3" TopLine="1242"/>
       </Position22>
       <Position23>
-        <Filename Value="/usr/local/share/lazarus/components/rxnew/rxfilterby.pas"/>
-        <Caret Line="109" Column="15" TopLine="103"/>
+        <Filename Value="/usr/local/share/lazarus/components/rxnew/rxdbgrid.pas"/>
+        <Caret Line="1271" Column="19" TopLine="1242"/>
       </Position23>
       <Position24>
-        <Filename Value="/usr/local/share/lazarus/components/rxnew/rxfilterby.pas"/>
-        <Caret Line="199" Column="5" TopLine="168"/>
+        <Filename Value="/usr/local/share/lazarus/components/rxnew/rxdbgrid.pas"/>
+        <Caret Line="1254" Column="15" TopLine="1251"/>
       </Position24>
       <Position25>
-        <Filename Value="/usr/local/share/lazarus/components/rxnew/rxfilterby.pas"/>
-        <Caret Line="234" Column="12" TopLine="213"/>
+        <Filename Value="/usr/local/share/lazarus/components/rxnew/rxlookup.pas"/>
+        <Caret Line="289" Column="14" TopLine="268"/>
       </Position25>
       <Position26>
-        <Filename Value="/usr/local/share/lazarus/components/rxnew/rxfilterby.pas"/>
-        <Caret Line="222" Column="30" TopLine="192"/>
+        <Filename Value="/usr/local/share/lazarus/components/rxnew/rxdbgrid.pas"/>
+        <Caret Line="1269" Column="4" TopLine="1250"/>
       </Position26>
       <Position27>
-        <Filename Value="/usr/local/share/lazarus/components/rxnew/rxfilterby.pas"/>
-        <Caret Line="291" Column="12" TopLine="271"/>
+        <Filename Value="/usr/local/share/lazarus/components/rxnew/rxdbgrid.pas"/>
+        <Caret Line="1256" Column="8" TopLine="1250"/>
       </Position27>
       <Position28>
-        <Filename Value="/usr/local/share/lazarus/components/rxnew/rxfilterby.pas"/>
-        <Caret Line="293" Column="1" TopLine="277"/>
+        <Filename Value="/usr/local/share/lazarus/components/rxnew/rxdbgrid.pas"/>
+        <Caret Line="1276" Column="3" TopLine="1250"/>
       </Position28>
       <Position29>
-        <Filename Value="/usr/local/share/lazarus/components/rxnew/rxfilterby.pas"/>
-        <Caret Line="136" Column="16" TopLine="107"/>
+        <Filename Value="/usr/local/share/lazarus/components/rxnew/rxdbgrid.pas"/>
+        <Caret Line="1272" Column="75" TopLine="1242"/>
       </Position29>
       <Position30>
         <Filename Value="/usr/local/share/lazarus/components/rxnew/rxdbgrid.pas"/>
-        <Caret Line="3400" Column="3" TopLine="3394"/>
+        <Caret Line="1282" Column="3" TopLine="1280"/>
       </Position30>
     </JumpHistory>
   </ProjectOptions>

components/rx/Demos/RxDBGrid/rxdbgridmainunit.lfm

@@ -122,7 +122,6 @@ object RxDBGridMainForm: TRxDBGridMainForm
               0000EEEEEEEEEEE00000EEEEEEEEEEE00000
             }
             Hint = 'Clear value'
-            NumGlyphs = 0
             OnClick = TRxColumnEditButtons2Click
           end>
       end    
@@ -186,7 +185,6 @@ object RxDBGridMainForm: TRxDBGridMainForm
               BB06666600000000006666666000066666666666666666666666
             }
             Hint = 'Первая кнопка'
-            NumGlyphs = 0
             Width = 16
             OnClick = TRxColumnEditButtons0Click
           end        
@@ -209,7 +207,6 @@ object RxDBGridMainForm: TRxDBGridMainForm
               00000000000000000000
             }
             Hint = 'Вторая кнопка'
-            NumGlyphs = 0
             OnClick = TRxColumnEditButtons1Click
           end>
       end>
@@ -492,7 +489,11 @@ object RxDBGridMainForm: TRxDBGridMainForm
       FieldKind = fkData
       FieldName = 'Developer'
       Index = 3
+      KeyFields = 'DEVELOPER_ID'
       LookupCache = False
+      LookupDataSet = RxMemoryData2
+      LookupKeyFields = 'DEVELOPER_ID'
+      LookupResultField = 'DEVELOPER_NAME'
       ProviderFlags = [pfInUpdate, pfInWhere]
       ReadOnly = False
       Required = False
@@ -513,11 +514,7 @@ object RxDBGridMainForm: TRxDBGridMainForm
       FieldKind = fkData
       FieldName = 'DEVELOPER_ID'
       Index = 5
-      KeyFields = 'DEVELOPER_ID'
       LookupCache = False
-      LookupDataSet = RxMemoryData2
-      LookupKeyFields = 'DEVELOPER_ID'
-      LookupResultField = 'DEVELOPER_NAME'
       ProviderFlags = [pfInUpdate, pfInWhere]
       ReadOnly = False
       Required = False
@@ -605,8 +602,8 @@ object RxDBGridMainForm: TRxDBGridMainForm
   end
   object Datasource2: TDatasource
     DataSet = RxMemoryData2
-    left = 207
-    top = 264
+    left = 288
+    top = 368
   end
   object RxMemoryData2: TRxMemoryData
     AutoCalcFields = False
@@ -624,8 +621,8 @@ object RxDBGridMainForm: TRxDBGridMainForm
         Size = 130
       end>
     PacketRecords = 0
-    left = 248
-    top = 264
+    left = 329
+    top = 368
     object RxMemoryData2DEVELOPER_ID1: TLongintField
       DisplayWidth = 10
       FieldKind = fkData

components/rx/languages/rxdconst.es.po

@@ -349,6 +349,10 @@ msgstr "Operando :"
 msgid "Enter filter expression for data in table:"
 msgstr "Seleccionar todos los registros que cumplan las siguientes condiciónes :"
 
+#: rxdconst.srxfindmore
+msgid "Find more"
+msgstr ""
+
 #: rxdconst.srxselectdatasetstruct
 msgid "Select dataset to copy to"
 msgstr "Seleccionar conjunto de datos para copiar"

components/rx/languages/rxdconst.po

@@ -349,6 +349,10 @@ msgstr ""
 msgid "Enter filter expression for data in table:"
 msgstr ""
 
+#: rxdconst.srxfindmore
+msgid "Find more"
+msgstr ""
+
 #: rxdconst.srxselectdatasetstruct
 msgid "Select dataset to copy to"
 msgstr ""

components/rx/languages/rxdconst.ru.po

@@ -266,7 +266,7 @@ msgstr "Искать по полю"
 
 #: rxdconst.srxdbgridfindpartial
 msgid "Partial key"
-msgstr "Частиный поиск"
+msgstr "Поиск по вхождению"
 
 #: rxdconst.srxdbgridfindrangeall
 msgid "All"
@@ -349,6 +349,10 @@ msgstr "Операнд :"
 msgid "Enter filter expression for data in table:"
 msgstr "Введите выражение фильтрации данных в таблице:"
 
+#: rxdconst.srxfindmore
+msgid "Find more"
+msgstr "Искать далее"
+
 #: rxdconst.srxselectdatasetstruct
 msgid "Select dataset to copy to"
 msgstr "Выберите таблицу для копирования"

components/rx/rxdbgrid.pas

@@ -788,6 +788,7 @@ type
     procedure msg_SetGrid(var Msg: TGridMessage); message GM_SETGRID;
     procedure msg_SetValue(var Msg: TGridMessage); message GM_SETVALUE;
     procedure ShowList; override;
+    procedure OnInternalClosePopup(AResult:boolean);override;
   public
     constructor Create(AOwner: TComponent); override;
     destructor Destroy; override;
@@ -1263,6 +1264,19 @@ begin
   inherited ShowList;
 end;
 
+procedure TRxDBGridLookupComboEditor.OnInternalClosePopup(AResult: boolean);
+var
+  F:TField;
+begin
+  inherited OnInternalClosePopup(AResult);
+  if (AResult) and Assigned(FGrid.SelectedField) and Assigned(FLDS.DataSet) then
+  begin
+    F:=FLDS.DataSet.FieldByName(LookupDisplay);
+    if Assigned(F) then
+      FGrid.SelectedField.Assign(F);
+  end;
+end;
+
 constructor TRxDBGridLookupComboEditor.Create(AOwner: TComponent);
 begin
   inherited Create(AOwner);
@@ -2643,6 +2657,8 @@ var
   Cell: TGridCoord;
   Rect: TRect;
 begin
+  QuickUTF8Search := '';
+
   Cell := MouseCoord(X, Y);
   if (DatalinkActive) and (DataSource.DataSet.State = dsBrowse) and
     (Button = mbLeft) and (Cell.X = 0) and (Cell.Y = 0) and

components/rx/rxdbgrid_findunit.lfm

@@ -1,25 +1,25 @@
 object rxDBGridFindForm: TrxDBGridFindForm
-  Left = 474
-  Height = 232
-  Top = 384
+  Left = 969
+  Height = 225
+  Top = 314
   Width = 493
   ActiveControl = Edit1
   Caption = 'Find'
-  ClientHeight = 232
+  ClientHeight = 225
   ClientWidth = 493
   OnCreate = FormCreate
   OnShow = FormShow
-  Position = poDesktopCenter
-  LCLVersion = '0.9.29'
+  Position = poScreenCenter
+  LCLVersion = '1.1'
   object Label1: TLabel
     AnchorSideLeft.Control = Owner
     AnchorSideTop.Control = Owner
     AnchorSideBottom.Control = Edit1
     AnchorSideBottom.Side = asrBottom
     Left = 6
-    Height = 18
+    Height = 15
     Top = 6
-    Width = 78
+    Width = 66
     BorderSpacing.Around = 6
     Caption = 'Text to find'
     FocusControl = Edit1
@@ -32,9 +32,9 @@ object rxDBGridFindForm: TrxDBGridFindForm
     AnchorSideBottom.Control = ComboBox1
     AnchorSideBottom.Side = asrBottom
     Left = 6
-    Height = 18
-    Top = 65
-    Width = 80
+    Height = 15
+    Top = 58
+    Width = 68
     BorderSpacing.Around = 6
     Caption = 'Find at filed'
     ParentColor = False
@@ -43,10 +43,10 @@ object rxDBGridFindForm: TrxDBGridFindForm
     AnchorSideRight.Control = Button2
     AnchorSideBottom.Control = Owner
     AnchorSideBottom.Side = asrBottom
-    Left = 334
-    Height = 37
-    Top = 189
-    Width = 88
+    Left = 347
+    Height = 35
+    Top = 184
+    Width = 79
     Anchors = [akRight, akBottom]
     AutoSize = True
     BorderSpacing.Around = 6
@@ -63,10 +63,10 @@ object rxDBGridFindForm: TrxDBGridFindForm
     AnchorSideRight.Side = asrBottom
     AnchorSideBottom.Control = Owner
     AnchorSideBottom.Side = asrBottom
-    Left = 428
-    Height = 37
-    Top = 189
-    Width = 59
+    Left = 432
+    Height = 35
+    Top = 184
+    Width = 55
     Anchors = [akRight, akBottom]
     AutoSize = True
     BorderSpacing.Top = 8
@@ -84,8 +84,8 @@ object rxDBGridFindForm: TrxDBGridFindForm
     AnchorSideRight.Control = Owner
     AnchorSideRight.Side = asrBottom
     Left = 18
-    Height = 29
-    Top = 30
+    Height = 25
+    Top = 27
     Width = 469
     Anchors = [akTop, akLeft, akRight]
     BorderSpacing.Around = 6
@@ -98,8 +98,8 @@ object rxDBGridFindForm: TrxDBGridFindForm
     AnchorSideRight.Control = Owner
     AnchorSideRight.Side = asrBottom
     Left = 12
-    Height = 31
-    Top = 89
+    Height = 29
+    Top = 79
     Width = 475
     Anchors = [akTop, akLeft, akRight]
     BorderSpacing.Around = 6
@@ -112,9 +112,9 @@ object rxDBGridFindForm: TrxDBGridFindForm
     AnchorSideTop.Control = ComboBox1
     AnchorSideTop.Side = asrBottom
     Left = 6
-    Height = 19
-    Top = 126
-    Width = 126
+    Height = 22
+    Top = 114
+    Width = 118
     BorderSpacing.Around = 6
     Caption = 'Case sensetive'
     TabOrder = 2
@@ -126,10 +126,10 @@ object rxDBGridFindForm: TrxDBGridFindForm
     AnchorSideTop.Side = asrBottom
     AnchorSideRight.Control = Owner
     AnchorSideRight.Side = asrBottom
-    Left = 138
-    Height = 52
-    Top = 126
-    Width = 349
+    Left = 130
+    Height = 51
+    Top = 114
+    Width = 357
     Anchors = [akTop, akLeft, akRight]
     AutoFill = True
     AutoSize = True
@@ -143,8 +143,8 @@ object rxDBGridFindForm: TrxDBGridFindForm
     ChildSizing.ShrinkVertical = crsScaleChilds
     ChildSizing.Layout = cclLeftToRightThenTopToBottom
     ChildSizing.ControlsPerLine = 3
-    ClientHeight = 31
-    ClientWidth = 341
+    ClientHeight = 34
+    ClientWidth = 353
     Columns = 3
     Items.Strings = (
       'All'
@@ -159,9 +159,9 @@ object rxDBGridFindForm: TrxDBGridFindForm
     AnchorSideTop.Control = CheckBox1
     AnchorSideTop.Side = asrBottom
     Left = 6
-    Height = 19
-    Top = 151
-    Width = 88
+    Height = 22
+    Top = 142
+    Width = 84
     BorderSpacing.Around = 6
     Caption = 'Partial key'
     TabOrder = 3

components/rx/rxdbgrid_findunit.pas

@@ -68,7 +68,7 @@ type
 procedure ShowRxDBGridFindForm(Grid:TRxDBGrid);
 
 implementation
-uses dbutils, DBGrids, rxdconst;
+uses dbutils, DBGrids, rxdconst, LCLStrConsts;
 
 {$R *.lfm}
 
@@ -101,6 +101,8 @@ begin
   RadioGroup1.Items.Add(sRxDbGridFindRangeAll);
   RadioGroup1.Items.Add(sRxDbGridFindRangeForw);
   RadioGroup1.Items.Add(sRxDbGridFindRangeBack);
+  BtnFind.Caption:=sRxFindMore;
+  Button2.Caption:=rsMbClose;
 end;
 
 procedure TrxDBGridFindForm.FormShow(Sender: TObject);

components/rx/rxdconst.pas

@@ -148,6 +148,7 @@ resourcestring
   sRxDbGridFindRangeAll    = 'All';
   sRxDbGridFindRangeForw   = 'Forward';
   sRxDbGridFindRangeBack   = 'Backward';
+  sRxFindMore              = 'Find more';
 
   //TrxDBGridColumsForm
   sRxDbGridSelColCaption   = 'Grid columns';

components/rx/rxlookup.pas

@@ -1476,8 +1476,9 @@ begin
     begin
       if Assigned(FDataField) and FDataField.IsNull then
       begin
+        SetRect(R1, 6, 6, ClientWidth - 6 - GetButtonWidth, ClientHeight - 6);
         Canvas.Brush.Color:=FEmptyItemColor;
-        Canvas.FillRect(R);
+        Canvas.FillRect(R1);
         AText:=FEmptyValue
       end
       else
@@ -1584,7 +1585,8 @@ begin
   FButton.ControlStyle := FButton.ControlStyle + [csNoDesignSelectable];
   FButton.Align:=alRight;
   FButton.BorderSpacing.Around:=2;
-  
+  //FButton.TabStop:=true;
+
   ControlStyle := ControlStyle - [csSetCaption];
   FDirectInput := True;
   ParentColor:=false;