RxFPC:new flag coDisableDialogFind in RxCollumn.Options - disable show collumn in rxdbgrud find dialog

git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@4212 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
alexs75
2015-07-27 12:32:43 +00:00
parent a838fe2707
commit d2f8202c38
6 changed files with 149 additions and 136 deletions

View File

@ -55,11 +55,11 @@
<MinVersion Major="1" Release="18" Build="56" Valid="True"/>
</Item5>
</RequiredPackages>
<Units Count="114">
<Units Count="117">
<Unit0>
<Filename Value="RxDBGridDemo.lpr"/>
<IsPartOfProject Value="True"/>
<EditorIndex Value="1"/>
<EditorIndex Value="4"/>
<CursorPos X="47" Y="18"/>
<UsageCount Value="100"/>
<Loaded Value="True"/>
@ -71,7 +71,8 @@
<HasResources Value="True"/>
<ResourceBaseClass Value="Form"/>
<UnitName Value="RxDBGridMainUnit"/>
<CursorPos X="37" Y="11"/>
<IsVisibleTab Value="True"/>
<CursorPos X="7" Y="9"/>
<UsageCount Value="100"/>
<Loaded Value="True"/>
<LoadedDesigner Value="True"/>
@ -96,14 +97,15 @@
</Unit4>
<Unit5>
<Filename Value="../../rxdbgrid.pas"/>
<EditorIndex Value="-1"/>
<TopLine Value="3475"/>
<CursorPos Y="3495"/>
<EditorIndex Value="1"/>
<TopLine Value="59"/>
<CursorPos X="102" Y="78"/>
<UsageCount Value="17"/>
<Bookmarks Count="2">
<Item0 Y="2573" ID="2"/>
<Item1 Y="3776" ID="1"/>
</Bookmarks>
<Loaded Value="True"/>
</Unit5>
<Unit6>
<Filename Value="../../../lcl/lresources.pp"/>
@ -351,9 +353,12 @@
<ComponentName Value="rxDBGridFindForm"/>
<HasResources Value="True"/>
<ResourceBaseClass Value="Form"/>
<TopLine Value="78"/>
<CursorPos Y="94"/>
<UsageCount Value="6"/>
<EditorIndex Value="2"/>
<TopLine Value="148"/>
<CursorPos Y="179"/>
<UsageCount Value="10"/>
<Loaded Value="True"/>
<LoadedDesigner Value="True"/>
</Unit45>
<Unit46>
<Filename Value="../../rxtoolbar.pas"/>
@ -598,8 +603,9 @@
</Unit83>
<Unit84>
<Filename Value="../../../../lcl/include/control.inc"/>
<TopLine Value="3955"/>
<CursorPos Y="3977"/>
<EditorIndex Value="-1"/>
<TopLine Value="3259"/>
<CursorPos Y="3278"/>
<UsageCount Value="10"/>
</Unit84>
<Unit85>
@ -662,11 +668,10 @@
</Unit94>
<Unit95>
<Filename Value="../../rx.inc"/>
<EditorIndex Value="3"/>
<TopLine Value="31"/>
<EditorIndex Value="-1"/>
<TopLine Value="23"/>
<CursorPos X="3" Y="62"/>
<UsageCount Value="10"/>
<Loaded Value="True"/>
</Unit95>
<Unit96>
<Filename Value="../../../../../../install/source/fpcsrc/rtl/objpas/classes/classes.inc"/>
@ -713,12 +718,10 @@
<Unit103>
<Filename Value="../../rxdbgridexportspreadsheet.pas"/>
<UnitName Value="RxDBGridExportSpreadSheet"/>
<IsVisibleTab Value="True"/>
<EditorIndex Value="2"/>
<EditorIndex Value="-1"/>
<TopLine Value="172"/>
<CursorPos Y="187"/>
<UsageCount Value="10"/>
<Loaded Value="True"/>
</Unit103>
<Unit104>
<Filename Value="../../../fpspreadsheet/fpsexprparser.pas"/>
@ -743,17 +746,15 @@
</Unit106>
<Unit107>
<Filename Value="../../../fpspreadsheet/fpolestorage.pas"/>
<EditorIndex Value="5"/>
<EditorIndex Value="-1"/>
<TopLine Value="25"/>
<CursorPos X="6" Y="48"/>
<UsageCount Value="10"/>
<Loaded Value="True"/>
</Unit107>
<Unit108>
<Filename Value="../../../fpspreadsheet/fpsutils.pas"/>
<EditorIndex Value="6"/>
<EditorIndex Value="-1"/>
<UsageCount Value="10"/>
<Loaded Value="True"/>
</Unit108>
<Unit109>
<Filename Value="../../../fpspreadsheet/fpstypes.pas"/>
@ -782,128 +783,129 @@
<Unit113>
<Filename Value="../../../fpspreadsheet/fpsheaderfooterparser.pas"/>
<UnitName Value="fpsHeaderFooterParser"/>
<EditorIndex Value="4"/>
<EditorIndex Value="-1"/>
<UsageCount Value="10"/>
</Unit113>
<Unit114>
<Filename Value="/home/install/source/fpcsrc/packages/fcl-db/src/base/db.pas"/>
<EditorIndex Value="-1"/>
<TopLine Value="519"/>
<CursorPos X="15" Y="546"/>
<UsageCount Value="10"/>
</Unit114>
<Unit115>
<Filename Value="/home/install/source/fpcsrc/packages/fcl-db/src/base/fields.inc"/>
<EditorIndex Value="-1"/>
<TopLine Value="727"/>
<CursorPos X="3" Y="731"/>
<UsageCount Value="10"/>
</Unit115>
<Unit116>
<Filename Value="../../dbutils.pas"/>
<EditorIndex Value="3"/>
<TopLine Value="432"/>
<CursorPos Y="503"/>
<UsageCount Value="10"/>
<Loaded Value="True"/>
</Unit113>
</Unit116>
</Units>
<JumpHistory Count="30" HistoryIndex="29">
<JumpHistory Count="24" HistoryIndex="23">
<Position1>
<Filename Value="../../rxdbgridexportspreadsheet.pas"/>
<Caret Line="414" Column="14" TopLine="406"/>
<Filename Value="../../rxdbgrid_findunit.pas"/>
<Caret Line="150" Column="57" TopLine="116"/>
</Position1>
<Position2>
<Filename Value="../../rxdbgridexportspreadsheet.pas"/>
<Filename Value="../../rxdbgrid_findunit.pas"/>
<Caret Line="129" Column="62" TopLine="115"/>
</Position2>
<Position3>
<Filename Value="../../rxdbgridexportspreadsheet.pas"/>
<Caret Line="437" Column="5" TopLine="406"/>
<Filename Value="../../rxdbgrid_findunit.pas"/>
<Caret Line="150" TopLine="119"/>
</Position3>
<Position4>
<Filename Value="../../rxdbgridexportspreadsheet.pas"/>
<Filename Value="../../dbutils.pas"/>
<Caret Line="442" TopLine="423"/>
</Position4>
<Position5>
<Filename Value="../../rxdbgridexportspreadsheet.pas"/>
<Caret Line="129" Column="47" TopLine="104"/>
<Filename Value="../../dbutils.pas"/>
<Caret Line="443" TopLine="423"/>
</Position5>
<Position6>
<Filename Value="../../rxdbgridexportspreadsheet.pas"/>
<Caret Line="130" Column="45" TopLine="105"/>
<Filename Value="../../dbutils.pas"/>
<Caret Line="445" TopLine="423"/>
</Position6>
<Position7>
<Filename Value="../../rxdbgridexportspreadsheet.pas"/>
<Caret Line="177" Column="43" TopLine="152"/>
<Filename Value="../../dbutils.pas"/>
<Caret Line="446" TopLine="423"/>
</Position7>
<Position8>
<Filename Value="../../rxdbgridexportspreadsheet.pas"/>
<Caret Line="178" Column="43" TopLine="153"/>
<Filename Value="../../dbutils.pas"/>
<Caret Line="448" TopLine="423"/>
</Position8>
<Position9>
<Filename Value="../../rxdbgridexportspreadsheet.pas"/>
<Caret Line="268" Column="45" TopLine="243"/>
<Filename Value="../../dbutils.pas"/>
<Caret Line="449" TopLine="423"/>
</Position9>
<Position10>
<Filename Value="../../rxdbgridexportspreadsheet.pas"/>
<Caret Line="269" Column="45" TopLine="244"/>
<Filename Value="../../dbutils.pas"/>
<Caret Line="450" TopLine="423"/>
</Position10>
<Position11>
<Filename Value="../../rxdbgridexportspreadsheet.pas"/>
<Caret Line="308" Column="41" TopLine="282"/>
<Filename Value="../../dbutils.pas"/>
<Caret Line="451" TopLine="423"/>
</Position11>
<Position12>
<Filename Value="../../../fpspreadsheet/fpolestorage.pas"/>
<Caret Line="48" Column="6" TopLine="25"/>
<Filename Value="../../dbutils.pas"/>
<Caret Line="453" TopLine="423"/>
</Position12>
<Position13>
<Filename Value="../../../fpspreadsheet/fpsutils.pas"/>
<Filename Value="../../dbutils.pas"/>
<Caret Line="455" TopLine="435"/>
</Position13>
<Position14>
<Filename Value="../../rxdbgridexportspreadsheet.pas"/>
<Caret Line="311" Column="43" TopLine="283"/>
<Filename Value="../../dbutils.pas"/>
<Caret Line="430" TopLine="411"/>
</Position14>
<Position15>
<Filename Value="../../rx.inc"/>
<Caret Line="60" Column="35" TopLine="29"/>
<Filename Value="../../dbutils.pas"/>
<Caret Line="431" TopLine="411"/>
</Position15>
<Position16>
<Filename Value="../../../fpspreadsheet/fpsheaderfooterparser.pas"/>
<Filename Value="../../dbutils.pas"/>
<Caret Line="432" TopLine="411"/>
</Position16>
<Position17>
<Filename Value="../../rxdbgridexportspreadsheet.pas"/>
<Caret Line="34" Column="8" TopLine="38"/>
<Filename Value="../../dbutils.pas"/>
<Caret Line="395" TopLine="378"/>
</Position17>
<Position18>
<Filename Value="../../rxdbgridexportspreadsheet.pas"/>
<Caret Line="138" TopLine="108"/>
<Filename Value="../../dbutils.pas"/>
<Caret Line="396" TopLine="378"/>
</Position18>
<Position19>
<Filename Value="../../rxdbgridexportspreadsheet.pas"/>
<Caret Line="127" Column="18" TopLine="97"/>
<Filename Value="../../rxdbgrid_findunit.pas"/>
<Caret Line="150" TopLine="119"/>
</Position19>
<Position20>
<Filename Value="../../rxdbgridexportspreadsheet.pas"/>
<Caret Line="132" Column="45" TopLine="107"/>
<Filename Value="../../dbutils.pas"/>
<Caret Line="499" TopLine="468"/>
</Position20>
<Position21>
<Filename Value="../../rxdbgridexportspreadsheet.pas"/>
<Caret Line="117" Column="42" TopLine="109"/>
<Filename Value="../../dbutils.pas"/>
<Caret Line="500" Column="18" TopLine="469"/>
</Position21>
<Position22>
<Filename Value="../../rxdbgridexportspreadsheet.pas"/>
<Caret Line="132" Column="45" TopLine="109"/>
<Filename Value="../../dbutils.pas"/>
<Caret Line="502" TopLine="470"/>
</Position22>
<Position23>
<Filename Value="../../rxdbgridexportspreadsheet.pas"/>
<Caret Line="134" Column="45" TopLine="109"/>
<Filename Value="../../rxdbgrid_findunit.pas"/>
<Caret Line="170" Column="3" TopLine="148"/>
</Position23>
<Position24>
<Filename Value="../../rxdbgridexportspreadsheet.pas"/>
<Caret Line="182" Column="43" TopLine="158"/>
<Filename Value="../../rxdbgrid.pas"/>
<Caret Line="518" Column="3" TopLine="441"/>
</Position24>
<Position25>
<Filename Value="../../rxdbgridexportspreadsheet.pas"/>
<Caret Line="183" Column="43" TopLine="158"/>
</Position25>
<Position26>
<Filename Value="../../rxdbgridexportspreadsheet.pas"/>
<Caret Line="185" Column="43" TopLine="160"/>
</Position26>
<Position27>
<Filename Value="../../rxdbgridexportspreadsheet.pas"/>
<Caret Line="278" Column="71" TopLine="252"/>
</Position27>
<Position28>
<Filename Value="../../rxdbgridexportspreadsheet.pas"/>
<Caret Line="281" Column="45" TopLine="255"/>
</Position28>
<Position29>
<Filename Value="../../rxdbgridexportspreadsheet.pas"/>
<Caret Line="337" Column="10" TopLine="307"/>
</Position29>
<Position30>
<Filename Value="../../rxdbgridexportspreadsheet.pas"/>
<Caret Line="131" Column="32" TopLine="117"/>
</Position30>
</JumpHistory>
</ProjectOptions>
<CompilerOptions>
@ -946,13 +948,16 @@
<Expression Value="K1"/>
</Item5>
</Watches>
<Exceptions Count="2">
<Exceptions Count="3">
<Item1>
<Name Value="EInvalidOp"/>
</Item1>
<Item2>
<Name Value="EConvertError"/>
</Item2>
<Item3>
<Name Value="EVariantError"/>
</Item3>
</Exceptions>
</Debugging>
</CONFIG>

