Merged develop into feature

--HG--
branch : feature
This commit is contained in:
Bojan Kverh 2016-10-10 22:43:00 +02:00
commit bc345231ea
3 changed files with 9 additions and 1 deletions

View file

@ -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;

View file

@ -622,6 +622,10 @@ void DialogLayoutSettings::DialogAccepted()
generator->SetPrinterFields(false, GetFields());
}
}
else
{
generator->SetPrinterFields(true, GetFields());
}
}
}

View file

@ -957,6 +957,10 @@ void MainWindowsNoGUI::SetPrinterSettings(QPrinter *printer, const PrintType &pr
printer->setPaperSize (pSZ);
}
}
else
{
printer->setPaperSize(QPrinter::A4);
}
printer->setFullPage(ignorePrinterFields);