aw/valentina_old
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merged develop into feature

Browse Source 
--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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/app/valentina/dialogs/configpages/patternpage.cpp
View File

@ -195,7 +195,7 @@ QGroupBox *PatternPage::UserWorkpieceGroup()
workpieceGroup = new QGroupBox(tr("Workpiece")); workpieceGroup = new QGroupBox(tr("Workpiece"));
forbidFlippingCheck = new QCheckBox(tr("Forbid flipping")); 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()); forbidFlippingCheck->setChecked(qApp->ValentinaSettings()->GetForbidWorkpieceFlipping());
QVBoxLayout *editLayout = new QVBoxLayout; QVBoxLayout *editLayout = new QVBoxLayout;

4
src/app/valentina/dialogs/dialoglayoutsettings.cpp
View File

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

4
src/app/valentina/mainwindowsnogui.cpp
View File

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