RxFPC:in rxdbgrid filter dialog allow use columns in expressions

git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@6291 8e941d3f-bd1b-0410-a28a-d453659cc2b4
2018-04-05 08:12:13 +00:00
parent 8d5997b3e3
commit 2b912d8e33
7 changed files with 358 additions and 326 deletions
--- a/components/rx/trunk/demos/rxdbgrid/RxDBGrid_Filter/project1.lpi
+++ b/components/rx/trunk/demos/rxdbgrid/RxDBGrid_Filter/project1.lpi
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <CONFIG>
  <ProjectOptions>
-    <Version Value="10"/>
+    <Version Value="11"/>
    <General>
      <SessionStorage Value="InProjectDir"/>
      <MainUnit Value="0"/>
@@ -17,9 +17,10 @@
      <Version Value="2"/>
    </PublishOptions>
    <RunParams>
-      <local>
-        <FormatVersion Value="1"/>
-      </local>
+      <FormatVersion Value="2"/>
+      <Modes Count="1">
+        <Mode0 Name="default"/>
+      </Modes>
    </RunParams>
    <RequiredPackages Count="4">
      <Item1>
@@ -35,7 +36,7 @@
        <PackageName Value="LCL"/>
      </Item4>
    </RequiredPackages>
-    <Units Count="3">
+    <Units Count="2">
      <Unit0>
        <Filename Value="project1.lpr"/>
        <IsPartOfProject Value="True"/>
@@ -48,14 +49,6 @@
        <ResourceBaseClass Value="Form"/>
        <UnitName Value="Unit1"/>
      </Unit1>
-      <Unit2>
-        <Filename Value="../../rxdb/rxdbgrid_popupfilterunit.pas"/>
-        <IsPartOfProject Value="True"/>
-        <ComponentName Value="RxDBGrid_PopUpFilterForm"/>
-        <HasResources Value="True"/>
-        <ResourceBaseClass Value="Form"/>
-        <UnitName Value="RxDBGrid_PopUpFilterUnit"/>
-      </Unit2>
    </Units>
  </ProjectOptions>
  <CompilerOptions>
--- a/components/rx/trunk/demos/rxdbgrid/RxDBGrid_Filter/project1.lpr
+++ b/components/rx/trunk/demos/rxdbgrid/RxDBGrid_Filter/project1.lpr
@@ -7,8 +7,7 @@ uses
  cthreads,
  {$ENDIF}{$ENDIF}
  Interfaces, // this includes the LCL widgetset
-  Forms, Unit1, rxnew, lazcontrols, RxDBGrid_PopUpFilterUnit
-  { you can add units after this };
+  Forms, Unit1, rxnew, lazcontrols;

 {$R *.res}

--- a/components/rx/trunk/demos/rxdbgrid/RxDBGrid_Filter/project1.lps
+++ b/components/rx/trunk/demos/rxdbgrid/RxDBGrid_Filter/project1.lps
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <CONFIG>
  <ProjectSession>
-    <Version Value="10"/>
+    <Version Value="11"/>
    <BuildModes Active="Default"/>
-    <Units Count="20">
+    <Units Count="22">
      <Unit0>
        <Filename Value="project1.lpr"/>
        <IsPartOfProject Value="True"/>
@@ -20,25 +20,21 @@
        <HasResources Value="True"/>
        <ResourceBaseClass Value="Form"/>
        <UnitName Value="Unit1"/>
-        <TopLine Value="25"/>
-        <CursorPos X="16" Y="51"/>
+        <CursorPos X="6" Y="27"/>
        <UsageCount Value="33"/>
        <Loaded Value="True"/>
        <LoadedDesigner Value="True"/>
      </Unit1>
      <Unit2>
        <Filename Value="../../rxdb/rxdbgrid_popupfilterunit.pas"/>
-        <IsPartOfProject Value="True"/>
        <ComponentName Value="RxDBGrid_PopUpFilterForm"/>
        <HasResources Value="True"/>
        <ResourceBaseClass Value="Form"/>
        <UnitName Value="RxDBGrid_PopUpFilterUnit"/>
-        <EditorIndex Value="1"/>
+        <EditorIndex Value="-1"/>
        <TopLine Value="188"/>
        <CursorPos X="60" Y="188"/>
        <UsageCount Value="33"/>
-        <Loaded Value="True"/>
-        <LoadedDesigner Value="True"/>
      </Unit2>
      <Unit3>
        <Filename Value="../../../../lcl/forms.pp"/>
@@ -50,7 +46,7 @@
      </Unit3>
      <Unit4>
        <Filename Value="../../rxdb/rxdbgrid.pas"/>
-        <EditorIndex Value="3"/>
+        <EditorIndex Value="-1"/>
        <TopLine Value="581"/>
        <CursorPos X="15" Y="599"/>
        <UsageCount Value="15"/>
@@ -60,7 +56,6 @@
          <Item2 Y="4864" ID="1"/>
          <Item3 Y="4287" ID="2"/>
        </Bookmarks>
-        <Loaded Value="True"/>
      </Unit4>
      <Unit5>
        <Filename Value="../../../lazcontrols/listfilteredit.pas"/>
@@ -107,11 +102,10 @@
      </Unit10>
      <Unit11>
        <Filename Value="../../rxtools/rxdconst.pas"/>
-        <EditorIndex Value="2"/>
+        <EditorIndex Value="-1"/>
        <TopLine Value="226"/>
        <CursorPos X="3" Y="239"/>
        <UsageCount Value="11"/>
-        <Loaded Value="True"/>
      </Unit11>
      <Unit12>
        <Filename Value="../../../../lcl/controls.pp"/>
@@ -155,19 +149,16 @@
      <Unit17>
        <Filename Value="../../../../lcl/grids.pas"/>
        <UnitName Value="Grids"/>
-        <IsVisibleTab Value="True"/>
-        <EditorIndex Value="5"/>
+        <EditorIndex Value="-1"/>
        <TopLine Value="5387"/>
        <CursorPos X="3" Y="5392"/>
        <UsageCount Value="10"/>
-        <Loaded Value="True"/>
      </Unit17>
      <Unit18>
        <Filename Value="../../../../lcl/dbgrids.pas"/>
        <UnitName Value="DBGrids"/>
-        <EditorIndex Value="4"/>
+        <EditorIndex Value="-1"/>
        <UsageCount Value="10"/>
-        <Loaded Value="True"/>
      </Unit18>
      <Unit19>
        <Filename Value="/home/install/source/fpcsrc/rtl/inc/typshrdh.inc"/>
@@ -176,126 +167,153 @@
        <CursorPos X="29" Y="158"/>
        <UsageCount Value="10"/>
      </Unit19>
+      <Unit20>
+        <Filename Value="../../../rxdb/rxdbgrid.pas"/>
+        <EditorIndex Value="1"/>
+        <TopLine Value="6203"/>
+        <CursorPos X="38" Y="6234"/>
+        <UsageCount Value="10"/>
+        <Loaded Value="True"/>
+      </Unit20>
+      <Unit21>
+        <Filename Value="../../../rxdb/rxfilterby.pas"/>
+        <ComponentName Value="rxFilterByForm"/>
+        <HasResources Value="True"/>
+        <ResourceBaseClass Value="Form"/>
+        <IsVisibleTab Value="True"/>
+        <EditorIndex Value="2"/>
+        <TopLine Value="340"/>
+        <CursorPos Y="370"/>
+        <UsageCount Value="10"/>
+        <Loaded Value="True"/>
+        <LoadedDesigner Value="True"/>
+      </Unit21>
    </Units>
    <JumpHistory Count="30" HistoryIndex="29">
      <Position1>
-        <Filename Value="../../../../lcl/dbgrids.pas"/>
-        <Caret Line="404" Column="15" TopLine="387"/>
+        <Filename Value="../../../rxdb/rxfilterby.pas"/>
+        <Caret Line="245" Column="3" TopLine="245"/>
      </Position1>
      <Position2>
-        <Filename Value="../../../../lcl/dbgrids.pas"/>
-        <Caret Line="3083" Column="3" TopLine="3080"/>
+        <Filename Value="../../../rxdb/rxfilterby.pas"/>
+        <Caret Line="246" Column="3" TopLine="246"/>
      </Position2>
      <Position3>
