RxFPC:enable quick search in RxDBGrid for not fsString fields

git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@5135 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
alexs75
2016-09-08 08:59:16 +00:00
parent 441bd798fb
commit 7a03db1a79
3 changed files with 63 additions and 39 deletions

View File

@ -3,7 +3,7 @@
<ProjectSession>
<Version Value="9"/>
<BuildModes Active="Default"/>
<Units Count="4">
<Units Count="6">
<Unit0>
<Filename Value="project1.lpr"/>
<IsPartOfProject Value="True"/>
@ -20,6 +20,7 @@
<HasResources Value="True"/>
<ResourceBaseClass Value="Form"/>
<UnitName Value="Unit1"/>
<IsVisibleTab Value="True"/>
<TopLine Value="11"/>
<CursorPos X="6" Y="21"/>
<UsageCount Value="21"/>
@ -28,10 +29,9 @@
</Unit1>
<Unit2>
<Filename Value="../../rxdbgrid.pas"/>
<IsVisibleTab Value="True"/>
<EditorIndex Value="1"/>
<TopLine Value="6169"/>
<CursorPos X="16" Y="6179"/>
<TopLine Value="4375"/>
<CursorPos X="34" Y="4400"/>
<UsageCount Value="10"/>
<Bookmarks Count="1">
<Item0 Y="5181" ID="1"/>
@ -40,132 +40,146 @@
</Unit2>
<Unit3>
<Filename Value="../../rxdconst.pas"/>
<EditorIndex Value="2"/>
<EditorIndex Value="4"/>
<TopLine Value="102"/>
<CursorPos X="73" Y="118"/>
<UsageCount Value="10"/>
<Loaded Value="True"/>
</Unit3>
<Unit4>
<Filename Value="../../dbutils.pas"/>
<EditorIndex Value="2"/>
<TopLine Value="381"/>
<CursorPos X="30" Y="386"/>
<UsageCount Value="10"/>
<Loaded Value="True"/>
</Unit4>
<Unit5>
<Filename Value="/home/install/source/fpcsrc/packages/fcl-db/src/base/db.pas"/>
<EditorIndex Value="3"/>
<TopLine Value="1358"/>
<CursorPos X="51" Y="1372"/>
<UsageCount Value="10"/>
<Loaded Value="True"/>
</Unit5>
</Units>
<JumpHistory Count="30" HistoryIndex="29">
<Position1>
<Filename Value="../../rxdbgrid.pas"/>
<Caret Line="391" Column="61" TopLine="361"/>
<Caret Line="5285" Column="47" TopLine="5260"/>
</Position1>
<Position2>
<Filename Value="../../rxdbgrid.pas"/>
<Caret Line="390" Column="67" TopLine="366"/>
<Caret Line="6155" Column="16" TopLine="6129"/>
</Position2>
<Position3>
<Filename Value="../../rxdbgrid.pas"/>
<Caret Line="3741" Column="54" TopLine="3717"/>
<Caret Line="446" Column="17" TopLine="425"/>
</Position3>
<Position4>
<Filename Value="../../rxdbgrid.pas"/>
<Caret Line="4741" Column="43" TopLine="4716"/>
<Caret Line="3741" Column="54" TopLine="3717"/>
</Position4>
<Position5>
<Filename Value="../../rxdbgrid.pas"/>
<Caret Line="5153" Column="75" TopLine="5128"/>
<Caret Line="4741" Column="83" TopLine="4729"/>
</Position5>
<Position6>
<Filename Value="../../rxdbgrid.pas"/>
<Caret Line="5285" Column="47" TopLine="5260"/>
<Caret Line="5151" Column="63" TopLine="5128"/>
</Position6>
<Position7>
<Filename Value="../../rxdbgrid.pas"/>
<Caret Line="6155" Column="16" TopLine="6129"/>
</Position7>
<Position8>
<Filename Value="../../rxdbgrid.pas"/>
<Caret Line="446" Column="17" TopLine="425"/>
<Caret Line="369" Column="16" TopLine="344"/>
</Position8>
<Position9>
<Filename Value="../../rxdbgrid.pas"/>
<Caret Line="3741" Column="54" TopLine="3717"/>
<Caret Line="390" Column="67" TopLine="366"/>
</Position9>
<Position10>
<Filename Value="../../rxdbgrid.pas"/>
<Caret Line="4741" Column="83" TopLine="4729"/>
<Caret Line="3741" Column="54" TopLine="3717"/>
</Position10>
<Position11>
<Filename Value="../../rxdbgrid.pas"/>
<Caret Line="5151" Column="63" TopLine="5128"/>
<Caret Line="4741" Column="44" TopLine="4716"/>
</Position11>
<Position12>
<Filename Value="../../rxdbgrid.pas"/>
<Caret Line="5153" Column="75" TopLine="5128"/>
</Position12>
<Position13>
<Filename Value="../../rxdbgrid.pas"/>
<Caret Line="369" Column="16" TopLine="344"/>
<Caret Line="5285" Column="47" TopLine="5260"/>
</Position13>
<Position14>
<Filename Value="../../rxdbgrid.pas"/>
<Caret Line="390" Column="67" TopLine="366"/>
<Caret Line="6154" Column="14" TopLine="6129"/>
</Position14>
<Position15>
<Filename Value="../../rxdbgrid.pas"/>
<Caret Line="3741" Column="54" TopLine="3717"/>
<Caret Line="5153" Column="76" TopLine="5132"/>
</Position15>
<Position16>
<Filename Value="../../rxdbgrid.pas"/>
<Caret Line="4741" Column="44" TopLine="4716"/>
<Caret Line="387" Column="52" TopLine="359"/>
</Position16>
<Position17>
<Filename Value="../../rxdbgrid.pas"/>
<Caret Line="5153" Column="75" TopLine="5128"/>
<Caret Line="397" Column="51" TopLine="368"/>
</Position17>
<Position18>
<Filename Value="../../rxdbgrid.pas"/>
<Caret Line="5285" Column="47" TopLine="5260"/>
<Caret Line="3746" Column="54" TopLine="3721"/>
</Position18>
<Position19>
<Filename Value="../../rxdbgrid.pas"/>
<Caret Line="6154" Column="14" TopLine="6129"/>
<Caret Line="750" Column="15" TopLine="737"/>
</Position19>
<Position20>
<Filename Value="../../rxdbgrid.pas"/>
<Caret Line="5153" Column="76" TopLine="5132"/>
<Caret Line="709" Column="15" TopLine="696"/>
</Position20>
<Position21>
<Filename Value="../../rxdbgrid.pas"/>
<Caret Line="387" Column="52" TopLine="359"/>
<Caret Line="3745" Column="94" TopLine="3721"/>
</Position21>
<Position22>
<Filename Value="../../rxdbgrid.pas"/>
<Caret Line="397" Column="51" TopLine="368"/>
<Caret Line="4748" Column="44" TopLine="4723"/>
</Position22>
<Position23>
<Filename Value="../../rxdbgrid.pas"/>
<Caret Line="3746" Column="54" TopLine="3721"/>
<Caret Line="5175" Column="29" TopLine="5152"/>
</Position23>
<Position24>
<Filename Value="../../rxdbgrid.pas"/>
<Caret Line="750" Column="15" TopLine="737"/>
<Caret Line="470" Column="14" TopLine="462"/>
</Position24>
<Position25>
<Filename Value="../../rxdbgrid.pas"/>
<Caret Line="709" Column="15" TopLine="696"/>
<Caret Line="5181" TopLine="5154"/>
</Position25>
<Position26>
<Filename Value="../../rxdbgrid.pas"/>
<Caret Line="3745" Column="94" TopLine="3721"/>
<Caret Line="6177" Column="59" TopLine="6169"/>
</Position26>
<Position27>
<Filename Value="../../rxdbgrid.pas"/>
<Caret Line="4748" Column="44" TopLine="4723"/>
</Position27>
<Position28>
<Filename Value="../../rxdbgrid.pas"/>
<Caret Line="5175" Column="29" TopLine="5152"/>
<Filename Value="../../dbutils.pas"/>
</Position28>
<Position29>
<Filename Value="../../rxdbgrid.pas"/>
<Caret Line="470" Column="14" TopLine="462"/>
<Filename Value="../../dbutils.pas"/>
<Caret Line="386" Column="27" TopLine="382"/>
</Position29>
<Position30>
<Filename Value="../../rxdbgrid.pas"/>
<Caret Line="5181" TopLine="5154"/>
<Caret Line="41" Column="36" TopLine="15"/>
</Position30>
</JumpHistory>
</ProjectSession>

View File

@ -72,8 +72,11 @@ object Form1: TForm1
Width = 90
FieldName = 'ID'
EditButtons = <>
Filter.IsNull = False
Filter.IsAll = True
Filter.DropDownRows = 0
Filter.EmptyValue = '(Нет)'
Filter.AllValue = '(All values)'
Filter.EmptyFont.Style = [fsItalic]
Filter.ItemIndex = -1
Footers = <>
@ -85,8 +88,11 @@ object Form1: TForm1
Width = 500
FieldName = 'NAME'
EditButtons = <>
Filter.IsNull = False
Filter.IsAll = True
Filter.DropDownRows = 0
Filter.EmptyValue = '(Нет)'
Filter.AllValue = '(All values)'
Filter.EmptyFont.Style = [fsItalic]
Filter.ItemIndex = -1
Footers = <>
@ -98,8 +104,11 @@ object Form1: TForm1
Width = 100
FieldName = 'CODE'
EditButtons = <>
Filter.IsNull = False
Filter.IsAll = True
Filter.DropDownRows = 0
Filter.EmptyValue = '(Нет)'
Filter.AllValue = '(All values)'
Filter.EmptyFont.Style = [fsItalic]
Filter.ItemIndex = -1
Footers = <>
@ -161,7 +170,7 @@ object Form1: TForm1
Enabled = True
end>
FooterOptions.DrawFullLine = False
OptionsRx = [rdgAllowColumnsForm, rdgAllowDialogFind, rdgAllowQuickFilter, rdgAllowToolMenu]
OptionsRx = [rdgAllowColumnsForm, rdgAllowDialogFind, rdgAllowQuickSearch, rdgAllowQuickFilter, rdgAllowToolMenu]
Anchors = [akTop, akLeft, akRight, akBottom]
Color = clWindow
DrawFullLine = False
@ -169,8 +178,9 @@ object Form1: TForm1
SelectedColor = clHighlight
GridLineStyle = psSolid
DataSource = DataSource1
Options = [dgEditing, dgTitles, dgIndicator, dgColumnResize, dgColumnMove, dgColLines, dgRowLines, dgAlwaysShowSelection, dgConfirmDelete, dgCancelOnExit]
Options = [dgTitles, dgIndicator, dgColumnResize, dgColumnMove, dgColLines, dgRowLines, dgAlwaysShowSelection, dgConfirmDelete, dgCancelOnExit]
ParentColor = False
ReadOnly = True
TabOrder = 2
end
object Memo1: TMemo

View File

@ -394,7 +394,7 @@ var
S,S1: string;
begin
if Field.DataType = ftString then
if (Field.DataType = ftString) or (loPartialKey in Options) then
begin
if loCaseInsensitive in Options then
begin