Don't check margin keys if user pass --ignoremargins.
--HG-- branch : release
This commit is contained in:
parent
30a5926177
commit
61915ea76a
|
@ -29,6 +29,7 @@
|
|||
- Fix visualization for tool Point from arc and tangent.
|
||||
- Changing settings for move and rotate tools through property browser does not take in count previous change for label point and Show label option.
|
||||
- Fix locking file after double save as.
|
||||
- Key --ignoremargins still required margins.
|
||||
|
||||
# Version 0.6.1 October 23, 2018
|
||||
- [#885] Regression. Broken support for multi size measurements.
|
||||
|
|
|
@ -455,21 +455,29 @@ VLayoutGeneratorPtr VCommandLine::DefaultGenerator() const
|
|||
}
|
||||
};
|
||||
|
||||
CheckKey(LONG_OPTION_LEFT_MARGIN, translate("VCommandLine", "Left margin must be used together with page units."));
|
||||
CheckKey(LONG_OPTION_RIGHT_MARGIN,
|
||||
translate("VCommandLine", "Right margin must be used together with page units."));
|
||||
CheckKey(LONG_OPTION_TOP_MARGIN, translate("VCommandLine", "Top margin must be used together with page units."));
|
||||
CheckKey(LONG_OPTION_BOTTOM_MARGIN,
|
||||
translate("VCommandLine", "Bottom margin must be used together with page units."));
|
||||
if (not parser.isSet(LONG_OPTION_IGNORE_MARGINS))
|
||||
{
|
||||
CheckKey(LONG_OPTION_LEFT_MARGIN,
|
||||
translate("VCommandLine", "Left margin must be used together with page units."));
|
||||
CheckKey(LONG_OPTION_RIGHT_MARGIN,
|
||||
translate("VCommandLine", "Right margin must be used together with page units."));
|
||||
CheckKey(LONG_OPTION_TOP_MARGIN,
|
||||
translate("VCommandLine", "Top margin must be used together with page units."));
|
||||
CheckKey(LONG_OPTION_BOTTOM_MARGIN,
|
||||
translate("VCommandLine", "Bottom margin must be used together with page units."));
|
||||
}
|
||||
|
||||
CheckKey(LONG_OPTION_TILED_PDF_LEFT_MARGIN,
|
||||
translate("VCommandLine", "Tiled left margin must be used together with page units."));
|
||||
CheckKey(LONG_OPTION_TILED_PDF_RIGHT_MARGIN,
|
||||
translate("VCommandLine", "Tiled right margin must be used together with page units."));
|
||||
CheckKey(LONG_OPTION_TILED_PDF_TOP_MARGIN,
|
||||
translate("VCommandLine", "Tiled top margin must be used together with page units."));
|
||||
CheckKey(LONG_OPTION_TILED_PDF_BOTTOM_MARGIN,
|
||||
translate("VCommandLine", "Tiled bottom margin must be used together with page units."));
|
||||
if (static_cast<LayoutExportFormats>(OptExportType()) == LayoutExportFormats::PDFTiled)
|
||||
{
|
||||
CheckKey(LONG_OPTION_TILED_PDF_LEFT_MARGIN,
|
||||
translate("VCommandLine", "Tiled left margin must be used together with page units."));
|
||||
CheckKey(LONG_OPTION_TILED_PDF_RIGHT_MARGIN,
|
||||
translate("VCommandLine", "Tiled right margin must be used together with page units."));
|
||||
CheckKey(LONG_OPTION_TILED_PDF_TOP_MARGIN,
|
||||
translate("VCommandLine", "Tiled top margin must be used together with page units."));
|
||||
CheckKey(LONG_OPTION_TILED_PDF_BOTTOM_MARGIN,
|
||||
translate("VCommandLine", "Tiled bottom margin must be used together with page units."));
|
||||
}
|
||||
|
||||
const int rotateDegree = OptRotation();
|
||||
diag.SetRotate(rotateDegree != 0 ); // 0 disable rotation
|
||||
|
|
Loading…
Reference in New Issue
Block a user