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

RxFPC:implemented images for TRxColumnEditButton.Style - thx RusDeveloper

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@4644 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
alexs75
2016-05-11 12:44:15 +00:00
parent 98ee797040
commit 3202b2f161
18 changed files with 398 additions and 235 deletions
Download Patch File Download Diff File Expand all files Collapse all files

181
components/rx/trunk/Demos/RxDBGrid/RxDBGridDemo.lpi
View File

@ -55,13 +55,13 @@
<MinVersion Major="1" Release="18" Build="56" Valid="True"/> <MinVersion Major="1" Release="18" Build="56" Valid="True"/>
</Item5> </Item5>
</RequiredPackages> </RequiredPackages>
<Units Count="118"> <Units Count="126">
<Unit0> <Unit0>
<Filename Value="RxDBGridDemo.lpr"/> <Filename Value="RxDBGridDemo.lpr"/>
<IsPartOfProject Value="True"/> <IsPartOfProject Value="True"/>
<EditorIndex Value="-1"/> <EditorIndex Value="-1"/>
<CursorPos X="47" Y="18"/> <CursorPos X="47" Y="18"/>
<UsageCount Value="104"/> <UsageCount Value="107"/>
</Unit0> </Unit0>
<Unit1> <Unit1>
<Filename Value="rxdbgridmainunit.pas"/> <Filename Value="rxdbgridmainunit.pas"/>
@ -70,11 +70,11 @@
<HasResources Value="True"/> <HasResources Value="True"/>
<ResourceBaseClass Value="Form"/> <ResourceBaseClass Value="Form"/>
<UnitName Value="RxDBGridMainUnit"/> <UnitName Value="RxDBGridMainUnit"/>
<TopLine Value="43"/> <IsVisibleTab Value="True"/>
<CursorPos X="86" Y="101"/> <TopLine Value="68"/>
<UsageCount Value="104"/> <CursorPos X="133" Y="85"/>
<UsageCount Value="107"/>
<Loaded Value="True"/> <Loaded Value="True"/>
<LoadedDesigner Value="True"/>
</Unit1> </Unit1>
<Unit2> <Unit2>
<Filename Value="../../../fpcsrc/fcl/db/db.pp"/> <Filename Value="../../../fpcsrc/fcl/db/db.pp"/>
@ -96,15 +96,15 @@
</Unit4> </Unit4>
<Unit5> <Unit5>
<Filename Value="../../rxdbgrid.pas"/> <Filename Value="../../rxdbgrid.pas"/>
<EditorIndex Value="1"/> <EditorIndex Value="-1"/>
<TopLine Value="6655"/> <TopLine Value="773"/>
<CursorPos X="7" Y="6673"/> <CursorPos Y="797"/>
<UsageCount Value="19"/> <UsageCount Value="21"/>
<Bookmarks Count="2"> <Bookmarks Count="3">
<Item0 Y="2575" ID="2"/> <Item0 X="37" Y="1740" ID="1"/>
<Item1 Y="3778" ID="1"/> <Item1 Y="588" ID="2"/>
<Item2 Y="5651" ID="3"/>
</Bookmarks> </Bookmarks>
<Loaded Value="True"/>
</Unit5> </Unit5>
<Unit6> <Unit6>
<Filename Value="../../../lcl/lresources.pp"/> <Filename Value="../../../lcl/lresources.pp"/>
@ -248,9 +248,11 @@
</Unit28> </Unit28>
<Unit29> <Unit29>
<Filename Value="../../rxversinfo.pas"/> <Filename Value="../../rxversinfo.pas"/>
<TopLine Value="72"/> <UnitName Value="RxVersInfo"/>
<CursorPos X="49" Y="105"/> <EditorIndex Value="-1"/>
<UsageCount Value="5"/> <TopLine Value="103"/>
<CursorPos X="88" Y="112"/>
<UsageCount Value="10"/>
</Unit29> </Unit29>
<Unit30> <Unit30>
<Filename Value="../../../lcl/buttonpanel.pas"/> <Filename Value="../../../lcl/buttonpanel.pas"/>
@ -432,23 +434,18 @@
<Unit58> <Unit58>
<Filename Value="../../../../lcl/dbgrids.pas"/> <Filename Value="../../../../lcl/dbgrids.pas"/>
<UnitName Value="DBGrids"/> <UnitName Value="DBGrids"/>
<IsVisibleTab Value="True"/> <EditorIndex Value="-1"/>
<EditorIndex Value="2"/> <TopLine Value="201"/>
<TopLine Value="512"/> <CursorPos X="3" Y="218"/>
<CursorPos Y="546"/> <UsageCount Value="22"/>
<UsageCount Value="20"/>
<Loaded Value="True"/>
</Unit58> </Unit58>
<Unit59> <Unit59>
<Filename Value="../../../../lcl/grids.pas"/> <Filename Value="../../../../lcl/grids.pas"/>
<UnitName Value="Grids"/> <UnitName Value="Grids"/>
<EditorIndex Value="-1"/> <EditorIndex Value="-1"/>
<TopLine Value="10079"/> <TopLine Value="12049"/>
<CursorPos X="25" Y="10111"/> <CursorPos X="3" Y="12052"/>
<UsageCount Value="22"/> <UsageCount Value="23"/>
<Bookmarks Count="1">
<Item0 X="23" Y="7562" ID="3"/>
</Bookmarks>
</Unit59> </Unit59>
<Unit60> <Unit60>
<Filename Value="../../../../../../install/fpcsrc/rtl/objpas/classes/classesh.inc"/> <Filename Value="../../../../../../install/fpcsrc/rtl/objpas/classes/classesh.inc"/>
@ -458,9 +455,11 @@
</Unit60> </Unit60>
<Unit61> <Unit61>
<Filename Value="../../../../lcl/buttons.pp"/> <Filename Value="../../../../lcl/buttons.pp"/>
<TopLine Value="333"/> <UnitName Value="Buttons"/>
<CursorPos X="3" Y="360"/> <EditorIndex Value="-1"/>
<UsageCount Value="7"/> <TopLine Value="66"/>
<CursorPos X="15" Y="84"/>
<UsageCount Value="10"/>
</Unit61> </Unit61>
<Unit62> <Unit62>
<Filename Value="../../../../../../install/fpcsrc/packages/fcl-db/src/base/db.pas"/> <Filename Value="../../../../../../install/fpcsrc/packages/fcl-db/src/base/db.pas"/>
@ -470,8 +469,10 @@
</Unit62> </Unit62>
<Unit63> <Unit63>
<Filename Value="../../vclutils.pas"/> <Filename Value="../../vclutils.pas"/>
<CursorPos Y="35"/> <EditorIndex Value="-1"/>
<UsageCount Value="9"/> <TopLine Value="621"/>
<CursorPos X="25" Y="629"/>
<UsageCount Value="12"/>
</Unit63> </Unit63>
<Unit64> <Unit64>
<Filename Value="../../../../lcl/include/canvas.inc"/> <Filename Value="../../../../lcl/include/canvas.inc"/>
@ -481,9 +482,11 @@
</Unit64> </Unit64>
<Unit65> <Unit65>
<Filename Value="../../../../lcl/graphics.pp"/> <Filename Value="../../../../lcl/graphics.pp"/>
<TopLine Value="93"/> <UnitName Value="Graphics"/>
<CursorPos X="3" Y="99"/> <EditorIndex Value="-1"/>
<UsageCount Value="8"/> <TopLine Value="2254"/>
<CursorPos X="3" Y="2258"/>
<UsageCount Value="10"/>
</Unit65> </Unit65>
<Unit66> <Unit66>
<Filename Value="../../../../lcl/include/lclintf.inc"/> <Filename Value="../../../../lcl/include/lclintf.inc"/>
@ -535,8 +538,9 @@
</Unit72> </Unit72>
<Unit73> <Unit73>
<Filename Value="../../rxlookup.pas"/> <Filename Value="../../rxlookup.pas"/>
<TopLine Value="1176"/> <EditorIndex Value="-1"/>
<CursorPos X="3" Y="1196"/> <TopLine Value="1574"/>
<CursorPos X="3" Y="1566"/>
<UsageCount Value="14"/> <UsageCount Value="14"/>
</Unit73> </Unit73>
<Unit74> <Unit74>
@ -811,49 +815,64 @@
<EditorIndex Value="-1"/> <EditorIndex Value="-1"/>
<UsageCount Value="10"/> <UsageCount Value="10"/>
</Unit117> </Unit117>
<Unit118>
<Filename Value="../../../../lcl/lresources.pp"/>
<UnitName Value="LResources"/>
<EditorIndex Value="-1"/>
<TopLine Value="5296"/>
<CursorPos Y="5314"/>
<UsageCount Value="11"/>
</Unit118>
<Unit119>
<Filename Value="../../pickdate.pas"/>
<EditorIndex Value="-1"/>
<TopLine Value="991"/>
<CursorPos X="3" Y="940"/>
<UsageCount Value="10"/>
</Unit119>
<Unit120>
<Filename Value="../../rxdbctrls.pas"/>
<UnitName Value="RxDBCtrls"/>
<EditorIndex Value="-1"/>
<TopLine Value="23"/>
<UsageCount Value="10"/>
</Unit120>
<Unit121>
<Filename Value="../../rxdbcomb.pas"/>
<EditorIndex Value="-1"/>
<TopLine Value="502"/>
<UsageCount Value="10"/>
</Unit121>
<Unit122>
<Filename Value="/home/install/source/fpcsrc/rtl/inc/resh.inc"/>
<EditorIndex Value="-1"/>
<TopLine Value="47"/>
<CursorPos X="10" Y="64"/>
<UsageCount Value="10"/>
</Unit122>
<Unit123>
<Filename Value="../../../../lcl/include/speedbutton.inc"/>
<EditorIndex Value="-1"/>
<TopLine Value="184"/>
<CursorPos X="3" Y="192"/>
<UsageCount Value="10"/>
</Unit123>
<Unit124>
<Filename Value="../../../../lcl/include/buttonglyph.inc"/>
<EditorIndex Value="-1"/>
<TopLine Value="119"/>
<CursorPos X="3" Y="126"/>
<UsageCount Value="10"/>
</Unit124>
<Unit125>
<Filename Value="/home/install/source/fpcsrc/rtl/objpas/classes/classesh.inc"/>
<EditorIndex Value="-1"/>
<TopLine Value="469"/>
<CursorPos X="37" Y="501"/>
<UsageCount Value="11"/>
</Unit125>
</Units> </Units>
<JumpHistory Count="10" HistoryIndex="9"> <JumpHistory HistoryIndex="-1"/>
<Position1>
<Filename Value="../../rxdbgrid.pas"/>
<Caret Line="518" Column="3" TopLine="441"/>
</Position1>
<Position2>
<Filename Value="rxdbgridmainunit.pas"/>
<Caret Line="18" Column="143"/>
</Position2>
<Position3>
<Filename Value="rxdbgridmainunit.pas"/>
<Caret Line="274" Column="3" TopLine="242"/>
</Position3>
<Position4>
<Filename Value="rxdbgridmainunit.pas"/>
<Caret Line="225" Column="26" TopLine="202"/>
</Position4>
<Position5>
<Filename Value="../../rxdbgrid.pas"/>
<Caret Line="846" Column="14" TopLine="519"/>
</Position5>
<Position6>
<Filename Value="../../../../lcl/dbgrids.pas"/>
<Caret Line="283" Column="3" TopLine="262"/>
</Position6>
<Position7>
<Filename Value="rxdbgridmainunit.pas"/>
<Caret Line="225" TopLine="202"/>
</Position7>
<Position8>
<Filename Value="rxdbgridmainunit.pas"/>
<Caret Line="101" Column="86" TopLine="43"/>
</Position8>
<Position9>
<Filename Value="../../rxdbgrid.pas"/>
<Caret Line="545" Column="3" TopLine="396"/>
</Position9>
<Position10>
<Filename Value="../../rxdbgrid.pas"/>
<Caret Line="1794" Column="3" TopLine="1792"/>
</Position10>
</JumpHistory>
</ProjectOptions> </ProjectOptions>
<CompilerOptions> <CompilerOptions>
<Version Value="11"/> <Version Value="11"/>

100
components/rx/trunk/Demos/RxDBGrid/rxdbgridmainunit.lfm
View File

@ -240,24 +240,93 @@ object RxDBGridMainForm: TRxDBGridMainForm
end end
item item
Glyph.Data = { Glyph.Data = {
C6010000424DC60100000000000036000000280000000A0000000A0000000100 76010000424D760100000000000036000000280000000A0000000A0000000100
2000000000009001000064000000640000000000000000000000000000000000 18000000000040010000640000006400000000000000000000007F7F7F7F7F7F
0000000000000000000000000000000000000000000000000000000000000000 7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F00007F7F7FEEEEEE
0000000000000000000000000000000000000000000000000000000000000000 EEEEEEEEEEEE414141414141EEEEEEEEEEEEEEEEEEC3C3C300007F7F7FEEEEEE
0000000000000000000000000000000000000000000000000000808080FFFFFF EEEEEEEEEEEE414141414141EEEEEEEEEEEEEEEEEEC3C3C300007F7F7FEEEEEE
FFFF000000000000000000000000000000000000000000000000000000008080 EEEEEEEEEEEE414141414141EEEEEEEEEEEEEEEEEEC3C3C300007F7F7F414141
80FF0000000000000000FFFFFFFF000000000000000000000000000000000000 414141414141414141414141414141414141414141C3C3C300007F7F7F414141
000000000000808080FF0000000000000000FFFFFFFF00000000000000000000 414141414141414141414141414141414141414141C3C3C300007F7F7FEEEEEE
00000000000000000000808080FF00000000000000000000000000000000FFFF EEEEEEEEEEEE414141414141EEEEEEEEEEEEEEEEEEC3C3C300007F7F7FEEEEEE
FFFF00000000000000000000000000000000808080FF00000000000000000000 EEEEEEEEEEEE414141414141EEEEEEEEEEEEEEEEEEC3C3C300007F7F7FEEEEEE
000000000000FFFFFFFF000000000000000000000000808080FF000000000000 EEEEEEEEEEEE414141414141EEEEEEEEEEEEEEEEEEC3C3C300007F7F7FC3C3C3
000000000000000000000000000000000000FFFFFFFF00000000000000008080 C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C30000
80FF808080FF808080FF808080FF808080FF808080FF808080FFFFFFFFFF0000
0000000000000000000000000000000000000000000000000000000000000000
00000000000000000000
} }
Hint = 'Style "PlusRx"' Hint = 'Style "PlusRx"'
Style = ebsPlusRx Style = ebsPlusRx
end
item
Glyph.Data = {
76010000424D760100000000000036000000280000000A0000000A0000000100
18000000000040010000640000006400000000000000000000007F7F7F7F7F7F
7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F00007F7F7FEEEEEE
EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEC3C3C300007F7F7FEEEEEE
EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEC3C3C300007F7F7FEEEEEE
EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEC3C3C300007F7F7F414141
414141EEEEEE414141414141EEEEEE414141414141C3C3C300007F7F7F414141
414141EEEEEE414141414141EEEEEE414141414141C3C3C300007F7F7FEEEEEE
EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEC3C3C300007F7F7FEEEEEE
EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEC3C3C300007F7F7FEEEEEE
EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEC3C3C300007F7F7FC3C3C3
C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C30000
}
Hint = 'Style "EllipsisRx"'
Style = ebsEllipsisRx
end
item
Glyph.Data = {
76010000424D760100000000000036000000280000000A0000000A0000000100
18000000000040010000640000006400000000000000000000007F7F7F7F7F7F
7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F00007F7F7FEEEEEE
EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEC3C3C300007F7F7FEEEEEE
EEEEEE414141EEEEEE414141EEEEEE414141414141C3C3C300007F7F7FEEEEEE
EEEEEE414141EEEEEE414141EEEEEE414141EEEEEEC3C3C300007F7F7FEEEEEE
EEEEEEEEEEEE414141EEEEEEEEEEEEEEEEEEEEEEEEC3C3C300007F7F7FEEEEEE
EEEEEEEEEEEE414141EEEEEEEEEEEEEEEEEEEEEEEEC3C3C300007F7F7FEEEEEE
414141414141414141414141414141EEEEEEEEEEEEC3C3C300007F7F7FEEEEEE
EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEC3C3C300007F7F7FEEEEEE
EEEEEEEEEEEE414141EEEEEEEEEEEEEEEEEEEEEEEEC3C3C300007F7F7FC3C3C3
C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C30000
}
Hint = 'Style "GlyphRx"'
Style = ebsGlyphRx
end
item
Glyph.Data = {
76010000424D760100000000000036000000280000000A0000000A0000000100
18000000000040010000640000006400000000000000000000007F7F7F7F7F7F
7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F00007F7F7FEEEEEE
EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEC3C3C300007F7F7FEEEEEE
EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEC3C3C300007F7F7FEEEEEE
EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEC3C3C300007F7F7F414141
414141414141414141414141414141414141414141C3C3C300007F7F7F414141
414141414141414141414141414141414141414141C3C3C300007F7F7FEEEEEE
EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEC3C3C300007F7F7FEEEEEE
EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEC3C3C300007F7F7FEEEEEE
EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEC3C3C300007F7F7FC3C3C3
C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C30000
}
Hint = 'Style "MinusRx"'
Style = ebsMinusRx
end
item
Glyph.Data = {
76010000424D760100000000000036000000280000000A0000000A0000000100
18000000000040010000640000006400000000000000000000007F7F7F7F7F7F
7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F00007F7F7FEEEEEE
EEEEEEEEEEEE414141414141EEEEEEEEEEEEEEEEEEC3C3C300007F7F7FEEEEEE
EEEEEE414141414141414141414141EEEEEEEEEEEEC3C3C300007F7F7FEEEEEE
414141414141414141414141414141414141EEEEEEC3C3C300007F7F7F414141
414141414141414141414141414141414141414141C3C3C300007F7F7F414141
EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE414141C3C3C300007F7F7FEEEEEE
414141EEEEEEEEEEEEEEEEEEEEEEEE414141EEEEEEC3C3C300007F7F7FEEEEEE
EEEEEE414141EEEEEEEEEEEE414141EEEEEEEEEEEEC3C3C300007F7F7FEEEEEE
EEEEEEEEEEEE414141414141EEEEEEEEEEEEEEEEEEC3C3C300007F7F7FC3C3C3
C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C30000
}
Hint = 'Style "UpDownRx"'
Style = ebsUpDownRx
end> end>
Filter.Font.Style = [fsItalic] Filter.Font.Style = [fsItalic]
Filter.DropDownRows = 0 Filter.DropDownRows = 0
@ -325,6 +394,7 @@ object RxDBGridMainForm: TRxDBGridMainForm
FooterOptions.Active = True FooterOptions.Active = True
FooterOptions.Color = clYellow FooterOptions.Color = clYellow
FooterOptions.RowCount = 2 FooterOptions.RowCount = 2
FooterOptions.DrawFullLine = True
Version = 1 Version = 1
OptionsRx = [rdgAllowColumnsForm, rdgAllowDialogFind, rdgHighlightFocusCol, rdgHighlightFocusRow, rdgDblClickOptimizeColWidth, rdgFooterRows, rdgXORColSizing, rdgMultiTitleLines, rdgAllowQuickSearch, rdgAllowQuickFilter, rdgAllowFilterForm, rdgAllowSortForm, rdgAllowToolMenu] OptionsRx = [rdgAllowColumnsForm, rdgAllowDialogFind, rdgHighlightFocusCol, rdgHighlightFocusRow, rdgDblClickOptimizeColWidth, rdgFooterRows, rdgXORColSizing, rdgMultiTitleLines, rdgAllowQuickSearch, rdgAllowQuickFilter, rdgAllowFilterForm, rdgAllowSortForm, rdgAllowToolMenu]
FooterColor = clYellow FooterColor = clYellow

8
components/rx/trunk/images/componet_img/all_component_res.bat
View File

@ -1,8 +1,8 @@
del tooledit.lrs del tooledit.lrs
del rxdbgrid.lrs del rxdbgrid.lrs
del tooledit.res
..\..\..\..\tools\lazres.exe tooledit.lrs picDateEdit.png del rxdbgrid.res
..\..\..\..\tools\lazres.exe rxdbgrid.lrs rx_markerdown.png rx_markerup.png
..\..\..\..\tools\lazres.exe tooledit.res picDateEdit.png ..\..\..\..\tools\lazres.exe tooledit.res picDateEdit.png
..\..\..\..\tools\lazres.exe rxdbgrid.res rx_markerdown.png rx_markerup.png ..\..\..\..\tools\lazres.exe rxdbgrid.res rx_markerdown.png rx_markerup.png rx_DropDown.png rx_Ellipsis.png rx_Glyph.png rx_minus.png rx_plus.png rx_UpDown.png rx_menu_grid.png

2
components/rx/trunk/images/componet_img/all_component_res.sh
View File

@ -3,7 +3,7 @@ rm rxdbgrid.lrs
rm tooledit.res rm tooledit.res
rm rxdbgrid.res rm rxdbgrid.res
/usr/local/share/lazarus/tools/lazres rxdbgrid.res rx_markerdown.png rx_markerup.png /usr/local/share/lazarus/tools/lazres rxdbgrid.res rx_markerdown.png rx_markerup.png rx_DropDown.png rx_Ellipsis.png rx_Glyph.png rx_minus.png rx_plus.png rx_UpDown.png rx_menu_grid.png
/usr/local/share/lazarus/tools/lazres rx_lcl.res picDateEdit.png rxbtn_downarrow.png /usr/local/share/lazarus/tools/lazres rx_lcl.res picDateEdit.png rxbtn_downarrow.png
#../../../../tools\lazres.exe tooledit.lrs picDateEdit.bmp #../../../../tools\lazres.exe tooledit.lrs picDateEdit.bmp

BIN
components/rx/trunk/images/componet_img/rx_DropDown.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 193 B

BIN
components/rx/trunk/images/componet_img/rx_Ellipsis.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 147 B

BIN
components/rx/trunk/images/componet_img/rx_Glyph.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 204 B

BIN
components/rx/trunk/images/componet_img/rx_UpDown.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 204 B

BIN
components/rx/trunk/images/componet_img/rx_menu_grid.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 335 B

BIN
components/rx/trunk/images/componet_img/rx_minus.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 174 B

BIN
components/rx/trunk/images/componet_img/rx_plus.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 178 B

BIN
components/rx/trunk/images/componet_img/rxdbgrid.res Normal file
View File

Binary file not shown.

BIN
components/rx/trunk/rx_lcl.res
View File

Binary file not shown.

25
components/rx/trunk/rxdbgrid.lrs
View File

@ -1,25 +0,0 @@
LazarusResources.Add('rx_markerdown','XPM',[
'/* XPM */'#10'static char *rx_mark_down[]={'#10'"10 10 3 1",'#10'". c None",'
+#10'"# c #808080",'#10'"a c #ffffff",'#10'"..........",'#10'".#######a.",'#10
+'".#......a.",'#10'"..#....a..",'#10'"..#....a..",'#10'"...#..a...",'#10'"..'
+'.#..a...",'#10'"....#a....",'#10'"..........",'#10'".........."};'#10
]);
LazarusResources.Add('rx_markerup','XPM',[
'/* XPM */'#10'static char *rx_mark_up[]={'#10'"10 10 4 1",'#10'"b c None",'
+#10'". c None",'#10'"# c #808080",'#10'"a c #ffffff",'#10'"..........",'#10
+'"....#a....",'#10'"...#..a...",'#10'"...#..a...",'#10'"..#....a..",'#10'"..'
+'#....a..",'#10'".#......a.",'#10'".aaaaaaaa.",'#10'".bbbbbbbb.",'#10'".....'
+'....."};'#10
]);
LazarusResources.Add('menu_grid','XPM',[
'/* XPM */'#10'static const unsigned char * menu_grid_xpm[] = {'#10'"16 16 4 1",'
+#10'" c None",'#10'"! c black",'#10'"# c #800000",'#10'"$ c #FFFF00",'
+#10'" ",'#10'" ! ",'#10'" !#! ",'
+#10'" !###! ",'#10'" !##$##! ",'#10'" !!!#$#!!! ",'
+#10'" !#$#! ",'#10'" !#$#! ",'#10'" !#$#! ",'
+#10'" !#$#! ",'#10'" !#$#! ",'#10'" !!!#$#!!! ",'
+#10'" !##$##! ",'#10'" !###! ",'#10'" !#! ",'
+#10'" ! "};'#10
]);

122
components/rx/trunk/rxdbgrid.pas
View File

