Merged develop into feature
--HG-- branch : feature
This commit is contained in:
commit
bc345231ea
|
@ -195,7 +195,7 @@ QGroupBox *PatternPage::UserWorkpieceGroup()
|
|||
workpieceGroup = new QGroupBox(tr("Workpiece"));
|
||||
|
||||
forbidFlippingCheck = new QCheckBox(tr("Forbid flipping"));
|
||||
forbidFlippingCheck->setToolTip(tr("By default forbid flipping for all workpieces"));
|
||||
forbidFlippingCheck->setToolTip(tr("By default forbid flipping for all new created workpieces"));
|
||||
forbidFlippingCheck->setChecked(qApp->ValentinaSettings()->GetForbidWorkpieceFlipping());
|
||||
|
||||
QVBoxLayout *editLayout = new QVBoxLayout;
|
||||
|
|
|
@ -622,6 +622,10 @@ void DialogLayoutSettings::DialogAccepted()
|
|||
generator->SetPrinterFields(false, GetFields());
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
generator->SetPrinterFields(true, GetFields());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -957,6 +957,10 @@ void MainWindowsNoGUI::SetPrinterSettings(QPrinter *printer, const PrintType &pr
|
|||
printer->setPaperSize (pSZ);
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
printer->setPaperSize(QPrinter::A4);
|
||||
}
|
||||
|
||||
printer->setFullPage(ignorePrinterFields);
|
||||
|
||||
|
|
Loading…
Reference in New Issue
Block a user