diff --git a/apps/api/documents/api.js b/apps/api/documents/api.js index 8b9efb748..ee1428a8b 100644 --- a/apps/api/documents/api.js +++ b/apps/api/documents/api.js @@ -798,7 +798,8 @@ iframe.allowFullscreen = true; iframe.setAttribute("allowfullscreen",""); // for IE11 iframe.setAttribute("onmousewheel",""); // for Safari on Mac - + iframe.setAttribute("allow", "autoplay"); + if (config.type == "mobile") { iframe.style.position = "fixed"; diff --git a/apps/common/main/lib/component/TabBar.js b/apps/common/main/lib/component/TabBar.js index baae6631d..44e58de0b 100644 --- a/apps/common/main/lib/component/TabBar.js +++ b/apps/common/main/lib/component/TabBar.js @@ -103,6 +103,8 @@ define([ var me = this, length = me.bar.tabs.length, barBounds = me.bar.$bar.get(0).getBoundingClientRect(); + me.leftBorder = barBounds.left; + me.rightBorder = barBounds.right; if (barBounds) { me.bounds = []; @@ -324,19 +326,30 @@ define([ function dragMove (event) { if (!_.isUndefined(me.drag)) { me.drag.moveX = event.clientX*Common.Utils.zoom(); - if (me.drag.moveX < me.tabBarRight && me.drag.moveX > me.tabBarLeft) { + if (me.drag.moveX < me.leftBorder) { + me.scrollLeft -= 20; + me.bar.$bar.scrollLeft(me.scrollLeft); + me.calculateBounds(); + } else if (me.drag.moveX < me.tabBarRight && me.drag.moveX > me.tabBarLeft) { var name = $(event.target).parent().data('label'), currentTab = _.findIndex(bar.tabs, {label: name}); - if (currentTab !== -1 && (me.bounds[currentTab].left - me.scrollLeft >= me.tabBarLeft)) { + if (currentTab === -1) { + bar.$el.find('li.mousemove').removeClass('mousemove right'); + me.drag.place = undefined; + } else if (me.bounds[currentTab].left - me.scrollLeft >= me.tabBarLeft) { me.drag.place = currentTab; $(event.target).parent().parent().find('li.mousemove').removeClass('mousemove right'); $(event.target).parent().addClass('mousemove'); } - } else if ((me.drag.moveX > me.lastTabRight - me.scrollLeft) && (me.tabBarRight >= me.lastTabRight - me.scrollLeft)) { //move to end of list, right border of the right tab is visible + } else if (me.drag.moveX > me.lastTabRight && Math.abs(me.tabBarRight - me.bounds[me.bar.tabs.length - 1].right) < 1) { //move to end of list, right border of the right tab is visible bar.$el.find('li.mousemove').removeClass('mousemove right'); bar.tabs[bar.tabs.length - 1].$el.addClass('mousemove right'); me.drag.place = bar.tabs.length; - } + } else if (me.drag.moveX - me.rightBorder > 3) { + me.scrollLeft += 20; + me.bar.$bar.scrollLeft(me.scrollLeft); + me.calculateBounds(); + } } } if (!_.isUndefined(bar) && !_.isUndefined(tabs) && bar.tabs.length > 1) { diff --git a/apps/common/main/lib/controller/History.js b/apps/common/main/lib/controller/History.js index 056183ee3..49bc3e55d 100644 --- a/apps/common/main/lib/controller/History.js +++ b/apps/common/main/lib/controller/History.js @@ -177,7 +177,7 @@ define([ if (historyStore && data!==null) { var rev, revisions = historyStore.findRevisions(data.version), urlGetTime = new Date(); - var diff = (this.currentChangeId===undefined) ? null : opts.data.changesUrl, // if revision has changes, but serverVersion !== app.buildVersion -> hide revision changes + var diff = (!opts.data.previous || this.currentChangeId===undefined) ? null : opts.data.changesUrl, // if revision has changes, but serverVersion !== app.buildVersion -> hide revision changes url = (!_.isEmpty(diff) && opts.data.previous) ? opts.data.previous.url : opts.data.url, docId = opts.data.key ? opts.data.key : this.currentDocId, docIdPrev = opts.data.previous && opts.data.previous.key ? opts.data.previous.key : this.currentDocIdPrev, diff --git a/apps/presentationeditor/main/app/view/ListSettingsDialog.js b/apps/common/main/lib/view/ListSettingsDialog.js similarity index 97% rename from apps/presentationeditor/main/app/view/ListSettingsDialog.js rename to apps/common/main/lib/view/ListSettingsDialog.js index ffde97be3..e0820cd4d 100644 --- a/apps/presentationeditor/main/app/view/ListSettingsDialog.js +++ b/apps/common/main/lib/view/ListSettingsDialog.js @@ -39,6 +39,9 @@ * */ +if (Common === undefined) + var Common = {}; + define([ 'common/main/lib/component/Window', 'common/main/lib/component/MetricSpinner', @@ -46,7 +49,7 @@ define([ 'common/main/lib/component/ColorButton' ], function () { 'use strict'; - PE.Views.ListSettingsDialog = Common.UI.Window.extend(_.extend({ + Common.Views.ListSettingsDialog = Common.UI.Window.extend(_.extend({ options: { type: 0, // 0 - markers, 1 - numbers width: 230, @@ -97,7 +100,7 @@ define([ this.spnSize = new Common.UI.MetricSpinner({ el : $window.find('#id-dlg-list-size'), step : 1, - width : 45, + width : 53, value : 100, defaultUnit : '', maxValue : 400, @@ -110,7 +113,7 @@ define([ }); this.btnColor = new Common.UI.ColorButton({ - style: "width:45px;", + style: "width:53px;", menu : new Common.UI.Menu({ additionalAlign: this.menuAddAlign, items: [ @@ -148,7 +151,7 @@ define([ this.spnStart = new Common.UI.MetricSpinner({ el : $window.find('#id-dlg-list-start'), step : 1, - width : 45, + width : 53, value : 1, defaultUnit : '', maxValue : 32767, @@ -235,5 +238,5 @@ define([ txtOfText: '% of text', textNewColor: 'Add New Custom Color', txtStart: 'Start at' - }, PE.Views.ListSettingsDialog || {})) + }, Common.Views.ListSettingsDialog || {})) }); \ No newline at end of file diff --git a/apps/common/main/resources/img/controls/common-controls@2x.png b/apps/common/main/resources/img/controls/common-controls@2x.png index 86c6e0c13..1c1de5bcb 100755 Binary files a/apps/common/main/resources/img/controls/common-controls@2x.png and b/apps/common/main/resources/img/controls/common-controls@2x.png differ diff --git a/apps/documenteditor/embed/js/ApplicationController.js b/apps/documenteditor/embed/js/ApplicationController.js index f8baf5891..7d8762564 100644 --- a/apps/documenteditor/embed/js/ApplicationController.js +++ b/apps/documenteditor/embed/js/ApplicationController.js @@ -402,6 +402,10 @@ DE.ApplicationController = new(function(){ message = me.errorFileSizeExceed; break; + case Asc.c_oAscError.ID.UpdateVersion: + message = me.errorUpdateVersionOnDisconnect; + break; + default: message = me.errorDefaultMessage.replace('%1', id); break; @@ -558,6 +562,7 @@ DE.ApplicationController = new(function(){ waitText: 'Please, wait...', textLoadingDocument: 'Loading document', txtClose: 'Close', - errorFileSizeExceed: 'The file size exceeds the limitation set for your server.
Please contact your Document Server administrator for details.' + errorFileSizeExceed: 'The file size exceeds the limitation set for your server.
Please contact your Document Server administrator for details.', + errorUpdateVersionOnDisconnect: 'The file version has been changed.
Use the \'Download\' option to save the file backup copy to your computer hard drive.' } })(); \ No newline at end of file diff --git a/apps/documenteditor/embed/locale/en.json b/apps/documenteditor/embed/locale/en.json index 91cd7c4b4..b8debeec6 100644 --- a/apps/documenteditor/embed/locale/en.json +++ b/apps/documenteditor/embed/locale/en.json @@ -22,6 +22,7 @@ "DE.ApplicationController.unknownErrorText": "Unknown error.", "DE.ApplicationController.unsupportedBrowserErrorText": "Your browser is not supported.", "DE.ApplicationController.waitText": "Please, wait...", + "DE.ApplicationController.errorUpdateVersionOnDisconnect": "The file version has been changed.
Use the 'Download' option to save the file backup copy to your computer hard drive.", "DE.ApplicationView.txtDownload": "Download", "DE.ApplicationView.txtEmbed": "Embed", "DE.ApplicationView.txtFullScreen": "Full Screen", diff --git a/apps/documenteditor/main/app/controller/Main.js b/apps/documenteditor/main/app/controller/Main.js index 7fc8b9c74..22beaaa0c 100644 --- a/apps/documenteditor/main/app/controller/Main.js +++ b/apps/documenteditor/main/app/controller/Main.js @@ -366,6 +366,7 @@ define([ if (!( this.editorConfig.customization && ( this.editorConfig.customization.toolbarNoTabs || (this.editorConfig.targetApp!=='desktop') && (this.editorConfig.customization.loaderName || this.editorConfig.customization.loaderLogo)))) { + $('#editor-container').css('overflow', 'hidden'); $('#editor-container').append('
' + '
'.repeat(20) + '
'); } @@ -1055,6 +1056,7 @@ define([ $(document).on('contextmenu', _.bind(me.onContextMenu, me)); Common.Gateway.documentReady(); + $('#editor-container').css('overflow', ''); $('.doc-placeholder').remove(); }, @@ -1497,6 +1499,10 @@ define([ config.msg = this.errorFileSizeExceed; break; + case Asc.c_oAscError.ID.UpdateVersion: + config.msg = this.errorUpdateVersionOnDisconnect; + break; + default: config.msg = (typeof id == 'string') ? id : this.errorDefaultMessage.replace('%1', id); break; @@ -2473,7 +2479,8 @@ define([ errorFileSizeExceed: 'The file size exceeds the limitation set for your server.
Please contact your Document Server administrator for details.', txtMainDocOnly: 'Error! Main Document Only.', txtNotValidBookmark: 'Error! Not a valid bookmark self-reference.', - txtNoText: 'Error! No text of specified style in document.' + txtNoText: 'Error! No text of specified style in document.', + errorUpdateVersionOnDisconnect: 'The file version has been changed.
Use the \'Download as...\' option to save the file backup copy to your computer hard drive.' } })(), DE.Controllers.Main || {})) }); \ No newline at end of file diff --git a/apps/documenteditor/main/locale/en.json b/apps/documenteditor/main/locale/en.json index 0556b0d6d..43fd7443b 100644 --- a/apps/documenteditor/main/locale/en.json +++ b/apps/documenteditor/main/locale/en.json @@ -657,6 +657,7 @@ "DE.Controllers.Main.warnNoLicense": "This version of %1 editors has certain limitations for concurrent connections to the document server.
If you need more please consider purchasing a commercial license.", "DE.Controllers.Main.warnNoLicenseUsers": "This version of %1 editors has certain limitations for concurrent users.
If you need more please consider purchasing a commercial license.", "DE.Controllers.Main.warnProcessRightsChange": "You have been denied the right to edit the file.", + "DE.Controllers.Main.errorUpdateVersionOnDisconnect": "The file version has been changed.
Use the 'Download as...' option to save the file backup copy to your computer hard drive.", "DE.Controllers.Navigation.txtBeginning": "Beginning of document", "DE.Controllers.Navigation.txtGotoBeginning": "Go to the beginning of the document", "DE.Controllers.Statusbar.textHasChanges": "New changes have been tracked", diff --git a/apps/documenteditor/main/locale/ru.json b/apps/documenteditor/main/locale/ru.json index e2ab5772e..800c93bea 100644 --- a/apps/documenteditor/main/locale/ru.json +++ b/apps/documenteditor/main/locale/ru.json @@ -1049,7 +1049,7 @@ "DE.Views.ChartSettings.textEditData": "Изменить данные", "DE.Views.ChartSettings.textHeight": "Высота", "DE.Views.ChartSettings.textLine": "График", - "DE.Views.ChartSettings.textOriginalSize": "По умолчанию", + "DE.Views.ChartSettings.textOriginalSize": "Реальный размер", "DE.Views.ChartSettings.textPie": "Круговая", "DE.Views.ChartSettings.textPoint": "Точечная", "DE.Views.ChartSettings.textSize": "Размер", @@ -1131,7 +1131,7 @@ "DE.Views.DocumentHolder.mergeCellsText": "Объединить ячейки", "DE.Views.DocumentHolder.moreText": "Больше вариантов...", "DE.Views.DocumentHolder.noSpellVariantsText": "Нет вариантов", - "DE.Views.DocumentHolder.originalSizeText": "Размер по умолчанию", + "DE.Views.DocumentHolder.originalSizeText": "Реальный размер", "DE.Views.DocumentHolder.paragraphText": "Абзац", "DE.Views.DocumentHolder.removeHyperlinkText": "Удалить гиперссылку", "DE.Views.DocumentHolder.rightText": "По правому краю", @@ -1491,7 +1491,7 @@ "DE.Views.ImageSettings.textHintFlipH": "Отразить слева направо", "DE.Views.ImageSettings.textHintFlipV": "Отразить сверху вниз", "DE.Views.ImageSettings.textInsert": "Заменить изображение", - "DE.Views.ImageSettings.textOriginalSize": "По умолчанию", + "DE.Views.ImageSettings.textOriginalSize": "Реальный размер", "DE.Views.ImageSettings.textRotate90": "Повернуть на 90°", "DE.Views.ImageSettings.textRotation": "Поворот", "DE.Views.ImageSettings.textSize": "Размер", @@ -1543,7 +1543,7 @@ "DE.Views.ImageSettingsAdvanced.textMiter": "Прямой", "DE.Views.ImageSettingsAdvanced.textMove": "Перемещать с текстом", "DE.Views.ImageSettingsAdvanced.textOptions": "Параметры", - "DE.Views.ImageSettingsAdvanced.textOriginalSize": "По умолчанию", + "DE.Views.ImageSettingsAdvanced.textOriginalSize": "Реальный размер", "DE.Views.ImageSettingsAdvanced.textOverlap": "Разрешить перекрытие", "DE.Views.ImageSettingsAdvanced.textPage": "Страницы", "DE.Views.ImageSettingsAdvanced.textParagraph": "Абзаца", diff --git a/apps/documenteditor/mobile/app/controller/Main.js b/apps/documenteditor/mobile/app/controller/Main.js index 3044ec934..544a8e890 100644 --- a/apps/documenteditor/mobile/app/controller/Main.js +++ b/apps/documenteditor/mobile/app/controller/Main.js @@ -971,6 +971,10 @@ define([ config.msg = this.errorFileSizeExceed; break; + case Asc.c_oAscError.ID.UpdateVersion: + config.msg = this.errorUpdateVersionOnDisconnect; + break; + default: config.msg = this.errorDefaultMessage.replace('%1', id); break; @@ -1456,7 +1460,8 @@ define([ textPaidFeature: 'Paid feature', textCustomLoader: 'Please note that according to the terms of the license you are not entitled to change the loader.
Please contact our Sales Department to get a quote.', waitText: 'Please, wait...', - errorFileSizeExceed: 'The file size exceeds the limitation set for your server.
Please contact your Document Server administrator for details.' + errorFileSizeExceed: 'The file size exceeds the limitation set for your server.
Please contact your Document Server administrator for details.', + errorUpdateVersionOnDisconnect: 'The file version has been changed.
Use the \'Download\' option to save the file backup copy to your computer hard drive.' } })(), DE.Controllers.Main || {})) }); \ No newline at end of file diff --git a/apps/documenteditor/mobile/locale/en.json b/apps/documenteditor/mobile/locale/en.json index ce2b8b404..7f7d1f914 100644 --- a/apps/documenteditor/mobile/locale/en.json +++ b/apps/documenteditor/mobile/locale/en.json @@ -249,6 +249,7 @@ "DE.Controllers.Main.warnNoLicense": "This version of %1 editors has certain limitations for concurrent connections to the document server.
If you need more please consider purchasing a commercial license.", "DE.Controllers.Main.warnNoLicenseUsers": "This version of %1 editors has certain limitations for concurrent users.
If you need more please consider purchasing a commercial license.", "DE.Controllers.Main.warnProcessRightsChange": "You have been denied the right to edit the file.", + "DE.Controllers.Main.errorUpdateVersionOnDisconnect": "The file version has been changed.
Use the 'Download' option to save the file backup copy to your computer hard drive.", "DE.Controllers.Search.textNoTextFound": "Text not Found", "DE.Controllers.Search.textReplaceAll": "Replace All", "DE.Controllers.Settings.notcriticalErrorTitle": "Warning", diff --git a/apps/documenteditor/mobile/locale/ru.json b/apps/documenteditor/mobile/locale/ru.json index 6fa5b1bf2..efc4828fd 100644 --- a/apps/documenteditor/mobile/locale/ru.json +++ b/apps/documenteditor/mobile/locale/ru.json @@ -337,7 +337,7 @@ "DE.Views.EditImage.textBack": "Назад", "DE.Views.EditImage.textBackward": "Перенести назад", "DE.Views.EditImage.textBehind": "За текстом", - "DE.Views.EditImage.textDefault": "Размер по умолчанию", + "DE.Views.EditImage.textDefault": "Реальный размер", "DE.Views.EditImage.textDistanceText": "Расстояние до текста", "DE.Views.EditImage.textForward": "Перенести вперед", "DE.Views.EditImage.textFromLibrary": "Изображение из библиотеки", diff --git a/apps/documenteditor/sdk_dev_scripts.js b/apps/documenteditor/sdk_dev_scripts.js index f52c9e4fb..345333749 100644 --- a/apps/documenteditor/sdk_dev_scripts.js +++ b/apps/documenteditor/sdk_dev_scripts.js @@ -160,6 +160,7 @@ var sdk_dev_scrpipts = [ "../../../../sdkjs/word/Editor/Footnotes.js", "../../../../sdkjs/word/Editor/FootnotesChanges.js", "../../../../sdkjs/word/Editor/FootEndNote.js", + "../../../../sdkjs/word/Drawing/buttons.js", "../../../../sdkjs/word/Drawing/Graphics.js", "../../../../sdkjs/word/Drawing/ShapeDrawer.js", "../../../../sdkjs/word/Drawing/DrawingDocument.js", diff --git a/apps/presentationeditor/embed/js/ApplicationController.js b/apps/presentationeditor/embed/js/ApplicationController.js index a140f01a6..f7e7c2deb 100644 --- a/apps/presentationeditor/embed/js/ApplicationController.js +++ b/apps/presentationeditor/embed/js/ApplicationController.js @@ -502,6 +502,10 @@ PE.ApplicationController = new(function(){ message = me.errorFileSizeExceed; break; + case Asc.c_oAscError.ID.UpdateVersion: + message = me.errorUpdateVersionOnDisconnect; + break; + default: message = me.errorDefaultMessage.replace('%1', id); break; @@ -629,6 +633,7 @@ PE.ApplicationController = new(function(){ waitText: 'Please, wait...', textLoadingDocument: 'Loading presentation', txtClose: 'Close', - errorFileSizeExceed: 'The file size exceeds the limitation set for your server.
Please contact your Document Server administrator for details.' + errorFileSizeExceed: 'The file size exceeds the limitation set for your server.
Please contact your Document Server administrator for details.', + errorUpdateVersionOnDisconnect: 'The file version has been changed.
Use the \'Download\' option to save the file backup copy to your computer hard drive.' } })(); diff --git a/apps/presentationeditor/embed/locale/en.json b/apps/presentationeditor/embed/locale/en.json index a12071d1d..a6842c5f4 100644 --- a/apps/presentationeditor/embed/locale/en.json +++ b/apps/presentationeditor/embed/locale/en.json @@ -22,6 +22,7 @@ "PE.ApplicationController.unknownErrorText": "Unknown error.", "PE.ApplicationController.unsupportedBrowserErrorText": "Your browser is not supported.", "PE.ApplicationController.waitText": "Please, wait...", + "PE.ApplicationController.errorUpdateVersionOnDisconnect": "The file version has been changed.
Use the 'Download' option to save the file backup copy to your computer hard drive.", "PE.ApplicationView.txtDownload": "Download", "PE.ApplicationView.txtEmbed": "Embed", "PE.ApplicationView.txtFullScreen": "Full Screen", diff --git a/apps/presentationeditor/main/app/controller/Main.js b/apps/presentationeditor/main/app/controller/Main.js index 29a8c48e3..f1629ec05 100644 --- a/apps/presentationeditor/main/app/controller/Main.js +++ b/apps/presentationeditor/main/app/controller/Main.js @@ -1204,6 +1204,10 @@ define([ config.msg = this.errorFileSizeExceed; break; + case Asc.c_oAscError.ID.UpdateVersion: + config.msg = this.errorUpdateVersionOnDisconnect; + break; + default: config.msg = (typeof id == 'string') ? id : this.errorDefaultMessage.replace('%1', id); break; @@ -2189,7 +2193,8 @@ define([ errorEmailClient: 'No email client could be found', textCustomLoader: 'Please note that according to the terms of the license you are not entitled to change the loader.
Please contact our Sales Department to get a quote.', waitText: 'Please, wait...', - errorFileSizeExceed: 'The file size exceeds the limitation set for your server.
Please contact your Document Server administrator for details.' + errorFileSizeExceed: 'The file size exceeds the limitation set for your server.
Please contact your Document Server administrator for details.', + errorUpdateVersionOnDisconnect: 'The file version has been changed.
Use the \'Download as...\' option to save the file backup copy to your computer hard drive.' } })(), PE.Controllers.Main || {})) }); diff --git a/apps/presentationeditor/main/app/controller/Toolbar.js b/apps/presentationeditor/main/app/controller/Toolbar.js index ea971034b..d01888446 100644 --- a/apps/presentationeditor/main/app/controller/Toolbar.js +++ b/apps/presentationeditor/main/app/controller/Toolbar.js @@ -48,6 +48,7 @@ define([ 'common/main/lib/view/ImageFromUrlDialog', 'common/main/lib/view/InsertTableDialog', 'common/main/lib/view/SelectFileDlg', + 'common/main/lib/view/ListSettingsDialog', 'common/main/lib/util/define', 'presentationeditor/main/app/collection/SlideThemes', 'presentationeditor/main/app/view/Toolbar', @@ -55,8 +56,7 @@ define([ 'presentationeditor/main/app/view/HeaderFooterDialog', 'presentationeditor/main/app/view/HyperlinkSettingsDialog', 'presentationeditor/main/app/view/SlideSizeSettings', - 'presentationeditor/main/app/view/SlideshowSettings', - 'presentationeditor/main/app/view/ListSettingsDialog' + 'presentationeditor/main/app/view/SlideshowSettings' ], function () { 'use strict'; PE.Controllers.Toolbar = Backbone.Controller.extend(_.extend({ @@ -1111,7 +1111,7 @@ define([ } } if (props) { - (new PE.Views.ListSettingsDialog({ + (new Common.Views.ListSettingsDialog({ props: props, type: type, handler: function(result, value) { diff --git a/apps/presentationeditor/main/locale/en.json b/apps/presentationeditor/main/locale/en.json index a8bd0bc44..414c39619 100644 --- a/apps/presentationeditor/main/locale/en.json +++ b/apps/presentationeditor/main/locale/en.json @@ -108,6 +108,12 @@ "Common.Views.InsertTableDialog.txtTitle": "Table Size", "Common.Views.InsertTableDialog.txtTitleSplit": "Split Cell", "Common.Views.LanguageDialog.labelSelect": "Select document language", + "Common.Views.ListSettingsDialog.textNewColor": "Add New Custom Color", + "Common.Views.ListSettingsDialog.txtColor": "Color", + "Common.Views.ListSettingsDialog.txtOfText": "% of text", + "Common.Views.ListSettingsDialog.txtSize": "Size", + "Common.Views.ListSettingsDialog.txtStart": "Start at", + "Common.Views.ListSettingsDialog.txtTitle": "List Settings", "Common.Views.OpenDialog.closeButtonText": "Close File", "Common.Views.OpenDialog.txtEncoding": "Encoding ", "Common.Views.OpenDialog.txtIncorrectPwd": "Password is incorrect.", @@ -575,6 +581,7 @@ "PE.Controllers.Main.warnNoLicense": "This version of %1 editors has certain limitations for concurrent connections to the document server.
If you need more please consider purchasing a commercial license.", "PE.Controllers.Main.warnNoLicenseUsers": "This version of %1 editors has certain limitations for concurrent users.
If you need more please consider purchasing a commercial license.", "PE.Controllers.Main.warnProcessRightsChange": "You have been denied the right to edit the file.", + "PE.Controllers.Main.errorUpdateVersionOnDisconnect": "The file version has been changed.
Use the 'Download as...' option to save the file backup copy to your computer hard drive.", "PE.Controllers.Statusbar.zoomText": "Zoom {0}%", "PE.Controllers.Toolbar.confirmAddFontName": "The font you are going to save is not available on the current device.
The text style will be displayed using one of the system fonts, the saved font will be used when it is available.
Do you want to continue?", "PE.Controllers.Toolbar.textAccent": "Accents", @@ -1293,12 +1300,6 @@ "PE.Views.LeftMenu.tipTitles": "Titles", "PE.Views.LeftMenu.txtDeveloper": "DEVELOPER MODE", "PE.Views.LeftMenu.txtTrial": "TRIAL MODE", - "PE.Views.ListSettingsDialog.textNewColor": "Add New Custom Color", - "PE.Views.ListSettingsDialog.txtColor": "Color", - "PE.Views.ListSettingsDialog.txtOfText": "% of text", - "PE.Views.ListSettingsDialog.txtSize": "Size", - "PE.Views.ListSettingsDialog.txtStart": "Start at", - "PE.Views.ListSettingsDialog.txtTitle": "List Settings", "PE.Views.ParagraphSettings.strLineHeight": "Line Spacing", "PE.Views.ParagraphSettings.strParagraphSpacing": "Paragraph Spacing", "PE.Views.ParagraphSettings.strSpacingAfter": "After", diff --git a/apps/presentationeditor/main/locale/ru.json b/apps/presentationeditor/main/locale/ru.json index 89f741143..d67275680 100644 --- a/apps/presentationeditor/main/locale/ru.json +++ b/apps/presentationeditor/main/locale/ru.json @@ -969,7 +969,7 @@ "PE.Views.DocumentHolder.mergeCellsText": "Объединить ячейки", "PE.Views.DocumentHolder.moreText": "Больше вариантов...", "PE.Views.DocumentHolder.noSpellVariantsText": "Нет вариантов", - "PE.Views.DocumentHolder.originalSizeText": "Размер по умолчанию", + "PE.Views.DocumentHolder.originalSizeText": "Реальный размер", "PE.Views.DocumentHolder.removeHyperlinkText": "Удалить гиперссылку", "PE.Views.DocumentHolder.rightText": "По правому краю", "PE.Views.DocumentHolder.rowText": "Строку", @@ -1253,7 +1253,7 @@ "PE.Views.ImageSettings.textHintFlipH": "Отразить слева направо", "PE.Views.ImageSettings.textHintFlipV": "Отразить сверху вниз", "PE.Views.ImageSettings.textInsert": "Заменить изображение", - "PE.Views.ImageSettings.textOriginalSize": "По умолчанию", + "PE.Views.ImageSettings.textOriginalSize": "Реальный размер", "PE.Views.ImageSettings.textRotate90": "Повернуть на 90°", "PE.Views.ImageSettings.textRotation": "Поворот", "PE.Views.ImageSettings.textSize": "Размер", @@ -1267,7 +1267,7 @@ "PE.Views.ImageSettingsAdvanced.textHeight": "Высота", "PE.Views.ImageSettingsAdvanced.textHorizontally": "По горизонтали", "PE.Views.ImageSettingsAdvanced.textKeepRatio": "Сохранять пропорции", - "PE.Views.ImageSettingsAdvanced.textOriginalSize": "По умолчанию", + "PE.Views.ImageSettingsAdvanced.textOriginalSize": "Реальный размер", "PE.Views.ImageSettingsAdvanced.textPlacement": "Положение", "PE.Views.ImageSettingsAdvanced.textPosition": "Положение", "PE.Views.ImageSettingsAdvanced.textRotation": "Поворот", diff --git a/apps/presentationeditor/mobile/app/controller/Main.js b/apps/presentationeditor/mobile/app/controller/Main.js index 91013c9ff..e76ecd8a9 100644 --- a/apps/presentationeditor/mobile/app/controller/Main.js +++ b/apps/presentationeditor/mobile/app/controller/Main.js @@ -890,6 +890,10 @@ define([ config.msg = this.errorFileSizeExceed; break; + case Asc.c_oAscError.ID.UpdateVersion: + config.msg = this.errorUpdateVersionOnDisconnect; + break; + default: config.msg = this.errorDefaultMessage.replace('%1', id); break; @@ -1397,7 +1401,8 @@ define([ textPaidFeature: 'Paid feature', textCustomLoader: 'Please note that according to the terms of the license you are not entitled to change the loader.
Please contact our Sales Department to get a quote.', waitText: 'Please, wait...', - errorFileSizeExceed: 'The file size exceeds the limitation set for your server.
Please contact your Document Server administrator for details.' + errorFileSizeExceed: 'The file size exceeds the limitation set for your server.
Please contact your Document Server administrator for details.', + errorUpdateVersionOnDisconnect: 'The file version has been changed.
Use the \'Download\' option to save the file backup copy to your computer hard drive.' } })(), PE.Controllers.Main || {})) }); \ No newline at end of file diff --git a/apps/presentationeditor/mobile/locale/en.json b/apps/presentationeditor/mobile/locale/en.json index d3d620c77..0c5cee1df 100644 --- a/apps/presentationeditor/mobile/locale/en.json +++ b/apps/presentationeditor/mobile/locale/en.json @@ -225,6 +225,7 @@ "PE.Controllers.Main.warnNoLicense": "This version of %1 editors has certain limitations for concurrent connections to the document server.
If you need more please consider purchasing a commercial license.", "PE.Controllers.Main.warnNoLicenseUsers": "This version of %1 editors has certain limitations for concurrent users.
If you need more please consider purchasing a commercial license.", "PE.Controllers.Main.warnProcessRightsChange": "You have been denied the right to edit the file.", + "PE.Controllers.Main.errorUpdateVersionOnDisconnect": "The file version has been changed.
Use the 'Download' option to save the file backup copy to your computer hard drive.", "PE.Controllers.Search.textNoTextFound": "Text not Found", "PE.Controllers.Search.textReplaceAll": "Replace All", "PE.Controllers.Settings.notcriticalErrorTitle": "Warning", diff --git a/apps/presentationeditor/mobile/locale/it.json b/apps/presentationeditor/mobile/locale/it.json index 20d98e0ba..fb451474a 100644 --- a/apps/presentationeditor/mobile/locale/it.json +++ b/apps/presentationeditor/mobile/locale/it.json @@ -1,5 +1,6 @@ { "Common.Controllers.Collaboration.textEditUser": "È in corso la modifica del documento da parte di più utenti.", + "Common.UI.ThemeColorPalette.textCustomColors": "Colori personalizzati", "Common.UI.ThemeColorPalette.textStandartColors": "Colori standard", "Common.UI.ThemeColorPalette.textThemeColors": "Colori del tema", "Common.Utils.Metric.txtCm": "cm", @@ -253,6 +254,7 @@ "PE.Views.AddLink.textNumber": "Numero Diapositiva", "PE.Views.AddLink.textPrev": "Diapositiva precedente", "PE.Views.AddLink.textTip": "Suggerimento ", + "PE.Views.EditChart.textAddCustomColor": "Aggiungi colore personalizzato", "PE.Views.EditChart.textAlign": "Allinea", "PE.Views.EditChart.textAlignBottom": "Allinea in basso", "PE.Views.EditChart.textAlignCenter": "Allinea al centro", @@ -264,6 +266,7 @@ "PE.Views.EditChart.textBackward": "Sposta indietro", "PE.Views.EditChart.textBorder": "Bordo", "PE.Views.EditChart.textColor": "Colore", + "PE.Views.EditChart.textCustomColor": "Colore personalizzato", "PE.Views.EditChart.textFill": "Riempimento", "PE.Views.EditChart.textForward": "Sposta avanti", "PE.Views.EditChart.textRemoveChart": "Elimina Grafico", @@ -285,7 +288,7 @@ "PE.Views.EditImage.textAlignTop": "Allinea in alto", "PE.Views.EditImage.textBack": "Indietro", "PE.Views.EditImage.textBackward": "Sposta indietro", - "PE.Views.EditImage.textDefault": "Dimensione predefinita", + "PE.Views.EditImage.textDefault": "Dimensione reale", "PE.Views.EditImage.textForward": "Sposta avanti", "PE.Views.EditImage.textFromLibrary": "Foto dalla Raccolta", "PE.Views.EditImage.textFromURL": "Immagine da URL", @@ -314,6 +317,7 @@ "PE.Views.EditLink.textPrev": "Diapositiva precedente", "PE.Views.EditLink.textRemove": "Elimina Collegamento", "PE.Views.EditLink.textTip": "Suggerimento ", + "PE.Views.EditShape.textAddCustomColor": "Aggiungi colore personalizzato", "PE.Views.EditShape.textAlign": "Allinea", "PE.Views.EditShape.textAlignBottom": "Allinea in basso", "PE.Views.EditShape.textAlignCenter": "Allinea al centro", @@ -325,6 +329,7 @@ "PE.Views.EditShape.textBackward": "Sposta indietro", "PE.Views.EditShape.textBorder": "Bordo", "PE.Views.EditShape.textColor": "Colore", + "PE.Views.EditShape.textCustomColor": "Colore personalizzato", "PE.Views.EditShape.textEffects": "Effetti", "PE.Views.EditShape.textFill": "Riempimento", "PE.Views.EditShape.textForward": "Sposta avanti", @@ -338,6 +343,7 @@ "PE.Views.EditShape.textToForeground": "Porta in primo piano", "PE.Views.EditShape.txtDistribHor": "Distribuisci orizzontalmente", "PE.Views.EditShape.txtDistribVert": "Distribuisci verticalmente", + "PE.Views.EditSlide.textAddCustomColor": "Aggiungi colore personalizzato", "PE.Views.EditSlide.textApplyAll": "Applica a tutte le diapositive", "PE.Views.EditSlide.textBack": "Indietro", "PE.Views.EditSlide.textBlack": "Attraverso il nero", @@ -349,6 +355,7 @@ "PE.Views.EditSlide.textColor": "Colore", "PE.Views.EditSlide.textCounterclockwise": "In senso antiorario", "PE.Views.EditSlide.textCover": "Copertina", + "PE.Views.EditSlide.textCustomColor": "Colore personalizzato", "PE.Views.EditSlide.textDelay": "Ritardo", "PE.Views.EditSlide.textDuplicateSlide": "Duplica diapositiva", "PE.Views.EditSlide.textDuration": "Durata", @@ -383,6 +390,7 @@ "PE.Views.EditSlide.textZoomIn": "Ingrandisci", "PE.Views.EditSlide.textZoomOut": "Rimpicciolisci", "PE.Views.EditSlide.textZoomRotate": "Zoom e rotazione", + "PE.Views.EditTable.textAddCustomColor": "Aggiungi colore personalizzato", "PE.Views.EditTable.textAlign": "Allinea", "PE.Views.EditTable.textAlignBottom": "Allinea in basso", "PE.Views.EditTable.textAlignCenter": "Allinea al centro", @@ -397,6 +405,7 @@ "PE.Views.EditTable.textBorder": "Bordo", "PE.Views.EditTable.textCellMargins": "Margini cella", "PE.Views.EditTable.textColor": "Colore", + "PE.Views.EditTable.textCustomColor": "Colore personalizzato", "PE.Views.EditTable.textFill": "Riempimento", "PE.Views.EditTable.textFirstColumn": "Prima colonna", "PE.Views.EditTable.textForward": "Sposta avanti", @@ -414,6 +423,7 @@ "PE.Views.EditTable.textTotalRow": "Riga del Totale", "PE.Views.EditTable.txtDistribHor": "Distribuisci orizzontalmente", "PE.Views.EditTable.txtDistribVert": "Distribuisci verticalmente", + "PE.Views.EditText.textAddCustomColor": "Aggiungi colore personalizzato", "PE.Views.EditText.textAdditional": "Più...", "PE.Views.EditText.textAdditionalFormat": "Formattazione aggiuntiva", "PE.Views.EditText.textAfter": "dopo", @@ -426,6 +436,7 @@ "PE.Views.EditText.textCharacterItalic": "I", "PE.Views.EditText.textCharacterStrikethrough": "S", "PE.Views.EditText.textCharacterUnderline": "U", + "PE.Views.EditText.textCustomColor": "Colore personalizzato", "PE.Views.EditText.textDblStrikethrough": "Barrato doppio", "PE.Views.EditText.textDblSuperscript": "Apice", "PE.Views.EditText.textFontColor": "Colore del carattere", diff --git a/apps/presentationeditor/mobile/locale/ru.json b/apps/presentationeditor/mobile/locale/ru.json index f53721ea4..63e24f085 100644 --- a/apps/presentationeditor/mobile/locale/ru.json +++ b/apps/presentationeditor/mobile/locale/ru.json @@ -288,7 +288,7 @@ "PE.Views.EditImage.textAlignTop": "По верхнему краю", "PE.Views.EditImage.textBack": "Назад", "PE.Views.EditImage.textBackward": "Перенести назад", - "PE.Views.EditImage.textDefault": "Размер по умолчанию", + "PE.Views.EditImage.textDefault": "Реальный размер", "PE.Views.EditImage.textForward": "Перенести вперед", "PE.Views.EditImage.textFromLibrary": "Изображение из библиотеки", "PE.Views.EditImage.textFromURL": "Изображение по URL", diff --git a/apps/presentationeditor/sdk_dev_scripts.js b/apps/presentationeditor/sdk_dev_scripts.js index 10b5ba925..fc7eccb9f 100644 --- a/apps/presentationeditor/sdk_dev_scripts.js +++ b/apps/presentationeditor/sdk_dev_scripts.js @@ -111,6 +111,7 @@ var sdk_dev_scrpipts = [ "../../../../sdkjs/word/Editor/StylesChanges.js", "../../../../sdkjs/word/Editor/RevisionsChange.js", "../../../../sdkjs/slide/Editor/Format/StylesPrototype.js", + "../../../../sdkjs/word/Drawing/buttons.js", "../../../../sdkjs/word/Drawing/Graphics.js", "../../../../sdkjs/word/Drawing/ShapeDrawer.js", "../../../../sdkjs/slide/Drawing/Transitions.js", diff --git a/apps/spreadsheeteditor/embed/js/ApplicationController.js b/apps/spreadsheeteditor/embed/js/ApplicationController.js index 1c8078945..d9d561008 100644 --- a/apps/spreadsheeteditor/embed/js/ApplicationController.js +++ b/apps/spreadsheeteditor/embed/js/ApplicationController.js @@ -410,6 +410,10 @@ SSE.ApplicationController = new(function(){ message = me.errorFileSizeExceed; break; + case Asc.c_oAscError.ID.UpdateVersion: + message = me.errorUpdateVersionOnDisconnect; + break; + default: message = me.errorDefaultMessage.replace('%1', id); break; @@ -576,6 +580,7 @@ SSE.ApplicationController = new(function(){ waitText: 'Please, wait...', textLoadingDocument: 'Loading spreadsheet', txtClose: 'Close', - errorFileSizeExceed: 'The file size exceeds the limitation set for your server.
Please contact your Document Server administrator for details.' + errorFileSizeExceed: 'The file size exceeds the limitation set for your server.
Please contact your Document Server administrator for details.', + errorUpdateVersionOnDisconnect: 'The file version has been changed.
Use the \'Download\' option to save the file backup copy to your computer hard drive.' } })(); \ No newline at end of file diff --git a/apps/spreadsheeteditor/embed/locale/en.json b/apps/spreadsheeteditor/embed/locale/en.json index 11ac34dc1..448682490 100644 --- a/apps/spreadsheeteditor/embed/locale/en.json +++ b/apps/spreadsheeteditor/embed/locale/en.json @@ -22,6 +22,7 @@ "SSE.ApplicationController.unknownErrorText": "Unknown error.", "SSE.ApplicationController.unsupportedBrowserErrorText": "Your browser is not supported.", "SSE.ApplicationController.waitText": "Please, wait...", + "SSE.ApplicationController.errorUpdateVersionOnDisconnect": "The file version has been changed.
Use the 'Download' option to save the file backup copy to your computer hard drive.", "SSE.ApplicationView.txtDownload": "Download", "SSE.ApplicationView.txtEmbed": "Embed", "SSE.ApplicationView.txtFullScreen": "Full Screen", diff --git a/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js b/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js index bcb7a5225..6c332e45b 100644 --- a/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js +++ b/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js @@ -64,6 +64,7 @@ define([ 'common/main/lib/util/Shortcuts', 'common/main/lib/view/CopyWarningDialog', 'common/main/lib/view/OpenDialog', + 'common/main/lib/view/ListSettingsDialog', 'spreadsheeteditor/main/app/view/DocumentHolder', 'spreadsheeteditor/main/app/view/HyperlinkSettingsDialog', 'spreadsheeteditor/main/app/view/ParagraphSettingsAdvanced', @@ -213,7 +214,7 @@ define([ view.menuImageAlign.menu.on('item:click', _.bind(me.onImgMenuAlign, me)); view.menuParagraphVAlign.menu.on('item:click', _.bind(me.onParagraphVAlign, me)); view.menuParagraphDirection.menu.on('item:click', _.bind(me.onParagraphDirection, me)); - view.menuParagraphBullets.menu.on('item:click', _.bind(me.onSelectNoneBullet, me)); + view.menuParagraphBullets.menu.on('item:click', _.bind(me.onSelectBulletMenu, me)); view.menuAddHyperlinkShape.on('click', _.bind(me.onInsHyperlink, me)); view.menuEditHyperlinkShape.on('click', _.bind(me.onInsHyperlink, me)); view.menuRemoveHyperlinkShape.on('click', _.bind(me.onRemoveHyperlinkShape, me)); @@ -744,11 +745,37 @@ define([ } }, - onSelectNoneBullet: function(menu, item) { - if (this.api && item.options.value == -1) { - this.api.asc_setListType(item.options.value); - Common.NotificationCenter.trigger('edit:complete', this.documentHolder); - Common.component.Analytics.trackEvent('DocumentHolder', 'List Type'); + onSelectBulletMenu: function(menu, item) { + if (this.api) { + if (item.options.value == -1) { + this.api.asc_setListType(item.options.value); + Common.NotificationCenter.trigger('edit:complete', this.documentHolder); + Common.component.Analytics.trackEvent('DocumentHolder', 'List Type'); + } else if (item.options.value == 'settings') { + var me = this, + props; + var selectedObjects = me.api.asc_getGraphicObjectProps(); + for (var i = 0; i < selectedObjects.length; i++) { + if (selectedObjects[i].asc_getObjectType() == Asc.c_oAscTypeSelectElement.Paragraph) { + props = selectedObjects[i].asc_getObjectValue(); + break; + } + } + if (props) { + (new Common.Views.ListSettingsDialog({ + props: props, + type: this.api.asc_getCurrentListType().get_ListType(), + handler: function(result, value) { + if (result == 'ok') { + if (me.api) { + me.api.asc_setGraphicObjectProps(value); + } + } + Common.NotificationCenter.trigger('edit:complete', me.documentHolder); + } + })).show(); + } + } } }, @@ -1645,6 +1672,7 @@ define([ documentHolder.menuParagraphDirect270.setChecked(direct == Asc.c_oAscVertDrawingText.vert270); documentHolder.menuParagraphBulletNone.setChecked(listtype.get_ListType() == -1); + documentHolder.mnuListSettings.setDisabled(listtype.get_ListType() == -1); var rec = documentHolder.paraBulletsPicker.store.findWhere({ type: listtype.get_ListType(), subtype: listtype.get_ListSubType() }); documentHolder.paraBulletsPicker.selectRecord(rec, true); } else if (elType == Asc.c_oAscTypeSelectElement.Paragraph) { diff --git a/apps/spreadsheeteditor/main/app/controller/Main.js b/apps/spreadsheeteditor/main/app/controller/Main.js index 8239d6184..8a6694f98 100644 --- a/apps/spreadsheeteditor/main/app/controller/Main.js +++ b/apps/spreadsheeteditor/main/app/controller/Main.js @@ -1406,6 +1406,10 @@ define([ config.msg = this.errorFileSizeExceed; break; + case Asc.c_oAscError.ID.UpdateVersion: + config.msg = this.errorUpdateVersionOnDisconnect; + break; + default: config.msg = (typeof id == 'string') ? id : this.errorDefaultMessage.replace('%1', id); break; @@ -2435,7 +2439,8 @@ define([ txtTime: 'Time', txtTab: 'Tab', txtFile: 'File', - errorFileSizeExceed: 'The file size exceeds the limitation set for your server.
Please contact your Document Server administrator for details.' + errorFileSizeExceed: 'The file size exceeds the limitation set for your server.
Please contact your Document Server administrator for details.', + errorUpdateVersionOnDisconnect: 'The file version has been changed.
Use the \'Download as...\' option to save the file backup copy to your computer hard drive.' } })(), SSE.Controllers.Main || {})) }); diff --git a/apps/spreadsheeteditor/main/app/view/CellSettings.js b/apps/spreadsheeteditor/main/app/view/CellSettings.js index 483d0f9ed..2c41c3736 100644 --- a/apps/spreadsheeteditor/main/app/view/CellSettings.js +++ b/apps/spreadsheeteditor/main/app/view/CellSettings.js @@ -401,261 +401,320 @@ define([ this.disableControls(this._locked); - if (props ) - { + if (props ) { this._noApply = true; var value = props.asc_getAngle(); - if ( Math.abs(this._state.CellAngle-value)>0.1 || (this._state.CellAngle===undefined)&&(this._state.CellAngle!==value)) { + if (Math.abs(this._state.CellAngle - value) > 0.1 || (this._state.CellAngle === undefined) && (this._state.CellAngle !== value)) { this.spnAngle.setValue((value !== null) ? value : '', true); - this._state.CellAngle=value; + this._state.CellAngle = value; } this.fill = props.asc_getFill2(); - this.pattern = this.fill.asc_getPatternFill(); - this.gradient = this.fill.asc_getGradientFill(); - if (this.pattern === null && this.gradient === null) { - this.OriginalFillType = Asc.c_oAscFill.FILL_TYPE_NOFILL; - this.CellColor = {Value: 0, Color: 'transparent'}; - this.FGColor = {Value: 1, Color: {color: '4f81bd', effectId: 24}}; - this.BGColor = {Value: 1, Color: 'ffffff'}; - this.GradColors[0] = {Value: 1, Color: {color: '4f81bd', effectId: 24}, Position: 0}; - this.GradColors[1] = {Value: 1, Color: 'ffffff', Position: 1}; - } else if (this.pattern !== null) { - if(this.pattern.asc_getType() === -1) { - var color = this.pattern.asc_getFgColor(); - if (color.asc_getType() == Asc.c_oAscColor.COLOR_TYPE_SCHEME) { - this.CellColor = {Value: 1, Color: {color: Common.Utils.ThemeColor.getHexColor(color.asc_getR(), color.asc_getG(), color.asc_getB()), effectValue: color.asc_getValue() }}; - } else { - this.CellColor = {Value: 1, Color: Common.Utils.ThemeColor.getHexColor(color.asc_getR(), color.asc_getG(), color.asc_getB())}; - } - this.OriginalFillType = Asc.c_oAscFill.FILL_TYPE_SOLID; - this.FGColor = {Value: 1, Color: Common.Utils.ThemeColor.colorValue2EffectId(this.CellColor.Color)}; + if (this.fill) { + this.pattern = this.fill.asc_getPatternFill(); + this.gradient = this.fill.asc_getGradientFill(); + if (this.pattern === null && this.gradient === null) { + this.OriginalFillType = Asc.c_oAscFill.FILL_TYPE_NOFILL; + this.CellColor = {Value: 0, Color: 'transparent'}; + this.FGColor = {Value: 1, Color: {color: '4f81bd', effectId: 24}}; this.BGColor = {Value: 1, Color: 'ffffff'}; - this.GradColors[0] = {Value: 1, Color: Common.Utils.ThemeColor.colorValue2EffectId(this.CellColor.Color), Position: 0}; + this.GradColors[0] = {Value: 1, Color: {color: '4f81bd', effectId: 24}, Position: 0}; this.GradColors[1] = {Value: 1, Color: 'ffffff', Position: 1}; - } else { - this.PatternFillType = this.pattern.asc_getType(); - if (this._state.PatternFillType !== this.PatternFillType) { - this.cmbPattern.suspendEvents(); - var rec = this.cmbPattern.menuPicker.store.findWhere({ - type: this.PatternFillType - }); - this.cmbPattern.menuPicker.selectRecord(rec); - this.cmbPattern.resumeEvents(); - this._state.PatternFillType = this.PatternFillType; - } - var color = this.pattern.asc_getFgColor(); - if (color) { + } else if (this.pattern !== null) { + if (this.pattern.asc_getType() === -1) { + var color = this.pattern.asc_getFgColor(); if (color.asc_getType() == Asc.c_oAscColor.COLOR_TYPE_SCHEME) { - this.FGColor = {Value: 1, Color: {color: Common.Utils.ThemeColor.getHexColor(color.asc_getR(), color.asc_getG(), color.asc_getB()), effectValue: color.asc_getValue() }}; + this.CellColor = { + Value: 1, + Color: { + color: Common.Utils.ThemeColor.getHexColor(color.asc_getR(), color.asc_getG(), color.asc_getB()), + effectValue: color.asc_getValue() + } + }; } else { - this.FGColor = {Value: 1, Color: Common.Utils.ThemeColor.getHexColor(color.asc_getR(), color.asc_getG(), color.asc_getB())}; + this.CellColor = { + Value: 1, + Color: Common.Utils.ThemeColor.getHexColor(color.asc_getR(), color.asc_getG(), color.asc_getB()) + }; } - } else - this.FGColor = {Value: 1, Color: {color: '4f81bd', effectId: 24}}; - - color = this.pattern.asc_getBgColor(); - if (color) { - if (color.asc_getType() == Asc.c_oAscColor.COLOR_TYPE_SCHEME) { - this.BGColor = {Value: 1, Color: {color: Common.Utils.ThemeColor.getHexColor(color.asc_getR(), color.asc_getG(), color.asc_getB()), effectValue: color.asc_getValue() }}; - } else { - this.BGColor = {Value: 1, Color: Common.Utils.ThemeColor.getHexColor(color.asc_getR(), color.asc_getG(), color.asc_getB())}; - } - } else + this.OriginalFillType = Asc.c_oAscFill.FILL_TYPE_SOLID; + this.FGColor = { + Value: 1, + Color: Common.Utils.ThemeColor.colorValue2EffectId(this.CellColor.Color) + }; this.BGColor = {Value: 1, Color: 'ffffff'}; - this.CellColor = {Value: 1, Color: Common.Utils.ThemeColor.colorValue2EffectId(this.FGColor.Color)}; - this.GradColors[0] = {Value: 1, Color: Common.Utils.ThemeColor.colorValue2EffectId(this.FGColor.Color), Position: 0}; - this.GradColors[1] = {Value: 1, Color: 'ffffff', Position: 1}; - this.OriginalFillType = Asc.c_oAscFill.FILL_TYPE_PATT; - } - } else if (this.gradient !== null) { - var gradFillType = this.gradient.asc_getType(); - if (this._state.GradFillType !== gradFillType || this.GradFillType !== gradFillType) { - this.GradFillType = gradFillType; - rec = undefined; - if (this.GradFillType == Asc.c_oAscFillGradType.GRAD_LINEAR || this.GradFillType == Asc.c_oAscFillGradType.GRAD_PATH) { - this.cmbGradType.setValue(this.GradFillType); - rec = this.cmbGradType.store.findWhere({value: this.GradFillType}); - this.onGradTypeSelect(this.cmbGradType, rec.attributes); + this.GradColors[0] = { + Value: 1, + Color: Common.Utils.ThemeColor.colorValue2EffectId(this.CellColor.Color), + Position: 0 + }; + this.GradColors[1] = {Value: 1, Color: 'ffffff', Position: 1}; } else { - this.cmbGradType.setValue(''); - this.btnDirection.setIconCls(''); + this.PatternFillType = this.pattern.asc_getType(); + if (this._state.PatternFillType !== this.PatternFillType) { + this.cmbPattern.suspendEvents(); + var rec = this.cmbPattern.menuPicker.store.findWhere({ + type: this.PatternFillType + }); + this.cmbPattern.menuPicker.selectRecord(rec); + this.cmbPattern.resumeEvents(); + this._state.PatternFillType = this.PatternFillType; + } + var color = this.pattern.asc_getFgColor(); + if (color) { + if (color.asc_getType() == Asc.c_oAscColor.COLOR_TYPE_SCHEME) { + this.FGColor = { + Value: 1, + Color: { + color: Common.Utils.ThemeColor.getHexColor(color.asc_getR(), color.asc_getG(), color.asc_getB()), + effectValue: color.asc_getValue() + } + }; + } else { + this.FGColor = { + Value: 1, + Color: Common.Utils.ThemeColor.getHexColor(color.asc_getR(), color.asc_getG(), color.asc_getB()) + }; + } + } else + this.FGColor = {Value: 1, Color: {color: '4f81bd', effectId: 24}}; + + color = this.pattern.asc_getBgColor(); + if (color) { + if (color.asc_getType() == Asc.c_oAscColor.COLOR_TYPE_SCHEME) { + this.BGColor = { + Value: 1, + Color: { + color: Common.Utils.ThemeColor.getHexColor(color.asc_getR(), color.asc_getG(), color.asc_getB()), + effectValue: color.asc_getValue() + } + }; + } else { + this.BGColor = { + Value: 1, + Color: Common.Utils.ThemeColor.getHexColor(color.asc_getR(), color.asc_getG(), color.asc_getB()) + }; + } + } else + this.BGColor = {Value: 1, Color: 'ffffff'}; + this.CellColor = { + Value: 1, + Color: Common.Utils.ThemeColor.colorValue2EffectId(this.FGColor.Color) + }; + this.GradColors[0] = { + Value: 1, + Color: Common.Utils.ThemeColor.colorValue2EffectId(this.FGColor.Color), + Position: 0 + }; + this.GradColors[1] = {Value: 1, Color: 'ffffff', Position: 1}; + this.OriginalFillType = Asc.c_oAscFill.FILL_TYPE_PATT; } - this._state.GradFillType = this.GradFillType; - } - if (this.GradFillType == Asc.c_oAscFillGradType.GRAD_LINEAR) { - var value = this.gradient.asc_getDegree(); - if (Math.abs(this.GradLinearDirectionType-value)>0.001) { - this.GradLinearDirectionType=value; - var record = this.mnuDirectionPicker.store.findWhere({type: value}); - this.mnuDirectionPicker.selectRecord(record, true); - if (record) - this.btnDirection.setIconCls('item-gradient ' + record.get('iconcls')); - else + } else if (this.gradient !== null) { + var gradFillType = this.gradient.asc_getType(); + if (this._state.GradFillType !== gradFillType || this.GradFillType !== gradFillType) { + this.GradFillType = gradFillType; + rec = undefined; + if (this.GradFillType == Asc.c_oAscFillGradType.GRAD_LINEAR || this.GradFillType == Asc.c_oAscFillGradType.GRAD_PATH) { + this.cmbGradType.setValue(this.GradFillType); + rec = this.cmbGradType.store.findWhere({value: this.GradFillType}); + this.onGradTypeSelect(this.cmbGradType, rec.attributes); + } else { + this.cmbGradType.setValue(''); this.btnDirection.setIconCls(''); + } + this._state.GradFillType = this.GradFillType; } + if (this.GradFillType == Asc.c_oAscFillGradType.GRAD_LINEAR) { + var value = this.gradient.asc_getDegree(); + if (Math.abs(this.GradLinearDirectionType - value) > 0.001) { + this.GradLinearDirectionType = value; + var record = this.mnuDirectionPicker.store.findWhere({type: value}); + this.mnuDirectionPicker.selectRecord(record, true); + if (record) + this.btnDirection.setIconCls('item-gradient ' + record.get('iconcls')); + else + this.btnDirection.setIconCls(''); + } + } + + var gradientStops; + this.GradColors.length = 0; + gradientStops = this.gradient.asc_getGradientStops(); + gradientStops.forEach(function (color) { + var clr = color.asc_getColor(), + position = color.asc_getPosition(), + itemColor; + if (clr.asc_getType() == Asc.c_oAscColor.COLOR_TYPE_SCHEME) { + itemColor = { + Value: 1, + Color: { + color: Common.Utils.ThemeColor.getHexColor(clr.asc_getR(), clr.asc_getG(), clr.asc_getB()), + effectValue: clr.asc_getValue() + }, + Position: position + }; + } else { + itemColor = { + Value: 1, + Color: Common.Utils.ThemeColor.getHexColor(clr.asc_getR(), clr.asc_getG(), clr.asc_getB()), + Position: position + }; + } + me.GradColors.push(itemColor); + }); + this.GradColors = _.sortBy(this.GradColors, 'Position'); + + this.OriginalFillType = Asc.c_oAscFill.FILL_TYPE_GRAD; + this.FGColor = { + Value: 1, + Color: Common.Utils.ThemeColor.colorValue2EffectId(this.GradColors[0].Color) + }; + this.BGColor = {Value: 1, Color: 'ffffff'}; + this.CellColor = { + Value: 1, + Color: Common.Utils.ThemeColor.colorValue2EffectId(this.GradColors[0].Color) + }; } - var gradientStops; - this.GradColors.length = 0; - gradientStops = this.gradient.asc_getGradientStops(); - gradientStops.forEach(function (color) { - var clr = color.asc_getColor(), - position = color.asc_getPosition(), - itemColor; - if (clr.asc_getType() == Asc.c_oAscColor.COLOR_TYPE_SCHEME) { - itemColor = {Value: 1, Color: {color: Common.Utils.ThemeColor.getHexColor(clr.asc_getR(), clr.asc_getG(), clr.asc_getB()), effectValue: clr.asc_getValue()}, Position: position}; + if (this._state.FillType !== this.OriginalFillType) { + this.cmbFillSrc.setValue((this.OriginalFillType === null) ? '' : this.OriginalFillType); + this._state.FillType = this.OriginalFillType; + this.ShowHideElem(this.OriginalFillType); + } + + // Color Back + + var type1 = typeof (this.CellColor.Color), + type2 = typeof (this._state.CellColor); + if ((type1 !== type2) || (type1 == 'object' && + (this.CellColor.Color.effectValue !== this._state.CellColor.effectValue || this._state.CellColor.color.indexOf(this.CellColor.Color) < 0)) || + (type1 != 'object' && this._state.CellColor !== undefined && this._state.CellColor.indexOf(this.CellColor.Color) < 0)) { + + this.btnBackColor.setColor(this.CellColor.Color); + if (_.isObject(this.CellColor.Color)) { + var isselected = false; + for (var i = 0; i < 10; i++) { + if (Common.Utils.ThemeColor.ThemeValues[i] == this.CellColor.Color.effectValue) { + this.colorsBack.select(this.CellColor.Color, true); + isselected = true; + break; + } + } + if (!isselected) this.colorsBack.clearSelection(); } else { - itemColor = {Value: 1, Color: Common.Utils.ThemeColor.getHexColor(clr.asc_getR(), clr.asc_getG(), clr.asc_getB()), Position: position}; + this.colorsBack.select(this.CellColor.Color, true); } - me.GradColors.push(itemColor); - }); - this.GradColors = _.sortBy(this.GradColors, 'Position'); - - this.OriginalFillType = Asc.c_oAscFill.FILL_TYPE_GRAD; - this.FGColor = {Value: 1, Color: Common.Utils.ThemeColor.colorValue2EffectId(this.GradColors[0].Color)}; - this.BGColor = {Value: 1, Color: 'ffffff'}; - this.CellColor = {Value: 1, Color: Common.Utils.ThemeColor.colorValue2EffectId(this.GradColors[0].Color)}; - } - - if ( this._state.FillType !== this.OriginalFillType ) { - this.cmbFillSrc.setValue((this.OriginalFillType === null) ? '' : this.OriginalFillType); - this._state.FillType = this.OriginalFillType; - this.ShowHideElem(this.OriginalFillType); - } - - // Color Back - - var type1 = typeof(this.CellColor.Color), - type2 = typeof(this._state.CellColor); - if ( (type1 !== type2) || (type1=='object' && - (this.CellColor.Color.effectValue!==this._state.CellColor.effectValue || this._state.CellColor.color.indexOf(this.CellColor.Color)<0)) || - (type1!='object' && this._state.CellColor!==undefined && this._state.CellColor.indexOf(this.CellColor.Color)<0 )) { - - this.btnBackColor.setColor(this.CellColor.Color); - if (_.isObject(this.CellColor.Color)) { - var isselected = false; - for (var i = 0; i < 10; i++) { - if (Common.Utils.ThemeColor.ThemeValues[i] == this.CellColor.Color.effectValue) { - this.colorsBack.select(this.CellColor.Color,true); - isselected = true; - break; - } - } - if (!isselected) this.colorsBack.clearSelection(); - } else { - this.colorsBack.select(this.CellColor.Color, true); + this._state.CellColor = this.CellColor.Color; } - this._state.CellColor = this.CellColor.Color; - } - // Pattern colors - type1 = typeof(this.FGColor.Color); - type2 = typeof(this._state.FGColor); + // Pattern colors + type1 = typeof (this.FGColor.Color); + type2 = typeof (this._state.FGColor); - if ( (type1 !== type2) || (type1=='object' && - (this.FGColor.Color.effectValue!==this._state.FGColor.effectValue || this._state.FGColor.color.indexOf(this.FGColor.Color.color)<0)) || - (type1!='object' && this._state.FGColor.indexOf(this.FGColor.Color)<0 )) { + if ((type1 !== type2) || (type1 == 'object' && + (this.FGColor.Color.effectValue !== this._state.FGColor.effectValue || this._state.FGColor.color.indexOf(this.FGColor.Color.color) < 0)) || + (type1 != 'object' && this._state.FGColor.indexOf(this.FGColor.Color) < 0)) { - this.btnFGColor.setColor(this.FGColor.Color); - if ( typeof(this.FGColor.Color) == 'object' ) { - var isselected = false; - for (var i=0; i<10; i++) { - if ( Common.Utils.ThemeColor.ThemeValues[i] == this.FGColor.Color.effectValue ) { - this.colorsFG.select(this.FGColor.Color,true); - isselected = true; - break; + this.btnFGColor.setColor(this.FGColor.Color); + if (typeof (this.FGColor.Color) == 'object') { + var isselected = false; + for (var i = 0; i < 10; i++) { + if (Common.Utils.ThemeColor.ThemeValues[i] == this.FGColor.Color.effectValue) { + this.colorsFG.select(this.FGColor.Color, true); + isselected = true; + break; + } } - } - if (!isselected) this.colorsFG.clearSelection(); - } else - this.colorsFG.select(this.FGColor.Color,true); + if (!isselected) this.colorsFG.clearSelection(); + } else + this.colorsFG.select(this.FGColor.Color, true); - this._state.FGColor = this.FGColor.Color; - } + this._state.FGColor = this.FGColor.Color; + } - type1 = typeof(this.BGColor.Color); - type2 = typeof(this._state.BGColor); + type1 = typeof (this.BGColor.Color); + type2 = typeof (this._state.BGColor); - if ( (type1 !== type2) || (type1=='object' && - (this.BGColor.Color.effectValue!==this._state.BGColor.effectValue || this._state.BGColor.color.indexOf(this.BGColor.Color.color)<0)) || - (type1!='object' && this._state.BGColor.indexOf(this.BGColor.Color)<0 )) { + if ((type1 !== type2) || (type1 == 'object' && + (this.BGColor.Color.effectValue !== this._state.BGColor.effectValue || this._state.BGColor.color.indexOf(this.BGColor.Color.color) < 0)) || + (type1 != 'object' && this._state.BGColor.indexOf(this.BGColor.Color) < 0)) { - this.btnBGColor.setColor(this.BGColor.Color); - if ( typeof(this.BGColor.Color) == 'object' ) { - var isselected = false; - for (var i=0; i<10; i++) { - if ( Common.Utils.ThemeColor.ThemeValues[i] == this.BGColor.Color.effectValue ) { - this.colorsBG.select(this.BGColor.Color,true); - isselected = true; - break; + this.btnBGColor.setColor(this.BGColor.Color); + if (typeof (this.BGColor.Color) == 'object') { + var isselected = false; + for (var i = 0; i < 10; i++) { + if (Common.Utils.ThemeColor.ThemeValues[i] == this.BGColor.Color.effectValue) { + this.colorsBG.select(this.BGColor.Color, true); + isselected = true; + break; + } } - } - if (!isselected) this.colorsBG.clearSelection(); - } else - this.colorsBG.select(this.BGColor.Color,true); + if (!isselected) this.colorsBG.clearSelection(); + } else + this.colorsBG.select(this.BGColor.Color, true); - this._state.BGColor = this.BGColor.Color; - } + this._state.BGColor = this.BGColor.Color; + } - // Gradient colors - var gradColor1 = this.GradColors[0]; - if (!gradColor1) { - gradColor1 = {Value: 1, Color: {color: '4f81bd', effectId: 24}}; - } - type1 = typeof(gradColor1.Color); - type2 = typeof(this._state.GradColor1); + // Gradient colors + var gradColor1 = this.GradColors[0]; + if (!gradColor1) { + gradColor1 = {Value: 1, Color: {color: '4f81bd', effectId: 24}}; + } + type1 = typeof (gradColor1.Color); + type2 = typeof (this._state.GradColor1); - if ( (type1 !== type2) || (type1=='object' && - (gradColor1.Color.effectValue!==this._state.GradColor1.effectValue || this._state.GradColor1.color.indexOf(gradColor1.Color.color)<0)) || - (type1!='object' && this._state.GradColor1.indexOf(gradColor1.Color)<0 )) { + if ((type1 !== type2) || (type1 == 'object' && + (gradColor1.Color.effectValue !== this._state.GradColor1.effectValue || this._state.GradColor1.color.indexOf(gradColor1.Color.color) < 0)) || + (type1 != 'object' && this._state.GradColor1.indexOf(gradColor1.Color) < 0)) { - this.btnGradColor1.setColor(gradColor1.Color); - if ( typeof(gradColor1.Color) == 'object' ) { - var isselected = false; - for (var i=0; i<10; i++) { - if ( Common.Utils.ThemeColor.ThemeValues[i] == gradColor1.Color.effectValue ) { - this.colorsGrad1.select(gradColor1.Color,true); - isselected = true; - break; + this.btnGradColor1.setColor(gradColor1.Color); + if (typeof (gradColor1.Color) == 'object') { + var isselected = false; + for (var i = 0; i < 10; i++) { + if (Common.Utils.ThemeColor.ThemeValues[i] == gradColor1.Color.effectValue) { + this.colorsGrad1.select(gradColor1.Color, true); + isselected = true; + break; + } } - } - if (!isselected) this.colorsGrad1.clearSelection(); - } else - this.colorsGrad1.select(gradColor1.Color,true); + if (!isselected) this.colorsGrad1.clearSelection(); + } else + this.colorsGrad1.select(gradColor1.Color, true); - this._state.GradColor1 = gradColor1.Color; - } + this._state.GradColor1 = gradColor1.Color; + } - var gradColor2 = this.GradColors[1]; - if (!gradColor2) { - gradColor2 = {Value: 1, Color: 'ffffff'}; - } - type1 = typeof(gradColor2.Color); - type2 = typeof(this._state.GradColor2); + var gradColor2 = this.GradColors[1]; + if (!gradColor2) { + gradColor2 = {Value: 1, Color: 'ffffff'}; + } + type1 = typeof (gradColor2.Color); + type2 = typeof (this._state.GradColor2); - if ( (type1 !== type2) || (type1=='object' && - (gradColor2.Color.effectValue!==this._state.GradColor2.effectValue || this._state.GradColor2.color.indexOf(gradColor2.Color.color)<0)) || - (type1!='object' && this._state.GradColor2.indexOf(gradColor2.Color)<0 )) { + if ((type1 !== type2) || (type1 == 'object' && + (gradColor2.Color.effectValue !== this._state.GradColor2.effectValue || this._state.GradColor2.color.indexOf(gradColor2.Color.color) < 0)) || + (type1 != 'object' && this._state.GradColor2.indexOf(gradColor2.Color) < 0)) { - this.btnGradColor2.setColor(gradColor2.Color); - if ( typeof(gradColor2.Color) == 'object' ) { - var isselected = false; - for (var i=0; i<10; i++) { - if ( Common.Utils.ThemeColor.ThemeValues[i] == gradColor2.Color.effectValue ) { - this.colorsGrad2.select(gradColor2.Color,true); - isselected = true; - break; + this.btnGradColor2.setColor(gradColor2.Color); + if (typeof (gradColor2.Color) == 'object') { + var isselected = false; + for (var i = 0; i < 10; i++) { + if (Common.Utils.ThemeColor.ThemeValues[i] == gradColor2.Color.effectValue) { + this.colorsGrad2.select(gradColor2.Color, true); + isselected = true; + break; + } } - } - if (!isselected) this.colorsGrad2.clearSelection(); - } else - this.colorsGrad2.select(gradColor2.Color,true); + if (!isselected) this.colorsGrad2.clearSelection(); + } else + this.colorsGrad2.select(gradColor2.Color, true); - this._state.GradColor2 = gradColor2.Color; + this._state.GradColor2 = gradColor2.Color; + } + + this._noApply = false; } - - this._noApply = false; } }, diff --git a/apps/spreadsheeteditor/main/app/view/DocumentHolder.js b/apps/spreadsheeteditor/main/app/view/DocumentHolder.js index 2a2d81402..481f98e1c 100644 --- a/apps/spreadsheeteditor/main/app/view/DocumentHolder.js +++ b/apps/spreadsheeteditor/main/app/view/DocumentHolder.js @@ -836,6 +836,10 @@ define([ checkable : true, checked : false, value : -1 + }), + me.mnuListSettings = new Common.UI.MenuItem({ + caption: me.textListSettings, + value: 'settings' }) ] }) @@ -1090,7 +1094,8 @@ define([ textAlign: 'Align', textCrop: 'Crop', textCropFill: 'Fill', - textCropFit: 'Fit' + textCropFit: 'Fit', + textListSettings: 'List Settings' }, SSE.Views.DocumentHolder || {})); }); \ No newline at end of file diff --git a/apps/spreadsheeteditor/main/app/view/Statusbar.js b/apps/spreadsheeteditor/main/app/view/Statusbar.js index 6b87e85dc..0d50e0bfc 100644 --- a/apps/spreadsheeteditor/main/app/view/Statusbar.js +++ b/apps/spreadsheeteditor/main/app/view/Statusbar.js @@ -571,11 +571,11 @@ define([ textNoColor : 'No Color', textNewColor : 'Add New Custom Color', zoomText : 'Zoom {0}%', - textSum : 'SUM', - textCount : 'COUNT', - textAverage : 'AVERAGE', - textMin : 'MIN', - textMax : 'MAX', + textSum : 'Sum', + textCount : 'Count', + textAverage : 'Average', + textMin : 'Min', + textMax : 'Max', filteredRecordsText : '{0} of {1} records filtered', filteredText : 'Filter mode', selectAllSheets : 'Select All Sheets', diff --git a/apps/spreadsheeteditor/main/locale/en.json b/apps/spreadsheeteditor/main/locale/en.json index bca6b30fb..e9999e4aa 100644 --- a/apps/spreadsheeteditor/main/locale/en.json +++ b/apps/spreadsheeteditor/main/locale/en.json @@ -94,6 +94,12 @@ "Common.Views.ImageFromUrlDialog.textUrl": "Paste an image URL:", "Common.Views.ImageFromUrlDialog.txtEmpty": "This field is required", "Common.Views.ImageFromUrlDialog.txtNotUrl": "This field should be a URL in the \"http://www.example.com\" format", + "Common.Views.ListSettingsDialog.textNewColor": "Add New Custom Color", + "Common.Views.ListSettingsDialog.txtColor": "Color", + "Common.Views.ListSettingsDialog.txtOfText": "% of text", + "Common.Views.ListSettingsDialog.txtSize": "Size", + "Common.Views.ListSettingsDialog.txtStart": "Start at", + "Common.Views.ListSettingsDialog.txtTitle": "List Settings", "Common.Views.OpenDialog.closeButtonText": "Close File", "Common.Views.OpenDialog.txtColon": "Colon", "Common.Views.OpenDialog.txtComma": "Comma", @@ -744,6 +750,7 @@ "SSE.Controllers.Main.warnNoLicense": "This version of %1 editors has certain limitations for concurrent connections to the document server.
If you need more please consider purchasing a commercial license.", "SSE.Controllers.Main.warnNoLicenseUsers": "This version of %1 editors has certain limitations for concurrent users.
If you need more please consider purchasing a commercial license.", "SSE.Controllers.Main.warnProcessRightsChange": "You have been denied the right to edit the file.", + "SSE.Controllers.Main.errorUpdateVersionOnDisconnect": "The file version has been changed.
Use the 'Download as...' option to save the file backup copy to your computer hard drive.", "SSE.Controllers.Print.strAllSheets": "All Sheets", "SSE.Controllers.Print.textWarning": "Warning", "SSE.Controllers.Print.txtCustom": "Custom", @@ -1502,6 +1509,7 @@ "SSE.Views.DocumentHolder.txtUngroup": "Ungroup", "SSE.Views.DocumentHolder.txtWidth": "Width", "SSE.Views.DocumentHolder.vertAlignText": "Vertical Alignment", + "SSE.Views.DocumentHolder.textListSettings": "List Settings", "SSE.Views.FileMenu.btnBackCaption": "Open file location", "SSE.Views.FileMenu.btnCloseMenuCaption": "Close Menu", "SSE.Views.FileMenu.btnCreateNewCaption": "Create New", @@ -2093,13 +2101,13 @@ "SSE.Views.Statusbar.RenameDialog.errNameWrongChar": "A sheet name cannot contain the following characters: \\/*?[]:", "SSE.Views.Statusbar.RenameDialog.labelSheetName": "Sheet Name", "SSE.Views.Statusbar.selectAllSheets": "Select All Sheets", - "SSE.Views.Statusbar.textAverage": "AVERAGE", - "SSE.Views.Statusbar.textCount": "COUNT", - "SSE.Views.Statusbar.textMax": "MAX", - "SSE.Views.Statusbar.textMin": "MIN", + "SSE.Views.Statusbar.textAverage": "Average", + "SSE.Views.Statusbar.textCount": "Count", + "SSE.Views.Statusbar.textMax": "Max", + "SSE.Views.Statusbar.textMin": "Min", "SSE.Views.Statusbar.textNewColor": "Add New Custom Color", "SSE.Views.Statusbar.textNoColor": "No Color", - "SSE.Views.Statusbar.textSum": "SUM", + "SSE.Views.Statusbar.textSum": "Sum", "SSE.Views.Statusbar.tipAddTab": "Add worksheet", "SSE.Views.Statusbar.tipFirst": "Scroll to first sheet", "SSE.Views.Statusbar.tipLast": "Scroll to last sheet", diff --git a/apps/spreadsheeteditor/main/locale/ru.json b/apps/spreadsheeteditor/main/locale/ru.json index cf522bc6a..f3aab8134 100644 --- a/apps/spreadsheeteditor/main/locale/ru.json +++ b/apps/spreadsheeteditor/main/locale/ru.json @@ -1391,7 +1391,7 @@ "SSE.Views.DocumentHolder.insertColumnRightText": "Столбец справа", "SSE.Views.DocumentHolder.insertRowAboveText": "Строку выше", "SSE.Views.DocumentHolder.insertRowBelowText": "Строку ниже", - "SSE.Views.DocumentHolder.originalSizeText": "По умолчанию", + "SSE.Views.DocumentHolder.originalSizeText": "Реальный размер", "SSE.Views.DocumentHolder.removeHyperlinkText": "Удалить гиперссылку", "SSE.Views.DocumentHolder.selectColumnText": "Весь столбец", "SSE.Views.DocumentHolder.selectDataText": "Данные столбцов", @@ -1702,7 +1702,7 @@ "SSE.Views.ImageSettings.textHintFlipV": "Отразить сверху вниз", "SSE.Views.ImageSettings.textInsert": "Заменить изображение", "SSE.Views.ImageSettings.textKeepRatio": "Сохранять пропорции", - "SSE.Views.ImageSettings.textOriginalSize": "По умолчанию", + "SSE.Views.ImageSettings.textOriginalSize": "Реальный размер", "SSE.Views.ImageSettings.textRotate90": "Повернуть на 90°", "SSE.Views.ImageSettings.textRotation": "Поворот", "SSE.Views.ImageSettings.textSize": "Размер", @@ -2086,13 +2086,13 @@ "SSE.Views.Statusbar.RenameDialog.errNameWrongChar": "Имя листа не может содержать следующие символы: \\/*?[]:", "SSE.Views.Statusbar.RenameDialog.labelSheetName": "Имя листа", "SSE.Views.Statusbar.selectAllSheets": "Выбрать все листы", - "SSE.Views.Statusbar.textAverage": "СРЕДНЕЕ", - "SSE.Views.Statusbar.textCount": "КОЛИЧЕСТВО", - "SSE.Views.Statusbar.textMax": "МАКС", - "SSE.Views.Statusbar.textMin": "МИН", + "SSE.Views.Statusbar.textAverage": "Среднее", + "SSE.Views.Statusbar.textCount": "Количество", + "SSE.Views.Statusbar.textMax": "Макс", + "SSE.Views.Statusbar.textMin": "Мин", "SSE.Views.Statusbar.textNewColor": "Пользовательский цвет", "SSE.Views.Statusbar.textNoColor": "Без цвета", - "SSE.Views.Statusbar.textSum": "СУММА", + "SSE.Views.Statusbar.textSum": "Сумма", "SSE.Views.Statusbar.tipAddTab": "Добавить лист", "SSE.Views.Statusbar.tipFirst": "Прокрутить до первого листа", "SSE.Views.Statusbar.tipLast": "Прокрутить до последнего листа", diff --git a/apps/spreadsheeteditor/main/resources/less/app.less b/apps/spreadsheeteditor/main/resources/less/app.less index 1f11e5e24..665d6f51e 100644 --- a/apps/spreadsheeteditor/main/resources/less/app.less +++ b/apps/spreadsheeteditor/main/resources/less/app.less @@ -164,7 +164,7 @@ height: 100%; display: inline-block; background: linear-gradient(90deg, #d5d5d5 0px, rgba(0,0,0,0) 1px) 0 0, - linear-gradient(rgba(0,255,0,0) 19px, #d5d5d5 20px) 0 0, + linear-gradient(rgba(0,0,0,0) 19px, #d5d5d5 20px) 0 0, linear-gradient( #f1f1f1 0px, #f1f1f1 20px) 0 0 repeat-x; background-size: 80px 20px; diff --git a/apps/spreadsheeteditor/mobile/app/controller/Main.js b/apps/spreadsheeteditor/mobile/app/controller/Main.js index b551e3551..4e3c9c118 100644 --- a/apps/spreadsheeteditor/mobile/app/controller/Main.js +++ b/apps/spreadsheeteditor/mobile/app/controller/Main.js @@ -1044,6 +1044,10 @@ define([ config.msg = this.errorFileSizeExceed; break; + case Asc.c_oAscError.ID.UpdateVersion: + config.msg = this.errorUpdateVersionOnDisconnect; + break; + default: config.msg = this.errorDefaultMessage.replace('%1', id); break; @@ -1625,7 +1629,8 @@ define([ textCustomLoader: 'Please note that according to the terms of the license you are not entitled to change the loader.
Please contact our Sales Department to get a quote.', errorFrmlMaxTextLength: 'Text values in formulas are limited to 255 characters.
Use the CONCATENATE function or concatenation operator (&)', waitText: 'Please, wait...', - errorFileSizeExceed: 'The file size exceeds the limitation set for your server.
Please contact your Document Server administrator for details.' + errorFileSizeExceed: 'The file size exceeds the limitation set for your server.
Please contact your Document Server administrator for details.', + errorUpdateVersionOnDisconnect: 'The file version has been changed.
Use the \'Download\' option to save the file backup copy to your computer hard drive.' } })(), SSE.Controllers.Main || {})) }); \ No newline at end of file diff --git a/apps/spreadsheeteditor/mobile/locale/en.json b/apps/spreadsheeteditor/mobile/locale/en.json index bffbbb5e6..f18aac42b 100644 --- a/apps/spreadsheeteditor/mobile/locale/en.json +++ b/apps/spreadsheeteditor/mobile/locale/en.json @@ -286,6 +286,7 @@ "SSE.Controllers.Main.warnNoLicense": "This version of %1 editors has certain limitations for concurrent connections to the document server.
If you need more please consider purchasing a commercial license.", "SSE.Controllers.Main.warnNoLicenseUsers": "This version of %1 editors has certain limitations for concurrent users.
If you need more please consider purchasing a commercial license.", "SSE.Controllers.Main.warnProcessRightsChange": "You have been denied the right to edit the file.", + "SSE.Controllers.Main.errorUpdateVersionOnDisconnect": "The file version has been changed.
Use the 'Download' option to save the file backup copy to your computer hard drive.", "SSE.Controllers.Search.textNoTextFound": "Text not found", "SSE.Controllers.Search.textReplaceAll": "Replace All", "SSE.Controllers.Settings.notcriticalErrorTitle": "Warning", diff --git a/apps/spreadsheeteditor/mobile/locale/it.json b/apps/spreadsheeteditor/mobile/locale/it.json index 3a781a874..5a254956d 100644 --- a/apps/spreadsheeteditor/mobile/locale/it.json +++ b/apps/spreadsheeteditor/mobile/locale/it.json @@ -1,5 +1,6 @@ { "Common.Controllers.Collaboration.textEditUser": "È in corso la modifica del documento da parte di più utenti.", + "Common.UI.ThemeColorPalette.textCustomColors": "Colori personalizzati", "Common.UI.ThemeColorPalette.textStandartColors": "Colori standard", "Common.UI.ThemeColorPalette.textThemeColors": "Colori del tema", "Common.Utils.Metric.txtCm": "cm", @@ -346,6 +347,7 @@ "SSE.Views.AddOther.textLink": "Collegamento", "SSE.Views.AddOther.textSort": "Ordina e filtra", "SSE.Views.EditCell.textAccounting": "Contabilità", + "SSE.Views.EditCell.textAddCustomColor": "Aggiungi colore personalizzato", "SSE.Views.EditCell.textAlignBottom": "Allinea in basso", "SSE.Views.EditCell.textAlignCenter": "Allinea al centro", "SSE.Views.EditCell.textAlignLeft": "Allinea a sinistra", @@ -362,6 +364,7 @@ "SSE.Views.EditCell.textCharacterUnderline": "U", "SSE.Views.EditCell.textColor": "Colore", "SSE.Views.EditCell.textCurrency": "Valuta", + "SSE.Views.EditCell.textCustomColor": "Colore personalizzato", "SSE.Views.EditCell.textDate": "Data", "SSE.Views.EditCell.textDiagDownBorder": "Bordo diagonale inferiore", "SSE.Views.EditCell.textDiagUpBorder": "Bordo diagonale superiore", @@ -395,6 +398,7 @@ "SSE.Views.EditCell.textTopBorder": "Bordo superiore", "SSE.Views.EditCell.textWrapText": "Disponi testo", "SSE.Views.EditCell.textYen": "Yen", + "SSE.Views.EditChart.textAddCustomColor": "Aggiungi colore personalizzato", "SSE.Views.EditChart.textAuto": "Auto", "SSE.Views.EditChart.textAxisCrosses": "Intersezione asse", "SSE.Views.EditChart.textAxisOptions": "Opzioni assi", @@ -408,6 +412,7 @@ "SSE.Views.EditChart.textChartTitle": "Titolo del grafico", "SSE.Views.EditChart.textColor": "Colore", "SSE.Views.EditChart.textCrossesValue": "Incrocia valore", + "SSE.Views.EditChart.textCustomColor": "Colore personalizzato", "SSE.Views.EditChart.textDataLabels": "Etichette dati", "SSE.Views.EditChart.textDesign": "Design", "SSE.Views.EditChart.textDisplayUnits": "Mostra unità", @@ -461,7 +466,7 @@ "SSE.Views.EditImage.textAddress": "Indirizzo", "SSE.Views.EditImage.textBack": "Indietro", "SSE.Views.EditImage.textBackward": "Sposta indietro", - "SSE.Views.EditImage.textDefault": "Dimensione predefinita", + "SSE.Views.EditImage.textDefault": "Dimensione reale", "SSE.Views.EditImage.textForward": "Sposta avanti", "SSE.Views.EditImage.textFromLibrary": "Foto dalla Raccolta", "SSE.Views.EditImage.textFromURL": "Immagine da URL", @@ -473,10 +478,12 @@ "SSE.Views.EditImage.textReplaceImg": "Sostituisci immagine", "SSE.Views.EditImage.textToBackground": "Porta in secondo piano", "SSE.Views.EditImage.textToForeground": "Porta in primo piano", + "SSE.Views.EditShape.textAddCustomColor": "Aggiungi colore personalizzato", "SSE.Views.EditShape.textBack": "Indietro", "SSE.Views.EditShape.textBackward": "Sposta indietro", "SSE.Views.EditShape.textBorder": "Bordo", "SSE.Views.EditShape.textColor": "Colore", + "SSE.Views.EditShape.textCustomColor": "Colore personalizzato", "SSE.Views.EditShape.textEffects": "Effetti", "SSE.Views.EditShape.textFill": "Riempimento", "SSE.Views.EditShape.textForward": "Sposta avanti", @@ -488,10 +495,12 @@ "SSE.Views.EditShape.textStyle": "Stile", "SSE.Views.EditShape.textToBackground": "Porta in secondo piano", "SSE.Views.EditShape.textToForeground": "Porta in primo piano", + "SSE.Views.EditText.textAddCustomColor": "Aggiungi colore personalizzato", "SSE.Views.EditText.textBack": "Indietro", "SSE.Views.EditText.textCharacterBold": "B", "SSE.Views.EditText.textCharacterItalic": "I", "SSE.Views.EditText.textCharacterUnderline": "U", + "SSE.Views.EditText.textCustomColor": "Colore personalizzato", "SSE.Views.EditText.textFillColor": "Colore di riempimento", "SSE.Views.EditText.textFonts": "Caratteri", "SSE.Views.EditText.textSize": "Dimensione", diff --git a/apps/spreadsheeteditor/mobile/locale/ru.json b/apps/spreadsheeteditor/mobile/locale/ru.json index 0c3be62c3..d66a071ac 100644 --- a/apps/spreadsheeteditor/mobile/locale/ru.json +++ b/apps/spreadsheeteditor/mobile/locale/ru.json @@ -466,7 +466,7 @@ "SSE.Views.EditImage.textAddress": "Адрес", "SSE.Views.EditImage.textBack": "Назад", "SSE.Views.EditImage.textBackward": "Перенести назад", - "SSE.Views.EditImage.textDefault": "Размер по умолчанию", + "SSE.Views.EditImage.textDefault": "Реальный размер", "SSE.Views.EditImage.textForward": "Перенести вперед", "SSE.Views.EditImage.textFromLibrary": "Изображение из библиотеки", "SSE.Views.EditImage.textFromURL": "Изображение по URL", diff --git a/apps/spreadsheeteditor/mobile/resources/css/app-ios.css b/apps/spreadsheeteditor/mobile/resources/css/app-ios.css index fd37673e5..1c04dcd53 100644 --- a/apps/spreadsheeteditor/mobile/resources/css/app-ios.css +++ b/apps/spreadsheeteditor/mobile/resources/css/app-ios.css @@ -7723,7 +7723,7 @@ html.pixel-ratio-3 .cell-styles.dataview .row li { width: 100%; height: 100%; display: inline-block; - background: linear-gradient(90deg, #d5d5d5 0px, rgba(0, 0, 0, 0) 1px) 0 0, linear-gradient(rgba(0, 255, 0, 0) 19px, #d5d5d5 20px) 0 0, linear-gradient(#f1f1f1 0px, #f1f1f1 20px) 0 0 repeat-x; + background: linear-gradient(90deg, #d5d5d5 0px, rgba(0, 0, 0, 0) 1px) 0 0, linear-gradient(rgba(0, 0, 0, 0) 19px, #d5d5d5 20px) 0 0, linear-gradient(#f1f1f1 0px, #f1f1f1 20px) 0 0 repeat-x; background-size: 80px 20px; -webkit-animation: flickerAnimation 2s infinite ease-in-out; -moz-animation: flickerAnimation 2s infinite ease-in-out; diff --git a/apps/spreadsheeteditor/mobile/resources/css/app-material.css b/apps/spreadsheeteditor/mobile/resources/css/app-material.css index 61264eaf2..db3b6425d 100644 --- a/apps/spreadsheeteditor/mobile/resources/css/app-material.css +++ b/apps/spreadsheeteditor/mobile/resources/css/app-material.css @@ -7585,7 +7585,7 @@ html.pixel-ratio-3 .cell-styles.dataview .row li { width: 100%; height: 100%; display: inline-block; - background: linear-gradient(90deg, #d5d5d5 0px, rgba(0, 0, 0, 0) 1px) 0 0, linear-gradient(rgba(0, 255, 0, 0) 19px, #d5d5d5 20px) 0 0, linear-gradient(#f1f1f1 0px, #f1f1f1 20px) 0 0 repeat-x; + background: linear-gradient(90deg, #d5d5d5 0px, rgba(0, 0, 0, 0) 1px) 0 0, linear-gradient(rgba(0, 0, 0, 0) 19px, #d5d5d5 20px) 0 0, linear-gradient(#f1f1f1 0px, #f1f1f1 20px) 0 0 repeat-x; background-size: 80px 20px; -webkit-animation: flickerAnimation 2s infinite ease-in-out; -moz-animation: flickerAnimation 2s infinite ease-in-out; diff --git a/apps/spreadsheeteditor/mobile/resources/less/app-ios.less b/apps/spreadsheeteditor/mobile/resources/less/app-ios.less index c370b84f6..6f179bc31 100644 --- a/apps/spreadsheeteditor/mobile/resources/less/app-ios.less +++ b/apps/spreadsheeteditor/mobile/resources/less/app-ios.less @@ -311,7 +311,7 @@ input, textarea { height: 100%; display: inline-block; background: linear-gradient(90deg, #d5d5d5 0px, rgba(0,0,0,0) 1px) 0 0, - linear-gradient(rgba(0,255,0,0) 19px, #d5d5d5 20px) 0 0, + linear-gradient(rgba(0,0,0,0) 19px, #d5d5d5 20px) 0 0, linear-gradient( #f1f1f1 0px, #f1f1f1 20px) 0 0 repeat-x; background-size: 80px 20px; diff --git a/apps/spreadsheeteditor/mobile/resources/less/app-material.less b/apps/spreadsheeteditor/mobile/resources/less/app-material.less index b69f06340..4cc126e86 100644 --- a/apps/spreadsheeteditor/mobile/resources/less/app-material.less +++ b/apps/spreadsheeteditor/mobile/resources/less/app-material.less @@ -299,7 +299,7 @@ input, textarea { height: 100%; display: inline-block; background: linear-gradient(90deg, #d5d5d5 0px, rgba(0,0,0,0) 1px) 0 0, - linear-gradient(rgba(0,255,0,0) 19px, #d5d5d5 20px) 0 0, + linear-gradient(rgba(0,0,0,0) 19px, #d5d5d5 20px) 0 0, linear-gradient( #f1f1f1 0px, #f1f1f1 20px) 0 0 repeat-x; background-size: 80px 20px;