-        <Filename Value="../../../../lcl/dbgrids.pas"/>
-        <Caret Line="402" Column="15" TopLine="389"/>
+        <Filename Value="../../../rxdb/rxfilterby.pas"/>
+        <Caret Line="245" Column="3" TopLine="245"/>
      </Position3>
      <Position4>
-        <Filename Value="../../../../lcl/grids.pas"/>
-        <Caret Line="4133" Column="3" TopLine="4129"/>
+        <Filename Value="../../../rxdb/rxfilterby.pas"/>
+        <Caret Line="246" Column="3" TopLine="246"/>
      </Position4>
      <Position5>
-        <Filename Value="../../../../lcl/grids.pas"/>
-        <Caret Line="750" Column="12" TopLine="735"/>
+        <Filename Value="../../../rxdb/rxfilterby.pas"/>
+        <Caret Line="245" Column="3" TopLine="245"/>
      </Position5>
      <Position6>
-        <Filename Value="../../../../lcl/dbgrids.pas"/>
-        <Caret Line="3049" Column="3" TopLine="3045"/>
+        <Filename Value="../../../rxdb/rxfilterby.pas"/>
+        <Caret Line="246" Column="3" TopLine="246"/>
      </Position6>
      <Position7>
-        <Filename Value="../../../../lcl/grids.pas"/>
-        <Caret Line="976" Column="15" TopLine="959"/>
+        <Filename Value="../../../rxdb/rxfilterby.pas"/>
+        <Caret Line="245" Column="3" TopLine="245"/>
      </Position7>
      <Position8>
-        <Filename Value="../../../../lcl/grids.pas"/>
-        <Caret Line="4133" Column="3" TopLine="4129"/>
+        <Filename Value="../../../rxdb/rxfilterby.pas"/>
+        <Caret Line="246" Column="3" TopLine="246"/>
      </Position8>
      <Position9>
-        <Filename Value="../../../../lcl/dbgrids.pas"/>
-        <Caret Line="3049" Column="3" TopLine="3045"/>
+        <Filename Value="../../../rxdb/rxfilterby.pas"/>
+        <Caret Line="245" Column="3" TopLine="245"/>
      </Position9>
      <Position10>
-        <Filename Value="../../../../lcl/grids.pas"/>
-        <Caret Line="976" Column="15" TopLine="961"/>
+        <Filename Value="../../../rxdb/rxfilterby.pas"/>
+        <Caret Line="246" Column="3" TopLine="246"/>
      </Position10>
      <Position11>
-        <Filename Value="../../../../lcl/dbgrids.pas"/>
-        <Caret Line="3049" Column="3" TopLine="3045"/>
+        <Filename Value="../../../rxdb/rxfilterby.pas"/>
+        <Caret Line="245" Column="3" TopLine="245"/>
      </Position11>
      <Position12>
-        <Filename Value="../../../../lcl/grids.pas"/>
-        <Caret Line="4134" Column="15" TopLine="4129"/>
+        <Filename Value="../../../rxdb/rxfilterby.pas"/>
+        <Caret Line="256" Column="45" TopLine="246"/>
      </Position12>
      <Position13>
-        <Filename Value="../../../../lcl/grids.pas"/>
+        <Filename Value="../../../rxdb/rxfilterby.pas"/>
+        <Caret Line="255" Column="45" TopLine="245"/>
      </Position13>
      <Position14>
-        <Filename Value="../../../../lcl/grids.pas"/>
-        <Caret Line="4134" Column="27" TopLine="4106"/>
+        <Filename Value="../../../rxdb/rxfilterby.pas"/>
+        <Caret Line="279" Column="20" TopLine="279"/>
      </Position14>
      <Position15>
-        <Filename Value="../../../../lcl/grids.pas"/>
-        <Caret Line="4201" Column="27" TopLine="4148"/>
+        <Filename Value="../../../rxdb/rxfilterby.pas"/>
+        <Caret Line="105" Column="15" TopLine="87"/>
      </Position15>
      <Position16>
