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 000000000..fd8418ff1 Binary files /dev/null and b/components/rx/trunk/images/componet_img/pickdate.res differ diff --git a/components/rx/trunk/images/componet_img/rx_DropDown.png b/components/rx/trunk/images/componet_img/rx_DropDown.png index d985816ac..374ffc61c 100644 Binary files a/components/rx/trunk/images/componet_img/rx_DropDown.png and b/components/rx/trunk/images/componet_img/rx_DropDown.png differ diff --git a/components/rx/trunk/images/componet_img/rx_Ellipsis.png b/components/rx/trunk/images/componet_img/rx_Ellipsis.png index d3385669b..19dfec594 100644 Binary files a/components/rx/trunk/images/componet_img/rx_Ellipsis.png and b/components/rx/trunk/images/componet_img/rx_Ellipsis.png differ diff --git a/components/rx/trunk/images/componet_img/rx_Glyph.png b/components/rx/trunk/images/componet_img/rx_Glyph.png index 5a76f9f13..a0c79302e 100644 Binary files a/components/rx/trunk/images/componet_img/rx_Glyph.png and b/components/rx/trunk/images/componet_img/rx_Glyph.png differ diff --git a/components/rx/trunk/images/componet_img/rx_minus.png b/components/rx/trunk/images/componet_img/rx_minus.png index 401752b17..1e6837739 100644 Binary files a/components/rx/trunk/images/componet_img/rx_minus.png and b/components/rx/trunk/images/componet_img/rx_minus.png differ 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 000000000..17fa4c806 Binary files /dev/null and b/components/rx/trunk/images/componet_img/rx_next1.png differ 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 000000000..9ac4d1ef6 Binary files /dev/null and b/components/rx/trunk/images/componet_img/rx_next2.png differ diff --git a/components/rx/trunk/images/componet_img/rx_plus.png b/components/rx/trunk/images/componet_img/rx_plus.png index b8d30ebe3..4c88f95d9 100644 Binary files a/components/rx/trunk/images/componet_img/rx_plus.png and b/components/rx/trunk/images/componet_img/rx_plus.png differ 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 000000000..d5c14e412 Binary files /dev/null and b/components/rx/trunk/images/componet_img/rx_prev1.png differ diff --git a/components/rx/trunk/images/componet_img/rx_prev2.png b/components/rx/trunk/images/componet_img/rx_prev2.png new file mode 100644 index 000000000..c3f6f7689 Binary files /dev/null and b/components/rx/trunk/images/componet_img/rx_prev2.png differ diff --git a/components/rx/trunk/images/componet_img/rxdbgrid.res b/components/rx/trunk/images/componet_img/rxdbgrid.res index 818b8b31d..3c4f418c6 100644 Binary files a/components/rx/trunk/images/componet_img/rxdbgrid.res and b/components/rx/trunk/images/componet_img/rxdbgrid.res differ 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 000000000..fd8418ff1 Binary files /dev/null and b/components/rx/trunk/pickdate.res differ diff --git a/components/rx/trunk/rxdbgrid.res b/components/rx/trunk/rxdbgrid.res index 818b8b31d..3c4f418c6 100644 Binary files a/components/rx/trunk/rxdbgrid.res and b/components/rx/trunk/rxdbgrid.res differ 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 - - - - - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - +