diff --git a/components/gridprinter/examples/stringgrid/main.lfm b/components/gridprinter/examples/stringgrid/main.lfm index e99855c9d..b56327a1b 100644 --- a/components/gridprinter/examples/stringgrid/main.lfm +++ b/components/gridprinter/examples/stringgrid/main.lfm @@ -60,7 +60,7 @@ object Form1: TForm1 Header.Font.Height = -11 Header.Text = 'test||' Orientation = poLandscape - PrintDialogs = gpdPrintDialog + ShowPrintDialog = gpdPrintDialog Left = 168 Top = 96 end diff --git a/components/gridprinter/source/gridprn.pas b/components/gridprinter/source/gridprn.pas index e3f3dae4c..04b44f18d 100644 --- a/components/gridprinter/source/gridprn.pas +++ b/components/gridprinter/source/gridprn.pas @@ -112,8 +112,8 @@ type FPadding: Integer; FPageHeight: Integer; FPageWidth: Integer; - FPrintDialogs: TGridPrnDialog; FPrintOrder: TGridPrnOrder; + FShowPrintDialog: TGridPrnDialog; FToPage: Integer; FOnAfterPrint: TNotifyEvent; FOnBeforePrint: TNotifyEvent; @@ -135,6 +135,7 @@ type function IsBorderLineWidthStored: Boolean; function IsFixedLineWidthStored: Boolean; function IsGridLineWidthStored: Boolean; + function IsOrientationStored: Boolean; procedure SetBorderLineColor(AValue: TColor); procedure SetBorderLineWidth(AValue: Double); procedure SetFileName(AValue: String); @@ -230,9 +231,9 @@ type property Header: TGridPrnHeaderFooter read FHeader write FHeader; property Margins: TGridPrnMargins read FMargins write FMargins; property Monochrome: Boolean read FMonochrome write FMonochrome default false; - property Orientation: TPrinterOrientation read GetOrientation write SetOrientation default poPortrait; - property PrintDialogs: TGridPrnDialog read FPrintDialogs write FPrintDialogs default gpdNone; + property Orientation: TPrinterOrientation read GetOrientation write SetOrientation stored IsOrientationStored; property PrintOrder: TGridPrnOrder read FPrintOrder write FPrintOrder default poRowsFirst; + property ShowPrintDialog: TGridPrnDialog read FShowPrintDialog write FShowPrintDialog default gpdNone; property ToPage: Integer read FToPage write FToPage default 0; property OnAfterPrint: TNotifyEvent read FOnAfterPrint write FOnAfterPrint; property OnBeforePrint: TNotifyEvent read FOnBeforePrint write FOnBeforePrint; @@ -725,6 +726,11 @@ begin Result := FGridLineWidth >= 0.0; end; +function TGridPrinter.IsOrientationStored: Boolean; +begin + Result := GetOrientation <> poPortrait; +end; + { Find the column and row indices before which page breaks are occuring. Store them in the arrays FPageBreakCols and FPageBreakRows. Note that the indices do not contain the fixed columns/rows. } @@ -888,7 +894,7 @@ begin exit; SetGrid(FGrid); - case FPrintDialogs of + case FShowPrintDialog of gpdNone: ; gpdPageSetup: