diff --git a/apps/common/main/lib/controller/Plugins.js b/apps/common/main/lib/controller/Plugins.js index d07bd2a9c6..2a86d452b2 100644 --- a/apps/common/main/lib/controller/Plugins.js +++ b/apps/common/main/lib/controller/Plugins.js @@ -450,28 +450,29 @@ define([ rank = 1.5; rank_plugins++; } - if (new_rank!==rank && rank>-1 && rank_plugins>0) { - _group.appendTo(me.$toolbarPanelPlugins); - $('
').appendTo(me.$toolbarPanelPlugins); - _group = $('
'); - rank_plugins = 0; - } else { - _group.appendTo(me.$toolbarPanelPlugins); - $('').appendTo(me.$toolbarPanelPlugins); - _group = $('
'); - } var btn = me.viewPlugins.createPluginButton(model); if (btn) { + if (new_rank!==rank && rank>-1 && rank_plugins>0) { + _group.appendTo(me.$toolbarPanelPlugins); + $('
').appendTo(me.$toolbarPanelPlugins); + _group = $('
'); + rank_plugins = 0; + } else if (rank_plugins>0) { + _group.appendTo(me.$toolbarPanelPlugins); + $('').appendTo(me.$toolbarPanelPlugins); + _group = $('
'); + } + var $slot = $('').appendTo(_group); btn.render($slot); rank_plugins++; + rank = new_rank; } if (new_rank === 1 && !isBackground) { _group = me.addBackgroundPluginsButton(_group); isBackground = true; } - rank = new_rank; }); _group.appendTo(me.$toolbarPanelPlugins); if (me.backgroundPlugins.length > 0) { @@ -972,6 +973,9 @@ define([ }); pluginStore.reset(arr); this.appOptions.canPlugins = !pluginStore.isEmpty(); + me.newInstalledBackgroundPlugins = _.filter(me.newInstalledBackgroundPlugins, function(item){ + return !!pluginStore.findWhere({guid: item.guid}); + }) } } else if (!uiCustomize){ @@ -1299,7 +1303,7 @@ define([ onModalClose: function () { var plugins = this.newInstalledBackgroundPlugins; - if (plugins && plugins.length > 0) { + if (plugins && plugins.length > 0 && this.viewPlugins.backgroundBtn && this.viewPlugins.backgroundBtn.isVisible()) { var text = plugins.length > 1 ? this.textPluginsSuccessfullyInstalled : Common.Utils.String.format(this.textPluginSuccessfullyInstalled, plugins[0].name); if (this.backgroundPluginsTip && this.backgroundPluginsTip.isVisible()) { diff --git a/apps/common/main/lib/mods/perfect-scrollbar.js b/apps/common/main/lib/mods/perfect-scrollbar.js index 4fe6612dde..417a91dde4 100644 --- a/apps/common/main/lib/mods/perfect-scrollbar.js +++ b/apps/common/main/lib/mods/perfect-scrollbar.js @@ -84,8 +84,8 @@ var $scrollbarXRail = $("
").appendTo($this), $scrollbarYRail = $("
").appendTo($this), - $scrollbarX = $("
").appendTo($scrollbarXRail), - $scrollbarY = $("
").appendTo($scrollbarYRail), + $scrollbarX = $("
").appendTo($scrollbarXRail), + $scrollbarY = $("
").appendTo($scrollbarYRail), scrollbarXActive, scrollbarYActive, containerWidth, diff --git a/apps/common/main/lib/util/themeinit.js b/apps/common/main/lib/util/themeinit.js index e2ba2f5fd8..8cd8fcbf21 100644 --- a/apps/common/main/lib/util/themeinit.js +++ b/apps/common/main/lib/util/themeinit.js @@ -123,7 +123,7 @@ } } } else { - if ( window.uitheme.id.lastIndexOf("theme-gray", 0) === 0 ) { + if ( window.uitheme.id && window.uitheme.id.lastIndexOf("theme-gray", 0) === 0 ) { header_tokens.forEach(function (i) { !!document.documentElement.style.setProperty('--' + i, "#f7f7f7"); }); diff --git a/apps/common/main/lib/view/PdfSignDialog.js b/apps/common/main/lib/view/PdfSignDialog.js new file mode 100644 index 0000000000..8207083744 --- /dev/null +++ b/apps/common/main/lib/view/PdfSignDialog.js @@ -0,0 +1,376 @@ +/* + * (c) Copyright Ascensio System SIA 2010-2024 + * + * 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-6 Ernesta Birznieka-Upish + * 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 + * + */ +/** + * PdfSignDialog.js + * + * Created on 26/08/24 + * + */ + + +define([], function () { 'use strict'; + Common.Views.PdfSignDialog = Common.UI.Window.extend(_.extend({ + options: { + width: 535, + style: 'min-width: 350px;', + cls: 'modal-dlg', + buttons: ['ok', 'cancel'], + id: 'window-pdf-sign' + }, + + initialize : function(options) { + _.extend(this.options, { + title: this.txtTitle + }, options || {}); + + this.api = this.options.api; + this.props = this.options.props; + this.fontStore = this.options.fontStore; + this.mode = 0; // 0 - upload, 1 - draw, 2 - type + this.storage = !!this.options.storage; + this.fontName = 'Arial'; + this.isImageLoaded = false; + + this.template = [ + '
', + '', + '
', + '', + '', + '', + '
', + '', + '
', + '
', + '
', + '', + '', + '', + '
', + '
', + '
', + '', + '
', + '', + '', + '
', + '
', + '
', + '', + '', + '', + '', + '
', + '
', + ].join(''); + + this.options.tpl = _.template(this.template)(this.options); + Common.UI.Window.prototype.initialize.call(this, this.options); + }, + + render: function() { + Common.UI.Window.prototype.render.call(this); + + var me = this, + $window = this.getChild(); + + this.btnUpload = new Common.UI.Button({ + el: $window.find('#id-dlg-pdf-btn-upload'), + enableToggle: true, + toggleGroup: 'pdf-img-type', + allowDepress: false, + pressed: true + }); + this.btnUpload.on('click', _.bind(this.onImgModeClick, this, 0)); + + this.btnDraw = new Common.UI.Button({ + el: $window.find('#id-dlg-pdf-btn-draw'), + enableToggle: true, + toggleGroup: 'pdf-img-type', + allowDepress: false + }); + this.btnDraw.on('click', _.bind(this.onImgModeClick, this, 1)); + + this.btnType = new Common.UI.Button({ + el: $window.find('#id-dlg-pdf-btn-type'), + enableToggle: true, + toggleGroup: 'pdf-img-type', + allowDepress: false + }); + this.btnType.on('click', _.bind(this.onImgModeClick, this, 2)); + + this.btnSelectImage = new Common.UI.Button({ + parentEl: $window.find('#id-dlg-pdf-select-image'), + cls: 'btn-text-menu-default', + caption: this.textSelect, + style: 'width: 142px;', + menu: new Common.UI.Menu({ + style: 'min-width: 142px;', + maxHeight: 200, + additionalAlign: this.menuAddAlign, + items: [ + {caption: this.textFromFile, value: 0}, + {caption: this.textFromUrl, value: 1}, + {caption: this.textFromStorage, value: 2} + ] + }), + takeFocusOnClose: true + }); + this.btnSelectImage.menu.on('item:click', _.bind(this.onImageSelect, this)); + this.btnSelectImage.menu.items[2].setVisible(this.storage); + this.btnSelectImage.menu.items[1].setDisabled(this.options.disableNetworkFunctionality); + this.btnSelectImage.menu.items[2].setDisabled(this.options.disableNetworkFunctionality); + + this.chRemBack = new Common.UI.CheckBox({ + el: $window.find('#pdf-sign-ch-back'), + labelText: this.txtRemBack + }); + this.chRemBack.on('change', function(field, newValue, oldValue, eOpts){ + me.props && me.props.put_RemoveBackground(field.getValue()==='checked'); + }); + + this.cmbFonts = new Common.UI.ComboBoxFonts({ + el : $window.find('#pdf-sign-fonts'), + cls : 'input-group-nr', + style : 'width: 142px;', + menuCls : 'scrollable-menu', + menuStyle : 'min-width: 100%;max-height: 270px;', + store : new Common.Collections.Fonts(), + recent : 0, + takeFocusOnClose: true + }).on('selected', function(combo, record) { + me.fontName = record.name; + me.props && me.props.put_TypeFont(record.name); + }); + + this.btnLineColor = new Common.UI.ColorButton({ + parentEl: $window.find('#pdf-sign-line-color'), + additionalAlign: this.menuAddAlign, + color: 'auto', + auto: true, + takeFocusOnClose: true + }); + this.colorsLine = this.btnLineColor.getPicker(); + this.btnLineColor.on('color:select', _.bind(this.onColorsLineSelect, this)); + this.btnLineColor.on('auto:select', _.bind(this.onColorsAutoSelect, this)); + + var data = []; + for (var i=1; i<6; i++) { + data.push({ value: i, displayValue: i + ' px' }); + } + this.cmbLineSize = new Common.UI.ComboBox({ + el: $window.find('#pdf-sign-line-size'), + cls: 'input-group-nr', + style: 'width: 50px;', + menuCls : 'scrollable-menu', + menuStyle: 'min-width: 50px;max-height: 270px;', + data: data, + takeFocusOnClose: true + }); + this.cmbLineSize.setValue(2); + this.cmbLineSize.on('selected', function(combo, record) { + me.props && me.props.put_LineSize(record.value); + }); + + this.btnClear = new Common.UI.Button({ + el: $window.find('#pdf-sign-btn-clear') + }); + this.btnClear.on('click', _.bind(this.onClear, this)); + + this.imgUploadPnl = $window.find('.img-upload'); + this.imgDrawPnl = $window.find('.img-draw'); + this.imgTypePnl = $window.find('.img-type'); + this.uploadEmptyPnl = $window.find('#pdf-sign-img-upload'); + this.uploadPreviewPnl = $window.find('#pdf-sign-img-upload-preview'); + + + this.btnOk = _.find(this.getFooterButtons(), function (item) { + return (item.$el && item.$el.find('.primary').addBack().filter('.primary').length>0); + }) || new Common.UI.Button({ el: this.$window.find('.primary') }); + this.btnOk.setDisabled(true); + + this.afterRender(); + }, + + getFocusedComponents: function() { + return [this.btnUpload, this.btnDraw, this.btnType, this.btnSelectImage, this.chRemBack, this.cmbLineSize, this.btnLineColor, this.cmbFonts, this.btnClear].concat(this.getFooterButtons()); + }, + + getDefaultFocusableComponent: function () { + }, + + afterRender: function() { + this.cmbFonts.fillFonts(this.fontStore); + this.cmbFonts.selectRecord(this.fontStore.findWhere({name: this.fontName})); + + this.updateThemeColors(); + this._setDefaults(this.props); + + var me = this; + var onApiImgLoaded = function() { + me.isImageLoaded = true; + me.uploadEmptyPnl.toggleClass('hidden', true); + me.uploadPreviewPnl.toggleClass('hidden', false); + me.btnOk.setDisabled(!me.mode); + }; + this.api.asc_registerCallback('asc_onSignatureImageLoaded', onApiImgLoaded); + + var insertImageFromStorage = function(data) { + if (data && data._urls && data.c==='signature') { + me.props.put_ImageUrl(data._urls[0], data.token); + } + }; + Common.NotificationCenter.on('storage:image-insert', insertImageFromStorage); + + this.on('close', function(obj){ + me.api.asc_unregisterCallback('asc_onSignatureImageLoaded', onApiImgLoaded); + Common.NotificationCenter.off('storage:image-insert', insertImageFromStorage); + }); + }, + + updateThemeColors: function() { + this.colorsLine.updateColors(Common.Utils.ThemeColor.getEffectColors(), Common.Utils.ThemeColor.getStandartColors()); + }, + + onImgModeClick: function(mode, btn) { + this.mode = mode; + this.ShowHideElem(mode); + }, + + ShowHideElem: function(mode) { + this.imgUploadPnl.toggleClass('hidden', !!mode); + this.imgDrawPnl.toggleClass('hidden', mode!==1); + this.imgTypePnl.toggleClass('hidden', mode!==2); + this.btnOk.setDisabled(!mode && !this.isImageLoaded); + var me = this; + _.delay(function(){ + mode===1 ? me.cmbLineSize.focus() : mode===2 ? me.cmbFonts.focus() : me.btnSelectImage.focus(); + },50); + }, + + onImageSelect: function(menu, item) { + if (item.value==1) { + var me = this; + (new Common.Views.ImageFromUrlDialog({ + handler: function(result, value) { + if (result == 'ok') { + var checkUrl = value.replace(/ /g, ''); + if (!_.isEmpty(checkUrl)) { + me.props.put_ImageUrl(checkUrl); + } + } + } + })).on('close', function() { + }).show(); + } else if (item.value==2) { + Common.NotificationCenter.trigger('storage:image-load', 'signature'); + } else { + this.props.showFileDialog(); + } + }, + + onColorsLineSelect: function(btn, color) { + this.isAutoColor = false; + this.props && this.props.put_LineColor(Common.Utils.ThemeColor.getRgbColor(color)); + }, + + onColorsAutoSelect: function(e) { + this.isAutoColor = true; + this.props && this.props.put_LineColor("#000000"); + }, + + _setDefaults: function (props) { + if (props) { + // props.put_PreviewImgId('#pdf-sign-img-upload-preview'); + // props.put_PreviewDrawId('#pdf-sign-img-draw-preview'); + // props.put_PreviewTypeId('#pdf-sign-img-type-preview'); + } + }, + + getSettings: function () { + + }, + + onBtnClick: function(event) { + this._handleInput(event.currentTarget.attributes['result'].value); + }, + + onPrimary: function(event) { + this._handleInput('ok'); + return false; + }, + + _handleInput: function(state) { + if (this.handler) { + if (state == 'ok' && this.btnOk.isDisabled()) { + return; + } + this.handler.call(this, state, this.getSettings()); + } + + this.close(); + }, + + onClear: function () { + switch (this.mode) { + case 0: + this.props.clearImg(); + this.isImageLoaded = false; + this.uploadEmptyPnl.toggleClass('hidden', false); + this.uploadPreviewPnl.toggleClass('hidden', true); + this.btnOk.setDisabled(true); + break; + case 1: + this.props.clearDraw(); + break; + case 2: + this.props.clearType(); + break; + } + }, + + txtTitle: 'Signature', + txtUpload: 'Upload', + txtDraw: 'Draw', + txtType: 'Type', + textLooksAs: 'Signature looks as', + textClear: 'Clear', + textSelect: 'Select Image', + txtUploadDesc: 'You can upload images in JPEG, JPG, GIF and PNG formats with a max size of 30 Mb', + textBefore: 'Before signing this document, verify that the content you are signing is correct', + txtRemBack: 'Remove white background', + textFromUrl: 'From URL', + textFromFile: 'From File', + textFromStorage: 'From Storage' + + }, Common.Views.PdfSignDialog || {})) +}); \ No newline at end of file diff --git a/apps/common/main/resources/less/advanced-settings-window.less b/apps/common/main/resources/less/advanced-settings-window.less index acce3eff92..97622fd4b4 100644 --- a/apps/common/main/resources/less/advanced-settings-window.less +++ b/apps/common/main/resources/less/advanced-settings-window.less @@ -179,3 +179,10 @@ } } } + +#window-pdf-sign { + #id-dlg-pdf-btn-draw, + #id-dlg-pdf-btn-type { + .margin-left(-1px) + } +} \ No newline at end of file diff --git a/apps/common/main/resources/less/colors-table-gray.less b/apps/common/main/resources/less/colors-table-gray.less index e9d3b22bc9..98f9c1db66 100644 --- a/apps/common/main/resources/less/colors-table-gray.less +++ b/apps/common/main/resources/less/colors-table-gray.less @@ -7,10 +7,10 @@ --toolbar-header-presentation: #f7f7f7; --toolbar-header-pdf: #f7f7f7; - --text-toolbar-header-on-background-document: #38567A; - --text-toolbar-header-on-background-spreadsheet: #336B49; - --text-toolbar-header-on-background-presentation: #854535; - --text-toolbar-header-on-background-pdf: #8D4444; + --text-toolbar-header-on-background-document: #FFFFFF; + --text-toolbar-header-on-background-spreadsheet: #FFFFFF; + --text-toolbar-header-on-background-presentation: #FFFFFF; + --text-toolbar-header-on-background-pdf: #FFFFFF; --background-normal: #fff; --background-toolbar: #f7f7f7; diff --git a/apps/common/main/resources/less/comments.less b/apps/common/main/resources/less/comments.less index 68eff8f413..2ed9fae2ce 100644 --- a/apps/common/main/resources/less/comments.less +++ b/apps/common/main/resources/less/comments.less @@ -352,11 +352,11 @@ .btn-edit,.btn-delete, .btn-resolve, .icon-resolve, .btn-resolve-check, .btn-accept, .btn-reject, .btn-goto { width: 16px; height: 16px; - margin: 0 0 0 5px; + margin: 1px 0 0 5px; background-color: transparent; .rtl & { - margin: 0 5px 0 0; + margin: 1px 5px 0 0; } } @@ -432,7 +432,14 @@ } .btn-resolve.comment-resolved, .icon-resolve.i-comment-resolved { - background-position: 0px -64px; + background-position: 0px -63px; + width: 17px; + height: 18px; + margin: 0 0 0 4px; + + .rtl & { + margin: 0px 4px 0 0; + } } .btn-resolve:not(.comment-resolved), .btn-accept{ diff --git a/apps/common/main/resources/less/scroller.less b/apps/common/main/resources/less/scroller.less index d5bbf3b87c..c864e7a354 100644 --- a/apps/common/main/resources/less/scroller.less +++ b/apps/common/main/resources/less/scroller.less @@ -21,7 +21,7 @@ background-color: @background-toolbar-ie; background-color: @background-toolbar; - span { + div { display: block; height: 100%; @@ -79,9 +79,13 @@ &.always-visible-x { background-color: @canvas-scroll-thumb-hover-ie; background-color: @canvas-scroll-thumb-hover; - background-position: center -7px; - span { + div { + background-position: center -7px; + .pixel-ratio__1_75 & { + background-position: center -6px; + } + .pixel-ratio__2_5 & { background-color: @canvas-scroll-arrow-hover; } @@ -100,9 +104,13 @@ background-color: @canvas-scroll-thumb-hover; border-color: @canvas-scroll-thumb-border-hover-ie; border-color: @canvas-scroll-thumb-border-hover; - background-position: center -7px; - span { + div { + background-position: center -7px; + .pixel-ratio__1_75 & { + background-position: center -6px; + } + .pixel-ratio__2_5 & { background-color: @canvas-scroll-arrow-hover; } @@ -134,7 +142,7 @@ background-color: @background-toolbar-ie; background-color: @background-toolbar; - span { + div { display: block; height: 100%; @@ -194,7 +202,12 @@ background-color: @canvas-scroll-thumb-hover-ie; background-color: @canvas-scroll-thumb-hover; - span { + div { + background-position: -7px center; + .pixel-ratio__1_75 & { + background-position: -6px center; + } + .pixel-ratio__2_5 & { background-color: @canvas-scroll-arrow-hover; } @@ -214,7 +227,8 @@ border-color: @canvas-scroll-thumb-border-hover-ie; border-color: @canvas-scroll-thumb-border-hover; - span { + div { + background-position: -7px center; .pixel-ratio__2_5 & { background-color: @canvas-scroll-arrow-hover; } diff --git a/apps/common/mobile/resources/less/ios/icons.less b/apps/common/mobile/resources/less/ios/icons.less index cc2e505a3c..804c965a0e 100644 --- a/apps/common/mobile/resources/less/ios/icons.less +++ b/apps/common/mobile/resources/less/ios/icons.less @@ -55,5 +55,10 @@ height: 24px; .encoded-svg-mask(''); } + &.icon-settings { + width: 24px; + height: 24px; + .encoded-svg-mask(''); + } } } diff --git a/apps/common/mobile/resources/less/material/icons.less b/apps/common/mobile/resources/less/material/icons.less index 74e02fd9b8..9a3457b4a4 100644 --- a/apps/common/mobile/resources/less/material/icons.less +++ b/apps/common/mobile/resources/less/material/icons.less @@ -92,6 +92,11 @@ height: 24px; .encoded-svg-mask('', @toolbar-icons); } + &.icon-settings { + width: 22px; + height: 22px; + .encoded-svg-mask('', @toolbar-icons); + } } } } diff --git a/apps/documenteditor/forms/app/controller/ApplicationController.js b/apps/documenteditor/forms/app/controller/ApplicationController.js index 05959bc0c3..0b1185e911 100644 --- a/apps/documenteditor/forms/app/controller/ApplicationController.js +++ b/apps/documenteditor/forms/app/controller/ApplicationController.js @@ -1768,6 +1768,10 @@ define([ this.view.btnOptions.menu.on('show:after', initMenu); + function onMouseLeave() { + screenTip.toolTip.hide(); + screenTip.isVisible = false; + } screenTip = { toolTip: new Common.UI.Tooltip({ owner: this, @@ -1779,6 +1783,12 @@ define([ isHidden: true, isVisible: false }; + screenTip.toolTip.on('tooltip:show', function () { + $('#id_main_view').on('mouseleave', onMouseLeave); + }); + screenTip.toolTip.on('tooltip:hide',function () { + $('#id_main_view').off('mouseleave', onMouseLeave); + }); }, attachUIEvents: function() { diff --git a/apps/documenteditor/main/app/controller/DocumentHolder.js b/apps/documenteditor/main/app/controller/DocumentHolder.js index 553689f168..dfd9d8c60d 100644 --- a/apps/documenteditor/main/app/controller/DocumentHolder.js +++ b/apps/documenteditor/main/app/controller/DocumentHolder.js @@ -129,13 +129,6 @@ define([ me.showMathTrackOnLoad = false; me.screenTip = { - toolTip: new Common.UI.Tooltip({ - owner: this, - html: true, - title: '
Press Ctrl and click link', - cls: 'link-tooltip' -// style: 'word-wrap: break-word;' - }), strTip: '', isHidden: true, isVisible: false @@ -151,7 +144,8 @@ define([ me.wrapEvents = { userTipMousover: _.bind(me.userTipMousover, me), userTipMousout: _.bind(me.userTipMousout, me), - onKeyUp: _.bind(me.onKeyUp, me) + onKeyUp: _.bind(me.onKeyUp, me), + onMouseLeave: _.bind(me.onMouseLeave, me) }; var keymap = {}; @@ -175,8 +169,7 @@ define([ var me = this; Common.NotificationCenter.on({ 'window:show': function(e){ - me.screenTip.toolTip.hide(); - me.screenTip.isVisible = false; + me.hideScreentip(); /** coauthoring begin **/ me.userTipHide(); /** coauthoring end **/ @@ -188,8 +181,7 @@ define([ me.hideTips(); }, 'layout:changed': function(e){ - me.screenTip.toolTip.hide(); - me.screenTip.isVisible = false; + me.hideScreentip(); /** coauthoring begin **/ me.userTipHide(); /** coauthoring end **/ @@ -1050,6 +1042,15 @@ define([ } }, + hideScreentip: function () { + this.screenTip.toolTip && this.screenTip.toolTip.hide(); + this.screenTip.isVisible = false; + }, + + onMouseLeave: function () { + this.hideScreentip(); + }, + onMouseMoveStart: function() { var me = this; me.screenTip.isHidden = true; @@ -1073,7 +1074,7 @@ define([ if (me.screenTip.isHidden && me.screenTip.isVisible) { me.screenTip.isVisible = false; me.isTooltipHiding = true; - me.screenTip.toolTip.hide(function(){ + me.screenTip.toolTip && me.screenTip.toolTip.hide(function(){ me.isTooltipHiding = false; if (me.mouseMoveData) me.onMouseMove(me.mouseMoveData); me.mouseMoveData = null; @@ -1209,6 +1210,21 @@ define([ var recalc = false; screenTip.isHidden = false; + if (!me.screenTip.toolTip) { + me.screenTip.toolTip = new Common.UI.Tooltip({ + owner: me, + html: true, + title: '
Press Ctrl and click link', + cls: 'link-tooltip' + }); + me.screenTip.toolTip.on('tooltip:show', function () { + $('#id_main_view').on('mouseleave', me.wrapEvents.onMouseLeave); + }); + me.screenTip.toolTip.on('tooltip:hide',function () { + $('#id_main_view').off('mouseleave', me.wrapEvents.onMouseLeave); + }); + } + if (type!==Asc.c_oAscMouseMoveDataTypes.Review && type!==Asc.c_oAscMouseMoveDataTypes.Placeholder) ToolTip = Common.Utils.String.htmlEncode(ToolTip); @@ -1704,7 +1720,8 @@ define([ }, onShowContentControlsActions: function(obj, x, y) { - var type = obj.type; + var type = obj.type, + me = this; switch (type) { case Asc.c_oAscContentControlSpecificType.DateTime: this.onShowDateActions(obj, x, y); @@ -1715,8 +1732,33 @@ define([ if (lock == Asc.c_oAscSdtLockType.SdtContentLocked || lock==Asc.c_oAscSdtLockType.ContentLocked) return; } - this.api.asc_addImage(obj); - var me = this; + if (obj.pr && obj.pr.is_Signature() && false) { + if (_.isUndefined(me.fontStore)) { + me.fontStore = new Common.Collections.Fonts(); + var fonts = me.getApplication().getController('Toolbar').getView('Toolbar').cmbFontName.store.toJSON(); + var arr = []; + _.each(fonts, function(font, index){ + if (!font.cloneid) { + arr.push(_.clone(font)); + } + }); + me.fontStore.add(arr); + } + (new Common.Views.PdfSignDialog({ + props: obj, + api: me.api, + disableNetworkFunctionality: me.mode.disableNetworkFunctionality, + storage: me.mode.canRequestInsertImage || me.mode.fileChoiceUrl && me.mode.fileChoiceUrl.indexOf("{documentType}")>-1, + fontStore: me.fontStore, + handler: function(result, value) { + if (result == 'ok') { + me.api.asc_SetSignatureProps(value); + } + Common.NotificationCenter.trigger('edit:complete', me.toolbar); + } + })).show(); + } else + this.api.asc_addImage(obj); setTimeout(function(){ me.api.asc_UncheckContentControlButtons(); }, 500); diff --git a/apps/documenteditor/main/app/controller/FormsTab.js b/apps/documenteditor/main/app/controller/FormsTab.js index 2b83e085e6..a9b4403538 100644 --- a/apps/documenteditor/main/app/controller/FormsTab.js +++ b/apps/documenteditor/main/app/controller/FormsTab.js @@ -281,7 +281,8 @@ define([ this.api.asc_AddContentControlTextForm(props); } else if (type == 'complex') { this.api.asc_AddComplexForm(); - } + } else if (type === 'signature') + this.api.asc_AddContentControlSignature(oFormPr); var me = this; if (!this._state.formCount) { // add first form diff --git a/apps/documenteditor/main/app/controller/Main.js b/apps/documenteditor/main/app/controller/Main.js index 2c268b2294..f8db0bfe81 100644 --- a/apps/documenteditor/main/app/controller/Main.js +++ b/apps/documenteditor/main/app/controller/Main.js @@ -152,7 +152,8 @@ define([ "table of figures": this.txtTableOfFigures, "TOC Heading": this.txtTOCHeading, "Anyone": this.textAnyone, - "Text": this.textText + "Text": this.textText, + "Signature": this.textSignature }; styleNames.forEach(function(item){ translate[item] = me['txtStyle_' + item.replace(/ /g, '_')] || item; diff --git a/apps/documenteditor/main/app/view/FormSettings.js b/apps/documenteditor/main/app/view/FormSettings.js index 827df4c849..5770ff3fb3 100644 --- a/apps/documenteditor/main/app/view/FormSettings.js +++ b/apps/documenteditor/main/app/view/FormSettings.js @@ -109,6 +109,7 @@ define([ this.DateOnlySettings = el.find('.form-datetime'); this.DefValueText = el.find('#form-txt-def-value').closest('tr'); this.DefValueDropDown = el.find('#form-combo-def-value').closest('tr'); + this.TagSettings = el.find('#form-txt-tag').closest('tr'); !Common.UI.FeaturesManager.isFeatureEnabled('roles', true) && el.find('#form-combo-roles').closest('tr').hide(); }, @@ -1407,8 +1408,8 @@ define([ if (formPr) { this._originalFormProps = formPr; - if (type == Asc.c_oAscContentControlSpecificType.Picture) - this.labelFormName.text(this.textImage); + if (type == Asc.c_oAscContentControlSpecificType.Picture) + this.labelFormName.text(props.is_Signature() ? this.textSignature : this.textImage); var data = this.api.asc_GetFormKeysByType(type); if (!this._state.arrKey || this._state.arrKey.length!==data.length || _.difference(this._state.arrKey, data).length>0) { @@ -1559,9 +1560,11 @@ define([ } - var pictPr = props.get_PictureFormPr(); + var pictPr = props.get_PictureFormPr(), + isSignature = false; if (pictPr) { this._originalPictProps = pictPr; + isSignature = props.is_Signature(); val = pictPr.get_ConstantProportions(); if ( this._state.Aspect!==val ) { this.chAspect.setValue(!!val, true); @@ -1594,6 +1597,7 @@ define([ var disableSliders = this._state.scaleFlag === Asc.c_oAscPictureFormScaleFlag.Always && !this._state.Aspect || this._state.DisabledControls; this.sldrPreviewPositionX.setDisabled(disableSliders); this.sldrPreviewPositionY.setDisabled(disableSliders); + this.chRequired.setDisabled(isSignature || this._state.DisabledControls); } var formTextPr = props.get_TextFormPr(); @@ -1720,12 +1724,14 @@ define([ this.ConnectedSettings.toggleClass('hidden', !connected); this.TextOnlySettingsMask.toggleClass('hidden', !(type === Asc.c_oAscContentControlSpecificType.None && !!formTextPr) || this._state.FormatType!==Asc.TextFormFormatType.Mask); this.TextOnlySettingsRegExp.toggleClass('hidden', !(type === Asc.c_oAscContentControlSpecificType.None && !!formTextPr) || this._state.FormatType!==Asc.TextFormFormatType.RegExp); - if (this.type !== type || this.isSimpleInsideComplex !== isSimpleInsideComplex || needUpdateTextControls || type == Asc.c_oAscContentControlSpecificType.CheckBox) - this.showHideControls(type, formTextPr, specProps, isSimpleInsideComplex); + if (this.type !== type || this.isSimpleInsideComplex !== isSimpleInsideComplex || needUpdateTextControls || + type == Asc.c_oAscContentControlSpecificType.CheckBox || this.isSignature !== isSignature) + this.showHideControls(type, formTextPr, specProps, isSimpleInsideComplex, isSignature); if (this.type !== type || this.isSimpleInsideComplex !== isSimpleInsideComplex) this.fireEvent('updatescroller', this); this.type = type; this.isSimpleInsideComplex = isSimpleInsideComplex; + this.isSignature = isSignature; this._state.internalId = this.internalId; } @@ -1820,9 +1826,10 @@ define([ this.sldrPreviewPositionY.setDisabled(disableSliders || this._state.DisabledControls); this.btnListAdd.setDisabled(this.txtNewValue.length<1 || this._state.DisabledControls); this.btnLockForm.setDisabled(disable); + this.chRequired.setDisabled(this.isSignature || this._state.DisabledControls); }, - showHideControls: function(type, textProps, specProps, isSimpleInsideComplex) { + showHideControls: function(type, textProps, specProps, isSimpleInsideComplex, isSignature) { var textOnly = false, checkboxOnly = false, radioboxOnly = false, @@ -1846,17 +1853,18 @@ define([ this.TextOnlySettings.toggleClass('hidden', !textOnly); this.TextOnlySimpleSettings.toggleClass('hidden', !textOnly || isSimpleInsideComplex); this.ListOnlySettings.toggleClass('hidden', !listOnly); - this.ImageOnlySettings.toggleClass('hidden', !imageOnly); + this.ImageOnlySettings.toggleClass('hidden', !imageOnly || isSignature); this.RadioOnlySettings.toggleClass('hidden', !radioboxOnly); this.KeySettings.toggleClass('hidden', radioboxOnly || isSimpleInsideComplex); var value = (checkboxOnly || radioboxOnly); this.PlaceholderSettings.toggleClass('hidden', value); this.CheckOnlySettings.toggleClass('hidden', !value); - this.FixedSettings.toggleClass('hidden', imageOnly || isSimpleInsideComplex); + this.FixedSettings.toggleClass('hidden', imageOnly || isSimpleInsideComplex || isSignature); this.NotInComplexSettings.toggleClass('hidden', isSimpleInsideComplex); this.DateOnlySettings.toggleClass('hidden', !dateOnly); this.DefValueText.toggleClass('hidden', !(type === Asc.c_oAscContentControlSpecificType.ComboBox || textOnly)); this.DefValueDropDown.toggleClass('hidden', type !== Asc.c_oAscContentControlSpecificType.DropDownList); + this.TagSettings.toggleClass('hidden', isSignature || isSimpleInsideComplex); }, onSelectItem: function(listView, itemView, record) { diff --git a/apps/documenteditor/main/app/view/FormsTab.js b/apps/documenteditor/main/app/view/FormsTab.js index 324961d8bc..d4816a6d40 100644 --- a/apps/documenteditor/main/app/view/FormsTab.js +++ b/apps/documenteditor/main/app/view/FormsTab.js @@ -69,6 +69,7 @@ define([ '' + '' + '' + + '' + '' + '' + ' diff --git a/apps/spreadsheeteditor/main/app/view/ChartSettingsDlg.js b/apps/spreadsheeteditor/main/app/view/ChartSettingsDlg.js index b59eb8346b..a686924721 100644 --- a/apps/spreadsheeteditor/main/app/view/ChartSettingsDlg.js +++ b/apps/spreadsheeteditor/main/app/view/ChartSettingsDlg.js @@ -241,6 +241,14 @@ define([ this.lblLines = $('#chart-dlg-label-lines'); + this.chShowEquation = new Common.UI.CheckBox({ + el: $('#chart-dlg-chk-show-equation'), + labelText: this.textShowEquation + }).on('change', _.bind(function (checkbox, state) { + if (this.chartSettings) + this.chartSettings.putDisplayTrendlinesEquation(state==='checked'); + }, this)); + // Vertical Axis this.cmbMinType = []; this.spnMinValue = []; @@ -1193,6 +1201,7 @@ define([ this.chMarkers.setVisible(value); this.cmbLines.setVisible(value); this.lblLines.toggleClass('hidden', !value); + this.lblLines.closest('tr').toggleClass('hidden', !value); if (value) { this.chMarkers.setValue(this.chartSettings.getShowMarker(), true); @@ -1510,7 +1519,11 @@ define([ var value = props.getSeparator(); this.txtSeparator.setValue((value) ? value : ''); - Common.UI.FocusManager.add(this, [this.cmbChartTitle, this.cmbLegendPos, this.cmbDataLabels, this.chSeriesName, this.chCategoryName, this.chValue, this.txtSeparator, this.cmbLines, this.chMarkers]); + value = this.chartSettings.getDisplayTrendlinesEquation(); + this.chShowEquation.setValue(value !== undefined ? !!value : 'indeterminate', true); + this.chShowEquation.setDisabled(value===null, true); + + Common.UI.FocusManager.add(this, [this.cmbChartTitle, this.cmbLegendPos, this.cmbDataLabels, this.chSeriesName, this.chCategoryName, this.chValue, this.txtSeparator, this.cmbLines, this.chMarkers, this.chShowEquation]); // Vertical Axis this.vertAxisProps = props.getVertAxesProps(); @@ -1987,7 +2000,9 @@ define([ textHideAxis: 'Hide axis', textFormat: 'Label format', textBase: 'Base', - textLogScale: 'Logarithmic Scale' + textLogScale: 'Logarithmic Scale', + textTrendlineOptions: 'Trendline options', + textShowEquation: 'Display equation on chart' }, SSE.Views.ChartSettingsDlg || {})); }); diff --git a/apps/spreadsheeteditor/main/locale/ar.json b/apps/spreadsheeteditor/main/locale/ar.json index c7f80c0d5f..5fe0c37cb0 100644 --- a/apps/spreadsheeteditor/main/locale/ar.json +++ b/apps/spreadsheeteditor/main/locale/ar.json @@ -4492,5 +4492,7 @@ "SSE.Views.WBProtection.txtWBUnlockTitle": "فك حماية المصنف", "SSE.Views.FileMenuPanels.MainSettingsGeneral.strSmoothScroll": "Snapped to the grid while scrolling", "SSE.Views.Toolbar.tipRtlSheet": "Switch the sheet direction so that the first column is on the right side", - "SSE.Views.Toolbar.textRtlSheet": "Sheet Right-to-left" + "SSE.Views.Toolbar.textRtlSheet": "Sheet Right-to-left", + "SSE.Views.ChartSettingsDlg.textShowEquation": "Display equation on chart", + "SSE.Views.ChartSettingsDlg.textTrendlineOptions": "Trendline options" } \ No newline at end of file diff --git a/apps/spreadsheeteditor/main/locale/az.json b/apps/spreadsheeteditor/main/locale/az.json index d69d886a8a..937962a889 100644 --- a/apps/spreadsheeteditor/main/locale/az.json +++ b/apps/spreadsheeteditor/main/locale/az.json @@ -4492,5 +4492,7 @@ "SSE.Views.WBProtection.txtWBUnlockTitle": "İş kitabının qorumasını ləğv et", "SSE.Views.FileMenuPanels.MainSettingsGeneral.strSmoothScroll": "Snapped to the grid while scrolling", "SSE.Views.Toolbar.tipRtlSheet": "Switch the sheet direction so that the first column is on the right side", - "SSE.Views.Toolbar.textRtlSheet": "Sheet Right-to-left" + "SSE.Views.Toolbar.textRtlSheet": "Sheet Right-to-left", + "SSE.Views.ChartSettingsDlg.textShowEquation": "Display equation on chart", + "SSE.Views.ChartSettingsDlg.textTrendlineOptions": "Trendline options" } \ No newline at end of file diff --git a/apps/spreadsheeteditor/main/locale/be.json b/apps/spreadsheeteditor/main/locale/be.json index cc31f559bf..93bfc08f91 100644 --- a/apps/spreadsheeteditor/main/locale/be.json +++ b/apps/spreadsheeteditor/main/locale/be.json @@ -4492,5 +4492,7 @@ "SSE.Views.WBProtection.txtWBUnlockTitle": "Зняць абарону працоўнай кнігі", "SSE.Views.FileMenuPanels.MainSettingsGeneral.strSmoothScroll": "Snapped to the grid while scrolling", "SSE.Views.Toolbar.tipRtlSheet": "Switch the sheet direction so that the first column is on the right side", - "SSE.Views.Toolbar.textRtlSheet": "Sheet Right-to-left" + "SSE.Views.Toolbar.textRtlSheet": "Sheet Right-to-left", + "SSE.Views.ChartSettingsDlg.textShowEquation": "Display equation on chart", + "SSE.Views.ChartSettingsDlg.textTrendlineOptions": "Trendline options" } \ No newline at end of file diff --git a/apps/spreadsheeteditor/main/locale/bg.json b/apps/spreadsheeteditor/main/locale/bg.json index 973858ace7..e033351d87 100644 --- a/apps/spreadsheeteditor/main/locale/bg.json +++ b/apps/spreadsheeteditor/main/locale/bg.json @@ -4492,5 +4492,7 @@ "SSE.Views.WBProtection.txtWBUnlockTitle": "Unprotect workbook", "SSE.Views.FileMenuPanels.MainSettingsGeneral.strSmoothScroll": "Snapped to the grid while scrolling", "SSE.Views.Toolbar.tipRtlSheet": "Switch the sheet direction so that the first column is on the right side", - "SSE.Views.Toolbar.textRtlSheet": "Sheet Right-to-left" + "SSE.Views.Toolbar.textRtlSheet": "Sheet Right-to-left", + "SSE.Views.ChartSettingsDlg.textShowEquation": "Display equation on chart", + "SSE.Views.ChartSettingsDlg.textTrendlineOptions": "Trendline options" } \ No newline at end of file diff --git a/apps/spreadsheeteditor/main/locale/ca.json b/apps/spreadsheeteditor/main/locale/ca.json index fdd8d50561..0c82e55f59 100644 --- a/apps/spreadsheeteditor/main/locale/ca.json +++ b/apps/spreadsheeteditor/main/locale/ca.json @@ -4492,5 +4492,7 @@ "SSE.Views.WBProtection.txtWBUnlockTitle": "Desprotegeix el llibre de treball", "SSE.Views.FileMenuPanels.MainSettingsGeneral.strSmoothScroll": "Snapped to the grid while scrolling", "SSE.Views.Toolbar.tipRtlSheet": "Switch the sheet direction so that the first column is on the right side", - "SSE.Views.Toolbar.textRtlSheet": "Sheet Right-to-left" + "SSE.Views.Toolbar.textRtlSheet": "Sheet Right-to-left", + "SSE.Views.ChartSettingsDlg.textShowEquation": "Display equation on chart", + "SSE.Views.ChartSettingsDlg.textTrendlineOptions": "Trendline options" } \ No newline at end of file diff --git a/apps/spreadsheeteditor/main/locale/cs.json b/apps/spreadsheeteditor/main/locale/cs.json index 2723af025c..8b1cac1363 100644 --- a/apps/spreadsheeteditor/main/locale/cs.json +++ b/apps/spreadsheeteditor/main/locale/cs.json @@ -4492,5 +4492,7 @@ "SSE.Views.WBProtection.txtWBUnlockTitle": "Zrušit zabezpečení sešitu", "SSE.Views.FileMenuPanels.MainSettingsGeneral.strSmoothScroll": "Snapped to the grid while scrolling", "SSE.Views.Toolbar.tipRtlSheet": "Switch the sheet direction so that the first column is on the right side", - "SSE.Views.Toolbar.textRtlSheet": "Sheet Right-to-left" + "SSE.Views.Toolbar.textRtlSheet": "Sheet Right-to-left", + "SSE.Views.ChartSettingsDlg.textShowEquation": "Display equation on chart", + "SSE.Views.ChartSettingsDlg.textTrendlineOptions": "Trendline options" } \ No newline at end of file diff --git a/apps/spreadsheeteditor/main/locale/da.json b/apps/spreadsheeteditor/main/locale/da.json index 0ae753a825..aeb3bccae1 100644 --- a/apps/spreadsheeteditor/main/locale/da.json +++ b/apps/spreadsheeteditor/main/locale/da.json @@ -4492,5 +4492,7 @@ "SSE.Views.WBProtection.txtWBUnlockTitle": "ubeskyt projektmappe", "SSE.Views.FileMenuPanels.MainSettingsGeneral.strSmoothScroll": "Snapped to the grid while scrolling", "SSE.Views.Toolbar.tipRtlSheet": "Switch the sheet direction so that the first column is on the right side", - "SSE.Views.Toolbar.textRtlSheet": "Sheet Right-to-left" + "SSE.Views.Toolbar.textRtlSheet": "Sheet Right-to-left", + "SSE.Views.ChartSettingsDlg.textShowEquation": "Display equation on chart", + "SSE.Views.ChartSettingsDlg.textTrendlineOptions": "Trendline options" } \ No newline at end of file diff --git a/apps/spreadsheeteditor/main/locale/de.json b/apps/spreadsheeteditor/main/locale/de.json index 29062182b5..f0f1dd7d13 100644 --- a/apps/spreadsheeteditor/main/locale/de.json +++ b/apps/spreadsheeteditor/main/locale/de.json @@ -4492,5 +4492,7 @@ "SSE.Views.WBProtection.txtWBUnlockTitle": "Arbeitsmappe entschützen", "SSE.Views.FileMenuPanels.MainSettingsGeneral.strSmoothScroll": "Snapped to the grid while scrolling", "SSE.Views.Toolbar.tipRtlSheet": "Switch the sheet direction so that the first column is on the right side", - "SSE.Views.Toolbar.textRtlSheet": "Sheet Right-to-left" + "SSE.Views.Toolbar.textRtlSheet": "Sheet Right-to-left", + "SSE.Views.ChartSettingsDlg.textShowEquation": "Display equation on chart", + "SSE.Views.ChartSettingsDlg.textTrendlineOptions": "Trendline options" } \ No newline at end of file diff --git a/apps/spreadsheeteditor/main/locale/el.json b/apps/spreadsheeteditor/main/locale/el.json index 3df29bbec6..34d1417692 100644 --- a/apps/spreadsheeteditor/main/locale/el.json +++ b/apps/spreadsheeteditor/main/locale/el.json @@ -4492,5 +4492,7 @@ "SSE.Views.WBProtection.txtWBUnlockTitle": "Άρση προστασίας βιβλίου εργασίας", "SSE.Views.FileMenuPanels.MainSettingsGeneral.strSmoothScroll": "Snapped to the grid while scrolling", "SSE.Views.Toolbar.tipRtlSheet": "Switch the sheet direction so that the first column is on the right side", - "SSE.Views.Toolbar.textRtlSheet": "Sheet Right-to-left" + "SSE.Views.Toolbar.textRtlSheet": "Sheet Right-to-left", + "SSE.Views.ChartSettingsDlg.textShowEquation": "Display equation on chart", + "SSE.Views.ChartSettingsDlg.textTrendlineOptions": "Trendline options" } \ No newline at end of file diff --git a/apps/spreadsheeteditor/main/locale/en.json b/apps/spreadsheeteditor/main/locale/en.json index 88e5e22e72..55ca5238fb 100644 --- a/apps/spreadsheeteditor/main/locale/en.json +++ b/apps/spreadsheeteditor/main/locale/en.json @@ -2204,6 +2204,8 @@ "SSE.Views.ChartSettingsDlg.textYAxisTitle": "Y axis title", "SSE.Views.ChartSettingsDlg.textZero": "Zero", "SSE.Views.ChartSettingsDlg.txtEmpty": "This field is required", + "SSE.Views.ChartSettingsDlg.textTrendlineOptions": "Trendline options", + "SSE.Views.ChartSettingsDlg.textShowEquation": "Display equation on chart", "SSE.Views.ChartTypeDialog.errorComboSeries": "To create a combination chart, select at least two series of data.", "SSE.Views.ChartTypeDialog.errorSecondaryAxis": "The selected chart type requires the secondary axis that an existing chart is using. Select another chart type.", "SSE.Views.ChartTypeDialog.textSecondary": "Secondary axis", diff --git a/apps/spreadsheeteditor/main/locale/es.json b/apps/spreadsheeteditor/main/locale/es.json index 8ad656cffb..6e8a55be28 100644 --- a/apps/spreadsheeteditor/main/locale/es.json +++ b/apps/spreadsheeteditor/main/locale/es.json @@ -4492,5 +4492,7 @@ "SSE.Views.WBProtection.txtWBUnlockTitle": "Desproteger libro", "SSE.Views.FileMenuPanels.MainSettingsGeneral.strSmoothScroll": "Snapped to the grid while scrolling", "SSE.Views.Toolbar.tipRtlSheet": "Switch the sheet direction so that the first column is on the right side", - "SSE.Views.Toolbar.textRtlSheet": "Sheet Right-to-left" + "SSE.Views.Toolbar.textRtlSheet": "Sheet Right-to-left", + "SSE.Views.ChartSettingsDlg.textShowEquation": "Display equation on chart", + "SSE.Views.ChartSettingsDlg.textTrendlineOptions": "Trendline options" } \ No newline at end of file diff --git a/apps/spreadsheeteditor/main/locale/eu.json b/apps/spreadsheeteditor/main/locale/eu.json index 23661873f8..69c0b62034 100644 --- a/apps/spreadsheeteditor/main/locale/eu.json +++ b/apps/spreadsheeteditor/main/locale/eu.json @@ -4492,5 +4492,7 @@ "SSE.Views.WBProtection.txtWBUnlockTitle": "Kendu babesa laneko liburuari", "SSE.Views.FileMenuPanels.MainSettingsGeneral.strSmoothScroll": "Snapped to the grid while scrolling", "SSE.Views.Toolbar.tipRtlSheet": "Switch the sheet direction so that the first column is on the right side", - "SSE.Views.Toolbar.textRtlSheet": "Sheet Right-to-left" + "SSE.Views.Toolbar.textRtlSheet": "Sheet Right-to-left", + "SSE.Views.ChartSettingsDlg.textShowEquation": "Display equation on chart", + "SSE.Views.ChartSettingsDlg.textTrendlineOptions": "Trendline options" } \ No newline at end of file diff --git a/apps/spreadsheeteditor/main/locale/fi.json b/apps/spreadsheeteditor/main/locale/fi.json index 3492ab284f..7c5ee9bb42 100644 --- a/apps/spreadsheeteditor/main/locale/fi.json +++ b/apps/spreadsheeteditor/main/locale/fi.json @@ -4492,5 +4492,7 @@ "SSE.Views.WBProtection.txtWBUnlockTitle": "Unprotect workbook", "SSE.Views.FileMenuPanels.MainSettingsGeneral.strSmoothScroll": "Snapped to the grid while scrolling", "SSE.Views.Toolbar.tipRtlSheet": "Switch the sheet direction so that the first column is on the right side", - "SSE.Views.Toolbar.textRtlSheet": "Sheet Right-to-left" + "SSE.Views.Toolbar.textRtlSheet": "Sheet Right-to-left", + "SSE.Views.ChartSettingsDlg.textShowEquation": "Display equation on chart", + "SSE.Views.ChartSettingsDlg.textTrendlineOptions": "Trendline options" } \ No newline at end of file diff --git a/apps/spreadsheeteditor/main/locale/fr.json b/apps/spreadsheeteditor/main/locale/fr.json index d70a656001..928d9f44a8 100644 --- a/apps/spreadsheeteditor/main/locale/fr.json +++ b/apps/spreadsheeteditor/main/locale/fr.json @@ -4492,5 +4492,7 @@ "SSE.Views.WBProtection.txtWBUnlockTitle": "Déprotéger le classeur", "SSE.Views.FileMenuPanels.MainSettingsGeneral.strSmoothScroll": "Snapped to the grid while scrolling", "SSE.Views.Toolbar.tipRtlSheet": "Switch the sheet direction so that the first column is on the right side", - "SSE.Views.Toolbar.textRtlSheet": "Sheet Right-to-left" + "SSE.Views.Toolbar.textRtlSheet": "Sheet Right-to-left", + "SSE.Views.ChartSettingsDlg.textShowEquation": "Display equation on chart", + "SSE.Views.ChartSettingsDlg.textTrendlineOptions": "Trendline options" } \ No newline at end of file diff --git a/apps/spreadsheeteditor/main/locale/gl.json b/apps/spreadsheeteditor/main/locale/gl.json index f6bf85f695..714978ac4b 100644 --- a/apps/spreadsheeteditor/main/locale/gl.json +++ b/apps/spreadsheeteditor/main/locale/gl.json @@ -4492,5 +4492,7 @@ "SSE.Views.WBProtection.txtWBUnlockTitle": "Desprotexer libro", "SSE.Views.FileMenuPanels.MainSettingsGeneral.strSmoothScroll": "Snapped to the grid while scrolling", "SSE.Views.Toolbar.tipRtlSheet": "Switch the sheet direction so that the first column is on the right side", - "SSE.Views.Toolbar.textRtlSheet": "Sheet Right-to-left" + "SSE.Views.Toolbar.textRtlSheet": "Sheet Right-to-left", + "SSE.Views.ChartSettingsDlg.textShowEquation": "Display equation on chart", + "SSE.Views.ChartSettingsDlg.textTrendlineOptions": "Trendline options" } \ No newline at end of file diff --git a/apps/spreadsheeteditor/main/locale/he.json b/apps/spreadsheeteditor/main/locale/he.json index 9e2c8a8b41..ec91e54a74 100644 --- a/apps/spreadsheeteditor/main/locale/he.json +++ b/apps/spreadsheeteditor/main/locale/he.json @@ -4492,5 +4492,7 @@ "SSE.Views.WBProtection.txtWBUnlockTitle": "חוברת עבודה לא מוגנת", "SSE.Views.FileMenuPanels.MainSettingsGeneral.strSmoothScroll": "Snapped to the grid while scrolling", "SSE.Views.Toolbar.tipRtlSheet": "Switch the sheet direction so that the first column is on the right side", - "SSE.Views.Toolbar.textRtlSheet": "Sheet Right-to-left" + "SSE.Views.Toolbar.textRtlSheet": "Sheet Right-to-left", + "SSE.Views.ChartSettingsDlg.textShowEquation": "Display equation on chart", + "SSE.Views.ChartSettingsDlg.textTrendlineOptions": "Trendline options" } \ No newline at end of file diff --git a/apps/spreadsheeteditor/main/locale/hu.json b/apps/spreadsheeteditor/main/locale/hu.json index 6ac0e30790..3da207923c 100644 --- a/apps/spreadsheeteditor/main/locale/hu.json +++ b/apps/spreadsheeteditor/main/locale/hu.json @@ -4492,5 +4492,7 @@ "SSE.Views.WBProtection.txtWBUnlockTitle": "Munkafüzet védelmének megszüntetése", "SSE.Views.FileMenuPanels.MainSettingsGeneral.strSmoothScroll": "Snapped to the grid while scrolling", "SSE.Views.Toolbar.tipRtlSheet": "Switch the sheet direction so that the first column is on the right side", - "SSE.Views.Toolbar.textRtlSheet": "Sheet Right-to-left" + "SSE.Views.Toolbar.textRtlSheet": "Sheet Right-to-left", + "SSE.Views.ChartSettingsDlg.textShowEquation": "Display equation on chart", + "SSE.Views.ChartSettingsDlg.textTrendlineOptions": "Trendline options" } \ No newline at end of file diff --git a/apps/spreadsheeteditor/main/locale/hy.json b/apps/spreadsheeteditor/main/locale/hy.json index bd61814179..ec45ad9e13 100644 --- a/apps/spreadsheeteditor/main/locale/hy.json +++ b/apps/spreadsheeteditor/main/locale/hy.json @@ -4492,5 +4492,7 @@ "SSE.Views.WBProtection.txtWBUnlockTitle": "Չպաշտպանել աշխատանքային գրքույկը", "SSE.Views.FileMenuPanels.MainSettingsGeneral.strSmoothScroll": "Snapped to the grid while scrolling", "SSE.Views.Toolbar.tipRtlSheet": "Switch the sheet direction so that the first column is on the right side", - "SSE.Views.Toolbar.textRtlSheet": "Sheet Right-to-left" + "SSE.Views.Toolbar.textRtlSheet": "Sheet Right-to-left", + "SSE.Views.ChartSettingsDlg.textShowEquation": "Display equation on chart", + "SSE.Views.ChartSettingsDlg.textTrendlineOptions": "Trendline options" } \ No newline at end of file diff --git a/apps/spreadsheeteditor/main/locale/id.json b/apps/spreadsheeteditor/main/locale/id.json index 831ca40aa7..7ccf2657ea 100644 --- a/apps/spreadsheeteditor/main/locale/id.json +++ b/apps/spreadsheeteditor/main/locale/id.json @@ -4492,5 +4492,7 @@ "SSE.Views.WBProtection.txtWBUnlockTitle": "Buka Proteksi Workbook", "SSE.Views.FileMenuPanels.MainSettingsGeneral.strSmoothScroll": "Snapped to the grid while scrolling", "SSE.Views.Toolbar.tipRtlSheet": "Switch the sheet direction so that the first column is on the right side", - "SSE.Views.Toolbar.textRtlSheet": "Sheet Right-to-left" + "SSE.Views.Toolbar.textRtlSheet": "Sheet Right-to-left", + "SSE.Views.ChartSettingsDlg.textShowEquation": "Display equation on chart", + "SSE.Views.ChartSettingsDlg.textTrendlineOptions": "Trendline options" } \ No newline at end of file diff --git a/apps/spreadsheeteditor/main/locale/it.json b/apps/spreadsheeteditor/main/locale/it.json index 281b1f2926..5b0f11f7cc 100644 --- a/apps/spreadsheeteditor/main/locale/it.json +++ b/apps/spreadsheeteditor/main/locale/it.json @@ -4492,5 +4492,7 @@ "SSE.Views.WBProtection.txtWBUnlockTitle": "Rimuovi la protezione del libro di lavoro", "SSE.Views.FileMenuPanels.MainSettingsGeneral.strSmoothScroll": "Snapped to the grid while scrolling", "SSE.Views.Toolbar.tipRtlSheet": "Switch the sheet direction so that the first column is on the right side", - "SSE.Views.Toolbar.textRtlSheet": "Sheet Right-to-left" + "SSE.Views.Toolbar.textRtlSheet": "Sheet Right-to-left", + "SSE.Views.ChartSettingsDlg.textShowEquation": "Display equation on chart", + "SSE.Views.ChartSettingsDlg.textTrendlineOptions": "Trendline options" } \ No newline at end of file diff --git a/apps/spreadsheeteditor/main/locale/ja.json b/apps/spreadsheeteditor/main/locale/ja.json index fdc6d06689..11378027ff 100644 --- a/apps/spreadsheeteditor/main/locale/ja.json +++ b/apps/spreadsheeteditor/main/locale/ja.json @@ -4492,5 +4492,7 @@ "SSE.Views.WBProtection.txtWBUnlockTitle": "ブックを保護を解除する", "SSE.Views.FileMenuPanels.MainSettingsGeneral.strSmoothScroll": "Snapped to the grid while scrolling", "SSE.Views.Toolbar.tipRtlSheet": "Switch the sheet direction so that the first column is on the right side", - "SSE.Views.Toolbar.textRtlSheet": "Sheet Right-to-left" + "SSE.Views.Toolbar.textRtlSheet": "Sheet Right-to-left", + "SSE.Views.ChartSettingsDlg.textShowEquation": "Display equation on chart", + "SSE.Views.ChartSettingsDlg.textTrendlineOptions": "Trendline options" } \ No newline at end of file diff --git a/apps/spreadsheeteditor/main/locale/ko.json b/apps/spreadsheeteditor/main/locale/ko.json index 08fc4d3b4e..d974fdfc10 100644 --- a/apps/spreadsheeteditor/main/locale/ko.json +++ b/apps/spreadsheeteditor/main/locale/ko.json @@ -4492,5 +4492,7 @@ "SSE.Views.WBProtection.txtWBUnlockTitle": "통합 문서 보호 잠금 해제", "SSE.Views.FileMenuPanels.MainSettingsGeneral.strSmoothScroll": "Snapped to the grid while scrolling", "SSE.Views.Toolbar.tipRtlSheet": "Switch the sheet direction so that the first column is on the right side", - "SSE.Views.Toolbar.textRtlSheet": "Sheet Right-to-left" + "SSE.Views.Toolbar.textRtlSheet": "Sheet Right-to-left", + "SSE.Views.ChartSettingsDlg.textShowEquation": "Display equation on chart", + "SSE.Views.ChartSettingsDlg.textTrendlineOptions": "Trendline options" } \ No newline at end of file diff --git a/apps/spreadsheeteditor/main/locale/lo.json b/apps/spreadsheeteditor/main/locale/lo.json index ee776e64ee..e1ba1894ca 100644 --- a/apps/spreadsheeteditor/main/locale/lo.json +++ b/apps/spreadsheeteditor/main/locale/lo.json @@ -4492,5 +4492,7 @@ "SSE.Views.WBProtection.txtWBUnlockTitle": "ບໍ່ປ້ອງ ປື້ມບັນທືກ", "SSE.Views.FileMenuPanels.MainSettingsGeneral.strSmoothScroll": "Snapped to the grid while scrolling", "SSE.Views.Toolbar.tipRtlSheet": "Switch the sheet direction so that the first column is on the right side", - "SSE.Views.Toolbar.textRtlSheet": "Sheet Right-to-left" + "SSE.Views.Toolbar.textRtlSheet": "Sheet Right-to-left", + "SSE.Views.ChartSettingsDlg.textShowEquation": "Display equation on chart", + "SSE.Views.ChartSettingsDlg.textTrendlineOptions": "Trendline options" } \ No newline at end of file diff --git a/apps/spreadsheeteditor/main/locale/lv.json b/apps/spreadsheeteditor/main/locale/lv.json index dbeac35401..854764caad 100644 --- a/apps/spreadsheeteditor/main/locale/lv.json +++ b/apps/spreadsheeteditor/main/locale/lv.json @@ -4492,5 +4492,7 @@ "SSE.Views.WBProtection.txtWBUnlockTitle": "Noņemt darbgrāmatas aizsardzību", "SSE.Views.FileMenuPanels.MainSettingsGeneral.strSmoothScroll": "Snapped to the grid while scrolling", "SSE.Views.Toolbar.tipRtlSheet": "Switch the sheet direction so that the first column is on the right side", - "SSE.Views.Toolbar.textRtlSheet": "Sheet Right-to-left" + "SSE.Views.Toolbar.textRtlSheet": "Sheet Right-to-left", + "SSE.Views.ChartSettingsDlg.textShowEquation": "Display equation on chart", + "SSE.Views.ChartSettingsDlg.textTrendlineOptions": "Trendline options" } \ No newline at end of file diff --git a/apps/spreadsheeteditor/main/locale/ms.json b/apps/spreadsheeteditor/main/locale/ms.json index 14cb388359..9aaf2c25ab 100644 --- a/apps/spreadsheeteditor/main/locale/ms.json +++ b/apps/spreadsheeteditor/main/locale/ms.json @@ -4492,5 +4492,7 @@ "SSE.Views.WBProtection.txtWBUnlockTitle": "Buku Kerja Nyahlindung", "SSE.Views.FileMenuPanels.MainSettingsGeneral.strSmoothScroll": "Snapped to the grid while scrolling", "SSE.Views.Toolbar.tipRtlSheet": "Switch the sheet direction so that the first column is on the right side", - "SSE.Views.Toolbar.textRtlSheet": "Sheet Right-to-left" + "SSE.Views.Toolbar.textRtlSheet": "Sheet Right-to-left", + "SSE.Views.ChartSettingsDlg.textShowEquation": "Display equation on chart", + "SSE.Views.ChartSettingsDlg.textTrendlineOptions": "Trendline options" } \ No newline at end of file diff --git a/apps/spreadsheeteditor/main/locale/nl.json b/apps/spreadsheeteditor/main/locale/nl.json index c1bd297055..2fd7454af3 100644 --- a/apps/spreadsheeteditor/main/locale/nl.json +++ b/apps/spreadsheeteditor/main/locale/nl.json @@ -4492,5 +4492,7 @@ "SSE.Views.WBProtection.txtWBUnlockTitle": "Beveiliging van werkboek opheffen", "SSE.Views.FileMenuPanels.MainSettingsGeneral.strSmoothScroll": "Snapped to the grid while scrolling", "SSE.Views.Toolbar.tipRtlSheet": "Switch the sheet direction so that the first column is on the right side", - "SSE.Views.Toolbar.textRtlSheet": "Sheet Right-to-left" + "SSE.Views.Toolbar.textRtlSheet": "Sheet Right-to-left", + "SSE.Views.ChartSettingsDlg.textShowEquation": "Display equation on chart", + "SSE.Views.ChartSettingsDlg.textTrendlineOptions": "Trendline options" } \ No newline at end of file diff --git a/apps/spreadsheeteditor/main/locale/pl.json b/apps/spreadsheeteditor/main/locale/pl.json index 0f57fc3136..1aed6c95ab 100644 --- a/apps/spreadsheeteditor/main/locale/pl.json +++ b/apps/spreadsheeteditor/main/locale/pl.json @@ -4492,5 +4492,7 @@ "SSE.Views.WBProtection.txtWBUnlockTitle": "Usuń ochronę skoroszytu", "SSE.Views.FileMenuPanels.MainSettingsGeneral.strSmoothScroll": "Snapped to the grid while scrolling", "SSE.Views.Toolbar.tipRtlSheet": "Switch the sheet direction so that the first column is on the right side", - "SSE.Views.Toolbar.textRtlSheet": "Sheet Right-to-left" + "SSE.Views.Toolbar.textRtlSheet": "Sheet Right-to-left", + "SSE.Views.ChartSettingsDlg.textShowEquation": "Display equation on chart", + "SSE.Views.ChartSettingsDlg.textTrendlineOptions": "Trendline options" } \ No newline at end of file diff --git a/apps/spreadsheeteditor/main/locale/pt-pt.json b/apps/spreadsheeteditor/main/locale/pt-pt.json index d87209d2a7..067cf878da 100644 --- a/apps/spreadsheeteditor/main/locale/pt-pt.json +++ b/apps/spreadsheeteditor/main/locale/pt-pt.json @@ -4492,5 +4492,7 @@ "SSE.Views.WBProtection.txtWBUnlockTitle": "Desproteger Livro", "SSE.Views.FileMenuPanels.MainSettingsGeneral.strSmoothScroll": "Snapped to the grid while scrolling", "SSE.Views.Toolbar.tipRtlSheet": "Switch the sheet direction so that the first column is on the right side", - "SSE.Views.Toolbar.textRtlSheet": "Sheet Right-to-left" + "SSE.Views.Toolbar.textRtlSheet": "Sheet Right-to-left", + "SSE.Views.ChartSettingsDlg.textShowEquation": "Display equation on chart", + "SSE.Views.ChartSettingsDlg.textTrendlineOptions": "Trendline options" } \ No newline at end of file diff --git a/apps/spreadsheeteditor/main/locale/pt.json b/apps/spreadsheeteditor/main/locale/pt.json index 7d155dd686..8111e01d4e 100644 --- a/apps/spreadsheeteditor/main/locale/pt.json +++ b/apps/spreadsheeteditor/main/locale/pt.json @@ -4492,5 +4492,7 @@ "SSE.Views.WBProtection.txtWBUnlockTitle": "Desproteger pasta de trabalho", "SSE.Views.FileMenuPanels.MainSettingsGeneral.strSmoothScroll": "Snapped to the grid while scrolling", "SSE.Views.Toolbar.tipRtlSheet": "Switch the sheet direction so that the first column is on the right side", - "SSE.Views.Toolbar.textRtlSheet": "Sheet Right-to-left" + "SSE.Views.Toolbar.textRtlSheet": "Sheet Right-to-left", + "SSE.Views.ChartSettingsDlg.textShowEquation": "Display equation on chart", + "SSE.Views.ChartSettingsDlg.textTrendlineOptions": "Trendline options" } \ No newline at end of file diff --git a/apps/spreadsheeteditor/main/locale/ro.json b/apps/spreadsheeteditor/main/locale/ro.json index f37abd71d9..7a50253088 100644 --- a/apps/spreadsheeteditor/main/locale/ro.json +++ b/apps/spreadsheeteditor/main/locale/ro.json @@ -4492,5 +4492,7 @@ "SSE.Views.WBProtection.txtWBUnlockTitle": "Dezactivarea protejării registrului de calcul", "SSE.Views.FileMenuPanels.MainSettingsGeneral.strSmoothScroll": "Snapped to the grid while scrolling", "SSE.Views.Toolbar.tipRtlSheet": "Switch the sheet direction so that the first column is on the right side", - "SSE.Views.Toolbar.textRtlSheet": "Sheet Right-to-left" + "SSE.Views.Toolbar.textRtlSheet": "Sheet Right-to-left", + "SSE.Views.ChartSettingsDlg.textShowEquation": "Display equation on chart", + "SSE.Views.ChartSettingsDlg.textTrendlineOptions": "Trendline options" } \ No newline at end of file diff --git a/apps/spreadsheeteditor/main/locale/ru.json b/apps/spreadsheeteditor/main/locale/ru.json index 8074763806..84e2d48de2 100644 --- a/apps/spreadsheeteditor/main/locale/ru.json +++ b/apps/spreadsheeteditor/main/locale/ru.json @@ -4492,5 +4492,7 @@ "SSE.Views.WBProtection.txtWBUnlockTitle": "Снять защиту книги", "SSE.Views.FileMenuPanels.MainSettingsGeneral.strSmoothScroll": "Snapped to the grid while scrolling", "SSE.Views.Toolbar.tipRtlSheet": "Switch the sheet direction so that the first column is on the right side", - "SSE.Views.Toolbar.textRtlSheet": "Sheet Right-to-left" + "SSE.Views.Toolbar.textRtlSheet": "Sheet Right-to-left", + "SSE.Views.ChartSettingsDlg.textShowEquation": "Display equation on chart", + "SSE.Views.ChartSettingsDlg.textTrendlineOptions": "Trendline options" } \ No newline at end of file diff --git a/apps/spreadsheeteditor/main/locale/si.json b/apps/spreadsheeteditor/main/locale/si.json index 27c31cd2f8..638bd99e71 100644 --- a/apps/spreadsheeteditor/main/locale/si.json +++ b/apps/spreadsheeteditor/main/locale/si.json @@ -4492,5 +4492,7 @@ "SSE.Views.WBProtection.txtWBUnlockTitle": "වැඩපොත අනාරක්‍ෂණය", "SSE.Views.FileMenuPanels.MainSettingsGeneral.strSmoothScroll": "Snapped to the grid while scrolling", "SSE.Views.Toolbar.tipRtlSheet": "Switch the sheet direction so that the first column is on the right side", - "SSE.Views.Toolbar.textRtlSheet": "Sheet Right-to-left" + "SSE.Views.Toolbar.textRtlSheet": "Sheet Right-to-left", + "SSE.Views.ChartSettingsDlg.textShowEquation": "Display equation on chart", + "SSE.Views.ChartSettingsDlg.textTrendlineOptions": "Trendline options" } \ No newline at end of file diff --git a/apps/spreadsheeteditor/main/locale/sk.json b/apps/spreadsheeteditor/main/locale/sk.json index 069dd8bf16..b9e680a122 100644 --- a/apps/spreadsheeteditor/main/locale/sk.json +++ b/apps/spreadsheeteditor/main/locale/sk.json @@ -4492,5 +4492,7 @@ "SSE.Views.WBProtection.txtWBUnlockTitle": "Zrušte ochranu zošita", "SSE.Views.FileMenuPanels.MainSettingsGeneral.strSmoothScroll": "Snapped to the grid while scrolling", "SSE.Views.Toolbar.tipRtlSheet": "Switch the sheet direction so that the first column is on the right side", - "SSE.Views.Toolbar.textRtlSheet": "Sheet Right-to-left" + "SSE.Views.Toolbar.textRtlSheet": "Sheet Right-to-left", + "SSE.Views.ChartSettingsDlg.textShowEquation": "Display equation on chart", + "SSE.Views.ChartSettingsDlg.textTrendlineOptions": "Trendline options" } \ No newline at end of file diff --git a/apps/spreadsheeteditor/main/locale/sl.json b/apps/spreadsheeteditor/main/locale/sl.json index c3c7842124..493262f7eb 100644 --- a/apps/spreadsheeteditor/main/locale/sl.json +++ b/apps/spreadsheeteditor/main/locale/sl.json @@ -4492,5 +4492,7 @@ "SSE.Views.WBProtection.txtWBUnlockTitle": "Unprotect workbook", "SSE.Views.FileMenuPanels.MainSettingsGeneral.strSmoothScroll": "Snapped to the grid while scrolling", "SSE.Views.Toolbar.tipRtlSheet": "Switch the sheet direction so that the first column is on the right side", - "SSE.Views.Toolbar.textRtlSheet": "Sheet Right-to-left" + "SSE.Views.Toolbar.textRtlSheet": "Sheet Right-to-left", + "SSE.Views.ChartSettingsDlg.textShowEquation": "Display equation on chart", + "SSE.Views.ChartSettingsDlg.textTrendlineOptions": "Trendline options" } \ No newline at end of file diff --git a/apps/spreadsheeteditor/main/locale/sr-cyrl.json b/apps/spreadsheeteditor/main/locale/sr-cyrl.json index a89c7b6b13..d2cd99f145 100644 --- a/apps/spreadsheeteditor/main/locale/sr-cyrl.json +++ b/apps/spreadsheeteditor/main/locale/sr-cyrl.json @@ -4492,5 +4492,7 @@ "SSE.Views.WBProtection.txtWBUnlockTitle": "Незаштити радну књигу", "SSE.Views.FileMenuPanels.MainSettingsGeneral.strSmoothScroll": "Snapped to the grid while scrolling", "SSE.Views.Toolbar.tipRtlSheet": "Switch the sheet direction so that the first column is on the right side", - "SSE.Views.Toolbar.textRtlSheet": "Sheet Right-to-left" + "SSE.Views.Toolbar.textRtlSheet": "Sheet Right-to-left", + "SSE.Views.ChartSettingsDlg.textShowEquation": "Display equation on chart", + "SSE.Views.ChartSettingsDlg.textTrendlineOptions": "Trendline options" } \ No newline at end of file diff --git a/apps/spreadsheeteditor/main/locale/sr.json b/apps/spreadsheeteditor/main/locale/sr.json index fdd0f31390..763d5dcb20 100644 --- a/apps/spreadsheeteditor/main/locale/sr.json +++ b/apps/spreadsheeteditor/main/locale/sr.json @@ -4492,5 +4492,7 @@ "SSE.Views.WBProtection.txtWBUnlockTitle": "Nezaštiti radnu knjigu", "SSE.Views.FileMenuPanels.MainSettingsGeneral.strSmoothScroll": "Snapped to the grid while scrolling", "SSE.Views.Toolbar.tipRtlSheet": "Switch the sheet direction so that the first column is on the right side", - "SSE.Views.Toolbar.textRtlSheet": "Sheet Right-to-left" + "SSE.Views.Toolbar.textRtlSheet": "Sheet Right-to-left", + "SSE.Views.ChartSettingsDlg.textShowEquation": "Display equation on chart", + "SSE.Views.ChartSettingsDlg.textTrendlineOptions": "Trendline options" } \ No newline at end of file diff --git a/apps/spreadsheeteditor/main/locale/sv.json b/apps/spreadsheeteditor/main/locale/sv.json index 236e58abca..0cc8d4b413 100644 --- a/apps/spreadsheeteditor/main/locale/sv.json +++ b/apps/spreadsheeteditor/main/locale/sv.json @@ -4492,5 +4492,7 @@ "SSE.Views.WBProtection.txtWBUnlockTitle": "Lås upp arbetsboken", "SSE.Views.FileMenuPanels.MainSettingsGeneral.strSmoothScroll": "Snapped to the grid while scrolling", "SSE.Views.Toolbar.tipRtlSheet": "Switch the sheet direction so that the first column is on the right side", - "SSE.Views.Toolbar.textRtlSheet": "Sheet Right-to-left" + "SSE.Views.Toolbar.textRtlSheet": "Sheet Right-to-left", + "SSE.Views.ChartSettingsDlg.textShowEquation": "Display equation on chart", + "SSE.Views.ChartSettingsDlg.textTrendlineOptions": "Trendline options" } \ No newline at end of file diff --git a/apps/spreadsheeteditor/main/locale/tr.json b/apps/spreadsheeteditor/main/locale/tr.json index 30e03a31f0..e38c377136 100644 --- a/apps/spreadsheeteditor/main/locale/tr.json +++ b/apps/spreadsheeteditor/main/locale/tr.json @@ -4492,5 +4492,7 @@ "SSE.Views.WBProtection.txtWBUnlockTitle": "Korumasız Çalışma Sayfası", "SSE.Views.FileMenuPanels.MainSettingsGeneral.strSmoothScroll": "Snapped to the grid while scrolling", "SSE.Views.Toolbar.tipRtlSheet": "Switch the sheet direction so that the first column is on the right side", - "SSE.Views.Toolbar.textRtlSheet": "Sheet Right-to-left" + "SSE.Views.Toolbar.textRtlSheet": "Sheet Right-to-left", + "SSE.Views.ChartSettingsDlg.textShowEquation": "Display equation on chart", + "SSE.Views.ChartSettingsDlg.textTrendlineOptions": "Trendline options" } \ No newline at end of file diff --git a/apps/spreadsheeteditor/main/locale/uk.json b/apps/spreadsheeteditor/main/locale/uk.json index 83f86dcea3..3fcf15883a 100644 --- a/apps/spreadsheeteditor/main/locale/uk.json +++ b/apps/spreadsheeteditor/main/locale/uk.json @@ -4492,5 +4492,7 @@ "SSE.Views.WBProtection.txtWBUnlockTitle": "Зняти захист книги", "SSE.Views.FileMenuPanels.MainSettingsGeneral.strSmoothScroll": "Snapped to the grid while scrolling", "SSE.Views.Toolbar.tipRtlSheet": "Switch the sheet direction so that the first column is on the right side", - "SSE.Views.Toolbar.textRtlSheet": "Sheet Right-to-left" + "SSE.Views.Toolbar.textRtlSheet": "Sheet Right-to-left", + "SSE.Views.ChartSettingsDlg.textShowEquation": "Display equation on chart", + "SSE.Views.ChartSettingsDlg.textTrendlineOptions": "Trendline options" } \ No newline at end of file diff --git a/apps/spreadsheeteditor/main/locale/vi.json b/apps/spreadsheeteditor/main/locale/vi.json index e6ed037953..edab0f1f5f 100644 --- a/apps/spreadsheeteditor/main/locale/vi.json +++ b/apps/spreadsheeteditor/main/locale/vi.json @@ -4492,5 +4492,7 @@ "SSE.Views.WBProtection.txtWBUnlockTitle": "Unprotect workbook", "SSE.Views.FileMenuPanels.MainSettingsGeneral.strSmoothScroll": "Snapped to the grid while scrolling", "SSE.Views.Toolbar.tipRtlSheet": "Switch the sheet direction so that the first column is on the right side", - "SSE.Views.Toolbar.textRtlSheet": "Sheet Right-to-left" + "SSE.Views.Toolbar.textRtlSheet": "Sheet Right-to-left", + "SSE.Views.ChartSettingsDlg.textShowEquation": "Display equation on chart", + "SSE.Views.ChartSettingsDlg.textTrendlineOptions": "Trendline options" } \ No newline at end of file diff --git a/apps/spreadsheeteditor/main/locale/zh-tw.json b/apps/spreadsheeteditor/main/locale/zh-tw.json index 79e7dcf59f..035062b4c1 100644 --- a/apps/spreadsheeteditor/main/locale/zh-tw.json +++ b/apps/spreadsheeteditor/main/locale/zh-tw.json @@ -4492,5 +4492,7 @@ "SSE.Views.WBProtection.txtWBUnlockTitle": "解除工作簿保護", "SSE.Views.FileMenuPanels.MainSettingsGeneral.strSmoothScroll": "Snapped to the grid while scrolling", "SSE.Views.Toolbar.tipRtlSheet": "Switch the sheet direction so that the first column is on the right side", - "SSE.Views.Toolbar.textRtlSheet": "Sheet Right-to-left" + "SSE.Views.Toolbar.textRtlSheet": "Sheet Right-to-left", + "SSE.Views.ChartSettingsDlg.textShowEquation": "Display equation on chart", + "SSE.Views.ChartSettingsDlg.textTrendlineOptions": "Trendline options" } \ No newline at end of file diff --git a/apps/spreadsheeteditor/main/locale/zh.json b/apps/spreadsheeteditor/main/locale/zh.json index 75478ded17..22394a4515 100644 --- a/apps/spreadsheeteditor/main/locale/zh.json +++ b/apps/spreadsheeteditor/main/locale/zh.json @@ -4492,5 +4492,7 @@ "SSE.Views.WBProtection.txtWBUnlockTitle": "撤消工作簿保护", "SSE.Views.FileMenuPanels.MainSettingsGeneral.strSmoothScroll": "Snapped to the grid while scrolling", "SSE.Views.Toolbar.tipRtlSheet": "Switch the sheet direction so that the first column is on the right side", - "SSE.Views.Toolbar.textRtlSheet": "Sheet Right-to-left" + "SSE.Views.Toolbar.textRtlSheet": "Sheet Right-to-left", + "SSE.Views.ChartSettingsDlg.textShowEquation": "Display equation on chart", + "SSE.Views.ChartSettingsDlg.textTrendlineOptions": "Trendline options" } \ No newline at end of file diff --git a/apps/spreadsheeteditor/mobile/src/less/icons-ios.less b/apps/spreadsheeteditor/mobile/src/less/icons-ios.less index a145bbff78..ee08b96d8c 100644 --- a/apps/spreadsheeteditor/mobile/src/less/icons-ios.less +++ b/apps/spreadsheeteditor/mobile/src/less/icons-ios.less @@ -42,11 +42,6 @@ height: 22px; .encoded-svg-mask('') } - &.icon-settings { - width: 24px; - height: 24px; - .encoded-svg-mask(''); - } &.icon-feedback { width: 22px; diff --git a/apps/spreadsheeteditor/mobile/src/less/icons-material.less b/apps/spreadsheeteditor/mobile/src/less/icons-material.less index b94189b715..e0c9ede20b 100644 --- a/apps/spreadsheeteditor/mobile/src/less/icons-material.less +++ b/apps/spreadsheeteditor/mobile/src/less/icons-material.less @@ -369,11 +369,6 @@ height: 22px; .encoded-svg-mask('', @toolbar-icons); } - &.icon-settings { - width: 22px; - height: 22px; - .encoded-svg-mask('', @toolbar-icons); - } &.icon-prev { width: 20px; height: 20px;