From f2f1d873adea35ee5e7286210f473fbb55c1117f Mon Sep 17 00:00:00 2001 From: alexs75 Date: Thu, 19 May 2016 07:43:14 +0000 Subject: [PATCH] RxFPC: revert 4650, fix button icons in RxDBGrid, move resourses for pickdate to res file git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@4654 8e941d3f-bd1b-0410-a28a-d453659cc2b4 --- .../rx/trunk/Demos/RxDBGrid/RxDBGridDemo.lpi | 46 +++- .../trunk/Demos/RxDBGrid/rxdbgridmainunit.lfm | 29 +++ .../trunk/Demos/RxDBGrid/rxdbgridmainunit.pas | 6 +- .../images/componet_img/all_component_res.sh | 2 + .../rx/trunk/images/componet_img/pickdate.res | Bin 0 -> 1368 bytes .../trunk/images/componet_img/rx_DropDown.png | Bin 193 -> 149 bytes .../trunk/images/componet_img/rx_Ellipsis.png | Bin 147 -> 122 bytes .../rx/trunk/images/componet_img/rx_Glyph.png | Bin 204 -> 143 bytes .../rx/trunk/images/componet_img/rx_minus.png | Bin 174 -> 127 bytes .../rx/trunk/images/componet_img/rx_next1.png | Bin 0 -> 284 bytes .../rx/trunk/images/componet_img/rx_next2.png | Bin 0 -> 290 bytes .../rx/trunk/images/componet_img/rx_plus.png | Bin 178 -> 140 bytes .../rx/trunk/images/componet_img/rx_prev1.png | Bin 0 -> 278 bytes .../rx/trunk/images/componet_img/rx_prev2.png | Bin 0 -> 288 bytes .../rx/trunk/images/componet_img/rxdbgrid.res | Bin 2415 -> 2199 bytes components/rx/trunk/images/next1.xpm | 11 - components/rx/trunk/images/next2.xpm | 11 - components/rx/trunk/images/prev1.xpm | 11 - components/rx/trunk/images/prev2.xpm | 11 - components/rx/trunk/pickdate.lrs | 20 -- components/rx/trunk/pickdate.pas | 21 +- components/rx/trunk/pickdate.res | Bin 0 -> 1368 bytes components/rx/trunk/rxdbgrid.res | Bin 2415 -> 2199 bytes components/rx/trunk/rxnew.lpk | 228 +++++++++--------- 24 files changed, 194 insertions(+), 202 deletions(-) create mode 100644 components/rx/trunk/images/componet_img/pickdate.res create mode 100644 components/rx/trunk/images/componet_img/rx_next1.png create mode 100644 components/rx/trunk/images/componet_img/rx_next2.png create mode 100644 components/rx/trunk/images/componet_img/rx_prev1.png create mode 100644 components/rx/trunk/images/componet_img/rx_prev2.png delete mode 100644 components/rx/trunk/images/next1.xpm delete mode 100644 components/rx/trunk/images/next2.xpm delete mode 100644 components/rx/trunk/images/prev1.xpm delete mode 100644 components/rx/trunk/images/prev2.xpm delete mode 100644 components/rx/trunk/pickdate.lrs create mode 100644 components/rx/trunk/pickdate.res diff --git a/components/rx/trunk/Demos/RxDBGrid/RxDBGridDemo.lpi b/components/rx/trunk/Demos/RxDBGrid/RxDBGridDemo.lpi index a0106e4aa..b215e488d 100644 --- a/components/rx/trunk/Demos/RxDBGrid/RxDBGridDemo.lpi +++ b/components/rx/trunk/Demos/RxDBGrid/RxDBGridDemo.lpi @@ -55,7 +55,7 @@ - + @@ -70,9 +70,8 @@ - - - + + @@ -470,10 +469,11 @@ - - - + + + + @@ -827,10 +827,12 @@ - - - + + + + + @@ -889,8 +891,30 @@ + + + + + - + + + + + + + + + + + + + + + + + + diff --git a/components/rx/trunk/Demos/RxDBGrid/rxdbgridmainunit.lfm b/components/rx/trunk/Demos/RxDBGrid/rxdbgridmainunit.lfm index 87d864b52..0dbb38081 100644 --- a/components/rx/trunk/Demos/RxDBGrid/rxdbgridmainunit.lfm +++ b/components/rx/trunk/Demos/RxDBGrid/rxdbgridmainunit.lfm @@ -554,6 +554,35 @@ object RxDBGridMainForm: TRxDBGridMainForm OnChange = CheckBox5Change TabOrder = 7 end + object Label2: TLabel + AnchorSideLeft.Control = CheckBox5 + AnchorSideLeft.Side = asrBottom + AnchorSideTop.Control = Panel1 + Left = 865 + Height = 20 + Top = 7 + Width = 32 + BorderSpacing.Around = 6 + Caption = 'Дата' + ParentColor = False + end + object RxDateEdit1: TRxDateEdit + AnchorSideLeft.Control = Label2 + AnchorSideTop.Control = Label2 + AnchorSideTop.Side = asrBottom + Left = 871 + Height = 30 + Top = 33 + Width = 129 + BorderSpacing.Around = 6 + ButtonWidth = 23 + MaxLength = 10 + NumGlyphs = 2 + PasswordChar = #0 + PopupColor = clWindow + TabOrder = 8 + Text = ' . . ' + end end object SpeedButton1: TSpeedButton Left = 596 diff --git a/components/rx/trunk/Demos/RxDBGrid/rxdbgridmainunit.pas b/components/rx/trunk/Demos/RxDBGrid/rxdbgridmainunit.pas index f69498135..f921e4e76 100644 --- a/components/rx/trunk/Demos/RxDBGrid/rxdbgridmainunit.pas +++ b/components/rx/trunk/Demos/RxDBGrid/rxdbgridmainunit.pas @@ -7,8 +7,8 @@ interface uses Classes, SysUtils, LResources, Forms, Controls, Graphics, Dialogs, rxmemds, DB, rxdbgrid, RxAboutDialog, RxIniPropStorage, RxDBGridPrintGrid, - RxDBGridExportSpreadSheet, RxDBGridFooterTools, ExtCtrls, Buttons, Menus, - ActnList, StdCtrls, DBGrids, types; + RxDBGridExportSpreadSheet, RxDBGridFooterTools, tooledit, ExtCtrls, Buttons, + Menus, ActnList, StdCtrls, DBGrids, types; type @@ -17,11 +17,13 @@ type TRxDBGridMainForm = class(TForm) actCalcTotal: TAction; CheckBox5: TCheckBox; + Label2: TLabel; MenuItem10: TMenuItem; MenuItem11: TMenuItem; MenuItem8: TMenuItem; MenuItem9: TMenuItem; RxAboutDialog1: TRxAboutDialog; + RxDateEdit1: TRxDateEdit; RxDBGridExportSpreadSheet1: TRxDBGridExportSpreadSheet; RxDBGridFooterTools1: TRxDBGridFooterTools; RxDBGridPrint1: TRxDBGridPrint; diff --git a/components/rx/trunk/images/componet_img/all_component_res.sh b/components/rx/trunk/images/componet_img/all_component_res.sh index aefdab72d..46be41aed 100644 --- a/components/rx/trunk/images/componet_img/all_component_res.sh +++ b/components/rx/trunk/images/componet_img/all_component_res.sh @@ -2,9 +2,11 @@ rm tooledit.lrs rm rxdbgrid.lrs rm tooledit.res rm rxdbgrid.res +rm pickdate.rex /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 pickdate.res rx_next1.png rx_next2.png rx_prev1.png rx_prev2.png #../../../../tools\lazres.exe tooledit.lrs picDateEdit.bmp #../../../../tools\lazres.exe rxdbgrid.lrs rx_markerdown.xpm rx_markerup.xpm diff --git a/components/rx/trunk/images/componet_img/pickdate.res b/components/rx/trunk/images/componet_img/pickdate.res new file mode 100644 index 0000000000000000000000000000000000000000..fd8418ff1a67248563ed74aa6b702ca6bf0dbabb GIT binary patch literal 1368 zcmZQzU|>)H;{X347|28cGK>ri20)Sj|G5}~7$O+r8T=SrfpiFiAzYn+0G!Ft8Q|y6 z%O%AH6yf#sa0vp^96-#*!2%>hc*F~U6id3JuOkD)#(wTUiL5}rLb6AYF9SoB8UsT^ z3j@P1pisjL28L3gy{{4&7_4S6Fo+k-*%fF5lweBoc6VX;-`;;_Kaj^>;_2(keves_ zQ&@A+-EeQ9kcy{^V+hCf98NB_VlXs$pfx(~( zOD$MfCM5hg&%pR!QbIyvhJX*p*%qDC2M&CYS7Tr|V0257IvT)mWhDpm>H61kKu;h7 zh~^>6z#xVZrUAfo>dFu{SktE*EKD03{|j_+PURMEC>GSZz#<{JfnkLi!}|gjHkYuU z|L7f#3OK`Ykfu!ySU4sC!H@F?7#7bA*vZ4=vm&O0OXR?j101P_O5Dns%nWzdaxfdJ Jn={ilL;+8TKS}@q literal 0 HcmV?d00001 diff --git a/components/rx/trunk/images/componet_img/rx_DropDown.png b/components/rx/trunk/images/componet_img/rx_DropDown.png index d985816acada5b9165d19f4eda223d15f4bd282a..374ffc61ca7d52e40326b0c60f7c4c873e26e71b 100644 GIT binary patch delta 111 zcmX@eIF)gNqy!rS14FOT`Mp4jrP#?cgaZg_I8r($+DZ7Bd%8G=NK8#mkT5uK;=q9e z4_>_ZAwPf7-{0SjjV7ij*#&=pfB$^PB7xaSGnCdGxOnlSy`p(AJJ7rs{w}%VJ|>`< N44$rjF6*2UngGh~Dr*1$ delta 155 zcmbQrc#v^|q$(2w0|Qe)#48}hSRCZ;#IWw1%u67LCEd~2k%3`jKlh(R)`^A^*^+X@#Fr* kiyzn5q4sv&5Sa(k5C6L3C?&#~tz_78O`%fb4L_-N%4Nn)x z5RKsE73N5C%_I KKbLh*2~7aNWg>(C diff --git a/components/rx/trunk/images/componet_img/rx_Glyph.png b/components/rx/trunk/images/componet_img/rx_Glyph.png index 5a76f9f138022fb532f9fc2289531df2c5c8c448..a0c79302e84ac1618bc396effac4b72e21dca08f 100644 GIT binary patch delta 105 zcmX@Z*v~jYQi6?vfuYyv{9Yi%Qtadz!T|&|94Q?W?Ihd`JzX3_B&H@OD2Q8FS^ZOw zHf9C_WxL7W-rqmpq33oXOKsB~Mq}Q&YNuSfoEg;_7#8XAO?vRk$_;25gQu&X%Q~lo FCIBufAPfKi delta 166 zcmV;X09pT!0n7oA86^S$0006|Sn2=(00DDSM?wIu&K&6g000DMK}|sb0I`n?{9y%= zF&K7XNklC~lcCNp_zfVtD)L;FAnW1Vr3(Fx_4r!on22WQ%mvv4FO#tCK9xVU> delta 135 zcmbq4sv&5Sa(k5C6L3C?&#~tz_78O`%fb4L_>)PXHOT$ z5RKsEHS5=x7ZxTSV2o&ph>n&%NZ$sU&*16m=d#Wzp$Pzdr7m6o diff --git a/components/rx/trunk/images/componet_img/rx_next1.png b/components/rx/trunk/images/componet_img/rx_next1.png new file mode 100644 index 0000000000000000000000000000000000000000..17fa4c80656840ed54dc0a0c8c36d31334665b10 GIT binary patch literal 284 zcmeAS@N?(olHy`uVBq!ia0vp^96-#*!2%>hc*F~U6id3JuOkD)#(wTUiL5}rLb6AY zF9SoB8UsT^3j@P1pisjL28L1t28LG&3=CE?7#PG0=Ijcz0ZK3>dAqwX{BQ3+vmeM~ zFY)wsWxvNP$tkS4=x(?-P)Nno#W95AdU8TT!~cL;jhx3CI2BnIIGtdU(2|h6FxA+= z0BG#%JQlWkpZHRsdesuwh?11Vl2ohYqEsNoU}RuurfXoTYiJo_XkcYzVr62eZD4F= zU@+mnJjk^O4Y~O#nQ4_E4JNt<#=1tPAqJLKhL&IrCO{3o&o6%fYGCkm^>bP0l+XkK DA}vU+ literal 0 HcmV?d00001 diff --git a/components/rx/trunk/images/componet_img/rx_next2.png b/components/rx/trunk/images/componet_img/rx_next2.png new file mode 100644 index 0000000000000000000000000000000000000000..9ac4d1ef63b42c3dd01b2d784788e8a2fe56b437 GIT binary patch literal 290 zcmeAS@N?(olHy`uVBq!ia0vp^96-#*!2%>hc*F~U6id3JuOkD)#(wTUiL5}rLb6AY zF9SoB8UsT^3j@P1pisjL28L1t28LG&3=CE?7#PG0=Ijcz0ZK3>dAqwX{BQ3+vmeM~ zFY)wsWxvNP$tkS4=x(?-P)N(u#W95AdU8TS!jJO|jQ=GiBqU}C_;8$U(K&tKzz2CX z26h8Rw-l+P0Ss4GaxkB+e;o(ZrCQ<|QIe8al4_M)lnSI6j0_CTbPY^(4J|_q4Xlhz ztV|5G4UDY}3?|%{2e}!cAvZrIGp!P&!9>@qJ9|7 z#}JL+KSou_QiZVp-x?CT~^3amtz1 r*VmV&qgTe~DWM4f$`~wl diff --git a/components/rx/trunk/images/componet_img/rx_prev1.png b/components/rx/trunk/images/componet_img/rx_prev1.png new file mode 100644 index 0000000000000000000000000000000000000000..d5c14e41286e18cb320589f9e3777dc5b5016ead GIT binary patch literal 278 zcmeAS@N?(olHy`uVBq!ia0vp^96-#*!2%>hc*F~U6id3JuOkD)#(wTUiL5}rLb6AY zF9SoB8UsT^3j@P1pisjL28L1t28LG&3=CE?7#PG0=Ijcz0ZK3>dAqwX{BQ3+vmeM~ zFY)wsWxvNP$tkS4=x(?-P)N?x#W95AdU8TT<9~rJ&Z*qO4aI_57g!`DH!!R)V|ZV{ z!sZh8^B+*9YKdz^NlIc#s#S7PDv)9@GB7mLH89mRvhc*F~U6id3JuOkD)#(wTUiL5}rLb6AY zF9SoB8UsT^3j@P1pisjL28L1t28LG&3=CE?7#PG0=Ijcz0ZK3>dAqwX{BQ3+vmeM~ zFY)wsWxvNP$tkS4=x(?-P)Nhm#W95AdU65?{5XGrVe!m>ojg1~D`GmhL=GG|z>#XG z#I2mk%y4Hd2eYBNIWtg?YKdz^NlIc#s#S7PDv)9@GB7mLH89mRvh7k3}ND+|$J|L}F@k zf`q|=69*0)c<|!I5Bd3v{{H@MY&0=N$u9W&`}^lR775HwnxVAjz{QIn?G?>~*?|Ve z@OQ}-_b~wtW$<+Mb6Mw<&;(>wP0nP-Z=;C}+(spkdHWYHeq3LZv#ha1VJjnpdpuYF zf`a=CP>t=MY{=q)*B>5+FjE!8Ev&5msYe?#1A(&L$zRXQrmQg(U^Cx+9{VV zXGV1fhDCaOlODXXaznAIezGnrew!>5VKzzpX_(m9*mw{WD0Z&DzrRmUS=3+sf|;Re zIt$AoR}N_ulY1ufvbo^(gR>sYWQZTiOG^Iq>z#91!|0-&(h}M3fAQbn-;$kXg3K4r Y8@n(w*e&4};gHyOAK9ACZ`hid09qESB>(^b delta 561 zcmbO(_+Ds30TbiF$%RZllVjOz>%%-<978mMlh>?YUtU<4cz`jYAtE|j`j8`Y`1-ii zCZj@z3GW^}NZ?@SH8C|6yudptZg-h(OEZr`Q^4H}tp_nJ4+|7imMSbi$T&;Vfq_d* zLs;0rfPo=vk9fbo{K}aOK;Y@>=d#Wzp$W*G48$ft{Qo}}Ll8p*L;Pf4W*d+@>@}e7 zSh0S+eUEg*lKT%CLME26Fe}LSI?gef&@UR`Dy6<+Jv&41%e%f$0+n_HO+lD^X7XER z51=`&_5F>U2Mjn^a$lOQo5(A3L~zcD!aK{C>1WQK(A+TpyC}bL_S%bW+VaNE9UZ$D z`zbwI^XcL1#(925?MyxUHZ5HK@MQjvQ`yR0y2;ngdi(0OuX>cN#Q(Z%rRXB*cmL!S zVz(cBi)`^aAP4AMB>(JXu>koe+L>UuGF?(Q+}zx(C}VQr$`zNEcU!ZsJ6U8jBrR`j zVm)<)g@=csXc6xdT?y&i$Tl)CY?>U)>H@MO&K-vxoP2z2ld`X`Yb{tGxAzoF;zK5u yC5~nCRwW##oLPN+eOXGH=dhJ?>&{_IO=4nWW7u_AZ1n**^GZ~EHjA(|GXVgC!_N%> diff --git a/components/rx/trunk/images/next1.xpm b/components/rx/trunk/images/next1.xpm deleted file mode 100644 index 22c69dcf9..000000000 --- a/components/rx/trunk/images/next1.xpm +++ /dev/null @@ -1,11 +0,0 @@ -/* XPM */ -static char *next1[]={ -"8 6 2 1", -". c None", -"# c #000000", -"...#....", -"...##...", -"...###..", -"...###..", -"...##...", -"...#...."}; diff --git a/components/rx/trunk/images/next2.xpm b/components/rx/trunk/images/next2.xpm deleted file mode 100644 index f0546c314..000000000 --- a/components/rx/trunk/images/next2.xpm +++ /dev/null @@ -1,11 +0,0 @@ -/* XPM */ -static char *next2[]={ -"8 6 2 1", -". c None", -"# c #000000", -".#...#..", -".##..##.", -".###.###", -".###.###", -".##..##.", -".#...#.."}; diff --git a/components/rx/trunk/images/prev1.xpm b/components/rx/trunk/images/prev1.xpm deleted file mode 100644 index fd077995b..000000000 --- a/components/rx/trunk/images/prev1.xpm +++ /dev/null @@ -1,11 +0,0 @@ -/* XPM */ -static char *prev1[]={ -"8 6 2 1", -". c None", -"# c #000000", -"....#...", -"...##...", -"..###...", -"..###...", -"...##...", -"....#..."}; diff --git a/components/rx/trunk/images/prev2.xpm b/components/rx/trunk/images/prev2.xpm deleted file mode 100644 index d53b7076c..000000000 --- a/components/rx/trunk/images/prev2.xpm +++ /dev/null @@ -1,11 +0,0 @@ -/* XPM */ -static char *prev2[]={ -"8 6 2 1", -". c None", -"# c #000000", -"..#...#.", -".##..##.", -"###.###.", -"###.###.", -".##..##.", -"..#...#."}; diff --git a/components/rx/trunk/pickdate.lrs b/components/rx/trunk/pickdate.lrs deleted file mode 100644 index 3ff15ef75..000000000 --- a/components/rx/trunk/pickdate.lrs +++ /dev/null @@ -1,20 +0,0 @@ -LazarusResources.Add('next1','XPM',[ - '/* XPM */'#10'static char *next1[]={'#10'"8 6 2 1",'#10'". c None",'#10'"# c' - +' #000000",'#10'"...#....",'#10'"...##...",'#10'"...###..",'#10'"...###..",' - +#10'"...##...",'#10'"...#...."};'#10 -]); -LazarusResources.Add('next2','XPM',[ - '/* XPM */'#10'static char *next2[]={'#10'"8 6 2 1",'#10'". c None",'#10'"# c' - +' #000000",'#10'".#...#..",'#10'".##..##.",'#10'".###.###",'#10'".###.###",' - +#10'".##..##.",'#10'".#...#.."};'#10 -]); -LazarusResources.Add('prev1','XPM',[ - '/* XPM */'#10'static char *prev1[]={'#10'"8 6 2 1",'#10'". c None",'#10'"# c' - +' #000000",'#10'"....#...",'#10'"...##...",'#10'"..###...",'#10'"..###...",' - +#10'"...##...",'#10'"....#..."};'#10 -]); -LazarusResources.Add('prev2','XPM',[ - '/* XPM */'#10'static char *prev2[]={'#10'"8 6 2 1",'#10'". c None",'#10'"# c' - +' #000000",'#10'"..#...#.",'#10'".##..##.",'#10'"###.###.",'#10'"###.###.",' - +#10'".##..##.",'#10'"..#...#."};'#10 -]); diff --git a/components/rx/trunk/pickdate.pas b/components/rx/trunk/pickdate.pas index 2434f980e..b4e7bb8aa 100644 --- a/components/rx/trunk/pickdate.pas +++ b/components/rx/trunk/pickdate.pas @@ -264,8 +264,9 @@ const implementation -uses Messages, RXCtrls, rxconst, ToolEdit, vclutils, math, LCLStrConsts, - {rxstrutils,} LResources; +uses Messages, RXCtrls, rxconst, ToolEdit, vclutils, math, LCLStrConsts, LResources; + +{$R pickdate.res} const SBtnGlyphs: array[0..3] of PChar = ('PREV2', 'PREV1', 'NEXT1', 'NEXT2'); @@ -795,7 +796,7 @@ begin if FMonthOffset = 2 then FMonthOffset := -5; FillDaysArray; - MoveExtend(false, (ADay - FMonthOffset) mod 7, (ADay - FMonthOffset) div 7 + 1, true); + MoveExtend(false, (ADay - FMonthOffset) mod 7, (ADay - FMonthOffset) div 7 + 1); TopRow:=1; //Правим ошибку для автоскрола календаря после 15 числа... VisualChange; @@ -1012,7 +1013,8 @@ begin Parent := FControlPanel; SetBounds(-1, -1, BtnSide, BtnSide); //loaded bitmap should be freed as Glyph just takes a copy of it - TmpBitmap:=LoadBitmapFromLazarusResource('prev2'); + //TmpBitmap:=LoadBitmapFromLazarusResource('prev2'); + TmpBitmap:=CreateResBitmap('rx_prev2'); Glyph := TmpBitmap; FreeAndNil(TmpBitmap); @@ -1027,7 +1029,8 @@ begin Parent := FControlPanel; SetBounds(BtnSide - 2, -1, BtnSide, BtnSide); - TmpBitmap:=LoadBitmapFromLazarusResource('prev1'); + //TmpBitmap:=LoadBitmapFromLazarusResource('prev1'); + TmpBitmap:=CreateResBitmap('rx_prev1'); Glyph := TmpBitmap; FreeAndNil(TmpBitmap); @@ -1041,7 +1044,8 @@ begin begin Parent := FControlPanel; SetBounds(FControlPanel.Width - 2 * BtnSide + 2, -1, BtnSide, BtnSide); - TmpBitmap:=LoadBitmapFromLazarusResource('next1'); + //TmpBitmap:=LoadBitmapFromLazarusResource('next1'); + TmpBitmap:=CreateResBitmap('rx_next1'); Glyph := TmpBitmap; FreeAndNil(TmpBitmap); OnClick := @NextMonthBtnClick; @@ -1054,7 +1058,8 @@ begin begin Parent := FControlPanel; SetBounds(FControlPanel.Width - BtnSide + 1, -1, BtnSide, BtnSide); - TmpBitmap:=LoadBitmapFromLazarusResource('next2'); + //TmpBitmap:=LoadBitmapFromLazarusResource('next2'); + TmpBitmap:=CreateResBitmap('rx_next2'); Glyph := TmpBitmap; FreeAndNil(TmpBitmap); OnClick := @NextYearBtnClick; @@ -1589,6 +1594,4 @@ begin DefaultRowHeight := (aHeight - GridLinesH) div 7; end; -initialization - {$I pickdate.lrs} end. diff --git a/components/rx/trunk/pickdate.res b/components/rx/trunk/pickdate.res new file mode 100644 index 0000000000000000000000000000000000000000..fd8418ff1a67248563ed74aa6b702ca6bf0dbabb GIT binary patch literal 1368 zcmZQzU|>)H;{X347|28cGK>ri20)Sj|G5}~7$O+r8T=SrfpiFiAzYn+0G!Ft8Q|y6 z%O%AH6yf#sa0vp^96-#*!2%>hc*F~U6id3JuOkD)#(wTUiL5}rLb6AYF9SoB8UsT^ z3j@P1pisjL28L3gy{{4&7_4S6Fo+k-*%fF5lweBoc6VX;-`;;_Kaj^>;_2(keves_ zQ&@A+-EeQ9kcy{^V+hCf98NB_VlXs$pfx(~( zOD$MfCM5hg&%pR!QbIyvhJX*p*%qDC2M&CYS7Tr|V0257IvT)mWhDpm>H61kKu;h7 zh~^>6z#xVZrUAfo>dFu{SktE*EKD03{|j_+PURMEC>GSZz#<{JfnkLi!}|gjHkYuU z|L7f#3OK`Ykfu!ySU4sC!H@F?7#7bA*vZ4=vm&O0OXR?j101P_O5Dns%nWzdaxfdJ Jn={ilL;+8TKS}@q literal 0 HcmV?d00001 diff --git a/components/rx/trunk/rxdbgrid.res b/components/rx/trunk/rxdbgrid.res index 818b8b31d1924d402c38f0d46e4296e8244e3856..3c4f418c6330a25eab1f87cddc85a38df5f36111 100644 GIT binary patch delta 511 zcmaDaG+l5*0TbiY$%RZl5^M|%482C@_W~)FVkgfK4j`!ENa>h7k3}ND+|$J|L}F@k zf`q|=69*0)c<|!I5Bd3v{{H@MY&0=N$u9W&`}^lR775HwnxVAjz{QIn?G?>~*?|Ve z@OQ}-_b~wtW$<+Mb6Mw<&;(>wP0nP-Z=;C}+(spkdHWYHeq3LZv#ha1VJjnpdpuYF zf`a=CP>t=MY{=q)*B>5+FjE!8Ev&5msYe?#1A(&L$zRXQrmQg(U^Cx+9{VV zXGV1fhDCaOlODXXaznAIezGnrew!>5VKzzpX_(m9*mw{WD0Z&DzrRmUS=3+sf|;Re zIt$AoR}N_ulY1ufvbo^(gR>sYWQZTiOG^Iq>z#91!|0-&(h}M3fAQbn-;$kXg3K4r Y8@n(w*e&4};gHyOAK9ACZ`hid09qESB>(^b delta 561 zcmbO(_+Ds30TbiF$%RZllVjOz>%%-<978mMlh>?YUtU<4cz`jYAtE|j`j8`Y`1-ii zCZj@z3GW^}NZ?@SH8C|6yudptZg-h(OEZr`Q^4H}tp_nJ4+|7imMSbi$T&;Vfq_d* zLs;0rfPo=vk9fbo{K}aOK;Y@>=d#Wzp$W*G48$ft{Qo}}Ll8p*L;Pf4W*d+@>@}e7 zSh0S+eUEg*lKT%CLME26Fe}LSI?gef&@UR`Dy6<+Jv&41%e%f$0+n_HO+lD^X7XER z51=`&_5F>U2Mjn^a$lOQo5(A3L~zcD!aK{C>1WQK(A+TpyC}bL_S%bW+VaNE9UZ$D z`zbwI^XcL1#(925?MyxUHZ5HK@MQjvQ`yR0y2;ngdi(0OuX>cN#Q(Z%rRXB*cmL!S zVz(cBi)`^aAP4AMB>(JXu>koe+L>UuGF?(Q+}zx(C}VQr$`zNEcU!ZsJ6U8jBrR`j zVm)<)g@=csXc6xdT?y&i$Tl)CY?>U)>H@MO&K-vxoP2z2ld`X`Yb{tGxAzoF;zK5u yC5~nCRwW##oLPN+eOXGH=dhJ?>&{_IO=4nWW7u_AZ1n**^GZ~EHjA(|GXVgC!_N%> diff --git a/components/rx/trunk/rxnew.lpk b/components/rx/trunk/rxnew.lpk index b3b6c2c67..6369478c8 100644 --- a/components/rx/trunk/rxnew.lpk +++ b/components/rx/trunk/rxnew.lpk @@ -25,7 +25,7 @@ translate to Lazarus by alexs in 2005 - 2016 "/> - + @@ -71,236 +71,232 @@ translate to Lazarus by alexs in 2005 - 2016 - - - - - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - +