Merge branch 'develop' into feature/fix-animation

apps/common/main/lib/component/SynchronizeTip.js

@@ -50,7 +50,7 @@ define([
             },
 
             template: _.template([
-                '<div class="synch-tip-root <% if (!!scope.options.extCls) {print(scope.options.extCls + \" \");} %><%= scope.placement %>">',
+                '<div class="synch-tip-root <% if (!!scope.options.extCls) {print(scope.options.extCls + \" \");} %><%= scope.placement %>" style="<%= scope.style %>">',
                     '<div class="asc-synchronizetip">',
                         '<div class="tip-arrow <%= scope.placement %>"></div>',
                         '<div>',
@@ -82,6 +82,7 @@ define([
                 this.closable = this.options.closable;
                 this.textButton = this.options.textButton || '';
                 this.position = this.options.position; // show in the position relative to target
+                this.style = this.options.style || '';
             },
 
             render: function() {

apps/documenteditor/main/app/controller/Statusbar.js

@@ -326,7 +326,8 @@ define([
                     text    : this.textDisconnect,
                     placement: 'top',
                     position: this.statusbar.isVisible() ? undefined : {bottom: 0},
-                    showLink: false
+                    showLink: false,
+                    style: 'max-width: 310px;'
                 });
                 this.disconnectTip.on({
                     'closeclick': function() {
@@ -348,6 +349,6 @@ define([
         textTrackChanges: 'The document is opened with the Track Changes mode enabled',
         tipReview       : 'Review',
         textSetTrackChanges: 'You are in Track Changes mode',
-        textDisconnect: '<b>Connection is lost</b><br>Please check connection settings.'
+        textDisconnect: '<b>Connection is lost</b><br>Trying to connect. Please check connection settings.'
     }, DE.Controllers.Statusbar || {}));
 });

apps/documenteditor/main/locale/en.json

@@ -887,7 +887,7 @@
   "DE.Controllers.Main.warnProcessRightsChange": "You have been denied the right to edit the file.",
   "DE.Controllers.Navigation.txtBeginning": "Beginning of document",
   "DE.Controllers.Navigation.txtGotoBeginning": "Go to the beginning of the document",
-  "DE.Controllers.Statusbar.textDisconnect": "<b>Connection is lost</b><br>Please check connection settings.",
+  "DE.Controllers.Statusbar.textDisconnect": "<b>Connection is lost</b><br>Trying to connect. Please check connection settings.",
   "DE.Controllers.Statusbar.textHasChanges": "New changes have been tracked",
   "DE.Controllers.Statusbar.textSetTrackChanges": "You are in Track Changes mode",
   "DE.Controllers.Statusbar.textTrackChanges": "The document is opened with the Track Changes mode enabled",

apps/documenteditor/main/locale/ru.json

@@ -884,6 +884,7 @@
   "DE.Controllers.Statusbar.textTrackChanges": "Документ открыт при включенном режиме отслеживания изменений",
   "DE.Controllers.Statusbar.tipReview": "Отслеживать изменения",
   "DE.Controllers.Statusbar.zoomText": "Масштаб {0}%",
+  "DE.Controllers.Statusbar.textDisconnect": "<b>Соединение потеряно</b><br>Пытаемся восстановить соединение. Проверьте параметры подключения.",
   "DE.Controllers.Toolbar.confirmAddFontName": "Шрифт, который вы хотите сохранить, недоступен на этом устройстве.<br>Стиль текста будет отображаться с помощью одного из системных шрифтов. Сохраненный шрифт будет использоваться, когда он станет доступен.<br>Вы хотите продолжить?",
   "DE.Controllers.Toolbar.dataUrl": "Вставьте URL-адрес данных",
   "DE.Controllers.Toolbar.notcriticalErrorTitle": "Внимание",

apps/presentationeditor/main/app/controller/Statusbar.js

@@ -246,7 +246,8 @@ define([
                     text    : this.textDisconnect,
                     placement: 'top',
                     position: this.statusbar.isVisible() ? undefined : {bottom: 0},
-                    showLink: false
+                    showLink: false,
+                    style: 'max-width: 310px;'
                 });
                 this.disconnectTip.on({
                     'closeclick': function() {
@@ -264,7 +265,7 @@ define([
         },
 
         zoomText        : 'Zoom {0}%',
-        textDisconnect: '<b>Connection is lost</b><br>Please check connection settings.'
+        textDisconnect: '<b>Connection is lost</b><br>Trying to connect. Please check connection settings.'
 
     }, PE.Controllers.Statusbar || {}));
 });

apps/presentationeditor/main/locale/en.json

@@ -947,7 +947,7 @@
   "PE.Controllers.Main.warnNoLicense": "You've reached the limit for simultaneous connections to %1 editors. This document will be opened for viewing only.<br>Contact %1 sales team for personal upgrade terms.",
   "PE.Controllers.Main.warnNoLicenseUsers": "You've reached the user limit for %1 editors. Contact %1 sales team for personal upgrade terms.",
   "PE.Controllers.Main.warnProcessRightsChange": "You have been denied the right to edit the file.",
-  "PE.Controllers.Statusbar.textDisconnect": "<b>Connection is lost</b><br>Please check connection settings.",
+  "PE.Controllers.Statusbar.textDisconnect": "<b>Connection is lost</b><br>Trying to connect. Please check connection settings.",
   "PE.Controllers.Statusbar.zoomText": "Zoom {0}%",
   "PE.Controllers.Toolbar.confirmAddFontName": "The font you are going to save is not available on the current device.<br>The text style will be displayed using one of the system fonts, the saved font will be used when it is available.<br>Do you want to continue?",
   "PE.Controllers.Toolbar.textAccent": "Accents",

apps/spreadsheeteditor/main/app/controller/Statusbar.js

@@ -824,7 +824,8 @@ define([
                     text    : this.textDisconnect,
                     placement: 'top',
                     position: this.statusbar.isVisible() ? undefined : {bottom: 0},
-                    showLink: false
+                    showLink: false,
+                    style: 'max-width: 310px;'
                 });
                 this.disconnectTip.on({
                     'closeclick': function() {
@@ -848,6 +849,6 @@ define([
         strSheet        : 'Sheet',
         textSheetViewTip: 'You are in Sheet View mode. Filters and sorting are visible only to you and those who are still in this view.',
         textSheetViewTipFilters: 'You are in Sheet View mode. Filters are visible only to you and those who are still in this view.',
-        textDisconnect: '<b>Connection is lost</b><br>Please check connection settings.'
+        textDisconnect: '<b>Connection is lost</b><br>Trying to connect. Please check connection settings.'
     }, SSE.Controllers.Statusbar || {}));
 });

apps/spreadsheeteditor/main/app/view/FormatSettingsDialog.js

@@ -222,7 +222,8 @@ define([
                 editable: false,
                 data: [],
                 scrollAlwaysVisible: true,
-                takeFocusOnClose: true
+                takeFocusOnClose: true,
+                search: true
             });
             this.cmbSymbols.on('selected', _.bind(this.onSymbolsSelect, this));
 
@@ -321,7 +322,7 @@ define([
                 if (this._state.hasSeparator)
                     this.chSeparator.setValue(props.formatInfo.asc_getSeparator());
                 if (this._state.hasSymbols)
-                    this.cmbSymbols.setValue(props.formatInfo.asc_getSymbol());
+                    this.cmbSymbols.setValue(props.formatInfo.asc_getSymbol() || props.formatInfo.asc_getCurrencySymbol());
 
                 if (props.format) {
                     if (this._state.hasNegative) {
@@ -384,7 +385,7 @@ define([
             info.asc_setType(this.FormatType);
             info.asc_setDecimalPlaces(this.spnDecimal.getNumberValue());
             info.asc_setSeparator(false);
-            info.asc_setSymbol(record.value);
+            (typeof record.value === 'string') ? info.asc_setCurrencySymbol(record.value) : info.asc_setSymbol(record.value);
 
             var format = this.api.asc_getFormatCells(info),
                 data = [];
@@ -406,7 +407,11 @@ define([
             info.asc_setType(this.FormatType);
             info.asc_setDecimalPlaces(field.getNumberValue());
             info.asc_setSeparator((this.FormatType == Asc.c_oAscNumFormatType.Number) ? this.chSeparator.getValue()=='checked' : false);
-            info.asc_setSymbol((this.FormatType == Asc.c_oAscNumFormatType.Currency || this.FormatType == Asc.c_oAscNumFormatType.Accounting) ? this.cmbSymbols.getValue() : false);
+            if (this.FormatType == Asc.c_oAscNumFormatType.Currency || this.FormatType == Asc.c_oAscNumFormatType.Accounting) {
+                var value = this.cmbSymbols.getValue();
+                (typeof value === 'string') ? info.asc_setCurrencySymbol(value) : info.asc_setSymbol(value);
+            } else
+                info.asc_setSymbol(false);
 
             var format = this.api.asc_getFormatCells(info);
             if (this.FormatType == Asc.c_oAscNumFormatType.Number || this.FormatType == Asc.c_oAscNumFormatType.Currency || this.FormatType == Asc.c_oAscNumFormatType.Accounting) {
@@ -479,7 +484,7 @@ define([
                 me = this,
                 valDecimal = (initFormatInfo) ? initFormatInfo.asc_getDecimalPlaces() : this.spnDecimal.getNumberValue(),
                 valSeparator = (initFormatInfo) ? initFormatInfo.asc_getSeparator() : (this.chSeparator.getValue()=='checked'),
-                valSymbol = (initFormatInfo) ? initFormatInfo.asc_getSymbol() : this.langId;
+                valSymbol = (initFormatInfo) ? (initFormatInfo.asc_getSymbol() || initFormatInfo.asc_getCurrencySymbol()) : this.langId;
 
             if (record.value !== Asc.c_oAscNumFormatType.Custom) {
                 var info = new Asc.asc_CFormatCellsInfo();
@@ -503,6 +508,10 @@ define([
                                 return 0;
                             });
                             me.CurrencySymbolsData.unshift({value: null, displayValue: me.txtNone});
+                            symbolssarr = this.api.asc_getAdditionalCurrencySymbols();
+                            symbolssarr.forEach(function(item) {
+                                me.CurrencySymbolsData.push({value: item, displayValue: item});
+                            });
                             this.cmbSymbols.setData(this.CurrencySymbolsData);
                             this.cmbSymbols.setValue(valSymbol);
                         }

apps/spreadsheeteditor/main/locale/en.json

@@ -1072,7 +1072,7 @@
   "SSE.Controllers.Statusbar.errorLastSheet": "Workbook must have at least one visible worksheet.",
   "SSE.Controllers.Statusbar.errorRemoveSheet": "Cannot delete the worksheet.",
   "SSE.Controllers.Statusbar.strSheet": "Sheet",
-  "SSE.Controllers.Statusbar.textDisconnect": "<b>Connection is lost</b><br>Please check connection settings.",
+  "SSE.Controllers.Statusbar.textDisconnect": "<b>Connection is lost</b><br>Trying to connect. Please check connection settings.",
   "SSE.Controllers.Statusbar.textSheetViewTip": "You are in Sheet View mode. Filters and sorting are visible only to you and those who are still in this view.",
   "SSE.Controllers.Statusbar.textSheetViewTipFilters": "You are in Sheet View mode. Filters are visible only to you and those who are still in this view.",
   "SSE.Controllers.Statusbar.warnDeleteSheet": "The selected worksheets might contain data. Are you sure you want to proceed?",