View File

@ -5,7 +5,7 @@ object RxDBGridMainForm: TRxDBGridMainForm
Width = 1151
ActiveControl = Panel1
Caption = 'RxDBGrid Demo'
ClientHeight = 694
ClientHeight = 692
ClientWidth = 1151
Menu = MainMenu1
OnCreate = FormCreate
@ -14,8 +14,8 @@ object RxDBGridMainForm: TRxDBGridMainForm
LCLVersion = '1.5'
object RxDBGrid1: TRxDBGrid
Left = 0
Height = 624
Top = 70
Height = 620
Top = 72
Width = 1151
TitleButtons = True
AutoSort = True
@ -80,12 +80,13 @@ object RxDBGridMainForm: TRxDBGridMainForm
Filter.EmptyValue = '(Нет)'
Filter.EmptyFont.Style = [fsItalic]
Filter.ItemIndex = -1
Footer.Value = 'This is test'
Footer.Value = 'This is test'#10'Line2'
Footer.ValueType = fvtStaticText
Footer.Font.Color = clRed
Footer.Font.Height = -15
Footer.Font.Name = 'Liberation Mono'
Footer.Font.Style = [fsBold, fsItalic]
Options = [coCustomizeVisible, coCustomizeWidth, coDisableDialogFind]
end
item
Title.Alignment = taCenter
@ -283,11 +284,11 @@ object RxDBGridMainForm: TRxDBGridMainForm
end>
FooterOptions.Active = True
FooterOptions.Color = clYellow
FooterOptions.RowCount = 1
FooterOptions.RowCount = 2
Version = 1
OptionsRx = [rdgAllowColumnsForm, rdgAllowDialogFind, rdgHighlightFocusCol, rdgHighlightFocusRow, rdgDblClickOptimizeColWidth, rdgFooterRows, rdgXORColSizing, rdgMultiTitleLines, rdgAllowQuickSearch, rdgAllowQuickFilter, rdgAllowFilterForm, rdgAllowSortForm, rdgAllowToolMenu]
FooterColor = clYellow
FooterRowCount = 1
FooterRowCount = 2
OnFiltred = RxDBGrid1Filtred
Align = alClient
Color = clWindow
@ -305,12 +306,12 @@ object RxDBGridMainForm: TRxDBGridMainForm
end
object Panel1: TPanel
Left = 0
Height = 70
Height = 72
Top = 0
Width = 1151
Align = alTop
AutoSize = True
ClientHeight = 70
ClientHeight = 72
ClientWidth = 1151
TabOrder = 1
object Label1: TLabel
@ -359,7 +360,7 @@ object RxDBGridMainForm: TRxDBGridMainForm
Height = 25
Hint = 'Use filter line'
Top = 38
Width = 85
Width = 83
BorderSpacing.Left = 6
Caption = 'Use filter'
OnChange = CheckBox1Change
@ -370,7 +371,7 @@ object RxDBGridMainForm: TRxDBGridMainForm
AnchorSideTop.Control = Label1
AnchorSideTop.Side = asrBottom
Left = 276
Height = 29
Height = 31
Top = 34
Width = 217
BorderSpacing.Around = 6
@ -393,7 +394,7 @@ object RxDBGridMainForm: TRxDBGridMainForm
Height = 25
Hint = 'Auto fill column width'
Top = 7
Width = 134
Width = 132
BorderSpacing.Around = 6
Caption = 'Auto fill columns'
OnChange = CheckBox2Change
@ -403,10 +404,10 @@ object RxDBGridMainForm: TRxDBGridMainForm
AnchorSideLeft.Control = CheckBox2
AnchorSideLeft.Side = asrBottom
AnchorSideTop.Control = Panel1
Left = 639
Left = 637
Height = 25
Top = 7
Width = 122
Width = 120
BorderSpacing.Around = 6
Caption = 'Show indicator'
Checked = True
@ -419,10 +420,10 @@ object RxDBGridMainForm: TRxDBGridMainForm
AnchorSideLeft.Side = asrBottom
AnchorSideTop.Control = CheckBox3
AnchorSideTop.Side = asrBottom
Left = 639
Left = 637
Height = 25
Top = 38
Width = 118
Width = 116
BorderSpacing.Around = 6
Caption = 'Show headers'
Checked = True
@ -434,10 +435,10 @@ object RxDBGridMainForm: TRxDBGridMainForm
AnchorSideLeft.Control = CheckBox3
AnchorSideLeft.Side = asrBottom
AnchorSideTop.Control = Panel1
Left = 767
Left = 763
Height = 25
Top = 7
Width = 97
Width = 95
BorderSpacing.Around = 6
Caption = 'Word wrap'
OnChange = CheckBox5Change

