").appendTo(toolbar.$el.find('.toolbar'));
- Common.util.Shortcuts.suspendEvents('command+k, ctrl+k, alt+h, command+f5, ctrl+f5');
+ Common.util.Shortcuts.suspendEvents('command+k, ctrl+k, command+f5, ctrl+f5, ' + hkComments);
} else {
mask.remove();
- Common.util.Shortcuts.resumeEvents('command+k, ctrl+k, alt+h, command+f5, ctrl+f5');
+ Common.util.Shortcuts.resumeEvents('command+k, ctrl+k, command+f5, ctrl+f5, ' + hkComments);
}
},
diff --git a/apps/presentationeditor/main/app/controller/Viewport.js b/apps/presentationeditor/main/app/controller/Viewport.js
index 11dab34ef..38ddd1020 100644
--- a/apps/presentationeditor/main/app/controller/Viewport.js
+++ b/apps/presentationeditor/main/app/controller/Viewport.js
@@ -222,7 +222,7 @@ define([
this.viewport.hlayout.doLayout();
break;
case 'history':
- var panel = this.viewport.hlayout.items[1];
+ var panel = this.viewport.hlayout.getItem('history');
if (panel.resize.el) {
this.boxSdk.css('border-left', '');
panel.resize.el.show();
@@ -230,7 +230,7 @@ define([
this.viewport.hlayout.doLayout();
break;
case 'leftmenu':
- var panel = this.viewport.hlayout.items[0];
+ var panel = this.viewport.hlayout.getItem('left');
if (panel.resize.el) {
if (panel.el.width() > 40) {
this.boxSdk.css('border-left', '');
diff --git a/apps/presentationeditor/main/app/template/HeaderFooterDialog.template b/apps/presentationeditor/main/app/template/HeaderFooterDialog.template
index 386e70bae..0b5c3a1a1 100644
--- a/apps/presentationeditor/main/app/template/HeaderFooterDialog.template
+++ b/apps/presentationeditor/main/app/template/HeaderFooterDialog.template
@@ -3,18 +3,18 @@
-
+
-
+
<%= scope.textFormat %>
-
+
<%= scope.textLang %>
@@ -26,7 +26,7 @@
-
+
@@ -38,7 +38,7 @@
-
+
diff --git a/apps/presentationeditor/main/app/template/ImageSettings.template b/apps/presentationeditor/main/app/template/ImageSettings.template
index 1341a2ed0..be505152e 100644
--- a/apps/presentationeditor/main/app/template/ImageSettings.template
+++ b/apps/presentationeditor/main/app/template/ImageSettings.template
@@ -41,15 +41,15 @@
<%= scope.textRotate90 %>
<%= scope.textFlip %>
diff --git a/apps/presentationeditor/main/app/template/ImageSettingsAdvanced.template b/apps/presentationeditor/main/app/template/ImageSettingsAdvanced.template
index bd32ccc50..74c05616f 100644
--- a/apps/presentationeditor/main/app/template/ImageSettingsAdvanced.template
+++ b/apps/presentationeditor/main/app/template/ImageSettingsAdvanced.template
@@ -58,7 +58,7 @@
<%= scope.textAngle %>
-
+
@@ -66,7 +66,7 @@
- <%= scope.textFlipped %>
+ <%= scope.textFlipped %>
diff --git a/apps/presentationeditor/main/app/template/ParagraphSettingsAdvanced.template b/apps/presentationeditor/main/app/template/ParagraphSettingsAdvanced.template
index 397e41ebd..fb2079162 100644
--- a/apps/presentationeditor/main/app/template/ParagraphSettingsAdvanced.template
+++ b/apps/presentationeditor/main/app/template/ParagraphSettingsAdvanced.template
@@ -8,11 +8,11 @@
-
+
<%= scope.strIndentsLeftText %>
+ -->
<%= scope.strIndentsRightText %>
-
+
<%= scope.strIndentsSpacingBefore %>
+ -->
<%= scope.strIndentsSpacingAfter %>
@@ -63,7 +63,7 @@
-
+
@@ -71,7 +71,7 @@
-
+
@@ -79,7 +79,7 @@
-
+
@@ -105,11 +105,11 @@
-
+
<%= scope.textTabPosition %>
-
- <%= scope.textSet %>
- <%= scope.textRemove %>
+ <%= scope.textSet %>
+ <%= scope.textRemove %>
<%= scope.textRemoveAll %>
diff --git a/apps/presentationeditor/main/app/template/ShapeSettings.template b/apps/presentationeditor/main/app/template/ShapeSettings.template
index 4d8534512..87464cb90 100644
--- a/apps/presentationeditor/main/app/template/ShapeSettings.template
+++ b/apps/presentationeditor/main/app/template/ShapeSettings.template
@@ -26,7 +26,7 @@
-
@@ -44,11 +44,11 @@
<%= scope.strForeground %>
-
+
<%= scope.strBackground %>
-
+
@@ -61,7 +61,7 @@
-
+
<%= scope.textDirection %>
@@ -69,7 +69,7 @@
- <%= scope.textAngle %>
+ <%= scope.textAngle %>
@@ -86,7 +86,7 @@
<%= scope.strColor %>
-
+
<%= scope.textPosition %>
@@ -108,7 +108,7 @@
100
-
+
@@ -159,15 +159,15 @@
<%= scope.textRotate90 %>
<%= scope.textFlip %>
@@ -182,7 +182,7 @@
-
+
diff --git a/apps/presentationeditor/main/app/template/ShapeSettingsAdvanced.template b/apps/presentationeditor/main/app/template/ShapeSettingsAdvanced.template
index d8da572f2..49b3bc75a 100644
--- a/apps/presentationeditor/main/app/template/ShapeSettingsAdvanced.template
+++ b/apps/presentationeditor/main/app/template/ShapeSettingsAdvanced.template
@@ -56,7 +56,7 @@
<%= scope.textAngle %>
-
+
@@ -64,7 +64,7 @@
- <%= scope.textFlipped %>
+ <%= scope.textFlipped %>
diff --git a/apps/presentationeditor/main/app/template/SlideSettings.template b/apps/presentationeditor/main/app/template/SlideSettings.template
index df87a6486..91ec7097c 100644
--- a/apps/presentationeditor/main/app/template/SlideSettings.template
+++ b/apps/presentationeditor/main/app/template/SlideSettings.template
@@ -44,11 +44,11 @@
<%= scope.strForeground %>
-
+
<%= scope.strBackground %>
-
+
@@ -61,7 +61,7 @@
-
+
<%= scope.textDirection %>
@@ -69,7 +69,7 @@
- <%= scope.textAngle %>
+ <%= scope.textAngle %>
@@ -86,7 +86,7 @@
<%= scope.strColor %>
-
+
<%= scope.textPosition %>
@@ -108,7 +108,7 @@
100
-
+
diff --git a/apps/presentationeditor/main/app/template/StatusBar.template b/apps/presentationeditor/main/app/template/StatusBar.template
index 8df4781e6..fd7cd0465 100644
--- a/apps/presentationeditor/main/app/template/StatusBar.template
+++ b/apps/presentationeditor/main/app/template/StatusBar.template
@@ -1,27 +1,27 @@
- <%= Common.Utils.String.format(scope.pageIndexText, 1, 1) %>
+ <%= Common.Utils.String.format(scope.pageIndexText, 1, 1) %>
@@ -40,6 +40,6 @@
Zoom 100%
-
+
diff --git a/apps/presentationeditor/main/app/template/TableSettings.template b/apps/presentationeditor/main/app/template/TableSettings.template
index 673ed83a9..33f3ae690 100644
--- a/apps/presentationeditor/main/app/template/TableSettings.template
+++ b/apps/presentationeditor/main/app/template/TableSettings.template
@@ -54,8 +54,8 @@
-
-
<%= scope.textBorderColor %>
+
+
<%= scope.textBorderColor %>
@@ -85,7 +85,7 @@
- <%= scope.textBackColor %>
+ <%= scope.textBackColor %>
@@ -112,13 +112,13 @@
<%= scope.textHeight %>
-
+
<%= scope.textWidth %>
-
+
diff --git a/apps/presentationeditor/main/app/template/TextArtSettings.template b/apps/presentationeditor/main/app/template/TextArtSettings.template
index 38d4e8846..8956defd1 100644
--- a/apps/presentationeditor/main/app/template/TextArtSettings.template
+++ b/apps/presentationeditor/main/app/template/TextArtSettings.template
@@ -36,7 +36,7 @@
<%= scope.textFromFile %>
- <%= scope.textFromUrl %>
+ <%= scope.textFromUrl %>
@@ -44,7 +44,7 @@
-
@@ -62,11 +62,11 @@
<%= scope.strForeground %>
-
+
<%= scope.strBackground %>
-
+
@@ -79,7 +79,7 @@
-
+
<%= scope.textDirection %>
@@ -87,7 +87,7 @@
- <%= scope.textAngle %>
+ <%= scope.textAngle %>
@@ -104,7 +104,7 @@
<%= scope.strColor %>
-
+
<%= scope.textPosition %>
@@ -126,7 +126,7 @@
100
-
+
diff --git a/apps/presentationeditor/main/app/template/Toolbar.template b/apps/presentationeditor/main/app/template/Toolbar.template
index 837d0642f..5571fe19d 100644
--- a/apps/presentationeditor/main/app/template/Toolbar.template
+++ b/apps/presentationeditor/main/app/template/Toolbar.template
@@ -46,7 +46,7 @@
-
+
diff --git a/apps/presentationeditor/main/app/view/Animation.js b/apps/presentationeditor/main/app/view/Animation.js
index 4358439fb..2b285698f 100644
--- a/apps/presentationeditor/main/app/view/Animation.js
+++ b/apps/presentationeditor/main/app/view/Animation.js
@@ -187,6 +187,7 @@ define([
this.toolbar = options.toolbar;
this.appConfig = options.mode;
this.$el = this.toolbar.toolbar.$el.find('#animation-panel');
+ var me = this;
var _set = Common.enumLock;
this.lockedControls = [];
this._arrEffectName = [{group:'none', value: AscFormat.ANIM_PRESET_NONE, iconCls: 'animation-none', displayValue: this.textNone}].concat(Common.define.effectData.getEffectData());
@@ -225,7 +226,7 @@ define([
if (menu.cmpEl) {
menu.menuAlignEl = cmp.cmpEl;
- menu.menuAlign = 'tl-tl';
+ menu.menuAlign = Common.UI.isRTL() ? 'tr-tr' : 'tl-tl';
menu.cmpEl.css({
'width': cmp.cmpEl.width() - cmp.openButton.$el.width(),
'min-height': cmp.cmpEl.height()
@@ -293,7 +294,7 @@ define([
this.lockedControls.push(this.btnAddAnimation);
- this.cmbDuration = new Common.UI.ComboBox({
+ this.cmbDuration = new Common.UI.ComboBoxCustom({
el: this.$el.find('#animation-spin-duration'),
cls: 'input-group-nr',
menuStyle: 'min-width: 100%;',
@@ -309,7 +310,10 @@ define([
lock: [_set.slideDeleted, _set.noSlides, _set.noGraphic, _set.noAnimation, _set.noAnimationDuration, _set.timingLock],
dataHint: '1',
dataHintDirection: 'top',
- dataHintOffset: 'small'
+ dataHintOffset: 'small',
+ updateFormControl: function(record) {
+ record && this.setRawValue(record.get('value') + ' ' + me.txtSec);
+ }
});
this.lockedControls.push(this.cmbDuration);
diff --git a/apps/presentationeditor/main/app/view/ChartSettings.js b/apps/presentationeditor/main/app/view/ChartSettings.js
index a1beac866..1d5196727 100644
--- a/apps/presentationeditor/main/app/view/ChartSettings.js
+++ b/apps/presentationeditor/main/app/view/ChartSettings.js
@@ -366,7 +366,7 @@ define([
});
this.lockedControls.push(this.btnLeft);
this.btnLeft.on('click', _.bind(function() {
- this.spnX.setValue(this.spnX.getNumberValue() - 10);
+ this.spnX.setValue(Math.ceil((this.spnX.getNumberValue() - 10)/10)*10);
}, this));
this.btnRight= new Common.UI.Button({
@@ -379,7 +379,7 @@ define([
});
this.lockedControls.push(this.btnRight);
this.btnRight.on('click', _.bind(function() {
- this.spnX.setValue(this.spnX.getNumberValue() + 10);
+ this.spnX.setValue(Math.floor((this.spnX.getNumberValue() + 10)/10)*10);
}, this));
this.spnY = new Common.UI.MetricSpinner({
@@ -408,7 +408,7 @@ define([
});
this.lockedControls.push(this.btnUp);
this.btnUp.on('click', _.bind(function() {
- this.spnY.setValue(this.spnY.getNumberValue() - 10);
+ this.spnY.setValue(Math.ceil((this.spnY.getNumberValue() - 10)/10)*10);
}, this));
this.btnDown= new Common.UI.Button({
@@ -421,7 +421,7 @@ define([
});
this.lockedControls.push(this.btnDown);
this.btnDown.on('click', _.bind(function() {
- this.spnY.setValue(this.spnY.getNumberValue() + 10);
+ this.spnY.setValue(Math.floor((this.spnY.getNumberValue() + 10)/10)*10);
}, this));
this.spnPerspective = new Common.UI.MetricSpinner({
@@ -450,7 +450,7 @@ define([
});
this.lockedControls.push(this.btnNarrow);
this.btnNarrow.on('click', _.bind(function() {
- this.spnPerspective.setValue(this.spnPerspective.getNumberValue() - 5);
+ this.spnPerspective.setValue(Math.ceil((this.spnPerspective.getNumberValue() - 5)/5)*5);
}, this));
this.btnWiden= new Common.UI.Button({
@@ -463,7 +463,7 @@ define([
});
this.lockedControls.push(this.btnWiden);
this.btnWiden.on('click', _.bind(function() {
- this.spnPerspective.setValue(this.spnPerspective.getNumberValue() + 5);
+ this.spnPerspective.setValue(Math.floor((this.spnPerspective.getNumberValue() + 5)/5)*5);
}, this));
this.chRightAngle = new Common.UI.CheckBox({
diff --git a/apps/presentationeditor/main/app/view/DateTimeDialog.js b/apps/presentationeditor/main/app/view/DateTimeDialog.js
index 3e5f3072e..f993cd09e 100644
--- a/apps/presentationeditor/main/app/view/DateTimeDialog.js
+++ b/apps/presentationeditor/main/app/view/DateTimeDialog.js
@@ -50,6 +50,7 @@ define([
width: 350,
style: 'min-width: 230px;',
cls: 'modal-dlg',
+ id: 'window-date-time',
buttons: ['ok', 'cancel']
},
@@ -73,7 +74,7 @@ define([
'
',
'',
''
].join('');
diff --git a/apps/presentationeditor/main/app/view/FileMenu.js b/apps/presentationeditor/main/app/view/FileMenu.js
index 134a7625c..1b2d588d7 100644
--- a/apps/presentationeditor/main/app/view/FileMenu.js
+++ b/apps/presentationeditor/main/app/view/FileMenu.js
@@ -72,7 +72,8 @@ define([
if (item.options.action === 'help') {
if ( panel.noHelpContents === true && navigator.onLine ) {
this.fireEvent('item:click', [this, 'external-help', true]);
- !!panel.urlHelpCenter && window.open(panel.urlHelpCenter, '_blank');
+ const helpCenter = Common.Utils.InternalSettings.get('url-help-center');
+ !!helpCenter && window.open(helpCenter, '_blank');
return;
}
}
diff --git a/apps/presentationeditor/main/app/view/FileMenuPanels.js b/apps/presentationeditor/main/app/view/FileMenuPanels.js
index 98a257219..50b6fdb83 100644
--- a/apps/presentationeditor/main/app/view/FileMenuPanels.js
+++ b/apps/presentationeditor/main/app/view/FileMenuPanels.js
@@ -323,6 +323,9 @@ define([
'',
'
',
' ',
+ '',
+ '
',
+ ' ',
'',
'
',
'
<%= scope.txtQuickPrint %> ',
@@ -592,6 +595,14 @@ define([
dataHintOffset: 'big'
});
+ this.chRTL = new Common.UI.CheckBox({
+ el: $markup.findById('#fms-chb-rtl-ui'),
+ labelText: this.strRTLSupport,
+ dataHint: '2',
+ dataHintDirection: 'left',
+ dataHintOffset: 'small'
+ });
+
$markup.find('.btn.primary').each(function(index, el){
(new Common.UI.Button({
el: $(el)
@@ -670,7 +681,7 @@ define([
$('tr.live-viewer', this.el)[mode.canLiveView && !mode.isOffline && mode.canChangeCoAuthoring ? 'show' : 'hide']();
$('tr.macros', this.el)[(mode.customization && mode.customization.macros===false) ? 'hide' : 'show']();
$('tr.spellcheck', this.el)[mode.isEdit && Common.UI.FeaturesManager.canChange('spellcheck') ? 'show' : 'hide']();
- $('tr.quick-print', this.el)[mode.canQuickPrint ? 'show' : 'hide']();
+ $('tr.quick-print', this.el)[mode.canQuickPrint && !(mode.customization && mode.customization.compactHeader && mode.isEdit) ? 'show' : 'hide']();
if ( !Common.UI.Themes.available() ) {
$('tr.themes, tr.themes + tr.divider', this.el).hide();
@@ -732,6 +743,7 @@ define([
this.lblMacrosDesc.text(item ? item.get('descValue') : this.txtWarnMacrosDesc);
this.chPaste.setValue(Common.Utils.InternalSettings.get("pe-settings-paste-button"));
+ this.chRTL.setValue(Common.localStorage.getBool("ui-rtl"));
this.chQuickPrint.setValue(Common.Utils.InternalSettings.get("pe-settings-quick-print-button"));
var data = [];
@@ -779,6 +791,7 @@ define([
Common.Utils.InternalSettings.set("pe-macros-mode", this.cmbMacros.getValue());
Common.localStorage.setItem("pe-settings-paste-button", this.chPaste.isChecked() ? 1 : 0);
+ Common.localStorage.setBool("ui-rtl", this.chRTL.isChecked());
Common.localStorage.setBool("pe-settings-quick-print-button", this.chQuickPrint.isChecked());
Common.localStorage.save();
@@ -832,6 +845,7 @@ define([
textForceSave: 'Save to Server',
txtSpellCheck: 'Spell Checking',
txtCacheMode: 'Default cache mode',
+ strRTLSupport: 'RTL interface',
strMacrosSettings: 'Macros Settings',
txtWarnMacros: 'Show Notification',
txtRunMacros: 'Enable All',
@@ -1471,7 +1485,7 @@ define([
'
',
'
',
'',
- '' + this.txtBtnAccessRights + ' ',
+ '' + this.txtBtnAccessRights + ' ',
' ',
'
'
].join(''));
@@ -1588,7 +1602,7 @@ define([
template: _.template([
''
].join('')),
@@ -1599,14 +1613,6 @@ define([
this.urlPref = 'resources/help/{{DEFAULT_LANG}}/';
this.openUrl = null;
- if ( !Common.Utils.isIE ) {
- if ( /^https?:\/\//.test('{{HELP_CENTER_WEB_PE}}') ) {
- const _url_obj = new URL('{{HELP_CENTER_WEB_PE}}');
- _url_obj.searchParams.set('lang', Common.Locale.getCurrentLanguage());
- this.urlHelpCenter = _url_obj.toString();
- }
- }
-
this.en_data = [
{"src": "ProgramInterface/ProgramInterface.htm", "name": "Introducing Presentation Editor user interface", "headername": "Program Interface"},
{"src": "ProgramInterface/FileTab.htm", "name": "File tab"},
@@ -1711,20 +1717,8 @@ define([
store.url = 'resources/help/{{DEFAULT_LANG}}/Contents.json';
store.fetch(config);
} else {
- if ( Common.Controllers.Desktop.isActive() ) {
- if ( store.contentLang === '{{DEFAULT_LANG}}' || !Common.Controllers.Desktop.helpUrl() ) {
- me.noHelpContents = true;
- me.iFrame.src = '../../common/main/resources/help/download.html';
- } else {
- store.contentLang = store.contentLang === lang ? '{{DEFAULT_LANG}}' : lang;
- me.urlPref = Common.Controllers.Desktop.helpUrl() + '/' + store.contentLang + '/';
- store.url = me.urlPref + 'Contents.json';
- store.fetch(config);
- }
- } else {
- me.urlPref = 'resources/help/{{DEFAULT_LANG}}/';
- store.reset(me.en_data);
- }
+ me.urlPref = 'resources/help/{{DEFAULT_LANG}}/';
+ store.reset(me.en_data);
}
},
success: function () {
@@ -1738,9 +1732,21 @@ define([
me.onSelectItem(me.openUrl ? me.openUrl : rec.get('src'));
}
};
- store.url = 'resources/help/' + lang + '/Contents.json';
- store.fetch(config);
- this.urlPref = 'resources/help/' + lang + '/';
+
+ if ( Common.Controllers.Desktop.isActive() ) {
+ if ( !Common.Controllers.Desktop.isHelpAvailable() ) {
+ me.noHelpContents = true;
+ me.iFrame.src = '../../common/main/resources/help/download.html';
+ } else {
+ me.urlPref = Common.Controllers.Desktop.helpUrl() + '/';
+ store.url = me.urlPref + 'Contents.json';
+ store.fetch(config);
+ }
+ } else {
+ store.url = 'resources/help/' + lang + '/Contents.json';
+ store.fetch(config);
+ this.urlPref = 'resources/help/' + lang + '/';
+ }
}
},
@@ -2057,23 +2063,23 @@ define([
takeFocusOnClose: true,
cls: 'input-group-nr',
data: [
- { value: 0, displayValue:'US Letter (21,59cm x 27,94cm)', caption: 'US Letter', size: [215.9, 279.4]},
- { value: 1, displayValue:'US Legal (21,59cm x 35,56cm)', caption: 'US Legal', size: [215.9, 355.6]},
- { value: 2, displayValue:'A4 (21cm x 29,7cm)', caption: 'A4', size: [210, 297]},
- { value: 3, displayValue:'A5 (14,8cm x 21cm)', caption: 'A5', size: [148, 210]},
- { value: 4, displayValue:'B5 (17,6cm x 25cm)', caption: 'B5', size: [176, 250]},
- { value: 5, displayValue:'Envelope #10 (10,48cm x 24,13cm)', caption: 'Envelope #10', size: [104.8, 241.3]},
- { value: 6, displayValue:'Envelope DL (11cm x 22cm)', caption: 'Envelope DL', size: [110, 220]},
- { value: 7, displayValue:'Tabloid (27,94cm x 43,18cm)', caption: 'Tabloid', size: [279.4, 431.8]},
- { value: 8, displayValue:'A3 (29,7cm x 42cm)', caption: 'A3', size: [297, 420]},
- { value: 9, displayValue:'Tabloid Oversize (30,48cm x 45,71cm)', caption: 'Tabloid Oversize', size: [304.8, 457.1]},
- { value: 10, displayValue:'ROC 16K (19,68cm x 27,3cm)', caption: 'ROC 16K', size: [196.8, 273]},
- { value: 11, displayValue:'Envelope Choukei 3 (11,99cm x 23,49cm)', caption: 'Envelope Choukei 3', size: [119.9, 234.9]},
- { value: 12, displayValue:'Super B/A3 (33,02cm x 48,25cm)', caption: 'Super B/A3', size: [330.2, 482.5]},
- { value: 13, displayValue:'A4 (84,1cm x 118,9cm)', caption: 'A0', size: [841, 1189]},
- { value: 14, displayValue:'A4 (59,4cm x 84,1cm)', caption: 'A1', size: [594, 841]},
- { value: 16, displayValue:'A4 (42cm x 59,4cm)', caption: 'A2', size: [420, 594]},
- { value: 17, displayValue:'A4 (10,5cm x 14,8cm)', caption: 'A6', size: [105, 148]}
+ { value: 0, displayValue:'US Letter (21,59 cm x 27,94 cm)', caption: 'US Letter', size: [215.9, 279.4]},
+ { value: 1, displayValue:'US Legal (21,59 cm x 35,56 cm)', caption: 'US Legal', size: [215.9, 355.6]},
+ { value: 2, displayValue:'A4 (21 cm x 29,7 cm)', caption: 'A4', size: [210, 297]},
+ { value: 3, displayValue:'A5 (14,8 cm x 21 cm)', caption: 'A5', size: [148, 210]},
+ { value: 4, displayValue:'B5 (17,6 cm x 25 cm)', caption: 'B5', size: [176, 250]},
+ { value: 5, displayValue:'Envelope #10 (10,48 cm x 24,13 cm)', caption: 'Envelope #10', size: [104.8, 241.3]},
+ { value: 6, displayValue:'Envelope DL (11 cm x 22 cm)', caption: 'Envelope DL', size: [110, 220]},
+ { value: 7, displayValue:'Tabloid (27,94 cm x 43,18 cm)', caption: 'Tabloid', size: [279.4, 431.8]},
+ { value: 8, displayValue:'A3 (29,7 cm x 42 cm)', caption: 'A3', size: [297, 420]},
+ { value: 9, displayValue:'Tabloid Oversize (30,48 cm x 45,71 cm)', caption: 'Tabloid Oversize', size: [304.8, 457.1]},
+ { value: 10, displayValue:'ROC 16K (19,68 cm x 27,3 cm)', caption: 'ROC 16K', size: [196.8, 273]},
+ { value: 11, displayValue:'Envelope Choukei 3 (11,99 cm x 23,49 cm)', caption: 'Envelope Choukei 3', size: [119.9, 234.9]},
+ { value: 12, displayValue:'Super B/A3 (33,02 cm x 48,25 cm)', caption: 'Super B/A3', size: [330.2, 482.5]},
+ { value: 13, displayValue:'A4 (84,1 cm x 118,9 cm)', caption: 'A0', size: [841, 1189]},
+ { value: 14, displayValue:'A4 (59,4 cm x 84,1 cm)', caption: 'A1', size: [594, 841]},
+ { value: 16, displayValue:'A4 (42 cm x 59,4 cm)', caption: 'A2', size: [420, 594]},
+ { value: 17, displayValue:'A4 (10,5 cm x 14,8 cm)', caption: 'A6', size: [105, 148]}
],
dataHint: '2',
dataHintDirection: 'bottom',
@@ -2214,8 +2220,8 @@ define([
pagewidth = size[0],
pageheight = size[1];
- item.set('displayValue', item.get('caption') + ' (' + parseFloat(Common.Utils.Metric.fnRecalcFromMM(pagewidth).toFixed(2)) + Common.Utils.Metric.getCurrentMetricName() + ' x ' +
- parseFloat(Common.Utils.Metric.fnRecalcFromMM(pageheight).toFixed(2)) + Common.Utils.Metric.getCurrentMetricName() + ')');
+ item.set('displayValue', item.get('caption') + ' (' + parseFloat(Common.Utils.Metric.fnRecalcFromMM(pagewidth).toFixed(2)) + ' ' + Common.Utils.Metric.getCurrentMetricName() + ' x ' +
+ parseFloat(Common.Utils.Metric.fnRecalcFromMM(pageheight).toFixed(2)) + ' ' + Common.Utils.Metric.getCurrentMetricName() + ')');
}
var value = this.cmbPaperSize.getValue();
this.cmbPaperSize.onResetItems();
diff --git a/apps/presentationeditor/main/app/view/GridSettings.js b/apps/presentationeditor/main/app/view/GridSettings.js
index c39cab567..66f7923de 100644
--- a/apps/presentationeditor/main/app/view/GridSettings.js
+++ b/apps/presentationeditor/main/app/view/GridSettings.js
@@ -64,8 +64,8 @@ define([
'',
'' + this.textSpacing + ' ',
'
',
- '
',
- '
',
+ '
',
+ '
',
'',
'
'
].join('');
diff --git a/apps/presentationeditor/main/app/view/HeaderFooterDialog.js b/apps/presentationeditor/main/app/view/HeaderFooterDialog.js
index 54c98e3ad..6adb99a76 100644
--- a/apps/presentationeditor/main/app/view/HeaderFooterDialog.js
+++ b/apps/presentationeditor/main/app/view/HeaderFooterDialog.js
@@ -49,7 +49,8 @@ define(['text!presentationeditor/main/app/template/HeaderFooterDialog.template',
options: {
contentWidth: 360,
height: 380,
- buttons: null
+ buttons: null,
+ id: 'window-header-footer'
},
initialize : function(options) {
@@ -67,8 +68,8 @@ define(['text!presentationeditor/main/app/template/HeaderFooterDialog.template',
'',
'
',
'
@@ -76,7 +76,7 @@
<%= scope.textMinValue %>
-
+
@@ -87,7 +87,7 @@
<%= scope.textMaxValue %>
-
+
@@ -98,7 +98,7 @@
<%= scope.textAxisCrosses %>
-
+
@@ -125,9 +125,9 @@
-
+
<%= scope.textBase %>
-
+
@@ -146,8 +146,8 @@
- <%= scope.textMinorType %>
-
+ <%= scope.textMinorType %>
+
@@ -167,7 +167,7 @@
- <%= scope.textFormat %>
+ <%= scope.textFormat %>
@@ -187,8 +187,8 @@
- <%= scope.textGridLines %>
-
+ <%= scope.textGridLines %>
+
diff --git a/apps/spreadsheeteditor/main/app/template/ImageSettingsAdvanced.template b/apps/spreadsheeteditor/main/app/template/ImageSettingsAdvanced.template
index 9c5fb1c05..252d13ee3 100644
--- a/apps/spreadsheeteditor/main/app/template/ImageSettingsAdvanced.template
+++ b/apps/spreadsheeteditor/main/app/template/ImageSettingsAdvanced.template
@@ -2,7 +2,7 @@