diff --git a/apps/documenteditor/mobile/app/view/Settings.js b/apps/documenteditor/mobile/app/view/Settings.js
index 56b197ef4..f120a87b4 100644
--- a/apps/documenteditor/mobile/app/view/Settings.js
+++ b/apps/documenteditor/mobile/app/view/Settings.js
@@ -56,7 +56,8 @@ define([
_canDownloadOrigin = false,
_canReader = false,
_canAbout = true,
- _canHelp = true;
+ _canHelp = true,
+ _canPrint = false;
return {
// el: '.view-main',
@@ -97,6 +98,7 @@ define([
_canDownload = mode.canDownload;
_canDownloadOrigin = mode.canDownloadOrigin;
_canReader = !mode.isEdit && mode.canReader;
+ _canPrint = mode.canPrint;
if (mode.customization && mode.canBrandingExt) {
_canAbout = (mode.customization.about!==false);
@@ -128,6 +130,7 @@ define([
if (!_canDownloadOrigin) $layour.find('#settings-download').hide();
if (!_canAbout) $layour.find('#settings-about').hide();
if (!_canHelp) $layour.find('#settings-help').hide();
+ if (!_canPrint) $layour.find('#settings-print').hide();
return $layour.html();
}
@@ -257,7 +260,8 @@ define([
textDocumentFormats: 'Document Formats',
textOrientation: 'Orientation',
textPoweredBy: 'Powered by',
- textSpellcheck: 'Spell Checking'
+ textSpellcheck: 'Spell Checking',
+ textPrint: 'Print'
}
})(), DE.Views.Settings || {}))
diff --git a/apps/documenteditor/mobile/locale/en.json b/apps/documenteditor/mobile/locale/en.json
index 90a1066cd..c7f5bafa2 100644
--- a/apps/documenteditor/mobile/locale/en.json
+++ b/apps/documenteditor/mobile/locale/en.json
@@ -386,5 +386,6 @@
"DE.Views.Settings.textWords": "Words",
"DE.Views.Settings.unknownText": "Unknown",
"DE.Views.Settings.textSpellcheck": "Spell Checking",
+ "DE.Views.Settings.textPrint": "Print",
"DE.Views.Toolbar.textBack": "Back"
}
\ No newline at end of file
diff --git a/apps/documenteditor/mobile/resources/css/app-ios.css b/apps/documenteditor/mobile/resources/css/app-ios.css
index 492cba929..341d33629 100644
--- a/apps/documenteditor/mobile/resources/css/app-ios.css
+++ b/apps/documenteditor/mobile/resources/css/app-ios.css
@@ -6351,6 +6351,11 @@ i.icon.icon-download {
height: 28px;
background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20version%3D%221.1%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20xmlns%3Axlink%3D%22http%3A%2F%2Fwww.w3.org%2F1999%2Fxlink%22%20viewBox%3D%220%200%2022%2022%22%20y%3D%220px%22%20x%3D%220px%22%20fill%3D%22%23446995%22%3E%3Cpath%20d%3D%22M12%200H11L11%2014L7.39999%2010.3L6.69999%2011.1L11.5%2016L16.3%2011.1L15.6%2010.3L12%2014L12%200Z%22%2F%3E%3Cpath%20d%3D%22M14%205V6H19V20H4V6H9V5H3V21H20V5H14Z%22%2F%3E%3C%2Fsvg%3E");
}
+i.icon.icon-print {
+ width: 22px;
+ height: 28px;
+ background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20version%3D%221.1%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20xmlns%3Axlink%3D%22http%3A%2F%2Fwww.w3.org%2F1999%2Fxlink%22%20viewBox%3D%22-0%200%2022%2022%22%20y%3D%220px%22%20x%3D%220px%22%20fill%3D%22%23446995%22%20%20stroke%3D%22%23446995%22%3E%3Cg%3E%3Cpath%20d%3D%22M5.5%2016.5H1.5V12.5M5.5%2016.5V20.5H16.5V16.5M5.5%2016.5V12.5M16.5%2016.5H20.5V12.5M16.5%2016.5V12.5M5.5%206.5H1.5V12.5M5.5%206.5V1.5H16.5V6.5M5.5%206.5H16.5M16.5%206.5H20.5V12.5M1.5%2012.5H5.5M20.5%2012.5H16.5M5.5%2012.5H16.5M8%2015.5H14M8%2017.5H14%22%2F%3E%3C%2Fg%3E%3C%2Fsvg%3E");
+}
i.icon.icon-spellcheck {
width: 22px;
height: 22px;
diff --git a/apps/documenteditor/mobile/resources/css/app-material.css b/apps/documenteditor/mobile/resources/css/app-material.css
index c39e482b8..111314452 100644
--- a/apps/documenteditor/mobile/resources/css/app-material.css
+++ b/apps/documenteditor/mobile/resources/css/app-material.css
@@ -5940,6 +5940,11 @@ i.icon.icon-download {
height: 28px;
background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20version%3D%221.1%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20xmlns%3Axlink%3D%22http%3A%2F%2Fwww.w3.org%2F1999%2Fxlink%22%20viewBox%3D%22-0%200%2022%2022%22%20y%3D%220px%22%20x%3D%220px%22%20fill%3D%22%23446995%22%3E%3Cg%3E%3Cpath%20d%3D%22M12%200H11L11%2014L7.39999%2010.3L6.69999%2011.1L11.5%2016L16.3%2011.1L15.6%2010.3L12%2014L12%200Z%22%2F%3E%3Cpath%20d%3D%22M14%205V6H19V20H4V6H9V5H3V21H20V5H14Z%22%2F%3E%3C%2Fg%3E%3C%2Fsvg%3E");
}
+i.icon.icon-print {
+ width: 22px;
+ height: 28px;
+ background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20version%3D%221.1%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20xmlns%3Axlink%3D%22http%3A%2F%2Fwww.w3.org%2F1999%2Fxlink%22%20viewBox%3D%220%200%2022%2022%22%20y%3D%220px%22%20x%3D%220px%22%20fill%3D%22%23446995%22%20%20stroke%3D%22%23446995%22%3E%3Cg%3E%3Cpath%20d%3D%22M5.5%2016.5H1.5V12.5M5.5%2016.5V20.5H16.5V16.5M5.5%2016.5V12.5M16.5%2016.5H20.5V12.5M16.5%2016.5V12.5M5.5%206.5H1.5V12.5M5.5%206.5V1.5H16.5V6.5M5.5%206.5H16.5M16.5%206.5H20.5V12.5M1.5%2012.5H5.5M20.5%2012.5H16.5M5.5%2012.5H16.5M8%2015.5H14M8%2017.5H14%22%2F%3E%3C%2Fg%3E%3C%2Fsvg%3E");
+}
i.icon.icon-spellcheck {
width: 22px;
height: 22px;
diff --git a/apps/documenteditor/mobile/resources/less/ios/_icons.less b/apps/documenteditor/mobile/resources/less/ios/_icons.less
index 9219d3c4d..f2fb0b092 100644
--- a/apps/documenteditor/mobile/resources/less/ios/_icons.less
+++ b/apps/documenteditor/mobile/resources/less/ios/_icons.less
@@ -40,6 +40,11 @@ i.icon {
height: 28px;
.encoded-svg-background('
');
}
+ &.icon-print {
+ width: 22px;
+ height: 28px;
+ .encoded-svg-background('
');
+ }
&.icon-spellcheck {
width: 22px;
height: 22px;
diff --git a/apps/documenteditor/mobile/resources/less/material/_icons.less b/apps/documenteditor/mobile/resources/less/material/_icons.less
index 3ffe1c059..1b39c29e6 100644
--- a/apps/documenteditor/mobile/resources/less/material/_icons.less
+++ b/apps/documenteditor/mobile/resources/less/material/_icons.less
@@ -35,6 +35,11 @@ i.icon {
height: 28px;
.encoded-svg-background('
');
}
+ &.icon-print {
+ width: 22px;
+ height: 28px;
+ .encoded-svg-background('
');
+ }
&.icon-spellcheck {
width: 22px;
height: 22px;
diff --git a/apps/presentationeditor/mobile/app/controller/Main.js b/apps/presentationeditor/mobile/app/controller/Main.js
index 822a1bef9..aa82f3511 100644
--- a/apps/presentationeditor/mobile/app/controller/Main.js
+++ b/apps/presentationeditor/mobile/app/controller/Main.js
@@ -1144,7 +1144,7 @@ define([
if (!this.appOptions.canPrint) return;
if (this.api)
- this.api.asc_Print(Common.Utils.isChrome || Common.Utils.isSafari || Common.Utils.isOpera); // if isChrome or isSafari or isOpera == true use asc_onPrintUrl event
+ this.api.asc_Print();
Common.component.Analytics.trackEvent('Print');
},
diff --git a/apps/presentationeditor/mobile/app/controller/Settings.js b/apps/presentationeditor/mobile/app/controller/Settings.js
index d5627d20c..53ba46997 100644
--- a/apps/presentationeditor/mobile/app/controller/Settings.js
+++ b/apps/presentationeditor/mobile/app/controller/Settings.js
@@ -159,6 +159,7 @@ define([
$('#settings-spellcheck input:checkbox').single('change', _.bind(me._onSpellcheck, me));
$(modalView).find('.formats a').single('click', _.bind(me._onSaveFormat, me));
$('#page-settings-setup-view li').single('click', _.bind(me._onSlideSize, me));
+ $('#settings-print').single('click', _.bind(me._onPrint, me));
me.initSettings(pageId);
},
@@ -235,6 +236,15 @@ define([
this.hideModal();
},
+ _onPrint: function(e) {
+ var me = this;
+
+ _.defer(function () {
+ me.api.asc_Print();
+ });
+ me.hideModal();
+ },
+
_onSpellcheck: function (e) {
var $checkbox = $(e.currentTarget),
state = $checkbox.is(':checked');
diff --git a/apps/presentationeditor/mobile/app/template/Settings.template b/apps/presentationeditor/mobile/app/template/Settings.template
index 0e96b8c2b..462b3f29a 100644
--- a/apps/presentationeditor/mobile/app/template/Settings.template
+++ b/apps/presentationeditor/mobile/app/template/Settings.template
@@ -65,6 +65,18 @@