diff --git a/apps/documenteditor/main/app/controller/Main.js b/apps/documenteditor/main/app/controller/Main.js index 1730ea1179..cfbae959e6 100644 --- a/apps/documenteditor/main/app/controller/Main.js +++ b/apps/documenteditor/main/app/controller/Main.js @@ -1861,6 +1861,7 @@ define([ if (/^(ca|us)$/i.test(region)) Common.Utils.Metric.setDefaultMetric(Common.Utils.Metric.c_MetricUnits.inch); + Common.Utils.InternalSettings.set("de-config-region", region); }, onDocModeApply: function(mode, force, disableModeButton) {// force !== true - change mode only if not in view mode, disableModeButton: disable or not DocMode button in the header diff --git a/apps/documenteditor/main/app/view/FileMenuPanels.js b/apps/documenteditor/main/app/view/FileMenuPanels.js index 16f97f5a3d..90589082b5 100644 --- a/apps/documenteditor/main/app/view/FileMenuPanels.js +++ b/apps/documenteditor/main/app/view/FileMenuPanels.js @@ -2827,7 +2827,7 @@ define([], function () { takeFocusOnClose: true, cls: 'input-group-nr', data: [ - { value: 0, displayValue: this.textMarginsNormal, size: [20, 30, 20, 15]}, + { value: 0, displayValue: this.textMarginsNormal, size: (/^(ca|us)$/i.test(Common.Utils.InternalSettings.get("de-config-region"))) ? [25.4, 25.4, 25.4, 25.4] : [20, 30, 20, 15]}, { value: 2, displayValue: this.textMarginsNarrow, size: [12.7, 12.7, 12.7, 12.7]}, { value: 3, displayValue: this.textMarginsModerate, size: [25.4, 19.1, 25.4, 19.1]}, { value: 4, displayValue: this.textMarginsWide, size: [25.4, 50.8, 25.4, 50.8]}, diff --git a/apps/documenteditor/main/app/view/Toolbar.js b/apps/documenteditor/main/app/view/Toolbar.js index 54c94eee17..51856cfb6e 100644 --- a/apps/documenteditor/main/app/view/Toolbar.js +++ b/apps/documenteditor/main/app/view/Toolbar.js @@ -1225,7 +1225,7 @@ define([ checkable: true, template: pageMarginsTemplate, toggleGroup: 'menuPageMargins', - value: [20, 30, 20, 15] + value: (/^(ca|us)$/i.test(Common.Utils.InternalSettings.get("de-config-region"))) ? [25.4, 25.4, 25.4, 25.4] : [20, 30, 20, 15] }, { caption: this.textMarginsNarrow, diff --git a/apps/pdfeditor/main/app/controller/Main.js b/apps/pdfeditor/main/app/controller/Main.js index 5d519e6640..234d428c3b 100644 --- a/apps/pdfeditor/main/app/controller/Main.js +++ b/apps/pdfeditor/main/app/controller/Main.js @@ -1480,6 +1480,7 @@ define([ if (/^(ca|us)$/i.test(region)) Common.Utils.Metric.setDefaultMetric(Common.Utils.Metric.c_MetricUnits.inch); + Common.Utils.InternalSettings.set("pdfe-config-region", region); }, onPdfModeApply: function(mode) { diff --git a/apps/pdfeditor/main/app/view/FileMenuPanels.js b/apps/pdfeditor/main/app/view/FileMenuPanels.js index 8bbb416ac7..0bdec32400 100644 --- a/apps/pdfeditor/main/app/view/FileMenuPanels.js +++ b/apps/pdfeditor/main/app/view/FileMenuPanels.js @@ -2592,7 +2592,7 @@ define([], function () { takeFocusOnClose: true, cls: 'input-group-nr', data: [ - { value: 0, displayValue: this.textMarginsNormal, size: [20, 30, 20, 15]}, + { value: 0, displayValue: this.textMarginsNormal, size: (/^(ca|us)$/i.test(Common.Utils.InternalSettings.get("pdfe-config-region"))) ? [25.4, 25.4, 25.4, 25.4] : [20, 30, 20, 15]}, { value: 2, displayValue: this.textMarginsNarrow, size: [12.7, 12.7, 12.7, 12.7]}, { value: 3, displayValue: this.textMarginsModerate, size: [25.4, 19.1, 25.4, 19.1]}, { value: 4, displayValue: this.textMarginsWide, size: [25.4, 50.8, 25.4, 50.8]},