diff --git a/apps/common/main/lib/component/Calendar.js b/apps/common/main/lib/component/Calendar.js index 0ae99149c1..51dd3315fa 100644 --- a/apps/common/main/lib/component/Calendar.js +++ b/apps/common/main/lib/component/Calendar.js @@ -44,16 +44,15 @@ define([ template : _.template([ '
', - '
', - '
', - '
', - '
', - '
', - '
', - '
', - '
', - '
', - '
', + '
', + '
', + '
', + '
', + '
', + '
', + '
', + '
', + '
', '
' ].join('')), @@ -179,6 +178,7 @@ define([ year = _.isNumber(year) ? year : (me.currentDate ? me.currentDate.getFullYear() : new Date().getFullYear()); me._state = 2; + me.$el.removeClass('view-days view-months').addClass('view-years'); var firstYear = year, lastYear = year; @@ -248,6 +248,7 @@ define([ me._state = 1; me.currentDate = curDate; + me.$el.removeClass('view-years view-days').addClass('view-months'); // Number of year me.topTitle = _.template([ @@ -329,6 +330,7 @@ define([ curYear = curDate.getFullYear(); me.currentDate = curDate; + me.$el.removeClass('view-years view-months').addClass('view-days'); // Name month me.topTitle = _.template([ diff --git a/apps/common/main/lib/component/ComboBoxFonts.js b/apps/common/main/lib/component/ComboBoxFonts.js index 2f47283a65..87f2b272b1 100644 --- a/apps/common/main/lib/component/ComboBoxFonts.js +++ b/apps/common/main/lib/component/ComboBoxFonts.js @@ -356,19 +356,20 @@ define([ var me = this; var name = (_.isFunction(font.get_Name) ? font.get_Name() : font.asc_getFontName()); if (this.__name !== name) { + this.__name = name; if (!this.__nameId) { this.__nameId = setTimeout(function () { - me.onApiChangeFontInternal(name); + me.onApiChangeFontInternal(me.__name); me.__nameId = null; }, 100); } + } }, onApiChangeFontInternal: function(name) { if (this.inFormControl) return; - this.__name = name; if (this.getRawValue() !== name) { var record = this.store.findWhere({ name: name diff --git a/apps/common/main/lib/component/MultiSliderGradient.js b/apps/common/main/lib/component/MultiSliderGradient.js index d4bf91a629..28c2daf093 100644 --- a/apps/common/main/lib/component/MultiSliderGradient.js +++ b/apps/common/main/lib/component/MultiSliderGradient.js @@ -55,7 +55,7 @@ define([ values: [0, 100], colorValues: ['#000000', '#ffffff'], currentThumb: 0, - thumbTemplate: '
' + + thumbTemplate: '
' + '
' + '
' + '
' diff --git a/apps/common/main/lib/component/TableStyler.js b/apps/common/main/lib/component/TableStyler.js index eb1108827e..68e5fb58a6 100644 --- a/apps/common/main/lib/component/TableStyler.js +++ b/apps/common/main/lib/component/TableStyler.js @@ -417,7 +417,7 @@ define([ '
', '', - '
', + '
', '
', '
', '', @@ -430,7 +430,7 @@ define([ '
', '
', '
', - '
', + '
', '' ].join('')), diff --git a/apps/common/main/lib/component/TreeView.js b/apps/common/main/lib/component/TreeView.js index b8016b4317..84c3fe8609 100644 --- a/apps/common/main/lib/component/TreeView.js +++ b/apps/common/main/lib/component/TreeView.js @@ -176,11 +176,11 @@ define([ '
', '<% } %>', '<% if (isNotHeader) { %>', - '
<%= name %>
', + '
<%= Common.Utils.String.htmlEncode(name) %>
', '<% } else if (isEmptyItem) { %>', '
' + options.emptyItemText + '
', '<% } else { %>', - '
<%= name %>
', + '
<%= Common.Utils.String.htmlEncode(name) %>
', '<% } %>', '' ].join('')); diff --git a/apps/common/main/lib/component/Window.js b/apps/common/main/lib/component/Window.js index d910e8497a..3b8aa6c14e 100644 --- a/apps/common/main/lib/component/Window.js +++ b/apps/common/main/lib/component/Window.js @@ -769,6 +769,9 @@ define([ '-o-transform': 'scale(1)', 'opacity': '1' }); + setTimeout(function () { + me.fireEvent('animate:after', me); + }, 210); }, 1); setTimeout(function () { @@ -779,6 +782,9 @@ define([ this.$window.css({opacity: 1}); this.$window.addClass('notransform'); this.fireEvent('show', this); + setTimeout(function () { + me.fireEvent('animate:after', me); + }, 10); } Common.NotificationCenter.trigger('window:show', this); diff --git a/apps/common/main/lib/controller/Plugins.js b/apps/common/main/lib/controller/Plugins.js index bc439ffc2c..5b63032bd0 100644 --- a/apps/common/main/lib/controller/Plugins.js +++ b/apps/common/main/lib/controller/Plugins.js @@ -167,8 +167,9 @@ define([ return this; }, - setMode: function(mode) { + setMode: function(mode, api) { this.appOptions = mode; + this.api = api; this.customPluginsComplete = !this.appOptions.canBrandingExt; if (this.appOptions.canBrandingExt) this.getAppCustomPlugins(this.configPlugins); @@ -383,7 +384,8 @@ define([ isCustomWindow = variation.get_CustomWindow(), arrBtns = variation.get_Buttons(), newBtns = [], - size = variation.get_Size(); + size = variation.get_Size(), + isModal = variation.get_Modal(); if (!size || size.length<2) size = [800, 600]; if (_.isArray(arrBtns)) { @@ -404,7 +406,8 @@ define([ frameId : frameId, buttons: isCustomWindow ? undefined : newBtns, toolcallback: _.bind(this.onToolClose, this), - help: !!help + help: !!help, + modal: isModal!==undefined ? isModal : true }); me.pluginDlg.on({ 'render:after': function(obj){ @@ -513,7 +516,7 @@ define([ var pluginStore = this.getApplication().getCollection('Common.Collections.Plugins'), isEdit = me.appOptions.isEdit, editor = me.editor, - apiVersion = me.api.GetVersion ? me.api.GetVersion() : null; + apiVersion = me.api ? me.api.GetVersion() : undefined; if ( pluginsdata instanceof Array ) { var arr = [], arrUI = [], lang = me.appOptions.lang.split(/[\-_]/)[0]; diff --git a/apps/common/main/lib/controller/ReviewChanges.js b/apps/common/main/lib/controller/ReviewChanges.js index a52e1451bf..28b169af61 100644 --- a/apps/common/main/lib/controller/ReviewChanges.js +++ b/apps/common/main/lib/controller/ReviewChanges.js @@ -132,7 +132,7 @@ define([ this.api.asc_registerCallback('asc_onAuthParticipantsChanged', _.bind(this.onAuthParticipantsChanged, this)); this.api.asc_registerCallback('asc_onParticipantsChanged', _.bind(this.onAuthParticipantsChanged, this)); } - if (this.appConfig.canReview && !this.appConfig.isReviewOnly) + if (this.appConfig.canReview) this.api.asc_registerCallback('asc_onOnTrackRevisionsChange', _.bind(this.onApiTrackRevisionsChange, this)); this.api.asc_registerCallback('asc_onAcceptChangesBeforeCompare',_.bind(this.onAcceptChangesBeforeCompare, this)); this.api.asc_registerCallback('asc_onCoAuthoringDisconnect',_.bind(this.onCoAuthoringDisconnect, this)); @@ -557,6 +557,7 @@ define([ this.view.turnChanges(true); } else if ( this.appConfig.canReview ) { + state = (state=='off') ? false : state; // support of prev. version (on/off) if (!!global) { this.api.asc_SetLocalTrackRevisions(null); this.api.asc_SetGlobalTrackRevisions(!!state); diff --git a/apps/common/main/lib/controller/Themes.js b/apps/common/main/lib/controller/Themes.js index c8c2e24273..0e952e05d3 100644 --- a/apps/common/main/lib/controller/Themes.js +++ b/apps/common/main/lib/controller/Themes.js @@ -7,24 +7,24 @@ define([ ], function () { 'use strict'; - Common.UI.Themes = new (function() { - var sdk_themes_alias = { - 'theme-light': 'flat', - 'theme-dark': 'flatDark' - }; - + Common.UI.Themes = new (function(locale) { + !locale && (locale = {}); var themes_map = { - 'theme-light': 'light', - 'theme-dark': 'dark' - } - - sdk_themes_alias.contains = function (name) { - return !!this[name]; - } - - themes_map.contains = function (name) { - return !!this[name]; + 'theme-light': { + text: locale.txtThemeLight || 'Light', + type: 'light' + }, + 'theme-classic-light': { + text: locale.txtThemeClassicLight || 'Classic Light', + type: 'light' + }, + 'theme-dark': { + text: locale.txtThemeDark || 'Dark', + type: 'dark' + }, } + var id_default_light_theme = 'theme-classic-light', + id_default_dark_theme = 'theme-dark'; var name_colors = [ "background-normal", @@ -61,6 +61,9 @@ define([ "text-secondary", "text-tertiary", "text-link", + "text-link-hover", + "text-link-active", + "text-link-visited", "text-inverse", "text-toolbar-header", "text-contrast-background", @@ -126,34 +129,78 @@ define([ return out_object; } - var refresh_sdk_colors = function () { - if ( !(Common.Utils.isIE10 || Common.Utils.isIE11) ) { - var style = getComputedStyle(document.body); - if ( !!window.DE ) { - var color_background_normal = style.getPropertyValue('--background-normal'); - this.api.asc_setSkin({ - "RulerOutline": style.getPropertyValue('--border-toolbar'), - "RulerMarkersFillColor": color_background_normal, - "RulerMarkersFillColorOld": color_background_normal, - "RulerTableColor1": color_background_normal, - "RulerLight": style.getPropertyValue("--canvas-ruler-background"), - "RulerDark": style.getPropertyValue("--canvas-ruler-margins-background"), - "RulerTextColor": style.getPropertyValue("--canvas-ruler-mark"), - "RulerTableColor2": style.getPropertyValue("--canvas-ruler-handle-border"), - "RulerTableColor2Old": style.getPropertyValue("--canvas-ruler-handle-border-disabled"), - "RulerTabsColor": style.getPropertyValue("--canvas-high-contrast"), - "RulerTabsColorOld": style.getPropertyValue("--canvas-high-contrast-disabled"), - }); + var create_colors_css = function (id, colors) { + if ( !!colors && !!id ) { + var _css_array = [':root .', id, '{']; + for (var c in colors) { + _css_array.push('--', c, ':', colors[c], ';'); } + + _css_array.push('}'); + return _css_array.join(''); } } - return { - THEME_LIGHT_ID: 'theme-light', - THEME_DARK_ID: 'theme-dark', + var write_theme_css = function (css) { + if ( !!css ) { + var style = document.createElement('style'); + style.type = 'text/css'; + style.innerHTML = css; + document.getElementsByTagName('head')[0].appendChild(style); + } + } + + var parse_themes_object = function (obj) { + if ( !!obj.themes && obj.themes instanceof Array ) { + obj.themes.forEach(function (item) { + if ( !!item.id ) { + themes_map[item.id] = {text: item.name, type: item.type}; + write_theme_css(create_colors_css(item.id, item.colors)); + } else + if ( typeof item == 'string' ) { + get_themes_config(item) + } + }); + } else + if ( obj.id ) { + themes_map[obj.id] = {text: obj.name, type: obj.type}; + write_theme_css( create_colors_css(obj.id, obj.colors) ); + } + } + + var get_themes_config = function (url) { + fetch(url, { + method: 'get', + headers: { + 'Accept': 'application/json', + }, + }).then(function(response) { + if (!response.ok) { + throw new Error('server error'); + } + return response.json(); + }).then(function(response) { + if ( response.then ) { + // return response.json(); + } else { + parse_themes_object(response); + + /* to break promises chain */ + throw new Error('loaded'); + } + }).catch(function(e) { + if ( e.message == 'loaded' ) { + } else console.log('fetch error: ' + e); + }); + } + + var on_document_ready = function (el) { + // get_themes_config('../../common/main/resources/themes/themes.json') + } + + return { init: function (api) { var me = this; - refresh_sdk_colors = refresh_sdk_colors.bind(this); $(window).on('storage', function (e) { if ( e.key == 'ui-theme' ) { @@ -162,60 +209,71 @@ define([ }) this.api = api; - var theme_name = Common.localStorage.getItem('ui-theme', 'theme-light'); + var theme_name = Common.localStorage.getItem('ui-theme'); + if ( !themes_map[theme_name] ) + theme_name = id_default_light_theme; if ( !$('body').hasClass(theme_name) ) { $('body').addClass(theme_name); } var obj = get_current_theme_colors(name_colors); - obj.type = themes_map[theme_name]; + obj.type = themes_map[theme_name].type; obj.name = theme_name; api.asc_setSkin(obj); - // app.eventbus.addListeners({ - // 'FileMenu': { - // 'settings:apply': function (menu) { - // } - // } - // }, {id: 'Themes'}); - - // getComputedStyle(document.documentElement).getPropertyValue('--background-normal'); + Common.NotificationCenter.on('document:ready', on_document_ready.bind(this)); }, available: function () { return !Common.Utils.isIE; }, - current: function () { - return Common.localStorage.getItem('ui-theme') || 'theme-light'; + map: function () { + return themes_map + }, + + get: function (id) { + return themes_map[id] + }, + + currentThemeId: function () { + return Common.localStorage.getItem('ui-theme') || id_default_light_theme; + }, + + defaultThemeId: function (type) { + return type == 'dark' ? id_default_dark_theme : id_default_light_theme; + }, + + defaultTheme: function (type) { + return themes_map[this.defaultThemeId(type)] }, isDarkTheme: function () { - return themes_map[this.current()] == 'dark'; + return themes_map[this.currentThemeId()].type == 'dark'; }, - setTheme: function (name) { - if ( themes_map.contains(name) ) { - var classname = document.documentElement.className.replace(/theme-\w+\s?/, ''); + setTheme: function (id) { + if ( !!themes_map[id] ) { + var classname = document.body.className.replace(/theme-\w+\s?/, ''); document.body.className = classname; - $('body').addClass(name); + $('body').addClass(id); var obj = get_current_theme_colors(name_colors); - obj.type = themes_map[name]; - obj.name = name; + obj.type = themes_map[id].type; + obj.name = id; this.api.asc_setSkin(obj); - Common.localStorage.setItem('ui-theme', name); - Common.NotificationCenter.trigger('uitheme:changed', name); + Common.localStorage.setItem('ui-theme', id); + Common.NotificationCenter.trigger('uitheme:changed', id); } }, toggleTheme: function () { - this.setTheme(this.current() == 'theme-dark' ? 'theme-light' : 'theme-dark'); + this.setTheme( this.isDarkTheme() ? id_default_light_theme : id_default_dark_theme ); } } - })(); + })(Common.UI.Themes); }); diff --git a/apps/common/main/lib/model/Plugin.js b/apps/common/main/lib/model/Plugin.js index 9de8d7ea8f..3361e19c23 100644 --- a/apps/common/main/lib/model/Plugin.js +++ b/apps/common/main/lib/model/Plugin.js @@ -61,7 +61,7 @@ define([ EditorsSupport: ["word", "cell", "slide"], isVisual: false, isCustomWindow: false, - isModal: false, + isModal: true, isInsideMode: false, initDataType: 0, initData: "", diff --git a/apps/common/main/lib/view/AdvancedSettingsWindow.js b/apps/common/main/lib/view/AdvancedSettingsWindow.js index 108adb385c..25221ec4d1 100644 --- a/apps/common/main/lib/view/AdvancedSettingsWindow.js +++ b/apps/common/main/lib/view/AdvancedSettingsWindow.js @@ -86,6 +86,8 @@ define([ var $window = this.getChild(); $window.find('.dlg-btn').on('click', _.bind(this.onDlgBtnClick, this)); + this.on('animate:after', _.bind(this.onAnimateAfter, this)); + this.btnsCategory = []; _.each($window.find('.btn-category'), function(item, index) { var btnEl = $(item); @@ -173,6 +175,10 @@ define([ if (this.storageName) Common.localStorage.setItem(this.storageName, this.getActiveCategory()); Common.UI.Window.prototype.close.call(this, suppressevent); + }, + + onAnimateAfter: function() { + } }, Common.Views.AdvancedSettingsWindow || {})); }); \ No newline at end of file diff --git a/apps/common/main/lib/view/Comments.js b/apps/common/main/lib/view/Comments.js index 08ae2ba903..b1e9090ea7 100644 --- a/apps/common/main/lib/view/Comments.js +++ b/apps/common/main/lib/view/Comments.js @@ -272,16 +272,8 @@ define([ me.fireEvent('comment:resolve', [commentId]); - readdresolves(); - } else if (btn.hasClass('btn-resolve-check', false)) { - var tip = btn.data('bs.tooltip'); - if (tip) tip.dontShow = true; - - me.fireEvent('comment:resolve', [commentId]); - readdresolves(); } else if (!btn.hasClass('msg-reply') && - !btn.hasClass('btn-resolve-check') && !btn.hasClass('btn-resolve')) { var isTextSelected = false; if (btn.hasClass('user-message')) { @@ -377,12 +369,12 @@ define([ } var arr = [], - btns = $(view.el).find('.btn-resolve'); + btns = $(view.el).find('.btn-resolve:not(.comment-resolved)'); btns.tooltip({title: me.textResolve, placement: 'cursor'}); btns.each(function(idx, item){ arr.push($(item).data('bs.tooltip').tip()); }); - btns = $(view.el).find('.btn-resolve-check'); + btns = $(view.el).find('.comment-resolved'); btns.tooltip({title: me.textOpenAgain, placement: 'cursor'}); btns.each(function(idx, item){ arr.push($(item).data('bs.tooltip').tip()); diff --git a/apps/common/main/lib/view/Header.js b/apps/common/main/lib/view/Header.js index fc4bba1a6d..1e193310e6 100644 --- a/apps/common/main/lib/view/Header.js +++ b/apps/common/main/lib/view/Header.js @@ -782,7 +782,6 @@ define([ textAdvSettings: 'Advanced Settings', tipViewSettings: 'View Settings', textRemoveFavorite: 'Remove from Favorites', - textDarkTheme: 'Dark theme', textAddFavorite: 'Mark as favorite', textHideNotes: 'Hide Notes' } diff --git a/apps/common/main/lib/view/ListSettingsDialog.js b/apps/common/main/lib/view/ListSettingsDialog.js index 7ba0754a43..54a13d0b23 100644 --- a/apps/common/main/lib/view/ListSettingsDialog.js +++ b/apps/common/main/lib/view/ListSettingsDialog.js @@ -187,7 +187,7 @@ define([ '
', '
', '
', - '', + '', '', '
' diff --git a/apps/common/main/lib/view/PasswordDialog.js b/apps/common/main/lib/view/PasswordDialog.js index 2989815242..05545ad1bc 100644 --- a/apps/common/main/lib/view/PasswordDialog.js +++ b/apps/common/main/lib/view/PasswordDialog.js @@ -99,6 +99,7 @@ define([ type: 'password', allowBlank : false, style : 'width: 100%;', + maxLength: 255, validateOnBlur: false }); this.repeatPwd = new Common.UI.InputField({ @@ -106,6 +107,7 @@ define([ type: 'password', allowBlank : false, style : 'width: 100%;', + maxLength: 255, validateOnBlur: false, validation : function(value) { return me.txtIncorrectPwd; diff --git a/apps/common/main/lib/view/Plugins.js b/apps/common/main/lib/view/Plugins.js index d607a1fdf9..509ba3819d 100644 --- a/apps/common/main/lib/view/Plugins.js +++ b/apps/common/main/lib/view/Plugins.js @@ -284,7 +284,7 @@ define([ parseIcons: function(icons) { if (icons.length && typeof icons[0] !== 'string') { - var theme = Common.UI.Themes.current().toLowerCase(), + var theme = Common.UI.Themes.currentThemeId().toLowerCase(), style = Common.UI.Themes.isDarkTheme() ? 'dark' : 'light', idx = -1; for (var i=0; i div { background-repeat: no-repeat; diff --git a/apps/common/main/resources/less/combobox.less b/apps/common/main/resources/less/combobox.less index c2a7c5a8ac..1664491390 100644 --- a/apps/common/main/resources/less/combobox.less +++ b/apps/common/main/resources/less/combobox.less @@ -1,5 +1,3 @@ -@img-borders-filter: var(--image-border-types-filter); -@img-borders-filter-selected: var(--image-border-types-filter-selected); .combobox { display: block; @@ -33,8 +31,8 @@ float: none; .image { - -webkit-filter: @img-borders-filter; - filter: @img-borders-filter; + -webkit-filter: @img-border-type-filter; + filter: @img-border-type-filter; } } @@ -68,16 +66,19 @@ } } - &.input-group-nr.open:not(.no-highlighted) { + &.input-group-nr.open { & > .form-control, & > .btn { - border-color: @border-control-focus-ie; - border-color: @border-control-focus; - .caret { transform: rotate(45deg); } } + + &:not(.no-highlighted) > .form-control, + &:not(.no-highlighted) > .btn { + border-color: @border-control-focus-ie; + border-color: @border-control-focus; + } } &.input-group-nr:not(.no-highlighted) > .form-control { @@ -87,6 +88,23 @@ border-color: @border-control-focus; } } + &.input-group-nr.no-highlighted > .form-control { + &:focus, + &:focus ~ button.dropdown-toggle { + border-color: @border-regular-control-ie; + border-color: @border-regular-control; + } + } + + &.input-group-nr { + .btn { + &:active { + .caret { + border-color: @icon-normal; + } + } + } + } li { a { @@ -116,22 +134,22 @@ // ------------------------ li { img { - -webkit-filter: @img-borders-filter; - filter: @img-borders-filter; + -webkit-filter: @img-border-type-filter; + filter: @img-border-type-filter; } canvas { - -webkit-filter: @img-borders-filter; - filter: @img-borders-filter; + -webkit-filter: @img-border-type-filter; + filter: @img-border-type-filter; } &.selected { img { - -webkit-filter: @img-borders-filter-selected; - filter: @img-borders-filter-selected; + -webkit-filter: @img-border-type-filter-selected; + filter: @img-border-type-filter-selected; } canvas { - -webkit-filter: @img-borders-filter-selected; - filter: @img-borders-filter-selected; + -webkit-filter: @img-border-type-filter-selected; + filter: @img-border-type-filter-selected; } } @@ -173,4 +191,13 @@ border-color: @border-control-focus; } } + + &.input-group-nr { + & > .form-control, + & > .btn { + .caret { + transform: rotate(45deg); + } + } + } } diff --git a/apps/common/main/resources/less/dropdown-menu.less b/apps/common/main/resources/less/dropdown-menu.less index 7a1b1e15a0..f0faa74bf3 100644 --- a/apps/common/main/resources/less/dropdown-menu.less +++ b/apps/common/main/resources/less/dropdown-menu.less @@ -39,15 +39,15 @@ &:focus, &.focus { outline: 0; - color: @text-normal-pressed-ie; - color: @text-normal-pressed; + color: @text-normal-ie; + color: @text-normal; background-color: @highlight-button-hover-ie; background-color: @highlight-button-hover; } &:hover { - color: @text-normal-pressed-ie; - color: @text-normal-pressed; + color: @text-normal-ie; + color: @text-normal; background-color: @highlight-button-hover-ie; background-color: @highlight-button-hover; } @@ -55,14 +55,14 @@ &.over > a { text-decoration: none; - color: @text-normal-pressed-ie; - color: @text-normal-pressed; + //color: @text-normal-pressed-ie; + //color: @text-normal-pressed; background-color: @highlight-button-hover-ie; background-color: @highlight-button-hover; &:after { - border-left-color: @icon-normal-pressed-ie; - border-left-color: @icon-normal-pressed; + border-left-color: @icon-normal-ie; + border-left-color: @icon-normal; } } @@ -153,4 +153,16 @@ background-color: @border-divider-ie; background-color: @border-divider; } + + .dataview { + .item { + .options__icon { + opacity: @component-normal-icon-opacity; + } + + .options__icon-huge { + background-position-x: var(--button-huge-normal-icon-offset-x, 0); + } + } + } } \ No newline at end of file diff --git a/apps/common/main/resources/less/header.less b/apps/common/main/resources/less/header.less index 82a03b18e7..9bed1c0f78 100644 --- a/apps/common/main/resources/less/header.less +++ b/apps/common/main/resources/less/header.less @@ -327,13 +327,24 @@ } .btn& { + &:not(:disabled) .icon { + opacity: @header-component-normal-icon-opacity; + } + &:active, &.active { .icon.toolbar__icon { &.icon--inverse { background-position-x: @button-header-active-icon-offset-x-ie; + opacity: @header-component-active-icon-opacity; } } } + + &:hover:not(:disabled) { + .icon { + opacity: @header-component-hover-icon-opacity; + } + } } svg.icon { diff --git a/apps/common/main/resources/less/multislider-gradient.less b/apps/common/main/resources/less/multislider-gradient.less index c6c7fabf72..ec8b0d2ac1 100644 --- a/apps/common/main/resources/less/multislider-gradient.less +++ b/apps/common/main/resources/less/multislider-gradient.less @@ -3,6 +3,8 @@ background-color: transparent; .thumb { + width: 13px; + height: 15px; top: 18px; background: none; diff --git a/apps/common/main/resources/less/scroller.less b/apps/common/main/resources/less/scroller.less index 0929d2cf55..6d94e4a7fb 100644 --- a/apps/common/main/resources/less/scroller.less +++ b/apps/common/main/resources/less/scroller.less @@ -90,6 +90,12 @@ .background-ximage('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA4AAAANCAQAAAAz1Zf0AAAAIUlEQVR42mNgAILz/0GQAQo+/gdBBqLAqE5ydH5k+sgEANHgUH2JtDRHAAAAAElFTkSuQmCC', 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABwAAAAaAgMAAADZOtQaAAAACVBMVEUAAADPz8/x8fFVrc9qAAAAAXRSTlMAQObYZgAAABZJREFUeNpjYAgNYOBaxcDEgAsMLXkA/sUJfm1m4l8AAAAASUVORK5CYII=', 14px); + .pixel-ratio__1_5 & { + //background-image: ~"url(@{common-image-const-path}/controls/Scroll_center@1.5x.png)"; + background-image: data-uri('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABUAAAATAgMAAAACIK4YAAAACVBMVEUAAADPz8/x8fFVrc9qAAAAAXRSTlMAQObYZgAAABRJREFUeNpjYAxl4FrBwYAK6CwIAOsnB3Hkb0WyAAAAAElFTkSuQmCC'); + background-size: 14px auto; + } + background-repeat: no-repeat; background-position: 0 center; .border-radius(2px); diff --git a/apps/common/main/resources/less/synchronize-tip.less b/apps/common/main/resources/less/synchronize-tip.less index 64ebe4bc6b..63cad18315 100644 --- a/apps/common/main/resources/less/synchronize-tip.less +++ b/apps/common/main/resources/less/synchronize-tip.less @@ -360,6 +360,16 @@ color: @text-link-ie; color: @text-link; cursor: pointer; + + &:hover:not(:disabled) { + color: @text-link-hover; + border-bottom-color: dotted @text-link-hover; + } + + &:active { + color: @text-link-active; + border-bottom-color: dotted @text-link-hover; + } } .asc-synchronizetip .close { diff --git a/apps/common/main/resources/less/table-styler.less b/apps/common/main/resources/less/table-styler.less index 3399084bb5..ad979147e8 100644 --- a/apps/common/main/resources/less/table-styler.less +++ b/apps/common/main/resources/less/table-styler.less @@ -1,4 +1,6 @@ .table-styler { + background-color: @canvas-content-background; + table { &.transparent { background-color: @canvas-content-background !important; diff --git a/apps/common/main/resources/less/toolbar.less b/apps/common/main/resources/less/toolbar.less index 89479f7493..1efe127593 100644 --- a/apps/common/main/resources/less/toolbar.less +++ b/apps/common/main/resources/less/toolbar.less @@ -216,6 +216,14 @@ &:last-child { padding-right: 6px; } + + &.small { + padding-left: 10px; + + + .separator { + margin-left: 10px; + } + } } .elset { @@ -523,10 +531,15 @@ box-shadow: inset 0 0 0 @scaled-one-px-value @border-regular-control; } - &, .icon { + & { width: 21px; height: 21px; } + + .icon { + width: 22px; + height: 22px; + } } } @@ -560,6 +573,7 @@ .equation-icon { .background-ximage-v2('toolbar/math.png', 1500px, @commonimage: true); + opacity: @component-normal-icon-opacity; .theme-dark & { -webkit-filter: @img-equition-filter; diff --git a/apps/common/main/resources/less/treeview.less b/apps/common/main/resources/less/treeview.less index cd7e0e002d..6a14d2827f 100644 --- a/apps/common/main/resources/less/treeview.less +++ b/apps/common/main/resources/less/treeview.less @@ -40,6 +40,8 @@ &.selected { background-color: @highlight-button-pressed-ie; background-color: @highlight-button-pressed; + color: @text-normal-pressed-ie; + color: @text-normal-pressed; } &.selected .empty { diff --git a/apps/documenteditor/embed/js/ApplicationController.js b/apps/documenteditor/embed/js/ApplicationController.js index 7993129601..ccef76d46c 100644 --- a/apps/documenteditor/embed/js/ApplicationController.js +++ b/apps/documenteditor/embed/js/ApplicationController.js @@ -213,7 +213,7 @@ DE.ApplicationController = new(function(){ function onPrint() { if ( permissions.print!==false ) - api.asc_Print(new Asc.asc_CDownloadOptions(null, $.browser.chrome || $.browser.safari || $.browser.opera)); + api.asc_Print(new Asc.asc_CDownloadOptions(null, $.browser.chrome || $.browser.safari || $.browser.opera || $.browser.mozilla && $.browser.versionNumber>86)); } function onPrintUrl(url) { @@ -278,7 +278,7 @@ DE.ApplicationController = new(function(){ common.utils.openLink(embedConfig.saveUrl); } else if (api && permissions.print!==false){ - api.asc_Print(new Asc.asc_CDownloadOptions(null, $.browser.chrome || $.browser.safari || $.browser.opera)); + api.asc_Print(new Asc.asc_CDownloadOptions(null, $.browser.chrome || $.browser.safari || $.browser.opera || $.browser.mozilla && $.browser.versionNumber>86)); } Common.Analytics.trackEvent('Save'); @@ -286,7 +286,7 @@ DE.ApplicationController = new(function(){ DE.ApplicationView.tools.get('#idt-print') .on('click', function(){ - api.asc_Print(new Asc.asc_CDownloadOptions(null, $.browser.chrome || $.browser.safari || $.browser.opera)); + api.asc_Print(new Asc.asc_CDownloadOptions(null, $.browser.chrome || $.browser.safari || $.browser.opera || $.browser.mozilla && $.browser.versionNumber>86)); Common.Analytics.trackEvent('Print'); }); diff --git a/apps/documenteditor/main/app/controller/FormsTab.js b/apps/documenteditor/main/app/controller/FormsTab.js index 41bd29531a..dddf680f1d 100644 --- a/apps/documenteditor/main/app/controller/FormsTab.js +++ b/apps/documenteditor/main/app/controller/FormsTab.js @@ -212,7 +212,7 @@ define([ onNoControlsColor: function(item) { if (!item.isChecked()) - this.api.asc_SetSpecialFormsHighlightColor(255, 192, 0); + this.api.asc_SetSpecialFormsHighlightColor(201, 200, 255); else this.api.asc_SetSpecialFormsHighlightColor(); Common.NotificationCenter.trigger('edit:complete', this.toolbar); diff --git a/apps/documenteditor/main/app/controller/LeftMenu.js b/apps/documenteditor/main/app/controller/LeftMenu.js index 9dbcb6a487..462d33f26c 100644 --- a/apps/documenteditor/main/app/controller/LeftMenu.js +++ b/apps/documenteditor/main/app/controller/LeftMenu.js @@ -236,7 +236,7 @@ define([ if ( isopts ) close_menu = false; else this.clickSaveCopyAsFormat(undefined); break; - case 'print': this.api.asc_Print(new Asc.asc_CDownloadOptions(null, Common.Utils.isChrome || Common.Utils.isSafari || Common.Utils.isOpera)); break; + case 'print': this.api.asc_Print(new Asc.asc_CDownloadOptions(null, Common.Utils.isChrome || Common.Utils.isSafari || Common.Utils.isOpera || Common.Utils.isGecko && Common.Utils.firefoxVersion>86)); break; case 'exit': Common.NotificationCenter.trigger('goback'); break; case 'edit': this.getApplication().getController('Statusbar').setStatusCaption(this.requestEditRightsText); diff --git a/apps/documenteditor/main/app/controller/Main.js b/apps/documenteditor/main/app/controller/Main.js index d83c38d901..4267414d6b 100644 --- a/apps/documenteditor/main/app/controller/Main.js +++ b/apps/documenteditor/main/app/controller/Main.js @@ -102,7 +102,7 @@ define([ var me = this, styleNames = ['Normal', 'No Spacing', 'Heading 1', 'Heading 2', 'Heading 3', 'Heading 4', 'Heading 5', 'Heading 6', 'Heading 7', 'Heading 8', 'Heading 9', 'Title', 'Subtitle', 'Quote', 'Intense Quote', 'List Paragraph', 'footnote text', - 'Caption'], + 'Caption', 'endnote text'], translate = { 'Series': this.txtSeries, 'Diagram Title': this.txtDiagramTitle, @@ -143,6 +143,9 @@ define([ "Type equation here": this.txtTypeEquation, "Click to load image": this.txtClickToLoad, "None": this.txtNone + "No table of figures entries found.": this.txtNoTableOfFigures, + "table of figures": this.txtTableOfFigures, + "TOC Heading": this.txtTOCHeading }; styleNames.forEach(function(item){ translate[item] = me['txtStyle_' + item.replace(/ /g, '_')] || item; @@ -1346,7 +1349,7 @@ define([ this.appOptions.canRename && appHeader.setCanRename(true); this.appOptions.canBrandingExt = params.asc_getCanBranding() && (typeof this.editorConfig.customization == 'object' || this.editorConfig.plugins); - this.getApplication().getController('Common.Controllers.Plugins').setMode(this.appOptions); + this.getApplication().getController('Common.Controllers.Plugins').setMode(this.appOptions, this.api); if (this.appOptions.canComments) Common.NotificationCenter.on('comments:cleardummy', _.bind(this.onClearDummyComment, this)); @@ -2330,7 +2333,7 @@ define([ if (!this.appOptions.canPrint || Common.Utils.ModalWindow.isVisible()) return; if (this.api) - this.api.asc_Print(new Asc.asc_CDownloadOptions(null, Common.Utils.isChrome || Common.Utils.isSafari || Common.Utils.isOpera)); // if isChrome or isSafari or isOpera == true use asc_onPrintUrl event + this.api.asc_Print(new Asc.asc_CDownloadOptions(null, Common.Utils.isChrome || Common.Utils.isSafari || Common.Utils.isOpera || Common.Utils.isGecko && Common.Utils.firefoxVersion>86)); // if isChrome or isSafari or isOpera == true use asc_onPrintUrl event Common.component.Analytics.trackEvent('Print'); }, @@ -2895,6 +2898,10 @@ define([ leavePageTextOnClose: 'All unsaved changes in this document will be lost.
Click \'Cancel\' then \'Save\' to save them. Click \'OK\' to discard all the unsaved changes.', textTryUndoRedoWarn: 'The Undo/Redo functions are disabled for the Fast co-editing mode.', txtNone: 'None' + txtNoTableOfFigures: "No table of figures entries found.", + txtTableOfFigures: 'Table of figures', + txtStyle_endnote_text: 'Endnote Text', + txtTOCHeading: 'TOC Heading' } })(), DE.Controllers.Main || {})) }); \ No newline at end of file diff --git a/apps/documenteditor/main/app/controller/Toolbar.js b/apps/documenteditor/main/app/controller/Toolbar.js index f55c19cdd2..58dcd0367a 100644 --- a/apps/documenteditor/main/app/controller/Toolbar.js +++ b/apps/documenteditor/main/app/controller/Toolbar.js @@ -305,6 +305,9 @@ define([ toolbar.mnuNumberChangeLevel && toolbar.mnuNumberChangeLevel.menu && toolbar.mnuNumberChangeLevel.menu.on('show:after', _.bind(this.onChangeLevelShowAfter, this, 1)); toolbar.mnuNumberChangeLevel.menu.on('item:click', _.bind(this.onChangeLevelClick, this, 1)); + toolbar.mnuMultiChangeLevel && toolbar.mnuMultiChangeLevel.menu && + toolbar.mnuMultiChangeLevel.menu.on('show:after', _.bind(this.onChangeLevelShowAfter, this, 2)); + toolbar.mnuMultiChangeLevel.menu.on('item:click', _.bind(this.onChangeLevelClick, this, 2)); toolbar.btnHighlightColor.on('click', _.bind(this.onBtnHighlightColor, this)); toolbar.btnFontColor.on('click', _.bind(this.onBtnFontColor, this)); toolbar.btnParagraphColor.on('click', _.bind(this.onBtnParagraphColor, this)); @@ -530,6 +533,7 @@ define([ this.toolbar.mnuMarkerSettings && this.toolbar.mnuMarkerSettings.setDisabled(this._state.bullets.subtype<0); this.toolbar.mnuMarkerChangeLevel && this.toolbar.mnuMarkerChangeLevel.setDisabled(this._state.bullets.subtype<0); this.toolbar.mnuMultilevelSettings && this.toolbar.mnuMultilevelSettings.setDisabled(this._state.bullets.subtype<0); + this.toolbar.mnuMultiChangeLevel && this.toolbar.mnuMultiChangeLevel.setDisabled(this._state.bullets.subtype<0); break; case 1: var idx; @@ -565,6 +569,7 @@ define([ this.toolbar.mnuNumberSettings && this.toolbar.mnuNumberSettings.setDisabled(idx==0); this.toolbar.mnuNumberChangeLevel && this.toolbar.mnuNumberChangeLevel.setDisabled(idx==0); this.toolbar.mnuMultilevelSettings && this.toolbar.mnuMultilevelSettings.setDisabled(idx==0); + this.toolbar.mnuMultiChangeLevel && this.toolbar.mnuMultiChangeLevel.setDisabled(idx==0); break; case 2: this.toolbar.btnMultilevels.toggle(true, true); @@ -1059,7 +1064,7 @@ define([ onPrint: function(e) { if (this.api) - this.api.asc_Print(new Asc.asc_CDownloadOptions(null, Common.Utils.isChrome || Common.Utils.isSafari || Common.Utils.isOpera)); // if isChrome or isSafari or isOpera == true use asc_onPrintUrl event + this.api.asc_Print(new Asc.asc_CDownloadOptions(null, Common.Utils.isChrome || Common.Utils.isSafari || Common.Utils.isOpera || Common.Utils.isGecko && Common.Utils.firefoxVersion>86)); // if isChrome or isSafari or isOpera == true use asc_onPrintUrl event Common.NotificationCenter.trigger('edit:complete', this.toolbar); @@ -1426,6 +1431,9 @@ define([ var listId = me.api.asc_GetCurrentNumberingId(), level = me.api.asc_GetCurrentNumberingLvl(), props = (listId !== null) ? me.api.asc_GetNumberingPr(listId) : null; + var item = _.find(menu.items, function(item) { return item.options.level == level; }); + menu.clearAll(); + item && item.setChecked(true); if (props) { this.api.SetDrawImagePreviewBulletChangeListLevel(menu.options.previewIds, props); } @@ -2411,6 +2419,7 @@ define([ this.toolbar.mnuMultilevelSettings && this.toolbar.mnuMultilevelSettings.setDisabled(true); this.toolbar.mnuMarkerChangeLevel && this.toolbar.mnuMarkerChangeLevel.setDisabled(true); this.toolbar.mnuNumberChangeLevel && this.toolbar.mnuNumberChangeLevel.setDisabled(true); + this.toolbar.mnuMultiChangeLevel && this.toolbar.mnuMultiChangeLevel.setDisabled(true); }, _getApiTextSize: function () { diff --git a/apps/documenteditor/main/app/template/Toolbar.template b/apps/documenteditor/main/app/template/Toolbar.template index 1c6b327452..f58295e4f4 100644 --- a/apps/documenteditor/main/app/template/Toolbar.template +++ b/apps/documenteditor/main/app/template/Toolbar.template @@ -6,7 +6,7 @@
-
+
@@ -15,7 +15,7 @@
-
+
@@ -29,7 +29,7 @@
-
+
@@ -49,7 +49,7 @@
-
+
@@ -68,7 +68,7 @@
-
+
@@ -78,7 +78,7 @@
-
+
@@ -165,7 +165,7 @@
-
+
diff --git a/apps/documenteditor/main/app/view/BookmarksDialog.js b/apps/documenteditor/main/app/view/BookmarksDialog.js index 3db3756798..8bea73e6d7 100644 --- a/apps/documenteditor/main/app/view/BookmarksDialog.js +++ b/apps/documenteditor/main/app/view/BookmarksDialog.js @@ -174,7 +174,7 @@ define([ el: $('#bookmarks-list', this.$window), store: new Common.UI.DataViewStore(), tabindex: 1, - itemTemplate: _.template('
<%= value %>
') + itemTemplate: _.template('
<%= Common.Utils.String.htmlEncode(value) %>
') }); this.bookmarksList.store.comparator = function(rec) { return (me.radioName.getValue() ? rec.get("value") : rec.get("location")); diff --git a/apps/documenteditor/main/app/view/ControlSettingsDialog.js b/apps/documenteditor/main/app/view/ControlSettingsDialog.js index 0e9babb1f4..537918e746 100644 --- a/apps/documenteditor/main/app/view/ControlSettingsDialog.js +++ b/apps/documenteditor/main/app/view/ControlSettingsDialog.js @@ -168,8 +168,8 @@ define([ 'text!documenteditor/main/app/template/ControlSettingsDialog.template', template: _.template(['
'].join('')), itemTemplate: _.template([ '
', - '
<%= name %>
', - '
<%= value %>
', + '
<%= Common.Utils.String.htmlEncode(name) %>
', + '
<%= Common.Utils.String.htmlEncode(value) %>
', '
' ].join('')), tabindex: 1 diff --git a/apps/documenteditor/main/app/view/CrossReferenceDialog.js b/apps/documenteditor/main/app/view/CrossReferenceDialog.js index f2a436813a..e5934cf3bf 100644 --- a/apps/documenteditor/main/app/view/CrossReferenceDialog.js +++ b/apps/documenteditor/main/app/view/CrossReferenceDialog.js @@ -183,7 +183,7 @@ define([ this.refList = new Common.UI.ListView({ el: $window.find('#id-dlg-cross-list'), store: new Common.UI.DataViewStore(), - itemTemplate: _.template('
<%= value %>
') + itemTemplate: _.template('
<%= Common.Utils.String.htmlEncode(value) %>
') }); this.refList.on('entervalue', _.bind(this.onPrimary, this)) .on('item:dblclick', _.bind(this.onPrimary, this)); diff --git a/apps/documenteditor/main/app/view/DocumentHolder.js b/apps/documenteditor/main/app/view/DocumentHolder.js index c036c40634..97ad0f1bd5 100644 --- a/apps/documenteditor/main/app/view/DocumentHolder.js +++ b/apps/documenteditor/main/app/view/DocumentHolder.js @@ -1857,7 +1857,7 @@ define([ if (this.api){ var printopt = new Asc.asc_CAdjustPrint(); printopt.asc_setPrintType(Asc.c_oAscPrintType.Selection); - var opts = new Asc.asc_CDownloadOptions(null, Common.Utils.isChrome || Common.Utils.isSafari || Common.Utils.isOpera); // if isChrome or isSafari or isOpera == true use asc_onPrintUrl event + var opts = new Asc.asc_CDownloadOptions(null, Common.Utils.isChrome || Common.Utils.isSafari || Common.Utils.isOpera || Common.Utils.isGecko && Common.Utils.firefoxVersion>86); // if isChrome or isSafari or isOpera == true use asc_onPrintUrl event opts.asc_setAdvancedOptions(printopt); this.api.asc_Print(opts); this.fireEvent('editcomplete', this); @@ -4319,7 +4319,12 @@ define([ for (var i=0; i', + '<%= Common.Utils.String.htmlEncode(caption) %>', + '' + ].join('')) })); } if (!isForm && menu.items.length<1) { diff --git a/apps/documenteditor/main/app/view/FileMenuPanels.js b/apps/documenteditor/main/app/view/FileMenuPanels.js index 62dd996f8c..9539508166 100644 --- a/apps/documenteditor/main/app/view/FileMenuPanels.js +++ b/apps/documenteditor/main/app/view/FileMenuPanels.js @@ -464,10 +464,6 @@ define([ style : 'width: 160px;', editable : false, cls : 'input-group-nr', - data : [ - { value: Common.UI.Themes.THEME_LIGHT_ID, displayValue: this.txtThemeLight }, - { value: Common.UI.Themes.THEME_DARK_ID, displayValue: this.txtThemeDark } - ] }); $markup.find('.btn.primary').each(function(index, el){ @@ -604,8 +600,16 @@ define([ this.chPaste.setValue(Common.Utils.InternalSettings.get("de-settings-paste-button")); - item = this.cmbTheme.store.findWhere({value: Common.UI.Themes.current()}); - this.cmbTheme.setValue(item ? item.get('value') : Common.UI.Themes.THEME_LIGHT_ID); + var data = []; + for (var t in Common.UI.Themes.map()) { + data.push({value: t, displayValue: Common.UI.Themes.get(t).text}); + } + + if ( data.length ) { + this.cmbTheme.setData(data); + item = this.cmbTheme.store.findWhere({value: Common.UI.Themes.currentThemeId()}); + this.cmbTheme.setValue(item ? item.get('value') : Common.UI.Themes.defaultThemeId()); + } }, applySettings: function() { @@ -734,8 +738,6 @@ define([ strPasteButton: 'Show Paste Options button when content is pasted', txtProofing: 'Proofing', strTheme: 'Theme', - txtThemeLight: 'Light', - txtThemeDark: 'Dark', txtAutoCorrect: 'AutoCorrect options...' }, DE.Views.FileMenuPanels.Settings || {})); diff --git a/apps/documenteditor/main/app/view/FormSettings.js b/apps/documenteditor/main/app/view/FormSettings.js index 57d504f9b6..443f84bf28 100644 --- a/apps/documenteditor/main/app/view/FormSettings.js +++ b/apps/documenteditor/main/app/view/FormSettings.js @@ -224,7 +224,7 @@ define([ itemTemplate: _.template([ '
', // '
<%= name %>
', - '
<%= name %>
', + '
<%= Common.Utils.String.htmlEncode(name) %>
', '
' ].join('')) }); @@ -389,7 +389,6 @@ define([ formTextPr.put_MaxCharacters(checked ? (field.getNumberValue() || 10) : checked); props.put_TextFormPr(formTextPr); this.api.asc_SetContentControlProperties(props, this.internalId); - this.fireEvent('editcomplete', this); } }, @@ -408,7 +407,7 @@ define([ formTextPr.put_MaxCharacters(this.spnMaxChars.getNumberValue() || 10); if (this.spnWidth.getValue()) { var value = this.spnWidth.getNumberValue(); - formTextPr.put_Width(value<=0 ? 0 : parseInt(Common.Utils.Metric.fnRecalcToMM(value) * 72 * 20 / 25.4 + 0.1)); + formTextPr.put_Width(value<=0 ? 0 : parseInt(Common.Utils.Metric.fnRecalcToMM(value) * 72 * 20 / 25.4 + 0.5)); } else formTextPr.put_Width(0); } @@ -424,13 +423,12 @@ define([ var formTextPr = this._originalTextFormProps || new AscCommon.CSdtTextFormPr(); if (this.spnWidth.getValue()) { var value = this.spnWidth.getNumberValue(); - formTextPr.put_Width(value<=0 ? 0 : parseInt(Common.Utils.Metric.fnRecalcToMM(value) * 72 * 20 / 25.4 + 0.1)); + formTextPr.put_Width(value<=0 ? 0 : parseInt(Common.Utils.Metric.fnRecalcToMM(value) * 72 * 20 / 25.4 + 0.5)); } else formTextPr.put_Width(0); props.put_TextFormPr(formTextPr); this.api.asc_SetContentControlProperties(props, this.internalId); - this.fireEvent('editcomplete', this); } }, @@ -727,7 +725,7 @@ define([ val = this.api.asc_GetTextFormAutoWidth(); if ( (this._state.WidthPlaceholder!==val) || Math.abs(this._state.WidthPlaceholder-val)>0.01) { - this.spnWidth.setDefaultValue(val!==undefined && val!==null ? Common.Utils.Metric.fnRecalcFromMM(val) : this.spnWidth.options.minValue); + this.spnWidth.setDefaultValue(val!==undefined && val!==null ? Common.Utils.Metric.fnRecalcFromMM((val+1) * 25.4 / 20 / 72.0) : this.spnWidth.options.minValue); this._state.WidthPlaceholder=val; } diff --git a/apps/documenteditor/main/app/view/FormsTab.js b/apps/documenteditor/main/app/view/FormsTab.js index f5ef8f2a26..fa93c08024 100644 --- a/apps/documenteditor/main/app/view/FormsTab.js +++ b/apps/documenteditor/main/app/view/FormsTab.js @@ -58,7 +58,7 @@ define([ '' + '
' + '' + - '
-
+
@@ -15,7 +15,7 @@
-
+
@@ -33,7 +33,7 @@
-
+
@@ -42,7 +42,7 @@
-
+
@@ -62,7 +62,7 @@
-
+
@@ -82,7 +82,7 @@
-
+
@@ -91,7 +91,7 @@
-
+
@@ -101,7 +101,7 @@
-
+
diff --git a/apps/presentationeditor/main/app/view/DocumentHolder.js b/apps/presentationeditor/main/app/view/DocumentHolder.js index a14ff95b4f..71a7fc8340 100644 --- a/apps/presentationeditor/main/app/view/DocumentHolder.js +++ b/apps/presentationeditor/main/app/view/DocumentHolder.js @@ -1856,7 +1856,7 @@ define([ if (me.api){ var printopt = new Asc.asc_CAdjustPrint(); printopt.asc_setPrintType(Asc.c_oAscPrintType.Selection); - var opts = new Asc.asc_CDownloadOptions(null, Common.Utils.isChrome || Common.Utils.isSafari || Common.Utils.isOpera); // if isChrome or isSafari or isOpera == true use asc_onPrintUrl event + var opts = new Asc.asc_CDownloadOptions(null, Common.Utils.isChrome || Common.Utils.isSafari || Common.Utils.isOpera || Common.Utils.isGecko && Common.Utils.firefoxVersion>86); // if isChrome or isSafari or isOpera == true use asc_onPrintUrl event opts.asc_setAdvancedOptions(printopt); me.api.asc_Print(opts); me.fireEvent('editcomplete', me); @@ -1962,7 +1962,7 @@ define([ if (me.api){ var printopt = new Asc.asc_CAdjustPrint(); printopt.asc_setPrintType(Asc.c_oAscPrintType.Selection); - var opts = new Asc.asc_CDownloadOptions(null, Common.Utils.isChrome || Common.Utils.isSafari || Common.Utils.isOpera); // if isChrome or isSafari or isOpera == true use asc_onPrintUrl event + var opts = new Asc.asc_CDownloadOptions(null, Common.Utils.isChrome || Common.Utils.isSafari || Common.Utils.isOpera || Common.Utils.isGecko && Common.Utils.firefoxVersion>86); // if isChrome or isSafari or isOpera == true use asc_onPrintUrl event opts.asc_setAdvancedOptions(printopt); me.api.asc_Print(opts); me.fireEvent('editcomplete', me); diff --git a/apps/presentationeditor/main/app/view/FileMenuPanels.js b/apps/presentationeditor/main/app/view/FileMenuPanels.js index 29e3624806..b648d0d150 100644 --- a/apps/presentationeditor/main/app/view/FileMenuPanels.js +++ b/apps/presentationeditor/main/app/view/FileMenuPanels.js @@ -403,10 +403,6 @@ define([ style : 'width: 160px;', editable : false, cls : 'input-group-nr', - data : [ - { value: Common.UI.Themes.THEME_LIGHT_ID, displayValue: this.txtThemeLight }, - { value: Common.UI.Themes.THEME_DARK_ID, displayValue: this.txtThemeDark } - ] }); $markup.find('.btn.primary').each(function(index, el){ @@ -532,8 +528,16 @@ define([ this.chPaste.setValue(Common.Utils.InternalSettings.get("pe-settings-paste-button")); - item = this.cmbTheme.store.findWhere({value: Common.UI.Themes.current()}); - this.cmbTheme.setValue(item ? item.get('value') : Common.UI.Themes.THEME_LIGHT_ID); + var data = []; + for (var t in Common.UI.Themes.map()) { + data.push({value: t, displayValue: Common.UI.Themes.get(t).text}); + } + + if ( data.length ) { + this.cmbTheme.setData(data); + item = this.cmbTheme.store.findWhere({value: Common.UI.Themes.currentThemeId()}); + this.cmbTheme.setValue(item ? item.get('value') : Common.UI.Themes.defaultThemeId()); + } }, applySettings: function() { diff --git a/apps/presentationeditor/main/app/view/ParagraphSettingsAdvanced.js b/apps/presentationeditor/main/app/view/ParagraphSettingsAdvanced.js index 67b7349350..5e33c00feb 100644 --- a/apps/presentationeditor/main/app/view/ParagraphSettingsAdvanced.js +++ b/apps/presentationeditor/main/app/view/ParagraphSettingsAdvanced.js @@ -414,7 +414,7 @@ define([ 'text!presentationeditor/main/app/template/ParagraphSettingsAdvanced ]; }, - onCategoryClick: function(btn, index) { + onCategoryClick: function(btn, index, cmp, e) { Common.Views.AdvancedSettingsWindow.prototype.onCategoryClick.call(this, btn, index); var me = this; @@ -425,6 +425,8 @@ define([ 'text!presentationeditor/main/app/template/ParagraphSettingsAdvanced break; case 1: me.chStrike.focus(); + if (e && (e instanceof jQuery.Event)) + me.api.SetDrawImagePlaceParagraph('paragraphadv-font-img', me._originalProps || new Asc.asc_CParagraphProperty()); break; case 2: me.numDefaultTab.focus(); @@ -433,6 +435,10 @@ define([ 'text!presentationeditor/main/app/template/ParagraphSettingsAdvanced }, 10); }, + onAnimateAfter: function() { + (this.getActiveCategory()==1) && this.api.SetDrawImagePlaceParagraph('paragraphadv-font-img', this._originalProps || new Asc.asc_CParagraphProperty()); + }, + getSettings: function() { if ( this._tabListChanged ) { if (this._changedProps.get_Tabs()===null || this._changedProps.get_Tabs()===undefined) @@ -494,8 +500,6 @@ define([ 'text!presentationeditor/main/app/template/ParagraphSettingsAdvanced this.numSpacing.setValue((props.get_TextSpacing() !== null && props.get_TextSpacing() !== undefined) ? Common.Utils.Metric.fnRecalcFromMM(props.get_TextSpacing()) : '', true); - this.api.SetDrawImagePlaceParagraph('paragraphadv-font-img', this._originalProps); - // Tabs this.numDefaultTab.setValue((props.get_DefaultTab() !== null && props.get_DefaultTab() !== undefined) ? Common.Utils.Metric.fnRecalcFromMM(parseFloat(props.get_DefaultTab().toFixed(1))) : '', true); diff --git a/apps/presentationeditor/main/app/view/ShapeSettings.js b/apps/presentationeditor/main/app/view/ShapeSettings.js index 9a72706772..b0cd3306c2 100644 --- a/apps/presentationeditor/main/app/view/ShapeSettings.js +++ b/apps/presentationeditor/main/app/view/ShapeSettings.js @@ -587,14 +587,16 @@ define([ expr = new RegExp('^\\s*(\\d*(\\.|,)?\\d+)\\s*(' + me.txtPt + ')?\\s*$'); if (!(expr.exec(record.value)) || value<0 || value>1584) { this._state.StrokeType = this._state.StrokeWidth = -1; - Common.UI.error({ - msg: this.textBorderSizeErr, - callback: function() { - _.defer(function(btn) { - me.fireEvent('editcomplete', me); - }) - } - }); + setTimeout( function() { + Common.UI.error({ + msg: me.textBorderSizeErr, + callback: function() { + _.defer(function(btn) { + me.fireEvent('editcomplete', me); + }) + } + }); + }, 10); } } else this.applyBorderSize(record.value); diff --git a/apps/presentationeditor/main/app/view/TableSettings.js b/apps/presentationeditor/main/app/view/TableSettings.js index 72d1b50b47..b2b1676746 100644 --- a/apps/presentationeditor/main/app/view/TableSettings.js +++ b/apps/presentationeditor/main/app/view/TableSettings.js @@ -437,7 +437,7 @@ define([ this.mnuTableTemplatePicker.selectRecord(rec, true); this.btnTableTemplate.resumeEvents(); - this.$el.find('.icon-template-table').css({'background-image': 'url(' + rec.get("imageUrl") + ')', 'height': '52px', 'width': '72px', 'background-position': 'center', 'background-size': 'cover'}); + this.$el.find('.icon-template-table').css({'background-image': 'url(' + rec.get("imageUrl") + ')', 'height': '52px', 'width': '72px', 'background-position': 'center', 'background-size': 'auto 50px'}); this._state.TemplateId = value; } diff --git a/apps/presentationeditor/main/app/view/TextArtSettings.js b/apps/presentationeditor/main/app/view/TextArtSettings.js index cc71d911c7..bb159c568b 100644 --- a/apps/presentationeditor/main/app/view/TextArtSettings.js +++ b/apps/presentationeditor/main/app/view/TextArtSettings.js @@ -93,7 +93,8 @@ define([ GradColor: '000000', GradFillType: Asc.c_oAscFillGradType.GRAD_LINEAR, FormId: null, - DisabledControls: false + DisabledControls: false, + applicationPixelRatio: Common.Utils.applicationPixelRatio() }; this.lockedControls = []; this._locked = false; @@ -134,6 +135,7 @@ define([ el.html(this.template({ scope: this })); + $(window).on('resize', _.bind(this.onWindowResize, this)); }, setApi: function(api) { @@ -594,14 +596,16 @@ define([ expr = new RegExp('^\\s*(\\d*(\\.|,)?\\d+)\\s*(' + me.txtPt + ')?\\s*$'); if (!(expr.exec(record.value)) || value<0 || value>1584) { this._state.StrokeType = this._state.StrokeWidth = -1; - Common.UI.error({ - msg: this.textBorderSizeErr, - callback: function() { - _.defer(function(btn) { - me.fireEvent('editcomplete', me); - }) - } - }); + setTimeout( function() { + Common.UI.error({ + msg: me.textBorderSizeErr, + callback: function() { + _.defer(function(btn) { + me.fireEvent('editcomplete', me); + }) + } + }); + }, 10); } } else this.applyBorderSize(record.value); @@ -1538,22 +1542,17 @@ define([ }, fillTransform: function(transforms) { - if (transforms && transforms.length>1 && transforms[1]){ - var me = this, - artStore = [], - arrTransforms = transforms[1]; - for (var i=0; i0) - _.each(arr, function(item){ - artStore.push({ - imageUrl: item.Image, - type : item.Type, - selected: false - }); - }); + if (transforms){ + var artStore = []; + for (var i=0; i 0) { this.cmbTransform.fillComboView(this.cmbTransform.menuPicker.store.at(0),true); } @@ -1727,6 +1726,13 @@ define([ } }, + onWindowResize: function() { + if (!this._initSettings && this._state.applicationPixelRatio !== Common.Utils.applicationPixelRatio()) + this.fillTransform(this.api.asc_getPropertyEditorTextArts()); + + this._state.applicationPixelRatio = Common.Utils.applicationPixelRatio(); + }, + txtNoBorders : 'No Line', strStroke : 'Stroke', strColor : 'Color', diff --git a/apps/presentationeditor/main/app_dev.reporter.js b/apps/presentationeditor/main/app_dev.reporter.js index e232230a88..77687a3223 100644 --- a/apps/presentationeditor/main/app_dev.reporter.js +++ b/apps/presentationeditor/main/app_dev.reporter.js @@ -94,7 +94,7 @@ require([ var api = new Asc.asc_docs_api({ 'id-view' : 'editor_sdk', using : 'reporter', - skin : (localStorage.getItem("ui-theme") == "theme-dark") ? "flatDark" : "flat" + skin : localStorage.getItem("ui-theme") }); var setDocumentTitle = function(title) { diff --git a/apps/presentationeditor/main/index.html b/apps/presentationeditor/main/index.html index 9847f2341c..cd541ff812 100644 --- a/apps/presentationeditor/main/index.html +++ b/apps/presentationeditor/main/index.html @@ -13,12 +13,16 @@ --toolbar-header-presentation: #2a2a2a; --background-toolbar: #404040; --border-toolbar: #2a2a2a; - --highlight-button-pressed: #606060; + --highlight-button-hover: #606060; --canvas-background: #666666; /*--canvas-content-background: #fff;*/ --canvas-page-border: #555; } + .theme-classic-light { + --highlight-button-hover: #d8dadc; + } + .loadmask { left: 0; top: 0; @@ -90,7 +94,7 @@ .loadmask > .sktoolbar li { background: #ccc; - background: var(--highlight-button-pressed, #ccc); + background: var(--highlight-button-hover, #ccc); border-radius: 3px; width: 20px; height: 20px; diff --git a/apps/presentationeditor/main/index.html.deploy b/apps/presentationeditor/main/index.html.deploy index b4e367fa34..b3daac5dc2 100644 --- a/apps/presentationeditor/main/index.html.deploy +++ b/apps/presentationeditor/main/index.html.deploy @@ -82,7 +82,7 @@ .loadmask > .sktoolbar li { background: #ccc; - background: var(--highlight-button-pressed, #ccc); + background: var(--highlight-button-hover, #ccc); border-radius: 3px; width: 20px; height: 20px; diff --git a/apps/presentationeditor/main/locale/da.json b/apps/presentationeditor/main/locale/da.json index 6609f5b407..9a35d40fcb 100644 --- a/apps/presentationeditor/main/locale/da.json +++ b/apps/presentationeditor/main/locale/da.json @@ -148,7 +148,6 @@ "Common.Views.Header.textAdvSettings": "Avancerede indstillinger", "Common.Views.Header.textBack": "Gå til dokumentplacering", "Common.Views.Header.textCompactView": "Vis kompakt værktøjslinie ", - "Common.Views.Header.textDarkTheme": "Mørkt tema", "Common.Views.Header.textHideLines": "Skjul lineal", "Common.Views.Header.textHideStatusBar": "Skjul statuslinie", "Common.Views.Header.textRemoveFavorite": "Fjern fra Favoritter", @@ -1352,8 +1351,6 @@ "PE.Views.FileMenuPanels.Settings.txtSpellCheck": "Stavekontrol", "PE.Views.FileMenuPanels.Settings.txtStopMacros": "Deaktiver Alle", "PE.Views.FileMenuPanels.Settings.txtStopMacrosDesc": "Deaktivér alle makroer uden besked", - "PE.Views.FileMenuPanels.Settings.txtThemeDark": "Mørk", - "PE.Views.FileMenuPanels.Settings.txtThemeLight": "Lys", "PE.Views.FileMenuPanels.Settings.txtWarnMacros": "Vis besked", "PE.Views.FileMenuPanels.Settings.txtWarnMacrosDesc": "Deaktiver alle makroer med en besked", "PE.Views.FileMenuPanels.Settings.txtWin": "som Windows", @@ -1904,7 +1901,7 @@ "PE.Views.Toolbar.textUnderline": "Understreg", "PE.Views.Toolbar.tipAddSlide": "Tilføj dias", "PE.Views.Toolbar.tipBack": "Tilbage", - "PE.Views.Toolbar.tipChangeCase:": "Ændre store/små bogstaver", + "PE.Views.Toolbar.tipChangeCase": "Ændre store/små bogstaver", "PE.Views.Toolbar.tipChangeChart": "Skift diagramtype", "PE.Views.Toolbar.tipChangeSlide": "Skift dias layout", "PE.Views.Toolbar.tipClearStyle": "Ryd formatering", diff --git a/apps/presentationeditor/main/locale/de.json b/apps/presentationeditor/main/locale/de.json index a90e643195..205fed73da 100644 --- a/apps/presentationeditor/main/locale/de.json +++ b/apps/presentationeditor/main/locale/de.json @@ -148,7 +148,6 @@ "Common.Views.Header.textAdvSettings": "Erweiterte Einstellungen", "Common.Views.Header.textBack": "Dateispeicherort öffnen", "Common.Views.Header.textCompactView": "Symbolleiste ausblenden", - "Common.Views.Header.textDarkTheme": "Dunkelmodus", "Common.Views.Header.textHideLines": "Lineale verbergen", "Common.Views.Header.textHideStatusBar": "Statusleiste verbergen", "Common.Views.Header.textRemoveFavorite": "Aus Favoriten entfernen", @@ -1352,8 +1351,6 @@ "PE.Views.FileMenuPanels.Settings.txtSpellCheck": "Rechtschreibprüfung", "PE.Views.FileMenuPanels.Settings.txtStopMacros": "Alle deaktivieren", "PE.Views.FileMenuPanels.Settings.txtStopMacrosDesc": "Alle Makros ohne Benachrichtigung deaktivieren", - "PE.Views.FileMenuPanels.Settings.txtThemeDark": "Dunkel", - "PE.Views.FileMenuPanels.Settings.txtThemeLight": "Hell", "PE.Views.FileMenuPanels.Settings.txtWarnMacros": "Benachrichtigung anzeigen", "PE.Views.FileMenuPanels.Settings.txtWarnMacrosDesc": "Alle Makros mit einer Benachrichtigung deaktivieren", "PE.Views.FileMenuPanels.Settings.txtWin": "wie Windows", @@ -1904,7 +1901,7 @@ "PE.Views.Toolbar.textUnderline": "Unterstrichen", "PE.Views.Toolbar.tipAddSlide": "Folie hinzufügen", "PE.Views.Toolbar.tipBack": "Zurück", - "PE.Views.Toolbar.tipChangeCase:": "Groß-/Kleinschreibung", + "PE.Views.Toolbar.tipChangeCase": "Groß-/Kleinschreibung", "PE.Views.Toolbar.tipChangeChart": "Diagrammtyp ändern", "PE.Views.Toolbar.tipChangeSlide": "Folienlayout ändern", "PE.Views.Toolbar.tipClearStyle": "Formatierung löschen", diff --git a/apps/presentationeditor/main/locale/el.json b/apps/presentationeditor/main/locale/el.json index 4fa91e514f..4cdb130b4a 100644 --- a/apps/presentationeditor/main/locale/el.json +++ b/apps/presentationeditor/main/locale/el.json @@ -148,7 +148,6 @@ "Common.Views.Header.textAdvSettings": "Προηγμένες ρυθμίσεις", "Common.Views.Header.textBack": "Άνοιγμα τοποθεσίας αρχείου", "Common.Views.Header.textCompactView": "Απόκρυψη Γραμμής Εργαλείων", - "Common.Views.Header.textDarkTheme": "Σκούρο Θέμα", "Common.Views.Header.textHideLines": "Απόκρυψη Χαράκων", "Common.Views.Header.textHideStatusBar": "Απόκρυψη Γραμμής Κατάστασης", "Common.Views.Header.textRemoveFavorite": "Αφαίρεση από τα Αγαπημένα", @@ -1352,8 +1351,6 @@ "PE.Views.FileMenuPanels.Settings.txtSpellCheck": "Έλεγχος Ορθογραφίας", "PE.Views.FileMenuPanels.Settings.txtStopMacros": "Απενεργοποίηση Όλων", "PE.Views.FileMenuPanels.Settings.txtStopMacrosDesc": "Απενεργοποίηση όλων των μακροεντολών χωρίς ειδοποίηση", - "PE.Views.FileMenuPanels.Settings.txtThemeDark": "Σκούρο", - "PE.Views.FileMenuPanels.Settings.txtThemeLight": "Ανοιχτό", "PE.Views.FileMenuPanels.Settings.txtWarnMacros": "Εμφάνιση Ειδοποίησης", "PE.Views.FileMenuPanels.Settings.txtWarnMacrosDesc": "Απενεργοποίηση όλων των μακροεντολών με ειδοποίηση", "PE.Views.FileMenuPanels.Settings.txtWin": "ως Windows", @@ -1904,7 +1901,7 @@ "PE.Views.Toolbar.textUnderline": "Υπογράμμιση", "PE.Views.Toolbar.tipAddSlide": "Προσθήκη διαφάνειας", "PE.Views.Toolbar.tipBack": "Πίσω", - "PE.Views.Toolbar.tipChangeCase:": "Αλλαγή πεζών-κεφαλαίων", + "PE.Views.Toolbar.tipChangeCase": "Αλλαγή πεζών-κεφαλαίων", "PE.Views.Toolbar.tipChangeChart": "Αλλαγή τύπου γραφήματος", "PE.Views.Toolbar.tipChangeSlide": "Αλλαγή διάταξης διαφάνειας", "PE.Views.Toolbar.tipClearStyle": "Εκκαθάριση τεχνοτροπίας", diff --git a/apps/presentationeditor/main/locale/en.json b/apps/presentationeditor/main/locale/en.json index b1929f7c02..a326343c1a 100644 --- a/apps/presentationeditor/main/locale/en.json +++ b/apps/presentationeditor/main/locale/en.json @@ -48,6 +48,8 @@ "Common.define.chartData.textStock": "Stock", "Common.define.chartData.textSurface": "Surface", "Common.Translation.warnFileLocked": "The file is being edited in another app. You can continue editing and save it as a copy.", + "Common.Translation.warnFileLockedBtnEdit": "Create a copy", + "Common.Translation.warnFileLockedBtnView": "Open for viewing", "Common.UI.ColorButton.textAutoColor": "Automatic", "Common.UI.ColorButton.textNewColor": "Add New Custom Color", "Common.UI.ComboBorderSize.txtNoBorders": "No borders", @@ -73,6 +75,9 @@ "Common.UI.SynchronizeTip.textSynchronize": "The document has been changed by another user.
Please click to save your changes and reload the updates.", "Common.UI.ThemeColorPalette.textStandartColors": "Standard Colors", "Common.UI.ThemeColorPalette.textThemeColors": "Theme Colors", + "Common.UI.Themes.txtThemeClassicLight": "Classic Light", + "Common.UI.Themes.txtThemeDark": "Dark", + "Common.UI.Themes.txtThemeLight": "Light", "Common.UI.Window.cancelButtonText": "Cancel", "Common.UI.Window.closeButtonText": "Close", "Common.UI.Window.noButtonText": "No", @@ -148,7 +153,6 @@ "Common.Views.Header.textAdvSettings": "Advanced settings", "Common.Views.Header.textBack": "Open file location", "Common.Views.Header.textCompactView": "Hide Toolbar", - "Common.Views.Header.textDarkTheme": "Dark theme", "Common.Views.Header.textHideLines": "Hide Rulers", "Common.Views.Header.textHideStatusBar": "Hide Status Bar", "Common.Views.Header.textRemoveFavorite": "Remove from Favorites", @@ -1367,8 +1371,6 @@ "PE.Views.FileMenuPanels.Settings.txtSpellCheck": "Spell Checking", "PE.Views.FileMenuPanels.Settings.txtStopMacros": "Disable All", "PE.Views.FileMenuPanels.Settings.txtStopMacrosDesc": "Disable all macros without a notification", - "PE.Views.FileMenuPanels.Settings.txtThemeDark": "Dark", - "PE.Views.FileMenuPanels.Settings.txtThemeLight": "Light", "PE.Views.FileMenuPanels.Settings.txtWarnMacros": "Show Notification", "PE.Views.FileMenuPanels.Settings.txtWarnMacrosDesc": "Disable all macros with a notification", "PE.Views.FileMenuPanels.Settings.txtWin": "as Windows", @@ -1919,7 +1921,8 @@ "PE.Views.Toolbar.textUnderline": "Underline", "PE.Views.Toolbar.tipAddSlide": "Add slide", "PE.Views.Toolbar.tipBack": "Back", - "PE.Views.Toolbar.tipChangeCase:": "Change case", + "del_PE.Views.Toolbar.tipChangeCase:": "Change case", + "PE.Views.Toolbar.tipChangeCase": "Change case", "PE.Views.Toolbar.tipChangeChart": "Change chart type", "PE.Views.Toolbar.tipChangeSlide": "Change slide layout", "PE.Views.Toolbar.tipClearStyle": "Clear style", diff --git a/apps/presentationeditor/main/locale/es.json b/apps/presentationeditor/main/locale/es.json index f1d351929a..f4b8ab3ccb 100644 --- a/apps/presentationeditor/main/locale/es.json +++ b/apps/presentationeditor/main/locale/es.json @@ -148,7 +148,6 @@ "Common.Views.Header.textAdvSettings": "Ajustes avanzados", "Common.Views.Header.textBack": "Abrir ubicación del archivo", "Common.Views.Header.textCompactView": "Esconder barra de herramientas", - "Common.Views.Header.textDarkTheme": "Tema oscuro", "Common.Views.Header.textHideLines": "Ocultar reglas", "Common.Views.Header.textHideStatusBar": "Ocultar barra de estado", "Common.Views.Header.textRemoveFavorite": "Eliminar de Favoritos", @@ -1352,8 +1351,6 @@ "PE.Views.FileMenuPanels.Settings.txtSpellCheck": "Сorrección ortográfica", "PE.Views.FileMenuPanels.Settings.txtStopMacros": "Deshabilitar todo", "PE.Views.FileMenuPanels.Settings.txtStopMacrosDesc": "Deshabilitar todas las macros sin notificación", - "PE.Views.FileMenuPanels.Settings.txtThemeDark": "Oscuro", - "PE.Views.FileMenuPanels.Settings.txtThemeLight": "Claro", "PE.Views.FileMenuPanels.Settings.txtWarnMacros": "Mostrar notificación", "PE.Views.FileMenuPanels.Settings.txtWarnMacrosDesc": "Deshabilitar todas las macros con notificación", "PE.Views.FileMenuPanels.Settings.txtWin": "como Windows", @@ -1904,7 +1901,7 @@ "PE.Views.Toolbar.textUnderline": "Subrayar", "PE.Views.Toolbar.tipAddSlide": "Añadir diapositiva", "PE.Views.Toolbar.tipBack": "Atrás", - "PE.Views.Toolbar.tipChangeCase:": "Cambiar mayúsculas y minúsculas", + "PE.Views.Toolbar.tipChangeCase": "Cambiar mayúsculas y minúsculas", "PE.Views.Toolbar.tipChangeChart": "Cambiar tipo de gráfico", "PE.Views.Toolbar.tipChangeSlide": "Cambiar diseño de diapositiva", "PE.Views.Toolbar.tipClearStyle": "Limpiar estilo", diff --git a/apps/presentationeditor/main/locale/fr.json b/apps/presentationeditor/main/locale/fr.json index 48b5fd557e..0e3ba8f7e4 100644 --- a/apps/presentationeditor/main/locale/fr.json +++ b/apps/presentationeditor/main/locale/fr.json @@ -148,7 +148,6 @@ "Common.Views.Header.textAdvSettings": "Paramètres avancés", "Common.Views.Header.textBack": "Ouvrir l'emplacement du fichier", "Common.Views.Header.textCompactView": "Masquer la barre d'outils", - "Common.Views.Header.textDarkTheme": "Thème sombre", "Common.Views.Header.textHideLines": "Masquer les règles", "Common.Views.Header.textHideStatusBar": "Masquer la barre d'état", "Common.Views.Header.textRemoveFavorite": "Enlever des favoris", @@ -1352,8 +1351,6 @@ "PE.Views.FileMenuPanels.Settings.txtSpellCheck": "Vérification de l'orthographe", "PE.Views.FileMenuPanels.Settings.txtStopMacros": "Désactiver tout", "PE.Views.FileMenuPanels.Settings.txtStopMacrosDesc": "Désactiver toutes les macros sans notification", - "PE.Views.FileMenuPanels.Settings.txtThemeDark": "Sombre", - "PE.Views.FileMenuPanels.Settings.txtThemeLight": "Clair", "PE.Views.FileMenuPanels.Settings.txtWarnMacros": "Montrer la notification", "PE.Views.FileMenuPanels.Settings.txtWarnMacrosDesc": "Désactiver toutes les macros avec notification", "PE.Views.FileMenuPanels.Settings.txtWin": "comme Windows", @@ -1904,7 +1901,7 @@ "PE.Views.Toolbar.textUnderline": "Souligné", "PE.Views.Toolbar.tipAddSlide": "Ajouter diapositive", "PE.Views.Toolbar.tipBack": "En arrière", - "PE.Views.Toolbar.tipChangeCase:": "Changer de cas", + "PE.Views.Toolbar.tipChangeCase": "Changer de cas", "PE.Views.Toolbar.tipChangeChart": "Modifier le type de graphique", "PE.Views.Toolbar.tipChangeSlide": "Modifier la disposition de diapositive", "PE.Views.Toolbar.tipClearStyle": "Effacer le style", diff --git a/apps/presentationeditor/main/locale/hu.json b/apps/presentationeditor/main/locale/hu.json index 17b5a8c30e..d544aad519 100644 --- a/apps/presentationeditor/main/locale/hu.json +++ b/apps/presentationeditor/main/locale/hu.json @@ -148,7 +148,6 @@ "Common.Views.Header.textAdvSettings": "Haladó beállítások", "Common.Views.Header.textBack": "Fájl helyének megnyitása", "Common.Views.Header.textCompactView": "Eszköztár elrejtése", - "Common.Views.Header.textDarkTheme": "Sötét téma", "Common.Views.Header.textHideLines": "Vonalzók elrejtése", "Common.Views.Header.textHideStatusBar": "Állapotsor elrejtése", "Common.Views.Header.textRemoveFavorite": "Eltávolítás a kedvencekből", @@ -1352,8 +1351,6 @@ "PE.Views.FileMenuPanels.Settings.txtSpellCheck": "Helyesírás-ellenőrzés", "PE.Views.FileMenuPanels.Settings.txtStopMacros": "Összes letiltása", "PE.Views.FileMenuPanels.Settings.txtStopMacrosDesc": "Minden értesítés nélküli makró letiltása", - "PE.Views.FileMenuPanels.Settings.txtThemeDark": "Sötét", - "PE.Views.FileMenuPanels.Settings.txtThemeLight": "Világos", "PE.Views.FileMenuPanels.Settings.txtWarnMacros": "Értesítés mutatása", "PE.Views.FileMenuPanels.Settings.txtWarnMacrosDesc": "Minden értesítéssel rendelkező makró letiltása", "PE.Views.FileMenuPanels.Settings.txtWin": "Windows-ként", @@ -1903,7 +1900,7 @@ "PE.Views.Toolbar.textUnderline": "Aláhúzott", "PE.Views.Toolbar.tipAddSlide": "Minden dia", "PE.Views.Toolbar.tipBack": "Vissza", - "PE.Views.Toolbar.tipChangeCase:": "Kis- és nagybetűk megváltoztatása", + "PE.Views.Toolbar.tipChangeCase": "Kis- és nagybetűk megváltoztatása", "PE.Views.Toolbar.tipChangeChart": "Diagramtípus módosítása", "PE.Views.Toolbar.tipChangeSlide": "Dia elrendezés módosítása", "PE.Views.Toolbar.tipClearStyle": "Stílus törlése", diff --git a/apps/presentationeditor/main/locale/it.json b/apps/presentationeditor/main/locale/it.json index 6310c12dc4..4b1fc13f46 100644 --- a/apps/presentationeditor/main/locale/it.json +++ b/apps/presentationeditor/main/locale/it.json @@ -99,7 +99,6 @@ "Common.Views.Header.textAdvSettings": "Impostazioni avanzate", "Common.Views.Header.textBack": "Apri percorso file", "Common.Views.Header.textCompactView": "Nascondi barra degli strumenti", - "Common.Views.Header.textDarkTheme": "‎Tema scuro‎", "Common.Views.Header.textHideLines": "Nascondi righelli", "Common.Views.Header.textHideStatusBar": "Nascondi barra di stato", "Common.Views.Header.textSaveBegin": "Salvataggio in corso...", @@ -1290,7 +1289,6 @@ "PE.Views.FileMenuPanels.Settings.txtSpellCheck": "Controllo ortografia", "PE.Views.FileMenuPanels.Settings.txtStopMacros": "Disabilita tutto", "PE.Views.FileMenuPanels.Settings.txtStopMacrosDesc": "Disabilita tutte le macro senza notifica", - "PE.Views.FileMenuPanels.Settings.txtThemeDark": "Scuro", "PE.Views.FileMenuPanels.Settings.txtWarnMacros": "Mostra notifica", "PE.Views.FileMenuPanels.Settings.txtWarnMacrosDesc": "Disabilita tutte le macro con notifica", "PE.Views.FileMenuPanels.Settings.txtWin": "come Windows", diff --git a/apps/presentationeditor/main/locale/ja.json b/apps/presentationeditor/main/locale/ja.json index 74a630f95b..01987b2b72 100644 --- a/apps/presentationeditor/main/locale/ja.json +++ b/apps/presentationeditor/main/locale/ja.json @@ -146,7 +146,6 @@ "Common.Views.Header.textAdvSettings": "詳細設定", "Common.Views.Header.textBack": "ドキュメントに移動", "Common.Views.Header.textCompactView": "ツールバーを表示しない", - "Common.Views.Header.textDarkTheme": "ダークテーマ", "Common.Views.Header.textHideLines": "ルーラーを表示しない", "Common.Views.Header.textHideStatusBar": "ステータスバーを表示しない", "Common.Views.Header.textRemoveFavorite": "お気に入りから削除", @@ -1350,8 +1349,6 @@ "PE.Views.FileMenuPanels.Settings.txtSpellCheck": "スペル・チェック", "PE.Views.FileMenuPanels.Settings.txtStopMacros": "全てを無効にする", "PE.Views.FileMenuPanels.Settings.txtStopMacrosDesc": "マクロを無効にして、通知しない", - "PE.Views.FileMenuPanels.Settings.txtThemeDark": "ダーク", - "PE.Views.FileMenuPanels.Settings.txtThemeLight": "ライト", "PE.Views.FileMenuPanels.Settings.txtWarnMacros": "通知を表示する", "PE.Views.FileMenuPanels.Settings.txtWarnMacrosDesc": "マクロを無効にして、通知する", "PE.Views.FileMenuPanels.Settings.txtWin": "Windowsのように", @@ -1901,7 +1898,7 @@ "PE.Views.Toolbar.textUnderline": "下線", "PE.Views.Toolbar.tipAddSlide": "スライドの追加", "PE.Views.Toolbar.tipBack": "戻る", - "PE.Views.Toolbar.tipChangeCase:": "大文字小文字を変更", + "PE.Views.Toolbar.tipChangeCase": "大文字小文字を変更", "PE.Views.Toolbar.tipChangeChart": "グラフの種類を変更", "PE.Views.Toolbar.tipChangeSlide": "レイアウトスライドの変更", "PE.Views.Toolbar.tipClearStyle": "スタイルのクリア", diff --git a/apps/presentationeditor/main/locale/nl.json b/apps/presentationeditor/main/locale/nl.json index c7517b4466..0d60802308 100644 --- a/apps/presentationeditor/main/locale/nl.json +++ b/apps/presentationeditor/main/locale/nl.json @@ -148,7 +148,6 @@ "Common.Views.Header.textAdvSettings": "Geavanceerde instellingen", "Common.Views.Header.textBack": "Naar documenten", "Common.Views.Header.textCompactView": "Werkbalk Verbergen", - "Common.Views.Header.textDarkTheme": "Donker thema ", "Common.Views.Header.textHideLines": "Linialen verbergen", "Common.Views.Header.textHideStatusBar": "Statusbalk verbergen", "Common.Views.Header.textRemoveFavorite": "Verwijder uit favorieten", @@ -1352,8 +1351,6 @@ "PE.Views.FileMenuPanels.Settings.txtSpellCheck": "Spellingcontrole", "PE.Views.FileMenuPanels.Settings.txtStopMacros": "Alles uitschakelen", "PE.Views.FileMenuPanels.Settings.txtStopMacrosDesc": "Schakel alle macro's uit zonder melding", - "PE.Views.FileMenuPanels.Settings.txtThemeDark": "Donker", - "PE.Views.FileMenuPanels.Settings.txtThemeLight": "licht", "PE.Views.FileMenuPanels.Settings.txtWarnMacros": "Weergeef notificatie", "PE.Views.FileMenuPanels.Settings.txtWarnMacrosDesc": "Schakel alle macro's uit met een melding", "PE.Views.FileMenuPanels.Settings.txtWin": "als Windows", @@ -1903,7 +1900,7 @@ "PE.Views.Toolbar.textUnderline": "Onderstrepen", "PE.Views.Toolbar.tipAddSlide": "Dia toevoegen", "PE.Views.Toolbar.tipBack": "Terug", - "PE.Views.Toolbar.tipChangeCase:": "Verander lettertype", + "PE.Views.Toolbar.tipChangeCase": "Verander lettertype", "PE.Views.Toolbar.tipChangeChart": "Grafiektype wijzigen", "PE.Views.Toolbar.tipChangeSlide": "Dia-indeling wijzigen", "PE.Views.Toolbar.tipClearStyle": "Stijl wissen", diff --git a/apps/presentationeditor/main/locale/ro.json b/apps/presentationeditor/main/locale/ro.json index 371401c3da..8054993137 100644 --- a/apps/presentationeditor/main/locale/ro.json +++ b/apps/presentationeditor/main/locale/ro.json @@ -148,7 +148,6 @@ "Common.Views.Header.textAdvSettings": "Setări avansate", "Common.Views.Header.textBack": "Deschidere locația fișierului", "Common.Views.Header.textCompactView": "Ascundere bară de instrumente", - "Common.Views.Header.textDarkTheme": "Tema întunecată", "Common.Views.Header.textHideLines": "Ascundere rigle", "Common.Views.Header.textHideStatusBar": "Ascundere bară de stare", "Common.Views.Header.textRemoveFavorite": "Eliminare din Preferințe", @@ -1352,8 +1351,6 @@ "PE.Views.FileMenuPanels.Settings.txtSpellCheck": "Verificarea ortografică", "PE.Views.FileMenuPanels.Settings.txtStopMacros": "Se dezactivează toate", "PE.Views.FileMenuPanels.Settings.txtStopMacrosDesc": "Se dezactivează toate macrocomenzile, fără notificare", - "PE.Views.FileMenuPanels.Settings.txtThemeDark": "Întunecat", - "PE.Views.FileMenuPanels.Settings.txtThemeLight": "Luminozitate", "PE.Views.FileMenuPanels.Settings.txtWarnMacros": "Afișare notificări", "PE.Views.FileMenuPanels.Settings.txtWarnMacrosDesc": "Se dezactivează toate macrocomenzile, cu notificare ", "PE.Views.FileMenuPanels.Settings.txtWin": "ca Windows", @@ -1903,7 +1900,7 @@ "PE.Views.Toolbar.textUnderline": "Subliniat", "PE.Views.Toolbar.tipAddSlide": "Adăugare diapozitiv", "PE.Views.Toolbar.tipBack": "Înapoi", - "PE.Views.Toolbar.tipChangeCase:": "Modificarea scrierii cu majuscule sau minuscule", + "PE.Views.Toolbar.tipChangeCase": "Modificarea scrierii cu majuscule sau minuscule", "PE.Views.Toolbar.tipChangeChart": "Modificare tip diagramă", "PE.Views.Toolbar.tipChangeSlide": "Modificare aspect diapozitiv", "PE.Views.Toolbar.tipClearStyle": "Golire stil", diff --git a/apps/presentationeditor/main/locale/ru.json b/apps/presentationeditor/main/locale/ru.json index 8b39752c3c..fe50d29de3 100644 --- a/apps/presentationeditor/main/locale/ru.json +++ b/apps/presentationeditor/main/locale/ru.json @@ -48,6 +48,8 @@ "Common.define.chartData.textStock": "Биржевая", "Common.define.chartData.textSurface": "Поверхность", "Common.Translation.warnFileLocked": "Файл редактируется в другом приложении. Вы можете продолжить редактирование и сохранить его как копию.", + "Common.Translation.warnFileLockedBtnEdit": "Создать копию", + "Common.Translation.warnFileLockedBtnView": "Открыть на просмотр", "Common.UI.ColorButton.textAutoColor": "Автоматический", "Common.UI.ColorButton.textNewColor": "Пользовательский цвет", "Common.UI.ComboBorderSize.txtNoBorders": "Без границ", @@ -73,6 +75,9 @@ "Common.UI.SynchronizeTip.textSynchronize": "Документ изменен другим пользователем.
Нажмите, чтобы сохранить свои изменения и загрузить обновления.", "Common.UI.ThemeColorPalette.textStandartColors": "Стандартные цвета", "Common.UI.ThemeColorPalette.textThemeColors": "Цвета темы", + "Common.UI.Themes.txtThemeClassicLight": "Светлая классическая", + "Common.UI.Themes.txtThemeDark": "Темная", + "Common.UI.Themes.txtThemeLight": "Светлая", "Common.UI.Window.cancelButtonText": "Отмена", "Common.UI.Window.closeButtonText": "Закрыть", "Common.UI.Window.noButtonText": "Нет", @@ -148,7 +153,6 @@ "Common.Views.Header.textAdvSettings": "Дополнительные параметры", "Common.Views.Header.textBack": "Открыть расположение файла", "Common.Views.Header.textCompactView": "Скрыть панель инструментов", - "Common.Views.Header.textDarkTheme": "Темная тема", "Common.Views.Header.textHideLines": "Скрыть линейки", "Common.Views.Header.textHideStatusBar": "Скрыть строку состояния", "Common.Views.Header.textRemoveFavorite": "Удалить из избранного", @@ -1352,8 +1356,6 @@ "PE.Views.FileMenuPanels.Settings.txtSpellCheck": "Проверка орфографии", "PE.Views.FileMenuPanels.Settings.txtStopMacros": "Отключить все", "PE.Views.FileMenuPanels.Settings.txtStopMacrosDesc": "Отключить все макросы без уведомления", - "PE.Views.FileMenuPanels.Settings.txtThemeDark": "Темная", - "PE.Views.FileMenuPanels.Settings.txtThemeLight": "Светлая", "PE.Views.FileMenuPanels.Settings.txtWarnMacros": "Показывать уведомление", "PE.Views.FileMenuPanels.Settings.txtWarnMacrosDesc": "Отключить все макросы с уведомлением", "PE.Views.FileMenuPanels.Settings.txtWin": "как Windows", @@ -1904,7 +1906,7 @@ "PE.Views.Toolbar.textUnderline": "Подчеркнутый", "PE.Views.Toolbar.tipAddSlide": "Добавить слайд", "PE.Views.Toolbar.tipBack": "Назад", - "PE.Views.Toolbar.tipChangeCase:": "Изменить регистр", + "PE.Views.Toolbar.tipChangeCase": "Изменить регистр", "PE.Views.Toolbar.tipChangeChart": "Изменить тип диаграммы", "PE.Views.Toolbar.tipChangeSlide": "Изменить макет слайда", "PE.Views.Toolbar.tipClearStyle": "Очистить стиль", diff --git a/apps/presentationeditor/main/locale/sk.json b/apps/presentationeditor/main/locale/sk.json index 53197aed7e..4d80f2919e 100644 --- a/apps/presentationeditor/main/locale/sk.json +++ b/apps/presentationeditor/main/locale/sk.json @@ -106,7 +106,6 @@ "Common.Views.Header.textAdvSettings": "Pokročilé nastavenia", "Common.Views.Header.textBack": "Prejsť do Dokumentov", "Common.Views.Header.textCompactView": "Skryť panel s nástrojmi", - "Common.Views.Header.textDarkTheme": "Tmavá téma", "Common.Views.Header.textHideLines": "Skryť pravítka", "Common.Views.Header.textHideStatusBar": "Schovať stavový riadok", "Common.Views.Header.textSaveBegin": "Ukladanie ...", @@ -1128,7 +1127,6 @@ "PE.Views.FileMenuPanels.Settings.txtSpellCheck": "Kontrola pravopisu", "PE.Views.FileMenuPanels.Settings.txtStopMacros": "Zablokovať všetko", "PE.Views.FileMenuPanels.Settings.txtStopMacrosDesc": "Zablokovať všetky makrá bez upozornenia", - "PE.Views.FileMenuPanels.Settings.txtThemeDark": "Tmavý", "PE.Views.FileMenuPanels.Settings.txtWarnMacrosDesc": "Zablokovať všetky makrá s upozornením", "PE.Views.FileMenuPanels.Settings.txtWin": "ako Windows", "PE.Views.HeaderFooterDialog.applyAllText": "Použiť na všetko", diff --git a/apps/presentationeditor/main/resources/less/app.less b/apps/presentationeditor/main/resources/less/app.less index 5b82f595bf..7ec5f06f5b 100644 --- a/apps/presentationeditor/main/resources/less/app.less +++ b/apps/presentationeditor/main/resources/less/app.less @@ -10,6 +10,7 @@ // Bootstrap overwrite @import "../../../../common/main/resources/less/variables.less"; @import "../../../../common/main/resources/less/colors-table.less"; +@import "../../../../common/main/resources/less/colors-table-classic.less"; @import "../../../../common/main/resources/less/colors-table-dark.less"; // diff --git a/apps/presentationeditor/main/resources/less/document-preview.less b/apps/presentationeditor/main/resources/less/document-preview.less index 96bdb1379e..97729c3dbe 100644 --- a/apps/presentationeditor/main/resources/less/document-preview.less +++ b/apps/presentationeditor/main/resources/less/document-preview.less @@ -20,7 +20,8 @@ #preview-label-slides { font: bold 11px Helvetica, Arial, Verdana, sans-serif; - color: #666666; + color: @text-normal-ie; + color: @text-normal; text-shadow: none; white-space: nowrap; cursor: pointer; diff --git a/apps/spreadsheeteditor/embed/js/ApplicationController.js b/apps/spreadsheeteditor/embed/js/ApplicationController.js index 6833f554af..fd7407ce2c 100644 --- a/apps/spreadsheeteditor/embed/js/ApplicationController.js +++ b/apps/spreadsheeteditor/embed/js/ApplicationController.js @@ -165,7 +165,7 @@ SSE.ApplicationController = new(function(){ function onPrint() { if ( permissions.print!==false ) - api.asc_Print(new Asc.asc_CDownloadOptions(null, $.browser.chrome || $.browser.safari || $.browser.opera)); + api.asc_Print(new Asc.asc_CDownloadOptions(null, $.browser.chrome || $.browser.safari || $.browser.opera || $.browser.mozilla && $.browser.versionNumber>86)); } function onPrintUrl(url) { @@ -223,7 +223,7 @@ SSE.ApplicationController = new(function(){ common.utils.openLink(embedConfig.saveUrl); } else if (permissions.print!==false){ - api.asc_Print(new Asc.asc_CDownloadOptions(null, $.browser.chrome || $.browser.safari || $.browser.opera)); + api.asc_Print(new Asc.asc_CDownloadOptions(null, $.browser.chrome || $.browser.safari || $.browser.opera || $.browser.mozilla && $.browser.versionNumber>86)); } Common.Analytics.trackEvent('Save'); @@ -231,7 +231,7 @@ SSE.ApplicationController = new(function(){ SSE.ApplicationView.tools.get('#idt-print') .on('click', function(){ - api.asc_Print(new Asc.asc_CDownloadOptions(null, $.browser.chrome || $.browser.safari || $.browser.opera)); + api.asc_Print(new Asc.asc_CDownloadOptions(null, $.browser.chrome || $.browser.safari || $.browser.opera || $.browser.mozilla && $.browser.versionNumber>86)); Common.Analytics.trackEvent('Print'); }); diff --git a/apps/spreadsheeteditor/main/app/controller/CellEditor.js b/apps/spreadsheeteditor/main/app/controller/CellEditor.js index 085c417e05..8a9beecf13 100644 --- a/apps/spreadsheeteditor/main/app/controller/CellEditor.js +++ b/apps/spreadsheeteditor/main/app/controller/CellEditor.js @@ -190,11 +190,15 @@ define([ onLayoutResize: function(o, r) { if (r == 'cell:edit') { if (Math.floor(this.editor.$el.height()) > 19) { - if (!this.editor.$btnexpand.hasClass('btn-collapse')) + if (!this.editor.$btnexpand.hasClass('btn-collapse')) { + this.editor.$el.addClass('expanded'); this.editor.$btnexpand['addClass']('btn-collapse'); + } + o && Common.localStorage.setItem('sse-celleditor-height', this.editor.$el.height()); o && Common.localStorage.setBool('sse-celleditor-expand', true); } else { + this.editor.$el.removeClass('expanded'); this.editor.$btnexpand['removeClass']('btn-collapse'); o && Common.localStorage.setBool('sse-celleditor-expand', false); } @@ -232,10 +236,12 @@ define([ if ( Math.floor(this.editor.$el.height()) > 19) { this.editor.keep_height = this.editor.$el.height(); this.editor.$el.height(19); + this.editor.$el.removeClass('expanded'); this.editor.$btnexpand['removeClass']('btn-collapse'); Common.localStorage.setBool('sse-celleditor-expand', false); } else { this.editor.$el.height(this.editor.keep_height); + this.editor.$el.addClass('expanded'); this.editor.$btnexpand['addClass']('btn-collapse'); Common.localStorage.setBool('sse-celleditor-expand', true); } diff --git a/apps/spreadsheeteditor/main/app/controller/Main.js b/apps/spreadsheeteditor/main/app/controller/Main.js index fa9ab10016..987d50054d 100644 --- a/apps/spreadsheeteditor/main/app/controller/Main.js +++ b/apps/spreadsheeteditor/main/app/controller/Main.js @@ -142,7 +142,9 @@ define([ 'Days': this.txtDays, 'Months': this.txtMonths, 'Quarters': this.txtQuarters, - 'Years': this.txtYears + 'Years': this.txtYears, + '%1 or %2': this.txtOr, + 'Qtr': this.txtQuarter }; styleNames.forEach(function(item){ @@ -2919,7 +2921,9 @@ define([ leavePageTextOnClose: 'All unsaved changes in this document will be lost.
Click \'Cancel\' then \'Save\' to save them. Click \'OK\' to discard all the unsaved changes.', errorPasteMultiSelect: 'This action cannot be done on a multiple range selection.
Select a single range and try again.', textTryUndoRedoWarn: 'The Undo/Redo functions are disabled for the Fast co-editing mode.', - errorPivotWithoutUnderlying: 'The Pivot Table report was saved without the underlying data.
Use the \'Refresh\' button to update the report.' + errorPivotWithoutUnderlying: 'The Pivot Table report was saved without the underlying data.
Use the \'Refresh\' button to update the report.', + txtQuarter: 'Qtr', + txtOr: '%1 or %2' } })(), SSE.Controllers.Main || {})) }); diff --git a/apps/spreadsheeteditor/main/app/controller/Print.js b/apps/spreadsheeteditor/main/app/controller/Print.js index db4168a588..6f22a4959f 100644 --- a/apps/spreadsheeteditor/main/app/controller/Print.js +++ b/apps/spreadsheeteditor/main/app/controller/Print.js @@ -310,7 +310,7 @@ define([ Common.localStorage.setItem("sse-print-settings-range", printtype); if ( this.printSettingsDlg.type=='print' ) { - var opts = new Asc.asc_CDownloadOptions(null, Common.Utils.isChrome || Common.Utils.isSafari || Common.Utils.isOpera); + var opts = new Asc.asc_CDownloadOptions(null, Common.Utils.isChrome || Common.Utils.isSafari || Common.Utils.isOpera || Common.Utils.isGecko && Common.Utils.firefoxVersion>86); opts.asc_setAdvancedOptions(this.adjPrintParams); this.api.asc_Print(opts); } else { diff --git a/apps/spreadsheeteditor/main/app/controller/ViewTab.js b/apps/spreadsheeteditor/main/app/controller/ViewTab.js index b4c07e6369..80c9e29a4d 100644 --- a/apps/spreadsheeteditor/main/app/controller/ViewTab.js +++ b/apps/spreadsheeteditor/main/app/controller/ViewTab.js @@ -156,7 +156,12 @@ define([ caption : item.asc_getName(), checkable: true, allowDepress: false, - checked : item.asc_getIsActive() + checked : item.asc_getIsActive(), + template : _.template([ + '', + '<%= Common.Utils.String.htmlEncode(caption) %>', + '' + ].join('')) })); if (item.asc_getIsActive()) active = true; diff --git a/apps/spreadsheeteditor/main/app/template/Toolbar.template b/apps/spreadsheeteditor/main/app/template/Toolbar.template index 624f73351d..d78278a2dc 100644 --- a/apps/spreadsheeteditor/main/app/template/Toolbar.template +++ b/apps/spreadsheeteditor/main/app/template/Toolbar.template @@ -6,7 +6,7 @@
-
+
@@ -15,7 +15,7 @@
-
+
@@ -29,7 +29,7 @@
-
+
@@ -48,7 +48,7 @@
-
+
@@ -65,7 +65,7 @@
-
+
@@ -74,7 +74,7 @@
-
+
@@ -85,7 +85,7 @@
-
+
@@ -97,7 +97,7 @@
-
+
@@ -106,7 +106,7 @@
-
+
@@ -116,7 +116,7 @@
-
+
@@ -213,7 +213,7 @@
-
+
@@ -240,7 +240,7 @@
-
+
@@ -249,7 +249,7 @@
-
+
@@ -262,7 +262,7 @@
-
+
@@ -270,7 +270,7 @@
-
+
diff --git a/apps/spreadsheeteditor/main/app/template/ToolbarAnother.template b/apps/spreadsheeteditor/main/app/template/ToolbarAnother.template index 7bced25b77..cc642b5adc 100644 --- a/apps/spreadsheeteditor/main/app/template/ToolbarAnother.template +++ b/apps/spreadsheeteditor/main/app/template/ToolbarAnother.template @@ -4,7 +4,7 @@
-
+
@@ -13,13 +13,13 @@
-
+
-
+
@@ -27,7 +27,7 @@
-
+
@@ -41,7 +41,7 @@
-
+
@@ -50,21 +50,21 @@
-
+
-
+
-
+
diff --git a/apps/spreadsheeteditor/main/app/view/ChartSettings.js b/apps/spreadsheeteditor/main/app/view/ChartSettings.js index 3ca5d4ed09..bf2b95ec49 100644 --- a/apps/spreadsheeteditor/main/app/view/ChartSettings.js +++ b/apps/spreadsheeteditor/main/app/view/ChartSettings.js @@ -1128,14 +1128,16 @@ define([ expr = new RegExp('^\\s*(\\d*(\\.|,)?\\d+)\\s*(' + me.txtPt + ')?\\s*$'); if (!(expr.exec(record.value)) || value<0.01 || value>1584) { this._state.LineWeight = -1; - Common.UI.error({ - msg: this.textBorderSizeErr, - callback: function() { - _.defer(function(btn) { - Common.NotificationCenter.trigger('edit:complete', me); - }) - } - }); + setTimeout( function() { + Common.UI.error({ + msg: me.textBorderSizeErr, + callback: function() { + _.defer(function(btn) { + Common.NotificationCenter.trigger('edit:complete', me); + }) + } + }); + }, 10); } } else this.applyBorderSize(record.value); diff --git a/apps/spreadsheeteditor/main/app/view/ChartSettingsDlg.js b/apps/spreadsheeteditor/main/app/view/ChartSettingsDlg.js index 3a231213e4..dd9f3ce11d 100644 --- a/apps/spreadsheeteditor/main/app/view/ChartSettingsDlg.js +++ b/apps/spreadsheeteditor/main/app/view/ChartSettingsDlg.js @@ -394,10 +394,10 @@ define([ 'text!spreadsheeteditor/main/app/template/ChartSettingsDlg.template' var value; switch (record.value) { case Asc.c_oAscCrossesRule.minValue: - me.spnVAxisCrosses[i].setValue(me.spnMinValue.getNumberValue(), true); + me.spnVAxisCrosses[i].setValue(me.spnMinValue[i].getNumberValue(), true); break; case Asc.c_oAscCrossesRule.maxValue: - me.spnVAxisCrosses[i].setValue(me.spnMaxValue.getNumberValue(), true); + me.spnVAxisCrosses[i].setValue(me.spnMaxValue[i].getNumberValue(), true); break; case Asc.c_oAscCrossesRule.auto: me.spnVAxisCrosses[i].setValue(me._originalAxisVValues[i].crossesAuto, true); diff --git a/apps/spreadsheeteditor/main/app/view/ChartTypeDialog.js b/apps/spreadsheeteditor/main/app/view/ChartTypeDialog.js index 0fdeeef173..ba3f190ee1 100644 --- a/apps/spreadsheeteditor/main/app/view/ChartTypeDialog.js +++ b/apps/spreadsheeteditor/main/app/view/ChartTypeDialog.js @@ -193,7 +193,7 @@ define([ '
', '
', '
<%= value %>
', - '
', + '
', '
', '
' ].join('')) @@ -285,14 +285,19 @@ define([ return; } - this.btnChartType.setIconCls('svgicon ' + 'chart-' + rawData.iconCls); - this.currentChartType = rawData.type; - this.chartSettings.changeType(this.currentChartType); - this.ShowHideSettings(this.currentChartType); - if (isCombo) - this.updateSeriesList(this.chartSettings.getSeries()); - else - this.updateChartStyles(this.api.asc_getChartPreviews(this.currentChartType)); + var res = this.chartSettings.changeType(rawData.type); + if (res) { + this.btnChartType.setIconCls('svgicon ' + 'chart-' + rawData.iconCls); + this.currentChartType = rawData.type; + this.ShowHideSettings(this.currentChartType); + if (isCombo) + this.updateSeriesList(this.chartSettings.getSeries()); + else + this.updateChartStyles(this.api.asc_getChartPreviews(this.currentChartType)); + } else { + picker.selectRecord(picker.store.findWhere({type: this.currentChartType}), true); + } + }, updateChartStyles: function(styles) { @@ -388,7 +393,7 @@ define([ template: _.template([ '', '', - '', + '', '' ].join('')) }); diff --git a/apps/spreadsheeteditor/main/app/view/FileMenuPanels.js b/apps/spreadsheeteditor/main/app/view/FileMenuPanels.js index 0205798577..50ea207fa8 100644 --- a/apps/spreadsheeteditor/main/app/view/FileMenuPanels.js +++ b/apps/spreadsheeteditor/main/app/view/FileMenuPanels.js @@ -1009,10 +1009,6 @@ define([ style : 'width: 160px;', editable : false, cls : 'input-group-nr', - data : [ - { value: Common.UI.Themes.THEME_LIGHT_ID, displayValue: this.txtThemeLight }, - { value: Common.UI.Themes.THEME_DARK_ID, displayValue: this.txtThemeDark } - ] }); $markup.find('.btn.primary').each(function(index, el){ @@ -1178,8 +1174,16 @@ define([ this.chPaste.setValue(Common.Utils.InternalSettings.get("sse-settings-paste-button")); - item = this.cmbTheme.store.findWhere({value: Common.UI.Themes.current()}); - this.cmbTheme.setValue(item ? item.get('value') : Common.UI.Themes.THEME_LIGHT_ID); + var data = []; + for (var t in Common.UI.Themes.map()) { + data.push({value: t, displayValue: Common.UI.Themes.get(t).text}); + } + + if ( data.length ) { + this.cmbTheme.setData(data); + item = this.cmbTheme.store.findWhere({value: Common.UI.Themes.currentThemeId()}); + this.cmbTheme.setValue(item ? item.get('value') : Common.UI.Themes.defaultThemeId()); + } }, applySettings: function() { diff --git a/apps/spreadsheeteditor/main/app/view/FormulaWizard.js b/apps/spreadsheeteditor/main/app/view/FormulaWizard.js index 212f6eaf83..63dfe88bea 100644 --- a/apps/spreadsheeteditor/main/app/view/FormulaWizard.js +++ b/apps/spreadsheeteditor/main/app/view/FormulaWizard.js @@ -292,7 +292,7 @@ define([ var res = me.api.asc_insertArgumentsInFormula(me.getArgumentsValue(), index, arg.argType, this.funcprops ? this.funcprops.origin : undefined), argres = res ? res.asc_getArgumentsResult() : undefined; argres = argres ? argres[index] : undefined; - arg.lblValue.html('= '+ (argres!==null && argres !==undefined ? argres : '' + arg.argTypeName + '' )); + arg.lblValue.html('= '+ (argres!==null && argres !==undefined ? argres : '' + arg.argTypeName + '' )); var result = res ? res.asc_getFunctionResult() : undefined; me.lblFunctionResult.html('= ' + ((result!==undefined && result!==null)? result : '')); diff --git a/apps/spreadsheeteditor/main/app/view/HyperlinkSettingsDialog.js b/apps/spreadsheeteditor/main/app/view/HyperlinkSettingsDialog.js index e1d31ad34d..b8eb52361a 100644 --- a/apps/spreadsheeteditor/main/app/view/HyperlinkSettingsDialog.js +++ b/apps/spreadsheeteditor/main/app/view/HyperlinkSettingsDialog.js @@ -504,6 +504,7 @@ define([ this.inputDisplay.setValue(name); } else { var val = this.inputRange.getValue(); + name = this.api.asc_getEscapeSheetName(name); name = (name + ((name!=='' && val!=='') ? '!' : '') + val); } name && Common.Gateway.requestMakeActionLink({ diff --git a/apps/spreadsheeteditor/main/app/view/NameManagerDlg.js b/apps/spreadsheeteditor/main/app/view/NameManagerDlg.js index 2b73ebff3c..30c353c5c8 100644 --- a/apps/spreadsheeteditor/main/app/view/NameManagerDlg.js +++ b/apps/spreadsheeteditor/main/app/view/NameManagerDlg.js @@ -123,7 +123,7 @@ define([ 'text!spreadsheeteditor/main/app/template/NameManagerDlg.template', itemTemplate: _.template([ '
', '
">
', - '
<%= name %>
', + '
<%= Common.Utils.String.htmlEncode(name) %>
', '
<%= scopeName %>
', '
<%= range %>
', '<% if (lock) { %>', diff --git a/apps/spreadsheeteditor/main/app/view/NamedRangePasteDlg.js b/apps/spreadsheeteditor/main/app/view/NamedRangePasteDlg.js index a977ac207d..50fc843252 100644 --- a/apps/spreadsheeteditor/main/app/view/NamedRangePasteDlg.js +++ b/apps/spreadsheeteditor/main/app/view/NamedRangePasteDlg.js @@ -95,7 +95,7 @@ define([ '
', '
', '
">
', - '
<%= name %>
', + '
<%= Common.Utils.String.htmlEncode(name) %>
', '
', '
' ].join('')) diff --git a/apps/spreadsheeteditor/main/app/view/ParagraphSettingsAdvanced.js b/apps/spreadsheeteditor/main/app/view/ParagraphSettingsAdvanced.js index 3d06cc4534..06775e9c64 100644 --- a/apps/spreadsheeteditor/main/app/view/ParagraphSettingsAdvanced.js +++ b/apps/spreadsheeteditor/main/app/view/ParagraphSettingsAdvanced.js @@ -412,7 +412,7 @@ define([ 'text!spreadsheeteditor/main/app/template/ParagraphSettingsAdvanced. ]; }, - onCategoryClick: function(btn, index) { + onCategoryClick: function(btn, index, cmp, e) { Common.Views.AdvancedSettingsWindow.prototype.onCategoryClick.call(this, btn, index); var me = this; @@ -423,6 +423,8 @@ define([ 'text!spreadsheeteditor/main/app/template/ParagraphSettingsAdvanced. break; case 1: me.chStrike.focus(); + if (e && (e instanceof jQuery.Event)) + me.api.asc_setDrawImagePlaceParagraph('paragraphadv-font-img', me._originalProps || new Asc.asc_CParagraphProperty()); break; case 2: me.numDefaultTab.focus(); @@ -431,6 +433,10 @@ define([ 'text!spreadsheeteditor/main/app/template/ParagraphSettingsAdvanced. }, 10); }, + onAnimateAfter: function() { + (this.getActiveCategory()==1) && this.api.asc_setDrawImagePlaceParagraph('paragraphadv-font-img', this._originalProps || new Asc.asc_CParagraphProperty()); + }, + getSettings: function() { if ( this._tabListChanged ) { if (this._changedProps.asc_getTabs()===null || this._changedProps.asc_getTabs()===undefined) @@ -489,8 +495,6 @@ define([ 'text!spreadsheeteditor/main/app/template/ParagraphSettingsAdvanced. this.numSpacing.setValue((props.asc_getTextSpacing() !== null && props.asc_getTextSpacing() !== undefined) ? Common.Utils.Metric.fnRecalcFromMM(props.asc_getTextSpacing()) : '', true); - this.api.asc_setDrawImagePlaceParagraph('paragraphadv-font-img', this._originalProps); - // Tabs this.numDefaultTab.setValue((props.asc_getDefaultTab() !== null && props.asc_getDefaultTab() !== undefined) ? Common.Utils.Metric.fnRecalcFromMM(parseFloat(props.asc_getDefaultTab().toFixed(1))) : '', true); diff --git a/apps/spreadsheeteditor/main/app/view/PivotGroupDialog.js b/apps/spreadsheeteditor/main/app/view/PivotGroupDialog.js index efa5bc6dbc..5a5dee0eae 100644 --- a/apps/spreadsheeteditor/main/app/view/PivotGroupDialog.js +++ b/apps/spreadsheeteditor/main/app/view/PivotGroupDialog.js @@ -242,9 +242,11 @@ define([ if (rangePr) { this.chStart.setValue(rangePr.asc_getAutoStart(), true); this.chEnd.setValue(rangePr.asc_getAutoEnd(), true); - this.inputStart.setValue((dateTypes ? rangePr.asc_getStartDateText() : rangePr.asc_getStartNum()) || ''); - this.inputEnd.setValue((dateTypes ? rangePr.asc_getEndDateText() : rangePr.asc_getEndNum()) || ''); - !dateTypes && this.inputBy.setValue(rangePr.asc_getGroupInterval() || ''); + var value = dateTypes ? rangePr.asc_getStartDateText() : rangePr.asc_getStartNum(); + this.inputStart.setValue(value!==null && value!==undefined ? value : ''); + value = dateTypes ? rangePr.asc_getEndDateText() : rangePr.asc_getEndNum(); + this.inputEnd.setValue(value!==null && value!==undefined ? value : ''); + !dateTypes && this.inputBy.setValue(rangePr.asc_getGroupInterval()); this.rangePr = rangePr; if (defRangePr) { this.defRangePr = {start: dateTypes ? defRangePr.asc_getStartDateText() : defRangePr.asc_getStartNum(), end: dateTypes ? defRangePr.asc_getEndDateText() : defRangePr.asc_getEndNum()}; @@ -259,7 +261,7 @@ define([ if (item == Asc.c_oAscGroupBy.Days) isDays = true; }); - this.spnDays.setValue(rangePr.asc_getGroupInterval() || ''); + this.spnDays.setValue(rangePr.asc_getGroupInterval()); this.spnDays.setDisabled(!isDays || dateTypes.length>1); this.btnOk.setDisabled(dateTypes.length<1); this.dateTypes = dateTypes; diff --git a/apps/spreadsheeteditor/main/app/view/PivotTable.js b/apps/spreadsheeteditor/main/app/view/PivotTable.js index 0598af43ea..0b6be69386 100644 --- a/apps/spreadsheeteditor/main/app/view/PivotTable.js +++ b/apps/spreadsheeteditor/main/app/view/PivotTable.js @@ -71,7 +71,7 @@ define([ '' + '
' + '
' + - '
' + + '
' + '
' + '' + '
' + @@ -79,7 +79,7 @@ define([ '' + '
' + '
' + - '
' + + '
' + '
' + '' + '
' + @@ -87,7 +87,7 @@ define([ '' + '
' + '
' + - '
' + + '
' + '
' + '
'; diff --git a/apps/spreadsheeteditor/main/app/view/ShapeSettings.js b/apps/spreadsheeteditor/main/app/view/ShapeSettings.js index 6fb27fc46d..0b5a3b1b9f 100644 --- a/apps/spreadsheeteditor/main/app/view/ShapeSettings.js +++ b/apps/spreadsheeteditor/main/app/view/ShapeSettings.js @@ -604,14 +604,16 @@ define([ expr = new RegExp('^\\s*(\\d*(\\.|,)?\\d+)\\s*(' + me.txtPt + ')?\\s*$'); if (!(expr.exec(record.value)) || value<0 || value>1584) { this._state.StrokeType = this._state.StrokeWidth = -1; - Common.UI.error({ - msg: this.textBorderSizeErr, - callback: function() { - _.defer(function(btn) { - Common.NotificationCenter.trigger('edit:complete', me); - }) - } - }); + setTimeout( function() { + Common.UI.error({ + msg: me.textBorderSizeErr, + callback: function() { + _.defer(function(btn) { + Common.NotificationCenter.trigger('edit:complete', me); + }) + } + }); + }, 10); } } else this.applyBorderSize(record.value); diff --git a/apps/spreadsheeteditor/main/app/view/TableSettings.js b/apps/spreadsheeteditor/main/app/view/TableSettings.js index 12cae83517..53f4e456f0 100644 --- a/apps/spreadsheeteditor/main/app/view/TableSettings.js +++ b/apps/spreadsheeteditor/main/app/view/TableSettings.js @@ -452,7 +452,7 @@ define([ this.mnuTableTemplatePicker.selectRecord(rec, true); this.btnTableTemplate.resumeEvents(); - this.$el.find('.icon-template-table').css({'background-image': 'url(' + rec.get("imageUrl") + ')', 'height': '48px', 'width': '63px', 'background-position': 'center', 'background-size': 'cover'}); + this.$el.find('.icon-template-table').css({'background-image': 'url(' + rec.get("imageUrl") + ')', 'height': '48px', 'width': '63px', 'background-position': 'center', 'background-size': 'auto 50px'}); this._state.TemplateName=value; } diff --git a/apps/spreadsheeteditor/main/app/view/TextArtSettings.js b/apps/spreadsheeteditor/main/app/view/TextArtSettings.js index b0b4b315ca..4ac5008871 100644 --- a/apps/spreadsheeteditor/main/app/view/TextArtSettings.js +++ b/apps/spreadsheeteditor/main/app/view/TextArtSettings.js @@ -94,7 +94,8 @@ define([ GradColor: '000000', GradFillType: Asc.c_oAscFillGradType.GRAD_LINEAR, FormId: null, - DisabledControls: false + DisabledControls: false, + applicationPixelRatio: Common.Utils.applicationPixelRatio() }; this.lockedControls = []; this._locked = false; @@ -135,6 +136,7 @@ define([ el.html(this.template({ scope: this })); + $(window).on('resize', _.bind(this.onWindowResize, this)); }, setApi: function(api) { @@ -595,14 +597,16 @@ define([ expr = new RegExp('^\\s*(\\d*(\\.|,)?\\d+)\\s*(' + me.txtPt + ')?\\s*$'); if (!(expr.exec(record.value)) || value<0 || value>1584) { this._state.StrokeType = this._state.StrokeWidth = -1; - Common.UI.error({ - msg: this.textBorderSizeErr, - callback: function() { - _.defer(function(btn) { - Common.NotificationCenter.trigger('edit:complete', me); - }) - } - }); + setTimeout( function() { + Common.UI.error({ + msg: me.textBorderSizeErr, + callback: function() { + _.defer(function(btn) { + Common.NotificationCenter.trigger('edit:complete', me); + }) + } + }); + }, 10); } } else this.applyBorderSize(record.value); @@ -1543,22 +1547,17 @@ define([ }, fillTransform: function(transforms) { - if (transforms && transforms.length>1 && transforms[1]){ - var me = this, - artStore = [], - arrTransforms = transforms[1]; - for (var i=0; i0) - _.each(arr, function(item){ - artStore.push({ - imageUrl: item.Image, - type : item.Type, - selected: false - }); - }); + if (transforms){ + var artStore = []; + for (var i=0; i 0) { this.cmbTransform.fillComboView(this.cmbTransform.menuPicker.store.at(0),true); } @@ -1730,6 +1729,13 @@ define([ } }, + onWindowResize: function() { + if (!this._initSettings && this._state.applicationPixelRatio !== Common.Utils.applicationPixelRatio()) + this.fillTransform(this.api.asc_getPropertyEditorTextArts()); + + this._state.applicationPixelRatio = Common.Utils.applicationPixelRatio(); + }, + txtNoBorders : 'No Line', strStroke : 'Stroke', strColor : 'Color', diff --git a/apps/spreadsheeteditor/main/app/view/ViewManagerDlg.js b/apps/spreadsheeteditor/main/app/view/ViewManagerDlg.js index b60151eb97..b9ba13f3ff 100644 --- a/apps/spreadsheeteditor/main/app/view/ViewManagerDlg.js +++ b/apps/spreadsheeteditor/main/app/view/ViewManagerDlg.js @@ -118,7 +118,7 @@ define([ template: _.template(['
'].join('')), itemTemplate: _.template([ '
', - '
<%= name %>
', + '
<%= Common.Utils.String.htmlEncode(name) %>
', '<% if (lock) { %>', '
<%=lockuser%>
', '<% } %>', diff --git a/apps/spreadsheeteditor/main/index.html b/apps/spreadsheeteditor/main/index.html index 4480d5f394..26e58915b5 100644 --- a/apps/spreadsheeteditor/main/index.html +++ b/apps/spreadsheeteditor/main/index.html @@ -13,12 +13,16 @@ --background-toolbar: #404040; --background-normal: #333; --border-toolbar: #2a2a2a; - --highlight-button-pressed: #606060; + --highlight-button-hover: #606060; --canvas-background: #666666; /*--canvas-content-background: #fff;*/ --canvas-page-border: #555; } + .theme-classic-light { + --highlight-button-hover: #d8dadc; + } + .loadmask { left: 0; top: 0; @@ -88,7 +92,7 @@ .loadmask > .sktoolbar li { background: #ccc; - background: var(--highlight-button-pressed, #ccc); + background: var(--highlight-button-hover, #ccc); border-radius: 3px; width: 20px; height: 20px; diff --git a/apps/spreadsheeteditor/main/index.html.deploy b/apps/spreadsheeteditor/main/index.html.deploy index f23b742c26..7a0e5eb6fa 100644 --- a/apps/spreadsheeteditor/main/index.html.deploy +++ b/apps/spreadsheeteditor/main/index.html.deploy @@ -79,7 +79,7 @@ .loadmask > .sktoolbar li { background: #ccc; - background: var(--highlight-button-pressed, #ccc); + background: var(--highlight-button-hover, #ccc); border-radius: 3px; width: 20px; height: 20px; diff --git a/apps/spreadsheeteditor/main/locale/da.json b/apps/spreadsheeteditor/main/locale/da.json index ac1b080aea..1bbb3e9161 100644 --- a/apps/spreadsheeteditor/main/locale/da.json +++ b/apps/spreadsheeteditor/main/locale/da.json @@ -144,7 +144,6 @@ "Common.Views.Header.textAdvSettings": "Avancerede indstillinger", "Common.Views.Header.textBack": "Gå til dokumentplacering", "Common.Views.Header.textCompactView": "Skjul værktøjslinie", - "Common.Views.Header.textDarkTheme": "Mørkt tema", "Common.Views.Header.textHideLines": "Skjul lineal", "Common.Views.Header.textHideStatusBar": "Skjul statuslinie", "Common.Views.Header.textRemoveFavorite": "Fjern fra Favoritter", @@ -1936,8 +1935,6 @@ "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtRunMacrosDesc": "Aktivér alle makroer uden meddelelse", "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtStopMacros": "Deaktivér alle", "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtStopMacrosDesc": "Deaktivér alle makroer uden meddelelse", - "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtThemeDark": "Mørk", - "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtThemeLight": "Lys", "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtWarnMacros": "Vis besked", "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtWarnMacrosDesc": "Deaktivér alle makroer med", "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtWin": "som Windows", diff --git a/apps/spreadsheeteditor/main/locale/de.json b/apps/spreadsheeteditor/main/locale/de.json index 5da6a2e93a..0d99f523c2 100644 --- a/apps/spreadsheeteditor/main/locale/de.json +++ b/apps/spreadsheeteditor/main/locale/de.json @@ -144,7 +144,6 @@ "Common.Views.Header.textAdvSettings": "Erweiterte Einstellungen", "Common.Views.Header.textBack": "Dateispeicherort öffnen", "Common.Views.Header.textCompactView": "Symbolleiste ausblenden", - "Common.Views.Header.textDarkTheme": "Dunkelmodus", "Common.Views.Header.textHideLines": "Lineale verbergen", "Common.Views.Header.textHideStatusBar": "Statusleiste verbergen", "Common.Views.Header.textRemoveFavorite": "Aus Favoriten entfernen", @@ -1938,8 +1937,6 @@ "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtRunMacrosDesc": "Aktivieren aller Makros ohne Benachrichtigung", "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtStopMacros": "Alle deaktivieren.", "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtStopMacrosDesc": "Alle Makros ohne Benachrichtigung deaktivieren", - "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtThemeDark": "Dunkel", - "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtThemeLight": "Hell", "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtWarnMacros": "Benachrichtigungen anzeigen", "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtWarnMacrosDesc": "Alle Makros mit einer Benachrichtigung deaktivieren", "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtWin": "wie Windows", diff --git a/apps/spreadsheeteditor/main/locale/el.json b/apps/spreadsheeteditor/main/locale/el.json index 677d5be683..34db830375 100644 --- a/apps/spreadsheeteditor/main/locale/el.json +++ b/apps/spreadsheeteditor/main/locale/el.json @@ -144,7 +144,6 @@ "Common.Views.Header.textAdvSettings": "Προηγμένες ρυθμίσεις", "Common.Views.Header.textBack": "Άνοιγμα τοποθεσίας αρχείου", "Common.Views.Header.textCompactView": "Απόκρυψη Γραμμής Εργαλείων", - "Common.Views.Header.textDarkTheme": "Σκούρο θέμα", "Common.Views.Header.textHideLines": "Απόκρυψη Χαράκων", "Common.Views.Header.textHideStatusBar": "Απόκρυψη Γραμμής Κατάστασης", "Common.Views.Header.textRemoveFavorite": "Αφαίρεση από τα Αγαπημένα", @@ -1936,8 +1935,6 @@ "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtRunMacrosDesc": "Ενεργοποίηση όλων των μακροεντολών χωρίς ειδοποίηση", "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtStopMacros": "Απενεργοποίηση όλων", "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtStopMacrosDesc": "Απενεργοποίηση όλων των μακροεντολών χωρίς ειδοποίηση", - "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtThemeDark": "Σκούρο", - "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtThemeLight": "Ανοιχτό", "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtWarnMacros": "Εμφάνιση Ειδοποίησης", "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtWarnMacrosDesc": "Απενεργοποίηση όλων των μακροεντολών με μια ειδοποίηση", "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtWin": "ως Windows", diff --git a/apps/spreadsheeteditor/main/locale/en.json b/apps/spreadsheeteditor/main/locale/en.json index 12c1795743..d266889494 100644 --- a/apps/spreadsheeteditor/main/locale/en.json +++ b/apps/spreadsheeteditor/main/locale/en.json @@ -100,6 +100,8 @@ "Common.define.conditionalData.textValue": "Value is", "Common.define.conditionalData.textYesterday": "Yesterday", "Common.Translation.warnFileLocked": "The file is being edited in another app. You can continue editing and save it as a copy.", + "Common.Translation.warnFileLockedBtnEdit": "Create a copy", + "Common.Translation.warnFileLockedBtnView": "Open for viewing", "Common.UI.ColorButton.textAutoColor": "Automatic", "Common.UI.ColorButton.textNewColor": "Add New Custom Color", "Common.UI.ComboBorderSize.txtNoBorders": "No borders", @@ -125,6 +127,9 @@ "Common.UI.SynchronizeTip.textSynchronize": "The document has been changed by another user.
Please click to save your changes and reload the updates.", "Common.UI.ThemeColorPalette.textStandartColors": "Standard Colors", "Common.UI.ThemeColorPalette.textThemeColors": "Theme Colors", + "Common.UI.Themes.txtThemeClassicLight": "Classic Light", + "Common.UI.Themes.txtThemeDark": "Dark", + "Common.UI.Themes.txtThemeLight": "Light", "Common.UI.Window.cancelButtonText": "Cancel", "Common.UI.Window.closeButtonText": "Close", "Common.UI.Window.noButtonText": "No", @@ -195,7 +200,6 @@ "Common.Views.Header.textAdvSettings": "Advanced settings", "Common.Views.Header.textBack": "Open file location", "Common.Views.Header.textCompactView": "Hide Toolbar", - "Common.Views.Header.textDarkTheme": "Dark theme", "Common.Views.Header.textHideLines": "Hide Rulers", "Common.Views.Header.textHideStatusBar": "Hide Status Bar", "Common.Views.Header.textRemoveFavorite": "Remove from Favorites", @@ -766,6 +770,8 @@ "SSE.Controllers.Main.txtPreparedBy": "Prepared by", "SSE.Controllers.Main.txtPrintArea": "Print_Area", "SSE.Controllers.Main.txtQuarters": "Quarters", + "SSE.Controllers.Main.txtQuarter": "Qtr", + "SSE.Controllers.Main.txtOr": "%1 or %2", "SSE.Controllers.Main.txtRectangles": "Rectangles", "SSE.Controllers.Main.txtRow": "Row", "SSE.Controllers.Main.txtRowLbls": "Row Labels", @@ -2032,8 +2038,6 @@ "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtRunMacrosDesc": "Enable all macros without a notification", "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtStopMacros": "Disable All", "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtStopMacrosDesc": "Disable all macros without a notification", - "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtThemeDark": "Dark", - "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtThemeLight": "Light", "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtWarnMacros": "Show Notification", "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtWarnMacrosDesc": "Disable all macros with a notification", "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtWin": "as Windows", diff --git a/apps/spreadsheeteditor/main/locale/es.json b/apps/spreadsheeteditor/main/locale/es.json index 4a3367fa8d..6591d6e054 100644 --- a/apps/spreadsheeteditor/main/locale/es.json +++ b/apps/spreadsheeteditor/main/locale/es.json @@ -144,7 +144,6 @@ "Common.Views.Header.textAdvSettings": "Ajustes avanzados", "Common.Views.Header.textBack": "Abrir ubicación del archivo", "Common.Views.Header.textCompactView": "Esconder barra de herramientas", - "Common.Views.Header.textDarkTheme": "Tema oscuro", "Common.Views.Header.textHideLines": "Ocultar reglas", "Common.Views.Header.textHideStatusBar": "Ocultar barra de estado", "Common.Views.Header.textRemoveFavorite": "Eliminar de Favoritos", @@ -1938,8 +1937,6 @@ "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtRunMacrosDesc": "Habilitar todas las macros sin notificación ", "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtStopMacros": "Deshabilitar todo", "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtStopMacrosDesc": "Deshabilitar todas las macros sin notificación", - "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtThemeDark": "Oscuro", - "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtThemeLight": "Claro", "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtWarnMacros": "Mostrar notificación", "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtWarnMacrosDesc": "Deshabilitar todas las macros con notificación", "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtWin": "como Windows", diff --git a/apps/spreadsheeteditor/main/locale/fr.json b/apps/spreadsheeteditor/main/locale/fr.json index 57b5c97c39..0d220bae8e 100644 --- a/apps/spreadsheeteditor/main/locale/fr.json +++ b/apps/spreadsheeteditor/main/locale/fr.json @@ -144,7 +144,6 @@ "Common.Views.Header.textAdvSettings": "Paramètres avancés", "Common.Views.Header.textBack": "Ouvrir l'emplacement du fichier", "Common.Views.Header.textCompactView": "Masquer la barre d'outils", - "Common.Views.Header.textDarkTheme": "Thème sombre", "Common.Views.Header.textHideLines": "Masquer les règles", "Common.Views.Header.textHideStatusBar": "Masquer la barre d'état", "Common.Views.Header.textRemoveFavorite": "Enlever des favoris", @@ -1938,8 +1937,6 @@ "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtRunMacrosDesc": "Activer tous les macros sans notification", "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtStopMacros": "Désactiver tout", "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtStopMacrosDesc": "Désactiver tous les macros sans notification", - "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtThemeDark": "Sombre", - "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtThemeLight": "Clair", "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtWarnMacros": "Montrer la notification", "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtWarnMacrosDesc": "Désactiver tous les macros avec notification", "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtWin": "comme Windows", diff --git a/apps/spreadsheeteditor/main/locale/hu.json b/apps/spreadsheeteditor/main/locale/hu.json index 98d7fe71a4..53513adbee 100644 --- a/apps/spreadsheeteditor/main/locale/hu.json +++ b/apps/spreadsheeteditor/main/locale/hu.json @@ -144,7 +144,6 @@ "Common.Views.Header.textAdvSettings": "Haladó beállítások", "Common.Views.Header.textBack": "Fájl helyének megnyitása", "Common.Views.Header.textCompactView": "Eszköztár elrejtése", - "Common.Views.Header.textDarkTheme": "Sötét téma", "Common.Views.Header.textHideLines": "Vonalzók elrejtése", "Common.Views.Header.textHideStatusBar": "Állapotsor elrejtése", "Common.Views.Header.textRemoveFavorite": "Eltávolítás a kedvencekből", @@ -1936,8 +1935,6 @@ "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtRunMacrosDesc": "Minden értesítés nélküli makró engedélyezése", "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtStopMacros": "Összes letiltása", "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtStopMacrosDesc": "Minden értesítés nélküli makró letiltása", - "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtThemeDark": "Sötét", - "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtThemeLight": "Világos", "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtWarnMacros": "Értesítés mutatása", "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtWarnMacrosDesc": "Minden értesítéssel rendelkező makró letiltása", "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtWin": "Windows-ként", diff --git a/apps/spreadsheeteditor/main/locale/ja.json b/apps/spreadsheeteditor/main/locale/ja.json index 2a5f398047..f595967cc9 100644 --- a/apps/spreadsheeteditor/main/locale/ja.json +++ b/apps/spreadsheeteditor/main/locale/ja.json @@ -142,7 +142,6 @@ "Common.Views.Header.textAdvSettings": "詳細設定", "Common.Views.Header.textBack": "文書URLを開く", "Common.Views.Header.textCompactView": "ツールバーを表示しない", - "Common.Views.Header.textDarkTheme": "ダークテーマ", "Common.Views.Header.textHideLines": "ルーラーを表示しない", "Common.Views.Header.textHideStatusBar": "ステータスバーを表示しない", "Common.Views.Header.textRemoveFavorite": "お気に入りから削除", @@ -1928,8 +1927,6 @@ "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtRunMacrosDesc": "マクロを有効にして、通知しない", "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtStopMacros": "全てを無効にする", "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtStopMacrosDesc": "マクロを無効にして、通知しない", - "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtThemeDark": "ダーク", - "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtThemeLight": "ライト", "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtWarnMacros": "通知を表示する", "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtWarnMacrosDesc": "マクロを無効にして、通知する", "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtWin": "Windowsのような", diff --git a/apps/spreadsheeteditor/main/locale/nl.json b/apps/spreadsheeteditor/main/locale/nl.json index 65626a0d32..e7672af672 100644 --- a/apps/spreadsheeteditor/main/locale/nl.json +++ b/apps/spreadsheeteditor/main/locale/nl.json @@ -144,7 +144,6 @@ "Common.Views.Header.textAdvSettings": "Geavanceerde instellingen", "Common.Views.Header.textBack": "Open bestandlocatie", "Common.Views.Header.textCompactView": "Werkbalk Verbergen", - "Common.Views.Header.textDarkTheme": "Donker thema ", "Common.Views.Header.textHideLines": "Linialen verbergen", "Common.Views.Header.textHideStatusBar": "Statusbalk verbergen", "Common.Views.Header.textRemoveFavorite": "Verwijder uit favorieten", @@ -1936,8 +1935,6 @@ "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtRunMacrosDesc": "Schakel alle macro's in zonder een notificatie", "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtStopMacros": "Alles uitschakelen", "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtStopMacrosDesc": "Schakel alle macro's uit zonder melding", - "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtThemeDark": "Donker", - "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtThemeLight": "licht", "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtWarnMacros": "Weergeef notificatie", "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtWarnMacrosDesc": "Schakel alle macro's uit met een melding", "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtWin": "als Windows", diff --git a/apps/spreadsheeteditor/main/locale/ro.json b/apps/spreadsheeteditor/main/locale/ro.json index f082b13837..7ad9649970 100644 --- a/apps/spreadsheeteditor/main/locale/ro.json +++ b/apps/spreadsheeteditor/main/locale/ro.json @@ -144,7 +144,6 @@ "Common.Views.Header.textAdvSettings": "Setări avansate", "Common.Views.Header.textBack": "Deschidere locația fișierului", "Common.Views.Header.textCompactView": "Ascundere bară de instrumente", - "Common.Views.Header.textDarkTheme": "Tema întunecată", "Common.Views.Header.textHideLines": "Ascundere rigle", "Common.Views.Header.textHideStatusBar": "Ascundere bară de stare", "Common.Views.Header.textRemoveFavorite": "Eliminare din Preferințe", @@ -1936,8 +1935,6 @@ "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtRunMacrosDesc": "Se activează toate macrocomenzile, fără notificare", "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtStopMacros": "Se dezactivează toate", "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtStopMacrosDesc": "Se dezactivează toate macrocomenzile, fără notificare", - "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtThemeDark": "Întunecat", - "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtThemeLight": "Luminozitate", "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtWarnMacros": "Afișare notificări", "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtWarnMacrosDesc": "Se dezactivează toate macrocomenzile, cu notificare ", "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtWin": "ca Windows", diff --git a/apps/spreadsheeteditor/main/locale/ru.json b/apps/spreadsheeteditor/main/locale/ru.json index 17906a4706..70d7473197 100644 --- a/apps/spreadsheeteditor/main/locale/ru.json +++ b/apps/spreadsheeteditor/main/locale/ru.json @@ -49,6 +49,8 @@ "Common.define.chartData.textSurface": "Поверхность", "Common.define.chartData.textWinLossSpark": "Выигрыш/проигрыш", "Common.Translation.warnFileLocked": "Файл редактируется в другом приложении. Вы можете продолжить редактирование и сохранить его как копию.", + "Common.Translation.warnFileLockedBtnEdit": "Создать копию", + "Common.Translation.warnFileLockedBtnView": "Открыть на просмотр", "Common.UI.ColorButton.textAutoColor": "Автоматический", "Common.UI.ColorButton.textNewColor": "Пользовательский цвет", "Common.UI.ComboBorderSize.txtNoBorders": "Без границ", @@ -74,6 +76,9 @@ "Common.UI.SynchronizeTip.textSynchronize": "Документ изменен другим пользователем.
Нажмите, чтобы сохранить свои изменения и загрузить обновления.", "Common.UI.ThemeColorPalette.textStandartColors": "Стандартные цвета", "Common.UI.ThemeColorPalette.textThemeColors": "Цвета темы", + "Common.UI.Themes.txtThemeClassicLight": "Светлая классическая", + "Common.UI.Themes.txtThemeDark": "Темная", + "Common.UI.Themes.txtThemeLight": "Светлая", "Common.UI.Window.cancelButtonText": "Отмена", "Common.UI.Window.closeButtonText": "Закрыть", "Common.UI.Window.noButtonText": "Нет", @@ -144,7 +149,6 @@ "Common.Views.Header.textAdvSettings": "Дополнительные параметры", "Common.Views.Header.textBack": "Открыть расположение файла", "Common.Views.Header.textCompactView": "Скрыть панель инструментов", - "Common.Views.Header.textDarkTheme": "Темная тема", "Common.Views.Header.textHideLines": "Скрыть линейки", "Common.Views.Header.textHideStatusBar": "Скрыть строку состояния", "Common.Views.Header.textRemoveFavorite": "Удалить из избранного", @@ -687,7 +691,9 @@ "SSE.Controllers.Main.txtFiguredArrows": "Фигурные стрелки", "SSE.Controllers.Main.txtFile": "Файл", "SSE.Controllers.Main.txtGrandTotal": "Общий итог", - "SSE.Controllers.Main.txtGroup": "Сгруппировать", + "SSE.Controllers.Main.txtGroup": "Группа", + "SSE.Controllers.Main.txtQuarter": "Кв-л", + "SSE.Controllers.Main.txtOr": "%1 или %2", "SSE.Controllers.Main.txtHours": "Часы", "SSE.Controllers.Main.txtLines": "Линии", "SSE.Controllers.Main.txtMath": "Математические знаки", @@ -1938,8 +1944,6 @@ "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtRunMacrosDesc": "Включить все макросы без уведомления", "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtStopMacros": "Отключить все", "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtStopMacrosDesc": "Отключить все макросы без уведомления", - "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtThemeDark": "Темная", - "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtThemeLight": "Светлая", "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtWarnMacros": "Показывать уведомление", "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtWarnMacrosDesc": "Отключить все макросы с уведомлением", "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtWin": "как Windows", diff --git a/apps/spreadsheeteditor/main/resources/img/toolbar/BorderSize@1.5x.png b/apps/spreadsheeteditor/main/resources/img/toolbar/BorderSize@1.5x.png new file mode 100644 index 0000000000..18d70bd140 Binary files /dev/null and b/apps/spreadsheeteditor/main/resources/img/toolbar/BorderSize@1.5x.png differ diff --git a/apps/spreadsheeteditor/main/resources/less/app.less b/apps/spreadsheeteditor/main/resources/less/app.less index fed2e5b4ce..d0cd39be25 100644 --- a/apps/spreadsheeteditor/main/resources/less/app.less +++ b/apps/spreadsheeteditor/main/resources/less/app.less @@ -10,6 +10,7 @@ // Bootstrap overwrite @import "../../../../common/main/resources/less/variables.less"; @import "../../../../common/main/resources/less/colors-table.less"; +@import "../../../../common/main/resources/less/colors-table-classic.less"; @import "../../../../common/main/resources/less/colors-table-dark.less"; // diff --git a/apps/spreadsheeteditor/main/resources/less/celleditor.less b/apps/spreadsheeteditor/main/resources/less/celleditor.less index 1cf73a6e66..90fb81afcf 100644 --- a/apps/spreadsheeteditor/main/resources/less/celleditor.less +++ b/apps/spreadsheeteditor/main/resources/less/celleditor.less @@ -4,20 +4,21 @@ border-left: solid @scaled-one-px-value-ie @border-toolbar-ie; border-left: solid @scaled-one-px-value @border-toolbar; min-height: 20px; - background-color: @background-normal-ie; - background-color: @background-normal; + background-color: @background-toolbar-ie; + background-color: @background-toolbar; .ce-group-name { float: left; height: 20px; - border-bottom: @scaled-one-px-value-ie solid @border-toolbar-ie; - border-bottom: @scaled-one-px-value solid @border-toolbar; + //border-bottom: @scaled-one-px-value-ie solid @border-toolbar-ie; + //border-bottom: @scaled-one-px-value solid @border-toolbar; background-color: @background-toolbar-ie; background-color: @background-toolbar; #ce-cell-name { width: 100px; height: 19px; + height: calc(19px + (1px - 1px/var(--pixel-ratio-factor,1))); padding: 0px 19px 0 4px; vertical-align: top; display: inline-block; @@ -26,6 +27,8 @@ border-right: @scaled-one-px-value solid @border-toolbar; transition: none; -webkit-transition: none; + box-shadow: 0 @scaled-one-px-value-ie 0 0 @border-toolbar-ie; + box-shadow: 0 @scaled-one-px-value 0 0 @border-toolbar; &[disabled] { color: @border-preview-select-ie; @@ -53,7 +56,7 @@ &:active:not(.disabled), &.active:not(.disabled){ .caret { - background-position: @arrow-small-offset-x @arrow-small-offset-y; + border-color: @icon-normal; } } } @@ -75,9 +78,19 @@ } } + &:not(.expanded) { + #ce-func-label { + border-bottom: @scaled-one-px-value-ie solid @border-toolbar-ie; + border-bottom: @scaled-one-px-value solid @border-toolbar; + } + } + .ce-group-expand { float: right; - height: 20px; + //height: 20px; + height: 100%; + background-color: @background-normal-ie; + background-color: @background-normal; } .ce-group-content { @@ -130,8 +143,8 @@ padding: 0 2px 0; .caret { - background-position: @arrow-small-offset-x @arrow-small-offset-y; transition: transform .2s; + border-color: @icon-normal; } &.btn-collapse { diff --git a/apps/spreadsheeteditor/main/resources/less/rightmenu.less b/apps/spreadsheeteditor/main/resources/less/rightmenu.less index c9619e6cf8..8daedd91f6 100644 --- a/apps/spreadsheeteditor/main/resources/less/rightmenu.less +++ b/apps/spreadsheeteditor/main/resources/less/rightmenu.less @@ -208,23 +208,14 @@ .combo-border-size.cell-border-type { img, .image { background-image: ~"url(@{app-image-const-path}/toolbar/BorderSize.png)"; + background-size: 60px auto; - @media only screen { - //@media (-webkit-min-device-pixel-ratio: 1.5) and (-webkit-max-device-pixel-ratio: 1.9), - // (min-resolution: 1.5dppx) and (max-resolution: 1.9dppx), - // (min-resolution: 144dpi) and (max-resolution: 191dpi) - //{ - // background-image: ~"url(@{app-image-const-path}/toolbar/BorderSize@1.5x.png)"; - // background-size: 60px auto; - //} + .pixel-ratio__1_5 & { + background-image: ~"url(@{app-image-const-path}/toolbar/BorderSize@1.5x.png)"; + } - @media (-webkit-min-device-pixel-ratio: 2), - (min-resolution: 2dppx), - (min-resolution: 192dpi) - { - background-image: ~"url(@{app-image-const-path}/toolbar/BorderSize@2x.png)"; - background-size: 60px auto; - } + .pixel-ratio__2 & { + background-image: ~"url(@{app-image-const-path}/toolbar/BorderSize@2x.png)"; } } } diff --git a/apps/spreadsheeteditor/main/resources/less/toolbar.less b/apps/spreadsheeteditor/main/resources/less/toolbar.less index 1f6f0b9eb8..e3a19c398c 100644 --- a/apps/spreadsheeteditor/main/resources/less/toolbar.less +++ b/apps/spreadsheeteditor/main/resources/less/toolbar.less @@ -78,26 +78,19 @@ #format-rules-borders-border-width { .border-size-item { background: ~"url(@{app-image-const-path}/toolbar/BorderSize.png) no-repeat scroll 0 0"; + background-size: 60px auto; width: 60px; height: 20px; margin: -3px 10px -2px; + filter: @img-border-type-filter; - @media only screen { - //@media (-webkit-min-device-pixel-ratio: 1.5) and (-webkit-max-device-pixel-ratio: 1.9), - // (min-resolution: 1.5dppx) and (max-resolution: 1.9dppx), - // (min-resolution: 144dpi) and (max-resolution: 191dpi) - //{ - // background-image: ~"url(@{app-image-const-path}/toolbar/BorderSize@1.5x.png)"; - // background-size: 60px auto; - //} + .pixel-ratio__1_5 & { + background-image: ~"url(@{app-image-const-path}/toolbar/BorderSize@1.5x.png)"; + //background-image: ~"url(@{app-image-const-path}/toolbar/BorderSize@1.5x.png)"; + } - @media (-webkit-min-device-pixel-ratio: 2), - (min-resolution: 2dppx), - (min-resolution: 192dpi) - { - background-image: ~"url(@{app-image-const-path}/toolbar/BorderSize@2x.png)"; - background-size: 60px auto; - } + .pixel-ratio__2 & { + background-image: ~"url(@{app-image-const-path}/toolbar/BorderSize@2x.png)"; } } } @@ -159,6 +152,6 @@ .combo-styles { .view, .dropdown-menu { - background-color: @canvas-content-background; + //background-color: @canvas-content-background; } } \ No newline at end of file diff --git a/apps/spreadsheeteditor/mobile/app/controller/Main.js b/apps/spreadsheeteditor/mobile/app/controller/Main.js index 009aac0d6d..08872692e5 100644 --- a/apps/spreadsheeteditor/mobile/app/controller/Main.js +++ b/apps/spreadsheeteditor/mobile/app/controller/Main.js @@ -1154,6 +1154,10 @@ define([ config.msg = errData && errData.asc_getError() ? Common.Utils.String.htmlEncode(errData.asc_getError()) : this.errorDataValidate; break; + case Asc.c_oAscError.ID.LockedCellPivot: + config.msg = this.errorLockedCellPivot; + break; + default: config.msg = this.errorDefaultMessage.replace('%1', id); break; @@ -1195,6 +1199,7 @@ define([ config.buttons = [{ text: 'OK' }, { text: this.textCancel, onClick: config.callback }]; } else { config.buttons = [{ text: 'OK', onClick: config.callback }]; + $('#ce-cell-content').blur(); } uiApp.modal({ title : config.title, @@ -1796,7 +1801,8 @@ define([ warnLicenseLimitedRenewed: 'License needs to be renewed.
You have a limited access to document editing functionality.
Please contact your administrator to get full access', warnLicenseLimitedNoAccess: 'License expired.
You have no access to document editing functionality.
Please contact your administrator.', textGuest: 'Guest', - errorDataValidate: 'The value you entered is not valid.
A user has restricted values that can be entered into this cell.' + errorDataValidate: 'The value you entered is not valid.
A user has restricted values that can be entered into this cell.', + errorLockedCellPivot: 'You cannot change data inside a pivot table.' } })(), SSE.Controllers.Main || {})) }); \ No newline at end of file diff --git a/apps/spreadsheeteditor/mobile/app/controller/edit/EditChart.js b/apps/spreadsheeteditor/mobile/app/controller/edit/EditChart.js index 53872aa798..e81b34ca71 100644 --- a/apps/spreadsheeteditor/mobile/app/controller/edit/EditChart.js +++ b/apps/spreadsheeteditor/mobile/app/controller/edit/EditChart.js @@ -626,7 +626,7 @@ define([ onBorderColor: function (palette, color) { var me = this, - currentShape = _shapeObject.get_ShapeProperties(); + currentShape = _shapeObject ? _shapeObject.get_ShapeProperties() : null; $('#edit-chart-bordercolor .color-preview').css('background-color', ('transparent' == color) ? color : ('#' + (_.isObject(color) ? color.color : color))); _borderInfo.color = color; diff --git a/apps/spreadsheeteditor/mobile/app/controller/edit/EditShape.js b/apps/spreadsheeteditor/mobile/app/controller/edit/EditShape.js index b60c14f711..83e225529c 100644 --- a/apps/spreadsheeteditor/mobile/app/controller/edit/EditShape.js +++ b/apps/spreadsheeteditor/mobile/app/controller/edit/EditShape.js @@ -301,8 +301,7 @@ define([ }, onFillColor: function(palette, color) { - var me = this, - currentShape = _shapeObject.get_ShapeProperties(); + var me = this; if (me.api) { var image = new Asc.asc_CImgProperty(), @@ -327,7 +326,7 @@ define([ onBorderColor: function (palette, color) { var me = this, - currentShape = _shapeObject.get_ShapeProperties(); + currentShape = _shapeObject ? _shapeObject.get_ShapeProperties() : null; $('#edit-shape-bordercolor .color-preview').css('background-color', ('transparent' == color) ? color : ('#' + (_.isObject(color) ? color.color : color))); _borderInfo.color = color; diff --git a/apps/spreadsheeteditor/mobile/locale/de.json b/apps/spreadsheeteditor/mobile/locale/de.json index 3079822e16..3d7b14a191 100644 --- a/apps/spreadsheeteditor/mobile/locale/de.json +++ b/apps/spreadsheeteditor/mobile/locale/de.json @@ -170,6 +170,7 @@ "SSE.Controllers.Main.errorDatabaseConnection": "Externer Fehler.
Datenbank-Verbindungsfehler. Wenden Sie sich an den Support.", "SSE.Controllers.Main.errorDataEncrypted": "Änderungen wurden verschlüsselt. Sie können nicht entschlüsselt werden.", "SSE.Controllers.Main.errorDataRange": "Falscher Datenbereich.", + "SSE.Controllers.Main.errorDataValidate": "Der eingegebene Wert ist ungültig.
Die Werte, die in diese Zelle eingegeben werden können, sind begrenzt.", "SSE.Controllers.Main.errorDefaultMessage": "Fehlercode: %1", "SSE.Controllers.Main.errorEditingDownloadas": "Bei der Arbeit mit dem Dokument ist ein Fehler aufgetreten.
Verwenden Sie die Option \"Herunterladen\", um die Sicherungskopie der Datei auf der Festplatte Ihres Computers zu speichern.", "SSE.Controllers.Main.errorFilePassProtect": "Das Dokument ist kennwortgeschützt und kann nicht geöffnet werden.", @@ -187,6 +188,7 @@ "SSE.Controllers.Main.errorKeyEncrypt": "Unbekannter Schlüsseldeskriptor", "SSE.Controllers.Main.errorKeyExpire": "Der Schlüsseldeskriptor ist abgelaufen", "SSE.Controllers.Main.errorLockedAll": "Die Operation kann nicht durchgeführt werden, weil das Blatt von einem anderen Benutzer gesperrt ist.", + "SSE.Controllers.Main.errorLockedCellPivot": "Die Daten innerhalb einer Pivot-Tabelle können nicht geändert werden.", "SSE.Controllers.Main.errorLockedWorksheetRename": "Umbenennen des Sheets ist derzeit nicht möglich, denn es wird gleichzeitig von einem anderen Benutzer umbenannt.", "SSE.Controllers.Main.errorMailMergeLoadFile": "Fehler beim Laden des Dokuments. Bitte wählen Sie eine andere Datei.", "SSE.Controllers.Main.errorMailMergeSaveFile": "Verbinden ist fehlgeschlagen.", diff --git a/apps/spreadsheeteditor/mobile/locale/en.json b/apps/spreadsheeteditor/mobile/locale/en.json index fe0e794875..8136635286 100644 --- a/apps/spreadsheeteditor/mobile/locale/en.json +++ b/apps/spreadsheeteditor/mobile/locale/en.json @@ -170,6 +170,7 @@ "SSE.Controllers.Main.errorDatabaseConnection": "External error.
Database connection error. Please contact support in case the error persists.", "SSE.Controllers.Main.errorDataEncrypted": "Encrypted changes have been received, they cannot be deciphered.", "SSE.Controllers.Main.errorDataRange": "Incorrect data range.", + "SSE.Controllers.Main.errorDataValidate": "The value you entered is not valid.
A user has restricted values that can be entered into this cell.", "SSE.Controllers.Main.errorDefaultMessage": "Error code: %1", "SSE.Controllers.Main.errorEditingDownloadas": "An error occurred during the work with the document.
Use the 'Download' option to save the file backup copy to your computer hard drive.", "SSE.Controllers.Main.errorFilePassProtect": "The file is password protected and cannot be opened.", @@ -187,6 +188,7 @@ "SSE.Controllers.Main.errorKeyEncrypt": "Unknown key descriptor", "SSE.Controllers.Main.errorKeyExpire": "Key descriptor expired", "SSE.Controllers.Main.errorLockedAll": "The operation could not be done as the sheet has been locked by another user.", + "SSE.Controllers.Main.errorLockedCellPivot": "You cannot change data inside a pivot table.", "SSE.Controllers.Main.errorLockedWorksheetRename": "The sheet cannot be renamed at the moment as it is being renamed by another user", "SSE.Controllers.Main.errorMailMergeLoadFile": "Loading the document failed. Please select a different file.", "SSE.Controllers.Main.errorMailMergeSaveFile": "Merge failed.", diff --git a/apps/spreadsheeteditor/mobile/locale/es.json b/apps/spreadsheeteditor/mobile/locale/es.json index f0384e4128..b620b4fff5 100644 --- a/apps/spreadsheeteditor/mobile/locale/es.json +++ b/apps/spreadsheeteditor/mobile/locale/es.json @@ -170,6 +170,7 @@ "SSE.Controllers.Main.errorDatabaseConnection": "Error externo.
Error de conexión a la base de datos. Por favor, póngase en contacto con soporte si el error persiste.", "SSE.Controllers.Main.errorDataEncrypted": "Se han recibido cambios cifrados, ellos no pueden ser descifrados.", "SSE.Controllers.Main.errorDataRange": "Rango de datos incorrecto.", + "SSE.Controllers.Main.errorDataValidate": "El valor que ha introducido no es válido.
Un usuario ha restringido los valores que pueden ser introducidos en esta celda.", "SSE.Controllers.Main.errorDefaultMessage": "Código de error: %1", "SSE.Controllers.Main.errorEditingDownloadas": "Se produjo un error durante el trabajo con el documento.
Use la opción 'Descargar' para guardar la copia de seguridad de archivo en el disco duro de su computadora.", "SSE.Controllers.Main.errorFilePassProtect": "El archivo está protegido por una contraseña y no puede ser abierto.", @@ -187,6 +188,7 @@ "SSE.Controllers.Main.errorKeyEncrypt": "Descriptor de clave desconocido", "SSE.Controllers.Main.errorKeyExpire": "Descriptor de clave ha expirado", "SSE.Controllers.Main.errorLockedAll": "No se puede realizar la operación porque la hoja ha sido bloqueado por otro usuario.", + "SSE.Controllers.Main.errorLockedCellPivot": "No puede modificar datos dentro de una tabla dinámica.", "SSE.Controllers.Main.errorLockedWorksheetRename": "No se puede cambiar el nombre de la hoja en este momento, porque se está cambiando el nombre por otro usuario", "SSE.Controllers.Main.errorMailMergeLoadFile": "Error al cargar el archivo. Por favor seleccione uno distinto.", "SSE.Controllers.Main.errorMailMergeSaveFile": "Error de fusión.", diff --git a/apps/spreadsheeteditor/mobile/locale/fr.json b/apps/spreadsheeteditor/mobile/locale/fr.json index 2bc1bea562..011c6b08dc 100644 --- a/apps/spreadsheeteditor/mobile/locale/fr.json +++ b/apps/spreadsheeteditor/mobile/locale/fr.json @@ -170,6 +170,7 @@ "SSE.Controllers.Main.errorDatabaseConnection": "Erreur externe.
Erreur de connexion base de données. Contactez l'assistance technique si le problême persiste.", "SSE.Controllers.Main.errorDataEncrypted": "Modifications encodées reçues, mais ne peuvent pas être déchiffrées.", "SSE.Controllers.Main.errorDataRange": "Plage de données incorrecte.", + "SSE.Controllers.Main.errorDataValidate": "La valeur saisie est incorrecte.
Un utilisateur a restreint les valeurs pouvant être saisies dans cette cellule.", "SSE.Controllers.Main.errorDefaultMessage": "Code d'erreur : %1", "SSE.Controllers.Main.errorEditingDownloadas": "Une erreure s'est produite lors du travail sur le document.
Utilisez l'option « Télécharger » pour enregistrer une copie de sauvegarde sur le disque dur de votre système.", "SSE.Controllers.Main.errorFilePassProtect": "Le fichier est protégé par le mot de passe et ne peut pas être ouvert.", @@ -187,6 +188,7 @@ "SSE.Controllers.Main.errorKeyEncrypt": "Descripteur de clés inconnu", "SSE.Controllers.Main.errorKeyExpire": "Descripteur de clés expiré", "SSE.Controllers.Main.errorLockedAll": "L'opération ne peut pas être faite car la feuille a été verrouillée par un autre utilisateur.", + "SSE.Controllers.Main.errorLockedCellPivot": "Impossible de modifier les données d'un tableau croisé dynamique.", "SSE.Controllers.Main.errorLockedWorksheetRename": "La feuille ne peut pas être renommée pour l'instant puisque elle est renommée par un autre utilisateur", "SSE.Controllers.Main.errorMailMergeLoadFile": "Échec du chargement. Merci de choisir un autre fichier", "SSE.Controllers.Main.errorMailMergeSaveFile": "Fusion a échoué.", diff --git a/apps/spreadsheeteditor/mobile/locale/ru.json b/apps/spreadsheeteditor/mobile/locale/ru.json index 8f3cb4a36e..05a06bf8b0 100644 --- a/apps/spreadsheeteditor/mobile/locale/ru.json +++ b/apps/spreadsheeteditor/mobile/locale/ru.json @@ -170,6 +170,7 @@ "SSE.Controllers.Main.errorDatabaseConnection": "Внешняя ошибка.
Ошибка подключения к базе данных. Если ошибка повторяется, пожалуйста, обратитесь в службу поддержки.", "SSE.Controllers.Main.errorDataEncrypted": "Получены зашифрованные изменения, их нельзя расшифровать.", "SSE.Controllers.Main.errorDataRange": "Некорректный диапазон данных.", + "SSE.Controllers.Main.errorDataValidate": "Введенное значение недопустимо.
Значения, которые можно ввести в эту ячейку, ограничены.", "SSE.Controllers.Main.errorDefaultMessage": "Код ошибки: %1", "SSE.Controllers.Main.errorEditingDownloadas": "В ходе работы с документом произошла ошибка.
Используйте опцию 'Скачать', чтобы сохранить резервную копию файла на жестком диске компьютера.", "SSE.Controllers.Main.errorFilePassProtect": "Файл защищен паролем и не может быть открыт.", @@ -187,6 +188,7 @@ "SSE.Controllers.Main.errorKeyEncrypt": "Неизвестный дескриптор ключа", "SSE.Controllers.Main.errorKeyExpire": "Срок действия дескриптора ключа истек", "SSE.Controllers.Main.errorLockedAll": "Операция не может быть произведена, так как лист заблокирован другим пользователем.", + "SSE.Controllers.Main.errorLockedCellPivot": "Нельзя изменить данные в сводной таблице.", "SSE.Controllers.Main.errorLockedWorksheetRename": "В настоящее время лист нельзя переименовать, так как его переименовывает другой пользователь", "SSE.Controllers.Main.errorMailMergeLoadFile": "Загрузка документа не удалась. Выберите другой файл.", "SSE.Controllers.Main.errorMailMergeSaveFile": "Не удалось выполнить слияние.",