@ -565,8 +565,6 @@ type
FOnRxColumnFooterDraw :TOnRxColumnFooterDraw; FOnRxColumnFooterDraw :TOnRxColumnFooterDraw;
//auto sort support //auto sort support
FMarkerUp : TBitmap;
FMarkerDown : TBitmap;
FAutoSort : boolean; FAutoSort : boolean;
FSortEngine : TRxDBGridSortEngine; FSortEngine : TRxDBGridSortEngine;
FPressedCol : TRxColumn; FPressedCol : TRxColumn;
@ -578,6 +576,16 @@ type
F_Clicked: boolean; F_Clicked: boolean;
F_PopupMenu: TPopupMenu; F_PopupMenu: TPopupMenu;
F_MenuBMP: TBitmap; F_MenuBMP: TBitmap;
//glyph for collumns buttons
{
FMarkerUp : TBitmap;
FMarkerDown : TBitmap;
FEllipsisRxBMP: TBitmap;
FGlyphRxBMP: TBitmap;
FUpDownRxBMP: TBitmap;
FPlusRxBMP: TBitmap;
FMinusRxBMP: TBitmap;
}
F_EventOnFilterRec: TFilterRecordEvent; F_EventOnFilterRec: TFilterRecordEvent;
F_EventOnBeforeDelete: TDataSetNotifyEvent; F_EventOnBeforeDelete: TDataSetNotifyEvent;
@ -611,8 +619,8 @@ type
function GetColumns: TRxDbGridColumns; function GetColumns: TRxDbGridColumns;
function GetFooterColor: TColor; function GetFooterColor: TColor;
function GetFooterRowCount: integer; function GetFooterRowCount: integer;
function GetMarkerDown: TBitmap; //function GetMarkerDown: TBitmap;
function GetMarkerUp: TBitmap; //function GetMarkerUp: TBitmap;
function GetPropertyStorage: TCustomPropertyStorage; function GetPropertyStorage: TCustomPropertyStorage;
function GetSortField: string; function GetSortField: string;
function GetSortOrder: TSortMarker; function GetSortOrder: TSortMarker;
@ -626,8 +634,8 @@ type
procedure SetFooterOptions(AValue: TRxDBGridFooterOptions); procedure SetFooterOptions(AValue: TRxDBGridFooterOptions);
procedure SetFooterRowCount(const AValue: integer); procedure SetFooterRowCount(const AValue: integer);
procedure SetKeyStrokes(const AValue: TRxDBGridKeyStrokes); procedure SetKeyStrokes(const AValue: TRxDBGridKeyStrokes);
procedure SetMarkerDown(AValue: TBitmap); //procedure SetMarkerDown(AValue: TBitmap);
procedure SetMarkerUp(AValue: TBitmap); //procedure SetMarkerUp(AValue: TBitmap);
procedure SetOptionsRx(const AValue: TOptionsRx); procedure SetOptionsRx(const AValue: TOptionsRx);
procedure SetPropertyStorage(const AValue: TCustomPropertyStorage); procedure SetPropertyStorage(const AValue: TCustomPropertyStorage);
procedure SetTitleButtons(const AValue: boolean); procedure SetTitleButtons(const AValue: boolean);
@ -784,8 +792,8 @@ type
property SortOrder:TSortMarker read GetSortOrder; property SortOrder:TSortMarker read GetSortOrder;
property SortColumns:TRxDbGridColumnsSortList read FSortColumns; property SortColumns:TRxDbGridColumnsSortList read FSortColumns;
property MarkerUp : TBitmap read GetMarkerUp write SetMarkerUp; //property MarkerUp : TBitmap read GetMarkerUp write SetMarkerUp;
property MarkerDown : TBitmap read GetMarkerDown write SetMarkerDown; //property MarkerDown : TBitmap read GetMarkerDown write SetMarkerDown;
published published
property AfterQuickSearch: TRxQuickSearchNotifyEvent read FAfterQuickSearch write FAfterQuickSearch; property AfterQuickSearch: TRxQuickSearchNotifyEvent read FAfterQuickSearch write FAfterQuickSearch;
property ColumnDefValues:TRxDBGridColumnDefValues read FColumnDefValues write SetColumnDefValues; property ColumnDefValues:TRxDBGridColumnDefValues read FColumnDefValues write SetColumnDefValues;
@ -947,6 +955,8 @@ implementation
uses Math, rxdconst, rxstrutils, strutils, rxdbgrid_findunit, rxdbgrid_columsunit, uses Math, rxdconst, rxstrutils, strutils, rxdbgrid_findunit, rxdbgrid_columsunit,
rxlookup, tooledit, LCLProc, Clipbrd, rxfilterby, rxsortby, variants; rxlookup, tooledit, LCLProc, Clipbrd, rxfilterby, rxsortby, variants;
{$R rxdbgrid.res}
const const
EditorCommandStrs: array[rxgcNone .. High(TRxDBGridCommand)] of TIdentMapEntry = EditorCommandStrs: array[rxgcNone .. High(TRxDBGridCommand)] of TIdentMapEntry =
( (
@ -967,6 +977,15 @@ const
var var
RxDBGridSortEngineList: TStringList; RxDBGridSortEngineList: TStringList;
FMarkerUp : TBitmap = nil;
FMarkerDown : TBitmap = nil;
FEllipsisRxBMP: TBitmap = nil;
FGlyphRxBMP: TBitmap = nil;
FUpDownRxBMP: TBitmap = nil;
FPlusRxBMP: TBitmap = nil;
FMinusRxBMP: TBitmap = nil;
procedure RegisterRxDBGridSortEngine( procedure RegisterRxDBGridSortEngine(
RxDBGridSortEngineClass: TRxDBGridSortEngineClass; DataSetClassName: string); RxDBGridSortEngineClass: TRxDBGridSortEngineClass; DataSetClassName: string);
var var
@ -1693,9 +1712,35 @@ begin
end; end;
procedure TRxColumnEditButton.SetStyle(AValue: TRxColumnEditButtonStyle); procedure TRxColumnEditButton.SetStyle(AValue: TRxColumnEditButtonStyle);
{var
G: TRxDBGrid;
P: TPersistent;}
begin begin
if FStyle=AValue then Exit; if FStyle=AValue then Exit;
FStyle:=AValue; FStyle:=AValue;
{ if Assigned(Collection) and Assigned(Collection.Owner)
and Assigned(TRxColumn(Collection.Owner).Collection)
and Assigned(TRxColumn(Collection.Owner).Collection.Owner) then
begin
P:=Collection;
P:=Collection.Owner;
P:=TRxColumn(Collection.Owner).Collection;
P:=TRxColumn(Collection.Owner).Collection.Owner;
G:=TRxDBGrid(TRxColumn(Collection.Owner).Collection.Owner);
}
case FStyle of
ebsDropDownRx:FButton.Glyph.Assign(FMarkerDown);
ebsEllipsisRx:FButton.Glyph.Assign(FEllipsisRxBMP);
ebsGlyphRx:FButton.Glyph.Assign(FGlyphRxBMP);
ebsUpDownRx:FButton.Glyph.Assign(FUpDownRxBMP);
ebsPlusRx:FButton.Glyph.Assign(FPlusRxBMP);
ebsMinusRx:FButton.Glyph.Assign(FMinusRxBMP);
else
FButton.Glyph.Assign(nil);
end;
// end;
end; end;
procedure TRxColumnEditButton.SetVisible(AValue: Boolean); procedure TRxColumnEditButton.SetVisible(AValue: Boolean);
@ -1792,10 +1837,16 @@ begin
end; end;
constructor TRxColumnEditButton.Create(ACollection: TCollection); constructor TRxColumnEditButton.Create(ACollection: TCollection);
var
P: TBitmap;
begin begin
inherited Create(ACollection); inherited Create(ACollection);
FButton:=TSpeedButton.Create(nil); FButton:=TSpeedButton.Create(nil);
FButton.Glyph:=LoadLazResBitmapImage('rx_markerdown'); //FButton.Glyph:=LoadLazResBitmapImage('rx_markerdown');
{ P:=CreateResBitmap('rx_markerdown');
FButton.Glyph:=P;
P.Free;}
FSpinBtn:=TRxSpinButton.Create(nil); FSpinBtn:=TRxSpinButton.Create(nil);
FSpinBtn.OnBottomClick:=@DoBottomClick; FSpinBtn.OnBottomClick:=@DoBottomClick;
FSpinBtn.OnTopClick:=@DoTopClick; FSpinBtn.OnTopClick:=@DoTopClick;
@ -2436,7 +2487,7 @@ function TRxDBGrid.GetFooterRowCount: integer;
begin begin
Result:=FFooterOptions.RowCount; Result:=FFooterOptions.RowCount;
end; end;
{
function TRxDBGrid.GetMarkerDown: TBitmap; function TRxDBGrid.GetMarkerDown: TBitmap;
begin begin
Result:=FMarkerDown; Result:=FMarkerDown;
@ -2446,7 +2497,7 @@ function TRxDBGrid.GetMarkerUp: TBitmap;
begin begin
Result:=FMarkerUp; Result:=FMarkerUp;
end; end;
}
function TRxDBGrid.GetDrawFullLine: boolean; function TRxDBGrid.GetDrawFullLine: boolean;
begin begin
Result := FFooterOptions.FDrawFullLine; Result := FFooterOptions.FDrawFullLine;
@ -2546,7 +2597,7 @@ begin
UpdateJMenuKeys; UpdateJMenuKeys;
end; end;
{
procedure TRxDBGrid.SetMarkerDown(AValue: TBitmap); procedure TRxDBGrid.SetMarkerDown(AValue: TBitmap);
begin begin
FMarkerDown.Assign(AValue); FMarkerDown.Assign(AValue);
@ -2556,7 +2607,7 @@ procedure TRxDBGrid.SetMarkerUp(AValue: TBitmap);
begin begin
FMarkerUp.Assign(AValue); FMarkerUp.Assign(AValue);
end; end;
}
procedure TRxDBGrid.SetOptionsRx(const AValue: TOptionsRx); procedure TRxDBGrid.SetOptionsRx(const AValue: TOptionsRx);
var var
OldOpt: TOptionsRx; OldOpt: TOptionsRx;
@ -5591,8 +5642,20 @@ begin
FSortColumns:=TRxDbGridColumnsSortList.Create; FSortColumns:=TRxDbGridColumnsSortList.Create;
FMarkerUp := LoadLazResBitmapImage('rx_markerup'); // FMarkerUp := LoadBitmapFromLazarusResource('rx_markerup');
FMarkerDown := LoadLazResBitmapImage('rx_markerdown'); // FMarkerDown := LoadBitmapFromLazarusResource('rx_markerdown');
// F_MenuBMP := LoadBitmapFromLazarusResource('menu_grid');
F_MenuBMP := CreateResBitmap('rx_menu_grid');
(*
FMarkerUp := CreateResBitmap('rx_markerup');
FMarkerDown := CreateResBitmap('rx_markerdown');
FEllipsisRxBMP:=CreateResBitmap('rx_Ellipsis');
FGlyphRxBMP:=CreateResBitmap('rx_Glyph');
FUpDownRxBMP:=CreateResBitmap('rx_UpDown');
FPlusRxBMP:=CreateResBitmap('rx_plus');
FMinusRxBMP:=CreateResBitmap('rx_minus');
*)
Options := Options - [dgTabs]; Options := Options - [dgTabs];
OptionsRx := OptionsRx + [rdgAllowColumnsForm, rdgAllowDialogFind, rdgAllowQuickFilter]; OptionsRx := OptionsRx + [rdgAllowColumnsForm, rdgAllowDialogFind, rdgAllowQuickFilter];
@ -5600,7 +5663,6 @@ begin
FAutoSort := True; FAutoSort := True;
F_Clicked := False; F_Clicked := False;
F_MenuBMP := LoadLazResBitmapImage('menu_grid');
DoCreateJMenu; DoCreateJMenu;
@ -5647,13 +5709,19 @@ begin
FreeAndNil(FRxDbGridLookupComboEditor); FreeAndNil(FRxDbGridLookupComboEditor);
FreeAndNil(FRxDbGridDateEditor); FreeAndNil(FRxDbGridDateEditor);
FreeAndNil(FMarkerDown); //FreeAndNil(FMarkerDown);
FreeAndNil(FMarkerUp); //FreeAndNil(FMarkerUp);
FreeAndNil(FPropertyStorageLink); FreeAndNil(FPropertyStorageLink);
FreeAndNil(FFilterListEditor); FreeAndNil(FFilterListEditor);
FreeAndNil(F_PopupMenu); FreeAndNil(F_PopupMenu);
FreeAndNil(F_MenuBMP); FreeAndNil(F_MenuBMP);
{ FreeAndNil(FEllipsisRxBMP);
FreeAndNil(FGlyphRxBMP);
FreeAndNil(FUpDownRxBMP);
FreeAndNil(FPlusRxBMP);
FreeAndNil(FMinusRxBMP);}
FreeAndNil(F_LastFilter); FreeAndNil(F_LastFilter);
FreeAndNil(FKeyStrokes); FreeAndNil(FKeyStrokes);
@ -6678,12 +6746,20 @@ end;
initialization initialization
RegisterPropertyToSkip( TRxDBGrid, 'AllowedOperations', 'This property duplicated standart DBGrid.Options', ''); RegisterPropertyToSkip( TRxDBGrid, 'AllowedOperations', 'This property duplicated standart DBGrid.Options', '');
{$I rxdbgrid.lrs} //{$I rxdbgrid.lrs}
// {$I rx_markerdown.lrs} // {$I rx_markerdown.lrs}
RxDBGridSortEngineList := TStringList.Create; RxDBGridSortEngineList := TStringList.Create;
RxDBGridSortEngineList.Sorted := True; RxDBGridSortEngineList.Sorted := True;
FMarkerUp := CreateResBitmap('rx_markerup');
FMarkerDown := CreateResBitmap('rx_markerdown');
FEllipsisRxBMP:=CreateResBitmap('rx_Ellipsis');
FGlyphRxBMP:=CreateResBitmap('rx_Glyph');
FUpDownRxBMP:=CreateResBitmap('rx_UpDown');
FPlusRxBMP:=CreateResBitmap('rx_plus');
FMinusRxBMP:=CreateResBitmap('rx_minus');
finalization finalization
while (RxDBGridSortEngineList.Count > 0) do while (RxDBGridSortEngineList.Count > 0) do
@ -6693,5 +6769,13 @@ finalization
end; end;
RxDBGridSortEngineList.Free; RxDBGridSortEngineList.Free;
FreeAndNil(FMarkerUp);
FreeAndNil(FMarkerDown);
FreeAndNil(FEllipsisRxBMP);
FreeAndNil(FGlyphRxBMP);
FreeAndNil(FUpDownRxBMP);
FreeAndNil(FPlusRxBMP);
FreeAndNil(FMinusRxBMP);
end. end.

BIN
components/rx/trunk/rxdbgrid.res Normal file
View File

Binary file not shown.

168
components/rx/trunk/rxnew.lpk
View File

@ -25,7 +25,7 @@ translate to Lazarus by alexs in 2005 - 2016
"/> "/>
<License Value="LGPL"/> <License Value="LGPL"/>
<Version Major="2" Minor="9" Release="1" Build="183"/> <Version Major="2" Minor="9" Release="1" Build="183"/>
<Files Count="70"> <Files Count="69">
<Item1> <Item1>
<Filename Value="autopanel.pas"/> <Filename Value="autopanel.pas"/>
<UnitName Value="AutoPanel"/> <UnitName Value="AutoPanel"/>
@ -142,173 +142,169 @@ translate to Lazarus by alexs in 2005 - 2016
<UnitName Value="rxdbgrid"/> <UnitName Value="rxdbgrid"/>
</Item28> </Item28>
<Item29> <Item29>
<Filename Value="rxdbgrid.lrs"/>
<Type Value="LRS"/>
</Item29>
<Item30>
<Filename Value="rxdbgrid_columsunit.pas"/> <Filename Value="rxdbgrid_columsunit.pas"/>
<UnitName Value="rxdbgrid_columsunit"/> <UnitName Value="rxdbgrid_columsunit"/>
</Item30> </Item29>
<Item31> <Item30>
<Filename Value="rxdbgrid_findunit.pas"/> <Filename Value="rxdbgrid_findunit.pas"/>
<UnitName Value="rxdbgrid_findunit"/> <UnitName Value="rxdbgrid_findunit"/>
</Item31> </Item30>
<Item32> <Item31>
<Filename Value="rxdbspinedit.pas"/> <Filename Value="rxdbspinedit.pas"/>
<UnitName Value="RxDBSpinEdit"/> <UnitName Value="RxDBSpinEdit"/>
</Item32> </Item31>
<Item33> <Item32>
<Filename Value="rxdbtimeedit.pas"/> <Filename Value="rxdbtimeedit.pas"/>
<UnitName Value="RxDBTimeEdit"/> <UnitName Value="RxDBTimeEdit"/>
</Item33> </Item32>
<Item34> <Item33>
<Filename Value="rxdconst.pas"/> <Filename Value="rxdconst.pas"/>
<UnitName Value="rxdconst"/> <UnitName Value="rxdconst"/>
</Item34> </Item33>
<Item35> <Item34>
<Filename Value="rxdice.pas"/> <Filename Value="rxdice.pas"/>
<UnitName Value="rxdice"/> <UnitName Value="rxdice"/>
</Item35> </Item34>
<Item36> <Item35>
<Filename Value="rxfilterby.pas"/> <Filename Value="rxfilterby.pas"/>
<UnitName Value="rxfilterby"/> <UnitName Value="rxfilterby"/>
</Item36> </Item35>
<Item37> <Item36>
<Filename Value="rxiconv.pas"/> <Filename Value="rxiconv.pas"/>
<UnitName Value="rxiconv"/> <UnitName Value="rxiconv"/>
</Item37> </Item36>
<Item38> <Item37>
<Filename Value="rxlogin.pas"/> <Filename Value="rxlogin.pas"/>
<UnitName Value="rxlogin"/> <UnitName Value="rxlogin"/>
</Item38> </Item37>
<Item39> <Item38>
<Filename Value="rxlookup.pas"/> <Filename Value="rxlookup.pas"/>
<UnitName Value="rxlookup"/> <UnitName Value="rxlookup"/>
</Item39> </Item38>
<Item40> <Item39>
<Filename Value="rxmemds.pas"/> <Filename Value="rxmemds.pas"/>
<UnitName Value="rxmemds"/> <UnitName Value="rxmemds"/>
</Item40> </Item39>
<Item41> <Item40>
<Filename Value="rxpopupunit.pas"/> <Filename Value="rxpopupunit.pas"/>
<UnitName Value="rxpopupunit"/> <UnitName Value="rxpopupunit"/>
</Item41> </Item40>
<Item42> <Item41>
<Filename Value="rxsortmemds.pas"/> <Filename Value="rxsortmemds.pas"/>
<UnitName Value="rxsortmemds"/> <UnitName Value="rxsortmemds"/>
</Item42> </Item41>
<Item43> <Item42>
<Filename Value="rxspin.pas"/> <Filename Value="rxspin.pas"/>
<UnitName Value="rxspin"/> <UnitName Value="rxspin"/>
</Item43> </Item42>
<Item44> <Item43>
<Filename Value="rxswitch.pas"/> <Filename Value="rxswitch.pas"/>
<UnitName Value="rxswitch"/> <UnitName Value="rxswitch"/>
</Item44> </Item43>
<Item45> <Item44>
<Filename Value="rxsystemservices.pas"/> <Filename Value="rxsystemservices.pas"/>
<UnitName Value="RxSystemServices"/> <UnitName Value="RxSystemServices"/>
</Item45> </Item44>
<Item46> <Item45>
<Filename Value="rxtbrsetup.pas"/> <Filename Value="rxtbrsetup.pas"/>
<UnitName Value="rxtbrsetup"/> <UnitName Value="rxtbrsetup"/>
</Item46> </Item45>
<Item47> <Item46>
<Filename Value="rxtimeedit.pas"/> <Filename Value="rxtimeedit.pas"/>
<UnitName Value="RxTimeEdit"/> <UnitName Value="RxTimeEdit"/>
</Item47> </Item46>
<Item48> <Item47>
<Filename Value="rxtoolbar.pas"/> <Filename Value="rxtoolbar.pas"/>
<UnitName Value="rxtoolbar"/> <UnitName Value="rxtoolbar"/>
</Item48> </Item47>
<Item49> <Item48>
<Filename Value="rxversinfo.pas"/> <Filename Value="rxversinfo.pas"/>
<UnitName Value="RxVersInfo"/> <UnitName Value="RxVersInfo"/>
</Item49> </Item48>
<Item50> <Item49>
<Filename Value="rxviewspanel.pas"/> <Filename Value="rxviewspanel.pas"/>
<UnitName Value="RxViewsPanel"/> <UnitName Value="RxViewsPanel"/>
</Item50> </Item49>
<Item51> <Item50>
<Filename Value="rxxpman.pas"/> <Filename Value="rxxpman.pas"/>
<UnitName Value="rxxpman"/> <UnitName Value="rxxpman"/>
</Item51> </Item50>
<Item52> <Item51>
<Filename Value="seldsfrm.pas"/> <Filename Value="seldsfrm.pas"/>
<UnitName Value="seldsfrm"/> <UnitName Value="seldsfrm"/>
</Item52> </Item51>
<Item53> <Item52>
<Filename Value="tooledit.pas"/> <Filename Value="tooledit.pas"/>
<UnitName Value="tooledit"/> <UnitName Value="tooledit"/>
</Item53> </Item52>
<Item54> <Item53>
<Filename Value="vclutils.pas"/> <Filename Value="vclutils.pas"/>
<UnitName Value="vclutils"/> <UnitName Value="vclutils"/>
</Item54> </Item53>
<Item55> <Item54>
<Filename Value="rxcloseformvalidator.pas"/> <Filename Value="rxcloseformvalidator.pas"/>
<UnitName Value="RxCloseFormValidator"/> <UnitName Value="RxCloseFormValidator"/>
</Item55> </Item54>
<Item56> <Item55>
<Filename Value="rxhistorynavigator.pas"/> <Filename Value="rxhistorynavigator.pas"/>
<UnitName Value="RxHistoryNavigator"/> <UnitName Value="RxHistoryNavigator"/>
</Item56> </Item55>
<Item57> <Item56>
<Filename Value="ex_rx_bin_datapacket.pas"/> <Filename Value="ex_rx_bin_datapacket.pas"/>
<UnitName Value="ex_rx_bin_datapacket"/> <UnitName Value="ex_rx_bin_datapacket"/>
</Item57> </Item56>
<Item58> <Item57>
<Filename Value="ex_rx_datapacket.pas"/> <Filename Value="ex_rx_datapacket.pas"/>
<UnitName Value="ex_rx_datapacket"/> <UnitName Value="ex_rx_datapacket"/>
</Item58> </Item57>
<Item59> <Item58>
<Filename Value="ex_rx_xml_datapacket.pas"/> <Filename Value="ex_rx_xml_datapacket.pas"/>
<UnitName Value="ex_rx_xml_datapacket"/> <UnitName Value="ex_rx_xml_datapacket"/>
</Item59> </Item58>
<Item60> <Item59>
<Filename Value="rxsortby.lfm"/> <Filename Value="rxsortby.lfm"/>
<Type Value="LFM"/> <Type Value="LFM"/>
</Item60> </Item59>
<Item61> <Item60>
<Filename Value="rxsortby.pas"/> <Filename Value="rxsortby.pas"/>
<UnitName Value="rxsortby"/> <UnitName Value="rxsortby"/>
</Item61> </Item60>
<Item62> <Item61>
<Filename Value="rxmdi.pas"/> <Filename Value="rxmdi.pas"/>
<UnitName Value="RxMDI"/> <UnitName Value="RxMDI"/>
</Item62> </Item61>
<Item63> <Item62>
<Filename Value="rxinipropstorage.pas"/> <Filename Value="rxinipropstorage.pas"/>
<UnitName Value="RxIniPropStorage"/> <UnitName Value="RxIniPropStorage"/>
</Item63> </Item62>
<Item64> <Item63>
<Filename Value="rx_lcl.res"/> <Filename Value="rx_lcl.res"/>
<Type Value="Binary"/> <Type Value="Binary"/>
</Item64> </Item63>
<Item65> <Item64>
<Filename Value="rxdaterangeeditunit.pas"/> <Filename Value="rxdaterangeeditunit.pas"/>
<UnitName Value="rxDateRangeEditUnit"/> <UnitName Value="rxDateRangeEditUnit"/>
</Item65> </Item64>
<Item66> <Item65>
<Filename Value="rxdbgridfootertools.pas"/> <Filename Value="rxdbgridfootertools.pas"/>
<UnitName Value="RxDBGridFooterTools"/> <UnitName Value="RxDBGridFooterTools"/>
</Item66> </Item65>
<Item67> <Item66>
<Filename Value="rxdbgridfootertools_setup.lfm"/> <Filename Value="rxdbgridfootertools_setup.lfm"/>
<Type Value="LFM"/> <Type Value="LFM"/>
</Item67> </Item66>
<Item68> <Item67>
<Filename Value="rxdbgridfootertools_setup.pas"/> <Filename Value="rxdbgridfootertools_setup.pas"/>
<UnitName Value="rxdbgridfootertools_setup"/> <UnitName Value="rxdbgridfootertools_setup"/>
</Item68> </Item67>
<Item69> <Item68>
<Filename Value="rxshortcutunit.lfm"/> <Filename Value="rxshortcutunit.lfm"/>
<Type Value="LFM"/> <Type Value="LFM"/>
</Item69> </Item68>
<Item70> <Item69>
<Filename Value="rxshortcutunit.pas"/> <Filename Value="rxshortcutunit.pas"/>
<UnitName Value="rxShortCutUnit"/> <UnitName Value="rxShortCutUnit"/>
</Item70> </Item69>
</Files> </Files>
<LazDoc Paths="docs;\usr\local\share\lazarus\components\rxnew\docs"/> <LazDoc Paths="docs;\usr\local\share\lazarus\components\rxnew\docs"/>
<i18n> <i18n>

27
components/rx/trunk/vclutils.pas
View File

@ -62,6 +62,7 @@ procedure OutTextXY90(Canvas:TCanvas; X,Y:integer; Text:string; Orientation:TTex
function IsForegroundTask: Boolean; function IsForegroundTask: Boolean;
function ValidParentForm(Control: TControl): TCustomForm; function ValidParentForm(Control: TControl): TCustomForm;
function CreateArrowBitmap:TBitmap; function CreateArrowBitmap:TBitmap;
function CreateResBitmap(const AResName:string):TBitmap;
function LoadLazResBitmapImage(const ResName: string): TBitmap; function LoadLazResBitmapImage(const ResName: string): TBitmap;
{functions from DBGrid} {functions from DBGrid}
@ -604,11 +605,10 @@ end;
{$ENDIF} {$ENDIF}
function CreateArrowBitmap:TBitmap; function CreateArrowBitmap:TBitmap;
var
C : TCustomBitmap;
begin begin
{$IFNDEF RX_USE_LAZARUS_RESOURCE} {$IFNDEF RX_USE_LAZARUS_RESOURCE}
Result := TBitmap.Create; Result:=CreateResBitmap('rxbtn_downarrow');
(* Result := TBitmap.Create;
try try
try try
C := TPortableNetworkGraphic.Create; C := TPortableNetworkGraphic.Create;
@ -620,12 +620,31 @@ begin
except except
Result.Free; Result.Free;
raise; raise;
end; end; *)
{$ELSE} {$ELSE}
Result:=LoadLazResBitmapImage('rxbtn_downarrow') Result:=LoadLazResBitmapImage('rxbtn_downarrow')
{$ENDIF} {$ENDIF}
end; end;
function CreateResBitmap(const AResName: string): TBitmap;
var
C : TCustomBitmap;
begin
Result := TBitmap.Create;
try
try
C := TPortableNetworkGraphic.Create;
C.LoadFromResourceName(hInstance, AResName);
Result.Assign(C);
finally
C.Free;
end;
except
Result.Free;
raise;
end;
end;
//Code from DBGrid //Code from DBGrid
function LoadLazResBitmapImage(const ResName: string): TBitmap; function LoadLazResBitmapImage(const ResName: string): TBitmap;
var var