From 3f8f7e96fdf6ef44b8111a349120d135bbdd0159 Mon Sep 17 00:00:00 2001 From: alexs75 Date: Tue, 23 Apr 2019 06:33:05 +0000 Subject: [PATCH] RxFPC:RxDBVerticalGrid - published property SelectedColor - thx.ssadragon git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@6860 8e941d3f-bd1b-0410-a28a-d453659cc2b4 --- .../trunk/demos/RxDBVerticalGrid/project1.lpi | 13 ++-- .../trunk/demos/RxDBVerticalGrid/project1.lps | 22 +++++-- .../trunk/demos/RxDBVerticalGrid/project1.res | Bin 139052 -> 139092 bytes .../rx/trunk/demos/RxDBVerticalGrid/unit1.lfm | 62 ++++++++++-------- components/rx/trunk/rxdb/rxdbverticalgrid.pas | 1 + 5 files changed, 60 insertions(+), 38 deletions(-) diff --git a/components/rx/trunk/demos/RxDBVerticalGrid/project1.lpi b/components/rx/trunk/demos/RxDBVerticalGrid/project1.lpi index b88d963b1..5aa2c65c0 100644 --- a/components/rx/trunk/demos/RxDBVerticalGrid/project1.lpi +++ b/components/rx/trunk/demos/RxDBVerticalGrid/project1.lpi @@ -1,10 +1,12 @@ - + + + + - <ResourceType Value="res"/> <UseXPManifest Value="True"/> @@ -17,9 +19,10 @@ <Version Value="2"/> </PublishOptions> <RunParams> - <local> - <FormatVersion Value="1"/> - </local> + <FormatVersion Value="2"/> + <Modes Count="1"> + <Mode0 Name="default"/> + </Modes> </RunParams> <RequiredPackages Count="3"> <Item1> diff --git a/components/rx/trunk/demos/RxDBVerticalGrid/project1.lps b/components/rx/trunk/demos/RxDBVerticalGrid/project1.lps index 3b71c0128..09b4f9cc2 100644 --- a/components/rx/trunk/demos/RxDBVerticalGrid/project1.lps +++ b/components/rx/trunk/demos/RxDBVerticalGrid/project1.lps @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <CONFIG> <ProjectSession> - <Version Value="10"/> + <Version Value="12"/> <BuildModes Active="Default"/> <Units Count="74"> <Unit0> @@ -19,7 +19,7 @@ <ResourceBaseClass Value="Form"/> <UnitName Value="Unit1"/> <IsVisibleTab Value="True"/> - <TopLine Value="123"/> + <TopLine Value="109"/> <CursorPos X="86" Y="146"/> <UsageCount Value="52"/> <Loaded Value="True"/> @@ -90,7 +90,7 @@ </Unit9> <Unit10> <Filename Value="../../../../lcl/dbctrls.pp"/> - <UnitName Value="DbCtrls"/> + <UnitName Value="DBCtrls"/> <EditorIndex Value="1"/> <TopLine Value="1042"/> <CursorPos X="15" Y="1070"/> @@ -177,11 +177,11 @@ <Unit22> <Filename Value="../../rxdb/rxdbverticalgrid.pas"/> <EditorIndex Value="4"/> - <TopLine Value="1289"/> - <CursorPos X="26" Y="1290"/> + <TopLine Value="319"/> + <CursorPos X="77" Y="342"/> <UsageCount Value="25"/> <Bookmarks Count="1"> - <Item0 X="38" Y="914" ID="1"/> + <Item0 X="38" Y="915" ID="1"/> </Bookmarks> <Loaded Value="True"/> </Unit22> @@ -554,7 +554,7 @@ <DefaultSyntaxHighlighter Value="LFM"/> </Unit73> </Units> - <JumpHistory Count="28" HistoryIndex="27"> + <JumpHistory Count="29" HistoryIndex="28"> <Position1> <Filename Value="../../rxdb/rxdbverticalgrid.pas"/> <Caret Line="293" Column="15" TopLine="272"/> @@ -667,7 +667,15 @@ <Filename Value="../../rxdb/rxdbverticalgrid.pas"/> <Caret Line="1290" Column="26" TopLine="1289"/> </Position28> + <Position29> + <Filename Value="unit1.pas"/> + <Caret Line="146" Column="106"/> + </Position29> </JumpHistory> + <RunParams> + <FormatVersion Value="2"/> + <Modes Count="0" ActiveMode="default"/> + </RunParams> </ProjectSession> <Debugging> <Watches Count="1"> diff --git a/components/rx/trunk/demos/RxDBVerticalGrid/project1.res b/components/rx/trunk/demos/RxDBVerticalGrid/project1.res index f6e8499568f21121986c715951291349244aeef3..4133fe048bfc96eac220bd2dbc2c6057417f565b 100644 GIT binary patch delta 67 zcmZ3pkK@WdjtL5kcQz_cW0O~~$;r=44@fM@a4b(OO0`Q%%qdQ_(T536HfB?ue2Go5 R`3qb77dFQ2U)Y!|Bmi?086W@v delta 33 pcmcbzk7La~jtL5kn>Q*>W1IYd&4!VoS%$q`hMjS{3_FvB1OU{s3K9SS diff --git a/components/rx/trunk/demos/RxDBVerticalGrid/unit1.lfm b/components/rx/trunk/demos/RxDBVerticalGrid/unit1.lfm index e5e46b5d6..97f8a8b87 100644 --- a/components/rx/trunk/demos/RxDBVerticalGrid/unit1.lfm +++ b/components/rx/trunk/demos/RxDBVerticalGrid/unit1.lfm @@ -8,14 +8,15 @@ object Form1: TForm1 ClientWidth = 1206 OnCreate = FormCreate Position = poScreenCenter - LCLVersion = '1.9.0.0' + LCLVersion = '2.1.0.0' object RxDBVerticalGrid1: TRxDBVerticalGrid Left = 899 - Height = 642 - Top = 107 + Height = 646 + Top = 103 Width = 307 Align = alClient Color = clWindow + SelectedColor = clSkyBlue GridDefValues.BlobText = '(данные)' DataCoumn.Title.Alignment = taCenter DataCoumn.Title.Caption = 'Данные' @@ -171,8 +172,8 @@ object Form1: TForm1 end object RxDBGrid1: TRxDBGrid Left = 0 - Height = 642 - Top = 107 + Height = 646 + Top = 103 Width = 894 ColumnDefValues.BlobText = '(данные)' TitleButtons = False @@ -186,6 +187,7 @@ object Form1: TForm1 EditButtons = <> Filter.DropDownRows = 0 Filter.EmptyValue = '(Пусто)' + Filter.NotEmptyValue = '(Не пусто)' Filter.AllValue = '(Все значения)' Filter.EmptyFont.Style = [fsItalic] Filter.ItemIndex = -1 @@ -199,6 +201,7 @@ object Form1: TForm1 EditButtons = <> Filter.DropDownRows = 0 Filter.EmptyValue = '(Пусто)' + Filter.NotEmptyValue = '(Не пусто)' Filter.AllValue = '(Все значения)' Filter.EmptyFont.Style = [fsItalic] Filter.ItemIndex = -1 @@ -212,6 +215,7 @@ object Form1: TForm1 EditButtons = <> Filter.DropDownRows = 0 Filter.EmptyValue = '(Пусто)' + Filter.NotEmptyValue = '(Не пусто)' Filter.AllValue = '(Все значения)' Filter.EmptyFont.Style = [fsItalic] Filter.ItemIndex = -1 @@ -225,6 +229,7 @@ object Form1: TForm1 EditButtons = <> Filter.DropDownRows = 0 Filter.EmptyValue = '(Пусто)' + Filter.NotEmptyValue = '(Не пусто)' Filter.AllValue = '(Все значения)' Filter.EmptyFont.Style = [fsItalic] Filter.ItemIndex = -1 @@ -238,6 +243,7 @@ object Form1: TForm1 EditButtons = <> Filter.DropDownRows = 0 Filter.EmptyValue = '(Пусто)' + Filter.NotEmptyValue = '(Не пусто)' Filter.AllValue = '(Все значения)' Filter.EmptyFont.Style = [fsItalic] Filter.ItemIndex = -1 @@ -251,6 +257,7 @@ object Form1: TForm1 EditButtons = <> Filter.DropDownRows = 0 Filter.EmptyValue = '(Пусто)' + Filter.NotEmptyValue = '(Не пусто)' Filter.AllValue = '(Все значения)' Filter.EmptyFont.Style = [fsItalic] Filter.ItemIndex = -1 @@ -264,6 +271,7 @@ object Form1: TForm1 EditButtons = <> Filter.DropDownRows = 0 Filter.EmptyValue = '(Пусто)' + Filter.NotEmptyValue = '(Не пусто)' Filter.AllValue = '(Все значения)' Filter.EmptyFont.Style = [fsItalic] Filter.ItemIndex = -1 @@ -277,6 +285,7 @@ object Form1: TForm1 EditButtons = <> Filter.DropDownRows = 0 Filter.EmptyValue = '(Пусто)' + Filter.NotEmptyValue = '(Не пусто)' Filter.AllValue = '(Все значения)' Filter.EmptyFont.Style = [fsItalic] Filter.ItemIndex = -1 @@ -290,6 +299,7 @@ object Form1: TForm1 EditButtons = <> Filter.DropDownRows = 0 Filter.EmptyValue = '(Пусто)' + Filter.NotEmptyValue = '(Не пусто)' Filter.AllValue = '(Все значения)' Filter.EmptyFont.Style = [fsItalic] Filter.ItemIndex = -1 @@ -368,21 +378,21 @@ object Form1: TForm1 end object Panel1: TPanel Left = 0 - Height = 107 + Height = 103 Top = 0 Width = 1206 Align = alTop AutoSize = True - ClientHeight = 107 + ClientHeight = 103 ClientWidth = 1206 TabOrder = 2 object Button1: TButton AnchorSideLeft.Control = Panel1 AnchorSideTop.Control = Panel1 Left = 7 - Height = 36 + Height = 31 Top = 7 - Width = 80 + Width = 78 AutoSize = True BorderSpacing.Around = 6 Caption = 'Diconnect' @@ -393,10 +403,10 @@ object Form1: TForm1 AnchorSideLeft.Control = Button1 AnchorSideLeft.Side = asrBottom AnchorSideTop.Control = Panel1 - Left = 93 - Height = 36 + Left = 91 + Height = 31 Top = 7 - Width = 69 + Width = 66 AutoSize = True BorderSpacing.Around = 6 Caption = 'Connect' @@ -407,10 +417,10 @@ object Form1: TForm1 AnchorSideLeft.Control = Button2 AnchorSideLeft.Side = asrBottom AnchorSideTop.Control = Panel1 - Left = 168 - Height = 93 + Left = 163 + Height = 89 Top = 7 - Width = 83 + Width = 85 AutoFill = True AutoSize = True BorderSpacing.Around = 6 @@ -422,8 +432,8 @@ object Form1: TForm1 ChildSizing.ShrinkVertical = crsScaleChilds ChildSizing.Layout = cclLeftToRightThenTopToBottom ChildSizing.ControlsPerLine = 1 - ClientHeight = 72 - ClientWidth = 81 + ClientHeight = 69 + ClientWidth = 83 ItemIndex = 0 Items.Strings = ( 'Left' @@ -438,10 +448,10 @@ object Form1: TForm1 AnchorSideLeft.Side = asrBottom AnchorSideTop.Control = CheckBox1 AnchorSideTop.Side = asrBottom - Left = 257 - Height = 24 - Top = 37 - Width = 111 + Left = 254 + Height = 23 + Top = 36 + Width = 114 BorderSpacing.Around = 6 Caption = 'Show images' OnChange = CheckBox1Change @@ -451,10 +461,10 @@ object Form1: TForm1 AnchorSideLeft.Control = RadioGroup1 AnchorSideLeft.Side = asrBottom AnchorSideTop.Control = Panel1 - Left = 257 - Height = 24 + Left = 254 + Height = 23 Top = 7 - Width = 110 + Width = 112 BorderSpacing.Around = 6 Caption = 'Show header' OnChange = CheckBox1Change @@ -463,8 +473,8 @@ object Form1: TForm1 end object Splitter1: TSplitter Left = 894 - Height = 642 - Top = 107 + Height = 646 + Top = 103 Width = 5 end object dsData: TDataSource diff --git a/components/rx/trunk/rxdb/rxdbverticalgrid.pas b/components/rx/trunk/rxdb/rxdbverticalgrid.pas index 59c84adf7..0cacfe222 100644 --- a/components/rx/trunk/rxdb/rxdbverticalgrid.pas +++ b/components/rx/trunk/rxdb/rxdbverticalgrid.pas @@ -335,6 +335,7 @@ type property BorderStyle; property CellHintPriority; property Color; + property SelectedColor; property GridDefValues; property DataCoumn; property DataSource;