count - 1) {
+ this._navigationPreview.currentPreviewPage = Math.max(0, count - 1);
+ if (this.printSettings.isVisible()) {
+ this.api.asc_drawPrintPreview(this._navigationPreview.currentPreviewPage);
+ this.updateNavigationButtons(this._navigationPreview.currentPreviewPage, count);
+ }
+ }
+ },
+
+ onCurrentPage: function(number) {
+ this._navigationPreview.currentPreviewPage = number;
+ if (this.printSettings.isVisible()) {
+ this.api.asc_drawPrintPreview(this._navigationPreview.currentPreviewPage);
+ this.updateNavigationButtons(this._navigationPreview.currentPreviewPage, this._navigationPreview.pageCount);
+ }
+ },
+
+ onShowMainSettingsPrint: function() {
+ var me = this;
+ this.printSettings.$previewBox.removeClass('hidden');
+
+ this.onUpdateLastCustomMargins(this._state.lastmargins);
+ this._state.pgsize && this.onApiPageSize(this._state.pgsize[0], this._state.pgsize[1]);
+ this.onApiPageOrient(this._state.pgorient);
+ this._state.sectionprops && this.onSectionProps(this._state.sectionprops);
+
+ var opts = new Asc.asc_CDownloadOptions(null, Common.Utils.isChrome || Common.Utils.isOpera || Common.Utils.isGecko && Common.Utils.firefoxVersion>86);
+ opts.asc_setAdvancedOptions(this.adjPrintParams);
+ this.api.asc_initPrintPreview('print-preview', opts);
+
+ this._navigationPreview.currentPreviewPage = this._navigationPreview.currentPage = this.api.getCurrentPage();
+ this.api.asc_drawPrintPreview(this._navigationPreview.currentPreviewPage);
+ this.updateNavigationButtons(this._navigationPreview.currentPreviewPage, this._navigationPreview.pageCount);
+ this.SetDisabled();
+ this._isPreviewVisible = true;
+ },
+
+ onPaperSizeSelect: function(combo, record) {
+ this._state.pgsize = [0, 0];
+ if (record.value !== -1) {
+ if (this.checkPageSize(record.size[0], record.size[1])) {
+ var section = this.api.asc_GetSectionProps();
+ this.onApiPageSize(section.get_W(), section.get_H());
+ return;
+ } else
+ this.api.change_DocSize(record.size[0], record.size[1]);
+ } else {
+ var win, props,
+ me = this;
+ win = new DE.Views.PageSizeDialog({
+ checkPageSize: _.bind(this.checkPageSize, this),
+ handler: function(dlg, result) {
+ if (result == 'ok') {
+ props = dlg.getSettings();
+ me.api.change_DocSize(props[0], props[1]);
+ Common.NotificationCenter.trigger('edit:complete');
+ }
+ }
+ });
+ win.show();
+ win.setSettings(me.api.asc_GetSectionProps());
+ }
+
+ Common.NotificationCenter.trigger('edit:complete');
+ },
+
+ onPaperMarginsSelect: function(combo, record) {
+ this._state.pgmargins = undefined;
+ if (record.value !== -1) {
+ if (this.checkPageSize(undefined, undefined, record.size[1], record.size[3], record.size[0], record.size[2])) {
+ this.onSectionProps(this.api.asc_GetSectionProps());
+ return;
+ } else {
+ var props = new Asc.CDocumentSectionProps();
+ props.put_TopMargin(record.size[0]);
+ props.put_LeftMargin(record.size[1]);
+ props.put_BottomMargin(record.size[2]);
+ props.put_RightMargin(record.size[3]);
+ this.api.asc_SetSectionProps(props);
+ }
+ } else {
+ var win, props,
+ me = this;
+ win = new DE.Views.PageMarginsDialog({
+ api: me.api,
+ handler: function(dlg, result) {
+ if (result == 'ok') {
+ props = dlg.getSettings();
+ Common.localStorage.setItem("de-pgmargins-top", props.get_TopMargin());
+ Common.localStorage.setItem("de-pgmargins-left", props.get_LeftMargin());
+ Common.localStorage.setItem("de-pgmargins-bottom", props.get_BottomMargin());
+ Common.localStorage.setItem("de-pgmargins-right", props.get_RightMargin());
+ Common.NotificationCenter.trigger('margins:update', props);
+
+ me.api.asc_SetSectionProps(props);
+ Common.NotificationCenter.trigger('edit:complete');
+ }
+ }
+ });
+ win.show();
+ win.setSettings(me.api.asc_GetSectionProps());
+ }
+
+ Common.NotificationCenter.trigger('edit:complete');
+ },
+
+ onUpdateLastCustomMargins: function(props) {
+ this._state.lastmargins = props;
+ if (this.printSettings.isVisible()) {
+ var top = props ? props.get_TopMargin() : Common.localStorage.getItem("de-pgmargins-top"),
+ left = props ? props.get_LeftMargin() : Common.localStorage.getItem("de-pgmargins-left"),
+ bottom = props ? props.get_BottomMargin() : Common.localStorage.getItem("de-pgmargins-bottom"),
+ right = props ? props.get_RightMargin() : Common.localStorage.getItem("de-pgmargins-right");
+ if ( top!==null && left!==null && bottom!==null && right!==null ) {
+ var rec = this.printSettings.cmbPaperMargins.store.at(0);
+ if (rec.get('value')===-2)
+ rec.set('size', [parseFloat(top), parseFloat(left), parseFloat(bottom), parseFloat(right)]);
+ else
+ this.printSettings.cmbPaperMargins.store.unshift({ value: -2, displayValue: this.textMarginsLast, size: [parseFloat(top), parseFloat(left), parseFloat(bottom), parseFloat(right)]});
+ this.printSettings.cmbPaperMargins.onResetItems();
+ }
+ }
+ },
+
+ onPaperOrientSelect: function(combo, record) {
+ this._state.pgorient = undefined;
+ if (this.api) {
+ this.api.change_PageOrient(record.value === Asc.c_oAscPageOrientation.PagePortrait);
+ }
+
+ Common.NotificationCenter.trigger('edit:complete');
+ },
+
+ checkPageSize: function(width, height, left, right, top, bottom) {
+ var section = this.api.asc_GetSectionProps();
+ (width===undefined) && (width = parseFloat(section.get_W().toFixed(4)));
+ (height===undefined) && (height = parseFloat(section.get_H().toFixed(4)));
+ (left===undefined) && (left = parseFloat(section.get_LeftMargin().toFixed(4)));
+ (right===undefined) && (right = parseFloat(section.get_RightMargin().toFixed(4)));
+ (top===undefined) && (top = parseFloat(section.get_TopMargin().toFixed(4)));
+ (bottom===undefined) && (bottom = parseFloat(section.get_BottomMargin().toFixed(4)));
+ var gutterLeft = section.get_GutterAtTop() ? 0 : parseFloat(section.get_Gutter().toFixed(4)),
+ gutterTop = section.get_GutterAtTop() ? parseFloat(section.get_Gutter().toFixed(4)) : 0;
+
+ var errmsg = null;
+ if (left + right + gutterLeft > width-12.7 )
+ errmsg = this.txtMarginsW;
+ else if (top + bottom + gutterTop > height-2.6 )
+ errmsg = this.txtMarginsH;
+ if (errmsg) {
+ Common.UI.warning({
+ title: this.notcriticalErrorTitle,
+ msg : errmsg,
+ callback: function() {
+ Common.NotificationCenter.trigger('edit:complete');
+ }
+ });
+ return true;
+ }
+ },
+
+ getPrintParams: function() {
+ return this.adjPrintParams;
+ },
+
+ onHidePrintMenu: function () {
+ if (this._isPreviewVisible) {
+ this.api.asc_closePrintPreview && this.api.asc_closePrintPreview();
+ this._isPreviewVisible = false;
+ }
+ },
+
+ onChangePreviewPage: function (next) {
+ var index = this._navigationPreview.currentPreviewPage;
+ if (next) {
+ index++;
+ index = Math.min(index, this._navigationPreview.pageCount - 1);
+ } else {
+ index--;
+ index = Math.max(index, 0);
+ }
+ this.api.goToPage(index);
+ },
+
+ onKeypressPageNumber: function (input, e) {
+ if (e.keyCode === Common.UI.Keys.RETURN) {
+ var box = this.printSettings.$el.find('#print-number-page'),
+ edit = box.find('input[type=text]'), page = parseInt(edit.val());
+ if (!page || page > this._navigationPreview.pageCount || page < 0) {
+ edit.select();
+ this.printSettings.txtNumberPage.setValue(this._navigationPreview.currentPreviewPage + 1);
+ this.printSettings.txtNumberPage.checkValidate();
+ return false;
+ }
+
+ box.focus(); // for IE
+
+ this.api.goToPage(page-1);
+ this.api.asc_enableKeyEvents(true);
+ return false;
+ }
+ },
+
+ onKeyupPageNumber: function (input, e) {
+ if (e.keyCode === Common.UI.Keys.ESC) {
+ var box = this.printSettings.$el.find('#print-number-page');
+ box.focus(); // for IE
+ this.api.asc_enableKeyEvents(true);
+ return false;
+ }
+ },
+
+ onBlurPageNumber: function () {
+ if (this.printSettings.txtNumberPage.getValue() != this._navigationPreview.currentPreviewPage + 1) {
+ this.printSettings.txtNumberPage.setValue(this._navigationPreview.currentPreviewPage + 1);
+ this.printSettings.txtNumberPage.checkValidate();
+ }
+ },
+
+ onPreviewWheel: function (e) {
+ if (e.ctrlKey) {
+ e.preventDefault();
+ e.stopImmediatePropagation();
+ }
+ var forward = (e.deltaY || (e.detail && -e.detail) || e.wheelDelta) < 0;
+ this.onChangePreviewPage(forward);
+ },
+
+ updateNavigationButtons: function (page, count) {
+ this._navigationPreview.currentPage = page;
+ this.printSettings.updateCurrentPage(page);
+ this._navigationPreview.pageCount = count;
+ this.printSettings.updateCountOfPages(count);
+ this.disableNavButtons();
+ },
+
+ disableNavButtons: function (force) {
+ if (force) {
+ this.printSettings.btnPrevPage.setDisabled(true);
+ this.printSettings.btnNextPage.setDisabled(true);
+ return;
+ }
+ var curPage = this._navigationPreview.currentPage,
+ pageCount = this._navigationPreview.pageCount;
+ this.printSettings.btnPrevPage.setDisabled(curPage < 1);
+ this.printSettings.btnNextPage.setDisabled(curPage > pageCount - 2);
+ },
+
+ onBtnPrint: function(print) {
+ this._isPrint = print;
+ if (this.printSettings.cmbRange.getValue()===-1 && this.printSettings.inputPages.checkValidate() !== true) {
+ this.printSettings.inputPages.focus();
+ this.isInputFirstChange = true;
+ return;
+ }
+ if (this.printSettings.cmbRange.getValue()==='all')
+ this._state.firstPrintPage = 0;
+ else if (this.printSettings.cmbRange.getValue()==='current')
+ this._state.firstPrintPage = this._navigationPreview.currentPage;
+
+ var size = this.api.asc_getPageSize(this._state.firstPrintPage);
+ this.adjPrintParams.asc_setNativeOptions({
+ pages: this.printSettings.cmbRange.getValue()===-1 ? this.printSettings.inputPages.getValue() : this.printSettings.cmbRange.getValue(),
+ paperSize: {
+ w: size ? size['W'] : undefined,
+ h: size ? size['H'] : undefined,
+ preset: size ? this.findPagePreset(size['W'], size['H']) : undefined
+ },
+ paperOrientation: size ? (size['H'] > size['W'] ? 'portrait' : 'landscape') : null
+ });
+
+ if ( print ) {
+ var opts = new Asc.asc_CDownloadOptions(null, Common.Utils.isChrome || Common.Utils.isOpera || Common.Utils.isGecko && Common.Utils.firefoxVersion>86);
+ opts.asc_setAdvancedOptions(this.adjPrintParams);
+ this.api.asc_Print(opts);
+ } else {
+ var opts = new Asc.asc_CDownloadOptions(Asc.c_oAscFileType.PDF);
+ opts.asc_setAdvancedOptions(this.adjPrintParams);
+ this.api.asc_DownloadAs(opts);
+ }
+ this.printSettings.menu.hide();
+ },
+
+ inputPagesChanging: function (input, value) {
+ this.isInputFirstChange && this.printSettings.inputPages.showError();
+ this.isInputFirstChange = false;
+
+ if (value.length<1)
+ this.printSettings.cmbRange.setValue('all');
+ else if (this.printSettings.cmbRange.getValue()!==-1)
+ this.printSettings.cmbRange.setValue(-1);
+ },
+
+ onApiLockDocumentProps: function() {
+ this._state.lock_doc = true;
+ this.SetDisabled();
+ },
+
+ onApiUnLockDocumentProps: function() {
+ this._state.lock_doc = false;
+ this.SetDisabled();
+ },
+
+ SetDisabled: function() {
+ if (this.printSettings.isVisible()) {
+ var disable = !this.mode.isEdit || this._state.lock_doc;
+ this.printSettings.cmbPaperSize.setDisabled(disable);
+ this.printSettings.cmbPaperMargins.setDisabled(disable);
+ this.printSettings.cmbPaperOrientation.setDisabled(disable);
+ }
+ },
+
+ txtCustom: 'Custom',
+ txtPrintRangeInvalid: 'Invalid print range',
+ textMarginsLast: 'Last Custom',
+ txtPrintRangeSingleRange: 'Enter either a single page number or a single page range (for example, 5-12). Or you can Print to PDF.'
+ }, DE.Controllers.Print || {}));
+});
\ No newline at end of file
diff --git a/apps/documenteditor/main/app/controller/Toolbar.js b/apps/documenteditor/main/app/controller/Toolbar.js
index 77710f0bd..f6af81f09 100644
--- a/apps/documenteditor/main/app/controller/Toolbar.js
+++ b/apps/documenteditor/main/app/controller/Toolbar.js
@@ -131,6 +131,10 @@ define([
var _main = this.getApplication().getController('Main');
_main.onPrint();
},
+ 'print-quick': function (opts) {
+ var _main = this.getApplication().getController('Main');
+ _main.onPrintQuick();
+ },
'save': function (opts) {
this.api.asc_Save();
},
@@ -1066,9 +1070,7 @@ define([
},
onPrint: function(e) {
- if (this.api)
- this.api.asc_Print(new Asc.asc_CDownloadOptions(null, Common.Utils.isChrome || Common.Utils.isOpera || Common.Utils.isGecko && Common.Utils.firefoxVersion>86)); // if isChrome or isOpera == true use asc_onPrintUrl event
-
+ Common.NotificationCenter.trigger('file:print', this.toolbar);
Common.NotificationCenter.trigger('edit:complete', this.toolbar);
Common.component.Analytics.trackEvent('Print');
@@ -1784,15 +1786,11 @@ define([
handler: function(dlg, result) {
if (result == 'ok') {
props = dlg.getSettings();
- var mnu = me.toolbar.btnPageMargins.menu.items[0];
- mnu.setVisible(true);
- mnu.setChecked(true);
- mnu.options.value = mnu.value = [props.get_TopMargin(), props.get_LeftMargin(), props.get_BottomMargin(), props.get_RightMargin()];
- $(mnu.el).html(mnu.template({id: Common.UI.getId(), caption : mnu.caption, options : mnu.options}));
Common.localStorage.setItem("de-pgmargins-top", props.get_TopMargin());
Common.localStorage.setItem("de-pgmargins-left", props.get_LeftMargin());
Common.localStorage.setItem("de-pgmargins-bottom", props.get_BottomMargin());
Common.localStorage.setItem("de-pgmargins-right", props.get_RightMargin());
+ Common.NotificationCenter.trigger('margins:update', props);
me.api.asc_SetSectionProps(props);
Common.NotificationCenter.trigger('edit:complete', me.toolbar);
diff --git a/apps/documenteditor/main/app/controller/Viewport.js b/apps/documenteditor/main/app/controller/Viewport.js
index e63b29eb9..898460665 100644
--- a/apps/documenteditor/main/app/controller/Viewport.js
+++ b/apps/documenteditor/main/app/controller/Viewport.js
@@ -71,7 +71,8 @@ define([
this.addListeners({
'FileMenu': {
'menu:hide': me.onFileMenu.bind(me, 'hide'),
- 'menu:show': me.onFileMenu.bind(me, 'show')
+ 'menu:show': me.onFileMenu.bind(me, 'show'),
+ 'settings:apply': me.applySettings.bind(me)
},
'Toolbar': {
'render:before' : function (toolbar) {
@@ -79,6 +80,11 @@ define([
toolbar.setExtra('right', me.header.getPanel('right', config));
if (!config.isEdit || config.customization && !!config.customization.compactHeader)
toolbar.setExtra('left', me.header.getPanel('left', config));
+
+ var value = Common.localStorage.getBool("de-settings-quick-print-button", true);
+ Common.Utils.InternalSettings.set("de-settings-quick-print-button", value);
+ if (me.header && me.header.btnPrintQuick)
+ me.header.btnPrintQuick[value ? 'show' : 'hide']();
},
'view:compact' : function (toolbar, state) {
me.viewport.vlayout.getItem('toolbar').height = state ?
@@ -100,6 +106,8 @@ define([
'print:disabled' : function (state) {
if ( me.header.btnPrint )
me.header.btnPrint.setDisabled(state);
+ if ( me.header.btnPrintQuick )
+ me.header.btnPrintQuick.setDisabled(state);
},
'save:disabled' : function (state) {
if ( me.header.btnSave )
@@ -255,12 +263,21 @@ define([
me.header.lockHeaderBtns( 'users', _need_disable );
},
+ applySettings: function () {
+ var value = Common.localStorage.getBool("de-settings-quick-print-button", true);
+ Common.Utils.InternalSettings.set("de-settings-quick-print-button", value);
+ if (this.header && this.header.btnPrintQuick)
+ this.header.btnPrintQuick[value ? 'show' : 'hide']();
+ },
+
onApiCoAuthoringDisconnect: function(enableDownload) {
if (this.header) {
if (this.header.btnDownload && !enableDownload)
this.header.btnDownload.hide();
if (this.header.btnPrint && !enableDownload)
this.header.btnPrint.hide();
+ if (this.header.btnPrintQuick && !enableDownload)
+ this.header.btnPrintQuick.hide();
if (this.header.btnEdit)
this.header.btnEdit.hide();
this.header.lockHeaderBtns( 'rename-user', true);
diff --git a/apps/documenteditor/main/app/template/FileMenu.template b/apps/documenteditor/main/app/template/FileMenu.template
index 3ad620221..ba1e7d69d 100644
--- a/apps/documenteditor/main/app/template/FileMenu.template
+++ b/apps/documenteditor/main/app/template/FileMenu.template
@@ -8,6 +8,7 @@
+
@@ -34,4 +35,5 @@
+
\ No newline at end of file
diff --git a/apps/documenteditor/main/app/view/DocumentHolder.js b/apps/documenteditor/main/app/view/DocumentHolder.js
index 06d162fb0..7a0c98177 100644
--- a/apps/documenteditor/main/app/view/DocumentHolder.js
+++ b/apps/documenteditor/main/app/view/DocumentHolder.js
@@ -738,9 +738,9 @@ define([
me.menuImgPrint.setDisabled(!cancopy);
var lockreview = Common.Utils.InternalSettings.get("de-accept-reject-lock");
- me.menuImgAccept.setVisible(!lockreview);
- me.menuImgReject.setVisible(!lockreview);
- menuImgReviewSeparator.setVisible(!lockreview);
+ me.menuImgAccept.setVisible(me.mode.canReview && !me.mode.isReviewOnly && !lockreview);
+ me.menuImgReject.setVisible(me.mode.canReview && !me.mode.isReviewOnly && !lockreview);
+ menuImgReviewSeparator.setVisible(me.mode.canReview && !me.mode.isReviewOnly && !lockreview);
var signGuid = (value.imgProps && value.imgProps.value && me.mode.isSignatureSupport) ? value.imgProps.value.asc_getSignatureId() : undefined,
isInSign = !!signGuid;
@@ -1313,9 +1313,9 @@ define([
me.menuTablePrint.setDisabled(!cancopy);
var lockreview = Common.Utils.InternalSettings.get("de-accept-reject-lock");
- me.menuTableAccept.setVisible(!lockreview);
- me.menuTableReject.setVisible(!lockreview);
- menuTableReviewSeparator.setVisible(!lockreview);
+ me.menuTableAccept.setVisible(me.mode.canReview && !me.mode.isReviewOnly && !lockreview);
+ me.menuTableReject.setVisible(me.mode.canReview && !me.mode.isReviewOnly && !lockreview);
+ menuTableReviewSeparator.setVisible(me.mode.canReview && !me.mode.isReviewOnly && !lockreview);
// bullets & numbering
var listId = me.api.asc_GetCurrentNumberingId(),
@@ -1939,9 +1939,9 @@ define([
me.menuParaPrint.setDisabled(!cancopy);
var lockreview = Common.Utils.InternalSettings.get("de-accept-reject-lock");
- me.menuParaAccept.setVisible(!lockreview);
- me.menuParaReject.setVisible(!lockreview);
- menuParaReviewSeparator.setVisible(!lockreview);
+ me.menuParaAccept.setVisible(me.mode.canReview && !me.mode.isReviewOnly && !lockreview);
+ me.menuParaReject.setVisible(me.mode.canReview && !me.mode.isReviewOnly && !lockreview);
+ menuParaReviewSeparator.setVisible(me.mode.canReview && !me.mode.isReviewOnly && !lockreview);
// spellCheck
var spell = (value.spellProps!==undefined && value.spellProps.value.get_Checked()===false);
diff --git a/apps/documenteditor/main/app/view/FileMenu.js b/apps/documenteditor/main/app/view/FileMenu.js
index 2e38656d7..3748d4a7c 100644
--- a/apps/documenteditor/main/app/view/FileMenu.js
+++ b/apps/documenteditor/main/app/view/FileMenu.js
@@ -161,6 +161,17 @@ define([
dataHintOffset: [2, 14]
});
+ this.miPrintWithPreview = new Common.UI.MenuItem({
+ el : $markup.elementById('#fm-btn-print-with-preview'),
+ action : 'printpreview',
+ caption : this.btnPrintCaption,
+ canFocused: false,
+ dataHint: 1,
+ dataHintDirection: 'left-top',
+ dataHintOffset: [2, 14],
+ dataHintTitle: 'P'
+ });
+
this.miPrint = new Common.UI.MenuItem({
el : $markup.elementById('#fm-btn-print'),
action : 'print',
@@ -295,6 +306,7 @@ define([
this.miSaveCopyAs,
this.miSaveAs,
this.miPrint,
+ this.miPrintWithPreview,
this.miRename,
this.miProtect,
this.miRecent,
@@ -385,7 +397,8 @@ define([
this.miSaveAs[((this.mode.canDownload || this.mode.canDownloadOrigin) && this.mode.isDesktopApp && this.mode.isOffline)?'show':'hide']();
this.miSave[this.mode.isEdit && Common.UI.LayoutManager.isElementVisible('toolbar-file-save') ?'show':'hide']();
this.miEdit[!this.mode.isEdit && this.mode.canEdit && this.mode.canRequestEditRights ?'show':'hide']();
- this.miPrint[this.mode.canPrint?'show':'hide']();
+ this.miPrint[this.mode.canPrint && !this.mode.canPreviewPrint ?'show':'hide']();
+ this.miPrintWithPreview[this.mode.canPreviewPrint?'show':'hide']();
this.miRename[(this.mode.canRename && !this.mode.isDesktopApp) ?'show':'hide']();
this.miProtect[this.mode.canProtect ?'show':'hide']();
separatorVisible = (this.mode.canDownload || this.mode.canDownloadOrigin || this.mode.isEdit && Common.UI.LayoutManager.isElementVisible('toolbar-file-save') || this.mode.canPrint || this.mode.canProtect ||
@@ -467,6 +480,12 @@ define([
this.panels['help'].setLangConfig(this.mode.lang);
}
+ if (this.mode.canPreviewPrint) {
+ var printPanel = DE.getController('Print').getView('PrintWithPreview');
+ printPanel.menu = this;
+ !this.panels['printpreview'] && (this.panels['printpreview'] = printPanel.render(this.$el.find('#panel-print')));
+ }
+
if ( Common.Controllers.Desktop.isActive() ) {
$('').insertAfter($('#fm-btn-recent', this.$el));
this.items.push(
diff --git a/apps/documenteditor/main/app/view/FileMenuPanels.js b/apps/documenteditor/main/app/view/FileMenuPanels.js
index fde5f54ef..b6174012b 100644
--- a/apps/documenteditor/main/app/view/FileMenuPanels.js
+++ b/apps/documenteditor/main/app/view/FileMenuPanels.js
@@ -341,6 +341,12 @@ define([
'',
' | ',
'
',
+ '',
+ '',
+ ' ',
+ ' | ',
+ '
',
'',
' | ',
'',
@@ -699,6 +705,17 @@ define([
})).on('click', _.bind(me.applySettings, me));
});
+ this.chQuickPrint = new Common.UI.CheckBox({
+ el: $markup.findById('#fms-chb-quick-print'),
+ labelText: '',
+ dataHint: '2',
+ dataHintDirection: 'left',
+ dataHintOffset: 'small'
+ });
+ this.chQuickPrint.$el.parent().on('click', function (){
+ me.chQuickPrint.setValue(!me.chQuickPrint.isChecked());
+ });
+
this.pnlSettings = $markup.find('.flex-settings').addBack().filter('.flex-settings');
this.pnlApply = $markup.find('.fms-flex-apply').addBack().filter('.fms-flex-apply');
this.pnlTable = this.pnlSettings.find('table');
@@ -763,9 +780,9 @@ define([
$('tr.view-review', this.el)[mode.canViewReview ? 'show' : 'hide']();
$('tr.spellcheck', this.el)[mode.isEdit && Common.UI.FeaturesManager.canChange('spellcheck') ? 'show' : 'hide']();
$('tr.comments', this.el)[mode.canCoAuthoring ? 'show' : 'hide']();
-
/** coauthoring end **/
+ $('tr.quick-print', this.el)[mode.canQuickPrint ? 'show' : 'hide']();
$('tr.macros', this.el)[(mode.customization && mode.customization.macros===false) ? 'hide' : 'show']();
if ( !Common.UI.Themes.available() ) {
$('tr.themes, tr.themes + tr.divider', this.el).hide();
@@ -836,6 +853,7 @@ define([
this.cmbMacros.setValue(item ? item.get('value') : 0);
this.chPaste.setValue(Common.Utils.InternalSettings.get("de-settings-paste-button"));
+ this.chQuickPrint.setValue(Common.Utils.InternalSettings.get("de-settings-quick-print-button"));
var data = [];
for (var t in Common.UI.Themes.map()) {
@@ -905,6 +923,7 @@ define([
}
Common.localStorage.setItem("de-settings-paste-button", this.chPaste.isChecked() ? 1 : 0);
+ Common.localStorage.setBool("de-settings-quick-print-button", this.chQuickPrint.isChecked());
Common.localStorage.save();
@@ -1002,7 +1021,9 @@ define([
txtStrictTip: 'Use the \'Save\' button to sync the changes you and others make',
strIgnoreWordsInUPPERCASE: 'Ignore words in UPPERCASE',
strIgnoreWordsWithNumbers: 'Ignore words with numbers',
- strShowOthersChanges: 'Show changes from other users'
+ strShowOthersChanges: 'Show changes from other users',
+ txtQuickPrint: 'Show the Quick Print button in the editor header',
+ txtQuickPrintTip: 'The document will be printed on the last selected or default printer'
}, DE.Views.FileMenuPanels.Settings || {}));
DE.Views.FileMenuPanels.RecentFiles = Common.UI.BaseView.extend({
@@ -2380,4 +2401,340 @@ define([
}, DE.Views.FileMenuPanels.ProtectDoc || {}));
+ DE.Views.PrintWithPreview = Common.UI.BaseView.extend(_.extend({
+ el: '#panel-print',
+ menu: undefined,
+
+ template: _.template([
+ '',
+ ' ',
+ ' ',
+ ' ',
+ ' ',
+ '',
+ ' | ',
+ ' | ',
+ '',
+ '',
+ '| <%= scope.txtPages %> | | ',
+ '
',
+ ' | ',
+ ' | ',
+ ' | ',
+ ' | ',
+ ' | ',
+ ' | ',
+ ' | ',
+ '| ',
+ '',
+ ' | ',
+ '',
+ ' ',
+ ' ',
+ ' ',
+ ' ',
+ ' ',
+ ' ',
+ ' ',
+ ' ',
+ ' ',
+ ' ',
+ ' ',
+ ' ',
+ ' ',
+ ' ',
+ ' ',
+ ' ',
+ ' <%= scope.getDisplayValue(item) %> ',
+ '<% if (item.size !== null) { %>' +
+ '' +
+ ' ' +
+ '' +
+ ' ' +
+ '<% } %>',
+ '<% }); %>'
+ ].join('')),
+ dataHint: '2',
+ dataHintDirection: 'bottom',
+ dataHintOffset: 'big'
+ });
+
+ this.pnlSettings = $markup.find('.flex-settings').addBack().filter('.flex-settings');
+ this.pnlTable = $(this.pnlSettings.find('table')[0]);
+ this.trApply = $markup.find('.fms-btn-apply');
+
+ this.btnPrint = new Common.UI.Button({
+ el: $markup.findById('#print-btn-print')
+ });
+ this.btnPrintPdf = new Common.UI.Button({
+ el: $markup.findById('#print-btn-print-pdf')
+ });
+
+ this.btnPrevPage = new Common.UI.Button({
+ parentEl: $markup.findById('#print-prev-page'),
+ cls: 'btn-prev-page',
+ iconCls: 'arrow',
+ dataHint: '2',
+ dataHintDirection: 'top'
+ });
+
+ this.btnNextPage = new Common.UI.Button({
+ parentEl: $markup.findById('#print-next-page'),
+ cls: 'btn-next-page',
+ iconCls: 'arrow',
+ dataHint: '2',
+ dataHintDirection: 'top'
+ });
+
+ this.countOfPages = $markup.findById('#print-count-page');
+
+ this.txtNumberPage = new Common.UI.InputField({
+ el: $markup.findById('#print-number-page'),
+ allowBlank: true,
+ validateOnChange: true,
+ style: 'width: 50px;',
+ maskExp: /[0-9]/,
+ validation: function(value) {
+ if (/(^[0-9]+$)/.test(value)) {
+ value = parseInt(value);
+ if (undefined !== value && value > 0 && value <= me.pageCount)
+ return true;
+ }
+
+ return me.txtPageNumInvalid;
+ },
+ dataHint: '2',
+ dataHintDirection: 'left',
+ dataHintOffset: 'small'
+ });
+
+ this.$el = $(node).html($markup);
+ this.$previewBox = $('#print-preview-box');
+
+ if (_.isUndefined(this.scroller)) {
+ this.scroller = new Common.UI.Scroller({
+ el: this.pnlSettings,
+ suppressScrollX: true,
+ alwaysVisibleY: true
+ });
+ }
+
+ Common.NotificationCenter.on({
+ 'window:resize': function() {
+ me.isVisible() && me.updateScroller();
+ }
+ });
+
+ this.updateMetricUnit();
+
+ this.fireEvent('render:after', this);
+
+ return this;
+ },
+
+ show: function() {
+ Common.UI.BaseView.prototype.show.call(this,arguments);
+ if (this._initSettings) {
+ this.updateMetricUnit();
+ this._initSettings = false;
+ }
+ this.updateScroller();
+ this.fireEvent('show', this);
+ },
+
+ updateScroller: function() {
+ if (this.scroller) {
+ Common.UI.Menu.Manager.hideAll();
+ var scrolled = this.$el.height()< this.pnlTable.height();
+ this.pnlSettings.css('overflow', scrolled ? 'hidden' : 'visible');
+ this.scroller.update();
+ }
+ },
+
+ setMode: function(mode) {
+ this.mode = mode;
+ },
+
+ setApi: function(api) {
+
+ },
+
+ updateMetricUnit: function() {
+ if (!this.cmbPaperSize) return;
+ var store = this.cmbPaperSize.store;
+ for (var i=0; iContact %1 sales team for personal upgrade terms.",
"DE.Controllers.Main.warnNoLicenseUsers": "You've reached the user limit for %1 editors. Contact %1 sales team for personal upgrade terms.",
"DE.Controllers.Main.warnProcessRightsChange": "You have been denied the right to edit the file.",
+ "DE.Controllers.Main.textTryQuickPrint": "You have selected Quick print: the entire document will be printed on the last selected or default printer.
Do you want to continue?",
"DE.Controllers.Navigation.txtBeginning": "Beginning of document",
"DE.Controllers.Navigation.txtGotoBeginning": "Go to the beginning of the document",
"DE.Controllers.Search.notcriticalErrorTitle": "Warning",
@@ -1115,6 +1120,10 @@
"DE.Controllers.Statusbar.textTrackChanges": "The document is opened with the Track Changes mode enabled",
"DE.Controllers.Statusbar.tipReview": "Track changes",
"DE.Controllers.Statusbar.zoomText": "Zoom {0}%",
+ "DE.Controllers.Print.txtCustom": "Custom",
+ "DE.Controllers.Print.txtPrintRangeInvalid": "Invalid print range",
+ "DE.Controllers.Print.textMarginsLast": "Last Custom",
+ "DE.Controllers.Print.txtPrintRangeSingleRange": "Enter either a single page number or a single page range (for example, 5-12). Or you can Print to PDF.",
"DE.Controllers.Toolbar.confirmAddFontName": "The font you are going to save is not available on the current device.
The text style will be displayed using one of the system fonts, the saved font will be used when it is available.
Do you want to continue?",
"DE.Controllers.Toolbar.dataUrl": "Paste a data URL",
"DE.Controllers.Toolbar.notcriticalErrorTitle": "Warning",
@@ -2035,6 +2044,8 @@
"DE.Views.FileMenuPanels.Settings.txtWarnMacrosDesc": "Disable all macros with a notification",
"DE.Views.FileMenuPanels.Settings.txtWin": "as Windows",
"DE.Views.FileMenuPanels.Settings.txtWorkspace": "Workspace",
+ "DE.Views.FileMenuPanels.Settings.txtQuickPrint": "Show the Quick Print button in the editor header",
+ "DE.Views.FileMenuPanels.Settings.txtQuickPrintTip": "The document will be printed on the last selected or default printer",
"DE.Views.FormSettings.textAlways": "Always",
"DE.Views.FormSettings.textAspect": "Lock aspect ratio",
"DE.Views.FormSettings.textAtLeast": "At least",
@@ -2591,6 +2602,33 @@
"DE.Views.ProtectDialog.txtRepeat": "Repeat password",
"DE.Views.ProtectDialog.txtTitle": "Protect",
"DE.Views.ProtectDialog.txtWarning": "Warning: If you lose or forget the password, it cannot be recovered. Please keep it in a safe place.",
+ "DE.Views.PrintWithPreview.txtPrint": "Print",
+ "DE.Views.PrintWithPreview.txtPrintPdf": "Print to PDF",
+ "DE.Views.PrintWithPreview.txtPrintRange": "Print range",
+ "DE.Views.PrintWithPreview.txtCurrentPage": "Current page",
+ "DE.Views.PrintWithPreview.txtAllPages": "All pages",
+ "DE.Views.PrintWithPreview.txtSelection": "Selection",
+ "DE.Views.PrintWithPreview.txtCustomPages": "Custom print",
+ "DE.Views.PrintWithPreview.txtPageSize": "Page size",
+ "DE.Views.PrintWithPreview.txtPageOrientation": "Page orientation",
+ "DE.Views.PrintWithPreview.txtPortrait": "Portrait",
+ "DE.Views.PrintWithPreview.txtLandscape": "Landscape",
+ "DE.Views.PrintWithPreview.txtCustom": "Custom",
+ "DE.Views.PrintWithPreview.txtMargins": "Margins",
+ "DE.Views.PrintWithPreview.txtTop": "Top",
+ "DE.Views.PrintWithPreview.txtBottom": "Bottom",
+ "DE.Views.PrintWithPreview.txtLeft": "Left",
+ "DE.Views.PrintWithPreview.txtRight": "Right",
+ "DE.Views.PrintWithPreview.txtPage": "Page",
+ "DE.Views.PrintWithPreview.txtOf": "of {0}",
+ "DE.Views.PrintWithPreview.txtPageNumInvalid": "Page number invalid",
+ "DE.Views.PrintWithPreview.txtPages": "Pages",
+ "DE.Views.PrintWithPreview.textMarginsLast": "Last Custom",
+ "DE.Views.PrintWithPreview.textMarginsNormal": "Normal",
+ "DE.Views.PrintWithPreview.textMarginsUsNormal": "US Normal",
+ "DE.Views.PrintWithPreview.textMarginsNarrow": "Narrow",
+ "DE.Views.PrintWithPreview.textMarginsModerate": "Moderate",
+ "DE.Views.PrintWithPreview.textMarginsWide": "Wide",
"DE.Views.RightMenu.txtChartSettings": "Chart settings",
"DE.Views.RightMenu.txtFormSettings": "Form Settings",
"DE.Views.RightMenu.txtHeaderFooterSettings": "Header and footer settings",
diff --git a/apps/documenteditor/main/locale/ru.json b/apps/documenteditor/main/locale/ru.json
index b41bb8c0b..1bb1485f9 100644
--- a/apps/documenteditor/main/locale/ru.json
+++ b/apps/documenteditor/main/locale/ru.json
@@ -285,6 +285,8 @@
"Common.define.smartArt.textVerticalPictureList": "Вертикальный список рисунков",
"Common.define.smartArt.textVerticalProcess": "Вертикальный процесс",
"Common.Translation.textMoreButton": "Ещё",
+ "Common.Translation.tipFileLocked": "Документ заблокирован на редактирование. Вы можете внести изменения и сохранить его как локальную копию позже.",
+ "Common.Translation.tipFileReadOnly": "Файл доступен только для чтения. Чтобы сохранить изменения, сохраните файл с новым названием или в другом месте.",
"Common.Translation.warnFileLocked": "Вы не можете редактировать этот файл, потому что он уже редактируется в другом приложении.",
"Common.Translation.warnFileLockedBtnEdit": "Создать копию",
"Common.Translation.warnFileLockedBtnView": "Открыть на просмотр",
@@ -458,6 +460,7 @@
"Common.Views.Header.textCompactView": "Скрыть панель инструментов",
"Common.Views.Header.textHideLines": "Скрыть линейки",
"Common.Views.Header.textHideStatusBar": "Скрыть строку состояния",
+ "Common.Views.Header.textReadOnly": "Только чтение",
"Common.Views.Header.textRemoveFavorite": "Удалить из избранного",
"Common.Views.Header.textShare": "Доступ",
"Common.Views.Header.textZoom": "Масштаб",
@@ -465,6 +468,7 @@
"Common.Views.Header.tipDownload": "Скачать файл",
"Common.Views.Header.tipGoEdit": "Редактировать текущий файл",
"Common.Views.Header.tipPrint": "Напечатать файл",
+ "Common.Views.Header.tipPrintQuick": "Быстрая печать",
"Common.Views.Header.tipRedo": "Повторить",
"Common.Views.Header.tipSave": "Сохранить",
"Common.Views.Header.tipSearch": "Поиск",
@@ -831,6 +835,7 @@
"DE.Controllers.Main.textRequestMacros": "Макрос делает запрос на URL. Вы хотите разрешить запрос на %1?",
"DE.Controllers.Main.textShape": "Фигура",
"DE.Controllers.Main.textStrict": "Строгий режим",
+ "DE.Controllers.Main.textTryQuickPrint": "Вы выбрали быструю печать: весь документ будет напечатан на последнем выбранном принтере или на принтере по умолчанию.
Вы хотите продолжить?",
"DE.Controllers.Main.textTryUndoRedo": "Функции отмены и повтора действий отключены в Быстром режиме совместного редактирования.
Нажмите на кнопку 'Строгий режим' для переключения в Строгий режим совместного редактирования, чтобы редактировать файл без вмешательства других пользователей и отправлять изменения только после того, как вы их сохраните. Переключаться между режимами совместного редактирования можно с помощью Дополнительных параметров редактора.",
"DE.Controllers.Main.textTryUndoRedoWarn": "Функции отмены и повтора действий отключены в Быстром режиме совместного редактирования.",
"DE.Controllers.Main.textUndo": "Отменить",
@@ -1104,6 +1109,10 @@
"DE.Controllers.Main.warnProcessRightsChange": "Вам было отказано в праве на редактирование этого файла.",
"DE.Controllers.Navigation.txtBeginning": "Начало документа",
"DE.Controllers.Navigation.txtGotoBeginning": "Перейти в начало документа",
+ "DE.Controllers.Print.textMarginsLast": "Последние настраиваемые",
+ "DE.Controllers.Print.txtCustom": "Пользовательское",
+ "DE.Controllers.Print.txtPrintRangeInvalid": "Неправильный диапазон печати",
+ "DE.Controllers.Print.txtPrintRangeSingleRange": "Введите или один номер страницы, или один диапазон страниц (например, 5-12). Или вы можете выбрать печать в PDF.",
"DE.Controllers.Search.notcriticalErrorTitle": "Внимание",
"DE.Controllers.Search.textNoTextFound": "Искомые данные не найдены. Пожалуйста, измените параметры поиска.",
"DE.Controllers.Search.textReplaceSkipped": "Замена выполнена. Пропущено вхождений - {0}.",
@@ -2022,6 +2031,8 @@
"DE.Views.FileMenuPanels.Settings.txtNone": "Никакие",
"DE.Views.FileMenuPanels.Settings.txtProofing": "Правописание",
"DE.Views.FileMenuPanels.Settings.txtPt": "Пункт",
+ "DE.Views.FileMenuPanels.Settings.txtQuickPrint": "Показывать кнопку Быстрая печать в шапке редактора",
+ "DE.Views.FileMenuPanels.Settings.txtQuickPrintTip": "Документ будет напечатан на последнем выбранном принтере или на принтере по умолчанию",
"DE.Views.FileMenuPanels.Settings.txtRunMacros": "Включить все",
"DE.Views.FileMenuPanels.Settings.txtRunMacrosDesc": "Включить все макросы без уведомления",
"DE.Views.FileMenuPanels.Settings.txtShowTrackChanges": "Показывать изменения при рецензировании",
@@ -2591,6 +2602,33 @@
"DE.Views.ProtectDialog.txtRepeat": "Повторить пароль",
"DE.Views.ProtectDialog.txtTitle": "Защитить",
"DE.Views.ProtectDialog.txtWarning": "Внимание: Если пароль забыт или утерян, его нельзя восстановить. Храните его в надежном месте.",
+ "DE.Views.PrintWithPreview.textMarginsLast": "Последние настраиваемые",
+ "DE.Views.PrintWithPreview.textMarginsModerate": "Средние",
+ "DE.Views.PrintWithPreview.textMarginsNarrow": "Узкие",
+ "DE.Views.PrintWithPreview.textMarginsNormal": "Обычные",
+ "DE.Views.PrintWithPreview.textMarginsUsNormal": "Обычные (американский стандарт)",
+ "DE.Views.PrintWithPreview.textMarginsWide": "Широкие",
+ "DE.Views.PrintWithPreview.txtAllPages": "Все страницы",
+ "DE.Views.PrintWithPreview.txtBottom": "Нижнее",
+ "DE.Views.PrintWithPreview.txtCurrentPage": "Текущая страница",
+ "DE.Views.PrintWithPreview.txtCustom": "Пользовательское",
+ "DE.Views.PrintWithPreview.txtCustomPages": "Настраиваемая печать",
+ "DE.Views.PrintWithPreview.txtLandscape": "Альбомная",
+ "DE.Views.PrintWithPreview.txtLeft": "Левое",
+ "DE.Views.PrintWithPreview.txtMargins": "Поля",
+ "DE.Views.PrintWithPreview.txtOf": "из {0}",
+ "DE.Views.PrintWithPreview.txtPage": "Страница",
+ "DE.Views.PrintWithPreview.txtPageNumInvalid": "Неправильный номер страницы",
+ "DE.Views.PrintWithPreview.txtPageOrientation": "Ориентация страницы",
+ "DE.Views.PrintWithPreview.txtPages": "Страницы",
+ "DE.Views.PrintWithPreview.txtPageSize": "Размер страницы",
+ "DE.Views.PrintWithPreview.txtPortrait": "Книжная",
+ "DE.Views.PrintWithPreview.txtPrint": "Печать",
+ "DE.Views.PrintWithPreview.txtPrintPdf": "Печать в PDF",
+ "DE.Views.PrintWithPreview.txtPrintRange": "Диапазон печати",
+ "DE.Views.PrintWithPreview.txtRight": "Правое",
+ "DE.Views.PrintWithPreview.txtSelection": "Выделенный фрагмент",
+ "DE.Views.PrintWithPreview.txtTop": "Верхнее",
"DE.Views.RightMenu.txtChartSettings": "Параметры диаграммы",
"DE.Views.RightMenu.txtFormSettings": "Параметры формы",
"DE.Views.RightMenu.txtHeaderFooterSettings": "Параметры верхнего и нижнего колонтитулов",
diff --git a/apps/documenteditor/main/resources/less/filemenu.less b/apps/documenteditor/main/resources/less/filemenu.less
index eab2e5353..e24905f5f 100644
--- a/apps/documenteditor/main/resources/less/filemenu.less
+++ b/apps/documenteditor/main/resources/less/filemenu.less
@@ -533,4 +533,111 @@ table {
padding: 5px 0;
}
}
-}
\ No newline at end of file
+}
+
+#file-menu-panel {
+ #panel-print {
+ padding: 0;
+
+ #id-print-settings {
+ position: absolute;
+ width:280px;
+ top: 0;
+ bottom: 0;
+ }
+ .print-settings {
+ width: 100%;
+ height: 100%;
+ overflow: hidden;
+ display: flex;
+ flex-direction: column;
+ border-right: @scaled-one-px-value-ie solid @border-toolbar-ie;
+ border-right: @scaled-one-px-value solid @border-toolbar;
+ label.header {
+ font-weight: 700;
+ }
+ .footer {
+ .btn.primary {
+ margin-right: 8px;
+ }
+ }
+ .settings-container {
+ width: 100%;
+ height: 100%;
+ overflow: hidden;
+ padding: 12px 16px;
+ .padding-small {
+ padding-bottom: 8px;
+ }
+ .padding-large {
+ padding-bottom: 16px;
+ }
+
+ #print-apply-all {
+ margin-top: 5px;
+ }
+ .link {
+ margin-top: 9px;
+ }
+ .footer {
+ margin-top: 24px;
+ }
+ }
+ }
+ #print-navigation {
+ height: 50px;
+ padding-left: 20px;
+ padding-top: 10px;
+ display: flex;
+ .btn-prev-page, .btn-next-page {
+ background-color: transparent;
+ padding: 0;
+ height: 20px;
+ width: 20px;
+ i.arrow {
+ display: inline-block;
+ width: 10px;
+ height: 10px;
+
+ border: solid @scaled-one-px-value-ie @icon-normal-ie;
+ border: solid @scaled-one-px-value @icon-normal;
+ border-bottom: none;
+ border-right: none;
+ }
+ &.disabled {
+ opacity: @component-disabled-opacity;
+ }
+
+ &:hover:not(:disabled):not(.disabled) {
+ background-color: @highlight-button-hover-ie;
+ background-color: @highlight-button-hover;
+ }
+ }
+ .btn-prev-page {
+ i {
+ transform: rotate(-45deg) translate(-1px, 3px);
+ }
+ }
+ .btn-next-page {
+ i {
+ transform: rotate(135deg) translate(4px, 0px);
+ }
+ }
+ .page-number {
+ display: flex;
+ align-items: center;
+ height: 20px;
+ margin-left: 10px;
+ label {
+ .font-weight-bold();
+ }
+ #print-count-page, #print-number-page {
+ margin-left: 4px;
+ }
+ }
+ }
+ #print-preview {
+ height: calc(100% - 50px);
+ }
+ }
+}
diff --git a/apps/presentationeditor/main/app.js b/apps/presentationeditor/main/app.js
index b2343b81e..8cba9cd5b 100644
--- a/apps/presentationeditor/main/app.js
+++ b/apps/presentationeditor/main/app.js
@@ -151,6 +151,7 @@ require([
'Main',
'ViewTab',
'Search',
+ 'Print',
'Common.Controllers.Fonts',
'Common.Controllers.History'
/** coauthoring begin **/
@@ -181,6 +182,7 @@ require([
'presentationeditor/main/app/controller/Main',
'presentationeditor/main/app/controller/ViewTab',
'presentationeditor/main/app/controller/Search',
+ 'presentationeditor/main/app/controller/Print',
'presentationeditor/main/app/view/FileMenuPanels',
'presentationeditor/main/app/view/ParagraphSettings',
'presentationeditor/main/app/view/ImageSettings',
diff --git a/apps/presentationeditor/main/app/controller/LeftMenu.js b/apps/presentationeditor/main/app/controller/LeftMenu.js
index a98940890..a0a351eb2 100644
--- a/apps/presentationeditor/main/app/controller/LeftMenu.js
+++ b/apps/presentationeditor/main/app/controller/LeftMenu.js
@@ -110,6 +110,7 @@ define([
if ( !this.leftMenu.panelHistory.isVisible() )
this.clickMenuFileItem(null, 'history');
}, this));
+ Common.NotificationCenter.on('file:print', _.bind(this.clickToolbarPrint, this));
},
onLaunch: function() {
@@ -799,6 +800,13 @@ define([
this.onLeftMenuHide(null, true);
},
+ clickToolbarPrint: function () {
+ if (this.mode.canPreviewPrint)
+ this.leftMenu.showMenu('file:printpreview');
+ else if (this.mode.canPrint)
+ this.clickMenuFileItem(null, 'print');
+ },
+
textNoTextFound : 'Text not found',
newDocumentTitle : 'Unnamed document',
requestEditRightsText : 'Requesting editing rights...',
diff --git a/apps/presentationeditor/main/app/controller/Main.js b/apps/presentationeditor/main/app/controller/Main.js
index 4f0127070..246bbb588 100644
--- a/apps/presentationeditor/main/app/controller/Main.js
+++ b/apps/presentationeditor/main/app/controller/Main.js
@@ -1190,6 +1190,9 @@ define([
console.log("Obsolete: The 'chat' parameter of the 'customization' section is deprecated. Please use 'chat' parameter in the permissions instead.");
}
this.appOptions.canPrint = (this.permissions.print !== false);
+ this.appOptions.canPreviewPrint = this.appOptions.canPrint && !Common.Utils.isMac && this.appOptions.isDesktopApp;
+ this.appOptions.canQuickPrint = this.appOptions.canPrint && !Common.Utils.isMac && this.appOptions.isDesktopApp &&
+ !(this.editorConfig.customization && this.editorConfig.customization.compactHeader);
this.appOptions.canRename = this.editorConfig.canRename;
this.appOptions.canForcesave = this.appOptions.isEdit && !this.appOptions.isOffline && (typeof (this.editorConfig.customization) == 'object' && !!this.editorConfig.customization.forcesave);
this.appOptions.forcesave = this.appOptions.canForcesave;
@@ -1323,6 +1326,9 @@ define([
documentHolder.setMode(this.appOptions);
viewport.applyCommonMode();
+ var printController = app.getController('Print');
+ printController && this.api && printController.setApi(this.api).setMode(this.appOptions);
+
this.api.asc_registerCallback('asc_onSendThemeColors', _.bind(this.onSendThemeColors, this));
this.api.asc_registerCallback('asc_onDownloadUrl', _.bind(this.onDownloadUrl, this));
this.api.asc_registerCallback('asc_onDocumentModifiedChanged', _.bind(this.onDocumentModifiedChanged, this));
@@ -1971,6 +1977,7 @@ define([
Common.Utils.InternalSettings.set("pe-settings-unit", value);
this.api.asc_SetDocumentUnits((value==Common.Utils.Metric.c_MetricUnits.inch) ? Asc.c_oAscDocumentUnits.Inch : ((value==Common.Utils.Metric.c_MetricUnits.pt) ? Asc.c_oAscDocumentUnits.Point : Asc.c_oAscDocumentUnits.Millimeter));
this.getApplication().getController('RightMenu').updateMetricUnit();
+ this.appOptions.canPreviewPrint && this.getApplication().getController('Print').getView('PrintWithPreview').updateMetricUnit();
},
updateThemeColors: function() {
@@ -2224,9 +2231,7 @@ define([
onPrint: function() {
if (!this.appOptions.canPrint || Common.Utils.ModalWindow.isVisible()) return;
-
- if (this.api)
- this.api.asc_Print(new Asc.asc_CDownloadOptions(null, Common.Utils.isChrome || Common.Utils.isOpera || Common.Utils.isGecko && Common.Utils.firefoxVersion>86)); // if isChrome or isOpera == true use asc_onPrintUrl event
+ Common.NotificationCenter.trigger('file:print');
Common.component.Analytics.trackEvent('Print');
},
@@ -2259,6 +2264,39 @@ define([
if (url) this.iframePrint.src = url;
},
+ onPrintQuick: function() {
+ if (!this.appOptions.canQuickPrint) return;
+
+ var value = Common.localStorage.getBool("pe-hide-quick-print-warning"),
+ me = this,
+ handler = function () {
+ var printopt = new Asc.asc_CAdjustPrint();
+ printopt.asc_setNativeOptions({quickPrint: true});
+ var opts = new Asc.asc_CDownloadOptions();
+ opts.asc_setAdvancedOptions(printopt);
+ me.api.asc_Print(opts);
+ Common.component.Analytics.trackEvent('Print');
+ };
+
+ if (value) {
+ handler.call(this);
+ } else {
+ Common.UI.warning({
+ msg: this.textTryQuickPrint,
+ buttons: ['yes', 'no'],
+ primary: 'yes',
+ dontshow: true,
+ maxwidth: 500,
+ callback: function(btn, dontshow){
+ dontshow && Common.localStorage.setBool("pe-hide-quick-print-warning", true);
+ if (btn === 'yes') {
+ setTimeout(handler, 1);
+ }
+ }
+ });
+ }
+ },
+
onAdvancedOptions: function(type, advOptions) {
if (this._state.openDlg) return;
@@ -3056,7 +3094,8 @@ define([
errorInconsistentExtPptx: 'An error has occurred while opening the file.
The file content corresponds to presentations (e.g. pptx), but the file has the inconsistent extension: %1.',
errorInconsistentExtPdf: 'An error has occurred while opening the file.
The file content corresponds to one of the following formats: pdf/djvu/xps/oxps, but the file has the inconsistent extension: %1.',
errorInconsistentExt: 'An error has occurred while opening the file.
The file content does not match the file extension.',
- errorCannotPasteImg: 'We can\'t paste this image from the Clipboard, but you can save it to your device and \ninsert it from there, or you can copy the image without text and paste it into the presentation.'
+ errorCannotPasteImg: 'We can\'t paste this image from the Clipboard, but you can save it to your device and \ninsert it from there, or you can copy the image without text and paste it into the presentation.',
+ textTryQuickPrint: 'You have selected Quick print: the entire document will be printed on the last selected or default printer.
Do you want to continue?'
}
})(), PE.Controllers.Main || {}))
});
diff --git a/apps/presentationeditor/main/app/controller/Print.js b/apps/presentationeditor/main/app/controller/Print.js
new file mode 100644
index 000000000..2fc123f63
--- /dev/null
+++ b/apps/presentationeditor/main/app/controller/Print.js
@@ -0,0 +1,348 @@
+/*
+ *
+ * (c) Copyright Ascensio System SIA 2010-2022
+ *
+ * This program is a free software product. You can redistribute it and/or
+ * modify it under the terms of the GNU Affero General Public License (AGPL)
+ * version 3 as published by the Free Software Foundation. In accordance with
+ * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect
+ * that Ascensio System SIA expressly excludes the warranty of non-infringement
+ * of any third-party rights.
+ *
+ * This program is distributed WITHOUT ANY WARRANTY; without even the implied
+ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For
+ * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html
+ *
+ * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha
+ * street, Riga, Latvia, EU, LV-1050.
+ *
+ * The interactive user interfaces in modified source and object code versions
+ * of the Program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU AGPL version 3.
+ *
+ * Pursuant to Section 7(b) of the License you must retain the original Product
+ * logo when distributing the program. Pursuant to Section 7(e) we decline to
+ * grant you any rights under trademark law for use of our trademarks.
+ *
+ * All the Product's GUI elements, including illustrations and icon sets, as
+ * well as technical writing content are licensed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International. See the License
+ * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
+ *
+*/
+define([
+ 'core',
+ 'presentationeditor/main/app/view/FileMenuPanels'
+], function () {
+ 'use strict';
+
+ PE.Controllers.Print = Backbone.Controller.extend(_.extend({
+ views: [
+ 'PrintWithPreview'
+ ],
+
+ initialize: function() {
+ this.adjPrintParams = new Asc.asc_CAdjustPrint();
+
+ this._state = {};
+ this._paperSize = undefined;
+ this._navigationPreview = {
+ pageCount: false,
+ currentPage: 0,
+ currentPreviewPage: 0
+ };
+
+ this._isPreviewVisible = false;
+
+ this.addListeners({
+ 'PrintWithPreview': {
+ 'show': _.bind(this.onShowMainSettingsPrint, this),
+ 'render:after': _.bind(this.onAfterRender, this)
+ }
+ });
+ },
+
+ onLaunch: function() {
+ this.printSettings = this.createView('PrintWithPreview');
+ },
+
+ onAfterRender: function(view) {
+ var me = this;
+ this.printSettings.menu.on('menu:hide', _.bind(this.onHidePrintMenu, this));
+ this.printSettings.btnPrint.on('click', _.bind(this.onBtnPrint, this, true));
+ this.printSettings.btnPrintPdf.on('click', _.bind(this.onBtnPrint, this, false));
+ this.printSettings.btnPrevPage.on('click', _.bind(this.onChangePreviewPage, this, false));
+ this.printSettings.btnNextPage.on('click', _.bind(this.onChangePreviewPage, this, true));
+ this.printSettings.txtNumberPage.on({
+ 'keypress:after': _.bind(this.onKeypressPageNumber, this),
+ 'keyup:after': _.bind(this.onKeyupPageNumber, this)
+ });
+ this.printSettings.txtNumberPage.cmpEl.find('input').on('blur', _.bind(this.onBlurPageNumber, this));
+ this.printSettings.cmbRange.on('selected', _.bind(this.comboRangeChange, this));
+ this.printSettings.inputPages.on('changing', _.bind(this.inputPagesChanging, this));
+ this.printSettings.inputPages.validation = function(value) {
+ if (!_.isEmpty(value) && /[0-9,\-]/.test(value)) {
+ var res = [],
+ arr = value.split(',');
+ if (me._isPrint && arr.length>1)
+ return me.txtPrintRangeSingleRange;
+
+ for (var i=0; i1) // more than 1 symbol '-'
+ return me.txtPrintRangeInvalid;
+ if (!str) {// one number
+ var num = parseInt(item)-1;
+ (num>=0) && res.push(num);
+ } else { // range
+ var pages = item.split('-'),
+ start = (pages[0] ? parseInt(pages[0])-1 : 0),
+ end = (pages[1] ? parseInt(pages[1])-1 : me._navigationPreview.pageCount-1);
+ if (start>end) {
+ var num = start;
+ start = end;
+ end = num;
+ }
+ for (var j=start; j<=end; j++) {
+ (j>=0) && res.push(j);
+ }
+ }
+ }
+ if (res.length>0) {
+ return true;
+ }
+ }
+
+ return me.txtPrintRangeInvalid;
+ };
+ this.printSettings.cmbPaperSize.on('selected', _.bind(this.onPaperSizeSelect, this));
+ this._paperSize = this.printSettings.cmbPaperSize.getSelectedRecord().size;
+
+ Common.NotificationCenter.on('window:resize', _.bind(function () {
+ if (this._isPreviewVisible) {
+ this.api.asc_drawPrintPreview(this._navigationPreview.currentPreviewPage, this._paperSize);
+ }
+ }, this));
+
+ var eventname = (/Firefox/i.test(navigator.userAgent))? 'DOMMouseScroll' : 'mousewheel';
+ this.printSettings.$previewBox.on(eventname, _.bind(this.onPreviewWheel, this));
+ },
+
+ setMode: function (mode) {
+ this.mode = mode;
+ this.printSettings && this.printSettings.setMode(mode);
+ },
+
+ setApi: function(o) {
+ this.api = o;
+ this.api.asc_registerCallback('asc_onCountPages', _.bind(this.onCountPages, this));
+ this.api.asc_registerCallback('asc_onCurrentPage', _.bind(this.onCurrentPage, this));
+
+ return this;
+ },
+
+ comboRangeChange: function(combo, record) {
+ if (record.value === -1) {
+ var me = this;
+ setTimeout(function(){
+ me.printSettings.inputPages.focus();
+ }, 50);
+ } else {
+ this.printSettings.inputPages.setValue('');
+ }
+ this.printSettings.inputPages.showError();
+ },
+
+ onCountPages: function(count) {
+ this._navigationPreview.pageCount = count;
+
+ if (this.printSettings.isVisible()) {
+ this.printSettings.$previewBox.toggleClass('hidden', !this._navigationPreview.pageCount);
+ this.printSettings.$previewEmpty.toggleClass('hidden', !!this._navigationPreview.pageCount);
+ }
+ if (!!this._navigationPreview.pageCount) {
+ if (this._navigationPreview.currentPreviewPage > count - 1)
+ this._navigationPreview.currentPreviewPage = Math.max(0, count - 1);
+ if (this.printSettings.isVisible()) {
+ this.api.asc_drawPrintPreview(this._navigationPreview.currentPreviewPage, this._paperSize);
+ this.updateNavigationButtons(this._navigationPreview.currentPreviewPage, count);
+ }
+ }
+ },
+
+ onCurrentPage: function(number) {
+ this._navigationPreview.currentPreviewPage = number;
+ if (this.printSettings.isVisible()) {
+ this.api.asc_drawPrintPreview(this._navigationPreview.currentPreviewPage, this._paperSize);
+ this.updateNavigationButtons(this._navigationPreview.currentPreviewPage, this._navigationPreview.pageCount);
+ }
+ },
+
+ onShowMainSettingsPrint: function() {
+ var me = this;
+ this.printSettings.$previewBox.removeClass('hidden');
+
+ var opts = new Asc.asc_CDownloadOptions(null, Common.Utils.isChrome || Common.Utils.isOpera || Common.Utils.isGecko && Common.Utils.firefoxVersion>86);
+ opts.asc_setAdvancedOptions(this.adjPrintParams);
+ this.api.asc_initPrintPreview('print-preview', opts);
+
+ this.printSettings.$previewBox.toggleClass('hidden', !this._navigationPreview.pageCount);
+ this.printSettings.$previewEmpty.toggleClass('hidden', !!this._navigationPreview.pageCount);
+ if (!!this._navigationPreview.pageCount) {
+ this._navigationPreview.currentPreviewPage = this._navigationPreview.currentPage = this.api.getCurrentPage();
+ this.api.asc_drawPrintPreview(this._navigationPreview.currentPreviewPage, this._paperSize);
+ this.updateNavigationButtons(this._navigationPreview.currentPreviewPage, this._navigationPreview.pageCount);
+ this.SetDisabled();
+ }
+ this._isPreviewVisible = true;
+ },
+
+ getPrintParams: function() {
+ return this.adjPrintParams;
+ },
+
+ onHidePrintMenu: function () {
+ if (this._isPreviewVisible) {
+ this.api.asc_closePrintPreview && this.api.asc_closePrintPreview();
+ this._isPreviewVisible = false;
+ }
+ },
+
+ onChangePreviewPage: function (next) {
+ var index = this._navigationPreview.currentPreviewPage;
+ if (next) {
+ index++;
+ index = Math.min(index, this._navigationPreview.pageCount - 1);
+ } else {
+ index--;
+ index = Math.max(index, 0);
+ }
+ this.api.goToPage(index);
+ },
+
+ onKeypressPageNumber: function (input, e) {
+ if (e.keyCode === Common.UI.Keys.RETURN) {
+ var box = this.printSettings.$el.find('#print-number-page'),
+ edit = box.find('input[type=text]'), page = parseInt(edit.val());
+ if (!page || page > this._navigationPreview.pageCount || page < 0) {
+ edit.select();
+ this.printSettings.txtNumberPage.setValue(this._navigationPreview.currentPreviewPage + 1);
+ this.printSettings.txtNumberPage.checkValidate();
+ return false;
+ }
+
+ box.focus(); // for IE
+
+ this.api.goToPage(page-1);
+ this.api.asc_enableKeyEvents(true);
+ return false;
+ }
+ },
+
+ onKeyupPageNumber: function (input, e) {
+ if (e.keyCode === Common.UI.Keys.ESC) {
+ var box = this.printSettings.$el.find('#print-number-page');
+ box.focus(); // for IE
+ this.api.asc_enableKeyEvents(true);
+ return false;
+ }
+ },
+
+ onBlurPageNumber: function () {
+ if (this.printSettings.txtNumberPage.getValue() != this._navigationPreview.currentPreviewPage + 1) {
+ this.printSettings.txtNumberPage.setValue(this._navigationPreview.currentPreviewPage + 1);
+ this.printSettings.txtNumberPage.checkValidate();
+ }
+ },
+
+ onPreviewWheel: function (e) {
+ if (e.ctrlKey) {
+ e.preventDefault();
+ e.stopImmediatePropagation();
+ }
+ var forward = (e.deltaY || (e.detail && -e.detail) || e.wheelDelta) < 0;
+ this.onChangePreviewPage(forward);
+ },
+
+ updateNavigationButtons: function (page, count) {
+ this._navigationPreview.currentPage = page;
+ this.printSettings.updateCurrentPage(page);
+ this._navigationPreview.pageCount = count;
+ this.printSettings.updateCountOfPages(count);
+ this.disableNavButtons();
+ },
+
+ disableNavButtons: function (force) {
+ if (force) {
+ this.printSettings.btnPrevPage.setDisabled(true);
+ this.printSettings.btnNextPage.setDisabled(true);
+ return;
+ }
+ var curPage = this._navigationPreview.currentPage,
+ pageCount = this._navigationPreview.pageCount;
+ this.printSettings.btnPrevPage.setDisabled(curPage < 1);
+ this.printSettings.btnNextPage.setDisabled(curPage > pageCount - 2);
+ },
+
+ onBtnPrint: function(print) {
+ this._isPrint = print;
+ if (this.printSettings.cmbRange.getValue()===-1 && this.printSettings.inputPages.checkValidate() !== true) {
+ this.printSettings.inputPages.focus();
+ this.isInputFirstChange = true;
+ return;
+ }
+ if (this._navigationPreview.pageCount<1)
+ return;
+
+ var rec = this.printSettings.cmbPaperSize.getSelectedRecord();
+ this.adjPrintParams.asc_setNativeOptions({
+ pages: this.printSettings.cmbRange.getValue()===-1 ? this.printSettings.inputPages.getValue() : this.printSettings.cmbRange.getValue(),
+ paperSize: {
+ w: rec ? rec.size[0] : undefined,
+ h: rec ? rec.size[1] : undefined,
+ preset: rec ? rec.caption : undefined
+ }
+ });
+
+ if ( print ) {
+ var opts = new Asc.asc_CDownloadOptions(null, Common.Utils.isChrome || Common.Utils.isOpera || Common.Utils.isGecko && Common.Utils.firefoxVersion>86);
+ opts.asc_setAdvancedOptions(this.adjPrintParams);
+ this.api.asc_Print(opts);
+ } else {
+ var opts = new Asc.asc_CDownloadOptions(Asc.c_oAscFileType.PDF);
+ opts.asc_setAdvancedOptions(this.adjPrintParams);
+ this.api.asc_DownloadAs(opts);
+ }
+ this.printSettings.menu.hide();
+ },
+
+ inputPagesChanging: function (input, value) {
+ this.isInputFirstChange && this.printSettings.inputPages.showError();
+ this.isInputFirstChange = false;
+
+ if (value.length<1)
+ this.printSettings.cmbRange.setValue('all');
+ else if (this.printSettings.cmbRange.getValue()!==-1)
+ this.printSettings.cmbRange.setValue(-1);
+ },
+
+ onPaperSizeSelect: function(combo, record) {
+ if (record) {
+ this._paperSize = record.size;
+ this.api.asc_drawPrintPreview(this._navigationPreview.currentPreviewPage, this._paperSize);
+ }
+ },
+
+ SetDisabled: function() {
+ if (this.printSettings.isVisible()) {
+ var disable = !this.mode.isEdit;
+ }
+ },
+
+ txtPrintRangeInvalid: 'Invalid print range',
+ txtPrintRangeSingleRange: 'Enter either a single slide number or a single slide range (for example, 5-12). Or you can Print to PDF.'
+ }, PE.Controllers.Print || {}));
+});
\ No newline at end of file
diff --git a/apps/presentationeditor/main/app/controller/Toolbar.js b/apps/presentationeditor/main/app/controller/Toolbar.js
index b441a9ea1..37c7f482b 100644
--- a/apps/presentationeditor/main/app/controller/Toolbar.js
+++ b/apps/presentationeditor/main/app/controller/Toolbar.js
@@ -151,6 +151,10 @@ define([
var _main = this.getApplication().getController('Main');
_main.onPrint();
},
+ 'print-quick': function (opts) {
+ var _main = this.getApplication().getController('Main');
+ _main.onPrintQuick();
+ },
'save': function (opts) {
this.api.asc_Save();
},
@@ -1079,9 +1083,7 @@ define([
},
onPrint: function(e) {
- if (this.api)
- this.api.asc_Print(new Asc.asc_CDownloadOptions(null, Common.Utils.isChrome || Common.Utils.isOpera || Common.Utils.isGecko && Common.Utils.firefoxVersion>86)); // if isChrome or isOpera == true use asc_onPrintUrl event
-
+ Common.NotificationCenter.trigger('file:print', this.toolbar);
Common.NotificationCenter.trigger('edit:complete', this.toolbar);
Common.component.Analytics.trackEvent('Print');
diff --git a/apps/presentationeditor/main/app/controller/Viewport.js b/apps/presentationeditor/main/app/controller/Viewport.js
index 4ab619c49..11dab34ef 100644
--- a/apps/presentationeditor/main/app/controller/Viewport.js
+++ b/apps/presentationeditor/main/app/controller/Viewport.js
@@ -72,7 +72,8 @@ define([
this.addListeners({
'FileMenu': {
'menu:hide': me.onFileMenu.bind(me, 'hide'),
- 'menu:show': me.onFileMenu.bind(me, 'show')
+ 'menu:show': me.onFileMenu.bind(me, 'show'),
+ 'settings:apply': me.applySettings.bind(me)
},
'Toolbar': {
'render:before' : function (toolbar) {
@@ -80,6 +81,10 @@ define([
toolbar.setExtra('right', me.header.getPanel('right', config));
if (!config.isEdit || config.customization && !!config.customization.compactHeader)
toolbar.setExtra('left', me.header.getPanel('left', config));
+ var value = Common.localStorage.getBool("pe-settings-quick-print-button", true);
+ Common.Utils.InternalSettings.set("pe-settings-quick-print-button", value);
+ if (me.header && me.header.btnPrintQuick)
+ me.header.btnPrintQuick[value ? 'show' : 'hide']();
},
'view:compact' : function (toolbar, state) {
me.viewport.vlayout.getItem('toolbar').height = state ?
@@ -102,6 +107,8 @@ define([
'print:disabled' : function (state) {
if ( me.header.btnPrint )
me.header.btnPrint.setDisabled(state);
+ if ( me.header.btnPrintQuick )
+ me.header.btnPrintQuick.setDisabled(state);
},
'save:disabled' : function (state) {
if ( me.header.btnSave )
@@ -312,6 +319,13 @@ define([
me.header.lockHeaderBtns( 'users', _need_disable );
},
+ applySettings: function () {
+ var value = Common.localStorage.getBool("pe-settings-quick-print-button", true);
+ Common.Utils.InternalSettings.set("pe-settings-quick-print-button", value);
+ if (this.header && this.header.btnPrintQuick)
+ this.header.btnPrintQuick[value ? 'show' : 'hide']();
+ },
+
onApiCoAuthoringDisconnect: function(enableDownload) {
if (this.header) {
if (this.header.btnDownload && !enableDownload)
@@ -320,6 +334,8 @@ define([
this.header.btnPrint.hide();
if (this.header.btnEdit)
this.header.btnEdit.hide();
+ if (this.header.btnPrintQuick && !enableDownload)
+ this.header.btnPrintQuick.hide();
this.header.lockHeaderBtns( 'rename-user', true);
}
},
diff --git a/apps/presentationeditor/main/app/template/FileMenu.template b/apps/presentationeditor/main/app/template/FileMenu.template
index 3ad620221..ba1e7d69d 100644
--- a/apps/presentationeditor/main/app/template/FileMenu.template
+++ b/apps/presentationeditor/main/app/template/FileMenu.template
@@ -8,6 +8,7 @@
+
@@ -34,4 +35,5 @@
+
\ No newline at end of file
diff --git a/apps/presentationeditor/main/app/view/FileMenu.js b/apps/presentationeditor/main/app/view/FileMenu.js
index 3f5a3d15b..134a7625c 100644
--- a/apps/presentationeditor/main/app/view/FileMenu.js
+++ b/apps/presentationeditor/main/app/view/FileMenu.js
@@ -171,6 +171,17 @@ define([
dataHintTitle: 'P'
});
+ this.miPrintWithPreview = new Common.UI.MenuItem({
+ el : $markup.elementById('#fm-btn-print-with-preview'),
+ action : 'printpreview',
+ caption : this.btnPrintCaption,
+ canFocused: false,
+ dataHint: 1,
+ dataHintDirection: 'left-top',
+ dataHintOffset: [2, 14],
+ dataHintTitle: 'P'
+ });
+
this.miRename = new Common.UI.MenuItem({
el : $markup.elementById('#fm-btn-rename'),
action : 'rename',
@@ -292,6 +303,7 @@ define([
this.miSaveCopyAs,
this.miSaveAs,
this.miPrint,
+ this.miPrintWithPreview,
this.miRename,
this.miProtect,
this.miRecent,
@@ -381,7 +393,8 @@ define([
this.miSaveAs[(this.mode.canDownload && this.mode.isDesktopApp && this.mode.isOffline)?'show':'hide']();
this.miSave[this.mode.isEdit && Common.UI.LayoutManager.isElementVisible('toolbar-file-save') ?'show':'hide']();
this.miEdit[!this.mode.isEdit && this.mode.canEdit && this.mode.canRequestEditRights ?'show':'hide']();
- this.miPrint[this.mode.canPrint?'show':'hide']();
+ this.miPrint[this.mode.canPrint && !this.mode.canPreviewPrint ?'show':'hide']();
+ this.miPrintWithPreview[this.mode.canPreviewPrint?'show':'hide']();
this.miRename[(this.mode.canRename && !this.mode.isDesktopApp) ?'show':'hide']();
this.miProtect[this.mode.canProtect ?'show':'hide']();
separatorVisible = (this.mode.canDownload || this.mode.isEdit && Common.UI.LayoutManager.isElementVisible('toolbar-file-save') || this.mode.canPrint || this.mode.canProtect ||
@@ -462,6 +475,12 @@ define([
this.panels['help'].setLangConfig(this.mode.lang);
}
+ if (this.mode.canPreviewPrint) {
+ var printPanel = PE.getController('Print').getView('PrintWithPreview');
+ printPanel.menu = this;
+ !this.panels['printpreview'] && (this.panels['printpreview'] = printPanel.render(this.$el.find('#panel-print')));
+ }
+
if ( Common.Controllers.Desktop.isActive() ) {
$('').insertAfter($('#fm-btn-recent', this.$el));
this.items.push(
diff --git a/apps/presentationeditor/main/app/view/FileMenuPanels.js b/apps/presentationeditor/main/app/view/FileMenuPanels.js
index 7e0e0ba5b..523cdff75 100644
--- a/apps/presentationeditor/main/app/view/FileMenuPanels.js
+++ b/apps/presentationeditor/main/app/view/FileMenuPanels.js
@@ -266,7 +266,12 @@ define([
'',
' | ',
' ',
-
+ '',
+ '',
+ ' ',
+ ' | ',
+ ' ',
'',
' | ',
' | ',
@@ -536,6 +541,17 @@ define([
})).on('click', _.bind(me.applySettings, me));
});
+ this.chQuickPrint = new Common.UI.CheckBox({
+ el: $markup.findById('#fms-chb-quick-print'),
+ labelText: '',
+ dataHint: '2',
+ dataHintDirection: 'left',
+ dataHintOffset: 'small'
+ });
+ this.chQuickPrint.$el.parent().on('click', function (){
+ me.chQuickPrint.setValue(!me.chQuickPrint.isChecked());
+ });
+
this.pnlSettings = $markup.find('.flex-settings').addBack().filter('.flex-settings');
this.pnlApply = $markup.find('.fms-flex-apply').addBack().filter('.fms-flex-apply');
this.pnlTable = this.pnlSettings.find('table');
@@ -597,6 +613,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']();
if ( !Common.UI.Themes.available() ) {
$('tr.themes, tr.themes + tr.divider', this.el).hide();
@@ -658,6 +675,7 @@ define([
this.lblMacrosDesc.text(item ? item.get('descValue') : this.txtWarnMacrosDesc);
this.chPaste.setValue(Common.Utils.InternalSettings.get("pe-settings-paste-button"));
+ this.chQuickPrint.setValue(Common.Utils.InternalSettings.get("pe-settings-quick-print-button"));
var data = [];
for (var t in Common.UI.Themes.map()) {
@@ -704,6 +722,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("pe-settings-quick-print-button", this.chQuickPrint.isChecked());
Common.localStorage.save();
@@ -779,7 +798,10 @@ define([
txtStrictTip: 'Use the \'Save\' button to sync the changes you and others make',
strIgnoreWordsInUPPERCASE: 'Ignore words in UPPERCASE',
strIgnoreWordsWithNumbers: 'Ignore words with numbers',
- strShowOthersChanges: 'Show changes from other users'
+ strShowOthersChanges: 'Show changes from other users',
+ txtQuickPrint: 'Show the Quick Print button in the editor header',
+ txtQuickPrintTip: 'The document will be printed on the last selected or default printer'
+
}, PE.Views.FileMenuPanels.Settings || {}));
PE.Views.FileMenuPanels.RecentFiles = Common.UI.BaseView.extend({
@@ -1849,4 +1871,280 @@ define([
}, PE.Views.FileMenuPanels.ProtectDoc || {}));
+ PE.Views.PrintWithPreview = Common.UI.BaseView.extend(_.extend({
+ el: '#panel-print',
+ menu: undefined,
+
+ template: _.template([
+ '',
+ ' ',
+ ' ',
+ ' ',
+ ' ',
+ '',
+ ' | ',
+ ' | ',
+ '',
+ '',
+ '| <%= scope.txtPages %> | | ',
+ '
',
+ ' | ',
+ ' | ',
+ ' | ',
+ '| ',
+ '',
+ ' | ',
+ '',
+ ' ',
+ ' ',
+ ' ',
+ ' ',
+ ' ',
+ ' ',
+ ' ',
+ ' ',
+ ' ',
+ ' ',
+ ' ',
+ ' ',
+ ' ',
+ ' ',
+ ' ',
+ ' ',
+ ' ',
+ ' <%= scope.txtEmptyTable %> ',
+ ' ',
+ '
Do you want to continue?",
+ "PE.Controllers.Print.txtPrintRangeInvalid": "Invalid print range",
+ "PE.Controllers.Print.txtPrintRangeSingleRange": "Enter either a single slide number or a single slide range (for example, 5-12). Or you can Print to PDF.",
"PE.Controllers.Search.notcriticalErrorTitle": "Warning",
"PE.Controllers.Search.textNoTextFound": "The data you have been searching for could not be found. Please adjust your search options.",
"PE.Controllers.Search.textReplaceSkipped": "The replacement has been made. {0} occurrences were skipped.",
@@ -1921,6 +1928,8 @@
"PE.Views.GridSettings.textCustom": "Custom",
"PE.Views.GridSettings.textSpacing": "Spacing",
"PE.Views.GridSettings.textTitle": "Grid settings",
+ "PE.Views.FileMenuPanels.Settings.txtQuickPrint": "Show the Quick Print button in the editor header",
+ "PE.Views.FileMenuPanels.Settings.txtQuickPrintTip": "The document will be printed on the last selected or default printer",
"PE.Views.HeaderFooterDialog.applyAllText": "Apply to all",
"PE.Views.HeaderFooterDialog.applyText": "Apply",
"PE.Views.HeaderFooterDialog.diffLanguage": "You can’t use a date format in a different language than the slide master.
To change the master, click 'Apply to all' instead of 'Apply'",
@@ -2060,6 +2069,18 @@
"PE.Views.ParagraphSettingsAdvanced.textTabRight": "Right",
"PE.Views.ParagraphSettingsAdvanced.textTitle": "Paragraph - Advanced settings",
"PE.Views.ParagraphSettingsAdvanced.txtAutoText": "Auto",
+ "PE.Views.PrintWithPreview.txtPrint": "Print",
+ "PE.Views.PrintWithPreview.txtPrintPdf": "Print to PDF",
+ "PE.Views.PrintWithPreview.txtPrintRange": "Print range",
+ "PE.Views.PrintWithPreview.txtCurrentPage": "Current slide",
+ "PE.Views.PrintWithPreview.txtAllPages": "All slides",
+ "PE.Views.PrintWithPreview.txtCustomPages": "Custom print",
+ "PE.Views.PrintWithPreview.txtPage": "Slide",
+ "PE.Views.PrintWithPreview.txtOf": "of {0}",
+ "PE.Views.PrintWithPreview.txtPageNumInvalid": "Slide number invalid",
+ "PE.Views.PrintWithPreview.txtEmptyTable": "There is nothing to print because the presentation is empty",
+ "PE.Views.PrintWithPreview.txtPages": "Slides",
+ "PE.Views.PrintWithPreview.txtPaperSize": "Paper size",
"PE.Views.RightMenu.txtChartSettings": "Chart settings",
"PE.Views.RightMenu.txtImageSettings": "Image settings",
"PE.Views.RightMenu.txtParagraphSettings": "Paragraph settings",
diff --git a/apps/presentationeditor/main/locale/ru.json b/apps/presentationeditor/main/locale/ru.json
index d21392d7d..bf26f1748 100644
--- a/apps/presentationeditor/main/locale/ru.json
+++ b/apps/presentationeditor/main/locale/ru.json
@@ -410,6 +410,8 @@
"Common.define.smartArt.textVerticalPictureList": "Вертикальный список рисунков",
"Common.define.smartArt.textVerticalProcess": "Вертикальный процесс",
"Common.Translation.textMoreButton": "Ещё",
+ "Common.Translation.tipFileLocked": "Документ заблокирован на редактирование. Вы можете внести изменения и сохранить его как локальную копию позже.",
+ "Common.Translation.tipFileReadOnly": "Файл доступен только для чтения. Чтобы сохранить изменения, сохраните файл с новым названием или в другом месте.",
"Common.Translation.warnFileLocked": "Файл редактируется в другом приложении. Вы можете продолжить редактирование и сохранить его как копию.",
"Common.Translation.warnFileLockedBtnEdit": "Создать копию",
"Common.Translation.warnFileLockedBtnView": "Открыть на просмотр",
@@ -550,6 +552,7 @@
"Common.Views.Header.textHideLines": "Скрыть линейки",
"Common.Views.Header.textHideNotes": "Скрыть заметки",
"Common.Views.Header.textHideStatusBar": "Скрыть строку состояния",
+ "Common.Views.Header.textReadOnly": "Только чтение",
"Common.Views.Header.textRemoveFavorite": "Удалить из избранного",
"Common.Views.Header.textSaveBegin": "Сохранение...",
"Common.Views.Header.textSaveChanged": "Изменен",
@@ -561,6 +564,7 @@
"Common.Views.Header.tipDownload": "Скачать файл",
"Common.Views.Header.tipGoEdit": "Редактировать текущий файл",
"Common.Views.Header.tipPrint": "Напечатать файл",
+ "Common.Views.Header.tipPrintQuick": "Быстрая печать",
"Common.Views.Header.tipRedo": "Повторить",
"Common.Views.Header.tipSave": "Сохранить",
"Common.Views.Header.tipSearch": "Поиск",
@@ -901,6 +905,7 @@
"PE.Controllers.Main.textRequestMacros": "Макрос делает запрос на URL. Вы хотите разрешить запрос на %1?",
"PE.Controllers.Main.textShape": "Фигура",
"PE.Controllers.Main.textStrict": "Строгий режим",
+ "PE.Controllers.Main.textTryQuickPrint": "Вы выбрали быструю печать: весь документ будет напечатан на последнем выбранном принтере или на принтере по умолчанию.
Вы хотите продолжить?",
"PE.Controllers.Main.textTryUndoRedo": "Функции отмены и повтора действий отключены в Быстром режиме совместного редактирования.
Нажмите на кнопку 'Строгий режим' для переключения в Строгий режим совместного редактирования, чтобы редактировать файл без вмешательства других пользователей и отправлять изменения только после того, как вы их сохраните. Переключаться между режимами совместного редактирования можно с помощью Дополнительных параметров редактора.",
"PE.Controllers.Main.textTryUndoRedoWarn": "Функции отмены и повтора действий отключены в Быстром режиме совместного редактирования.",
"PE.Controllers.Main.textUndo": "Отменить",
@@ -1178,6 +1183,8 @@
"PE.Controllers.Main.warnNoLicense": "Вы достигли лимита на одновременные подключения к редакторам %1. Этот документ будет открыт на просмотр.
Напишите в отдел продаж %1, чтобы обсудить индивидуальные условия лицензирования.",
"PE.Controllers.Main.warnNoLicenseUsers": "Вы достигли лимита на одновременные подключения к редакторам %1.
Напишите в отдел продаж %1, чтобы обсудить индивидуальные условия лицензирования.",
"PE.Controllers.Main.warnProcessRightsChange": "Вам было отказано в праве на редактирование этого файла.",
+ "PE.Controllers.Print.txtPrintRangeInvalid": "Неправильный диапазон печати",
+ "PE.Controllers.Print.txtPrintRangeSingleRange": "Введите или один номер слайда, или один диапазон слайдов (например, 5-12). Или вы можете выбрать печать в PDF.",
"PE.Controllers.Search.notcriticalErrorTitle": "Внимание",
"PE.Controllers.Search.textNoTextFound": "Искомые данные не найдены. Пожалуйста, измените параметры поиска.",
"PE.Controllers.Search.textReplaceSkipped": "Замена выполнена. Пропущено вхождений - {0}.",
@@ -1905,6 +1912,8 @@
"PE.Views.FileMenuPanels.Settings.txtNative": "Собственный",
"PE.Views.FileMenuPanels.Settings.txtProofing": "Правописание",
"PE.Views.FileMenuPanels.Settings.txtPt": "Пункт",
+ "PE.Views.FileMenuPanels.Settings.txtQuickPrint": "Показывать кнопку Быстрая печать в шапке редактора",
+ "PE.Views.FileMenuPanels.Settings.txtQuickPrintTip": "Документ будет напечатан на последнем выбранном принтере или на принтере по умолчанию",
"PE.Views.FileMenuPanels.Settings.txtRunMacros": "Включить все",
"PE.Views.FileMenuPanels.Settings.txtRunMacrosDesc": "Включить все макросы без уведомления",
"PE.Views.FileMenuPanels.Settings.txtSpellCheck": "Проверка орфографии",
@@ -2060,6 +2069,18 @@
"PE.Views.ParagraphSettingsAdvanced.textTabRight": "По правому краю",
"PE.Views.ParagraphSettingsAdvanced.textTitle": "Абзац - дополнительные параметры",
"PE.Views.ParagraphSettingsAdvanced.txtAutoText": "Авто",
+ "PE.Views.PrintWithPreview.txtAllPages": "Все слайды",
+ "PE.Views.PrintWithPreview.txtCurrentPage": "Текущий слайд",
+ "PE.Views.PrintWithPreview.txtCustomPages": "Настраиваемая печать",
+ "PE.Views.PrintWithPreview.txtEmptyTable": "Нечего печатать, так как презентация пустая",
+ "PE.Views.PrintWithPreview.txtOf": "из {0}",
+ "PE.Views.PrintWithPreview.txtPage": "Слайд",
+ "PE.Views.PrintWithPreview.txtPageNumInvalid": "Неправильный номер слайда",
+ "PE.Views.PrintWithPreview.txtPages": "Слайды",
+ "PE.Views.PrintWithPreview.txtPaperSize": "Размер бумаги",
+ "PE.Views.PrintWithPreview.txtPrint": "Печать",
+ "PE.Views.PrintWithPreview.txtPrintPdf": "Печать в PDF",
+ "PE.Views.PrintWithPreview.txtPrintRange": "Диапазон печати",
"PE.Views.RightMenu.txtChartSettings": "Параметры диаграммы",
"PE.Views.RightMenu.txtImageSettings": "Параметры изображения",
"PE.Views.RightMenu.txtParagraphSettings": "Параметры абзаца",
diff --git a/apps/presentationeditor/main/resources/less/leftmenu.less b/apps/presentationeditor/main/resources/less/leftmenu.less
index 15f97642c..22997e795 100644
--- a/apps/presentationeditor/main/resources/less/leftmenu.less
+++ b/apps/presentationeditor/main/resources/less/leftmenu.less
@@ -520,6 +520,128 @@
}
}
}
+
+ #panel-print {
+ padding: 0;
+ #print-preview-empty {
+ padding: 14px;
+ color: @text-tertiary-ie;
+ color: @text-tertiary;
+
+ position: absolute;
+ left: 280px;
+ top: 0;
+ right: 0;
+ bottom: 0;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+
+ div {
+ text-align: center;
+ }
+ }
+ #id-print-settings {
+ position: absolute;
+ width:280px;
+ top: 0;
+ bottom: 0;
+ }
+ .print-settings {
+ width: 100%;
+ height: 100%;
+ overflow: hidden;
+ display: flex;
+ flex-direction: column;
+ border-right: @scaled-one-px-value-ie solid @border-toolbar-ie;
+ border-right: @scaled-one-px-value solid @border-toolbar;
+ label.header {
+ font-weight: 700;
+ }
+ .footer {
+ .btn.primary {
+ margin-right: 8px;
+ }
+ }
+ .settings-container {
+ width: 100%;
+ height: 100%;
+ overflow: hidden;
+ padding: 12px 16px;
+ .padding-small {
+ padding-bottom: 8px;
+ }
+ .padding-large {
+ padding-bottom: 16px;
+ }
+
+ #print-apply-all {
+ margin-top: 5px;
+ }
+ .link {
+ margin-top: 9px;
+ }
+ .footer {
+ margin-top: 24px;
+ }
+ }
+ }
+ #print-navigation {
+ height: 50px;
+ padding-left: 20px;
+ padding-top: 10px;
+ display: flex;
+ .btn-prev-page, .btn-next-page {
+ background-color: transparent;
+ padding: 0;
+ height: 20px;
+ width: 20px;
+ i.arrow {
+ display: inline-block;
+ width: 10px;
+ height: 10px;
+
+ border: solid @scaled-one-px-value-ie @icon-normal-ie;
+ border: solid @scaled-one-px-value @icon-normal;
+ border-bottom: none;
+ border-right: none;
+ }
+ &.disabled {
+ opacity: @component-disabled-opacity;
+ }
+
+ &:hover:not(:disabled):not(.disabled) {
+ background-color: @highlight-button-hover-ie;
+ background-color: @highlight-button-hover;
+ }
+ }
+ .btn-prev-page {
+ i {
+ transform: rotate(-45deg) translate(-1px, 3px);
+ }
+ }
+ .btn-next-page {
+ i {
+ transform: rotate(135deg) translate(4px, 0px);
+ }
+ }
+ .page-number {
+ display: flex;
+ align-items: center;
+ height: 20px;
+ margin-left: 10px;
+ label {
+ .font-weight-bold();
+ }
+ #print-count-page, #print-number-page {
+ margin-left: 4px;
+ }
+ }
+ }
+ #print-preview {
+ height: calc(100% - 50px);
+ }
+ }
}
}
diff --git a/apps/spreadsheeteditor/main/app/controller/Main.js b/apps/spreadsheeteditor/main/app/controller/Main.js
index 3c25623b5..0dab37b05 100644
--- a/apps/spreadsheeteditor/main/app/controller/Main.js
+++ b/apps/spreadsheeteditor/main/app/controller/Main.js
@@ -1308,7 +1308,9 @@ define([
(this.editorConfig.canRequestEditRights || this.editorConfig.mode !== 'view'); // if mode=="view" -> canRequestEditRights must be defined
this.appOptions.isEdit = (this.appOptions.canLicense || this.appOptions.isEditDiagram || this.appOptions.isEditMailMerge || this.appOptions.isEditOle) && this.permissions.edit !== false && this.editorConfig.mode !== 'view';
this.appOptions.canDownload = (this.permissions.download !== false);
- this.appOptions.canPrint = (this.permissions.print !== false);
+ this.appOptions.canPrint = (this.permissions.print !== false) && !(this.appOptions.isEditDiagram || this.appOptions.isEditMailMerge || this.appOptions.isEditOle);
+ this.appOptions.canQuickPrint = this.appOptions.canPrint && !Common.Utils.isMac && this.appOptions.isDesktopApp &&
+ !(this.editorConfig.customization && this.editorConfig.customization.compactHeader);
this.appOptions.canForcesave = this.appOptions.isEdit && !this.appOptions.isOffline && !(this.appOptions.isEditDiagram || this.appOptions.isEditMailMerge || this.appOptions.isEditOle) &&
(typeof (this.editorConfig.customization) == 'object' && !!this.editorConfig.customization.forcesave);
this.appOptions.forcesave = this.appOptions.canForcesave;
@@ -2932,6 +2934,39 @@ define([
if (url) this.iframePrint.src = url;
},
+ onPrintQuick: function() {
+ if (!this.appOptions.canQuickPrint) return;
+
+ var value = Common.localStorage.getBool("sse-hide-quick-print-warning"),
+ me = this,
+ handler = function () {
+ var printopt = new Asc.asc_CAdjustPrint();
+ printopt.asc_setNativeOptions({quickPrint: true});
+ var opts = new Asc.asc_CDownloadOptions();
+ opts.asc_setAdvancedOptions(printopt);
+ me.api.asc_Print(opts);
+ Common.component.Analytics.trackEvent('Print');
+ };
+
+ if (value) {
+ handler.call(this);
+ } else {
+ Common.UI.warning({
+ msg: this.textTryQuickPrint,
+ buttons: ['yes', 'no'],
+ primary: 'yes',
+ dontshow: true,
+ maxwidth: 500,
+ callback: function(btn, dontshow){
+ dontshow && Common.localStorage.setBool("sse-hide-quick-print-warning", true);
+ if (btn === 'yes') {
+ setTimeout(handler, 1);
+ }
+ }
+ });
+ }
+ },
+
warningDocumentIsLocked: function() {
var me = this;
Common.Utils.warningDocumentIsLocked({
@@ -3720,7 +3755,8 @@ define([
errorInconsistentExtPptx: 'An error has occurred while opening the file.
The file content corresponds to presentations (e.g. pptx), but the file has the inconsistent extension: %1.',
errorInconsistentExtPdf: 'An error has occurred while opening the file.
The file content corresponds to one of the following formats: pdf/djvu/xps/oxps, but the file has the inconsistent extension: %1.',
errorInconsistentExt: 'An error has occurred while opening the file.
The file content does not match the file extension.',
- errorCannotPasteImg: 'We can\'t paste this image from the Clipboard, but you can save it to your device and \ninsert it from there, or you can copy the image without text and paste it into the spreadsheet.'
+ errorCannotPasteImg: 'We can\'t paste this image from the Clipboard, but you can save it to your device and \ninsert it from there, or you can copy the image without text and paste it into the spreadsheet.',
+ textTryQuickPrint: 'You have selected Quick print: the entire document will be printed on the last selected or default printer.
Do you want to continue?'
}
})(), SSE.Controllers.Main || {}))
});
diff --git a/apps/spreadsheeteditor/main/app/controller/Toolbar.js b/apps/spreadsheeteditor/main/app/controller/Toolbar.js
index d0cd11f05..e36540bab 100644
--- a/apps/spreadsheeteditor/main/app/controller/Toolbar.js
+++ b/apps/spreadsheeteditor/main/app/controller/Toolbar.js
@@ -101,6 +101,10 @@ define([
var _main = this.getApplication().getController('Main');
_main.onPrint();
},
+ 'print-quick': function (opts) {
+ var _main = this.getApplication().getController('Main');
+ _main.onPrintQuick();
+ },
'save': function (opts) {
this.api.asc_Save();
},
diff --git a/apps/spreadsheeteditor/main/app/controller/Viewport.js b/apps/spreadsheeteditor/main/app/controller/Viewport.js
index c7f43d4df..c85618494 100644
--- a/apps/spreadsheeteditor/main/app/controller/Viewport.js
+++ b/apps/spreadsheeteditor/main/app/controller/Viewport.js
@@ -70,7 +70,8 @@ define([
this.addListeners({
'FileMenu': {
'menu:hide': me.onFileMenu.bind(me, 'hide'),
- 'menu:show': me.onFileMenu.bind(me, 'show')
+ 'menu:show': me.onFileMenu.bind(me, 'show'),
+ 'settings:apply': me.applySettings.bind(me)
},
'Statusbar': {
'view:compact': function (statusbar, state) {
@@ -89,6 +90,10 @@ define([
if ( me.appConfig && me.appConfig.isEdit && !(config.customization && config.customization.compactHeader) && toolbar.btnCollabChanges )
toolbar.btnCollabChanges = me.header.btnSave;
+ var value = Common.localStorage.getBool("sse-settings-quick-print-button", true);
+ Common.Utils.InternalSettings.set("sse-settings-quick-print-button", value);
+ if (me.header && me.header.btnPrintQuick)
+ me.header.btnPrintQuick[value ? 'show' : 'hide']();
},
'view:compact' : function (toolbar, state) {
me.viewport.vlayout.getItem('toolbar').height = state ?
@@ -111,6 +116,8 @@ define([
'print:disabled' : function (state) {
if ( me.header.btnPrint )
me.header.btnPrint.setDisabled(state);
+ if ( me.header.btnPrintQuick )
+ me.header.btnPrintQuick.setDisabled(state);
},
'save:disabled' : function (state) {
if ( me.header.btnSave )
@@ -285,6 +292,13 @@ define([
me.header.lockHeaderBtns( 'users', _need_disable );
},
+ applySettings: function () {
+ var value = Common.localStorage.getBool("sse-settings-quick-print-button", true);
+ Common.Utils.InternalSettings.set("sse-settings-quick-print-button", value);
+ if (this.header && this.header.btnPrintQuick)
+ this.header.btnPrintQuick[value ? 'show' : 'hide']();
+ },
+
onApiCoAuthoringDisconnect: function(enableDownload) {
if (this.header) {
if (this.header.btnDownload && !enableDownload)
@@ -293,6 +307,8 @@ define([
this.header.btnPrint.hide();
if (this.header.btnEdit)
this.header.btnEdit.hide();
+ if (this.header.btnPrintQuick && !enableDownload)
+ this.header.btnPrintQuick.hide();
}
},
diff --git a/apps/spreadsheeteditor/main/app/view/FileMenuPanels.js b/apps/spreadsheeteditor/main/app/view/FileMenuPanels.js
index 5dfb68a03..b92088838 100644
--- a/apps/spreadsheeteditor/main/app/view/FileMenuPanels.js
+++ b/apps/spreadsheeteditor/main/app/view/FileMenuPanels.js
@@ -244,6 +244,12 @@ define([
'',
' | ',
' ',
+ '',
+ '',
+ ' ',
+ ' | ',
+ ' ',
'',
' | ',
' | ',
@@ -719,6 +725,17 @@ define([
})).on('click', _.bind(me.applySettings, me));
});
+ this.chQuickPrint = new Common.UI.CheckBox({
+ el: $markup.findById('#fms-chb-quick-print'),
+ labelText: '',
+ dataHint: '2',
+ dataHintDirection: 'left',
+ dataHintOffset: 'small'
+ });
+ this.chQuickPrint.$el.parent().on('click', function (){
+ me.chQuickPrint.setValue(!me.chQuickPrint.isChecked());
+ });
+
this.pnlSettings = $markup.find('.flex-settings').addBack().filter('.flex-settings');
this.pnlApply = $markup.find('.fms-flex-apply').addBack().filter('.fms-flex-apply');
this.pnlTable = this.pnlSettings.find('table');
@@ -783,6 +800,7 @@ define([
$('tr.coauth.changes', this.el)[mode.isEdit && !mode.isOffline && mode.canCoAuthoring && mode.canChangeCoAuthoring ? 'show' : 'hide']();
$('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.quick-print', this.el)[mode.canQuickPrint ? 'show' : 'hide']();
if ( !Common.UI.Themes.available() ) {
$('tr.themes, tr.themes + tr.divider', this.el).hide();
@@ -878,6 +896,7 @@ define([
this.cmbMacros.setValue(item ? item.get('value') : 0);
this.chPaste.setValue(Common.Utils.InternalSettings.get("sse-settings-paste-button"));
+ this.chQuickPrint.setValue(Common.Utils.InternalSettings.get("sse-settings-quick-print-button"));
var data = [];
for (var t in Common.UI.Themes.map()) {
@@ -981,6 +1000,7 @@ define([
Common.Utils.InternalSettings.set("sse-macros-mode", this.cmbMacros.getValue());
Common.localStorage.setItem("sse-settings-paste-button", this.chPaste.isChecked() ? 1 : 0);
+ Common.localStorage.setBool("sse-settings-quick-print-button", this.chQuickPrint.isChecked());
Common.localStorage.save();
if (this.menu) {
@@ -1173,7 +1193,9 @@ define([
txtStrictTip: 'Use the \'Save\' button to sync the changes you and others make',
strShowOthersChanges: 'Show changes from other users',
txtCalculating: 'Calculating',
- strDateFormat1904: 'Use 1904 date system'
+ strDateFormat1904: 'Use 1904 date system',
+ txtQuickPrint: 'Show the Quick Print button in the editor header',
+ txtQuickPrintTip: 'The document will be printed on the last selected or default printer'
}, SSE.Views.FileMenuPanels.MainSettingsGeneral || {}));
@@ -2744,7 +2766,8 @@ SSE.Views.FileMenuPanels.RecentFiles = Common.UI.BaseView.extend({
applySettings: function() {
if (this.menu) {
- this.menu.fireEvent('settings:apply', [this.menu]);
+ this.menu.hide();
+ // this.menu.fireEvent('settings:apply', [this.menu]);
}
},
diff --git a/apps/spreadsheeteditor/main/locale/en.json b/apps/spreadsheeteditor/main/locale/en.json
index 710427bb9..7ebdd7b81 100644
--- a/apps/spreadsheeteditor/main/locale/en.json
+++ b/apps/spreadsheeteditor/main/locale/en.json
@@ -260,6 +260,8 @@
"Common.define.smartArt.textVerticalPictureList": "Vertical Picture List",
"Common.define.smartArt.textVerticalProcess": "Vertical Process",
"Common.Translation.textMoreButton": "More",
+ "Common.Translation.tipFileLocked": "Document is locked for editing. You can make changes and save it as local copy later.",
+ "Common.Translation.tipFileReadOnly": "The file is read-only. To keep your changes, save the file with a new name or in a different location.",
"Common.Translation.warnFileLocked": "The file is being edited in another app. You can continue editing and save it as a copy.",
"Common.Translation.warnFileLockedBtnEdit": "Create a copy",
"Common.Translation.warnFileLockedBtnView": "Open for viewing",
@@ -412,6 +414,8 @@
"Common.Views.Header.tipViewUsers": "View users and manage document access rights",
"Common.Views.Header.txtAccessRights": "Change access rights",
"Common.Views.Header.txtRename": "Rename",
+ "Common.Views.Header.tipPrintQuick": "Quick print",
+ "Common.Views.Header.textReadOnly": "Read only",
"Common.Views.History.textCloseHistory": "Close History",
"Common.Views.History.textHide": "Collapse",
"Common.Views.History.textHideAll": "Hide detailed changes",
@@ -1294,6 +1298,7 @@
"SSE.Controllers.Main.warnNoLicense": "You've reached the limit for simultaneous connections to %1 editors. This document will be opened for viewing only.
Contact %1 sales team for personal upgrade terms.",
"SSE.Controllers.Main.warnNoLicenseUsers": "You've reached the user limit for %1 editors. Contact %1 sales team for personal upgrade terms.",
"SSE.Controllers.Main.warnProcessRightsChange": "You have been denied the right to edit the file.",
+ "SSE.Controllers.Main.textTryQuickPrint": "You have selected Quick print: the entire document will be printed on the last selected or default printer.
Do you want to continue?",
"SSE.Controllers.Print.strAllSheets": "All Sheets",
"SSE.Controllers.Print.textFirstCol": "First column",
"SSE.Controllers.Print.textFirstRow": "First row",
@@ -2448,6 +2453,8 @@
"SSE.Views.FileMenuPanels.MainSettingsGeneral.txtWin": "as Windows",
"SSE.Views.FileMenuPanels.MainSettingsGeneral.txtWorkspace": "Workspace",
"SSE.Views.FileMenuPanels.MainSettingsGeneral.txtZh": "Chinese",
+ "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtQuickPrint": "Show the Quick Print button in the editor header",
+ "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtQuickPrintTip": "The document will be printed on the last selected or default printer",
"SSE.Views.FileMenuPanels.ProtectDoc.notcriticalErrorTitle": "Warning",
"SSE.Views.FileMenuPanels.ProtectDoc.strEncrypt": "With password",
"SSE.Views.FileMenuPanels.ProtectDoc.strProtect": "Protect Spreadsheet",
diff --git a/apps/spreadsheeteditor/main/locale/ru.json b/apps/spreadsheeteditor/main/locale/ru.json
index 1c73dc2ea..1b75d0265 100644
--- a/apps/spreadsheeteditor/main/locale/ru.json
+++ b/apps/spreadsheeteditor/main/locale/ru.json
@@ -260,6 +260,8 @@
"Common.define.smartArt.textVerticalPictureList": "Вертикальный список рисунков",
"Common.define.smartArt.textVerticalProcess": "Вертикальный процесс",
"Common.Translation.textMoreButton": "Ещё",
+ "Common.Translation.tipFileLocked": "Документ заблокирован на редактирование. Вы можете внести изменения и сохранить его как локальную копию позже.",
+ "Common.Translation.tipFileReadOnly": "Файл доступен только для чтения. Чтобы сохранить изменения, сохраните файл с новым названием или в другом месте.",
"Common.Translation.warnFileLocked": "Файл редактируется в другом приложении. Вы можете продолжить редактирование и сохранить его как копию.",
"Common.Translation.warnFileLockedBtnEdit": "Создать копию",
"Common.Translation.warnFileLockedBtnView": "Открыть на просмотр",
@@ -391,6 +393,7 @@
"Common.Views.Header.textCompactView": "Скрыть панель инструментов",
"Common.Views.Header.textHideLines": "Скрыть линейки",
"Common.Views.Header.textHideStatusBar": "Объединить строки листов и состояния",
+ "Common.Views.Header.textReadOnly": "Только чтение",
"Common.Views.Header.textRemoveFavorite": "Удалить из избранного",
"Common.Views.Header.textSaveBegin": "Сохранение...",
"Common.Views.Header.textSaveChanged": "Изменен",
@@ -402,6 +405,7 @@
"Common.Views.Header.tipDownload": "Скачать файл",
"Common.Views.Header.tipGoEdit": "Редактировать текущий файл",
"Common.Views.Header.tipPrint": "Напечатать файл",
+ "Common.Views.Header.tipPrintQuick": "Быстрая печать",
"Common.Views.Header.tipRedo": "Повторить",
"Common.Views.Header.tipSave": "Сохранить",
"Common.Views.Header.tipSearch": "Поиск",
@@ -1022,6 +1026,7 @@
"SSE.Controllers.Main.textRequestMacros": "Макрос делает запрос на URL. Вы хотите разрешить запрос на %1?",
"SSE.Controllers.Main.textShape": "Фигура",
"SSE.Controllers.Main.textStrict": "Строгий режим",
+ "SSE.Controllers.Main.textTryQuickPrint": "Вы выбрали быструю печать: весь документ будет напечатан на последнем выбранном принтере или на принтере по умолчанию.
Вы хотите продолжить?",
"SSE.Controllers.Main.textTryUndoRedo": "Функции отмены и повтора действий отключены в Быстром режиме совместного редактирования.
Нажмите на кнопку 'Строгий режим' для переключения в Строгий режим совместного редактирования, чтобы редактировать файл без вмешательства других пользователей и отправлять изменения только после того, как вы их сохраните. Переключаться между режимами совместного редактирования можно с помощью Дополнительных параметров редактора.",
"SSE.Controllers.Main.textTryUndoRedoWarn": "Функции отмены и повтора действий отключены в Быстром режиме совместного редактирования.",
"SSE.Controllers.Main.textUndo": "Отменить",
@@ -2427,6 +2432,8 @@
"SSE.Views.FileMenuPanels.MainSettingsGeneral.txtPt": "Пункт",
"SSE.Views.FileMenuPanels.MainSettingsGeneral.txtPtbr": "Португальский (Бразилия)",
"SSE.Views.FileMenuPanels.MainSettingsGeneral.txtPtlang": "Португальский (Португалия)",
+ "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtQuickPrint": "Показывать кнопку Быстрая печать в шапке редактора",
+ "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtQuickPrintTip": "Документ будет напечатан на последнем выбранном принтере или на принтере по умолчанию",
"SSE.Views.FileMenuPanels.MainSettingsGeneral.txtRegion": "Регион",
"SSE.Views.FileMenuPanels.MainSettingsGeneral.txtRo": "Румынский",
"SSE.Views.FileMenuPanels.MainSettingsGeneral.txtRu": "Русский",
|