pascal/lazarus-ccr
1
0
Fork 0
Code Issues Releases Activity

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

Browse Source 
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
This commit is contained in:
alexs75
2012-09-19 14:06:46 +00:00
parent d06f7b4a54
commit b1c6b6141a
10 changed files with 160 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files

152
components/rx/Demos/RxDBGrid/RxDBGridDemo.lpi
View File

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

19
components/rx/Demos/RxDBGrid/rxdbgridmainunit.lfm
View File

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

4
components/rx/languages/rxdconst.es.po
View File

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

4
components/rx/languages/rxdconst.po
View File

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

6
components/rx/languages/rxdconst.ru.po
View File

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

16
components/rx/rxdbgrid.pas
View File

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

70
components/rx/rxdbgrid_findunit.lfm
View File

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

4
components/rx/rxdbgrid_findunit.pas
View File

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

1
components/rx/rxdconst.pas
View File

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

4
components/rx/rxlookup.pas
View File

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