diff --git a/components/rx/Demos/RxDBGrid/RxDBGridDemo.lpi b/components/rx/Demos/RxDBGrid/RxDBGridDemo.lpi
index 581a21e1d..bdd755f49 100644
--- a/components/rx/Demos/RxDBGrid/RxDBGridDemo.lpi
+++ b/components/rx/Demos/RxDBGrid/RxDBGridDemo.lpi
@@ -62,8 +62,8 @@
-
-
+
+
@@ -155,7 +155,7 @@
-
+
@@ -307,5 +307,10 @@
+
+
+
+
+
diff --git a/components/rx/Demos/RxDBGrid/RxDBGridDemo.lrs b/components/rx/Demos/RxDBGrid/RxDBGridDemo.lrs
index b8ddd6a05..0981932ae 100644
--- a/components/rx/Demos/RxDBGrid/RxDBGridDemo.lrs
+++ b/components/rx/Demos/RxDBGrid/RxDBGridDemo.lrs
@@ -20,7 +20,7 @@ LazarusResources.Add('MAINICON','ICO',[
+#128#0#8#7#0#0#0#136#136#136#136#136#136#136#136#136#128'p'#8#7#7'w'#8#136
+#255#255#255#255#255#255#255#255#248#0#143#0#0#0#136#255#0#0#0#0#0#0#0#0#15
+#255#240#0#15#255#255#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0
- +#0#255#254#31#255#255#240#19#255#255#224#1#255#255#128#1''#255#0#0'?'#254#0
+ +#0#255#254#31#255#255#240#19#255#255#224#1#255#255#128#1#127#255#0#0'?'#254#0
+#0#31#252#0#0'?'#252#0#0#15#248#0#0#7#240#0#0#7#240#0#0#15#240#0#0#3#224#0#0
+#3#224#1#128#3#224#0#128#3#224#0#0#7#248#0#0#7#240#0#0#7#240#0#0#15#248#0#0
+#31#254#0#0#31#192#0#0'?'#130#0#0'C'#0#0#0#129#0#0#0#0#240#0#0#0#248#0#0'0'
diff --git a/components/rx/Demos/RxDBGrid/rxdbgridmainunit.lfm b/components/rx/Demos/RxDBGrid/rxdbgridmainunit.lfm
index 5e65eedd0..142080b18 100644
--- a/components/rx/Demos/RxDBGrid/rxdbgridmainunit.lfm
+++ b/components/rx/Demos/RxDBGrid/rxdbgridmainunit.lfm
@@ -1,18 +1,18 @@
object RxDBGridMainForm: TRxDBGridMainForm
- Left = 240
+ Left = 318
Height = 609
- Top = 242
+ Top = 245
Width = 969
ActiveControl = Panel1
Caption = 'RxDBGrid Demo (ver 3) ...'
ClientHeight = 609
ClientWidth = 969
OnCreate = FormCreate
- LCLVersion = '0.9.27'
+ LCLVersion = '0.9.29'
object RxDBGrid1: TRxDBGrid
Left = 0
- Height = 544
- Top = 65
+ Height = 542
+ Top = 67
Width = 969
TitleButtons = True
AutoSort = True
@@ -21,64 +21,82 @@ object RxDBGridMainForm: TRxDBGridMainForm
Title.Alignment = taCenter
Title.Caption = 'Code'
Title.Orientation = toHorizontal
- Width = 155
+ Width = 158
FieldName = 'ID'
Footer.Alignment = taRightJustify
Footer.DisplayFormat = 'Count: %d'
Footer.ValueType = fvtCount
+ Filter.Font.Style = [fsItalic]
Filter.DropDownRows = 0
Filter.Color = clLime
+ Filter.EmptyValue = '(Нет)'
+ Filter.EmptyFont.Style = [fsItalic]
Filter.ItemIndex = -1
end
item
Title.Alignment = taCenter
Title.Orientation = toHorizontal
- Width = 155
+ Width = 158
FieldName = 'Developer'
+ Filter.Font.Style = [fsItalic]
Filter.DropDownRows = 0
Filter.Color = clLime
+ Filter.EmptyValue = '(Нет)'
+ Filter.EmptyFont.Style = [fsItalic]
Filter.ItemIndex = -1
end
item
Title.Alignment = taCenter
Title.Caption = 'Software|Name'
Title.Orientation = toHorizontal
- Width = 155
+ Width = 158
FieldName = 'NAME'
+ Filter.Font.Style = [fsItalic]
Filter.DropDownRows = 0
Filter.Color = clLime
+ Filter.EmptyValue = '(Нет)'
+ Filter.EmptyFont.Style = [fsItalic]
Filter.ItemIndex = -1
end
item
Title.Alignment = taCenter
Title.Caption = 'Software|Cost'
Title.Orientation = toHorizontal
- Width = 155
+ Width = 158
FieldName = 'PRICE'
DisplayFormat = '#,##0.00'
Footer.Alignment = taRightJustify
Footer.DisplayFormat = '#,##0.00'
Footer.FieldName = 'PRICE'
Footer.ValueType = fvtSum
+ Filter.Font.Style = [fsItalic]
Filter.DropDownRows = 0
Filter.Color = clLime
+ Filter.EmptyValue = '(Нет)'
+ Filter.EmptyFont.Style = [fsItalic]
Filter.ItemIndex = -1
end
item
Title.Alignment = taCenter
Title.Caption = 'Software|Date Present'
Title.Orientation = toHorizontal
- Width = 155
+ Width = 158
FieldName = 'Date_Present'
+ Filter.Font.Style = [fsItalic]
Filter.DropDownRows = 0
+ Filter.EmptyValue = '(Нет)'
+ Filter.EmptyFont.Style = [fsItalic]
Filter.ItemIndex = -1
end
item
Title.Alignment = taCenter
Title.Orientation = toHorizontal
- Width = 160
+ Width = 163
FieldName = 'DEVELOPER_ID'
+ Filter.Font.Style = [fsItalic]
Filter.DropDownRows = 0
+ Filter.EmptyValue = '(Нет)'
+ Filter.EmptyFont.Style = [fsItalic]
Filter.ItemIndex = -1
end>
OptionsRx = [rdgAllowColumnsForm, rdgAllowDialogFind, rdgFooterRows, rdgAllowQuickSearch]
@@ -99,22 +117,22 @@ object RxDBGridMainForm: TRxDBGridMainForm
end
object Panel1: TPanel
Left = 0
- Height = 65
+ Height = 67
Top = 0
Width = 969
Align = alTop
AutoSize = True
- ClientHeight = 65
+ ClientHeight = 67
ClientWidth = 969
TabOrder = 1
object Label1: TLabel
AnchorSideLeft.Control = CheckBox1
AnchorSideLeft.Side = asrBottom
AnchorSideTop.Control = Panel1
- Left = 359
+ Left = 378
Height = 18
Top = 6
- Width = 36
+ Width = 40
BorderSpacing.Around = 6
Caption = 'Mode'
ParentColor = False
@@ -123,9 +141,9 @@ object RxDBGridMainForm: TRxDBGridMainForm
AnchorSideLeft.Control = Panel1
AnchorSideTop.Control = Panel1
Left = 6
- Height = 35
+ Height = 37
Top = 6
- Width = 90
+ Width = 95
Action = actCalcTotal
AutoSize = True
BorderSpacing.Around = 6
@@ -136,10 +154,10 @@ object RxDBGridMainForm: TRxDBGridMainForm
AnchorSideLeft.Control = Button1
AnchorSideLeft.Side = asrBottom
AnchorSideTop.Control = Panel1
- Left = 102
- Height = 35
+ Left = 107
+ Height = 37
Top = 6
- Width = 163
+ Width = 174
Action = actOptimizeColumnsWidthAll
AutoSize = True
BorderSpacing.Around = 6
@@ -151,10 +169,10 @@ object RxDBGridMainForm: TRxDBGridMainForm
AnchorSideLeft.Side = asrBottom
AnchorSideTop.Control = Button1
AnchorSideTop.Side = asrCenter
- Left = 271
- Height = 22
- Top = 12
- Width = 82
+ Left = 287
+ Height = 21
+ Top = 14
+ Width = 85
BorderSpacing.Left = 6
Caption = 'Use filter'
OnChange = CheckBox1Change
@@ -164,8 +182,8 @@ object RxDBGridMainForm: TRxDBGridMainForm
AnchorSideLeft.Control = Label1
AnchorSideTop.Control = Label1
AnchorSideTop.Side = asrBottom
- Left = 365
- Height = 29
+ Left = 384
+ Height = 31
Top = 30
Width = 217
BorderSpacing.Around = 6
diff --git a/components/rx/Demos/RxDBGrid/rxdbgridmainunit.lrs b/components/rx/Demos/RxDBGrid/rxdbgridmainunit.lrs
index 0d307cad5..c941bcdbb 100644
--- a/components/rx/Demos/RxDBGrid/rxdbgridmainunit.lrs
+++ b/components/rx/Demos/RxDBGrid/rxdbgridmainunit.lrs
@@ -1,71 +1,82 @@
-{ - , lazarus }
+{ Это - файл ресурсов, автоматически созданный lazarus }
LazarusResources.Add('TRxDBGridMainForm','FORMDATA',[
- 'TPF0'#17'TRxDBGridMainForm'#16'RxDBGridMainForm'#4'Left'#3#240#0#6'Height'#3
- +'a'#2#3'Top'#3#242#0#5'Width'#3#201#3#13'ActiveControl'#7#6'Panel1'#7'Captio'
+ 'TPF0'#17'TRxDBGridMainForm'#16'RxDBGridMainForm'#4'Left'#3'>'#1#6'Height'#3
+ +'a'#2#3'Top'#3#245#0#5'Width'#3#201#3#13'ActiveControl'#7#6'Panel1'#7'Captio'
+'n'#6#26'RxDBGrid Demo (ver 3) ...'#12'ClientHeight'#3'a'#2#11'ClientWidth'
- +#3#201#3#8'OnCreate'#7#10'FormCreate'#10'LCLVersion'#6#6'0.9.27'#0#9'TRxDBGr'
- +'id'#9'RxDBGrid1'#4'Left'#2#0#6'Height'#3' '#2#3'Top'#2'A'#5'Width'#3#201#3
+ +#3#201#3#8'OnCreate'#7#10'FormCreate'#10'LCLVersion'#6#6'0.9.29'#0#9'TRxDBGr'
+ +'id'#9'RxDBGrid1'#4'Left'#2#0#6'Height'#3#30#2#3'Top'#2'C'#5'Width'#3#201#3
+#12'TitleButtons'#9#8'AutoSort'#9#7'Columns'#14#1#15'Title.Alignment'#7#8'ta'
+'Center'#13'Title.Caption'#6#4'Code'#17'Title.Orientation'#7#12'toHorizontal'
- +#5'Width'#3#155#0#9'FieldName'#6#2'ID'#16'Footer.Alignment'#7#14'taRightJust'
+ +#5'Width'#3#158#0#9'FieldName'#6#2'ID'#16'Footer.Alignment'#7#14'taRightJust'
+'ify'#20'Footer.DisplayFormat'#6#9'Count: %d'#16'Footer.ValueType'#7#8'fvtCo'
- +'unt'#19'Filter.DropDownRows'#2#0#12'Filter.Color'#7#6'clLime'#16'Filter.Ite'
- +'mIndex'#2#255#0#1#15'Title.Alignment'#7#8'taCenter'#17'Title.Orientation'#7
- +#12'toHorizontal'#5'Width'#3#155#0#9'FieldName'#6#9'Developer'#19'Filter.Dro'
- +'pDownRows'#2#0#12'Filter.Color'#7#6'clLime'#16'Filter.ItemIndex'#2#255#0#1
- +#15'Title.Alignment'#7#8'taCenter'#13'Title.Caption'#6#13'Software|Name'#17
- +'Title.Orientation'#7#12'toHorizontal'#5'Width'#3#155#0#9'FieldName'#6#4'NAM'
- +'E'#19'Filter.DropDownRows'#2#0#12'Filter.Color'#7#6'clLime'#16'Filter.ItemI'
- +'ndex'#2#255#0#1#15'Title.Alignment'#7#8'taCenter'#13'Title.Caption'#6#13'So'
- +'ftware|Cost'#17'Title.Orientation'#7#12'toHorizontal'#5'Width'#3#155#0#9'Fi'
- +'eldName'#6#5'PRICE'#13'DisplayFormat'#6#8'#,##0.00'#16'Footer.Alignment'#7
- +#14'taRightJustify'#20'Footer.DisplayFormat'#6#8'#,##0.00'#16'Footer.FieldNa'
- +'me'#6#5'PRICE'#16'Footer.ValueType'#7#6'fvtSum'#19'Filter.DropDownRows'#2#0
- +#12'Filter.Color'#7#6'clLime'#16'Filter.ItemIndex'#2#255#0#1#15'Title.Alignm'
- +'ent'#7#8'taCenter'#13'Title.Caption'#6#21'Software|Date Present'#17'Title.O'
- +'rientation'#7#12'toHorizontal'#5'Width'#3#155#0#9'FieldName'#6#12'Date_Pres'
- +'ent'#19'Filter.DropDownRows'#2#0#16'Filter.ItemIndex'#2#255#0#1#15'Title.Al'
- +'ignment'#7#8'taCenter'#17'Title.Orientation'#7#12'toHorizontal'#5'Width'#3
- +#160#0#9'FieldName'#6#12'DEVELOPER_ID'#19'Filter.DropDownRows'#2#0#16'Filter'
- +'.ItemIndex'#2#255#0#0#9'OptionsRx'#11#19'rdgAllowColumnsForm'#18'rdgAllowDi'
- +'alogFind'#13'rdgFooterRows'#19'rdgAllowQuickSearch'#0#11'FooterColor'#7#8'c'
- +'lYellow'#14'FooterRowCount'#2#1#9'OnFiltred'#7#16'RxDBGrid1Filtred'#5'Align'
- +#7#8'alClient'#15'AutoFillColumns'#9#10'FocusColor'#7#5'clRed'#13'SelectedCo'
- +'lor'#7#11'clHighlight'#13'GridLineStyle'#7#7'psSolid'#10'DataSource'#7#11'D'
- +'atasource1'#7'Options'#11#9'dgEditing'#8'dgTitles'#11'dgIndicator'#14'dgCol'
- +'umnResize'#12'dgColumnMove'#10'dgColLines'#10'dgRowLines'#6'dgTabs'#21'dgAl'
- +'waysShowSelection'#15'dgConfirmDelete'#14'dgCancelOnExit'#13'dgMultiselect'
- +#18'dgHeaderPushedLook'#0#11'ParentColor'#8#9'PopupMenu'#7#10'PopupMenu1'#8
- +'TabOrder'#2#0#10'TitleStyle'#7#8'tsNative'#0#0#6'TPanel'#6'Panel1'#4'Left'#2
- +#0#6'Height'#2'A'#3'Top'#2#0#5'Width'#3#201#3#5'Align'#7#5'alTop'#8'AutoSize'
- +#9#12'ClientHeight'#2'A'#11'ClientWidth'#3#201#3#8'TabOrder'#2#1#0#6'TLabel'
- +#6'Label1'#22'AnchorSideLeft.Control'#7#9'CheckBox1'#19'AnchorSideLeft.Side'
- +#7#9'asrBottom'#21'AnchorSideTop.Control'#7#6'Panel1'#4'Left'#3'g'#1#6'Heigh'
- +'t'#2#18#3'Top'#2#6#5'Width'#2'$'#20'BorderSpacing.Around'#2#6#7'Caption'#6#4
- +'Mode'#11'ParentColor'#8#0#0#7'TButton'#7'Button1'#22'AnchorSideLeft.Control'
- +#7#6'Panel1'#21'AnchorSideTop.Control'#7#6'Panel1'#4'Left'#2#6#6'Height'#2'#'
- +#3'Top'#2#6#5'Width'#2'Z'#6'Action'#7#12'actCalcTotal'#8'AutoSize'#9#20'Bord'
+ +'unt'#17'Filter.Font.Style'#11#8'fsItalic'#0#19'Filter.DropDownRows'#2#0#12
+ +'Filter.Color'#7#6'clLime'#17'Filter.EmptyValue'#6#8'('#208#157#208#181#209
+ +#130')'#22'Filter.EmptyFont.Style'#11#8'fsItalic'#0#16'Filter.ItemIndex'#2
+ +#255#0#1#15'Title.Alignment'#7#8'taCenter'#17'Title.Orientation'#7#12'toHori'
+ +'zontal'#5'Width'#3#158#0#9'FieldName'#6#9'Developer'#17'Filter.Font.Style'
+ +#11#8'fsItalic'#0#19'Filter.DropDownRows'#2#0#12'Filter.Color'#7#6'clLime'#17
+ +'Filter.EmptyValue'#6#8'('#208#157#208#181#209#130')'#22'Filter.EmptyFont.St'
+ +'yle'#11#8'fsItalic'#0#16'Filter.ItemIndex'#2#255#0#1#15'Title.Alignment'#7#8
+ +'taCenter'#13'Title.Caption'#6#13'Software|Name'#17'Title.Orientation'#7#12
+ +'toHorizontal'#5'Width'#3#158#0#9'FieldName'#6#4'NAME'#17'Filter.Font.Style'
+ +#11#8'fsItalic'#0#19'Filter.DropDownRows'#2#0#12'Filter.Color'#7#6'clLime'#17
+ +'Filter.EmptyValue'#6#8'('#208#157#208#181#209#130')'#22'Filter.EmptyFont.St'
+ +'yle'#11#8'fsItalic'#0#16'Filter.ItemIndex'#2#255#0#1#15'Title.Alignment'#7#8
+ +'taCenter'#13'Title.Caption'#6#13'Software|Cost'#17'Title.Orientation'#7#12
+ +'toHorizontal'#5'Width'#3#158#0#9'FieldName'#6#5'PRICE'#13'DisplayFormat'#6#8
+ +'#,##0.00'#16'Footer.Alignment'#7#14'taRightJustify'#20'Footer.DisplayFormat'
+ +#6#8'#,##0.00'#16'Footer.FieldName'#6#5'PRICE'#16'Footer.ValueType'#7#6'fvtS'
+ +'um'#17'Filter.Font.Style'#11#8'fsItalic'#0#19'Filter.DropDownRows'#2#0#12'F'
+ +'ilter.Color'#7#6'clLime'#17'Filter.EmptyValue'#6#8'('#208#157#208#181#209
+ +#130')'#22'Filter.EmptyFont.Style'#11#8'fsItalic'#0#16'Filter.ItemIndex'#2
+ +#255#0#1#15'Title.Alignment'#7#8'taCenter'#13'Title.Caption'#6#21'Software|D'
+ +'ate Present'#17'Title.Orientation'#7#12'toHorizontal'#5'Width'#3#158#0#9'Fi'
+ +'eldName'#6#12'Date_Present'#17'Filter.Font.Style'#11#8'fsItalic'#0#19'Filte'
+ +'r.DropDownRows'#2#0#17'Filter.EmptyValue'#6#8'('#208#157#208#181#209#130')'
+ +#22'Filter.EmptyFont.Style'#11#8'fsItalic'#0#16'Filter.ItemIndex'#2#255#0#1
+ +#15'Title.Alignment'#7#8'taCenter'#17'Title.Orientation'#7#12'toHorizontal'#5
+ +'Width'#3#163#0#9'FieldName'#6#12'DEVELOPER_ID'#17'Filter.Font.Style'#11#8'f'
+ +'sItalic'#0#19'Filter.DropDownRows'#2#0#17'Filter.EmptyValue'#6#8'('#208#157
+ +#208#181#209#130')'#22'Filter.EmptyFont.Style'#11#8'fsItalic'#0#16'Filter.It'
+ +'emIndex'#2#255#0#0#9'OptionsRx'#11#19'rdgAllowColumnsForm'#18'rdgAllowDialo'
+ +'gFind'#13'rdgFooterRows'#19'rdgAllowQuickSearch'#0#11'FooterColor'#7#8'clYe'
+ +'llow'#14'FooterRowCount'#2#1#9'OnFiltred'#7#16'RxDBGrid1Filtred'#5'Align'#7
+ +#8'alClient'#15'AutoFillColumns'#9#10'FocusColor'#7#5'clRed'#13'SelectedColo'
+ +'r'#7#11'clHighlight'#13'GridLineStyle'#7#7'psSolid'#10'DataSource'#7#11'Dat'
+ +'asource1'#7'Options'#11#9'dgEditing'#8'dgTitles'#11'dgIndicator'#14'dgColum'
+ +'nResize'#12'dgColumnMove'#10'dgColLines'#10'dgRowLines'#6'dgTabs'#21'dgAlwa'
+ +'ysShowSelection'#15'dgConfirmDelete'#14'dgCancelOnExit'#13'dgMultiselect'#18
+ +'dgHeaderPushedLook'#0#11'ParentColor'#8#9'PopupMenu'#7#10'PopupMenu1'#8'Tab'
+ +'Order'#2#0#10'TitleStyle'#7#8'tsNative'#0#0#6'TPanel'#6'Panel1'#4'Left'#2#0
+ +#6'Height'#2'C'#3'Top'#2#0#5'Width'#3#201#3#5'Align'#7#5'alTop'#8'AutoSize'#9
+ +#12'ClientHeight'#2'C'#11'ClientWidth'#3#201#3#8'TabOrder'#2#1#0#6'TLabel'#6
+ +'Label1'#22'AnchorSideLeft.Control'#7#9'CheckBox1'#19'AnchorSideLeft.Side'#7
+ +#9'asrBottom'#21'AnchorSideTop.Control'#7#6'Panel1'#4'Left'#3'z'#1#6'Height'
+ +#2#18#3'Top'#2#6#5'Width'#2'('#20'BorderSpacing.Around'#2#6#7'Caption'#6#4'M'
+ +'ode'#11'ParentColor'#8#0#0#7'TButton'#7'Button1'#22'AnchorSideLeft.Control'
+ +#7#6'Panel1'#21'AnchorSideTop.Control'#7#6'Panel1'#4'Left'#2#6#6'Height'#2'%'
+ +#3'Top'#2#6#5'Width'#2'_'#6'Action'#7#12'actCalcTotal'#8'AutoSize'#9#20'Bord'
+'erSpacing.Around'#2#6#25'BorderSpacing.InnerBorder'#2#4#8'TabOrder'#2#0#0#0
+#7'TButton'#7'Button2'#22'AnchorSideLeft.Control'#7#7'Button1'#19'AnchorSide'
- +'Left.Side'#7#9'asrBottom'#21'AnchorSideTop.Control'#7#6'Panel1'#4'Left'#2'f'
- +#6'Height'#2'#'#3'Top'#2#6#5'Width'#3#163#0#6'Action'#7#26'actOptimizeColumn'
+ +'Left.Side'#7#9'asrBottom'#21'AnchorSideTop.Control'#7#6'Panel1'#4'Left'#2'k'
+ +#6'Height'#2'%'#3'Top'#2#6#5'Width'#3#174#0#6'Action'#7#26'actOptimizeColumn'
+'sWidthAll'#8'AutoSize'#9#20'BorderSpacing.Around'#2#6#25'BorderSpacing.Inne'
+'rBorder'#2#4#8'TabOrder'#2#1#0#0#9'TCheckBox'#9'CheckBox1'#22'AnchorSideLef'
+'t.Control'#7#7'Button2'#19'AnchorSideLeft.Side'#7#9'asrBottom'#21'AnchorSid'
+'eTop.Control'#7#7'Button1'#18'AnchorSideTop.Side'#7#9'asrCenter'#4'Left'#3
- +#15#1#6'Height'#2#22#3'Top'#2#12#5'Width'#2'R'#18'BorderSpacing.Left'#2#6#7
+ ,#31#1#6'Height'#2#21#3'Top'#2#14#5'Width'#2'U'#18'BorderSpacing.Left'#2#6#7
+'Caption'#6#10'Use filter'#8'OnChange'#7#15'CheckBox1Change'#8'TabOrder'#2#2
+#0#0#9'TComboBox'#9'ComboBox1'#22'AnchorSideLeft.Control'#7#6'Label1'#21'Anc'
+'horSideTop.Control'#7#6'Label1'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Lef'
- +'t'#3'm'#1#6'Height'#2#29#3'Top'#2#30#5'Width'#3#217#0#20'BorderSpacing.Arou'
- +'nd'#2#6#10'ItemHeight'#2#0#9'ItemIndex'#2#0#13'Items.Strings'#1#6#9'Edit mo'
- +'de'#6#17'Quick search mode'#0#8'OnChange'#7#15'ComboBox1Change'#5'Style'#7
+ +'t'#3#128#1#6'Height'#2#31#3'Top'#2#30#5'Width'#3#217#0#20'BorderSpacing.Aro'
+ +'und'#2#6#10'ItemHeight'#2#0#9'ItemIndex'#2#0#13'Items.Strings'#1#6#9'Edit m'
+ +'ode'#6#17'Quick search mode'#0#8'OnChange'#7#15'ComboBox1Change'#5'Style'#7
+#14'csDropDownList'#8'TabOrder'#2#3#4'Text'#6#9'Edit mode'#0#0#0#13'TRxMemor'
+'yData'#13'RxMemoryData1'#14'AutoCalcFields'#8#9'FieldDefs'#14#1#4'Name'#6#2
+'ID'#8'DataType'#7#9'ftInteger'#9'Precision'#2#255#4'Size'#2#7#0#1#4'Name'#6
+#4'NAME'#8'DataType'#7#8'ftString'#9'Precision'#2#255#4'Size'#3#150#0#0#1#4
- ,'Name'#6#5'PRICE'#8'DataType'#7#7'ftFloat'#9'Precision'#2#2#4'Size'#2#12#0#1
+ +'Name'#6#5'PRICE'#8'DataType'#7#7'ftFloat'#9'Precision'#2#2#4'Size'#2#12#0#1
+#4'Name'#6#9'Developer'#8'DataType'#7#8'ftString'#9'Precision'#2#255#4'Size'
+#3#150#0#0#1#4'Name'#6#12'Date_Present'#8'DataType'#7#6'ftDate'#9'Precision'
+#2#0#4'Size'#2#0#0#1#4'Name'#6#12'DEVELOPER_ID'#8'DataType'#7#9'ftInteger'#9
@@ -118,7 +129,7 @@ LazarusResources.Add('TRxDBGridMainForm','FORMDATA',[
+'DataType'#7#9'ftInteger'#9'Precision'#2#0#4'Size'#2#0#0#1#4'Name'#6#14'DEVE'
+'LOPER_NAME'#8'DataType'#7#8'ftString'#9'Precision'#2#0#4'Size'#3#130#0#0#0#4
+'left'#3#240#0#3'top'#3#8#1#0#13'TLongintField'#26'RxMemoryData2DEVELOPER_ID'
- +'1'#12'DisplayWidth'#2#10#9'FieldKind'#7#6'fkData'#9'FieldName'#6#12'DEVELOP'
+ ,'1'#12'DisplayWidth'#2#10#9'FieldKind'#7#6'fkData'#9'FieldName'#6#12'DEVELOP'
+'ER_ID'#5'Index'#2#0#11'LookupCache'#8#13'ProviderFlags'#11#10'pfInUpdate'#9
+'pfInWhere'#0#8'ReadOnly'#8#8'Required'#8#0#0#12'TStringField'#28'RxMemoryDa'
+'ta2DEVELOPER_NAME1'#12'DisplayWidth'#3#130#0#9'FieldKind'#7#6'fkData'#9'Fie'
diff --git a/components/rx/Demos/RxDBGrid/rxdbgridmainunit.pas b/components/rx/Demos/RxDBGrid/rxdbgridmainunit.pas
index 6d0ac70a5..7e9511793 100644
--- a/components/rx/Demos/RxDBGrid/rxdbgridmainunit.pas
+++ b/components/rx/Demos/RxDBGrid/rxdbgridmainunit.pas
@@ -90,6 +90,11 @@ begin
RxMemoryData1.AppendRecord([9, 'Microsoft Windows 2000', 150, 'Microsoft', EncodeDate(1999, 11, 13), 3]);
RxMemoryData1.AppendRecord([10, 'Microsoft Windows XP', 130, 'Microsoft', EncodeDate(2003, 10, 1), 3]);
RxMemoryData1.AppendRecord([11, 'Microsoft Windows Vista', 180, 'Microsoft', EncodeDate(2007, 2, 1), 3]);
+ RxMemoryData1.AppendRecord([12, 'Поисковая системя Яндекс', 0, 'Yandex', EncodeDate(2007, 2, 1), 3]);
+ RxMemoryData1.AppendRecord([13, 'Бухгалтерия 1С', 280, '1С', EncodeDate(1994, 2, 1), 3]);
+ RxMemoryData1.AppendRecord([14, 'Бух. комплекс "45-я Параллель"', 180, 'ООО "Boot"', EncodeDate(2007, 2, 1), 3]);
+ RxMemoryData1.AppendRecord([15, 'Консультант+', 380, 'Консультант+', EncodeDate(2007, 2, 1), 3]);
+ RxMemoryData1.AppendRecord([16, 'Гарант', 480, 'Гарант', EncodeDate(2007, 2, 1), 3]);
DoFillFilters;
RxMemoryData1.First;
RxDBGrid1.CalcStatTotals; //fix error in GotoBookmark
diff --git a/components/rx/docs/rxfpc.xml b/components/rx/docs/rxfpc.xml
index 9a3e13bd7..48d069092 100644
--- a/components/rx/docs/rxfpc.xml
+++ b/components/rx/docs/rxfpc.xml
@@ -1474,5 +1474,106 @@ Description
+
+
+ Возвращает текущий год
+
+
+ Возвращает True если год високосный
+
+
+ Возвращает кол-во дней в месяце
+
+
+ Возвращает первый день преведущего месяца
+
+
+ Возвращает последний день преведущего месяца
+
+
+ Возвращает день из даты
+
+
+ Возвращает месяц из даты
+
+
+ Возвращает год из даты
+
+
+ Добавляет к дате заданное число дней\месяцев\лет
+
+
+ Добавляет к дате заданное число дней
+
+
+ Добавляет к дате заданное число месяцев
+
+
+ Добавляет к дате заданное число лет
+
+
+ Проверяет дату на правильность.
+
+
+ Возвращает разницу между датами
+
+
+ Возвращает разницу между датами в месяцах
+
+
+ Возвращает разницу между датами в месяцах
+
+
+ Возвращает разницу между датами в месяцах
+
+
+ Добавляет к дате заданное число часов\минут\секунд
+
+
+ Добавляет к дате заданное число часов
+
+
+ Добавляет к дате заданное число минут
+
+
+ Добавляет к дате заданное число секунд
+
+
+ Добавляет к дате заданное число милисекунд
+
+
+ Округляет дату отрезая время
+
+
+ Порядок составление даты
+
+
+ Дни недели
+
+
+ Проверяет дату на нулевую
+
+
+ Возвращает маску даты по умолчанию
+
+
+ Получить TDateOrder из заданного формата
+
+
+ Возвращает номер месяца по имени
+
+
+ Переводит строку в дату, в случае ошибке возврощает заданую дату
+
+
+ Переводит строку в дату по заданному формату
+
+
+ Переводит строку в дату по формату, в случае ошибке возвращает заданную дату
+
+
+ Возвращает формат даты по умолчанию
+
+