Merge branch 'develop' into feature/sse-custom-sort

Readme.md

@@ -4,6 +4,10 @@
 
 The frontend for [ONLYOFFICE Document Server][2]. Builds the program interface and allows the user create, edit, save and export text, spreadsheet and presentation documents using the common interface of a document editor.
 
+## Previos versions
+
+Until 2019-10-23 the repository was called web-apps-pro
+
 ## Project Information
 
 Official website: [http://www.onlyoffice.org](http://onlyoffice.org "http://www.onlyoffice.org")

apps/api/documents/api.js

@@ -109,7 +109,8 @@
                     goback: {
                         url: 'http://...',
                         text: 'Go to London',
-                        blank: true
+                        blank: true,
+                        requestClose: false // if true - goback send onRequestClose event instead opening url
                     },
                     chat: true,
                     comments: true,
@@ -129,7 +130,8 @@
                     toolbarNoTabs: false,
                     toolbarHideFileName: false,
                     reviewDisplay: 'original',
-                    spellcheck: true
+                    spellcheck: true,
+                    compatibleFeatures: false
                 },
                 plugins: {
                     autostart: ['asc.{FFE1F462-1EA2-4391-990D-4CC84940B754}'],
@@ -730,17 +732,24 @@
             }
         }
 
+        var userAgent = navigator.userAgent.toLowerCase(),
+            check = function(regex){ return regex.test(userAgent); },
+            isIE = !check(/opera/) && (check(/msie/) || check(/trident/) || check(/edge/)),
+            isChrome = !isIE && check(/\bchrome\b/),
+            isSafari_mobile = !isIE && !isChrome && check(/safari/) && (navigator.maxTouchPoints>0);
+
         path += app + "/";
-        path += config.type === "mobile"
+        path += (config.type === "mobile" || isSafari_mobile)
             ? "mobile"
             : config.type === "embedded"
                 ? "embed"
                 : "main";
 
         var index = "/index.html";
-        if (config.editorConfig && config.editorConfig.targetApp!=='desktop') {
+        if (config.editorConfig) {
             var customization = config.editorConfig.customization;
-            if ( typeof(customization) == 'object' && (customization.loaderName || customization.loaderLogo)) {
+            if ( typeof(customization) == 'object' && ( customization.toolbarNoTabs ||
+                                                        (config.editorConfig.targetApp!=='desktop') && (customization.loaderName || customization.loaderLogo))) {
                 index = "/index_loader.html";
             }
         }
@@ -769,9 +778,19 @@
             }
         }
 
+        if (config.editorConfig && (config.editorConfig.mode == 'editdiagram' || config.editorConfig.mode == 'editmerge'))
+            params += "&internal=true";
+
         if (config.frameEditorId)
             params += "&frameEditorId=" + config.frameEditorId;
 
+        if (config.editorConfig && config.editorConfig.mode == 'view' ||
+            config.document && config.document.permissions && (config.document.permissions.edit === false && !config.document.permissions.review ))
+            params += "&mode=view";
+
+        if (config.editorConfig && config.editorConfig.customization && !!config.editorConfig.customization.compactHeader)
+            params += "&compact=true";
+
         return params;
     }
 
@@ -787,6 +806,7 @@
         iframe.allowFullscreen = true;
         iframe.setAttribute("allowfullscreen",""); // for IE11
         iframe.setAttribute("onmousewheel",""); // for Safari on Mac
+        iframe.setAttribute("allow", "autoplay");
         
 		if (config.type == "mobile")
 		{

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

@@ -710,7 +710,7 @@ define([
                 this.caption = caption;
 
                 if (this.rendered) {
-                    var captionNode = this.cmpEl.find('button:first > .caption').addBack().filter('button > .caption');
+                    var captionNode = this.cmpEl.find('.caption');
 
                     if (captionNode.length > 0) {
                         captionNode.text(caption);

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

@@ -0,0 +1,491 @@
+/*
+ *
+ * (c) Copyright Ascensio System SIA 2010-2019
+ *
+ * This program is a free software product. You can redistribute it and/or
+ * modify it under the terms of the GNU Affero General Public License (AGPL)
+ * version 3 as published by the Free Software Foundation. In accordance with
+ * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect
+ * that Ascensio System SIA expressly excludes the warranty of non-infringement
+ * of any third-party rights.
+ *
+ * This program is distributed WITHOUT ANY WARRANTY; without even the implied
+ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR  PURPOSE. For
+ * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html
+ *
+ * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha
+ * street, Riga, Latvia, EU, LV-1050.
+ *
+ * The  interactive user interfaces in modified source and object code versions
+ * of the Program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU AGPL version 3.
+ *
+ * Pursuant to Section 7(b) of the License you must retain the original Product
+ * logo when distributing the program. Pursuant to Section 7(e) we decline to
+ * grant you any rights under trademark law for use of our trademarks.
+ *
+ * All the Product's GUI elements, including illustrations and icon sets, as
+ * well as technical writing content are licensed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International. See the License
+ * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
+ *
+*/
+if (Common === undefined)
+    var Common = {};
+
+define([
+    'common/main/lib/component/BaseView',
+    'common/main/lib/util/utils'
+], function () {
+    'use strict';
+
+    Common.UI.Calendar = Common.UI.BaseView.extend(_.extend({
+
+        template    :
+            _.template([
+                '<div id="calendar" class="calendar-box">',
+                '<div class="calendar-header">',
+                '<div class="top-row">',
+                '<div id="prev-arrow"><button type="button"><i class="arrow-prev img-commonctrl">&nbsp;</i></button></div>',
+                '<div class="title"></div>',
+                '<div id="next-arrow"><button type="button"><i class="arrow-next img-commonctrl">&nbsp;</i></button></div>',
+                '</div>',
+                '<div class="bottom-row">',
+                '</div>',
+                '</div>',
+                '<div class="calendar-content"></div>',
+                '</div>'
+                ].join('')),
+
+        options: {
+            date: undefined,
+            firstday: 0 // 0 - sunday, 1 - monday
+        },
+
+        initialize : function(options) {
+            Common.UI.BaseView.prototype.initialize.call(this, options);
+
+            var me = this;
+
+            this.monthNames = [this.textJanuary, this.textFebruary, this.textMarch, this.textApril, this.textMay, this.textJune, this.textJuly, this.textAugust, this.textSeptember, this.textOctober, this.textNovember, this.textDecember];
+            this.dayNamesShort = [this.textShortSunday, this.textShortMonday, this.textShortTuesday, this.textShortWednesday, this.textShortThursday, this.textShortFriday, this.textShortSaturday];
+            this.monthShortNames = [this.textShortJanuary, this.textShortFebruary, this.textShortMarch, this.textShortApril, this.textShortMay, this.textShortJune, this.textShortJuly, this.textShortAugust, this.textShortSeptember, this.textShortOctober, this.textShortNovember, this.textShortDecember];
+
+            me.options.date = options.date;
+            if (!_.isUndefined(options.firstday) && (options.firstday === 0 || options.firstday === 1)) {
+                me.options.firstday = options.firstday;
+            }
+
+            me.enableKeyEvents= me.options.enableKeyEvents;
+
+            me._state = undefined; // 0 - month, 1 - months, 2 - years
+
+            me.render();
+        },
+
+        render: function () {
+            var me = this;
+            me.cmpEl = me.$el || $(this.el);
+            me.cmpEl.html(this.template());
+
+            me.currentDate = me.options.date || new Date();
+
+            me.btnPrev = new Common.UI.Button({
+                cls: '',
+                iconCls: 'arrow-prev img-commonctrl'
+            });
+            me.btnPrev.render(me.cmpEl.find('#prev-arrow'));
+            me.btnPrev.on('click', _.bind(me.onClickPrev, me));
+
+            me.btnNext = new Common.UI.Button({
+                cls: '',
+                iconCls: 'arrow-next img-commonctrl'
+            });
+            me.btnNext.render(me.cmpEl.find('#next-arrow'));
+            me.btnNext.on('click', _.bind(me.onClickNext, me));
+
+            me.cmpEl.on('keydown', function(e) {
+                me.trigger('calendar:keydown', me, e);
+            });
+
+            me.renderMonth(me.currentDate);
+
+            this.trigger('render:after', this);
+            return this;
+        },
+
+        onClickPrev: function () {
+            var me = this;
+            if (me._state === 0) {
+                var d = new Date(me.currentDate);
+                d.setMonth(d.getMonth() - 1);
+                if (d.getFullYear() > 0) {
+                    me.renderMonth(d);
+                }
+            } else if (me._state === 1) {
+                var d = new Date(me.currentDate);
+                d.setFullYear(d.getFullYear() - 1);
+                if (d.getFullYear() > 0) {
+                    me.renderMonths(d);
+                }
+            } else if (me._state === 2) {
+                var year = me.currentDate.getFullYear(),
+                    newYear;
+                if (year % 10 !== 0) {
+                    newYear = String(year);
+                    newYear = Number(newYear.slice(0, -1) + '0') - 1;
+                } else {
+                    newYear = year - 1;
+                }
+                if (newYear > 0) {
+                    me.currentDate.setFullYear(newYear);
+                    me.renderYears(newYear);
+                }
+            }
+        },
+
+        onClickNext: function () {
+            var me = this;
+            if (me._state === 0) {
+                var d = new Date(me.currentDate);
+                d.setMonth(d.getMonth() + 1);
+                if (d.getFullYear() > 0) {
+                    me.renderMonth(d);
+                }
+            } else if (me._state === 1) {
+                var d = new Date(me.currentDate);
+                d.setFullYear(d.getFullYear() + 1);
+                if (d.getFullYear() > 0) {
+                    me.renderMonths(d);
+                }
+            } else if (me._state === 2) {
+                var year = me.currentDate.getFullYear(),
+                    newYear;
+                if (year % 10 !== 9) {
+                    newYear = String(year);
+                    newYear = Number(newYear.slice(0, -1) + '9') + 1;
+                } else {
+                    newYear = year + 1;
+                }
+                if (newYear > 0) {
+                    me.currentDate.setFullYear(newYear);
+                    me.renderYears(newYear);
+                }
+            }
+        },
+
+        renderYears: function (year) {
+            var me = this,
+                year = _.isNumber(year) ? year : (me.currentDate ? me.currentDate.getFullYear() : new Date().getFullYear());
+
+            me._state = 2;
+
+            var firstYear = year,
+                lastYear = year;
+            if ((firstYear % 10) !== 0) {
+                var strYear = String(year);
+                firstYear = Number(strYear.slice(0, -1) + '0');
+            }
+            if ((lastYear % 10) !== 9) {
+                var strYear = String(year);
+                lastYear = Number(strYear.slice(0, -1) + '9');
+            }
+
+            me.topTitle = _.template([
+                '<label>' + firstYear + '-' + lastYear + '</label>'
+            ].join(''));
+            me.cmpEl.find('.calendar-header .title').html(me.topTitle);
+
+            me.bottomTitle = _.template([
+                '<label>' + me.textYears + '</label>'
+            ].join(''));
+            me.cmpEl.find('.calendar-header .bottom-row').html(me.bottomTitle);
+
+            var arrYears = [];
+            var tmpYear = firstYear - 3;
+
+            for (var i = 0; i < 16; i++) {
+                arrYears.push({
+                    year: (tmpYear > 0) ? tmpYear : '',
+                    isCurrentDecade: ((tmpYear >= firstYear) && (tmpYear <= lastYear)) ? true : false,
+                    disabled: (tmpYear > 0) ? false : true,
+                    selected: (_.isDate(me.selectedDate)) ?
+                        (tmpYear === me.selectedDate.getFullYear()) :
+                        (tmpYear === new Date().getFullYear())
+                });
+                tmpYear++;
+            }
+
+            if (!me.yearPicker) {
+                me.yearPicker = new Common.UI.DataView({
+                    el: me.cmpEl.find('.calendar-content'),
+                    store: new Common.UI.DataViewStore(arrYears),
+                    itemTemplate: _.template('<div class="name-year <% if (!isCurrentDecade) { %> no-current-decade <% } %>" data-year="<%= year %>"><%= year %></div>')
+                });
+                me.yearPicker.on('item:click', function (picker, item, record, e) {
+                    var year = record.get('year'),
+                        date = new Date();
+                    date.setFullYear(year);
+                    me.renderMonths(date);
+                });
+                me.enableKeyEvents && this.yearPicker.on('item:keydown', function(view, record, e) {
+                    if (e.keyCode==Common.UI.Keys.ESC) {
+                        Common.NotificationCenter.trigger('dataview:blur');
+                    }
+                });
+            } else
+                me.yearPicker.store.reset(arrYears);
+
+            me.enableKeyEvents && _.delay(function() {
+                me.monthPicker.cmpEl.find('.dataview').focus();
+            }, 10);
+        },
+
+        renderMonths: function (date) {
+            var me = this,
+                curDate = (_.isDate(date)) ? date : (me.currentDate ? me.currentDate : new Date()),
+                year = curDate.getFullYear();
+
+            me._state = 1;
+            me.currentDate = curDate;
+
+            // Number of year
+            me.topTitle = _.template([
+                '<div class="button"><label>' + year + '</label></div>'
+            ].join(''));
+            me.cmpEl.find('.calendar-header .title').html(me.topTitle);
+            me.cmpEl.find('.calendar-header .title').off();
+            me.cmpEl.find('.calendar-header .title').on('click', _.bind(me.renderYears, me));
+
+            me.bottomTitle = _.template([
+                '<label>' + me.textMonths + '</label>'
+            ].join(''));
+            me.cmpEl.find('.calendar-header .bottom-row').html(me.bottomTitle);
+
+            var arrMonths = [];
+            var today = new Date();
+
+            for (var ind = 0; ind < 12; ind++) {
+                arrMonths.push({
+                    indexMonth: ind,
+                    nameMonth: me.monthShortNames[ind],
+                    year: year,
+                    curYear: true,
+                    isCurrentMonth: (ind === curDate.getMonth()),
+                    selected: (_.isDate(me.selectedDate)) ?
+                        (ind === me.selectedDate.getMonth() && year === me.selectedDate.getFullYear()) :
+                        (ind === today.getMonth() && year === today.getFullYear())
+                });
+            }
+            year = year + 1;
+            for (var ind = 0; ind < 4; ind++) {
+                arrMonths.push({
+                    indexMonth: ind,
+                    nameMonth: me.monthShortNames[ind],
+                    year: year,
+                    curYear: false,
+                    selected: (_.isDate(me.selectedDate)) ?
+                        (ind === me.selectedDate.getMonth() && year === me.selectedDate.getFullYear()) :
+                        (ind === today.getMonth() && year === today.getFullYear())
+                });
+            }
+
+            if (!me.monthsPicker) {
+                me.monthsPicker = new Common.UI.DataView({
+                    el: me.cmpEl.find('.calendar-content'),
+                    store: new Common.UI.DataViewStore(arrMonths),
+                    itemTemplate: _.template('<div class="name-month <% if (!curYear) { %> no-cur-year <% } %>" data-month="<%= indexMonth %>" data-year="<%= year %>"><%= nameMonth %></div>')
+                });
+                me.monthsPicker.on('item:click', function (picker, item, record, e) {
+                    var month = record.get('indexMonth'),
+                        year = record.get('year'),
+                        date = new Date();
+                    date.setFullYear(year, month);
+                    me.renderMonth(date);
+                });
+                me.enableKeyEvents && this.monthsPicker.on('item:keydown', function(view, record, e) {
+                    if (e.keyCode==Common.UI.Keys.ESC) {
+                        Common.NotificationCenter.trigger('dataview:blur');
+                    }
+                });
+            } else
+                me.monthsPicker.store.reset(arrMonths);
+
+            me.enableKeyEvents && _.delay(function() {
+                me.monthPicker.cmpEl.find('.dataview').focus();
+            }, 10);
+        },
+
+        renderMonth: function (date) {
+            var me = this;
+            me._state = 0;
+            var firstDay = me.options.firstday;
+
+            // Current date
+            var curDate = date || new Date(),
+                curMonth = curDate.getMonth(),
+                curIndexDayInWeek = curDate.getDay(),
+                curNumberDayInMonth = curDate.getDate(),
+                curYear = curDate.getFullYear();
+
+            me.currentDate = curDate;
+
+            // Name month
+            me.topTitle = _.template([
+                '<div class="button">',
+                '<label>' + me.monthNames[curMonth] + ' ' + curYear + '</label>',
+                '</div>'
+            ].join(''));
+            me.cmpEl.find('.calendar-header .title').html(me.topTitle);
+            me.cmpEl.find('.calendar-header .title').off();
+            me.cmpEl.find('.calendar-header .title').on('click', _.bind(me.renderMonths, me));
+
+            // Name days of week
+            var dayNamesTemplate = '';
+            for (var i = firstDay; i < 7; i++) {
+                dayNamesTemplate += '<label>' + me.dayNamesShort[i] + '</label>';
+            }
+            if (firstDay > 0) {
+                dayNamesTemplate += '<label>' + me.dayNamesShort[0] + '</label>';
+            }
+            me.cmpEl.find('.calendar-header .bottom-row').html(_.template(dayNamesTemplate));
+
+            // Month
+            var rows = 6,
+                cols = 7;
+
+            var arrDays = [];
+
+            var d = new Date(curDate);
+            d.setDate(1);
+            var firstDayOfMonthIndex = d.getDay();
+
+            var daysInPrevMonth = me.daysInMonth(d.getTime() - (10 * 24 * 60 * 60 * 1000)),
+                numberDay,
+                month,
+                year;
+            if (firstDay === 0) {
+                numberDay = (firstDayOfMonthIndex > 0) ? (daysInPrevMonth - (firstDayOfMonthIndex - 1)) : 1;
+            } else {
+                if (firstDayOfMonthIndex === 0) {
+                    numberDay = daysInPrevMonth - 5;
+                } else {
+                    numberDay = daysInPrevMonth - (firstDayOfMonthIndex - 2);
+                }
+            }
+            if ((firstDayOfMonthIndex > 0 && firstDay === 0) || firstDay === 1) {
+                if (curMonth - 1 >= 0) {
+                    month = curMonth - 1;
+                    year = curYear;
+                } else {
+                    month = 11;
+                    year = curYear - 1;
+                }
+            } else {
+                month = curMonth;
+                year = curYear;
+            }
+
+            var tmp = new Date();
+            tmp.setFullYear(year, month, numberDay);
+            var today = new Date();
+
+            for(var r = 0; r < rows; r++) {
+                for(var c = 0; c < cols; c++) {
+                    var tmpDay = tmp.getDay(),
+                        tmpNumber = tmp.getDate(),
+                        tmpMonth = tmp.getMonth(),
+                        tmpYear = tmp.getFullYear();
+                    arrDays.push({
+                        indexInWeek: tmpDay,
+                        dayNumber: tmpNumber,
+                        month: tmpMonth,
+                        year: tmpYear,
+                        isCurrentMonth: tmpMonth === curMonth,
+                        selected: (_.isDate(me.selectedDate)) ?
+                            (tmpNumber === me.selectedDate.getDate() && tmpMonth === me.selectedDate.getMonth() && tmpYear === me.selectedDate.getFullYear()) :
+                            (tmpNumber === today.getDate() && tmpMonth === today.getMonth() && tmpYear === today.getFullYear())
+                    });
+                    tmp.setDate(tmpNumber + 1);
+                }
+            }
+
+            if (!me.monthPicker) {
+                me.monthPicker = new Common.UI.DataView({
+                    el: me.cmpEl.find('.calendar-content'),
+                    store: new Common.UI.DataViewStore(arrDays),
+                    itemTemplate: _.template('<div class="number-day<% if (indexInWeek === 6 || indexInWeek === 0) { %> weekend<% } %><% if (!isCurrentMonth) { %> no-current-month<% } %>" data-number="<%= dayNumber %>" data-month="<%= month %>" data-year="<%= year %>"><%= dayNumber %></div>')
+                });
+                me.monthPicker.on('item:click', function(picker, item, record, e) {
+                    var day = record.get('dayNumber'),
+                        month = record.get('month'),
+                        year = record.get('year');
+                    if (_.isUndefined(me.selectedDate)) {
+                        me.selectedDate = new Date();
+                    }
+                    me.selectedDate.setFullYear(year, month, day);
+                    me.trigger('date:click', me, me.selectedDate);
+                });
+                me.enableKeyEvents && this.monthPicker.on('item:keydown', function(view, record, e) {
+                    if (e.keyCode==Common.UI.Keys.ESC) {
+                        Common.NotificationCenter.trigger('dataview:blur');
+                    }
+                });
+            } else
+                me.monthPicker.store.reset(arrDays);
+
+            me.enableKeyEvents && _.delay(function() {
+                me.monthPicker.cmpEl.find('.dataview').focus();
+            }, 10);
+        },
+
+        daysInMonth: function (date) {
+            var d;
+            d = date ? new Date(date) : new Date();
+            var result = new Date();
+            result.setFullYear(d.getFullYear(), d.getMonth() + 1, 0);
+            return result.getDate();
+        },
+
+        setDate: function (date) {
+            if (_.isDate(date)) {
+                this.selectedDate = new Date(date);
+                this.renderMonth(this.selectedDate);
+            }
+        },
+
+        textJanuary: 'January',
+        textFebruary: 'February',
+        textMarch: 'March',
+        textApril: 'April',
+        textMay: 'May',
+        textJune: 'June',
+        textJuly: 'July',
+        textAugust: 'August',
+        textSeptember: 'September',
+        textOctober: 'October',
+        textNovember: 'November',
+        textDecember: 'December',
+        textShortJanuary: 'Jan',
+        textShortFebruary: 'Feb',
+        textShortMarch: 'Mar',
+        textShortApril: 'Apr',
+        textShortMay: 'May',
+        textShortJune: 'Jun',
+        textShortJuly: 'Jul',
+        textShortAugust: 'Aug',
+        textShortSeptember: 'Sep',
+        textShortOctober: 'Oct',
+        textShortNovember: 'Nov',
+        textShortDecember: 'Dec',
+        textShortSunday: 'Su',
+        textShortMonday: 'Mo',
+        textShortTuesday: 'Tu',
+        textShortWednesday: 'We',
+        textShortThursday: 'Th',
+        textShortFriday: 'Fr',
+        textShortSaturday: 'Sa',
+        textMonths: 'Months',
+        textYears: 'Years'
+    }, Common.UI.Calendar || {}));
+});

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

@@ -311,11 +311,13 @@ define([
 
                 if ($selected.length) {
                     var itemTop = $selected.position().top,
-                        itemHeight = $selected.height(),
+                        itemHeight = $selected.outerHeight(),
-                        listHeight = $list.height();
+                        listHeight = $list.outerHeight();
 
                     if (itemTop < 0 || itemTop + itemHeight > listHeight) {
-                        $list.scrollTop($list.scrollTop() + itemTop + itemHeight - (listHeight/2));
+                        var height = $list.scrollTop() + itemTop + (itemHeight - listHeight)/2;
+                        height = (Math.floor(height/itemHeight) * itemHeight);
+                        $list.scrollTop(height);
                     }
                     setTimeout(function(){$selected.find('a').focus();}, 1);
                 }
@@ -400,10 +402,12 @@ define([
                         this.scroller.update({alwaysVisibleY: this.scrollAlwaysVisible});
                         var $list = $(this.el).find('ul');
                         var itemTop = item.position().top,
-                            itemHeight = item.height(),
+                            itemHeight = item.outerHeight(),
-                            listHeight = $list.height();
+                            listHeight = $list.outerHeight();
                         if (itemTop < 0 || itemTop + itemHeight > listHeight) {
-                            $list.scrollTop($list.scrollTop() + itemTop + itemHeight - (listHeight/2));
+                            var height = $list.scrollTop() + itemTop;
+                            height = (Math.floor(height/itemHeight) * itemHeight);
+                            $list.scrollTop(height);
                         }
                     }
                     item.focus();

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

@@ -430,7 +430,7 @@ define([
             },
 
             addItemToRecent: function(record, silent) {
-                if (this.recent<1) return;
+                if (!record || this.recent<1) return;
 
                 var font = this.store.findWhere({name: record.get('name'),type:FONT_TYPE_RECENT});
                 font && this.store.remove(font);

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

@@ -47,31 +47,6 @@ define([
     'use strict';
 
     Common.UI.DimensionPicker = Common.UI.BaseView.extend((function(){
-        var me,
-            rootEl,
-            areaMouseCatcher,
-            areaUnHighLighted,
-            areaHighLighted,
-            areaStatus,
-            curColumns = 0,
-            curRows = 0;
-
-        var onMouseMove = function(event){
-            me.setTableSize(
-                Math.ceil((event.offsetX === undefined ? event.originalEvent.layerX : event.offsetX*Common.Utils.zoom()) / me.itemSize),
-                Math.ceil((event.offsetY === undefined ? event.originalEvent.layerY : event.offsetY*Common.Utils.zoom()) / me.itemSize),
-                event
-            );
-        };
-
-        var onMouseLeave = function(event){
-            me.setTableSize(0, 0, event);
-        };
-
-        var onHighLightedMouseClick = function(e){
-            me.trigger('select', me, curColumns, curRows, e);
-        };
-
         return {
             options: {
                 itemSize    : 18,
@@ -95,9 +70,13 @@ define([
             initialize : function(options) {
                 Common.UI.BaseView.prototype.initialize.call(this, options);
 
-                me = this;
+                var me = this;
 
-                rootEl = me.$el || $(this.el);
+                this.render();
+
+                this.cmpEl = me.$el || $(this.el);
+
+                var rootEl = this.cmpEl;
 
                 me.itemSize    = me.options.itemSize;
                 me.minRows     = me.options.minRows;
@@ -105,31 +84,48 @@ define([
                 me.maxRows     = me.options.maxRows;
                 me.maxColumns  = me.options.maxColumns;
 
-                this.render();
+                me.curColumns = 0;
+                me.curRows = 0;
+
+                var onMouseMove = function(event){
+                    me.setTableSize(
+                        Math.ceil((event.offsetX === undefined ? event.originalEvent.layerX : event.offsetX*Common.Utils.zoom()) / me.itemSize),
+                        Math.ceil((event.offsetY === undefined ? event.originalEvent.layerY : event.offsetY*Common.Utils.zoom()) / me.itemSize),
+                        event
+                    );
+                };
+
+                var onMouseLeave = function(event){
+                    me.setTableSize(0, 0, event);
+                };
+
+                var onHighLightedMouseClick = function(e){
+                    me.trigger('select', me, me.curColumns, me.curRows, e);
+                };
 
                 if (rootEl){
-                    areaMouseCatcher    = rootEl.find('.dimension-picker-mousecatcher');
+                    var areaMouseCatcher    = rootEl.find('.dimension-picker-mousecatcher');
-                    areaUnHighLighted   = rootEl.find('.dimension-picker-unhighlighted');
+                    me.areaUnHighLighted   = rootEl.find('.dimension-picker-unhighlighted');
-                    areaHighLighted     = rootEl.find('.dimension-picker-highlighted');
+                    me.areaHighLighted     = rootEl.find('.dimension-picker-highlighted');
-                    areaStatus          = rootEl.find('.dimension-picker-status');
+                    me.areaStatus          = rootEl.find('.dimension-picker-status');
 
                     rootEl.css({width: me.minColumns + 'em'});
                     areaMouseCatcher.css('z-index', 1);
                     areaMouseCatcher.width(me.maxColumns + 'em').height(me.maxRows + 'em');
-                    areaUnHighLighted.width(me.minColumns + 'em').height(me.minRows + 'em');
+                    me.areaUnHighLighted.width(me.minColumns + 'em').height(me.minRows + 'em');
-                    areaStatus.html(curColumns + ' x ' + curRows);
+                    me.areaStatus.html(me.curColumns + ' x ' + me.curRows);
-                    areaStatus.width(areaUnHighLighted.width());
+                    me.areaStatus.width(me.areaUnHighLighted.width());
-                }
 
                     areaMouseCatcher.on('mousemove', onMouseMove);
-                areaHighLighted.on('mousemove', onMouseMove);
+                    me.areaHighLighted.on('mousemove', onMouseMove);
-                areaUnHighLighted.on('mousemove', onMouseMove);
+                    me.areaUnHighLighted.on('mousemove', onMouseMove);
                     areaMouseCatcher.on('mouseleave', onMouseLeave);
-                areaHighLighted.on('mouseleave', onMouseLeave);
+                    me.areaHighLighted.on('mouseleave', onMouseLeave);
-                areaUnHighLighted.on('mouseleave', onMouseLeave);
+                    me.areaUnHighLighted.on('mouseleave', onMouseLeave);
                     areaMouseCatcher.on('click', onHighLightedMouseClick);
-                areaHighLighted.on('click', onHighLightedMouseClick);
+                    me.areaHighLighted.on('click', onHighLightedMouseClick);
-                areaUnHighLighted.on('click', onHighLightedMouseClick);
+                    me.areaUnHighLighted.on('click', onHighLightedMouseClick);
+                }
             },
 
             render: function() {
@@ -142,38 +138,38 @@ define([
                 if (columns > this.maxColumns)  columns = this.maxColumns;
                 if (rows > this.maxRows)        rows = this.maxRows;
 
-                if (curColumns != columns || curRows != rows){
+                if (this.curColumns != columns || this.curRows != rows){
-                    curColumns  = columns;
+                    this.curColumns  = columns;
-                    curRows     = rows;
+                    this.curRows     = rows;
 
-                    areaHighLighted.width(curColumns + 'em').height(curRows + 'em');
+                    this.areaHighLighted.width(this.curColumns + 'em').height(this.curRows + 'em');
-                    areaUnHighLighted.width(
+                    this.areaUnHighLighted.width(
-                        ((curColumns < me.minColumns)
+                        ((this.curColumns < this.minColumns)
-                            ? me.minColumns
+                            ? this.minColumns
-                            : ((curColumns + 1 > me.maxColumns)
+                            : ((this.curColumns + 1 > this.maxColumns)
-                            ? me.maxColumns
+                            ? this.maxColumns
-                            : curColumns + 1)) + 'em'
+                            : this.curColumns + 1)) + 'em'
-                    ).height(((curRows < me.minRows)
+                    ).height(((this.curRows < this.minRows)
-                            ? me.minRows
+                            ? this.minRows
-                            : ((curRows + 1 > me.maxRows)
+                            : ((this.curRows + 1 > this.maxRows)
-                            ? me.maxRows
+                            ? this.maxRows
-                            : curRows + 1)) + 'em'
+                            : this.curRows + 1)) + 'em'
                     );
 
-                    rootEl.width(areaUnHighLighted.width());
+                    this.cmpEl.width(this.areaUnHighLighted.width());
-                    areaStatus.html(curColumns + ' x ' + curRows);
+                    this.areaStatus.html(this.curColumns + ' x ' + this.curRows);
-                    areaStatus.width(areaUnHighLighted.width());
+                    this.areaStatus.width(this.areaUnHighLighted.width());
 
-                    me.trigger('change', me, curColumns, curRows, event);
+                    this.trigger('change', this, this.curColumns, this.curRows, event);
                 }
             },
 
             getColumnsCount: function() {
-                return curColumns;
+                return this.curColumns;
             },
 
             getRowsCount: function() {
-                return curRows;
+                return this.curRows;
             }
         }
     })())

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

@@ -380,15 +380,23 @@ define([
             onAfterShowMenu: function(e) {
                 this.trigger('show:after', this, e);
                 if (this.scroller) {
-                    this.scroller.update({alwaysVisibleY: this.scrollAlwaysVisible});
+                    var menuRoot = this.menuRoot;
-                    var menuRoot = this.menuRoot,
+                    if (this.wheelSpeed===undefined) {
-                        $selected = menuRoot.find('> li .checked');
+                        var item = menuRoot.find('> li:first'),
+                            itemHeight = (item.length) ? item.outerHeight() : 1;
+                        this.wheelSpeed = Math.min((Math.floor(menuRoot.height()/itemHeight) * itemHeight)/10, 20);
+                    }
+                    this.scroller.update({alwaysVisibleY: this.scrollAlwaysVisible, wheelSpeed: this.wheelSpeed});
+
+                    var $selected = menuRoot.find('> li .checked');
                     if ($selected.length) {
                         var itemTop = $selected.position().top,
-                            itemHeight = $selected.height(),
+                            itemHeight = $selected.outerHeight(),
-                            listHeight = menuRoot.height();
+                            listHeight = menuRoot.outerHeight();
                         if (itemTop < 0 || itemTop + itemHeight > listHeight) {
-                            menuRoot.scrollTop(menuRoot.scrollTop() + itemTop + itemHeight - (listHeight/2));
+                            var height = menuRoot.scrollTop() + itemTop + (itemHeight - listHeight)/2;
+                            height = (Math.floor(height/itemHeight) * itemHeight);
+                            menuRoot.scrollTop(height);
                         }
                         setTimeout(function(){$selected.focus();}, 1);
                     }
@@ -469,12 +477,14 @@ define([
                     this._search.index = idxCandidate;
                     var item = itemCandidate.cmpEl.find('a');
                     if (this.scroller) {
-                        this.scroller.update({alwaysVisibleY: this.scrollAlwaysVisible});
+                        this.scroller.update({alwaysVisibleY: this.scrollAlwaysVisible, wheelSpeed: this.wheelSpeed});
                         var itemTop = item.position().top,
-                            itemHeight = item.height(),
+                            itemHeight = item.outerHeight(),
-                            listHeight = this.menuRoot.height();
+                            listHeight = this.menuRoot.outerHeight();
                         if (itemTop < 0 || itemTop + itemHeight > listHeight) {
-                            this.menuRoot.scrollTop(this.menuRoot.scrollTop() + itemTop + itemHeight - (listHeight/2));
+                            var height = this.menuRoot.scrollTop() + itemTop;
+                            height = (Math.floor(height/itemHeight) * itemHeight);
+                            this.menuRoot.scrollTop(height);
                         }
                     }
                     item.focus();
@@ -552,8 +562,10 @@ define([
                                 suppressScrollX: true,
                                 alwaysVisibleY: this.scrollAlwaysVisible
                             }));
+                            this.wheelSpeed = undefined;
                         } else if ( top + menuH < docH && menuRoot.height() < this.options.restoreHeight) {
                             menuRoot.css('max-height', (Math.min(docH - top, this.options.restoreHeight)) + 'px');
+                            this.wheelSpeed = undefined;
                         }
                     }
                 } else {
@@ -568,7 +580,6 @@ define([
                     if (top < 0)
                         top = 0;
                 }
-
                 if (this.options.additionalAlign)
                     this.options.additionalAlign.call(this, menuRoot, left, top);
                 else
@@ -848,10 +859,12 @@ define([
                     $selected = menuRoot.find('> li .checked');
                 if ($selected.length) {
                     var itemTop = $selected.position().top,
-                        itemHeight = $selected.height(),
+                        itemHeight = $selected.outerHeight(),
-                        listHeight = menuRoot.height();
+                        listHeight = menuRoot.outerHeight();
                     if (itemTop < 0 || itemTop + itemHeight > listHeight) {
-                        menuRoot.scrollTop(menuRoot.scrollTop() + itemTop + itemHeight - (listHeight/2));
+                        var height = menuRoot.scrollTop() + itemTop + (itemHeight - listHeight)/2;
+                        height = (Math.floor(height/itemHeight) * itemHeight);
+                        menuRoot.scrollTop(height);
                     }
                     setTimeout(function(){$selected.focus();}, 1);
                 }
@@ -936,10 +949,12 @@ define([
                 if (this.scroller) {
                     this.scroller.update({alwaysVisibleY: this.scrollAlwaysVisible});
                     var itemTop = item.position().top,
-                        itemHeight = item.height(),
+                        itemHeight = item.outerHeight(),
-                        listHeight = this.menuRoot.height();
+                        listHeight = this.menuRoot.outerHeight();
                     if (itemTop < 0 || itemTop + itemHeight > listHeight) {
-                        this.menuRoot.scrollTop(this.menuRoot.scrollTop() + itemTop + itemHeight - (listHeight/2));
+                        var height = this.menuRoot.scrollTop() + itemTop;
+                        height = (Math.floor(height/itemHeight) * itemHeight);
+                        this.menuRoot.scrollTop(height);
                     }
                 }
                 item.focus();

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

@@ -159,11 +159,21 @@ define([
             me.changeSliderStyle();
         },
 
+        addNewThumb: function(index, color) {
+            var me = this;
+            me.thumbs[index].thumbcolor = me.thumbs[index].thumb.find('> div');
+            (index>0) && this.setColorValue(color, index);
+            me.sortThumbs();
+            me.changeSliderStyle();
+            me.changeGradientStyle();
+        },
+
         removeThumb: function(index) {
             if (index===undefined) index = this.thumbs.length-1;
-            if (index>0) {
+            if (this.thumbs.length > 2) {
                 this.thumbs[index].thumb.remove();
                 this.thumbs.splice(index, 1);
+                this.sortThumbs();
                 this.changeSliderStyle();
             }
         },

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

@@ -347,17 +347,28 @@ define([
                     pos = Math.max(0, Math.min(100, position)),
                     value = pos/me.delta + me.minValue;
 
+                if (me.isRemoveThumb) {
+                    if (me.thumbs.length < 3) {
+                        $(document).off('mouseup', me.binding.onMouseUp);
+                        $(document).off('mousemove', me.binding.onMouseMove);
+                        return;
+                    }
+                    me.trigger('removethumb', me, _.findIndex(me.thumbs, {index: index}));
+                    me.trigger('changecomplete', me, value, lastValue);
+                } else {
                     me.setThumbPosition(index, pos);
                     me.thumbs[index].value = value;
 
                     if (need_sort)
                         me.sortThumbs();
+                }
 
                 $(document).off('mouseup', me.binding.onMouseUp);
                 $(document).off('mousemove', me.binding.onMouseMove);
 
                 me._dragstart = undefined;
-                me.trigger('changecomplete', me, value, lastValue);
+                !me.isRemoveThumb && me.trigger('changecomplete', me, value, lastValue);
+                me.isRemoveThumb = undefined;
             };
 
             var onMouseMove = function (e) {
@@ -382,6 +393,10 @@ define([
                 if (need_sort)
                     me.sortThumbs();
 
+                var positionY = e.pageY*Common.Utils.zoom() - me.cmpEl.offset().top;
+                me.isRemoveThumb = positionY > me.cmpEl.height() || positionY < 0;
+                me.setRemoveThumb(index, me.isRemoveThumb);
+
                 if (Math.abs(value-lastValue)>0.001)
                     me.trigger('change', me, value, lastValue);
             };
@@ -403,7 +418,25 @@ define([
                 $(document).on('mousemove', null, e.data, me.binding.onMouseMove);
             };
 
-            var onTrackMouseDown = function (e) {
+            var onTrackMouseUp = function (e) {
+                if ( me.disabled || !_.isUndefined(me._dragstart) || me.thumbs.length > 9) return;
+
+                var pos = Math.max(0, Math.min(100, (Math.round((e.pageX*Common.Utils.zoom() - me.cmpEl.offset().left) / me.width * 100)))),
+                    nearIndex = findThumb(pos),
+                    thumbColor = me.thumbs[nearIndex].colorValue,
+                    thumbValue = me.thumbs[nearIndex].value,
+                    value = pos/me.delta + me.minValue;
+                me.addThumb();
+                var index = me.thumbs.length - 1;
+                me.setThumbPosition(index, pos);
+                me.thumbs[index].value = value;
+                me.trigger('addthumb', me, index, nearIndex, thumbColor);
+
+                me.trigger('change', me);
+                me.trigger('changecomplete', me);
+            };
+
+            /*var onTrackMouseDown = function (e) {
                 if ( me.disabled ) return;
 
                 var pos = Math.max(0, Math.min(100, (Math.round((e.pageX*Common.Utils.zoom() - me.cmpEl.offset().left) / me.width * 100)))),
@@ -416,7 +449,7 @@ define([
 
                 me.trigger('change', me, value, lastValue);
                 me.trigger('changecomplete', me, value, lastValue);
-            };
+            };*/
 
             var findThumb = function(pos) {
                 var nearest = 100,
@@ -462,7 +495,8 @@ define([
             me.setActiveThumb(0, true);
 
             if (!me.rendered) {
-                el.on('mousedown', '.track', onTrackMouseDown);
+                /*el.on('mousedown', '.track', onTrackMouseDown);*/
+                el.on('mouseup', '.track', onTrackMouseUp);
             }
 
             me.rendered = true;
@@ -472,11 +506,23 @@ define([
 
         setActiveThumb: function(index, suspend) {
             this.currentThumb = index;
+            this.$thumbs = this.cmpEl.find('.thumb');
             this.$thumbs.removeClass('active');
             this.thumbs[index].thumb.addClass('active');
             if (suspend!==true) this.trigger('thumbclick', this, index);
         },
 
+        setRemoveThumb: function(index, remove) {
+            var ind = _.findIndex(this.thumbs, {index: index});
+            if (ind !== -1) {
+                if (remove && this.thumbs.length > 2) {
+                    this.$el.find('.active').addClass('remove');
+                } else {
+                    this.$el.find('.remove').removeClass('remove');
+                }
+            }
+        },
+
         setThumbPosition: function(index, x) {
             this.thumbs[index].position = x;
             this.thumbs[index].thumb.css({left: x + '%'});

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

@@ -51,7 +51,7 @@ define([
         this.active     = false;
         this.label      = 'Tab';
         this.cls        = '';
-        this.template   = _.template(['<li class="<% if(active){ %>active<% } %> <% if(cls.length){%><%= cls %><%}%>" data-label="<%= label %>">',
+        this.template   = _.template(['<li class="<% if(active){ %>active selected<% } %> <% if(cls.length){%><%= cls %><%}%>" data-label="<%= label %>">',
                                             '<a><%- label %></a>',
                                         '</li>'].join(''));
 
@@ -82,6 +82,10 @@ define([
                 this.$el.addClass('active');
         },
 
+        isSelected: function() {
+            return this.$el.hasClass('selected');
+        },
+
         deactivate: function(){
             this.$el.removeClass('active');
         },
@@ -110,6 +114,11 @@ define([
                 this.$el.removeClass(cls);
         },
 
+        toggleClass: function(cls) {
+            if (cls.length)
+                this.$el.toggleClass(cls);
+        },
+
         hasClass: function(cls) {
             return this.$el.hasClass(cls);
         },

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

@@ -69,12 +69,28 @@ define([
     };
 
     StateManager.prototype.attach = function (tab) {
-        tab.changeState = $.proxy(function () {
+        tab.changeState = $.proxy(function (select) {
+            if (select) {
+                tab.toggleClass('selected');
+                var selectTab = _.find(this.bar.selectTabs, function (item) {return item.sheetindex === tab.sheetindex;});
+                if (selectTab) {
+                    this.bar.selectTabs = _.without(this.bar.selectTabs, selectTab);
+                } else {
+                    this.bar.selectTabs.push(tab);
+                }
+            } else {
+                if (!tab.isSelected()) {
+                    this.bar.$el.find('ul > li.selected').removeClass('selected');
+                    tab.addClass('selected');
+                    this.bar.selectTabs.length = 0;
+                    this.bar.selectTabs.push(tab);
+                }
                 this.trigger('tab:change', tab);
                 this.bar.$el.find('ul > li.active').removeClass('active');
                 tab.activate();
 
                 this.bar.trigger('tab:changed', this.bar, this.bar.tabs.indexOf(tab), tab);
+            }
         }, this);
 
         var dragHelper = new (function() {
@@ -87,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       = [];
@@ -97,6 +115,8 @@ define([
                             this.bounds.push(me.bar.tabs[i].$el.get(0).getBoundingClientRect());
                         }
 
+                        me.lastTabRight = me.bounds[length - 1].right;
+
                         me.tabBarLeft   = me.bounds[0].left;
                         me.tabBarRight  = me.bounds[length - 1].right;
                         me.tabBarRight  = Math.min(me.tabBarRight, barBounds.right - 1);
@@ -278,33 +298,125 @@ define([
                             document.removeEventListener('dragstart',dragDropText);
                         });
                     }
+                },
+
+                setHookTabs: function (e, bar, tabs) {
+                    var me = this;
+                    function dragComplete() {
+                        if (!_.isUndefined(me.drag)) {
+                            bar.dragging = false;
+                            bar.$el.find('li.mousemove').removeClass('mousemove right');
+                            var arrSelectIndex = [];
+                            tabs.forEach(function (item) {
+                                arrSelectIndex.push(item.sheetindex);
+                            });
+                            if (!_.isUndefined(me.drag.place)) {
+                                me.bar.trigger('tab:move', arrSelectIndex, me.drag.place);
+                                me.bar.$bar.scrollLeft(me.scrollLeft);
+                                me.bar.scrollX = undefined;
+                            } else {
+                                me.bar.trigger('tab:move', arrSelectIndex);
+                                me.bar.$bar.scrollLeft(me.scrollLeft);
+                                me.bar.scrollX = undefined;
+                            }
+
+                            me.drag  = undefined;
+                        }
+                    }
+                    function dragMove (event) {
+                        if (!_.isUndefined(me.drag)) {
+                            me.drag.moveX = event.clientX*Common.Utils.zoom();
+                           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) {
+                                    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 && 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) {
+                        me.bar      = bar;
+                        me.drag     = {tabs: tabs};
+                        bar.dragging = true;
+                        this.calculateBounds();
+
+                        $(document).on('mousemove.tabbar', dragMove);
+                        $(document).on('mouseup.tabbar', function (e) {
+                            dragComplete(e);
+                            $(document).off('mouseup.tabbar');
+                            $(document).off('mousemove.tabbar', dragMove);
+                        });
+                    }
                 }
             }
         });
 
         tab.$el.on({
-            click: $.proxy(function () {
+            click: $.proxy(function (event) {
-                if (!tab.disabled && !tab.$el.hasClass('active')) {
+                if (!tab.disabled) {
+                    if (event.ctrlKey || event.metaKey) {
+                        if (!tab.isActive()) {
+                            tab.changeState(true);
+                        }
+                    } else if (event.shiftKey) {
+                        this.bar.$el.find('ul > li.selected').removeClass('selected');
+                        this.bar.selectTabs.length = 0;
+                        var $active = this.bar.$el.find('ul > li.active'),
+                            indexAct = $active.index(),
+                            indexCur = this.bar.tabs.indexOf(tab);
+                        var startIndex = (indexCur > indexAct) ? indexAct : indexCur,
+                            endIndex = (indexCur > indexAct) ? indexCur : indexAct;
+                        for (var i = startIndex; i <= endIndex; i++) {
+                            this.bar.tabs[i].changeState(true);
+                        }
+                    } else if (!tab.$el.hasClass('active')) {
+                        if (this.bar.tabs.length === this.bar.selectTabs.length) {
+                            this.bar.$el.find('ul > li.selected').removeClass('selected');
+                            this.bar.selectTabs.length = 0;
+                        }
                         if (tab.control == 'manual') {
                             this.bar.trigger('tab:manual', this.bar, this.bar.tabs.indexOf(tab), tab);
                         } else {
                             tab.changeState();
                         }
                     }
+                }
                 !tab.disabled && Common.NotificationCenter.trigger('edit:complete', this.bar);
             }, this),
             dblclick: $.proxy(function() {
                 this.trigger('tab:dblclick', this, this.tabs.indexOf(tab), tab);
             }, this.bar),
             contextmenu: $.proxy(function () {
-                this.trigger('tab:contextmenu', this, this.tabs.indexOf(tab), tab);
+                this.trigger('tab:contextmenu', this, this.tabs.indexOf(tab), tab, this.selectTabs);
             }, this.bar),
             mousedown: $.proxy(function (e) {
                 if (this.bar.options.draggable && !_.isUndefined(dragHelper) && (3 !== e.which)) {
                     if (!tab.isLockTheDrag) {
+                        if (this.bar.selectTabs.length > 1) {
+                            dragHelper.setHookTabs(e, this.bar, this.bar.selectTabs);
+                        } else {
                             dragHelper.setHook(e, this.bar, tab);
                         }
                     }
+                }
             }, this)
         });
     };
@@ -322,6 +434,7 @@ define([
 
         tabs: [],
         template: _.template('<ul class="nav nav-tabs <%= placement %>" />'),
+        selectTabs: [],
 
         initialize : function (options) {
             _.extend(this.config, options);
@@ -397,6 +510,10 @@ define([
                                 me.$bar.append(tab.render().$el);
                                 me.tabs.push(tab);
                                 me.manager.attach(tab);
+                                if (tab.isActive()) {
+                                    me.selectTabs.length = 0;
+                                    me.selectTabs.push(tab);
+                                }
                             }
                         } else {
                             for (i = tabs.length; i-- > 0 ; ) {
@@ -410,6 +527,11 @@ define([
                                     me.tabs.splice(index, 0, tab);
                                 }
 
+                                if (tab.isActive()) {
+                                    me.selectTabs.length = 0;
+                                    me.selectTabs.push(tab);
+                                }
+
                                 me.manager.attach(tab);
                             }
                         }
@@ -462,6 +584,27 @@ define([
             this.checkInvisible();
         },
 
+        setSelectAll: function(isSelect) {
+            var me = this;
+            me.selectTabs.length = 0;
+            if (isSelect) {
+                me.tabs.forEach(function(tab){
+                    if (!tab.isSelected()) {
+                        tab.addClass('selected');
+                    }
+                    me.selectTabs.push(tab);
+                });
+            } else {
+                me.tabs.forEach(function(tab){
+                    if (tab.isActive()) {
+                        me.selectTabs.push(tab);
+                    } else if (tab.isSelected()) {
+                        tab.removeClass('selected');
+                    }
+                });
+            }
+        },
+
         getActive: function(iselem) {
             return iselem ? this.$bar.find('> li.active') : this.$bar.find('> li.active').index();
         },
@@ -575,7 +718,7 @@ define([
                 //left = tab.position().left;
                 //right = left + tab.width();
 
-                return !(left < leftbound) && !(right > rightbound);
+                return !(left < leftbound) && !(right - rightbound > 0.1);
             }
 
             return false;

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

@@ -348,20 +348,11 @@ define([
                 maxwidth = (this.initConfig.maxwidth) ? this.initConfig.maxwidth : main_width,
                 maxheight = (this.initConfig.maxheight) ? this.initConfig.maxheight : main_height;
 
-            if (this.resizing.type[0]>0) {
+            this.resizing.minw  = this.initConfig.minwidth;
-                this.resizing.maxx  = Math.min(main_width, left+maxwidth);
+            this.resizing.maxw = (this.resizing.type[0]>0) ? Math.min(main_width-left, maxwidth) : Math.min(left+this.resizing.initw, maxwidth);
-                this.resizing.minx  = left+this.initConfig.minwidth;
+
-            } else if (this.resizing.type[0]<0) {
+            this.resizing.minh  = this.initConfig.minheight;
-                this.resizing.maxx  = left+this.resizing.initw-this.initConfig.minwidth;
+            this.resizing.maxh  = (this.resizing.type[1]>0) ? Math.min(main_height-top, maxheight) : Math.min(top+this.resizing.inith, maxheight);
-                this.resizing.minx  = Math.max(0, left+this.resizing.initw-maxwidth);
-            }
-            if (this.resizing.type[1]>0) {
-                this.resizing.maxy  = Math.min(main_height, top+maxheight);
-                this.resizing.miny  = top+this.initConfig.minheight;
-            } else if (this.resizing.type[1]<0) {
-                this.resizing.maxy  = top+this.resizing.inith-this.initConfig.minheight;
-                this.resizing.miny  = Math.max(0, top+this.resizing.inith-maxheight);
-            }
 
             $(document.body).css('cursor', el.css('cursor'));
             this.$window.find('.resize-border').addClass('resizing');
@@ -378,16 +369,34 @@ define([
                     zoom = (event instanceof jQuery.Event) ? Common.Utils.zoom() : 1,
                     pageX = event.pageX*zoom,
                     pageY = event.pageY*zoom;
-                if (this.resizing.type[0] && pageX<this.resizing.maxx && pageX>this.resizing.minx) {
+                if (this.resizing.type[0]) {
+                    var new_width = this.resizing.initw + (pageX - this.resizing.initpage_x) * this.resizing.type[0];
+                    if (new_width>this.resizing.maxw) {
+                        pageX = pageX - (new_width-this.resizing.maxw) * this.resizing.type[0];
+                        new_width = this.resizing.maxw;
+                    } else if (new_width<this.resizing.minw) {
+                        pageX = pageX - (new_width-this.resizing.minw) * this.resizing.type[0];
+                        new_width = this.resizing.minw;
+                    }
+
                     if (this.resizing.type[0]<0)
                         this.$window.css({left: pageX - this.resizing.initx});
-                    this.setWidth(this.resizing.initw + (pageX - this.resizing.initpage_x) * this.resizing.type[0]);
+                    this.setWidth(new_width);
                     resized = true;
                 }
-                if (this.resizing.type[1] && pageY<this.resizing.maxy && pageY>this.resizing.miny) {
+                if (this.resizing.type[1]) {
+                    var new_height = this.resizing.inith + (pageY - this.resizing.initpage_y) * this.resizing.type[1];
+                    if (new_height>this.resizing.maxh) {
+                        pageY = pageY - (new_height-this.resizing.maxh) * this.resizing.type[1];
+                        new_height = this.resizing.maxh;
+                    } else if (new_height<this.resizing.minh) {
+                        pageY = pageY - (new_height-this.resizing.minh) * this.resizing.type[1];
+                        new_height = this.resizing.minh;
+                    }
+
                     if (this.resizing.type[1]<0)
                         this.$window.css({top: pageY - this.resizing.inity});
-                    this.setHeight(this.resizing.inith + (pageY - this.resizing.initpage_y) * this.resizing.type[1]);
+                    this.setHeight(new_height);
                     resized = true;
                 }
                 if (resized) this.fireEvent('resizing');

apps/common/main/lib/controller/Comments.js

@@ -126,6 +126,9 @@ define([
                     'comment:closeEditing':     _.bind(this.closeEditing, this),
                     'comment:disableHint':      _.bind(this.disableHint, this),
                     'comment:addDummyComment':  _.bind(this.onAddDummyComment, this)
+                },
+                'Common.Views.ReviewChanges': {
+                    'comment:removeComments':           _.bind(this.onRemoveComments, this)
                 }
             });
 
@@ -180,7 +183,7 @@ define([
                 this.api.asc_registerCallback('asc_onAddComments', _.bind(this.onApiAddComments, this));
                 this.api.asc_registerCallback('asc_onRemoveComment', _.bind(this.onApiRemoveComment, this));
                 this.api.asc_registerCallback('asc_onChangeComments', _.bind(this.onChangeComments, this));
-                this.api.asc_registerCallback('asc_onRemoveComments', _.bind(this.onRemoveComments, this));
+                this.api.asc_registerCallback('asc_onRemoveComments', _.bind(this.onApiRemoveComments, this));
                 this.api.asc_registerCallback('asc_onChangeCommentData', _.bind(this.onApiChangeCommentData, this));
                 this.api.asc_registerCallback('asc_onLockComment', _.bind(this.onApiLockComment, this));
                 this.api.asc_registerCallback('asc_onUnLockComment', _.bind(this.onApiUnLockComment, this));
@@ -233,6 +236,11 @@ define([
                 this.api.asc_removeComment(id);
             }
         },
+        onRemoveComments: function (type) {
+            if (this.api) {
+                this.api.asc_RemoveAllComments(type=='my' || !this.mode.canEditComments, type=='current');// 1 param = true if remove only my comments, 2 param - remove current comments
+            }
+        },
         onResolveComment: function (uid) {
             var t = this,
                 reply = null,
@@ -725,7 +733,7 @@ define([
 
             this.updateComments(true);
         },
-        onRemoveComments: function (data) {
+        onApiRemoveComments: function (data) {
             for (var i = 0; i < data.length; ++i) {
                 this.onApiRemoveComment(data[i], true);
             }
@@ -821,6 +829,7 @@ define([
             }
         },
         onApiShowComment: function (uids, posX, posY, leftX, opts, hint) {
+            var apihint = hint;
             var same_uids = (0 === _.difference(this.uids, uids).length) && (0 === _.difference(uids, this.uids).length);
             
             if (hint && this.isSelectedComment && same_uids && !this.isModeChanged) {
@@ -886,7 +895,7 @@ define([
                         this.animate = false;
                     }
 
-                    this.isSelectedComment = !hint || !this.hintmode;
+                    this.isSelectedComment = !apihint || !this.hintmode;
                     this.uids = _.clone(uids);
 
                     comments.push(comment);

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,

apps/common/main/lib/controller/Plugins.js

@@ -367,14 +367,14 @@ define([
                     var me = this,
                         isCustomWindow = variation.get_CustomWindow(),
                         arrBtns = variation.get_Buttons(),
-                        newBtns = {},
+                        newBtns = [],
                         size = variation.get_Size();
                         if (!size || size.length<2) size = [800, 600];
 
                     if (_.isArray(arrBtns)) {
                         _.each(arrBtns, function(b, index){
                             if (b.visible)
-                                newBtns[index] = {text: b.text, cls: 'custom' + ((b.primary) ? ' primary' : '')};
+                                newBtns[index] = {caption: b.text, value: index, primary: b.primary};
                         });
                     }
 

apps/common/main/lib/controller/ReviewChanges.js

@@ -69,6 +69,10 @@ define([
                 'FileMenu': {
                     'settings:apply': this.applySettings.bind(this)
                 },
+                'LeftMenu': {
+                    'comments:show': _.bind(this.commentsShowHide, this, 'show'),
+                    'comments:hide': _.bind(this.commentsShowHide, this, 'hide')
+                },
                 'Common.Views.ReviewChanges': {
                     'reviewchange:accept':      _.bind(this.onAcceptClick, this),
                     'reviewchange:reject':      _.bind(this.onRejectClick, this),
@@ -101,6 +105,8 @@ define([
             Common.NotificationCenter.on('spelling:turn', this.onTurnSpelling.bind(this));
             Common.NotificationCenter.on('app:ready', this.onAppReady.bind(this));
             Common.NotificationCenter.on('api:disconnect', _.bind(this.onCoAuthoringDisconnect, this));
+            Common.NotificationCenter.on('collaboration:sharing', this.changeAccessRights.bind(this));
+            Common.NotificationCenter.on('collaboration:sharingdeny', this.onLostEditRights.bind(this));
 
             this.userCollection.on('reset', _.bind(this.onUpdateUsers, this));
             this.userCollection.on('add',   _.bind(this.onUpdateUsers, this));
@@ -112,6 +118,7 @@ define([
                 this.currentUserId      =   data.config.user.id;
                 this.sdkViewName        =   data['sdkviewname'] || this.sdkViewName;
             }
+            return this;
         },
         setApi: function (api) {
             if (api) {
@@ -130,9 +137,16 @@ define([
             this.popoverChanges = new Common.Collections.ReviewChanges();
             this.view = this.createView('Common.Views.ReviewChanges', { mode: mode });
 
+            !!this.appConfig.sharingSettingsUrl && this.appConfig.sharingSettingsUrl.length && Common.Gateway.on('showsharingsettings', _.bind(this.changeAccessRights, this));
+            !!this.appConfig.sharingSettingsUrl && this.appConfig.sharingSettingsUrl.length && Common.Gateway.on('setsharingsettings', _.bind(this.setSharingSettings, this));
+
             return this;
         },
 
+        loadDocument: function(data) {
+            this.document = data.doc;
+        },
+
         SetDisabled: function(state) {
             if (this.dlgChanges)
                 this.dlgChanges.close();
@@ -685,7 +699,9 @@ define([
                     if (state !== me.view.btnChat.pressed)
                         me.view.turnChat(state);
                 });
-
+            }
+            if (me.view && me.view.btnCommentRemove) {
+                me.view.btnCommentRemove.setDisabled(!Common.localStorage.getBool(me.view.appPrefix + "settings-livecomment", true));
             }
         },
 
@@ -724,9 +740,34 @@ define([
         },
 
         onLostEditRights: function() {
+            this._readonlyRights = true;
             this.view && this.view.onLostEditRights();
         },
 
+        changeAccessRights: function(btn,event,opts) {
+            if (this._docAccessDlg || this._readonlyRights) return;
+
+            var me = this;
+            me._docAccessDlg = new Common.Views.DocumentAccessDialog({
+                settingsurl: this.appConfig.sharingSettingsUrl
+            });
+            me._docAccessDlg.on('accessrights', function(obj, rights){
+                me.setSharingSettings({sharingSettings: rights});
+            }).on('close', function(obj){
+                me._docAccessDlg = undefined;
+            });
+
+            me._docAccessDlg.show();
+        },
+
+        setSharingSettings: function(data) {
+            if (data) {
+                this.document.info.sharingSettings = data.sharingSettings;
+                Common.NotificationCenter.trigger('collaboration:sharingupdate', data.sharingSettings);
+                Common.NotificationCenter.trigger('mentions:clearusers', this);
+            }
+        },
+
         onCoAuthoringDisconnect: function() {
             this.SetDisabled(true);
         },
@@ -739,6 +780,12 @@ define([
             });
         },
 
+        commentsShowHide: function(mode) {
+            if (!this.view) return;
+            var value = Common.Utils.InternalSettings.get(this.view.appPrefix + "settings-livecomment");
+            (value!==undefined) && this.view.btnCommentRemove && this.view.btnCommentRemove.setDisabled(mode != 'show' && !value);
+        },
+
         textInserted: '<b>Inserted:</b>',
         textDeleted: '<b>Deleted:</b>',
         textParaInserted: '<b>Paragraph Inserted</b> ',

apps/common/main/lib/mods/perfect-scrollbar.js

@@ -155,8 +155,8 @@
         else
             $scrollbarYRail.css({top: $this.scrollTop(), right: scrollbarYRight - $this.scrollLeft(), height: scrollbarYRailHeight, display: scrollbarYActive ? "inherit": "none"});
 
-        $scrollbarX.css({left: scrollbarXLeft, width: scrollbarXWidth});
+        $scrollbarX && $scrollbarX.css({left: scrollbarXLeft, width: scrollbarXWidth});
-        $scrollbarY.css({top: scrollbarYTop, height: scrollbarYHeight});
+        $scrollbarY && $scrollbarY.css({top: scrollbarYTop, height: scrollbarYHeight});
       };
 
       var updateBarSizeAndPosition = function () {

apps/common/main/lib/util/LanguageInfo.js

@@ -363,6 +363,8 @@ Common.util.LanguageInfo = new(function() {
         0x380A : ["es-UY", "Español (Uruguay)", "Spanish (Uruguay)"],
         0x200A : ["es-VE", "Español (Republica Bolivariana de Venezuela)", "Spanish (Venezuela)"],
         0x040a : ["es-ES_tradnl", "Spanish"],
+        0x580a : ["es-419", "Español (América Latina y el Caribe)", "Spanish (Latin America and the Caribbean)"],
+        0x5C0a : ["es-CU",  "Español (Cuba)", "Spanish (Cuba)"],
         0x001D : ["sv", "Svenska"],
         0x081D : ["sv-FI", "Svenska (Finland)", "Swedish (Finland)"],
         0x041D : ["sv-SE", "Svenska (Sverige)", "Swedish (Sweden)"],

apps/common/main/lib/util/define.js

@@ -30,14 +30,15 @@
  * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
  *
 */
-
 if (Common === undefined) {
     var Common = {};
 }
 
-define(function(){ 'use strict';
+if (Common.define === undefined) {
-
     Common.define = {};
+}
+
+define(function(){ 'use strict';
 
     Common.define.c_oAscMathMainType = {
         Symbol       :  0x00,
@@ -413,4 +414,86 @@ define(function(){ 'use strict';
         Matrix_Flat_Round                       : 0x0b040000,
         Matrix_Flat_Square                      : 0x0b040001
     };
+
+    Common.define.chartData = _.extend( new(function() {
+        return {
+            textLine: 'Line',
+            textColumn: 'Column',
+            textBar: 'Bar',
+            textArea: 'Area',
+            textPie: 'Pie',
+            textPoint: 'XY (Scatter)',
+            textStock: 'Stock',
+            textSurface: 'Surface',
+            textCharts: 'Charts',
+            textSparks: 'Sparklines',
+            textLineSpark: 'Line',
+            textColumnSpark: 'Column',
+            textWinLossSpark: 'Win/Loss',
+
+            getChartGroupData: function(headername) {
+                return [
+                    {id: 'menu-chart-group-bar', caption: this.textColumn, headername: (headername) ? this.textCharts : undefined},
+                    {id: 'menu-chart-group-line', caption: this.textLine},
+                    {id: 'menu-chart-group-pie', caption: this.textPie},
+                    {id: 'menu-chart-group-hbar', caption: this.textBar},
+                    {id: 'menu-chart-group-area', caption: this.textArea, inline: true},
+                    {id: 'menu-chart-group-scatter', caption: this.textPoint, inline: true},
+                    {id: 'menu-chart-group-stock', caption: this.textStock, inline: true}
+                    // {id: 'menu-chart-group-surface', caption: this.textSurface}
+                ];
+            },
+
+            getChartData: function() {
+                return [
+                    { group: 'menu-chart-group-bar',     type: Asc.c_oAscChartTypeSettings.barNormal,          iconCls: 'column-normal'},
+                    { group: 'menu-chart-group-bar',     type: Asc.c_oAscChartTypeSettings.barStacked,         iconCls: 'column-stack'},
+                    { group: 'menu-chart-group-bar',     type: Asc.c_oAscChartTypeSettings.barStackedPer,      iconCls: 'column-pstack'},
+                    { group: 'menu-chart-group-bar',     type: Asc.c_oAscChartTypeSettings.barNormal3d,        iconCls: 'column-3d-normal'},
+                    { group: 'menu-chart-group-bar',     type: Asc.c_oAscChartTypeSettings.barStacked3d,       iconCls: 'column-3d-stack'},
+                    { group: 'menu-chart-group-bar',     type: Asc.c_oAscChartTypeSettings.barStackedPer3d,    iconCls: 'column-3d-pstack'},
+                    { group: 'menu-chart-group-bar',     type: Asc.c_oAscChartTypeSettings.barNormal3dPerspective,    iconCls: 'column-3d-normal-per'},
+                    { group: 'menu-chart-group-line',    type: Asc.c_oAscChartTypeSettings.lineNormal,         iconCls: 'line-normal'},
+                    { group: 'menu-chart-group-line',    type: Asc.c_oAscChartTypeSettings.lineStacked,        iconCls: 'line-stack'},
+                    { group: 'menu-chart-group-line',    type: Asc.c_oAscChartTypeSettings.lineStackedPer,     iconCls: 'line-pstack'},
+                    { group: 'menu-chart-group-line',    type: Asc.c_oAscChartTypeSettings.line3d,             iconCls: 'line-3d'},
+                    { group: 'menu-chart-group-pie',     type: Asc.c_oAscChartTypeSettings.pie,                iconCls: 'pie-normal'},
+                    { group: 'menu-chart-group-pie',     type: Asc.c_oAscChartTypeSettings.doughnut,           iconCls: 'pie-doughnut'},
+                    { group: 'menu-chart-group-pie',     type: Asc.c_oAscChartTypeSettings.pie3d,              iconCls: 'pie-3d-normal'},
+                    { group: 'menu-chart-group-hbar',    type: Asc.c_oAscChartTypeSettings.hBarNormal,         iconCls: 'bar-normal'},
+                    { group: 'menu-chart-group-hbar',    type: Asc.c_oAscChartTypeSettings.hBarStacked,        iconCls: 'bar-stack'},
+                    { group: 'menu-chart-group-hbar',    type: Asc.c_oAscChartTypeSettings.hBarStackedPer,     iconCls: 'bar-pstack'},
+                    { group: 'menu-chart-group-hbar',    type: Asc.c_oAscChartTypeSettings.hBarNormal3d,       iconCls: 'bar-3d-normal'},
+                    { group: 'menu-chart-group-hbar',    type: Asc.c_oAscChartTypeSettings.hBarStacked3d,      iconCls: 'bar-3d-stack'},
+                    { group: 'menu-chart-group-hbar',    type: Asc.c_oAscChartTypeSettings.hBarStackedPer3d,   iconCls: 'bar-3d-pstack'},
+                    { group: 'menu-chart-group-area',    type: Asc.c_oAscChartTypeSettings.areaNormal,         iconCls: 'area-normal'},
+                    { group: 'menu-chart-group-area',    type: Asc.c_oAscChartTypeSettings.areaStacked,        iconCls: 'area-stack'},
+                    { group: 'menu-chart-group-area',    type: Asc.c_oAscChartTypeSettings.areaStackedPer,     iconCls: 'area-pstack'},
+                    { group: 'menu-chart-group-scatter', type: Asc.c_oAscChartTypeSettings.scatter,            iconCls: 'point-normal'},
+                    { group: 'menu-chart-group-stock',   type: Asc.c_oAscChartTypeSettings.stock,              iconCls: 'stock-normal'}
+                    // { group: 'menu-chart-group-surface', type: Asc.c_oAscChartTypeSettings.surfaceNormal,      iconCls: 'surface-normal'},
+                    // { group: 'menu-chart-group-surface', type: Asc.c_oAscChartTypeSettings.surfaceWireframe,   iconCls: 'surface-wireframe'},
+                    // { group: 'menu-chart-group-surface', type: Asc.c_oAscChartTypeSettings.contourNormal,      iconCls: 'contour-normal'},
+                    // { group: 'menu-chart-group-surface', type: Asc.c_oAscChartTypeSettings.contourWireframe,   iconCls: 'contour-wireframe'}
+
+                ];
+            },
+
+            getSparkGroupData: function(headername) {
+                return [
+                    { id: 'menu-chart-group-sparkcolumn', inline: true, headername: (headername) ? this.textSparks : undefined },
+                    { id: 'menu-chart-group-sparkline', inline: true },
+                    { id: 'menu-chart-group-sparkwin', inline: true }
+                ];
+            },
+
+            getSparkData: function() {
+                return [
+                    { group: 'menu-chart-group-sparkcolumn',   type: Asc.c_oAscSparklineType.Column,    allowSelected: true, iconCls: 'spark-column', tip: this.textColumnSpark},
+                    { group: 'menu-chart-group-sparkline',     type: Asc.c_oAscSparklineType.Line,      allowSelected: true, iconCls: 'spark-line',   tip: this.textLineSpark},
+                    { group: 'menu-chart-group-sparkwin',      type: Asc.c_oAscSparklineType.Stacked,   allowSelected: true, iconCls: 'spark-win',    tip: this.textWinLossSpark}
+                ];
+            }
+        }
+    })(), Common.define.chartData || {});
 });

apps/common/main/lib/view/About.js

@@ -174,12 +174,12 @@ define([
                 this.lblCompanyUrl = _$l.findById('#id-about-company-url');
                 this.lblCompanyLic = _$l.findById('#id-about-company-lic');
 
-                if ( this.licData )
-                    this.setLicInfo(this.licData);
-
                 this.$el.html(_$l);
                 this.$el.addClass('about-dlg');
 
+                if ( this.licData )
+                    this.setLicInfo(this.licData);
+
                 if (_.isUndefined(this.scroller)) {
                     this.scroller = new Common.UI.Scroller({
                         el: this.$el,

apps/common/main/lib/view/Chat.js

@@ -208,7 +208,7 @@ define([
             var user    = this.storeUsers.findOriginalUser(m.get('userid'));
             m.set({
                 usercolor   : user ? user.get('color') : null,
-                message     : this._pickLink(Common.Utils.String.htmlEncode(m.get('message')))
+                message     : this._pickLink(m.get('message'))
             }, {silent:true});
         },
 
@@ -256,14 +256,13 @@ define([
 
             arr = _.sortBy(arr, function(item){ return item.start; });
 
-            var str_res = (arr.length>0) ? ( message.substring(0, arr[0].start) + arr[0].str) : message;
+            var str_res = (arr.length>0) ? ( Common.Utils.String.htmlEncode(message.substring(0, arr[0].start)) + arr[0].str) : Common.Utils.String.htmlEncode(message);
             for (var i=1; i<arr.length; i++) {
-                str_res += (message.substring(arr[i-1].end, arr[i].start) + arr[i].str);
+                str_res += (Common.Utils.String.htmlEncode(message.substring(arr[i-1].end, arr[i].start)) + arr[i].str);
             }
             if (arr.length>0) {
-                str_res += message.substring(arr[i-1].end, message.length);
+                str_res += Common.Utils.String.htmlEncode(message.substring(arr[i-1].end, message.length));
             }
-
             return str_res;
         },
 

apps/common/main/lib/view/Comments.js

@@ -196,23 +196,23 @@ define([
 
                         me.commentsView.reply = replyId;
 
-                        this.autoHeightTextBox();
+                        picker.autoHeightTextBox();
 
                         readdresolves();
 
                         me.hookTextBox();
 
-                        this.autoScrollToEditButtons();
+                        picker.autoScrollToEditButtons();
-                        this.setFocusToTextBox();
+                        picker.setFocusToTextBox();
                     } else {
 
                         if (!showEditBox) {
                             me.fireEvent('comment:closeEditing');
                             record.set('editText', true);
 
-                            this.autoHeightTextBox();
+                            picker.autoHeightTextBox();
                             readdresolves();
-                            this.setFocusToTextBox();
+                            picker.setFocusToTextBox();
                             me.hookTextBox();
                         }
                     }
@@ -232,14 +232,14 @@ define([
 
                     readdresolves();
 
-                    this.autoHeightTextBox();
+                    picker.autoHeightTextBox();
                     me.hookTextBox();
 
-                    this.autoScrollToEditButtons();
+                    picker.autoScrollToEditButtons();
-                    this.setFocusToTextBox();
+                    picker.setFocusToTextBox();
                 } else if (btn.hasClass('btn-reply', false)) {
                     if (showReplyBox) {
-                        me.fireEvent('comment:addReply', [commentId, this.getActiveTextBoxVal()]);
+                        me.fireEvent('comment:addReply', [commentId, picker.getActiveTextBoxVal()]);
                         me.fireEvent('comment:closeEditing');
 
                         readdresolves();
@@ -250,10 +250,10 @@ define([
 
                 } else if (btn.hasClass('btn-inner-edit', false)) {
                     if (!_.isUndefined(me.commentsView.reply)) {
-                        me.fireEvent('comment:changeReply', [commentId, me.commentsView.reply, this.getActiveTextBoxVal()]);
+                        me.fireEvent('comment:changeReply', [commentId, me.commentsView.reply, picker.getActiveTextBoxVal()]);
                         me.commentsView.reply = undefined;
                     } else if (showEditBox) {
-                        me.fireEvent('comment:change', [commentId, this.getActiveTextBoxVal()]);
+                        me.fireEvent('comment:change', [commentId, picker.getActiveTextBoxVal()]);
                     }
 
                     me.fireEvent('comment:closeEditing');
@@ -559,9 +559,13 @@ define([
                 add = $('.new-comment-ct', this.el),
                 to = $('.add-link-ct', this.el),
                 msgs = $('.messages-ct', this.el);
-            msgs.toggleClass('stretch', !mode.canComments);
+            msgs.toggleClass('stretch', !mode.canComments || mode.compatibleFeatures);
-            if (!mode.canComments) {
+            if (!mode.canComments || mode.compatibleFeatures) {
+                if (mode.compatibleFeatures) {
+                    add.remove(); to.remove();
+                } else {
                     add.hide(); to.hide();
+                }
                 this.layout.changeLayout([{el: msgs[0], rely: false, stretch: true}]);
             } else {
                 var container = $('#comments-box', this.el),
@@ -656,8 +660,6 @@ define([
 
         pickLink: function (message) {
             var arr = [], offset, len;
-            message = Common.Utils.String.htmlEncode(message);
-
             message.replace(Common.Utils.ipStrongRe, function(subStr) {
                 var result = /[\.,\?\+;:=!\(\)]+$/.exec(subStr);
                 if (result)
@@ -699,14 +701,13 @@ define([
 
             arr = _.sortBy(arr, function(item){ return item.start; });
 
-            var str_res = (arr.length>0) ? ( message.substring(0, arr[0].start) + arr[0].str) : message;
+            var str_res = (arr.length>0) ? ( Common.Utils.String.htmlEncode(message.substring(0, arr[0].start)) + arr[0].str) : Common.Utils.String.htmlEncode(message);
             for (var i=1; i<arr.length; i++) {
-                str_res += (message.substring(arr[i-1].end, arr[i].start) + arr[i].str);
+                str_res += (Common.Utils.String.htmlEncode(message.substring(arr[i-1].end, arr[i].start)) + arr[i].str);
             }
             if (arr.length>0) {
-                str_res += message.substring(arr[i-1].end, message.length);
+                str_res += Common.Utils.String.htmlEncode(message.substring(arr[i-1].end, message.length));
             }
-
             return str_res;
         },
 

apps/common/main/lib/view/Header.js

@@ -183,14 +183,14 @@ define([
 
         function onLostEditRights() {
             _readonlyRights = true;
-            $panelUsers.find('#tlb-change-rights').hide();
+            $panelUsers && $panelUsers.find('#tlb-change-rights').hide();
             $btnUsers && !$btnUsers.menu && $panelUsers.hide();
         }
 
         function onUsersClick(e) {
             if ( !$btnUsers.menu ) {
                 $panelUsers.removeClass('open');
-                this.fireEvent('click:users', this);
+                Common.NotificationCenter.trigger('collaboration:sharing');
             } else {
                 var usertip = $btnUsers.data('bs.tooltip');
                 if ( usertip ) {
@@ -245,7 +245,7 @@ define([
             var $labelChangeRights = $panelUsers.find('#tlb-change-rights');
             $labelChangeRights.on('click', function(e) {
                 $panelUsers.removeClass('open');
-                me.fireEvent('click:users', me);
+                Common.NotificationCenter.trigger('collaboration:sharing');
             });
 
             $labelChangeRights[(!mode.isOffline && !mode.isReviewOnly && mode.sharingSettingsUrl && mode.sharingSettingsUrl.length)?'show':'hide']();

apps/common/main/lib/view/ImageFromUrlDialog.js

@@ -47,8 +47,7 @@ define([
             width: 330,
             header: false,
             cls: 'modal-dlg',
-            buttons: ['ok', 'cancel'],
+            buttons: ['ok', 'cancel']
-            footerCls: 'right'
         },
 
         initialize : function(options) {
@@ -93,7 +92,7 @@ define([
             var me = this;
             _.delay(function(){
                 me.getChild('input').focus();
-            },500);
+            },100);
         },
 
         onPrimary: function(event) {

apps/common/main/lib/view/InsertTableDialog.js

@@ -110,8 +110,8 @@ define([
         onBtnClick: function(event) {
             if (this.options.handler) {
                 this.options.handler.call(this, event.currentTarget.attributes['result'].value, {
-                    columns : this.udColumns.getValue(),
+                    columns : this.udColumns.getNumberValue(),
-                    rows    : this.udRows.getValue()
+                    rows    : this.udRows.getNumberValue()
                 });
             }
 
@@ -121,8 +121,8 @@ define([
         onPrimary: function() {
             if (this.options.handler) {
                 this.options.handler.call(this, 'ok', {
-                    columns : this.udColumns.getValue(),
+                    columns : this.udColumns.getNumberValue(),
-                    rows    : this.udRows.getValue()
+                    rows    : this.udRows.getNumberValue()
                 });
             }
 

apps/common/main/lib/view/LanguageDialog.js

@@ -52,8 +52,7 @@ define([
         header: false,
         width: 350,
         cls: 'modal-dlg',
-        buttons: ['ok', 'cancel'],
+        buttons: ['ok', 'cancel']
-        footerCls: 'right'
     },
 
     template:   '<div class="box">' +

apps/common/main/lib/view/ListSettingsDialog.js

@@ -0,0 +1,293 @@
+/*
+ *
+ * (c) Copyright Ascensio System SIA 2010-2019
+ *
+ * This program is a free software product. You can redistribute it and/or
+ * modify it under the terms of the GNU Affero General Public License (AGPL)
+ * version 3 as published by the Free Software Foundation. In accordance with
+ * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect
+ * that Ascensio System SIA expressly excludes the warranty of non-infringement
+ * of any third-party rights.
+ *
+ * This program is distributed WITHOUT ANY WARRANTY; without even the implied
+ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR  PURPOSE. For
+ * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html
+ *
+ * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha
+ * street, Riga, Latvia, EU, LV-1050.
+ *
+ * The  interactive user interfaces in modified source and object code versions
+ * of the Program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU AGPL version 3.
+ *
+ * Pursuant to Section 7(b) of the License you must retain the original Product
+ * logo when distributing the program. Pursuant to Section 7(e) we decline to
+ * grant you any rights under trademark law for use of our trademarks.
+ *
+ * All the Product's GUI elements, including illustrations and icon sets, as
+ * well as technical writing content are licensed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International. See the License
+ * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
+ *
+ */
+
+/**
+ *  ListSettingsDialog.js
+ *
+ *  Created by Julia Radzhabova on 30.10.2019
+ *  Copyright (c) 2019 Ascensio System SIA. All rights reserved.
+ *
+ */
+
+if (Common === undefined)
+    var Common = {};
+
+define([
+    'common/main/lib/component/Window',
+    'common/main/lib/component/MetricSpinner',
+    'common/main/lib/component/ThemeColorPalette',
+    'common/main/lib/component/ColorButton',
+    'common/main/lib/view/SymbolTableDialog'
+], function () { 'use strict';
+
+    Common.Views.ListSettingsDialog = Common.UI.Window.extend(_.extend({
+        options: {
+            type: 0, // 0 - markers, 1 - numbers
+            width: 230,
+            height: 200,
+            style: 'min-width: 240px;',
+            cls: 'modal-dlg',
+            split: false,
+            buttons: ['ok', 'cancel']
+        },
+
+        initialize : function(options) {
+            this.type = options.type || 0;
+
+            _.extend(this.options, {
+                title: this.txtTitle
+            }, options || {});
+
+            this.template = [
+                '<div class="box">',
+                    '<div class="input-row" style="margin-bottom: 10px;">',
+                    '<label class="text" style="width: 70px;">' + this.txtSize + '</label><div id="id-dlg-list-size"></div><label class="text" style="margin-left: 10px;">' + this.txtOfText + '</label>',
+                    '</div>',
+                    '<div style="margin-bottom: 10px;">',
+                    '<label class="text" style="width: 70px;">' + this.txtColor + '</label><div id="id-dlg-list-color" style="display: inline-block;"></div>',
+                    '</div>',
+                    '<% if (type == 0) { %>',
+                    '<div class="input-row" style="margin-bottom: 10px;">',
+                    '<label class="text" style="width: 70px;vertical-align: top;">' + this.txtBullet + '</label>',
+                    '<button type="button" class="btn btn-text-default" id="id-dlg-list-edit" style="width:53px;display: inline-block;vertical-align: top;"></button>',
+                    '</div>',
+                    '<% } %>',
+                    '<% if (type == 1) { %>',
+                    '<div class="input-row" style="margin-bottom: 10px;">',
+                    '<label class="text" style="width: 70px;">' + this.txtStart + '</label><div id="id-dlg-list-start"></div>',
+                    '</div>',
+                    '<% } %>',
+                '</div>'
+            ].join('');
+
+            this.props = options.props;
+            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();
+            $window.find('.dlg-btn').on('click', _.bind(this.onBtnClick, this));
+
+            this.spnSize = new Common.UI.MetricSpinner({
+                el          : $window.find('#id-dlg-list-size'),
+                step        : 1,
+                width       : 53,
+                value       : 100,
+                defaultUnit : '',
+                maxValue    : 400,
+                minValue    : 25,
+                allowDecimal: false
+            }).on('change', function(field, newValue, oldValue, eOpts){
+                if (me._changedProps) {
+                    me._changedProps.asc_putBulletSize(field.getNumberValue());
+                }
+            });
+
+            this.btnColor = new Common.UI.ColorButton({
+                style: "width:53px;",
+                menu        : new Common.UI.Menu({
+                    additionalAlign: this.menuAddAlign,
+                    items: [
+                        { template: _.template('<div id="id-dlg-list-color-menu" style="width: 169px; height: 220px; margin: 10px;"></div>') },
+                        { template: _.template('<a id="id-dlg-list-color-new" style="padding-left:12px;">' + this.textNewColor + '</a>') }
+                    ]
+                })
+            });
+            this.btnColor.on('render:after', function(btn) {
+                me.colors = new Common.UI.ThemeColorPalette({
+                    el: $('#id-dlg-list-color-menu'),
+                    transparent: false
+                });
+                me.colors.on('select', _.bind(me.onColorsSelect, me));
+            });
+            this.btnColor.render($window.find('#id-dlg-list-color'));
+            $('#id-dlg-list-color-new').on('click', _.bind(this.addNewColor, this, this.colors));
+
+            this.menuAddAlign = function(menuRoot, left, top) {
+                var self = this;
+                if (!$window.hasClass('notransform')) {
+                    $window.addClass('notransform');
+                    menuRoot.addClass('hidden');
+                    setTimeout(function() {
+                        menuRoot.removeClass('hidden');
+                        menuRoot.css({left: left, top: top});
+                        self.options.additionalAlign = null;
+                    }, 300);
+                } else {
+                    menuRoot.css({left: left, top: top});
+                    self.options.additionalAlign = null;
+                }
+            };
+
+            this.spnStart = new Common.UI.MetricSpinner({
+                el          : $window.find('#id-dlg-list-start'),
+                step        : 1,
+                width       : 53,
+                value       : 1,
+                defaultUnit : '',
+                maxValue    : 32767,
+                minValue    : 1,
+                allowDecimal: false
+            }).on('change', function(field, newValue, oldValue, eOpts){
+                if (me._changedProps) {
+                    me._changedProps.put_NumStartAt(field.getNumberValue());
+                }
+            });
+
+            this.btnEdit = new Common.UI.Button({
+                el: $window.find('#id-dlg-list-edit'),
+                hint: this.tipChange
+            });
+            this.btnEdit.on('click', _.bind(this.onEditBullet, this));
+            this.btnEdit.cmpEl.css({'font-size': '12px'});
+
+            this.afterRender();
+        },
+
+        afterRender: function() {
+            this.updateThemeColors();
+            this._setDefaults(this.props);
+        },
+
+        updateThemeColors: function() {
+            this.colors.updateColors(Common.Utils.ThemeColor.getEffectColors(), Common.Utils.ThemeColor.getStandartColors());
+        },
+
+        addNewColor: function(picker, btn) {
+            picker.addNewColor((typeof(btn.color) == 'object') ? btn.color.color : btn.color);
+        },
+
+        onColorsSelect: function(picker, color) {
+            this.btnColor.setColor(color);
+            if (this._changedProps) {
+                this._changedProps.asc_putBulletColor(Common.Utils.ThemeColor.getRgbColor(color));
+            }
+        },
+
+        onEditBullet: function() {
+            var me = this,
+                props = me.bulletProps,
+                handler = function(dlg, result, settings) {
+                    if (result == 'ok') {
+                        props.changed = true;
+                        props.code = settings.code;
+                        props.font = settings.font;
+                        props.symbol = settings.symbol;
+                        props.font && me.btnEdit.cmpEl.css('font-family', props.font);
+                        settings.symbol && me.btnEdit.setCaption(settings.symbol);
+                        if (me._changedProps) {
+                            me._changedProps.asc_putBulletFont(props.font);
+                            me._changedProps.asc_putBulletSymbol(props.symbol);
+                        }
+                    }
+                },
+                win = new Common.Views.SymbolTableDialog({
+                    api: me.options.api,
+                    lang: me.options.interfaceLang,
+                    modal: true,
+                    type: 0,
+                    font: props.font,
+                    symbol: props.symbol,
+                    handler: handler
+                });
+            win.show();
+            win.on('symbol:dblclick', handler);
+        },
+
+        _handleInput: function(state) {
+            if (this.options.handler) {
+                this.options.handler.call(this, state, this._changedProps);
+            }
+            this.close();
+        },
+
+        onBtnClick: function(event) {
+            this._handleInput(event.currentTarget.attributes['result'].value);
+        },
+
+        onPrimary: function(event) {
+            this._handleInput('ok');
+            return false;
+        },
+
+        _setDefaults: function (props) {
+            if (props) {
+                this.spnSize.setValue(props.asc_getBulletSize() || '', true);
+                this.spnStart.setValue(props.get_NumStartAt() || '', true);
+                var color = props.asc_getBulletColor();
+                if (color) {
+                    if (color.get_type() == Asc.c_oAscColor.COLOR_TYPE_SCHEME) {
+                        color = {color: Common.Utils.ThemeColor.getHexColor(color.get_r(), color.get_g(), color.get_b()), effectValue: color.get_value()};
+                    } else {
+                        color = Common.Utils.ThemeColor.getHexColor(color.get_r(), color.get_g(), color.get_b());
+                    }
+                } else
+                    color = 'transparent';
+                this.btnColor.setColor(color);
+                if ( typeof(color) == 'object' ) {
+                    var isselected = false;
+                    for (var i=0; i<10; i++) {
+                        if ( Common.Utils.ThemeColor.ThemeValues[i] == color.effectValue ) {
+                            this.colors.select(color,true);
+                            isselected = true;
+                            break;
+                        }
+                    }
+                    if (!isselected) this.colors.clearSelection();
+                } else
+                    this.colors.select(color,true);
+
+                if (this.type==0) {
+                    this.bulletProps = {symbol: props.asc_getBulletSymbol(), font: props.asc_getBulletFont()};
+                    this.bulletProps.font && this.btnEdit.cmpEl.css('font-family', this.bulletProps.font);
+                    this.bulletProps.symbol && this.btnEdit.setCaption(this.bulletProps.symbol);
+                }
+            }
+            this._changedProps = new Asc.asc_CParagraphProperty();
+        },
+
+        txtTitle: 'List Settings',
+        txtSize: 'Size',
+        txtColor: 'Color',
+        txtOfText: '% of text',
+        textNewColor: 'Add New Custom Color',
+        txtStart: 'Start at',
+        txtBullet: 'Bullet',
+        tipChange: 'Change bullet'
+    }, Common.Views.ListSettingsDialog || {}))
+});

apps/common/main/lib/view/Plugins.js

@@ -190,7 +190,7 @@ define([
                     item.setDisabled(disable);
                 });
 
-                this.pluginsMask.css('display', disable ? 'block' : 'none');
+                this.pluginsMask && this.pluginsMask.css('display', disable ? 'block' : 'none');
             }
         },
 
@@ -366,11 +366,6 @@ define([
                 '</div>',
                 '<% if ((typeof buttons !== "undefined") && _.size(buttons) > 0) { %>',
                     '<div class="separator horizontal"/>',
-                    '<div class="footer" style="text-align: center;">',
-                        '<% for(var bt in buttons) { %>',
-                            '<button class="btn normal dlg-btn <%= buttons[bt].cls %>" result="<%= bt %>"><%= buttons[bt].text %></button>',
-                        '<% } %>',
-                    '</div>',
                 '<% } %>'
             ].join('');
 

apps/common/main/lib/view/RenameDialog.js

@@ -48,8 +48,7 @@ define([
             header: false,
             cls: 'modal-dlg',
             filename: '',
-            buttons: ['ok', 'cancel'],
+            buttons: ['ok', 'cancel']
-            footerCls: 'right'
         },
 
         initialize : function(options) {

apps/common/main/lib/view/ReviewChanges.js

@@ -64,6 +64,7 @@ define([
                 '<div class="separator long sharing"/>' +
                 '<div class="group">' +
                     '<span class="btn-slot text x-huge slot-comment"></span>' +
+                    '<span class="btn-slot text x-huge" id="slot-comment-remove"></span>' +
                 '</div>' +
                 '<div class="separator long comments"/>' +
                 '<div class="group">' +
@@ -161,6 +162,16 @@ define([
             this.btnChat && this.btnChat.on('click', function (btn, e) {
                 me.fireEvent('collaboration:chat', [btn.pressed]);
             });
+
+            if (this.btnCommentRemove) {
+                this.btnCommentRemove.on('click', function (e) {
+                    me.fireEvent('comment:removeComments', ['current']);
+                });
+
+                this.btnCommentRemove.menu.on('item:click', function (menu, item, e) {
+                    me.fireEvent('comment:removeComments', [item.value]);
+                });
+            }
         }
 
         return {
@@ -291,6 +302,15 @@ define([
                     });
                 }
 
+                if ( this.appConfig.canCoAuthoring && this.appConfig.canComments ) {
+                    this.btnCommentRemove = new Common.UI.Button({
+                        cls: 'btn-toolbar x-huge icon-top',
+                        caption: this.txtCommentRemove,
+                        split: true,
+                        iconCls: 'btn-rem-comment'
+                    });
+                }
+
                 var filter = Common.localStorage.getKeysFilter();
                 this.appPrefix = (filter && filter.length) ? filter.split(',')[0] : '';
 
@@ -397,6 +417,28 @@ define([
                         me.turnCoAuthMode((value===null || parseInt(value) == 1) && !(config.isDesktopApp && config.isOffline) && config.canCoAuthoring);
                     }
 
+                    if (me.btnCommentRemove) {
+                        var items = [
+                            {
+                                caption: config.canEditComments ? me.txtCommentRemCurrent : me.txtCommentRemMyCurrent,
+                                value: 'current'
+                            },
+                            {
+                                caption: me.txtCommentRemMy,
+                                value: 'my'
+                            }
+                        ];
+                        if (config.canEditComments)
+                            items.push({
+                                caption: me.txtCommentRemAll,
+                                value: 'all'
+                            });
+                        me.btnCommentRemove.setMenu(
+                            new Common.UI.Menu({items: items})
+                        );
+                        me.btnCommentRemove.updateHint([me.tipCommentRemCurrent, me.tipCommentRem]);
+                    }
+
                     var separator_sharing = !(me.btnSharing || me.btnCoAuthMode) ? me.$el.find('.separator.sharing') : '.separator.sharing',
                         separator_comments = !(config.canComments && config.canCoAuthoring) ? me.$el.find('.separator.comments') : '.separator.comments',
                         separator_review = !(config.canReview || config.canViewReview) ? me.$el.find('.separator.review') : '.separator.review',
@@ -426,7 +468,7 @@ define([
                     if (!me.btnHistory && separator_last)
                         me.$el.find(separator_last).hide();
 
-                    Common.NotificationCenter.trigger('tab:visible', 'review', config.isEdit || config.canViewReview);
+                    Common.NotificationCenter.trigger('tab:visible', 'review', config.isEdit || config.canViewReview || config.canCoAuthoring && config.canComments);
 
                     setEvents.call(me);
                 });
@@ -448,6 +490,7 @@ define([
                 this.btnCoAuthMode && this.btnCoAuthMode.render(this.$el.find('#slot-btn-coauthmode'));
                 this.btnHistory && this.btnHistory.render(this.$el.find('#slot-btn-history'));
                 this.btnChat && this.btnChat.render(this.$el.find('#slot-btn-chat'));
+                this.btnCommentRemove && this.btnCommentRemove.render(this.$el.find('#slot-comment-remove'));
 
                 return this.$el;
             },
@@ -561,6 +604,7 @@ define([
                     }
                 }, this);
                 this.btnChat && this.btnChat.setDisabled(state);
+                this.btnCommentRemove && this.btnCommentRemove.setDisabled(state);
             },
 
             onLostEditRights: function() {
@@ -609,7 +653,14 @@ define([
             txtFinalCap: 'Final',
             txtOriginalCap: 'Original',
             strFastDesc: 'Real-time co-editing. All changes are saved automatically.',
-            strStrictDesc: 'Use the \'Save\' button to sync the changes you and others make.'
+            strStrictDesc: 'Use the \'Save\' button to sync the changes you and others make.',
+            txtCommentRemove: 'Remove',
+            tipCommentRemCurrent: 'Remove current comments',
+            tipCommentRem: 'Remove comments',
+            txtCommentRemCurrent: 'Remove Current Comments',
+            txtCommentRemMyCurrent: 'Remove My Current Comments',
+            txtCommentRemMy: 'Remove My Comments',
+            txtCommentRemAll: 'Remove All Comments'
         }
     }()), Common.Views.ReviewChanges || {}));
 

apps/common/main/lib/view/ReviewPopover.js

@@ -469,7 +469,7 @@ define([
                     });
 
                     this.emailMenu = new Common.UI.Menu({
-                        maxHeight: 190,
+                        maxHeight: 200,
                         cyclic: false,
                         items: []
                     }).on('render:after', function(mnu) {
@@ -945,7 +945,7 @@ define([
                     $this.val($this.val().substring(0, start) + '\t' + $this.val().substring(end));
                     this.selectionStart = this.selectionEnd = start + 1;
 
-                    event.stopImmediatePropagation();
+                    // event.stopImmediatePropagation();
                     event.preventDefault();
                 }
 
@@ -954,28 +954,30 @@ define([
 
             if (this.canRequestUsers) {
                 textBox && textBox.keydown(function (event) {
-                    if ( event.keyCode == Common.UI.Keys.SPACE ||
+                    if ( event.keyCode == Common.UI.Keys.SPACE || event.keyCode === Common.UI.Keys.TAB ||
                         event.keyCode == Common.UI.Keys.HOME || event.keyCode == Common.UI.Keys.END || event.keyCode == Common.UI.Keys.RIGHT ||
                         event.keyCode == Common.UI.Keys.LEFT || event.keyCode == Common.UI.Keys.UP) {
                         // hide email menu
                         me.onEmailListMenu();
                     } else if (event.keyCode == Common.UI.Keys.DOWN) {
-                        if (me.emailMenu && me.emailMenu.rendered && me.emailMenu.isVisible())
+                        if (me.emailMenu && me.emailMenu.rendered && me.emailMenu.isVisible()) {
                             _.delay(function () {
                                 var selected = me.emailMenu.cmpEl.find('li:not(.divider):first');
                                 selected = selected.find('a');
                                 selected.focus();
                             }, 10);
+                            event.preventDefault();
+                        }
                     }
                     me.e = event;
                 });
                 textBox && textBox.on('input', function (event) {
                     var $this = $(this),
                         start = this.selectionStart,
-                        val = $this.val().replace(/[\n]$/, ""),
+                        val = $this.val(),
                         left = 0, right = val.length-1;
                     for (var i=start-1; i>=0; i--) {
-                        if (val.charCodeAt(i) == 32 /*space*/ || val.charCodeAt(i) == 13 || val.charCodeAt(i) == 10 || val.charCodeAt(i) == 9) {
+                        if (val.charCodeAt(i) == 32 /*space*/ || val.charCodeAt(i) == 13 /*enter*/ || val.charCodeAt(i) == 10 /*new line*/ || val.charCodeAt(i) == 9 /*tab*/) {
                             left = i+1; break;
                         }
                     }
@@ -989,7 +991,8 @@ define([
                     if (res && res.length>1) {
                         str = res[1]; // send to show email menu
                         me.onEmailListMenu(str, left, right);
-                    }
+                    } else
+                        me.onEmailListMenu(); // hide email menu
                 });
             }
         },
@@ -1011,6 +1014,8 @@ define([
                         });
                     }
                 }, this);
+            if (this.emailMenu && this.emailMenu.rendered)
+                this.emailMenu.cmpEl.css('display', 'none');
         },
 
         isCommentsViewMouseOver: function () {
@@ -1118,7 +1123,10 @@ define([
                             return (item.email && 0 === item.email.toLowerCase().indexOf(str) || item.name && 0 === item.name.toLowerCase().indexOf(str))
                         });
                     }
-                    var tpl = _.template('<a id="<%= id %>" tabindex="-1" type="menuitem" style="font-size: 12px;"><div><%= Common.Utils.String.htmlEncode(caption) %></div><div style="color: #909090;"><%= Common.Utils.String.htmlEncode(options.value) %></div></a>'),
+                    var tpl = _.template('<a id="<%= id %>" tabindex="-1" type="menuitem" style="font-size: 12px;">' +
+                                            '<div style="overflow: hidden; text-overflow: ellipsis; max-width: 195px;"><%= Common.Utils.String.htmlEncode(caption) %></div>' +
+                                            '<div style="overflow: hidden; text-overflow: ellipsis; max-width: 195px; color: #909090;"><%= Common.Utils.String.htmlEncode(options.value) %></div>' +
+                                        '</a>'),
                         divider = false;
                     _.each(users, function(menuItem, index) {
                         if (divider && !menuItem.hasAccess) {
@@ -1157,11 +1165,13 @@ define([
         },
 
         insertEmailToTextbox: function(str, left, right) {
-            var textBox = this.commentsView.getTextBox(),
+            var textBox = this.commentsView.getTextBox();
-                val = textBox.val();
+            if (!textBox) return;
-            textBox.val(val.substring(0, left) + '+' + str + val.substring(right+1, val.length));
+
+            var val = textBox.val();
+            textBox.val(val.substring(0, left) + '+' + str + ' ' + val.substring(right+1, val.length));
             setTimeout(function(){
-                textBox[0].selectionStart = textBox[0].selectionEnd = left + str.length + 1;
+                textBox[0].selectionStart = textBox[0].selectionEnd = left + str.length + 2;
             }, 10);
         },
 

apps/common/main/lib/view/SaveAsDlg.js

@@ -122,6 +122,8 @@ define([
             if (msg && msg.Referer == "onlyoffice") {
                 if ( !_.isEmpty(msg.error) ) {
                     this.trigger('saveaserror', this, msg.error);
+                } else if (!_.isEmpty(msg.message)) {
+                    Common.NotificationCenter.trigger('showmessage', {msg: msg.message});
                 }
 //                if ( !_.isEmpty(msg.folder) ) {
 //                    this.trigger('saveasfolder', this, msg.folder); // save last folder url

apps/common/main/resources/img/header/buttons.svg

@@ -42,11 +42,11 @@
     </symbol>
     <symbol id="svg-btn-save-sync" viewBox="0 0 20 20">
         <rect x="6" y="10" width="3" height="1" fill="#ffffff"/>
-        <rect x="6" y="12" width="2" height="1" fill="#ffffff"/>
+        <rect x="6" y="12" width="3" height="1" fill="#ffffff"/>
-        <path fill-rule="evenodd" clip-rule="evenodd" d="M15 15H4V4H6V7H12V4H12.5858L15 6.41421V15ZM11 4H10V6H11V4ZM4 3H13L16 6V15C16 15.5523 15.5523 16 15 16H4C3.44772 16 3 15.5523 3 15V4C3 3.44772 3.44772 3 4 3Z" fill="#ffffff"/>
+        <rect x="10" y="10" width="9" height="7" rx="1" fill="#FFD114"/>
-        <rect x="8" y="10" width="9" height="7" rx="1" fill="#FFD114"/>
+        <rect x="12" y="12" width="5" height="1" fill="#444444"/>
-        <rect x="10" y="12" width="5" height="1" fill="#444444"/>
+        <rect x="12" y="14" width="5" height="1" fill="#444444"/>
-        <rect x="10" y="14" width="5" height="1" fill="#444444"/>
+        <path fill-rule="evenodd" clip-rule="evenodd" d="M4 15H9V16H4C3.44772 16 3 15.5523 3 15V4C3 3.44772 3.44772 3 4 3H13L16 6V9H15V6.41421L12.5858 4H12V7H6V4H4V15ZM10 4H11V6H10V4Z" fill="#ffffff"/>
     </symbol>
     <symbol id="svg-btn-undo" viewBox="0 0 20 20">
         <path d="M11.355,7.625c-1.965,0-3.864,0.777-5.151,2.033L4,7.625V14h6.407l-2.091-2.219

apps/common/main/resources/less/about.less

@@ -11,6 +11,8 @@
             only screen and (min-resolution: 2dppx),
             only screen and (min-resolution: 192dpi) {
                 content: data-uri('@{common-image-path}/about/logo@2x.png');
+                display: block;
+                transform: scale(.5);
             }
         }
     }

apps/common/main/resources/less/buttons.less

@@ -399,6 +399,13 @@
                 }
             }
         }
+        .dropdown-menu {
+            &.scale-menu {
+                li.disabled {
+                    opacity: 0.65;
+                }
+            }
+        }
     }
 
 @color-gray: @secondary;

apps/common/main/resources/less/calendar.less

@@ -0,0 +1,128 @@
+@calendar-bg-color: @tabs-bg-color;
+
+.calendar-window {
+  border-radius: 0;
+  box-shadow: none;
+}
+.calendar-box {
+  width: 198px;
+  height: 220px;
+  border: 1px solid @calendar-bg-color;
+  .top-row {
+    padding: 0 5px;
+  }
+  .btn {
+    background-color: transparent;
+    border: none;
+    height: 20px;
+    width: 20px;
+    margin-top: 4px;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    .icon {
+      width: 16px;
+      height: 16px;
+      display: block;
+      position: relative;
+      &.arrow-prev {
+        background-position: -55px -96px;
+      }
+      &.arrow-next {
+        background-position: -52px -112px;
+      }
+    }
+    &:hover {
+      background-color: rgba(255,255,255,0.2);
+      cursor: pointer;
+    }
+  }
+  .calendar-header {
+    height: 50px;
+    background-color: @calendar-bg-color;
+    color: #FFFFFF;
+    .top-row {
+      display: flex;
+      justify-content: space-between;
+    }
+    .bottom-row {
+      display: flex;
+      justify-content: space-around;
+      padding: 0;
+    }
+    .title {
+      width: 100%;
+      margin: 4px 6px 3px 6px;
+      text-align: center;
+      font-size: 13px;
+      label {
+        padding: 2px 10px 0;
+        display: block;
+        font-weight: bold;
+        &:not(:last-of-type) {
+          margin-right: 6px;
+        }
+      }
+      .button {
+        height: 100%;
+        width: 100%;
+        &:hover {
+          background-color: rgba(255,255,255,0.2);
+          cursor: pointer;
+          label {
+            cursor: pointer;
+          }
+        }
+      }
+
+    }
+  }
+  .calendar-content {
+    .item {
+      margin: 0;
+      padding: 0;
+      height: auto;
+      width: auto;
+      box-shadow: none;
+      border: 1px solid #fff;
+      .name-month, .name-year {
+        height: 40px;
+        width: 47px;
+        background-color: #F1F1F1;
+        display: flex;
+        justify-content: center;
+        align-items: center;
+        font-size: 13px;
+      }
+      .number-day {
+        height: 26px;
+        width: 26px;
+        background-color: #F1F1F1;
+        display: flex;
+        justify-content: center;
+        align-items: center;
+      }
+      &.selected {
+        .number-day, .name-month, .name-year {
+          color: #fff;
+          background-color: #7D858C;
+        }
+      }
+      .weekend {
+        color: #D25252;
+      }
+      .no-current-month, .no-cur-year, .no-current-decade {
+        color: #A5A5A5;
+      }
+      &:not(.disabled):not(.selected) {
+        .number-day, .name-month, .name-year {
+          &:hover {
+            background-color: #D9D9D9;
+          }
+        }
+      }
+
+
+    }
+  }
+}

apps/common/main/resources/less/comments.less

@@ -187,6 +187,10 @@
         &.user-select {
             cursor: text;
         }
+        &.user-select::selection {
+            background: #3494fb;
+            color: white;
+        }
     }
 
     .user-reply {

apps/common/main/resources/less/header.less

@@ -141,7 +141,18 @@
             height: 20px;
             display: inline-block;
             vertical-align: middle;
-            .background-ximage('@{common-image-path}/header/header-logo.png', '@{common-image-path}/header/header-logo@2x.png', 86px);
+
+            background-image: ~"url('@{common-image-const-path}/header/header-logo.png')";
+            background-repeat: no-repeat;
+
+            @media
+            only screen and (-webkit-min-device-pixel-ratio: 2),
+            only screen and (min-resolution: 2dppx),
+            only screen and (min-resolution: 192dpi) {
+                background-image: ~"url('@{common-image-const-path}/header/header-logo@2x.png')";
+                background-size: 86px auto;
+            }
+
         }
 
         &.link img {

apps/common/main/resources/less/input.less

@@ -80,3 +80,8 @@ input.error {
 input[type="password"] {
     font-size: 16px;
 }
+
+input[type="text"]::selection, textarea::selection {
+    background: #3494fb;
+    color: white;
+}

apps/common/main/resources/less/multislider-gradient.less

@@ -40,6 +40,10 @@
         &.active .thumb-bottom {
             border-bottom-width: 2px;
         }
+
+        &.remove {
+            opacity: 0.5;
+        }
     }
 
     .track {

apps/common/main/resources/less/symboltable.less

@@ -0,0 +1,54 @@
+#symbol-table-scrollable-div, #symbol-table-recent {
+  div{
+    display: inline-block;
+    vertical-align: top;
+  }
+
+  .cell{
+    width: 31px;
+    height: 33px;
+    border-right: 1px solid @gray-soft;
+    border-bottom: 1px solid @gray-soft;
+    background: #ffffff;
+    align-content: center;
+    vertical-align: middle;
+    text-align: center;
+    font-size: 22px;
+    -khtml-user-select: none;
+    user-select: none;
+    -moz-user-select: none;
+    -webkit-user-select: none;
+    cursor: default;
+    overflow:hidden;
+    display: inline-block;
+  }
+
+  .cell-selected{
+    background-color: @gray-darker;
+    color: white;
+  }
+}
+
+#symbol-table-recent {
+  width: 100%;
+  height: 32px;
+  overflow: hidden;
+  border: @gray-soft solid 1px;
+}
+
+#symbol-table-scrollable-div {
+  #id-preview {
+    width: 100%;
+    height: 132px;
+    position:relative;
+    overflow:hidden;
+    border: @gray-soft solid 1px;
+  }
+
+  #id-preview-data {
+    width: 100%;
+    height: 132px;
+    position:relative;
+    overflow:hidden;
+  }
+}

apps/common/main/resources/less/toolbar.less

@@ -520,7 +520,7 @@
 .button-normal-icon(btn-watermark,          63, @toolbar-big-icon-size);
 .button-normal-icon(btn-color-schema,       64, @toolbar-big-icon-size);
 .button-normal-icon(btn-ins-formula,        65, @toolbar-big-icon-size);
-.button-normal-icon(btn-autosumm,           66, @toolbar-big-icon-size);
+.button-normal-icon(btn-autosum,            66, @toolbar-big-icon-size);
 .button-normal-icon(btn-recent,             67, @toolbar-big-icon-size);
 .button-normal-icon(btn-finance,            68, @toolbar-big-icon-size);
 .button-normal-icon(btn-logic,              69, @toolbar-big-icon-size);
@@ -533,6 +533,8 @@
 .button-normal-icon(btn-caption,            76, @toolbar-big-icon-size);
 .button-normal-icon(btn-calculation,        80, @toolbar-big-icon-size);
 .button-normal-icon(btn-scale,              81, @toolbar-big-icon-size);
+.button-normal-icon(btn-rem-comment,        83, @toolbar-big-icon-size);
+.button-normal-icon(btn-symbol,             84, @toolbar-big-icon-size);
 
 [applang=ru] {
     .btn-toolbar {
@@ -582,3 +584,137 @@
     width: 20px;
     height: 20px;
 }
+
+// charts
+.menu-insertchart {
+    .group-description {
+        padding-left: 4px;
+    }
+
+    .group-items-container {
+        float: left;
+        position: relative;
+    }
+}
+
+.item-chartlist {
+    .background-ximage('@{common-image-path}/toolbar/charttypes.png', '@{common-image-path}/toolbar/charttypes@2x.png', 250px);
+    width: 50px;
+    height: 50px;
+}
+
+.line-normal {
+    background-position: 0 0;
+}
+
+.line-stack {
+    background-position: -50px 0;
+}
+
+.line-pstack {
+    background-position: -100px 0;
+}
+
+.line-3d {
+    background-position: -150px 0;
+}
+
+.column-normal {
+    background-position: 0 -50px;
+}
+
+.column-stack{
+    background-position: -50px -50px;
+}
+
+.column-pstack{
+    background-position: -100px -50px;
+}
+
+.column-3d-normal {
+    background-position: -150px -50px;
+}
+
+.column-3d-stack{
+    background-position: -200px -50px;
+}
+
+.column-3d-pstack{
+    background-position: -150px -100px;
+}
+
+.column-3d-normal-per{
+    background-position: -200px -100px;
+}
+
+.bar-normal {
+    background-position: 0 -100px;
+}
+
+.bar-stack{
+    background-position: -50px -100px;
+}
+
+.bar-pstack{
+    background-position: -100px -100px;
+}
+
+.bar-3d-normal {
+    background-position: -150px -150px;
+}
+
+.bar-3d-stack{
+    background-position: -200px -150px;
+}
+
+.bar-3d-pstack{
+    background-position: -150px -200px;
+}
+
+.area-normal {
+    background-position: 0 -150px;
+}
+
+.area-stack{
+    background-position: -50px -150px;
+}
+
+.area-pstack{
+    background-position: -100px -150px;
+}
+
+.pie-normal {
+    background-position: 0 -200px;
+}
+
+.pie-3d-normal {
+    background-position: -200px -200px;
+}
+
+.point-normal{
+    background-position: -50px -200px;
+}
+
+.stock-normal{
+    background-position: -100px -200px;
+}
+
+.pie-doughnut{
+    background-position: -200px 0;
+}
+
+.surface-normal{
+    background-position: 0px -300px;
+}
+
+.surface-wireframe{
+    background-position: -50px -300px;
+}
+
+.contour-normal{
+    background-position: -100px -300px;
+}
+
+.contour-wireframe{
+    background-position: -150px -300px;
+}

apps/common/main/resources/symboltable/ru.json

@@ -0,0 +1,275 @@
+{
+	"Basic Latin": "Основная латиница",
+	"Latin 1 Supplement": "Дополнительная латиница-1",
+	"Latin Extended A": "Расширенная латиница-A",
+	"Latin Extended B": "Расширенная латиница-B",
+	"IPA Extensions": "Международный фонетический алфавит",
+	"Spacing Modifier Letters": "Некомбинируемые протяжённые символы-модификаторы",
+	"Combining Diacritical Marks": "Комбинируемые диакритические знаки",
+	"Greek and Coptic": "Греческий и коптский алфавиты",
+	"Cyrillic": "Кириллица",
+	"Cyrillic Supplement": "Кириллица. Дополнительные символы",
+	"Armenian": "Армянский алфавит",
+	"Hebrew": "Иврит",
+	"Arabic": "Арабский",
+	"Syriac": "Сирийский",
+	"Arabic Supplement": "Дополнительные символы арабского письма",
+	"Thaana": "Тана",
+	"NKo": "Нко",
+	"Samaritan": "Самаритянское письмо",
+	"Mandaic": "Мандейский алфавит",
+	"Arabic Extended A": "Расширенный набор символов арабского письма-A",
+	"Devanagari": "Деванагари",
+	"Bengali": "Бенгальский",
+	"Gurmukhi": "Гурмукхи",
+	"Gujarati": "Гуджарати",
+	"Oriya": "Ория",
+	"Tamil": "Тамильская письменность",
+	"Telugu": "Телугу",
+	"Kannada": "Каннада",
+	"Malayalam": "Малаялам",
+	"Sinhala": "Сингальская письменность",
+	"Thai": "Тайская письменность",
+	"Lao": "Лаосская письменность",
+	"Tibetan": "Тибетская письменность",
+	"Myanmar": "Бирманский",
+	"Georgian": "Грузинский",
+	"Hangul Jamo": "Хангыль чамо",
+	"Ethiopic": "Эфиопская слоговая письменность",
+	"Ethiopic Supplement": "Дополнительные символы эфиопской письменности",
+	"Cherokee": "Письменность чероки",
+	"Unified Canadian Aboriginal Syllabics": "Канадское слоговое письмо",
+	"Ogham": "Огамическое письмо",
+	"Runic": "Руническая письменность",
+	"Tagalog": "Тагальская письменность. Байбайин",
+	"Hanunoo": "Хануноо",
+	"Buhid": "Бухид",
+	"Tagbanwa": "Тагбанва",
+	"Khmer": "Кхмерская письменность",
+	"Mongolian": "Старомонгольская письменность",
+	"Unified Canadian Aboriginal Syllabics Extended": "Расширенный набор символов канадского слогового письма",
+	"Limbu": "Письменность лимбу",
+	"Tai Le": "Письменность тай лы",
+	"New Tai Lue": "Новый алфавит тай лы",
+	"Khmer Symbols": "Кхмерские символы",
+	"Buginese": "Бугийская письменность. Лонтара",
+	"Tai Tham": "Тай Тхам",
+	"Combining Diacritical Marks Extended": "Комбинируемые диакритические знаки (расширение)",
+	"Balinese": "Балийское письмо",
+	"Sundanese": "Сунданское письмо",
+	"Batak": "Батакское письмо",
+	"Lepcha": "Письмо лепча",
+	"Ol Chiki": "Письменность Ол-чики",
+	"Cyrillic Extended C": "Расширенная кириллица C",
+	"Sundanese Supplement": "Сунданское расширенное письмо",
+	"Vedic Extensions": "Ведические символы",
+	"Phonetic Extensions": "Фонетические расширения",
+	"Phonetic Extensions Supplement": "Дополнительные фонетические расширения",
+	"Combining Diacritical Marks Supplement": "Дополнительные комбинируемые диакритические знаки",
+	"Latin Extended Additional": "Дополнительная расширенная латиница",
+	"Greek Extended": "Расширенный набор символов греческого алфавита",
+	"General Punctuation": "Знаки пунктуации",
+	"Superscripts and Subscripts": "Надстрочные и подстрочные знаки",
+	"Currency Symbols": "Символы валют",
+	"Combining Diacritical Marks for Symbols": "Комбинируемые диакритические знаки для символов",
+	"Letterlike Symbols": "Буквоподобные символы",
+	"Number Forms": "Числовые формы",
+	"Arrows": "Стрелки",
+	"Mathematical Operators": "Математические операторы",
+	"Miscellaneous Technical": "Разнообразные технические символы",
+	"Control Pictures": "Значки управляющих кодов",
+	"Optical Character Recognition": "Символы оптического распознавания",
+	"Enclosed Alphanumerics": "Вложенные буквы и цифры",
+	"Box Drawing": "Символы для рисования рамок",
+	"Block Elements": "Символы заполнения",
+	"Geometric Shapes": "Геометрические фигуры",
+	"Miscellaneous Symbols": "Разнообразные символы",
+	"Dingbats": "Дингбаты",
+	"Miscellaneous Mathematical Symbols A": "Разнообразные математические символы-A",
+	"Supplemental Arrows A": "Дополнительные стрелки-A",
+	"Braille Patterns": "Азбука Брайля",
+	"Supplemental Arrows B": "Дополнительные стрелки-B",
+	"Miscellaneous Mathematical Symbols B": "Разнообразные математические символы-B",
+	"Supplemental Mathematical Operators": "Дополнительные математические операторы",
+	"Miscellaneous Symbols and Arrows": "Разнообразные символы и стрелки",
+	"Glagolitic": "Глаголица",
+	"Latin Extended C": "Расширенная латиница C",
+	"Coptic": "Коптский алфавит",
+	"Georgian Supplement": "Дополнительные символы грузинского алфавита",
+	"Tifinagh": "Тифинаг (Древнеливийское письмо)",
+	"Ethiopic Extended": "Расширенный набор символов эфиопского письма",
+	"Cyrillic Extended A": "Расширенная кириллица A",
+	"Supplemental Punctuation": "Дополнительные знаки пунктуации",
+	"CJK Radicals Supplement": "Дополнительные иероглифические ключи ККЯ",
+	"Kangxi Radicals": "Иероглифические ключи словаря Канси",
+	"Ideographic Description Characters": "Символы описания иероглифов",
+	"CJK Symbols and Punctuation": "Символы и пунктуация ККЯ",
+	"Hiragana": "Хирагана",
+	"Katakana": "Катакана",
+	"Bopomofo": "Чжуинь. Бопомофо",
+	"Hangul Compatibility Jamo": "Комбинируемые чамо Хангыля",
+	"Kanbun": "Канбун(китайский)",
+	"Bopomofo Extended": "Расширенный набор символов бопомофо, чжуинь",
+	"CJK Strokes": "Черты ККЯ",
+	"Katakana Phonetic Extensions": "Фонетические расширения катаканы",
+	"Enclosed CJK Letters and Months": "Вложенные буквы и месяцы ККЯ",
+	"CJK Compatibility": "Знаки совместимости ККЯ",
+	"CJK Unified Ideographs Extension": "Унифицированные иероглифы ККЯ. Расширение А",
+	"Yijing Hexagram Symbols": "Гексаграммы И-Цзин",
+	"CJK Unified Ideographs": "Унифицированные иероглифы ККЯ",
+	"Yi Syllables": "Слоги. Письмо И",
+	"Yi Radicals": "Радикалы. Письмо И",
+	"Lisu": "Лису",
+	"Vai": "Слоговая письменность ваи",
+	"Cyrillic Extended B": "Расширенная кириллица-B",
+	"Bamum": "Письмо бамум",
+	"Modifier Tone Letters": "Символы изменения тона",
+	"Latin Extended D": "Расширенная латиница-D",
+	"Syloti Nagri": "Силоти нагри",
+	"Common Indic Number Forms": "Индийские числовые символы",
+	"Phags pa": "Квадратное письмо Пагба-ламы",
+	"Saurashtra": "Саураштра",
+	"Devanagari Extended": "Расширенный набор символов деванагари",
+	"Kayah Li": "Кайях Ли",
+	"Rejang": "Реджанг",
+	"Hangul Jamo Extended A": "Хангыль",
+	"Javanese": "Яванская письменность",
+	"Myanmar Extended B": "Расширенный бирманский-B",
+	"Cham": "Чамское письмо",
+	"Myanmar Extended A": "Мьянманская письменность. Расширение A",
+	"Tai Viet": "Письменность Тай Вьет",
+	"Meetei Mayek Extensions": "Мейтей расширенная",
+	"Ethiopic Extended A": "Набор расширенных символов эфиопского письма-А",
+	"Latin Extended E": "Расширенная латиница-E",
+	"Cherokee Supplement": "Письменность чероки (дополнение)",
+	"Meetei Mayek": "Мейтей (Манипури)",
+	"Hangul Syllables": "Слоги Хангыля",
+	"Hangul Jamo Extended B": "Расширенные хангыль чамо B",
+	"High Surrogates": "Верхняя часть суррогатных пар",
+	"High Private Use Surrogates": "Верхняя часть суррогатных пар для частного использования",
+	"Low Surrogates": "Нижняя часть суррогатных пар",
+	"Private Use Area": "Область для частного использования",
+	"CJK Compatibility Ideographs": "Совместимые иероглифы ККЯ",
+	"Alphabetic Presentation Forms": "Алфавитные формы представления",
+	"Arabic Presentation Forms A": "Формы представления арабских букв-A",
+	"Variation Selectors": "Селекторы вариантов начертания",
+	"Vertical Forms": "Вертикальные формы",
+	"Combining Half Marks": "Комбинируемые половинки символов",
+	"CJK Compatibility Forms": "Формы совместимости ККЯ",
+	"Small Form Variants": "Варианты малого размера",
+	"Arabic Presentation Forms B": "Формы представления арабских букв-B",
+	"Halfwidth and Fullwidth Forms": "Полуширинные и полноширинные формы",
+	"Specials": "Специальные символы",
+	"Linear B Syllabary": "Слоги линейного письма Б",
+	"Linear B Ideograms": "Идеограммы линейного письма Б",
+	"Aegean Numbers": "Эгейские цифры",
+	"Ancient Greek Numbers": "Древнегреческие единицы измерения",
+	"Ancient Symbols": "Древние символы",
+	"Phaistos Disc": "Символы фестского диска",
+	"Lycian": "Ликийский алфавит",
+	"Carian": "Алфавит карийского языка",
+	"Coptic Epact Numbers": "Коптские числа епакты",
+	"Old Italic": "Этрусский (староитальянский) алфавит",
+	"Gothic": "Готский алфавит",
+	"Old Permic": "Древнепермское письмо",
+	"Ugaritic": "Угаритский алфавит",
+	"Old Persian": "Древнеперсидский клинописный алфавит",
+	"Deseret": "Дезеретский алфавит",
+	"Shavian": "Алфавит Бернарда Шоу",
+	"Osmanya": "Османья (сомалийский алфавит)",
+	"Osage": "Оседж",
+	"Elbasan": "Эльбасанское письмо",
+	"Caucasian Albanian": "Агванское письмо (Кавказская Албания)",
+	"Linear A": "Линейное письмо А",
+	"Cypriot Syllabary": "Слоговая письменность острова Кипр",
+	"Imperial Aramaic": "Имперское арамейское письмо",
+	"Palmyrene": "Пальмирский алфавит",
+	"Nabataean": "Набатейское письмо",
+	"Hatran": "Хатран",
+	"Phoenician": "Финикийское письмо",
+	"Lydian": "Лидийский алфавит",
+	"Meroitic Hieroglyphs": "Лидийский алфавит",
+	"Meroitic Cursive": "Курсивное мероитское письмо",
+	"Kharoshthi": "Кхароштхи",
+	"Old South Arabian": "Старый южноаравийский алфавит",
+	"Old North Arabian": "Старый североаравийский алфавит",
+	"Manichaean": "Манихейское письмо",
+	"Avestan": "Авестийский алфавит",
+	"Inscriptional Parthian": "Пехлевийское письмо для парфянского языка",
+	"Inscriptional Pahlavi": "Эпиграфическое пехлевийское письмо",
+	"Psalter Pahlavi": "Псалтырь пехлеви",
+	"Old Turkic": "Древнетюркское руническое письмо",
+	"Old Hungarian": "Венгерские руны",
+	"Rumi Numeral Symbols": "Цифры системы руми",
+	"Brahmi": "Брахмическая письменность",
+	"Kaithi": "Кайтхи",
+	"Sora Sompeng": "Соранг сомпенг",
+	"Chakma": "Чакма",
+	"Mahajani": "Махаяни",
+	"Sharada": "Шарада",
+	"Sinhala Archaic Numbers": "Сингальские архаические цифры",
+	"Khojki": "Кходжики",
+	"Multani": "Мултани",
+	"Khudawadi": "Кхудабади",
+	"Grantha": "Грантха",
+	"Newa": "Нева",
+	"Tirhuta": "Тирхута",
+	"Siddham": "Сиддхаматрика",
+	"Modi": "Моди",
+	"Mongolian Supplement": "Монгольский (дополнение)",
+	"Takri": "Такри",
+	"Ahom": "Письмо ахом",
+	"Warang Citi": "Варанг-кшити",
+	"Pau Cin Hau": "Пау Цин Хау",
+	"Bhaiksuki": "Байсаки",
+	"Marchen": "Марчен",
+	"Cuneiform": "Клинопись",
+	"Cuneiform Numbers and Punctuation": "Клинописные цифры и знаки препинания",
+	"Early Dynastic Cuneiform": "Ранняя династическая клинопись",
+	"Egyptian Hieroglyphs": "Египетские иероглифы",
+	"Anatolian Hieroglyphs": "Анатолийские иероглифы",
+	"Bamum Supplement": "Письмо бамум (дополнение)",
+	"Mro": "Мру",
+	"Bassa Vah": "Письмо басса",
+	"Pahawh Hmong": "Пахау хмонг",
+	"Miao": "Письмо Полларда (миао)",
+	"Ideographic Symbols and Punctuation": "Идеографические символы и знаки препинания",
+	"Tangut": "Тангутское письмо",
+	"Tangut Components": "Компоненты тангутского письма",
+	"Kana Supplement": "Кана (дополнение)",
+	"Duployan": "Дюплойе",
+	"Shorthand Format Controls": "Форматирующие символы стенографии",
+	"Byzantine Musical Symbols": "Византийские музыкальные символы",
+	"Musical Symbols": "Музыкальные символы",
+	"Ancient Greek Musical Notation": "Древнегреческие музыкальные символы",
+	"Tai Xuan Jing Symbols": "Символы Тай Сюань Цзин",
+	"Counting Rod Numerals": "Счётные палочки",
+	"Mathematical Alphanumeric Symbols": "Математические буквенно-цифровые символы",
+	"Sutton SignWriting": "Жестовая письменность Саттон",
+	"Glagolitic Supplement": "Глаголица (расширение)",
+	"Mende Kikakui": "Письмо кикакуи для языка менде",
+	"Adlam": "Адлам",
+	"Arabic Mathematical Alphabetic Symbols": "Арабские математические буквенно-цифровые символы",
+	"Mahjong Tiles": "Кости для маджонга",
+	"Domino Tiles": "Кости для домино",
+	"Playing Cards": "Игральные карты",
+	"Enclosed Alphanumeric Supplement": "Вложенные буквенно-цифровые символы (дополнение)",
+	"Enclosed Ideographic Supplement": "Вложенные идеографические символы (дополнение)",
+	"Miscellaneous Symbols and Pictographs": "Различные символы и пиктограммы",
+	"Emoticons": "Эмотикон (эмоджи)",
+	"Ornamental Dingbats": "Элементы орнамента",
+	"Transport and Map Symbols": "Транспортные и картографические символы",
+	"Alchemical Symbols": "Алхимические символы",
+	"Geometric Shapes Extended": "Геометрические фигуры (расширение)",
+	"Supplemental Arrows C": "Дополнительные стрелки-С",
+	"Supplemental Symbols and Pictographs": "Символы и пиктограммы (дополнение)",
+	"CJK Unified Ideographs Extension B": "Унифицированные иероглифы ККЯ. Расширение B",
+	"CJK Unified Ideographs Extension C": "Унифицированные иероглифы ККЯ. Расширение C",
+	"CJK Unified Ideographs Extension D": "Унифицированные иероглифы ККЯ. Расширение D",
+	"CJK Unified Ideographs Extension E": "Унифицированные иероглифы ККЯ. Расширение E",
+	"CJK Compatibility Ideographs Supplement": "Унифицированные иероглифы ККЯ (дополнение)",
+	"Tags": "Теги",
+	"Variation Selectors Supplement": "Селекторы вариантов начертания (дополнение)",
+	"Supplementary Private Use Area A": "Дополнительная область для частного использования — A",
+	"Supplementary Private Use Area B": "Дополнительная область для частного использования — B"	
+}

apps/common/mobile/lib/component/HsbColorPicker.js

@@ -0,0 +1,327 @@
+/*
+ *
+ * (c) Copyright Ascensio System SIA 2010-2019
+ *
+ * This program is a free software product. You can redistribute it and/or
+ * modify it under the terms of the GNU Affero General Public License (AGPL)
+ * version 3 as published by the Free Software Foundation. In accordance with
+ * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect
+ * that Ascensio System SIA expressly excludes the warranty of non-infringement
+ * of any third-party rights.
+ *
+ * This program is distributed WITHOUT ANY WARRANTY; without even the implied
+ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR  PURPOSE. For
+ * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html
+ *
+ * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha
+ * street, Riga, Latvia, EU, LV-1050.
+ *
+ * The  interactive user interfaces in modified source and object code versions
+ * of the Program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU AGPL version 3.
+ *
+ * Pursuant to Section 7(b) of the License you must retain the original Product
+ * logo when distributing the program. Pursuant to Section 7(e) we decline to
+ * grant you any rights under trademark law for use of our trademarks.
+ *
+ * All the Product's GUI elements, including illustrations and icon sets, as
+ * well as technical writing content are licensed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International. See the License
+ * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
+ *
+ */
+
+/**
+ *  HsbColorPicker.js
+ *
+ *  Created by Julia Svinareva on 02/10/19
+ *  Copyright (c) 2019 Ascensio System SIA. All rights reserved.
+ *
+ */
+
+if (Common === undefined)
+    var Common = {};
+
+Common.UI = Common.UI || {};
+
+define([
+    'jquery',
+    'underscore',
+    'backbone'
+], function ($, _, Backbone) {
+    'use strict';
+
+    Common.UI.HsbColorPicker = Backbone.View.extend(_.extend({
+        options: {
+            color: '#000000'
+        },
+        template: _.template([
+            '<div class="custom-colors <% if (phone) { %> phone <% } %>">',
+                '<div class="color-picker-wheel">',
+                    '<svg id="id-wheel" viewBox="0 0 300 300" width="300" height="300"><%=circlesColors%></svg>',
+                    '<div class="color-picker-wheel-handle"></div>',
+                    '<div class="color-picker-sb-spectrum" style="background-color: hsl(0, 100%, 50%)">',
+                        '<div class="color-picker-sb-spectrum-handle"></div>',
+                    '</div>',
+                '</div>',
+                '<div class="right-block">',
+                    '<div class="color-hsb-preview">',
+                        '<div class="new-color-hsb-preview" style=""></div>',
+                        '<div class="current-color-hsb-preview" style=""></div>',
+                    '</div>',
+                    '<a href="#" class="button button-round" id="add-new-color"><i class="icon icon-plus" style="height: 30px;width: 30px;"></i></a>',
+                '</div>',
+            '</div>'
+        ].join('')),
+
+        initialize : function(options) {
+            var me = this,
+                el = $(me.el);
+            me.currentColor = options.color;
+            if(_.isObject(me.currentColor)) {
+                me.currentColor = me.currentColor.color;
+            }
+            if (!me.currentColor) {
+                me.currentColor = me.options.color;
+            }
+            if (me.currentColor === 'transparent') {
+                me.currentColor = 'ffffff';
+            }
+            var colorRgb = me.colorHexToRgb(me.currentColor);
+            me.currentHsl = me.colorRgbToHsl(colorRgb[0],colorRgb[1],colorRgb[2]);
+            me.currentHsb = me.colorHslToHsb(me.currentHsl[0],me.currentHsl[1],me.currentHsl[2]);
+            me.currentHue = [];
+
+            me.options = _({}).extend(me.options, options);
+            me.render();
+        },
+
+        render: function () {
+            var me = this;
+
+            var total = 256,
+                circles = '';
+            for (var i = total; i > 0; i -= 1) {
+                var angle = i * Math.PI / (total / 2);
+                var hue = 360 / total * i;
+                circles += '<circle cx="' + (150 - Math.sin(angle) * 125) + '" cy="' + (150 - Math.cos(angle) * 125) + '" r="25" fill="hsl( ' + hue + ', 100%, 50%)"></circle>';
+            }
+
+            (me.$el || $(me.el)).html(me.template({
+                circlesColors: circles,
+                scope: me,
+                phone: Common.SharedSettings.get('phone'),
+                android: Common.SharedSettings.get('android')
+            }));
+
+            $('.current-color-hsb-preview').css({'background-color': '#' + me.currentColor});
+
+            this.afterRender();
+
+            return me;
+        },
+
+        afterRender: function () {
+            this.$colorPicker = $('.color-picker-wheel');
+            this.$colorPicker.on({
+                'touchstart': this.handleTouchStart.bind(this),
+                'touchmove': this.handleTouchMove.bind(this),
+                'touchend': this.handleTouchEnd.bind(this)
+            });
+            $('#add-new-color').single('click', _.bind(this.onClickAddNewColor, this));
+            this.updateCustomColor();
+        },
+
+        colorHexToRgb: function(hex) {
+            var h = hex.replace(/^#?([a-f\d])([a-f\d])([a-f\d])$/i, function(m, r, g, b) { return (r + r + g + g + b + b)});
+            var result = /^#?([a-f\d]{2})([a-f\d]{2})([a-f\d]{2})$/i.exec(h);
+            return result
+                ? result.slice(1).map(function (n) { return parseInt(n, 16)})
+                : null;
+        },
+
+        colorRgbToHsl: function(r, g, b) {
+            r /= 255;
+            g /= 255;
+            b /= 255;
+            var max = Math.max(r, g, b);
+            var min = Math.min(r, g, b);
+            var d = max - min;
+            var h;
+            if (d === 0) h = 0;
+            else if (max === r) h = ((g - b) / d) % 6;
+            else if (max === g) h = (b - r) / d + 2;
+            else if (max === b) h = (r - g) / d + 4;
+            var l = (min + max) / 2;
+            var s = d === 0 ? 0 : d / (1 - Math.abs(2 * l - 1));
+            if (h < 0) h = 360 / 60 + h;
+            return [h * 60, s, l];
+        },
+
+        colorHslToHsb: function(h, s, l) {
+            var HSB = {h: h, s: 0, b: 0};
+            var HSL = {h: h, s: s, l: l};
+            var t = HSL.s * (HSL.l < 0.5 ? HSL.l : 1 - HSL.l);
+            HSB.b = HSL.l + t;
+            HSB.s = HSL.l > 0 ? 2 * t / HSB.b : HSB.s;
+            return [HSB.h, HSB.s, HSB.b];
+        },
+
+        colorHsbToHsl: function(h, s, b) {
+            var HSL = {h: h, s: 0, l: 0};
+            var HSB = { h: h, s: s, b: b };
+            HSL.l = (2 - HSB.s) * HSB.b / 2;
+            HSL.s = HSL.l && HSL.l < 1 ? HSB.s * HSB.b / (HSL.l < 0.5 ? HSL.l * 2 : 2 - HSL.l * 2) : HSL.s;
+            return [HSL.h, HSL.s, HSL.l];
+        },
+
+        colorHslToRgb: function(h, s, l) {
+            var c = (1 - Math.abs(2 * l - 1)) * s;
+            var hp = h / 60;
+            var x = c * (1 - Math.abs((hp % 2) - 1));
+            var rgb1;
+            if (Number.isNaN(h) || typeof h === 'undefined') {
+                rgb1 = [0, 0, 0];
+            } else if (hp <= 1) rgb1 = [c, x, 0];
+            else if (hp <= 2) rgb1 = [x, c, 0];
+            else if (hp <= 3) rgb1 = [0, c, x];
+            else if (hp <= 4) rgb1 = [0, x, c];
+            else if (hp <= 5) rgb1 = [x, 0, c];
+            else if (hp <= 6) rgb1 = [c, 0, x];
+            var m = l - (c / 2);
+            var result = rgb1.map(function (n) {
+                return Math.max(0, Math.min(255, Math.round(255 * (n + m))));
+            });
+            return result;
+        },
+
+        colorRgbToHex: function(r, g, b) {
+            var result = [r, g, b].map( function (n) {
+                var hex = n.toString(16);
+                return hex.length === 1 ? ('0' + hex) : hex;
+            }).join('');
+            return ('#' + result);
+        },
+
+        setHueFromWheelCoords: function (x, y) {
+            var wheelCenterX = this.wheelRect.left + this.wheelRect.width / 2;
+            var wheelCenterY = this.wheelRect.top + this.wheelRect.height / 2;
+            var angleRad = Math.atan2(y - wheelCenterY, x - wheelCenterX);
+            var angleDeg = angleRad * 180 / Math.PI + 90;
+            if (angleDeg < 0) angleDeg += 360;
+            angleDeg = 360 - angleDeg;
+            this.currentHsl[0] = angleDeg;
+            this.updateCustomColor();
+        },
+
+        setSBFromSpecterCoords: function (x, y) {
+            var s = (x - this.specterRect.left) / this.specterRect.width;
+            var b = (y - this.specterRect.top) / this.specterRect.height;
+            s = Math.max(0, Math.min(1, s));
+            b = 1 - Math.max(0, Math.min(1, b));
+
+            this.currentHsb = [this.currentHsl[0], s, b];
+            this.currentHsl = this.colorHsbToHsl(this.currentHsl[0], s, b);
+            this.updateCustomColor();
+        },
+
+        handleTouchStart: function (e) {
+            if (this.isMoved || this.isTouched) return;
+            this.touchStartX = e.type === 'touchstart' ? e.targetTouches[0].pageX : e.pageX;
+            this.touchCurrentX = this.touchStartX;
+            this.touchStartY = e.type === 'touchstart' ? e.targetTouches[0].pageY : e.pageY;
+            this.touchCurrentY = this.touchStartY;
+            var $targetEl = $(e.target);
+            this.wheelHandleIsTouched = $targetEl.closest('.color-picker-wheel-handle').length > 0;
+            this.wheelIsTouched = $targetEl.closest('circle').length > 0;
+            this.specterHandleIsTouched = $targetEl.closest('.color-picker-sb-spectrum-handle').length > 0;
+            if (!this.specterHandleIsTouched) {
+                this.specterIsTouched = $targetEl.closest('.color-picker-sb-spectrum').length > 0;
+            }
+            if (this.wheelIsTouched) {
+                this.wheelRect = this.$el.find('.color-picker-wheel')[0].getBoundingClientRect();
+                this.setHueFromWheelCoords(this.touchStartX, this.touchStartY);
+            }
+            if (this.specterIsTouched) {
+                this.specterRect = this.$el.find('.color-picker-sb-spectrum')[0].getBoundingClientRect();
+                this.setSBFromSpecterCoords(this.touchStartX, this.touchStartY);
+            }
+            if (this.specterHandleIsTouched || this.specterIsTouched) {
+                this.$el.find('.color-picker-sb-spectrum-handle').addClass('color-picker-sb-spectrum-handle-pressed');
+            }
+        },
+
+        handleTouchMove: function (e) {
+            if (!(this.wheelIsTouched || this.wheelHandleIsTouched) && !(this.specterIsTouched || this.specterHandleIsTouched)) return;
+            this.touchCurrentX = e.type === 'touchmove' ? e.targetTouches[0].pageX : e.pageX;
+            this.touchCurrentY = e.type === 'touchmove' ? e.targetTouches[0].pageY : e.pageY;
+            e.preventDefault();
+            if (!this.isMoved) {
+                // First move
+                this.isMoved = true;
+                if (this.wheelHandleIsTouched) {
+                    this.wheelRect = this.$el.find('.color-picker-wheel')[0].getBoundingClientRect();
+                }
+                if (this.specterHandleIsTouched) {
+                    this.specterRect = this.$el.find('.color-picker-sb-spectrum')[0].getBoundingClientRect();
+                }
+            }
+            if (this.wheelIsTouched || this.wheelHandleIsTouched) {
+                this.setHueFromWheelCoords(this.touchCurrentX, this.touchCurrentY);
+            }
+            if (this.specterIsTouched || this.specterHandleIsTouched) {
+                this.setSBFromSpecterCoords(this.touchCurrentX, this.touchCurrentY);
+            }
+        },
+
+        handleTouchEnd: function () {
+            this.isMoved = false;
+            if (this.specterIsTouched || this.specterHandleIsTouched) {
+                this.$el.find('.color-picker-sb-spectrum-handle').removeClass('color-picker-sb-spectrum-handle-pressed');
+            }
+            this.wheelIsTouched = false;
+            this.wheelHandleIsTouched = false;
+            this.specterIsTouched = false;
+            this.specterHandleIsTouched = false;
+        },
+
+        updateCustomColor: function (first) {
+            var specterWidth = this.$el.find('.color-picker-sb-spectrum')[0].offsetWidth,
+                specterHeight = this.$el.find('.color-picker-sb-spectrum')[0].offsetHeight,
+                wheelSize = this.$el.find('.color-picker-wheel')[0].offsetWidth,
+                wheelHalfSize = wheelSize / 2,
+                angleRad = this.currentHsl[0] * Math.PI / 180,
+                handleSize = wheelSize / 6,
+                handleHalfSize = handleSize / 2,
+                tX = wheelHalfSize - Math.sin(angleRad) * (wheelHalfSize - handleHalfSize) - handleHalfSize,
+                tY = wheelHalfSize - Math.cos(angleRad) * (wheelHalfSize - handleHalfSize) - handleHalfSize;
+            this.$el.find('.color-picker-wheel-handle')
+                .css({'background-color':  'hsl(' + this.currentHsl[0] + ', 100%, 50%)'})
+                .css({transform: 'translate(' + tX + 'px,' + tY + 'px)'});
+
+            this.$el.find('.color-picker-sb-spectrum')
+                .css({'background-color':  'hsl(' + this.currentHsl[0] + ', 100%, 50%)'});
+
+            if (this.currentHsb && this.currentHsl) {
+                this.$el.find('.color-picker-sb-spectrum-handle')
+                    .css({'background-color': 'hsl(' + this.currentHsl[0] + ', ' + (this.currentHsl[1] * 100) + '%,' + (this.currentHsl[2] * 100) + '%)'})
+                    .css({transform: 'translate(' + specterWidth * this.currentHsb[1] + 'px, ' + specterHeight * (1 - this.currentHsb[2]) + 'px)'});
+            }
+            var color = this.colorHslToRgb(this.currentHsl[0], this.currentHsl[1], this.currentHsl[2]);
+            this.currentColor = this.colorRgbToHex(color[0], color[1], color[2]);
+            $('.new-color-hsb-preview').css({'background-color': this.currentColor});
+
+        },
+
+        onClickAddNewColor: function() {
+            var color = this.currentColor;
+            if (color) {
+                if (color.charAt(0) === '#') {
+                    color = color.substr(1);
+                }
+                this.trigger('addcustomcolor', this, color);
+            }
+        }
+
+    }, Common.UI.HsbColorPicker || {}));
+});

apps/common/mobile/lib/component/ThemeColorPalette.js

@@ -97,6 +97,21 @@ define([
                             '</div>',
                         '</div>',
                     '</li>',
+                    '<li class="dynamic-colors">',
+                        '<div style="padding: 15px 0 0 15px;"><%= me.textCustomColors %></div>',
+                        '<div class="item-content">',
+                            '<div class="item-inner">',
+                                '<% _.each(dynamicColors, function(color, index) { %>',
+                                    '<a data-color="<%=color%>" style="background:#<%=color%>"></a>',
+                                '<% }); %>',
+                                '<% if (dynamicColors.length < me.options.dynamiccolors) { %>',
+                                '<% for(var i = dynamicColors.length; i < me.options.dynamiccolors; i++) { %>',
+                                    '<a data-color="empty" style="background:#ffffff"></a>',
+                                '<% } %>',
+                                '<% } %>',
+                            '</div>',
+                        '</div>',
+                    '</li>',
                 '</ul>',
             '</div>'
         ].join('')),
@@ -133,9 +148,15 @@ define([
                 themeColors[row].push(effect);
             });
 
+            // custom color
+            this.dynamicColors = Common.localStorage.getItem('asc.'+Common.localStorage.getId()+'.colors.custom');
+            this.dynamicColors = this.dynamicColors ? this.dynamicColors.toLowerCase().split(',') : [];
+
+
             $(me.el).append(me.template({
                 themeColors: themeColors,
-                standartColors: standartColors
+                standartColors: standartColors,
+                dynamicColors: me.dynamicColors
             }));
 
             return me;
@@ -157,29 +178,26 @@ define([
                 el = $(me.el),
                 $target = $(e.currentTarget);
 
-            el.find('.color-palette a').removeClass('active');
-            $target.addClass('active');
-
             var color = $target.data('color').toString(),
                 effectId = $target.data('effectid');
 
+            if (color !== 'empty') {
+                el.find('.color-palette a').removeClass('active');
+                $target.addClass('active');
                 me.currentColor = color;
-
                 if (effectId) {
                     me.currentColor = {color: color, effectId: effectId};
                 }
-
                 me.trigger('select', me, me.currentColor);
+            } else {
+                me.fireEvent('customcolor', me);
+            }
         },
 
         select: function(color) {
             var me = this,
                 el = $(me.el);
 
-            if (color == me.currentColor) {
-                return;
-            }
-
             me.currentColor = color;
 
             me.clearSelection();
@@ -195,11 +213,10 @@ define([
                     color = /#?([a-fA-F0-9]{6})/.exec(color)[1];
                 }
 
-                if (/^[a-fA-F0-9]{6}|transparent$/.test(color) || _.indexOf(Common.Utils.ThemeColor.getStandartColors(), color) > -1) {
+                if (/^[a-fA-F0-9]{6}|transparent$/.test(color) || _.indexOf(Common.Utils.ThemeColor.getStandartColors(), color) > -1 || _.indexOf(this.dynamicColors, color) > -1) {
-                    el.find('.standart-colors a[data-color=' + color + ']').addClass('active');
+                    el.find('.color-palette a[data-color=' + color + ']').first().addClass('active');
-                } else {
-                    el.find('.custom-colors a[data-color=' + color + ']').addClass('active');
                 }
+
             }
         },
 
@@ -208,7 +225,43 @@ define([
             $(this.el).find('.color-palette a').removeClass('active');
         },
 
+        saveDynamicColor: function(color) {
+            var key_name = 'asc.'+Common.localStorage.getId()+'.colors.custom';
+            var colors = Common.localStorage.getItem(key_name);
+            colors = colors ? colors.split(',') : [];
+            if (colors.push(color) > this.options.dynamiccolors) colors.shift();
+            this.dynamicColors = colors;
+            Common.localStorage.setItem(key_name, colors.join().toUpperCase());
+        },
+
+        updateDynamicColors: function() {
+            var me = this;
+            var dynamicColors = Common.localStorage.getItem('asc.'+Common.localStorage.getId()+'.colors.custom');
+            dynamicColors = dynamicColors ? dynamicColors.toLowerCase().split(',') : [];
+            var templateColors = '';
+            _.each(dynamicColors, function(color) {
+                templateColors += '<a data-color="' + color + '" style="background:#' + color + '"></a>';
+            });
+            if (dynamicColors.length < this.options.dynamiccolors) {
+                for (var i = dynamicColors.length; i < this.options.dynamiccolors; i++) {
+                    templateColors += '<a data-color="empty" style="background-color: #ffffff;"></a>';
+                }
+            }
+            $(this.el).find('.dynamic-colors .item-inner').html(_.template(templateColors));
+            $(this.el).find('.color-palette .dynamic-colors a').on('click', _.bind(this.onColorClick, this));
+        },
+
+        addNewDynamicColor: function(colorPicker, color) {
+            if (color) {
+                this.saveDynamicColor(color);
+                this.updateDynamicColors();
+                this.trigger('select', this, color);
+                this.select(color);
+            }
+        },
+
         textThemeColors: 'Theme Colors',
-        textStandartColors: 'Standard Colors'
+        textStandartColors: 'Standard Colors',
+        textCustomColors: 'Custom Colors'
     }, Common.UI.ThemeColorPalette || {}));
 });

apps/common/mobile/resources/less/ios/_color-palette.less

@@ -35,9 +35,132 @@
     }
   }
 
-  .standart-colors {
+  .standart-colors, .dynamic-colors {
     .item-inner {
       overflow: visible;
     }
   }
 }
+
+.custom-colors {
+  display: flex;
+  justify-content: space-around;
+  align-items: center;
+  margin: 15px;
+  &.phone {
+    max-width: 300px;
+    margin: 0 auto;
+    margin-top: 4px;
+    .button-round {
+      margin-top: 20px;
+    }
+  }
+  .right-block {
+    margin-left: 20px;
+  }
+  .button-round {
+    height: 72px;
+    width: 72px;
+    padding: 0;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    border-radius: 100px;
+    background-color: #ffffff;
+    box-shadow: 0px 4px 4px rgba(0, 0, 0, 0.25);
+    border-color: transparent;
+    margin-top: 25px;
+    &.active-state {
+      background-color: rgba(0, 0, 0, 0.1);
+    }
+  }
+  .color-hsb-preview {
+    width: 72px;
+    height: 72px;
+    border-radius: 100px;
+    overflow: hidden;
+    border: 1px solid #c4c4c4;
+  }
+  .new-color-hsb-preview {
+    width: 100%;
+    height: 36px;
+  }
+  .current-color-hsb-preview {
+    width: 100%;
+    height: 36px;
+  }
+  .list-block ul:before, .list-block ul:after {
+    content: none;
+  }
+  .list-block ul li {
+    border: 1px solid rgba(0, 0, 0, 0.3);
+  }
+  .color-picker-wheel {
+    position: relative;
+    width: 290px;
+    max-width: 100%;
+    height: auto;
+    font-size: 0;
+
+    svg {
+      width: 100%;
+      height: auto;
+    }
+
+    .color-picker-wheel-handle {
+      width: calc(100% / 6);
+      height: calc(100% / 6);
+      position: absolute;
+      box-sizing: border-box;
+      border: 2px solid #fff;
+      box-shadow: 0px 0px 5px rgba(0, 0, 0, 0.5);
+      background: red;
+      border-radius: 50%;
+      left: 0;
+      top: 0;
+    }
+
+    .color-picker-sb-spectrum {
+      background-color: #000;
+      background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0) 0%, #000 100%), linear-gradient(to left, rgba(255, 255, 255, 0) 0%, #fff 100%);
+      position: relative;
+      width: 45%;
+      height: 45%;
+      left: 50%;
+      top: 50%;
+      transform: translate3d(-50%, -50%, 0);
+      position: absolute;
+    }
+
+    .color-picker-sb-spectrum-handle {
+      width: 4px;
+      height: 4px;
+      position: absolute;
+      left: -2px;
+      top: -2px;
+      z-index: 1;
+
+      &:after {
+        background-color: inherit;
+        content: '';
+        position: absolute;
+        width: 16px;
+        height: 16px;
+        border: 1px solid #fff;
+        border-radius: 50%;
+        box-shadow: 0px 0px 2px rgba(0, 0, 0, 0.5);
+        box-sizing: border-box;
+        left: 50%;
+        top: 50%;
+        transform: translate(-50%, -50%);
+        transition: 150ms;
+        transition-property: transform;
+        transform-origin: center;
+      }
+
+      &.color-picker-sb-spectrum-handle-pressed:after {
+        transform: scale(1.5) translate(-33.333%, -33.333%);
+      }
+    }
+  }
+}

apps/common/mobile/resources/less/material/_color-palette.less

@@ -35,7 +35,7 @@
     }
   }
 
-  .standart-colors {
+  .standart-colors, .dynamic-colors {
     .item-inner {
       overflow: visible;
     }
@@ -44,4 +44,128 @@
   &.list-block:last-child li:last-child a {
     border-radius: 0;
   }
+
+}
+
+.custom-colors {
+  display: flex;
+  justify-content: space-around;
+  align-items: center;
+  margin: 15px;
+  &.phone {
+    max-width: 300px;
+    margin: 0 auto;
+    margin-top: 4px;
+    .button-round {
+      margin-top: 20px;
+    }
+  }
+  .right-block {
+    margin-left: 20px;
+  }
+  .button-round {
+    height: 72px;
+    width: 72px;
+    padding: 0;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    border-radius: 100px;
+    background-color: @themeColor;
+    box-shadow: 0px 4px 4px rgba(0, 0, 0, 0.25);
+    border-color: transparent;
+    margin-top: 25px;
+    &.active-state {
+      background-color: rgba(0, 0, 0, 0.1);
+    }
+  }
+  .color-hsb-preview {
+    width: 72px;
+    height: 72px;
+    border-radius: 100px;
+    overflow: hidden;
+    border: 1px solid #ededed;
+  }
+  .new-color-hsb-preview {
+    width: 100%;
+    height: 36px;
+  }
+  .current-color-hsb-preview {
+    width: 100%;
+    height: 36px;
+  }
+  .list-block ul:before, .list-block ul:after {
+    content: none;
+  }
+  .list-block ul li {
+    border: 1px solid rgba(0, 0, 0, 0.3);
+  }
+  .color-picker-wheel {
+    position: relative;
+    width: 290px;
+    max-width: 100%;
+    height: auto;
+    font-size: 0;
+
+    svg {
+      width: 100%;
+      height: auto;
+    }
+
+    .color-picker-wheel-handle {
+      width: calc(100% / 6);
+      height: calc(100% / 6);
+      position: absolute;
+      box-sizing: border-box;
+      border: 2px solid #fff;
+      box-shadow: 0px 0px 5px rgba(0, 0, 0, 0.5);
+      background: red;
+      border-radius: 50%;
+      left: 0;
+      top: 0;
+    }
+
+    .color-picker-sb-spectrum {
+      background-color: #000;
+      background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0) 0%, #000 100%), linear-gradient(to left, rgba(255, 255, 255, 0) 0%, #fff 100%);
+      position: relative;
+      width: 45%;
+      height: 45%;
+      left: 50%;
+      top: 50%;
+      transform: translate3d(-50%, -50%, 0);
+      position: absolute;
+    }
+
+    .color-picker-sb-spectrum-handle {
+      width: 4px;
+      height: 4px;
+      position: absolute;
+      left: -2px;
+      top: -2px;
+      z-index: 1;
+
+      &:after {
+        background-color: inherit;
+        content: '';
+        position: absolute;
+        width: 16px;
+        height: 16px;
+        border: 1px solid #fff;
+        border-radius: 50%;
+        box-shadow: 0px 0px 2px rgba(0, 0, 0, 0.5);
+        box-sizing: border-box;
+        left: 50%;
+        top: 50%;
+        transform: translate(-50%, -50%);
+        transition: 150ms;
+        transition-property: transform;
+        transform-origin: center;
+      }
+
+      &.color-picker-sb-spectrum-handle-pressed:after {
+        transform: scale(1.5) translate(-33.333%, -33.333%);
+      }
+    }
+  }
 }

apps/documenteditor/embed/js/ApplicationController.js

@@ -75,7 +75,7 @@ DE.ApplicationController = new(function(){
             $('#editor_sdk').addClass('top');
         }
 
-        if (config.canBackToFolder === false || !(config.customization && config.customization.goback && config.customization.goback.url)) {
+        if (config.canBackToFolder === false || !(config.customization && config.customization.goback && (config.customization.goback.url || config.customization.goback.requestClose && config.canRequestClose))) {
             $('#id-btn-close').hide();
 
             // Hide last separator
@@ -266,8 +266,12 @@ DE.ApplicationController = new(function(){
             });
 
         $('#id-btn-close').on('click', function(){
-            if (config.customization && config.customization.goback && config.customization.goback.url)
+            if (config.customization && config.customization.goback) {
+                if (config.customization.goback.requestClose && config.canRequestClose)
+                    Common.Gateway.requestClose();
+                else if (config.customization.goback.url)
                     window.parent.location.href = config.customization.goback.url;
+            }
         });
 
         $('#id-btn-zoom-in').on('click', api.zoomIn.bind(this));
@@ -402,6 +406,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 +566,7 @@ DE.ApplicationController = new(function(){
         waitText: 'Please, wait...',
         textLoadingDocument: 'Loading document',
         txtClose: 'Close',
-        errorFileSizeExceed: 'The file size exceeds the limitation set for your server.<br>Please contact your Document Server administrator for details.'
+        errorFileSizeExceed: 'The file size exceeds the limitation set for your server.<br>Please contact your Document Server administrator for details.',
+        errorUpdateVersionOnDisconnect: 'Internet connection has been restored, and the file version has been changed.<br>Before you can continue working, you need to download the file or copy its content to make sure nothing is lost, and then reload this page.'
     }
 })();

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": "Internet connection has been restored, and the file version has been changed.<br>Before you can continue working, you need to download the file or copy its content to make sure nothing is lost, and then reload this page.",
   "DE.ApplicationView.txtDownload": "Download",
   "DE.ApplicationView.txtEmbed": "Embed",
   "DE.ApplicationView.txtFullScreen": "Full Screen",

apps/documenteditor/embed/locale/fr.json

@@ -12,6 +12,7 @@
   "DE.ApplicationController.errorAccessDeny": "Vous tentez d'exéсuter une action pour laquelle vous ne disposez pas des droits.<br>Veuillez contacter l'administrateur de Document Server.",
   "DE.ApplicationController.errorDefaultMessage": "Code d'erreur: %1",
   "DE.ApplicationController.errorFilePassProtect": "Le fichier est protégé par le mot de passe et ne peut pas être ouvert.",
+  "DE.ApplicationController.errorFileSizeExceed": "La taille du fichier dépasse les limites établies sur votre serveur.<br>Veuillez contacter votre administrateur de Document Server pour obtenir plus d'information.  ",
   "DE.ApplicationController.errorUserDrop": "Impossible d'accéder au fichier.",
   "DE.ApplicationController.notcriticalErrorTitle": "Avertissement",
   "DE.ApplicationController.scriptLoadError": "La connexion est trop lente, certains  éléments ne peuvent pas être chargés. Veuillez recharger la page.",

apps/documenteditor/embed/locale/it.json

@@ -12,6 +12,7 @@
   "DE.ApplicationController.errorAccessDeny": "Stai tentando di eseguire un'azione per la quale non disponi di permessi sufficienti.<br>Si prega di contattare l'amministratore del Server dei Documenti.",
   "DE.ApplicationController.errorDefaultMessage": "Codice errore: %1",
   "DE.ApplicationController.errorFilePassProtect": "Il file è protetto da una password. Impossibile aprirlo.",
+  "DE.ApplicationController.errorFileSizeExceed": "La dimensione del file supera la limitazione impostata per il tuo server.<br>Per i dettagli, contatta l'amministratore del Document server.",
   "DE.ApplicationController.errorUserDrop": "Impossibile accedere al file subito.",
   "DE.ApplicationController.notcriticalErrorTitle": "Avviso",
   "DE.ApplicationController.scriptLoadError": "La connessione è troppo lenta, alcuni componenti non possono essere caricati. Si prega di ricaricare la pagina.",

apps/documenteditor/embed/locale/ru.json

@@ -12,6 +12,7 @@
   "DE.ApplicationController.errorAccessDeny": "Вы пытаетесь выполнить действие, на которое у вас нет прав.<br>Пожалуйста, обратитесь к администратору Сервера документов.",
   "DE.ApplicationController.errorDefaultMessage": "Код ошибки: %1",
   "DE.ApplicationController.errorFilePassProtect": "Файл защищен паролем и не может быть открыт.",
+  "DE.ApplicationController.errorFileSizeExceed": "Размер файла превышает ограничение, установленное для вашего сервера.<br>Обратитесь к администратору Сервера документов для получения дополнительной информации.",
   "DE.ApplicationController.errorUserDrop": "В настоящий момент файл недоступен.",
   "DE.ApplicationController.notcriticalErrorTitle": "Внимание",
   "DE.ApplicationController.scriptLoadError": "Слишком медленное подключение, некоторые компоненты не удалось загрузить. Пожалуйста, обновите страницу.",

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

@@ -62,7 +62,6 @@ define([
                     'hide': _.bind(this.onHideChat, this)
                 },
                 'Common.Views.Header': {
-                    'click:users': _.bind(this.clickStatusbarUsers, this),
                     'file:settings': _.bind(this.clickToolbarSettings,this),
                     'history:show': function () {
                         if ( !this.leftMenu.panelHistory.isVisible() )
@@ -468,6 +467,7 @@ define([
             if (this.mode.canViewComments && this.leftMenu.panelComments.isVisible())
                 value = resolved = true;
             (value) ? this.api.asc_showComments(resolved) : this.api.asc_hideComments();
+            this.getApplication().getController('Common.Controllers.ReviewChanges').commentsShowHide(value ? 'show' : 'hide');
             /** coauthoring end **/
 
             value = Common.localStorage.getItem("de-settings-fontrender");
@@ -532,10 +532,6 @@ define([
         },
 
         /** coauthoring begin **/
-        clickStatusbarUsers: function() {
-            this.leftMenu.menuFile.panels['rights'].changeAccessRights();
-        },
-
         onHideChat: function() {
             $(this.leftMenu.btnChat.el).blur();
             Common.NotificationCenter.trigger('layout:changed', 'leftmenu');

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

@@ -41,6 +41,7 @@
 
 define([
     'core',
+    'common/main/lib/component/Calendar',
     'documenteditor/main/app/view/Links',
     'documenteditor/main/app/view/NoteSettingsDialog',
     'documenteditor/main/app/view/HyperlinkSettingsDialog',
@@ -129,7 +130,8 @@ define([
                 in_header = false,
                 in_equation = false,
                 in_image = false,
-                in_table = false;
+                in_table = false,
+                frame_pr = null;
 
             while (++i < selectedObjects.length) {
                 type = selectedObjects[i].get_ObjectType();
@@ -137,6 +139,7 @@ define([
 
                 if (type === Asc.c_oAscTypeSelectElement.Paragraph) {
                     paragraph_locked = pr.get_Locked();
+                    frame_pr = pr;
                 } else if (type === Asc.c_oAscTypeSelectElement.Header) {
                     header_locked = pr.get_Locked();
                     in_header = true;
@@ -153,12 +156,19 @@ define([
 
             var control_props = this.api.asc_IsContentControl() ? this.api.asc_GetContentControlProperties() : null,
                 control_plain = (control_props) ? (control_props.get_ContentControlType()==Asc.c_oAscSdtLevelType.Inline) : false;
+            var rich_del_lock = (frame_pr) ? !frame_pr.can_DeleteBlockContentControl() : true,
+                rich_edit_lock = (frame_pr) ? !frame_pr.can_EditBlockContentControl() : true,
+                plain_del_lock = (frame_pr) ? !frame_pr.can_DeleteInlineContentControl() : true,
+                plain_edit_lock = (frame_pr) ? !frame_pr.can_EditInlineContentControl() : true;
 
-            var need_disable = paragraph_locked || in_equation || in_image || in_header || control_plain;
+            var need_disable = paragraph_locked || in_equation || in_image || in_header || control_plain || rich_edit_lock || plain_edit_lock;
             this.view.btnsNotes.setDisabled(need_disable);
 
             need_disable = paragraph_locked || header_locked || in_header || control_plain;
             this.view.btnBookmarks.setDisabled(need_disable);
+
+            need_disable = in_header || rich_edit_lock || plain_edit_lock || rich_del_lock || plain_del_lock;
+            this.view.btnsContents.setDisabled(need_disable);
         },
 
         onApiCanAddHyperlink: function(value) {
@@ -351,8 +361,9 @@ define([
             })).show();
         },
 
-        onShowContentControlsActions: function(action, x, y) {
+        onShowTOCActions: function(obj, x, y) {
-            var menu = (action==1) ? this.view.contentsUpdateMenu : this.view.contentsMenu,
+            var action = obj.button,
+                menu = (action==AscCommon.CCButtonType.Toc) ? this.view.contentsUpdateMenu : this.view.contentsMenu,
                 documentHolderView  = this.getApplication().getController('DocumentHolder').documentHolder,
                 menuContainer = documentHolderView.cmpEl.find(Common.Utils.String.format('#menu-container-{0}', menu.id)),
                 me = this;
@@ -391,6 +402,150 @@ define([
         onHideContentControlsActions: function() {
             this.view.contentsMenu && this.view.contentsMenu.hide();
             this.view.contentsUpdateMenu && this.view.contentsUpdateMenu.hide();
+            this.view.listControlMenu && this.view.listControlMenu.isVisible() && this.view.listControlMenu.hide();
+            var controlsContainer = this.getApplication().getController('DocumentHolder').documentHolder.cmpEl.find('#calendar-control-container');
+            if (controlsContainer.is(':visible'))
+                controlsContainer.hide();
+        },
+
+        onShowDateActions: function(obj, x, y) {
+            var props = obj.pr,
+                specProps = props.get_DateTimePr(),
+                id = props.get_InternalId(),
+                documentHolderView  = this.getApplication().getController('DocumentHolder').documentHolder,
+                controlsContainer = documentHolderView.cmpEl.find('#calendar-control-container'),
+                me = this;
+
+            if (controlsContainer.length < 1) {
+                controlsContainer = $('<div id="calendar-control-container" style="position: absolute;z-index: 1000;"><div id="id-document-calendar-control" style="position: fixed; left: -1000px; top: -1000px;"></div></div>');
+                documentHolderView.cmpEl.append(controlsContainer);
+            }
+
+            Common.UI.Menu.Manager.hideAll();
+
+            controlsContainer.css({left: x, top : y});
+            controlsContainer.show();
+
+            if (!this.cmpCalendar) {
+                this.cmpCalendar = new Common.UI.Calendar({
+                    el: documentHolderView.cmpEl.find('#id-document-calendar-control'),
+                    enableKeyEvents: true,
+                    firstday: 1
+                });
+                this.cmpCalendar.on('date:click', function (cmp, date) {
+                    specProps.put_FullDate(new  Date(date));
+                    me.api.asc_SetContentControlProperties(props, id);
+                    controlsContainer.hide();
+                    me.api.asc_UncheckContentControlButtons();
+                });
+                this.cmpCalendar.on('calendar:keydown', function (cmp, e) {
+                    if (e.keyCode==Common.UI.Keys.ESC) {
+                        controlsContainer.hide();
+                        me.api.asc_UncheckContentControlButtons();
+                    }
+                });
+            }
+            this.cmpCalendar.setDate(new Date(specProps ? specProps.get_FullDate() : undefined));
+
+            // align
+            var offset  = controlsContainer.offset(),
+                docW    = Common.Utils.innerWidth(),
+                docH    = Common.Utils.innerHeight() - 10, // Yep, it's magic number
+                menuW   = this.cmpCalendar.cmpEl.outerWidth(),
+                menuH   = this.cmpCalendar.cmpEl.outerHeight(),
+                buttonOffset = 22,
+                left = offset.left - menuW,
+                top  = offset.top;
+            if (top + menuH > docH) {
+                top = docH - menuH;
+                left -= buttonOffset;
+            }
+            if (top < 0)
+                top = 0;
+            if (left + menuW > docW)
+                left = docW - menuW;
+            this.cmpCalendar.cmpEl.css({left: left, top : top});
+
+            documentHolderView._preventClick = true;
+        },
+
+        onShowListActions: function(obj, x, y) {
+            var type = obj.type,
+                props = obj.pr,
+                id = props.get_InternalId(),
+                specProps = (type == Asc.c_oAscContentControlSpecificType.ComboBox) ? props.get_ComboBoxPr() : props.get_DropDownListPr(),
+                menu = this.view.listControlMenu,
+                documentHolderView  = this.getApplication().getController('DocumentHolder').documentHolder,
+                menuContainer = menu ? documentHolderView.cmpEl.find(Common.Utils.String.format('#menu-container-{0}', menu.id)) : null,
+                me = this;
+
+            this._fromShowContentControls = true;
+            Common.UI.Menu.Manager.hideAll();
+
+            if (!menu) {
+                this.view.listControlMenu = menu = new Common.UI.Menu({
+                    menuAlign: 'tr-bl',
+                    items: []
+                });
+                menu.on('item:click', function(menu, item) {
+                    setTimeout(function(){
+                        me.api.asc_SelectContentControlListItem(item.value, id);
+                    }, 1);
+                });
+
+                // Prepare menu container
+                if (!menuContainer || menuContainer.length < 1) {
+                    menuContainer = $(Common.Utils.String.format('<div id="menu-container-{0}" style="position: absolute; z-index: 10000;"><div class="dropdown-toggle" data-toggle="dropdown"></div></div>', menu.id));
+                    documentHolderView.cmpEl.append(menuContainer);
+                }
+
+                menu.render(menuContainer);
+                menu.cmpEl.attr({tabindex: "-1"});
+                menu.on('hide:after', function(){
+                    me.view.listControlMenu.removeAll();
+                    if (!me._fromShowContentControls)
+                        me.api.asc_UncheckContentControlButtons();
+                });
+            }
+            if (specProps) {
+                var count = specProps.get_ItemsCount();
+                for (var i=0; i<count; i++) {
+                    menu.addItem(new Common.UI.MenuItem({
+                        caption     : specProps.get_ItemDisplayText(i),
+                        value       : specProps.get_ItemValue(i)
+                    }));
+                }
+            }
+
+            menuContainer.css({left: x, top : y});
+            menuContainer.attr('data-value', 'prevent-canvas-click');
+            documentHolderView._preventClick = true;
+            menu.show();
+
+            menu.alignPosition();
+            _.delay(function() {
+                menu.cmpEl.focus();
+            }, 10);
+            this._fromShowContentControls = false;
+        },
+
+        onShowContentControlsActions: function(obj, x, y) {
+            var type = obj.type;
+            switch (type) {
+                case Asc.c_oAscContentControlSpecificType.TOC:
+                    this.onShowTOCActions(obj, x, y);
+                    break;
+                case Asc.c_oAscContentControlSpecificType.DateTime:
+                    this.onShowDateActions(obj, x, y);
+                    break;
+                case Asc.c_oAscContentControlSpecificType.Picture:
+                    this.api.asc_addImage(obj);
+                    break;
+                case Asc.c_oAscContentControlSpecificType.DropDownList:
+                case Asc.c_oAscContentControlSpecificType.ComboBox:
+                    this.onShowListActions(obj, x, y);
+                    break;
+            }
         }
 
     }, DE.Controllers.Links || {}));

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

@@ -132,7 +132,10 @@ define([
                     "Table Index Cannot be Zero": this.txtTableInd,
                     "Undefined Bookmark": this.txtUndefBookmark,
                     "Unexpected End of Formula": this.txtEndOfFormula,
-                    "Hyperlink": this.txtHyperlink
+                    "Hyperlink": this.txtHyperlink,
+                    "Error! Main Document Only.": this.txtMainDocOnly,
+                    "Error! Not a valid bookmark self-reference.": this.txtNotValidBookmark,
+                    "Error! No text of specified style in document.": this.txtNoText
                 };
                 styleNames.forEach(function(item){
                     translate[item] = me['txtStyle_' + item.replace(/ /g, '_')] || item;
@@ -190,6 +193,7 @@ define([
                     Common.NotificationCenter.on('api:disconnect',                  _.bind(this.onCoAuthoringDisconnect, this));
                     Common.NotificationCenter.on('goback',                          _.bind(this.goBack, this));
                     Common.NotificationCenter.on('download:advanced',               _.bind(this.onAdvancedOptions, this));
+                    Common.NotificationCenter.on('showmessage',                     _.bind(this.onExternalMessage, this));
 
                     this.isShowOpenDialog = false;
                     
@@ -231,7 +235,7 @@ define([
                             if (!e.relatedTarget ||
                                 !/area_id/.test(e.target.id)
                                 && !(e.target.localName == 'input' && $(e.target).parent().find(e.relatedTarget).length>0) /* Check if focus in combobox goes from input to it's menu button or menu items, or from comment editing area to Ok/Cancel button */
-                                && !(e.target.localName == 'textarea' && $(e.target).closest('.asc-window').find(e.relatedTarget).length>0) /* Check if focus in comment goes from textarea to it's email menu */
+                                && !(e.target.localName == 'textarea' && $(e.target).closest('.asc-window').find('.dropdown-menu').find(e.relatedTarget).length>0) /* Check if focus in comment goes from textarea to it's email menu */
                                 && (e.relatedTarget.localName != 'input' || !/form-control/.test(e.relatedTarget.className)) /* Check if focus goes to text input with class "form-control" */
                                 && (e.relatedTarget.localName != 'textarea' || /area_id/.test(e.relatedTarget.id))) /* Check if focus goes to textarea, but not to "area_id" */ {
                                 if (Common.Utils.isIE && e.originalEvent && e.originalEvent.target && /area_id/.test(e.originalEvent.target.id) && (e.originalEvent.target === e.originalEvent.srcElement))
@@ -337,9 +341,10 @@ define([
                 this.appOptions.mergeFolderUrl  = this.editorConfig.mergeFolderUrl;
                 this.appOptions.saveAsUrl       = this.editorConfig.saveAsUrl;
                 this.appOptions.canAnalytics    = false;
+                this.appOptions.canRequestClose = this.editorConfig.canRequestClose;
                 this.appOptions.customization   = this.editorConfig.customization;
-                this.appOptions.canBackToFolder = (this.editorConfig.canBackToFolder!==false) && (typeof (this.editorConfig.customization) == 'object')
+                this.appOptions.canBackToFolder = (this.editorConfig.canBackToFolder!==false) && (typeof (this.editorConfig.customization) == 'object') && (typeof (this.editorConfig.customization.goback) == 'object')
-                                                  && (typeof (this.editorConfig.customization.goback) == 'object') && !_.isEmpty(this.editorConfig.customization.goback.url);
+                                                  && (!_.isEmpty(this.editorConfig.customization.goback.url) || this.editorConfig.customization.goback.requestClose && this.appOptions.canRequestClose);
                 this.appOptions.canBack         = this.appOptions.canBackToFolder === true;
                 this.appOptions.canPlugins      = false;
                 this.appOptions.canMakeActionLink = this.editorConfig.canMakeActionLink;
@@ -348,6 +353,7 @@ define([
                 this.appOptions.canRequestSaveAs = this.editorConfig.canRequestSaveAs;
                 this.appOptions.canRequestInsertImage = this.editorConfig.canRequestInsertImage;
                 this.appOptions.canRequestMailMergeRecipients = this.editorConfig.canRequestMailMergeRecipients;
+                this.appOptions.compatibleFeatures = (typeof (this.appOptions.customization) == 'object') && !!this.appOptions.customization.compatibleFeatures;
 
                 appHeader = this.getApplication().getController('Viewport').getView('Common.Views.Header');
                 appHeader.setCanBack(this.appOptions.canBackToFolder === true, (this.appOptions.canBackToFolder) ? this.editorConfig.customization.goback.text : '')
@@ -359,8 +365,11 @@ define([
                 if (this.appOptions.location == 'us' || this.appOptions.location == 'ca')
                     Common.Utils.Metric.setDefaultMetric(Common.Utils.Metric.c_MetricUnits.inch);
 
-                if (!this.editorConfig.customization || !(this.editorConfig.customization.loaderName || this.editorConfig.customization.loaderLogo))
+                if (!( this.editorConfig.customization && ( this.editorConfig.customization.toolbarNoTabs ||
-                    $('#editor_sdk').append('<div class="doc-placeholder">' + '<div class="line"></div>'.repeat(20) + '</div>');
+                    (this.editorConfig.targetApp!=='desktop') && (this.editorConfig.customization.loaderName || this.editorConfig.customization.loaderLogo)))) {
+                    $('#editor-container').css('overflow', 'hidden');
+                    $('#editor-container').append('<div class="doc-placeholder">' + '<div class="line"></div>'.repeat(20) + '</div>');
+                }
 
                 Common.Controllers.Desktop.init(this.appOptions);
             },
@@ -640,6 +649,10 @@ define([
 
             goBack: function(current) {
                 if ( !Common.Controllers.Desktop.process('goback') ) {
+                    if (this.appOptions.customization.goback.requestClose && this.appOptions.canRequestClose) {
+                        Common.Gateway.requestClose();
+                        // Common.Controllers.Desktop.requestClose();
+                    } else {
                         var href = this.appOptions.customization.goback.url;
                         if (!current && this.appOptions.customization.goback.blank!==false) {
                             window.open(href, "_blank");
@@ -647,6 +660,7 @@ define([
                             parent.location.href = href;
                         }
                     }
+                }
             },
 
             onEditComplete: function(cmp) {
@@ -1048,6 +1062,7 @@ define([
                 $(document).on('contextmenu', _.bind(me.onContextMenu, me));
                 Common.Gateway.documentReady();
 
+                $('#editor-container').css('overflow', '');
                 $('.doc-placeholder').remove();
             },
 
@@ -1146,7 +1161,6 @@ define([
                 this.appOptions.isOffline      = this.api.asc_isOffline();
                 this.appOptions.isReviewOnly   = this.permissions.review === true && this.permissions.edit === false;
                 this.appOptions.canRequestEditRights = this.editorConfig.canRequestEditRights;
-                this.appOptions.canRequestClose = this.editorConfig.canRequestClose;
                 this.appOptions.canEdit        = (this.permissions.edit !== false || this.permissions.review === true) && // can edit or review
                                                  (this.editorConfig.canRequestEditRights || this.editorConfig.mode !== 'view') && // if mode=="view" -> canRequestEditRights must be defined
                                                  (!this.appOptions.isReviewOnly || this.appOptions.canLicense); // if isReviewOnly==true -> canLicense must be true
@@ -1254,13 +1268,13 @@ define([
                 var me = this,
                     application         = this.getApplication(),
                     reviewController    = application.getController('Common.Controllers.ReviewChanges');
-                reviewController.setMode(me.appOptions).setConfig({config: me.editorConfig}, me.api);
+                reviewController.setMode(me.appOptions).setConfig({config: me.editorConfig}, me.api).loadDocument({doc:me.document});
 
                 if (this.appOptions.isEdit || this.appOptions.isRestrictedEdit) { // set api events for toolbar in the Restricted Editing mode
                     var toolbarController   = application.getController('Toolbar');
                     toolbarController   && toolbarController.setApi(me.api);
 
-                    if (this.appOptions.isRestrictedEdit) return;
+                    if (!this.appOptions.isEdit) return;
 
                     var rightmenuController = application.getController('RightMenu'),
                         fontsControllers    = application.getController('Common.Controllers.Fonts');
@@ -1441,7 +1455,7 @@ define([
                         break;
 
                     case Asc.c_oAscError.ID.Warning:
-                        config.msg = this.errorConnectToServer.replace('%1', '{{API_URL_EDITING_CALLBACK}}');
+                        config.msg = this.errorConnectToServer;
                         config.closable = false;
                         break;
 
@@ -1490,6 +1504,11 @@ define([
                         config.msg = this.errorFileSizeExceed;
                         break;
 
+                   case Asc.c_oAscError.ID.UpdateVersion:
+                        config.msg = this.errorUpdateVersionOnDisconnect;
+                        config.maxwidth = 600;
+                        break;
+
                     default:
                         config.msg = (typeof id == 'string') ? id : this.errorDefaultMessage.replace('%1', id);
                         break;
@@ -2067,7 +2086,8 @@ define([
 
                 var filemenu = this.getApplication().getController('LeftMenu').getView('LeftMenu').getMenu('file');
                 filemenu.loadDocument({doc:this.document});
-                filemenu.panels['info'].updateInfo(this.document);
+                filemenu.panels && filemenu.panels['info'] && filemenu.panels['info'].updateInfo(this.document);
+                this.getApplication().getController('Common.Controllers.ReviewChanges').loadDocument({doc:this.document});
                 Common.Gateway.metaChange(meta);
             },
 
@@ -2210,15 +2230,14 @@ define([
             sendMergeTitle: 'Sending Merge',
             sendMergeText: 'Sending Merge...',
             txtArt: 'Your text here',
-            errorConnectToServer: 'The document could not be saved. Please check connection settings or contact your administrator.<br>When you click the \'OK\' button, you will be prompted to download the document.<br><br>' +
+            errorConnectToServer: 'The document could not be saved. Please check connection settings or contact your administrator.<br>When you click the \'OK\' button, you will be prompted to download the document.',
-                                  'Find more information about connecting Document Server <a href=\"%1\" target=\"_blank\">here</a>',
             textTryUndoRedo: 'The Undo/Redo functions are disabled for the Fast co-editing mode.<br>Click the \'Strict mode\' button to switch to the Strict co-editing mode to edit the file without other users interference and send your changes only after you save them. You can switch between the co-editing modes using the editor Advanced settings.',
             textStrict: 'Strict mode',
             txtErrorLoadHistory: 'Loading history failed',
             textBuyNow: 'Visit website',
             textNoLicenseTitle: '%1 connection limitation',
             textContactUs: 'Contact sales',
-            errorViewerDisconnect: 'Connection is lost. You can still view the document,<br>but will not be able to download or print until the connection is restored.',
+            errorViewerDisconnect: 'Connection is lost. You can still view the document,<br>but will not be able to download or print until the connection is restored and page is reloaded.',
             warnLicenseExp: 'Your license has expired.<br>Please update your license and refresh the page.',
             titleLicenseExp: 'License expired',
             openErrorText: 'An error has occurred while opening the file',
@@ -2463,7 +2482,11 @@ define([
             textCustomLoader: 'Please note that according to the terms of the license you are not entitled to change the loader.<br>Please contact our Sales Department to get a quote.',
             txtHyperlink: 'Hyperlink',
             waitText: 'Please, wait...',
-            errorFileSizeExceed: 'The file size exceeds the limitation set for your server.<br>Please contact your Document Server administrator for details.'
+            errorFileSizeExceed: 'The file size exceeds the limitation set for your server.<br>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.',
+            errorUpdateVersionOnDisconnect: 'Internet connection has been restored, and the file version has been changed.<br>Before you can continue working, you need to download the file or copy its content to make sure nothing is lost, and then reload this page.'
         }
     })(), DE.Controllers.Main || {}))
 });

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

@@ -47,6 +47,7 @@ define([
     'common/main/lib/view/ImageFromUrlDialog',
     'common/main/lib/view/InsertTableDialog',
     'common/main/lib/view/SelectFileDlg',
+    'common/main/lib/view/SymbolTableDialog',
     'common/main/lib/util/define',
     'documenteditor/main/app/view/Toolbar',
     'documenteditor/main/app/view/DropcapSettingsAdvanced',
@@ -324,6 +325,7 @@ define([
             toolbar.listStyles.on('contextmenu',                        _.bind(this.onListStyleContextMenu, this));
             toolbar.styleMenu.on('hide:before',                         _.bind(this.onListStyleBeforeHide, this));
             toolbar.btnInsertEquation.on('click',                       _.bind(this.onInsertEquationClick, this));
+            toolbar.btnInsertSymbol.on('click',                         _.bind(this.onInsertSymbolClick, this));
             toolbar.mnuNoControlsColor.on('click',                      _.bind(this.onNoControlsColor, this));
             toolbar.mnuControlsColorPicker.on('select',                 _.bind(this.onSelectControlsColor, this));
             Common.Gateway.on('insertimage',                            _.bind(this.insertImage, this));
@@ -378,7 +380,10 @@ define([
                 this.api.asc_registerCallback('asc_onContextMenu', _.bind(this.onContextMenu, this));
                 this.api.asc_registerCallback('asc_onShowParaMarks', _.bind(this.onShowParaMarks, this));
                 this.api.asc_registerCallback('asc_onChangeSdtGlobalSettings', _.bind(this.onChangeSdtGlobalSettings, this));
+                this.api.asc_registerCallback('asc_onTextLanguage',         _.bind(this.onTextLanguage, this));
                 Common.NotificationCenter.on('fonts:change',                _.bind(this.onApiChangeFont, this));
+                this.api.asc_registerCallback('asc_onTableDrawModeChanged', _.bind(this.onTableDraw, this));
+                this.api.asc_registerCallback('asc_onTableEraseModeChanged', _.bind(this.onTableErase, this));
             } else if (this.mode.isRestrictedEdit) {
                 this.api.asc_registerCallback('asc_onFocusObject', _.bind(this.onApiFocusObjectRestrictedEdit, this));
                 this.api.asc_registerCallback('asc_onCoAuthoringDisconnect', _.bind(this.onApiCoAuthoringDisconnect, this));
@@ -653,7 +658,8 @@ define([
             var i = -1, type,
                 paragraph_locked = false,
                 header_locked = false,
-                image_locked = false;
+                image_locked = false,
+                in_image = false;
 
             while (++i < selectedObjects.length) {
                 type = selectedObjects[i].get_ObjectType();
@@ -663,11 +669,15 @@ define([
                 } else if (type === Asc.c_oAscTypeSelectElement.Header) {
                     header_locked = selectedObjects[i].get_ObjectValue().get_Locked();
                 } else if (type === Asc.c_oAscTypeSelectElement.Image) {
+                    in_image = true;
                     image_locked = selectedObjects[i].get_ObjectValue().get_Locked();
                 }
             }
 
             var need_disable = !this.api.can_AddQuotedComment() || paragraph_locked || header_locked || image_locked;
+            if (this.mode.compatibleFeatures) {
+                need_disable = need_disable || in_image;
+            }
             if ( this.btnsComment && this.btnsComment.length > 0 )
                 this.btnsComment.setDisabled(need_disable);
         },
@@ -690,7 +700,8 @@ define([
                 in_equation = false,
                 btn_eq_state = false,
                 in_image = false,
-                in_control = false;
+                in_control = false,
+                in_para = false;
 
             while (++i < selectedObjects.length) {
                 type = selectedObjects[i].get_ObjectType();
@@ -702,6 +713,7 @@ define([
                     can_add_image = pr.get_CanAddImage();
                     frame_pr = pr;
                     sh = pr.get_Shade();
+                    in_para = true;
                 } else if (type === Asc.c_oAscTypeSelectElement.Header) {
                     header_locked = pr.get_Locked();
                     in_header = true;
@@ -727,7 +739,11 @@ define([
             if (sh)
                 this.onParagraphColor(sh);
 
-            var need_disable = paragraph_locked || header_locked;
+            var rich_del_lock = (frame_pr) ? !frame_pr.can_DeleteBlockContentControl() : true,
+                rich_edit_lock = (frame_pr) ? !frame_pr.can_EditBlockContentControl() : true,
+                plain_del_lock = (frame_pr) ? !frame_pr.can_DeleteInlineContentControl() : true,
+                plain_edit_lock = (frame_pr) ? !frame_pr.can_EditInlineContentControl() : true;
+            var need_disable = paragraph_locked || header_locked || rich_edit_lock || plain_edit_lock;
 
             if (this._state.prcontrolsdisable != need_disable) {
                 if (this._state.activated) this._state.prcontrolsdisable = need_disable;
@@ -741,15 +757,18 @@ define([
                 lock_type = (in_control&&control_props) ? control_props.get_Lock() : Asc.c_oAscSdtLockType.Unlocked,
                 control_plain = (in_control&&control_props) ? (control_props.get_ContentControlType()==Asc.c_oAscSdtLevelType.Inline) : false;
             (lock_type===undefined) && (lock_type = Asc.c_oAscSdtLockType.Unlocked);
+            var content_locked = lock_type==Asc.c_oAscSdtLockType.SdtContentLocked || lock_type==Asc.c_oAscSdtLockType.ContentLocked;
 
-            if (!paragraph_locked && !header_locked) {
+            toolbar.btnContentControls.setDisabled(paragraph_locked || header_locked);
-                toolbar.btnContentControls.menu.items[0].setDisabled(control_plain || lock_type==Asc.c_oAscSdtLockType.SdtContentLocked || lock_type==Asc.c_oAscSdtLockType.ContentLocked);
+            if (!(paragraph_locked || header_locked)) {
-                toolbar.btnContentControls.menu.items[1].setDisabled(control_plain || lock_type==Asc.c_oAscSdtLockType.SdtContentLocked || lock_type==Asc.c_oAscSdtLockType.ContentLocked);
+                var control_disable = control_plain || content_locked;
-                toolbar.btnContentControls.menu.items[3].setDisabled(!in_control || lock_type==Asc.c_oAscSdtLockType.SdtContentLocked || lock_type==Asc.c_oAscSdtLockType.SdtLocked);
+                for (var i=0; i<7; i++)
-                toolbar.btnContentControls.menu.items[5].setDisabled(!in_control);
+                    toolbar.btnContentControls.menu.items[i].setDisabled(control_disable);
+                toolbar.btnContentControls.menu.items[8].setDisabled(!in_control || lock_type==Asc.c_oAscSdtLockType.SdtContentLocked || lock_type==Asc.c_oAscSdtLockType.SdtLocked);
+                toolbar.btnContentControls.menu.items[10].setDisabled(!in_control);
             }
 
-            var need_text_disable = paragraph_locked || header_locked || in_chart;
+            var need_text_disable = paragraph_locked || header_locked || in_chart || rich_edit_lock || plain_edit_lock;
             if (this._state.textonlycontrolsdisable != need_text_disable) {
                 if (this._state.activated) this._state.textonlycontrolsdisable = need_text_disable;
                 if (!need_disable) {
@@ -757,7 +776,7 @@ define([
                         item.setDisabled(need_text_disable);
                     }, this);
                 }
-                toolbar.btnCopyStyle.setDisabled(need_text_disable);
+                // toolbar.btnCopyStyle.setDisabled(need_text_disable);
                 toolbar.btnClearStyle.setDisabled(need_text_disable);
             }
 
@@ -783,50 +802,55 @@ define([
             if ( !toolbar.btnDropCap.isDisabled() )
                 toolbar.mnuDropCapAdvanced.setDisabled(disable_dropcapadv);
 
-            need_disable = !can_add_table || header_locked || in_equation || control_plain;
+            need_disable = !can_add_table || header_locked || in_equation || control_plain || rich_edit_lock || plain_edit_lock || rich_del_lock || plain_del_lock;
             toolbar.btnInsertTable.setDisabled(need_disable);
 
             need_disable = toolbar.mnuPageNumCurrentPos.isDisabled() && toolbar.mnuPageNumberPosPicker.isDisabled() || control_plain;
             toolbar.mnuInsertPageNum.setDisabled(need_disable);
 
             var in_footnote = this.api.asc_IsCursorInFootnote();
-            need_disable = paragraph_locked || header_locked || in_header || in_image || in_equation && !btn_eq_state || in_footnote || in_control;
+            need_disable = paragraph_locked || header_locked || in_header || in_image || in_equation && !btn_eq_state || in_footnote || in_control || rich_edit_lock || plain_edit_lock || rich_del_lock;
             toolbar.btnsPageBreak.setDisabled(need_disable);
             toolbar.btnBlankPage.setDisabled(need_disable);
 
-            need_disable = paragraph_locked || header_locked || in_equation || control_plain;
+            need_disable = paragraph_locked || header_locked || in_equation || control_plain || content_locked;
             toolbar.btnInsertShape.setDisabled(need_disable);
             toolbar.btnInsertText.setDisabled(need_disable);
 
-            need_disable = paragraph_locked || header_locked || !can_add_image || in_equation || control_plain;
+            need_disable = paragraph_locked || header_locked  || in_para && !can_add_image || in_equation || control_plain || rich_del_lock || plain_del_lock || content_locked;
             toolbar.btnInsertImage.setDisabled(need_disable);
-            toolbar.btnInsertTextArt.setDisabled(need_disable || in_image || in_footnote);
+            toolbar.btnInsertTextArt.setDisabled(need_disable || in_footnote);
 
             if (in_chart !== this._state.in_chart) {
                 toolbar.btnInsertChart.updateHint(in_chart ? toolbar.tipChangeChart : toolbar.tipInsertChart);
                 this._state.in_chart = in_chart;
             }
 
-            need_disable = in_chart && image_locked || !in_chart && need_disable || control_plain;
+            need_disable = in_chart && image_locked || !in_chart && need_disable || control_plain || rich_del_lock || plain_del_lock || content_locked;
             toolbar.btnInsertChart.setDisabled(need_disable);
 
-            need_disable = paragraph_locked || header_locked || in_chart || !can_add_image&&!in_equation || control_plain;
+            need_disable = paragraph_locked || header_locked || in_chart || !can_add_image&&!in_equation || control_plain || rich_edit_lock || plain_edit_lock || rich_del_lock || plain_del_lock;
             toolbar.btnInsertEquation.setDisabled(need_disable);
 
-            need_disable = paragraph_locked || header_locked || in_equation;
+            toolbar.btnInsertSymbol.setDisabled(!in_para || paragraph_locked || header_locked || rich_edit_lock || plain_edit_lock || rich_del_lock || plain_del_lock);
+
+            need_disable = paragraph_locked || header_locked || in_equation || rich_edit_lock || plain_edit_lock;
             toolbar.btnSuperscript.setDisabled(need_disable);
             toolbar.btnSubscript.setDisabled(need_disable);
 
             toolbar.btnEditHeader.setDisabled(in_equation);
 
-            need_disable = paragraph_locked || header_locked || in_image || control_plain;
+            need_disable = paragraph_locked || header_locked || in_image || control_plain || rich_edit_lock || plain_edit_lock;
             if (need_disable != toolbar.btnColumns.isDisabled())
                 toolbar.btnColumns.setDisabled(need_disable);
 
             if (toolbar.listStylesAdditionalMenuItem && (frame_pr===undefined) !== toolbar.listStylesAdditionalMenuItem.isDisabled())
                 toolbar.listStylesAdditionalMenuItem.setDisabled(frame_pr===undefined);
 
-            need_disable = !this.api.can_AddQuotedComment() || paragraph_locked || header_locked || image_locked;
+            need_disable = !this.api.can_AddQuotedComment() || paragraph_locked || header_locked || image_locked || rich_del_lock || rich_edit_lock || plain_del_lock || plain_edit_lock;
+            if (this.mode.compatibleFeatures) {
+                need_disable = need_disable || in_image;
+            }
             if ( this.btnsComment && this.btnsComment.length > 0 )
                 this.btnsComment.setDisabled(need_disable);
 
@@ -840,6 +864,13 @@ define([
             this.modeAlwaysSetStyle = false;
         },
 
+        onTableDraw: function(v) {
+            this.toolbar.mnuInsertTable && this.toolbar.mnuInsertTable.items[2].setChecked(!!v, true);
+        },
+        onTableErase: function(v) {
+            this.toolbar.mnuInsertTable && this.toolbar.mnuInsertTable.items[3].setChecked(!!v, true);
+        },
+
         onApiParagraphStyleChange: function(name) {
             if (this._state.prstyle != name) {
                 var listStyle = this.toolbar.listStyles,
@@ -1396,6 +1427,12 @@ define([
                         Common.NotificationCenter.trigger('edit:complete', me.toolbar);
                     }
                 })).show();
+            } else if (item.value == 'draw') {
+                item.isChecked() && menu.items[3].setChecked(false, true);
+                this.api.SetTableDrawMode(item.isChecked());
+            } else if (item.value == 'erase') {
+                item.isChecked() && menu.items[2].setChecked(false, true);
+                this.api.SetTableEraseMode(item.isChecked());
             }
         },
 
@@ -1719,6 +1756,8 @@ define([
                             (new DE.Views.ControlSettingsDialog({
                                 props: props,
                                 api: me.api,
+                                controlLang: me._state.lang,
+                                interfaceLang: me.mode.lang,
                                 handler: function(result, value) {
                                     if (result == 'ok') {
                                         me.api.asc_SetContentControlProperties(value, id);
@@ -1735,7 +1774,17 @@ define([
                     }
                 }
             } else {
-                this.api.asc_AddContentControl(item.value);
+                if (item.value == 'plain' || item.value == 'rich')
+                    this.api.asc_AddContentControl((item.value=='plain') ? Asc.c_oAscSdtLevelType.Inline : Asc.c_oAscSdtLevelType.Block);
+                else if (item.value == 'picture')
+                    this.api.asc_AddContentControlPicture();
+                else if (item.value == 'checkbox')
+                    this.api.asc_AddContentControlCheckBox();
+                else if (item.value == 'date')
+                    this.api.asc_AddContentControlDatePicker();
+                else if (item.value == 'combobox' || item.value == 'dropdown')
+                    this.api.asc_AddContentControlList(item.value == 'combobox');
+
                 Common.component.Analytics.trackEvent('ToolBar', 'Add Content Control');
             }
 
@@ -2460,6 +2509,31 @@ define([
             Common.NotificationCenter.trigger('edit:complete', this.toolbar, this.toolbar.btnInsertEquation);
         },
 
+        onInsertSymbolClick: function() {
+            if (this.dlgSymbolTable && this.dlgSymbolTable.isVisible()) return;
+
+            if (this.api) {
+                var me = this;
+                me.dlgSymbolTable = new Common.Views.SymbolTableDialog({
+                    api: me.api,
+                    lang: me.mode.lang,
+                    modal: false,
+                    type: 1,
+                    buttons: [{value: 'ok', caption: this.textInsert}, 'close'],
+                    handler: function(dlg, result, settings) {
+                        if (result == 'ok') {
+                            me.api.asc_insertSymbol(settings.font, settings.code);
+                        } else
+                            Common.NotificationCenter.trigger('edit:complete', me.toolbar);
+                    }
+                });
+                me.dlgSymbolTable.show();
+                me.dlgSymbolTable.on('symbol:dblclick', function(cmp, result, settings) {
+                    me.api.asc_insertSymbol(settings.font, settings.code);
+                });
+            }
+        },
+
         onApiMathTypes: function(equation) {
             this._equationTemp = equation;
             var me = this;
@@ -2825,7 +2899,6 @@ define([
                     compactview = true;
             }
 
-            setTimeout(function () {
             me.toolbar.render(_.extend({isCompactView: compactview}, config));
 
             var tab = {action: 'review', caption: me.toolbar.textTabCollaboration};
@@ -2863,7 +2936,6 @@ define([
                 links.setApi(me.api).setConfig({toolbar: me});
                 Array.prototype.push.apply(me.toolbar.toolbarControls, links.getView('Links').getButtons());
             }
-            }, 0);
         },
 
         onAppReady: function (config) {
@@ -2879,6 +2951,8 @@ define([
                         btn.on('click', function (btn, e) {
                             Common.NotificationCenter.trigger('app:comment:add', 'toolbar');
                         });
+                        if (btn.cmpEl.closest('#review-changes-panel').length>0)
+                            btn.setCaption(me.toolbar.capBtnAddComment);
                     }, this);
                 }
             }
@@ -2913,6 +2987,10 @@ define([
             }
         },
 
+        onTextLanguage: function(langId) {
+            this._state.lang = langId;
+        },
+
         textEmptyImgUrl                            : 'You need to specify image URL.',
         textWarning                                : 'Warning',
         textFontSizeErr                            : 'The entered value is incorrect.<br>Please enter a numeric value between 1 and 100',
@@ -3260,7 +3338,8 @@ define([
         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 device fonts, the saved font will be used when it is available.<br>Do you want to continue?',
         notcriticalErrorTitle: 'Warning',
         txtMarginsW: 'Left and right margins are too high for a given page wight',
-        txtMarginsH: 'Top and bottom margins are too high for a given page height'
+        txtMarginsH: 'Top and bottom margins are too high for a given page height',
+        textInsert: 'Insert'
 
     }, DE.Controllers.Toolbar || {}));
 });

apps/documenteditor/main/app/template/ControlSettingsDialog.template

@@ -0,0 +1,151 @@
+<div id="id-adv-control-settings-general" class="settings-panel active">
+    <div class="inner-content">
+        <table cols="1" style="width: 100%;">
+            <tr>
+                <td class="padding-small">
+                    <label class="input-label"><%= scope.textName %></label>
+                    <div id="control-settings-txt-name"></div>
+                </td>
+            </tr>
+            <tr>
+                <td class="padding-large">
+                    <label class="input-label"><%= scope.textTag %></label>
+                    <div id="control-settings-txt-tag"></div>
+                </td>
+            </tr>
+            <tr>
+                <td class="padding-large">
+                    <div class="separator horizontal"></div>
+                </td>
+            </tr>
+        </table>
+        <table cols="2" style="width: auto;">
+            <tr>
+                <td class="padding-small" colspan="2">
+                    <label class="header"><%= scope.textAppearance %></label>
+                </td>
+            </tr>
+            <tr>
+                <td class="padding-small">
+                    <label class="input-label" style="margin-right: 10px;"><%= scope.textShowAs %></label>
+                </td>
+                <td class="padding-small">
+                    <div id="control-settings-combo-show" class="input-group-nr" style="display: inline-block; width:120px;"></div>
+                </td>
+            </tr>
+            <tr>
+                <td class="padding-small">
+                    <label class="input-label" style="margin-right: 10px;"><%= scope.textColor %></label>
+                </td>
+                <td class="padding-small">
+                    <div id="control-settings-color-btn" style="display: inline-block;"></div>
+                </td>
+            </tr>
+            <tr>
+                <td class="padding-large" colspan="2">
+                    <button type="button" class="btn btn-text-default auto" id="control-settings-btn-all" style="min-width: 98px;"><%= scope.textApplyAll %></button>
+                </td>
+            </tr>
+        </table>
+    </div>
+</div>
+<div id="id-adv-control-settings-lock" class="settings-panel active">
+    <div class="inner-content">
+        <table cols="1" style="width: 100%;">
+            <tr>
+                <td class="padding-small">
+                    <div id="control-settings-chb-lock-delete"></div>
+                </td>
+            </tr>
+            <tr>
+                <td class="padding-small">
+                    <div id="control-settings-chb-lock-edit"></div>
+                </td>
+            </tr>
+        </table>
+    </div>
+</div>
+<div id="id-adv-control-settings-list" class="settings-panel active">
+    <div class="inner-content">
+        <table cols="2" style="width: 100%;">
+            <tr>
+                <td>
+                    <label class="header" style="width: 99px;"><%= scope.textDisplayName %></label>
+                    <label class="header" style=""><%= scope.textValue %></label>
+                </td>
+                <td></td>
+            </tr>
+            <tr style="vertical-align: top;">
+                <td class="padding-small">
+                    <div id="control-settings-list" style="width:200px; height: 192px;margin-right: 10px;"></div>
+                </td>
+                <td class="padding-small">
+                    <button type="button" class="btn btn-text-default" id="control-settings-btn-add" style="min-width: 86px;margin-bottom: 5px;"><%= scope.textAdd %></button>
+                    <button type="button" class="btn btn-text-default" id="control-settings-btn-change" style="min-width: 86px;margin-bottom: 5px;"><%= scope.textChange %></button>
+                    <button type="button" class="btn btn-text-default" id="control-settings-btn-delete" style="min-width: 86px;margin-bottom: 5px;"><%= scope.textDelete %></button>
+                    <button type="button" class="btn btn-text-default" id="control-settings-btn-up" style="min-width: 86px;margin-bottom: 5px;"><%= scope.textUp %></button>
+                    <button type="button" class="btn btn-text-default" id="control-settings-btn-down" style="min-width: 86px;margin-bottom: 5px;"><%= scope.textDown %></button>
+                </td>
+            </tr>
+        </table>
+    </div>
+</div>
+<div id="id-adv-control-settings-date" class="settings-panel active">
+    <div class="inner-content">
+        <table cols="1" style="width: 100%;">
+            <tr>
+                <td>
+                    <label><%= scope.textFormat %></label>
+                </td>
+            </tr>
+            <tr>
+                <td class="padding-small">
+                    <div id="control-settings-txt-format" style="width: 100%;"></div>
+                </td>
+            </tr>
+            <tr>
+                <td class="padding-small">
+                    <div id="control-settings-format" style="width: 100%; height: 165px;"></div>
+                </td>
+            </tr>
+            <tr>
+                <td>
+                    <label><%= scope.textLang %></label>
+                </td>
+            </tr>
+            <tr>
+                <td class="padding-small">
+                    <div id="control-settings-lang"></div>
+                </td>
+            </tr>
+        </table>
+    </div>
+</div>
+<div id="id-adv-control-settings-checkbox" class="settings-panel">
+    <div class="inner-content">
+        <table cols="3" style="width: auto;">
+            <tr>
+                <td class="padding-small">
+                    <label class="input-label" style="margin-right: 10px;"><%= scope.textChecked %></label>
+                </td>
+                <td class="padding-small">
+                    <div id="control-settings-input-checked" style="margin-right: 10px;"></div>
+                </td>
+                <td class="padding-small">
+                    <button type="button" class="btn btn-text-default" id="control-settings-btn-checked-edit" style="min-width:86px;"><%= scope.textChange %></button>
+                </td>
+            </tr>
+            <tr>
+                <td class="padding-small">
+                    <label class="input-label" style="margin-right: 10px;"><%= scope.textUnchecked %></label>
+                </td>
+                <td class="padding-small">
+                    <div id="control-settings-input-unchecked" style="margin-right: 10px;"></div>
+                </td>
+                <td class="padding-small">
+                    <button type="button" class="btn btn-text-default" id="control-settings-btn-unchecked-edit" style="min-width:86px;"><%= scope.textChange %></button>
+                </td>
+            </tr>
+        </table>
+    </div>
+</div>

apps/documenteditor/main/app/template/ImageSettings.template

@@ -14,17 +14,17 @@
     </tr>
     <tr>
         <td class="padding-small" colspan=2>
-            <button type="button" class="btn btn-text-default" id="image-button-original-size" style="width:100px;"><%= scope.textOriginalSize %></button>
+            <button type="button" class="btn btn-text-default" id="image-button-original-size" style="min-width:100px;width: auto;"><%= scope.textOriginalSize %></button>
         </td>
     </tr>
     <tr>
         <td class="padding-small" colspan=2>
-            <button type="button" class="btn btn-text-default" id="image-button-fit-margins" style="width:100px;"><%= scope.textFitMargins %></button>
+            <button type="button" class="btn btn-text-default" id="image-button-fit-margins" style="min-width:100px;width: auto;"><%= scope.textFitMargins %></button>
         </td>
     </tr>
     <tr>
         <td class="padding-small" colspan=2>
-            <div id="image-button-crop" style="width: 100px;"></div>
+            <div id="image-button-crop" style="min-width: 100px;"></div>
         </td>
     </tr>
     <tr>

apps/documenteditor/main/app/template/Toolbar.template

@@ -108,6 +108,7 @@
                 <div class="separator long"></div>
                 <div class="group">
                     <span class="btn-slot text x-huge" id="slot-btn-insequation"></span>
+                    <span class="btn-slot text x-huge" id="slot-btn-inssymbol"></span>
                 </div>
                 <div class="separator long"></div>
                 <div class="group">

apps/documenteditor/main/app/template/Viewport.template

@@ -9,7 +9,7 @@
             <div id="viewport-hbox-layout" class="layout-ct hbox">
                 <div id="left-menu" class="layout-item" style="width: 40px;"></div>
                 <div id="about-menu-panel" class="left-menu-full-ct" style="display:none;"></div>
-                <div id="editor_sdk" class="layout-item"></div>
+                <div id="editor-container" class="layout-item"><div id="editor_sdk"></div></div>
                 <div id="right-menu" class="layout-item"></div>
                 <div id="left-panel-history" class="layout-item" />
             </div>

apps/documenteditor/main/app/view/AddNewCaptionLabelDialog.js

@@ -0,0 +1,126 @@
+/*
+ *
+ * (c) Copyright Ascensio System SIA 2010-2019
+ *
+ * This program is a free software product. You can redistribute it and/or
+ * modify it under the terms of the GNU Affero General Public License (AGPL)
+ * version 3 as published by the Free Software Foundation. In accordance with
+ * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect
+ * that Ascensio System SIA expressly excludes the warranty of non-infringement
+ * of any third-party rights.
+ *
+ * This program is distributed WITHOUT ANY WARRANTY; without even the implied
+ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR  PURPOSE. For
+ * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html
+ *
+ * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha
+ * street, Riga, Latvia, EU, LV-1050.
+ *
+ * The  interactive user interfaces in modified source and object code versions
+ * of the Program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU AGPL version 3.
+ *
+ * Pursuant to Section 7(b) of the License you must retain the original Product
+ * logo when distributing the program. Pursuant to Section 7(e) we decline to
+ * grant you any rights under trademark law for use of our trademarks.
+ *
+ * All the Product's GUI elements, including illustrations and icon sets, as
+ * well as technical writing content are licensed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International. See the License
+ * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
+ *
+*/
+/**
+ *  AddNewCaptionLabelDialog.js
+ *
+ *  Created by Julia Svinareva on 03/10/19
+ *  Copyright (c) 2019 Ascensio System SIA. All rights reserved.
+ *
+ */
+
+define([
+    'common/main/lib/component/Window',
+    'common/main/lib/component/InputField'
+], function () { 'use strict';
+
+    DE.Views.AddNewCaptionLabelDialog = Common.UI.Window.extend(_.extend({
+        options: {
+            width: 330,
+            header: false,
+            cls: 'modal-dlg',
+            buttons: ['ok', 'cancel']
+        },
+
+        initialize : function(options) {
+            _.extend(this.options, options || {});
+
+            this.template = [
+                '<div class="box">',
+                '<div class="input-row">',
+                '<label>' + this.textLabel + '</label>',
+                '</div>',
+                '<div id="id-dlg-label-caption" class="input-row"></div>',
+                '</div>'
+            ].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;
+            me.inputLabel = new Common.UI.InputField({
+                el          : $('#id-dlg-label-caption'),
+                allowBlank  : false,
+                blankError  : me.textLabelError,
+                style       : 'width: 100%;',
+                validateOnBlur: false,
+                validation  : function(value) {
+                    return value ? true : '';
+                }
+            });
+
+            var $window = this.getChild();
+            $window.find('.btn').on('click',     _.bind(this.onBtnClick, this));
+        },
+
+        show: function() {
+            Common.UI.Window.prototype.show.apply(this, arguments);
+
+            var me = this;
+            _.delay(function(){
+                me.getChild('input').focus();
+            },50);
+        },
+
+        onPrimary: function(event) {
+            this._handleInput('ok');
+            return false;
+        },
+
+        onBtnClick: function(event) {
+            this._handleInput(event.currentTarget.attributes['result'].value);
+        },
+
+        _handleInput: function(state) {
+            if (this.options.handler) {
+                if (state == 'ok') {
+                    if (this.inputLabel.checkValidate() !== true)  {
+                        this.inputLabel.cmpEl.find('input').focus();
+                        return;
+                    }
+                }
+
+                this.options.handler.call(this, state, this.inputLabel.getValue());
+            }
+
+            this.close();
+        },
+
+        textLabel: 'Label:',
+        textLabelError: 'Label must not be empty.'
+    }, DE.Views.AddNewCaptionLabelDialog || {}));
+});

apps/documenteditor/main/app/view/BookmarksDialog.js

@@ -110,7 +110,7 @@ define([
                             '</div></div>',
                         '</div>',
                     '</div>',
-                    '<div class="footer right">',
+                    '<div class="footer center">',
                     '<button class="btn normal dlg-btn" result="cancel" style="width: 86px;">' + me.textClose + '</button>',
                     '</div>'
                 ].join('')

apps/documenteditor/main/app/view/CaptionDialog.js

@@ -42,7 +42,8 @@ define([
     'common/main/lib/util/utils',
     'common/main/lib/component/MetricSpinner',
     'common/main/lib/component/ComboBox',
-    'common/main/lib/view/AdvancedSettingsWindow'
+    'common/main/lib/view/AdvancedSettingsWindow',
+    'documenteditor/main/app/view/AddNewCaptionLabelDialog'
 ], function () { 'use strict';
 
     DE.Views.CaptionDialog = Common.Views.AdvancedSettingsWindow.extend(_.extend({
@@ -178,7 +179,7 @@ define([
                 el: $('#caption-combo-label'),
                 cls: 'input-group-nr',
                 menuStyle: 'min-width: 160px;max-height:155px;',
-                editable: true,
+                editable: false,
                 data: this.arrLabel,
                 alwaysVisibleY: true
             });
@@ -187,18 +188,11 @@ define([
                 me.props.put_Label(value);
                 me.props.updateName();
                 me.txtCaption.setValue(me.props.get_Name());
-                var custom = (record.type==1),
+                var custom = (record.type==1);
-                    find = _.findWhere(me.arrLabel, {value: value}) ? true : false;
-                me.btnAdd.setDisabled(find);
                 me.btnDelete.setDisabled(!custom);
                 me.currentLabel = value;
                 me.positionCaption = me.txtCaption.getValue().length;
             });
-            this.cmbLabel.$el.find('input').on('keyup', _.bind(function() {
-                var value = this.cmbLabel.getRawValue(),
-                    disabled = _.findWhere(this.arrLabel, {value: value}) ? true : false;
-                this.btnAdd.setDisabled(disabled);
-            }, this));
             var curLabel = Common.Utils.InternalSettings.get("de-settings-current-label"),
                 recLabel,
                 findIndLabel;
@@ -215,25 +209,28 @@ define([
             this.cmbLabel.selectRecord(recLabel);
 
             this.btnAdd = new Common.UI.Button({
-                el: $('#caption-btn-add'),
+                el: $('#caption-btn-add')
-                disabled: true
             });
             this.btnAdd.on('click', _.bind(function (e) {
-                var value = this.cmbLabel.getRawValue();
+                var me = this;
-                if (!value) {
+                (new DE.Views.AddNewCaptionLabelDialog({
-                    Common.UI.error({
+                    handler: function(result, value) {
-                        msg  : this.textLabelError
+                        if (result == 'ok') {
-                    });
+                            var rec = _.findWhere(me.arrLabel, {value: value});
-                    this.cmbLabel.setValue(this.currentLabel);
+                            if (rec) {
-                    this.btnAdd.setDisabled(true);
+                                me.cmbLabel.setValue(value);
+                                me.cmbLabel.trigger('selected', me.cmbLabel, rec);
                             } else {
                                 var rec = {displayValue: value, value: value, type: 1};
-                    this.arrLabel.unshift(rec);
+                                me.arrLabel.unshift(rec);
-                    this.cmbLabel.setData(this.arrLabel);
+                                me.cmbLabel.setData(me.arrLabel);
-                    this.cmbLabel.setValue(value);
+                                me.cmbLabel.setValue(value);
-                    this.cmbLabel.trigger('selected', this.cmbLabel, rec);
+                                me.cmbLabel.trigger('selected', me.cmbLabel, rec);
-                    this.cmbLabel.scroller.update({alwaysVisibleY: true});
+                                me.cmbLabel.scroller.update({alwaysVisibleY: true});
                             }
+                        }
+                    }
+                })).show();
             }, this));
 
             this.btnDelete = new Common.UI.Button({
@@ -258,6 +255,7 @@ define([
                 me.props.put_ExcludeLabel(newValue=='checked');
                 me.props.updateName();
                 me.txtCaption.setValue(me.props.get_Name());
+                me.positionCaption = me.txtCaption.getValue().length;
             });
 
             this.cmbNumbering = new Common.UI.ComboBox({
@@ -288,6 +286,7 @@ define([
                 me.props.put_IncludeChapterNumber(newValue=='checked');
                 me.props.updateName();
                 me.txtCaption.setValue(me.props.get_Name());
+                me.positionCaption = me.txtCaption.getValue().length;
                 me.cmbChapter.setDisabled(newValue!=='checked');
                 me.cmbSeparator.setDisabled(newValue!=='checked');
             });
@@ -454,8 +453,7 @@ define([
         textEquation: 'Equation',
         textFigure: 'Figure',
         textTable: 'Table',
-        textExclude: 'Exclude label from caption',
+        textExclude: 'Exclude label from caption'
-        textLabelError: 'Label must not be empty.'
 
     }, DE.Views.CaptionDialog || {}))
 });

apps/documenteditor/main/app/view/ChartSettings.js

@@ -261,48 +261,8 @@ define([
                     el: $('#id-chart-menu-type'),
                     parentMenu: btn.menu,
                     restoreHeight: 421,
-                    groups: new Common.UI.DataViewGroupStore([
+                    groups: new Common.UI.DataViewGroupStore(Common.define.chartData.getChartGroupData()),
-                        { id: 'menu-chart-group-bar',     caption: me.textColumn },
+                    store: new Common.UI.DataViewStore(Common.define.chartData.getChartData()),
-                        { id: 'menu-chart-group-line',    caption: me.textLine },
-                        { id: 'menu-chart-group-pie',     caption: me.textPie },
-                        { id: 'menu-chart-group-hbar',    caption: me.textBar },
-                        { id: 'menu-chart-group-area',    caption: me.textArea, inline: true },
-                        { id: 'menu-chart-group-scatter', caption: me.textPoint, inline: true },
-                        { id: 'menu-chart-group-stock',   caption: me.textStock, inline: true }
-                        // { id: 'menu-chart-group-surface', caption: me.textSurface}
-                    ]),
-                    store: new Common.UI.DataViewStore([
-                        { group: 'menu-chart-group-bar',     type: Asc.c_oAscChartTypeSettings.barNormal,          iconCls: 'column-normal', selected: true},
-                        { group: 'menu-chart-group-bar',     type: Asc.c_oAscChartTypeSettings.barStacked,         iconCls: 'column-stack'},
-                        { group: 'menu-chart-group-bar',     type: Asc.c_oAscChartTypeSettings.barStackedPer,      iconCls: 'column-pstack'},
-                        { group: 'menu-chart-group-bar',     type: Asc.c_oAscChartTypeSettings.barNormal3d,        iconCls: 'column-3d-normal'},
-                        { group: 'menu-chart-group-bar',     type: Asc.c_oAscChartTypeSettings.barStacked3d,       iconCls: 'column-3d-stack'},
-                        { group: 'menu-chart-group-bar',     type: Asc.c_oAscChartTypeSettings.barStackedPer3d,    iconCls: 'column-3d-pstack'},
-                        { group: 'menu-chart-group-bar',     type: Asc.c_oAscChartTypeSettings.barNormal3dPerspective,    iconCls: 'column-3d-normal-per'},
-                        { group: 'menu-chart-group-line',    type: Asc.c_oAscChartTypeSettings.lineNormal,         iconCls: 'line-normal'},
-                        { group: 'menu-chart-group-line',    type: Asc.c_oAscChartTypeSettings.lineStacked,        iconCls: 'line-stack'},
-                        { group: 'menu-chart-group-line',    type: Asc.c_oAscChartTypeSettings.lineStackedPer,     iconCls: 'line-pstack'},
-                        { group: 'menu-chart-group-line',    type: Asc.c_oAscChartTypeSettings.line3d,             iconCls: 'line-3d'},
-                        { group: 'menu-chart-group-pie',     type: Asc.c_oAscChartTypeSettings.pie,                iconCls: 'pie-normal'},
-                        { group: 'menu-chart-group-pie',     type: Asc.c_oAscChartTypeSettings.doughnut,           iconCls: 'pie-doughnut'},
-                        { group: 'menu-chart-group-pie',     type: Asc.c_oAscChartTypeSettings.pie3d,              iconCls: 'pie-3d-normal'},
-                        { group: 'menu-chart-group-hbar',    type: Asc.c_oAscChartTypeSettings.hBarNormal,         iconCls: 'bar-normal'},
-                        { group: 'menu-chart-group-hbar',    type: Asc.c_oAscChartTypeSettings.hBarStacked,        iconCls: 'bar-stack'},
-                        { group: 'menu-chart-group-hbar',    type: Asc.c_oAscChartTypeSettings.hBarStackedPer,     iconCls: 'bar-pstack'},
-                        { group: 'menu-chart-group-hbar',    type: Asc.c_oAscChartTypeSettings.hBarNormal3d,       iconCls: 'bar-3d-normal'},
-                        { group: 'menu-chart-group-hbar',    type: Asc.c_oAscChartTypeSettings.hBarStacked3d,      iconCls: 'bar-3d-stack'},
-                        { group: 'menu-chart-group-hbar',    type: Asc.c_oAscChartTypeSettings.hBarStackedPer3d,   iconCls: 'bar-3d-pstack'},
-                        { group: 'menu-chart-group-area',    type: Asc.c_oAscChartTypeSettings.areaNormal,         iconCls: 'area-normal'},
-                        { group: 'menu-chart-group-area',    type: Asc.c_oAscChartTypeSettings.areaStacked,        iconCls: 'area-stack'},
-                        { group: 'menu-chart-group-area',    type: Asc.c_oAscChartTypeSettings.areaStackedPer,     iconCls: 'area-pstack'},
-                        { group: 'menu-chart-group-scatter', type: Asc.c_oAscChartTypeSettings.scatter,            iconCls: 'point-normal'},
-                        { group: 'menu-chart-group-stock',   type: Asc.c_oAscChartTypeSettings.stock,              iconCls: 'stock-normal'}
-                        // { group: 'menu-chart-group-surface', type: Asc.c_oAscChartTypeSettings.surfaceNormal,      iconCls: 'surface-normal'},
-                        // { group: 'menu-chart-group-surface', type: Asc.c_oAscChartTypeSettings.surfaceWireframe,   iconCls: 'surface-wireframe'},
-                        // { group: 'menu-chart-group-surface', type: Asc.c_oAscChartTypeSettings.contourNormal,      iconCls: 'contour-normal'},
-                        // { group: 'menu-chart-group-surface', type: Asc.c_oAscChartTypeSettings.contourWireframe,   iconCls: 'contour-wireframe'}
-
-                    ]),
                     itemTemplate: _.template('<div id="<%= id %>" class="item-chartlist <%= iconCls %>"></div>')
                 });
             });
@@ -538,15 +498,7 @@ define([
         txtInFront: 'In front',
         textEditData: 'Edit Data',
         textChartType: 'Change Chart Type',
-        textLine:           'Line',
+        textStyle:          'Style'
-        textColumn:         'Column',
-        textBar:            'Bar',
-        textArea:           'Area',
-        textPie:            'Pie',
-        textPoint:          'XY (Scatter)',
-        textStock:          'Stock',
-        textStyle:          'Style',
-        textSurface: 'Surface'
 
     }, DE.Views.ChartSettings || {}));
 });

apps/documenteditor/main/app/view/ControlSettingsDialog.js

@@ -39,17 +39,21 @@
  *
  */
 
-define([
+define([ 'text!documenteditor/main/app/template/ControlSettingsDialog.template',
     'common/main/lib/util/utils',
     'common/main/lib/component/CheckBox',
     'common/main/lib/component/InputField',
-    'common/main/lib/view/AdvancedSettingsWindow'
+    'common/main/lib/view/AdvancedSettingsWindow',
-], function () { 'use strict';
+    'common/main/lib/view/SymbolTableDialog',
+    'documenteditor/main/app/view/EditListItemDialog'
+], function (contentTemplate) { 'use strict';
 
     DE.Views.ControlSettingsDialog = Common.Views.AdvancedSettingsWindow.extend(_.extend({
         options: {
             contentWidth: 310,
-            height: 412
+            height: 392,
+            toggleGroup: 'control-adv-settings-group',
+            storageName: 'de-control-settings-adv-category'
         },
 
         initialize : function(options) {
@@ -57,83 +61,16 @@ define([
 
             _.extend(this.options, {
                 title: this.textTitle,
-                template: [
+                items: [
-                    '<div class="box" style="height:' + (me.options.height - 85) + 'px;">',
+                    {panelId: 'id-adv-control-settings-general', panelCaption: this.strGeneral},
-                        '<div class="content-panel" style="padding: 0 5px;"><div class="inner-content">',
+                    {panelId: 'id-adv-control-settings-lock',    panelCaption: this.textLock},
-                            '<div class="settings-panel active">',
+                    {panelId: 'id-adv-control-settings-list',    panelCaption: this.textCombobox},
-                                '<table cols="1" style="width: 100%;">',
+                    {panelId: 'id-adv-control-settings-date',    panelCaption: this.textDate},
-                                '<tr>',
+                    {panelId: 'id-adv-control-settings-checkbox',panelCaption: this.textCheckbox}
-                                    '<td class="padding-small">',
+                ],
-                                        '<label class="input-label">', me.textName, '</label>',
+                contentTemplate: _.template(contentTemplate)({
-                                        '<div id="control-settings-txt-name"></div>',
+                    scope: this
-                                    '</td>',
+                })
-                                '</tr>',
-                                '<tr>',
-                                    '<td class="padding-large">',
-                                        '<label class="input-label">', me.textTag, '</label>',
-                                        '<div id="control-settings-txt-tag"></div>',
-                                    '</td>',
-                                '</tr>',
-                                '<tr>',
-                                    '<td class="padding-large">',
-                                        '<div class="separator horizontal"></div>',
-                                    '</td>',
-                                '</tr>',
-                                '</table>',
-                                '<table cols="2" style="width: auto;">',
-                                '<tr>',
-                                    '<td class="padding-small" colspan="2">',
-                                        '<label class="header">', me.textAppearance, '</label>',
-                                    '</td>',
-                                '</tr>',
-                                '<tr>',
-                                    '<td class="padding-small">',
-                                        '<label class="input-label" style="margin-right: 10px;">', me.textShowAs,'</label>',
-                                    '</td>',
-                                    '<td class="padding-small">',
-                                        '<div id="control-settings-combo-show" class="input-group-nr" style="display: inline-block; width:120px;"></div>',
-                                    '</td>',
-                                '</tr>',
-                                '<tr>',
-                                    '<td class="padding-small">',
-                                        '<label class="input-label" style="margin-right: 10px;">', me.textColor, '</label>',
-                                    '</td>',
-                                    '<td class="padding-small">',
-                                        '<div id="control-settings-color-btn" style="display: inline-block;"></div>',
-                                    '</td>',
-                                '</tr>',
-                                '<tr>',
-                                    '<td class="padding-large" colspan="2">',
-                                        '<button type="button" class="btn btn-text-default auto" id="control-settings-btn-all" style="min-width: 98px;">', me.textApplyAll,'</button>',
-                                    '</td>',
-                                '</tr>',
-                                '</table>',
-                                '<table cols="1" style="width: 100%;">',
-                                '<tr>',
-                                    '<td class="padding-large">',
-                                        '<div class="separator horizontal"></div>',
-                                    '</td>',
-                                '</tr>',
-                                '<tr>',
-                                    '<td class="padding-small">',
-                                        '<label class="header">', me.textLock, '</label>',
-                                    '</td>',
-                                '</tr>',
-                                '<tr>',
-                                    '<td class="padding-small">',
-                                        '<div id="control-settings-chb-lock-delete"></div>',
-                                    '</td>',
-                                '</tr>',
-                                '<tr>',
-                                    '<td class="padding-small">',
-                                        '<div id="control-settings-chb-lock-edit"></div>',
-                                    '</td>',
-                                '</tr>',
-                                '</table>',
-                            '</div></div>',
-                        '</div>',
-                    '</div>'
-                ].join('')
             }, options);
 
             this.handler    = options.handler;
@@ -222,6 +159,117 @@ define([
                 labelText: this.txtLockEdit
             });
 
+            // combobox & dropdown list
+            this.list = new Common.UI.ListView({
+                el: $('#control-settings-list', this.$window),
+                store: new Common.UI.DataViewStore(),
+                emptyText: '',
+                template: _.template(['<div class="listview inner" style=""></div>'].join('')),
+                itemTemplate: _.template([
+                    '<div id="<%= id %>" class="list-item" style="width: 100%;display:inline-block;">',
+                    '<div style="width:90px;display: inline-block;vertical-align: middle; overflow: hidden; text-overflow: ellipsis;white-space: pre;margin-right: 5px;"><%= name %></div>',
+                    '<div style="width:90px;display: inline-block;vertical-align: middle; overflow: hidden; text-overflow: ellipsis;white-space: pre;"><%= value %></div>',
+                    '</div>'
+                ].join(''))
+            });
+            this.list.on('item:select', _.bind(this.onSelectItem, this));
+
+            this.btnAdd = new Common.UI.Button({
+                el: $('#control-settings-btn-add')
+            });
+            this.btnAdd.on('click', _.bind(this.onAddItem, this));
+
+            this.btnChange = new Common.UI.Button({
+                el: $('#control-settings-btn-change')
+            });
+            this.btnChange.on('click', _.bind(this.onChangeItem, this));
+
+            this.btnDelete = new Common.UI.Button({
+                el: $('#control-settings-btn-delete')
+            });
+            this.btnDelete.on('click', _.bind(this.onDeleteItem, this));
+
+            this.btnUp = new Common.UI.Button({
+                el: $('#control-settings-btn-up')
+            });
+            this.btnUp.on('click', _.bind(this.onMoveItem, this, true));
+
+            this.btnDown = new Common.UI.Button({
+                el: $('#control-settings-btn-down')
+            });
+            this.btnDown.on('click', _.bind(this.onMoveItem, this, false));
+
+            // date picker
+            var data = [{ value: 0x042C }, { value: 0x0402 }, { value: 0x0405 }, { value: 0x0407 },  {value: 0x0807}, { value: 0x0408 }, { value: 0x0C09 }, { value: 0x0809 }, { value: 0x0409 }, { value: 0x0C0A }, { value: 0x080A },
+                { value: 0x040B }, { value: 0x040C }, { value: 0x0410 }, { value: 0x0411 }, { value: 0x0412 }, { value: 0x0426 }, { value: 0x0413 }, { value: 0x0415 }, { value: 0x0416 },
+                { value: 0x0816 }, { value: 0x0419 }, { value: 0x041B }, { value: 0x0424 }, { value: 0x081D }, { value: 0x041D }, { value: 0x041F }, { value: 0x0422 }, { value: 0x042A }, { value: 0x0804 }];
+            data.forEach(function(item) {
+                var langinfo = Common.util.LanguageInfo.getLocalLanguageName(item.value);
+                item.displayValue = langinfo[1];
+                item.langName = langinfo[0];
+            });
+
+            this.cmbLang = new Common.UI.ComboBox({
+                el          : $('#control-settings-lang'),
+                menuStyle   : 'min-width: 100%; max-height: 185px;',
+                cls         : 'input-group-nr',
+                editable    : false,
+                data        : data
+            });
+            this.cmbLang.setValue(0x0409);
+            this.cmbLang.on('selected',function(combo, record) {
+                me.updateFormats(record.value);
+            });
+
+            this.listFormats = new Common.UI.ListView({
+                el: $('#control-settings-format'),
+                store: new Common.UI.DataViewStore(),
+                scrollAlwaysVisible: true
+            });
+            this.listFormats.on('item:select', _.bind(this.onSelectFormat, this));
+
+            this.txtDate = new Common.UI.InputField({
+                el          : $('#control-settings-txt-format'),
+                allowBlank  : true,
+                validateOnChange: false,
+                validateOnBlur: false,
+                style       : 'width: 100%;',
+                value       : ''
+            });
+
+            // Check Box
+            this.txtChecked = new Common.UI.InputField({
+                el          : $('#control-settings-input-checked'),
+                allowBlank  : true,
+                validateOnChange: false,
+                validateOnBlur: false,
+                style       : 'width: 30px;',
+                value       : ''
+            });
+            this.txtChecked._input.attr('disabled', true);
+            this.txtChecked._input.css({'text-align': 'center', 'font-size': '16px'});
+
+            this.txtUnchecked = new Common.UI.InputField({
+                el          : $('#control-settings-input-unchecked'),
+                allowBlank  : true,
+                validateOnChange: false,
+                validateOnBlur: false,
+                style       : 'width: 30px;',
+                value       : ''
+            });
+            this.txtUnchecked._input.attr('disabled', true);
+            this.txtUnchecked._input.css({'text-align': 'center', 'font-size': '16px'});
+
+            this.btnEditChecked = new Common.UI.Button({
+                el: $('#control-settings-btn-checked-edit')
+            });
+            this.btnEditChecked.on('click', _.bind(this.onEditCheckbox, this, true));
+
+            this.btnEditUnchecked = new Common.UI.Button({
+                el: $('#control-settings-btn-unchecked-edit')
+            });
+            this.btnEditUnchecked.on('click', _.bind(this.onEditCheckbox, this, false));
+
             this.afterRender();
         },
 
@@ -252,6 +300,10 @@ define([
         afterRender: function() {
             this.updateThemeColors();
             this._setDefaults(this.props);
+            if (this.storageName) {
+                var value = Common.localStorage.getItem(this.storageName);
+                this.setActiveCategory((value!==null) ? parseInt(value) : 0);
+            }
         },
 
         show: function() {
@@ -286,6 +338,69 @@ define([
                 (val===undefined) && (val = Asc.c_oAscSdtLockType.Unlocked);
                 this.chLockDelete.setValue(val==Asc.c_oAscSdtLockType.SdtContentLocked || val==Asc.c_oAscSdtLockType.SdtLocked);
                 this.chLockEdit.setValue(val==Asc.c_oAscSdtLockType.SdtContentLocked || val==Asc.c_oAscSdtLockType.ContentLocked);
+
+                var type = props.get_SpecificType();
+
+                //for list controls
+                this.btnsCategory[2].setVisible(type == Asc.c_oAscContentControlSpecificType.ComboBox || type == Asc.c_oAscContentControlSpecificType.DropDownList);
+                if (type == Asc.c_oAscContentControlSpecificType.ComboBox || type == Asc.c_oAscContentControlSpecificType.DropDownList) {
+                    this.btnsCategory[2].setCaption(type == Asc.c_oAscContentControlSpecificType.ComboBox ? this.textCombobox : this.textDropDown);
+                    var specProps = (type == Asc.c_oAscContentControlSpecificType.ComboBox) ? props.get_ComboBoxPr() : props.get_DropDownListPr();
+                    if (specProps) {
+                        var count = specProps.get_ItemsCount();
+                        var arr = [];
+                        for (var i=0; i<count; i++) {
+                            arr.push({
+                                value: specProps.get_ItemValue(i),
+                                name: specProps.get_ItemDisplayText(i)
+                            });
+                        }
+                        this.list.store.reset(arr);
+                    }
+                    this.disableListButtons();
+                }
+
+                //for date picker
+                this.btnsCategory[3].setVisible(type == Asc.c_oAscContentControlSpecificType.DateTime);
+                if (type == Asc.c_oAscContentControlSpecificType.DateTime) {
+                    var specProps = props.get_DateTimePr();
+                    if (specProps) {
+                        this.datetime = specProps;
+                        var lang = specProps.get_LangId() || this.options.controlLang;
+                        if (lang) {
+                            var item = this.cmbLang.store.findWhere({value: lang});
+                            item = item ? item.get('value') : 0x0409;
+                            this.cmbLang.setValue(item);
+                        }
+                        this.updateFormats(this.cmbLang.getValue());
+                        var format = specProps.get_DateFormat();
+                        var rec = this.listFormats.store.findWhere({format: format});
+                        this.listFormats.selectRecord(rec);
+                        this.listFormats.scrollToRecord(rec);
+                        this.txtDate.setValue(format);
+                    }
+                }
+
+                // for check box
+                this.btnsCategory[4].setVisible(type == Asc.c_oAscContentControlSpecificType.CheckBox);
+                if (type == Asc.c_oAscContentControlSpecificType.CheckBox) {
+                    var specProps = props.get_CheckBoxPr();
+                    if (specProps) {
+                        var code = specProps.get_CheckedSymbol(),
+                            font = specProps.get_CheckedFont();
+                        font && this.txtChecked.cmpEl.css('font-family', font);
+                        code && this.txtChecked.setValue(String.fromCharCode(code));
+                        this.checkedBox = {code: code, font: font};
+
+                        code = specProps.get_UncheckedSymbol();
+                        font = specProps.get_UncheckedFont();
+                        font && this.txtUnchecked.cmpEl.css('font-family', font);
+                        code && this.txtUnchecked.setValue(String.fromCharCode(code));
+                        this.uncheckedBox = {code: code, font: font};
+                    }
+                }
+
+                this.type = type;
             }
         },
 
@@ -312,6 +427,39 @@ define([
                 lock = Asc.c_oAscSdtLockType.ContentLocked;
             props.put_Lock(lock);
 
+            // for list controls
+            if (this.type == Asc.c_oAscContentControlSpecificType.ComboBox || this.type == Asc.c_oAscContentControlSpecificType.DropDownList) {
+                var specProps = new AscCommon.CSdtComboBoxPr();
+                this.list.store.each(function (item, index) {
+                    specProps.add_Item(item.get('name'), item.get('value'));
+                });
+                (this.type == Asc.c_oAscContentControlSpecificType.ComboBox) ? props.put_ComboBoxPr(specProps) : props.put_DropDownListPr(specProps);
+            }
+
+            //for date picker
+            if (this.type == Asc.c_oAscContentControlSpecificType.DateTime) {
+                var specProps = new AscCommon.CSdtDatePickerPr();
+                specProps.put_DateFormat(this.txtDate.getValue());
+                specProps.put_LangId(this.cmbLang.getValue());
+                props.put_DateTimePr(specProps);
+            }
+
+            // for check box
+            if (this.type == Asc.c_oAscContentControlSpecificType.CheckBox) {
+                if (this.checkedBox && this.checkedBox.changed || this.uncheckedBox && this.uncheckedBox.changed) {
+                    var specProps = new AscCommon.CSdtCheckBoxPr();
+                    if (this.checkedBox) {
+                        specProps.put_CheckedSymbol(this.checkedBox.code);
+                        specProps.put_CheckedFont(this.checkedBox.font);
+                    }
+                    if (this.uncheckedBox) {
+                        specProps.put_UncheckedSymbol(this.uncheckedBox.code);
+                        specProps.put_UncheckedFont(this.uncheckedBox.font);
+                    }
+                    props.put_CheckBoxPr(specProps);
+                }
+            }
+
             return props;
         },
 
@@ -339,6 +487,147 @@ define([
             }
         },
 
+        onSelectItem: function(listView, itemView, record) {
+            this.disableListButtons(false);
+        },
+
+        disableListButtons: function(disabled) {
+            if (disabled===undefined)
+                disabled = !this.list.getSelectedRec();
+            this.btnChange.setDisabled(disabled);
+            this.btnDelete.setDisabled(disabled);
+            this.btnUp.setDisabled(disabled);
+            this.btnDown.setDisabled(disabled);
+        },
+
+        onAddItem: function() {
+            var me = this,
+                win = new DE.Views.EditListItemDialog({
+                    store: me.list.store,
+                    handler: function(result, name, value) {
+                        if (result == 'ok') {
+                            var rec = me.list.store.add({
+                                    value: value,
+                                    name: name
+                                });
+                            if (rec) {
+                                me.list.selectRecord(rec);
+                                me.list.scrollToRecord(rec);
+                                me.disableListButtons();
+                            }
+                        }
+                        me.list.cmpEl.find('.listview').focus();
+                    }
+                });
+            win.show();
+        },
+
+        onChangeItem: function() {
+            var me = this,
+                rec = this.list.getSelectedRec(),
+                win = new DE.Views.EditListItemDialog({
+                    store: me.list.store,
+                    handler: function(result, name, value) {
+                        if (result == 'ok') {
+                            if (rec) {
+                                rec.set({
+                                    value: value,
+                                    name: name
+                                });
+                            }
+                        }
+                        me.list.cmpEl.find('.listview').focus();
+                    }
+                });
+            rec && win.show();
+            rec && win.setSettings({name: rec.get('name'), value: rec.get('value')});
+        },
+
+        onDeleteItem: function(btn, eOpts){
+            var rec = this.list.getSelectedRec();
+            if (rec) {
+                var store = this.list.store;
+                var idx = _.indexOf(store.models, rec);
+                store.remove(rec);
+                if (idx>store.length-1) idx = store.length-1;
+                if (store.length>0) {
+                    this.list.selectByIndex(idx);
+                    this.list.scrollToRecord(store.at(idx));
+                }
+            }
+            this.disableListButtons();
+            this.list.cmpEl.find('.listview').focus();
+        },
+
+        onMoveItem: function(up) {
+            var store = this.list.store,
+                length = store.length,
+                rec = this.list.getSelectedRec();
+            if (rec) {
+                var index = store.indexOf(rec);
+                store.add(store.remove(rec), {at: up ? Math.max(0, index-1) : Math.min(length-1, index+1)});
+                this.list.selectRecord(rec);
+                this.list.scrollToRecord(rec);
+            }
+            this.list.cmpEl.find('.listview').focus();
+        },
+
+        updateFormats: function(lang) {
+            if (this.datetime) {
+                var props = this.datetime,
+                    formats = props.get_FormatsExamples(),
+                    arr = [];
+                for (var i = 0, len = formats.length; i < len; i++)
+                {
+                    props.get_String(formats[i], undefined, lang);
+                    var rec = new Common.UI.DataViewModel();
+                    rec.set({
+                        format: formats[i],
+                        value: props.get_String(formats[i], undefined, lang)
+                    });
+                    arr.push(rec);
+                }
+                this.listFormats.store.reset(arr);
+                this.listFormats.selectByIndex(0);
+                var rec = this.listFormats.getSelectedRec();
+                this.listFormats.scrollToRecord(rec);
+                this.txtDate.setValue(rec.get('format'));
+            }
+        },
+
+        onEditCheckbox: function(checked) {
+            if (this.api) {
+                var me = this,
+                    props = (checked) ? me.checkedBox : me.uncheckedBox,
+                    cmp = (checked) ? me.txtChecked : me.txtUnchecked,
+                    handler = function(dlg, result, settings) {
+                        if (result == 'ok') {
+                            props.changed = true;
+                            props.code = settings.code;
+                            props.font = settings.font;
+                            props.font && cmp.cmpEl.css('font-family', props.font);
+                            settings.symbol && cmp.setValue(settings.symbol);
+                        }
+                    },
+                    win = new Common.Views.SymbolTableDialog({
+                        api: me.api,
+                        lang: me.options.interfaceLang,
+                        modal: true,
+                        type: 0,
+                        font: props.font,
+                        code: props.code,
+                        handler: handler
+                    });
+                win.show();
+                win.on('symbol:dblclick', handler);
+            }
+        },
+
+        onSelectFormat: function(lisvView, itemView, record) {
+            if (!record) return;
+            this.txtDate.setValue(record.get('format'));
+        },
+
         textTitle:    'Content Control Settings',
         textName: 'Title',
         textTag: 'Tag',
@@ -352,7 +641,23 @@ define([
         textNewColor: 'Add New Custom Color',
         textApplyAll: 'Apply to All',
         textAppearance: 'Appearance',
-        textSystemColor: 'System'
+        textSystemColor: 'System',
+        strGeneral: 'General',
+        textAdd: 'Add',
+        textChange: 'Edit',
+        textDelete: 'Delete',
+        textUp: 'Up',
+        textDown: 'Down',
+        textCombobox: 'Combo box',
+        textDropDown: 'Drop-down list',
+        textDisplayName: 'Display name',
+        textValue: 'Value',
+        textDate: 'Date format',
+        textLang: 'Language',
+        textFormat: 'Display the date like this',
+        textCheckbox: 'Check box',
+        textChecked: 'Checked symbol',
+        textUnchecked: 'Unchecked symbol'
 
     }, DE.Views.ControlSettingsDialog || {}))
 });

apps/documenteditor/main/app/view/DocumentHolder.js

@@ -1995,10 +1995,13 @@ define([
             this.viewModeMenu = new Common.UI.Menu({
                 initMenu: function (value) {
                     var isInChart = (value.imgProps && value.imgProps.value && !_.isNull(value.imgProps.value.get_ChartProperties())),
+                        isInShape = (value.imgProps && value.imgProps.value && !_.isNull(value.imgProps.value.get_ShapeProperties())),
                         signGuid = (value.imgProps && value.imgProps.value && me.mode.isSignatureSupport) ? value.imgProps.value.asc_getSignatureId() : undefined,
                         signProps = (signGuid) ? me.api.asc_getSignatureSetup(signGuid) : null,
                         isInSign = !!signProps && me._canProtect,
                         canComment = !isInChart && me.api.can_AddQuotedComment() !== false && me.mode.canCoAuthoring && me.mode.canComments && !me._isDisabled;
+                    if (me.mode.compatibleFeatures)
+                        canComment = canComment && !isInShape;
 
                     menuViewUndo.setVisible(me.mode.canCoAuthoring && me.mode.canComments && !me._isDisabled);
                     menuViewUndo.setDisabled(!me.api.asc_getCanUndo() && !me._isDisabled);
@@ -3625,8 +3628,11 @@ define([
                         text = me.api.can_AddHyperlink();
                     }
                     /** coauthoring begin **/
-                    menuCommentSeparatorPara.setVisible(!isInChart && me.api.can_AddQuotedComment()!==false && me.mode.canCoAuthoring && me.mode.canComments);
+                    var isVisible = !isInChart && me.api.can_AddQuotedComment()!==false && me.mode.canCoAuthoring && me.mode.canComments;
-                    menuAddCommentPara.setVisible(!isInChart && me.api.can_AddQuotedComment()!==false && me.mode.canCoAuthoring && me.mode.canComments);
+                    if (me.mode.compatibleFeatures)
+                        isVisible = isVisible && !isInShape;
+                    menuCommentSeparatorPara.setVisible(isVisible);
+                    menuAddCommentPara.setVisible(isVisible);
                     menuAddCommentPara.setDisabled(value.paraProps && value.paraProps.locked === true);
                     /** coauthoring end **/
 
@@ -3976,7 +3982,7 @@ define([
         mergeCellsText          : 'Merge Cells',
         splitCellsText          : 'Split Cell...',
         splitCellTitleText      : 'Split Cell',
-        originalSizeText        : 'Default Size',
+        originalSizeText        : 'Actual Size',
         advancedText            : 'Advanced Settings',
         breakBeforeText         : 'Page break before',
         keepLinesText           : 'Keep lines together',

apps/documenteditor/main/app/view/EditListItemDialog.js

@@ -0,0 +1,175 @@
+/*
+ *
+ * (c) Copyright Ascensio System SIA 2010-2019
+ *
+ * This program is a free software product. You can redistribute it and/or
+ * modify it under the terms of the GNU Affero General Public License (AGPL)
+ * version 3 as published by the Free Software Foundation. In accordance with
+ * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect
+ * that Ascensio System SIA expressly excludes the warranty of non-infringement
+ * of any third-party rights.
+ *
+ * This program is distributed WITHOUT ANY WARRANTY; without even the implied
+ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR  PURPOSE. For
+ * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html
+ *
+ * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha
+ * street, Riga, Latvia, EU, LV-1050.
+ *
+ * The  interactive user interfaces in modified source and object code versions
+ * of the Program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU AGPL version 3.
+ *
+ * Pursuant to Section 7(b) of the License you must retain the original Product
+ * logo when distributing the program. Pursuant to Section 7(e) we decline to
+ * grant you any rights under trademark law for use of our trademarks.
+ *
+ * All the Product's GUI elements, including illustrations and icon sets, as
+ * well as technical writing content are licensed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International. See the License
+ * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
+ *
+ */
+
+/**
+ *  EditListItemDialog.js
+ *
+ *  Created by Julia Radzhabova on 05.11.2019
+ *  Copyright (c) 2019 Ascensio System SIA. All rights reserved.
+ *
+ */
+
+define([
+    'common/main/lib/component/Window',
+    'common/main/lib/component/InputField'
+], function () { 'use strict';
+
+    DE.Views.EditListItemDialog = Common.UI.Window.extend(_.extend({
+        options: {
+            width: 330,
+            header: false,
+            cls: 'modal-dlg',
+            buttons: ['ok', 'cancel']
+        },
+
+        initialize : function(options) {
+            _.extend(this.options, options || {});
+
+            this.template = [
+                '<div class="box">',
+                '<div class="input-row">',
+                    '<label>' + this.textDisplayName + '</label>',
+                '</div>',
+                '<div id="id-dlg-label-name" class="input-row" style="margin-bottom: 8px;"></div>',
+                '<div class="input-row">',
+                '<label>' + this.textValue + '</label>',
+                '</div>',
+                '<div id="id-dlg-label-value" class="input-row"></div>',
+                '</div>'
+            ].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;
+            me.inputName = new Common.UI.InputField({
+                el          : $('#id-dlg-label-name'),
+                allowBlank  : false,
+                blankError  : me.textNameError,
+                style       : 'width: 100%;',
+                validateOnBlur: false,
+                validation  : function(value) {
+                    return value ? true : '';
+                }
+            });
+            me.inputName._input.on('input', function (e) {
+                if (me.copyvalue==undefined && me.inputValue.getValue()==me.inputName.getValue()) {
+                    me.copyvalue = 1;
+                }
+                if (me.copyvalue==1)
+                    me.inputValue.setValue($(e.target).val());
+                else if (me.copyvalue==2)
+                    me.copyvalue = 0;
+            });
+
+            me.inputValue = new Common.UI.InputField({
+                el          : $('#id-dlg-label-value'),
+                style       : 'width: 100%;',
+                validateOnBlur: false,
+                validation  : function(value) {
+                    if (value!=='' && me.options.store) {
+                        var rec = me.options.store.findWhere({value: value});
+                        if (rec)
+                            return me.textValueError
+                    }
+                    return true;
+                }
+            });
+            me.inputValue._input.on('input', function (e) {
+                if (me.copyvalue==undefined && me.inputValue.getValue()==me.inputName.getValue()) {
+                    me.copyvalue = 2;
+                }
+                if (me.copyvalue==2)
+                    me.inputName.setValue($(e.target).val());
+                else if (me.copyvalue==1)
+                    me.copyvalue = 0;
+            });
+
+            var $window = this.getChild();
+            $window.find('.btn').on('click',     _.bind(this.onBtnClick, this));
+        },
+
+        show: function() {
+            Common.UI.Window.prototype.show.apply(this, arguments);
+
+            var me = this;
+            _.delay(function(){
+                me.inputName.cmpEl.find('input').focus();
+            },50);
+        },
+
+        onPrimary: function(event) {
+            this._handleInput('ok');
+            return false;
+        },
+
+        onBtnClick: function(event) {
+            this._handleInput(event.currentTarget.attributes['result'].value);
+        },
+
+        _handleInput: function(state) {
+            if (this.options.handler) {
+                if (state == 'ok') {
+                    if (this.inputName.checkValidate() !== true)  {
+                        this.inputName.cmpEl.find('input').focus();
+                        return;
+                    }
+                    if (this.inputValue.checkValidate() !== true)  {
+                        this.inputValue.cmpEl.find('input').focus();
+                        return;
+                    }
+                }
+
+                this.options.handler.call(this, state, this.inputName.getValue(), this.inputValue.getValue());
+            }
+
+            this.close();
+        },
+
+        setSettings: function (props) {
+            if (props) {
+                this.inputName.setValue(props.name || '');
+                this.inputValue.setValue(props.value || '');
+            }
+        },
+
+        textDisplayName: 'Display name',
+        textValue: 'Value',
+        textNameError: 'Display name must not be empty.',
+        textValueError: 'An item with the same value already exists.'
+    }, DE.Views.EditListItemDialog || {}));
+});

apps/documenteditor/main/app/view/FileMenuPanels.js

@@ -881,7 +881,7 @@ define([
             }).on('keydown:before', keyDownBefore);
 
             this.btnApply = new Common.UI.Button({
-                el: '#fminfo-btn-apply'
+                el: $markup.findById('#fminfo-btn-apply')
             });
             this.btnApply.on('click', _.bind(this.applySettings, this));
 
@@ -1003,6 +1003,7 @@ define([
                     me.authors.push(item);
                 });
                 this.tblAuthor.find('.close').toggleClass('hidden', !this.mode.isEdit);
+                !this.mode.isEdit && this._ShowHideInfoItem(this.tblAuthor, !!this.authors.length);
             }
             this.SetDisabled();
         },
@@ -1047,6 +1048,12 @@ define([
             this.inputAuthor.setVisible(mode.isEdit);
             this.btnApply.setVisible(mode.isEdit);
             this.tblAuthor.find('.close').toggleClass('hidden', !mode.isEdit);
+            if (!mode.isEdit) {
+                this.inputTitle._input.attr('placeholder', '');
+                this.inputSubject._input.attr('placeholder', '');
+                this.inputComment._input.attr('placeholder', '');
+                this.inputAuthor._input.attr('placeholder', '');
+            }
             this.SetDisabled();
             return this;
         },
@@ -1192,7 +1199,7 @@ define([
 
             this.updateInfo(this.doc);
 
-            Common.NotificationCenter.on('collaboration:sharing', this.changeAccessRights.bind(this));
+            Common.NotificationCenter.on('collaboration:sharingupdate', this.updateSharingSettings.bind(this));
             Common.NotificationCenter.on('collaboration:sharingdeny', this.onLostEditRights.bind(this));
 
             this.$el = $(node).html($markup);
@@ -1245,36 +1252,16 @@ define([
 
         setMode: function(mode) {
             this.sharingSettingsUrl = mode.sharingSettingsUrl;
-            !!this.sharingSettingsUrl && this.sharingSettingsUrl.length && Common.Gateway.on('showsharingsettings', _.bind(this.changeAccessRights, this));
-            !!this.sharingSettingsUrl && this.sharingSettingsUrl.length && Common.Gateway.on('setsharingsettings', _.bind(this.setSharingSettings, this));
             return this;
         },
 
         changeAccessRights: function(btn,event,opts) {
-            if (this._docAccessDlg || this._readonlyRights) return;
+            Common.NotificationCenter.trigger('collaboration:sharing');
-
-            var me = this;
-            me._docAccessDlg = new Common.Views.DocumentAccessDialog({
-                settingsurl: this.sharingSettingsUrl
-            });
-            me._docAccessDlg.on('accessrights', function(obj, rights){
-                me.updateSharingSettings(rights);
-            }).on('close', function(obj){
-                me._docAccessDlg = undefined;
-            });
-
-            me._docAccessDlg.show();
-        },
-
-        setSharingSettings: function(data) {
-            data && this.updateSharingSettings(data.sharingSettings);
         },
 
         updateSharingSettings: function(rights) {
-            this.doc.info.sharingSettings = rights;
             this._ShowHideInfoItem('rights', this.doc.info.sharingSettings!==undefined && this.doc.info.sharingSettings!==null && this.doc.info.sharingSettings.length>0);
             this.cntRights.html(this.templateRights({users: this.doc.info.sharingSettings}));
-            Common.NotificationCenter.trigger('mentions:clearusers', this);
         },
 
         onLostEditRights: function() {

apps/documenteditor/main/app/view/HyperlinkSettingsDialog.js

@@ -58,8 +58,7 @@ define([
             width: 350,
             style: 'min-width: 230px;',
             cls: 'modal-dlg',
-            buttons: ['ok', 'cancel'],
+            buttons: ['ok', 'cancel']
-            footerCls: 'right'
         },
 
         initialize : function(options) {

apps/documenteditor/main/app/view/ImageSettings.js

@@ -105,10 +105,10 @@ define([
 
         updateMetricUnit: function() {
             var value = Common.Utils.Metric.fnRecalcFromMM(this._state.Width);
-            this.labelWidth[0].innerHTML = this.textWidth + ': ' + value.toFixed(1) + ' ' + Common.Utils.Metric.getCurrentMetricName();
+            this.labelWidth[0].innerHTML = this.textWidth + ': ' + value.toFixed(2) + ' ' + Common.Utils.Metric.getCurrentMetricName();
 
             value = Common.Utils.Metric.fnRecalcFromMM(this._state.Height);
-            this.labelHeight[0].innerHTML = this.textHeight + ': ' + value.toFixed(1) + ' ' + Common.Utils.Metric.getCurrentMetricName();
+            this.labelHeight[0].innerHTML = this.textHeight + ': ' + value.toFixed(2) + ' ' + Common.Utils.Metric.getCurrentMetricName();
         },
 
         createDelayedControls: function() {
@@ -159,6 +159,10 @@ define([
             });
             this.lockedControls.push(this.btnFitMargins);
 
+            var w = Math.max(this.btnOriginalSize.cmpEl.width(), this.btnFitMargins.cmpEl.width());
+            this.btnOriginalSize.cmpEl.width(w);
+            this.btnFitMargins.cmpEl.width(w);
+
             this.btnInsertFromFile = new Common.UI.Button({
                 el: $('#image-button-from-file')
             });
@@ -229,6 +233,7 @@ define([
             this.btnFlipH.on('click', _.bind(this.onBtnFlipClick, this));
             this.lockedControls.push(this.btnFlipH);
 
+            var w = this.btnOriginalSize.cmpEl.outerWidth();
             this.btnCrop = new Common.UI.Button({
                 cls: 'btn-text-split-default',
                 caption: this.textCrop,
@@ -236,9 +241,9 @@ define([
                 enableToggle: true,
                 allowDepress: true,
                 pressed: this._state.cropMode,
-                width: 100,
+                width: w,
                 menu        : new Common.UI.Menu({
-                    style       : 'min-width: 100px;',
+                    style       : 'min-width:' + w + 'px;',
                     items: [
                         {
                             caption: this.textCrop,
@@ -311,13 +316,13 @@ define([
 
                 value = props.get_Width();
                 if ( Math.abs(this._state.Width-value)>0.001 ) {
-                    this.labelWidth[0].innerHTML = this.textWidth + ': ' + Common.Utils.Metric.fnRecalcFromMM(value).toFixed(1) + ' ' + Common.Utils.Metric.getCurrentMetricName();
+                    this.labelWidth[0].innerHTML = this.textWidth + ': ' + Common.Utils.Metric.fnRecalcFromMM(value).toFixed(2) + ' ' + Common.Utils.Metric.getCurrentMetricName();
                     this._state.Width = value;
                 }
 
                 value = props.get_Height();
                 if ( Math.abs(this._state.Height-value)>0.001 ) {
-                    this.labelHeight[0].innerHTML = this.textHeight + ': ' + Common.Utils.Metric.fnRecalcFromMM(value).toFixed(1) + ' ' + Common.Utils.Metric.getCurrentMetricName();
+                    this.labelHeight[0].innerHTML = this.textHeight + ': ' + Common.Utils.Metric.fnRecalcFromMM(value).toFixed(2) + ' ' + Common.Utils.Metric.getCurrentMetricName();
                     this._state.Height = value;
                 }
 
@@ -391,8 +396,8 @@ define([
                 var w = imgsize.get_ImageWidth();
                 var h = imgsize.get_ImageHeight();
 
-                this.labelWidth[0].innerHTML = this.textWidth + ': ' + Common.Utils.Metric.fnRecalcFromMM(w).toFixed(1) + ' ' + Common.Utils.Metric.getCurrentMetricName();
+                this.labelWidth[0].innerHTML = this.textWidth + ': ' + Common.Utils.Metric.fnRecalcFromMM(w).toFixed(2) + ' ' + Common.Utils.Metric.getCurrentMetricName();
-                this.labelHeight[0].innerHTML = this.textHeight + ': ' + Common.Utils.Metric.fnRecalcFromMM(h).toFixed(1) + ' ' + Common.Utils.Metric.getCurrentMetricName();
+                this.labelHeight[0].innerHTML = this.textHeight + ': ' + Common.Utils.Metric.fnRecalcFromMM(h).toFixed(2) + ' ' + Common.Utils.Metric.getCurrentMetricName();
 
                 var properties = new Asc.asc_CImgProperty();
                 properties.put_Width(w);
@@ -423,8 +428,8 @@ define([
                     h = pageh;
                 }
 
-                this.labelWidth[0].innerHTML = this.textWidth + ': ' + Common.Utils.Metric.fnRecalcFromMM(w).toFixed(1) + ' ' + Common.Utils.Metric.getCurrentMetricName();
+                this.labelWidth[0].innerHTML = this.textWidth + ': ' + Common.Utils.Metric.fnRecalcFromMM(w).toFixed(2) + ' ' + Common.Utils.Metric.getCurrentMetricName();
-                this.labelHeight[0].innerHTML = this.textHeight + ': ' + Common.Utils.Metric.fnRecalcFromMM(h).toFixed(1) + ' ' + Common.Utils.Metric.getCurrentMetricName();
+                this.labelHeight[0].innerHTML = this.textHeight + ': ' + Common.Utils.Metric.fnRecalcFromMM(h).toFixed(2) + ' ' + Common.Utils.Metric.getCurrentMetricName();
 
                 var properties = new Asc.asc_CImgProperty();
                 properties.put_Width(w);
@@ -572,7 +577,7 @@ define([
         textWrap:       'Wraping Style',
         textWidth:      'Width',
         textHeight:     'Height',
-        textOriginalSize: 'Default Size',
+        textOriginalSize: 'Actual Size',
         textInsert:     'Replace Image',
         textFromUrl:    'From URL',
         textFromFile:   'From File',

apps/documenteditor/main/app/view/ImageSettingsAdvanced.js

@@ -2013,7 +2013,7 @@ define([    'text!documenteditor/main/app/template/ImageSettingsAdvanced.templat
         textLeft:       'Left',
         textBottom:     'Bottom',
         textRight:      'Right',
-        textOriginalSize: 'Default Size',
+        textOriginalSize: 'Actual Size',
         textPosition:   'Position',
         textDistance:   'Distance From Text',
         textSize:       'Size',

apps/documenteditor/main/app/view/ParagraphSettings.js

@@ -84,13 +84,13 @@ define([
             this._locked = true;
             this.isChart = false;
 
-            this.render();
-
             this._arrLineRule = [
                 {displayValue: this.textAtLeast,defaultValue: 5, value: c_paragraphLinerule.LINERULE_LEAST, minValue: 0.03,   step: 0.01, defaultUnit: 'cm'},
                 {displayValue: this.textAuto,   defaultValue: 1, value: c_paragraphLinerule.LINERULE_AUTO, minValue: 0.5,    step: 0.01, defaultUnit: ''},
                 {displayValue: this.textExact,  defaultValue: 5, value: c_paragraphLinerule.LINERULE_EXACT, minValue: 0.03,   step: 0.01, defaultUnit: 'cm'}
             ];
+
+            this.render();
         },
 
         render: function () {

apps/documenteditor/main/app/view/ParagraphSettingsAdvanced.js

@@ -124,9 +124,9 @@ define([    'text!documenteditor/main/app/template/ParagraphSettingsAdvanced.tem
             }
 
             this._arrTabAlign = [
-                { value: 1, displayValue: this.textTabLeft },
+                { value: Asc.c_oAscTabType.Left, displayValue: this.textTabLeft },
-                { value: 3, displayValue: this.textTabCenter },
+                { value: Asc.c_oAscTabType.Center, displayValue: this.textTabCenter },
-                { value: 2, displayValue: this.textTabRight }
+                { value: Asc.c_oAscTabType.Right, displayValue: this.textTabRight }
             ];
             this._arrKeyTabAlign = [];
             this._arrTabAlign.forEach(function(item) {
@@ -577,7 +577,7 @@ define([    'text!documenteditor/main/app/template/ParagraphSettingsAdvanced.tem
                 cls         : 'input-group-nr',
                 data        : this._arrTabAlign
             });
-            this.cmbAlign.setValue(1);
+            this.cmbAlign.setValue(Asc.c_oAscTabType.Left);
 
             this.cmbLeader = new Common.UI.ComboBox({
                 el          : $('#paraadv-cmb-leader'),

apps/documenteditor/main/app/view/RightMenu.js

@@ -190,8 +190,7 @@ define([
                     allowMouseEventsOnDisabled: true
                 });
                 this._settings[Common.Utils.documentSettingsType.MailMerge]   = {panel: "id-mail-merge-settings",      btn: this.btnMailMerge};
-
+                this.btnMailMerge.setElement($markup.findById('#id-right-menu-mail-merge'), false); this.btnMailMerge.render().setVisible(true);
-                this.btnMailMerge.el    = $markup.findById('#id-right-menu-mail-merge'); this.btnMailMerge.render().setVisible(true);
                 this.btnMailMerge.on('click', this.onBtnMenuClick.bind(this));
                 this.mergeSettings = new DE.Views.MailMergeSettings();
             }
@@ -206,8 +205,7 @@ define([
                     allowMouseEventsOnDisabled: true
                 });
                 this._settings[Common.Utils.documentSettingsType.Signature]   = {panel: "id-signature-settings",      btn: this.btnSignature};
-
+                this.btnSignature.setElement($markup.findById('#id-right-menu-signature'), false); this.btnSignature.render().setVisible(true);
-                this.btnSignature.el    = $markup.findById('#id-right-menu-signature'); this.btnSignature.render().setVisible(true);
                 this.btnSignature.on('click', this.onBtnMenuClick.bind(this));
                 this.signatureSettings = new DE.Views.SignatureSettings();
             }

apps/documenteditor/main/app/view/ShapeSettings.js

@@ -550,7 +550,6 @@ define([
                 });
                 fill.get_fill().put_positions(arr);
 
-                if (this.OriginalFillType !== Asc.c_oAscFill.FILL_TYPE_GRAD) {
                 if (this.GradFillType == Asc.c_oAscFillGradType.GRAD_LINEAR) {
                     fill.get_fill().put_linear_angle(this.GradLinearDirectionType * 60000);
                     fill.get_fill().put_linear_scale(true);
@@ -560,7 +559,7 @@ define([
                     arr.push(Common.Utils.ThemeColor.getRgbColor(item));
                 });
                 fill.get_fill().put_colors(arr);
-                }
+
                 props.put_fill(fill);
                 this.imgprops.put_ShapeProperties(props);
                 this.api.ImgApply(this.imgprops);
@@ -958,6 +957,10 @@ define([
                         me.sldrGradient.setColorValue(Common.Utils.String.format('#{0}', (typeof(me.GradColor.colors[index]) == 'object') ? me.GradColor.colors[index].color : me.GradColor.colors[index]), index);
                         me.sldrGradient.setValue(index, me.GradColor.values[index]);
                     }
+                    if (_.isUndefined(me.GradColor.currentIdx) || me.GradColor.currentIdx >= this.GradColor.colors.length) {
+                        me.GradColor.currentIdx = 0;
+                    }
+                    me.sldrGradient.setActiveThumb(me.GradColor.currentIdx);
                     this.OriginalFillType = Asc.c_oAscFill.FILL_TYPE_GRAD;
                     this.FGColor = {Value: 1, Color: this.GradColor.colors[0]};
                     this.BGColor = {Value: 1, Color: 'ffffff'};
@@ -1357,6 +1360,16 @@ define([
                 me.GradColor.colors = colors;
                 me.GradColor.currentIdx = currentIdx;
             });
+            this.sldrGradient.on('addthumb', function(cmp, index, nearIndex, color){
+                me.GradColor.colors[index] = me.GradColor.colors[nearIndex];
+                me.GradColor.currentIdx = index;
+                me.sldrGradient.addNewThumb(index, color);
+            });
+            this.sldrGradient.on('removethumb', function(cmp, index){
+                me.sldrGradient.removeThumb(index);
+                me.GradColor.values.splice(index, 1);
+                me.sldrGradient.changeGradientStyle();
+            });
             this.fillControls.push(this.sldrGradient);
 
             this.cmbBorderSize = new Common.UI.ComboBorderSizeEditable({

apps/documenteditor/main/app/view/StyleTitleDialog.js

@@ -45,11 +45,9 @@ define([
     DE.Views.StyleTitleDialog = Common.UI.Window.extend(_.extend({
         options: {
             width: 350,
-            height: 200,
             style: 'min-width: 230px;',
             cls: 'modal-dlg',
-            buttons: ['ok', 'cancel'],
+            buttons: ['ok', 'cancel']
-            footerCls: 'right'
         },
 
             initialize : function(options) {

apps/documenteditor/main/app/view/TableFormulaDialog.js

@@ -48,8 +48,7 @@ define([
             width: 300,
             style: 'min-width: 230px;',
             cls: 'modal-dlg',
-            buttons: ['ok', 'cancel'],
+            buttons: ['ok', 'cancel']
-            footerCls: 'right'
         },
 
         initialize : function(options) {

apps/documenteditor/main/app/view/TextArtSettings.js

@@ -650,6 +650,10 @@ define([
                         me.sldrGradient.setColorValue(Common.Utils.String.format('#{0}', (typeof(me.GradColor.colors[index]) == 'object') ? me.GradColor.colors[index].color : me.GradColor.colors[index]), index);
                         me.sldrGradient.setValue(index, me.GradColor.values[index]);
                     }
+                    if (_.isUndefined(me.GradColor.currentIdx) || me.GradColor.currentIdx >= this.GradColor.colors.length) {
+                        me.GradColor.currentIdx = 0;
+                    }
+                    me.sldrGradient.setActiveThumb(me.GradColor.currentIdx);
                     this.OriginalFillType = Asc.c_oAscFill.FILL_TYPE_GRAD;
                     this.ShapeColor = {Value: 1, Color: this.GradColor.colors[0]};
                 }
@@ -944,6 +948,16 @@ define([
                 me.GradColor.colors = colors;
                 me.GradColor.currentIdx = currentIdx;
             });
+            this.sldrGradient.on('addthumb', function(cmp, index, nearIndex, color){
+                me.GradColor.colors[index] = me.GradColor.colors[nearIndex];
+                me.GradColor.currentIdx = index;
+                me.sldrGradient.addNewThumb(index, color);
+            });
+            this.sldrGradient.on('removethumb', function(cmp, index){
+                me.sldrGradient.removeThumb(index);
+                me.GradColor.values.splice(index, 1);
+                me.sldrGradient.changeGradientStyle();
+            });
             this.lockedControls.push(this.sldrGradient);
 
             this.cmbBorderSize = new Common.UI.ComboBorderSizeEditable({

apps/documenteditor/main/app/view/Toolbar.js

@@ -480,7 +480,9 @@ define([
                         menu: new Common.UI.Menu({
                             items: [
                                 {template: _.template('<div id="id-toolbar-menu-tablepicker" class="dimension-picker" style="margin: 5px 10px;"></div>')},
-                                {caption: this.mniCustomTable, value: 'custom'}
+                                {caption: this.mniCustomTable, value: 'custom'},
+                                {caption: this.mniDrawTable, value: 'draw', checkable: true},
+                                {caption: this.mniEraseTable, value: 'erase', checkable: true}
                             ]
                         })
                     });
@@ -583,6 +585,14 @@ define([
                     });
                     this.paragraphControls.push(this.btnInsertEquation);
 
+                    this.btnInsertSymbol = new Common.UI.Button({
+                        id: 'tlbtn-insertsymbol',
+                        cls: 'btn-toolbar x-huge icon-top',
+                        iconCls: 'btn-symbol',
+                        caption: me.capBtnInsSymbol
+                    });
+                    this.paragraphControls.push(this.btnInsertSymbol);
+
                     this.btnDropCap = new Common.UI.Button({
                         id: 'tlbtn-dropcap',
                         cls: 'btn-toolbar x-huge icon-top',
@@ -630,18 +640,43 @@ define([
                             items: [
                                 {
                                     caption: this.textPlainControl,
-                                    iconCls: 'mnu-control-plain',
+                                    // iconCls: 'mnu-control-plain',
-                                    value: Asc.c_oAscSdtLevelType.Inline
+                                    value: 'plain'
                                 },
                                 {
                                     caption: this.textRichControl,
-                                    iconCls: 'mnu-control-rich',
+                                    // iconCls: 'mnu-control-rich',
-                                    value: Asc.c_oAscSdtLevelType.Block
+                                    value: 'rich'
+                                },
+                                {
+                                    caption: this.textPictureControl,
+                                    // iconCls: 'mnu-control-rich',
+                                    value: 'picture'
+                                },
+                                {
+                                    caption: this.textComboboxControl,
+                                    // iconCls: 'mnu-control-rich',
+                                    value: 'combobox'
+                                },
+                                {
+                                    caption: this.textDropdownControl,
+                                    // iconCls: 'mnu-control-rich',
+                                    value: 'dropdown'
+                                },
+                                {
+                                    caption: this.textDateControl,
+                                    // iconCls: 'mnu-control-rich',
+                                    value: 'date'
+                                },
+                                {
+                                    caption: this.textCheckboxControl,
+                                    // iconCls: 'mnu-control-rich',
+                                    value: 'checkbox'
                                 },
                                 {caption: '--'},
                                 {
                                     caption: this.textRemoveControl,
-                                    iconCls: 'mnu-control-remove',
+                                    // iconCls: 'mnu-control-remove',
                                     value: 'remove'
                                 },
                                 {caption: '--'},
@@ -669,7 +704,7 @@ define([
                             ]
                         })
                     });
-                    this.paragraphControls.push(this.btnContentControls);
+                    // this.paragraphControls.push(this.btnContentControls);
 
                     this.btnColumns = new Common.UI.Button({
                         id: 'tlbtn-columns',
@@ -1309,6 +1344,7 @@ define([
                 _injectComponent('#slot-btn-blankpage', this.btnBlankPage);
                 _injectComponent('#slot-btn-insshape', this.btnInsertShape);
                 _injectComponent('#slot-btn-insequation', this.btnInsertEquation);
+                _injectComponent('#slot-btn-inssymbol', this.btnInsertSymbol);
                 _injectComponent('#slot-btn-pageorient', this.btnPageOrient);
                 _injectComponent('#slot-btn-pagemargins', this.btnPageMargins);
                 _injectComponent('#slot-btn-pagesize', this.btnPageSize);
@@ -1579,6 +1615,7 @@ define([
                 this.btnBlankPage.updateHint(this.tipBlankPage);
                 this.btnInsertShape.updateHint(this.tipInsertShape);
                 this.btnInsertEquation.updateHint(this.tipInsertEquation);
+                this.btnInsertSymbol.updateHint(this.tipInsertSymbol);
                 this.btnDropCap.updateHint(this.tipDropCap);
                 this.btnContentControls.updateHint(this.tipControls);
                 this.btnColumns.updateHint(this.tipColumns);
@@ -1664,48 +1701,8 @@ define([
                         parentMenu: menu,
                         showLast: false,
                         restoreHeight: 421,
-                        groups: new Common.UI.DataViewGroupStore([
+                        groups: new Common.UI.DataViewGroupStore(Common.define.chartData.getChartGroupData(true)),
-                            {id: 'menu-chart-group-bar', caption: me.textColumn, headername: me.textCharts},
+                        store: new Common.UI.DataViewStore(Common.define.chartData.getChartData()),
-                            {id: 'menu-chart-group-line', caption: me.textLine},
-                            {id: 'menu-chart-group-pie', caption: me.textPie},
-                            {id: 'menu-chart-group-hbar', caption: me.textBar},
-                            {id: 'menu-chart-group-area', caption: me.textArea, inline: true},
-                            {id: 'menu-chart-group-scatter', caption: me.textPoint, inline: true},
-                            {id: 'menu-chart-group-stock', caption: me.textStock, inline: true}
-                            // {id: 'menu-chart-group-surface', caption: me.textSurface}
-                        ]),
-                        store: new Common.UI.DataViewStore([
-                            { group: 'menu-chart-group-bar',     type: Asc.c_oAscChartTypeSettings.barNormal,          iconCls: 'column-normal'},
-                            { group: 'menu-chart-group-bar',     type: Asc.c_oAscChartTypeSettings.barStacked,         iconCls: 'column-stack'},
-                            { group: 'menu-chart-group-bar',     type: Asc.c_oAscChartTypeSettings.barStackedPer,      iconCls: 'column-pstack'},
-                            { group: 'menu-chart-group-bar',     type: Asc.c_oAscChartTypeSettings.barNormal3d,        iconCls: 'column-3d-normal'},
-                            { group: 'menu-chart-group-bar',     type: Asc.c_oAscChartTypeSettings.barStacked3d,       iconCls: 'column-3d-stack'},
-                            { group: 'menu-chart-group-bar',     type: Asc.c_oAscChartTypeSettings.barStackedPer3d,    iconCls: 'column-3d-pstack'},
-                            { group: 'menu-chart-group-bar',     type: Asc.c_oAscChartTypeSettings.barNormal3dPerspective,    iconCls: 'column-3d-normal-per'},
-                            { group: 'menu-chart-group-line',    type: Asc.c_oAscChartTypeSettings.lineNormal,         iconCls: 'line-normal'},
-                            { group: 'menu-chart-group-line',    type: Asc.c_oAscChartTypeSettings.lineStacked,        iconCls: 'line-stack'},
-                            { group: 'menu-chart-group-line',    type: Asc.c_oAscChartTypeSettings.lineStackedPer,     iconCls: 'line-pstack'},
-                            { group: 'menu-chart-group-line',    type: Asc.c_oAscChartTypeSettings.line3d,             iconCls: 'line-3d'},
-                            { group: 'menu-chart-group-pie',     type: Asc.c_oAscChartTypeSettings.pie,                iconCls: 'pie-normal'},
-                            { group: 'menu-chart-group-pie',     type: Asc.c_oAscChartTypeSettings.doughnut,           iconCls: 'pie-doughnut'},
-                            { group: 'menu-chart-group-pie',     type: Asc.c_oAscChartTypeSettings.pie3d,              iconCls: 'pie-3d-normal'},
-                            { group: 'menu-chart-group-hbar',    type: Asc.c_oAscChartTypeSettings.hBarNormal,         iconCls: 'bar-normal'},
-                            { group: 'menu-chart-group-hbar',    type: Asc.c_oAscChartTypeSettings.hBarStacked,        iconCls: 'bar-stack'},
-                            { group: 'menu-chart-group-hbar',    type: Asc.c_oAscChartTypeSettings.hBarStackedPer,     iconCls: 'bar-pstack'},
-                            { group: 'menu-chart-group-hbar',    type: Asc.c_oAscChartTypeSettings.hBarNormal3d,       iconCls: 'bar-3d-normal'},
-                            { group: 'menu-chart-group-hbar',    type: Asc.c_oAscChartTypeSettings.hBarStacked3d,      iconCls: 'bar-3d-stack'},
-                            { group: 'menu-chart-group-hbar',    type: Asc.c_oAscChartTypeSettings.hBarStackedPer3d,   iconCls: 'bar-3d-pstack'},
-                            { group: 'menu-chart-group-area',    type: Asc.c_oAscChartTypeSettings.areaNormal,         iconCls: 'area-normal'},
-                            { group: 'menu-chart-group-area',    type: Asc.c_oAscChartTypeSettings.areaStacked,        iconCls: 'area-stack'},
-                            { group: 'menu-chart-group-area',    type: Asc.c_oAscChartTypeSettings.areaStackedPer,     iconCls: 'area-pstack'},
-                            { group: 'menu-chart-group-scatter', type: Asc.c_oAscChartTypeSettings.scatter,            iconCls: 'point-normal'},
-                            { group: 'menu-chart-group-stock',   type: Asc.c_oAscChartTypeSettings.stock,              iconCls: 'stock-normal'}
-                            // { group: 'menu-chart-group-surface', type: Asc.c_oAscChartTypeSettings.surfaceNormal,      iconCls: 'surface-normal'},
-                            // { group: 'menu-chart-group-surface', type: Asc.c_oAscChartTypeSettings.surfaceWireframe,   iconCls: 'surface-wireframe'},
-                            // { group: 'menu-chart-group-surface', type: Asc.c_oAscChartTypeSettings.contourNormal,      iconCls: 'contour-normal'},
-                            // { group: 'menu-chart-group-surface', type: Asc.c_oAscChartTypeSettings.contourWireframe,   iconCls: 'contour-wireframe'}
-
-                        ]),
                         itemTemplate: _.template('<div id="<%= id %>" class="item-chartlist <%= iconCls %>"></div>')
                     });
                     picker.on('item:click', function (picker, item, record, e) {
@@ -1958,8 +1955,7 @@ define([
 
                 this.btnMailRecepients.setVisible(mode.canCoAuthoring == true && mode.canUseMailMerge);
                 this.listStylesAdditionalMenuItem.setVisible(mode.canEditStyles);
-                this.btnContentControls.menu.items[4].setVisible(mode.canEditContentControl);
+                this.btnContentControls.menu.items[10].setVisible(mode.canEditContentControl);
-                this.btnContentControls.menu.items[5].setVisible(mode.canEditContentControl);
                 this.mnuInsertImage.items[2].setVisible(this.mode.canRequestInsertImage || this.mode.fileChoiceUrl && this.mode.fileChoiceUrl.indexOf("{documentType}")>-1);
             },
 
@@ -2194,13 +2190,6 @@ define([
             textNewColor: 'Add New Custom Color',
             textAutoColor: 'Automatic',
             tipInsertChart: 'Insert Chart',
-            textLine: 'Line',
-            textColumn: 'Column',
-            textBar: 'Bar',
-            textArea: 'Area',
-            textPie: 'Pie',
-            textPoint: 'XY (Scatter)',
-            textStock: 'Stock',
             tipColorSchemas: 'Change Color Scheme',
             tipInsertText: 'Insert Text',
             tipInsertTextArt: 'Insert Text Art',
@@ -2268,7 +2257,6 @@ define([
             textPortrait: 'Portrait',
             textLandscape: 'Landscape',
             textInsertPageCount: 'Insert number of pages',
-            textCharts: 'Charts',
             tipChangeChart: 'Change Chart Type',
             capBtnInsPagebreak: 'Page Break',
             capBtnInsImage: 'Image',
@@ -2301,7 +2289,6 @@ define([
             capImgWrapping: 'Wrapping',
             capBtnComment: 'Comment',
             textColumnsCustom: 'Custom Columns',
-            textSurface: 'Surface',
             textTabCollaboration: 'Collaboration',
             textTabProtect: 'Protection',
             textTabLinks: 'References',
@@ -2324,7 +2311,17 @@ define([
             capBtnWatermark: 'Watermark',
             textEditWatermark: 'Custom Watermark',
             textRemWatermark: 'Remove Watermark',
-            tipWatermark: 'Edit watermark'
+            tipWatermark: 'Edit watermark',
+            textPictureControl: 'Picture',
+            textComboboxControl: 'Combo box',
+            textCheckboxControl: 'Check box',
+            textDropdownControl: 'Drop-down list',
+            textDateControl: 'Date',
+            capBtnAddComment: 'Add Comment',
+            capBtnInsSymbol: 'Symbol',
+            tipInsertSymbol: 'Insert symbol',
+            mniDrawTable: 'Draw table',
+            mniEraseTable: 'Erase table'
         }
     })(), DE.Views.Toolbar || {}));
 });

apps/documenteditor/main/index.html

@@ -18,19 +18,20 @@
             width: 100%;
             overflow: hidden;
             border: none;
-            background-color: #f4f4f4;
+            background: #e2e2e2;
             z-index: 1001;
         }
 
         .loadmask > .brendpanel {
             width: 100%;
-            height: 56px;
+            min-height: 32px;
             background: #446995;
         }
 
         .loadmask > .brendpanel > div {
             display: flex;
             align-items: center;
+            height: 28px;
         }
 
         .loadmask > .brendpanel .spacer {
@@ -50,15 +51,6 @@
             opacity: 0;
         }
 
-        .loadmask > .brendpanel .circle {
-            vertical-align: middle;
-            width: 20px;
-            height: 20px;
-            border-radius: 12px;
-            margin: 4px 10px;
-            background: rgba(255, 255, 255, 0.2);
-        }
-
         .loadmask > .brendpanel .rect {
             vertical-align: middle;
             width: 50px;
@@ -68,12 +60,51 @@
             background: rgba(255, 255, 255, 0.2);
         }
 
+        .loadmask > .sktoolbar {
+            background: #f1f1f1;
+            border-bottom: 1px solid #cfcfcf;
+            height: 46px;
+            padding: 10px 12px;
+            box-sizing: content-box;
+        }
+
+        .loadmask > .sktoolbar ul {
+            margin: 0;
+            padding: 0;
+            white-space: nowrap;
+            position: relative;
+        }
+
+        .loadmask > .sktoolbar li {
+            background: #e2e2e2;
+            border-radius: 3px;
+            width: 20px;
+            height: 20px;
+            display: inline-block;
+            margin-right: 6px;
+        }
+
+        .loadmask > .sktoolbar li.space {
+            background: none;
+            width: 12px;
+        }
+
+        .loadmask > .sktoolbar li.fat {
+            position: absolute;
+            right: 0;
+            top: 0;
+            bottom: 0;
+            left: 612px;
+            width: inherit;
+            height: 44px;
+        }
+
         .loadmask > .placeholder {
             background: #fbfbfb;
-            width: 796px;
+            width: 794px;
-            margin: 112px auto;
+            margin: 46px auto;
             height: 100%;
-            border: 1px solid #dfdfdf;
+            border: 1px solid #bebebe;
             padding-top: 50px;
         }
 
@@ -91,28 +122,30 @@
         }
 
         @keyframes flickerAnimation {
-            0%   { opacity:0.1; }
+            0%   { opacity:0.5; }
             50%  { opacity:1; }
-            100% { opacity:0.1; }
+            100% { opacity:0.5; }
         }
         @-o-keyframes flickerAnimation{
-            0%   { opacity:0.1; }
+            0%   { opacity:0.5; }
             50%  { opacity:1; }
-            100% { opacity:0.1; }
+            100% { opacity:0.5; }
         }
         @-moz-keyframes flickerAnimation{
-            0%   { opacity:0.1; }
+            0%   { opacity:0.5; }
             50%  { opacity:1; }
-            100% { opacity:0.1; }
+            100% { opacity:0.5; }
         }
         @-webkit-keyframes flickerAnimation{
-            0%   { opacity:0.1; }
+            0%   { opacity:0.5; }
             50%  { opacity:1; }
-            100% { opacity:0.1; }
+            100% { opacity:0.5; }
         }
     </style>
 
     <script>
+        document.getElementsByTagName('html')[0].setAttribute('style', 'zoom: ' + 1 / (window.devicePixelRatio < 2 ? window.devicePixelRatio : window.devicePixelRatio / 2) + ';');
+
         var userAgent = navigator.userAgent.toLowerCase(),
             check = function(regex){ return regex.test(userAgent); },
             stopLoading = false;
@@ -174,10 +207,33 @@
     <!-- debug end -->
 </head>
 <body>
-    <div id="loading-mask" class="loadmask"><div class="brendpanel"><div><div class="loading-logo"><img src="../../common/main/resources/img/header/header-logo.png"></div><div class="circle"></div><div class="circle"></div><div class="circle"></div><div class="circle"></div><div class="spacer"></div><div class="rect"></div></div><div><span class="rect"></span><span class="rect"></span><span class="rect"></span><span class="rect"></span><span class="rect"></span><div class="spacer"></div><span class="circle"></span><span class="circle"></span><span class="circle"></span></div></div><div class="placeholder"><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div></div></div>
+    <div id="loading-mask" class="loadmask">
+        <div class="brendpanel">
+            <div><div class="loading-logo"><img src="../../common/main/resources/img/header/header-logo@2x.png"></div><div class="spacer"></div><div class="rect"></div></div><div><span class="rect"></span><span class="rect"></span><span class="rect"></span><span class="rect"></span><span class="rect"></span></div></div>
+        <div class="sktoolbar">
+            <ul><li></li><li class="space"></li><li style="width: 255px;"></li><li class="space"></li><li style="width: 180px;"></li><li class="space"></li><li style="width: 60px;"></li><li class="fat"></li></ul>
+            <ul><li></li><li class="space"></li><li style="width: 255px;"></li><li class="space"></li><li style="width: 180px;"></li><li class="space"></li><li style="width: 60px;"></li></ul>
+        </div>
+        <div class="placeholder">
+            <div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div>
+        </div>
+    </div>
+
     <div id="viewport"></div>
 
     <script>
+        var params = getUrlParams(),
+            compact = params["compact"] == 'true',
+            view = params["mode"] == 'view';
+
+        if (compact || view) {
+            document.querySelector('.brendpanel > :nth-child(2)').remove();
+            document.querySelector('.brendpanel > :nth-child(1)').style.height = '32px';
+        }
+        if (view) {
+            document.querySelector('.sktoolbar').remove();
+        }
+
         if (stopLoading) {
             document.body.removeChild(document.getElementById('loading-mask'));
         } else {

apps/documenteditor/main/index.html.deploy

@@ -19,19 +19,20 @@
             width: 100%;
             overflow: hidden;
             border: none;
-            background-color: #f4f4f4;
+            background: #e2e2e2;
             z-index: 1001;
         }
 
         .loadmask > .brendpanel {
             width: 100%;
-            height: 56px;
+            min-height: 32px;
             background: #446995;
         }
 
         .loadmask > .brendpanel > div {
             display: flex;
             align-items: center;
+            height: 28px;
         }
 
         .loadmask > .brendpanel .spacer {
@@ -51,15 +52,6 @@
             opacity: 0;
         }
 
-        .loadmask > .brendpanel .circle {
-            vertical-align: middle;
-            width: 20px;
-            height: 20px;
-            border-radius: 12px;
-            margin: 4px 10px;
-            background: rgba(255, 255, 255, 0.2);
-        }
-
         .loadmask > .brendpanel .rect {
             vertical-align: middle;
             width: 50px;
@@ -69,12 +61,51 @@
             background: rgba(255, 255, 255, 0.2);
         }
 
+        .loadmask > .sktoolbar {
+            background: #f1f1f1;
+            border-bottom: 1px solid #cfcfcf;
+            height: 46px;
+            padding: 10px 12px;
+            box-sizing: content-box;
+        }
+
+        .loadmask > .sktoolbar ul {
+            margin: 0;
+            padding: 0;
+            white-space: nowrap;
+            position: relative;
+        }
+
+        .loadmask > .sktoolbar li {
+            background: #e2e2e2;
+            border-radius: 3px;
+            width: 20px;
+            height: 20px;
+            display: inline-block;
+            margin-right: 6px;
+        }
+
+        .loadmask > .sktoolbar li.space {
+            background: none;
+            width: 12px;
+        }
+
+        .loadmask > .sktoolbar li.fat {
+            position: absolute;
+            right: 0;
+            top: 0;
+            bottom: 0;
+            left: 612px;
+            width: inherit;
+            height: 44px;
+        }
+
         .loadmask > .placeholder {
             background: #fbfbfb;
-            width: 796px;
+            width: 794px;
-            margin: 112px auto;
+            margin: 46px auto;
             height: 100%;
-            border: 1px solid #dfdfdf;
+            border: 1px solid #bebebe;
             padding-top: 50px;
         }
 
@@ -92,28 +123,30 @@
         }
 
         @keyframes flickerAnimation {
-            0%   { opacity:0.1; }
+            0%   { opacity:0.5; }
             50%  { opacity:1; }
-            100% { opacity:0.1; }
+            100% { opacity:0.5; }
         }
         @-o-keyframes flickerAnimation{
-            0%   { opacity:0.1; }
+            0%   { opacity:0.5; }
             50%  { opacity:1; }
-            100% { opacity:0.1; }
+            100% { opacity:0.5; }
         }
         @-moz-keyframes flickerAnimation{
-            0%   { opacity:0.1; }
+            0%   { opacity:0.5; }
             50%  { opacity:1; }
-            100% { opacity:0.1; }
+            100% { opacity:0.5; }
         }
         @-webkit-keyframes flickerAnimation{
-            0%   { opacity:0.1; }
+            0%   { opacity:0.5; }
             50%  { opacity:1; }
-            100% { opacity:0.1; }
+            100% { opacity:0.5; }
         }
     </style>
 
     <script>
+        document.getElementsByTagName('html')[0].setAttribute('style', 'zoom: ' + 1 / (window.devicePixelRatio < 2 ? window.devicePixelRatio : window.devicePixelRatio / 2) + ';');
+
         var userAgent = navigator.userAgent.toLowerCase(),
             check = function(regex){ return regex.test(userAgent); },
             stopLoading = false;
@@ -171,10 +204,22 @@
     <link rel="stylesheet" type="text/css" href="../../../apps/documenteditor/main/resources/css/app.css">
 </head>
 <body>
-    <div id="loading-mask" class="loadmask"><div class="brendpanel"><div><div class="loading-logo"><img src="../../../apps/documenteditor/main/resources/img/header/header-logo.png"></div><div class="circle"></div><div class="circle"></div><div class="circle"></div><div class="circle"></div><div class="spacer"></div><div class="rect"></div></div><div><span class="rect"></span><span class="rect"></span><span class="rect"></span><span class="rect"></span><span class="rect"></span><div class="spacer"></div><span class="circle"></span><span class="circle"></span><span class="circle"></span></div></div><div class="placeholder"><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div></div></div>
+    <div id="loading-mask" class="loadmask"><div class="brendpanel"><div><div class="loading-logo"><img src="../../../apps/documenteditor/main/resources/img/header/header-logo@2x.png"></div><div class="spacer"></div><div class="rect"></div></div><div><span class="rect"></span><span class="rect"></span><span class="rect"></span><span class="rect"></span><span class="rect"></span></div></div><div class="sktoolbar"><ul><li></li><li class="space"></li><li style="width: 255px;"></li><li class="space"></li><li style="width: 180px;"></li><li class="space"></li><li style="width: 60px;"></li><li class="fat"></li></ul><ul><li></li><li class="space"></li><li style="width: 255px;"></li><li class="space"></li><li style="width: 180px;"></li><li class="space"></li><li style="width: 60px;"></li></ul></div><div class="placeholder"><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div></div></div>
     <div id="viewport"></div>
 
     <script>
+        var params = getUrlParams(),
+            compact = params["compact"] == 'true',
+            view = params["mode"] == 'view';
+
+        if (compact || view) {
+            document.querySelector('.brendpanel > :nth-child(2)').remove();
+            document.querySelector('.brendpanel > :nth-child(1)').style.height = '32px';
+        }
+        if (view) {
+            document.querySelector('.sktoolbar').remove();
+        }
+
         if (stopLoading) {
             document.body.removeChild(document.getElementById('loading-mask'));
         } else {

apps/documenteditor/main/locale/bg.json

@@ -69,6 +69,15 @@
   "Common.Controllers.ReviewChanges.textTabs": "Промяна на разделите",
   "Common.Controllers.ReviewChanges.textUnderline": "Подчертавам",
   "Common.Controllers.ReviewChanges.textWidow": "Управление на вдовицата",
+  "Common.define.chartData.textArea": "Площ",
+  "Common.define.chartData.textBar": "Бар",
+  "Common.define.chartData.textColumn": "Колона",
+  "Common.define.chartData.textLine": "Линия",
+  "Common.define.chartData.textPie": "Кръгова",
+  "Common.define.chartData.textPoint": "XY (точкова)",
+  "Common.define.chartData.textStock": "Борсова",
+  "Common.define.chartData.textSurface": "Повърхност",
+  "Common.define.chartData.textCharts": "Диаграми",
   "Common.UI.ComboBorderSize.txtNoBorders": "Няма граници",
   "Common.UI.ComboBorderSizeEditable.txtNoBorders": "Няма граници",
   "Common.UI.ComboDataView.emptyComboText": "Няма стилове",
@@ -321,7 +330,7 @@
   "DE.Controllers.Main.errorAccessDeny": "Опитвате се да извършите действие, за което нямате права. <br> Моля, свържете се с администратора на сървъра за документи.",
   "DE.Controllers.Main.errorBadImageUrl": "URL адресът на изображението е неправилен",
   "DE.Controllers.Main.errorCoAuthoringDisconnect": "Връзката със сървъра е загубена. Документът не може да бъде редактиран в момента.",
-  "DE.Controllers.Main.errorConnectToServer": "Документът не може да бъде запасен. Моля, проверете настройките за връзка или се свържете с администратора си.<br>Когато щракнете върху бутона 'OK', ще бъдете подканени да изтеглите документа. <br><br>Намерете повече информация за свързването на сървър за документи <a href=\"%1\" target=\"_blank\">тук</a>",
+  "DE.Controllers.Main.errorConnectToServer": "Документът не може да бъде запасен. Моля, проверете настройките за връзка или се свържете с администратора си.<br>Когато щракнете върху бутона 'OK', ще бъдете подканени да изтеглите документа.",
   "DE.Controllers.Main.errorDatabaseConnection": "Външна грешка. <br> Грешка при свързване към база данни. Моля, свържете се с екипа за поддръжка, в случай че грешката продължава.",
   "DE.Controllers.Main.errorDataEncrypted": "Получени са криптирани промени, които не могат да бъдат дешифрирани.",
   "DE.Controllers.Main.errorDataRange": "Неправилен обхват от данни.",
@@ -1000,20 +1009,12 @@
   "DE.Views.BookmarksDialog.textTitle": "Отбелязани",
   "DE.Views.BookmarksDialog.txtInvalidName": "Името на отметката може да съдържа само букви, цифри и долни черти и трябва да започва с буквата",
   "DE.Views.ChartSettings.textAdvanced": "Показване на разширените настройки",
-  "DE.Views.ChartSettings.textArea": "Площ",
-  "DE.Views.ChartSettings.textBar": "Бар",
   "DE.Views.ChartSettings.textChartType": "Промяна на типа на диаграмата",
-  "DE.Views.ChartSettings.textColumn": "Колона",
   "DE.Views.ChartSettings.textEditData": "Редактиране на данни",
   "DE.Views.ChartSettings.textHeight": "Височина",
-  "DE.Views.ChartSettings.textLine": "Линия",
   "DE.Views.ChartSettings.textOriginalSize": "Размер по подразбиране",
-  "DE.Views.ChartSettings.textPie": "Кръгова",
-  "DE.Views.ChartSettings.textPoint": "XY (точкова)",
   "DE.Views.ChartSettings.textSize": "Размер",
-  "DE.Views.ChartSettings.textStock": "Борсова",
   "DE.Views.ChartSettings.textStyle": "Стил",
-  "DE.Views.ChartSettings.textSurface": "Повърхност",
   "DE.Views.ChartSettings.textUndock": "Откачете от панела",
   "DE.Views.ChartSettings.textWidth": "Ширина",
   "DE.Views.ChartSettings.textWrap": "Стил на опаковане",
@@ -1982,7 +1983,7 @@
   "DE.Views.Toolbar.capImgForward": "Изведи напред",
   "DE.Views.Toolbar.capImgGroup": "Група",
   "DE.Views.Toolbar.capImgWrapping": "Опаковане",
-  "DE.Views.Toolbar.mniCustomTable": "Вмъкване на персонализирана таблица",
+  "DE.Views.Toolbar.mniCustomTable": "Персонализирана таблица",
   "DE.Views.Toolbar.mniEditControls": "Настройки за управление",
   "DE.Views.Toolbar.mniEditDropCap": "Пуснете настройките на капачката",
   "DE.Views.Toolbar.mniEditFooter": "Редактиране на долен колонтитул",
@@ -1994,13 +1995,9 @@
   "DE.Views.Toolbar.mniImageFromStorage": "Изображение от хранилището",
   "DE.Views.Toolbar.mniImageFromUrl": "Изображение от URL адрес",
   "DE.Views.Toolbar.strMenuNoFill": "Без попълване",
-  "DE.Views.Toolbar.textArea": "Площ",
   "DE.Views.Toolbar.textAutoColor": "Автоматичен",
-  "DE.Views.Toolbar.textBar": "Бар",
   "DE.Views.Toolbar.textBold": "Получер",
   "DE.Views.Toolbar.textBottom": "Долу:",
-  "DE.Views.Toolbar.textCharts": "Диаграми",
-  "DE.Views.Toolbar.textColumn": "Колона",
   "DE.Views.Toolbar.textColumnsCustom": "Персонализирани графи",
   "DE.Views.Toolbar.textColumnsLeft": "Наляво",
   "DE.Views.Toolbar.textColumnsOne": "Един",
@@ -2019,7 +2016,6 @@
   "DE.Views.Toolbar.textItalic": "Курсив",
   "DE.Views.Toolbar.textLandscape": "Пейзаж",
   "DE.Views.Toolbar.textLeft": "Наляво: ",
-  "DE.Views.Toolbar.textLine": "Линия",
   "DE.Views.Toolbar.textMarginsLast": "Последно персонализирано",
   "DE.Views.Toolbar.textMarginsModerate": "Умерен",
   "DE.Views.Toolbar.textMarginsNarrow": "Тесен",
@@ -2033,14 +2029,11 @@
   "DE.Views.Toolbar.textOddPage": "Нечетна страница",
   "DE.Views.Toolbar.textPageMarginsCustom": "Персонализирани полета",
   "DE.Views.Toolbar.textPageSizeCustom": "Персонализиран размер на страницата",
-  "DE.Views.Toolbar.textPie": "Кръгова",
   "DE.Views.Toolbar.textPlainControl": "Вмъкване на контрол на съдържанието в обикновен текст",
-  "DE.Views.Toolbar.textPoint": "XY (точкова)",
   "DE.Views.Toolbar.textPortrait": "Портрет",
   "DE.Views.Toolbar.textRemoveControl": "Премахване на контрола на съдържанието",
   "DE.Views.Toolbar.textRichControl": "Вмъкване на контрол върху съдържанието на богатия текст",
   "DE.Views.Toolbar.textRight": "Дясно: ",
-  "DE.Views.Toolbar.textStock": "Борсова",
   "DE.Views.Toolbar.textStrikeout": "Зачеркнато",
   "DE.Views.Toolbar.textStyleMenuDelete": "Изтриване на стил",
   "DE.Views.Toolbar.textStyleMenuDeleteAll": "Изтрийте всички персонализирани стилове",
@@ -2050,7 +2043,6 @@
   "DE.Views.Toolbar.textStyleMenuUpdate": "Актуализация от избора",
   "DE.Views.Toolbar.textSubscript": "Долен",
   "DE.Views.Toolbar.textSuperscript": "Горен индекс",
-  "DE.Views.Toolbar.textSurface": "Повърхност",
   "DE.Views.Toolbar.textTabCollaboration": "Сътрудничество",
   "DE.Views.Toolbar.textTabFile": "Файл",
   "DE.Views.Toolbar.textTabHome": "У дома",

apps/documenteditor/main/locale/cs.json

@@ -63,6 +63,14 @@
   "Common.Controllers.ReviewChanges.textTabs": "Change tabs",
   "Common.Controllers.ReviewChanges.textUnderline": "Podtržené",
   "Common.Controllers.ReviewChanges.textWidow": "Widow control",
+  "Common.define.chartData.textArea": "Plošný graf",
+  "Common.define.chartData.textBar": "Pruhový graf",
+  "Common.define.chartData.textColumn": "Sloupcový graf",
+  "Common.define.chartData.textLine": "Liniový graf",
+  "Common.define.chartData.textPie": "Kruhový diagram",
+  "Common.define.chartData.textPoint": "Bodový graf",
+  "Common.define.chartData.textStock": "Burzovní graf",
+  "Common.define.chartData.textSurface": "Povrch",
   "Common.UI.ComboBorderSize.txtNoBorders": "Bez ohraničení",
   "Common.UI.ComboBorderSizeEditable.txtNoBorders": "Bez ohraničení",
   "Common.UI.ComboDataView.emptyComboText": "Žádné styly",
@@ -237,7 +245,7 @@
   "DE.Controllers.Main.errorAccessDeny": "Pokoušíte se provést akci, na kterou nemáte oprávnění.<br>Prosím, kontaktujte administrátora vašeho Dokumentového serveru.",
   "DE.Controllers.Main.errorBadImageUrl": "Adresa URL obrázku je nesprávná",
   "DE.Controllers.Main.errorCoAuthoringDisconnect": "Spojení se serverem ztraceno. Dokument nyní nelze upravovat.",
-  "DE.Controllers.Main.errorConnectToServer": "Dokument nelze uložit. Prosím, zkontrolujte nastavení vašeho připojení nebo kontaktujte vašeho administrátora.<br> Při kliknutí na tlačítko \"OK\" budete vyzváni ke stažení dokumentu.<br><br> Více informací o připojení najdete v Dokumentovém serveru <a href=\"%1\" target=\"_blank\">here</a>",
+  "DE.Controllers.Main.errorConnectToServer": "Dokument nelze uložit. Prosím, zkontrolujte nastavení vašeho připojení nebo kontaktujte vašeho administrátora.<br> Při kliknutí na tlačítko \"OK\" budete vyzváni ke stažení dokumentu.",
   "DE.Controllers.Main.errorDatabaseConnection": "Externí chyba.<br>Chyba spojení s databází. Prosím kontaktujte podporu, pokud chyba přetrvává.",
   "DE.Controllers.Main.errorDataRange": "Nesprávný datový rozsah.",
   "DE.Controllers.Main.errorDefaultMessage": "Kód chyby: %1",
@@ -689,20 +697,12 @@
   "DE.Controllers.Toolbar.txtSymbol_xsi": "Ksí",
   "DE.Controllers.Toolbar.txtSymbol_zeta": "Zeta",
   "DE.Views.ChartSettings.textAdvanced": "Zobrazit pokročilé nastavení",
-  "DE.Views.ChartSettings.textArea": "Plošný graf",
-  "DE.Views.ChartSettings.textBar": "Pruhový graf",
   "DE.Views.ChartSettings.textChartType": "Změnit typ grafu",
-  "DE.Views.ChartSettings.textColumn": "Sloupcový graf",
   "DE.Views.ChartSettings.textEditData": "Upravit data",
   "DE.Views.ChartSettings.textHeight": "Výška",
-  "DE.Views.ChartSettings.textLine": "Liniový graf",
   "DE.Views.ChartSettings.textOriginalSize": "Výchozí velikost",
-  "DE.Views.ChartSettings.textPie": "Kruhový diagram",
-  "DE.Views.ChartSettings.textPoint": "Bodový graf",
   "DE.Views.ChartSettings.textSize": "Velikost",
-  "DE.Views.ChartSettings.textStock": "Burzovní graf",
   "DE.Views.ChartSettings.textStyle": "Styl",
-  "DE.Views.ChartSettings.textSurface": "Povrch",
   "DE.Views.ChartSettings.textUndock": "Odepnout od panelu",
   "DE.Views.ChartSettings.textWidth": "Šířka",
   "DE.Views.ChartSettings.textWrap": "Obtékání textu",
@@ -1495,13 +1495,9 @@
   "DE.Views.Toolbar.mniImageFromFile": "Obrázek ze souboru",
   "DE.Views.Toolbar.mniImageFromUrl": "Obrázek z adresy URL",
   "DE.Views.Toolbar.strMenuNoFill": "Bez výplně",
-  "DE.Views.Toolbar.textArea": "Plošný graf",
   "DE.Views.Toolbar.textAutoColor": "Automaticky",
-  "DE.Views.Toolbar.textBar": "Pruhový graf",
   "DE.Views.Toolbar.textBold": "Tučné",
   "DE.Views.Toolbar.textBottom": "Bottom: ",
-  "DE.Views.Toolbar.textCharts": "Grafy",
-  "DE.Views.Toolbar.textColumn": "Sloupcový graf",
   "DE.Views.Toolbar.textColumnsCustom": "Vlastní sloupce",
   "DE.Views.Toolbar.textColumnsLeft": "Left",
   "DE.Views.Toolbar.textColumnsOne": "One",
@@ -1520,7 +1516,6 @@
   "DE.Views.Toolbar.textItalic": "Kurzíva",
   "DE.Views.Toolbar.textLandscape": "Na šířku",
   "DE.Views.Toolbar.textLeft": "Left: ",
-  "DE.Views.Toolbar.textLine": "Liniový graf",
   "DE.Views.Toolbar.textMarginsLast": "Last Custom",
   "DE.Views.Toolbar.textMarginsModerate": "Moderate",
   "DE.Views.Toolbar.textMarginsNarrow": "Narrow",
@@ -1533,11 +1528,8 @@
   "DE.Views.Toolbar.textOddPage": "Lichá stránka",
   "DE.Views.Toolbar.textPageMarginsCustom": "Custom margins",
   "DE.Views.Toolbar.textPageSizeCustom": "Custom Page Size",
-  "DE.Views.Toolbar.textPie": "Kruhový diagram",
-  "DE.Views.Toolbar.textPoint": "Bodový graf",
   "DE.Views.Toolbar.textPortrait": "Na výšku",
   "DE.Views.Toolbar.textRight": "Right: ",
-  "DE.Views.Toolbar.textStock": "Burzovní graf",
   "DE.Views.Toolbar.textStrikeout": "Přeškrtnout",
   "DE.Views.Toolbar.textStyleMenuDelete": "Odstranit styl",
   "DE.Views.Toolbar.textStyleMenuDeleteAll": "Odstranit všechny vlastní styly",
@@ -1547,7 +1539,6 @@
   "DE.Views.Toolbar.textStyleMenuUpdate": "Aktualizovat z výběru",
   "DE.Views.Toolbar.textSubscript": "Dolní index",
   "DE.Views.Toolbar.textSuperscript": "Horní index",
-  "DE.Views.Toolbar.textSurface": "Povrch",
   "DE.Views.Toolbar.textTabFile": "Soubor",
   "DE.Views.Toolbar.textTabHome": "Domů",
   "DE.Views.Toolbar.textTabInsert": "Vložit",

apps/documenteditor/main/locale/de.json

@@ -69,6 +69,15 @@
   "Common.Controllers.ReviewChanges.textTabs": "Registerkarten ändern",
   "Common.Controllers.ReviewChanges.textUnderline": "Unterstrichen",
   "Common.Controllers.ReviewChanges.textWidow": "Widow Сontrol",
+  "Common.define.chartData.textArea": "Fläche",
+  "Common.define.chartData.textBar": "Balken",
+  "Common.define.chartData.textCharts": "Diagramme",
+  "Common.define.chartData.textColumn": "Spalte",
+  "Common.define.chartData.textLine": "Linie",
+  "Common.define.chartData.textPie": "Kreis",
+  "Common.define.chartData.textPoint": "Punkt (XY)",
+  "Common.define.chartData.textStock": "Kurs",
+  "Common.define.chartData.textSurface": "Oberfläche",
   "Common.UI.ComboBorderSize.txtNoBorders": "Keine Rahmen",
   "Common.UI.ComboBorderSizeEditable.txtNoBorders": "Keine Rahmen",
   "Common.UI.ComboDataView.emptyComboText": "Keine Formate",
@@ -321,7 +330,7 @@
   "DE.Controllers.Main.errorAccessDeny": "Sie haben versucht die Änderungen im Dokument, zu dem Sie keine Berechtigungen haben, vorzunehemen.<br>Wenden Sie sich an Ihren Serveradministrator.",
   "DE.Controllers.Main.errorBadImageUrl": "URL des Bildes ist falsch",
   "DE.Controllers.Main.errorCoAuthoringDisconnect": "Verbindung zum Server ist verloren gegangen. Das Dokument kann momentan nicht bearbeitet werden.",
-  "DE.Controllers.Main.errorConnectToServer": "Das Dokument konnte nicht gespeichert werden. Bitte überprüfen Sie die Verbindungseinstellungen oder wenden Sie sich an Ihren Administrator.<br>Wenn Sie auf die Schaltfläche \"OK\" klicken, werden Sie aufgefordert das Dokument herunterzuladen.<br><br>Mehr Informationen über die Verbindung zum Dokumentenserver finden Sie <a href=\"%1\" target=\"_blank\">hier</a>",
+  "DE.Controllers.Main.errorConnectToServer": "Das Dokument konnte nicht gespeichert werden. Bitte überprüfen Sie die Verbindungseinstellungen oder wenden Sie sich an Ihren Administrator.<br>Wenn Sie auf die Schaltfläche \"OK\" klicken, werden Sie aufgefordert das Dokument herunterzuladen.",
   "DE.Controllers.Main.errorDatabaseConnection": "Externer Fehler.<br>Fehler beim Verbinden zur Datenbank. Bitte wenden Sie sich an den Kundendienst, falls der Fehler bestehen bleibt.",
   "DE.Controllers.Main.errorDataEncrypted": "Änderungen wurden verschlüsselt. Sie können nicht entschlüsselt werden.",
   "DE.Controllers.Main.errorDataRange": "Falscher Datenbereich.",
@@ -1000,20 +1009,12 @@
   "DE.Views.BookmarksDialog.textTitle": "Lesezeichen",
   "DE.Views.BookmarksDialog.txtInvalidName": "Der Name des Lesezeichens darf nur Buchstaben, Ziffern und Unterstriche enthalten und sollte mit dem Buchstaben beginnen",
   "DE.Views.ChartSettings.textAdvanced": "Erweiterte Einstellungen anzeigen",
-  "DE.Views.ChartSettings.textArea": "Fläche",
-  "DE.Views.ChartSettings.textBar": "Balken",
   "DE.Views.ChartSettings.textChartType": "Diagrammtyp ändern",
-  "DE.Views.ChartSettings.textColumn": "Spalte",
   "DE.Views.ChartSettings.textEditData": "Daten ändern",
   "DE.Views.ChartSettings.textHeight": "Höhe",
-  "DE.Views.ChartSettings.textLine": "Linie",
   "DE.Views.ChartSettings.textOriginalSize": "Standardgröße",
-  "DE.Views.ChartSettings.textPie": "Kreis",
-  "DE.Views.ChartSettings.textPoint": "Punkt (XY)",
   "DE.Views.ChartSettings.textSize": "Größe",
-  "DE.Views.ChartSettings.textStock": "Kurs",
   "DE.Views.ChartSettings.textStyle": "Stil",
-  "DE.Views.ChartSettings.textSurface": "Oberfläche",
   "DE.Views.ChartSettings.textUndock": "Seitenbereich abdocken",
   "DE.Views.ChartSettings.textWidth": "Breite",
   "DE.Views.ChartSettings.textWrap": "Textumbruch",
@@ -1994,13 +1995,9 @@
   "DE.Views.Toolbar.mniImageFromStorage": "Bild aus dem Speicher",
   "DE.Views.Toolbar.mniImageFromUrl": "Bild aus URL",
   "DE.Views.Toolbar.strMenuNoFill": "Keine Füllung",
-  "DE.Views.Toolbar.textArea": "Fläche",
   "DE.Views.Toolbar.textAutoColor": "Automatisch",
-  "DE.Views.Toolbar.textBar": "Balken",
   "DE.Views.Toolbar.textBold": "Fett",
   "DE.Views.Toolbar.textBottom": "Unten: ",
-  "DE.Views.Toolbar.textCharts": "Diagramme",
-  "DE.Views.Toolbar.textColumn": "Spalte",
   "DE.Views.Toolbar.textColumnsCustom": "Benutzerdefinierte Spalten",
   "DE.Views.Toolbar.textColumnsLeft": "Links",
   "DE.Views.Toolbar.textColumnsOne": "Ein",
@@ -2019,7 +2016,6 @@
   "DE.Views.Toolbar.textItalic": "Kursiv",
   "DE.Views.Toolbar.textLandscape": "Querformat",
   "DE.Views.Toolbar.textLeft": "Links: ",
-  "DE.Views.Toolbar.textLine": "Linie",
   "DE.Views.Toolbar.textMarginsLast": " Benutzerdefiniert als letzte",
   "DE.Views.Toolbar.textMarginsModerate": "Mittelmäßig",
   "DE.Views.Toolbar.textMarginsNarrow": "Schmal",
@@ -2033,14 +2029,11 @@
   "DE.Views.Toolbar.textOddPage": "Ungerade Seite",
   "DE.Views.Toolbar.textPageMarginsCustom": "Benutzerdefinierte Seitenränder ",
   "DE.Views.Toolbar.textPageSizeCustom": "Benutzerdefiniertes Seitenformat",
-  "DE.Views.Toolbar.textPie": "Kreis",
   "DE.Views.Toolbar.textPlainControl": "Nur-Text-Inhaltssteuerelement einfügen",
-  "DE.Views.Toolbar.textPoint": "Punkt (XY)",
   "DE.Views.Toolbar.textPortrait": "Hochformat",
   "DE.Views.Toolbar.textRemoveControl": "Inhaltssteuerelement entfernen",
   "DE.Views.Toolbar.textRichControl": "Rich-Text-Inhaltssteuerelement einfügen",
   "DE.Views.Toolbar.textRight": "Rechts: ",
-  "DE.Views.Toolbar.textStock": "Kurs",
   "DE.Views.Toolbar.textStrikeout": "Durchgestrichen",
   "DE.Views.Toolbar.textStyleMenuDelete": "Stil löschen",
   "DE.Views.Toolbar.textStyleMenuDeleteAll": "Alle benutzerdefinierte Stile löschen ",
@@ -2050,7 +2043,6 @@
   "DE.Views.Toolbar.textStyleMenuUpdate": "Aus der Auswahl neu aktualisieren",
   "DE.Views.Toolbar.textSubscript": "Tiefgestellt",
   "DE.Views.Toolbar.textSuperscript": "Hochgestellt",
-  "DE.Views.Toolbar.textSurface": "Oberfläche",
   "DE.Views.Toolbar.textTabCollaboration": "Zusammenarbeit",
   "DE.Views.Toolbar.textTabFile": "Datei",
   "DE.Views.Toolbar.textTabHome": "Startseite",

apps/documenteditor/main/locale/en.json

@@ -69,6 +69,15 @@
   "Common.Controllers.ReviewChanges.textTabs": "Change tabs",
   "Common.Controllers.ReviewChanges.textUnderline": "Underline",
   "Common.Controllers.ReviewChanges.textWidow": "Widow control",
+  "Common.define.chartData.textArea": "Area",
+  "Common.define.chartData.textBar": "Bar",
+  "Common.define.chartData.textCharts": "Charts",
+  "Common.define.chartData.textColumn": "Column",
+  "Common.define.chartData.textLine": "Line",
+  "Common.define.chartData.textPie": "Pie",
+  "Common.define.chartData.textPoint": "XY (Scatter)",
+  "Common.define.chartData.textStock": "Stock",
+  "Common.define.chartData.textSurface": "Surface",
   "Common.UI.ComboBorderSize.txtNoBorders": "No borders",
   "Common.UI.ComboBorderSizeEditable.txtNoBorders": "No borders",
   "Common.UI.ComboDataView.emptyComboText": "No styles",
@@ -102,6 +111,39 @@
   "Common.UI.Window.textInformation": "Information",
   "Common.UI.Window.textWarning": "Warning",
   "Common.UI.Window.yesButtonText": "Yes",
+  "Common.UI.Calendar.textJanuary": "January",
+  "Common.UI.Calendar.textFebruary": "February",
+  "Common.UI.Calendar.textMarch": "March",
+  "Common.UI.Calendar.textApril": "April",
+  "Common.UI.Calendar.textMay": "May",
+  "Common.UI.Calendar.textJune": "June",
+  "Common.UI.Calendar.textJuly": "July",
+  "Common.UI.Calendar.textAugust": "August",
+  "Common.UI.Calendar.textSeptember": "September",
+  "Common.UI.Calendar.textOctober": "October",
+  "Common.UI.Calendar.textNovember": "November",
+  "Common.UI.Calendar.textDecember": "December",
+  "Common.UI.Calendar.textShortJanuary": "Jan",
+  "Common.UI.Calendar.textShortFebruary": "Feb",
+  "Common.UI.Calendar.textShortMarch": "Mar",
+  "Common.UI.Calendar.textShortApril": "Apr",
+  "Common.UI.Calendar.textShortMay": "May",
+  "Common.UI.Calendar.textShortJune": "Jun",
+  "Common.UI.Calendar.textShortJuly": "Jul",
+  "Common.UI.Calendar.textShortAugust": "Aug",
+  "Common.UI.Calendar.textShortSeptember": "Sep",
+  "Common.UI.Calendar.textShortOctober": "Oct",
+  "Common.UI.Calendar.textShortNovember": "Nov",
+  "Common.UI.Calendar.textShortDecember": "Dec",
+  "Common.UI.Calendar.textShortSunday": "Su",
+  "Common.UI.Calendar.textShortMonday": "Mo",
+  "Common.UI.Calendar.textShortTuesday": "Tu",
+  "Common.UI.Calendar.textShortWednesday": "We",
+  "Common.UI.Calendar.textShortThursday": "Th",
+  "Common.UI.Calendar.textShortFriday": "Fr",
+  "Common.UI.Calendar.textShortSaturday": "Sa",
+  "Common.UI.Calendar.textMonths": "Months",
+  "Common.UI.Calendar.textYears": "Years",
   "Common.Utils.Metric.txtCm": "cm",
   "Common.Utils.Metric.txtPt": "pt",
   "Common.Views.About.txtAddress": "address: ",
@@ -221,6 +263,8 @@
   "Common.Views.ReviewChanges.strStrictDesc": "Use the 'Save' button to sync the changes you and others make.",
   "Common.Views.ReviewChanges.tipAcceptCurrent": "Accept current change",
   "Common.Views.ReviewChanges.tipCoAuthMode": "Set co-editing mode",
+  "Common.Views.ReviewChanges.tipCommentRem": "Remove comments",
+  "Common.Views.ReviewChanges.tipCommentRemCurrent": "Remove current comments",
   "Common.Views.ReviewChanges.tipHistory": "Show version history",
   "Common.Views.ReviewChanges.tipRejectCurrent": "Reject current change",
   "Common.Views.ReviewChanges.tipReview": "Track changes",
@@ -235,6 +279,11 @@
   "Common.Views.ReviewChanges.txtChat": "Chat",
   "Common.Views.ReviewChanges.txtClose": "Close",
   "Common.Views.ReviewChanges.txtCoAuthMode": "Co-editing Mode",
+  "Common.Views.ReviewChanges.txtCommentRemAll": "Remove All Comments",
+  "Common.Views.ReviewChanges.txtCommentRemCurrent": "Remove Current Comments",
+  "Common.Views.ReviewChanges.txtCommentRemMy": "Remove My Comments",
+  "Common.Views.ReviewChanges.txtCommentRemMyCurrent": "Remove My Current Comments",
+  "Common.Views.ReviewChanges.txtCommentRemove": "Remove",
   "Common.Views.ReviewChanges.txtDocLang": "Language",
   "Common.Views.ReviewChanges.txtFinal": "All changes accepted (Preview)",
   "Common.Views.ReviewChanges.txtFinalCap": "Final",
@@ -299,6 +348,11 @@
   "Common.Views.SignSettingsDialog.textShowDate": "Show sign date in signature line",
   "Common.Views.SignSettingsDialog.textTitle": "Signature Setup",
   "Common.Views.SignSettingsDialog.txtEmpty": "This field is required",
+  "Common.Views.SymbolTableDialog.textCode": "Unicode HEX value",
+  "Common.Views.SymbolTableDialog.textFont": "Font",
+  "Common.Views.SymbolTableDialog.textRange": "Range",
+  "Common.Views.SymbolTableDialog.textRecent": "Recently used symbols",
+  "Common.Views.SymbolTableDialog.textTitle": "Symbol",
   "DE.Controllers.LeftMenu.leavePageText": "All unsaved changes in this document will be lost.<br> Click \"Cancel\" then \"Save\" to save them. Click \"OK\" to discard all the unsaved changes.",
   "DE.Controllers.LeftMenu.newDocumentTitle": "Unnamed document",
   "DE.Controllers.LeftMenu.notcriticalErrorTitle": "Warning",
@@ -348,9 +402,10 @@
   "DE.Controllers.Main.errorToken": "The document security token is not correctly formed.<br>Please contact your Document Server administrator.",
   "DE.Controllers.Main.errorTokenExpire": "The document security token has expired.<br>Please contact your Document Server administrator.",
   "DE.Controllers.Main.errorUpdateVersion": "The file version has been changed. The page will be reloaded.",
+  "DE.Controllers.Main.errorUpdateVersionOnDisconnect": "Internet connection has been restored, and the file version has been changed.<br>Before you can continue working, you need to download the file or copy its content to make sure nothing is lost, and then reload this page.",
   "DE.Controllers.Main.errorUserDrop": "The file cannot be accessed right now.",
   "DE.Controllers.Main.errorUsersExceed": "The number of users allowed by the pricing plan was exceeded",
-  "DE.Controllers.Main.errorViewerDisconnect": "Connection is lost. You can still view the document,<br>but will not be able to download or print until the connection is restored.",
+  "DE.Controllers.Main.errorViewerDisconnect": "Connection is lost. You can still view the document,<br>but will not be able to download or print it until the connection is restored and page is reloaded.",
   "DE.Controllers.Main.leavePageText": "You have unsaved changes in this document. Click \"Stay on This Page\", then \"Save\" to save them. Click \"Leave This Page\" to discard all the unsaved changes.",
   "DE.Controllers.Main.loadFontsTextText": "Loading data...",
   "DE.Controllers.Main.loadFontsTitleText": "Loading Data",
@@ -365,7 +420,7 @@
   "DE.Controllers.Main.mailMergeLoadFileText": "Loading Data Source...",
   "DE.Controllers.Main.mailMergeLoadFileTitle": "Loading Data Source",
   "DE.Controllers.Main.notcriticalErrorTitle": "Warning",
-  "DE.Controllers.Main.openErrorText": "An error has occurred while opening the file",
+  "DE.Controllers.Main.openErrorText": "An error has occurred while opening the file.",
   "DE.Controllers.Main.openTextText": "Opening document...",
   "DE.Controllers.Main.openTitleText": "Opening Document",
   "DE.Controllers.Main.printTextText": "Printing document...",
@@ -373,7 +428,7 @@
   "DE.Controllers.Main.reloadButtonText": "Reload Page",
   "DE.Controllers.Main.requestEditFailedMessageText": "Someone is editing this document right now. Please try again later.",
   "DE.Controllers.Main.requestEditFailedTitleText": "Access denied",
-  "DE.Controllers.Main.saveErrorText": "An error has occurred while saving the file",
+  "DE.Controllers.Main.saveErrorText": "An error has occurred while saving the file.",
   "DE.Controllers.Main.savePreparingText": "Preparing to save",
   "DE.Controllers.Main.savePreparingTitle": "Preparing to save. Please wait...",
   "DE.Controllers.Main.saveTextText": "Saving document...",
@@ -422,12 +477,15 @@
   "DE.Controllers.Main.txtHyperlink": "Hyperlink",
   "DE.Controllers.Main.txtIndTooLarge": "Index Too Large",
   "DE.Controllers.Main.txtLines": "Lines",
+  "DE.Controllers.Main.txtMainDocOnly": "Error! Main Document Only.",
   "DE.Controllers.Main.txtMath": "Math",
   "DE.Controllers.Main.txtMissArg": "Missing Argument",
   "DE.Controllers.Main.txtMissOperator": "Missing Operator",
   "DE.Controllers.Main.txtNeedSynchronize": "You have updates",
   "DE.Controllers.Main.txtNoTableOfContents": "No table of contents entries found.",
+  "DE.Controllers.Main.txtNoText": "Error! No text of specified style in document.",
   "DE.Controllers.Main.txtNotInTable": "Is Not In Table",
+  "DE.Controllers.Main.txtNotValidBookmark": "Error! Not a valid bookmark self-reference.",
   "DE.Controllers.Main.txtOddPage": "Odd Page",
   "DE.Controllers.Main.txtOnPage": "on page",
   "DE.Controllers.Main.txtRectangles": "Rectangles",
@@ -661,6 +719,7 @@
   "DE.Controllers.Toolbar.textFontSizeErr": "The entered value is incorrect.<br>Please enter a numeric value between 1 and 100",
   "DE.Controllers.Toolbar.textFraction": "Fractions",
   "DE.Controllers.Toolbar.textFunction": "Functions",
+  "DE.Controllers.Toolbar.textInsert": "Insert",
   "DE.Controllers.Toolbar.textIntegral": "Integrals",
   "DE.Controllers.Toolbar.textLargeOperator": "Large Operators",
   "DE.Controllers.Toolbar.textLimitAndLog": "Limits And Logarithms",
@@ -990,6 +1049,8 @@
   "DE.Controllers.Toolbar.txtSymbol_zeta": "Zeta",
   "DE.Controllers.Viewport.textFitPage": "Fit to Page",
   "DE.Controllers.Viewport.textFitWidth": "Fit to Width",
+  "DE.Views.AddNewCaptionLabelDialog.textLabel": "Label:",
+  "DE.Views.AddNewCaptionLabelDialog.textLabelError": "Label must not be empty.",
   "DE.Views.BookmarksDialog.textAdd": "Add",
   "DE.Views.BookmarksDialog.textBookmarkName": "Bookmark name",
   "DE.Views.BookmarksDialog.textClose": "Close",
@@ -1003,29 +1064,28 @@
   "DE.Views.BookmarksDialog.textSort": "Sort by",
   "DE.Views.BookmarksDialog.textTitle": "Bookmarks",
   "DE.Views.BookmarksDialog.txtInvalidName": "Bookmark name can only contain letters, digits and underscores, and should begin with the letter",
-  "DE.Views.CaptionDialog.textTitle": "Insert Caption",
+  "DE.Views.CaptionDialog.textAdd": "Add label",
+  "DE.Views.CaptionDialog.textAfter": "After",
+  "DE.Views.CaptionDialog.textBefore": "Before",
   "DE.Views.CaptionDialog.textCaption": "Caption",
+  "DE.Views.CaptionDialog.textChapter": "Chapter starts with style",
+  "DE.Views.CaptionDialog.textChapterInc": "Include chapter number",
+  "DE.Views.CaptionDialog.textColon": "colon",
+  "DE.Views.CaptionDialog.textDash": "dash",
+  "DE.Views.CaptionDialog.textDelete": "Delete label",
+  "DE.Views.CaptionDialog.textEquation": "Equation",
+  "DE.Views.CaptionDialog.textExamples": "Examples: Table 2-A, Image 1.IV",
+  "DE.Views.CaptionDialog.textExclude": "Exclude label from caption",
+  "DE.Views.CaptionDialog.textFigure": "Figure",
+  "DE.Views.CaptionDialog.textHyphen": "hyphen",
   "DE.Views.CaptionDialog.textInsert": "Insert",
   "DE.Views.CaptionDialog.textLabel": "Label",
-  "DE.Views.CaptionDialog.textAdd": "Add label",
-  "DE.Views.CaptionDialog.textDelete": "Delete label",
-  "DE.Views.CaptionDialog.textNumbering": "Numbering",
-  "DE.Views.CaptionDialog.textChapterInc": "Include chapter number",
-  "DE.Views.CaptionDialog.textChapter": "Chapter starts with style",
-  "DE.Views.CaptionDialog.textSeparator": "Use separator",
-  "DE.Views.CaptionDialog.textExamples": "Examples: Table 2-A, Image 1.IV",
-  "DE.Views.CaptionDialog.textBefore": "Before",
-  "DE.Views.CaptionDialog.textAfter": "After",
-  "DE.Views.CaptionDialog.textHyphen": "hyphen",
-  "DE.Views.CaptionDialog.textPeriod": "period",
-  "DE.Views.CaptionDialog.textColon": "colon",
   "DE.Views.CaptionDialog.textLongDash": "long dash",
-  "DE.Views.CaptionDialog.textDash": "dash",
+  "DE.Views.CaptionDialog.textNumbering": "Numbering",
-  "DE.Views.CaptionDialog.textEquation": "Equation",
+  "DE.Views.CaptionDialog.textPeriod": "period",
-  "DE.Views.CaptionDialog.textFigure": "Figure",
+  "DE.Views.CaptionDialog.textSeparator": "Use separator",
   "DE.Views.CaptionDialog.textTable": "Table",
-  "DE.Views.CaptionDialog.textExclude": "Exclude label from caption",
+  "DE.Views.CaptionDialog.textTitle": "Insert Caption",
-  "DE.Views.CaptionDialog.textLabelError": "Label must not be empty.",
   "DE.Views.CellsAddDialog.textCol": "Columns",
   "DE.Views.CellsAddDialog.textDown": "Below the cursor",
   "DE.Views.CellsAddDialog.textLeft": "To the left",
@@ -1038,20 +1098,12 @@
   "DE.Views.CellsRemoveDialog.textRow": "Delete entire row",
   "DE.Views.CellsRemoveDialog.textTitle": "Delete Cells",
   "DE.Views.ChartSettings.textAdvanced": "Show advanced settings",
-  "DE.Views.ChartSettings.textArea": "Area",
-  "DE.Views.ChartSettings.textBar": "Bar",
   "DE.Views.ChartSettings.textChartType": "Change Chart Type",
-  "DE.Views.ChartSettings.textColumn": "Column",
   "DE.Views.ChartSettings.textEditData": "Edit Data",
   "DE.Views.ChartSettings.textHeight": "Height",
-  "DE.Views.ChartSettings.textLine": "Line",
+  "DE.Views.ChartSettings.textOriginalSize": "Actual Size",
-  "DE.Views.ChartSettings.textOriginalSize": "Default Size",
-  "DE.Views.ChartSettings.textPie": "Pie",
-  "DE.Views.ChartSettings.textPoint": "XY (Scatter)",
   "DE.Views.ChartSettings.textSize": "Size",
-  "DE.Views.ChartSettings.textStock": "Stock",
   "DE.Views.ChartSettings.textStyle": "Style",
-  "DE.Views.ChartSettings.textSurface": "Surface",
   "DE.Views.ChartSettings.textUndock": "Undock from panel",
   "DE.Views.ChartSettings.textWidth": "Width",
   "DE.Views.ChartSettings.textWrap": "Wrapping Style",
@@ -1077,6 +1129,22 @@
   "DE.Views.ControlSettingsDialog.textTitle": "Content Control Settings",
   "DE.Views.ControlSettingsDialog.txtLockDelete": "Content control cannot be deleted",
   "DE.Views.ControlSettingsDialog.txtLockEdit": "Contents cannot be edited",
+  "DE.Views.ControlSettingsDialog.strGeneral": "General",
+  "DE.Views.ControlSettingsDialog.textAdd": "Add",
+  "DE.Views.ControlSettingsDialog.textChange": "Edit",
+  "DE.Views.ControlSettingsDialog.textDelete": "Delete",
+  "DE.Views.ControlSettingsDialog.textUp": "Up",
+  "DE.Views.ControlSettingsDialog.textDown": "Down",
+  "DE.Views.ControlSettingsDialog.textCombobox": "Combo box",
+  "DE.Views.ControlSettingsDialog.textDropDown": "Drop-down list",
+  "DE.Views.ControlSettingsDialog.textDisplayName": "Display name",
+  "DE.Views.ControlSettingsDialog.textValue": "Value",
+  "DE.Views.ControlSettingsDialog.textDate": "Date format",
+  "DE.Views.ControlSettingsDialog.textLang": "Language",
+  "DE.Views.ControlSettingsDialog.textFormat": "Display the date like this",
+  "DE.Views.ControlSettingsDialog.textCheckbox": "Check box",
+  "DE.Views.ControlSettingsDialog.textChecked": "Checked symbol",
+  "DE.Views.ControlSettingsDialog.textUnchecked": "Unchecked symbol",
   "DE.Views.CustomColumnsDialog.textColumns": "Number of columns",
   "DE.Views.CustomColumnsDialog.textSeparator": "Column divider",
   "DE.Views.CustomColumnsDialog.textSpacing": "Spacing between columns",
@@ -1127,7 +1195,7 @@
   "DE.Views.DocumentHolder.mergeCellsText": "Merge Cells",
   "DE.Views.DocumentHolder.moreText": "More variants...",
   "DE.Views.DocumentHolder.noSpellVariantsText": "No variants",
-  "DE.Views.DocumentHolder.originalSizeText": "Default Size",
+  "DE.Views.DocumentHolder.originalSizeText": "Actual Size",
   "DE.Views.DocumentHolder.paragraphText": "Paragraph",
   "DE.Views.DocumentHolder.removeHyperlinkText": "Remove Hyperlink",
   "DE.Views.DocumentHolder.rightText": "Right",
@@ -1254,6 +1322,7 @@
   "DE.Views.DocumentHolder.txtInsertArgAfter": "Insert argument after",
   "DE.Views.DocumentHolder.txtInsertArgBefore": "Insert argument before",
   "DE.Views.DocumentHolder.txtInsertBreak": "Insert manual break",
+  "DE.Views.DocumentHolder.txtInsertCaption": "Insert Caption",
   "DE.Views.DocumentHolder.txtInsertEqAfter": "Insert equation after",
   "DE.Views.DocumentHolder.txtInsertEqBefore": "Insert equation before",
   "DE.Views.DocumentHolder.txtKeepTextOnly": "Keep text only",
@@ -1292,7 +1361,6 @@
   "DE.Views.DocumentHolder.txtUngroup": "Ungroup",
   "DE.Views.DocumentHolder.updateStyleText": "Update %1 style",
   "DE.Views.DocumentHolder.vertAlignText": "Vertical Alignment",
-  "DE.Views.DocumentHolder.txtInsertCaption": "Insert Caption",
   "DE.Views.DropcapSettingsAdvanced.strBorders": "Borders & Fill",
   "DE.Views.DropcapSettingsAdvanced.strDropcap": "Drop Cap",
   "DE.Views.DropcapSettingsAdvanced.strMargins": "Margins",
@@ -1335,6 +1403,10 @@
   "DE.Views.DropcapSettingsAdvanced.textWidth": "Width",
   "DE.Views.DropcapSettingsAdvanced.tipFontName": "Font",
   "DE.Views.DropcapSettingsAdvanced.txtNoBorders": "No borders",
+  "DE.Views.EditListItemDialog.textDisplayName": "Display name",
+  "DE.Views.EditListItemDialog.textValue": "Value",
+  "DE.Views.EditListItemDialog.textNameError": "Display name must not be empty.",
+  "DE.Views.EditListItemDialog.textValueError": "An item with the same value already exists.",
   "DE.Views.FileMenu.btnBackCaption": "Open file location",
   "DE.Views.FileMenu.btnCloseMenuCaption": "Close Menu",
   "DE.Views.FileMenu.btnCreateNewCaption": "Create New",
@@ -1487,7 +1559,7 @@
   "DE.Views.ImageSettings.textHintFlipH": "Flip Horizontally",
   "DE.Views.ImageSettings.textHintFlipV": "Flip Vertically",
   "DE.Views.ImageSettings.textInsert": "Replace Image",
-  "DE.Views.ImageSettings.textOriginalSize": "Default Size",
+  "DE.Views.ImageSettings.textOriginalSize": "Actual Size",
   "DE.Views.ImageSettings.textRotate90": "Rotate 90°",
   "DE.Views.ImageSettings.textRotation": "Rotation",
   "DE.Views.ImageSettings.textSize": "Size",
@@ -1539,7 +1611,7 @@
   "DE.Views.ImageSettingsAdvanced.textMiter": "Miter",
   "DE.Views.ImageSettingsAdvanced.textMove": "Move object with text",
   "DE.Views.ImageSettingsAdvanced.textOptions": "Options",
-  "DE.Views.ImageSettingsAdvanced.textOriginalSize": "Default Size",
+  "DE.Views.ImageSettingsAdvanced.textOriginalSize": "Actual Size",
   "DE.Views.ImageSettingsAdvanced.textOverlap": "Allow overlap",
   "DE.Views.ImageSettingsAdvanced.textPage": "Page",
   "DE.Views.ImageSettingsAdvanced.textParagraph": "Paragraph",
@@ -1944,14 +2016,14 @@
   "DE.Views.TableSettings.tipRight": "Set outer right border only",
   "DE.Views.TableSettings.tipTop": "Set outer top border only",
   "DE.Views.TableSettings.txtNoBorders": "No borders",
-  "DE.Views.TableSettings.txtTable_TableGrid": "Table Grid",
-  "DE.Views.TableSettings.txtTable_PlainTable": "Plain Table",
-  "DE.Views.TableSettings.txtTable_GridTable": "Grid Table",
-  "DE.Views.TableSettings.txtTable_ListTable": "List Table",
-  "DE.Views.TableSettings.txtTable_Light": "Light",
-  "DE.Views.TableSettings.txtTable_Dark": "Dark",
-  "DE.Views.TableSettings.txtTable_Colorful": "Colorful",
   "DE.Views.TableSettings.txtTable_Accent": "Accent",
+  "DE.Views.TableSettings.txtTable_Colorful": "Colorful",
+  "DE.Views.TableSettings.txtTable_Dark": "Dark",
+  "DE.Views.TableSettings.txtTable_GridTable": "Grid Table",
+  "DE.Views.TableSettings.txtTable_Light": "Light",
+  "DE.Views.TableSettings.txtTable_ListTable": "List Table",
+  "DE.Views.TableSettings.txtTable_PlainTable": "Plain Table",
+  "DE.Views.TableSettings.txtTable_TableGrid": "Table Grid",
   "DE.Views.TableSettingsAdvanced.textAlign": "Alignment",
   "DE.Views.TableSettingsAdvanced.textAlignment": "Alignment",
   "DE.Views.TableSettingsAdvanced.textAllowSpacing": "Spacing between cells",
@@ -2045,6 +2117,7 @@
   "DE.Views.TextArtSettings.textTemplate": "Template",
   "DE.Views.TextArtSettings.textTransform": "Transform",
   "DE.Views.TextArtSettings.txtNoBorders": "No Line",
+  "DE.Views.Toolbar.capBtnAddComment": "Add Comment",
   "DE.Views.Toolbar.capBtnBlankPage": "Blank Page",
   "DE.Views.Toolbar.capBtnColumns": "Columns",
   "DE.Views.Toolbar.capBtnComment": "Comment",
@@ -2056,6 +2129,7 @@
   "DE.Views.Toolbar.capBtnInsImage": "Image",
   "DE.Views.Toolbar.capBtnInsPagebreak": "Breaks",
   "DE.Views.Toolbar.capBtnInsShape": "Shape",
+  "DE.Views.Toolbar.capBtnInsSymbol": "Symbol",
   "DE.Views.Toolbar.capBtnInsTable": "Table",
   "DE.Views.Toolbar.capBtnInsTextart": "Text Art",
   "DE.Views.Toolbar.capBtnInsTextbox": "Text Box",
@@ -2080,13 +2154,9 @@
   "DE.Views.Toolbar.mniImageFromStorage": "Image from Storage",
   "DE.Views.Toolbar.mniImageFromUrl": "Image from URL",
   "DE.Views.Toolbar.strMenuNoFill": "No Fill",
-  "DE.Views.Toolbar.textArea": "Area",
   "DE.Views.Toolbar.textAutoColor": "Automatic",
-  "DE.Views.Toolbar.textBar": "Bar",
   "DE.Views.Toolbar.textBold": "Bold",
   "DE.Views.Toolbar.textBottom": "Bottom: ",
-  "DE.Views.Toolbar.textCharts": "Charts",
-  "DE.Views.Toolbar.textColumn": "Column",
   "DE.Views.Toolbar.textColumnsCustom": "Custom Columns",
   "DE.Views.Toolbar.textColumnsLeft": "Left",
   "DE.Views.Toolbar.textColumnsOne": "One",
@@ -2106,7 +2176,6 @@
   "DE.Views.Toolbar.textItalic": "Italic",
   "DE.Views.Toolbar.textLandscape": "Landscape",
   "DE.Views.Toolbar.textLeft": "Left: ",
-  "DE.Views.Toolbar.textLine": "Line",
   "DE.Views.Toolbar.textMarginsLast": "Last Custom",
   "DE.Views.Toolbar.textMarginsModerate": "Moderate",
   "DE.Views.Toolbar.textMarginsNarrow": "Narrow",
@@ -2120,15 +2189,12 @@
   "DE.Views.Toolbar.textOddPage": "Odd Page",
   "DE.Views.Toolbar.textPageMarginsCustom": "Custom margins",
   "DE.Views.Toolbar.textPageSizeCustom": "Custom Page Size",
-  "DE.Views.Toolbar.textPie": "Pie",
+  "DE.Views.Toolbar.textPlainControl": "Plain text",
-  "DE.Views.Toolbar.textPlainControl": "Insert plain text content control",
-  "DE.Views.Toolbar.textPoint": "XY (Scatter)",
   "DE.Views.Toolbar.textPortrait": "Portrait",
   "DE.Views.Toolbar.textRemoveControl": "Remove content control",
   "DE.Views.Toolbar.textRemWatermark": "Remove Watermark",
-  "DE.Views.Toolbar.textRichControl": "Insert rich text content control",
+  "DE.Views.Toolbar.textRichControl": "Rich text",
   "DE.Views.Toolbar.textRight": "Right: ",
-  "DE.Views.Toolbar.textStock": "Stock",
   "DE.Views.Toolbar.textStrikeout": "Strikethrough",
   "DE.Views.Toolbar.textStyleMenuDelete": "Delete style",
   "DE.Views.Toolbar.textStyleMenuDeleteAll": "Delete all custom styles",
@@ -2138,7 +2204,6 @@
   "DE.Views.Toolbar.textStyleMenuUpdate": "Update from selection",
   "DE.Views.Toolbar.textSubscript": "Subscript",
   "DE.Views.Toolbar.textSuperscript": "Superscript",
-  "DE.Views.Toolbar.textSurface": "Surface",
   "DE.Views.Toolbar.textTabCollaboration": "Collaboration",
   "DE.Views.Toolbar.textTabFile": "File",
   "DE.Views.Toolbar.textTabHome": "Home",
@@ -2183,6 +2248,7 @@
   "DE.Views.Toolbar.tipInsertImage": "Insert image",
   "DE.Views.Toolbar.tipInsertNum": "Insert Page Number",
   "DE.Views.Toolbar.tipInsertShape": "Insert autoshape",
+  "DE.Views.Toolbar.tipInsertSymbol": "Insert symbol",
   "DE.Views.Toolbar.tipInsertTable": "Insert table",
   "DE.Views.Toolbar.tipInsertText": "Insert text box",
   "DE.Views.Toolbar.tipInsertTextArt": "Insert Text Art",
@@ -2234,6 +2300,13 @@
   "DE.Views.Toolbar.txtScheme7": "Equity",
   "DE.Views.Toolbar.txtScheme8": "Flow",
   "DE.Views.Toolbar.txtScheme9": "Foundry",
+  "DE.Views.Toolbar.textPictureControl": "Picture",
+  "DE.Views.Toolbar.textComboboxControl": "Combo box",
+  "DE.Views.Toolbar.textCheckboxControl": "Check box",
+  "DE.Views.Toolbar.textDropdownControl": "Drop-down list",
+  "DE.Views.Toolbar.textDateControl": "Date",
+  "DE.Views.Toolbar.mniDrawTable": "Draw table",
+  "DE.Views.Toolbar.mniEraseTable": "Erase table",
   "DE.Views.WatermarkSettingsDialog.textAuto": "Auto",
   "DE.Views.WatermarkSettingsDialog.textBold": "Bold",
   "DE.Views.WatermarkSettingsDialog.textColor": "Text color",

apps/documenteditor/main/locale/es.json

@@ -69,6 +69,14 @@
   "Common.Controllers.ReviewChanges.textTabs": "Cambiar tabuladores",
   "Common.Controllers.ReviewChanges.textUnderline": "Subrayado",
   "Common.Controllers.ReviewChanges.textWidow": "Widow control",
+  "Common.define.chartData.textArea": "Área",
+  "Common.define.chartData.textBar": "Barra",
+  "Common.define.chartData.textColumn": "Gráfico de columnas",
+  "Common.define.chartData.textLine": "Línea",
+  "Common.define.chartData.textPie": "Gráfico circular",
+  "Common.define.chartData.textPoint": "XY (Dispersión)",
+  "Common.define.chartData.textStock": "De cotizaciones",
+  "Common.define.chartData.textSurface": "Superficie",
   "Common.UI.ComboBorderSize.txtNoBorders": "Sin bordes",
   "Common.UI.ComboBorderSizeEditable.txtNoBorders": "Sin bordes",
   "Common.UI.ComboDataView.emptyComboText": "Sin estilo",
@@ -322,7 +330,7 @@
   "DE.Controllers.Main.errorAccessDeny": "Usted no tiene permisos para realizar la acción que está intentando hacer.<br> Por favor, contacte con el Administrador del Servidor de Documentos.",
   "DE.Controllers.Main.errorBadImageUrl": "URL de imagen es incorrecto",
   "DE.Controllers.Main.errorCoAuthoringDisconnect": "Se ha perdido la conexión con servidor. El documento no puede ser editado ahora.",
-  "DE.Controllers.Main.errorConnectToServer": "No se consiguió guardar el documento. Por favor, compruebe los ajustes de conexión o póngase en contacto con su administrador.<br>Al hacer clic en el botón 'OK' se le solicitará que descargue el documento.<br><br>Encuentre más información acerca de la conexión de Servidor de Documentos <a href=\"%1\" target=\"_blank\">aquí</a>",
+  "DE.Controllers.Main.errorConnectToServer": "No se consiguió guardar el documento. Por favor, compruebe los ajustes de conexión o póngase en contacto con su administrador.<br>Al hacer clic en el botón 'OK' se le solicitará que descargue el documento.",
   "DE.Controllers.Main.errorDatabaseConnection": "Error externo.<br>Error de conexión de base de datos. Por favor póngase en contacto con soporte si el error se mantiene.",
   "DE.Controllers.Main.errorDataEncrypted": "Se han recibido cambios cifrados, ellos no pueden ser descifrados.",
   "DE.Controllers.Main.errorDataRange": "Rango de datos incorrecto.",
@@ -1001,20 +1009,12 @@
   "DE.Views.BookmarksDialog.textTitle": "Marcadores",
   "DE.Views.BookmarksDialog.txtInvalidName": "Nombre de marcador sólo puede contener letras, dígitos y barras bajas y debe comenzar con la letra",
   "DE.Views.ChartSettings.textAdvanced": "Mostrar ajustes avanzados",
-  "DE.Views.ChartSettings.textArea": "Área",
-  "DE.Views.ChartSettings.textBar": "Barra",
   "DE.Views.ChartSettings.textChartType": "Cambiar tipo de gráfico",
-  "DE.Views.ChartSettings.textColumn": "Gráfico de columnas",
   "DE.Views.ChartSettings.textEditData": "Editar datos",
   "DE.Views.ChartSettings.textHeight": "Altura",
-  "DE.Views.ChartSettings.textLine": "Línea",
   "DE.Views.ChartSettings.textOriginalSize": "Tamaño Predeterminado",
-  "DE.Views.ChartSettings.textPie": "Gráfico circular",
-  "DE.Views.ChartSettings.textPoint": "XY (Dispersión)",
   "DE.Views.ChartSettings.textSize": "Tamaño",
-  "DE.Views.ChartSettings.textStock": "De cotizaciones",
   "DE.Views.ChartSettings.textStyle": "Estilo",
-  "DE.Views.ChartSettings.textSurface": "Superficie",
   "DE.Views.ChartSettings.textUndock": "Desacoplar de panel",
   "DE.Views.ChartSettings.textWidth": "Ancho",
   "DE.Views.ChartSettings.textWrap": "Ajuste de texto",
@@ -2005,13 +2005,9 @@
   "DE.Views.Toolbar.mniImageFromStorage": "Imagen de Almacenamiento",
   "DE.Views.Toolbar.mniImageFromUrl": "Imagen de URL",
   "DE.Views.Toolbar.strMenuNoFill": "Sin relleno",
-  "DE.Views.Toolbar.textArea": "Área",
   "DE.Views.Toolbar.textAutoColor": "Automático",
-  "DE.Views.Toolbar.textBar": "Gráfico de barras",
   "DE.Views.Toolbar.textBold": "Negrita",
   "DE.Views.Toolbar.textBottom": "Inferior: ",
-  "DE.Views.Toolbar.textCharts": "Gráficos",
-  "DE.Views.Toolbar.textColumn": "Gráfico de columnas",
   "DE.Views.Toolbar.textColumnsCustom": "Columnas personalizadas",
   "DE.Views.Toolbar.textColumnsLeft": "Izquierdo",
   "DE.Views.Toolbar.textColumnsOne": "Uno",
@@ -2031,7 +2027,6 @@
   "DE.Views.Toolbar.textItalic": "Cursiva",
   "DE.Views.Toolbar.textLandscape": "Horizontal",
   "DE.Views.Toolbar.textLeft": "Izquierdo: ",
-  "DE.Views.Toolbar.textLine": "Gráfico de líneas",
   "DE.Views.Toolbar.textMarginsLast": "último personalizado",
   "DE.Views.Toolbar.textMarginsModerate": "Moderar",
   "DE.Views.Toolbar.textMarginsNarrow": "Estrecho",
@@ -2045,15 +2040,12 @@
   "DE.Views.Toolbar.textOddPage": "Página impar",
   "DE.Views.Toolbar.textPageMarginsCustom": "Márgenes personalizados",
   "DE.Views.Toolbar.textPageSizeCustom": "Tamaño de página personalizado",
-  "DE.Views.Toolbar.textPie": "Gráfico circular",
   "DE.Views.Toolbar.textPlainControl": "Introducir contenido de texto simple",
-  "DE.Views.Toolbar.textPoint": "XY (Dispersión)",
   "DE.Views.Toolbar.textPortrait": "Vertical",
   "DE.Views.Toolbar.textRemoveControl": "Elimine el control de contenido",
   "DE.Views.Toolbar.textRemWatermark": "Quitar marca de agua",
   "DE.Views.Toolbar.textRichControl": "Introducir contenido de texto rico",
   "DE.Views.Toolbar.textRight": "Derecho: ",
-  "DE.Views.Toolbar.textStock": "De cotizaciones",
   "DE.Views.Toolbar.textStrikeout": "Tachado",
   "DE.Views.Toolbar.textStyleMenuDelete": "Eliminar estilo",
   "DE.Views.Toolbar.textStyleMenuDeleteAll": "Borrar todos los estilos personalizados",
@@ -2063,7 +2055,6 @@
   "DE.Views.Toolbar.textStyleMenuUpdate": "Actualizar de la selección",
   "DE.Views.Toolbar.textSubscript": "Subíndice",
   "DE.Views.Toolbar.textSuperscript": "Sobreíndice",
-  "DE.Views.Toolbar.textSurface": "Superficie",
   "DE.Views.Toolbar.textTabCollaboration": "Colaboración",
   "DE.Views.Toolbar.textTabFile": "Archivo",
   "DE.Views.Toolbar.textTabHome": "Inicio",

apps/documenteditor/main/locale/fr.json

@@ -69,6 +69,14 @@
   "Common.Controllers.ReviewChanges.textTabs": "Changer les tabulations",
   "Common.Controllers.ReviewChanges.textUnderline": "Souligné",
   "Common.Controllers.ReviewChanges.textWidow": "Contrôle des veuves",
+  "Common.define.chartData.textArea": "En aires",
+  "Common.define.chartData.textBar": "En barre",
+  "Common.define.chartData.textColumn": "Colonne",
+  "Common.define.chartData.textLine": "Graphique en ligne",
+  "Common.define.chartData.textPie": "Graphiques à secteurs",
+  "Common.define.chartData.textPoint": "Nuages de points (XY)",
+  "Common.define.chartData.textStock": "Boursier",
+  "Common.define.chartData.textSurface": "Surface",
   "Common.UI.ComboBorderSize.txtNoBorders": "Pas de bordures",
   "Common.UI.ComboBorderSizeEditable.txtNoBorders": "Pas de bordures",
   "Common.UI.ComboDataView.emptyComboText": "Aucun style",
@@ -322,7 +330,7 @@
   "DE.Controllers.Main.errorAccessDeny": "Vous tentez d'exéсuter une action pour laquelle vous ne disposez pas des droits.<br>Veuillez contacter l'administrateur de Document Server.",
   "DE.Controllers.Main.errorBadImageUrl": "L'URL de l'image est incorrecte",
   "DE.Controllers.Main.errorCoAuthoringDisconnect": "Connexion au serveur perdue. Le document ne peut être modifié en ce moment.",
-  "DE.Controllers.Main.errorConnectToServer": "Impossible d'enregistrer le document. Veuillez vérifier vos paramètres de connexion ou contactez l'administrateur.<br>Lorsque vous cliquez sur le bouton 'OK', vous serez invité à télécharger le document.<br><br>Trouvez plus d'informations sur la connexion au Serveur de Documents <a href=\"%1\" target=\"_blank\">ici</a>",
+  "DE.Controllers.Main.errorConnectToServer": "Impossible d'enregistrer le document. Veuillez vérifier vos paramètres de connexion ou contactez l'administrateur.<br>Lorsque vous cliquez sur le bouton 'OK', vous serez invité à télécharger le document.",
   "DE.Controllers.Main.errorDatabaseConnection": "Erreur externe.<br>Erreur de connexion à la base de données. Si l'erreur persiste veillez contactez l'assistance technique.",
   "DE.Controllers.Main.errorDataEncrypted": "Les modifications chiffrées ont été reçues, elle ne peuvent pas être déchiffrées.",
   "DE.Controllers.Main.errorDataRange": "Plage de données incorrecte.",
@@ -331,6 +339,7 @@
   "DE.Controllers.Main.errorEditingSaveas": "Une erreure s'est produite lors du travail avec le document.<br>Utilisez l'option 'Enregistrer comme...' pour enregistrer une copie de sauvegarde  sur le disque dur de votre ordinateur. ",
   "DE.Controllers.Main.errorEmailClient": "Pas de client messagerie trouvé",
   "DE.Controllers.Main.errorFilePassProtect": "Le fichier est protégé par le mot de passe et ne peut être ouvert.",
+  "DE.Controllers.Main.errorFileSizeExceed": "La taille du fichier dépasse les limites établies sur votre serveur.<br>Veuillez contacter votre administrateur de Document Server pour obtenir plus d'information.  ",
   "DE.Controllers.Main.errorForceSave": "Une erreur est survenue lors de l'enregistrement du fichier. Veuillez utiliser l'option «Télécharger en tant que» pour enregistrer le fichier sur le disque dur de votre ordinateur ou réessayer plus tard.",
   "DE.Controllers.Main.errorKeyEncrypt": "Descripteur de clés inconnu",
   "DE.Controllers.Main.errorKeyExpire": "Descripteur clé a expiré",
@@ -1000,21 +1009,24 @@
   "DE.Views.BookmarksDialog.textSort": "Trier par",
   "DE.Views.BookmarksDialog.textTitle": "Signets",
   "DE.Views.BookmarksDialog.txtInvalidName": "Nom du signet ne peut pas contenir que des lettres, des  chiffres et des barres de soulignement et doit commencer avec une lettre",
+  "DE.Views.CellsAddDialog.textCol": "Colonnes",
+  "DE.Views.CellsAddDialog.textDown": "Au-dessous du curseur",
+  "DE.Views.CellsAddDialog.textLeft": "Vers la gauche",
+  "DE.Views.CellsAddDialog.textRight": "Vers la droite",
+  "DE.Views.CellsAddDialog.textRow": "Lignes",
+  "DE.Views.CellsAddDialog.textTitle": "Inserer Plusieurs",
+  "DE.Views.CellsAddDialog.textUp": "au-dessus du curseur",
+  "DE.Views.CellsRemoveDialog.textCol": "Supprimer la colonne entière",
+  "DE.Views.CellsRemoveDialog.textLeft": "Décaler les cellules vers la gauche",
+  "DE.Views.CellsRemoveDialog.textRow": "Supprimer la ligne entière",
+  "DE.Views.CellsRemoveDialog.textTitle": "Supprimer les cellules",
   "DE.Views.ChartSettings.textAdvanced": "Afficher les paramètres avancés",
-  "DE.Views.ChartSettings.textArea": "En aires",
-  "DE.Views.ChartSettings.textBar": "En barre",
   "DE.Views.ChartSettings.textChartType": "Modifier le type de graphique",
-  "DE.Views.ChartSettings.textColumn": "Colonne",
   "DE.Views.ChartSettings.textEditData": "Modifier les données",
   "DE.Views.ChartSettings.textHeight": "Hauteur",
-  "DE.Views.ChartSettings.textLine": "Graphique en ligne",
   "DE.Views.ChartSettings.textOriginalSize": "Taille par défaut",
-  "DE.Views.ChartSettings.textPie": "Graphiques à secteurs",
-  "DE.Views.ChartSettings.textPoint": "Nuages de points (XY)",
   "DE.Views.ChartSettings.textSize": "Taille",
-  "DE.Views.ChartSettings.textStock": "Boursier",
   "DE.Views.ChartSettings.textStyle": "Style",
-  "DE.Views.ChartSettings.textSurface": "Surface",
   "DE.Views.ChartSettings.textUndock": "Détacher du panneau",
   "DE.Views.ChartSettings.textWidth": "Largeur",
   "DE.Views.ChartSettings.textWrap": "Style d'habillage",
@@ -1117,6 +1129,7 @@
   "DE.Views.DocumentHolder.textArrangeBackward": "Reculer",
   "DE.Views.DocumentHolder.textArrangeForward": "Avancer",
   "DE.Views.DocumentHolder.textArrangeFront": "Mettre au premier plan",
+  "DE.Views.DocumentHolder.textCells": "Cellules",
   "DE.Views.DocumentHolder.textContentControls": "Contrôle du contenu",
   "DE.Views.DocumentHolder.textContinueNumbering": "Continuer la numérotation",
   "DE.Views.DocumentHolder.textCopy": "Copier",
@@ -1148,6 +1161,7 @@
   "DE.Views.DocumentHolder.textRotate90": "Faire pivoter à droite de 90°",
   "DE.Views.DocumentHolder.textSeparateList": "Liste séparée",
   "DE.Views.DocumentHolder.textSettings": "Paramètres",
+  "DE.Views.DocumentHolder.textSeveral": "Plusieurs Lignes/Colonnes ",
   "DE.Views.DocumentHolder.textShapeAlignBottom": "Aligner en bas",
   "DE.Views.DocumentHolder.textShapeAlignCenter": "Aligner au centre",
   "DE.Views.DocumentHolder.textShapeAlignLeft": "Aligner à gauche",
@@ -1164,6 +1178,7 @@
   "DE.Views.DocumentHolder.textUpdateTOC": "Actualiser la table des matières",
   "DE.Views.DocumentHolder.textWrap": "Style d'habillage",
   "DE.Views.DocumentHolder.tipIsLocked": "Cet élément est en cours d'édition par un autre utilisateur.",
+  "DE.Views.DocumentHolder.toDictionaryText": "Ajouter au dictionnaire",
   "DE.Views.DocumentHolder.txtAddBottom": "Ajouter bordure inférieure",
   "DE.Views.DocumentHolder.txtAddFractionBar": "Ajouter barre de fraction",
   "DE.Views.DocumentHolder.txtAddHor": "Ajouter une ligne horizontale",
@@ -1226,6 +1241,7 @@
   "DE.Views.DocumentHolder.txtOverwriteCells": "Remplacer les cellules",
   "DE.Views.DocumentHolder.txtPasteSourceFormat": "Garder la mise en forme source",
   "DE.Views.DocumentHolder.txtPressLink": "Appuyez sur Ctrl et cliquez sur le lien",
+  "DE.Views.DocumentHolder.txtPrintSelection": "Imprimer la sélection",
   "DE.Views.DocumentHolder.txtRemFractionBar": "Supprimer la barre de fraction",
   "DE.Views.DocumentHolder.txtRemLimit": "Supprimer la limite",
   "DE.Views.DocumentHolder.txtRemoveAccentChar": "Supprimer le caractère d'accent",
@@ -1317,6 +1333,7 @@
   "DE.Views.FileMenuPanels.CreateNew.newDescriptionText": "Créez un nouveau document texte vierge que vous serez en mesure de styliser et de formater après sa création au cours de la modification. Ou choisissez un des modèles où certains styles sont déjà pré-appliqués pour commencer un document d'un certain type ou objectif.",
   "DE.Views.FileMenuPanels.CreateNew.newDocumentText": "Nouveau document texte ",
   "DE.Views.FileMenuPanels.CreateNew.noTemplatesText": "Pas de modèles",
+  "DE.Views.FileMenuPanels.DocumentInfo.okButtonText": "Appliquer",
   "DE.Views.FileMenuPanels.DocumentInfo.txtAddAuthor": "Ajouter un auteur",
   "DE.Views.FileMenuPanels.DocumentInfo.txtAddText": "Ajouter du texte",
   "DE.Views.FileMenuPanels.DocumentInfo.txtAppName": "Application",
@@ -1325,12 +1342,16 @@
   "DE.Views.FileMenuPanels.DocumentInfo.txtComment": "Commentaire",
   "DE.Views.FileMenuPanels.DocumentInfo.txtCreated": "Créé",
   "DE.Views.FileMenuPanels.DocumentInfo.txtLoading": "Chargement en cours...",
+  "DE.Views.FileMenuPanels.DocumentInfo.txtModifyBy": "Dernière modification par",
+  "DE.Views.FileMenuPanels.DocumentInfo.txtModifyDate": "Dernière modification",
+  "DE.Views.FileMenuPanels.DocumentInfo.txtOwner": "Propriétaire",
   "DE.Views.FileMenuPanels.DocumentInfo.txtPages": "Pages",
   "DE.Views.FileMenuPanels.DocumentInfo.txtParagraphs": "Paragraphes",
   "DE.Views.FileMenuPanels.DocumentInfo.txtPlacement": "Emplacement",
   "DE.Views.FileMenuPanels.DocumentInfo.txtRights": "Personnes qui ont des droits",
   "DE.Views.FileMenuPanels.DocumentInfo.txtSpaces": "Symboles avec des espaces",
   "DE.Views.FileMenuPanels.DocumentInfo.txtStatistics": "Statistiques",
+  "DE.Views.FileMenuPanels.DocumentInfo.txtSubject": "Sujet",
   "DE.Views.FileMenuPanels.DocumentInfo.txtSymbols": "Symboles",
   "DE.Views.FileMenuPanels.DocumentInfo.txtTitle": "Titre du document",
   "DE.Views.FileMenuPanels.DocumentInfo.txtUploaded": "Chargé",
@@ -1373,6 +1394,7 @@
   "DE.Views.FileMenuPanels.Settings.textAlignGuides": "Guides d'alignement",
   "DE.Views.FileMenuPanels.Settings.textAutoRecover": "Récupération automatique",
   "DE.Views.FileMenuPanels.Settings.textAutoSave": "Enregistrement automatique",
+  "DE.Views.FileMenuPanels.Settings.textCompatible": "Compatibilité",
   "DE.Views.FileMenuPanels.Settings.textDisabled": "Désactivé",
   "DE.Views.FileMenuPanels.Settings.textForceSave": "Enregistrer sur le serveur",
   "DE.Views.FileMenuPanels.Settings.textMinute": "Chaque minute",
@@ -1659,33 +1681,52 @@
   "DE.Views.ParagraphSettingsAdvanced.strBorders": "Bordures et remplissage",
   "DE.Views.ParagraphSettingsAdvanced.strBreakBefore": "Saut de page avant",
   "DE.Views.ParagraphSettingsAdvanced.strDoubleStrike": "Double barré",
+  "DE.Views.ParagraphSettingsAdvanced.strIndent": "Retraits",
   "DE.Views.ParagraphSettingsAdvanced.strIndentsLeftText": "A gauche",
+  "DE.Views.ParagraphSettingsAdvanced.strIndentsLineSpacing": "Interligne",
+  "DE.Views.ParagraphSettingsAdvanced.strIndentsOutlinelevel": "Niveau hiérarchique",
   "DE.Views.ParagraphSettingsAdvanced.strIndentsRightText": "A droite",
+  "DE.Views.ParagraphSettingsAdvanced.strIndentsSpacingAfter": "Après",
+  "DE.Views.ParagraphSettingsAdvanced.strIndentsSpacingBefore": "Avant",
+  "DE.Views.ParagraphSettingsAdvanced.strIndentsSpecial": "Spécial",
   "DE.Views.ParagraphSettingsAdvanced.strKeepLines": "Lignes solidaires",
   "DE.Views.ParagraphSettingsAdvanced.strKeepNext": "Paragraphes solidaires",
   "DE.Views.ParagraphSettingsAdvanced.strMargins": "Marges intérieures",
   "DE.Views.ParagraphSettingsAdvanced.strOrphan": "Éviter orphelines",
   "DE.Views.ParagraphSettingsAdvanced.strParagraphFont": "Police",
   "DE.Views.ParagraphSettingsAdvanced.strParagraphIndents": "Retraits et emplacement",
+  "DE.Views.ParagraphSettingsAdvanced.strParagraphLine": "Enchaînements",
   "DE.Views.ParagraphSettingsAdvanced.strParagraphPosition": "Emplacement",
   "DE.Views.ParagraphSettingsAdvanced.strSmallCaps": "Petites majuscules",
+  "DE.Views.ParagraphSettingsAdvanced.strSomeParagraphSpace": "Ne pas ajouter d'intervalle entre paragraphes du même style",
+  "DE.Views.ParagraphSettingsAdvanced.strSpacing": "Espacement",
   "DE.Views.ParagraphSettingsAdvanced.strStrike": "Barré",
   "DE.Views.ParagraphSettingsAdvanced.strSubscript": "Indice",
   "DE.Views.ParagraphSettingsAdvanced.strSuperscript": "Exposant",
   "DE.Views.ParagraphSettingsAdvanced.strTabs": "Tabulation",
   "DE.Views.ParagraphSettingsAdvanced.textAlign": "Alignement",
+  "DE.Views.ParagraphSettingsAdvanced.textAtLeast": "Au moins ",
+  "DE.Views.ParagraphSettingsAdvanced.textAuto": "Plusieurs",
   "DE.Views.ParagraphSettingsAdvanced.textBackColor": "Couleur d'arrière-plan",
+  "DE.Views.ParagraphSettingsAdvanced.textBodyText": "Texte simple",
   "DE.Views.ParagraphSettingsAdvanced.textBorderColor": "Couleur",
   "DE.Views.ParagraphSettingsAdvanced.textBorderDesc": "Cliquez sur le diagramme ou utilisez les boutons pour sélectionner les bordures et appliquez le style choisi",
   "DE.Views.ParagraphSettingsAdvanced.textBorderWidth": "Taille de bordure",
   "DE.Views.ParagraphSettingsAdvanced.textBottom": "En bas",
+  "DE.Views.ParagraphSettingsAdvanced.textCentered": "Centré",
   "DE.Views.ParagraphSettingsAdvanced.textCharacterSpacing": "Espacement des caractères",
   "DE.Views.ParagraphSettingsAdvanced.textDefault": "Par défaut",
   "DE.Views.ParagraphSettingsAdvanced.textEffects": "Effets",
+  "DE.Views.ParagraphSettingsAdvanced.textExact": "Exactement",
+  "DE.Views.ParagraphSettingsAdvanced.textFirstLine": "Première ligne",
+  "DE.Views.ParagraphSettingsAdvanced.textHanging": "Suspendu",
+  "DE.Views.ParagraphSettingsAdvanced.textJustified": "Justifié",
   "DE.Views.ParagraphSettingsAdvanced.textLeader": "Guide",
   "DE.Views.ParagraphSettingsAdvanced.textLeft": "A gauche",
+  "DE.Views.ParagraphSettingsAdvanced.textLevel": "Niveau",
   "DE.Views.ParagraphSettingsAdvanced.textNewColor": "Couleur personnalisée",
   "DE.Views.ParagraphSettingsAdvanced.textNone": "Aucune",
+  "DE.Views.ParagraphSettingsAdvanced.textNoneSpecial": "(aucun)",
   "DE.Views.ParagraphSettingsAdvanced.textPosition": "Position",
   "DE.Views.ParagraphSettingsAdvanced.textRemove": "Supprimer",
   "DE.Views.ParagraphSettingsAdvanced.textRemoveAll": "Supprimer tout",
@@ -1706,6 +1747,7 @@
   "DE.Views.ParagraphSettingsAdvanced.tipOuter": "Seulement bordure extérieure",
   "DE.Views.ParagraphSettingsAdvanced.tipRight": "Seulement bordure droite",
   "DE.Views.ParagraphSettingsAdvanced.tipTop": "Seulement bordure supérieure",
+  "DE.Views.ParagraphSettingsAdvanced.txtAutoText": "Auto",
   "DE.Views.ParagraphSettingsAdvanced.txtNoBorders": "Pas de bordures",
   "DE.Views.RightMenu.txtChartSettings": "Paramètres du graphique",
   "DE.Views.RightMenu.txtHeaderFooterSettings": "Paramètres d'en-têtes et de pieds de page",
@@ -1873,6 +1915,14 @@
   "DE.Views.TableSettings.tipRight": "Seulement bordure extérieure droite",
   "DE.Views.TableSettings.tipTop": "Seulement bordure extérieure supérieure",
   "DE.Views.TableSettings.txtNoBorders": "Pas de bordures",
+  "DE.Views.TableSettings.txtTable_Accent": "Accentuation",
+  "DE.Views.TableSettings.txtTable_Colorful": "En couleurs",
+  "DE.Views.TableSettings.txtTable_Dark": "Foncé",
+  "DE.Views.TableSettings.txtTable_GridTable": "Table Grille",
+  "DE.Views.TableSettings.txtTable_Light": "Clair",
+  "DE.Views.TableSettings.txtTable_ListTable": "Tableau de listes",
+  "DE.Views.TableSettings.txtTable_PlainTable": "Tableau simple",
+  "DE.Views.TableSettings.txtTable_TableGrid": "Grille du tableau",
   "DE.Views.TableSettingsAdvanced.textAlign": "Alignement",
   "DE.Views.TableSettingsAdvanced.textAlignment": "Alignement",
   "DE.Views.TableSettingsAdvanced.textAllowSpacing": "Espacement entre les cellules",
@@ -2001,13 +2051,9 @@
   "DE.Views.Toolbar.mniImageFromStorage": "Image de stockage",
   "DE.Views.Toolbar.mniImageFromUrl": "Image à partir d'une URL",
   "DE.Views.Toolbar.strMenuNoFill": "Pas de remplissage",
-  "DE.Views.Toolbar.textArea": "En aires",
   "DE.Views.Toolbar.textAutoColor": "Automatique",
-  "DE.Views.Toolbar.textBar": "En barre",
   "DE.Views.Toolbar.textBold": "Gras",
   "DE.Views.Toolbar.textBottom": "En bas: ",
-  "DE.Views.Toolbar.textCharts": "Graphiques",
-  "DE.Views.Toolbar.textColumn": "Colonne",
   "DE.Views.Toolbar.textColumnsCustom": "Colonnes personnalisées",
   "DE.Views.Toolbar.textColumnsLeft": "A gauche",
   "DE.Views.Toolbar.textColumnsOne": "Un",
@@ -2027,7 +2073,6 @@
   "DE.Views.Toolbar.textItalic": "Italique",
   "DE.Views.Toolbar.textLandscape": "Paysage",
   "DE.Views.Toolbar.textLeft": "À gauche:",
-  "DE.Views.Toolbar.textLine": "Graphique en ligne",
   "DE.Views.Toolbar.textMarginsLast": "Dernière mesure",
   "DE.Views.Toolbar.textMarginsModerate": "Modérer",
   "DE.Views.Toolbar.textMarginsNarrow": "Étroit",
@@ -2041,14 +2086,12 @@
   "DE.Views.Toolbar.textOddPage": "Page impaire",
   "DE.Views.Toolbar.textPageMarginsCustom": "Marges personnalisées",
   "DE.Views.Toolbar.textPageSizeCustom": "Taille personnalisée",
-  "DE.Views.Toolbar.textPie": "Graphiques à secteurs",
   "DE.Views.Toolbar.textPlainControl": "Insérer un contrôle de contenu en texte brut",
-  "DE.Views.Toolbar.textPoint": "Nuages de points (XY)",
   "DE.Views.Toolbar.textPortrait": "Portrait",
   "DE.Views.Toolbar.textRemoveControl": "Supprimer le contrôle du contenu",
+  "DE.Views.Toolbar.textRemWatermark": "Supprimer le filigrane",
   "DE.Views.Toolbar.textRichControl": "Insérer un contrôle de contenu en texte enrichi",
   "DE.Views.Toolbar.textRight": "A droite: ",
-  "DE.Views.Toolbar.textStock": "Boursier",
   "DE.Views.Toolbar.textStrikeout": "Barré",
   "DE.Views.Toolbar.textStyleMenuDelete": "Supprimer le style",
   "DE.Views.Toolbar.textStyleMenuDeleteAll": "Supprimer tous les styles personnalisés",
@@ -2058,7 +2101,6 @@
   "DE.Views.Toolbar.textStyleMenuUpdate": "Mettre à jour selon la sélection",
   "DE.Views.Toolbar.textSubscript": "Indice",
   "DE.Views.Toolbar.textSuperscript": "Exposant",
-  "DE.Views.Toolbar.textSurface": "Surface",
   "DE.Views.Toolbar.textTabCollaboration": "Collaboration",
   "DE.Views.Toolbar.textTabFile": "Fichier",
   "DE.Views.Toolbar.textTabHome": "Accueil",
@@ -2127,6 +2169,7 @@
   "DE.Views.Toolbar.tipShowHiddenChars": "Caractères non imprimables",
   "DE.Views.Toolbar.tipSynchronize": "Le document a été modifié par un autre utilisateur. Cliquez pour enregistrer vos modifications et recharger des mises à jour.",
   "DE.Views.Toolbar.tipUndo": "Annuler",
+  "DE.Views.Toolbar.tipWatermark": "Modifier le filigrane",
   "DE.Views.Toolbar.txtDistribHor": "Distribuer horizontalement",
   "DE.Views.Toolbar.txtDistribVert": "Distribuer verticalement",
   "DE.Views.Toolbar.txtMarginAlign": "Aligner par rapport à la marge",
@@ -2156,9 +2199,24 @@
   "DE.Views.WatermarkSettingsDialog.textAuto": "Auto",
   "DE.Views.WatermarkSettingsDialog.textBold": "Gras",
   "DE.Views.WatermarkSettingsDialog.textColor": "Couleur du texte",
+  "DE.Views.WatermarkSettingsDialog.textDiagonal": "Diagonale",
+  "DE.Views.WatermarkSettingsDialog.textFont": "Police",
+  "DE.Views.WatermarkSettingsDialog.textFromFile": "Depuis un fichier",
+  "DE.Views.WatermarkSettingsDialog.textFromUrl": "D'une URL",
+  "DE.Views.WatermarkSettingsDialog.textHor": "Horizontal",
+  "DE.Views.WatermarkSettingsDialog.textImageW": "Image en filigrane",
+  "DE.Views.WatermarkSettingsDialog.textItalic": "Italique",
+  "DE.Views.WatermarkSettingsDialog.textLanguage": "Langue",
+  "DE.Views.WatermarkSettingsDialog.textLayout": "Mise en page",
   "DE.Views.WatermarkSettingsDialog.textNewColor": "Ajouter une nouvelle couleur personnalisée",
+  "DE.Views.WatermarkSettingsDialog.textNone": "Aucun",
+  "DE.Views.WatermarkSettingsDialog.textScale": "Échelle",
+  "DE.Views.WatermarkSettingsDialog.textStrikeout": "Barré",
   "DE.Views.WatermarkSettingsDialog.textText": "Texte",
   "DE.Views.WatermarkSettingsDialog.textTextW": "Filigrane de texte",
   "DE.Views.WatermarkSettingsDialog.textTitle": "Paramètres de filigrane",
-  "DE.Views.WatermarkSettingsDialog.textUnderline": "Souligné"
+  "DE.Views.WatermarkSettingsDialog.textTransparency": "Semi-transparent",
+  "DE.Views.WatermarkSettingsDialog.textUnderline": "Souligné",
+  "DE.Views.WatermarkSettingsDialog.tipFontName": "Nom de la police",
+  "DE.Views.WatermarkSettingsDialog.tipFontSize": "Taille de police"
 }

apps/documenteditor/main/locale/hu.json

@@ -63,6 +63,14 @@
   "Common.Controllers.ReviewChanges.textTabs": "Lapok módosítása",
   "Common.Controllers.ReviewChanges.textUnderline": "Aláhúzott",
   "Common.Controllers.ReviewChanges.textWidow": "Özvegy sor",
+  "Common.define.chartData.textArea": "Terület",
+  "Common.define.chartData.textBar": "Sáv",
+  "Common.define.chartData.textColumn": "Oszlop",
+  "Common.define.chartData.textLine": "Vonal",
+  "Common.define.chartData.textPie": "Kör",
+  "Common.define.chartData.textPoint": "Pont",
+  "Common.define.chartData.textStock": "Részvény",
+  "Common.define.chartData.textSurface": "Felület",
   "Common.UI.ComboBorderSize.txtNoBorders": "Nincsenek szegélyek",
   "Common.UI.ComboBorderSizeEditable.txtNoBorders": "Nincsenek szegélyek",
   "Common.UI.ComboDataView.emptyComboText": "Nincsenek stílusok",
@@ -314,7 +322,7 @@
   "DE.Controllers.Main.errorAccessDeny": "Olyan műveletet próbál végrehajtani, melyre nincs jogosultsága.<br>Vegye fel a kapcsolatot a Document Server adminisztrátorával.",
   "DE.Controllers.Main.errorBadImageUrl": "Hibás kép URL",
   "DE.Controllers.Main.errorCoAuthoringDisconnect": "Elveszett a kapcsolat a szerverrel. A dokumentum jelenleg nem szerkeszthető.",
-  "DE.Controllers.Main.errorConnectToServer": "A dokumentum mentése nem lehetséges. Kérjük ellenőrizze a kapcsolódási beállításokat vagy lépjen kapcsolatba a rendszer adminisztrátorral.<br>Ha az 'OK'-ra kattint letöltheti a dokumentumot.<br><br>Bővebb információk a Dokumentum Szerverhez kapcsolódásról <a href=\"%1\" target=\"_blank\">itt</a> találhat.",
+  "DE.Controllers.Main.errorConnectToServer": "A dokumentum mentése nem lehetséges. Kérjük ellenőrizze a kapcsolódási beállításokat vagy lépjen kapcsolatba a rendszer adminisztrátorral.<br>Ha az 'OK'-ra kattint letöltheti a dokumentumot.",
   "DE.Controllers.Main.errorDatabaseConnection": "Külső hiba.<br>Adatbázis-kapcsolati hiba. Ha a hiba továbbra is fennáll, lépjen kapcsolatba a rendszer támogatással.",
   "DE.Controllers.Main.errorDataEncrypted": "Titkosított változások érkeztek, melyek feloldása sikertelen.",
   "DE.Controllers.Main.errorDataRange": "Hibás adattartomány.",
@@ -923,20 +931,12 @@
   "DE.Views.BookmarksDialog.textTitle": "Könyvjelzők",
   "DE.Views.BookmarksDialog.txtInvalidName": "A könyvjelző neve kizárólag betűket, számokat és alulvonást tartalmazhat, és betűvel kezdődhet.",
   "DE.Views.ChartSettings.textAdvanced": "Speciális beállítások megjelenítése",
-  "DE.Views.ChartSettings.textArea": "Terület",
-  "DE.Views.ChartSettings.textBar": "Sáv",
   "DE.Views.ChartSettings.textChartType": "Diagramtípus módosítása",
-  "DE.Views.ChartSettings.textColumn": "Oszlop",
   "DE.Views.ChartSettings.textEditData": "Adat szerkesztése",
   "DE.Views.ChartSettings.textHeight": "Magasság",
-  "DE.Views.ChartSettings.textLine": "Vonal",
   "DE.Views.ChartSettings.textOriginalSize": "Alapértelmezett méret",
-  "DE.Views.ChartSettings.textPie": "Kör",
-  "DE.Views.ChartSettings.textPoint": "Pont",
   "DE.Views.ChartSettings.textSize": "Méret",
-  "DE.Views.ChartSettings.textStock": "Részvény",
   "DE.Views.ChartSettings.textStyle": "Stílus",
-  "DE.Views.ChartSettings.textSurface": "Felület",
   "DE.Views.ChartSettings.textUndock": "Eltávolít a panelről",
   "DE.Views.ChartSettings.textWidth": "Szélesség",
   "DE.Views.ChartSettings.textWrap": "Tördelés stílus",
@@ -1912,13 +1912,9 @@
   "DE.Views.Toolbar.mniImageFromStorage": "Kép a tárolóból",
   "DE.Views.Toolbar.mniImageFromUrl": "Kép hivatkozásból",
   "DE.Views.Toolbar.strMenuNoFill": "Nincs kitöltés",
-  "DE.Views.Toolbar.textArea": "Terület",
   "DE.Views.Toolbar.textAutoColor": "Automatikus",
-  "DE.Views.Toolbar.textBar": "Sáv",
   "DE.Views.Toolbar.textBold": "Félkövér",
   "DE.Views.Toolbar.textBottom": "Alsó:",
-  "DE.Views.Toolbar.textCharts": "Diagramok",
-  "DE.Views.Toolbar.textColumn": "Oszlop",
   "DE.Views.Toolbar.textColumnsCustom": "Egyéni hasábok",
   "DE.Views.Toolbar.textColumnsLeft": "Bal",
   "DE.Views.Toolbar.textColumnsOne": "Egy",
@@ -1937,7 +1933,6 @@
   "DE.Views.Toolbar.textItalic": "Dőlt",
   "DE.Views.Toolbar.textLandscape": "Tájkép",
   "DE.Views.Toolbar.textLeft": "Bal:",
-  "DE.Views.Toolbar.textLine": "Vonal",
   "DE.Views.Toolbar.textMarginsLast": "Előző egyéni beállítások",
   "DE.Views.Toolbar.textMarginsModerate": "Mérsékelt",
   "DE.Views.Toolbar.textMarginsNarrow": "Keskeny",
@@ -1951,14 +1946,11 @@
   "DE.Views.Toolbar.textOddPage": "Páratlan oldal",
   "DE.Views.Toolbar.textPageMarginsCustom": "Egyéni margók",
   "DE.Views.Toolbar.textPageSizeCustom": "Egyéni lapméret",
-  "DE.Views.Toolbar.textPie": "Kör",
   "DE.Views.Toolbar.textPlainControl": "Egyszerű szöveg tartalomkezelő beillesztése",
-  "DE.Views.Toolbar.textPoint": "Pont",
   "DE.Views.Toolbar.textPortrait": "Portré",
   "DE.Views.Toolbar.textRemoveControl": "Tartalomkezelő eltávolítása",
   "DE.Views.Toolbar.textRichControl": "Rich text tartalomkezelő beillesztése",
   "DE.Views.Toolbar.textRight": "Jobb:",
-  "DE.Views.Toolbar.textStock": "Részvény",
   "DE.Views.Toolbar.textStrikeout": "Áthúzott",
   "DE.Views.Toolbar.textStyleMenuDelete": "Stílus törlése",
   "DE.Views.Toolbar.textStyleMenuDeleteAll": "Minden egyéni stílus törlése",
@@ -1968,7 +1960,6 @@
   "DE.Views.Toolbar.textStyleMenuUpdate": "Frissítés a kiválasztásból",
   "DE.Views.Toolbar.textSubscript": "Alsó index",
   "DE.Views.Toolbar.textSuperscript": "Felső index",
-  "DE.Views.Toolbar.textSurface": "Felület",
   "DE.Views.Toolbar.textTabCollaboration": "Együttműködés",
   "DE.Views.Toolbar.textTabFile": "Fájl",
   "DE.Views.Toolbar.textTabHome": "Kezdőlap",

apps/documenteditor/main/locale/it.json

@@ -69,6 +69,14 @@
   "Common.Controllers.ReviewChanges.textTabs": "Modifica Schede",
   "Common.Controllers.ReviewChanges.textUnderline": "Sottolineato",
   "Common.Controllers.ReviewChanges.textWidow": "Widow control",
+  "Common.define.chartData.textArea": "Aerogramma",
+  "Common.define.chartData.textBar": "A barre",
+  "Common.define.chartData.textColumn": "Istogramma",
+  "Common.define.chartData.textLine": "A linee",
+  "Common.define.chartData.textPie": "A torta",
+  "Common.define.chartData.textPoint": "XY (A dispersione)",
+  "Common.define.chartData.textStock": "Azionario",
+  "Common.define.chartData.textSurface": "Superficie",
   "Common.UI.ComboBorderSize.txtNoBorders": "Nessun bordo",
   "Common.UI.ComboBorderSizeEditable.txtNoBorders": "Nessun bordo",
   "Common.UI.ComboDataView.emptyComboText": "Nessuno stile",
@@ -324,7 +332,7 @@
   "DE.Controllers.Main.errorAccessDeny": "Stai tentando di eseguire un'azione per la quale non disponi di permessi sufficienti.<br>Si prega di contattare l'amministratore del Server dei Documenti.",
   "DE.Controllers.Main.errorBadImageUrl": "URL dell'immagine non corretto",
   "DE.Controllers.Main.errorCoAuthoringDisconnect": "Connessione al server persa. Impossibile modificare il documento.",
-  "DE.Controllers.Main.errorConnectToServer": "Il documento non può essere salvato. Controllare le impostazioni di rete o contatta l'Amministratore.<br>Quando clicchi 'OK' Ti verrà richiesto di scaricare il documento.<br><br>Per maggiori dettagli sulla connessione al Document Server  <a href=\"%1\" target=\"_blank\">clicca qui</a>",
+  "DE.Controllers.Main.errorConnectToServer": "Il documento non può essere salvato. Controllare le impostazioni di rete o contatta l'Amministratore.<br>Quando clicchi 'OK' Ti verrà richiesto di scaricare il documento.",
   "DE.Controllers.Main.errorDatabaseConnection": "Errore esterno.<br>Errore di connessione a banca dati. Si prega di contattare l'assistenza tecnica nel caso in cui l'errore persiste.",
   "DE.Controllers.Main.errorDataEncrypted": "Le modifiche crittografate sono state ricevute, non possono essere decifrate.",
   "DE.Controllers.Main.errorDataRange": "Intervallo di dati non corretto.",
@@ -1002,21 +1010,18 @@
   "DE.Views.BookmarksDialog.textSort": "Ordina per",
   "DE.Views.BookmarksDialog.textTitle": "Segnalibri",
   "DE.Views.BookmarksDialog.txtInvalidName": "il nome del Segnalibro può contenere solo lettere, numeri e underscore, e dovrebbe iniziare con la lettera",
+  "DE.Views.CaptionDialog.textBefore": "Prima",
+  "DE.Views.CaptionDialog.textColon": "due punti",
+  "DE.Views.CaptionDialog.textSeparator": "Usa separatore",
+  "DE.Views.CellsAddDialog.textCol": "Colonne",
+  "DE.Views.CellsRemoveDialog.textTitle": "Elimina celle",
   "DE.Views.ChartSettings.textAdvanced": "Mostra impostazioni avanzate",
-  "DE.Views.ChartSettings.textArea": "Aerogramma",
-  "DE.Views.ChartSettings.textBar": "A barre",
   "DE.Views.ChartSettings.textChartType": "Cambia tipo grafico",
-  "DE.Views.ChartSettings.textColumn": "Istogramma",
   "DE.Views.ChartSettings.textEditData": "Modifica dati",
   "DE.Views.ChartSettings.textHeight": "Altezza",
-  "DE.Views.ChartSettings.textLine": "A linee",
   "DE.Views.ChartSettings.textOriginalSize": "Predefinita",
-  "DE.Views.ChartSettings.textPie": "A torta",
-  "DE.Views.ChartSettings.textPoint": "XY (A dispersione)",
   "DE.Views.ChartSettings.textSize": "Dimensione",
-  "DE.Views.ChartSettings.textStock": "Azionario",
   "DE.Views.ChartSettings.textStyle": "Stile",
-  "DE.Views.ChartSettings.textSurface": "Superficie",
   "DE.Views.ChartSettings.textUndock": "Disancora dal pannello",
   "DE.Views.ChartSettings.textWidth": "Larghezza",
   "DE.Views.ChartSettings.textWrap": "Stile di disposizione testo",
@@ -1119,6 +1124,7 @@
   "DE.Views.DocumentHolder.textArrangeBackward": "Porta indietro",
   "DE.Views.DocumentHolder.textArrangeForward": "Porta avanti",
   "DE.Views.DocumentHolder.textArrangeFront": "Porta in primo piano",
+  "DE.Views.DocumentHolder.textCells": "Celle",
   "DE.Views.DocumentHolder.textContentControls": "Controllo Contenuto",
   "DE.Views.DocumentHolder.textContinueNumbering": "Continua la numerazione",
   "DE.Views.DocumentHolder.textCopy": "Copia",
@@ -1321,6 +1327,7 @@
   "DE.Views.FileMenuPanels.CreateNew.newDescriptionText": "Crea un nuovo documento di testo vuoto che potrai formattare in seguito durante la modifica. Oppure scegli uno dei modelli per creare un documento di un certo tipo al quale sono già applicati certi stili.",
   "DE.Views.FileMenuPanels.CreateNew.newDocumentText": "Nuovo documento di testo",
   "DE.Views.FileMenuPanels.CreateNew.noTemplatesText": "Nessun modello",
+  "DE.Views.FileMenuPanels.DocumentInfo.okButtonText": "Applica",
   "DE.Views.FileMenuPanels.DocumentInfo.txtAddAuthor": "Aggiungi Autore",
   "DE.Views.FileMenuPanels.DocumentInfo.txtAddText": "Aggiungi testo",
   "DE.Views.FileMenuPanels.DocumentInfo.txtAppName": "Applicazione",
@@ -2032,13 +2039,9 @@
   "DE.Views.Toolbar.mniImageFromStorage": "Immagine dallo spazio di archiviazione",
   "DE.Views.Toolbar.mniImageFromUrl": "Immagine da URL",
   "DE.Views.Toolbar.strMenuNoFill": "Nessun riempimento",
-  "DE.Views.Toolbar.textArea": "Aerogramma",
   "DE.Views.Toolbar.textAutoColor": "Automatico",
-  "DE.Views.Toolbar.textBar": "A barre",
   "DE.Views.Toolbar.textBold": "Grassetto",
   "DE.Views.Toolbar.textBottom": "Bottom: ",
-  "DE.Views.Toolbar.textCharts": "Grafici",
-  "DE.Views.Toolbar.textColumn": "Istogramma",
   "DE.Views.Toolbar.textColumnsCustom": "Colonne personalizzate",
   "DE.Views.Toolbar.textColumnsLeft": "Left",
   "DE.Views.Toolbar.textColumnsOne": "One",
@@ -2058,7 +2061,6 @@
   "DE.Views.Toolbar.textItalic": "Corsivo",
   "DE.Views.Toolbar.textLandscape": "Orizzontale",
   "DE.Views.Toolbar.textLeft": "Left: ",
-  "DE.Views.Toolbar.textLine": "A linee",
   "DE.Views.Toolbar.textMarginsLast": "Last Custom",
   "DE.Views.Toolbar.textMarginsModerate": "Moderare",
   "DE.Views.Toolbar.textMarginsNarrow": "Narrow",
@@ -2072,15 +2074,12 @@
   "DE.Views.Toolbar.textOddPage": "Pagina dispari",
   "DE.Views.Toolbar.textPageMarginsCustom": "Custom margins",
   "DE.Views.Toolbar.textPageSizeCustom": "Custom Page Size",
-  "DE.Views.Toolbar.textPie": "A torta",
   "DE.Views.Toolbar.textPlainControl": "Inserisci il controllo del contenuto in testo normale",
-  "DE.Views.Toolbar.textPoint": "XY (A dispersione)",
   "DE.Views.Toolbar.textPortrait": "Verticale",
   "DE.Views.Toolbar.textRemoveControl": "Rimuovi il controllo del contenuto",
   "DE.Views.Toolbar.textRemWatermark": "Rimuovi filigrana",
   "DE.Views.Toolbar.textRichControl": "Inserisci il controllo del contenuto RTF",
   "DE.Views.Toolbar.textRight": "Right: ",
-  "DE.Views.Toolbar.textStock": "Azionario",
   "DE.Views.Toolbar.textStrikeout": "Barrato",
   "DE.Views.Toolbar.textStyleMenuDelete": "Elimina stile",
   "DE.Views.Toolbar.textStyleMenuDeleteAll": "Elimina tutti gli stili personalizzati",
@@ -2090,7 +2089,6 @@
   "DE.Views.Toolbar.textStyleMenuUpdate": "Aggiorna da selezione",
   "DE.Views.Toolbar.textSubscript": "Pedice",
   "DE.Views.Toolbar.textSuperscript": "Apice",
-  "DE.Views.Toolbar.textSurface": "Superficie",
   "DE.Views.Toolbar.textTabCollaboration": "Collaborazione",
   "DE.Views.Toolbar.textTabFile": "File",
   "DE.Views.Toolbar.textTabHome": "Home",

apps/documenteditor/main/locale/ja.json

@@ -63,6 +63,13 @@
   "Common.Controllers.ReviewChanges.textTabs": "タブの変更",
   "Common.Controllers.ReviewChanges.textUnderline": "下線",
   "Common.Controllers.ReviewChanges.textWidow": "改ページ時1行残して段落を区切らないを制御する。",
+  "Common.define.chartData.textArea": "面グラフ",
+  "Common.define.chartData.textBar": "横棒グラフ",
+  "Common.define.chartData.textColumn": "縦棒グラフ",
+  "Common.define.chartData.textLine": "折れ線グラフ",
+  "Common.define.chartData.textPie": "円グラフ",
+  "Common.define.chartData.textPoint": "点グラフ",
+  "Common.define.chartData.textStock": "株価チャート",
   "Common.UI.ComboBorderSize.txtNoBorders": "罫線なし",
   "Common.UI.ComboBorderSizeEditable.txtNoBorders": "罫線なし",
   "Common.UI.ComboDataView.emptyComboText": "スタイルなし",
@@ -173,7 +180,7 @@
   "DE.Controllers.Main.downloadTextText": "ドキュメントのダウンロード中...",
   "DE.Controllers.Main.downloadTitleText": "ドキュメントのダウンロード中",
   "DE.Controllers.Main.errorCoAuthoringDisconnect": "サーバーとの接続が失われました。今、文書を編集することができません。",
-  "DE.Controllers.Main.errorConnectToServer": "文書を保存できませんでした。接続設定を確認するか、管理者にお問い合わせください。<br>OKボタンをクリックするとドキュメントをダウンロードするように求められます。<br><br>ドキュメントサーバーの接続の詳細情報を見つけます:<a href=\"%1\" target=\"_blank\">ここに</a>",
+  "DE.Controllers.Main.errorConnectToServer": "文書を保存できませんでした。接続設定を確認するか、管理者にお問い合わせください。<br>OKボタンをクリックするとドキュメントをダウンロードするように求められます。",
   "DE.Controllers.Main.errorDatabaseConnection": "外部エラーです。<br>データベース接続エラーです。この問題は解決しない場合は、サポートにお問い合わせください。",
   "DE.Controllers.Main.errorDataRange": "データ範囲が正しくありません",
   "DE.Controllers.Main.errorDefaultMessage": "エラー コード:%1",
@@ -589,18 +596,11 @@
   "DE.Controllers.Toolbar.txtSymbol_xsi": "グザイ",
   "DE.Controllers.Toolbar.txtSymbol_zeta": "ゼータ",
   "DE.Views.ChartSettings.textAdvanced": "詳細設定の表示",
-  "DE.Views.ChartSettings.textArea": "面グラフ",
-  "DE.Views.ChartSettings.textBar": "横棒グラフ",
   "DE.Views.ChartSettings.textChartType": "グラフの種類の変更",
-  "DE.Views.ChartSettings.textColumn": "縦棒グラフ",
   "DE.Views.ChartSettings.textEditData": "データの編集",
   "DE.Views.ChartSettings.textHeight": "高さ",
-  "DE.Views.ChartSettings.textLine": "折れ線グラフ",
   "DE.Views.ChartSettings.textOriginalSize": "既定のサイズ",
-  "DE.Views.ChartSettings.textPie": "円グラフ",
-  "DE.Views.ChartSettings.textPoint": "点グラフ",
   "DE.Views.ChartSettings.textSize": "サイズ",
-  "DE.Views.ChartSettings.textStock": "株価チャート",
   "DE.Views.ChartSettings.textStyle": "スタイル",
   "DE.Views.ChartSettings.textUndock": "パネルからのドッキング解除",
   "DE.Views.ChartSettings.textWidth": "幅",
@@ -1327,12 +1327,9 @@
   "DE.Views.Toolbar.mniImageFromFile": "ファイルからの画像",
   "DE.Views.Toolbar.mniImageFromUrl": "ファイルからのURL",
   "DE.Views.Toolbar.strMenuNoFill": "塗りつぶしなし",
-  "DE.Views.Toolbar.textArea": "面グラフ",
   "DE.Views.Toolbar.textAutoColor": "自動",
-  "DE.Views.Toolbar.textBar": "横棒グラフ",
   "DE.Views.Toolbar.textBold": "太字",
   "DE.Views.Toolbar.textBottom": "下：",
-  "DE.Views.Toolbar.textColumn": "縦棒グラフ",
   "DE.Views.Toolbar.textColumnsLeft": "左",
   "DE.Views.Toolbar.textColumnsOne": "1",
   "DE.Views.Toolbar.textColumnsRight": "右に",
@@ -1348,7 +1345,6 @@
   "DE.Views.Toolbar.textInText": "テキスト",
   "DE.Views.Toolbar.textItalic": "斜体",
   "DE.Views.Toolbar.textLeft": "左：",
-  "DE.Views.Toolbar.textLine": "折れ線グラフ",
   "DE.Views.Toolbar.textMarginsLast": "最後に適用したユーザー",
   "DE.Views.Toolbar.textMarginsModerate": "標準",
   "DE.Views.Toolbar.textMarginsNarrow": "狭い",
@@ -1361,10 +1357,7 @@
   "DE.Views.Toolbar.textOddPage": "奇数ページから開始",
   "DE.Views.Toolbar.textPageMarginsCustom": "カスタム マージン",
   "DE.Views.Toolbar.textPageSizeCustom": "ユーザー設定のページ サイズ",
-  "DE.Views.Toolbar.textPie": "円グラフ",
-  "DE.Views.Toolbar.textPoint": "点グラフ",
   "DE.Views.Toolbar.textRight": "右：",
-  "DE.Views.Toolbar.textStock": "株価チャート",
   "DE.Views.Toolbar.textStrikeout": "取り消し線",
   "DE.Views.Toolbar.textStyleMenuDelete": "スタイルの削除",
   "DE.Views.Toolbar.textStyleMenuDeleteAll": "ユーザー設定のスタイルの削除",

apps/documenteditor/main/locale/ko.json

@@ -298,7 +298,7 @@
   "DE.Controllers.Main.errorAccessDeny": "권한이없는 작업을 수행하려고합니다. <br> 문서 관리자에게 문의하십시오.",
   "DE.Controllers.Main.errorBadImageUrl": "이미지 URL이 잘못되었습니다.",
   "DE.Controllers.Main.errorCoAuthoringDisconnect": "서버 연결이 끊어졌습니다. 지금 문서를 편집 할 수 없습니다.",
-  "DE.Controllers.Main.errorConnectToServer": "문서를 저장할 수 없습니다. 연결 설정을 확인하거나 관리자에게 문의하십시오.<br>'확인'버튼을 클릭하면 문서를 다운로드하라는 메시지가 나타납니다.<br ><br>Document Server 연결에 대한 추가 정보 찾기 <a href=\"%1\" target=\"_blank\">여기</a> ",
+  "DE.Controllers.Main.errorConnectToServer": "문서를 저장할 수 없습니다. 연결 설정을 확인하거나 관리자에게 문의하십시오.<br>'확인'버튼을 클릭하면 문서를 다운로드하라는 메시지가 나타납니다.",
   "DE.Controllers.Main.errorDatabaseConnection": "외부 오류. <br> 데이터베이스 연결 오류입니다. 오류가 계속 발생하면 지원부에 문의하십시오.",
   "DE.Controllers.Main.errorDataRange": "잘못된 데이터 범위입니다.",
   "DE.Controllers.Main.errorDefaultMessage": "오류 코드 : % 1",
@@ -777,20 +777,12 @@
   "DE.Views.BookmarksDialog.textSort": "정렬",
   "DE.Views.BookmarksDialog.textTitle": "책갈피",
   "DE.Views.ChartSettings.textAdvanced": "고급 설정 표시",
-  "DE.Views.ChartSettings.textArea": "영역",
-  "DE.Views.ChartSettings.textBar": "Bar",
   "DE.Views.ChartSettings.textChartType": "차트 유형 변경",
-  "DE.Views.ChartSettings.textColumn": "열",
   "DE.Views.ChartSettings.textEditData": "데이터 편집",
   "DE.Views.ChartSettings.textHeight": "높이",
-  "DE.Views.ChartSettings.textLine": "Line",
   "DE.Views.ChartSettings.textOriginalSize": "기본 크기",
-  "DE.Views.ChartSettings.textPie": "파이",
-  "DE.Views.ChartSettings.textPoint": "XY (Scatter)",
   "DE.Views.ChartSettings.textSize": "크기",
-  "DE.Views.ChartSettings.textStock": "Stock",
   "DE.Views.ChartSettings.textStyle": "스타일",
-  "DE.Views.ChartSettings.textSurface": "표면",
   "DE.Views.ChartSettings.textUndock": "패널에서 도킹 해제",
   "DE.Views.ChartSettings.textWidth": "너비",
   "DE.Views.ChartSettings.textWrap": "포장 스타일",
@@ -1707,13 +1699,9 @@
   "DE.Views.Toolbar.mniImageFromFile": "그림 파일에서",
   "DE.Views.Toolbar.mniImageFromUrl": "URL에서 그림",
   "DE.Views.Toolbar.strMenuNoFill": "채우기 없음",
-  "DE.Views.Toolbar.textArea": "Area",
   "DE.Views.Toolbar.textAutoColor": "자동",
-  "DE.Views.Toolbar.textBar": "Bar",
   "DE.Views.Toolbar.textBold": "Bold",
   "DE.Views.Toolbar.textBottom": "Bottom :",
-  "DE.Views.Toolbar.textCharts": "차트",
-  "DE.Views.Toolbar.textColumn": "Column",
   "DE.Views.Toolbar.textColumnsCustom": "사용자 정의 열",
   "DE.Views.Toolbar.textColumnsLeft": "왼쪽",
   "DE.Views.Toolbar.textColumnsOne": "하나",
@@ -1732,7 +1720,6 @@
   "DE.Views.Toolbar.textItalic": "Italic",
   "DE.Views.Toolbar.textLandscape": "Landscape",
   "DE.Views.Toolbar.textLeft": "왼쪽 :",
-  "DE.Views.Toolbar.textLine": "Line",
   "DE.Views.Toolbar.textMarginsLast": "마지막 사용자 정의",
   "DE.Views.Toolbar.textMarginsModerate": "보통",
   "DE.Views.Toolbar.textMarginsNarrow": "좁다",
@@ -1745,14 +1732,11 @@
   "DE.Views.Toolbar.textOddPage": "홀수 페이지",
   "DE.Views.Toolbar.textPageMarginsCustom": "사용자 정의 여백",
   "DE.Views.Toolbar.textPageSizeCustom": "사용자 정의 페이지 크기",
-  "DE.Views.Toolbar.textPie": "파이",
   "DE.Views.Toolbar.textPlainControl": "일반 텍스트 콘텐트 제어 삽입",
-  "DE.Views.Toolbar.textPoint": "XY (Scatter)",
   "DE.Views.Toolbar.textPortrait": "Portrait",
   "DE.Views.Toolbar.textRemoveControl": "콘텐트 제어 삭제",
   "DE.Views.Toolbar.textRichControl": "리치 텍스트 콘텐트 제어 삽입",
   "DE.Views.Toolbar.textRight": "오른쪽 :",
-  "DE.Views.Toolbar.textStock": "Stock",
   "DE.Views.Toolbar.textStrikeout": "Strikeout",
   "DE.Views.Toolbar.textStyleMenuDelete": "스타일 삭제",
   "DE.Views.Toolbar.textStyleMenuDeleteAll": "모든 사용자 정의 스타일 삭제",
@@ -1762,7 +1746,6 @@
   "DE.Views.Toolbar.textStyleMenuUpdate": "선택 항목에서 업데이트",
   "DE.Views.Toolbar.textSubscript": "Subscript",
   "DE.Views.Toolbar.textSuperscript": "Superscript",
-  "DE.Views.Toolbar.textSurface": "Surface",
   "DE.Views.Toolbar.textTabCollaboration": "합치기",
   "DE.Views.Toolbar.textTabFile": "파일",
   "DE.Views.Toolbar.textTabHome": "집",

apps/documenteditor/main/locale/lv.json

@@ -295,7 +295,7 @@
   "DE.Controllers.Main.errorAccessDeny": "Jūs mēģināt veikt darbību, kuru nedrīkstat veikt.<br>Lūdzu, sazinieties ar savu dokumentu servera administratoru.",
   "DE.Controllers.Main.errorBadImageUrl": "Nav pareizs attēla URL",
   "DE.Controllers.Main.errorCoAuthoringDisconnect": "Server connection lost. The document cannot be edited right now.",
-  "DE.Controllers.Main.errorConnectToServer": "Dokumentu neizdevās noglabāt. Lūdzu, pārbaudiet savienojuma uzstādījumus vai sazinieties ar savu administratoru.<br>Nospiežot \"OK\", jūs varēsit lejupielādēt dokumentu.<br><br>Uzziniet vairāk par dokumentu servera pieslēgšanu <a href=\"%1\" target=\"_blank\">šeit</a>",
+  "DE.Controllers.Main.errorConnectToServer": "Dokumentu neizdevās noglabāt. Lūdzu, pārbaudiet savienojuma uzstādījumus vai sazinieties ar savu administratoru.<br>Nospiežot \"OK\", jūs varēsit lejupielādēt dokumentu.",
   "DE.Controllers.Main.errorDatabaseConnection": "External error.<br>Database connection error. Please contact support in case the error persists.",
   "DE.Controllers.Main.errorDataRange": "Incorrect data range.",
   "DE.Controllers.Main.errorDefaultMessage": "Kļūdas kods: %1",
@@ -774,20 +774,12 @@
   "DE.Views.BookmarksDialog.textSort": "Šķirot pēc",
   "DE.Views.BookmarksDialog.textTitle": "Grāmatzīmes",
   "DE.Views.ChartSettings.textAdvanced": "Show advanced settings",
-  "DE.Views.ChartSettings.textArea": "Area Chart",
-  "DE.Views.ChartSettings.textBar": "Bar Chart",
   "DE.Views.ChartSettings.textChartType": "Change Chart Type",
-  "DE.Views.ChartSettings.textColumn": "Column Chart",
   "DE.Views.ChartSettings.textEditData": "Edit Data",
   "DE.Views.ChartSettings.textHeight": "Height",
-  "DE.Views.ChartSettings.textLine": "Line Chart",
   "DE.Views.ChartSettings.textOriginalSize": "Default Size",
-  "DE.Views.ChartSettings.textPie": "Pie Chart",
-  "DE.Views.ChartSettings.textPoint": "XY (Scatter) Chart",
   "DE.Views.ChartSettings.textSize": "Size",
-  "DE.Views.ChartSettings.textStock": "Stock Chart",
   "DE.Views.ChartSettings.textStyle": "Style",
-  "DE.Views.ChartSettings.textSurface": "Virsma",
   "DE.Views.ChartSettings.textUndock": "Undock from panel",
   "DE.Views.ChartSettings.textWidth": "Width",
   "DE.Views.ChartSettings.textWrap": "Wrapping Style",
@@ -1704,13 +1696,9 @@
   "DE.Views.Toolbar.mniImageFromFile": "Attēls no faila",
   "DE.Views.Toolbar.mniImageFromUrl": "Attēls no URL",
   "DE.Views.Toolbar.strMenuNoFill": "Bez aizpildījuma",
-  "DE.Views.Toolbar.textArea": "Area Chart",
   "DE.Views.Toolbar.textAutoColor": "Automatic",
-  "DE.Views.Toolbar.textBar": "Bar Chart",
   "DE.Views.Toolbar.textBold": "Treknraksts",
   "DE.Views.Toolbar.textBottom": "Bottom: ",
-  "DE.Views.Toolbar.textCharts": "Diagrammas",
-  "DE.Views.Toolbar.textColumn": "Column Chart",
   "DE.Views.Toolbar.textColumnsCustom": "Pielāgotās kolonnas",
   "DE.Views.Toolbar.textColumnsLeft": "Left",
   "DE.Views.Toolbar.textColumnsOne": "One",
@@ -1729,7 +1717,6 @@
   "DE.Views.Toolbar.textItalic": "Kursīvs",
   "DE.Views.Toolbar.textLandscape": "Ainava",
   "DE.Views.Toolbar.textLeft": "Left: ",
-  "DE.Views.Toolbar.textLine": "Line Chart",
   "DE.Views.Toolbar.textMarginsLast": "Last Custom",
   "DE.Views.Toolbar.textMarginsModerate": "Moderate",
   "DE.Views.Toolbar.textMarginsNarrow": "Narrow",
@@ -1742,14 +1729,11 @@
   "DE.Views.Toolbar.textOddPage": "Odd Page",
   "DE.Views.Toolbar.textPageMarginsCustom": "Custom margins",
   "DE.Views.Toolbar.textPageSizeCustom": "Custom Page Size",
-  "DE.Views.Toolbar.textPie": "Pie Chart",
   "DE.Views.Toolbar.textPlainControl": "Ievietot parastā teksta satura kontroli",
-  "DE.Views.Toolbar.textPoint": "XY (Scatter) Chart",
   "DE.Views.Toolbar.textPortrait": "Portrets",
   "DE.Views.Toolbar.textRemoveControl": "Noņemt satura kontroles elementu",
   "DE.Views.Toolbar.textRichControl": "Ievietot formatētā teksta satura kontroli",
   "DE.Views.Toolbar.textRight": "Right: ",
-  "DE.Views.Toolbar.textStock": "Stock Chart",
   "DE.Views.Toolbar.textStrikeout": "Pārsvītrots",
   "DE.Views.Toolbar.textStyleMenuDelete": "Delete style",
   "DE.Views.Toolbar.textStyleMenuDeleteAll": "Delete all custom styles",
@@ -1759,7 +1743,6 @@
   "DE.Views.Toolbar.textStyleMenuUpdate": "Update from selection",
   "DE.Views.Toolbar.textSubscript": "Apakšraksts",
   "DE.Views.Toolbar.textSuperscript": "Augšraksts",
-  "DE.Views.Toolbar.textSurface": "Virsma",
   "DE.Views.Toolbar.textTabCollaboration": "Sadarbība",
   "DE.Views.Toolbar.textTabFile": "Fails",
   "DE.Views.Toolbar.textTabHome": "Sākums",

apps/documenteditor/main/locale/nl.json

@@ -69,6 +69,14 @@
   "Common.Controllers.ReviewChanges.textTabs": "Tabs wijzigen",
   "Common.Controllers.ReviewChanges.textUnderline": "Onderstrepen",
   "Common.Controllers.ReviewChanges.textWidow": "Zwevende regels voorkomen",
+  "Common.define.chartData.textArea": "Vlak",
+  "Common.define.chartData.textBar": "Staaf",
+  "Common.define.chartData.textColumn": "Kolom",
+  "Common.define.chartData.textLine": "Lijn",
+  "Common.define.chartData.textPie": "Cirkel",
+  "Common.define.chartData.textPoint": "Spreiding",
+  "Common.define.chartData.textStock": "Voorraad",
+  "Common.define.chartData.textSurface": "Oppervlak",
   "Common.UI.ComboBorderSize.txtNoBorders": "Geen randen",
   "Common.UI.ComboBorderSizeEditable.txtNoBorders": "Geen randen",
   "Common.UI.ComboDataView.emptyComboText": "Geen stijlen",
@@ -317,7 +325,7 @@
   "DE.Controllers.Main.errorAccessDeny": "U probeert een actie uit te voeren waarvoor u geen rechten hebt.<br>Neem contact op met de beheerder van de documentserver.",
   "DE.Controllers.Main.errorBadImageUrl": "URL afbeelding is onjuist",
   "DE.Controllers.Main.errorCoAuthoringDisconnect": "Verbinding met server is verbroken. Het document kan op dit moment niet worden bewerkt.",
-  "DE.Controllers.Main.errorConnectToServer": "Het document kan niet worden opgeslagen. Controleer de verbindingsinstellingen of neem contact op met de beheerder.<br>Wanneer u op de knop 'OK' klikt, wordt u gevraagd het document te downloaden.<br><br>Meer informatie over verbindingen met de documentserver is <a href=\"%1\" target=\"_blank\">hier</a> te vinden.",
+  "DE.Controllers.Main.errorConnectToServer": "Het document kan niet worden opgeslagen. Controleer de verbindingsinstellingen of neem contact op met de beheerder.<br>Wanneer u op de knop 'OK' klikt, wordt u gevraagd het document te downloaden.",
   "DE.Controllers.Main.errorDatabaseConnection": "Externe fout.<br>Fout in databaseverbinding. Neem contact op met Support als deze fout zich blijft voordoen.",
   "DE.Controllers.Main.errorDataRange": "Onjuist gegevensbereik.",
   "DE.Controllers.Main.errorDefaultMessage": "Foutcode: %1",
@@ -874,20 +882,12 @@
   "DE.Views.BookmarksDialog.textSort": "Sorteren op",
   "DE.Views.BookmarksDialog.textTitle": "Bladwijzers",
   "DE.Views.ChartSettings.textAdvanced": "Geavanceerde instellingen tonen",
-  "DE.Views.ChartSettings.textArea": "Vlak",
-  "DE.Views.ChartSettings.textBar": "Staaf",
   "DE.Views.ChartSettings.textChartType": "Grafiektype wijzigen",
-  "DE.Views.ChartSettings.textColumn": "Kolom",
   "DE.Views.ChartSettings.textEditData": "Gegevens bewerken",
   "DE.Views.ChartSettings.textHeight": "Hoogte",
-  "DE.Views.ChartSettings.textLine": "Lijn",
   "DE.Views.ChartSettings.textOriginalSize": "Standaardgrootte",
-  "DE.Views.ChartSettings.textPie": "Cirkel",
-  "DE.Views.ChartSettings.textPoint": "Spreiding",
   "DE.Views.ChartSettings.textSize": "Grootte",
-  "DE.Views.ChartSettings.textStock": "Voorraad",
   "DE.Views.ChartSettings.textStyle": "Stijl",
-  "DE.Views.ChartSettings.textSurface": "Oppervlak",
   "DE.Views.ChartSettings.textUndock": "Loskoppelen van deelvenster",
   "DE.Views.ChartSettings.textWidth": "Breedte",
   "DE.Views.ChartSettings.textWrap": "Terugloopstijl",
@@ -1845,13 +1845,9 @@
   "DE.Views.Toolbar.mniImageFromFile": "Afbeelding uit bestand",
   "DE.Views.Toolbar.mniImageFromUrl": "Afbeelding van URL",
   "DE.Views.Toolbar.strMenuNoFill": "Geen vulling",
-  "DE.Views.Toolbar.textArea": "Vlak",
   "DE.Views.Toolbar.textAutoColor": "Automatisch",
-  "DE.Views.Toolbar.textBar": "Staaf",
   "DE.Views.Toolbar.textBold": "Vet",
   "DE.Views.Toolbar.textBottom": "Onder:",
-  "DE.Views.Toolbar.textCharts": "Grafieken",
-  "DE.Views.Toolbar.textColumn": "Kolom",
   "DE.Views.Toolbar.textColumnsCustom": "Aangepaste kolommen",
   "DE.Views.Toolbar.textColumnsLeft": "Links",
   "DE.Views.Toolbar.textColumnsOne": "Eén",
@@ -1870,7 +1866,6 @@
   "DE.Views.Toolbar.textItalic": "Cursief",
   "DE.Views.Toolbar.textLandscape": "Liggend",
   "DE.Views.Toolbar.textLeft": "Links:",
-  "DE.Views.Toolbar.textLine": "Lijn",
   "DE.Views.Toolbar.textMarginsLast": "Laatste aangepaste",
   "DE.Views.Toolbar.textMarginsModerate": "Gemiddeld",
   "DE.Views.Toolbar.textMarginsNarrow": "Smal",
@@ -1883,14 +1878,11 @@
   "DE.Views.Toolbar.textOddPage": "Oneven pagina",
   "DE.Views.Toolbar.textPageMarginsCustom": "Aangepaste marges",
   "DE.Views.Toolbar.textPageSizeCustom": "Aangepast paginaformaat",
-  "DE.Views.Toolbar.textPie": "Cirkel",
   "DE.Views.Toolbar.textPlainControl": "Platte tekst inhoud beheer toevoegen",
-  "DE.Views.Toolbar.textPoint": "Spreiding",
   "DE.Views.Toolbar.textPortrait": "Staand",
   "DE.Views.Toolbar.textRemoveControl": "Inhoud beheer verwijderen",
   "DE.Views.Toolbar.textRichControl": "Uitgebreide tekst inhoud beheer toevoegen",
   "DE.Views.Toolbar.textRight": "Rechts:",
-  "DE.Views.Toolbar.textStock": "Voorraad",
   "DE.Views.Toolbar.textStrikeout": "Doorhalen",
   "DE.Views.Toolbar.textStyleMenuDelete": "Stijl verwijderen",
   "DE.Views.Toolbar.textStyleMenuDeleteAll": "Alle aangepaste stijlen verwijderen",
@@ -1900,7 +1892,6 @@
   "DE.Views.Toolbar.textStyleMenuUpdate": "Bijwerken op basis van selectie",
   "DE.Views.Toolbar.textSubscript": "Subscript",
   "DE.Views.Toolbar.textSuperscript": "Superscript",
-  "DE.Views.Toolbar.textSurface": "Oppervlak",
   "DE.Views.Toolbar.textTabCollaboration": "Samenwerking",
   "DE.Views.Toolbar.textTabFile": "Bestand",
   "DE.Views.Toolbar.textTabHome": "Home",

apps/documenteditor/main/locale/pl.json

@@ -67,6 +67,14 @@
   "Common.Controllers.ReviewChanges.textTabs": "Zmień zakładki",
   "Common.Controllers.ReviewChanges.textUnderline": "Podkreśl",
   "Common.Controllers.ReviewChanges.textWidow": "Kontrola okna",
+  "Common.define.chartData.textArea": "Obszar",
+  "Common.define.chartData.textBar": "Pasek",
+  "Common.define.chartData.textColumn": "Kolumna",
+  "Common.define.chartData.textLine": "Liniowy",
+  "Common.define.chartData.textPie": "Kołowe",
+  "Common.define.chartData.textPoint": "XY (Punktowy)",
+  "Common.define.chartData.textStock": "Zbiory",
+  "Common.define.chartData.textSurface": "Powierzchnia",
   "Common.UI.ComboBorderSize.txtNoBorders": "Bez krawędzi",
   "Common.UI.ComboBorderSizeEditable.txtNoBorders": "Bez krawędzi",
   "Common.UI.ComboDataView.emptyComboText": "Brak styli",
@@ -272,7 +280,7 @@
   "DE.Controllers.Main.errorAccessDeny": "Próbujesz wykonać działanie, na które nie masz uprawnień.<br>Proszę skontaktować się z administratorem serwera dokumentów.",
   "DE.Controllers.Main.errorBadImageUrl": "Adres URL obrazu jest błędny",
   "DE.Controllers.Main.errorCoAuthoringDisconnect": "Połączenie z serwerem zostało utracone. Nie można teraz edytować dokumentu.",
-  "DE.Controllers.Main.errorConnectToServer": "Nie można zapisać dokumentu. Sprawdź ustawienia połączenia lub skontaktuj się z administratorem.<br>Po kliknięciu przycisku \"OK\" zostanie wyświetlony monit o pobranie dokumentu.<br><br>Dowiedz się więcej o połączeniu serwera dokumentów <a href=\"%1\" target=\"_blank\">tutaj</a>",
+  "DE.Controllers.Main.errorConnectToServer": "Nie można zapisać dokumentu. Sprawdź ustawienia połączenia lub skontaktuj się z administratorem.<br>Po kliknięciu przycisku \"OK\" zostanie wyświetlony monit o pobranie dokumentu.",
   "DE.Controllers.Main.errorDatabaseConnection": "Błąd zewnętrzny.<br>Błąd połączenia z bazą danych. W przypadku wystąpienia błędu należy skontaktować się z pomocą techniczną.",
   "DE.Controllers.Main.errorDataRange": "Błędny zakres danych.",
   "DE.Controllers.Main.errorDefaultMessage": "Kod błędu: %1",
@@ -775,20 +783,12 @@
   "DE.Views.BookmarksDialog.textTitle": "Zakładki",
   "DE.Views.BookmarksDialog.txtInvalidName": "Nazwa zakładki powinna zaczynać się literą i zawierać może ona tylko litery, liczby i znaki podkreślenia ",
   "DE.Views.ChartSettings.textAdvanced": "Pokaż ustawienia zaawansowane",
-  "DE.Views.ChartSettings.textArea": "Obszar",
-  "DE.Views.ChartSettings.textBar": "Pasek",
   "DE.Views.ChartSettings.textChartType": "Zmień typ wykresu",
-  "DE.Views.ChartSettings.textColumn": "Kolumna",
   "DE.Views.ChartSettings.textEditData": "Edytuj dane",
   "DE.Views.ChartSettings.textHeight": "Wysokość",
-  "DE.Views.ChartSettings.textLine": "Liniowy",
   "DE.Views.ChartSettings.textOriginalSize": "Domyślny rozmiar",
-  "DE.Views.ChartSettings.textPie": "Kołowe",
-  "DE.Views.ChartSettings.textPoint": "XY (Punktowy)",
   "DE.Views.ChartSettings.textSize": "Rozmiar",
-  "DE.Views.ChartSettings.textStock": "Zbiory",
   "DE.Views.ChartSettings.textStyle": "Styl",
-  "DE.Views.ChartSettings.textSurface": "Powierzchnia",
   "DE.Views.ChartSettings.textUndock": "Odepnij od panelu",
   "DE.Views.ChartSettings.textWidth": "Szerokość",
   "DE.Views.ChartSettings.textWrap": "Styl zawijania",
@@ -1678,13 +1678,9 @@
   "DE.Views.Toolbar.mniImageFromFile": "Obraz z pliku",
   "DE.Views.Toolbar.mniImageFromUrl": "Obraz z URL",
   "DE.Views.Toolbar.strMenuNoFill": "Brak wypełnienia",
-  "DE.Views.Toolbar.textArea": "Obszar",
   "DE.Views.Toolbar.textAutoColor": "Automatyczny",
-  "DE.Views.Toolbar.textBar": "Pasek",
   "DE.Views.Toolbar.textBold": "Pogrubienie",
   "DE.Views.Toolbar.textBottom": "Dół:",
-  "DE.Views.Toolbar.textCharts": "Wykresy",
-  "DE.Views.Toolbar.textColumn": "Kolumna",
   "DE.Views.Toolbar.textColumnsCustom": "Niestandardowe kolumny",
   "DE.Views.Toolbar.textColumnsLeft": "Lewy",
   "DE.Views.Toolbar.textColumnsOne": "Jeden",
@@ -1704,7 +1700,6 @@
   "DE.Views.Toolbar.textItalic": "Kursywa",
   "DE.Views.Toolbar.textLandscape": "Krajobraz",
   "DE.Views.Toolbar.textLeft": "Lewo:",
-  "DE.Views.Toolbar.textLine": "Wiersz",
   "DE.Views.Toolbar.textMarginsLast": "Ostatni niestandardowy",
   "DE.Views.Toolbar.textMarginsModerate": "Umiarkowany",
   "DE.Views.Toolbar.textMarginsNarrow": "Wąski",
@@ -1718,13 +1713,10 @@
   "DE.Views.Toolbar.textOddPage": "Nieparzysta strona",
   "DE.Views.Toolbar.textPageMarginsCustom": "Niestandardowe marginesy",
   "DE.Views.Toolbar.textPageSizeCustom": "Własny rozmiar strony",
-  "DE.Views.Toolbar.textPie": "Kołowe",
-  "DE.Views.Toolbar.textPoint": "XY (Punktowy)",
   "DE.Views.Toolbar.textPortrait": "Portret",
   "DE.Views.Toolbar.textRemoveControl": "Usuń kontrolę treści",
   "DE.Views.Toolbar.textRemWatermark": "Usuń znak wodny",
   "DE.Views.Toolbar.textRight": "Prawo:",
-  "DE.Views.Toolbar.textStock": "Zbiory",
   "DE.Views.Toolbar.textStrikeout": "Skreślenie",
   "DE.Views.Toolbar.textStyleMenuDelete": "Usuń styl",
   "DE.Views.Toolbar.textStyleMenuDeleteAll": "Usuń wszystkie niestandardowe style",
@@ -1734,7 +1726,6 @@
   "DE.Views.Toolbar.textStyleMenuUpdate": "Aktualizuj z wyboru",
   "DE.Views.Toolbar.textSubscript": "Indeks",
   "DE.Views.Toolbar.textSuperscript": "Indeks górny",
-  "DE.Views.Toolbar.textSurface": "Powierzchnia",
   "DE.Views.Toolbar.textTabCollaboration": "Współpraca",
   "DE.Views.Toolbar.textTabFile": "Plik",
   "DE.Views.Toolbar.textTabHome": "Narzędzia główne",