diff --git a/components/rx/trunk/Demos/RxDBGrid/RxDBGridDemo.lpi b/components/rx/trunk/Demos/RxDBGrid/RxDBGridDemo.lpi
index b2e71ffe2..54bc1b3a6 100644
--- a/components/rx/trunk/Demos/RxDBGrid/RxDBGridDemo.lpi
+++ b/components/rx/trunk/Demos/RxDBGrid/RxDBGridDemo.lpi
@@ -55,13 +55,13 @@
-
+
-
+
@@ -71,9 +71,8 @@
-
-
-
+
+
@@ -893,16 +892,185 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
-
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/components/rx/trunk/Demos/RxDBGrid/rxdbgridmainunit.lfm b/components/rx/trunk/Demos/RxDBGrid/rxdbgridmainunit.lfm
index 0dbb38081..16fdcc7e0 100644
--- a/components/rx/trunk/Demos/RxDBGrid/rxdbgridmainunit.lfm
+++ b/components/rx/trunk/Demos/RxDBGrid/rxdbgridmainunit.lfm
@@ -240,72 +240,84 @@ object RxDBGridMainForm: TRxDBGridMainForm
end
item
Glyph.Data = {
- 76010000424D760100000000000036000000280000000A0000000A0000000100
- 18000000000040010000640000006400000000000000000000007F7F7F7F7F7F
- 7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F00007F7F7FEEEEEE
- EEEEEEEEEEEE414141414141EEEEEEEEEEEEEEEEEEC3C3C300007F7F7FEEEEEE
- EEEEEEEEEEEE414141414141EEEEEEEEEEEEEEEEEEC3C3C300007F7F7FEEEEEE
- EEEEEEEEEEEE414141414141EEEEEEEEEEEEEEEEEEC3C3C300007F7F7F414141
- 414141414141414141414141414141414141414141C3C3C300007F7F7F414141
- 414141414141414141414141414141414141414141C3C3C300007F7F7FEEEEEE
- EEEEEEEEEEEE414141414141EEEEEEEEEEEEEEEEEEC3C3C300007F7F7FEEEEEE
- EEEEEEEEEEEE414141414141EEEEEEEEEEEEEEEEEEC3C3C300007F7F7FEEEEEE
- EEEEEEEEEEEE414141414141EEEEEEEEEEEEEEEEEEC3C3C300007F7F7FC3C3C3
- C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C30000
+ C6010000424DC60100000000000036000000280000000A0000000A0000000100
+ 2000000000009001000064000000640000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 000000000000000000000000000000000000414141FF414141FF000000000000
+ 0000000000000000000000000000000000000000000000000000414141FF4141
+ 41FF000000000000000000000000000000000000000000000000000000000000
+ 0000414141FF414141FF00000000000000000000000000000000000000004141
+ 41FF414141FF414141FF414141FF414141FF414141FF414141FF414141FF0000
+ 000000000000414141FF414141FF414141FF414141FF414141FF414141FF4141
+ 41FF414141FF0000000000000000000000000000000000000000414141FF4141
+ 41FF000000000000000000000000000000000000000000000000000000000000
+ 0000414141FF414141FF00000000000000000000000000000000000000000000
+ 00000000000000000000414141FF414141FF0000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 00000000000000000000
}
Hint = 'Style "PlusRx"'
Style = ebsPlusRx
end
item
Glyph.Data = {
- 76010000424D760100000000000036000000280000000A0000000A0000000100
- 18000000000040010000640000006400000000000000000000007F7F7F7F7F7F
- 7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F00007F7F7FEEEEEE
- EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEC3C3C300007F7F7FEEEEEE
- EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEC3C3C300007F7F7FEEEEEE
- EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEC3C3C300007F7F7F414141
- 414141EEEEEE414141414141EEEEEE414141414141C3C3C300007F7F7F414141
- 414141EEEEEE414141414141EEEEEE414141414141C3C3C300007F7F7FEEEEEE
- EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEC3C3C300007F7F7FEEEEEE
- EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEC3C3C300007F7F7FEEEEEE
- EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEC3C3C300007F7F7FC3C3C3
- C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C30000
+ C6010000424DC60100000000000036000000280000000A0000000A0000000100
+ 2000000000009001000064000000640000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000004141
+ 41FF414141FF00000000414141FF414141FF00000000414141FF414141FF0000
+ 000000000000414141FF414141FF00000000414141FF414141FF000000004141
+ 41FF414141FF0000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 00000000000000000000
}
Hint = 'Style "EllipsisRx"'
Style = ebsEllipsisRx
end
item
Glyph.Data = {
- 76010000424D760100000000000036000000280000000A0000000A0000000100
- 18000000000040010000640000006400000000000000000000007F7F7F7F7F7F
- 7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F00007F7F7FEEEEEE
- EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEC3C3C300007F7F7FEEEEEE
- EEEEEE414141EEEEEE414141EEEEEE414141414141C3C3C300007F7F7FEEEEEE
- EEEEEE414141EEEEEE414141EEEEEE414141EEEEEEC3C3C300007F7F7FEEEEEE
- EEEEEEEEEEEE414141EEEEEEEEEEEEEEEEEEEEEEEEC3C3C300007F7F7FEEEEEE
- EEEEEEEEEEEE414141EEEEEEEEEEEEEEEEEEEEEEEEC3C3C300007F7F7FEEEEEE
- 414141414141414141414141414141EEEEEEEEEEEEC3C3C300007F7F7FEEEEEE
- EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEC3C3C300007F7F7FEEEEEE
- EEEEEEEEEEEE414141EEEEEEEEEEEEEEEEEEEEEEEEC3C3C300007F7F7FC3C3C3
- C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C30000
+ C6010000424DC60100000000000036000000280000000A0000000A0000000100
+ 2000000000009001000064000000640000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 00000000000000000000000000000000000000000000414141FF000000004141
+ 41FF00000000414141FF414141FF000000000000000000000000000000004141
+ 41FF00000000414141FF00000000414141FF0000000000000000000000000000
+ 00000000000000000000414141FF000000000000000000000000000000000000
+ 000000000000000000000000000000000000414141FF00000000000000000000
+ 000000000000000000000000000000000000414141FF414141FF414141FF4141
+ 41FF414141FF0000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 00000000000000000000414141FF000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 00000000000000000000
}
Hint = 'Style "GlyphRx"'
Style = ebsGlyphRx
end
item
Glyph.Data = {
- 76010000424D760100000000000036000000280000000A0000000A0000000100
- 18000000000040010000640000006400000000000000000000007F7F7F7F7F7F
- 7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F00007F7F7FEEEEEE
- EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEC3C3C300007F7F7FEEEEEE
- EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEC3C3C300007F7F7FEEEEEE
- EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEC3C3C300007F7F7F414141
- 414141414141414141414141414141414141414141C3C3C300007F7F7F414141
- 414141414141414141414141414141414141414141C3C3C300007F7F7FEEEEEE
- EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEC3C3C300007F7F7FEEEEEE
- EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEC3C3C300007F7F7FEEEEEE
- EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEC3C3C300007F7F7FC3C3C3
- C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C30000
+ C6010000424DC60100000000000036000000280000000A0000000A0000000100
+ 2000000000009001000064000000640000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000004141
+ 41FF414141FF414141FF414141FF414141FF414141FF414141FF414141FF0000
+ 000000000000414141FF414141FF414141FF414141FF414141FF414141FF4141
+ 41FF414141FF0000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 00000000000000000000
}
Hint = 'Style "MinusRx"'
Style = ebsMinusRx
@@ -1499,6 +1511,7 @@ object RxDBGridMainForm: TRxDBGridMainForm
Options = [rxpoShowTitle, rxpoShowFooter, rxpoShowGridColor, rxpoShowFooterColor, rxpoShowReportTitle]
ShowProgress = True
ReportTitle = 'RxDBGrid demo'
+ ModifyPrepared = True
left = 548
top = 269
end
diff --git a/components/rx/trunk/Demos/RxDBGrid/rxdbgridmainunit.pas b/components/rx/trunk/Demos/RxDBGrid/rxdbgridmainunit.pas
index f921e4e76..5f85ac527 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, tooledit, ExtCtrls, Buttons,
- Menus, ActnList, StdCtrls, DBGrids, types;
+ RxDBGridExportSpreadSheet, RxDBGridFooterTools, tooledit,
+ ExtCtrls, Buttons, Menus, ActnList, StdCtrls, DBGrids;
type
@@ -106,7 +106,7 @@ procedure LocalizeApp;
var
Lang, FallbackLang: String;
begin
- GetLanguageIDs(Lang,FallbackLang); // in unit gettext
+ GetLanguageIDs(Lang{%H-},FallbackLang{%H-}); // in unit gettext
TranslateUnitResourceStrings('rxconst',NormalizeDirectoryName('../../languages/rxconst.%s.po'), Lang, FallbackLang);
TranslateUnitResourceStrings('rxdconst',NormalizeDirectoryName('../../languages/rxdconst.%s.po'), Lang, FallbackLang);
end;
@@ -143,6 +143,7 @@ begin
RxMemoryData1.AppendRecord([16, 'Гарант', 480, 'Гарант', EncodeDate(2007, 2, 1), 3]);
RxMemoryData1.First;
+
end;
procedure TRxDBGridMainForm.hlpAboutExecute(Sender: TObject);
diff --git a/components/rx/trunk/rxdbgridprintgrid.pas b/components/rx/trunk/rxdbgridprintgrid.pas
index 1517d4571..f625351d8 100644
--- a/components/rx/trunk/rxdbgridprintgrid.pas
+++ b/components/rx/trunk/rxdbgridprintgrid.pas
@@ -83,6 +83,7 @@ type
TRxDBGridPrint = class(TRxDBGridAbstractTools)
private
+ FModifyPrepared: boolean;
FOptions: TRxDBGridPrintOptions;
FOrientation: TPrinterOrientation;
FPageMargin: TRxPageMargin;
@@ -123,6 +124,7 @@ type
property PageMargin:TRxPageMargin read FPageMargin write SetPageMargin;
property ReportTitle:string read FReportTitle write FReportTitle;
property ShowColumnHeaderOnAllPage:boolean read FShowColumnHeaderOnAllPage write FShowColumnHeaderOnAllPage default false;
+ property ModifyPrepared:boolean read FModifyPrepared write FModifyPrepared default false;
end;
procedure Register;
@@ -311,14 +313,12 @@ procedure TRxDBGridPrint.DoShowFooter;
var
FBand: TfrBandView;
FView: TfrMemoView;
- i: Integer;
begin
FBand := TfrBandView(frCreateObject(gtBand, '', FPage));
FBand.BandType := btMasterFooter;
FBand.SetBounds(FXPos, FYPos, 1000, 20);
FBand.Flags:=FBand.Flags or flStretched;
-// FPage.Objects.Add(FBand);
FView := frCreateObject(gtMemo, '', FPage) as TfrMemoView;
FView.SetBounds(FXPos, FYPos, 20, 20);
@@ -326,12 +326,10 @@ begin
if rxpoShowFooterColor in FOptions then
FView.FillColor := RxDBGrid.FooterOptions.Color;
-// FView.Font.Assign(FTitleFont);
FView.Font.Size:=12;
FView.Frames:=frAllFrames;
FView.Layout:=tlTop;
- FView.Memo.Add(Format('Footer', [i]));
-// FPage.Objects.Add(FView);
+ FView.Memo.Add('Footer');
FYPos := FYPos + 22;
end;
@@ -367,6 +365,8 @@ begin
C:=F.Col.Color;
if Assigned(RxDBGrid.OnGetCellProps) then
RxDBGrid.OnGetCellProps(RxDBGrid, F.Col.Field, TfrMemoView(View).Font, C);
+ if C = clWindow then
+ C := clNone;
TfrMemoView(View).FillColor:=C;
end;
@@ -423,7 +423,6 @@ end;
function TRxDBGridPrint.DoExecTools: boolean;
var
- C:integer;
SaveDesign: TfrReportDesigner;
begin
Result:=false;
@@ -437,6 +436,7 @@ begin
FReport:=TfrReport.Create(Self);
FReport.OnPrintColumn:=@OnPrintColumn;
FReport.OnEnterRect:=@OnEnterRect;
+ FReport.ModifyPrepared:=FModifyPrepared;
FReportDataSet := TfrDBDataSet.Create(Self);
FColumnDataSet := TfrUserDataSet.Create(Self);
@@ -454,13 +454,16 @@ begin
FReport.ShowProgress:=FShowProgress;
DoCreateReport;
+
+ frDesigner:=SaveDesign;
+
FReport.ShowReport;
Result:=true;
finally
FreeAndNil(FColumnDataSet);
FreeAndNil(FReportDataSet);
FreeAndNil(FReport);
- frDesigner:=SaveDesign;
+// frDesigner:=SaveDesign;
end;
end;
@@ -529,6 +532,7 @@ begin
FCaption:=sPrintGrid;
FShowProgress:=false;
+ FModifyPrepared:=false;
FRxColInfoList:=TObjectList.Create(true);
FOrientation:=poPortrait;
ShowSetupForm:=false;