paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-08-19 11:00:24 +02:00
Code Issues Packages Projects Releases Wiki Activity

cocoa-printing: New implementation of the dialog, found a way to show the dialog and print separately

Browse Source 
git-svn-id: trunk@47789 -
This commit is contained in:
sekelsenmat 2015-02-14 19:45:47 +00:00
parent 7fbf0b2c70
commit 0c1bc741f1
2 changed files with 36 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
components/printers/cocoa/cocoaprinters.inc
View File

@ -315,7 +315,8 @@ begin
inherited DoEndDoc(aAborded);
EndPage;
//PMSessionEndDocument(GetPrintSession());
FPrintOp.setShowsPrintPanel(False);
FPrintOp.runOperation();
end;
procedure TCocoaPrinter.DoAbort;

66
components/printers/cocoa/cocoaprndialogs.inc
View File

@ -42,10 +42,13 @@ end;
function TPrintDialog.Execute: Boolean;
var
CocoaPrinter: TCocoaPrinter;
DialogSettings: PMPrintSettings;
PrintPanel: NSPrintPanel;
PrintPanelInfo: NSPrintInfo;
PrintSettings: PMPrintSettings;
V: UInt32;
B: Boolean;
PMin, PMax, PFrom, PTo: Integer;
lDialogResult: NSInteger;
begin
Result := False;
// TODO: Options, Title
@ -55,43 +58,45 @@ begin
CocoaPrinter := Printer as TCocoaPrinter;
//DebugLn('TPrintDialog.Execute ' + CarbonPrinter.CurrentPrinterName);
//if PMCreatePrintSettings(DialogSettings) <> noErr then Exit;
//try
{if PMCopyPrintSettings(CocoaPrinter.PrintSettings, DialogSettings) <> noErr then Exit;
// Create the panel and the info object
PrintPanel := NSPrintPanel.printPanel();
PrintPanelInfo := NSPrintInfo.alloc.initWithDictionary(NSDictionary.dictionary());
try
// Set all properties
PrintSettings := PrintPanelInfo.PMPrintSettings();
PMSetCollate(PrintSettings, Collate);
PMSetCopies(PrintSettings, Copies, False);
OSError(PMSetCollate(DialogSettings, Collate), Self, SExecute, 'PMSetCollate');
OSError(PMSetCopies(DialogSettings, Copies, False), Self, SExecute, 'PMSetCopies');
PMin := MinPage;
PMax := Max(PMin, MaxPage);
PFrom := Min(Max(FromPage, PMin), PMax);
PTo := Max(PFrom, Min(ToPage, PMax));
OSError(PMSetPageRange(DialogSettings, PMin, PMax),
Self, SExecute, 'PMSetPageRange');
PMSetPageRange(PrintSettings, PMin, PMax);
if PrintRange <> prAllPages then
begin
OSError(PMSetFirstPage(DialogSettings, PFrom, False), Self, SExecute, 'PMSetFirstPage');
OSError(PMSetLastPage(DialogSettings, PTo, False), Self, SExecute, 'PMSetLastPage');
PMSetFirstPage(PrintSettings, PFrom, False);
PMSetLastPage(PrintSettings, PTo, False);
end;
if OSError(PMSessionPrintDialog(CarbonPrinter.PrintSession, DialogSettings, CarbonPrinter.PageFormat, Result),
Self, SExecute, 'PMSessionPrintDialog') then Exit;}
//CocoaPrinter.PrintView.setBounds();
CocoaPrinter.PrintOperation.runOperation();
// Run the dialog
PrintPanelInfo.updateFromPMPrintSettings();
lDialogResult := PrintPanel.runModalWithPrintInfo(PrintPanelInfo);
{if Result then
if lDialogResult = NSOKButton then // NSCancelButton for Cancel
begin
PrintSettings := PrintPanelInfo.PMPrintSettings();
B := Collate;
OSError(PMGetCollate(DialogSettings, B), Self, SExecute, 'PMGetCollate');
PMGetCollate(PrintSettings, B);
Collate := B;
V := Copies;
OSError(PMGetCopies(DialogSettings, V), Self, SExecute, 'PMGetCopies');
PMGetCopies(PrintSettings, V);
Copies := V;
OSError(PMGetLastPage(DialogSettings, V), Self, SExecute, 'PMGetLastPage');
PMGetLastPage(PrintSettings, V);
if V > $FFFF then
begin
PrintRange := prAllPages;
@ -102,17 +107,14 @@ begin
begin
PrintRange := prSelection;
ToPage := V;
OSError(PMGetFirstPage(DialogSettings, V), Self, SExecute, 'PMGetFirstPage');
PMGetFirstPage(PrintSettings, V);
FromPage := V;
end;
if OSError(PMCopyPrintSettings(DialogSettings, CarbonPrinter.PrintSettings),
Self, SExecute, 'PMCopyPrintSettings') then Exit;
CarbonPrinter.UpdatePrinter;
end; }
{finally
PMRelease(PMObject(DialogSettings));
end; }
PMCopyPrintSettings(PrintSettings, CocoaPrinter.PrintSettings);
CocoaPrinter.PrintInfo.updateFromPMPrintSettings();
end;
finally
end;
end;