diff --git a/apps/documenteditor/main/app/view/ParagraphSettingsAdvanced.js b/apps/documenteditor/main/app/view/ParagraphSettingsAdvanced.js index 987589d9b..6c8293d96 100644 --- a/apps/documenteditor/main/app/view/ParagraphSettingsAdvanced.js +++ b/apps/documenteditor/main/app/view/ParagraphSettingsAdvanced.js @@ -82,6 +82,8 @@ define([ 'text!documenteditor/main/app/template/ParagraphSettingsAdvanced.tem this._noApply = true; this._tabListChanged = false; this.Margins = undefined; + this.FirstLine = undefined; + this.LeftIndent = undefined; this.spinners = []; this.tableStylerRows = this.options.tableStylerRows; @@ -576,6 +578,26 @@ define([ 'text!documenteditor/main/app/template/ParagraphSettingsAdvanced.tem this._changedProps.get_Tabs().add_Tab(tab); }, this); } + if (this._changedProps.get_Ind()!==null && this._changedProps.get_Ind()!==undefined) { + var left = this._changedProps.get_Ind().get_Left(), + first = this._changedProps.get_Ind().get_FirstLine(); + if (first<0 || this.FirstLine<0) { + if (first<0 || first===undefined || first===null) { + if (first === undefined || first === null) + first = this.FirstLine; + if (left === undefined || left === null) + left = this.LeftIndent; + if (left !== undefined && left !== null) + this._changedProps.get_Ind().put_Left(left-first); + } else { + if (left === undefined || left === null) + left = this.LeftIndent; + if (left !== undefined && left !== null) + this._changedProps.get_Ind().put_Left(left); + } + } + } + return { paragraphProps: this._changedProps, borderProps: {borderSize: this.BorderSize, borderColor: this.btnBorderColor.color} }; }, @@ -585,8 +607,12 @@ define([ 'text!documenteditor/main/app/template/ParagraphSettingsAdvanced.tem this.hideTextOnlySettings(this.isChart); - this.numFirstLine.setValue((props.get_Ind() !== null && props.get_Ind().get_FirstLine() !== null ) ? Common.Utils.Metric.fnRecalcFromMM(props.get_Ind().get_FirstLine()) : '', true); - this.numIndentsLeft.setValue((props.get_Ind() !== null && props.get_Ind().get_Left() !== null) ? Common.Utils.Metric.fnRecalcFromMM(props.get_Ind().get_Left()) : '', true); + this.FirstLine = (props.get_Ind() !== null) ? props.get_Ind().get_FirstLine() : null; + this.numFirstLine.setValue(this.FirstLine!== null ? Common.Utils.Metric.fnRecalcFromMM(this.FirstLine) : '', true); + this.LeftIndent = (props.get_Ind() !== null) ? props.get_Ind().get_Left() : null; + if (this.FirstLine<0 && this.LeftIndent !== null) + this.LeftIndent = this.LeftIndent + this.FirstLine; + this.numIndentsLeft.setValue(this.LeftIndent!==null ? Common.Utils.Metric.fnRecalcFromMM(this.LeftIndent) : '', true); this.numIndentsRight.setValue((props.get_Ind() !== null && props.get_Ind().get_Right() !== null) ? Common.Utils.Metric.fnRecalcFromMM(props.get_Ind().get_Right()) : '', true); this.chKeepLines.setValue((props.get_KeepLines() !== null && props.get_KeepLines() !== undefined) ? props.get_KeepLines() : 'indeterminate', true); diff --git a/apps/documenteditor/mobile/app/controller/DocumentHolder.js b/apps/documenteditor/mobile/app/controller/DocumentHolder.js index f7b2dcce3..c1ed762e1 100644 --- a/apps/documenteditor/mobile/app/controller/DocumentHolder.js +++ b/apps/documenteditor/mobile/app/controller/DocumentHolder.js @@ -57,7 +57,10 @@ define([ _view, _fastCoAuthTips = [], _actionSheets = [], - _isEdit = false; + _isEdit = false, + _canAcceptChanges = false, + _inRevisionChange = false, + _menuPos = []; return { models: [], @@ -90,11 +93,13 @@ define([ me.api.asc_registerCallback('asc_onDocumentContentReady', _.bind(me.onApiDocumentContentReady, me)); Common.NotificationCenter.on('api:disconnect', _.bind(me.onCoAuthoringDisconnect, me)); me.api.asc_registerCallback('asc_onCoAuthoringDisconnect', _.bind(me.onCoAuthoringDisconnect,me)); + me.api.asc_registerCallback('asc_onShowRevisionsChange', _.bind(me.onApiShowChange, me)); me.api.asc_coAuthoringGetUsers(); }, setMode: function (mode) { _isEdit = mode.isEdit; + _canAcceptChanges = mode.canReview && !mode.isReviewOnly; }, // When our application is ready, lets get started @@ -135,10 +140,29 @@ define([ return true; } }); + } else if ('accept' == eventName) { + me.api.asc_GetNextRevisionsChange(); + me.api.asc_AcceptChanges(); + } else if ('acceptall' == eventName) { + me.api.asc_AcceptAllChanges(); + } else if ('reject' == eventName) { + me.api.asc_GetNextRevisionsChange(); + me.api.asc_RejectChanges(); + } else if ('rejectall' == eventName) { + me.api.asc_RejectAllChanges(); + } else if ('review' == eventName) { + if (Common.SharedSettings.get('phone')) { + _actionSheets = me._initReviewMenu(); + me.onContextMenuClick(view, 'showActionSheet'); + } else { + _.delay(function () { + _view.showMenu(me._initReviewMenu(), _menuPos[0] || 0, _menuPos[1] || 0); + }, 100); + } } else if ('showActionSheet' == eventName && _actionSheets.length > 0) { _.delay(function () { _.each(_actionSheets, function (action) { - action.text = action.caption + action.text = action.caption; action.onClick = function () { me.onContextMenuClick(null, action.event) } @@ -166,6 +190,7 @@ define([ if ($('.popover.settings, .popup.settings, .picker-modal.settings, .modal.modal-in, .actions-modal').length > 0) { return; } + _menuPos = [posX, posY]; var me = this, items; @@ -283,6 +308,10 @@ define([ _view = this.createView('DocumentHolder').render(); }, + onApiShowChange: function(sdkchange) { + _inRevisionChange = sdkchange && sdkchange.length>0; + }, + // Internal _openLink: function(url) { @@ -378,6 +407,13 @@ define([ event: 'addlink' }); } + + if (_canAcceptChanges && _inRevisionChange) { + menuItems.push({ + caption: me.menuReview, + event: 'review' + }); + } } } @@ -401,6 +437,33 @@ define([ return menuItems; }, + _initReviewMenu: function (stack) { + var me = this, + menuItems = []; + + menuItems.push({ + caption: me.menuAccept, + event: 'accept' + }); + + menuItems.push({ + caption: me.menuReject, + event: 'reject' + }); + + menuItems.push({ + caption: me.menuAcceptAll, + event: 'acceptall' + }); + + menuItems.push({ + caption: me.menuRejectAll, + event: 'rejectall' + }); + + return menuItems; + }, + onCoAuthoringDisconnect: function() { this.isDisconnected = true; }, @@ -414,7 +477,12 @@ define([ menuAddLink: 'Add Link', menuOpenLink: 'Open Link', menuMore: 'More', - sheetCancel: 'Cancel' + sheetCancel: 'Cancel', + menuReview: 'Review', + menuAccept: 'Accept', + menuAcceptAll: 'Accept All', + menuReject: 'Reject', + menuRejectAll: 'Reject All' } })(), DE.Controllers.DocumentHolder || {})) }); \ No newline at end of file diff --git a/apps/documenteditor/mobile/app/controller/Main.js b/apps/documenteditor/mobile/app/controller/Main.js index 67764cd4e..542d51928 100644 --- a/apps/documenteditor/mobile/app/controller/Main.js +++ b/apps/documenteditor/mobile/app/controller/Main.js @@ -502,8 +502,7 @@ define([ me.hidePreloader(); me.onLongActionEnd(Asc.c_oAscAsyncActionType['BlockInteraction'], LoadingDocument); - if (me.appOptions.isReviewOnly) - me.api.asc_SetTrackRevisions(true); + me.api.asc_SetTrackRevisions(me.appOptions.isReviewOnly || Common.localStorage.getBool("de-mobile-track-changes-" + (me.appOptions.fileKey || ''))); /** coauthoring begin **/ this.isLiveCommenting = Common.localStorage.getBool("de-settings-livecomment", true); @@ -689,6 +688,7 @@ define([ me.appOptions.canChat = me.appOptions.canLicense && !me.appOptions.isOffline && !((typeof (me.editorConfig.customization) == 'object') && me.editorConfig.customization.chat===false); me.appOptions.canEditStyles = me.appOptions.canLicense && me.appOptions.canEdit; me.appOptions.canPrint = (me.permissions.print !== false); + me.appOptions.fileKey = me.document.key; var type = /^(?:(pdf|djvu|xps))$/.exec(me.document.fileType); me.appOptions.canDownloadOrigin = me.permissions.download !== false && (type && typeof type[1] === 'string'); @@ -698,6 +698,10 @@ define([ me.appOptions.canBranding = (licType === Asc.c_oLicenseResult.Success) && (typeof me.editorConfig.customization == 'object'); me.appOptions.canBrandingExt = params.asc_getCanBranding() && (typeof me.editorConfig.customization == 'object'); + if ( me.appOptions.isLightVersion ) { + me.appOptions.canUseHistory = me.appOptions.canReview = me.appOptions.isReviewOnly = false; + } + me.applyModeCommonElements(); me.applyModeEditorElements(); diff --git a/apps/documenteditor/mobile/app/controller/Settings.js b/apps/documenteditor/mobile/app/controller/Settings.js index 7b58fd0c7..07d576ecc 100644 --- a/apps/documenteditor/mobile/app/controller/Settings.js +++ b/apps/documenteditor/mobile/app/controller/Settings.js @@ -79,7 +79,10 @@ define([ { caption: 'A2', subtitle: Common.Utils.String.format('42{0} x 59,4{0}', txtCm), value: [420, 594] }, { caption: 'A6', subtitle: Common.Utils.String.format('10,5{0} x 14,8{0}', txtCm), value: [105, 148] } ], - _licInfo; + _licInfo, + _canReview = false, + _isReviewOnly = false, + _fileKey; var mm2Cm = function(mm) { return parseFloat((mm/10.).toFixed(2)); @@ -137,6 +140,9 @@ define([ this.getView('Settings').setMode(mode); if (mode.canBranding) _licInfo = mode.customization; + _canReview = mode.canReview; + _isReviewOnly = mode.isReviewOnly; + _fileKey = mode.fileKey; }, initEvents: function () { @@ -213,9 +219,11 @@ define([ } else { $('#settings-readermode input:checkbox').attr('checked', Common.SharedSettings.get('readerMode')); $('#settings-spellcheck input:checkbox').attr('checked', Common.localStorage.getBool("de-mobile-spellcheck", false)); + $('#settings-review input:checkbox').attr('checked', _isReviewOnly || Common.localStorage.getBool("de-mobile-track-changes-" + (_fileKey || ''))); $('#settings-search').single('click', _.bind(me.onSearch, me)); $('#settings-readermode input:checkbox').single('change', _.bind(me.onReaderMode, me)); $('#settings-spellcheck input:checkbox').single('change', _.bind(me.onSpellcheck, me)); + $('#settings-review input:checkbox').single('change', _.bind(me.onTrackChanges, me)); $('#settings-help').single('click', _.bind(me.onShowHelp, me)); $('#settings-download').single('click', _.bind(me.onDownloadOrigin, me)); $('#settings-print').single('click', _.bind(me.onPrint, me)); @@ -364,6 +372,17 @@ define([ this.api && this.api.asc_setSpellCheck(state); }, + onTrackChanges: function(e) { + var $checkbox = $(e.currentTarget), + state = $checkbox.is(':checked'); + if ( _isReviewOnly ) { + $checkbox.attr('checked', true); + } else if ( _canReview ) { + this.api.asc_SetTrackRevisions(state); + Common.localStorage.setItem("de-mobile-track-changes-" + (_fileKey || ''), state ? 1 : 0); + } + }, + onShowHelp: function () { window.open('http://support.onlyoffice.com/', "_blank"); this.hideModal(); diff --git a/apps/documenteditor/mobile/app/template/Settings.template b/apps/documenteditor/mobile/app/template/Settings.template index 2ea5ff4ba..f523005ea 100644 --- a/apps/documenteditor/mobile/app/template/Settings.template +++ b/apps/documenteditor/mobile/app/template/Settings.template @@ -57,6 +57,22 @@ +
  • +
    +
    + +
    +
    +
    <%= scope.textReview %>
    +
    + +
    +
    +
    +
  • @@ -425,6 +441,18 @@
    • +
  • + +
    +
    + +
    +
    +
    PDF/A
    +
    +
    +     +
  • diff --git a/apps/documenteditor/mobile/app/view/Settings.js b/apps/documenteditor/mobile/app/view/Settings.js index d7d0450a2..d6cac7c18 100644 --- a/apps/documenteditor/mobile/app/view/Settings.js +++ b/apps/documenteditor/mobile/app/view/Settings.js @@ -57,7 +57,9 @@ define([ _canReader = false, _canAbout = true, _canHelp = true, - _canPrint = false; + _canPrint = false, + _canReview = false, + _isReviewOnly = false; return { // el: '.view-main', @@ -99,6 +101,8 @@ define([ _canDownloadOrigin = mode.canDownloadOrigin; _canReader = !mode.isEdit && mode.canReader; _canPrint = mode.canPrint; + _canReview = mode.canReview; + _isReviewOnly = mode.isReviewOnly; if (mode.customization && mode.canBrandingExt) { _canAbout = (mode.customization.about!==false); @@ -131,6 +135,8 @@ define([ if (!_canAbout) $layour.find('#settings-about').hide(); if (!_canHelp) $layour.find('#settings-help').hide(); if (!_canPrint) $layour.find('#settings-print').hide(); + if (!_canReview) $layour.find('#settings-review').hide(); + if (_isReviewOnly) $layour.find('#settings-review').addClass('disabled'); return $layour.html(); } @@ -262,6 +268,7 @@ define([ textPoweredBy: 'Powered by', textSpellcheck: 'Spell Checking', textPrint: 'Print', + textReview: 'Review', textMargins: 'Margins', textTop: 'Top', textLeft: 'Left', diff --git a/apps/documenteditor/mobile/locale/en.json b/apps/documenteditor/mobile/locale/en.json index 4b5016d73..0aa6564f2 100644 --- a/apps/documenteditor/mobile/locale/en.json +++ b/apps/documenteditor/mobile/locale/en.json @@ -24,6 +24,11 @@ "DE.Controllers.DocumentHolder.menuPaste": "Paste", "DE.Controllers.DocumentHolder.sheetCancel": "Cancel", "DE.Controllers.DocumentHolder.textGuest": "Guest", + "DE.Controllers.DocumentHolder.menuReview": "Review", + "DE.Controllers.DocumentHolder.menuAccept": "Accept", + "DE.Controllers.DocumentHolder.menuAcceptAll": "Accept All", + "DE.Controllers.DocumentHolder.menuReject": "Reject", + "DE.Controllers.DocumentHolder.menuRejectAll": "Reject All", "DE.Controllers.EditContainer.textChart": "Chart", "DE.Controllers.EditContainer.textHyperlink": "Hyperlink", "DE.Controllers.EditContainer.textImage": "Image", @@ -387,6 +392,7 @@ "DE.Views.Settings.unknownText": "Unknown", "DE.Views.Settings.textSpellcheck": "Spell Checking", "DE.Views.Settings.textPrint": "Print", + "DE.Views.Settings.textReview": "Track Changes", "DE.Views.Settings.textMargins": "Margins", "DE.Views.Settings.textTop": "Top", "DE.Views.Settings.textLeft": "Left", diff --git a/apps/documenteditor/mobile/resources/css/app-ios.css b/apps/documenteditor/mobile/resources/css/app-ios.css index 3e97850d0..687d0d69a 100644 --- a/apps/documenteditor/mobile/resources/css/app-ios.css +++ b/apps/documenteditor/mobile/resources/css/app-ios.css @@ -6348,12 +6348,12 @@ i.icon.icon-reader { } i.icon.icon-download { width: 22px; - height: 28px; + height: 22px; background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20version%3D%221.1%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20xmlns%3Axlink%3D%22http%3A%2F%2Fwww.w3.org%2F1999%2Fxlink%22%20viewBox%3D%220%200%2022%2022%22%20y%3D%220px%22%20x%3D%220px%22%20fill%3D%22%23446995%22%3E%3Cpath%20d%3D%22M12%200H11L11%2014L7.39999%2010.3L6.69999%2011.1L11.5%2016L16.3%2011.1L15.6%2010.3L12%2014L12%200Z%22%2F%3E%3Cpath%20d%3D%22M14%205V6H19V20H4V6H9V5H3V21H20V5H14Z%22%2F%3E%3C%2Fsvg%3E"); } i.icon.icon-print { width: 22px; - height: 28px; + height: 22px; background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20version%3D%221.1%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20xmlns%3Axlink%3D%22http%3A%2F%2Fwww.w3.org%2F1999%2Fxlink%22%20viewBox%3D%22-0%200%2022%2022%22%20y%3D%220px%22%20x%3D%220px%22%20fill%3D%22%23446995%22%3E%3Cg%3E%3Cpath%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M5%201H17V6H21V17H17V21H5V17H1V6H5V1ZM6%206H16V2H6V6ZM5%2016V13H2V16H5ZM2%2012H20V7H2V12ZM20%2013H17V16H20V13ZM16%2013H6V20H16V13ZM14%2016H8V15H14V16ZM14%2018H8V17H14V18Z%22%2F%3E%3C%2Fg%3E%3C%2Fsvg%3E"); } i.icon.icon-spellcheck { @@ -6361,6 +6361,11 @@ i.icon.icon-spellcheck { height: 22px; background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20version%3D%221.1%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20xmlns%3Axlink%3D%22http%3A%2F%2Fwww.w3.org%2F1999%2Fxlink%22%20viewBox%3D%220%200%2022%2022%22%20fill%3D%22%23446995%22%3E%3Cg%3E%3Cpath%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M8%201L3%2015H4.2L5.97686%2010H11.0231L11.6768%2011.8394C11.955%2011.5504%2012.262%2011.2892%2012.593%2011.0605L9%201H8ZM8.5%202.9L10.6678%209H6.33223L8.5%202.9Z%22%2F%3E%3Cpath%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M16%2021C18.7614%2021%2021%2018.7614%2021%2016C21%2013.2386%2018.7614%2011%2016%2011C13.2386%2011%2011%2013.2386%2011%2016C11%2018.7614%2013.2386%2021%2016%2021ZM15.3536%2018.3536L19.3536%2014.3536L18.6464%2013.6464L15%2017.2929L13.3536%2015.6464L12.6464%2016.3536L14.6464%2018.3536L15%2018.7071L15.3536%2018.3536Z%22%2F%3E%3C%2Fg%3E%3C%2Fsvg%3E"); } +i.icon.icon-review { + width: 22px; + height: 28px; + background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20version%3D%221.1%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20xmlns%3Axlink%3D%22http%3A%2F%2Fwww.w3.org%2F1999%2Fxlink%22%20viewBox%3D%22-0%200%2022%2022%22%20y%3D%220px%22%20x%3D%220px%22%20fill%3D%22%23446995%22%3E%3Cg%3E%3Cpath%20d%3D%22M2%202H19V6H18V3H3V19H18V13H19V20H2V2Z%22%2F%3E%3Cpath%20d%3D%22M15%207H6V6H15V7Z%22%2F%3E%3Cpath%20d%3D%22M6%209H15V8H6V9Z%22%2F%3E%3Cpath%20d%3D%22M13%2011H6V10H13V11Z%22%2F%3E%3Cpath%20d%3D%22M6%2013H11V12H6V13Z%22%2F%3E%3Cpath%20d%3D%22M10%2015H6V14H10V15Z%22%2F%3E%3Cpath%20d%3D%22M12%2014.5V16H13.5L21.5%208L20%206.5L12%2014.5Z%22%2F%3E%3C%2Fg%3E%3C%2Fsvg%3E"); +} i.icon.icon-doc-setup { width: 22px; height: 22px; @@ -6685,6 +6690,11 @@ i.icon.icon-format-pdf { height: 30px; background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20version%3D%221.1%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20xmlns%3Axlink%3D%22http%3A%2F%2Fwww.w3.org%2F1999%2Fxlink%22%20viewBox%3D%220%200%2033%2033%22%20height%3D%2233px%22%20width%3D%2233px%22%20y%3D%220px%22%20x%3D%220px%22%3E%3Cdefs%3E%3Cstyle%3E.cls-1%7Bfill%3A%23446995%3B%7D%3C%2Fstyle%3E%3C%2Fdefs%3E%3Cpath%20d%3D%22M11.875%2C18.648c0.8-1.567%2C1.709-3.334%2C2.437-5.107l0%2C0%20%20l0.288-0.7c-0.95-3.616-1.52-6.519-1.011-8.396l0%2C0c0.137-0.489%2C0.704-0.786%2C1.31-0.786l0%2C0l0.369%2C0.005h0.068%20%20c0.83-0.013%2C1.22%2C1.042%2C1.264%2C1.453l0%2C0c0.073%2C0.683-0.243%2C1.839-0.243%2C1.839l0%2C0c0-0.467%2C0.018-1.221-0.276-1.873l0%2C0%20%20c-0.343-0.753-0.671-1.204-0.965-1.275l0%2C0c-0.148%2C0.099-0.292%2C0.304-0.342%2C0.699l0%2C0c-0.103%2C0.553-0.133%2C1.252-0.133%2C1.612l0%2C0%20%20c0%2C1.272%2C0.25%2C2.952%2C0.743%2C4.683l0%2C0c0.093-0.268%2C0.174-0.526%2C0.24-0.767l0%2C0c0.101-0.38%2C0.743-2.901%2C0.743-2.901l0%2C0%20%20c0%2C0-0.162%2C3.355-0.388%2C4.371l0%2C0c-0.048%2C0.215-0.102%2C0.427-0.158%2C0.644l0%2C0c0.812%2C2.268%2C2.121%2C4.292%2C3.68%2C5.75l0%2C0%20%20c0.615%2C0.575%2C1.393%2C1.038%2C2.128%2C1.461l0%2C0c1.605-0.229%2C3.084-0.338%2C4.318-0.324l0%2C0c1.637%2C0.021%2C2.838%2C0.264%2C3.324%2C0.743l0%2C0%20%20c0.238%2C0.232%2C0.335%2C0.514%2C0.365%2C0.83l0%2C0c0.007%2C0.122-0.053%2C0.41-0.07%2C0.482l0%2C0c0.018-0.088%2C0.018-0.518-1.297-0.938l0%2C0%20%20c-1.034-0.33-2.971-0.32-5.295-0.073l0%2C0c2.688%2C1.315%2C5.307%2C1.968%2C6.137%2C1.577l0%2C0c0.203-0.1%2C0.449-0.437%2C0.449-0.437l0%2C0%20%20c0%2C0-0.146%2C0.665-0.252%2C0.831l0%2C0c-0.134%2C0.18-0.396%2C0.376-0.646%2C0.441l0%2C0c-1.311%2C0.35-4.722-0.459-7.695-2.158l0%2C0%20%20c-3.322%2C0.489-6.972%2C1.393-9.897%2C2.353l0%2C0c-2.874%2C5.037-5.035%2C7.351-6.793%2C6.471l0%2C0L3.63%2C28.833%20%20c-0.263-0.15-0.303-0.516-0.242-0.813l0%2C0c0.205-1.003%2C1.462-2.513%2C3.988-4.021l0%2C0c0.272-0.165%2C1.483-0.805%2C1.483-0.805l0%2C0%20%20c0%2C0-0.896%2C0.868-1.106%2C1.038l0%2C0c-2.016%2C1.652-3.504%2C3.73-3.467%2C4.536l0%2C0l0.007%2C0.069C6.005%2C28.594%2C8.573%2C25.109%2C11.875%2C18.648%20%20%20M12.921%2C19.184c-0.551%2C1.038-1.09%2C2.001-1.588%2C2.886l0%2C0c2.752-1.153%2C5.715-1.892%2C8.535-2.416l0%2C0%20%20c-0.379-0.262-0.746-0.539-1.093-0.832l0%2C0c-1.554-1.314-2.737-2.955-3.595-4.681l0%2C0C14.636%2C15.607%2C13.989%2C17.166%2C12.921%2C19.184%22%20class%3D%22cls-1%22%20%2F%3E%3C%2Fsvg%3E"); } +i.icon.icon-format-pdfa { + width: 30px; + height: 30px; + background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20version%3D%221.1%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20xmlns%3Axlink%3D%22http%3A%2F%2Fwww.w3.org%2F1999%2Fxlink%22%20viewBox%3D%220%200%2033%2033%22%20height%3D%2233px%22%20width%3D%2233px%22%20y%3D%220px%22%20x%3D%220px%22%3E%3Cdefs%3E%3Cstyle%3E.cls-1%7Bfill%3A%23446995%3B%7D%3C%2Fstyle%3E%3C%2Fdefs%3E%3Cpath%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M11.875%2018.648L11.9617%2018.4783C12.7401%2016.954%2013.6102%2015.2503%2014.312%2013.541L14.6%2012.841C13.65%209.225%2013.08%206.322%2013.589%204.445C13.726%203.956%2014.293%203.659%2014.899%203.659L15.268%203.664H15.336C16.166%203.651%2016.556%204.706%2016.6%205.117C16.673%205.8%2016.357%206.956%2016.357%206.956L16.3571%206.87946C16.358%206.40944%2016.3594%205.70047%2016.081%205.083C15.738%204.33%2015.41%203.879%2015.116%203.808C14.968%203.907%2014.824%204.112%2014.774%204.507C14.671%205.06%2014.641%205.759%2014.641%206.119C14.641%207.391%2014.891%209.071%2015.384%2010.802C15.477%2010.534%2015.558%2010.276%2015.624%2010.035C15.725%209.655%2016.367%207.134%2016.367%207.134C16.367%207.134%2016.205%2010.489%2015.979%2011.505C15.931%2011.72%2015.877%2011.932%2015.821%2012.149C16.633%2014.417%2017.942%2016.441%2019.501%2017.899C19.9467%2018.3157%2020.4779%2018.6735%2021.0164%2019H29C30.1046%2019%2031%2019.8954%2031%2021V29C31%2030.1046%2030.1046%2031%2029%2031H17C15.8954%2031%2015%2030.1046%2015%2029V21.5492C13.6156%2021.9019%2012.2807%2022.2896%2011.07%2022.687C8.19599%2027.724%206.03499%2030.038%204.27699%2029.158L3.62999%2028.833C3.36699%2028.683%203.32699%2028.317%203.38799%2028.02C3.59299%2027.017%204.84999%2025.507%207.37599%2023.999C7.64799%2023.834%208.85899%2023.194%208.85899%2023.194C8.85899%2023.194%207.96299%2024.062%207.75299%2024.232C5.73699%2025.884%204.24899%2027.962%204.28599%2028.768L4.29299%2028.837C6.00499%2028.594%208.57299%2025.109%2011.875%2018.648ZM18.775%2018.822C18.8461%2018.882%2018.918%2018.9413%2018.9906%2019H17C15.9681%2019%2015.1187%2019.7815%2015.0114%2020.785C13.7648%2021.146%2012.529%2021.5689%2011.333%2022.07C11.831%2021.185%2012.37%2020.222%2012.921%2019.184C13.989%2017.166%2014.636%2015.607%2015.18%2014.141C16.038%2015.867%2017.221%2017.508%2018.775%2018.822ZM21.5553%2027.3521H24.4447L24.9995%2029H26.7518L23.7581%2021.002H22.231L19.2537%2029H21.006L21.5553%2027.3521ZM23.9998%2026.0172H22.0002L22.9945%2023.0234L23.9998%2026.0172Z%22%20class%3D%22cls-1%22%2F%3E%3C%2Fsvg%3E"); +} i.icon.icon-format-odt { width: 30px; height: 30px; diff --git a/apps/documenteditor/mobile/resources/css/app-material.css b/apps/documenteditor/mobile/resources/css/app-material.css index 2c4bab90d..17df1a541 100644 --- a/apps/documenteditor/mobile/resources/css/app-material.css +++ b/apps/documenteditor/mobile/resources/css/app-material.css @@ -5937,12 +5937,12 @@ i.icon.icon-reader { } i.icon.icon-download { width: 22px; - height: 28px; + height: 22px; background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20version%3D%221.1%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20xmlns%3Axlink%3D%22http%3A%2F%2Fwww.w3.org%2F1999%2Fxlink%22%20viewBox%3D%22-0%200%2022%2022%22%20y%3D%220px%22%20x%3D%220px%22%20fill%3D%22%23446995%22%3E%3Cg%3E%3Cpath%20d%3D%22M12%200H11L11%2014L7.39999%2010.3L6.69999%2011.1L11.5%2016L16.3%2011.1L15.6%2010.3L12%2014L12%200Z%22%2F%3E%3Cpath%20d%3D%22M14%205V6H19V20H4V6H9V5H3V21H20V5H14Z%22%2F%3E%3C%2Fg%3E%3C%2Fsvg%3E"); } i.icon.icon-print { width: 22px; - height: 28px; + height: 22px; background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20version%3D%221.1%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20xmlns%3Axlink%3D%22http%3A%2F%2Fwww.w3.org%2F1999%2Fxlink%22%20viewBox%3D%22-0%200%2022%2022%22%20y%3D%220px%22%20x%3D%220px%22%20fill%3D%22%23446995%22%3E%3Cg%3E%3Cpath%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M5%201H17V6H21V17H17V21H5V17H1V6H5V1ZM6%206H16V2H6V6ZM5%2016V13H2V16H5ZM2%2012H20V7H2V12ZM20%2013H17V16H20V13ZM16%2013H6V20H16V13ZM14%2016H8V15H14V16ZM14%2018H8V17H14V18Z%22%2F%3E%3C%2Fg%3E%3C%2Fsvg%3E"); } i.icon.icon-spellcheck { @@ -5950,6 +5950,11 @@ i.icon.icon-spellcheck { height: 22px; background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20version%3D%221.1%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20xmlns%3Axlink%3D%22http%3A%2F%2Fwww.w3.org%2F1999%2Fxlink%22%20viewBox%3D%220%200%2022%2022%22%20fill%3D%22%23446995%22%3E%3Cg%3E%3Cpath%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M8%201L3%2015H4.2L5.97686%2010H11.0231L11.6768%2011.8394C11.955%2011.5504%2012.262%2011.2892%2012.593%2011.0605L9%201H8ZM8.5%202.9L10.6678%209H6.33223L8.5%202.9Z%22%2F%3E%3Cpath%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M16%2021C18.7614%2021%2021%2018.7614%2021%2016C21%2013.2386%2018.7614%2011%2016%2011C13.2386%2011%2011%2013.2386%2011%2016C11%2018.7614%2013.2386%2021%2016%2021ZM15.3536%2018.3536L19.3536%2014.3536L18.6464%2013.6464L15%2017.2929L13.3536%2015.6464L12.6464%2016.3536L14.6464%2018.3536L15%2018.7071L15.3536%2018.3536Z%22%2F%3E%3C%2Fg%3E%3C%2Fsvg%3E"); } +i.icon.icon-review { + width: 22px; + height: 28px; + background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20version%3D%221.1%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20xmlns%3Axlink%3D%22http%3A%2F%2Fwww.w3.org%2F1999%2Fxlink%22%20viewBox%3D%22-0%200%2022%2022%22%20y%3D%220px%22%20x%3D%220px%22%20fill%3D%22%23446995%22%3E%3Cg%3E%3Cpath%20d%3D%22M2%202H19V6H18V3H3V19H18V13H19V20H2V2Z%22%2F%3E%3Cpath%20d%3D%22M15%207H6V6H15V7Z%22%2F%3E%3Cpath%20d%3D%22M6%209H15V8H6V9Z%22%2F%3E%3Cpath%20d%3D%22M13%2011H6V10H13V11Z%22%2F%3E%3Cpath%20d%3D%22M6%2013H11V12H6V13Z%22%2F%3E%3Cpath%20d%3D%22M10%2015H6V14H10V15Z%22%2F%3E%3Cpath%20d%3D%22M12%2014.5V16H13.5L21.5%208L20%206.5L12%2014.5Z%22%2F%3E%3C%2Fg%3E%3C%2Fsvg%3E"); +} i.icon.icon-doc-setup { width: 22px; height: 22px; @@ -6174,6 +6179,11 @@ i.icon.icon-format-pdf { height: 30px; background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20version%3D%221.1%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20xmlns%3Axlink%3D%22http%3A%2F%2Fwww.w3.org%2F1999%2Fxlink%22%20viewBox%3D%220%200%2033%2033%22%20height%3D%2233px%22%20width%3D%2233px%22%20y%3D%220px%22%20x%3D%220px%22%3E%3Cdefs%3E%3Cstyle%3E.cls-1%7Bfill%3A%23446995%3B%7D%3C%2Fstyle%3E%3C%2Fdefs%3E%3Cpath%20d%3D%22M11.875%2C18.648c0.8-1.567%2C1.709-3.334%2C2.437-5.107l0%2C0%20%20l0.288-0.7c-0.95-3.616-1.52-6.519-1.011-8.396l0%2C0c0.137-0.489%2C0.704-0.786%2C1.31-0.786l0%2C0l0.369%2C0.005h0.068%20%20c0.83-0.013%2C1.22%2C1.042%2C1.264%2C1.453l0%2C0c0.073%2C0.683-0.243%2C1.839-0.243%2C1.839l0%2C0c0-0.467%2C0.018-1.221-0.276-1.873l0%2C0%20%20c-0.343-0.753-0.671-1.204-0.965-1.275l0%2C0c-0.148%2C0.099-0.292%2C0.304-0.342%2C0.699l0%2C0c-0.103%2C0.553-0.133%2C1.252-0.133%2C1.612l0%2C0%20%20c0%2C1.272%2C0.25%2C2.952%2C0.743%2C4.683l0%2C0c0.093-0.268%2C0.174-0.526%2C0.24-0.767l0%2C0c0.101-0.38%2C0.743-2.901%2C0.743-2.901l0%2C0%20%20c0%2C0-0.162%2C3.355-0.388%2C4.371l0%2C0c-0.048%2C0.215-0.102%2C0.427-0.158%2C0.644l0%2C0c0.812%2C2.268%2C2.121%2C4.292%2C3.68%2C5.75l0%2C0%20%20c0.615%2C0.575%2C1.393%2C1.038%2C2.128%2C1.461l0%2C0c1.605-0.229%2C3.084-0.338%2C4.318-0.324l0%2C0c1.637%2C0.021%2C2.838%2C0.264%2C3.324%2C0.743l0%2C0%20%20c0.238%2C0.232%2C0.335%2C0.514%2C0.365%2C0.83l0%2C0c0.007%2C0.122-0.053%2C0.41-0.07%2C0.482l0%2C0c0.018-0.088%2C0.018-0.518-1.297-0.938l0%2C0%20%20c-1.034-0.33-2.971-0.32-5.295-0.073l0%2C0c2.688%2C1.315%2C5.307%2C1.968%2C6.137%2C1.577l0%2C0c0.203-0.1%2C0.449-0.437%2C0.449-0.437l0%2C0%20%20c0%2C0-0.146%2C0.665-0.252%2C0.831l0%2C0c-0.134%2C0.18-0.396%2C0.376-0.646%2C0.441l0%2C0c-1.311%2C0.35-4.722-0.459-7.695-2.158l0%2C0%20%20c-3.322%2C0.489-6.972%2C1.393-9.897%2C2.353l0%2C0c-2.874%2C5.037-5.035%2C7.351-6.793%2C6.471l0%2C0L3.63%2C28.833%20%20c-0.263-0.15-0.303-0.516-0.242-0.813l0%2C0c0.205-1.003%2C1.462-2.513%2C3.988-4.021l0%2C0c0.272-0.165%2C1.483-0.805%2C1.483-0.805l0%2C0%20%20c0%2C0-0.896%2C0.868-1.106%2C1.038l0%2C0c-2.016%2C1.652-3.504%2C3.73-3.467%2C4.536l0%2C0l0.007%2C0.069C6.005%2C28.594%2C8.573%2C25.109%2C11.875%2C18.648%20%20%20M12.921%2C19.184c-0.551%2C1.038-1.09%2C2.001-1.588%2C2.886l0%2C0c2.752-1.153%2C5.715-1.892%2C8.535-2.416l0%2C0%20%20c-0.379-0.262-0.746-0.539-1.093-0.832l0%2C0c-1.554-1.314-2.737-2.955-3.595-4.681l0%2C0C14.636%2C15.607%2C13.989%2C17.166%2C12.921%2C19.184%22%20class%3D%22cls-1%22%20%2F%3E%3C%2Fsvg%3E"); } +i.icon.icon-format-pdfa { + width: 30px; + height: 30px; + background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20version%3D%221.1%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20xmlns%3Axlink%3D%22http%3A%2F%2Fwww.w3.org%2F1999%2Fxlink%22%20viewBox%3D%220%200%2033%2033%22%20height%3D%2233px%22%20width%3D%2233px%22%20y%3D%220px%22%20x%3D%220px%22%3E%3Cdefs%3E%3Cstyle%3E.cls-1%7Bfill%3A%23446995%3B%7D%3C%2Fstyle%3E%3C%2Fdefs%3E%3Cpath%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M11.875%2018.648L11.9617%2018.4783C12.7401%2016.954%2013.6102%2015.2503%2014.312%2013.541L14.6%2012.841C13.65%209.225%2013.08%206.322%2013.589%204.445C13.726%203.956%2014.293%203.659%2014.899%203.659L15.268%203.664H15.336C16.166%203.651%2016.556%204.706%2016.6%205.117C16.673%205.8%2016.357%206.956%2016.357%206.956L16.3571%206.87946C16.358%206.40944%2016.3594%205.70047%2016.081%205.083C15.738%204.33%2015.41%203.879%2015.116%203.808C14.968%203.907%2014.824%204.112%2014.774%204.507C14.671%205.06%2014.641%205.759%2014.641%206.119C14.641%207.391%2014.891%209.071%2015.384%2010.802C15.477%2010.534%2015.558%2010.276%2015.624%2010.035C15.725%209.655%2016.367%207.134%2016.367%207.134C16.367%207.134%2016.205%2010.489%2015.979%2011.505C15.931%2011.72%2015.877%2011.932%2015.821%2012.149C16.633%2014.417%2017.942%2016.441%2019.501%2017.899C19.9467%2018.3157%2020.4779%2018.6735%2021.0164%2019H29C30.1046%2019%2031%2019.8954%2031%2021V29C31%2030.1046%2030.1046%2031%2029%2031H17C15.8954%2031%2015%2030.1046%2015%2029V21.5492C13.6156%2021.9019%2012.2807%2022.2896%2011.07%2022.687C8.19599%2027.724%206.03499%2030.038%204.27699%2029.158L3.62999%2028.833C3.36699%2028.683%203.32699%2028.317%203.38799%2028.02C3.59299%2027.017%204.84999%2025.507%207.37599%2023.999C7.64799%2023.834%208.85899%2023.194%208.85899%2023.194C8.85899%2023.194%207.96299%2024.062%207.75299%2024.232C5.73699%2025.884%204.24899%2027.962%204.28599%2028.768L4.29299%2028.837C6.00499%2028.594%208.57299%2025.109%2011.875%2018.648ZM18.775%2018.822C18.8461%2018.882%2018.918%2018.9413%2018.9906%2019H17C15.9681%2019%2015.1187%2019.7815%2015.0114%2020.785C13.7648%2021.146%2012.529%2021.5689%2011.333%2022.07C11.831%2021.185%2012.37%2020.222%2012.921%2019.184C13.989%2017.166%2014.636%2015.607%2015.18%2014.141C16.038%2015.867%2017.221%2017.508%2018.775%2018.822ZM21.5553%2027.3521H24.4447L24.9995%2029H26.7518L23.7581%2021.002H22.231L19.2537%2029H21.006L21.5553%2027.3521ZM23.9998%2026.0172H22.0002L22.9945%2023.0234L23.9998%2026.0172Z%22%20class%3D%22cls-1%22%2F%3E%3C%2Fsvg%3E"); +} i.icon.icon-format-odt { width: 30px; height: 30px; diff --git a/apps/documenteditor/mobile/resources/less/ios/_icons.less b/apps/documenteditor/mobile/resources/less/ios/_icons.less index ed8c44678..9202d27cb 100644 --- a/apps/documenteditor/mobile/resources/less/ios/_icons.less +++ b/apps/documenteditor/mobile/resources/less/ios/_icons.less @@ -37,12 +37,12 @@ i.icon { } &.icon-download { width: 22px; - height: 28px; + height: 22px; .encoded-svg-background(''); } &.icon-print { width: 22px; - height: 28px; + height: 22px; .encoded-svg-background(''); } &.icon-spellcheck { @@ -50,6 +50,11 @@ i.icon { height: 22px; .encoded-svg-background(''); } + &.icon-review { + width: 22px; + height: 28px; + .encoded-svg-background(''); + } &.icon-doc-setup { width: 22px; height: 22px; @@ -380,6 +385,11 @@ i.icon { height: 30px; .encoded-svg-background(''); } + &.icon-format-pdfa { + width: 30px; + height: 30px; + .encoded-svg-background(''); + } &.icon-format-odt { width: 30px; height: 30px; diff --git a/apps/documenteditor/mobile/resources/less/material/_icons.less b/apps/documenteditor/mobile/resources/less/material/_icons.less index 95ca9f990..9410cc70a 100644 --- a/apps/documenteditor/mobile/resources/less/material/_icons.less +++ b/apps/documenteditor/mobile/resources/less/material/_icons.less @@ -32,12 +32,12 @@ i.icon { } &.icon-download { width: 22px; - height: 28px; + height: 22px; .encoded-svg-background(''); } &.icon-print { width: 22px; - height: 28px; + height: 22px; .encoded-svg-background(''); } &.icon-spellcheck { @@ -45,6 +45,11 @@ i.icon { height: 22px; .encoded-svg-background(''); } + &.icon-review { + width: 22px; + height: 28px; + .encoded-svg-background(''); + } &.icon-doc-setup { width: 22px; height: 22px; @@ -302,6 +307,11 @@ i.icon { height: 30px; .encoded-svg-background(''); } + &.icon-format-pdfa { + width: 30px; + height: 30px; + .encoded-svg-background(''); + } &.icon-format-odt { width: 30px; height: 30px; diff --git a/apps/presentationeditor/mobile/app/template/Settings.template b/apps/presentationeditor/mobile/app/template/Settings.template index 462b3f29a..084d11e32 100644 --- a/apps/presentationeditor/mobile/app/template/Settings.template +++ b/apps/presentationeditor/mobile/app/template/Settings.template @@ -212,6 +212,18 @@
    • +
  • + +
    +
    + +
    +
    +
    PDF/A
    +
    +
    +     +
  • diff --git a/apps/presentationeditor/mobile/resources/css/app-ios.css b/apps/presentationeditor/mobile/resources/css/app-ios.css index caf3d14fa..72bce2955 100644 --- a/apps/presentationeditor/mobile/resources/css/app-ios.css +++ b/apps/presentationeditor/mobile/resources/css/app-ios.css @@ -6671,6 +6671,11 @@ i.icon.icon-format-pdf { height: 30px; background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20version%3D%221.1%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20xmlns%3Axlink%3D%22http%3A%2F%2Fwww.w3.org%2F1999%2Fxlink%22%20x%3D%220px%22%20y%3D%220px%22%20width%3D%2233px%22%20height%3D%2233px%22%20viewBox%3D%22-3.363%20-3.658%2033%2033%22%20xml%3Aspace%3D%22preserve%22%3E%3Cdefs%3E%3Cstyle%3E.cls-1%7Bfill%3A%23aa5252%3B%7D%3C%2Fstyle%3E%3C%2Fdefs%3E%3Cpath%20class%3D%22cls-1%22%20d%3D%22M8.512%2C14.989c0.8-1.567%2C1.709-3.334%2C2.438-5.107l0%2C0l0.287-0.699%20%20c-0.949-3.616-1.52-6.52-1.011-8.396l0%2C0C10.362%2C0.297%2C10.929%2C0%2C11.535%2C0l0%2C0l0.368%2C0.005h0.068c0.83-0.013%2C1.22%2C1.042%2C1.264%2C1.453%20%20l0%2C0c0.073%2C0.684-0.242%2C1.839-0.242%2C1.839l0%2C0c0-0.467%2C0.018-1.221-0.276-1.873l0%2C0c-0.343-0.753-0.671-1.203-0.965-1.274l0%2C0%20%20C11.604%2C0.25%2C11.46%2C0.455%2C11.411%2C0.85l0%2C0c-0.104%2C0.553-0.134%2C1.252-0.134%2C1.611l0%2C0c0%2C1.272%2C0.25%2C2.952%2C0.743%2C4.684l0%2C0%20%20c0.093-0.269%2C0.174-0.526%2C0.24-0.768l0%2C0c0.101-0.38%2C0.743-2.9%2C0.743-2.9l0%2C0c0%2C0-0.162%2C3.354-0.388%2C4.371l0%2C0%20%20c-0.049%2C0.215-0.103%2C0.427-0.158%2C0.644l0%2C0c0.812%2C2.268%2C2.121%2C4.292%2C3.68%2C5.75l0%2C0c0.615%2C0.575%2C1.393%2C1.038%2C2.128%2C1.461l0%2C0%20%20c1.605-0.229%2C3.084-0.338%2C4.318-0.324l0%2C0c1.637%2C0.021%2C2.838%2C0.265%2C3.324%2C0.743l0%2C0c0.237%2C0.232%2C0.335%2C0.514%2C0.364%2C0.83l0%2C0%20%20c0.007%2C0.122-0.053%2C0.41-0.069%2C0.482l0%2C0c0.018-0.088%2C0.018-0.519-1.298-0.938l0%2C0c-1.033-0.33-2.971-0.32-5.295-0.073l0%2C0%20%20c2.688%2C1.315%2C5.308%2C1.969%2C6.138%2C1.577l0%2C0c0.203-0.1%2C0.448-0.437%2C0.448-0.437l0%2C0c0%2C0-0.146%2C0.665-0.252%2C0.831l0%2C0%20%20c-0.134%2C0.18-0.396%2C0.376-0.646%2C0.44l0%2C0c-1.312%2C0.351-4.722-0.459-7.695-2.158l0%2C0c-3.322%2C0.489-6.972%2C1.394-9.896%2C2.354l0%2C0%20%20c-2.874%2C5.036-5.036%2C7.35-6.793%2C6.47l0%2C0l-0.646-0.325c-0.263-0.149-0.303-0.516-0.242-0.813l0%2C0%20%20c0.205-1.003%2C1.462-2.513%2C3.988-4.021l0%2C0c0.272-0.165%2C1.483-0.805%2C1.483-0.805l0%2C0c0%2C0-0.896%2C0.868-1.106%2C1.038l0%2C0%20%20c-2.016%2C1.652-3.504%2C3.73-3.467%2C4.536l0%2C0l0.007%2C0.069C2.643%2C24.936%2C5.21%2C21.45%2C8.512%2C14.989%20M9.559%2C15.525%20%20c-0.551%2C1.038-1.09%2C2.001-1.588%2C2.886l0%2C0c2.752-1.153%2C5.715-1.892%2C8.535-2.416l0%2C0c-0.379-0.262-0.746-0.539-1.093-0.832l0%2C0%20%20c-1.555-1.313-2.737-2.955-3.596-4.681l0%2C0C11.273%2C11.948%2C10.626%2C13.507%2C9.559%2C15.525%22%20%2F%3E%3C%2Fsvg%3E"); } +i.icon.icon-format-pdfa { + width: 30px; + height: 30px; + background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20version%3D%221.1%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20xmlns%3Axlink%3D%22http%3A%2F%2Fwww.w3.org%2F1999%2Fxlink%22%20viewBox%3D%220%200%2033%2033%22%20height%3D%2233px%22%20width%3D%2233px%22%20y%3D%220px%22%20x%3D%220px%22%3E%3Cdefs%3E%3Cstyle%3E.cls-1%7Bfill%3A%23aa5252%3B%7D%3C%2Fstyle%3E%3C%2Fdefs%3E%3Cpath%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M11.875%2018.648L11.9617%2018.4783C12.7401%2016.954%2013.6102%2015.2503%2014.312%2013.541L14.6%2012.841C13.65%209.225%2013.08%206.322%2013.589%204.445C13.726%203.956%2014.293%203.659%2014.899%203.659L15.268%203.664H15.336C16.166%203.651%2016.556%204.706%2016.6%205.117C16.673%205.8%2016.357%206.956%2016.357%206.956L16.3571%206.87946C16.358%206.40944%2016.3594%205.70047%2016.081%205.083C15.738%204.33%2015.41%203.879%2015.116%203.808C14.968%203.907%2014.824%204.112%2014.774%204.507C14.671%205.06%2014.641%205.759%2014.641%206.119C14.641%207.391%2014.891%209.071%2015.384%2010.802C15.477%2010.534%2015.558%2010.276%2015.624%2010.035C15.725%209.655%2016.367%207.134%2016.367%207.134C16.367%207.134%2016.205%2010.489%2015.979%2011.505C15.931%2011.72%2015.877%2011.932%2015.821%2012.149C16.633%2014.417%2017.942%2016.441%2019.501%2017.899C19.9467%2018.3157%2020.4779%2018.6735%2021.0164%2019H29C30.1046%2019%2031%2019.8954%2031%2021V29C31%2030.1046%2030.1046%2031%2029%2031H17C15.8954%2031%2015%2030.1046%2015%2029V21.5492C13.6156%2021.9019%2012.2807%2022.2896%2011.07%2022.687C8.19599%2027.724%206.03499%2030.038%204.27699%2029.158L3.62999%2028.833C3.36699%2028.683%203.32699%2028.317%203.38799%2028.02C3.59299%2027.017%204.84999%2025.507%207.37599%2023.999C7.64799%2023.834%208.85899%2023.194%208.85899%2023.194C8.85899%2023.194%207.96299%2024.062%207.75299%2024.232C5.73699%2025.884%204.24899%2027.962%204.28599%2028.768L4.29299%2028.837C6.00499%2028.594%208.57299%2025.109%2011.875%2018.648ZM18.775%2018.822C18.8461%2018.882%2018.918%2018.9413%2018.9906%2019H17C15.9681%2019%2015.1187%2019.7815%2015.0114%2020.785C13.7648%2021.146%2012.529%2021.5689%2011.333%2022.07C11.831%2021.185%2012.37%2020.222%2012.921%2019.184C13.989%2017.166%2014.636%2015.607%2015.18%2014.141C16.038%2015.867%2017.221%2017.508%2018.775%2018.822ZM21.5553%2027.3521H24.4447L24.9995%2029H26.7518L23.7581%2021.002H22.231L19.2537%2029H21.006L21.5553%2027.3521ZM23.9998%2026.0172H22.0002L22.9945%2023.0234L23.9998%2026.0172Z%22%20class%3D%22cls-1%22%2F%3E%3C%2Fsvg%3E"); +} i.icon.icon-format-pptx { width: 30px; height: 30px; diff --git a/apps/presentationeditor/mobile/resources/css/app-material.css b/apps/presentationeditor/mobile/resources/css/app-material.css index f55ebe755..c7e5133e0 100644 --- a/apps/presentationeditor/mobile/resources/css/app-material.css +++ b/apps/presentationeditor/mobile/resources/css/app-material.css @@ -6209,6 +6209,11 @@ i.icon.icon-format-pdf { height: 30px; background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20version%3D%221.1%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20xmlns%3Axlink%3D%22http%3A%2F%2Fwww.w3.org%2F1999%2Fxlink%22%20x%3D%220px%22%20y%3D%220px%22%20width%3D%2233px%22%20height%3D%2233px%22%20viewBox%3D%22-3.363%20-3.658%2033%2033%22%20xml%3Aspace%3D%22preserve%22%3E%3Cdefs%3E%3Cstyle%3E.cls-1%7Bfill%3A%23aa5252%3B%7D%3C%2Fstyle%3E%3C%2Fdefs%3E%3Cpath%20class%3D%22cls-1%22%20d%3D%22M8.512%2C14.989c0.8-1.567%2C1.709-3.334%2C2.438-5.107l0%2C0l0.287-0.699%20%20c-0.949-3.616-1.52-6.52-1.011-8.396l0%2C0C10.362%2C0.297%2C10.929%2C0%2C11.535%2C0l0%2C0l0.368%2C0.005h0.068c0.83-0.013%2C1.22%2C1.042%2C1.264%2C1.453%20%20l0%2C0c0.073%2C0.684-0.242%2C1.839-0.242%2C1.839l0%2C0c0-0.467%2C0.018-1.221-0.276-1.873l0%2C0c-0.343-0.753-0.671-1.203-0.965-1.274l0%2C0%20%20C11.604%2C0.25%2C11.46%2C0.455%2C11.411%2C0.85l0%2C0c-0.104%2C0.553-0.134%2C1.252-0.134%2C1.611l0%2C0c0%2C1.272%2C0.25%2C2.952%2C0.743%2C4.684l0%2C0%20%20c0.093-0.269%2C0.174-0.526%2C0.24-0.768l0%2C0c0.101-0.38%2C0.743-2.9%2C0.743-2.9l0%2C0c0%2C0-0.162%2C3.354-0.388%2C4.371l0%2C0%20%20c-0.049%2C0.215-0.103%2C0.427-0.158%2C0.644l0%2C0c0.812%2C2.268%2C2.121%2C4.292%2C3.68%2C5.75l0%2C0c0.615%2C0.575%2C1.393%2C1.038%2C2.128%2C1.461l0%2C0%20%20c1.605-0.229%2C3.084-0.338%2C4.318-0.324l0%2C0c1.637%2C0.021%2C2.838%2C0.265%2C3.324%2C0.743l0%2C0c0.237%2C0.232%2C0.335%2C0.514%2C0.364%2C0.83l0%2C0%20%20c0.007%2C0.122-0.053%2C0.41-0.069%2C0.482l0%2C0c0.018-0.088%2C0.018-0.519-1.298-0.938l0%2C0c-1.033-0.33-2.971-0.32-5.295-0.073l0%2C0%20%20c2.688%2C1.315%2C5.308%2C1.969%2C6.138%2C1.577l0%2C0c0.203-0.1%2C0.448-0.437%2C0.448-0.437l0%2C0c0%2C0-0.146%2C0.665-0.252%2C0.831l0%2C0%20%20c-0.134%2C0.18-0.396%2C0.376-0.646%2C0.44l0%2C0c-1.312%2C0.351-4.722-0.459-7.695-2.158l0%2C0c-3.322%2C0.489-6.972%2C1.394-9.896%2C2.354l0%2C0%20%20c-2.874%2C5.036-5.036%2C7.35-6.793%2C6.47l0%2C0l-0.646-0.325c-0.263-0.149-0.303-0.516-0.242-0.813l0%2C0%20%20c0.205-1.003%2C1.462-2.513%2C3.988-4.021l0%2C0c0.272-0.165%2C1.483-0.805%2C1.483-0.805l0%2C0c0%2C0-0.896%2C0.868-1.106%2C1.038l0%2C0%20%20c-2.016%2C1.652-3.504%2C3.73-3.467%2C4.536l0%2C0l0.007%2C0.069C2.643%2C24.936%2C5.21%2C21.45%2C8.512%2C14.989%20M9.559%2C15.525%20%20c-0.551%2C1.038-1.09%2C2.001-1.588%2C2.886l0%2C0c2.752-1.153%2C5.715-1.892%2C8.535-2.416l0%2C0c-0.379-0.262-0.746-0.539-1.093-0.832l0%2C0%20%20c-1.555-1.313-2.737-2.955-3.596-4.681l0%2C0C11.273%2C11.948%2C10.626%2C13.507%2C9.559%2C15.525%22%20%2F%3E%3C%2Fsvg%3E"); } +i.icon.icon-format-pdfa { + width: 30px; + height: 30px; + background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20version%3D%221.1%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20xmlns%3Axlink%3D%22http%3A%2F%2Fwww.w3.org%2F1999%2Fxlink%22%20viewBox%3D%220%200%2033%2033%22%20height%3D%2233px%22%20width%3D%2233px%22%20y%3D%220px%22%20x%3D%220px%22%3E%3Cdefs%3E%3Cstyle%3E.cls-1%7Bfill%3A%23aa5252%3B%7D%3C%2Fstyle%3E%3C%2Fdefs%3E%3Cpath%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M11.875%2018.648L11.9617%2018.4783C12.7401%2016.954%2013.6102%2015.2503%2014.312%2013.541L14.6%2012.841C13.65%209.225%2013.08%206.322%2013.589%204.445C13.726%203.956%2014.293%203.659%2014.899%203.659L15.268%203.664H15.336C16.166%203.651%2016.556%204.706%2016.6%205.117C16.673%205.8%2016.357%206.956%2016.357%206.956L16.3571%206.87946C16.358%206.40944%2016.3594%205.70047%2016.081%205.083C15.738%204.33%2015.41%203.879%2015.116%203.808C14.968%203.907%2014.824%204.112%2014.774%204.507C14.671%205.06%2014.641%205.759%2014.641%206.119C14.641%207.391%2014.891%209.071%2015.384%2010.802C15.477%2010.534%2015.558%2010.276%2015.624%2010.035C15.725%209.655%2016.367%207.134%2016.367%207.134C16.367%207.134%2016.205%2010.489%2015.979%2011.505C15.931%2011.72%2015.877%2011.932%2015.821%2012.149C16.633%2014.417%2017.942%2016.441%2019.501%2017.899C19.9467%2018.3157%2020.4779%2018.6735%2021.0164%2019H29C30.1046%2019%2031%2019.8954%2031%2021V29C31%2030.1046%2030.1046%2031%2029%2031H17C15.8954%2031%2015%2030.1046%2015%2029V21.5492C13.6156%2021.9019%2012.2807%2022.2896%2011.07%2022.687C8.19599%2027.724%206.03499%2030.038%204.27699%2029.158L3.62999%2028.833C3.36699%2028.683%203.32699%2028.317%203.38799%2028.02C3.59299%2027.017%204.84999%2025.507%207.37599%2023.999C7.64799%2023.834%208.85899%2023.194%208.85899%2023.194C8.85899%2023.194%207.96299%2024.062%207.75299%2024.232C5.73699%2025.884%204.24899%2027.962%204.28599%2028.768L4.29299%2028.837C6.00499%2028.594%208.57299%2025.109%2011.875%2018.648ZM18.775%2018.822C18.8461%2018.882%2018.918%2018.9413%2018.9906%2019H17C15.9681%2019%2015.1187%2019.7815%2015.0114%2020.785C13.7648%2021.146%2012.529%2021.5689%2011.333%2022.07C11.831%2021.185%2012.37%2020.222%2012.921%2019.184C13.989%2017.166%2014.636%2015.607%2015.18%2014.141C16.038%2015.867%2017.221%2017.508%2018.775%2018.822ZM21.5553%2027.3521H24.4447L24.9995%2029H26.7518L23.7581%2021.002H22.231L19.2537%2029H21.006L21.5553%2027.3521ZM23.9998%2026.0172H22.0002L22.9945%2023.0234L23.9998%2026.0172Z%22%20class%3D%22cls-1%22%2F%3E%3C%2Fsvg%3E"); +} i.icon.icon-format-pptx { width: 30px; height: 30px; diff --git a/apps/presentationeditor/mobile/resources/less/ios/_icons.less b/apps/presentationeditor/mobile/resources/less/ios/_icons.less index 2c27374f4..77f743748 100644 --- a/apps/presentationeditor/mobile/resources/less/ios/_icons.less +++ b/apps/presentationeditor/mobile/resources/less/ios/_icons.less @@ -373,6 +373,11 @@ i.icon { height: 30px; .encoded-svg-background(''); } + &.icon-format-pdfa { + width: 30px; + height: 30px; + .encoded-svg-background(''); + } &.icon-format-pptx { width: 30px; height: 30px; diff --git a/apps/presentationeditor/mobile/resources/less/material/_icons.less b/apps/presentationeditor/mobile/resources/less/material/_icons.less index b019f31c1..0cf56c6c2 100644 --- a/apps/presentationeditor/mobile/resources/less/material/_icons.less +++ b/apps/presentationeditor/mobile/resources/less/material/_icons.less @@ -343,6 +343,11 @@ i.icon { height: 30px; .encoded-svg-background(''); } + &.icon-format-pdfa { + width: 30px; + height: 30px; + .encoded-svg-background(''); + } &.icon-format-pptx { width: 30px; height: 30px; diff --git a/apps/spreadsheeteditor/main/app/controller/Main.js b/apps/spreadsheeteditor/main/app/controller/Main.js index c79ac4422..d83047457 100644 --- a/apps/spreadsheeteditor/main/app/controller/Main.js +++ b/apps/spreadsheeteditor/main/app/controller/Main.js @@ -1346,6 +1346,10 @@ define([ config.msg = (this.appOptions.isDesktopApp && this.appOptions.isOffline) ? this.errorEditingSaveas : this.errorEditingDownloadas; break; + case Asc.c_oAscError.ID.CannotChangeFormulaArray: + config.msg = this.errorChangeArray; + break; + default: config.msg = (typeof id == 'string') ? id : this.errorDefaultMessage.replace('%1', id); break; @@ -2467,7 +2471,8 @@ define([ txtShape_curvedConnector3WithTwoArrows: 'Curved Double-Arrow Connector', txtShape_spline: 'Curve', txtShape_polyline1: 'Scribble', - txtShape_polyline2: 'Freeform' + txtShape_polyline2: 'Freeform', + errorChangeArray: 'You cannot change part of an array.' } })(), SSE.Controllers.Main || {})) }); diff --git a/apps/spreadsheeteditor/main/app/controller/Toolbar.js b/apps/spreadsheeteditor/main/app/controller/Toolbar.js index 6173101a8..e88e1a248 100644 --- a/apps/spreadsheeteditor/main/app/controller/Toolbar.js +++ b/apps/spreadsheeteditor/main/app/controller/Toolbar.js @@ -1951,6 +1951,10 @@ define([ toolbar.btnImgGroup.menu.items[1].setDisabled(!canungroup); toolbar.lockToolbar(SSE.enumLock.cantGroup, !cangroup, { array: [toolbar.btnImgAlign]}); + var objcount = this.api.asc_getSelectedDrawingObjectsCount(); + toolbar.btnImgAlign.menu.items[7].setDisabled(objcount<3); + toolbar.btnImgAlign.menu.items[8].setDisabled(objcount<3); + if (editOptionsDisabled) return; /* read font params */ @@ -3270,10 +3274,19 @@ define([ }, onImgAlignSelect: function(menu, item) { - if (this.api) - this.api.asc_setSelectedDrawingObjectAlign(item.value); + if (this.api) { + if (item.value>-1 && item.value < 6) { + this.api.asc_setSelectedDrawingObjectAlign(item.value); + Common.component.Analytics.trackEvent('ToolBar', 'Objects Align'); + } else if (item.value == 6) { + this.api.asc_DistributeSelectedDrawingObjectHor(); + Common.component.Analytics.trackEvent('ToolBar', 'Distribute'); + } else if (item.value == 7){ + this.api.asc_DistributeSelectedDrawingObjectVer(); + Common.component.Analytics.trackEvent('ToolBar', 'Distribute'); + } + } Common.NotificationCenter.trigger('edit:complete', this.toolbar); - Common.component.Analytics.trackEvent('ToolBar', 'Objects Align'); }, onPrintAreaClick: function(menu, item) { diff --git a/apps/spreadsheeteditor/main/app/view/DocumentHolder.js b/apps/spreadsheeteditor/main/app/view/DocumentHolder.js index 5c9a3d5a5..0c27ec0c8 100644 --- a/apps/spreadsheeteditor/main/app/view/DocumentHolder.js +++ b/apps/spreadsheeteditor/main/app/view/DocumentHolder.js @@ -958,7 +958,9 @@ define([ textShapeAlignCenter : 'Align Center', textShapeAlignTop : 'Align Top', textShapeAlignBottom : 'Align Bottom', - textShapeAlignMiddle : 'Align Middle' + textShapeAlignMiddle : 'Align Middle', + txtDistribHor: 'Distribute Horizontally', + txtDistribVert: 'Distribute Vertically' }, SSE.Views.DocumentHolder || {})); }); \ No newline at end of file diff --git a/apps/spreadsheeteditor/main/app/view/Toolbar.js b/apps/spreadsheeteditor/main/app/view/Toolbar.js index 790306f50..570f74b7f 100644 --- a/apps/spreadsheeteditor/main/app/view/Toolbar.js +++ b/apps/spreadsheeteditor/main/app/view/Toolbar.js @@ -2202,6 +2202,17 @@ define([ caption : _holder_view.textShapeAlignBottom, iconCls : 'mnu-img-align-bottom', value : 2 + }, + {caption: '--'}, + { + caption: _holder_view.txtDistribHor, + iconCls: 'mnu-distrib-hor', + value: 6 + }, + { + caption: _holder_view.txtDistribVert, + iconCls: 'mnu-distrib-vert', + value: 7 }] })); diff --git a/apps/spreadsheeteditor/main/locale/en.json b/apps/spreadsheeteditor/main/locale/en.json index 91c6b5be6..984b927ae 100644 --- a/apps/spreadsheeteditor/main/locale/en.json +++ b/apps/spreadsheeteditor/main/locale/en.json @@ -366,6 +366,8 @@ "SSE.Controllers.DocumentHolder.txtUnderbar": "Bar under text", "SSE.Controllers.DocumentHolder.txtUndoExpansion": "Undo table autoexpansion", "SSE.Controllers.DocumentHolder.txtWidth": "Width", + "SSE.Controllers.DocumentHolder.txtDistribHor": "Distribute Horizontally", + "SSE.Controllers.DocumentHolder.txtDistribVert": "Distribute Vertically", "SSE.Controllers.LeftMenu.newDocumentTitle": "Unnamed spreadsheet", "SSE.Controllers.LeftMenu.textByColumns": "By columns", "SSE.Controllers.LeftMenu.textByRows": "By rows", @@ -399,6 +401,7 @@ "SSE.Controllers.Main.errorAutoFilterDataRange": "The operation could not be done for the selected range of cells.
    Select a uniform data range different from the existing one and try again.", "SSE.Controllers.Main.errorAutoFilterHiddenRange": "The operation cannot be performed because the area contains filtered cells.
    Please unhide the filtered elements and try again.", "SSE.Controllers.Main.errorBadImageUrl": "Image URL is incorrect", + "SSE.Controllers.Main.errorChangeArray": "You cannot change part of an array.", "SSE.Controllers.Main.errorCoAuthoringDisconnect": "Server connection lost. The document cannot be edited right now.", "SSE.Controllers.Main.errorConnectToServer": "The document could not be saved. Please check connection settings or contact your administrator.
    When you click the 'OK' button, you will be prompted to download the document.

    Find more information about connecting Document Server     here", "SSE.Controllers.Main.errorCopyMultiselectArea": "This command cannot be used with multiple selections.
    Select a single range and try again.", diff --git a/apps/spreadsheeteditor/main/resources/less/toolbar.less b/apps/spreadsheeteditor/main/resources/less/toolbar.less index 5de0a404f..d71597540 100644 --- a/apps/spreadsheeteditor/main/resources/less/toolbar.less +++ b/apps/spreadsheeteditor/main/resources/less/toolbar.less @@ -213,6 +213,8 @@ .menu-btn-icon(mnu-img-align-bottom, 45, @menu-icon-size); .menu-btn-icon(mnu-img-align-middle, 44, @menu-icon-size); .menu-btn-icon(mnu-img-align-top, 43, @menu-icon-size); +.menu-btn-icon(mnu-distrib-hor, 46, @menu-icon-size); +.menu-btn-icon(mnu-distrib-vert, 47, @menu-icon-size); .username-tip { background-color: #ee3525; diff --git a/apps/spreadsheeteditor/mobile/app/controller/Main.js b/apps/spreadsheeteditor/mobile/app/controller/Main.js index cd21ce1a2..aaabd781e 100644 --- a/apps/spreadsheeteditor/mobile/app/controller/Main.js +++ b/apps/spreadsheeteditor/mobile/app/controller/Main.js @@ -977,6 +977,10 @@ define([ config.msg = this.errorDataEncrypted; break; + case Asc.c_oAscError.ID.CannotChangeFormulaArray: + config.msg = this.errorChangeArray; + break; + default: config.msg = this.errorDefaultMessage.replace('%1', id); break; @@ -1535,7 +1539,8 @@ define([ errorCopyMultiselectArea: 'This command cannot be used with multiple selections.
    Select a single range and try again.', errorPrintMaxPagesCount: 'Unfortunately, it’s not possible to print more than 1500 pages at once in the current version of the program.
    This restriction will be eliminated in upcoming releases.', closeButtonText: 'Close File', - scriptLoadError: 'The connection is too slow, some of the components could not be loaded. Please reload the page.' + scriptLoadError: 'The connection is too slow, some of the components could not be loaded. Please reload the page.', + errorChangeArray: 'You cannot change part of an array.' } })(), SSE.Controllers.Main || {})) }); \ No newline at end of file diff --git a/apps/spreadsheeteditor/mobile/app/template/Settings.template b/apps/spreadsheeteditor/mobile/app/template/Settings.template index 2ceead895..9ca20c7cb 100644 --- a/apps/spreadsheeteditor/mobile/app/template/Settings.template +++ b/apps/spreadsheeteditor/mobile/app/template/Settings.template @@ -196,6 +196,18 @@
    • +
  • + +
    +
    + +
    +
    +
    PDF/A
    +
    +
    +     +
  • diff --git a/apps/spreadsheeteditor/mobile/app/view/Settings.js b/apps/spreadsheeteditor/mobile/app/view/Settings.js index 1c04182a0..185864042 100644 --- a/apps/spreadsheeteditor/mobile/app/view/Settings.js +++ b/apps/spreadsheeteditor/mobile/app/view/Settings.js @@ -92,6 +92,7 @@ define([ , saveas: { xlsx: Asc.c_oAscFileType.XLSX, pdf: Asc.c_oAscFileType.PDF, + pdfa: Asc.c_oAscFileType.PDFA, ods: Asc.c_oAscFileType.ODS, csv: Asc.c_oAscFileType.CSV } diff --git a/apps/spreadsheeteditor/mobile/locale/en.json b/apps/spreadsheeteditor/mobile/locale/en.json index 7edf620a0..2d35f54a6 100644 --- a/apps/spreadsheeteditor/mobile/locale/en.json +++ b/apps/spreadsheeteditor/mobile/locale/en.json @@ -115,6 +115,7 @@ "SSE.Controllers.Main.errorAutoFilterDataRange": "The operation could not be done for the selected range of cells.
    Select a uniform data range different from the existing one and try again.", "SSE.Controllers.Main.errorAutoFilterHiddenRange": "The operation cannot be performed because the area contains filtered cells.
    Please unhide the filtered elements and try again.", "SSE.Controllers.Main.errorBadImageUrl": "Image URL is incorrect", + "SSE.Controllers.Main.errorChangeArray": "You cannot change part of an array.", "SSE.Controllers.Main.errorCoAuthoringDisconnect": "Server connection lost. The document cannot be edited right now.", "SSE.Controllers.Main.errorConnectToServer": "The document could not be saved. Please check connection settings or contact your administrator.
    When you click the 'OK' button, you will be prompted to download the document.

    Find more information about connecting Document Server     here", "SSE.Controllers.Main.errorCopyMultiselectArea": "This command cannot be used with multiple selections.
    Select a single range and try again.", diff --git a/apps/spreadsheeteditor/mobile/resources/css/app-ios.css b/apps/spreadsheeteditor/mobile/resources/css/app-ios.css index b2148a7a1..9df3be106 100644 --- a/apps/spreadsheeteditor/mobile/resources/css/app-ios.css +++ b/apps/spreadsheeteditor/mobile/resources/css/app-ios.css @@ -6552,6 +6552,11 @@ i.icon.icon-format-pdf { height: 30px; background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20version%3D%221.1%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20xmlns%3Axlink%3D%22http%3A%2F%2Fwww.w3.org%2F1999%2Fxlink%22%20viewBox%3D%22-3.363%20-3.658%2033%2033%22%20height%3D%2233px%22%20width%3D%2233px%22%20y%3D%220px%22%20x%3D%220px%22%20xml%3Aspace%3D%22preserve%22%3E%3Cdefs%3E%3Cstyle%3E.cls-1%7Bfill%3A%2340865c%3B%7D%3C%2Fstyle%3E%3C%2Fdefs%3E%3Cpath%20class%3D%22cls-1%22%20d%3D%22M8.512%2C14.989c0.8-1.567%2C1.709-3.334%2C2.438-5.107l0%2C0l0.287-0.699%20%20c-0.949-3.616-1.52-6.52-1.011-8.396l0%2C0C10.362%2C0.297%2C10.929%2C0%2C11.535%2C0l0%2C0l0.368%2C0.005h0.068c0.83-0.013%2C1.22%2C1.042%2C1.264%2C1.453%20%20l0%2C0c0.073%2C0.684-0.242%2C1.839-0.242%2C1.839l0%2C0c0-0.467%2C0.018-1.221-0.276-1.873l0%2C0c-0.343-0.753-0.671-1.203-0.965-1.274l0%2C0%20%20C11.604%2C0.25%2C11.46%2C0.455%2C11.411%2C0.85l0%2C0c-0.104%2C0.553-0.134%2C1.252-0.134%2C1.611l0%2C0c0%2C1.272%2C0.25%2C2.952%2C0.743%2C4.684l0%2C0%20%20c0.093-0.269%2C0.174-0.526%2C0.24-0.768l0%2C0c0.101-0.38%2C0.743-2.9%2C0.743-2.9l0%2C0c0%2C0-0.162%2C3.354-0.388%2C4.371l0%2C0%20%20c-0.049%2C0.215-0.103%2C0.427-0.158%2C0.644l0%2C0c0.812%2C2.268%2C2.121%2C4.292%2C3.68%2C5.75l0%2C0c0.615%2C0.575%2C1.393%2C1.038%2C2.128%2C1.461l0%2C0%20%20c1.605-0.229%2C3.084-0.338%2C4.318-0.324l0%2C0c1.637%2C0.021%2C2.838%2C0.265%2C3.324%2C0.743l0%2C0c0.237%2C0.232%2C0.335%2C0.514%2C0.364%2C0.83l0%2C0%20%20c0.007%2C0.122-0.053%2C0.41-0.069%2C0.482l0%2C0c0.018-0.088%2C0.018-0.519-1.298-0.938l0%2C0c-1.033-0.33-2.971-0.32-5.295-0.073l0%2C0%20%20c2.688%2C1.315%2C5.308%2C1.969%2C6.138%2C1.577l0%2C0c0.203-0.1%2C0.448-0.437%2C0.448-0.437l0%2C0c0%2C0-0.146%2C0.665-0.252%2C0.831l0%2C0%20%20c-0.134%2C0.18-0.396%2C0.376-0.646%2C0.44l0%2C0c-1.312%2C0.351-4.722-0.459-7.695-2.158l0%2C0c-3.322%2C0.489-6.972%2C1.394-9.896%2C2.354l0%2C0%20%20c-2.874%2C5.036-5.036%2C7.35-6.793%2C6.47l0%2C0l-0.646-0.325c-0.263-0.149-0.303-0.516-0.242-0.813l0%2C0%20%20c0.205-1.003%2C1.462-2.513%2C3.988-4.021l0%2C0c0.272-0.165%2C1.483-0.805%2C1.483-0.805l0%2C0c0%2C0-0.896%2C0.868-1.106%2C1.038l0%2C0%20%20c-2.016%2C1.652-3.504%2C3.73-3.467%2C4.536l0%2C0l0.007%2C0.069C2.643%2C24.936%2C5.21%2C21.45%2C8.512%2C14.989%20M9.559%2C15.525%20%20c-0.551%2C1.038-1.09%2C2.001-1.588%2C2.886l0%2C0c2.752-1.153%2C5.715-1.892%2C8.535-2.416l0%2C0c-0.379-0.262-0.746-0.539-1.093-0.832l0%2C0%20%20c-1.555-1.313-2.737-2.955-3.596-4.681l0%2C0C11.273%2C11.948%2C10.626%2C13.507%2C9.559%2C15.525%22%20%2F%3E%3C%2Fsvg%3E"); } +i.icon.icon-format-pdfa { + width: 30px; + height: 30px; + background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20version%3D%221.1%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20xmlns%3Axlink%3D%22http%3A%2F%2Fwww.w3.org%2F1999%2Fxlink%22%20viewBox%3D%220%200%2033%2033%22%20height%3D%2233px%22%20width%3D%2233px%22%20y%3D%220px%22%20x%3D%220px%22%3E%3Cdefs%3E%3Cstyle%3E.cls-1%7Bfill%3A%2340865c%3B%7D%3C%2Fstyle%3E%3C%2Fdefs%3E%3Cpath%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M11.875%2018.648L11.9617%2018.4783C12.7401%2016.954%2013.6102%2015.2503%2014.312%2013.541L14.6%2012.841C13.65%209.225%2013.08%206.322%2013.589%204.445C13.726%203.956%2014.293%203.659%2014.899%203.659L15.268%203.664H15.336C16.166%203.651%2016.556%204.706%2016.6%205.117C16.673%205.8%2016.357%206.956%2016.357%206.956L16.3571%206.87946C16.358%206.40944%2016.3594%205.70047%2016.081%205.083C15.738%204.33%2015.41%203.879%2015.116%203.808C14.968%203.907%2014.824%204.112%2014.774%204.507C14.671%205.06%2014.641%205.759%2014.641%206.119C14.641%207.391%2014.891%209.071%2015.384%2010.802C15.477%2010.534%2015.558%2010.276%2015.624%2010.035C15.725%209.655%2016.367%207.134%2016.367%207.134C16.367%207.134%2016.205%2010.489%2015.979%2011.505C15.931%2011.72%2015.877%2011.932%2015.821%2012.149C16.633%2014.417%2017.942%2016.441%2019.501%2017.899C19.9467%2018.3157%2020.4779%2018.6735%2021.0164%2019H29C30.1046%2019%2031%2019.8954%2031%2021V29C31%2030.1046%2030.1046%2031%2029%2031H17C15.8954%2031%2015%2030.1046%2015%2029V21.5492C13.6156%2021.9019%2012.2807%2022.2896%2011.07%2022.687C8.19599%2027.724%206.03499%2030.038%204.27699%2029.158L3.62999%2028.833C3.36699%2028.683%203.32699%2028.317%203.38799%2028.02C3.59299%2027.017%204.84999%2025.507%207.37599%2023.999C7.64799%2023.834%208.85899%2023.194%208.85899%2023.194C8.85899%2023.194%207.96299%2024.062%207.75299%2024.232C5.73699%2025.884%204.24899%2027.962%204.28599%2028.768L4.29299%2028.837C6.00499%2028.594%208.57299%2025.109%2011.875%2018.648ZM18.775%2018.822C18.8461%2018.882%2018.918%2018.9413%2018.9906%2019H17C15.9681%2019%2015.1187%2019.7815%2015.0114%2020.785C13.7648%2021.146%2012.529%2021.5689%2011.333%2022.07C11.831%2021.185%2012.37%2020.222%2012.921%2019.184C13.989%2017.166%2014.636%2015.607%2015.18%2014.141C16.038%2015.867%2017.221%2017.508%2018.775%2018.822ZM21.5553%2027.3521H24.4447L24.9995%2029H26.7518L23.7581%2021.002H22.231L19.2537%2029H21.006L21.5553%2027.3521ZM23.9998%2026.0172H22.0002L22.9945%2023.0234L23.9998%2026.0172Z%22%20class%3D%22cls-1%22%2F%3E%3C%2Fsvg%3E"); +} i.icon.icon-format-xlsx { width: 30px; height: 30px; diff --git a/apps/spreadsheeteditor/mobile/resources/css/app-material.css b/apps/spreadsheeteditor/mobile/resources/css/app-material.css index 987b5934a..005dee430 100644 --- a/apps/spreadsheeteditor/mobile/resources/css/app-material.css +++ b/apps/spreadsheeteditor/mobile/resources/css/app-material.css @@ -6192,6 +6192,11 @@ i.icon.icon-format-pdf { height: 30px; background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20version%3D%221.1%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20xmlns%3Axlink%3D%22http%3A%2F%2Fwww.w3.org%2F1999%2Fxlink%22%20viewBox%3D%22-3.363%20-3.658%2033%2033%22%20height%3D%2233px%22%20width%3D%2233px%22%20y%3D%220px%22%20x%3D%220px%22%20xml%3Aspace%3D%22preserve%22%3E%3Cdefs%3E%3Cstyle%3E.cls-1%7Bfill%3A%2340865c%3B%7D%3C%2Fstyle%3E%3C%2Fdefs%3E%3Cpath%20class%3D%22cls-1%22%20d%3D%22M8.512%2C14.989c0.8-1.567%2C1.709-3.334%2C2.438-5.107l0%2C0l0.287-0.699%20%20c-0.949-3.616-1.52-6.52-1.011-8.396l0%2C0C10.362%2C0.297%2C10.929%2C0%2C11.535%2C0l0%2C0l0.368%2C0.005h0.068c0.83-0.013%2C1.22%2C1.042%2C1.264%2C1.453%20%20l0%2C0c0.073%2C0.684-0.242%2C1.839-0.242%2C1.839l0%2C0c0-0.467%2C0.018-1.221-0.276-1.873l0%2C0c-0.343-0.753-0.671-1.203-0.965-1.274l0%2C0%20%20C11.604%2C0.25%2C11.46%2C0.455%2C11.411%2C0.85l0%2C0c-0.104%2C0.553-0.134%2C1.252-0.134%2C1.611l0%2C0c0%2C1.272%2C0.25%2C2.952%2C0.743%2C4.684l0%2C0%20%20c0.093-0.269%2C0.174-0.526%2C0.24-0.768l0%2C0c0.101-0.38%2C0.743-2.9%2C0.743-2.9l0%2C0c0%2C0-0.162%2C3.354-0.388%2C4.371l0%2C0%20%20c-0.049%2C0.215-0.103%2C0.427-0.158%2C0.644l0%2C0c0.812%2C2.268%2C2.121%2C4.292%2C3.68%2C5.75l0%2C0c0.615%2C0.575%2C1.393%2C1.038%2C2.128%2C1.461l0%2C0%20%20c1.605-0.229%2C3.084-0.338%2C4.318-0.324l0%2C0c1.637%2C0.021%2C2.838%2C0.265%2C3.324%2C0.743l0%2C0c0.237%2C0.232%2C0.335%2C0.514%2C0.364%2C0.83l0%2C0%20%20c0.007%2C0.122-0.053%2C0.41-0.069%2C0.482l0%2C0c0.018-0.088%2C0.018-0.519-1.298-0.938l0%2C0c-1.033-0.33-2.971-0.32-5.295-0.073l0%2C0%20%20c2.688%2C1.315%2C5.308%2C1.969%2C6.138%2C1.577l0%2C0c0.203-0.1%2C0.448-0.437%2C0.448-0.437l0%2C0c0%2C0-0.146%2C0.665-0.252%2C0.831l0%2C0%20%20c-0.134%2C0.18-0.396%2C0.376-0.646%2C0.44l0%2C0c-1.312%2C0.351-4.722-0.459-7.695-2.158l0%2C0c-3.322%2C0.489-6.972%2C1.394-9.896%2C2.354l0%2C0%20%20c-2.874%2C5.036-5.036%2C7.35-6.793%2C6.47l0%2C0l-0.646-0.325c-0.263-0.149-0.303-0.516-0.242-0.813l0%2C0%20%20c0.205-1.003%2C1.462-2.513%2C3.988-4.021l0%2C0c0.272-0.165%2C1.483-0.805%2C1.483-0.805l0%2C0c0%2C0-0.896%2C0.868-1.106%2C1.038l0%2C0%20%20c-2.016%2C1.652-3.504%2C3.73-3.467%2C4.536l0%2C0l0.007%2C0.069C2.643%2C24.936%2C5.21%2C21.45%2C8.512%2C14.989%20M9.559%2C15.525%20%20c-0.551%2C1.038-1.09%2C2.001-1.588%2C2.886l0%2C0c2.752-1.153%2C5.715-1.892%2C8.535-2.416l0%2C0c-0.379-0.262-0.746-0.539-1.093-0.832l0%2C0%20%20c-1.555-1.313-2.737-2.955-3.596-4.681l0%2C0C11.273%2C11.948%2C10.626%2C13.507%2C9.559%2C15.525%22%20%2F%3E%3C%2Fsvg%3E"); } +i.icon.icon-format-pdfa { + width: 30px; + height: 30px; + background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20version%3D%221.1%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20xmlns%3Axlink%3D%22http%3A%2F%2Fwww.w3.org%2F1999%2Fxlink%22%20viewBox%3D%220%200%2033%2033%22%20height%3D%2233px%22%20width%3D%2233px%22%20y%3D%220px%22%20x%3D%220px%22%3E%3Cdefs%3E%3Cstyle%3E.cls-1%7Bfill%3A%2340865c%3B%7D%3C%2Fstyle%3E%3C%2Fdefs%3E%3Cpath%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M11.875%2018.648L11.9617%2018.4783C12.7401%2016.954%2013.6102%2015.2503%2014.312%2013.541L14.6%2012.841C13.65%209.225%2013.08%206.322%2013.589%204.445C13.726%203.956%2014.293%203.659%2014.899%203.659L15.268%203.664H15.336C16.166%203.651%2016.556%204.706%2016.6%205.117C16.673%205.8%2016.357%206.956%2016.357%206.956L16.3571%206.87946C16.358%206.40944%2016.3594%205.70047%2016.081%205.083C15.738%204.33%2015.41%203.879%2015.116%203.808C14.968%203.907%2014.824%204.112%2014.774%204.507C14.671%205.06%2014.641%205.759%2014.641%206.119C14.641%207.391%2014.891%209.071%2015.384%2010.802C15.477%2010.534%2015.558%2010.276%2015.624%2010.035C15.725%209.655%2016.367%207.134%2016.367%207.134C16.367%207.134%2016.205%2010.489%2015.979%2011.505C15.931%2011.72%2015.877%2011.932%2015.821%2012.149C16.633%2014.417%2017.942%2016.441%2019.501%2017.899C19.9467%2018.3157%2020.4779%2018.6735%2021.0164%2019H29C30.1046%2019%2031%2019.8954%2031%2021V29C31%2030.1046%2030.1046%2031%2029%2031H17C15.8954%2031%2015%2030.1046%2015%2029V21.5492C13.6156%2021.9019%2012.2807%2022.2896%2011.07%2022.687C8.19599%2027.724%206.03499%2030.038%204.27699%2029.158L3.62999%2028.833C3.36699%2028.683%203.32699%2028.317%203.38799%2028.02C3.59299%2027.017%204.84999%2025.507%207.37599%2023.999C7.64799%2023.834%208.85899%2023.194%208.85899%2023.194C8.85899%2023.194%207.96299%2024.062%207.75299%2024.232C5.73699%2025.884%204.24899%2027.962%204.28599%2028.768L4.29299%2028.837C6.00499%2028.594%208.57299%2025.109%2011.875%2018.648ZM18.775%2018.822C18.8461%2018.882%2018.918%2018.9413%2018.9906%2019H17C15.9681%2019%2015.1187%2019.7815%2015.0114%2020.785C13.7648%2021.146%2012.529%2021.5689%2011.333%2022.07C11.831%2021.185%2012.37%2020.222%2012.921%2019.184C13.989%2017.166%2014.636%2015.607%2015.18%2014.141C16.038%2015.867%2017.221%2017.508%2018.775%2018.822ZM21.5553%2027.3521H24.4447L24.9995%2029H26.7518L23.7581%2021.002H22.231L19.2537%2029H21.006L21.5553%2027.3521ZM23.9998%2026.0172H22.0002L22.9945%2023.0234L23.9998%2026.0172Z%22%20class%3D%22cls-1%22%2F%3E%3C%2Fsvg%3E"); +} i.icon.icon-format-xlsx { width: 30px; height: 30px; diff --git a/apps/spreadsheeteditor/mobile/resources/less/ios/_icons.less b/apps/spreadsheeteditor/mobile/resources/less/ios/_icons.less index 98887454b..56bc9766d 100644 --- a/apps/spreadsheeteditor/mobile/resources/less/ios/_icons.less +++ b/apps/spreadsheeteditor/mobile/resources/less/ios/_icons.less @@ -322,6 +322,11 @@ i.icon { height: 30px; .encoded-svg-background(''); } + &.icon-format-pdfa { + width: 30px; + height: 30px; + .encoded-svg-background(''); + } &.icon-format-xlsx { width: 30px; height: 30px; diff --git a/apps/spreadsheeteditor/mobile/resources/less/material/_icons.less b/apps/spreadsheeteditor/mobile/resources/less/material/_icons.less index 0fc1f4ca5..394664ba8 100644 --- a/apps/spreadsheeteditor/mobile/resources/less/material/_icons.less +++ b/apps/spreadsheeteditor/mobile/resources/less/material/_icons.less @@ -285,6 +285,11 @@ i.icon { height: 30px; .encoded-svg-background(''); } + &.icon-format-pdfa { + width: 30px; + height: 30px; + .encoded-svg-background(''); + } &.icon-format-xlsx { width: 30px; height: 30px;