* show the config job panel, even if no page setup was already performed
this avoids to multiple window popup for page settings and job settings * Note: this shows the painting regression introduced with r26665, see task #2534 git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@27211 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
parent
4ddc254c08
commit
4f3736d7b6
@ -1065,20 +1065,16 @@ StyledEditWindow::PageSetup(const char* documentName)
|
|||||||
void
|
void
|
||||||
StyledEditWindow::Print(const char* documentName)
|
StyledEditWindow::Print(const char* documentName)
|
||||||
{
|
{
|
||||||
status_t result;
|
|
||||||
|
|
||||||
if (fPrintSettings == NULL) {
|
|
||||||
result = PageSetup(documentName);
|
|
||||||
if (result != B_OK)
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
BPrintJob printJob(documentName);
|
BPrintJob printJob(documentName);
|
||||||
|
if (fPrintSettings)
|
||||||
printJob.SetSettings(new BMessage(*fPrintSettings));
|
printJob.SetSettings(new BMessage(*fPrintSettings));
|
||||||
result = printJob.ConfigJob();
|
|
||||||
if (result != B_OK)
|
if (printJob.ConfigJob() != B_OK)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
|
delete fPrintSettings;
|
||||||
|
fPrintSettings = printJob.Settings();
|
||||||
|
|
||||||
// information from printJob
|
// information from printJob
|
||||||
BRect printableRect = printJob.PrintableRect();
|
BRect printableRect = printJob.PrintableRect();
|
||||||
int32 firstPage = printJob.FirstPage();
|
int32 firstPage = printJob.FirstPage();
|
||||||
|
Loading…
Reference in New Issue
Block a user