View File

@ -495,9 +495,11 @@ begin
DataSet.FreeBookmark(Bookmark);
DataSet.EnableControls;
end;
finally
Fields.Free;
except
{ finally
Fields.Free;}
end;
Fields.Free;
end;
procedure SaveFields(DataSet: TDataSet; IniFile: TIniFile);

View File

@ -75,7 +75,7 @@ type
//TRxDBGridAllowedOperations = set of TRxDBGridAllowedOperation;
{$ENDIF}
TRxColumnOption = (coCustomizeVisible, coCustomizeWidth, coFixDecimalSeparator);
TRxColumnOption = (coCustomizeVisible, coCustomizeWidth, coFixDecimalSeparator, coDisableDialogFind);
TRxColumnOptions = set of TRxColumnOption;
TRxColumnEditButtonStyle = (ebsDropDownRx, ebsEllipsisRx, ebsGlyphRx, ebsUpDownRx,

View File

@ -1,16 +1,16 @@
object rxDBGridFindForm: TrxDBGridFindForm
Left = 688
Height = 225
Height = 260
Top = 327
Width = 493
ActiveControl = Edit1
Caption = 'Find'
ClientHeight = 225
ClientHeight = 260
ClientWidth = 493
OnCreate = FormCreate
OnShow = FormShow
Position = poScreenCenter
LCLVersion = '1.3'
LCLVersion = '1.5'
object Label1: TLabel
AnchorSideLeft.Control = Owner
AnchorSideTop.Control = Owner
@ -45,7 +45,7 @@ object rxDBGridFindForm: TrxDBGridFindForm
AnchorSideBottom.Side = asrBottom
Left = 340
Height = 41
Top = 178
Top = 213
Width = 84
Anchors = [akRight, akBottom]
AutoSize = True
@ -65,7 +65,7 @@ object rxDBGridFindForm: TrxDBGridFindForm
AnchorSideBottom.Side = asrBottom
Left = 430
Height = 41
Top = 178
Top = 213
Width = 57
Anchors = [akRight, akBottom]
AutoSize = True
@ -98,7 +98,7 @@ object rxDBGridFindForm: TrxDBGridFindForm
AnchorSideRight.Control = Owner
AnchorSideRight.Side = asrBottom
Left = 12
Height = 33
Height = 35
Top = 97
Width = 475
Anchors = [akTop, akLeft, akRight]
@ -116,10 +116,10 @@ object rxDBGridFindForm: TrxDBGridFindForm
AnchorSideRight.Side = asrBottom
AnchorSideBottom.Control = Panel1
AnchorSideBottom.Side = asrBottom
Left = 147
Height = 66
Top = 136
Width = 340
Left = 148
Height = 70
Top = 138
Width = 339
Anchors = [akTop, akLeft, akRight, akBottom]
AutoFill = True
AutoSize = True
@ -135,8 +135,8 @@ object rxDBGridFindForm: TrxDBGridFindForm
ChildSizing.ShrinkVertical = crsScaleChilds
ChildSizing.Layout = cclLeftToRightThenTopToBottom
ChildSizing.ControlsPerLine = 3
ClientHeight = 43
ClientWidth = 336
ClientHeight = 47
ClientWidth = 335
Columns = 3
Items.Strings = (
'All'
@ -150,22 +150,22 @@ object rxDBGridFindForm: TrxDBGridFindForm
AnchorSideTop.Control = ComboBox1
AnchorSideTop.Side = asrBottom
Left = 6
Height = 66
Top = 136
Width = 135
Height = 70
Top = 138
Width = 136
AutoSize = True
BorderSpacing.Around = 6
ClientHeight = 66
ClientWidth = 135
ClientHeight = 70
ClientWidth = 136
TabOrder = 5
object CheckBox2: TCheckBox
AnchorSideLeft.Control = Panel1
AnchorSideTop.Control = CheckBox1
AnchorSideTop.Side = asrBottom
Left = 7
Height = 23
Top = 36
Width = 91
Height = 25
Top = 38
Width = 92
BorderSpacing.Around = 6
Caption = 'Partial key'
TabOrder = 0
@ -174,9 +174,9 @@ object rxDBGridFindForm: TrxDBGridFindForm
AnchorSideLeft.Control = Panel1
AnchorSideTop.Control = Panel1
Left = 7
Height = 23
Height = 25
Top = 7
Width = 121
Width = 122
BorderSpacing.Around = 6
Caption = 'Case sensetive'
TabOrder = 1

View File

@ -125,6 +125,7 @@ begin
if Edit1.Text<>'' then
begin
try
FieldName:=FGrid.Columns[ComboBox1.ItemIndex].FieldName;
LOptions:=[];
if not CheckBox1.Checked then
@ -172,7 +173,11 @@ begin
if Assigned(AGrid) then
begin
for i:=0 to AGrid.Columns.Count-1 do
ComboBox1.Items.Add(AGrid.Columns[i].Title.Caption);
begin
if not (coDisableDialogFind in AGrid.Columns[i].Options) then
ComboBox1.Items.Add(AGrid.Columns[i].Title.Caption);
end;
ComboBox1.ItemIndex:=ComboBox1.Items.IndexOf(AGrid.SelectedColumn.Title.Caption);
end;