-        <Filename Value="../../../../lcl/grids.pas"/>
-        <Caret Line="7212" Column="27" TopLine="7184"/>
+        <Filename Value="../../../rxdb/rxfilterby.pas"/>
+        <Caret Line="186" Column="3" TopLine="181"/>
      </Position16>
      <Position17>
-        <Filename Value="../../../../lcl/grids.pas"/>
-        <Caret Line="7218" Column="27" TopLine="7190"/>
+        <Filename Value="../../../rxdb/rxfilterby.pas"/>
+        <Caret Line="105" Column="5" TopLine="87"/>
      </Position17>
      <Position18>
-        <Filename Value="../../../../lcl/grids.pas"/>
-        <Caret Line="7759" Column="52" TopLine="7731"/>
+        <Filename Value="../../../rxdb/rxfilterby.pas"/>
+        <Caret Line="197" Column="17" TopLine="178"/>
      </Position18>
      <Position19>
-        <Filename Value="../../../../lcl/grids.pas"/>
-        <Caret Line="8260" Column="62" TopLine="8232"/>
+        <Filename Value="../../../rxdb/rxfilterby.pas"/>
+        <Caret Line="198" TopLine="177"/>
      </Position19>
      <Position20>
-        <Filename Value="../../../../lcl/grids.pas"/>
-        <Caret Line="8266" Column="63" TopLine="8238"/>
+        <Filename Value="../../../rxdb/rxfilterby.pas"/>
+        <Caret Line="384" Column="27" TopLine="363"/>
      </Position20>
      <Position21>
-        <Filename Value="../../../../lcl/grids.pas"/>
+        <Filename Value="../../../rxdb/rxfilterby.pas"/>
+        <Caret Line="107" Column="14" TopLine="89"/>
      </Position21>
      <Position22>
-        <Filename Value="../../../../lcl/grids.pas"/>
-        <Caret Line="667" Column="18" TopLine="638"/>
+        <Filename Value="../../../rxdb/rxfilterby.pas"/>
+        <Caret Line="235" Column="30" TopLine="217"/>
      </Position22>
      <Position23>
-        <Filename Value="../../../../lcl/grids.pas"/>
-        <Caret Line="668" Column="45" TopLine="639"/>
+        <Filename Value="../../../rxdb/rxfilterby.pas"/>
+        <Caret Line="109" Column="15" TopLine="87"/>
      </Position23>
      <Position24>
-        <Filename Value="../../../../lcl/grids.pas"/>
-        <Caret Line="687" Column="22" TopLine="656"/>
+        <Filename Value="../../../rxdb/rxfilterby.pas"/>
+        <Caret Line="105" Column="15" TopLine="87"/>
      </Position24>
      <Position25>
-        <Filename Value="../../../../lcl/grids.pas"/>
-        <Caret Line="788" Column="31" TopLine="761"/>
+        <Filename Value="../../../rxdb/rxfilterby.pas"/>
+        <Caret Line="197" Column="33" TopLine="181"/>
      </Position25>
      <Position26>
-        <Filename Value="../../../../lcl/grids.pas"/>
-        <Caret Line="5392" Column="3" TopLine="5387"/>
+        <Filename Value="../../../rxdb/rxfilterby.pas"/>
+        <Caret Line="109" Column="15" TopLine="87"/>
      </Position26>
      <Position27>
-        <Filename Value="../../../../lcl/grids.pas"/>
-        <Caret Line="845" Column="15" TopLine="830"/>
+        <Filename Value="../../../rxdb/rxfilterby.pas"/>
+        <Caret Line="351" Column="11" TopLine="332"/>
      </Position27>
      <Position28>
-        <Filename Value="../../../../lcl/grids.pas"/>
-        <Caret Line="3373" Column="3" TopLine="3378"/>
+        <Filename Value="../../../rxdb/rxfilterby.pas"/>
+        <Caret Line="354" Column="70" TopLine="337"/>
      </Position28>
      <Position29>
-        <Filename Value="../../../../lcl/grids.pas"/>
-        <Caret Line="3846" Column="21" TopLine="3818"/>
+        <Filename Value="../../../rxdb/rxfilterby.pas"/>
+        <Caret Line="353" TopLine="337"/>
      </Position29>
      <Position30>
-        <Filename Value="../../../../lcl/grids.pas"/>
-        <Caret Line="788" Column="15" TopLine="773"/>
+        <Filename Value="../../../rxdb/rxfilterby.pas"/>
+        <Caret Line="354" TopLine="337"/>
      </Position30>
    </JumpHistory>
+    <RunParams>
+      <FormatVersion Value="2"/>
+      <Modes Count="0" ActiveMode="default"/>
+    </RunParams>
  </ProjectSession>
 </CONFIG>
--- a/components/rx/trunk/demos/rxdbgrid/RxDBGrid_Filter/project1.res
+++ b/components/rx/trunk/demos/rxdbgrid/RxDBGrid_Filter/project1.res
--- a/components/rx/trunk/demos/rxdbgrid/RxDBGrid_Filter/unit1.lfm
+++ b/components/rx/trunk/demos/rxdbgrid/RxDBGrid_Filter/unit1.lfm
@@ -26,6 +26,7 @@ object Form1: TForm1
        EditButtons = <>
        Filter.DropDownRows = 0
        Filter.EmptyValue = '(Empty)'
+        Filter.NotEmptyValue = '(Не пусто)'
        Filter.AllValue = '(All values)'
        Filter.EmptyFont.Style = [fsItalic]
        Filter.ItemIndex = -1
@@ -40,6 +41,7 @@ object Form1: TForm1
        EditButtons = <>
        Filter.DropDownRows = 0
        Filter.EmptyValue = '(Empty)'
+        Filter.NotEmptyValue = '(Не пусто)'
        Filter.AllValue = '(All values)'
        Filter.EmptyFont.Style = [fsItalic]
        Filter.ItemIndex = -1
@@ -55,6 +57,7 @@ object Form1: TForm1
        EditButtons = <>
        Filter.DropDownRows = 0
        Filter.EmptyValue = '(Empty)'
+        Filter.NotEmptyValue = '(Не пусто)'
        Filter.AllValue = '(All values)'
        Filter.EmptyFont.Style = [fsItalic]
        Filter.ItemIndex = -1
@@ -70,6 +73,7 @@ object Form1: TForm1
        EditButtons = <>
        Filter.DropDownRows = 0
        Filter.EmptyValue = '(Empty)'
+        Filter.NotEmptyValue = '(Не пусто)'
        Filter.AllValue = '(All values)'
        Filter.EmptyFont.Style = [fsItalic]
        Filter.ItemIndex = -1
@@ -84,6 +88,7 @@ object Form1: TForm1
        EditButtons = <>
        Filter.DropDownRows = 0
        Filter.EmptyValue = '(Empty)'
+        Filter.NotEmptyValue = '(Не пусто)'
        Filter.AllValue = '(All values)'
        Filter.EmptyFont.Style = [fsItalic]
        Filter.ItemIndex = -1
@@ -149,7 +154,7 @@ object Form1: TForm1
    FooterOptions.DrawFullLine = False
    SearchOptions.QuickSearchOptions = [loCaseInsensitive, loPartialKey]
    SearchOptions.FromStart = False
-    OptionsRx = [rdgAllowColumnsForm, rdgAllowDialogFind, rdgFilter, rdgAllowQuickFilter, rdgAllowToolMenu]
+    OptionsRx = [rdgAllowColumnsForm, rdgAllowDialogFind, rdgFilter, rdgAllowQuickFilter, rdgAllowFilterForm, rdgAllowToolMenu]
    Align = alClient
    Color = clWindow
    DrawFullLine = False
@@ -158,7 +163,6 @@ object Form1: TForm1
    GridLineStyle = psSolid
    DataSource = dsData
    Options = [dgEditing, dgTitles, dgIndicator, dgColumnResize, dgColumnMove, dgColLines, dgRowLines, dgAlwaysShowSelection, dgConfirmDelete, dgCancelOnExit, dgHeaderPushedLook]
-    ParentColor = False
    TabOrder = 0
  end
  object rxData: TRxMemoryData