From e7d08c0e5d94c7300d478cac2423bb66a0c22153 Mon Sep 17 00:00:00 2001 From: Maxim Kadushkin Date: Thu, 1 Feb 2018 17:12:23 +0300 Subject: [PATCH 001/419] unlocked zoom --- apps/documenteditor/main/app/controller/Main.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/apps/documenteditor/main/app/controller/Main.js b/apps/documenteditor/main/app/controller/Main.js index f1e71bd65..d810393e1 100644 --- a/apps/documenteditor/main/app/controller/Main.js +++ b/apps/documenteditor/main/app/controller/Main.js @@ -962,6 +962,8 @@ define([ Common.NotificationCenter.trigger('document:ready', 'main'); me.applyLicense(); + + $(window).off('resize'); } }, 50); } else { From 1497eae9d2529995e42effdf1f275d156d1b5e2a Mon Sep 17 00:00:00 2001 From: Maxim Kadushkin Date: Thu, 1 Feb 2018 17:14:11 +0300 Subject: [PATCH 002/419] zomm step changed to 50% --- apps/common/main/lib/util/utils.js | 31 +++++++++---------- .../main/app/controller/Main.js | 1 + 2 files changed, 15 insertions(+), 17 deletions(-) diff --git a/apps/common/main/lib/util/utils.js b/apps/common/main/lib/util/utils.js index b30f674dc..a2a746a34 100644 --- a/apps/common/main/lib/util/utils.js +++ b/apps/common/main/lib/util/utils.js @@ -108,31 +108,26 @@ Common.Utils = _.extend(new(function() { isMobile = /android|avantgo|blackberry|blazer|compal|elaine|fennec|hiptop|iemobile|ip(hone|od|ad)|iris|kindle|lge |maemo|midp|mmp|opera m(ob|in)i|palm( os)?|phone|p(ixi|re)\/|plucker|pocket|psp|symbian|treo|up\.(browser|link)|vodafone|wap|windows (ce|phone)|xda|xiino/i.test(navigator.userAgent || navigator.vendor || window.opera), me = this, checkSize = function() { - me.zoom = 1; - if (isChrome && !isOpera && !isMobile && document && document.firstElementChild && document.body) - { + me.zoom = 1; + if (isChrome && !isOpera && !isMobile && document && document.firstElementChild && document.body) { // делаем простую проверку // считаем: 0 < window.devicePixelRatio < 2 => _devicePixelRatio = 1; zoom = window.devicePixelRatio / _devicePixelRatio; // считаем: window.devicePixelRatio >= 2 => _devicePixelRatio = 2; zoom = window.devicePixelRatio / _devicePixelRatio; - if (window.devicePixelRatio > 0.1) - { - if (window.devicePixelRatio < 1.99) - { - var _devicePixelRatio = 1; - me.zoom = window.devicePixelRatio / _devicePixelRatio; + if (window.devicePixelRatio > 0.1) { + var _fraction = window.devicePixelRatio % 1; + var _devicePixelRatio = Math.floor(window.devicePixelRatio); + + if ( !(_fraction < .5) ) { + _devicePixelRatio += .5; } - else - { - var _devicePixelRatio = 2; - me.zoom = window.devicePixelRatio / _devicePixelRatio; - } - // chrome 54.x: zoom = "reset" - clear retina zoom (windows) - //document.firstElementChild.style.zoom = "reset"; + + me.zoom = window.devicePixelRatio / _devicePixelRatio; document.firstElementChild.style.zoom = 1.0 / me.zoom; } else document.firstElementChild.style.zoom = "normal"; - } + } + me.innerWidth = window.innerWidth * me.zoom; me.innerHeight = window.innerHeight * me.zoom; }; @@ -143,6 +138,8 @@ Common.Utils = _.extend(new(function() { $(window).on('resize', checkSize); return { + checkSize: checkSize, + userAgent: userAgent, isStrict: isStrict, isIEQuirks: isIE && (!isStrict && (isIE6 || isIE7 || isIE8 || isIE9)), diff --git a/apps/documenteditor/main/app/controller/Main.js b/apps/documenteditor/main/app/controller/Main.js index d810393e1..9e8bac347 100644 --- a/apps/documenteditor/main/app/controller/Main.js +++ b/apps/documenteditor/main/app/controller/Main.js @@ -964,6 +964,7 @@ define([ me.applyLicense(); $(window).off('resize'); + $(window).on('resize', Common.Utils.checkSize); } }, 50); } else { From e2f86ace350e47754e61cad3d32c1b52597416e9 Mon Sep 17 00:00:00 2001 From: Maxim Kadushkin Date: Thu, 1 Feb 2018 17:15:56 +0300 Subject: [PATCH 003/419] in button added icon for 150% of zoom --- apps/common/main/lib/component/Button.js | 3 +- apps/common/main/lib/view/Header.js | 5 ++- .../main/resources/img/header/buttons150.svg | 24 +++++++++++ apps/common/main/resources/less/buttons.less | 40 +++++++++++++++++++ apps/documenteditor/main/index.html | 1 + 5 files changed, 71 insertions(+), 2 deletions(-) create mode 100644 apps/common/main/resources/img/header/buttons150.svg diff --git a/apps/common/main/lib/component/Button.js b/apps/common/main/lib/component/Button.js index e55b50942..57cfac85d 100644 --- a/apps/common/main/lib/component/Button.js +++ b/apps/common/main/lib/component/Button.js @@ -190,7 +190,8 @@ define([ // '<% if (iconCls != "") { print(\' \'); }} %>', '<% if (iconCls != "") { ' + ' if (/svgicon/.test(iconCls)) {' + - 'print(\'\');' + + 'print(\'' + + '\');' + '} else ' + 'print(\' \'); ' + '}} %>', diff --git a/apps/common/main/lib/view/Header.js b/apps/common/main/lib/view/Header.js index 792c70ff7..0ce0f489e 100644 --- a/apps/common/main/lib/view/Header.js +++ b/apps/common/main/lib/view/Header.js @@ -83,7 +83,10 @@ define([ // '' + ' diff --git a/apps/presentationeditor/main/app/view/Toolbar.js b/apps/presentationeditor/main/app/view/Toolbar.js index 13f52082c..a5cb95d6b 100644 --- a/apps/presentationeditor/main/app/view/Toolbar.js +++ b/apps/presentationeditor/main/app/view/Toolbar.js @@ -543,6 +543,15 @@ define([ }); me.slideOnlyControls.push(this.btnInsertEquation); + me.btnInsertSymbol = new Common.UI.Button({ + id: 'tlbtn-insertsymbol', + cls: 'btn-toolbar x-huge icon-top', + iconCls: 'btn-symbol', + caption: me.capBtnInsSymbol, + lock: [_set.slideDeleted, _set.paragraphLock, _set.lostConnect, _set.noSlides, _set.noParagraphSelected] + }); + me.paragraphControls.push(me.btnInsertSymbol); + me.btnInsertHyperlink = new Common.UI.Button({ id: 'tlbtn-insertlink', cls: 'btn-toolbar x-huge icon-top', @@ -815,7 +824,7 @@ define([ this.btnSubscript, this.btnFontColor, this.btnClearStyle, this.btnCopyStyle, this.btnMarkers, this.btnNumbers, this.btnDecLeftOffset, this.btnIncLeftOffset, this.btnLineSpace, this.btnHorizontalAlign, this.btnVerticalAlign, this.btnShapeArrange, this.btnShapeAlign, this.btnInsertTable, this.btnInsertChart, - this.btnInsertEquation, this.btnInsertHyperlink, this.btnColorSchemas, this.btnSlideSize, this.listTheme, this.mnuShowSettings + this.btnInsertEquation, this.btnInsertSymbol, this.btnInsertHyperlink, this.btnColorSchemas, this.btnSlideSize, this.listTheme, this.mnuShowSettings ]; // Disable all components before load document @@ -933,6 +942,7 @@ define([ _injectComponent('#slot-btn-arrange-shape', this.btnShapeArrange); _injectComponent('#slot-btn-align-shape', this.btnShapeAlign); _injectComponent('#slot-btn-insertequation', this.btnInsertEquation); + _injectComponent('#slot-btn-inssymbol', this.btnInsertSymbol); _injectComponent('#slot-btn-insertlink', this.btnInsertHyperlink); _injectComponent('#slot-btn-inserttable', this.btnInsertTable); _injectComponent('#slot-btn-insertchart', this.btnInsertChart); @@ -1044,6 +1054,7 @@ define([ this.btnInsertTable.updateHint(this.tipInsertTable); this.btnInsertChart.updateHint(this.tipInsertChart); this.btnInsertEquation.updateHint(this.tipInsertEquation); + this.btnInsertSymbol.updateHint(this.tipInsertSymbol); this.btnInsertHyperlink.updateHint(this.tipInsertHyperlink + Common.Utils.String.platformKey('Ctrl+K')); this.btnInsertTextArt.updateHint(this.tipInsertTextArt); this.btnColorSchemas.updateHint(this.tipColorSchemas); @@ -1676,7 +1687,9 @@ define([ capBtnInsHeader: 'Header/Footer', capBtnSlideNum: 'Slide Number', capBtnDateTime: 'Date & Time', - textListSettings: 'List Settings' + textListSettings: 'List Settings', + capBtnInsSymbol: 'Symbol', + tipInsertSymbol: 'Insert symbol' } }()), PE.Views.Toolbar || {})); }); \ No newline at end of file diff --git a/apps/presentationeditor/main/locale/en.json b/apps/presentationeditor/main/locale/en.json index e1c99e63b..dd431ece4 100644 --- a/apps/presentationeditor/main/locale/en.json +++ b/apps/presentationeditor/main/locale/en.json @@ -908,6 +908,7 @@ "PE.Controllers.Toolbar.txtSymbol_vdots": "Vertical ellipsis", "PE.Controllers.Toolbar.txtSymbol_xsi": "Xi", "PE.Controllers.Toolbar.txtSymbol_zeta": "Zeta", + "PE.Controllers.Toolbar.textInsert": "Insert", "PE.Controllers.Viewport.textFitPage": "Fit to Slide", "PE.Controllers.Viewport.textFitWidth": "Fit to Width", "PE.Views.ChartSettings.textAdvanced": "Show advanced settings", @@ -1798,5 +1799,7 @@ "PE.Views.Toolbar.txtScheme8": "Flow", "PE.Views.Toolbar.txtScheme9": "Foundry", "PE.Views.Toolbar.txtSlideAlign": "Align to Slide", - "PE.Views.Toolbar.txtUngroup": "Ungroup" + "PE.Views.Toolbar.txtUngroup": "Ungroup", + "PE.Views.Toolbar.capBtnInsSymbol": "Symbol", + "PE.Views.Toolbar.tipInsertSymbol": "Insert symbol" } \ No newline at end of file diff --git a/apps/presentationeditor/main/resources/less/app.less b/apps/presentationeditor/main/resources/less/app.less index 0e0890b76..9f99ba211 100644 --- a/apps/presentationeditor/main/resources/less/app.less +++ b/apps/presentationeditor/main/resources/less/app.less @@ -114,6 +114,7 @@ @import "../../../../common/main/resources/less/toolbar.less"; @import "../../../../common/main/resources/less/language-dialog.less"; @import "../../../../common/main/resources/less/winxp_fix.less"; +@import "../../../../common/main/resources/less/symboltable.less"; // App // -------------------------------------------------- diff --git a/apps/spreadsheeteditor/main/app/controller/Toolbar.js b/apps/spreadsheeteditor/main/app/controller/Toolbar.js index f37309543..1c6b65022 100644 --- a/apps/spreadsheeteditor/main/app/controller/Toolbar.js +++ b/apps/spreadsheeteditor/main/app/controller/Toolbar.js @@ -44,6 +44,7 @@ define([ 'common/main/lib/view/CopyWarningDialog', 'common/main/lib/view/ImageFromUrlDialog', 'common/main/lib/view/SelectFileDlg', + 'common/main/lib/view/SymbolTableDialog', 'common/main/lib/util/define', 'spreadsheeteditor/main/app/view/Toolbar', 'spreadsheeteditor/main/app/collection/TableTemplates', @@ -323,6 +324,7 @@ define([ toolbar.btnInsertText.on('click', _.bind(this.onBtnInsertTextClick, this)); toolbar.btnInsertShape.menu.on('hide:after', _.bind(this.onInsertShapeHide, this)); toolbar.btnInsertEquation.on('click', _.bind(this.onInsertEquationClick, this)); + toolbar.btnInsertSymbol.on('click', _.bind(this.onInsertSymbolClick, this)); toolbar.btnTableTemplate.menu.on('show:after', _.bind(this.onTableTplMenuOpen, this)); toolbar.btnPercentStyle.on('click', _.bind(this.onNumberFormat, this)); toolbar.btnCurrencyStyle.on('click', _.bind(this.onNumberFormat, this)); @@ -2763,6 +2765,28 @@ define([ Common.NotificationCenter.trigger('edit:complete', this.toolbar, this.toolbar.btnInsertEquation); }, + onInsertSymbolClick: function() { + if (this.api) { + var me = this, + win = new Common.Views.SymbolTableDialog({ + api: me.api, + lang: me.toolbar.mode.lang, + type: 1, + buttons: [{value: 'ok', caption: this.textInsert}, 'close'], + handler: function(dlg, result, settings) { + if (result == 'ok') { + me.api.pluginMethod_PasteHtml("" + settings.symbol + ""); + } else + Common.NotificationCenter.trigger('edit:complete', me.toolbar); + } + }); + win.show(); + win.on('symbol:dblclick', function(cmp, settings) { + me.api.pluginMethod_PasteHtml("" + settings.symbol + ""); + }); + } + }, + onApiMathTypes: function(equation) { this._equationTemp = equation; var me = this; @@ -3811,7 +3835,8 @@ define([ textPivot: 'Pivot Table', txtTable_TableStyleMedium: 'Table Style Medium', txtTable_TableStyleDark: 'Table Style Dark', - txtTable_TableStyleLight: 'Table Style Light' + txtTable_TableStyleLight: 'Table Style Light', + textInsert: 'Insert' }, SSE.Controllers.Toolbar || {})); }); \ No newline at end of file diff --git a/apps/spreadsheeteditor/main/app/template/Toolbar.template b/apps/spreadsheeteditor/main/app/template/Toolbar.template index 9d812e6b3..b1f14757a 100644 --- a/apps/spreadsheeteditor/main/app/template/Toolbar.template +++ b/apps/spreadsheeteditor/main/app/template/Toolbar.template @@ -142,6 +142,7 @@
+
diff --git a/apps/spreadsheeteditor/main/app/view/Toolbar.js b/apps/spreadsheeteditor/main/app/view/Toolbar.js index 08ac23eba..80741de00 100644 --- a/apps/spreadsheeteditor/main/app/view/Toolbar.js +++ b/apps/spreadsheeteditor/main/app/view/Toolbar.js @@ -714,6 +714,14 @@ define([ menu : new Common.UI.Menu({cls: 'menu-shapes'}) }); + me.btnInsertSymbol = new Common.UI.Button({ + id: 'tlbtn-insertsymbol', + cls: 'btn-toolbar x-huge icon-top', + iconCls: 'btn-symbol', + caption: me.capBtnInsSymbol, + lock: [_set.selImage, _set.selChart, _set.selShape, _set.editFormula, _set.selRangeEdit, _set.coAuth, _set.coAuthText, _set.lostConnect] + }); + me.btnTableTemplate = new Common.UI.Button({ id : 'id-toolbar-btn-ttempl', cls : 'btn-toolbar', @@ -1459,7 +1467,7 @@ define([ me.btnItalic, me.btnUnderline, me.btnStrikeout, me.btnSubscript, me.btnTextColor, me.btnHorizontalAlign, me.btnAlignLeft, me.btnAlignCenter,me.btnAlignRight,me.btnAlignJust, me.btnVerticalAlign, me.btnAlignTop, me.btnAlignMiddle, me.btnAlignBottom, me.btnWrap, me.btnTextOrient, me.btnBackColor, me.btnInsertTable, - me.btnMerge, me.btnInsertFormula, me.btnNamedRange, me.btnIncDecimal, me.btnInsertShape, me.btnInsertEquation, + me.btnMerge, me.btnInsertFormula, me.btnNamedRange, me.btnIncDecimal, me.btnInsertShape, me.btnInsertEquation, me.btnInsertSymbol, me.btnInsertText, me.btnInsertTextArt, me.btnSortUp, me.btnSortDown, me.btnSetAutofilter, me.btnClearAutofilter, me.btnTableTemplate, me.btnPercentStyle, me.btnCurrencyStyle, me.btnDecDecimal, me.btnAddCell, me.btnDeleteCell, me.cmbNumberFormat, me.btnBorders, me.btnInsertImage, me.btnInsertHyperlink, @@ -1635,6 +1643,7 @@ define([ _injectComponent('#slot-btn-instext', this.btnInsertText); _injectComponent('#slot-btn-instextart', this.btnInsertTextArt); _injectComponent('#slot-btn-insequation', this.btnInsertEquation); + _injectComponent('#slot-btn-inssymbol', this.btnInsertSymbol); _injectComponent('#slot-btn-sortdesc', this.btnSortDown); _injectComponent('#slot-btn-sortasc', this.btnSortUp); _injectComponent('#slot-btn-setfilter', this.btnSetAutofilter); @@ -1717,6 +1726,7 @@ define([ _updateHint(this.btnInsertHyperlink, this.tipInsertHyperlink + Common.Utils.String.platformKey('Ctrl+K')); _updateHint(this.btnInsertShape, this.tipInsertShape); _updateHint(this.btnInsertEquation, this.tipInsertEquation); + _updateHint(this.btnInsertSymbol, this.tipInsertSymbol); _updateHint(this.btnSortDown, this.txtSortAZ); _updateHint(this.btnSortUp, this.txtSortZA); _updateHint(this.btnSetAutofilter, this.txtFilter + ' (Ctrl+Shift+L)'); @@ -2520,6 +2530,8 @@ define([ textManyPages: 'pages', textHeight: 'Height', textWidth: 'Width', - textMorePages: 'More pages' + textMorePages: 'More pages', + capBtnInsSymbol: 'Symbol', + tipInsertSymbol: 'Insert symbol' }, SSE.Views.Toolbar || {})); }); \ No newline at end of file diff --git a/apps/spreadsheeteditor/main/locale/en.json b/apps/spreadsheeteditor/main/locale/en.json index 6463233b9..57ebf73da 100644 --- a/apps/spreadsheeteditor/main/locale/en.json +++ b/apps/spreadsheeteditor/main/locale/en.json @@ -1098,6 +1098,7 @@ "SSE.Controllers.Toolbar.txtTable_TableStyleMedium": "Table Style Medium", "SSE.Controllers.Toolbar.warnLongOperation": "The operation you are about to perform might take rather much time to complete.
Are you sure you want to continue?", "SSE.Controllers.Toolbar.warnMergeLostData": "Only the data from the upper-left cell will remain in the merged cell.
Are you sure you want to continue?", + "SSE.Controllers.Toolbar.textInsert": "Insert", "SSE.Controllers.Viewport.textFreezePanes": "Freeze Panes", "SSE.Controllers.Viewport.textHideFBar": "Hide Formula Bar", "SSE.Controllers.Viewport.textHideGridlines": "Hide Gridlines", @@ -2437,6 +2438,8 @@ "SSE.Views.Toolbar.txtTime": "Time", "SSE.Views.Toolbar.txtUnmerge": "Unmerge Cells", "SSE.Views.Toolbar.txtYen": "¥ Yen", + "SSE.Views.Toolbar.capBtnInsSymbol": "Symbol", + "SSE.Views.Toolbar.tipInsertSymbol": "Insert symbol", "SSE.Views.Top10FilterDialog.textType": "Show", "SSE.Views.Top10FilterDialog.txtBottom": "Bottom", "SSE.Views.Top10FilterDialog.txtItems": "Item", diff --git a/apps/spreadsheeteditor/main/resources/less/app.less b/apps/spreadsheeteditor/main/resources/less/app.less index 665d6f51e..5bd93bc68 100644 --- a/apps/spreadsheeteditor/main/resources/less/app.less +++ b/apps/spreadsheeteditor/main/resources/less/app.less @@ -115,6 +115,7 @@ @import "../../../../common/main/resources/less/toolbar.less"; @import "../../../../common/main/resources/less/language-dialog.less"; @import "../../../../common/main/resources/less/winxp_fix.less"; +@import "../../../../common/main/resources/less/symboltable.less"; // App // -------------------------------------------------- From da9f9026dd13b824ff1431af791d85475a220e2d Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Thu, 14 Nov 2019 11:53:07 +0300 Subject: [PATCH 245/419] Update translation --- apps/presentationeditor/main/locale/en.json | 5 +++++ apps/spreadsheeteditor/main/locale/en.json | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/apps/presentationeditor/main/locale/en.json b/apps/presentationeditor/main/locale/en.json index dd431ece4..77c8ffa81 100644 --- a/apps/presentationeditor/main/locale/en.json +++ b/apps/presentationeditor/main/locale/en.json @@ -220,6 +220,11 @@ "Common.Views.SignSettingsDialog.textShowDate": "Show sign date in signature line", "Common.Views.SignSettingsDialog.textTitle": "Signature Setup", "Common.Views.SignSettingsDialog.txtEmpty": "This field is required", + "Common.Views.SymbolTableDialog.textTitle": "Symbol Table", + "Common.Views.SymbolTableDialog.textFont": "Font", + "Common.Views.SymbolTableDialog.textRange": "Range", + "Common.Views.SymbolTableDialog.textRecent": "Recently used symbols", + "Common.Views.SymbolTableDialog.textCode": "Unicode HEX value", "PE.Controllers.LeftMenu.newDocumentTitle": "Unnamed presentation", "PE.Controllers.LeftMenu.notcriticalErrorTitle": "Warning", "PE.Controllers.LeftMenu.requestEditRightsText": "Requesting editing rights...", diff --git a/apps/spreadsheeteditor/main/locale/en.json b/apps/spreadsheeteditor/main/locale/en.json index 57ebf73da..c363e0e39 100644 --- a/apps/spreadsheeteditor/main/locale/en.json +++ b/apps/spreadsheeteditor/main/locale/en.json @@ -214,6 +214,11 @@ "Common.Views.SignSettingsDialog.textShowDate": "Show sign date in signature line", "Common.Views.SignSettingsDialog.textTitle": "Signature Setup", "Common.Views.SignSettingsDialog.txtEmpty": "This field is required", + "Common.Views.SymbolTableDialog.textTitle": "Symbol Table", + "Common.Views.SymbolTableDialog.textFont": "Font", + "Common.Views.SymbolTableDialog.textRange": "Range", + "Common.Views.SymbolTableDialog.textRecent": "Recently used symbols", + "Common.Views.SymbolTableDialog.textCode": "Unicode HEX value", "SSE.Controllers.DataTab.textWizard": "Text to Columns", "SSE.Controllers.DocumentHolder.alignmentText": "Alignment", "SSE.Controllers.DocumentHolder.centerText": "Center", From d72b54c730d9e8d99366c99a10c44d84fcfe186e Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Thu, 14 Nov 2019 12:06:10 +0300 Subject: [PATCH 246/419] [PE] Fix Bug 43540 --- apps/presentationeditor/main/app/controller/Toolbar.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/apps/presentationeditor/main/app/controller/Toolbar.js b/apps/presentationeditor/main/app/controller/Toolbar.js index 64d75d653..4bff6451a 100644 --- a/apps/presentationeditor/main/app/controller/Toolbar.js +++ b/apps/presentationeditor/main/app/controller/Toolbar.js @@ -475,7 +475,7 @@ define([ case 0: this.toolbar.btnMarkers.toggle(true, true); this.toolbar.mnuMarkersPicker.selectByIndex(this._state.bullets.subtype, true); - this.toolbar.mnuMarkerSettings.setDisabled(this._state.bullets.subtype<0); + this.toolbar.mnuMarkerSettings && this.toolbar.mnuMarkerSettings.setDisabled(this._state.bullets.subtype<0); break; case 1: var idx = 0; @@ -504,7 +504,7 @@ define([ } this.toolbar.btnNumbers.toggle(true, true); this.toolbar.mnuNumbersPicker.selectByIndex(idx, true); - this.toolbar.mnuNumberSettings.setDisabled(idx==0); + this.toolbar.mnuNumberSettings && this.toolbar.mnuNumberSettings.setDisabled(idx==0); break; } } @@ -1670,8 +1670,8 @@ define([ this.toolbar.mnuMarkersPicker.selectByIndex(0, true); this.toolbar.mnuNumbersPicker.selectByIndex(0, true); - this.toolbar.mnuMarkerSettings.setDisabled(true); - this.toolbar.mnuNumberSettings.setDisabled(true); + this.toolbar.mnuMarkerSettings && this.toolbar.mnuMarkerSettings.setDisabled(true); + this.toolbar.mnuNumberSettings && this.toolbar.mnuNumberSettings.setDisabled(true); }, _getApiTextSize: function () { From 9d8675f041d658ab1a5438083ecffa4393a4e49b Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Thu, 14 Nov 2019 13:25:01 +0300 Subject: [PATCH 247/419] [DE] Disable comparing of documents in the co-editing mode --- apps/common/main/lib/controller/ReviewChanges.js | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/apps/common/main/lib/controller/ReviewChanges.js b/apps/common/main/lib/controller/ReviewChanges.js index fdfda5bd5..289cdd0bd 100644 --- a/apps/common/main/lib/controller/ReviewChanges.js +++ b/apps/common/main/lib/controller/ReviewChanges.js @@ -124,6 +124,8 @@ define([ if (this.appConfig.canReview || this.appConfig.canViewReview) { this.api.asc_registerCallback('asc_onShowRevisionsChange', _.bind(this.onApiShowChange, this)); this.api.asc_registerCallback('asc_onUpdateRevisionsChangesPosition', _.bind(this.onApiUpdateChangePosition, this)); + this.api.asc_registerCallback('asc_onAuthParticipantsChanged', _.bind(this.onAuthParticipantsChanged, this)); + this.api.asc_registerCallback('asc_onParticipantsChanged', _.bind(this.onAuthParticipantsChanged, this)); } this.api.asc_registerCallback('asc_onAcceptChangesBeforeCompare',_.bind(this.onAcceptChangesBeforeCompare, this)); this.api.asc_registerCallback('asc_onCoAuthoringDisconnect',_.bind(this.onCoAuthoringDisconnect, this)); @@ -856,6 +858,17 @@ define([ }); }, + onAuthParticipantsChanged: function(users) { + if (this.view && this.view.btnCompare) { + var length = 0; + _.each(users, function(item){ + if (!item.asc_getView()) + length++; + }); + this.view.btnCompare.setDisabled(length>1 || this.viewmode); + } + }, + textInserted: 'Inserted:', textDeleted: 'Deleted:', textParaInserted: 'Paragraph Inserted ', From 29bb234686fb78e3f27692fab702548dc6ede0fa Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Thu, 14 Nov 2019 13:46:59 +0300 Subject: [PATCH 248/419] Change translation --- apps/common/main/lib/view/SymbolTableDialog.js | 2 +- apps/documenteditor/main/locale/en.json | 2 +- apps/documenteditor/main/locale/ru.json | 2 +- apps/presentationeditor/main/locale/en.json | 2 +- apps/spreadsheeteditor/main/locale/en.json | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/apps/common/main/lib/view/SymbolTableDialog.js b/apps/common/main/lib/view/SymbolTableDialog.js index e8eea6645..ab23cb3b7 100644 --- a/apps/common/main/lib/view/SymbolTableDialog.js +++ b/apps/common/main/lib/view/SymbolTableDialog.js @@ -1324,7 +1324,7 @@ define([ } }, - textTitle: 'Symbol Table', + textTitle: 'Symbol', textFont: 'Font', textRange: 'Range', textRecent: 'Recently used symbols', diff --git a/apps/documenteditor/main/locale/en.json b/apps/documenteditor/main/locale/en.json index 31a578370..50c07692a 100644 --- a/apps/documenteditor/main/locale/en.json +++ b/apps/documenteditor/main/locale/en.json @@ -299,7 +299,7 @@ "Common.Views.SignSettingsDialog.textShowDate": "Show sign date in signature line", "Common.Views.SignSettingsDialog.textTitle": "Signature Setup", "Common.Views.SignSettingsDialog.txtEmpty": "This field is required", - "Common.Views.SymbolTableDialog.textTitle": "Symbol Table", + "Common.Views.SymbolTableDialog.textTitle": "Symbol", "Common.Views.SymbolTableDialog.textFont": "Font", "Common.Views.SymbolTableDialog.textRange": "Range", "Common.Views.SymbolTableDialog.textRecent": "Recently used symbols", diff --git a/apps/documenteditor/main/locale/ru.json b/apps/documenteditor/main/locale/ru.json index 44695cd59..cb5315757 100644 --- a/apps/documenteditor/main/locale/ru.json +++ b/apps/documenteditor/main/locale/ru.json @@ -299,7 +299,7 @@ "Common.Views.SignSettingsDialog.textShowDate": "Показывать дату подписи в строке подписи", "Common.Views.SignSettingsDialog.textTitle": "Настройка подписи", "Common.Views.SignSettingsDialog.txtEmpty": "Это поле необходимо заполнить", - "Common.Views.SymbolTableDialog.textTitle": "Symbol Table", + "Common.Views.SymbolTableDialog.textTitle": "Symbol", "Common.Views.SymbolTableDialog.textFont": "Шрифт", "Common.Views.SymbolTableDialog.textRange": "Набор", "Common.Views.SymbolTableDialog.textRecent": "Ранее использовавшиеся символы", diff --git a/apps/presentationeditor/main/locale/en.json b/apps/presentationeditor/main/locale/en.json index 77c8ffa81..5ad8010bb 100644 --- a/apps/presentationeditor/main/locale/en.json +++ b/apps/presentationeditor/main/locale/en.json @@ -220,7 +220,7 @@ "Common.Views.SignSettingsDialog.textShowDate": "Show sign date in signature line", "Common.Views.SignSettingsDialog.textTitle": "Signature Setup", "Common.Views.SignSettingsDialog.txtEmpty": "This field is required", - "Common.Views.SymbolTableDialog.textTitle": "Symbol Table", + "Common.Views.SymbolTableDialog.textTitle": "Symbol", "Common.Views.SymbolTableDialog.textFont": "Font", "Common.Views.SymbolTableDialog.textRange": "Range", "Common.Views.SymbolTableDialog.textRecent": "Recently used symbols", diff --git a/apps/spreadsheeteditor/main/locale/en.json b/apps/spreadsheeteditor/main/locale/en.json index c363e0e39..56a78e04e 100644 --- a/apps/spreadsheeteditor/main/locale/en.json +++ b/apps/spreadsheeteditor/main/locale/en.json @@ -214,7 +214,7 @@ "Common.Views.SignSettingsDialog.textShowDate": "Show sign date in signature line", "Common.Views.SignSettingsDialog.textTitle": "Signature Setup", "Common.Views.SignSettingsDialog.txtEmpty": "This field is required", - "Common.Views.SymbolTableDialog.textTitle": "Symbol Table", + "Common.Views.SymbolTableDialog.textTitle": "Symbol", "Common.Views.SymbolTableDialog.textFont": "Font", "Common.Views.SymbolTableDialog.textRange": "Range", "Common.Views.SymbolTableDialog.textRecent": "Recently used symbols", From 475e9c030646f2a81ca49207d75834efb303f53d Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Thu, 14 Nov 2019 16:28:28 +0300 Subject: [PATCH 249/419] [DE] Add settings for check box. Refactoring symbol table --- .../common/main/lib/view/SymbolTableDialog.js | 22 +++- .../main/app/controller/Toolbar.js | 5 +- .../template/ControlSettingsDialog.template | 28 +++++ .../main/app/view/ControlSettingsDialog.js | 107 +++++++++++++++++- .../main/app/controller/Toolbar.js | 2 +- .../main/app/controller/Toolbar.js | 2 +- 6 files changed, 156 insertions(+), 10 deletions(-) diff --git a/apps/common/main/lib/view/SymbolTableDialog.js b/apps/common/main/lib/view/SymbolTableDialog.js index ab23cb3b7..adba7b7ba 100644 --- a/apps/common/main/lib/view/SymbolTableDialog.js +++ b/apps/common/main/lib/view/SymbolTableDialog.js @@ -453,6 +453,15 @@ define([ var init = (aFontSelects.length<1); init && this.initFonts(); + if (options.font) { + for(var i = 0; i < aFontSelects.length; ++i){ + if(aFontSelects[i].displayValue === options.font){ + nCurrentFont = i; + break; + } + } + } + if (nCurrentFont < 0) nCurrentFont = 0; @@ -477,6 +486,10 @@ define([ nCurrentSymbol = aRanges[0].Start; } + if (options.code) { + nCurrentSymbol = options.code; + } + if (init && this.options.lang && this.options.lang != 'en') { var me = this; loadTranslation(this.options.lang, function(){ @@ -526,7 +539,6 @@ define([ for(var key in oFontsByName){ if(oFontsByName.hasOwnProperty(key)){ data.push(oFontsByName[key]); - data[data.length-1].value = i++; data[data.length-1].displayValue = oFontsByName[key].m_wsFontName; } } @@ -534,6 +546,10 @@ define([ //initialize params aFontSelects = data; aFontSelects.sort(function(a, b){return (a.displayValue.toLowerCase() > b.displayValue.toLowerCase()) ? 1 : -1;}); + for(i = 0; i < aFontSelects.length; ++i){ + aFontSelects[i].value = i; + } + if(!oFontsByName[sInitFont]){ if(oFontsByName['Cambria Math']){ sInitFont = 'Cambria Math'; @@ -679,7 +695,7 @@ define([ var nFontId = parseInt(cellId.split('_')[2]); sFont = aFontSelects[nFontId].displayValue; } - return {font: sFont, symbol: this.encodeSurrogateChar(nCurrentSymbol), updateRecents: bUpdateRecents}; + return {font: sFont, symbol: this.encodeSurrogateChar(nCurrentSymbol), code: nCurrentSymbol, updateRecents: bUpdateRecents}; }, onBtnClick: function(event) { @@ -927,7 +943,7 @@ define([ var settings = this.getPasteSymbol($(e.target).attr('id')); settings.updateRecents && this.checkRecent(nCurrentSymbol, settings.font); settings.updateRecents && this.updateView(false, undefined, undefined, true); - this.fireEvent('symbol:dblclick', this, settings); + this.fireEvent('symbol:dblclick', this, 'ok', settings); } }, diff --git a/apps/documenteditor/main/app/controller/Toolbar.js b/apps/documenteditor/main/app/controller/Toolbar.js index d13383bf7..0e54aee52 100644 --- a/apps/documenteditor/main/app/controller/Toolbar.js +++ b/apps/documenteditor/main/app/controller/Toolbar.js @@ -1735,7 +1735,8 @@ define([ (new DE.Views.ControlSettingsDialog({ props: props, api: me.api, - lang: me._state.lang, + controlLang: me._state.lang, + interfaceLang: me.mode.lang, handler: function(result, value) { if (result == 'ok') { me.api.asc_SetContentControlProperties(value, id); @@ -2504,7 +2505,7 @@ define([ } }); win.show(); - win.on('symbol:dblclick', function(cmp, settings) { + win.on('symbol:dblclick', function(cmp, result, settings) { me.api.pluginMethod_PasteHtml("" + settings.symbol + ""); }); } diff --git a/apps/documenteditor/main/app/template/ControlSettingsDialog.template b/apps/documenteditor/main/app/template/ControlSettingsDialog.template index 0f48db92a..9c5d28007 100644 --- a/apps/documenteditor/main/app/template/ControlSettingsDialog.template +++ b/apps/documenteditor/main/app/template/ControlSettingsDialog.template @@ -115,4 +115,32 @@ + +
+
+ + + + + + + + + + + +
+ + +
+ 		+ +
+ + +
+ 		+ +
+
\ No newline at end of file diff --git a/apps/documenteditor/main/app/view/ControlSettingsDialog.js b/apps/documenteditor/main/app/view/ControlSettingsDialog.js index 32d2b7016..8d54bf093 100644 --- a/apps/documenteditor/main/app/view/ControlSettingsDialog.js +++ b/apps/documenteditor/main/app/view/ControlSettingsDialog.js @@ -44,6 +44,7 @@ define([ 'text!documenteditor/main/app/template/ControlSettingsDialog.template', 'common/main/lib/component/CheckBox', 'common/main/lib/component/InputField', 'common/main/lib/view/AdvancedSettingsWindow', + 'common/main/lib/view/SymbolTableDialog', 'documenteditor/main/app/view/EditListItemDialog' ], function (contentTemplate) { 'use strict'; @@ -64,7 +65,8 @@ define([ 'text!documenteditor/main/app/template/ControlSettingsDialog.template', {panelId: 'id-adv-control-settings-general', panelCaption: this.strGeneral}, {panelId: 'id-adv-control-settings-lock', panelCaption: this.textLock}, {panelId: 'id-adv-control-settings-list', panelCaption: this.textCombobox}, - {panelId: 'id-adv-control-settings-date', panelCaption: this.textDate} + {panelId: 'id-adv-control-settings-date', panelCaption: this.textDate}, + {panelId: 'id-adv-control-settings-checkbox',panelCaption: this.textCheckbox} ], contentTemplate: _.template(contentTemplate)({ scope: this @@ -226,6 +228,39 @@ define([ 'text!documenteditor/main/app/template/ControlSettingsDialog.template', }); // this.listFormats.on('item:select', _.bind(this.onSelectFormat, this)); + // Check Box + this.txtChecked = new Common.UI.InputField({ + el : $('#control-settings-input-checked'), + allowBlank : true, + validateOnChange: false, + validateOnBlur: false, + style : 'width: 30px;', + value : '' + }); + this.txtChecked._input.attr('disabled', true); + this.txtChecked._input.css({'text-align': 'center', 'font-size': '16px'}); + + this.txtUnchecked = new Common.UI.InputField({ + el : $('#control-settings-input-unchecked'), + allowBlank : true, + validateOnChange: false, + validateOnBlur: false, + style : 'width: 30px;', + value : '' + }); + this.txtUnchecked._input.attr('disabled', true); + this.txtUnchecked._input.css({'text-align': 'center', 'font-size': '16px'}); + + this.btnEditChecked = new Common.UI.Button({ + el: $('#control-settings-btn-checked-edit') + }); + this.btnEditChecked.on('click', _.bind(this.onEditCheckbox, this, true)); + + this.btnEditUnchecked = new Common.UI.Button({ + el: $('#control-settings-btn-unchecked-edit') + }); + this.btnEditUnchecked.on('click', _.bind(this.onEditCheckbox, this, false)); + this.afterRender(); }, @@ -320,7 +355,7 @@ define([ 'text!documenteditor/main/app/template/ControlSettingsDialog.template', if (type == Asc.c_oAscContentControlSpecificType.DateTime) { var specProps = props.get_DateTimePr(); if (specProps) { - var lang = specProps.get_LangId() || this.options.lang; + var lang = specProps.get_LangId() || this.options.controlLang; if (lang) { var item = this.cmbLang.store.findWhere({value: lang}); item = item ? item.get('value') : 0x0409; @@ -335,6 +370,25 @@ define([ 'text!documenteditor/main/app/template/ControlSettingsDialog.template', } } + // for check box + this.btnsCategory[4].setVisible(type == Asc.c_oAscContentControlSpecificType.CheckBox); + if (type == Asc.c_oAscContentControlSpecificType.CheckBox) { + var specProps = props.get_CheckBoxPr(); + if (specProps) { + var code = specProps.get_CheckedSymbol(), + font = specProps.get_CheckedFont(); + font && this.txtChecked.cmpEl.css('font-family', font); + code && this.txtChecked.setValue(String.fromCharCode(code)); + this.checkedBox = {code: code, font: font}; + + code = specProps.get_UncheckedSymbol(); + font = specProps.get_UncheckedFont(); + font && this.txtUnchecked.cmpEl.css('font-family', font); + code && this.txtUnchecked.setValue(String.fromCharCode(code)); + this.uncheckedBox = {code: code, font: font}; + } + } + this.type = type; } }, @@ -377,6 +431,22 @@ define([ 'text!documenteditor/main/app/template/ControlSettingsDialog.template', // props.set_DateFormat(rec.get('format')); // } + // for check box + if (this.type == Asc.c_oAscContentControlSpecificType.CheckBox) { + if (this.checkedBox && this.checkedBox.changed || this.uncheckedBox && this.uncheckedBox.changed) { + var specProps = new AscCommon.CSdtCheckBoxPr(); + if (this.checkedBox) { + specProps.put_CheckedSymbol(this.checkedBox.code); + specProps.put_CheckedFont(this.checkedBox.font); + } + if (this.uncheckedBox) { + specProps.put_UncheckedSymbol(this.uncheckedBox.code); + specProps.put_UncheckedFont(this.uncheckedBox.font); + } + props.put_CheckBoxPr(specProps); + } + } + return props; }, @@ -509,6 +579,34 @@ define([ 'text!documenteditor/main/app/template/ControlSettingsDialog.template', // this.onSelectFormat(this.listFormats, null, rec); }, + onEditCheckbox: function(checked) { + if (this.api) { + var me = this, + props = (checked) ? me.checkedBox : me.uncheckedBox, + cmp = (checked) ? me.txtChecked : me.txtUnchecked, + handler = function(dlg, result, settings) { + if (result == 'ok') { + props.changed = true; + props.code = settings.code; + props.font = settings.font; + props.font && cmp.cmpEl.css('font-family', props.font); + settings.symbol && cmp.setValue(settings.symbol); + } + }, + win = new Common.Views.SymbolTableDialog({ + api: me.api, + lang: me.options.interfaceLang, + modal: true, + type: 0, + font: props.font, + code: props.code, + handler: handler + }); + win.show(); + win.on('symbol:dblclick', handler); + } + }, + textTitle: 'Content Control Settings', textName: 'Title', textTag: 'Tag', @@ -534,7 +632,10 @@ define([ 'text!documenteditor/main/app/template/ControlSettingsDialog.template', textValue: 'Value', textDate: 'Date Format', textLang: 'Language', - textFormat: 'Formats' + textFormat: 'Formats', + textCheckbox: 'Check box', + textChecked: 'Checked symbol', + textUnchecked: 'Unchecked symbol' }, DE.Views.ControlSettingsDialog || {})) }); \ No newline at end of file diff --git a/apps/presentationeditor/main/app/controller/Toolbar.js b/apps/presentationeditor/main/app/controller/Toolbar.js index 4bff6451a..1d81d9480 100644 --- a/apps/presentationeditor/main/app/controller/Toolbar.js +++ b/apps/presentationeditor/main/app/controller/Toolbar.js @@ -1843,7 +1843,7 @@ define([ } }); win.show(); - win.on('symbol:dblclick', function(cmp, settings) { + win.on('symbol:dblclick', function(cmp, result, settings) { me.api.pluginMethod_PasteHtml("" + settings.symbol + ""); }); } diff --git a/apps/spreadsheeteditor/main/app/controller/Toolbar.js b/apps/spreadsheeteditor/main/app/controller/Toolbar.js index 1c6b65022..e472884d5 100644 --- a/apps/spreadsheeteditor/main/app/controller/Toolbar.js +++ b/apps/spreadsheeteditor/main/app/controller/Toolbar.js @@ -2781,7 +2781,7 @@ define([ } }); win.show(); - win.on('symbol:dblclick', function(cmp, settings) { + win.on('symbol:dblclick', function(cmp, result, settings) { me.api.pluginMethod_PasteHtml("" + settings.symbol + ""); }); } From 82cfe9c710b55a645619739f86fef7a4e03aced4 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Thu, 14 Nov 2019 16:30:55 +0300 Subject: [PATCH 250/419] Fix fonts list in the symbol table --- apps/common/main/lib/view/SymbolTableDialog.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/apps/common/main/lib/view/SymbolTableDialog.js b/apps/common/main/lib/view/SymbolTableDialog.js index ab23cb3b7..601c7070d 100644 --- a/apps/common/main/lib/view/SymbolTableDialog.js +++ b/apps/common/main/lib/view/SymbolTableDialog.js @@ -526,7 +526,6 @@ define([ for(var key in oFontsByName){ if(oFontsByName.hasOwnProperty(key)){ data.push(oFontsByName[key]); - data[data.length-1].value = i++; data[data.length-1].displayValue = oFontsByName[key].m_wsFontName; } } @@ -534,6 +533,9 @@ define([ //initialize params aFontSelects = data; aFontSelects.sort(function(a, b){return (a.displayValue.toLowerCase() > b.displayValue.toLowerCase()) ? 1 : -1;}); + for(i = 0; i < aFontSelects.length; ++i){ + aFontSelects[i].value = i; + } if(!oFontsByName[sInitFont]){ if(oFontsByName['Cambria Math']){ sInitFont = 'Cambria Math'; From c40c8d6a2d1c08e9b4f912eb662fc2e5a864721d Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Fri, 15 Nov 2019 11:11:34 +0300 Subject: [PATCH 251/419] [DE] Add settings for date content control --- .../template/ControlSettingsDialog.template | 27 ++++--- .../main/app/view/ControlSettingsDialog.js | 78 ++++++++++++------- 2 files changed, 64 insertions(+), 41 deletions(-) diff --git a/apps/documenteditor/main/app/template/ControlSettingsDialog.template b/apps/documenteditor/main/app/template/ControlSettingsDialog.template index 9c5d28007..70df12159 100644 --- a/apps/documenteditor/main/app/template/ControlSettingsDialog.template +++ b/apps/documenteditor/main/app/template/ControlSettingsDialog.template @@ -95,7 +95,22 @@ + + + + + + + + + @@ -103,16 +118,6 @@
- - - - - -
- + +
+
+
+
+
+
- -
-
-
diff --git a/apps/documenteditor/main/app/view/ControlSettingsDialog.js b/apps/documenteditor/main/app/view/ControlSettingsDialog.js index 8d54bf093..0920897c2 100644 --- a/apps/documenteditor/main/app/view/ControlSettingsDialog.js +++ b/apps/documenteditor/main/app/view/ControlSettingsDialog.js @@ -226,7 +226,16 @@ define([ 'text!documenteditor/main/app/template/ControlSettingsDialog.template', store: new Common.UI.DataViewStore(), scrollAlwaysVisible: true }); - // this.listFormats.on('item:select', _.bind(this.onSelectFormat, this)); + this.listFormats.on('item:select', _.bind(this.onSelectFormat, this)); + + this.txtDate = new Common.UI.InputField({ + el : $('#control-settings-txt-format'), + allowBlank : true, + validateOnChange: false, + validateOnBlur: false, + style : 'width: 100%;', + value : '' + }); // Check Box this.txtChecked = new Common.UI.InputField({ @@ -355,6 +364,7 @@ define([ 'text!documenteditor/main/app/template/ControlSettingsDialog.template', if (type == Asc.c_oAscContentControlSpecificType.DateTime) { var specProps = props.get_DateTimePr(); if (specProps) { + this.datetime = specProps; var lang = specProps.get_LangId() || this.options.controlLang; if (lang) { var item = this.cmbLang.store.findWhere({value: lang}); @@ -362,11 +372,11 @@ define([ 'text!documenteditor/main/app/template/ControlSettingsDialog.template', this.cmbLang.setValue(item); } this.updateFormats(this.cmbLang.getValue()); - // var rec = this.listFormats.store.find({format: specProps.get_DateFormat()}); - // if (rec) { - // this.listFormats.selectRecord(rec); - // this.listFormats.scrollToRecord(rec); - // } + var format = specProps.get_DateFormat(); + var rec = this.listFormats.store.findWhere({format: format}); + this.listFormats.selectRecord(rec); + this.listFormats.scrollToRecord(rec); + this.txtDate.setValue(format); } } @@ -426,10 +436,12 @@ define([ 'text!documenteditor/main/app/template/ControlSettingsDialog.template', } //for date picker - // var rec = this.listFormats.getSelectedRec(); - // if (rec) { - // props.set_DateFormat(rec.get('format')); - // } + if (this.type == Asc.c_oAscContentControlSpecificType.DateTime) { + var specProps = new AscCommon.CSdtDatePickerPr(); + specProps.put_DateFormat(this.txtDate.getValue()); + specProps.put_LangId(this.cmbLang.getValue()); + props.put_DateTimePr(specProps); + } // for check box if (this.type == Asc.c_oAscContentControlSpecificType.CheckBox) { @@ -558,25 +570,26 @@ define([ 'text!documenteditor/main/app/template/ControlSettingsDialog.template', }, updateFormats: function(lang) { - // this.props.put_Lang(lang); - // var data = this.props.get_DateTimeExamples(), - // arr = []; - // var store = this.listFormats.store; - // for (var name in data) { - // if (data[name]) { - // var rec = new Common.UI.DataViewModel(); - // rec.set({ - // format: name, - // value: data[name] - // }); - // arr.push(rec); - // } - // } - // store.reset(arr); - // this.listFormats.selectByIndex(0); - // var rec = this.listFormats.getSelectedRec(); - // this.listFormats.scrollToRecord(rec); - // this.onSelectFormat(this.listFormats, null, rec); + if (this.datetime) { + var props = this.datetime, + formats = props.get_FormatsExamples(), + arr = []; + for (var i = 0, len = formats.length; i < len; i++) + { + props.get_String(formats[i], undefined, lang); + var rec = new Common.UI.DataViewModel(); + rec.set({ + format: formats[i], + value: props.get_String(formats[i], undefined, lang) + }); + arr.push(rec); + } + this.listFormats.store.reset(arr); + this.listFormats.selectByIndex(0); + var rec = this.listFormats.getSelectedRec(); + this.listFormats.scrollToRecord(rec); + this.txtDate.setValue(rec.get('format')); + } }, onEditCheckbox: function(checked) { @@ -607,6 +620,11 @@ define([ 'text!documenteditor/main/app/template/ControlSettingsDialog.template', } }, + onSelectFormat: function(lisvView, itemView, record) { + if (!record) return; + this.txtDate.setValue(record.get('format')); + }, + textTitle: 'Content Control Settings', textName: 'Title', textTag: 'Tag', @@ -632,7 +650,7 @@ define([ 'text!documenteditor/main/app/template/ControlSettingsDialog.template', textValue: 'Value', textDate: 'Date Format', textLang: 'Language', - textFormat: 'Formats', + textFormat: 'Display the date like this', textCheckbox: 'Check box', textChecked: 'Checked symbol', textUnchecked: 'Unchecked symbol' From 943afb4ebcbd552a493da1837e3e65444d142574 Mon Sep 17 00:00:00 2001 From: Julia Svinareva Date: Fri, 15 Nov 2019 11:42:13 +0300 Subject: [PATCH 252/419] Gradient Slider: fix remove thumb --- .../main/lib/component/MultiSliderGradient.js | 3 +- apps/common/main/lib/component/Slider.js | 45 +++++++++++-------- .../main/app/view/ShapeSettings.js | 6 ++- .../main/app/view/ShapeSettings.js | 6 ++- .../main/app/view/ShapeSettings.js | 3 +- 5 files changed, 37 insertions(+), 26 deletions(-) diff --git a/apps/common/main/lib/component/MultiSliderGradient.js b/apps/common/main/lib/component/MultiSliderGradient.js index 0228fe09e..a3cc65c93 100644 --- a/apps/common/main/lib/component/MultiSliderGradient.js +++ b/apps/common/main/lib/component/MultiSliderGradient.js @@ -173,9 +173,10 @@ define([ removeThumb: function(index) { if (index===undefined) index = this.thumbs.length-1; - if (index>0) { + if (this.thumbs.length > 2) { this.thumbs[index].thumb.remove(); this.thumbs.splice(index, 1); + this.sortThumbs(); this.changeSliderStyle(); } }, diff --git a/apps/common/main/lib/component/Slider.js b/apps/common/main/lib/component/Slider.js index e6abb5266..c069a1b5d 100644 --- a/apps/common/main/lib/component/Slider.js +++ b/apps/common/main/lib/component/Slider.js @@ -348,23 +348,27 @@ define([ value = pos/me.delta + me.minValue; if (me.isRemoveThumb) { - if (me.thumbs.length < 3) return; - me.trigger('removethumb', me, index); - me.trigger('change', me); - me.trigger('changecomplete', me); + if (me.thumbs.length < 3) { + $(document).off('mouseup', me.binding.onMouseUp); + $(document).off('mousemove', me.binding.onMouseMove); + return; + } + me.trigger('removethumb', me, _.findIndex(me.thumbs, {index: index})); + me.trigger('changecomplete', me, value, lastValue); + } else { + me.setThumbPosition(index, pos); + me.thumbs[index].value = value; + + if (need_sort) + me.sortThumbs(); } - me.setThumbPosition(index, pos); - me.thumbs[index].value = value; - - if (need_sort) - me.sortThumbs(); - $(document).off('mouseup', me.binding.onMouseUp); $(document).off('mousemove', me.binding.onMouseMove); me._dragstart = undefined; - me.trigger('changecomplete', me, value, lastValue); + !me.isRemoveThumb && me.trigger('changecomplete', me, value, lastValue); + me.isRemoveThumb = undefined; }; var onMouseMove = function (e) { @@ -383,16 +387,16 @@ define([ pos = Math.max(0, Math.min(100, position)), value = pos/me.delta + me.minValue; - var positionY = e.pageY*Common.Utils.zoom() - me.cmpEl.offset().top; - me.isRemoveThumb = positionY > me.cmpEl.height(); - me.setRemoveThumb(index, me.isRemoveThumb); - me.setThumbPosition(index, pos); me.thumbs[index].value = value; if (need_sort) me.sortThumbs(); + var positionY = e.pageY*Common.Utils.zoom() - me.cmpEl.offset().top; + me.isRemoveThumb = positionY > me.cmpEl.height(); + me.setRemoveThumb(index, me.isRemoveThumb); + if (Math.abs(value-lastValue)>0.001) me.trigger('change', me, value, lastValue); }; @@ -510,10 +514,13 @@ define([ }, setRemoveThumb: function(index, remove) { - if (remove) { - this.thumbs[index].thumb.addClass('remove'); - } else { - this.thumbs[index].thumb.removeClass('remove'); + var ind = _.findIndex(this.thumbs, {index: index}); + if (ind !== -1) { + if (remove && this.thumbs.length > 2) { + this.thumbs[index].thumb.addClass('remove'); + } else { + this.thumbs[index].thumb.removeClass('remove'); + } } }, diff --git a/apps/documenteditor/main/app/view/ShapeSettings.js b/apps/documenteditor/main/app/view/ShapeSettings.js index 609b50247..613b3078d 100644 --- a/apps/documenteditor/main/app/view/ShapeSettings.js +++ b/apps/documenteditor/main/app/view/ShapeSettings.js @@ -957,6 +957,9 @@ define([ me.sldrGradient.setColorValue(Common.Utils.String.format('#{0}', (typeof(me.GradColor.colors[index]) == 'object') ? me.GradColor.colors[index].color : me.GradColor.colors[index]), index); me.sldrGradient.setValue(index, me.GradColor.values[index]); } + if (me.GradColor.currentIdx) { + me.sldrGradient.setActiveThumb(me.GradColor.currentIdx); + } this.OriginalFillType = Asc.c_oAscFill.FILL_TYPE_GRAD; this.FGColor = {Value: 1, Color: this.GradColor.colors[0]}; this.BGColor = {Value: 1, Color: 'ffffff'}; @@ -1361,9 +1364,8 @@ define([ me.sldrGradient.addNewThumb(index, color); }); this.sldrGradient.on('removethumb', function(cmp, index){ - me.GradColor.colors.splice(index, 1); - me.GradColor.values.splice(index, 1); me.sldrGradient.removeThumb(index); + me.GradColor.values.splice(index, 1); me.sldrGradient.changeGradientStyle(); }); this.fillControls.push(this.sldrGradient); diff --git a/apps/presentationeditor/main/app/view/ShapeSettings.js b/apps/presentationeditor/main/app/view/ShapeSettings.js index 79757ea42..28d8912b3 100644 --- a/apps/presentationeditor/main/app/view/ShapeSettings.js +++ b/apps/presentationeditor/main/app/view/ShapeSettings.js @@ -870,6 +870,9 @@ define([ me.sldrGradient.setColorValue(Common.Utils.String.format('#{0}', (typeof(me.GradColor.colors[index]) == 'object') ? me.GradColor.colors[index].color : me.GradColor.colors[index]), index); me.sldrGradient.setValue(index, me.GradColor.values[index]); } + if (me.GradColor.currentIdx) { + me.sldrGradient.setActiveThumb(me.GradColor.currentIdx); + } this.OriginalFillType = Asc.c_oAscFill.FILL_TYPE_GRAD; this.FGColor = {Value: 1, Color: this.GradColor.colors[0]}; this.BGColor = {Value: 1, Color: 'ffffff'}; @@ -1273,9 +1276,8 @@ define([ me.sldrGradient.addNewThumb(index, color); }); this.sldrGradient.on('removethumb', function(cmp, index){ - me.GradColor.colors.splice(index, 1); - me.GradColor.values.splice(index, 1); me.sldrGradient.removeThumb(index); + me.GradColor.values.splice(index, 1); me.sldrGradient.changeGradientStyle(); }); this.fillControls.push(this.sldrGradient); diff --git a/apps/spreadsheeteditor/main/app/view/ShapeSettings.js b/apps/spreadsheeteditor/main/app/view/ShapeSettings.js index f3b2f6ea6..d04fea464 100644 --- a/apps/spreadsheeteditor/main/app/view/ShapeSettings.js +++ b/apps/spreadsheeteditor/main/app/view/ShapeSettings.js @@ -1300,9 +1300,8 @@ define([ me.sldrGradient.addNewThumb(index, color); }); this.sldrGradient.on('removethumb', function(cmp, index){ - me.GradColor.colors.splice(index, 1); - me.GradColor.values.splice(index, 1); me.sldrGradient.removeThumb(index); + me.GradColor.values.splice(index, 1); me.sldrGradient.changeGradientStyle(); }); this.fillControls.push(this.sldrGradient); From 4d7afb1b856ad71162b4a89d9e508f1b99cdf957 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Fri, 15 Nov 2019 13:08:57 +0300 Subject: [PATCH 253/419] [SSE] Change style for selected and colored sheets --- apps/spreadsheeteditor/main/app/controller/Statusbar.js | 4 ++-- apps/spreadsheeteditor/main/resources/less/statusbar.less | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/apps/spreadsheeteditor/main/app/controller/Statusbar.js b/apps/spreadsheeteditor/main/app/controller/Statusbar.js index 545029bd8..cb2809a3c 100644 --- a/apps/spreadsheeteditor/main/app/controller/Statusbar.js +++ b/apps/spreadsheeteditor/main/app/controller/Statusbar.js @@ -676,9 +676,9 @@ define([ if (color.length) { if (!tab.isActive()) { - color = '0px 3px 0 ' + Common.Utils.RGBColor(color).toRGBA(0.7) + ' inset'; + color = '0px 4px 0 ' + Common.Utils.RGBColor(color).toRGBA(1) + ' inset'; } else { - color = '0px 3px 0 ' + color + ' inset'; + color = '0px 4px 0 ' + color + ' inset'; } tab.$el.find('a').css('box-shadow', color); diff --git a/apps/spreadsheeteditor/main/resources/less/statusbar.less b/apps/spreadsheeteditor/main/resources/less/statusbar.less index d11f7533b..5f9c7e8ab 100644 --- a/apps/spreadsheeteditor/main/resources/less/statusbar.less +++ b/apps/spreadsheeteditor/main/resources/less/statusbar.less @@ -188,7 +188,7 @@ background-color: @body-bg; outline: none; - box-shadow: 0px 2px 0 @gray-deep inset; + box-shadow: 0px 4px 0 #49795d inset; border-top-width: 0; font-weight: bold; } @@ -198,7 +198,7 @@ > a { border-bottom-color: @body-bg; background-color: @body-bg; - box-shadow: 0px 2px 0 @gray-deep inset; + box-shadow: 0px 4px 0 #49795d inset; } } From f2d2ef5fc37f9c7d9bbb61a1422de8bdf56c1793 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Fri, 15 Nov 2019 14:01:08 +0300 Subject: [PATCH 254/419] Show collaboration tab in the comment mode (show add/remove comment buttons) --- apps/common/main/lib/view/ReviewChanges.js | 2 +- .../main/app/controller/Main.js | 2 +- .../main/app/controller/Main.js | 11 ++- .../main/app/controller/Toolbar.js | 95 +++++++++++-------- .../main/app/view/Toolbar.js | 2 +- .../main/app/controller/Main.js | 11 ++- .../main/app/controller/Toolbar.js | 52 ++++++---- .../main/app/view/Toolbar.js | 2 +- 8 files changed, 104 insertions(+), 73 deletions(-) diff --git a/apps/common/main/lib/view/ReviewChanges.js b/apps/common/main/lib/view/ReviewChanges.js index 8f8ad705a..f24941211 100644 --- a/apps/common/main/lib/view/ReviewChanges.js +++ b/apps/common/main/lib/view/ReviewChanges.js @@ -468,7 +468,7 @@ define([ if (!me.btnHistory && separator_last) me.$el.find(separator_last).hide(); - Common.NotificationCenter.trigger('tab:visible', 'review', config.isEdit || config.canViewReview); + Common.NotificationCenter.trigger('tab:visible', 'review', config.isEdit || config.canViewReview || config.canCoAuthoring && config.canComments); setEvents.call(me); }); diff --git a/apps/documenteditor/main/app/controller/Main.js b/apps/documenteditor/main/app/controller/Main.js index 22beaaa0c..f1e81d3de 100644 --- a/apps/documenteditor/main/app/controller/Main.js +++ b/apps/documenteditor/main/app/controller/Main.js @@ -1269,7 +1269,7 @@ define([ var toolbarController = application.getController('Toolbar'); toolbarController && toolbarController.setApi(me.api); - if (this.appOptions.isRestrictedEdit) return; + if (!this.appOptions.isEdit) return; var rightmenuController = application.getController('RightMenu'), fontsControllers = application.getController('Common.Controllers.Fonts'); diff --git a/apps/presentationeditor/main/app/controller/Main.js b/apps/presentationeditor/main/app/controller/Main.js index f1629ec05..ea3bd9378 100644 --- a/apps/presentationeditor/main/app/controller/Main.js +++ b/apps/presentationeditor/main/app/controller/Main.js @@ -976,14 +976,17 @@ define([ reviewController = application.getController('Common.Controllers.ReviewChanges'); reviewController.setMode(me.appOptions).setConfig({config: me.editorConfig}, me.api).loadDocument({doc:me.document}); - if (this.appOptions.isEdit) { - var toolbarController = application.getController('Toolbar'), - rightmenuController = application.getController('RightMenu'), + if (this.appOptions.isEdit || this.appOptions.isRestrictedEdit) { // set api events for toolbar in the Restricted Editing mode) + var toolbarController = application.getController('Toolbar'); + toolbarController && toolbarController.setApi(me.api); + + if (!this.appOptions.isEdit) return; + + var rightmenuController = application.getController('RightMenu'), fontsControllers = application.getController('Common.Controllers.Fonts'); // me.getStore('SlideLayouts'); fontsControllers && fontsControllers.setApi(me.api); - toolbarController && toolbarController.setApi(me.api); rightmenuController && rightmenuController.setApi(me.api); if (me.appOptions.canProtect) diff --git a/apps/presentationeditor/main/app/controller/Toolbar.js b/apps/presentationeditor/main/app/controller/Toolbar.js index e5f0f9509..0373668a7 100644 --- a/apps/presentationeditor/main/app/controller/Toolbar.js +++ b/apps/presentationeditor/main/app/controller/Toolbar.js @@ -323,48 +323,52 @@ define([ setApi: function(api) { this.api = api; - this.toolbar.setApi(api); + if (this.mode.isEdit) { + this.toolbar.setApi(api); - this.api.asc_registerCallback('asc_onFontSize', _.bind(this.onApiFontSize, this)); - this.api.asc_registerCallback('asc_onBold', _.bind(this.onApiBold, this)); - this.api.asc_registerCallback('asc_onItalic', _.bind(this.onApiItalic, this)); - this.api.asc_registerCallback('asc_onUnderline', _.bind(this.onApiUnderline, this)); - this.api.asc_registerCallback('asc_onStrikeout', _.bind(this.onApiStrikeout, this)); - this.api.asc_registerCallback('asc_onVerticalAlign', _.bind(this.onApiVerticalAlign, this)); - Common.NotificationCenter.on('fonts:change', _.bind(this.onApiChangeFont, this)); + this.api.asc_registerCallback('asc_onFontSize', _.bind(this.onApiFontSize, this)); + this.api.asc_registerCallback('asc_onBold', _.bind(this.onApiBold, this)); + this.api.asc_registerCallback('asc_onItalic', _.bind(this.onApiItalic, this)); + this.api.asc_registerCallback('asc_onUnderline', _.bind(this.onApiUnderline, this)); + this.api.asc_registerCallback('asc_onStrikeout', _.bind(this.onApiStrikeout, this)); + this.api.asc_registerCallback('asc_onVerticalAlign', _.bind(this.onApiVerticalAlign, this)); + Common.NotificationCenter.on('fonts:change', _.bind(this.onApiChangeFont, this)); - this.api.asc_registerCallback('asc_onCanUndo', _.bind(this.onApiCanRevert, this, 'undo')); - this.api.asc_registerCallback('asc_onCanRedo', _.bind(this.onApiCanRevert, this, 'redo')); - this.api.asc_registerCallback('asc_onPaintFormatChanged', _.bind(this.onApiStyleChange, this)); - this.api.asc_registerCallback('asc_onListType', _.bind(this.onApiBullets, this)); - this.api.asc_registerCallback('asc_canIncreaseIndent', _.bind(this.onApiCanIncreaseIndent, this)); - this.api.asc_registerCallback('asc_canDecreaseIndent', _.bind(this.onApiCanDecreaseIndent, this)); - this.api.asc_registerCallback('asc_onLineSpacing', _.bind(this.onApiLineSpacing, this)); - this.api.asc_registerCallback('asc_onPrAlign', _.bind(this.onApiParagraphAlign, this)); - this.api.asc_registerCallback('asc_onVerticalTextAlign', _.bind(this.onApiVerticalTextAlign, this)); - this.api.asc_registerCallback('asc_onCanAddHyperlink', _.bind(this.onApiCanAddHyperlink, this)); - this.api.asc_registerCallback('asc_onTextColor', _.bind(this.onApiTextColor, this)); + this.api.asc_registerCallback('asc_onCanUndo', _.bind(this.onApiCanRevert, this, 'undo')); + this.api.asc_registerCallback('asc_onCanRedo', _.bind(this.onApiCanRevert, this, 'redo')); + this.api.asc_registerCallback('asc_onPaintFormatChanged', _.bind(this.onApiStyleChange, this)); + this.api.asc_registerCallback('asc_onListType', _.bind(this.onApiBullets, this)); + this.api.asc_registerCallback('asc_canIncreaseIndent', _.bind(this.onApiCanIncreaseIndent, this)); + this.api.asc_registerCallback('asc_canDecreaseIndent', _.bind(this.onApiCanDecreaseIndent, this)); + this.api.asc_registerCallback('asc_onLineSpacing', _.bind(this.onApiLineSpacing, this)); + this.api.asc_registerCallback('asc_onPrAlign', _.bind(this.onApiParagraphAlign, this)); + this.api.asc_registerCallback('asc_onVerticalTextAlign', _.bind(this.onApiVerticalTextAlign, this)); + this.api.asc_registerCallback('asc_onCanAddHyperlink', _.bind(this.onApiCanAddHyperlink, this)); + this.api.asc_registerCallback('asc_onTextColor', _.bind(this.onApiTextColor, this)); - this.api.asc_registerCallback('asc_onUpdateThemeIndex', _.bind(this.onApiUpdateThemeIndex, this)); - this.api.asc_registerCallback('asc_onEndAddShape', _.bind(this.onApiEndAddShape, this)); - this.api.asc_registerCallback('asc_onCanGroup', _.bind(this.onApiCanGroup, this)); - this.api.asc_registerCallback('asc_onCanUnGroup', _.bind(this.onApiCanUnGroup, this)); - this.api.asc_registerCallback('asc_onPresentationSize', _.bind(this.onApiPageSize, this)); + this.api.asc_registerCallback('asc_onUpdateThemeIndex', _.bind(this.onApiUpdateThemeIndex, this)); + this.api.asc_registerCallback('asc_onEndAddShape', _.bind(this.onApiEndAddShape, this)); + this.api.asc_registerCallback('asc_onCanGroup', _.bind(this.onApiCanGroup, this)); + this.api.asc_registerCallback('asc_onCanUnGroup', _.bind(this.onApiCanUnGroup, this)); + this.api.asc_registerCallback('asc_onPresentationSize', _.bind(this.onApiPageSize, this)); - this.api.asc_registerCallback('asc_onCoAuthoringDisconnect',_.bind(this.onApiCoAuthoringDisconnect, this)); - Common.NotificationCenter.on('api:disconnect', _.bind(this.onApiCoAuthoringDisconnect, this)); - this.api.asc_registerCallback('asc_onZoomChange', _.bind(this.onApiZoomChange, this)); - this.api.asc_registerCallback('asc_onFocusObject', _.bind(this.onApiFocusObject, this)); - this.api.asc_registerCallback('asc_onLockDocumentProps', _.bind(this.onApiLockDocumentProps, this)); - this.api.asc_registerCallback('asc_onUnLockDocumentProps', _.bind(this.onApiUnLockDocumentProps, this)); - this.api.asc_registerCallback('asc_onLockDocumentTheme', _.bind(this.onApiLockDocumentTheme, this)); - this.api.asc_registerCallback('asc_onUnLockDocumentTheme', _.bind(this.onApiUnLockDocumentTheme, this)); - this.api.asc_registerCallback('asc_onInitEditorStyles', _.bind(this.onApiInitEditorStyles, this)); + this.api.asc_registerCallback('asc_onCoAuthoringDisconnect',_.bind(this.onApiCoAuthoringDisconnect, this)); + Common.NotificationCenter.on('api:disconnect', _.bind(this.onApiCoAuthoringDisconnect, this)); + this.api.asc_registerCallback('asc_onZoomChange', _.bind(this.onApiZoomChange, this)); + this.api.asc_registerCallback('asc_onFocusObject', _.bind(this.onApiFocusObject, this)); + this.api.asc_registerCallback('asc_onLockDocumentProps', _.bind(this.onApiLockDocumentProps, this)); + this.api.asc_registerCallback('asc_onUnLockDocumentProps', _.bind(this.onApiUnLockDocumentProps, this)); + this.api.asc_registerCallback('asc_onLockDocumentTheme', _.bind(this.onApiLockDocumentTheme, this)); + this.api.asc_registerCallback('asc_onUnLockDocumentTheme', _.bind(this.onApiUnLockDocumentTheme, this)); + this.api.asc_registerCallback('asc_onInitEditorStyles', _.bind(this.onApiInitEditorStyles, this)); - this.api.asc_registerCallback('asc_onCountPages', _.bind(this.onApiCountPages, this)); - this.api.asc_registerCallback('asc_onMathTypes', _.bind(this.onApiMathTypes, this)); - this.api.asc_registerCallback('asc_onContextMenu', _.bind(this.onContextMenu, this)); - this.api.asc_registerCallback('asc_onTextLanguage', _.bind(this.onTextLanguage, this)); + this.api.asc_registerCallback('asc_onCountPages', _.bind(this.onApiCountPages, this)); + this.api.asc_registerCallback('asc_onMathTypes', _.bind(this.onApiMathTypes, this)); + this.api.asc_registerCallback('asc_onContextMenu', _.bind(this.onContextMenu, this)); + this.api.asc_registerCallback('asc_onTextLanguage', _.bind(this.onTextLanguage, this)); + } else if (this.mode.isRestrictedEdit) { + this.api.asc_registerCallback('asc_onCountPages', _.bind(this.onApiCountPagesRestricted, this)); + } }, onChangeCompactView: function(view, compact) { @@ -638,6 +642,14 @@ define([ } }, + onApiCountPagesRestricted: function(count) { + if (this._state.no_slides !== (count<=0)) { + this._state.no_slides = (count<=0); + if (this.btnsComment) + this.toolbar.lockToolbar(PE.enumLock.noSlides, this._state.no_slides, { array: this.btnsComment }); + } + }, + onApiFocusObject: function(selectedObjects) { if (!this.editMode) return; @@ -2139,12 +2151,13 @@ define([ me.toolbar.render(_.extend({compactview: compactview}, config)); + var tab = {action: 'review', caption: me.toolbar.textTabCollaboration}; + var $panel = me.getApplication().getController('Common.Controllers.ReviewChanges').createToolbarPanel(); + if ( $panel ) + me.toolbar.addTab(tab, $panel, 3); + if ( config.isEdit ) { me.toolbar.setMode(config); - var tab = {action: 'review', caption: me.toolbar.textTabCollaboration}; - var $panel = me.getApplication().getController('Common.Controllers.ReviewChanges').createToolbarPanel(); - if ( $panel ) - me.toolbar.addTab(tab, $panel, 3); me.toolbar.btnSave.on('disabled', _.bind(me.onBtnChangeState, me, 'save:disabled')); diff --git a/apps/presentationeditor/main/app/view/Toolbar.js b/apps/presentationeditor/main/app/view/Toolbar.js index 37e238ecd..253df53b9 100644 --- a/apps/presentationeditor/main/app/view/Toolbar.js +++ b/apps/presentationeditor/main/app/view/Toolbar.js @@ -121,7 +121,7 @@ define([ applyLayout: function (config) { var me = this; - + me.lockControls = []; if ( config.isEdit ) { Common.UI.Mixtbar.prototype.initialize.call(this, { template: _.template(template), diff --git a/apps/spreadsheeteditor/main/app/controller/Main.js b/apps/spreadsheeteditor/main/app/controller/Main.js index 8a6694f98..74a38f3bf 100644 --- a/apps/spreadsheeteditor/main/app/controller/Main.js +++ b/apps/spreadsheeteditor/main/app/controller/Main.js @@ -1050,14 +1050,17 @@ define([ reviewController = application.getController('Common.Controllers.ReviewChanges'); reviewController.setMode(me.appOptions).setConfig({config: me.editorConfig}, me.api).loadDocument({doc:me.appOptions.spreadsheet}); - if (this.appOptions.isEdit) { - var toolbarController = application.getController('Toolbar'), - statusbarController = application.getController('Statusbar'), + if (this.appOptions.isEdit || this.appOptions.isRestrictedEdit) { // set api events for toolbar in the Restricted Editing mode + var toolbarController = application.getController('Toolbar'); + toolbarController && toolbarController.setApi(me.api); + + if (!this.appOptions.isEdit) return; + + var statusbarController = application.getController('Statusbar'), rightmenuController = application.getController('RightMenu'), fontsControllers = application.getController('Common.Controllers.Fonts'); fontsControllers && fontsControllers.setApi(me.api); - toolbarController && toolbarController.setApi(me.api); // statusbarController && statusbarController.setApi(me.api); rightmenuController && rightmenuController.setApi(me.api); diff --git a/apps/spreadsheeteditor/main/app/controller/Toolbar.js b/apps/spreadsheeteditor/main/app/controller/Toolbar.js index 38f3a4009..0a2c60e52 100644 --- a/apps/spreadsheeteditor/main/app/controller/Toolbar.js +++ b/apps/spreadsheeteditor/main/app/controller/Toolbar.js @@ -389,18 +389,21 @@ define([ this.api = api; var config = SSE.getController('Main').appOptions; - if ( !config.isEditDiagram && !config.isEditMailMerge ) { - this.api.asc_registerCallback('asc_onSendThemeColors', _.bind(this.onSendThemeColors, this)); - this.api.asc_registerCallback('asc_onMathTypes', _.bind(this.onApiMathTypes, this)); - this.api.asc_registerCallback('asc_onContextMenu', _.bind(this.onContextMenu, this)); - } + if (config.isEdit) { + if ( !config.isEditDiagram && !config.isEditMailMerge ) { + this.api.asc_registerCallback('asc_onSendThemeColors', _.bind(this.onSendThemeColors, this)); + this.api.asc_registerCallback('asc_onMathTypes', _.bind(this.onApiMathTypes, this)); + this.api.asc_registerCallback('asc_onContextMenu', _.bind(this.onContextMenu, this)); + } + this.api.asc_registerCallback('asc_onInitEditorStyles', _.bind(this.onApiInitEditorStyles, this)); + this.api.asc_registerCallback('asc_onCoAuthoringDisconnect',_.bind(this.onApiCoAuthoringDisconnect, this)); + Common.NotificationCenter.on('api:disconnect', _.bind(this.onApiCoAuthoringDisconnect, this)); + this.api.asc_registerCallback('asc_onLockDefNameManager', _.bind(this.onLockDefNameManager, this)); + this.api.asc_registerCallback('asc_onZoomChanged', _.bind(this.onApiZoomChange, this)); + Common.NotificationCenter.on('fonts:change', _.bind(this.onApiChangeFont, this)); + } else if (config.isRestrictedEdit) + this.api.asc_registerCallback('asc_onSelectionChanged', _.bind(this.onApiSelectionChangedRestricted, this)); - this.api.asc_registerCallback('asc_onInitEditorStyles', _.bind(this.onApiInitEditorStyles, this)); - this.api.asc_registerCallback('asc_onCoAuthoringDisconnect',_.bind(this.onApiCoAuthoringDisconnect, this)); - Common.NotificationCenter.on('api:disconnect', _.bind(this.onApiCoAuthoringDisconnect, this)); - this.api.asc_registerCallback('asc_onLockDefNameManager', _.bind(this.onLockDefNameManager, this)); - this.api.asc_registerCallback('asc_onZoomChanged', _.bind(this.onApiZoomChange, this)); - Common.NotificationCenter.on('fonts:change', _.bind(this.onApiChangeFont, this)); }, // onNewDocument: function(btn, e) { @@ -2429,6 +2432,13 @@ define([ toolbar.lockToolbar(SSE.enumLock.headerLock, info.asc_getLockedHeaderFooter(), {array: this.toolbar.btnsEditHeader}); }, + onApiSelectionChangedRestricted: function(info) { + var selectionType = info.asc_getFlags().asc_getSelectionType(); + this.toolbar.lockToolbar(SSE.enumLock.commentLock, (selectionType == Asc.c_oAscSelectionType.RangeCells) && (info.asc_getComments().length>0 || info.asc_getLocked()) || + this.appConfig && this.appConfig.compatibleFeatures && (selectionType != Asc.c_oAscSelectionType.RangeCells), + { array: this.btnsComment }); + }, + onApiSelectionChanged_DiagramEditor: function(info) { if ( !this.editMode || this.api.isCellEdited || this.api.isRangeSelection) return; @@ -3177,6 +3187,13 @@ define([ me.toolbar.render(_.extend({isCompactView: compactview}, config)); + if ( !config.isEditDiagram && !config.isEditMailMerge ) { + var tab = {action: 'review', caption: me.toolbar.textTabCollaboration}; + var $panel = me.getApplication().getController('Common.Controllers.ReviewChanges').createToolbarPanel(); + if ($panel) + me.toolbar.addTab(tab, $panel, 6); + } + if ( config.isEdit ) { me.toolbar.setMode(config); @@ -3204,19 +3221,14 @@ define([ Array.prototype.push.apply(me.toolbar.lockControls, formulatab.getButtons()); if ( !config.isOffline ) { - tab = {action: 'pivot', caption: me.textPivot}; - $panel = me.getApplication().getController('PivotTable').createToolbarPanel(); + var tab = {action: 'pivot', caption: me.textPivot}; + var $panel = me.getApplication().getController('PivotTable').createToolbarPanel(); if ($panel) { me.toolbar.addTab(tab, $panel, 5); me.toolbar.setVisible('pivot', true); } } - var tab = {action: 'review', caption: me.toolbar.textTabCollaboration}; - var $panel = me.getApplication().getController('Common.Controllers.ReviewChanges').createToolbarPanel(); - if ( $panel ) - me.toolbar.addTab(tab, $panel, 6); - if (!(config.customization && config.customization.compactHeader)) { // hide 'print' and 'save' buttons group and next separator me.toolbar.btnPrint.$el.parents('.group').hide().next().hide(); @@ -3231,8 +3243,8 @@ define([ if ( config.isDesktopApp ) { if ( config.canProtect ) { - tab = {action: 'protect', caption: me.toolbar.textTabProtect}; - $panel = me.getApplication().getController('Common.Controllers.Protection').createToolbarPanel(); + var tab = {action: 'protect', caption: me.toolbar.textTabProtect}; + var $panel = me.getApplication().getController('Common.Controllers.Protection').createToolbarPanel(); if ($panel) me.toolbar.addTab(tab, $panel, 7); } diff --git a/apps/spreadsheeteditor/main/app/view/Toolbar.js b/apps/spreadsheeteditor/main/app/view/Toolbar.js index 769be62ab..f67499c25 100644 --- a/apps/spreadsheeteditor/main/app/view/Toolbar.js +++ b/apps/spreadsheeteditor/main/app/view/Toolbar.js @@ -1460,7 +1460,7 @@ define([ } ); } - + me.lockControls = []; if (config.isEdit) { me.lockControls = [ me.cmbFontName, me.cmbFontSize, me.btnIncFontSize, me.btnDecFontSize, me.btnBold, From 310033f575f974b59d49cfabf5b1706380005c5b Mon Sep 17 00:00:00 2001 From: Julia Svinareva Date: Fri, 15 Nov 2019 14:05:50 +0300 Subject: [PATCH 255/419] [DE] [PE] [SSE] Gradient Slider: add, remove thumb --- .../main/lib/component/MultiSliderGradient.js | 3 --- apps/common/main/lib/component/Slider.js | 7 +++---- apps/documenteditor/main/app/view/ShapeSettings.js | 5 +++-- .../documenteditor/main/app/view/TextArtSettings.js | 13 +++++++++++++ .../main/app/view/ShapeSettings.js | 5 +++-- .../main/app/view/SlideSettings.js | 13 +++++++++++++ .../main/app/view/TextArtSettings.js | 13 +++++++++++++ .../main/app/view/ShapeSettings.js | 5 +++-- .../main/app/view/TextArtSettings.js | 13 +++++++++++++ 9 files changed, 64 insertions(+), 13 deletions(-) diff --git a/apps/common/main/lib/component/MultiSliderGradient.js b/apps/common/main/lib/component/MultiSliderGradient.js index a3cc65c93..71a5bf3a6 100644 --- a/apps/common/main/lib/component/MultiSliderGradient.js +++ b/apps/common/main/lib/component/MultiSliderGradient.js @@ -161,9 +161,6 @@ define([ addNewThumb: function(index, color) { var me = this; - me.thumbs[index].thumb.on('dblclick', null, function() { - me.trigger('thumbdblclick', me); - }); me.thumbs[index].thumbcolor = me.thumbs[index].thumb.find('> div'); (index>0) && this.setColorValue(color, index); me.sortThumbs(); diff --git a/apps/common/main/lib/component/Slider.js b/apps/common/main/lib/component/Slider.js index c069a1b5d..14e9717ea 100644 --- a/apps/common/main/lib/component/Slider.js +++ b/apps/common/main/lib/component/Slider.js @@ -419,8 +419,7 @@ define([ }; var onTrackMouseUp = function (e) { - if ( me.disabled ) return; - if ( me.thumbs.length > 9 ) return; + if ( me.disabled || !_.isUndefined(me._dragstart) || me.thumbs.length > 9) return; var pos = Math.max(0, Math.min(100, (Math.round((e.pageX*Common.Utils.zoom() - me.cmpEl.offset().left) / me.width * 100)))), nearIndex = findThumb(pos), @@ -517,9 +516,9 @@ define([ var ind = _.findIndex(this.thumbs, {index: index}); if (ind !== -1) { if (remove && this.thumbs.length > 2) { - this.thumbs[index].thumb.addClass('remove'); + this.$el.find('.active').addClass('remove'); } else { - this.thumbs[index].thumb.removeClass('remove'); + this.$el.find('.remove').removeClass('remove'); } } }, diff --git a/apps/documenteditor/main/app/view/ShapeSettings.js b/apps/documenteditor/main/app/view/ShapeSettings.js index 613b3078d..33ce7c598 100644 --- a/apps/documenteditor/main/app/view/ShapeSettings.js +++ b/apps/documenteditor/main/app/view/ShapeSettings.js @@ -957,9 +957,10 @@ define([ me.sldrGradient.setColorValue(Common.Utils.String.format('#{0}', (typeof(me.GradColor.colors[index]) == 'object') ? me.GradColor.colors[index].color : me.GradColor.colors[index]), index); me.sldrGradient.setValue(index, me.GradColor.values[index]); } - if (me.GradColor.currentIdx) { - me.sldrGradient.setActiveThumb(me.GradColor.currentIdx); + if (_.isUndefined(me.GradColor.currentIdx) || me.GradColor.currentIdx >= this.GradColor.colors.length) { + me.GradColor.currentIdx = 0; } + me.sldrGradient.setActiveThumb(me.GradColor.currentIdx); this.OriginalFillType = Asc.c_oAscFill.FILL_TYPE_GRAD; this.FGColor = {Value: 1, Color: this.GradColor.colors[0]}; this.BGColor = {Value: 1, Color: 'ffffff'}; diff --git a/apps/documenteditor/main/app/view/TextArtSettings.js b/apps/documenteditor/main/app/view/TextArtSettings.js index 4613bf022..f1a445a19 100644 --- a/apps/documenteditor/main/app/view/TextArtSettings.js +++ b/apps/documenteditor/main/app/view/TextArtSettings.js @@ -650,6 +650,10 @@ define([ me.sldrGradient.setColorValue(Common.Utils.String.format('#{0}', (typeof(me.GradColor.colors[index]) == 'object') ? me.GradColor.colors[index].color : me.GradColor.colors[index]), index); me.sldrGradient.setValue(index, me.GradColor.values[index]); } + if (_.isUndefined(me.GradColor.currentIdx) || me.GradColor.currentIdx >= this.GradColor.colors.length) { + me.GradColor.currentIdx = 0; + } + me.sldrGradient.setActiveThumb(me.GradColor.currentIdx); this.OriginalFillType = Asc.c_oAscFill.FILL_TYPE_GRAD; this.ShapeColor = {Value: 1, Color: this.GradColor.colors[0]}; } @@ -944,6 +948,15 @@ define([ me.GradColor.colors = colors; me.GradColor.currentIdx = currentIdx; }); + this.sldrGradient.on('addthumb', function(cmp, index, nearIndex, color){ + me.GradColor.colors[index] = me.GradColor.colors[nearIndex]; + me.sldrGradient.addNewThumb(index, color); + }); + this.sldrGradient.on('removethumb', function(cmp, index){ + me.sldrGradient.removeThumb(index); + me.GradColor.values.splice(index, 1); + me.sldrGradient.changeGradientStyle(); + }); this.lockedControls.push(this.sldrGradient); this.cmbBorderSize = new Common.UI.ComboBorderSizeEditable({ diff --git a/apps/presentationeditor/main/app/view/ShapeSettings.js b/apps/presentationeditor/main/app/view/ShapeSettings.js index 28d8912b3..602299ba0 100644 --- a/apps/presentationeditor/main/app/view/ShapeSettings.js +++ b/apps/presentationeditor/main/app/view/ShapeSettings.js @@ -870,9 +870,10 @@ define([ me.sldrGradient.setColorValue(Common.Utils.String.format('#{0}', (typeof(me.GradColor.colors[index]) == 'object') ? me.GradColor.colors[index].color : me.GradColor.colors[index]), index); me.sldrGradient.setValue(index, me.GradColor.values[index]); } - if (me.GradColor.currentIdx) { - me.sldrGradient.setActiveThumb(me.GradColor.currentIdx); + if (_.isUndefined(me.GradColor.currentIdx) || me.GradColor.currentIdx >= this.GradColor.colors.length) { + me.GradColor.currentIdx = 0; } + me.sldrGradient.setActiveThumb(me.GradColor.currentIdx); this.OriginalFillType = Asc.c_oAscFill.FILL_TYPE_GRAD; this.FGColor = {Value: 1, Color: this.GradColor.colors[0]}; this.BGColor = {Value: 1, Color: 'ffffff'}; diff --git a/apps/presentationeditor/main/app/view/SlideSettings.js b/apps/presentationeditor/main/app/view/SlideSettings.js index f71abc046..469038244 100644 --- a/apps/presentationeditor/main/app/view/SlideSettings.js +++ b/apps/presentationeditor/main/app/view/SlideSettings.js @@ -804,6 +804,15 @@ define([ me.GradColor.colors = colors; me.GradColor.currentIdx = currentIdx; }); + this.sldrGradient.on('addthumb', function(cmp, index, nearIndex, color){ + me.GradColor.colors[index] = me.GradColor.colors[nearIndex]; + me.sldrGradient.addNewThumb(index, color); + }); + this.sldrGradient.on('removethumb', function(cmp, index){ + me.sldrGradient.removeThumb(index); + me.GradColor.values.splice(index, 1); + me.sldrGradient.changeGradientStyle(); + }); this.FillItems.push(this.sldrGradient); }, @@ -1282,6 +1291,10 @@ define([ me.sldrGradient.setColorValue(Common.Utils.String.format('#{0}', (typeof(me.GradColor.colors[index]) == 'object') ? me.GradColor.colors[index].color : me.GradColor.colors[index]), index); me.sldrGradient.setValue(index, me.GradColor.values[index]); } + if (_.isUndefined(me.GradColor.currentIdx) || me.GradColor.currentIdx >= this.GradColor.colors.length) { + me.GradColor.currentIdx = 0; + } + me.sldrGradient.setActiveThumb(me.GradColor.currentIdx); this.OriginalFillType = Asc.c_oAscFill.FILL_TYPE_GRAD; this.FGColor = {Value: 1, Color: this.GradColor.colors[0]}; this.BGColor = {Value: 1, Color: 'ffffff'}; diff --git a/apps/presentationeditor/main/app/view/TextArtSettings.js b/apps/presentationeditor/main/app/view/TextArtSettings.js index 7d1690829..d2940b0cd 100644 --- a/apps/presentationeditor/main/app/view/TextArtSettings.js +++ b/apps/presentationeditor/main/app/view/TextArtSettings.js @@ -846,6 +846,10 @@ define([ me.sldrGradient.setColorValue(Common.Utils.String.format('#{0}', (typeof(me.GradColor.colors[index]) == 'object') ? me.GradColor.colors[index].color : me.GradColor.colors[index]), index); me.sldrGradient.setValue(index, me.GradColor.values[index]); } + if (_.isUndefined(me.GradColor.currentIdx) || me.GradColor.currentIdx >= this.GradColor.colors.length) { + me.GradColor.currentIdx = 0; + } + me.sldrGradient.setActiveThumb(me.GradColor.currentIdx); this.OriginalFillType = Asc.c_oAscFill.FILL_TYPE_GRAD; this.FGColor = {Value: 1, Color: this.GradColor.colors[0]}; this.BGColor = {Value: 1, Color: 'ffffff'}; @@ -1253,6 +1257,15 @@ define([ me.GradColor.colors = colors; me.GradColor.currentIdx = currentIdx; }); + this.sldrGradient.on('addthumb', function(cmp, index, nearIndex, color){ + me.GradColor.colors[index] = me.GradColor.colors[nearIndex]; + me.sldrGradient.addNewThumb(index, color); + }); + this.sldrGradient.on('removethumb', function(cmp, index){ + me.sldrGradient.removeThumb(index); + me.GradColor.values.splice(index, 1); + me.sldrGradient.changeGradientStyle(); + }); this.lockedControls.push(this.sldrGradient); this.cmbBorderSize = new Common.UI.ComboBorderSizeEditable({ diff --git a/apps/spreadsheeteditor/main/app/view/ShapeSettings.js b/apps/spreadsheeteditor/main/app/view/ShapeSettings.js index d04fea464..9b28011ca 100644 --- a/apps/spreadsheeteditor/main/app/view/ShapeSettings.js +++ b/apps/spreadsheeteditor/main/app/view/ShapeSettings.js @@ -894,9 +894,10 @@ define([ me.sldrGradient.setColorValue(Common.Utils.String.format('#{0}', (typeof(me.GradColor.colors[index]) == 'object') ? me.GradColor.colors[index].color : me.GradColor.colors[index]), index); me.sldrGradient.setValue(index, me.GradColor.values[index]); } - if (me.GradColor.currentIdx) { - me.sldrGradient.setActiveThumb(me.GradColor.currentIdx); + if (_.isUndefined(me.GradColor.currentIdx) || me.GradColor.currentIdx >= this.GradColor.colors.length) { + me.GradColor.currentIdx = 0; } + me.sldrGradient.setActiveThumb(me.GradColor.currentIdx); this.OriginalFillType = Asc.c_oAscFill.FILL_TYPE_GRAD; this.FGColor = {Value: 1, Color: this.GradColor.colors[0]}; this.BGColor = {Value: 1, Color: 'ffffff'}; diff --git a/apps/spreadsheeteditor/main/app/view/TextArtSettings.js b/apps/spreadsheeteditor/main/app/view/TextArtSettings.js index d3d6291d7..9141afbb5 100644 --- a/apps/spreadsheeteditor/main/app/view/TextArtSettings.js +++ b/apps/spreadsheeteditor/main/app/view/TextArtSettings.js @@ -850,6 +850,10 @@ define([ me.sldrGradient.setColorValue(Common.Utils.String.format('#{0}', (typeof(me.GradColor.colors[index]) == 'object') ? me.GradColor.colors[index].color : me.GradColor.colors[index]), index); me.sldrGradient.setValue(index, me.GradColor.values[index]); } + if (_.isUndefined(me.GradColor.currentIdx) || me.GradColor.currentIdx >= this.GradColor.colors.length) { + me.GradColor.currentIdx = 0; + } + me.sldrGradient.setActiveThumb(me.GradColor.currentIdx); this.OriginalFillType = Asc.c_oAscFill.FILL_TYPE_GRAD; this.FGColor = {Value: 1, Color: this.GradColor.colors[0]}; this.BGColor = {Value: 1, Color: 'ffffff'}; @@ -1257,6 +1261,15 @@ define([ me.GradColor.colors = colors; me.GradColor.currentIdx = currentIdx; }); + this.sldrGradient.on('addthumb', function(cmp, index, nearIndex, color){ + me.GradColor.colors[index] = me.GradColor.colors[nearIndex]; + me.sldrGradient.addNewThumb(index, color); + }); + this.sldrGradient.on('removethumb', function(cmp, index){ + me.sldrGradient.removeThumb(index); + me.GradColor.values.splice(index, 1); + me.sldrGradient.changeGradientStyle(); + }); this.lockedControls.push(this.sldrGradient); this.cmbBorderSize = new Common.UI.ComboBorderSizeEditable({ From 3c493d898b7b718fde788b032ab15fe229af96c6 Mon Sep 17 00:00:00 2001 From: Julia Svinareva Date: Fri, 15 Nov 2019 14:33:09 +0300 Subject: [PATCH 256/419] Gradient Slider: fix remove thumb --- apps/common/main/lib/component/Slider.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/common/main/lib/component/Slider.js b/apps/common/main/lib/component/Slider.js index 14e9717ea..00e54d0d0 100644 --- a/apps/common/main/lib/component/Slider.js +++ b/apps/common/main/lib/component/Slider.js @@ -394,7 +394,7 @@ define([ me.sortThumbs(); var positionY = e.pageY*Common.Utils.zoom() - me.cmpEl.offset().top; - me.isRemoveThumb = positionY > me.cmpEl.height(); + me.isRemoveThumb = positionY > me.cmpEl.height() || positionY < 0; me.setRemoveThumb(index, me.isRemoveThumb); if (Math.abs(value-lastValue)>0.001) From 93e10743fbd7c2618f6dc5f697ca4ec39dda901a Mon Sep 17 00:00:00 2001 From: Oleg Korshul Date: Fri, 15 Nov 2019 14:36:57 +0300 Subject: [PATCH 257/419] Add images to deploy --- build/common.json | 2 ++ 1 file changed, 2 insertions(+) diff --git a/build/common.json b/build/common.json index 639be9511..ae094a888 100644 --- a/build/common.json +++ b/build/common.json @@ -16,6 +16,8 @@ "cwd": "../../sdkjs/common/", "src": [ "Images/*", + "Images/placeholders/*", + "Images/content_controls/*", "Native/*.js", "libfont/js/fonts.*", "libfont/wasm/fonts.*" From 5aed3e8b516e58aeea32146c9834d52a128a1b29 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Fri, 15 Nov 2019 14:42:07 +0300 Subject: [PATCH 258/419] [DE] Fix opening symbol table dialog --- .../main/app/controller/Toolbar.js | 34 ++++++++++--------- 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/apps/documenteditor/main/app/controller/Toolbar.js b/apps/documenteditor/main/app/controller/Toolbar.js index 7f5f5bdd7..d4ceada56 100644 --- a/apps/documenteditor/main/app/controller/Toolbar.js +++ b/apps/documenteditor/main/app/controller/Toolbar.js @@ -2475,23 +2475,25 @@ define([ }, onInsertSymbolClick: function() { + if (this.dlgSymbolTable && this.dlgSymbolTable.isVisible()) return; + if (this.api) { - var me = this, - win = new Common.Views.SymbolTableDialog({ - api: me.api, - lang: me.mode.lang, - modal: false, - type: 1, - buttons: [{value: 'ok', caption: this.textInsert}, 'close'], - handler: function(dlg, result, settings) { - if (result == 'ok') { - me.api.pluginMethod_PasteHtml("" + settings.symbol + ""); - } else - Common.NotificationCenter.trigger('edit:complete', me.toolbar); - } - }); - win.show(); - win.on('symbol:dblclick', function(cmp, settings) { + var me = this; + me.dlgSymbolTable = new Common.Views.SymbolTableDialog({ + api: me.api, + lang: me.mode.lang, + modal: false, + type: 1, + buttons: [{value: 'ok', caption: this.textInsert}, 'close'], + handler: function(dlg, result, settings) { + if (result == 'ok') { + me.api.pluginMethod_PasteHtml("" + settings.symbol + ""); + } else + Common.NotificationCenter.trigger('edit:complete', me.toolbar); + } + }); + me.dlgSymbolTable.show(); + me.dlgSymbolTable.on('symbol:dblclick', function(cmp, settings) { me.api.pluginMethod_PasteHtml("" + settings.symbol + ""); }); } From 58e5f5040f248b0acfbe4370ba7a8a4cd6a6c44f Mon Sep 17 00:00:00 2001 From: Julia Svinareva Date: Fri, 15 Nov 2019 15:10:03 +0300 Subject: [PATCH 259/419] [DE] [PE] [SSE] Gradient slider: set active new thumb --- apps/documenteditor/main/app/view/ShapeSettings.js | 1 + apps/documenteditor/main/app/view/TextArtSettings.js | 1 + apps/presentationeditor/main/app/view/ShapeSettings.js | 1 + apps/presentationeditor/main/app/view/SlideSettings.js | 1 + apps/presentationeditor/main/app/view/TextArtSettings.js | 1 + apps/spreadsheeteditor/main/app/view/ShapeSettings.js | 1 + apps/spreadsheeteditor/main/app/view/TextArtSettings.js | 1 + 7 files changed, 7 insertions(+) diff --git a/apps/documenteditor/main/app/view/ShapeSettings.js b/apps/documenteditor/main/app/view/ShapeSettings.js index 33ce7c598..76c98258b 100644 --- a/apps/documenteditor/main/app/view/ShapeSettings.js +++ b/apps/documenteditor/main/app/view/ShapeSettings.js @@ -1362,6 +1362,7 @@ define([ }); this.sldrGradient.on('addthumb', function(cmp, index, nearIndex, color){ me.GradColor.colors[index] = me.GradColor.colors[nearIndex]; + me.GradColor.currentIdx = index; me.sldrGradient.addNewThumb(index, color); }); this.sldrGradient.on('removethumb', function(cmp, index){ diff --git a/apps/documenteditor/main/app/view/TextArtSettings.js b/apps/documenteditor/main/app/view/TextArtSettings.js index f1a445a19..89600a6df 100644 --- a/apps/documenteditor/main/app/view/TextArtSettings.js +++ b/apps/documenteditor/main/app/view/TextArtSettings.js @@ -950,6 +950,7 @@ define([ }); this.sldrGradient.on('addthumb', function(cmp, index, nearIndex, color){ me.GradColor.colors[index] = me.GradColor.colors[nearIndex]; + me.GradColor.currentIdx = index; me.sldrGradient.addNewThumb(index, color); }); this.sldrGradient.on('removethumb', function(cmp, index){ diff --git a/apps/presentationeditor/main/app/view/ShapeSettings.js b/apps/presentationeditor/main/app/view/ShapeSettings.js index 602299ba0..3043c455a 100644 --- a/apps/presentationeditor/main/app/view/ShapeSettings.js +++ b/apps/presentationeditor/main/app/view/ShapeSettings.js @@ -1274,6 +1274,7 @@ define([ }); this.sldrGradient.on('addthumb', function(cmp, index, nearIndex, color){ me.GradColor.colors[index] = me.GradColor.colors[nearIndex]; + me.GradColor.currentIdx = index; me.sldrGradient.addNewThumb(index, color); }); this.sldrGradient.on('removethumb', function(cmp, index){ diff --git a/apps/presentationeditor/main/app/view/SlideSettings.js b/apps/presentationeditor/main/app/view/SlideSettings.js index 469038244..11ef1102a 100644 --- a/apps/presentationeditor/main/app/view/SlideSettings.js +++ b/apps/presentationeditor/main/app/view/SlideSettings.js @@ -806,6 +806,7 @@ define([ }); this.sldrGradient.on('addthumb', function(cmp, index, nearIndex, color){ me.GradColor.colors[index] = me.GradColor.colors[nearIndex]; + me.GradColor.currentIdx = index; me.sldrGradient.addNewThumb(index, color); }); this.sldrGradient.on('removethumb', function(cmp, index){ diff --git a/apps/presentationeditor/main/app/view/TextArtSettings.js b/apps/presentationeditor/main/app/view/TextArtSettings.js index d2940b0cd..04a9f738a 100644 --- a/apps/presentationeditor/main/app/view/TextArtSettings.js +++ b/apps/presentationeditor/main/app/view/TextArtSettings.js @@ -1259,6 +1259,7 @@ define([ }); this.sldrGradient.on('addthumb', function(cmp, index, nearIndex, color){ me.GradColor.colors[index] = me.GradColor.colors[nearIndex]; + me.GradColor.currentIdx = index; me.sldrGradient.addNewThumb(index, color); }); this.sldrGradient.on('removethumb', function(cmp, index){ diff --git a/apps/spreadsheeteditor/main/app/view/ShapeSettings.js b/apps/spreadsheeteditor/main/app/view/ShapeSettings.js index 9b28011ca..6585349ca 100644 --- a/apps/spreadsheeteditor/main/app/view/ShapeSettings.js +++ b/apps/spreadsheeteditor/main/app/view/ShapeSettings.js @@ -1298,6 +1298,7 @@ define([ }); this.sldrGradient.on('addthumb', function(cmp, index, nearIndex, color){ me.GradColor.colors[index] = me.GradColor.colors[nearIndex]; + me.GradColor.currentIdx = index; me.sldrGradient.addNewThumb(index, color); }); this.sldrGradient.on('removethumb', function(cmp, index){ diff --git a/apps/spreadsheeteditor/main/app/view/TextArtSettings.js b/apps/spreadsheeteditor/main/app/view/TextArtSettings.js index 9141afbb5..9ce20f43e 100644 --- a/apps/spreadsheeteditor/main/app/view/TextArtSettings.js +++ b/apps/spreadsheeteditor/main/app/view/TextArtSettings.js @@ -1263,6 +1263,7 @@ define([ }); this.sldrGradient.on('addthumb', function(cmp, index, nearIndex, color){ me.GradColor.colors[index] = me.GradColor.colors[nearIndex]; + me.GradColor.currentIdx = index; me.sldrGradient.addNewThumb(index, color); }); this.sldrGradient.on('removethumb', function(cmp, index){ From 2d46a39a533e47a6b79ca2f53fe481a077c69b6c Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Fri, 15 Nov 2019 15:53:51 +0300 Subject: [PATCH 260/419] Refactoring symbol table dialog --- apps/common/main/lib/view/SymbolTableDialog.js | 1 + 1 file changed, 1 insertion(+) diff --git a/apps/common/main/lib/view/SymbolTableDialog.js b/apps/common/main/lib/view/SymbolTableDialog.js index 601c7070d..83bafdde0 100644 --- a/apps/common/main/lib/view/SymbolTableDialog.js +++ b/apps/common/main/lib/view/SymbolTableDialog.js @@ -599,6 +599,7 @@ define([ el : $window.find('#symbol-table-cmb-range'), cls : 'input-group-nr', editable : false, + search : true, menuStyle : 'min-width: 100%; max-height: 209px;' }).on('selected', function(combo, record) { var oCurrentRange = me.getRangeByName(aRanges, parseInt(record.value)); From 9cca3321ada445dc174510d22167d58081f1b7fd Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Fri, 15 Nov 2019 16:12:49 +0300 Subject: [PATCH 261/419] Update translation --- apps/documenteditor/main/locale/en.json | 4 ++-- apps/documenteditor/main/locale/ru.json | 9 ++------- apps/documenteditor/mobile/locale/en.json | 4 ++-- apps/documenteditor/mobile/locale/ru.json | 4 ++-- apps/presentationeditor/main/locale/en.json | 4 ++-- apps/presentationeditor/main/locale/ru.json | 11 +++++++++-- apps/presentationeditor/mobile/locale/en.json | 4 ++-- apps/presentationeditor/mobile/locale/ru.json | 4 ++-- apps/spreadsheeteditor/main/locale/en.json | 4 ++-- apps/spreadsheeteditor/main/locale/ru.json | 11 +++++++++-- apps/spreadsheeteditor/mobile/locale/en.json | 4 ++-- apps/spreadsheeteditor/mobile/locale/ru.json | 4 ++-- 12 files changed, 38 insertions(+), 29 deletions(-) diff --git a/apps/documenteditor/main/locale/en.json b/apps/documenteditor/main/locale/en.json index 26fdd5d98..2b71d3109 100644 --- a/apps/documenteditor/main/locale/en.json +++ b/apps/documenteditor/main/locale/en.json @@ -377,7 +377,7 @@ "DE.Controllers.Main.mailMergeLoadFileText": "Loading Data Source...", "DE.Controllers.Main.mailMergeLoadFileTitle": "Loading Data Source", "DE.Controllers.Main.notcriticalErrorTitle": "Warning", - "DE.Controllers.Main.openErrorText": "An error has occurred while opening the file", + "DE.Controllers.Main.openErrorText": "An error has occurred while opening the file.", "DE.Controllers.Main.openTextText": "Opening document...", "DE.Controllers.Main.openTitleText": "Opening Document", "DE.Controllers.Main.printTextText": "Printing document...", @@ -385,7 +385,7 @@ "DE.Controllers.Main.reloadButtonText": "Reload Page", "DE.Controllers.Main.requestEditFailedMessageText": "Someone is editing this document right now. Please try again later.", "DE.Controllers.Main.requestEditFailedTitleText": "Access denied", - "DE.Controllers.Main.saveErrorText": "An error has occurred while saving the file", + "DE.Controllers.Main.saveErrorText": "An error has occurred while saving the file.", "DE.Controllers.Main.savePreparingText": "Preparing to save", "DE.Controllers.Main.savePreparingTitle": "Preparing to save. Please wait...", "DE.Controllers.Main.saveTextText": "Saving document...", diff --git a/apps/documenteditor/main/locale/ru.json b/apps/documenteditor/main/locale/ru.json index cb5315757..6cafab58b 100644 --- a/apps/documenteditor/main/locale/ru.json +++ b/apps/documenteditor/main/locale/ru.json @@ -299,11 +299,6 @@ "Common.Views.SignSettingsDialog.textShowDate": "Показывать дату подписи в строке подписи", "Common.Views.SignSettingsDialog.textTitle": "Настройка подписи", "Common.Views.SignSettingsDialog.txtEmpty": "Это поле необходимо заполнить", - "Common.Views.SymbolTableDialog.textTitle": "Symbol", - "Common.Views.SymbolTableDialog.textFont": "Шрифт", - "Common.Views.SymbolTableDialog.textRange": "Набор", - "Common.Views.SymbolTableDialog.textRecent": "Ранее использовавшиеся символы", - "Common.Views.SymbolTableDialog.textCode": "Код знака из Юникод (шестн.)", "DE.Controllers.LeftMenu.leavePageText": "Все несохраненные изменения в этом документе будут потеряны.
Нажмите кнопку \"Отмена\", а затем нажмите кнопку \"Сохранить\", чтобы сохранить их. Нажмите кнопку \"OK\", чтобы сбросить все несохраненные изменения.", "DE.Controllers.LeftMenu.newDocumentTitle": "Документ без имени", "DE.Controllers.LeftMenu.notcriticalErrorTitle": "Внимание", @@ -370,7 +365,7 @@ "DE.Controllers.Main.mailMergeLoadFileText": "Загрузка источника данных...", "DE.Controllers.Main.mailMergeLoadFileTitle": "Загрузка источника данных", "DE.Controllers.Main.notcriticalErrorTitle": "Предупреждение", - "DE.Controllers.Main.openErrorText": "При открытии файла произошла ошибка", + "DE.Controllers.Main.openErrorText": "При открытии файла произошла ошибка.", "DE.Controllers.Main.openTextText": "Открытие документа...", "DE.Controllers.Main.openTitleText": "Открытие документа", "DE.Controllers.Main.printTextText": "Печать документа...", @@ -378,7 +373,7 @@ "DE.Controllers.Main.reloadButtonText": "Обновить страницу", "DE.Controllers.Main.requestEditFailedMessageText": "В настоящее время документ редактируется. Пожалуйста, попробуйте позже.", "DE.Controllers.Main.requestEditFailedTitleText": "Доступ запрещён", - "DE.Controllers.Main.saveErrorText": "При сохранении файла произошла ошибка", + "DE.Controllers.Main.saveErrorText": "При сохранении файла произошла ошибка.", "DE.Controllers.Main.savePreparingText": "Подготовка к сохранению", "DE.Controllers.Main.savePreparingTitle": "Подготовка к сохранению. Пожалуйста, подождите...", "DE.Controllers.Main.saveTextText": "Сохранение документа...", diff --git a/apps/documenteditor/mobile/locale/en.json b/apps/documenteditor/mobile/locale/en.json index 7f7d1f914..d4d80f91a 100644 --- a/apps/documenteditor/mobile/locale/en.json +++ b/apps/documenteditor/mobile/locale/en.json @@ -174,12 +174,12 @@ "DE.Controllers.Main.mailMergeLoadFileText": "Loading Data Source...", "DE.Controllers.Main.mailMergeLoadFileTitle": "Loading Data Source", "DE.Controllers.Main.notcriticalErrorTitle": "Warning", - "DE.Controllers.Main.openErrorText": "An error has occurred while opening the file", + "DE.Controllers.Main.openErrorText": "An error has occurred while opening the file.", "DE.Controllers.Main.openTextText": "Opening document...", "DE.Controllers.Main.openTitleText": "Opening Document", "DE.Controllers.Main.printTextText": "Printing document...", "DE.Controllers.Main.printTitleText": "Printing Document", - "DE.Controllers.Main.saveErrorText": "An error has occurred while saving the file", + "DE.Controllers.Main.saveErrorText": "An error has occurred while saving the file.", "DE.Controllers.Main.savePreparingText": "Preparing to save", "DE.Controllers.Main.savePreparingTitle": "Preparing to save. Please wait...", "DE.Controllers.Main.saveTextText": "Saving document...", diff --git a/apps/documenteditor/mobile/locale/ru.json b/apps/documenteditor/mobile/locale/ru.json index efc4828fd..907befeeb 100644 --- a/apps/documenteditor/mobile/locale/ru.json +++ b/apps/documenteditor/mobile/locale/ru.json @@ -174,12 +174,12 @@ "DE.Controllers.Main.mailMergeLoadFileText": "Загрузка источника данных...", "DE.Controllers.Main.mailMergeLoadFileTitle": "Загрузка источника данных", "DE.Controllers.Main.notcriticalErrorTitle": "Внимание", - "DE.Controllers.Main.openErrorText": "При открытии файла произошла ошибка", + "DE.Controllers.Main.openErrorText": "При открытии файла произошла ошибка.", "DE.Controllers.Main.openTextText": "Открытие документа...", "DE.Controllers.Main.openTitleText": "Открытие документа", "DE.Controllers.Main.printTextText": "Печать документа...", "DE.Controllers.Main.printTitleText": "Печать документа", - "DE.Controllers.Main.saveErrorText": "При сохранении файла произошла ошибка", + "DE.Controllers.Main.saveErrorText": "При сохранении файла произошла ошибка.", "DE.Controllers.Main.savePreparingText": "Подготовка к сохранению", "DE.Controllers.Main.savePreparingTitle": "Подготовка к сохранению. Пожалуйста, подождите...", "DE.Controllers.Main.saveTextText": "Сохранение документа...", diff --git a/apps/presentationeditor/main/locale/en.json b/apps/presentationeditor/main/locale/en.json index a4a1b287e..dd2f4e91a 100644 --- a/apps/presentationeditor/main/locale/en.json +++ b/apps/presentationeditor/main/locale/en.json @@ -289,7 +289,7 @@ "PE.Controllers.Main.loadThemeTextText": "Loading theme...", "PE.Controllers.Main.loadThemeTitleText": "Loading Theme", "PE.Controllers.Main.notcriticalErrorTitle": "Warning", - "PE.Controllers.Main.openErrorText": "An error has occurred while opening the file", + "PE.Controllers.Main.openErrorText": "An error has occurred while opening the file.", "PE.Controllers.Main.openTextText": "Opening presentation...", "PE.Controllers.Main.openTitleText": "Opening Presentation", "PE.Controllers.Main.printTextText": "Printing presentation...", @@ -297,7 +297,7 @@ "PE.Controllers.Main.reloadButtonText": "Reload Page", "PE.Controllers.Main.requestEditFailedMessageText": "Someone is editing this presentation right now. Please try again later.", "PE.Controllers.Main.requestEditFailedTitleText": "Access denied", - "PE.Controllers.Main.saveErrorText": "An error has occurred while saving the file", + "PE.Controllers.Main.saveErrorText": "An error has occurred while saving the file.", "PE.Controllers.Main.savePreparingText": "Preparing to save", "PE.Controllers.Main.savePreparingTitle": "Preparing to save. Please wait...", "PE.Controllers.Main.saveTextText": "Saving presentation...", diff --git a/apps/presentationeditor/main/locale/ru.json b/apps/presentationeditor/main/locale/ru.json index d67275680..a52dcfd2e 100644 --- a/apps/presentationeditor/main/locale/ru.json +++ b/apps/presentationeditor/main/locale/ru.json @@ -108,6 +108,12 @@ "Common.Views.InsertTableDialog.txtTitle": "Размер таблицы", "Common.Views.InsertTableDialog.txtTitleSplit": "Разделить ячейку", "Common.Views.LanguageDialog.labelSelect": "Выбрать язык документа", + "Common.Views.ListSettingsDialog.textNewColor": "Пользовательский цвет", + "Common.Views.ListSettingsDialog.txtColor": "Цвет", + "Common.Views.ListSettingsDialog.txtOfText": "% текста", + "Common.Views.ListSettingsDialog.txtSize": "Размер", + "Common.Views.ListSettingsDialog.txtStart": "Начать с", + "Common.Views.ListSettingsDialog.txtTitle": "Параметры списка", "Common.Views.OpenDialog.closeButtonText": "Закрыть файл", "Common.Views.OpenDialog.txtEncoding": "Кодировка", "Common.Views.OpenDialog.txtIncorrectPwd": "Указан неверный пароль.", @@ -271,7 +277,7 @@ "PE.Controllers.Main.loadThemeTextText": "Загрузка темы...", "PE.Controllers.Main.loadThemeTitleText": "Загрузка темы", "PE.Controllers.Main.notcriticalErrorTitle": "Предупреждение", - "PE.Controllers.Main.openErrorText": "При открытии файла произошла ошибка", + "PE.Controllers.Main.openErrorText": "При открытии файла произошла ошибка.", "PE.Controllers.Main.openTextText": "Открытие презентации...", "PE.Controllers.Main.openTitleText": "Открытие презентации", "PE.Controllers.Main.printTextText": "Печать презентации...", @@ -279,7 +285,7 @@ "PE.Controllers.Main.reloadButtonText": "Обновить страницу", "PE.Controllers.Main.requestEditFailedMessageText": "В настоящее время презентация редактируется. Пожалуйста, повторите попытку позже.", "PE.Controllers.Main.requestEditFailedTitleText": "Доступ запрещён", - "PE.Controllers.Main.saveErrorText": "При сохранении файла произошла ошибка", + "PE.Controllers.Main.saveErrorText": "При сохранении файла произошла ошибка.", "PE.Controllers.Main.savePreparingText": "Подготовка к сохранению", "PE.Controllers.Main.savePreparingTitle": "Подготовка к сохранению. Пожалуйста, подождите...", "PE.Controllers.Main.saveTextText": "Сохранение презентации...", @@ -1244,6 +1250,7 @@ "PE.Views.ImageSettings.textCropFit": "Вписать", "PE.Views.ImageSettings.textEdit": "Редактировать", "PE.Views.ImageSettings.textEditObject": "Редактировать объект", + "PE.Views.ImageSettings.textFitSlide": "По размеру слайда", "PE.Views.ImageSettings.textFlip": "Отразить", "PE.Views.ImageSettings.textFromFile": "Из файла", "PE.Views.ImageSettings.textFromUrl": "По URL", diff --git a/apps/presentationeditor/mobile/locale/en.json b/apps/presentationeditor/mobile/locale/en.json index 0c5cee1df..10b46a172 100644 --- a/apps/presentationeditor/mobile/locale/en.json +++ b/apps/presentationeditor/mobile/locale/en.json @@ -109,7 +109,7 @@ "PE.Controllers.Main.loadThemeTextText": "Loading theme...", "PE.Controllers.Main.loadThemeTitleText": "Loading Theme", "PE.Controllers.Main.notcriticalErrorTitle": "Warning", - "PE.Controllers.Main.openErrorText": "An error has occurred while opening the file", + "PE.Controllers.Main.openErrorText": "An error has occurred while opening the file.", "PE.Controllers.Main.openTextText": "Opening document...", "PE.Controllers.Main.openTitleText": "Opening Document", "PE.Controllers.Main.printTextText": "Printing document...", @@ -117,7 +117,7 @@ "PE.Controllers.Main.reloadButtonText": "Reload Page", "PE.Controllers.Main.requestEditFailedMessageText": "Someone is editing this document right now. Please try again later.", "PE.Controllers.Main.requestEditFailedTitleText": "Access denied", - "PE.Controllers.Main.saveErrorText": "An error has occurred while saving the file", + "PE.Controllers.Main.saveErrorText": "An error has occurred while saving the file.", "PE.Controllers.Main.savePreparingText": "Preparing to save", "PE.Controllers.Main.savePreparingTitle": "Preparing to save. Please wait...", "PE.Controllers.Main.saveTextText": "Saving document...", diff --git a/apps/presentationeditor/mobile/locale/ru.json b/apps/presentationeditor/mobile/locale/ru.json index 63e24f085..2d9cb86ac 100644 --- a/apps/presentationeditor/mobile/locale/ru.json +++ b/apps/presentationeditor/mobile/locale/ru.json @@ -109,7 +109,7 @@ "PE.Controllers.Main.loadThemeTextText": "Загрузка темы...", "PE.Controllers.Main.loadThemeTitleText": "Загрузка темы", "PE.Controllers.Main.notcriticalErrorTitle": "Внимание", - "PE.Controllers.Main.openErrorText": "При открытии файла произошла ошибка", + "PE.Controllers.Main.openErrorText": "При открытии файла произошла ошибка.", "PE.Controllers.Main.openTextText": "Открытие документа...", "PE.Controllers.Main.openTitleText": "Открытие документа", "PE.Controllers.Main.printTextText": "Печать документа...", @@ -117,7 +117,7 @@ "PE.Controllers.Main.reloadButtonText": "Обновить страницу", "PE.Controllers.Main.requestEditFailedMessageText": "В настоящее время документ редактируется. Пожалуйста, попробуйте позже.", "PE.Controllers.Main.requestEditFailedTitleText": "Доступ запрещен", - "PE.Controllers.Main.saveErrorText": "При сохранении файла произошла ошибка", + "PE.Controllers.Main.saveErrorText": "При сохранении файла произошла ошибка.", "PE.Controllers.Main.savePreparingText": "Подготовка к сохранению", "PE.Controllers.Main.savePreparingTitle": "Подготовка к сохранению. Пожалуйста, подождите...", "PE.Controllers.Main.saveTextText": "Сохранение документа...", diff --git a/apps/spreadsheeteditor/main/locale/en.json b/apps/spreadsheeteditor/main/locale/en.json index 0cf9d42f1..9036bb282 100644 --- a/apps/spreadsheeteditor/main/locale/en.json +++ b/apps/spreadsheeteditor/main/locale/en.json @@ -485,7 +485,7 @@ "SSE.Controllers.Main.loadImageTitleText": "Loading Image", "SSE.Controllers.Main.loadingDocumentTitleText": "Loading spreadsheet", "SSE.Controllers.Main.notcriticalErrorTitle": "Warning", - "SSE.Controllers.Main.openErrorText": "An error has occurred while opening the file", + "SSE.Controllers.Main.openErrorText": "An error has occurred while opening the file.", "SSE.Controllers.Main.openTextText": "Opening spreadsheet...", "SSE.Controllers.Main.openTitleText": "Opening Spreadsheet", "SSE.Controllers.Main.pastInMergeAreaError": "Cannot change part of a merged cell", @@ -494,7 +494,7 @@ "SSE.Controllers.Main.reloadButtonText": "Reload Page", "SSE.Controllers.Main.requestEditFailedMessageText": "Someone is editing this document right now. Please try again later.", "SSE.Controllers.Main.requestEditFailedTitleText": "Access denied", - "SSE.Controllers.Main.saveErrorText": "An error has occurred while saving the file", + "SSE.Controllers.Main.saveErrorText": "An error has occurred while saving the file.", "SSE.Controllers.Main.savePreparingText": "Preparing to save", "SSE.Controllers.Main.savePreparingTitle": "Preparing to save. Please wait...", "SSE.Controllers.Main.saveTextText": "Saving spreadsheet...", diff --git a/apps/spreadsheeteditor/main/locale/ru.json b/apps/spreadsheeteditor/main/locale/ru.json index f3aab8134..16ed31e4b 100644 --- a/apps/spreadsheeteditor/main/locale/ru.json +++ b/apps/spreadsheeteditor/main/locale/ru.json @@ -94,6 +94,12 @@ "Common.Views.ImageFromUrlDialog.textUrl": "Вставьте URL изображения:", "Common.Views.ImageFromUrlDialog.txtEmpty": "Это поле необходимо заполнить", "Common.Views.ImageFromUrlDialog.txtNotUrl": "Это поле должно быть URL-адресом в формате \"http://www.example.com\"", + "Common.Views.ListSettingsDialog.textNewColor": "Пользовательский цвет", + "Common.Views.ListSettingsDialog.txtColor": "Цвет", + "Common.Views.ListSettingsDialog.txtOfText": "% текста", + "Common.Views.ListSettingsDialog.txtSize": "Размер", + "Common.Views.ListSettingsDialog.txtStart": "Начать с", + "Common.Views.ListSettingsDialog.txtTitle": "Параметры списка", "Common.Views.OpenDialog.closeButtonText": "Закрыть файл", "Common.Views.OpenDialog.txtColon": "Двоеточие", "Common.Views.OpenDialog.txtComma": "Запятая", @@ -467,7 +473,7 @@ "SSE.Controllers.Main.loadImageTitleText": "Загрузка изображения", "SSE.Controllers.Main.loadingDocumentTitleText": "Загрузка таблицы", "SSE.Controllers.Main.notcriticalErrorTitle": "Предупреждение", - "SSE.Controllers.Main.openErrorText": "При открытии файла произошла ошибка", + "SSE.Controllers.Main.openErrorText": "При открытии файла произошла ошибка.", "SSE.Controllers.Main.openTextText": "Открытие электронной таблицы...", "SSE.Controllers.Main.openTitleText": "Открытие электронной таблицы", "SSE.Controllers.Main.pastInMergeAreaError": "Нельзя изменить часть объединенной ячейки", @@ -476,7 +482,7 @@ "SSE.Controllers.Main.reloadButtonText": "Обновить страницу", "SSE.Controllers.Main.requestEditFailedMessageText": "В настоящее время документ редактируется. Пожалуйста, попробуйте позже.", "SSE.Controllers.Main.requestEditFailedTitleText": "Доступ запрещен", - "SSE.Controllers.Main.saveErrorText": "При сохранении файла произошла ошибка", + "SSE.Controllers.Main.saveErrorText": "При сохранении файла произошла ошибка.", "SSE.Controllers.Main.savePreparingText": "Подготовка к сохранению", "SSE.Controllers.Main.savePreparingTitle": "Подготовка к сохранению. Пожалуйста, подождите...", "SSE.Controllers.Main.saveTextText": "Сохранение электронной таблицы...", @@ -1416,6 +1422,7 @@ "SSE.Views.DocumentHolder.textFreezePanes": "Закрепить области", "SSE.Views.DocumentHolder.textFromFile": "Из файла", "SSE.Views.DocumentHolder.textFromUrl": "По URL", + "SSE.Views.DocumentHolder.textListSettings": "Параметры списка", "SSE.Views.DocumentHolder.textMoreFormats": "Другие форматы", "SSE.Views.DocumentHolder.textNone": "Нет", "SSE.Views.DocumentHolder.textReplace": "Заменить изображение", diff --git a/apps/spreadsheeteditor/mobile/locale/en.json b/apps/spreadsheeteditor/mobile/locale/en.json index f18aac42b..058efca3c 100644 --- a/apps/spreadsheeteditor/mobile/locale/en.json +++ b/apps/spreadsheeteditor/mobile/locale/en.json @@ -191,7 +191,7 @@ "SSE.Controllers.Main.mailMergeLoadFileText": "Loading Data Source...", "SSE.Controllers.Main.mailMergeLoadFileTitle": "Loading Data Source", "SSE.Controllers.Main.notcriticalErrorTitle": "Warning", - "SSE.Controllers.Main.openErrorText": "An error has occurred while opening the file", + "SSE.Controllers.Main.openErrorText": "An error has occurred while opening the file.", "SSE.Controllers.Main.openTextText": "Opening document...", "SSE.Controllers.Main.openTitleText": "Opening Document", "SSE.Controllers.Main.pastInMergeAreaError": "Cannot change part of a merged cell", @@ -200,7 +200,7 @@ "SSE.Controllers.Main.reloadButtonText": "Reload Page", "SSE.Controllers.Main.requestEditFailedMessageText": "Someone is editing this document right now. Please try again later.", "SSE.Controllers.Main.requestEditFailedTitleText": "Access denied", - "SSE.Controllers.Main.saveErrorText": "An error has occurred while saving the file", + "SSE.Controllers.Main.saveErrorText": "An error has occurred while saving the file.", "SSE.Controllers.Main.savePreparingText": "Preparing to save", "SSE.Controllers.Main.savePreparingTitle": "Preparing to save. Please wait...", "SSE.Controllers.Main.saveTextText": "Saving document...", diff --git a/apps/spreadsheeteditor/mobile/locale/ru.json b/apps/spreadsheeteditor/mobile/locale/ru.json index d66a071ac..555d3e339 100644 --- a/apps/spreadsheeteditor/mobile/locale/ru.json +++ b/apps/spreadsheeteditor/mobile/locale/ru.json @@ -191,7 +191,7 @@ "SSE.Controllers.Main.mailMergeLoadFileText": "Загрузка источника данных...", "SSE.Controllers.Main.mailMergeLoadFileTitle": "Загрузка источника данных", "SSE.Controllers.Main.notcriticalErrorTitle": "Внимание", - "SSE.Controllers.Main.openErrorText": "При открытии файла произошла ошибка", + "SSE.Controllers.Main.openErrorText": "При открытии файла произошла ошибка.", "SSE.Controllers.Main.openTextText": "Открытие документа...", "SSE.Controllers.Main.openTitleText": "Открытие документа", "SSE.Controllers.Main.pastInMergeAreaError": "Нельзя изменить часть объединенной ячейки", @@ -200,7 +200,7 @@ "SSE.Controllers.Main.reloadButtonText": "Обновить страницу", "SSE.Controllers.Main.requestEditFailedMessageText": "В настоящее время документ редактируется. Пожалуйста, попробуйте позже.", "SSE.Controllers.Main.requestEditFailedTitleText": "Доступ запрещен", - "SSE.Controllers.Main.saveErrorText": "При сохранении файла произошла ошибка", + "SSE.Controllers.Main.saveErrorText": "При сохранении файла произошла ошибка.", "SSE.Controllers.Main.savePreparingText": "Подготовка к сохранению", "SSE.Controllers.Main.savePreparingTitle": "Подготовка к сохранению. Пожалуйста, подождите...", "SSE.Controllers.Main.saveTextText": "Сохранение документа...", From 9199b6988187d7e0c2b88cc5492e50625f30ceda Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Fri, 15 Nov 2019 16:57:55 +0300 Subject: [PATCH 262/419] Refactoring symbol table: change sdk method --- apps/common/main/lib/view/SymbolTableDialog.js | 4 ++-- apps/documenteditor/main/app/controller/Toolbar.js | 6 +++--- apps/presentationeditor/main/app/controller/Toolbar.js | 6 +++--- apps/spreadsheeteditor/main/app/controller/Toolbar.js | 6 +++--- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/apps/common/main/lib/view/SymbolTableDialog.js b/apps/common/main/lib/view/SymbolTableDialog.js index 83bafdde0..0e02835bd 100644 --- a/apps/common/main/lib/view/SymbolTableDialog.js +++ b/apps/common/main/lib/view/SymbolTableDialog.js @@ -682,7 +682,7 @@ define([ var nFontId = parseInt(cellId.split('_')[2]); sFont = aFontSelects[nFontId].displayValue; } - return {font: sFont, symbol: this.encodeSurrogateChar(nCurrentSymbol), updateRecents: bUpdateRecents}; + return {font: sFont, symbol: this.encodeSurrogateChar(nCurrentSymbol), code: nCurrentSymbol, updateRecents: bUpdateRecents}; }, onBtnClick: function(event) { @@ -930,7 +930,7 @@ define([ var settings = this.getPasteSymbol($(e.target).attr('id')); settings.updateRecents && this.checkRecent(nCurrentSymbol, settings.font); settings.updateRecents && this.updateView(false, undefined, undefined, true); - this.fireEvent('symbol:dblclick', this, settings); + this.fireEvent('symbol:dblclick', this, 'ok', settings); } }, diff --git a/apps/documenteditor/main/app/controller/Toolbar.js b/apps/documenteditor/main/app/controller/Toolbar.js index d4ceada56..8d20b388a 100644 --- a/apps/documenteditor/main/app/controller/Toolbar.js +++ b/apps/documenteditor/main/app/controller/Toolbar.js @@ -2487,14 +2487,14 @@ define([ buttons: [{value: 'ok', caption: this.textInsert}, 'close'], handler: function(dlg, result, settings) { if (result == 'ok') { - me.api.pluginMethod_PasteHtml("" + settings.symbol + ""); + me.api.asc_insertSymbol(settings.font, settings.code); } else Common.NotificationCenter.trigger('edit:complete', me.toolbar); } }); me.dlgSymbolTable.show(); - me.dlgSymbolTable.on('symbol:dblclick', function(cmp, settings) { - me.api.pluginMethod_PasteHtml("" + settings.symbol + ""); + me.dlgSymbolTable.on('symbol:dblclick', function(cmp, result, settings) { + me.api.asc_insertSymbol(settings.font, settings.code); }); } }, diff --git a/apps/presentationeditor/main/app/controller/Toolbar.js b/apps/presentationeditor/main/app/controller/Toolbar.js index 0373668a7..c40f6b3cb 100644 --- a/apps/presentationeditor/main/app/controller/Toolbar.js +++ b/apps/presentationeditor/main/app/controller/Toolbar.js @@ -1849,14 +1849,14 @@ define([ buttons: [{value: 'ok', caption: this.textInsert}, 'close'], handler: function(dlg, result, settings) { if (result == 'ok') { - me.api.pluginMethod_PasteHtml("" + settings.symbol + ""); + me.api.asc_insertSymbol(settings.font, settings.code); } else Common.NotificationCenter.trigger('edit:complete', me.toolbar); } }); win.show(); - win.on('symbol:dblclick', function(cmp, settings) { - me.api.pluginMethod_PasteHtml("" + settings.symbol + ""); + win.on('symbol:dblclick', function(cmp, result, settings) { + me.api.asc_insertSymbol(settings.font, settings.code); }); } }, diff --git a/apps/spreadsheeteditor/main/app/controller/Toolbar.js b/apps/spreadsheeteditor/main/app/controller/Toolbar.js index 0a2c60e52..860e4f776 100644 --- a/apps/spreadsheeteditor/main/app/controller/Toolbar.js +++ b/apps/spreadsheeteditor/main/app/controller/Toolbar.js @@ -2785,14 +2785,14 @@ define([ buttons: [{value: 'ok', caption: this.textInsert}, 'close'], handler: function(dlg, result, settings) { if (result == 'ok') { - me.api.pluginMethod_PasteHtml("" + settings.symbol + ""); + me.api.asc_insertSymbol(settings.font, settings.code); } else Common.NotificationCenter.trigger('edit:complete', me.toolbar); } }); win.show(); - win.on('symbol:dblclick', function(cmp, settings) { - me.api.pluginMethod_PasteHtml("" + settings.symbol + ""); + win.on('symbol:dblclick', function(cmp, result, settings) { + me.api.asc_insertSymbol(settings.font, settings.code); }); } }, From 6ceb9a08ad5e7e2bf7222f8e4a50d7e77d8e7a59 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Fri, 15 Nov 2019 17:11:59 +0300 Subject: [PATCH 263/419] Change message for Asc.c_oAscError.ID.UpdateVersion error --- apps/documenteditor/embed/js/ApplicationController.js | 2 +- apps/documenteditor/embed/locale/en.json | 2 +- apps/documenteditor/main/app/controller/Main.js | 3 ++- apps/documenteditor/main/locale/en.json | 2 +- apps/documenteditor/mobile/app/controller/Main.js | 2 +- apps/documenteditor/mobile/locale/en.json | 2 +- apps/presentationeditor/embed/js/ApplicationController.js | 2 +- apps/presentationeditor/embed/locale/en.json | 2 +- apps/presentationeditor/main/app/controller/Main.js | 3 ++- apps/presentationeditor/main/locale/en.json | 2 +- apps/presentationeditor/mobile/app/controller/Main.js | 2 +- apps/presentationeditor/mobile/locale/en.json | 2 +- apps/spreadsheeteditor/embed/js/ApplicationController.js | 2 +- apps/spreadsheeteditor/embed/locale/en.json | 2 +- apps/spreadsheeteditor/main/app/controller/Main.js | 3 ++- apps/spreadsheeteditor/main/locale/en.json | 2 +- apps/spreadsheeteditor/mobile/app/controller/Main.js | 2 +- apps/spreadsheeteditor/mobile/locale/en.json | 2 +- 18 files changed, 21 insertions(+), 18 deletions(-) diff --git a/apps/documenteditor/embed/js/ApplicationController.js b/apps/documenteditor/embed/js/ApplicationController.js index 7d8762564..db428d1c5 100644 --- a/apps/documenteditor/embed/js/ApplicationController.js +++ b/apps/documenteditor/embed/js/ApplicationController.js @@ -563,6 +563,6 @@ DE.ApplicationController = new(function(){ textLoadingDocument: 'Loading document', txtClose: 'Close', errorFileSizeExceed: 'The file size exceeds the limitation set for your server.
Please contact your Document Server administrator for details.', - errorUpdateVersionOnDisconnect: 'The file version has been changed.
Use the \'Download\' option to save the file backup copy to your computer hard drive.' + errorUpdateVersionOnDisconnect: 'Internet connection has been restored, and the file version has been changed.
Before you can continue working, you need to download the file or copy its content to make sure nothing is lost, and then reload this page.' } })(); \ No newline at end of file diff --git a/apps/documenteditor/embed/locale/en.json b/apps/documenteditor/embed/locale/en.json index b8debeec6..a36be77b1 100644 --- a/apps/documenteditor/embed/locale/en.json +++ b/apps/documenteditor/embed/locale/en.json @@ -22,7 +22,7 @@ "DE.ApplicationController.unknownErrorText": "Unknown error.", "DE.ApplicationController.unsupportedBrowserErrorText": "Your browser is not supported.", "DE.ApplicationController.waitText": "Please, wait...", - "DE.ApplicationController.errorUpdateVersionOnDisconnect": "The file version has been changed.
Use the 'Download' option to save the file backup copy to your computer hard drive.", + "DE.ApplicationController.errorUpdateVersionOnDisconnect": "Internet connection has been restored, and the file version has been changed.
Before you can continue working, you need to download the file or copy its content to make sure nothing is lost, and then reload this page.", "DE.ApplicationView.txtDownload": "Download", "DE.ApplicationView.txtEmbed": "Embed", "DE.ApplicationView.txtFullScreen": "Full Screen", diff --git a/apps/documenteditor/main/app/controller/Main.js b/apps/documenteditor/main/app/controller/Main.js index f1e81d3de..e321b5a20 100644 --- a/apps/documenteditor/main/app/controller/Main.js +++ b/apps/documenteditor/main/app/controller/Main.js @@ -1501,6 +1501,7 @@ define([ case Asc.c_oAscError.ID.UpdateVersion: config.msg = this.errorUpdateVersionOnDisconnect; + config.maxwidth = 600; break; default: @@ -2480,7 +2481,7 @@ define([ txtMainDocOnly: 'Error! Main Document Only.', txtNotValidBookmark: 'Error! Not a valid bookmark self-reference.', txtNoText: 'Error! No text of specified style in document.', - errorUpdateVersionOnDisconnect: 'The file version has been changed.
Use the \'Download as...\' option to save the file backup copy to your computer hard drive.' + errorUpdateVersionOnDisconnect: 'Internet connection has been restored, and the file version has been changed.
Before you can continue working, you need to download the file or copy its content to make sure nothing is lost, and then reload this page.' } })(), DE.Controllers.Main || {})) }); \ No newline at end of file diff --git a/apps/documenteditor/main/locale/en.json b/apps/documenteditor/main/locale/en.json index 2b71d3109..2a857d7eb 100644 --- a/apps/documenteditor/main/locale/en.json +++ b/apps/documenteditor/main/locale/en.json @@ -662,7 +662,7 @@ "DE.Controllers.Main.warnNoLicense": "This version of %1 editors has certain limitations for concurrent connections to the document server.
If you need more please consider purchasing a commercial license.", "DE.Controllers.Main.warnNoLicenseUsers": "This version of %1 editors has certain limitations for concurrent users.
If you need more please consider purchasing a commercial license.", "DE.Controllers.Main.warnProcessRightsChange": "You have been denied the right to edit the file.", - "DE.Controllers.Main.errorUpdateVersionOnDisconnect": "The file version has been changed.
Use the 'Download as...' option to save the file backup copy to your computer hard drive.", + "DE.Controllers.Main.errorUpdateVersionOnDisconnect": "Internet connection has been restored, and the file version has been changed.
Before you can continue working, you need to download the file or copy its content to make sure nothing is lost, and then reload this page.", "DE.Controllers.Navigation.txtBeginning": "Beginning of document", "DE.Controllers.Navigation.txtGotoBeginning": "Go to the beginning of the document", "DE.Controllers.Statusbar.textHasChanges": "New changes have been tracked", diff --git a/apps/documenteditor/mobile/app/controller/Main.js b/apps/documenteditor/mobile/app/controller/Main.js index 544a8e890..f1d2b0df2 100644 --- a/apps/documenteditor/mobile/app/controller/Main.js +++ b/apps/documenteditor/mobile/app/controller/Main.js @@ -1461,7 +1461,7 @@ define([ textCustomLoader: 'Please note that according to the terms of the license you are not entitled to change the loader.
Please contact our Sales Department to get a quote.', waitText: 'Please, wait...', errorFileSizeExceed: 'The file size exceeds the limitation set for your server.
Please contact your Document Server administrator for details.', - errorUpdateVersionOnDisconnect: 'The file version has been changed.
Use the \'Download\' option to save the file backup copy to your computer hard drive.' + errorUpdateVersionOnDisconnect: 'Internet connection has been restored, and the file version has been changed.
Before you can continue working, you need to download the file or copy its content to make sure nothing is lost, and then reload this page.' } })(), DE.Controllers.Main || {})) }); \ No newline at end of file diff --git a/apps/documenteditor/mobile/locale/en.json b/apps/documenteditor/mobile/locale/en.json index d4d80f91a..a3330b3a9 100644 --- a/apps/documenteditor/mobile/locale/en.json +++ b/apps/documenteditor/mobile/locale/en.json @@ -249,7 +249,7 @@ "DE.Controllers.Main.warnNoLicense": "This version of %1 editors has certain limitations for concurrent connections to the document server.
If you need more please consider purchasing a commercial license.", "DE.Controllers.Main.warnNoLicenseUsers": "This version of %1 editors has certain limitations for concurrent users.
If you need more please consider purchasing a commercial license.", "DE.Controllers.Main.warnProcessRightsChange": "You have been denied the right to edit the file.", - "DE.Controllers.Main.errorUpdateVersionOnDisconnect": "The file version has been changed.
Use the 'Download' option to save the file backup copy to your computer hard drive.", + "DE.Controllers.Main.errorUpdateVersionOnDisconnect": "Internet connection has been restored, and the file version has been changed.
Before you can continue working, you need to download the file or copy its content to make sure nothing is lost, and then reload this page.", "DE.Controllers.Search.textNoTextFound": "Text not Found", "DE.Controllers.Search.textReplaceAll": "Replace All", "DE.Controllers.Settings.notcriticalErrorTitle": "Warning", diff --git a/apps/presentationeditor/embed/js/ApplicationController.js b/apps/presentationeditor/embed/js/ApplicationController.js index f7e7c2deb..241309afe 100644 --- a/apps/presentationeditor/embed/js/ApplicationController.js +++ b/apps/presentationeditor/embed/js/ApplicationController.js @@ -634,6 +634,6 @@ PE.ApplicationController = new(function(){ textLoadingDocument: 'Loading presentation', txtClose: 'Close', errorFileSizeExceed: 'The file size exceeds the limitation set for your server.
Please contact your Document Server administrator for details.', - errorUpdateVersionOnDisconnect: 'The file version has been changed.
Use the \'Download\' option to save the file backup copy to your computer hard drive.' + errorUpdateVersionOnDisconnect: 'Internet connection has been restored, and the file version has been changed.
Before you can continue working, you need to download the file or copy its content to make sure nothing is lost, and then reload this page.' } })(); diff --git a/apps/presentationeditor/embed/locale/en.json b/apps/presentationeditor/embed/locale/en.json index a6842c5f4..62e07cbb0 100644 --- a/apps/presentationeditor/embed/locale/en.json +++ b/apps/presentationeditor/embed/locale/en.json @@ -22,7 +22,7 @@ "PE.ApplicationController.unknownErrorText": "Unknown error.", "PE.ApplicationController.unsupportedBrowserErrorText": "Your browser is not supported.", "PE.ApplicationController.waitText": "Please, wait...", - "PE.ApplicationController.errorUpdateVersionOnDisconnect": "The file version has been changed.
Use the 'Download' option to save the file backup copy to your computer hard drive.", + "PE.ApplicationController.errorUpdateVersionOnDisconnect": "Internet connection has been restored, and the file version has been changed.
Before you can continue working, you need to download the file or copy its content to make sure nothing is lost, and then reload this page.", "PE.ApplicationView.txtDownload": "Download", "PE.ApplicationView.txtEmbed": "Embed", "PE.ApplicationView.txtFullScreen": "Full Screen", diff --git a/apps/presentationeditor/main/app/controller/Main.js b/apps/presentationeditor/main/app/controller/Main.js index ea3bd9378..1ed674d98 100644 --- a/apps/presentationeditor/main/app/controller/Main.js +++ b/apps/presentationeditor/main/app/controller/Main.js @@ -1209,6 +1209,7 @@ define([ case Asc.c_oAscError.ID.UpdateVersion: config.msg = this.errorUpdateVersionOnDisconnect; + config.maxwidth = 600; break; default: @@ -2197,7 +2198,7 @@ define([ textCustomLoader: 'Please note that according to the terms of the license you are not entitled to change the loader.
Please contact our Sales Department to get a quote.', waitText: 'Please, wait...', errorFileSizeExceed: 'The file size exceeds the limitation set for your server.
Please contact your Document Server administrator for details.', - errorUpdateVersionOnDisconnect: 'The file version has been changed.
Use the \'Download as...\' option to save the file backup copy to your computer hard drive.' + errorUpdateVersionOnDisconnect: 'Internet connection has been restored, and the file version has been changed.
Before you can continue working, you need to download the file or copy its content to make sure nothing is lost, and then reload this page.' } })(), PE.Controllers.Main || {})) }); diff --git a/apps/presentationeditor/main/locale/en.json b/apps/presentationeditor/main/locale/en.json index dd2f4e91a..d3bd8ef11 100644 --- a/apps/presentationeditor/main/locale/en.json +++ b/apps/presentationeditor/main/locale/en.json @@ -586,7 +586,7 @@ "PE.Controllers.Main.warnNoLicense": "This version of %1 editors has certain limitations for concurrent connections to the document server.
If you need more please consider purchasing a commercial license.", "PE.Controllers.Main.warnNoLicenseUsers": "This version of %1 editors has certain limitations for concurrent users.
If you need more please consider purchasing a commercial license.", "PE.Controllers.Main.warnProcessRightsChange": "You have been denied the right to edit the file.", - "PE.Controllers.Main.errorUpdateVersionOnDisconnect": "The file version has been changed.
Use the 'Download as...' option to save the file backup copy to your computer hard drive.", + "PE.Controllers.Main.errorUpdateVersionOnDisconnect": "Internet connection has been restored, and the file version has been changed.
Before you can continue working, you need to download the file or copy its content to make sure nothing is lost, and then reload this page.", "PE.Controllers.Statusbar.zoomText": "Zoom {0}%", "PE.Controllers.Toolbar.confirmAddFontName": "The font you are going to save is not available on the current device.
The text style will be displayed using one of the system fonts, the saved font will be used when it is available.
Do you want to continue?", "PE.Controllers.Toolbar.textAccent": "Accents", diff --git a/apps/presentationeditor/mobile/app/controller/Main.js b/apps/presentationeditor/mobile/app/controller/Main.js index e76ecd8a9..8f5562b69 100644 --- a/apps/presentationeditor/mobile/app/controller/Main.js +++ b/apps/presentationeditor/mobile/app/controller/Main.js @@ -1402,7 +1402,7 @@ define([ textCustomLoader: 'Please note that according to the terms of the license you are not entitled to change the loader.
Please contact our Sales Department to get a quote.', waitText: 'Please, wait...', errorFileSizeExceed: 'The file size exceeds the limitation set for your server.
Please contact your Document Server administrator for details.', - errorUpdateVersionOnDisconnect: 'The file version has been changed.
Use the \'Download\' option to save the file backup copy to your computer hard drive.' + errorUpdateVersionOnDisconnect: 'Internet connection has been restored, and the file version has been changed.
Before you can continue working, you need to download the file or copy its content to make sure nothing is lost, and then reload this page.' } })(), PE.Controllers.Main || {})) }); \ No newline at end of file diff --git a/apps/presentationeditor/mobile/locale/en.json b/apps/presentationeditor/mobile/locale/en.json index 10b46a172..f6790cfaa 100644 --- a/apps/presentationeditor/mobile/locale/en.json +++ b/apps/presentationeditor/mobile/locale/en.json @@ -225,7 +225,7 @@ "PE.Controllers.Main.warnNoLicense": "This version of %1 editors has certain limitations for concurrent connections to the document server.
If you need more please consider purchasing a commercial license.", "PE.Controllers.Main.warnNoLicenseUsers": "This version of %1 editors has certain limitations for concurrent users.
If you need more please consider purchasing a commercial license.", "PE.Controllers.Main.warnProcessRightsChange": "You have been denied the right to edit the file.", - "PE.Controllers.Main.errorUpdateVersionOnDisconnect": "The file version has been changed.
Use the 'Download' option to save the file backup copy to your computer hard drive.", + "PE.Controllers.Main.errorUpdateVersionOnDisconnect": "Internet connection has been restored, and the file version has been changed.
Before you can continue working, you need to download the file or copy its content to make sure nothing is lost, and then reload this page.", "PE.Controllers.Search.textNoTextFound": "Text not Found", "PE.Controllers.Search.textReplaceAll": "Replace All", "PE.Controllers.Settings.notcriticalErrorTitle": "Warning", diff --git a/apps/spreadsheeteditor/embed/js/ApplicationController.js b/apps/spreadsheeteditor/embed/js/ApplicationController.js index d9d561008..39c8a3600 100644 --- a/apps/spreadsheeteditor/embed/js/ApplicationController.js +++ b/apps/spreadsheeteditor/embed/js/ApplicationController.js @@ -581,6 +581,6 @@ SSE.ApplicationController = new(function(){ textLoadingDocument: 'Loading spreadsheet', txtClose: 'Close', errorFileSizeExceed: 'The file size exceeds the limitation set for your server.
Please contact your Document Server administrator for details.', - errorUpdateVersionOnDisconnect: 'The file version has been changed.
Use the \'Download\' option to save the file backup copy to your computer hard drive.' + errorUpdateVersionOnDisconnect: 'Internet connection has been restored, and the file version has been changed.
Before you can continue working, you need to download the file or copy its content to make sure nothing is lost, and then reload this page.' } })(); \ No newline at end of file diff --git a/apps/spreadsheeteditor/embed/locale/en.json b/apps/spreadsheeteditor/embed/locale/en.json index 448682490..a05a7bb1d 100644 --- a/apps/spreadsheeteditor/embed/locale/en.json +++ b/apps/spreadsheeteditor/embed/locale/en.json @@ -22,7 +22,7 @@ "SSE.ApplicationController.unknownErrorText": "Unknown error.", "SSE.ApplicationController.unsupportedBrowserErrorText": "Your browser is not supported.", "SSE.ApplicationController.waitText": "Please, wait...", - "SSE.ApplicationController.errorUpdateVersionOnDisconnect": "The file version has been changed.
Use the 'Download' option to save the file backup copy to your computer hard drive.", + "SSE.ApplicationController.errorUpdateVersionOnDisconnect": "Internet connection has been restored, and the file version has been changed.
Before you can continue working, you need to download the file or copy its content to make sure nothing is lost, and then reload this page.", "SSE.ApplicationView.txtDownload": "Download", "SSE.ApplicationView.txtEmbed": "Embed", "SSE.ApplicationView.txtFullScreen": "Full Screen", diff --git a/apps/spreadsheeteditor/main/app/controller/Main.js b/apps/spreadsheeteditor/main/app/controller/Main.js index 74a38f3bf..299b873f9 100644 --- a/apps/spreadsheeteditor/main/app/controller/Main.js +++ b/apps/spreadsheeteditor/main/app/controller/Main.js @@ -1411,6 +1411,7 @@ define([ case Asc.c_oAscError.ID.UpdateVersion: config.msg = this.errorUpdateVersionOnDisconnect; + config.maxwidth = 600; break; default: @@ -2443,7 +2444,7 @@ define([ txtTab: 'Tab', txtFile: 'File', errorFileSizeExceed: 'The file size exceeds the limitation set for your server.
Please contact your Document Server administrator for details.', - errorUpdateVersionOnDisconnect: 'The file version has been changed.
Use the \'Download as...\' option to save the file backup copy to your computer hard drive.' + errorUpdateVersionOnDisconnect: 'Internet connection has been restored, and the file version has been changed.
Before you can continue working, you need to download the file or copy its content to make sure nothing is lost, and then reload this page.' } })(), SSE.Controllers.Main || {})) }); diff --git a/apps/spreadsheeteditor/main/locale/en.json b/apps/spreadsheeteditor/main/locale/en.json index 9036bb282..6ed79f3e7 100644 --- a/apps/spreadsheeteditor/main/locale/en.json +++ b/apps/spreadsheeteditor/main/locale/en.json @@ -755,7 +755,7 @@ "SSE.Controllers.Main.warnNoLicense": "This version of %1 editors has certain limitations for concurrent connections to the document server.
If you need more please consider purchasing a commercial license.", "SSE.Controllers.Main.warnNoLicenseUsers": "This version of %1 editors has certain limitations for concurrent users.
If you need more please consider purchasing a commercial license.", "SSE.Controllers.Main.warnProcessRightsChange": "You have been denied the right to edit the file.", - "SSE.Controllers.Main.errorUpdateVersionOnDisconnect": "The file version has been changed.
Use the 'Download as...' option to save the file backup copy to your computer hard drive.", + "SSE.Controllers.Main.errorUpdateVersionOnDisconnect": "Internet connection has been restored, and the file version has been changed.
Before you can continue working, you need to download the file or copy its content to make sure nothing is lost, and then reload this page.", "SSE.Controllers.Print.strAllSheets": "All Sheets", "SSE.Controllers.Print.textWarning": "Warning", "SSE.Controllers.Print.txtCustom": "Custom", diff --git a/apps/spreadsheeteditor/mobile/app/controller/Main.js b/apps/spreadsheeteditor/mobile/app/controller/Main.js index 4e3c9c118..9e6bb8faf 100644 --- a/apps/spreadsheeteditor/mobile/app/controller/Main.js +++ b/apps/spreadsheeteditor/mobile/app/controller/Main.js @@ -1630,7 +1630,7 @@ define([ errorFrmlMaxTextLength: 'Text values in formulas are limited to 255 characters.
Use the CONCATENATE function or concatenation operator (&)', waitText: 'Please, wait...', errorFileSizeExceed: 'The file size exceeds the limitation set for your server.
Please contact your Document Server administrator for details.', - errorUpdateVersionOnDisconnect: 'The file version has been changed.
Use the \'Download\' option to save the file backup copy to your computer hard drive.' + errorUpdateVersionOnDisconnect: 'Internet connection has been restored, and the file version has been changed.
Before you can continue working, you need to download the file or copy its content to make sure nothing is lost, and then reload this page.' } })(), SSE.Controllers.Main || {})) }); \ No newline at end of file diff --git a/apps/spreadsheeteditor/mobile/locale/en.json b/apps/spreadsheeteditor/mobile/locale/en.json index 058efca3c..db91076d4 100644 --- a/apps/spreadsheeteditor/mobile/locale/en.json +++ b/apps/spreadsheeteditor/mobile/locale/en.json @@ -286,7 +286,7 @@ "SSE.Controllers.Main.warnNoLicense": "This version of %1 editors has certain limitations for concurrent connections to the document server.
If you need more please consider purchasing a commercial license.", "SSE.Controllers.Main.warnNoLicenseUsers": "This version of %1 editors has certain limitations for concurrent users.
If you need more please consider purchasing a commercial license.", "SSE.Controllers.Main.warnProcessRightsChange": "You have been denied the right to edit the file.", - "SSE.Controllers.Main.errorUpdateVersionOnDisconnect": "The file version has been changed.
Use the 'Download' option to save the file backup copy to your computer hard drive.", + "SSE.Controllers.Main.errorUpdateVersionOnDisconnect": "Internet connection has been restored, and the file version has been changed.
Before you can continue working, you need to download the file or copy its content to make sure nothing is lost, and then reload this page.", "SSE.Controllers.Search.textNoTextFound": "Text not found", "SSE.Controllers.Search.textReplaceAll": "Replace All", "SSE.Controllers.Settings.notcriticalErrorTitle": "Warning", From 68433e3cca1588c612acde26a2cb0c44abccbf98 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Fri, 15 Nov 2019 17:37:34 +0300 Subject: [PATCH 264/419] [DE] Fix list content controls: verify unique values --- .../main/app/view/ControlSettingsDialog.js | 2 ++ .../main/app/view/EditListItemDialog.js | 19 ++++++++++++++++--- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/apps/documenteditor/main/app/view/ControlSettingsDialog.js b/apps/documenteditor/main/app/view/ControlSettingsDialog.js index 0920897c2..3d9e3a31e 100644 --- a/apps/documenteditor/main/app/view/ControlSettingsDialog.js +++ b/apps/documenteditor/main/app/view/ControlSettingsDialog.js @@ -502,6 +502,7 @@ define([ 'text!documenteditor/main/app/template/ControlSettingsDialog.template', onAddItem: function() { var me = this, win = new DE.Views.EditListItemDialog({ + store: me.list.store, handler: function(result, name, value) { if (result == 'ok') { var rec = me.list.store.add({ @@ -524,6 +525,7 @@ define([ 'text!documenteditor/main/app/template/ControlSettingsDialog.template', var me = this, rec = this.list.getSelectedRec(), win = new DE.Views.EditListItemDialog({ + store: me.list.store, handler: function(result, name, value) { if (result == 'ok') { if (rec) { diff --git a/apps/documenteditor/main/app/view/EditListItemDialog.js b/apps/documenteditor/main/app/view/EditListItemDialog.js index ba854af97..56b05eca2 100644 --- a/apps/documenteditor/main/app/view/EditListItemDialog.js +++ b/apps/documenteditor/main/app/view/EditListItemDialog.js @@ -60,7 +60,7 @@ define([ '
', '', '
', - '
', + '
', '
', '', '
', @@ -99,7 +99,15 @@ define([ me.inputValue = new Common.UI.InputField({ el : $('#id-dlg-label-value'), style : 'width: 100%;', - validateOnBlur: false + validateOnBlur: false, + validation : function(value) { + if (value!=='' && me.options.store) { + var rec = me.options.store.findWhere({value: value}); + if (rec) + return me.textValueError + } + return true; + } }); me.inputValue._input.on('input', function (e) { if (me.copyvalue==undefined && me.inputValue.getValue()==me.inputName.getValue()) { @@ -140,6 +148,10 @@ define([ this.inputName.cmpEl.find('input').focus(); return; } + if (this.inputValue.checkValidate() !== true) { + this.inputValue.cmpEl.find('input').focus(); + return; + } } this.options.handler.call(this, state, this.inputName.getValue(), this.inputValue.getValue()); @@ -157,6 +169,7 @@ define([ textDisplayName: 'Display name', textValue: 'Value', - textNameError: 'Display name must not be empty.' + textNameError: 'Display name must not be empty.', + textValueError: 'An item with the same value already exists.' }, DE.Views.EditListItemDialog || {})); }); \ No newline at end of file From 6f4fbd5f47b01c7e584fa1a0a1be1d98fcec68b2 Mon Sep 17 00:00:00 2001 From: Julia Svinareva Date: Mon, 18 Nov 2019 11:12:35 +0300 Subject: [PATCH 265/419] [DE] Bug 43059 ( Margins Dialog) --- .../main/app/view/PageMarginsDialog.js | 83 +++++++++++-------- 1 file changed, 48 insertions(+), 35 deletions(-) diff --git a/apps/documenteditor/main/app/view/PageMarginsDialog.js b/apps/documenteditor/main/app/view/PageMarginsDialog.js index 571b796bb..5ed6ab1e3 100644 --- a/apps/documenteditor/main/app/view/PageMarginsDialog.js +++ b/apps/documenteditor/main/app/view/PageMarginsDialog.js @@ -55,15 +55,14 @@ define([ initialize : function(options) { _.extend(this.options, { - title: this.textTitle + title: this.textMargins }, options || {}); this.template = [ - '
', - '
' + this.textMultiplePages + '', - '
', - '
', + '
', + '
', + '', + '
', '
', '', '
', @@ -73,34 +72,35 @@ define([ '
', '
', '
', - '
', + '
', '
', - '', + '', '
', '
', '
', - '', + '', '
', '
', '
', '
', - '
', - '', - '
', - '
', - '
', - '', - '
', + '', + '
', + '
', + '
', '
', '
', '
', - '', + '', '
', '
', + '
', + '', + '
', + '
', '
', '
', - '', - '
', + '', + '
', '
', '
', ].join(''); @@ -117,18 +117,6 @@ define([ render: function() { Common.UI.Window.prototype.render.call(this); - this.cmbMultiplePages = new Common.UI.ComboBox({ - el : $('#page-margins-cmb-multiple-pages'), - menuStyle : 'min-width: 180px;', - style : 'width: 180px;', - editable : false, - cls : 'input-group-nr', - data : [ - { value: 0, displayValue: this.textNormal }, - { value: 1, displayValue: this.textMirrorMargins } - ] - }); - this.spnTop = new Common.UI.MetricSpinner({ el: $('#page-margins-spin-top'), step: .1, @@ -208,8 +196,29 @@ define([ ] }); - var $window = this.getChild(); - $window.find('.dlg-btn').on('click', _.bind(this.onBtnClick, this)); + this.cmbMultiplePages = new Common.UI.ComboBox({ + el : $('#page-margins-cmb-multiple-pages'), + menuStyle : 'min-width: 180px;', + style : 'width: 180px;', + editable : false, + cls : 'input-group-nr', + data : [ + { value: 0, displayValue: this.textNormal }, + { value: 1, displayValue: this.textMirrorMargins } + ] + }); + this.cmbMultiplePages.on('selected', _.bind(function(combo, record) { + if (record.value === 0) { + this.window.find('#margin-left-label').html(this.textLeft); + this.window.find('#margin-right-label').html(this.textRight); + } else { + this.window.find('#margin-left-label').html(this.textInside); + this.window.find('#margin-right-label').html(this.textOutside); + } + }, this)); + + this.window = this.getChild(); + this.window.find('.dlg-btn').on('click', _.bind(this.onBtnClick, this)); this.updateMetricUnit(); }, @@ -258,6 +267,7 @@ define([ this.spnBottom.setValue(Common.Utils.Metric.fnRecalcFromMM(props.get_BottomMargin()), true); this.spnLeft.setValue(Common.Utils.Metric.fnRecalcFromMM(props.get_LeftMargin()), true); this.spnRight.setValue(Common.Utils.Metric.fnRecalcFromMM(props.get_RightMargin()), true); + this.cmbOrientation.setValue(props.get_Orientation()); } }, @@ -267,6 +277,7 @@ define([ props.put_BottomMargin(Common.Utils.Metric.fnRecalcToMM(this.spnBottom.getNumberValue())); props.put_LeftMargin(Common.Utils.Metric.fnRecalcToMM(this.spnLeft.getNumberValue())); props.put_RightMargin(Common.Utils.Metric.fnRecalcToMM(this.spnRight.getNumberValue())); + props.put_Orientation(this.cmbOrientation.getValue()); return props; }, @@ -280,7 +291,7 @@ define([ } }, - textTitle: 'Margins', + textMargins: 'Margins', textTop: 'Top', textLeft: 'Left', textBottom: 'Bottom', @@ -296,6 +307,8 @@ define([ textPortrait: 'Portrait', textLandscape: 'Landscape', textMirrorMargins: 'Mirror margins', - textNormal: 'Normal' + textNormal: 'Normal', + textInside: 'Inside', + textOutside: 'Outside' }, DE.Views.PageMarginsDialog || {})) }); \ No newline at end of file From e47015cc188bbb8c0befa283828fb3a2f7f7b916 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Mon, 18 Nov 2019 13:40:10 +0300 Subject: [PATCH 266/419] Move chart data to common --- apps/common/main/lib/util/define.js | 89 ++++++++++++++++++- .../main/app/view/ChartSettings.js | 54 +---------- apps/documenteditor/main/app/view/Toolbar.js | 53 +---------- apps/documenteditor/main/locale/en.json | 43 +++++---- apps/documenteditor/main/locale/ru.json | 9 ++ .../main/app/view/ChartSettings.js | 53 +---------- .../main/app/view/Toolbar.js | 53 +---------- apps/presentationeditor/main/locale/en.json | 43 +++++---- apps/presentationeditor/main/locale/ru.json | 9 ++ .../main/app/view/ChartSettings.js | 68 ++------------ .../main/app/view/ChartSettingsDlg.js | 66 +------------- .../main/app/view/Toolbar.js | 62 +------------ apps/spreadsheeteditor/main/locale/en.json | 83 +++++++++-------- apps/spreadsheeteditor/main/locale/ru.json | 13 +++ 14 files changed, 238 insertions(+), 460 deletions(-) diff --git a/apps/common/main/lib/util/define.js b/apps/common/main/lib/util/define.js index 0b04adfec..bb448a41c 100644 --- a/apps/common/main/lib/util/define.js +++ b/apps/common/main/lib/util/define.js @@ -30,14 +30,15 @@ * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode * */ - if (Common === undefined) { var Common = {}; } -define(function(){ 'use strict'; - +if (Common.define === undefined) { Common.define = {}; +} + +define(function(){ 'use strict'; Common.define.c_oAscMathMainType = { Symbol : 0x00, @@ -413,4 +414,86 @@ define(function(){ 'use strict'; Matrix_Flat_Round : 0x0b040000, Matrix_Flat_Square : 0x0b040001 }; + + Common.define.chartData = _.extend( new(function() { + return { + textLine: 'Line', + textColumn: 'Column', + textBar: 'Bar', + textArea: 'Area', + textPie: 'Pie', + textPoint: 'XY (Scatter)', + textStock: 'Stock', + textSurface: 'Surface', + textCharts: 'Charts', + textSparks: 'Sparklines', + textLineSpark: 'Line', + textColumnSpark: 'Column', + textWinLossSpark: 'Win/Loss', + + getChartGroupData: function(headername) { + return [ + {id: 'menu-chart-group-bar', caption: this.textColumn, headername: (headername) ? this.textCharts : undefined}, + {id: 'menu-chart-group-line', caption: this.textLine}, + {id: 'menu-chart-group-pie', caption: this.textPie}, + {id: 'menu-chart-group-hbar', caption: this.textBar}, + {id: 'menu-chart-group-area', caption: this.textArea, inline: true}, + {id: 'menu-chart-group-scatter', caption: this.textPoint, inline: true}, + {id: 'menu-chart-group-stock', caption: this.textStock, inline: true} + // {id: 'menu-chart-group-surface', caption: this.textSurface} + ]; + }, + + getChartData: function() { + return [ + { group: 'menu-chart-group-bar', type: Asc.c_oAscChartTypeSettings.barNormal, iconCls: 'column-normal'}, + { group: 'menu-chart-group-bar', type: Asc.c_oAscChartTypeSettings.barStacked, iconCls: 'column-stack'}, + { group: 'menu-chart-group-bar', type: Asc.c_oAscChartTypeSettings.barStackedPer, iconCls: 'column-pstack'}, + { group: 'menu-chart-group-bar', type: Asc.c_oAscChartTypeSettings.barNormal3d, iconCls: 'column-3d-normal'}, + { group: 'menu-chart-group-bar', type: Asc.c_oAscChartTypeSettings.barStacked3d, iconCls: 'column-3d-stack'}, + { group: 'menu-chart-group-bar', type: Asc.c_oAscChartTypeSettings.barStackedPer3d, iconCls: 'column-3d-pstack'}, + { group: 'menu-chart-group-bar', type: Asc.c_oAscChartTypeSettings.barNormal3dPerspective, iconCls: 'column-3d-normal-per'}, + { group: 'menu-chart-group-line', type: Asc.c_oAscChartTypeSettings.lineNormal, iconCls: 'line-normal'}, + { group: 'menu-chart-group-line', type: Asc.c_oAscChartTypeSettings.lineStacked, iconCls: 'line-stack'}, + { group: 'menu-chart-group-line', type: Asc.c_oAscChartTypeSettings.lineStackedPer, iconCls: 'line-pstack'}, + { group: 'menu-chart-group-line', type: Asc.c_oAscChartTypeSettings.line3d, iconCls: 'line-3d'}, + { group: 'menu-chart-group-pie', type: Asc.c_oAscChartTypeSettings.pie, iconCls: 'pie-normal'}, + { group: 'menu-chart-group-pie', type: Asc.c_oAscChartTypeSettings.doughnut, iconCls: 'pie-doughnut'}, + { group: 'menu-chart-group-pie', type: Asc.c_oAscChartTypeSettings.pie3d, iconCls: 'pie-3d-normal'}, + { group: 'menu-chart-group-hbar', type: Asc.c_oAscChartTypeSettings.hBarNormal, iconCls: 'bar-normal'}, + { group: 'menu-chart-group-hbar', type: Asc.c_oAscChartTypeSettings.hBarStacked, iconCls: 'bar-stack'}, + { group: 'menu-chart-group-hbar', type: Asc.c_oAscChartTypeSettings.hBarStackedPer, iconCls: 'bar-pstack'}, + { group: 'menu-chart-group-hbar', type: Asc.c_oAscChartTypeSettings.hBarNormal3d, iconCls: 'bar-3d-normal'}, + { group: 'menu-chart-group-hbar', type: Asc.c_oAscChartTypeSettings.hBarStacked3d, iconCls: 'bar-3d-stack'}, + { group: 'menu-chart-group-hbar', type: Asc.c_oAscChartTypeSettings.hBarStackedPer3d, iconCls: 'bar-3d-pstack'}, + { group: 'menu-chart-group-area', type: Asc.c_oAscChartTypeSettings.areaNormal, iconCls: 'area-normal'}, + { group: 'menu-chart-group-area', type: Asc.c_oAscChartTypeSettings.areaStacked, iconCls: 'area-stack'}, + { group: 'menu-chart-group-area', type: Asc.c_oAscChartTypeSettings.areaStackedPer, iconCls: 'area-pstack'}, + { group: 'menu-chart-group-scatter', type: Asc.c_oAscChartTypeSettings.scatter, iconCls: 'point-normal'}, + { group: 'menu-chart-group-stock', type: Asc.c_oAscChartTypeSettings.stock, iconCls: 'stock-normal'} + // { group: 'menu-chart-group-surface', type: Asc.c_oAscChartTypeSettings.surfaceNormal, iconCls: 'surface-normal'}, + // { group: 'menu-chart-group-surface', type: Asc.c_oAscChartTypeSettings.surfaceWireframe, iconCls: 'surface-wireframe'}, + // { group: 'menu-chart-group-surface', type: Asc.c_oAscChartTypeSettings.contourNormal, iconCls: 'contour-normal'}, + // { group: 'menu-chart-group-surface', type: Asc.c_oAscChartTypeSettings.contourWireframe, iconCls: 'contour-wireframe'} + + ]; + }, + + getSparkGroupData: function(headername) { + return [ + { id: 'menu-chart-group-sparkcolumn', inline: true, headername: (headername) ? this.textSparks : undefined }, + { id: 'menu-chart-group-sparkline', inline: true }, + { id: 'menu-chart-group-sparkwin', inline: true } + ]; + }, + + getSparkData: function() { + return [ + { group: 'menu-chart-group-sparkcolumn', type: Asc.c_oAscSparklineType.Column, allowSelected: true, iconCls: 'spark-column', tip: this.textColumnSpark}, + { group: 'menu-chart-group-sparkline', type: Asc.c_oAscSparklineType.Line, allowSelected: true, iconCls: 'spark-line', tip: this.textLineSpark}, + { group: 'menu-chart-group-sparkwin', type: Asc.c_oAscSparklineType.Stacked, allowSelected: true, iconCls: 'spark-win', tip: this.textWinLossSpark} + ]; + } + } + })(), Common.define.chartData || {}); }); diff --git a/apps/documenteditor/main/app/view/ChartSettings.js b/apps/documenteditor/main/app/view/ChartSettings.js index 64eb011be..878effd46 100644 --- a/apps/documenteditor/main/app/view/ChartSettings.js +++ b/apps/documenteditor/main/app/view/ChartSettings.js @@ -261,48 +261,8 @@ define([ el: $('#id-chart-menu-type'), parentMenu: btn.menu, restoreHeight: 421, - groups: new Common.UI.DataViewGroupStore([ - { id: 'menu-chart-group-bar', caption: me.textColumn }, - { id: 'menu-chart-group-line', caption: me.textLine }, - { id: 'menu-chart-group-pie', caption: me.textPie }, - { id: 'menu-chart-group-hbar', caption: me.textBar }, - { id: 'menu-chart-group-area', caption: me.textArea, inline: true }, - { id: 'menu-chart-group-scatter', caption: me.textPoint, inline: true }, - { id: 'menu-chart-group-stock', caption: me.textStock, inline: true } - // { id: 'menu-chart-group-surface', caption: me.textSurface} - ]), - store: new Common.UI.DataViewStore([ - { group: 'menu-chart-group-bar', type: Asc.c_oAscChartTypeSettings.barNormal, iconCls: 'column-normal', selected: true}, - { group: 'menu-chart-group-bar', type: Asc.c_oAscChartTypeSettings.barStacked, iconCls: 'column-stack'}, - { group: 'menu-chart-group-bar', type: Asc.c_oAscChartTypeSettings.barStackedPer, iconCls: 'column-pstack'}, - { group: 'menu-chart-group-bar', type: Asc.c_oAscChartTypeSettings.barNormal3d, iconCls: 'column-3d-normal'}, - { group: 'menu-chart-group-bar', type: Asc.c_oAscChartTypeSettings.barStacked3d, iconCls: 'column-3d-stack'}, - { group: 'menu-chart-group-bar', type: Asc.c_oAscChartTypeSettings.barStackedPer3d, iconCls: 'column-3d-pstack'}, - { group: 'menu-chart-group-bar', type: Asc.c_oAscChartTypeSettings.barNormal3dPerspective, iconCls: 'column-3d-normal-per'}, - { group: 'menu-chart-group-line', type: Asc.c_oAscChartTypeSettings.lineNormal, iconCls: 'line-normal'}, - { group: 'menu-chart-group-line', type: Asc.c_oAscChartTypeSettings.lineStacked, iconCls: 'line-stack'}, - { group: 'menu-chart-group-line', type: Asc.c_oAscChartTypeSettings.lineStackedPer, iconCls: 'line-pstack'}, - { group: 'menu-chart-group-line', type: Asc.c_oAscChartTypeSettings.line3d, iconCls: 'line-3d'}, - { group: 'menu-chart-group-pie', type: Asc.c_oAscChartTypeSettings.pie, iconCls: 'pie-normal'}, - { group: 'menu-chart-group-pie', type: Asc.c_oAscChartTypeSettings.doughnut, iconCls: 'pie-doughnut'}, - { group: 'menu-chart-group-pie', type: Asc.c_oAscChartTypeSettings.pie3d, iconCls: 'pie-3d-normal'}, - { group: 'menu-chart-group-hbar', type: Asc.c_oAscChartTypeSettings.hBarNormal, iconCls: 'bar-normal'}, - { group: 'menu-chart-group-hbar', type: Asc.c_oAscChartTypeSettings.hBarStacked, iconCls: 'bar-stack'}, - { group: 'menu-chart-group-hbar', type: Asc.c_oAscChartTypeSettings.hBarStackedPer, iconCls: 'bar-pstack'}, - { group: 'menu-chart-group-hbar', type: Asc.c_oAscChartTypeSettings.hBarNormal3d, iconCls: 'bar-3d-normal'}, - { group: 'menu-chart-group-hbar', type: Asc.c_oAscChartTypeSettings.hBarStacked3d, iconCls: 'bar-3d-stack'}, - { group: 'menu-chart-group-hbar', type: Asc.c_oAscChartTypeSettings.hBarStackedPer3d, iconCls: 'bar-3d-pstack'}, - { group: 'menu-chart-group-area', type: Asc.c_oAscChartTypeSettings.areaNormal, iconCls: 'area-normal'}, - { group: 'menu-chart-group-area', type: Asc.c_oAscChartTypeSettings.areaStacked, iconCls: 'area-stack'}, - { group: 'menu-chart-group-area', type: Asc.c_oAscChartTypeSettings.areaStackedPer, iconCls: 'area-pstack'}, - { group: 'menu-chart-group-scatter', type: Asc.c_oAscChartTypeSettings.scatter, iconCls: 'point-normal'}, - { group: 'menu-chart-group-stock', type: Asc.c_oAscChartTypeSettings.stock, iconCls: 'stock-normal'} - // { group: 'menu-chart-group-surface', type: Asc.c_oAscChartTypeSettings.surfaceNormal, iconCls: 'surface-normal'}, - // { group: 'menu-chart-group-surface', type: Asc.c_oAscChartTypeSettings.surfaceWireframe, iconCls: 'surface-wireframe'}, - // { group: 'menu-chart-group-surface', type: Asc.c_oAscChartTypeSettings.contourNormal, iconCls: 'contour-normal'}, - // { group: 'menu-chart-group-surface', type: Asc.c_oAscChartTypeSettings.contourWireframe, iconCls: 'contour-wireframe'} - - ]), + groups: new Common.UI.DataViewGroupStore(Common.define.chartData.getChartGroupData()), + store: new Common.UI.DataViewStore(Common.define.chartData.getChartData()), itemTemplate: _.template('
') }); }); @@ -538,15 +498,7 @@ define([ txtInFront: 'In front', textEditData: 'Edit Data', textChartType: 'Change Chart Type', - textLine: 'Line', - textColumn: 'Column', - textBar: 'Bar', - textArea: 'Area', - textPie: 'Pie', - textPoint: 'XY (Scatter)', - textStock: 'Stock', - textStyle: 'Style', - textSurface: 'Surface' + textStyle: 'Style' }, DE.Views.ChartSettings || {})); }); \ No newline at end of file diff --git a/apps/documenteditor/main/app/view/Toolbar.js b/apps/documenteditor/main/app/view/Toolbar.js index e3746bc6a..7d3e06267 100644 --- a/apps/documenteditor/main/app/view/Toolbar.js +++ b/apps/documenteditor/main/app/view/Toolbar.js @@ -1674,48 +1674,8 @@ define([ parentMenu: menu, showLast: false, restoreHeight: 421, - groups: new Common.UI.DataViewGroupStore([ - {id: 'menu-chart-group-bar', caption: me.textColumn, headername: me.textCharts}, - {id: 'menu-chart-group-line', caption: me.textLine}, - {id: 'menu-chart-group-pie', caption: me.textPie}, - {id: 'menu-chart-group-hbar', caption: me.textBar}, - {id: 'menu-chart-group-area', caption: me.textArea, inline: true}, - {id: 'menu-chart-group-scatter', caption: me.textPoint, inline: true}, - {id: 'menu-chart-group-stock', caption: me.textStock, inline: true} - // {id: 'menu-chart-group-surface', caption: me.textSurface} - ]), - store: new Common.UI.DataViewStore([ - { group: 'menu-chart-group-bar', type: Asc.c_oAscChartTypeSettings.barNormal, iconCls: 'column-normal'}, - { group: 'menu-chart-group-bar', type: Asc.c_oAscChartTypeSettings.barStacked, iconCls: 'column-stack'}, - { group: 'menu-chart-group-bar', type: Asc.c_oAscChartTypeSettings.barStackedPer, iconCls: 'column-pstack'}, - { group: 'menu-chart-group-bar', type: Asc.c_oAscChartTypeSettings.barNormal3d, iconCls: 'column-3d-normal'}, - { group: 'menu-chart-group-bar', type: Asc.c_oAscChartTypeSettings.barStacked3d, iconCls: 'column-3d-stack'}, - { group: 'menu-chart-group-bar', type: Asc.c_oAscChartTypeSettings.barStackedPer3d, iconCls: 'column-3d-pstack'}, - { group: 'menu-chart-group-bar', type: Asc.c_oAscChartTypeSettings.barNormal3dPerspective, iconCls: 'column-3d-normal-per'}, - { group: 'menu-chart-group-line', type: Asc.c_oAscChartTypeSettings.lineNormal, iconCls: 'line-normal'}, - { group: 'menu-chart-group-line', type: Asc.c_oAscChartTypeSettings.lineStacked, iconCls: 'line-stack'}, - { group: 'menu-chart-group-line', type: Asc.c_oAscChartTypeSettings.lineStackedPer, iconCls: 'line-pstack'}, - { group: 'menu-chart-group-line', type: Asc.c_oAscChartTypeSettings.line3d, iconCls: 'line-3d'}, - { group: 'menu-chart-group-pie', type: Asc.c_oAscChartTypeSettings.pie, iconCls: 'pie-normal'}, - { group: 'menu-chart-group-pie', type: Asc.c_oAscChartTypeSettings.doughnut, iconCls: 'pie-doughnut'}, - { group: 'menu-chart-group-pie', type: Asc.c_oAscChartTypeSettings.pie3d, iconCls: 'pie-3d-normal'}, - { group: 'menu-chart-group-hbar', type: Asc.c_oAscChartTypeSettings.hBarNormal, iconCls: 'bar-normal'}, - { group: 'menu-chart-group-hbar', type: Asc.c_oAscChartTypeSettings.hBarStacked, iconCls: 'bar-stack'}, - { group: 'menu-chart-group-hbar', type: Asc.c_oAscChartTypeSettings.hBarStackedPer, iconCls: 'bar-pstack'}, - { group: 'menu-chart-group-hbar', type: Asc.c_oAscChartTypeSettings.hBarNormal3d, iconCls: 'bar-3d-normal'}, - { group: 'menu-chart-group-hbar', type: Asc.c_oAscChartTypeSettings.hBarStacked3d, iconCls: 'bar-3d-stack'}, - { group: 'menu-chart-group-hbar', type: Asc.c_oAscChartTypeSettings.hBarStackedPer3d, iconCls: 'bar-3d-pstack'}, - { group: 'menu-chart-group-area', type: Asc.c_oAscChartTypeSettings.areaNormal, iconCls: 'area-normal'}, - { group: 'menu-chart-group-area', type: Asc.c_oAscChartTypeSettings.areaStacked, iconCls: 'area-stack'}, - { group: 'menu-chart-group-area', type: Asc.c_oAscChartTypeSettings.areaStackedPer, iconCls: 'area-pstack'}, - { group: 'menu-chart-group-scatter', type: Asc.c_oAscChartTypeSettings.scatter, iconCls: 'point-normal'}, - { group: 'menu-chart-group-stock', type: Asc.c_oAscChartTypeSettings.stock, iconCls: 'stock-normal'} - // { group: 'menu-chart-group-surface', type: Asc.c_oAscChartTypeSettings.surfaceNormal, iconCls: 'surface-normal'}, - // { group: 'menu-chart-group-surface', type: Asc.c_oAscChartTypeSettings.surfaceWireframe, iconCls: 'surface-wireframe'}, - // { group: 'menu-chart-group-surface', type: Asc.c_oAscChartTypeSettings.contourNormal, iconCls: 'contour-normal'}, - // { group: 'menu-chart-group-surface', type: Asc.c_oAscChartTypeSettings.contourWireframe, iconCls: 'contour-wireframe'} - - ]), + groups: new Common.UI.DataViewGroupStore(Common.define.chartData.getChartGroupData(true)), + store: new Common.UI.DataViewStore(Common.define.chartData.getChartData()), itemTemplate: _.template('
') }); picker.on('item:click', function (picker, item, record, e) { @@ -2204,13 +2164,6 @@ define([ textNewColor: 'Add New Custom Color', textAutoColor: 'Automatic', tipInsertChart: 'Insert Chart', - textLine: 'Line', - textColumn: 'Column', - textBar: 'Bar', - textArea: 'Area', - textPie: 'Pie', - textPoint: 'XY (Scatter)', - textStock: 'Stock', tipColorSchemas: 'Change Color Scheme', tipInsertText: 'Insert Text', tipInsertTextArt: 'Insert Text Art', @@ -2278,7 +2231,6 @@ define([ textPortrait: 'Portrait', textLandscape: 'Landscape', textInsertPageCount: 'Insert number of pages', - textCharts: 'Charts', tipChangeChart: 'Change Chart Type', capBtnInsPagebreak: 'Page Break', capBtnInsImage: 'Image', @@ -2311,7 +2263,6 @@ define([ capImgWrapping: 'Wrapping', capBtnComment: 'Comment', textColumnsCustom: 'Custom Columns', - textSurface: 'Surface', textTabCollaboration: 'Collaboration', textTabProtect: 'Protection', textTabLinks: 'References', diff --git a/apps/documenteditor/main/locale/en.json b/apps/documenteditor/main/locale/en.json index 2a857d7eb..908214cac 100644 --- a/apps/documenteditor/main/locale/en.json +++ b/apps/documenteditor/main/locale/en.json @@ -69,6 +69,15 @@ "Common.Controllers.ReviewChanges.textTabs": "Change tabs", "Common.Controllers.ReviewChanges.textUnderline": "Underline", "Common.Controllers.ReviewChanges.textWidow": "Widow control", + "Common.define.chartData.textArea": "Area", + "Common.define.chartData.textBar": "Bar", + "Common.define.chartData.textCharts": "Charts", + "Common.define.chartData.textColumn": "Column", + "Common.define.chartData.textLine": "Line", + "Common.define.chartData.textPie": "Pie", + "Common.define.chartData.textPoint": "XY (Scatter)", + "Common.define.chartData.textStock": "Stock", + "Common.define.chartData.textSurface": "Surface", "Common.UI.ComboBorderSize.txtNoBorders": "No borders", "Common.UI.ComboBorderSizeEditable.txtNoBorders": "No borders", "Common.UI.ComboDataView.emptyComboText": "No styles", @@ -1056,20 +1065,20 @@ "DE.Views.CellsRemoveDialog.textRow": "Delete entire row", "DE.Views.CellsRemoveDialog.textTitle": "Delete Cells", "DE.Views.ChartSettings.textAdvanced": "Show advanced settings", - "DE.Views.ChartSettings.textArea": "Area", - "DE.Views.ChartSettings.textBar": "Bar", + "del_DE.Views.ChartSettings.textArea": "Area", + "del_DE.Views.ChartSettings.textBar": "Bar", "DE.Views.ChartSettings.textChartType": "Change Chart Type", - "DE.Views.ChartSettings.textColumn": "Column", + "del_DE.Views.ChartSettings.textColumn": "Column", "DE.Views.ChartSettings.textEditData": "Edit Data", "DE.Views.ChartSettings.textHeight": "Height", - "DE.Views.ChartSettings.textLine": "Line", + "del_DE.Views.ChartSettings.textLine": "Line", "DE.Views.ChartSettings.textOriginalSize": "Actual Size", - "DE.Views.ChartSettings.textPie": "Pie", - "DE.Views.ChartSettings.textPoint": "XY (Scatter)", + "del_DE.Views.ChartSettings.textPie": "Pie", + "del_DE.Views.ChartSettings.textPoint": "XY (Scatter)", "DE.Views.ChartSettings.textSize": "Size", - "DE.Views.ChartSettings.textStock": "Stock", + "del_DE.Views.ChartSettings.textStock": "Stock", "DE.Views.ChartSettings.textStyle": "Style", - "DE.Views.ChartSettings.textSurface": "Surface", + "del_DE.Views.ChartSettings.textSurface": "Surface", "DE.Views.ChartSettings.textUndock": "Undock from panel", "DE.Views.ChartSettings.textWidth": "Width", "DE.Views.ChartSettings.textWrap": "Wrapping Style", @@ -2099,13 +2108,13 @@ "DE.Views.Toolbar.mniImageFromStorage": "Image from Storage", "DE.Views.Toolbar.mniImageFromUrl": "Image from URL", "DE.Views.Toolbar.strMenuNoFill": "No Fill", - "DE.Views.Toolbar.textArea": "Area", + "del_DE.Views.Toolbar.textArea": "Area", "DE.Views.Toolbar.textAutoColor": "Automatic", - "DE.Views.Toolbar.textBar": "Bar", + "del_DE.Views.Toolbar.textBar": "Bar", "DE.Views.Toolbar.textBold": "Bold", "DE.Views.Toolbar.textBottom": "Bottom: ", - "DE.Views.Toolbar.textCharts": "Charts", - "DE.Views.Toolbar.textColumn": "Column", + "del_DE.Views.Toolbar.textCharts": "Charts", + "del_DE.Views.Toolbar.textColumn": "Column", "DE.Views.Toolbar.textColumnsCustom": "Custom Columns", "DE.Views.Toolbar.textColumnsLeft": "Left", "DE.Views.Toolbar.textColumnsOne": "One", @@ -2125,7 +2134,7 @@ "DE.Views.Toolbar.textItalic": "Italic", "DE.Views.Toolbar.textLandscape": "Landscape", "DE.Views.Toolbar.textLeft": "Left: ", - "DE.Views.Toolbar.textLine": "Line", + "del_DE.Views.Toolbar.textLine": "Line", "DE.Views.Toolbar.textMarginsLast": "Last Custom", "DE.Views.Toolbar.textMarginsModerate": "Moderate", "DE.Views.Toolbar.textMarginsNarrow": "Narrow", @@ -2139,15 +2148,15 @@ "DE.Views.Toolbar.textOddPage": "Odd Page", "DE.Views.Toolbar.textPageMarginsCustom": "Custom margins", "DE.Views.Toolbar.textPageSizeCustom": "Custom Page Size", - "DE.Views.Toolbar.textPie": "Pie", + "del_DE.Views.Toolbar.textPie": "Pie", "DE.Views.Toolbar.textPlainControl": "Insert plain text content control", - "DE.Views.Toolbar.textPoint": "XY (Scatter)", + "del_DE.Views.Toolbar.textPoint": "XY (Scatter)", "DE.Views.Toolbar.textPortrait": "Portrait", "DE.Views.Toolbar.textRemoveControl": "Remove content control", "DE.Views.Toolbar.textRemWatermark": "Remove Watermark", "DE.Views.Toolbar.textRichControl": "Insert rich text content control", "DE.Views.Toolbar.textRight": "Right: ", - "DE.Views.Toolbar.textStock": "Stock", + "del_DE.Views.Toolbar.textStock": "Stock", "DE.Views.Toolbar.textStrikeout": "Strikethrough", "DE.Views.Toolbar.textStyleMenuDelete": "Delete style", "DE.Views.Toolbar.textStyleMenuDeleteAll": "Delete all custom styles", @@ -2157,7 +2166,7 @@ "DE.Views.Toolbar.textStyleMenuUpdate": "Update from selection", "DE.Views.Toolbar.textSubscript": "Subscript", "DE.Views.Toolbar.textSuperscript": "Superscript", - "DE.Views.Toolbar.textSurface": "Surface", + "del_DE.Views.Toolbar.textSurface": "Surface", "DE.Views.Toolbar.textTabCollaboration": "Collaboration", "DE.Views.Toolbar.textTabFile": "File", "DE.Views.Toolbar.textTabHome": "Home", diff --git a/apps/documenteditor/main/locale/ru.json b/apps/documenteditor/main/locale/ru.json index 6cafab58b..1b9481d80 100644 --- a/apps/documenteditor/main/locale/ru.json +++ b/apps/documenteditor/main/locale/ru.json @@ -69,6 +69,15 @@ "Common.Controllers.ReviewChanges.textTabs": "Изменение табуляции", "Common.Controllers.ReviewChanges.textUnderline": "Подчёркнутый", "Common.Controllers.ReviewChanges.textWidow": "Запрет висячих строк", + "Common.define.chartData.textArea": "С областями", + "Common.define.chartData.textBar": "Линейчатая", + "Common.define.chartData.textCharts": "Диаграммы", + "Common.define.chartData.textColumn": "Гистограмма", + "Common.define.chartData.textLine": "График", + "Common.define.chartData.textPie": "Круговая", + "Common.define.chartData.textPoint": "Точечная", + "Common.define.chartData.textStock": "Биржевая", + "Common.define.chartData.textSurface": "Поверхность", "Common.UI.ComboBorderSize.txtNoBorders": "Без границ", "Common.UI.ComboBorderSizeEditable.txtNoBorders": "Без границ", "Common.UI.ComboDataView.emptyComboText": "Без стилей", diff --git a/apps/presentationeditor/main/app/view/ChartSettings.js b/apps/presentationeditor/main/app/view/ChartSettings.js index f742fb087..7a21c313e 100644 --- a/apps/presentationeditor/main/app/view/ChartSettings.js +++ b/apps/presentationeditor/main/app/view/ChartSettings.js @@ -213,47 +213,8 @@ define([ el: $('#id-chart-menu-type'), parentMenu: btn.menu, restoreHeight: 421, - groups: new Common.UI.DataViewGroupStore([ - { id: 'menu-chart-group-bar', caption: me.textColumn }, - { id: 'menu-chart-group-line', caption: me.textLine }, - { id: 'menu-chart-group-pie', caption: me.textPie }, - { id: 'menu-chart-group-hbar', caption: me.textBar }, - { id: 'menu-chart-group-area', caption: me.textArea, inline: true }, - { id: 'menu-chart-group-scatter', caption: me.textPoint, inline: true }, - { id: 'menu-chart-group-stock', caption: me.textStock, inline: true } - // { id: 'menu-chart-group-surface', caption: me.textSurface} - ]), - store: new Common.UI.DataViewStore([ - { group: 'menu-chart-group-bar', type: Asc.c_oAscChartTypeSettings.barNormal, iconCls: 'column-normal', selected: true}, - { group: 'menu-chart-group-bar', type: Asc.c_oAscChartTypeSettings.barStacked, iconCls: 'column-stack'}, - { group: 'menu-chart-group-bar', type: Asc.c_oAscChartTypeSettings.barStackedPer, iconCls: 'column-pstack'}, - { group: 'menu-chart-group-bar', type: Asc.c_oAscChartTypeSettings.barNormal3d, iconCls: 'column-3d-normal'}, - { group: 'menu-chart-group-bar', type: Asc.c_oAscChartTypeSettings.barStacked3d, iconCls: 'column-3d-stack'}, - { group: 'menu-chart-group-bar', type: Asc.c_oAscChartTypeSettings.barStackedPer3d, iconCls: 'column-3d-pstack'}, - { group: 'menu-chart-group-bar', type: Asc.c_oAscChartTypeSettings.barNormal3dPerspective, iconCls: 'column-3d-normal-per'}, - { group: 'menu-chart-group-line', type: Asc.c_oAscChartTypeSettings.lineNormal, iconCls: 'line-normal'}, - { group: 'menu-chart-group-line', type: Asc.c_oAscChartTypeSettings.lineStacked, iconCls: 'line-stack'}, - { group: 'menu-chart-group-line', type: Asc.c_oAscChartTypeSettings.lineStackedPer, iconCls: 'line-pstack'}, - { group: 'menu-chart-group-line', type: Asc.c_oAscChartTypeSettings.line3d, iconCls: 'line-3d'}, - { group: 'menu-chart-group-pie', type: Asc.c_oAscChartTypeSettings.pie, iconCls: 'pie-normal'}, - { group: 'menu-chart-group-pie', type: Asc.c_oAscChartTypeSettings.doughnut, iconCls: 'pie-doughnut'}, - { group: 'menu-chart-group-pie', type: Asc.c_oAscChartTypeSettings.pie3d, iconCls: 'pie-3d-normal'}, - { group: 'menu-chart-group-hbar', type: Asc.c_oAscChartTypeSettings.hBarNormal, iconCls: 'bar-normal'}, - { group: 'menu-chart-group-hbar', type: Asc.c_oAscChartTypeSettings.hBarStacked, iconCls: 'bar-stack'}, - { group: 'menu-chart-group-hbar', type: Asc.c_oAscChartTypeSettings.hBarStackedPer, iconCls: 'bar-pstack'}, - { group: 'menu-chart-group-hbar', type: Asc.c_oAscChartTypeSettings.hBarNormal3d, iconCls: 'bar-3d-normal'}, - { group: 'menu-chart-group-hbar', type: Asc.c_oAscChartTypeSettings.hBarStacked3d, iconCls: 'bar-3d-stack'}, - { group: 'menu-chart-group-hbar', type: Asc.c_oAscChartTypeSettings.hBarStackedPer3d, iconCls: 'bar-3d-pstack'}, - { group: 'menu-chart-group-area', type: Asc.c_oAscChartTypeSettings.areaNormal, iconCls: 'area-normal'}, - { group: 'menu-chart-group-area', type: Asc.c_oAscChartTypeSettings.areaStacked, iconCls: 'area-stack'}, - { group: 'menu-chart-group-area', type: Asc.c_oAscChartTypeSettings.areaStackedPer, iconCls: 'area-pstack'}, - { group: 'menu-chart-group-scatter', type: Asc.c_oAscChartTypeSettings.scatter, iconCls: 'point-normal'}, - { group: 'menu-chart-group-stock', type: Asc.c_oAscChartTypeSettings.stock, iconCls: 'stock-normal'} - // { group: 'menu-chart-group-surface', type: Asc.c_oAscChartTypeSettings.surfaceNormal, iconCls: 'surface-normal'}, - // { group: 'menu-chart-group-surface', type: Asc.c_oAscChartTypeSettings.surfaceWireframe, iconCls: 'surface-wireframe'}, - // { group: 'menu-chart-group-surface', type: Asc.c_oAscChartTypeSettings.contourNormal, iconCls: 'contour-normal'}, - // { group: 'menu-chart-group-surface', type: Asc.c_oAscChartTypeSettings.contourWireframe, iconCls: 'contour-wireframe'} - ]), + groups: new Common.UI.DataViewGroupStore(Common.define.chartData.getChartGroupData()), + store: new Common.UI.DataViewStore(Common.define.chartData.getChartData()), itemTemplate: _.template('
') }); }); @@ -534,15 +495,7 @@ define([ textHeight: 'Height', textEditData: 'Edit Data', textChartType: 'Change Chart Type', - textLine: 'Line', - textColumn: 'Column', - textBar: 'Bar', - textArea: 'Area', - textPie: 'Pie', - textPoint: 'XY (Scatter)', - textStock: 'Stock', textStyle: 'Style', - textAdvanced: 'Show advanced settings', - textSurface: 'Surface' + textAdvanced: 'Show advanced settings' }, PE.Views.ChartSettings || {})); }); \ No newline at end of file diff --git a/apps/presentationeditor/main/app/view/Toolbar.js b/apps/presentationeditor/main/app/view/Toolbar.js index 253df53b9..d66ab2fb5 100644 --- a/apps/presentationeditor/main/app/view/Toolbar.js +++ b/apps/presentationeditor/main/app/view/Toolbar.js @@ -1117,48 +1117,8 @@ define([ parentMenu: menu, showLast: false, restoreHeight: 421, - groups: new Common.UI.DataViewGroupStore([ - {id: 'menu-chart-group-bar', caption: me.textColumn, headername: me.textCharts}, - {id: 'menu-chart-group-line', caption: me.textLine}, - {id: 'menu-chart-group-pie', caption: me.textPie}, - {id: 'menu-chart-group-hbar', caption: me.textBar}, - {id: 'menu-chart-group-area', caption: me.textArea, inline: true}, - {id: 'menu-chart-group-scatter', caption: me.textPoint, inline: true}, - {id: 'menu-chart-group-stock', caption: me.textStock, inline: true} - // {id: 'menu-chart-group-surface', caption: me.textSurface} - ]), - store: new Common.UI.DataViewStore([ - { group: 'menu-chart-group-bar', type: Asc.c_oAscChartTypeSettings.barNormal, iconCls: 'column-normal'}, - { group: 'menu-chart-group-bar', type: Asc.c_oAscChartTypeSettings.barStacked, iconCls: 'column-stack'}, - { group: 'menu-chart-group-bar', type: Asc.c_oAscChartTypeSettings.barStackedPer, iconCls: 'column-pstack'}, - { group: 'menu-chart-group-bar', type: Asc.c_oAscChartTypeSettings.barNormal3d, iconCls: 'column-3d-normal'}, - { group: 'menu-chart-group-bar', type: Asc.c_oAscChartTypeSettings.barStacked3d, iconCls: 'column-3d-stack'}, - { group: 'menu-chart-group-bar', type: Asc.c_oAscChartTypeSettings.barStackedPer3d, iconCls: 'column-3d-pstack'}, - { group: 'menu-chart-group-bar', type: Asc.c_oAscChartTypeSettings.barNormal3dPerspective, iconCls: 'column-3d-normal-per'}, - { group: 'menu-chart-group-line', type: Asc.c_oAscChartTypeSettings.lineNormal, iconCls: 'line-normal'}, - { group: 'menu-chart-group-line', type: Asc.c_oAscChartTypeSettings.lineStacked, iconCls: 'line-stack'}, - { group: 'menu-chart-group-line', type: Asc.c_oAscChartTypeSettings.lineStackedPer, iconCls: 'line-pstack'}, - { group: 'menu-chart-group-line', type: Asc.c_oAscChartTypeSettings.line3d, iconCls: 'line-3d'}, - { group: 'menu-chart-group-pie', type: Asc.c_oAscChartTypeSettings.pie, iconCls: 'pie-normal'}, - { group: 'menu-chart-group-pie', type: Asc.c_oAscChartTypeSettings.doughnut, iconCls: 'pie-doughnut'}, - { group: 'menu-chart-group-pie', type: Asc.c_oAscChartTypeSettings.pie3d, iconCls: 'pie-3d-normal'}, - { group: 'menu-chart-group-hbar', type: Asc.c_oAscChartTypeSettings.hBarNormal, iconCls: 'bar-normal'}, - { group: 'menu-chart-group-hbar', type: Asc.c_oAscChartTypeSettings.hBarStacked, iconCls: 'bar-stack'}, - { group: 'menu-chart-group-hbar', type: Asc.c_oAscChartTypeSettings.hBarStackedPer, iconCls: 'bar-pstack'}, - { group: 'menu-chart-group-hbar', type: Asc.c_oAscChartTypeSettings.hBarNormal3d, iconCls: 'bar-3d-normal'}, - { group: 'menu-chart-group-hbar', type: Asc.c_oAscChartTypeSettings.hBarStacked3d, iconCls: 'bar-3d-stack'}, - { group: 'menu-chart-group-hbar', type: Asc.c_oAscChartTypeSettings.hBarStackedPer3d, iconCls: 'bar-3d-pstack'}, - { group: 'menu-chart-group-area', type: Asc.c_oAscChartTypeSettings.areaNormal, iconCls: 'area-normal'}, - { group: 'menu-chart-group-area', type: Asc.c_oAscChartTypeSettings.areaStacked, iconCls: 'area-stack'}, - { group: 'menu-chart-group-area', type: Asc.c_oAscChartTypeSettings.areaStackedPer, iconCls: 'area-pstack'}, - { group: 'menu-chart-group-scatter', type: Asc.c_oAscChartTypeSettings.scatter, iconCls: 'point-normal'}, - { group: 'menu-chart-group-stock', type: Asc.c_oAscChartTypeSettings.stock, iconCls: 'stock-normal'} - // { group: 'menu-chart-group-surface', type: Asc.c_oAscChartTypeSettings.surfaceNormal, iconCls: 'surface-normal'}, - // { group: 'menu-chart-group-surface', type: Asc.c_oAscChartTypeSettings.surfaceWireframe, iconCls: 'surface-wireframe'}, - // { group: 'menu-chart-group-surface', type: Asc.c_oAscChartTypeSettings.contourNormal, iconCls: 'contour-normal'}, - // { group: 'menu-chart-group-surface', type: Asc.c_oAscChartTypeSettings.contourWireframe, iconCls: 'contour-wireframe'} - - ]), + groups: new Common.UI.DataViewGroupStore(Common.define.chartData.getChartGroupData(true)), + store: new Common.UI.DataViewStore(Common.define.chartData.getChartData()), itemTemplate: _.template('
') }); picker.on('item:click', function (picker, item, record, e) { @@ -1621,13 +1581,6 @@ define([ mniSlideAdvanced: 'Advanced Settings', tipSlideSize: 'Select Slide Size', tipInsertChart: 'Insert Chart', - textLine: 'Line', - textColumn: 'Column', - textBar: 'Bar', - textArea: 'Area', - textPie: 'Pie', - textPoint: 'XY (Scatter)', - textStock: 'Stock', tipSynchronize: 'The document has been changed by another user. Please click to save your changes and reload the updates.', txtScheme1: 'Office', txtScheme2: 'Grayscale', @@ -1656,7 +1609,6 @@ define([ textShowCurrent: 'Show from Current slide', textShowSettings: 'Show Settings', tipInsertEquation: 'Insert Equation', - textCharts: 'Charts', tipChangeChart: 'Change Chart Type', capInsertText: 'Text', capInsertTextArt: 'Text Art', @@ -1674,7 +1626,6 @@ define([ textTabFile: 'File', textTabHome: 'Home', textTabInsert: 'Insert', - textSurface: 'Surface', textShowPresenterView: 'Show presenter view', textTabCollaboration: 'Collaboration', textTabProtect: 'Protection', diff --git a/apps/presentationeditor/main/locale/en.json b/apps/presentationeditor/main/locale/en.json index d3bd8ef11..a2332c607 100644 --- a/apps/presentationeditor/main/locale/en.json +++ b/apps/presentationeditor/main/locale/en.json @@ -5,6 +5,15 @@ "Common.Controllers.ExternalDiagramEditor.textClose": "Close", "Common.Controllers.ExternalDiagramEditor.warningText": "The object is disabled because it is being edited by another user.", "Common.Controllers.ExternalDiagramEditor.warningTitle": "Warning", + "Common.define.chartData.textArea": "Area", + "Common.define.chartData.textBar": "Bar", + "Common.define.chartData.textCharts": "Charts", + "Common.define.chartData.textColumn": "Column", + "Common.define.chartData.textLine": "Line", + "Common.define.chartData.textPie": "Pie", + "Common.define.chartData.textPoint": "XY (Scatter)", + "Common.define.chartData.textStock": "Stock", + "Common.define.chartData.textSurface": "Surface", "Common.UI.ComboBorderSize.txtNoBorders": "No borders", "Common.UI.ComboBorderSizeEditable.txtNoBorders": "No borders", "Common.UI.ComboDataView.emptyComboText": "No styles", @@ -924,20 +933,20 @@ "PE.Controllers.Viewport.textFitPage": "Fit to Slide", "PE.Controllers.Viewport.textFitWidth": "Fit to Width", "PE.Views.ChartSettings.textAdvanced": "Show advanced settings", - "PE.Views.ChartSettings.textArea": "Area", - "PE.Views.ChartSettings.textBar": "Bar", + "del_PE.Views.ChartSettings.textArea": "Area", + "del_PE.Views.ChartSettings.textBar": "Bar", "PE.Views.ChartSettings.textChartType": "Change Chart Type", - "PE.Views.ChartSettings.textColumn": "Column", + "del_PE.Views.ChartSettings.textColumn": "Column", "PE.Views.ChartSettings.textEditData": "Edit Data", "PE.Views.ChartSettings.textHeight": "Height", "PE.Views.ChartSettings.textKeepRatio": "Constant proportions", - "PE.Views.ChartSettings.textLine": "Line", - "PE.Views.ChartSettings.textPie": "Pie", - "PE.Views.ChartSettings.textPoint": "XY (Scatter)", + "del_PE.Views.ChartSettings.textLine": "Line", + "del_PE.Views.ChartSettings.textPie": "Pie", + "del_PE.Views.ChartSettings.textPoint": "XY (Scatter)", "PE.Views.ChartSettings.textSize": "Size", - "PE.Views.ChartSettings.textStock": "Stock", + "del_PE.Views.ChartSettings.textStock": "Stock", "PE.Views.ChartSettings.textStyle": "Style", - "PE.Views.ChartSettings.textSurface": "Surface", + "del_PE.Views.ChartSettings.textSurface": "Surface", "PE.Views.ChartSettings.textWidth": "Width", "PE.Views.ChartSettingsAdvanced.textAlt": "Alternative Text", "PE.Views.ChartSettingsAdvanced.textAltDescription": "Description", @@ -1708,21 +1717,21 @@ "PE.Views.Toolbar.textAlignMiddle": "Align text to the middle", "PE.Views.Toolbar.textAlignRight": "Align text right", "PE.Views.Toolbar.textAlignTop": "Align text to the top", - "PE.Views.Toolbar.textArea": "Area", + "del_PE.Views.Toolbar.textArea": "Area", "PE.Views.Toolbar.textArrangeBack": "Send to Background", "PE.Views.Toolbar.textArrangeBackward": "Send Backward", "PE.Views.Toolbar.textArrangeForward": "Bring Forward", "PE.Views.Toolbar.textArrangeFront": "Bring to Foreground", - "PE.Views.Toolbar.textBar": "Bar", + "del_PE.Views.Toolbar.textBar": "Bar", "PE.Views.Toolbar.textBold": "Bold", - "PE.Views.Toolbar.textCharts": "Charts", - "PE.Views.Toolbar.textColumn": "Column", + "del_PE.Views.Toolbar.textCharts": "Charts", + "del_PE.Views.Toolbar.textColumn": "Column", "PE.Views.Toolbar.textItalic": "Italic", - "PE.Views.Toolbar.textLine": "Line", + "del_PE.Views.Toolbar.textLine": "Line", "PE.Views.Toolbar.textListSettings": "List Settings", "PE.Views.Toolbar.textNewColor": "Custom Color", - "PE.Views.Toolbar.textPie": "Pie", - "PE.Views.Toolbar.textPoint": "XY (Scatter)", + "del_PE.Views.Toolbar.textPie": "Pie", + "del_PE.Views.Toolbar.textPoint": "XY (Scatter)", "PE.Views.Toolbar.textShapeAlignBottom": "Align Bottom", "PE.Views.Toolbar.textShapeAlignCenter": "Align Center", "PE.Views.Toolbar.textShapeAlignLeft": "Align Left", @@ -1733,11 +1742,11 @@ "PE.Views.Toolbar.textShowCurrent": "Show from Current Slide", "PE.Views.Toolbar.textShowPresenterView": "Show Presenter View", "PE.Views.Toolbar.textShowSettings": "Show Settings", - "PE.Views.Toolbar.textStock": "Stock", + "del_PE.Views.Toolbar.textStock": "Stock", "PE.Views.Toolbar.textStrikeout": "Strikethrough", "PE.Views.Toolbar.textSubscript": "Subscript", "PE.Views.Toolbar.textSuperscript": "Superscript", - "PE.Views.Toolbar.textSurface": "Surface", + "del_PE.Views.Toolbar.textSurface": "Surface", "PE.Views.Toolbar.textTabCollaboration": "Collaboration", "PE.Views.Toolbar.textTabFile": "File", "PE.Views.Toolbar.textTabHome": "Home", diff --git a/apps/presentationeditor/main/locale/ru.json b/apps/presentationeditor/main/locale/ru.json index a52dcfd2e..f46f4cf5d 100644 --- a/apps/presentationeditor/main/locale/ru.json +++ b/apps/presentationeditor/main/locale/ru.json @@ -5,6 +5,15 @@ "Common.Controllers.ExternalDiagramEditor.textClose": "Закрыть", "Common.Controllers.ExternalDiagramEditor.warningText": "Объект недоступен, так как редактируется другим пользователем.", "Common.Controllers.ExternalDiagramEditor.warningTitle": "Предупреждение", + "Common.define.chartData.textArea": "С областями", + "Common.define.chartData.textBar": "Линейчатая", + "Common.define.chartData.textCharts": "Диаграммы", + "Common.define.chartData.textColumn": "Гистограмма", + "Common.define.chartData.textLine": "График", + "Common.define.chartData.textPie": "Круговая", + "Common.define.chartData.textPoint": "Точечная", + "Common.define.chartData.textStock": "Биржевая", + "Common.define.chartData.textSurface": "Поверхность", "Common.UI.ComboBorderSize.txtNoBorders": "Без границ", "Common.UI.ComboBorderSizeEditable.txtNoBorders": "Без границ", "Common.UI.ComboDataView.emptyComboText": "Без стилей", diff --git a/apps/spreadsheeteditor/main/app/view/ChartSettings.js b/apps/spreadsheeteditor/main/app/view/ChartSettings.js index 95f009c4d..4e16b4592 100644 --- a/apps/spreadsheeteditor/main/app/view/ChartSettings.js +++ b/apps/spreadsheeteditor/main/app/view/ChartSettings.js @@ -668,47 +668,8 @@ define([ el: $('#id-chart-menu-type'), parentMenu: btn.menu, restoreHeight: 421, - groups: new Common.UI.DataViewGroupStore([ - { id: 'menu-chart-group-bar', caption: me.textColumn }, - { id: 'menu-chart-group-line', caption: me.textLine }, - { id: 'menu-chart-group-pie', caption: me.textPie }, - { id: 'menu-chart-group-hbar', caption: me.textBar }, - { id: 'menu-chart-group-area', caption: me.textArea, inline: true }, - { id: 'menu-chart-group-scatter', caption: me.textPoint, inline: true }, - { id: 'menu-chart-group-stock', caption: me.textStock, inline: true } - // { id: 'menu-chart-group-surface', caption: me.textSurface} - ]), - store: new Common.UI.DataViewStore([ - { group: 'menu-chart-group-bar', type: Asc.c_oAscChartTypeSettings.barNormal, iconCls: 'column-normal', selected: true}, - { group: 'menu-chart-group-bar', type: Asc.c_oAscChartTypeSettings.barStacked, iconCls: 'column-stack'}, - { group: 'menu-chart-group-bar', type: Asc.c_oAscChartTypeSettings.barStackedPer, iconCls: 'column-pstack'}, - { group: 'menu-chart-group-bar', type: Asc.c_oAscChartTypeSettings.barNormal3d, iconCls: 'column-3d-normal'}, - { group: 'menu-chart-group-bar', type: Asc.c_oAscChartTypeSettings.barStacked3d, iconCls: 'column-3d-stack'}, - { group: 'menu-chart-group-bar', type: Asc.c_oAscChartTypeSettings.barStackedPer3d, iconCls: 'column-3d-pstack'}, - { group: 'menu-chart-group-bar', type: Asc.c_oAscChartTypeSettings.barNormal3dPerspective, iconCls: 'column-3d-normal-per'}, - { group: 'menu-chart-group-line', type: Asc.c_oAscChartTypeSettings.lineNormal, iconCls: 'line-normal'}, - { group: 'menu-chart-group-line', type: Asc.c_oAscChartTypeSettings.lineStacked, iconCls: 'line-stack'}, - { group: 'menu-chart-group-line', type: Asc.c_oAscChartTypeSettings.lineStackedPer, iconCls: 'line-pstack'}, - { group: 'menu-chart-group-line', type: Asc.c_oAscChartTypeSettings.line3d, iconCls: 'line-3d'}, - { group: 'menu-chart-group-pie', type: Asc.c_oAscChartTypeSettings.pie, iconCls: 'pie-normal'}, - { group: 'menu-chart-group-pie', type: Asc.c_oAscChartTypeSettings.doughnut, iconCls: 'pie-doughnut'}, - { group: 'menu-chart-group-pie', type: Asc.c_oAscChartTypeSettings.pie3d, iconCls: 'pie-3d-normal'}, - { group: 'menu-chart-group-hbar', type: Asc.c_oAscChartTypeSettings.hBarNormal, iconCls: 'bar-normal'}, - { group: 'menu-chart-group-hbar', type: Asc.c_oAscChartTypeSettings.hBarStacked, iconCls: 'bar-stack'}, - { group: 'menu-chart-group-hbar', type: Asc.c_oAscChartTypeSettings.hBarStackedPer, iconCls: 'bar-pstack'}, - { group: 'menu-chart-group-hbar', type: Asc.c_oAscChartTypeSettings.hBarNormal3d, iconCls: 'bar-3d-normal'}, - { group: 'menu-chart-group-hbar', type: Asc.c_oAscChartTypeSettings.hBarStacked3d, iconCls: 'bar-3d-stack'}, - { group: 'menu-chart-group-hbar', type: Asc.c_oAscChartTypeSettings.hBarStackedPer3d, iconCls: 'bar-3d-pstack'}, - { group: 'menu-chart-group-area', type: Asc.c_oAscChartTypeSettings.areaNormal, iconCls: 'area-normal'}, - { group: 'menu-chart-group-area', type: Asc.c_oAscChartTypeSettings.areaStacked, iconCls: 'area-stack'}, - { group: 'menu-chart-group-area', type: Asc.c_oAscChartTypeSettings.areaStackedPer, iconCls: 'area-pstack'}, - { group: 'menu-chart-group-scatter', type: Asc.c_oAscChartTypeSettings.scatter, iconCls: 'point-normal'}, - { group: 'menu-chart-group-stock', type: Asc.c_oAscChartTypeSettings.stock, iconCls: 'stock-normal'} - // { group: 'menu-chart-group-surface', type: Asc.c_oAscChartTypeSettings.surfaceNormal, iconCls: 'surface-normal'}, - // { group: 'menu-chart-group-surface', type: Asc.c_oAscChartTypeSettings.surfaceWireframe, iconCls: 'surface-wireframe'}, - // { group: 'menu-chart-group-surface', type: Asc.c_oAscChartTypeSettings.contourNormal, iconCls: 'contour-normal'}, - // { group: 'menu-chart-group-surface', type: Asc.c_oAscChartTypeSettings.contourWireframe, iconCls: 'contour-wireframe'} - ]), + groups: new Common.UI.DataViewGroupStore(Common.define.chartData.getChartGroupData()), + store: new Common.UI.DataViewStore(Common.define.chartData.getChartData()), itemTemplate: _.template('
') }); }); @@ -781,16 +742,8 @@ define([ parentMenu: btn.menu, restoreHeight: 120, allowScrollbar: false, - groups: new Common.UI.DataViewGroupStore([ - { id: 'menu-chart-group-sparkcolumn', inline: true }, - { id: 'menu-chart-group-sparkline', inline: true }, - { id: 'menu-chart-group-sparkwin', inline: true } - ]), - store: new Common.UI.DataViewStore([ - { group: 'menu-chart-group-sparkcolumn', type: Asc.c_oAscSparklineType.Column, allowSelected: true, iconCls: 'spark-column', tip: me.textColumnSpark}, - { group: 'menu-chart-group-sparkline', type: Asc.c_oAscSparklineType.Line, allowSelected: true, iconCls: 'spark-line', tip: me.textLineSpark}, - { group: 'menu-chart-group-sparkwin', type: Asc.c_oAscSparklineType.Stacked, allowSelected: true, iconCls: 'spark-win', tip: me.textWinLossSpark} - ]), + groups: new Common.UI.DataViewGroupStore(Common.define.chartData.getSparkGroupData()), + store: new Common.UI.DataViewStore(Common.define.chartData.getSparkData()), itemTemplate: _.template('
') }); }); @@ -1324,22 +1277,12 @@ define([ textHeight: 'Height', textEditData: 'Edit Data and Location', textChartType: 'Change Chart Type', - textLine: 'Line', - textColumn: 'Column', - textBar: 'Bar', - textArea: 'Area', - textPie: 'Pie', - textPoint: 'XY (Scatter)', - textStock: 'Stock', textStyle: 'Style', textAdvanced: 'Show advanced settings', strSparkColor: 'Color', strLineWeight: 'Line Weight', textMarkers: 'Markers', textNewColor: 'Add New Custom Color', - textLineSpark: 'Line', - textColumnSpark: 'Column', - textWinLossSpark: 'Win/Loss', textHighPoint: 'High Point', textLowPoint: 'Low Point', textNegativePoint: 'Negative Point', @@ -1350,8 +1293,7 @@ define([ textType: 'Type', textSelectData: 'Select Data', textRanges: 'Data Range', - textBorderSizeErr: 'The entered value is incorrect.
Please enter a value between 0 pt and 1584 pt.', - textSurface: 'Surface' + textBorderSizeErr: 'The entered value is incorrect.
Please enter a value between 0 pt and 1584 pt.' }, SSE.Views.ChartSettings || {})); }); \ No newline at end of file diff --git a/apps/spreadsheeteditor/main/app/view/ChartSettingsDlg.js b/apps/spreadsheeteditor/main/app/view/ChartSettingsDlg.js index 859113c94..40c9eff96 100644 --- a/apps/spreadsheeteditor/main/app/view/ChartSettingsDlg.js +++ b/apps/spreadsheeteditor/main/app/view/ChartSettingsDlg.js @@ -129,47 +129,8 @@ define([ 'text!spreadsheeteditor/main/app/template/ChartSettingsDlg.template' el: $('#id-chart-dlg-menu-type'), parentMenu: btn.menu, restoreHeight: 421, - groups: new Common.UI.DataViewGroupStore([ - { id: 'menu-chart-group-bar', caption: me.textColumn }, - { id: 'menu-chart-group-line', caption: me.textLine }, - { id: 'menu-chart-group-pie', caption: me.textPie }, - { id: 'menu-chart-group-hbar', caption: me.textBar }, - { id: 'menu-chart-group-area', caption: me.textArea, inline: true }, - { id: 'menu-chart-group-scatter', caption: me.textPoint, inline: true }, - { id: 'menu-chart-group-stock', caption: me.textStock, inline: true } - // { id: 'menu-chart-group-surface', caption: me.textSurface} - ]), - store: new Common.UI.DataViewStore([ - { group: 'menu-chart-group-bar', type: Asc.c_oAscChartTypeSettings.barNormal, iconCls: 'column-normal', selected: true}, - { group: 'menu-chart-group-bar', type: Asc.c_oAscChartTypeSettings.barStacked, iconCls: 'column-stack'}, - { group: 'menu-chart-group-bar', type: Asc.c_oAscChartTypeSettings.barStackedPer, iconCls: 'column-pstack'}, - { group: 'menu-chart-group-bar', type: Asc.c_oAscChartTypeSettings.barNormal3d, iconCls: 'column-3d-normal'}, - { group: 'menu-chart-group-bar', type: Asc.c_oAscChartTypeSettings.barStacked3d, iconCls: 'column-3d-stack'}, - { group: 'menu-chart-group-bar', type: Asc.c_oAscChartTypeSettings.barStackedPer3d, iconCls: 'column-3d-pstack'}, - { group: 'menu-chart-group-bar', type: Asc.c_oAscChartTypeSettings.barNormal3dPerspective, iconCls: 'column-3d-normal-per'}, - { group: 'menu-chart-group-line', type: Asc.c_oAscChartTypeSettings.lineNormal, iconCls: 'line-normal'}, - { group: 'menu-chart-group-line', type: Asc.c_oAscChartTypeSettings.lineStacked, iconCls: 'line-stack'}, - { group: 'menu-chart-group-line', type: Asc.c_oAscChartTypeSettings.lineStackedPer, iconCls: 'line-pstack'}, - { group: 'menu-chart-group-line', type: Asc.c_oAscChartTypeSettings.line3d, iconCls: 'line-3d'}, - { group: 'menu-chart-group-pie', type: Asc.c_oAscChartTypeSettings.pie, iconCls: 'pie-normal'}, - { group: 'menu-chart-group-pie', type: Asc.c_oAscChartTypeSettings.doughnut, iconCls: 'pie-doughnut'}, - { group: 'menu-chart-group-pie', type: Asc.c_oAscChartTypeSettings.pie3d, iconCls: 'pie-3d-normal'}, - { group: 'menu-chart-group-hbar', type: Asc.c_oAscChartTypeSettings.hBarNormal, iconCls: 'bar-normal'}, - { group: 'menu-chart-group-hbar', type: Asc.c_oAscChartTypeSettings.hBarStacked, iconCls: 'bar-stack'}, - { group: 'menu-chart-group-hbar', type: Asc.c_oAscChartTypeSettings.hBarStackedPer, iconCls: 'bar-pstack'}, - { group: 'menu-chart-group-hbar', type: Asc.c_oAscChartTypeSettings.hBarNormal3d, iconCls: 'bar-3d-normal'}, - { group: 'menu-chart-group-hbar', type: Asc.c_oAscChartTypeSettings.hBarStacked3d, iconCls: 'bar-3d-stack'}, - { group: 'menu-chart-group-hbar', type: Asc.c_oAscChartTypeSettings.hBarStackedPer3d, iconCls: 'bar-3d-pstack'}, - { group: 'menu-chart-group-area', type: Asc.c_oAscChartTypeSettings.areaNormal, iconCls: 'area-normal'}, - { group: 'menu-chart-group-area', type: Asc.c_oAscChartTypeSettings.areaStacked, iconCls: 'area-stack'}, - { group: 'menu-chart-group-area', type: Asc.c_oAscChartTypeSettings.areaStackedPer, iconCls: 'area-pstack'}, - { group: 'menu-chart-group-scatter', type: Asc.c_oAscChartTypeSettings.scatter, iconCls: 'point-normal'}, - { group: 'menu-chart-group-stock', type: Asc.c_oAscChartTypeSettings.stock, iconCls: 'stock-normal'} - // { group: 'menu-chart-group-surface', type: Asc.c_oAscChartTypeSettings.surfaceNormal, iconCls: 'surface-normal'}, - // { group: 'menu-chart-group-surface', type: Asc.c_oAscChartTypeSettings.surfaceWireframe, iconCls: 'surface-wireframe'}, - // { group: 'menu-chart-group-surface', type: Asc.c_oAscChartTypeSettings.contourNormal, iconCls: 'contour-normal'}, - // { group: 'menu-chart-group-surface', type: Asc.c_oAscChartTypeSettings.contourWireframe, iconCls: 'contour-wireframe'} - ]), + groups: new Common.UI.DataViewGroupStore(Common.define.chartData.getChartGroupData()), + store: new Common.UI.DataViewStore(Common.define.chartData.getChartData()), itemTemplate: _.template('
') }); }); @@ -790,16 +751,8 @@ define([ 'text!spreadsheeteditor/main/app/template/ChartSettingsDlg.template' el: $('#id-spark-dlg-menu-type'), parentMenu: btn.menu, restoreHeight: 120, - groups: new Common.UI.DataViewGroupStore([ - { id: 'menu-chart-group-sparkcolumn', inline: true }, - { id: 'menu-chart-group-sparkline', inline: true }, - { id: 'menu-chart-group-sparkwin', inline: true } - ]), - store: new Common.UI.DataViewStore([ - { group: 'menu-chart-group-sparkcolumn', type: Asc.c_oAscSparklineType.Column, allowSelected: true, iconCls: 'spark-column', tip: me.textColumnSpark}, - { group: 'menu-chart-group-sparkline', type: Asc.c_oAscSparklineType.Line, allowSelected: true, iconCls: 'spark-line', tip: me.textLineSpark}, - { group: 'menu-chart-group-sparkwin', type: Asc.c_oAscSparklineType.Stacked, allowSelected: true, iconCls: 'spark-win', tip: me.textWinLossSpark} - ]), + groups: new Common.UI.DataViewGroupStore(Common.define.chartData.getSparkGroupData()), + store: new Common.UI.DataViewStore(Common.define.chartData.getSparkData()), itemTemplate: _.template('
') }); }); @@ -1680,13 +1633,6 @@ define([ 'text!spreadsheeteditor/main/app/template/ChartSettingsDlg.template' textTitle: 'Chart - Advanced Settings', textShowValues: 'Display chart values', textShowBorders: 'Display chart borders', - textLine: 'Line', - textColumn: 'Column', - textBar: 'Bar', - textArea: 'Area', - textPie: 'Pie', - textPoint: 'XY (Scatter)', - textStock: 'Stock', textDataRows: 'in rows', textDataColumns: 'in columns', textDisplayLegend: 'Display Legend', @@ -1797,9 +1743,6 @@ define([ 'text!spreadsheeteditor/main/app/template/ChartSettingsDlg.template' textGaps: 'Gaps', textZero: 'Zero', textEmptyLine: 'Connect data points with line', - textLineSpark: 'Line', - textColumnSpark: 'Column', - textWinLossSpark: 'Win/Loss', textShowSparkAxis: 'Show Axis', textReverseOrder: 'Reverse order', textAutoEach: 'Auto for Each', @@ -1809,7 +1752,6 @@ define([ 'text!spreadsheeteditor/main/app/template/ChartSettingsDlg.template' textAltTitle: 'Title', textAltDescription: 'Description', textAltTip: 'The alternative text-based representation of the visual object information, which will be read to the people with vision or cognitive impairments to help them better understand what information there is in the image, autoshape, chart or table.', - textSurface: 'Surface', errorMaxPoints: 'ERROR! The maximum number of points in series per chart is 4096.', textSnap: 'Cell Snapping', textAbsolute: 'Don\'t move or size with cells', diff --git a/apps/spreadsheeteditor/main/app/view/Toolbar.js b/apps/spreadsheeteditor/main/app/view/Toolbar.js index f67499c25..36085e6f3 100644 --- a/apps/spreadsheeteditor/main/app/view/Toolbar.js +++ b/apps/spreadsheeteditor/main/app/view/Toolbar.js @@ -1902,53 +1902,8 @@ define([ parentMenu: menu, showLast: false, restoreHeight: 421, - groups: new Common.UI.DataViewGroupStore([ - {id: 'menu-chart-group-bar', caption: me.textColumn, headername: me.textCharts}, - {id: 'menu-chart-group-line', caption: me.textLine}, - {id: 'menu-chart-group-pie', caption: me.textPie}, - {id: 'menu-chart-group-hbar', caption: me.textBar}, - {id: 'menu-chart-group-area', caption: me.textArea, inline: true}, - {id: 'menu-chart-group-scatter', caption: me.textPoint, inline: true}, - {id: 'menu-chart-group-stock', caption: me.textStock, inline: true} - // { id: 'menu-chart-group-surface', caption: me.textSurface} - // ,{ id: 'menu-chart-group-sparkcolumn', inline: true, headername: me.textSparks }, - // { id: 'menu-chart-group-sparkline', inline: true }, - // { id: 'menu-chart-group-sparkwin', inline: true } - ]), - store: new Common.UI.DataViewStore([ - { group: 'menu-chart-group-bar', type: Asc.c_oAscChartTypeSettings.barNormal, iconCls: 'column-normal'}, - { group: 'menu-chart-group-bar', type: Asc.c_oAscChartTypeSettings.barStacked, iconCls: 'column-stack'}, - { group: 'menu-chart-group-bar', type: Asc.c_oAscChartTypeSettings.barStackedPer, iconCls: 'column-pstack'}, - { group: 'menu-chart-group-bar', type: Asc.c_oAscChartTypeSettings.barNormal3d, iconCls: 'column-3d-normal'}, - { group: 'menu-chart-group-bar', type: Asc.c_oAscChartTypeSettings.barStacked3d, iconCls: 'column-3d-stack'}, - { group: 'menu-chart-group-bar', type: Asc.c_oAscChartTypeSettings.barStackedPer3d, iconCls: 'column-3d-pstack'}, - { group: 'menu-chart-group-bar', type: Asc.c_oAscChartTypeSettings.barNormal3dPerspective, iconCls: 'column-3d-normal-per'}, - { group: 'menu-chart-group-line', type: Asc.c_oAscChartTypeSettings.lineNormal, iconCls: 'line-normal'}, - { group: 'menu-chart-group-line', type: Asc.c_oAscChartTypeSettings.lineStacked, iconCls: 'line-stack'}, - { group: 'menu-chart-group-line', type: Asc.c_oAscChartTypeSettings.lineStackedPer, iconCls: 'line-pstack'}, - { group: 'menu-chart-group-line', type: Asc.c_oAscChartTypeSettings.line3d, iconCls: 'line-3d'}, - { group: 'menu-chart-group-pie', type: Asc.c_oAscChartTypeSettings.pie, iconCls: 'pie-normal'}, - { group: 'menu-chart-group-pie', type: Asc.c_oAscChartTypeSettings.doughnut, iconCls: 'pie-doughnut'}, - { group: 'menu-chart-group-pie', type: Asc.c_oAscChartTypeSettings.pie3d, iconCls: 'pie-3d-normal'}, - { group: 'menu-chart-group-hbar', type: Asc.c_oAscChartTypeSettings.hBarNormal, iconCls: 'bar-normal'}, - { group: 'menu-chart-group-hbar', type: Asc.c_oAscChartTypeSettings.hBarStacked, iconCls: 'bar-stack'}, - { group: 'menu-chart-group-hbar', type: Asc.c_oAscChartTypeSettings.hBarStackedPer, iconCls: 'bar-pstack'}, - { group: 'menu-chart-group-hbar', type: Asc.c_oAscChartTypeSettings.hBarNormal3d, iconCls: 'bar-3d-normal'}, - { group: 'menu-chart-group-hbar', type: Asc.c_oAscChartTypeSettings.hBarStacked3d, iconCls: 'bar-3d-stack'}, - { group: 'menu-chart-group-hbar', type: Asc.c_oAscChartTypeSettings.hBarStackedPer3d, iconCls: 'bar-3d-pstack'}, - { group: 'menu-chart-group-area', type: Asc.c_oAscChartTypeSettings.areaNormal, iconCls: 'area-normal'}, - { group: 'menu-chart-group-area', type: Asc.c_oAscChartTypeSettings.areaStacked, iconCls: 'area-stack'}, - { group: 'menu-chart-group-area', type: Asc.c_oAscChartTypeSettings.areaStackedPer, iconCls: 'area-pstack'}, - { group: 'menu-chart-group-scatter', type: Asc.c_oAscChartTypeSettings.scatter, iconCls: 'point-normal'}, - { group: 'menu-chart-group-stock', type: Asc.c_oAscChartTypeSettings.stock, iconCls: 'stock-normal'} - // { group: 'menu-chart-group-surface', type: Asc.c_oAscChartTypeSettings.surfaceNormal, iconCls: 'surface-normal'}, - // { group: 'menu-chart-group-surface', type: Asc.c_oAscChartTypeSettings.surfaceWireframe, iconCls: 'surface-wireframe'}, - // { group: 'menu-chart-group-surface', type: Asc.c_oAscChartTypeSettings.contourNormal, iconCls: 'contour-normal'}, - // { group: 'menu-chart-group-surface', type: Asc.c_oAscChartTypeSettings.contourWireframe, iconCls: 'contour-wireframe'} - // ,{ group: 'menu-chart-group-sparkcolumn', type: Asc.c_oAscSparklineType.Column, allowSelected: true, iconCls: 'spark-column', tip: me.textColumnSpark}, - // { group: 'menu-chart-group-sparkline', type: Asc.c_oAscSparklineType.Line, allowSelected: true, iconCls: 'spark-line', tip: me.textLineSpark}, - // { group: 'menu-chart-group-sparkwin', type: Asc.c_oAscSparklineType.Stacked, allowSelected: true, iconCls: 'spark-win', tip: me.textWinLossSpark} - ]), + groups: new Common.UI.DataViewGroupStore(Common.define.chartData.getChartGroupData(true)/*.concat(Common.define.chartData.getSparkGroupData(true))*/), + store: new Common.UI.DataViewStore(Common.define.chartData.getChartData()/*.concat(Common.define.chartData.getSparkData())*/), itemTemplate: _.template('
') }); picker.on('item:click', function (picker, item, record, e) { @@ -2448,19 +2403,7 @@ define([ txtManageRange: 'Name manager', txtPasteRange: 'Paste name', textInsCharts: 'Charts', - textLine: 'Line', - textColumn: 'Column', - textBar: 'Bar', - textArea: 'Area', - textPie: 'Pie', - textPoint: 'XY (Scatter)', - textStock: 'Stock', - textLineSpark: 'Line', - textColumnSpark: 'Column', - textWinLossSpark: 'Win/Loss', tipInsertEquation: 'Insert Equation', - textCharts: 'Charts', - textSparks: 'Sparklines', tipInsertChartSpark: 'Insert Chart', textMoreFormats: 'More formats', capInsertText: 'Text', @@ -2474,7 +2417,6 @@ define([ textTabFile: 'File', textTabHome: 'Home', textTabInsert: 'Insert', - textSurface: 'Surface', tipChangeChart: 'Change Chart Type', textTabCollaboration: 'Collaboration', textTabProtect: 'Protection', diff --git a/apps/spreadsheeteditor/main/locale/en.json b/apps/spreadsheeteditor/main/locale/en.json index 6ed79f3e7..8f39480be 100644 --- a/apps/spreadsheeteditor/main/locale/en.json +++ b/apps/spreadsheeteditor/main/locale/en.json @@ -2,6 +2,19 @@ "cancelButtonText": "Cancel", "Common.Controllers.Chat.notcriticalErrorTitle": "Warning", "Common.Controllers.Chat.textEnterMessage": "Enter your message here", + "Common.define.chartData.textArea": "Area", + "Common.define.chartData.textBar": "Bar", + "Common.define.chartData.textCharts": "Charts", + "Common.define.chartData.textColumn": "Column", + "Common.define.chartData.textLine": "Line", + "Common.define.chartData.textPie": "Pie", + "Common.define.chartData.textPoint": "XY (Scatter)", + "Common.define.chartData.textStock": "Stock", + "Common.define.chartData.textSurface": "Surface", + "Common.define.chartData.textSparks": "Sparklines", + "Common.define.chartData.textColumnSpark": "Column", + "Common.define.chartData.textLineSpark": "Line", + "Common.define.chartData.textWinLossSpark": "Win/Loss", "Common.UI.ComboBorderSize.txtNoBorders": "No borders", "Common.UI.ComboBorderSizeEditable.txtNoBorders": "No borders", "Common.UI.ComboDataView.emptyComboText": "No styles", @@ -1192,36 +1205,36 @@ "SSE.Views.ChartSettings.strSparkColor": "Color", "SSE.Views.ChartSettings.strTemplate": "Template", "SSE.Views.ChartSettings.textAdvanced": "Show advanced settings", - "SSE.Views.ChartSettings.textArea": "Area", - "SSE.Views.ChartSettings.textBar": "Bar", + "del_SSE.Views.ChartSettings.textArea": "Area", + "del_SSE.Views.ChartSettings.textBar": "Bar", "SSE.Views.ChartSettings.textBorderSizeErr": "The entered value is incorrect.
Please enter a value between 0 pt and 1584 pt.", "SSE.Views.ChartSettings.textChartType": "Change Chart Type", - "SSE.Views.ChartSettings.textColumn": "Column", - "SSE.Views.ChartSettings.textColumnSpark": "Column", + "del_SSE.Views.ChartSettings.textColumn": "Column", + "del_SSE.Views.ChartSettings.textColumnSpark": "Column", "SSE.Views.ChartSettings.textEditData": "Edit Data and Location", "SSE.Views.ChartSettings.textFirstPoint": "First Point", "SSE.Views.ChartSettings.textHeight": "Height", "SSE.Views.ChartSettings.textHighPoint": "High Point", "SSE.Views.ChartSettings.textKeepRatio": "Constant proportions", "SSE.Views.ChartSettings.textLastPoint": "Last Point", - "SSE.Views.ChartSettings.textLine": "Line", - "SSE.Views.ChartSettings.textLineSpark": "Line", + "del_SSE.Views.ChartSettings.textLine": "Line", + "del_SSE.Views.ChartSettings.textLineSpark": "Line", "SSE.Views.ChartSettings.textLowPoint": "Low Point", "SSE.Views.ChartSettings.textMarkers": "Markers", "SSE.Views.ChartSettings.textNegativePoint": "Negative Point", "SSE.Views.ChartSettings.textNewColor": "Add New Custom Color", - "SSE.Views.ChartSettings.textPie": "Pie", - "SSE.Views.ChartSettings.textPoint": "XY (Scatter)", + "del_SSE.Views.ChartSettings.textPie": "Pie", + "del_SSE.Views.ChartSettings.textPoint": "XY (Scatter)", "SSE.Views.ChartSettings.textRanges": "Data Range", "SSE.Views.ChartSettings.textSelectData": "Select Data", "SSE.Views.ChartSettings.textShow": "Show", "SSE.Views.ChartSettings.textSize": "Size", - "SSE.Views.ChartSettings.textStock": "Stock", + "del_SSE.Views.ChartSettings.textStock": "Stock", "SSE.Views.ChartSettings.textStyle": "Style", - "SSE.Views.ChartSettings.textSurface": "Surface", + "del_SSE.Views.ChartSettings.textSurface": "Surface", "SSE.Views.ChartSettings.textType": "Type", "SSE.Views.ChartSettings.textWidth": "Width", - "SSE.Views.ChartSettings.textWinLossSpark": "Win/Loss", + "del_SSE.Views.ChartSettings.textWinLossSpark": "Win/Loss", "SSE.Views.ChartSettingsDlg.errorMaxPoints": "ERROR! The maximum number of points in series per chart is 4096.", "SSE.Views.ChartSettingsDlg.errorMaxRows": "ERROR! The maximum number of data series per chart is 255", "SSE.Views.ChartSettingsDlg.errorStockChart": "Incorrect row order. To build a stock chart place the data on the sheet in the following order:
opening price, max price, min price, closing price.", @@ -1230,14 +1243,14 @@ "SSE.Views.ChartSettingsDlg.textAltDescription": "Description", "SSE.Views.ChartSettingsDlg.textAltTip": "The alternative text-based representation of the visual object information, which will be read to the people with vision or cognitive impairments to help them better understand what information there is in the image, autoshape, chart or table.", "SSE.Views.ChartSettingsDlg.textAltTitle": "Title", - "SSE.Views.ChartSettingsDlg.textArea": "Area", + "del_SSE.Views.ChartSettingsDlg.textArea": "Area", "SSE.Views.ChartSettingsDlg.textAuto": "Auto", "SSE.Views.ChartSettingsDlg.textAutoEach": "Auto for Each", "SSE.Views.ChartSettingsDlg.textAxisCrosses": "Axis Crosses", "SSE.Views.ChartSettingsDlg.textAxisOptions": "Axis Options", "SSE.Views.ChartSettingsDlg.textAxisPos": "Axis Position", "SSE.Views.ChartSettingsDlg.textAxisSettings": "Axis Settings", - "SSE.Views.ChartSettingsDlg.textBar": "Bar", + "del_SSE.Views.ChartSettingsDlg.textBar": "Bar", "SSE.Views.ChartSettingsDlg.textBetweenTickMarks": "Between Tick Marks", "SSE.Views.ChartSettingsDlg.textBillions": "Billions", "SSE.Views.ChartSettingsDlg.textBottom": "Bottom", @@ -1245,8 +1258,8 @@ "SSE.Views.ChartSettingsDlg.textCenter": "Center", "SSE.Views.ChartSettingsDlg.textChartElementsLegend": "Chart Elements &
Chart Legend", "SSE.Views.ChartSettingsDlg.textChartTitle": "Chart Title", - "SSE.Views.ChartSettingsDlg.textColumn": "Column", - "SSE.Views.ChartSettingsDlg.textColumnSpark": "Column", + "del_SSE.Views.ChartSettingsDlg.textColumn": "Column", + "del_SSE.Views.ChartSettingsDlg.textColumnSpark": "Column", "SSE.Views.ChartSettingsDlg.textCross": "Cross", "SSE.Views.ChartSettingsDlg.textCustom": "Custom", "SSE.Views.ChartSettingsDlg.textDataColumns": "in columns", @@ -1287,9 +1300,9 @@ "SSE.Views.ChartSettingsDlg.textLegendPos": "Legend", "SSE.Views.ChartSettingsDlg.textLegendRight": "Right", "SSE.Views.ChartSettingsDlg.textLegendTop": "Top", - "SSE.Views.ChartSettingsDlg.textLine": "Line Chart", + "del_SSE.Views.ChartSettingsDlg.textLine": "Line Chart", "SSE.Views.ChartSettingsDlg.textLines": "Lines ", - "SSE.Views.ChartSettingsDlg.textLineSpark": "Line", + "del_SSE.Views.ChartSettingsDlg.textLineSpark": "Line", "SSE.Views.ChartSettingsDlg.textLocationRange": "Location Range", "SSE.Views.ChartSettingsDlg.textLow": "Low", "SSE.Views.ChartSettingsDlg.textMajor": "Major", @@ -1311,8 +1324,8 @@ "SSE.Views.ChartSettingsDlg.textOut": "Out", "SSE.Views.ChartSettingsDlg.textOuterTop": "Outer Top", "SSE.Views.ChartSettingsDlg.textOverlay": "Overlay", - "SSE.Views.ChartSettingsDlg.textPie": "Pie", - "SSE.Views.ChartSettingsDlg.textPoint": "XY (Scatter)", + "del_SSE.Views.ChartSettingsDlg.textPie": "Pie", + "del_SSE.Views.ChartSettingsDlg.textPoint": "XY (Scatter)", "SSE.Views.ChartSettingsDlg.textReverse": "Values in reverse order", "SSE.Views.ChartSettingsDlg.textReverseOrder": "Reverse order", "SSE.Views.ChartSettingsDlg.textRight": "Right", @@ -1334,10 +1347,10 @@ "SSE.Views.ChartSettingsDlg.textSmooth": "Smooth", "SSE.Views.ChartSettingsDlg.textSnap": "Cell Snapping", "SSE.Views.ChartSettingsDlg.textSparkRanges": "Sparkline Ranges", - "SSE.Views.ChartSettingsDlg.textStock": "Stock", + "del_SSE.Views.ChartSettingsDlg.textStock": "Stock", "SSE.Views.ChartSettingsDlg.textStraight": "Straight", "SSE.Views.ChartSettingsDlg.textStyle": "Style", - "SSE.Views.ChartSettingsDlg.textSurface": "Surface", + "del_SSE.Views.ChartSettingsDlg.textSurface": "Surface", "SSE.Views.ChartSettingsDlg.textTenMillions": "10 000 000", "SSE.Views.ChartSettingsDlg.textTenThousands": "10 000", "SSE.Views.ChartSettingsDlg.textThousands": "Thousands", @@ -1355,7 +1368,7 @@ "SSE.Views.ChartSettingsDlg.textVertAxis": "Vertical Axis", "SSE.Views.ChartSettingsDlg.textVertGrid": "Vertical Gridlines", "SSE.Views.ChartSettingsDlg.textVertTitle": "Vertical Axis Title", - "SSE.Views.ChartSettingsDlg.textWinLossSpark": "Win/Loss", + "del_SSE.Views.ChartSettingsDlg.textWinLossSpark": "Win/Loss", "SSE.Views.ChartSettingsDlg.textXAxisTitle": "X Axis Title", "SSE.Views.ChartSettingsDlg.textYAxisTitle": "Y Axis Title", "SSE.Views.ChartSettingsDlg.textZero": "Zero", @@ -2244,20 +2257,20 @@ "SSE.Views.Toolbar.textAlignRight": "Align Right", "SSE.Views.Toolbar.textAlignTop": "Align Top", "SSE.Views.Toolbar.textAllBorders": "All Borders", - "SSE.Views.Toolbar.textArea": "Area", + "del_SSE.Views.Toolbar.textArea": "Area", "SSE.Views.Toolbar.textAuto": "Auto", - "SSE.Views.Toolbar.textBar": "Bar", + "del_SSE.Views.Toolbar.textBar": "Bar", "SSE.Views.Toolbar.textBold": "Bold", "SSE.Views.Toolbar.textBordersColor": "Border Color", "SSE.Views.Toolbar.textBordersStyle": "Border Style", "SSE.Views.Toolbar.textBottom": "Bottom: ", "SSE.Views.Toolbar.textBottomBorders": "Bottom Borders", "SSE.Views.Toolbar.textCenterBorders": "Inside Vertical Borders", - "SSE.Views.Toolbar.textCharts": "Charts", + "del_SSE.Views.Toolbar.textCharts": "Charts", "SSE.Views.Toolbar.textClearPrintArea": "Clear Print Area", "SSE.Views.Toolbar.textClockwise": "Angle Clockwise", - "SSE.Views.Toolbar.textColumn": "Column", - "SSE.Views.Toolbar.textColumnSpark": "Column", + "del_SSE.Views.Toolbar.textColumn": "Column", + "del_SSE.Views.Toolbar.textColumnSpark": "Column", "SSE.Views.Toolbar.textCounterCw": "Angle Counterclockwise", "SSE.Views.Toolbar.textDelLeft": "Shift Cells Left", "SSE.Views.Toolbar.textDelUp": "Shift Cells Up", @@ -2275,8 +2288,8 @@ "SSE.Views.Toolbar.textLandscape": "Landscape", "SSE.Views.Toolbar.textLeft": "Left: ", "SSE.Views.Toolbar.textLeftBorders": "Left Borders", - "SSE.Views.Toolbar.textLine": "Line", - "SSE.Views.Toolbar.textLineSpark": "Line", + "del_SSE.Views.Toolbar.textLine": "Line", + "del_SSE.Views.Toolbar.textLineSpark": "Line", "SSE.Views.Toolbar.textManyPages": "pages", "SSE.Views.Toolbar.textMarginsLast": "Last Custom", "SSE.Views.Toolbar.textMarginsNarrow": "Narrow", @@ -2290,8 +2303,8 @@ "SSE.Views.Toolbar.textOnePage": "page", "SSE.Views.Toolbar.textOutBorders": "Outside Borders", "SSE.Views.Toolbar.textPageMarginsCustom": "Custom margins", - "SSE.Views.Toolbar.textPie": "Pie", - "SSE.Views.Toolbar.textPoint": "XY (Scatter)", + "del_SSE.Views.Toolbar.textPie": "Pie", + "del_SSE.Views.Toolbar.textPoint": "XY (Scatter)", "SSE.Views.Toolbar.textPortrait": "Portrait", "SSE.Views.Toolbar.textPrint": "Print", "SSE.Views.Toolbar.textPrintOptions": "Print Settings", @@ -2300,13 +2313,13 @@ "SSE.Views.Toolbar.textRotateDown": "Rotate Text Down", "SSE.Views.Toolbar.textRotateUp": "Rotate Text Up", "SSE.Views.Toolbar.textSetPrintArea": "Set Print Area", - "SSE.Views.Toolbar.textSparks": "Sparklines", - "SSE.Views.Toolbar.textStock": "Stock", + "del_SSE.Views.Toolbar.textSparks": "Sparklines", + "del_SSE.Views.Toolbar.textStock": "Stock", "SSE.Views.Toolbar.textStrikeout": "Strikeout", "SSE.Views.Toolbar.textSubscript": "Subscript", "SSE.Views.Toolbar.textSubSuperscript": "Subscript/Superscript", "SSE.Views.Toolbar.textSuperscript": "Superscript", - "SSE.Views.Toolbar.textSurface": "Surface", + "del_SSE.Views.Toolbar.textSurface": "Surface", "SSE.Views.Toolbar.textTabCollaboration": "Collaboration", "SSE.Views.Toolbar.textTabData": "Data", "SSE.Views.Toolbar.textTabFile": "File", @@ -2319,7 +2332,7 @@ "SSE.Views.Toolbar.textTopBorders": "Top Borders", "SSE.Views.Toolbar.textUnderline": "Underline", "SSE.Views.Toolbar.textWidth": "Width", - "SSE.Views.Toolbar.textWinLossSpark": "Win/Loss", + "del_SSE.Views.Toolbar.textWinLossSpark": "Win/Loss", "SSE.Views.Toolbar.textZoom": "Zoom", "SSE.Views.Toolbar.tipAlignBottom": "Align bottom", "SSE.Views.Toolbar.tipAlignCenter": "Align center", diff --git a/apps/spreadsheeteditor/main/locale/ru.json b/apps/spreadsheeteditor/main/locale/ru.json index 16ed31e4b..60fb87fc5 100644 --- a/apps/spreadsheeteditor/main/locale/ru.json +++ b/apps/spreadsheeteditor/main/locale/ru.json @@ -2,6 +2,19 @@ "cancelButtonText": "Отмена", "Common.Controllers.Chat.notcriticalErrorTitle": "Предупреждение", "Common.Controllers.Chat.textEnterMessage": "Введите здесь своё сообщение", + "Common.define.chartData.textArea": "С областями", + "Common.define.chartData.textBar": "Линейчатая", + "Common.define.chartData.textCharts": "Диаграммы", + "Common.define.chartData.textColumn": "Гистограмма", + "Common.define.chartData.textLine": "График", + "Common.define.chartData.textPie": "Круговая", + "Common.define.chartData.textPoint": "Точечная", + "Common.define.chartData.textStock": "Биржевая", + "Common.define.chartData.textSurface": "Поверхность", + "Common.define.chartData.textSparks": "Спарклайны", + "Common.define.chartData.textColumnSpark": "Гистограмма", + "Common.define.chartData.textLineSpark": "График", + "Common.define.chartData.textWinLossSpark": "Выигрыш/проигрыш", "Common.UI.ComboBorderSize.txtNoBorders": "Без границ", "Common.UI.ComboBorderSizeEditable.txtNoBorders": "Без границ", "Common.UI.ComboDataView.emptyComboText": "Без стилей", From f3d97598835651569e160892bd949ecd24f10ad7 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Mon, 18 Nov 2019 14:08:17 +0300 Subject: [PATCH 267/419] Move chart styles to common --- apps/common/main/resources/less/toolbar.less | 134 ++++++++++++++++ .../main/resources/less/toolbar.less | 134 ---------------- .../main/resources/less/toolbar.less | 134 ---------------- .../main/resources/less/rightmenu.less | 146 ------------------ 4 files changed, 134 insertions(+), 414 deletions(-) diff --git a/apps/common/main/resources/less/toolbar.less b/apps/common/main/resources/less/toolbar.less index 16ddef848..74da8eb05 100644 --- a/apps/common/main/resources/less/toolbar.less +++ b/apps/common/main/resources/less/toolbar.less @@ -584,3 +584,137 @@ width: 20px; height: 20px; } + +// charts +.menu-insertchart { + .group-description { + padding-left: 4px; + } + + .group-items-container { + float: left; + position: relative; + } +} + +.item-chartlist { + .background-ximage('@{common-image-path}/toolbar/charttypes.png', '@{common-image-path}/toolbar/charttypes@2x.png', 250px); + width: 50px; + height: 50px; +} + +.line-normal { + background-position: 0 0; +} + +.line-stack { + background-position: -50px 0; +} + +.line-pstack { + background-position: -100px 0; +} + +.line-3d { + background-position: -150px 0; +} + +.column-normal { + background-position: 0 -50px; +} + +.column-stack{ + background-position: -50px -50px; +} + +.column-pstack{ + background-position: -100px -50px; +} + +.column-3d-normal { + background-position: -150px -50px; +} + +.column-3d-stack{ + background-position: -200px -50px; +} + +.column-3d-pstack{ + background-position: -150px -100px; +} + +.column-3d-normal-per{ + background-position: -200px -100px; +} + +.bar-normal { + background-position: 0 -100px; +} + +.bar-stack{ + background-position: -50px -100px; +} + +.bar-pstack{ + background-position: -100px -100px; +} + +.bar-3d-normal { + background-position: -150px -150px; +} + +.bar-3d-stack{ + background-position: -200px -150px; +} + +.bar-3d-pstack{ + background-position: -150px -200px; +} + +.area-normal { + background-position: 0 -150px; +} + +.area-stack{ + background-position: -50px -150px; +} + +.area-pstack{ + background-position: -100px -150px; +} + +.pie-normal { + background-position: 0 -200px; +} + +.pie-3d-normal { + background-position: -200px -200px; +} + +.point-normal{ + background-position: -50px -200px; +} + +.stock-normal{ + background-position: -100px -200px; +} + +.pie-doughnut{ + background-position: -200px 0; +} + +.surface-normal{ + background-position: 0px -300px; +} + +.surface-wireframe{ + background-position: -50px -300px; +} + +.contour-normal{ + background-position: -100px -300px; +} + +.contour-wireframe{ + background-position: -150px -300px; +} diff --git a/apps/documenteditor/main/resources/less/toolbar.less b/apps/documenteditor/main/resources/less/toolbar.less index c4ab40396..29bcb93bd 100644 --- a/apps/documenteditor/main/resources/less/toolbar.less +++ b/apps/documenteditor/main/resources/less/toolbar.less @@ -157,140 +157,6 @@ } } -// charts -.menu-insertchart { - .group-description { - padding-left: 4px; - } - - .group-items-container { - float: left; - position: relative; - } -} - -.item-chartlist { - .background-ximage('@{common-image-path}/toolbar/charttypes.png', '@{common-image-path}/toolbar/charttypes@2x.png', 250px); - width: 50px; - height: 50px; -} - -.line-normal { - background-position: 0 0; -} - -.line-stack { - background-position: -50px 0; -} - -.line-pstack { - background-position: -100px 0; -} - -.line-3d { - background-position: -150px 0; -} - -.column-normal { - background-position: 0 -50px; -} - -.column-stack{ - background-position: -50px -50px; -} - -.column-pstack{ - background-position: -100px -50px; -} - -.column-3d-normal { - background-position: -150px -50px; -} - -.column-3d-stack{ - background-position: -200px -50px; -} - -.column-3d-pstack{ - background-position: -150px -100px; -} - -.column-3d-normal-per{ - background-position: -200px -100px; -} - -.bar-normal { - background-position: 0 -100px; -} - -.bar-stack{ - background-position: -50px -100px; -} - -.bar-pstack{ - background-position: -100px -100px; -} - -.bar-3d-normal { - background-position: -150px -150px; -} - -.bar-3d-stack{ - background-position: -200px -150px; -} - -.bar-3d-pstack{ - background-position: -150px -200px; -} - -.area-normal { - background-position: 0 -150px; -} - -.area-stack{ - background-position: -50px -150px; -} - -.area-pstack{ - background-position: -100px -150px; -} - -.pie-normal { - background-position: 0 -200px; -} - -.pie-3d-normal { - background-position: -200px -200px; -} - -.point-normal{ - background-position: -50px -200px; -} - -.stock-normal{ - background-position: -100px -200px; -} - -.pie-doughnut{ - background-position: -200px 0; -} - -.surface-normal{ - background-position: 0px -300px; -} - -.surface-wireframe{ - background-position: -50px -300px; -} - -.contour-normal{ - background-position: -100px -300px; -} - -.contour-wireframe{ - background-position: -150px -300px; -} - @toolbar-icon-size: 20px; .button-normal-icon(btn-align-center, 0, @toolbar-icon-size); .button-normal-icon(btn-align-just, 1, @toolbar-icon-size); diff --git a/apps/presentationeditor/main/resources/less/toolbar.less b/apps/presentationeditor/main/resources/less/toolbar.less index b75053b19..612296379 100644 --- a/apps/presentationeditor/main/resources/less/toolbar.less +++ b/apps/presentationeditor/main/resources/less/toolbar.less @@ -104,140 +104,6 @@ } } -// charts -.menu-insertchart { - .group-description { - padding-left: 4px; - } - - .group-items-container { - float: left; - position: relative; - } -} - -.item-chartlist { - .background-ximage('@{common-image-path}/toolbar/charttypes.png', '@{common-image-path}/toolbar/charttypes@2x.png', 250px); - width: 50px; - height: 50px; -} - -.line-normal { - background-position: 0 0; -} - -.line-stack { - background-position: -50px 0; -} - -.line-pstack { - background-position: -100px 0; -} - -.line-3d { - background-position: -150px 0; -} - -.column-normal { - background-position: 0 -50px; -} - -.column-stack{ - background-position: -50px -50px; -} - -.column-pstack{ - background-position: -100px -50px; -} - -.column-3d-normal { - background-position: -150px -50px; -} - -.column-3d-stack{ - background-position: -200px -50px; -} - -.column-3d-pstack{ - background-position: -150px -100px; -} - -.column-3d-normal-per{ - background-position: -200px -100px; -} - -.bar-normal { - background-position: 0 -100px; -} - -.bar-stack{ - background-position: -50px -100px; -} - -.bar-pstack{ - background-position: -100px -100px; -} - -.bar-3d-normal { - background-position: -150px -150px; -} - -.bar-3d-stack{ - background-position: -200px -150px; -} - -.bar-3d-pstack{ - background-position: -150px -200px; -} - -.area-normal { - background-position: 0 -150px; -} - -.area-stack{ - background-position: -50px -150px; -} - -.area-pstack{ - background-position: -100px -150px; -} - -.pie-normal { - background-position: 0 -200px; -} - -.pie-3d-normal { - background-position: -200px -200px; -} - -.point-normal{ - background-position: -50px -200px; -} - -.stock-normal{ - background-position: -100px -200px; -} - -.pie-doughnut{ - background-position: -200px 0; -} - -.surface-normal{ - background-position: 0px -300px; -} - -.surface-wireframe{ - background-position: -50px -300px; -} - -.contour-normal{ - background-position: -100px -300px; -} - -.contour-wireframe{ - background-position: -150px -300px; -} - @toolbar-icon-size: 20px; .button-normal-icon(btn-changeslide, 7, @toolbar-icon-size); .button-normal-icon(btn-preview, 8, @toolbar-icon-size); diff --git a/apps/spreadsheeteditor/main/resources/less/rightmenu.less b/apps/spreadsheeteditor/main/resources/less/rightmenu.less index 2d16d42e1..00b6b296e 100644 --- a/apps/spreadsheeteditor/main/resources/less/rightmenu.less +++ b/apps/spreadsheeteditor/main/resources/less/rightmenu.less @@ -199,158 +199,12 @@ button:active:not(.disabled) .btn-change-shape {background-position: -56px - background-position: -100px -150px; } -// charts .item-wrap { width:50px; height:50px; background-size: cover; } -.menu-insertchart { - .group-description { - padding-left: 4px; - } - - .group-items-container { - float: left; - position: relative; - } -} - -.item-chartlist { - .background-ximage('@{common-image-path}/toolbar/charttypes.png', '@{common-image-path}/toolbar/charttypes@2x.png', 250px); - width: 50px; - height: 50px; -} - -.line-normal { - background-position: 0 0; -} - -.line-stack { - background-position: -50px 0; -} - -.line-pstack { - background-position: -100px 0; -} - -.line-3d { - background-position: -150px 0; -} - -.column-normal { - background-position: 0 -50px; -} - -.column-stack{ - background-position: -50px -50px; -} - -.column-pstack{ - background-position: -100px -50px; -} - -.column-3d-normal { - background-position: -150px -50px; -} - -.column-3d-stack{ - background-position: -200px -50px; -} - -.column-3d-pstack{ - background-position: -150px -100px; -} - -.column-3d-normal-per{ - background-position: -200px -100px; -} - -.bar-normal { - background-position: 0 -100px; -} - -.bar-stack{ - background-position: -50px -100px; -} - -.bar-pstack{ - background-position: -100px -100px; -} - -.bar-3d-normal { - background-position: -150px -150px; -} - -.bar-3d-stack{ - background-position: -200px -150px; -} - -.bar-3d-pstack{ - background-position: -150px -200px; -} - -.area-normal { - background-position: 0 -150px; -} - -.area-stack{ - background-position: -50px -150px; -} - -.area-pstack{ - background-position: -100px -150px; -} - -.pie-normal { - background-position: 0 -200px; -} - -.pie-3d-normal { - background-position: -200px -200px; -} - -.point-normal{ - background-position: -50px -200px; -} - -.stock-normal{ - background-position: -100px -200px; -} - -.pie-doughnut{ - background-position: -200px 0; -} - -.spark-line{ - background-position: 0px -250px; -} - -.spark-column{ - background-position: -50px -250px; -} - -.spark-win{ - background-position: -100px -250px; -} - -.surface-normal{ - background-position: 0px -300px; -} - -.surface-wireframe{ - background-position: -50px -300px; -} - -.contour-normal{ - background-position: -100px -300px; -} - -.contour-wireframe{ - background-position: -150px -300px; -} - #table-combo-template .combo-dataview { .combo-template(60px); } From 76a90f93b26a08ff2c3eea0975f73f91a14cfbc2 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Mon, 18 Nov 2019 14:09:52 +0300 Subject: [PATCH 268/419] Update translation --- apps/documenteditor/main/locale/de.json | 17 +++++++++-------- apps/presentationeditor/main/locale/de.json | 9 +++++++++ apps/spreadsheeteditor/main/locale/de.json | 9 +++++++++ 3 files changed, 27 insertions(+), 8 deletions(-) diff --git a/apps/documenteditor/main/locale/de.json b/apps/documenteditor/main/locale/de.json index 5abdee882..a09a79c9e 100644 --- a/apps/documenteditor/main/locale/de.json +++ b/apps/documenteditor/main/locale/de.json @@ -69,6 +69,15 @@ "Common.Controllers.ReviewChanges.textTabs": "Registerkarten ändern", "Common.Controllers.ReviewChanges.textUnderline": "Unterstrichen", "Common.Controllers.ReviewChanges.textWidow": "Widow Сontrol", + "Common.define.chartData.textArea": "Fläche", + "Common.define.chartData.textBar": "Balken", + "Common.define.chartData.textCharts": "Diagramme", + "Common.define.chartData.textColumn": "Spalte", + "Common.define.chartData.textLine": "Linie", + "Common.define.chartData.textPie": "Kreis", + "Common.define.chartData.textPoint": "Punkt (XY)", + "Common.define.chartData.textStock": "Kurs", + "Common.define.chartData.textSurface": "Oberfläche", "Common.UI.ComboBorderSize.txtNoBorders": "Keine Rahmen", "Common.UI.ComboBorderSizeEditable.txtNoBorders": "Keine Rahmen", "Common.UI.ComboDataView.emptyComboText": "Keine Formate", @@ -1000,20 +1009,12 @@ "DE.Views.BookmarksDialog.textTitle": "Lesezeichen", "DE.Views.BookmarksDialog.txtInvalidName": "Der Name des Lesezeichens darf nur Buchstaben, Ziffern und Unterstriche enthalten und sollte mit dem Buchstaben beginnen", "DE.Views.ChartSettings.textAdvanced": "Erweiterte Einstellungen anzeigen", - "DE.Views.ChartSettings.textArea": "Fläche", - "DE.Views.ChartSettings.textBar": "Balken", "DE.Views.ChartSettings.textChartType": "Diagrammtyp ändern", - "DE.Views.ChartSettings.textColumn": "Spalte", "DE.Views.ChartSettings.textEditData": "Daten ändern", "DE.Views.ChartSettings.textHeight": "Höhe", - "DE.Views.ChartSettings.textLine": "Linie", "DE.Views.ChartSettings.textOriginalSize": "Standardgröße", - "DE.Views.ChartSettings.textPie": "Kreis", - "DE.Views.ChartSettings.textPoint": "Punkt (XY)", "DE.Views.ChartSettings.textSize": "Größe", - "DE.Views.ChartSettings.textStock": "Kurs", "DE.Views.ChartSettings.textStyle": "Stil", - "DE.Views.ChartSettings.textSurface": "Oberfläche", "DE.Views.ChartSettings.textUndock": "Seitenbereich abdocken", "DE.Views.ChartSettings.textWidth": "Breite", "DE.Views.ChartSettings.textWrap": "Textumbruch", diff --git a/apps/presentationeditor/main/locale/de.json b/apps/presentationeditor/main/locale/de.json index 7087a7408..f7205b884 100644 --- a/apps/presentationeditor/main/locale/de.json +++ b/apps/presentationeditor/main/locale/de.json @@ -5,6 +5,15 @@ "Common.Controllers.ExternalDiagramEditor.textClose": "Schließen", "Common.Controllers.ExternalDiagramEditor.warningText": "Das Objekt ist deaktiviert, weil es momentan von einem anderen Benutzer bearbeitet wird.", "Common.Controllers.ExternalDiagramEditor.warningTitle": "Achtung", + "Common.define.chartData.textArea": "Fläche", + "Common.define.chartData.textBar": "Balken", + "Common.define.chartData.textCharts": "Diagramme", + "Common.define.chartData.textColumn": "Spalte", + "Common.define.chartData.textLine": "Linie", + "Common.define.chartData.textPie": "Kreis", + "Common.define.chartData.textPoint": "Punkt (XY)", + "Common.define.chartData.textStock": "Kurs", + "Common.define.chartData.textSurface": "Oberfläche", "Common.UI.ComboBorderSize.txtNoBorders": "Keine Rahmen", "Common.UI.ComboBorderSizeEditable.txtNoBorders": "Keine Rahmen", "Common.UI.ComboDataView.emptyComboText": "Keine Formate", diff --git a/apps/spreadsheeteditor/main/locale/de.json b/apps/spreadsheeteditor/main/locale/de.json index c898642ca..5feab7090 100644 --- a/apps/spreadsheeteditor/main/locale/de.json +++ b/apps/spreadsheeteditor/main/locale/de.json @@ -2,6 +2,15 @@ "cancelButtonText": "Abbrechen", "Common.Controllers.Chat.notcriticalErrorTitle": "Achtung", "Common.Controllers.Chat.textEnterMessage": "Geben Sie Ihre Nachricht hier ein", + "Common.define.chartData.textArea": "Fläche", + "Common.define.chartData.textBar": "Balken", + "Common.define.chartData.textCharts": "Diagramme", + "Common.define.chartData.textColumn": "Spalte", + "Common.define.chartData.textLine": "Linie", + "Common.define.chartData.textPie": "Kreis", + "Common.define.chartData.textPoint": "Punkt (XY)", + "Common.define.chartData.textStock": "Kurs", + "Common.define.chartData.textSurface": "Oberfläche", "Common.UI.ComboBorderSize.txtNoBorders": "Keine Rahmen", "Common.UI.ComboBorderSizeEditable.txtNoBorders": "Keine Rahmen", "Common.UI.ComboDataView.emptyComboText": "Keine Formate", From 57f91cc6dda088cde3d63a7e88a3a9f380ab6647 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Mon, 18 Nov 2019 15:14:14 +0300 Subject: [PATCH 269/419] [PE] Support picture placeholders --- .../main/app/view/DocumentHolder.js | 54 ++++++++++++------- 1 file changed, 34 insertions(+), 20 deletions(-) diff --git a/apps/presentationeditor/main/app/view/DocumentHolder.js b/apps/presentationeditor/main/app/view/DocumentHolder.js index 48cac30b7..077826844 100644 --- a/apps/presentationeditor/main/app/view/DocumentHolder.js +++ b/apps/presentationeditor/main/app/view/DocumentHolder.js @@ -1586,7 +1586,9 @@ define([ me.api.asc_registerCallback('asc_onShowSpecialPasteOptions', _.bind(onShowSpecialPasteOptions, me)); me.api.asc_registerCallback('asc_onHideSpecialPasteOptions', _.bind(onHideSpecialPasteOptions, me)); me.api.asc_registerCallback('asc_ChangeCropState', _.bind(onChangeCropState, me)); - + me.api.asc_registerCallback('asc_onHidePlaceholderActions', _.bind(onChangeCropState, me)); + me.api.asc_registerPlaceholderCallback(AscCommon.PlaceholderButtonType.Image, _.bind(me.onInsertImage, me, true)); + me.api.asc_registerPlaceholderCallback(AscCommon.PlaceholderButtonType.ImageUrl, _.bind(me.onInsertImageUrl, me, true)); } me.api.asc_registerCallback('asc_onCoAuthoringDisconnect', _.bind(onCoAuthoringDisconnect, me)); Common.NotificationCenter.on('api:disconnect', _.bind(onCoAuthoringDisconnect, me)); @@ -2781,29 +2783,12 @@ define([ caption : this.textFromFile }).on('click', function(item) { setTimeout(function(){ - if (me.api) me.api.ChangeImageFromFile(); - me.fireEvent('editcomplete', me); + me.onInsertImage(); }, 10); }), new Common.UI.MenuItem({ caption : this.textFromUrl - }).on('click', function(item) { - (new Common.Views.ImageFromUrlDialog({ - handler: function(result, value) { - if (result == 'ok') { - if (me.api) { - var checkUrl = value.replace(/ /g, ''); - if (!_.isEmpty(checkUrl)) { - var props = new Asc.asc_CImgProperty(); - props.put_ImageUrl(checkUrl); - me.api.ImgApply(props); - } - } - } - me.fireEvent('editcomplete', me); - } - })).show(); - }) + }).on('click', _.bind(me.onInsertImageUrl, me, false)) ] }) }); @@ -3432,6 +3417,35 @@ define([ this._isDisabled = state; }, + onInsertImage: function(placeholder, obj, x, y) { + if (this.api) + (placeholder) ? this.api.asc_addImage() : this.api.ChangeImageFromFile(); + this.fireEvent('editcomplete', this); + }, + + onInsertImageUrl: function(placeholder, obj, x, y) { + var me = this; + (new Common.Views.ImageFromUrlDialog({ + handler: function(result, value) { + if (result == 'ok') { + if (me.api) { + var checkUrl = value.replace(/ /g, ''); + if (!_.isEmpty(checkUrl)) { + if (placeholder) + me.api.AddImageUrl(checkUrl); + else { + var props = new Asc.asc_CImgProperty(); + props.put_ImageUrl(checkUrl); + me.api.ImgApply(props); + } + } + } + } + me.fireEvent('editcomplete', me); + } + })).show(); + }, + insertRowAboveText : 'Row Above', insertRowBelowText : 'Row Below', insertColumnLeftText : 'Column Left', From a04fa80c124fd15983abd70cc3c8770fb391d71d Mon Sep 17 00:00:00 2001 From: Julia Svinareva Date: Mon, 18 Nov 2019 17:19:32 +0300 Subject: [PATCH 270/419] [SSE] Spell checking settings --- .../main/app/controller/Spellcheck.js | 4 + .../main/app/view/FileMenuPanels.js | 113 +++++++++++++++++- 2 files changed, 115 insertions(+), 2 deletions(-) diff --git a/apps/spreadsheeteditor/main/app/controller/Spellcheck.js b/apps/spreadsheeteditor/main/app/controller/Spellcheck.js index 6a7a2f8ef..0a58ef1b3 100644 --- a/apps/spreadsheeteditor/main/app/controller/Spellcheck.js +++ b/apps/spreadsheeteditor/main/app/controller/Spellcheck.js @@ -150,6 +150,7 @@ define([ if (a.shortName > b.shortName) return 1; return 0; }); + this.langs = langs; combo.setData(langs); var item = combo.store.findWhere({value: value}); if (!item && allLangs[value]) { @@ -164,8 +165,11 @@ define([ combo.setValue(Common.util.LanguageInfo.getLocalLanguageName(value)[1]); combo.setDisabled(true); } + this.langValue = value; this.api.asc_setDefaultLanguage(value); this._initSettings = false; + + return [this.langs, this.langValue]; }, onSelectLanguage: function (combo, record) { diff --git a/apps/spreadsheeteditor/main/app/view/FileMenuPanels.js b/apps/spreadsheeteditor/main/app/view/FileMenuPanels.js index ea7561535..3810c812f 100644 --- a/apps/spreadsheeteditor/main/app/view/FileMenuPanels.js +++ b/apps/spreadsheeteditor/main/app/view/FileMenuPanels.js @@ -171,6 +171,7 @@ define([ '
', '
', '
', + '
', '
', '
' ].join('')), @@ -192,11 +193,15 @@ define([ this.printSettings.menu = this.menu; this.printSettings.render($markup.findById('#panel-settings-print')); + this.spellcheckSettings = new SSE.Views.FileMenuPanels.MainSpellCheckSettings({menu: this.menu}); + this.spellcheckSettings.render($markup.findById('#panel-settings-spellcheck')); + this.viewSettingsPicker = new Common.UI.DataView({ el: $markup.findById('#id-settings-menu'), store: new Common.UI.DataViewStore([ {name: this.txtGeneral, panel: this.generalSettings, iconCls:'mnu-settings-general', selected: true}, - {name: this.txtPageSettings, panel: this.printSettings, iconCls:'mnu-print'} + {name: this.txtPageSettings, panel: this.printSettings, iconCls:'mnu-print'}, + {name: this.txtSpellСhecking, panel: this.spellcheckSettings, iconCls:'btn-ic-docspell'} ]), itemTemplate: _.template([ '
', @@ -234,7 +239,8 @@ define([ }, txtGeneral: 'General', - txtPageSettings: 'Page Settings' + txtPageSettings: 'Page Settings', + txtSpellСhecking: 'Spell checking' }, SSE.Views.FileMenuPanels.Settings || {})); SSE.Views.MainSettingsPrint = Common.UI.BaseView.extend(_.extend({ @@ -948,6 +954,109 @@ define([ strR1C1: 'Turn on R1C1 style' }, SSE.Views.FileMenuPanels.MainSettingsGeneral || {})); + SSE.Views.FileMenuPanels.MainSpellCheckSettings = Common.UI.BaseView.extend(_.extend({ + el: '#panel-settings-spellcheck', + menu: undefined, + + template: _.template([ + '', + '', + '', + '', + '
', + '
', + '
', + '
', + '
', + '', + '
', + '
' + ].join('')), + + initialize: function(options) { + Common.UI.BaseView.prototype.initialize.call(this,arguments); + + this.menu = options.menu; + }, + + render: function(node) { + var me = this; + var $markup = $(this.template({scope: this})); + + this.chIgnoreUppercase = new Common.UI.CheckBox({ + el: $markup.findById('#fms-chb-ignore-uppercase-words'), + labelText: this.strIgnoreWordsInUPPERCASE + }).on('change', function(field, newValue, oldValue, eOpts){ + }); + + this.chIgnoreNumbers = new Common.UI.CheckBox({ + el: $markup.findById('#fms-chb-ignore-numbers-words'), + labelText: this.strIgnoreWordsWithNumbers + }).on('change', function(field, newValue, oldValue, eOpts){ + }); + + this.cmbDictionaryLanguage = new Common.UI.ComboBox({ + el: $markup.findById('#fms-cmb-dictionary-language'), + cls: 'input-group-nr', + editable: false, + menuStyle: 'min-width: 100%; max-height: 209px;' + }); + + this.btnApply = new Common.UI.Button({ + el: $markup.findById('#fms-btn-apply') + }); + + this.btnApply.on('click', _.bind(this.applySettings, this)); + + this.$el = $(node).html($markup); + + if (_.isUndefined(this.scroller)) { + this.scroller = new Common.UI.Scroller({ + el: this.$el, + suppressScrollX: true + }); + } + + return this; + }, + + show: function() { + Common.UI.BaseView.prototype.show.call(this,arguments); + + this.updateSettings(); + }, + + setMode: function(mode) { + this.mode = mode; + }, + + setApi: function(api) { + this.api = api; + }, + + updateSettings: function() { + var array = SSE.getController('Spellcheck').loadLanguages(), + lang = array[0], + value = array[1]; + if (lang) { + this.cmbDictionaryLanguage.setData(lang); + this.cmbDictionaryLanguage.setValue(value); + } else { + this.cmbDictionaryLanguage.setValue(Common.util.LanguageInfo.getLocalLanguageName(value)[1]); + this.cmbDictionaryLanguage.setDisabled(true); + } + }, + + applySettings: function() { + + }, + + strIgnoreWordsInUPPERCASE: 'Ignore words in UPPERCASE', + strIgnoreWordsWithNumbers: 'Ignore words with numbers', + strDictionaryLanguage: 'Dictionary language' + + }, SSE.Views.FileMenuPanels.MainSpellCheckSettings || {})); + SSE.Views.FileMenuPanels.RecentFiles = Common.UI.BaseView.extend({ el: '#panel-recentfiles', menu: undefined, From 29c564dd82ec133647ba36584f2871f28f8fa133 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Tue, 19 Nov 2019 10:00:44 +0300 Subject: [PATCH 271/419] [PE] Click on chart placeholder --- .../main/app/view/DocumentHolder.js | 112 ++++++++++++++---- 1 file changed, 89 insertions(+), 23 deletions(-) diff --git a/apps/presentationeditor/main/app/view/DocumentHolder.js b/apps/presentationeditor/main/app/view/DocumentHolder.js index 077826844..8c56779bf 100644 --- a/apps/presentationeditor/main/app/view/DocumentHolder.js +++ b/apps/presentationeditor/main/app/view/DocumentHolder.js @@ -325,7 +325,10 @@ define([ }); meEl.on('click', function(e){ if (e.target.localName == 'canvas') { - meEl.focus(); + if (me._preventClick) + me._preventClick = false; + else + meEl.focus(); } }); meEl.on('mousedown', function(e){ @@ -675,18 +678,6 @@ define([ me.mode.isEdit = false; }; - var onDoubleClickOnChart = function(chart) { - if (me.mode.isEdit && !me._isDisabled) { - var diagramEditor = PE.getController('Common.Controllers.ExternalDiagramEditor').getView('Common.Views.ExternalDiagramEditor'); - - if (diagramEditor && chart) { - diagramEditor.setEditMode(true); - diagramEditor.show(); - diagramEditor.setChartData(new Asc.asc_CChartBinary(chart)); - } - } - }; - var onTextLanguage = function(langid) { me._currLang.id = langid; }; @@ -1581,14 +1572,18 @@ define([ if (me.mode.isEdit===true) { me.api.asc_registerCallback('asc_onDialogAddHyperlink', _.bind(onDialogAddHyperlink, me)); - me.api.asc_registerCallback('asc_doubleClickOnChart', onDoubleClickOnChart); + me.api.asc_registerCallback('asc_doubleClickOnChart', _.bind(me.editChartClick, me)); me.api.asc_registerCallback('asc_onSpellCheckVariantsFound', _.bind(onSpellCheckVariantsFound, me)); me.api.asc_registerCallback('asc_onShowSpecialPasteOptions', _.bind(onShowSpecialPasteOptions, me)); me.api.asc_registerCallback('asc_onHideSpecialPasteOptions', _.bind(onHideSpecialPasteOptions, me)); me.api.asc_registerCallback('asc_ChangeCropState', _.bind(onChangeCropState, me)); - me.api.asc_registerCallback('asc_onHidePlaceholderActions', _.bind(onChangeCropState, me)); + me.api.asc_registerCallback('asc_onHidePlaceholderActions', _.bind(me.onHidePlaceholderActions, me)); me.api.asc_registerPlaceholderCallback(AscCommon.PlaceholderButtonType.Image, _.bind(me.onInsertImage, me, true)); me.api.asc_registerPlaceholderCallback(AscCommon.PlaceholderButtonType.ImageUrl, _.bind(me.onInsertImageUrl, me, true)); + me.api.asc_registerPlaceholderCallback(AscCommon.PlaceholderButtonType.Chart, _.bind(me.onClickPlaceholderChart, me)); + me.api.asc_registerPlaceholderCallback(AscCommon.PlaceholderButtonType.Table, _.bind(me.onClickPlaceholder, me, AscCommon.PlaceholderButtonType.Table)); + me.api.asc_registerPlaceholderCallback(AscCommon.PlaceholderButtonType.Video, _.bind(me.onClickPlaceholder, me, AscCommon.PlaceholderButtonType.Video)); + me.api.asc_registerPlaceholderCallback(AscCommon.PlaceholderButtonType.Audio, _.bind(me.onClickPlaceholder, me, AscCommon.PlaceholderButtonType.Audio)); } me.api.asc_registerCallback('asc_onCoAuthoringDisconnect', _.bind(onCoAuthoringDisconnect, me)); Common.NotificationCenter.on('api:disconnect', _.bind(onCoAuthoringDisconnect, me)); @@ -1703,14 +1698,15 @@ define([ } }, /** coauthoring end **/ - editChartClick: function(){ - var diagramEditor = PE.getController('Common.Controllers.ExternalDiagramEditor').getView('Common.Views.ExternalDiagramEditor'); - if (diagramEditor) { - diagramEditor.setEditMode(true); - diagramEditor.show(); + editChartClick: function(chart){ + if (this.mode.isEdit && !this._isDisabled) { + var diagramEditor = PE.getController('Common.Controllers.ExternalDiagramEditor').getView('Common.Views.ExternalDiagramEditor'); - var chart = this.api.asc_getChartObject(); - if (chart) { + if (diagramEditor) { + diagramEditor.setEditMode(chart===undefined || typeof chart == 'object'); //edit from doubleclick or context menu + diagramEditor.show(); + if (typeof chart !== 'object') + chart = this.api.asc_getChartObject(chart); diagramEditor.setChartData(new Asc.asc_CChartBinary(chart)); } } @@ -2664,7 +2660,7 @@ define([ var menuChartEdit = new Common.UI.MenuItem({ caption : me.editChartText - }).on('click', _.bind(me.editChartClick, me)); + }).on('click', _.bind(me.editChartClick, me, undefined)); var menuParagraphVAlign = new Common.UI.MenuItem({ caption : me.vertAlignText, @@ -3446,6 +3442,76 @@ define([ })).show(); }, + onClickPlaceholderChart: function(obj, x, y) { + if (!this.api) return; + var menu = this.placeholderMenuChart, + menuContainer = menu ? this.cmpEl.find(Common.Utils.String.format('#menu-container-{0}', menu.id)) : null, + me = this; + this._fromShowPlaceholder = true; + Common.UI.Menu.Manager.hideAll(); + + if (!menu) { + this.placeholderMenuChart = menu = new Common.UI.Menu({ + style: 'width: 435px;', + items: [ + {template: _.template('')} + ] + }); + // Prepare menu container + menuContainer = $(Common.Utils.String.format('', menu.id)); + this.cmpEl.append(menuContainer); + menu.render(menuContainer); + menu.cmpEl.attr({tabindex: "-1"}); + menu.on('hide:after', function(){ + if (!me._fromShowPlaceholder) + me.api.asc_uncheckPlaceholders(); + }); + + var picker = new Common.UI.DataView({ + el: $('#id-placeholder-menu-chart'), + parentMenu: menu, + showLast: false, + // restoreHeight: 421, + groups: new Common.UI.DataViewGroupStore(Common.define.chartData.getChartGroupData()), + store: new Common.UI.DataViewStore(Common.define.chartData.getChartData()), + itemTemplate: _.template('
') + }); + picker.on('item:click', function (picker, item, record, e) { + me.editChartClick(record.get('type')); + }); + } + menuContainer.css({left: x, top : y}); + menuContainer.attr('data-value', 'prevent-canvas-click'); + this._preventClick = true; + menu.show(); + + menu.alignPosition(); + _.delay(function() { + menu.cmpEl.focus(); + }, 10); + this._fromShowPlaceholder = false; + }, + + onHidePlaceholderActions: function() { + this.placeholderMenuChart && this.placeholderMenuChart.hide(); + }, + + onClickPlaceholder: function(type, obj, x, y) { + if (!this.api) return; + + switch (type) { + case AscCommon.PlaceholderButtonType.Table: + break; + case AscCommon.PlaceholderButtonType.Video: + // this.api.addVideo(); + break; + case AscCommon.PlaceholderButtonType.Audio: + // this.api.addAudio(); + break; + } + + }, + insertRowAboveText : 'Row Above', insertRowBelowText : 'Row Below', insertColumnLeftText : 'Column Left', From c6ec8dac5c76a6b643ee63ca164c045783b0056a Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Tue, 19 Nov 2019 10:02:41 +0300 Subject: [PATCH 272/419] [SSE] Bug 40747 --- .../main/app/view/HeaderFooterDialog.js | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/apps/spreadsheeteditor/main/app/view/HeaderFooterDialog.js b/apps/spreadsheeteditor/main/app/view/HeaderFooterDialog.js index c67f149ac..aac0c9f4d 100644 --- a/apps/spreadsheeteditor/main/app/view/HeaderFooterDialog.js +++ b/apps/spreadsheeteditor/main/app/view/HeaderFooterDialog.js @@ -167,6 +167,22 @@ define([ render: function() { Common.UI.Window.prototype.render.call(this); + this.menuAddAlign = function(menuRoot, left, top) { + var self = this; + if (!$window.hasClass('notransform')) { + $window.addClass('notransform'); + menuRoot.addClass('hidden'); + setTimeout(function() { + menuRoot.removeClass('hidden'); + menuRoot.css({left: left, top: top}); + self.options.additionalAlign = null; + }, 300); + } else { + menuRoot.css({left: left, top: top}); + self.options.additionalAlign = null; + } + }; + var me = this, $window = this.getChild(); @@ -305,6 +321,7 @@ define([ menu: new Common.UI.Menu({ style: 'min-width: 110px;', maxHeight: 200, + additionalAlign: this.menuAddAlign, items: data }) }); @@ -319,6 +336,7 @@ define([ menu: new Common.UI.Menu({ style: 'min-width: 110px;', maxHeight: 200, + additionalAlign: this.menuAddAlign, items: data }) }); @@ -560,6 +578,7 @@ define([ hint : this.textColor, split : true, menu : new Common.UI.Menu({ + additionalAlign: this.menuAddAlign, items: [ { template: _.template('
') }, { template: _.template('' + this.textNewColor + '') } @@ -578,6 +597,7 @@ define([ hint : this.textColor, split : true, menu : new Common.UI.Menu({ + additionalAlign: this.menuAddAlign, items: [ { template: _.template('
') }, { template: _.template('' + this.textNewColor + '') } @@ -666,12 +686,14 @@ define([ this.btnPresetsH.setMenu(new Common.UI.Menu({ style: 'min-width: 110px;', maxHeight: 200, + additionalAlign: this.menuAddAlign, items: presets })); this.btnPresetsH.menu.on('item:click', _.bind(this.onPresetSelect, this, false)); this.btnPresetsF.setMenu(new Common.UI.Menu({ style: 'min-width: 110px;', maxHeight: 200, + additionalAlign: this.menuAddAlign, items: presets })); this.btnPresetsF.menu.on('item:click', _.bind(this.onPresetSelect, this, true)); From 6f0636a687f03721f2bd44ae2ba851a4eb112be5 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Tue, 19 Nov 2019 11:41:52 +0300 Subject: [PATCH 273/419] Update translation --- apps/documenteditor/main/locale/bg.json | 26 +++----- apps/documenteditor/main/locale/cs.json | 25 +++----- apps/documenteditor/main/locale/de.json | 9 --- apps/documenteditor/main/locale/en.json | 43 ++++--------- apps/documenteditor/main/locale/es.json | 25 +++----- apps/documenteditor/main/locale/fr.json | 25 +++----- apps/documenteditor/main/locale/hu.json | 25 +++----- apps/documenteditor/main/locale/it.json | 32 +++++----- apps/documenteditor/main/locale/ja.json | 21 +++---- apps/documenteditor/main/locale/ko.json | 17 ----- apps/documenteditor/main/locale/lv.json | 17 ----- apps/documenteditor/main/locale/nl.json | 25 +++----- apps/documenteditor/main/locale/pl.json | 25 +++----- apps/documenteditor/main/locale/pt.json | 25 +++----- apps/documenteditor/main/locale/ru.json | 34 +++++----- apps/documenteditor/main/locale/sk.json | 25 +++----- apps/documenteditor/main/locale/sl.json | 21 +++---- apps/documenteditor/main/locale/tr.json | 25 +++----- apps/documenteditor/main/locale/uk.json | 25 +++----- apps/documenteditor/main/locale/vi.json | 25 +++----- apps/documenteditor/main/locale/zh.json | 25 +++----- apps/presentationeditor/main/locale/bg.json | 26 +++----- apps/presentationeditor/main/locale/cs.json | 25 +++----- apps/presentationeditor/main/locale/de.json | 17 ----- apps/presentationeditor/main/locale/en.json | 50 ++++++--------- apps/presentationeditor/main/locale/es.json | 25 +++----- apps/presentationeditor/main/locale/fr.json | 25 +++----- apps/presentationeditor/main/locale/hu.json | 25 +++----- apps/presentationeditor/main/locale/it.json | 28 ++++----- apps/presentationeditor/main/locale/ja.json | 21 +++---- apps/presentationeditor/main/locale/ko.json | 17 ----- apps/presentationeditor/main/locale/lv.json | 17 ----- apps/presentationeditor/main/locale/nl.json | 25 +++----- apps/presentationeditor/main/locale/pl.json | 25 +++----- apps/presentationeditor/main/locale/pt.json | 25 +++----- apps/presentationeditor/main/locale/ru.json | 34 +++++----- apps/presentationeditor/main/locale/sk.json | 25 +++----- apps/presentationeditor/main/locale/sl.json | 21 +++---- apps/presentationeditor/main/locale/tr.json | 25 +++----- apps/presentationeditor/main/locale/uk.json | 25 +++----- apps/presentationeditor/main/locale/vi.json | 25 +++----- apps/presentationeditor/main/locale/zh.json | 25 +++----- apps/spreadsheeteditor/main/locale/bg.json | 48 ++++---------- apps/spreadsheeteditor/main/locale/cs.json | 47 ++++---------- apps/spreadsheeteditor/main/locale/de.json | 39 ++---------- apps/spreadsheeteditor/main/locale/en.json | 69 +++++---------------- apps/spreadsheeteditor/main/locale/es.json | 47 ++++---------- apps/spreadsheeteditor/main/locale/fr.json | 47 ++++---------- apps/spreadsheeteditor/main/locale/hu.json | 47 ++++---------- apps/spreadsheeteditor/main/locale/it.json | 47 ++++---------- apps/spreadsheeteditor/main/locale/ja.json | 21 +++---- apps/spreadsheeteditor/main/locale/ko.json | 35 ----------- apps/spreadsheeteditor/main/locale/lv.json | 35 ----------- apps/spreadsheeteditor/main/locale/nl.json | 47 ++++---------- apps/spreadsheeteditor/main/locale/pl.json | 47 ++++---------- apps/spreadsheeteditor/main/locale/pt.json | 47 ++++---------- apps/spreadsheeteditor/main/locale/ru.json | 58 ++++++----------- apps/spreadsheeteditor/main/locale/sk.json | 47 ++++---------- apps/spreadsheeteditor/main/locale/sl.json | 21 +++---- apps/spreadsheeteditor/main/locale/tr.json | 43 +++---------- apps/spreadsheeteditor/main/locale/uk.json | 47 ++++---------- apps/spreadsheeteditor/main/locale/vi.json | 47 ++++---------- apps/spreadsheeteditor/main/locale/zh.json | 47 ++++---------- 63 files changed, 550 insertions(+), 1434 deletions(-) diff --git a/apps/documenteditor/main/locale/bg.json b/apps/documenteditor/main/locale/bg.json index 024657783..624e9888f 100644 --- a/apps/documenteditor/main/locale/bg.json +++ b/apps/documenteditor/main/locale/bg.json @@ -69,6 +69,15 @@ "Common.Controllers.ReviewChanges.textTabs": "Промяна на разделите", "Common.Controllers.ReviewChanges.textUnderline": "Подчертавам", "Common.Controllers.ReviewChanges.textWidow": "Управление на вдовицата", + "Common.define.chartData.textArea": "Площ", + "Common.define.chartData.textBar": "Бар", + "Common.define.chartData.textColumn": "Колона", + "Common.define.chartData.textLine": "Линия", + "Common.define.chartData.textPie": "Кръгова", + "Common.define.chartData.textPoint": "XY (точкова)", + "Common.define.chartData.textStock": "Борсова", + "Common.define.chartData.textSurface": "Повърхност", + "Common.define.chartData.textCharts": "Диаграми", "Common.UI.ComboBorderSize.txtNoBorders": "Няма граници", "Common.UI.ComboBorderSizeEditable.txtNoBorders": "Няма граници", "Common.UI.ComboDataView.emptyComboText": "Няма стилове", @@ -1000,20 +1009,12 @@ "DE.Views.BookmarksDialog.textTitle": "Отбелязани", "DE.Views.BookmarksDialog.txtInvalidName": "Името на отметката може да съдържа само букви, цифри и долни черти и трябва да започва с буквата", "DE.Views.ChartSettings.textAdvanced": "Показване на разширените настройки", - "DE.Views.ChartSettings.textArea": "Площ", - "DE.Views.ChartSettings.textBar": "Бар", "DE.Views.ChartSettings.textChartType": "Промяна на типа на диаграмата", - "DE.Views.ChartSettings.textColumn": "Колона", "DE.Views.ChartSettings.textEditData": "Редактиране на данни", "DE.Views.ChartSettings.textHeight": "Височина", - "DE.Views.ChartSettings.textLine": "Линия", "DE.Views.ChartSettings.textOriginalSize": "Размер по подразбиране", - "DE.Views.ChartSettings.textPie": "Кръгова", - "DE.Views.ChartSettings.textPoint": "XY (точкова)", "DE.Views.ChartSettings.textSize": "Размер", - "DE.Views.ChartSettings.textStock": "Борсова", "DE.Views.ChartSettings.textStyle": "Стил", - "DE.Views.ChartSettings.textSurface": "Повърхност", "DE.Views.ChartSettings.textUndock": "Откачете от панела", "DE.Views.ChartSettings.textWidth": "Ширина", "DE.Views.ChartSettings.textWrap": "Стил на опаковане", @@ -1994,13 +1995,9 @@ "DE.Views.Toolbar.mniImageFromStorage": "Изображение от хранилището", "DE.Views.Toolbar.mniImageFromUrl": "Изображение от URL адрес", "DE.Views.Toolbar.strMenuNoFill": "Без попълване", - "DE.Views.Toolbar.textArea": "Площ", "DE.Views.Toolbar.textAutoColor": "Автоматичен", - "DE.Views.Toolbar.textBar": "Бар", "DE.Views.Toolbar.textBold": "Получер", "DE.Views.Toolbar.textBottom": "Долу:", - "DE.Views.Toolbar.textCharts": "Диаграми", - "DE.Views.Toolbar.textColumn": "Колона", "DE.Views.Toolbar.textColumnsCustom": "Персонализирани графи", "DE.Views.Toolbar.textColumnsLeft": "Наляво", "DE.Views.Toolbar.textColumnsOne": "Един", @@ -2019,7 +2016,6 @@ "DE.Views.Toolbar.textItalic": "Курсив", "DE.Views.Toolbar.textLandscape": "Пейзаж", "DE.Views.Toolbar.textLeft": "Наляво: ", - "DE.Views.Toolbar.textLine": "Линия", "DE.Views.Toolbar.textMarginsLast": "Последно персонализирано", "DE.Views.Toolbar.textMarginsModerate": "Умерен", "DE.Views.Toolbar.textMarginsNarrow": "Тесен", @@ -2033,14 +2029,11 @@ "DE.Views.Toolbar.textOddPage": "Нечетна страница", "DE.Views.Toolbar.textPageMarginsCustom": "Персонализирани полета", "DE.Views.Toolbar.textPageSizeCustom": "Персонализиран размер на страницата", - "DE.Views.Toolbar.textPie": "Кръгова", "DE.Views.Toolbar.textPlainControl": "Вмъкване на контрол на съдържанието в обикновен текст", - "DE.Views.Toolbar.textPoint": "XY (точкова)", "DE.Views.Toolbar.textPortrait": "Портрет", "DE.Views.Toolbar.textRemoveControl": "Премахване на контрола на съдържанието", "DE.Views.Toolbar.textRichControl": "Вмъкване на контрол върху съдържанието на богатия текст", "DE.Views.Toolbar.textRight": "Дясно: ", - "DE.Views.Toolbar.textStock": "Борсова", "DE.Views.Toolbar.textStrikeout": "Зачеркнато", "DE.Views.Toolbar.textStyleMenuDelete": "Изтриване на стил", "DE.Views.Toolbar.textStyleMenuDeleteAll": "Изтрийте всички персонализирани стилове", @@ -2050,7 +2043,6 @@ "DE.Views.Toolbar.textStyleMenuUpdate": "Актуализация от избора", "DE.Views.Toolbar.textSubscript": "Долен", "DE.Views.Toolbar.textSuperscript": "Горен индекс", - "DE.Views.Toolbar.textSurface": "Повърхност", "DE.Views.Toolbar.textTabCollaboration": "Сътрудничество", "DE.Views.Toolbar.textTabFile": "Файл", "DE.Views.Toolbar.textTabHome": "У дома", diff --git a/apps/documenteditor/main/locale/cs.json b/apps/documenteditor/main/locale/cs.json index 83acf0f4c..008709f10 100644 --- a/apps/documenteditor/main/locale/cs.json +++ b/apps/documenteditor/main/locale/cs.json @@ -63,6 +63,14 @@ "Common.Controllers.ReviewChanges.textTabs": "Change tabs", "Common.Controllers.ReviewChanges.textUnderline": "Podtržené", "Common.Controllers.ReviewChanges.textWidow": "Widow control", + "Common.define.chartData.textArea": "Plošný graf", + "Common.define.chartData.textBar": "Pruhový graf", + "Common.define.chartData.textColumn": "Sloupcový graf", + "Common.define.chartData.textLine": "Liniový graf", + "Common.define.chartData.textPie": "Kruhový diagram", + "Common.define.chartData.textPoint": "Bodový graf", + "Common.define.chartData.textStock": "Burzovní graf", + "Common.define.chartData.textSurface": "Povrch", "Common.UI.ComboBorderSize.txtNoBorders": "Bez ohraničení", "Common.UI.ComboBorderSizeEditable.txtNoBorders": "Bez ohraničení", "Common.UI.ComboDataView.emptyComboText": "Žádné styly", @@ -689,20 +697,12 @@ "DE.Controllers.Toolbar.txtSymbol_xsi": "Ksí", "DE.Controllers.Toolbar.txtSymbol_zeta": "Zeta", "DE.Views.ChartSettings.textAdvanced": "Zobrazit pokročilé nastavení", - "DE.Views.ChartSettings.textArea": "Plošný graf", - "DE.Views.ChartSettings.textBar": "Pruhový graf", "DE.Views.ChartSettings.textChartType": "Změnit typ grafu", - "DE.Views.ChartSettings.textColumn": "Sloupcový graf", "DE.Views.ChartSettings.textEditData": "Upravit data", "DE.Views.ChartSettings.textHeight": "Výška", - "DE.Views.ChartSettings.textLine": "Liniový graf", "DE.Views.ChartSettings.textOriginalSize": "Výchozí velikost", - "DE.Views.ChartSettings.textPie": "Kruhový diagram", - "DE.Views.ChartSettings.textPoint": "Bodový graf", "DE.Views.ChartSettings.textSize": "Velikost", - "DE.Views.ChartSettings.textStock": "Burzovní graf", "DE.Views.ChartSettings.textStyle": "Styl", - "DE.Views.ChartSettings.textSurface": "Povrch", "DE.Views.ChartSettings.textUndock": "Odepnout od panelu", "DE.Views.ChartSettings.textWidth": "Šířka", "DE.Views.ChartSettings.textWrap": "Obtékání textu", @@ -1495,13 +1495,9 @@ "DE.Views.Toolbar.mniImageFromFile": "Obrázek ze souboru", "DE.Views.Toolbar.mniImageFromUrl": "Obrázek z adresy URL", "DE.Views.Toolbar.strMenuNoFill": "Bez výplně", - "DE.Views.Toolbar.textArea": "Plošný graf", "DE.Views.Toolbar.textAutoColor": "Automaticky", - "DE.Views.Toolbar.textBar": "Pruhový graf", "DE.Views.Toolbar.textBold": "Tučné", "DE.Views.Toolbar.textBottom": "Bottom: ", - "DE.Views.Toolbar.textCharts": "Grafy", - "DE.Views.Toolbar.textColumn": "Sloupcový graf", "DE.Views.Toolbar.textColumnsCustom": "Vlastní sloupce", "DE.Views.Toolbar.textColumnsLeft": "Left", "DE.Views.Toolbar.textColumnsOne": "One", @@ -1520,7 +1516,6 @@ "DE.Views.Toolbar.textItalic": "Kurzíva", "DE.Views.Toolbar.textLandscape": "Na šířku", "DE.Views.Toolbar.textLeft": "Left: ", - "DE.Views.Toolbar.textLine": "Liniový graf", "DE.Views.Toolbar.textMarginsLast": "Last Custom", "DE.Views.Toolbar.textMarginsModerate": "Moderate", "DE.Views.Toolbar.textMarginsNarrow": "Narrow", @@ -1533,11 +1528,8 @@ "DE.Views.Toolbar.textOddPage": "Lichá stránka", "DE.Views.Toolbar.textPageMarginsCustom": "Custom margins", "DE.Views.Toolbar.textPageSizeCustom": "Custom Page Size", - "DE.Views.Toolbar.textPie": "Kruhový diagram", - "DE.Views.Toolbar.textPoint": "Bodový graf", "DE.Views.Toolbar.textPortrait": "Na výšku", "DE.Views.Toolbar.textRight": "Right: ", - "DE.Views.Toolbar.textStock": "Burzovní graf", "DE.Views.Toolbar.textStrikeout": "Přeškrtnout", "DE.Views.Toolbar.textStyleMenuDelete": "Odstranit styl", "DE.Views.Toolbar.textStyleMenuDeleteAll": "Odstranit všechny vlastní styly", @@ -1547,7 +1539,6 @@ "DE.Views.Toolbar.textStyleMenuUpdate": "Aktualizovat z výběru", "DE.Views.Toolbar.textSubscript": "Dolní index", "DE.Views.Toolbar.textSuperscript": "Horní index", - "DE.Views.Toolbar.textSurface": "Povrch", "DE.Views.Toolbar.textTabFile": "Soubor", "DE.Views.Toolbar.textTabHome": "Domů", "DE.Views.Toolbar.textTabInsert": "Vložit", diff --git a/apps/documenteditor/main/locale/de.json b/apps/documenteditor/main/locale/de.json index a09a79c9e..7736050f9 100644 --- a/apps/documenteditor/main/locale/de.json +++ b/apps/documenteditor/main/locale/de.json @@ -1995,13 +1995,9 @@ "DE.Views.Toolbar.mniImageFromStorage": "Bild aus dem Speicher", "DE.Views.Toolbar.mniImageFromUrl": "Bild aus URL", "DE.Views.Toolbar.strMenuNoFill": "Keine Füllung", - "DE.Views.Toolbar.textArea": "Fläche", "DE.Views.Toolbar.textAutoColor": "Automatisch", - "DE.Views.Toolbar.textBar": "Balken", "DE.Views.Toolbar.textBold": "Fett", "DE.Views.Toolbar.textBottom": "Unten: ", - "DE.Views.Toolbar.textCharts": "Diagramme", - "DE.Views.Toolbar.textColumn": "Spalte", "DE.Views.Toolbar.textColumnsCustom": "Benutzerdefinierte Spalten", "DE.Views.Toolbar.textColumnsLeft": "Links", "DE.Views.Toolbar.textColumnsOne": "Ein", @@ -2020,7 +2016,6 @@ "DE.Views.Toolbar.textItalic": "Kursiv", "DE.Views.Toolbar.textLandscape": "Querformat", "DE.Views.Toolbar.textLeft": "Links: ", - "DE.Views.Toolbar.textLine": "Linie", "DE.Views.Toolbar.textMarginsLast": " Benutzerdefiniert als letzte", "DE.Views.Toolbar.textMarginsModerate": "Mittelmäßig", "DE.Views.Toolbar.textMarginsNarrow": "Schmal", @@ -2034,14 +2029,11 @@ "DE.Views.Toolbar.textOddPage": "Ungerade Seite", "DE.Views.Toolbar.textPageMarginsCustom": "Benutzerdefinierte Seitenränder ", "DE.Views.Toolbar.textPageSizeCustom": "Benutzerdefiniertes Seitenformat", - "DE.Views.Toolbar.textPie": "Kreis", "DE.Views.Toolbar.textPlainControl": "Nur-Text-Inhaltssteuerelement einfügen", - "DE.Views.Toolbar.textPoint": "Punkt (XY)", "DE.Views.Toolbar.textPortrait": "Hochformat", "DE.Views.Toolbar.textRemoveControl": "Inhaltssteuerelement entfernen", "DE.Views.Toolbar.textRichControl": "Rich-Text-Inhaltssteuerelement einfügen", "DE.Views.Toolbar.textRight": "Rechts: ", - "DE.Views.Toolbar.textStock": "Kurs", "DE.Views.Toolbar.textStrikeout": "Durchgestrichen", "DE.Views.Toolbar.textStyleMenuDelete": "Stil löschen", "DE.Views.Toolbar.textStyleMenuDeleteAll": "Alle benutzerdefinierte Stile löschen ", @@ -2051,7 +2043,6 @@ "DE.Views.Toolbar.textStyleMenuUpdate": "Aus der Auswahl neu aktualisieren", "DE.Views.Toolbar.textSubscript": "Tiefgestellt", "DE.Views.Toolbar.textSuperscript": "Hochgestellt", - "DE.Views.Toolbar.textSurface": "Oberfläche", "DE.Views.Toolbar.textTabCollaboration": "Zusammenarbeit", "DE.Views.Toolbar.textTabFile": "Datei", "DE.Views.Toolbar.textTabHome": "Startseite", diff --git a/apps/documenteditor/main/locale/en.json b/apps/documenteditor/main/locale/en.json index 908214cac..48b17da4b 100644 --- a/apps/documenteditor/main/locale/en.json +++ b/apps/documenteditor/main/locale/en.json @@ -230,6 +230,8 @@ "Common.Views.ReviewChanges.strStrictDesc": "Use the 'Save' button to sync the changes you and others make.", "Common.Views.ReviewChanges.tipAcceptCurrent": "Accept current change", "Common.Views.ReviewChanges.tipCoAuthMode": "Set co-editing mode", + "Common.Views.ReviewChanges.tipCommentRem": "Remove comments", + "Common.Views.ReviewChanges.tipCommentRemCurrent": "Remove current comments", "Common.Views.ReviewChanges.tipHistory": "Show version history", "Common.Views.ReviewChanges.tipRejectCurrent": "Reject current change", "Common.Views.ReviewChanges.tipReview": "Track changes", @@ -244,6 +246,11 @@ "Common.Views.ReviewChanges.txtChat": "Chat", "Common.Views.ReviewChanges.txtClose": "Close", "Common.Views.ReviewChanges.txtCoAuthMode": "Co-editing Mode", + "Common.Views.ReviewChanges.txtCommentRemAll": "Remove All Comments", + "Common.Views.ReviewChanges.txtCommentRemCurrent": "Remove Current Comments", + "Common.Views.ReviewChanges.txtCommentRemMy": "Remove My Comments", + "Common.Views.ReviewChanges.txtCommentRemMyCurrent": "Remove My Current Comments", + "Common.Views.ReviewChanges.txtCommentRemove": "Remove", "Common.Views.ReviewChanges.txtDocLang": "Language", "Common.Views.ReviewChanges.txtFinal": "All changes accepted (Preview)", "Common.Views.ReviewChanges.txtFinalCap": "Final", @@ -262,13 +269,6 @@ "Common.Views.ReviewChanges.txtSpelling": "Spell Checking", "Common.Views.ReviewChanges.txtTurnon": "Track Changes", "Common.Views.ReviewChanges.txtView": "Display Mode", - "Common.Views.ReviewChanges.txtCommentRemove": "Remove", - "Common.Views.ReviewChanges.tipCommentRemCurrent": "Remove current comments", - "Common.Views.ReviewChanges.tipCommentRem": "Remove comments", - "Common.Views.ReviewChanges.txtCommentRemCurrent": "Remove Current Comments", - "Common.Views.ReviewChanges.txtCommentRemMyCurrent": "Remove My Current Comments", - "Common.Views.ReviewChanges.txtCommentRemMy": "Remove My Comments", - "Common.Views.ReviewChanges.txtCommentRemAll": "Remove All Comments", "Common.Views.ReviewChangesDialog.textTitle": "Review Changes", "Common.Views.ReviewChangesDialog.txtAccept": "Accept", "Common.Views.ReviewChangesDialog.txtAcceptAll": "Accept All Changes", @@ -315,11 +315,11 @@ "Common.Views.SignSettingsDialog.textShowDate": "Show sign date in signature line", "Common.Views.SignSettingsDialog.textTitle": "Signature Setup", "Common.Views.SignSettingsDialog.txtEmpty": "This field is required", - "Common.Views.SymbolTableDialog.textTitle": "Symbol", + "Common.Views.SymbolTableDialog.textCode": "Unicode HEX value", "Common.Views.SymbolTableDialog.textFont": "Font", "Common.Views.SymbolTableDialog.textRange": "Range", "Common.Views.SymbolTableDialog.textRecent": "Recently used symbols", - "Common.Views.SymbolTableDialog.textCode": "Unicode HEX value", + "Common.Views.SymbolTableDialog.textTitle": "Symbol", "DE.Controllers.LeftMenu.leavePageText": "All unsaved changes in this document will be lost.
Click \"Cancel\" then \"Save\" to save them. Click \"OK\" to discard all the unsaved changes.", "DE.Controllers.LeftMenu.newDocumentTitle": "Unnamed document", "DE.Controllers.LeftMenu.notcriticalErrorTitle": "Warning", @@ -369,6 +369,7 @@ "DE.Controllers.Main.errorToken": "The document security token is not correctly formed.
Please contact your Document Server administrator.", "DE.Controllers.Main.errorTokenExpire": "The document security token has expired.
Please contact your Document Server administrator.", "DE.Controllers.Main.errorUpdateVersion": "The file version has been changed. The page will be reloaded.", + "DE.Controllers.Main.errorUpdateVersionOnDisconnect": "Internet connection has been restored, and the file version has been changed.
Before you can continue working, you need to download the file or copy its content to make sure nothing is lost, and then reload this page.", "DE.Controllers.Main.errorUserDrop": "The file cannot be accessed right now.", "DE.Controllers.Main.errorUsersExceed": "The number of users allowed by the pricing plan was exceeded", "DE.Controllers.Main.errorViewerDisconnect": "Connection is lost. You can still view the document,
but will not be able to download or print it until the connection is restored and page is reloaded.", @@ -671,7 +672,6 @@ "DE.Controllers.Main.warnNoLicense": "This version of %1 editors has certain limitations for concurrent connections to the document server.
If you need more please consider purchasing a commercial license.", "DE.Controllers.Main.warnNoLicenseUsers": "This version of %1 editors has certain limitations for concurrent users.
If you need more please consider purchasing a commercial license.", "DE.Controllers.Main.warnProcessRightsChange": "You have been denied the right to edit the file.", - "DE.Controllers.Main.errorUpdateVersionOnDisconnect": "Internet connection has been restored, and the file version has been changed.
Before you can continue working, you need to download the file or copy its content to make sure nothing is lost, and then reload this page.", "DE.Controllers.Navigation.txtBeginning": "Beginning of document", "DE.Controllers.Navigation.txtGotoBeginning": "Go to the beginning of the document", "DE.Controllers.Statusbar.textHasChanges": "New changes have been tracked", @@ -686,6 +686,7 @@ "DE.Controllers.Toolbar.textFontSizeErr": "The entered value is incorrect.
Please enter a numeric value between 1 and 100", "DE.Controllers.Toolbar.textFraction": "Fractions", "DE.Controllers.Toolbar.textFunction": "Functions", + "DE.Controllers.Toolbar.textInsert": "Insert", "DE.Controllers.Toolbar.textIntegral": "Integrals", "DE.Controllers.Toolbar.textLargeOperator": "Large Operators", "DE.Controllers.Toolbar.textLimitAndLog": "Limits And Logarithms", @@ -1013,7 +1014,6 @@ "DE.Controllers.Toolbar.txtSymbol_vdots": "Vertical ellipsis", "DE.Controllers.Toolbar.txtSymbol_xsi": "Xi", "DE.Controllers.Toolbar.txtSymbol_zeta": "Zeta", - "DE.Controllers.Toolbar.textInsert": "Insert", "DE.Controllers.Viewport.textFitPage": "Fit to Page", "DE.Controllers.Viewport.textFitWidth": "Fit to Width", "DE.Views.AddNewCaptionLabelDialog.textLabel": "Label:", @@ -1065,20 +1065,12 @@ "DE.Views.CellsRemoveDialog.textRow": "Delete entire row", "DE.Views.CellsRemoveDialog.textTitle": "Delete Cells", "DE.Views.ChartSettings.textAdvanced": "Show advanced settings", - "del_DE.Views.ChartSettings.textArea": "Area", - "del_DE.Views.ChartSettings.textBar": "Bar", "DE.Views.ChartSettings.textChartType": "Change Chart Type", - "del_DE.Views.ChartSettings.textColumn": "Column", "DE.Views.ChartSettings.textEditData": "Edit Data", "DE.Views.ChartSettings.textHeight": "Height", - "del_DE.Views.ChartSettings.textLine": "Line", "DE.Views.ChartSettings.textOriginalSize": "Actual Size", - "del_DE.Views.ChartSettings.textPie": "Pie", - "del_DE.Views.ChartSettings.textPoint": "XY (Scatter)", "DE.Views.ChartSettings.textSize": "Size", - "del_DE.Views.ChartSettings.textStock": "Stock", "DE.Views.ChartSettings.textStyle": "Style", - "del_DE.Views.ChartSettings.textSurface": "Surface", "DE.Views.ChartSettings.textUndock": "Undock from panel", "DE.Views.ChartSettings.textWidth": "Width", "DE.Views.ChartSettings.textWrap": "Wrapping Style", @@ -2084,6 +2076,7 @@ "DE.Views.Toolbar.capBtnInsImage": "Image", "DE.Views.Toolbar.capBtnInsPagebreak": "Breaks", "DE.Views.Toolbar.capBtnInsShape": "Shape", + "DE.Views.Toolbar.capBtnInsSymbol": "Symbol", "DE.Views.Toolbar.capBtnInsTable": "Table", "DE.Views.Toolbar.capBtnInsTextart": "Text Art", "DE.Views.Toolbar.capBtnInsTextbox": "Text Box", @@ -2108,13 +2101,9 @@ "DE.Views.Toolbar.mniImageFromStorage": "Image from Storage", "DE.Views.Toolbar.mniImageFromUrl": "Image from URL", "DE.Views.Toolbar.strMenuNoFill": "No Fill", - "del_DE.Views.Toolbar.textArea": "Area", "DE.Views.Toolbar.textAutoColor": "Automatic", - "del_DE.Views.Toolbar.textBar": "Bar", "DE.Views.Toolbar.textBold": "Bold", "DE.Views.Toolbar.textBottom": "Bottom: ", - "del_DE.Views.Toolbar.textCharts": "Charts", - "del_DE.Views.Toolbar.textColumn": "Column", "DE.Views.Toolbar.textColumnsCustom": "Custom Columns", "DE.Views.Toolbar.textColumnsLeft": "Left", "DE.Views.Toolbar.textColumnsOne": "One", @@ -2134,7 +2123,6 @@ "DE.Views.Toolbar.textItalic": "Italic", "DE.Views.Toolbar.textLandscape": "Landscape", "DE.Views.Toolbar.textLeft": "Left: ", - "del_DE.Views.Toolbar.textLine": "Line", "DE.Views.Toolbar.textMarginsLast": "Last Custom", "DE.Views.Toolbar.textMarginsModerate": "Moderate", "DE.Views.Toolbar.textMarginsNarrow": "Narrow", @@ -2148,15 +2136,12 @@ "DE.Views.Toolbar.textOddPage": "Odd Page", "DE.Views.Toolbar.textPageMarginsCustom": "Custom margins", "DE.Views.Toolbar.textPageSizeCustom": "Custom Page Size", - "del_DE.Views.Toolbar.textPie": "Pie", "DE.Views.Toolbar.textPlainControl": "Insert plain text content control", - "del_DE.Views.Toolbar.textPoint": "XY (Scatter)", "DE.Views.Toolbar.textPortrait": "Portrait", "DE.Views.Toolbar.textRemoveControl": "Remove content control", "DE.Views.Toolbar.textRemWatermark": "Remove Watermark", "DE.Views.Toolbar.textRichControl": "Insert rich text content control", "DE.Views.Toolbar.textRight": "Right: ", - "del_DE.Views.Toolbar.textStock": "Stock", "DE.Views.Toolbar.textStrikeout": "Strikethrough", "DE.Views.Toolbar.textStyleMenuDelete": "Delete style", "DE.Views.Toolbar.textStyleMenuDeleteAll": "Delete all custom styles", @@ -2166,7 +2151,6 @@ "DE.Views.Toolbar.textStyleMenuUpdate": "Update from selection", "DE.Views.Toolbar.textSubscript": "Subscript", "DE.Views.Toolbar.textSuperscript": "Superscript", - "del_DE.Views.Toolbar.textSurface": "Surface", "DE.Views.Toolbar.textTabCollaboration": "Collaboration", "DE.Views.Toolbar.textTabFile": "File", "DE.Views.Toolbar.textTabHome": "Home", @@ -2211,6 +2195,7 @@ "DE.Views.Toolbar.tipInsertImage": "Insert image", "DE.Views.Toolbar.tipInsertNum": "Insert Page Number", "DE.Views.Toolbar.tipInsertShape": "Insert autoshape", + "DE.Views.Toolbar.tipInsertSymbol": "Insert symbol", "DE.Views.Toolbar.tipInsertTable": "Insert table", "DE.Views.Toolbar.tipInsertText": "Insert text box", "DE.Views.Toolbar.tipInsertTextArt": "Insert Text Art", @@ -2262,8 +2247,6 @@ "DE.Views.Toolbar.txtScheme7": "Equity", "DE.Views.Toolbar.txtScheme8": "Flow", "DE.Views.Toolbar.txtScheme9": "Foundry", - "DE.Views.Toolbar.capBtnInsSymbol": "Symbol", - "DE.Views.Toolbar.tipInsertSymbol": "Insert symbol", "DE.Views.WatermarkSettingsDialog.textAuto": "Auto", "DE.Views.WatermarkSettingsDialog.textBold": "Bold", "DE.Views.WatermarkSettingsDialog.textColor": "Text color", diff --git a/apps/documenteditor/main/locale/es.json b/apps/documenteditor/main/locale/es.json index 4a19a5ee5..4ec69ef9b 100644 --- a/apps/documenteditor/main/locale/es.json +++ b/apps/documenteditor/main/locale/es.json @@ -69,6 +69,14 @@ "Common.Controllers.ReviewChanges.textTabs": "Cambiar tabuladores", "Common.Controllers.ReviewChanges.textUnderline": "Subrayado", "Common.Controllers.ReviewChanges.textWidow": "Widow control", + "Common.define.chartData.textArea": "Área", + "Common.define.chartData.textBar": "Barra", + "Common.define.chartData.textColumn": "Gráfico de columnas", + "Common.define.chartData.textLine": "Línea", + "Common.define.chartData.textPie": "Gráfico circular", + "Common.define.chartData.textPoint": "XY (Dispersión)", + "Common.define.chartData.textStock": "De cotizaciones", + "Common.define.chartData.textSurface": "Superficie", "Common.UI.ComboBorderSize.txtNoBorders": "Sin bordes", "Common.UI.ComboBorderSizeEditable.txtNoBorders": "Sin bordes", "Common.UI.ComboDataView.emptyComboText": "Sin estilo", @@ -1001,20 +1009,12 @@ "DE.Views.BookmarksDialog.textTitle": "Marcadores", "DE.Views.BookmarksDialog.txtInvalidName": "Nombre de marcador sólo puede contener letras, dígitos y barras bajas y debe comenzar con la letra", "DE.Views.ChartSettings.textAdvanced": "Mostrar ajustes avanzados", - "DE.Views.ChartSettings.textArea": "Área", - "DE.Views.ChartSettings.textBar": "Barra", "DE.Views.ChartSettings.textChartType": "Cambiar tipo de gráfico", - "DE.Views.ChartSettings.textColumn": "Gráfico de columnas", "DE.Views.ChartSettings.textEditData": "Editar datos", "DE.Views.ChartSettings.textHeight": "Altura", - "DE.Views.ChartSettings.textLine": "Línea", "DE.Views.ChartSettings.textOriginalSize": "Tamaño Predeterminado", - "DE.Views.ChartSettings.textPie": "Gráfico circular", - "DE.Views.ChartSettings.textPoint": "XY (Dispersión)", "DE.Views.ChartSettings.textSize": "Tamaño", - "DE.Views.ChartSettings.textStock": "De cotizaciones", "DE.Views.ChartSettings.textStyle": "Estilo", - "DE.Views.ChartSettings.textSurface": "Superficie", "DE.Views.ChartSettings.textUndock": "Desacoplar de panel", "DE.Views.ChartSettings.textWidth": "Ancho", "DE.Views.ChartSettings.textWrap": "Ajuste de texto", @@ -2005,13 +2005,9 @@ "DE.Views.Toolbar.mniImageFromStorage": "Imagen de Almacenamiento", "DE.Views.Toolbar.mniImageFromUrl": "Imagen de URL", "DE.Views.Toolbar.strMenuNoFill": "Sin relleno", - "DE.Views.Toolbar.textArea": "Área", "DE.Views.Toolbar.textAutoColor": "Automático", - "DE.Views.Toolbar.textBar": "Gráfico de barras", "DE.Views.Toolbar.textBold": "Negrita", "DE.Views.Toolbar.textBottom": "Inferior: ", - "DE.Views.Toolbar.textCharts": "Gráficos", - "DE.Views.Toolbar.textColumn": "Gráfico de columnas", "DE.Views.Toolbar.textColumnsCustom": "Columnas personalizadas", "DE.Views.Toolbar.textColumnsLeft": "Izquierdo", "DE.Views.Toolbar.textColumnsOne": "Uno", @@ -2031,7 +2027,6 @@ "DE.Views.Toolbar.textItalic": "Cursiva", "DE.Views.Toolbar.textLandscape": "Horizontal", "DE.Views.Toolbar.textLeft": "Izquierdo: ", - "DE.Views.Toolbar.textLine": "Gráfico de líneas", "DE.Views.Toolbar.textMarginsLast": "último personalizado", "DE.Views.Toolbar.textMarginsModerate": "Moderar", "DE.Views.Toolbar.textMarginsNarrow": "Estrecho", @@ -2045,15 +2040,12 @@ "DE.Views.Toolbar.textOddPage": "Página impar", "DE.Views.Toolbar.textPageMarginsCustom": "Márgenes personalizados", "DE.Views.Toolbar.textPageSizeCustom": "Tamaño de página personalizado", - "DE.Views.Toolbar.textPie": "Gráfico circular", "DE.Views.Toolbar.textPlainControl": "Introducir contenido de texto simple", - "DE.Views.Toolbar.textPoint": "XY (Dispersión)", "DE.Views.Toolbar.textPortrait": "Vertical", "DE.Views.Toolbar.textRemoveControl": "Elimine el control de contenido", "DE.Views.Toolbar.textRemWatermark": "Quitar marca de agua", "DE.Views.Toolbar.textRichControl": "Introducir contenido de texto rico", "DE.Views.Toolbar.textRight": "Derecho: ", - "DE.Views.Toolbar.textStock": "De cotizaciones", "DE.Views.Toolbar.textStrikeout": "Tachado", "DE.Views.Toolbar.textStyleMenuDelete": "Eliminar estilo", "DE.Views.Toolbar.textStyleMenuDeleteAll": "Borrar todos los estilos personalizados", @@ -2063,7 +2055,6 @@ "DE.Views.Toolbar.textStyleMenuUpdate": "Actualizar de la selección", "DE.Views.Toolbar.textSubscript": "Subíndice", "DE.Views.Toolbar.textSuperscript": "Sobreíndice", - "DE.Views.Toolbar.textSurface": "Superficie", "DE.Views.Toolbar.textTabCollaboration": "Colaboración", "DE.Views.Toolbar.textTabFile": "Archivo", "DE.Views.Toolbar.textTabHome": "Inicio", diff --git a/apps/documenteditor/main/locale/fr.json b/apps/documenteditor/main/locale/fr.json index 99ecab9ed..776d0c97c 100644 --- a/apps/documenteditor/main/locale/fr.json +++ b/apps/documenteditor/main/locale/fr.json @@ -69,6 +69,14 @@ "Common.Controllers.ReviewChanges.textTabs": "Changer les tabulations", "Common.Controllers.ReviewChanges.textUnderline": "Souligné", "Common.Controllers.ReviewChanges.textWidow": "Contrôle des veuves", + "Common.define.chartData.textArea": "En aires", + "Common.define.chartData.textBar": "En barre", + "Common.define.chartData.textColumn": "Colonne", + "Common.define.chartData.textLine": "Graphique en ligne", + "Common.define.chartData.textPie": "Graphiques à secteurs", + "Common.define.chartData.textPoint": "Nuages de points (XY)", + "Common.define.chartData.textStock": "Boursier", + "Common.define.chartData.textSurface": "Surface", "Common.UI.ComboBorderSize.txtNoBorders": "Pas de bordures", "Common.UI.ComboBorderSizeEditable.txtNoBorders": "Pas de bordures", "Common.UI.ComboDataView.emptyComboText": "Aucun style", @@ -1013,20 +1021,12 @@ "DE.Views.CellsRemoveDialog.textRow": "Supprimer la ligne entière", "DE.Views.CellsRemoveDialog.textTitle": "Supprimer les cellules", "DE.Views.ChartSettings.textAdvanced": "Afficher les paramètres avancés", - "DE.Views.ChartSettings.textArea": "En aires", - "DE.Views.ChartSettings.textBar": "En barre", "DE.Views.ChartSettings.textChartType": "Modifier le type de graphique", - "DE.Views.ChartSettings.textColumn": "Colonne", "DE.Views.ChartSettings.textEditData": "Modifier les données", "DE.Views.ChartSettings.textHeight": "Hauteur", - "DE.Views.ChartSettings.textLine": "Graphique en ligne", "DE.Views.ChartSettings.textOriginalSize": "Taille par défaut", - "DE.Views.ChartSettings.textPie": "Graphiques à secteurs", - "DE.Views.ChartSettings.textPoint": "Nuages de points (XY)", "DE.Views.ChartSettings.textSize": "Taille", - "DE.Views.ChartSettings.textStock": "Boursier", "DE.Views.ChartSettings.textStyle": "Style", - "DE.Views.ChartSettings.textSurface": "Surface", "DE.Views.ChartSettings.textUndock": "Détacher du panneau", "DE.Views.ChartSettings.textWidth": "Largeur", "DE.Views.ChartSettings.textWrap": "Style d'habillage", @@ -2051,13 +2051,9 @@ "DE.Views.Toolbar.mniImageFromStorage": "Image de stockage", "DE.Views.Toolbar.mniImageFromUrl": "Image à partir d'une URL", "DE.Views.Toolbar.strMenuNoFill": "Pas de remplissage", - "DE.Views.Toolbar.textArea": "En aires", "DE.Views.Toolbar.textAutoColor": "Automatique", - "DE.Views.Toolbar.textBar": "En barre", "DE.Views.Toolbar.textBold": "Gras", "DE.Views.Toolbar.textBottom": "En bas: ", - "DE.Views.Toolbar.textCharts": "Graphiques", - "DE.Views.Toolbar.textColumn": "Colonne", "DE.Views.Toolbar.textColumnsCustom": "Colonnes personnalisées", "DE.Views.Toolbar.textColumnsLeft": "A gauche", "DE.Views.Toolbar.textColumnsOne": "Un", @@ -2077,7 +2073,6 @@ "DE.Views.Toolbar.textItalic": "Italique", "DE.Views.Toolbar.textLandscape": "Paysage", "DE.Views.Toolbar.textLeft": "À gauche:", - "DE.Views.Toolbar.textLine": "Graphique en ligne", "DE.Views.Toolbar.textMarginsLast": "Dernière mesure", "DE.Views.Toolbar.textMarginsModerate": "Modérer", "DE.Views.Toolbar.textMarginsNarrow": "Étroit", @@ -2091,15 +2086,12 @@ "DE.Views.Toolbar.textOddPage": "Page impaire", "DE.Views.Toolbar.textPageMarginsCustom": "Marges personnalisées", "DE.Views.Toolbar.textPageSizeCustom": "Taille personnalisée", - "DE.Views.Toolbar.textPie": "Graphiques à secteurs", "DE.Views.Toolbar.textPlainControl": "Insérer un contrôle de contenu en texte brut", - "DE.Views.Toolbar.textPoint": "Nuages de points (XY)", "DE.Views.Toolbar.textPortrait": "Portrait", "DE.Views.Toolbar.textRemoveControl": "Supprimer le contrôle du contenu", "DE.Views.Toolbar.textRemWatermark": "Supprimer le filigrane", "DE.Views.Toolbar.textRichControl": "Insérer un contrôle de contenu en texte enrichi", "DE.Views.Toolbar.textRight": "A droite: ", - "DE.Views.Toolbar.textStock": "Boursier", "DE.Views.Toolbar.textStrikeout": "Barré", "DE.Views.Toolbar.textStyleMenuDelete": "Supprimer le style", "DE.Views.Toolbar.textStyleMenuDeleteAll": "Supprimer tous les styles personnalisés", @@ -2109,7 +2101,6 @@ "DE.Views.Toolbar.textStyleMenuUpdate": "Mettre à jour selon la sélection", "DE.Views.Toolbar.textSubscript": "Indice", "DE.Views.Toolbar.textSuperscript": "Exposant", - "DE.Views.Toolbar.textSurface": "Surface", "DE.Views.Toolbar.textTabCollaboration": "Collaboration", "DE.Views.Toolbar.textTabFile": "Fichier", "DE.Views.Toolbar.textTabHome": "Accueil", diff --git a/apps/documenteditor/main/locale/hu.json b/apps/documenteditor/main/locale/hu.json index 85266bf9b..8943743f3 100644 --- a/apps/documenteditor/main/locale/hu.json +++ b/apps/documenteditor/main/locale/hu.json @@ -63,6 +63,14 @@ "Common.Controllers.ReviewChanges.textTabs": "Lapok módosítása", "Common.Controllers.ReviewChanges.textUnderline": "Aláhúzott", "Common.Controllers.ReviewChanges.textWidow": "Özvegy sor", + "Common.define.chartData.textArea": "Terület", + "Common.define.chartData.textBar": "Sáv", + "Common.define.chartData.textColumn": "Oszlop", + "Common.define.chartData.textLine": "Vonal", + "Common.define.chartData.textPie": "Kör", + "Common.define.chartData.textPoint": "Pont", + "Common.define.chartData.textStock": "Részvény", + "Common.define.chartData.textSurface": "Felület", "Common.UI.ComboBorderSize.txtNoBorders": "Nincsenek szegélyek", "Common.UI.ComboBorderSizeEditable.txtNoBorders": "Nincsenek szegélyek", "Common.UI.ComboDataView.emptyComboText": "Nincsenek stílusok", @@ -923,20 +931,12 @@ "DE.Views.BookmarksDialog.textTitle": "Könyvjelzők", "DE.Views.BookmarksDialog.txtInvalidName": "A könyvjelző neve kizárólag betűket, számokat és alulvonást tartalmazhat, és betűvel kezdődhet.", "DE.Views.ChartSettings.textAdvanced": "Speciális beállítások megjelenítése", - "DE.Views.ChartSettings.textArea": "Terület", - "DE.Views.ChartSettings.textBar": "Sáv", "DE.Views.ChartSettings.textChartType": "Diagramtípus módosítása", - "DE.Views.ChartSettings.textColumn": "Oszlop", "DE.Views.ChartSettings.textEditData": "Adat szerkesztése", "DE.Views.ChartSettings.textHeight": "Magasság", - "DE.Views.ChartSettings.textLine": "Vonal", "DE.Views.ChartSettings.textOriginalSize": "Alapértelmezett méret", - "DE.Views.ChartSettings.textPie": "Kör", - "DE.Views.ChartSettings.textPoint": "Pont", "DE.Views.ChartSettings.textSize": "Méret", - "DE.Views.ChartSettings.textStock": "Részvény", "DE.Views.ChartSettings.textStyle": "Stílus", - "DE.Views.ChartSettings.textSurface": "Felület", "DE.Views.ChartSettings.textUndock": "Eltávolít a panelről", "DE.Views.ChartSettings.textWidth": "Szélesség", "DE.Views.ChartSettings.textWrap": "Tördelés stílus", @@ -1912,13 +1912,9 @@ "DE.Views.Toolbar.mniImageFromStorage": "Kép a tárolóból", "DE.Views.Toolbar.mniImageFromUrl": "Kép hivatkozásból", "DE.Views.Toolbar.strMenuNoFill": "Nincs kitöltés", - "DE.Views.Toolbar.textArea": "Terület", "DE.Views.Toolbar.textAutoColor": "Automatikus", - "DE.Views.Toolbar.textBar": "Sáv", "DE.Views.Toolbar.textBold": "Félkövér", "DE.Views.Toolbar.textBottom": "Alsó:", - "DE.Views.Toolbar.textCharts": "Diagramok", - "DE.Views.Toolbar.textColumn": "Oszlop", "DE.Views.Toolbar.textColumnsCustom": "Egyéni hasábok", "DE.Views.Toolbar.textColumnsLeft": "Bal", "DE.Views.Toolbar.textColumnsOne": "Egy", @@ -1937,7 +1933,6 @@ "DE.Views.Toolbar.textItalic": "Dőlt", "DE.Views.Toolbar.textLandscape": "Tájkép", "DE.Views.Toolbar.textLeft": "Bal:", - "DE.Views.Toolbar.textLine": "Vonal", "DE.Views.Toolbar.textMarginsLast": "Előző egyéni beállítások", "DE.Views.Toolbar.textMarginsModerate": "Mérsékelt", "DE.Views.Toolbar.textMarginsNarrow": "Keskeny", @@ -1951,14 +1946,11 @@ "DE.Views.Toolbar.textOddPage": "Páratlan oldal", "DE.Views.Toolbar.textPageMarginsCustom": "Egyéni margók", "DE.Views.Toolbar.textPageSizeCustom": "Egyéni lapméret", - "DE.Views.Toolbar.textPie": "Kör", "DE.Views.Toolbar.textPlainControl": "Egyszerű szöveg tartalomkezelő beillesztése", - "DE.Views.Toolbar.textPoint": "Pont", "DE.Views.Toolbar.textPortrait": "Portré", "DE.Views.Toolbar.textRemoveControl": "Tartalomkezelő eltávolítása", "DE.Views.Toolbar.textRichControl": "Rich text tartalomkezelő beillesztése", "DE.Views.Toolbar.textRight": "Jobb:", - "DE.Views.Toolbar.textStock": "Részvény", "DE.Views.Toolbar.textStrikeout": "Áthúzott", "DE.Views.Toolbar.textStyleMenuDelete": "Stílus törlése", "DE.Views.Toolbar.textStyleMenuDeleteAll": "Minden egyéni stílus törlése", @@ -1968,7 +1960,6 @@ "DE.Views.Toolbar.textStyleMenuUpdate": "Frissítés a kiválasztásból", "DE.Views.Toolbar.textSubscript": "Alsó index", "DE.Views.Toolbar.textSuperscript": "Felső index", - "DE.Views.Toolbar.textSurface": "Felület", "DE.Views.Toolbar.textTabCollaboration": "Együttműködés", "DE.Views.Toolbar.textTabFile": "Fájl", "DE.Views.Toolbar.textTabHome": "Kezdőlap", diff --git a/apps/documenteditor/main/locale/it.json b/apps/documenteditor/main/locale/it.json index 0097548f9..5086a9172 100644 --- a/apps/documenteditor/main/locale/it.json +++ b/apps/documenteditor/main/locale/it.json @@ -69,6 +69,14 @@ "Common.Controllers.ReviewChanges.textTabs": "Modifica Schede", "Common.Controllers.ReviewChanges.textUnderline": "Sottolineato", "Common.Controllers.ReviewChanges.textWidow": "Widow control", + "Common.define.chartData.textArea": "Aerogramma", + "Common.define.chartData.textBar": "A barre", + "Common.define.chartData.textColumn": "Istogramma", + "Common.define.chartData.textLine": "A linee", + "Common.define.chartData.textPie": "A torta", + "Common.define.chartData.textPoint": "XY (A dispersione)", + "Common.define.chartData.textStock": "Azionario", + "Common.define.chartData.textSurface": "Superficie", "Common.UI.ComboBorderSize.txtNoBorders": "Nessun bordo", "Common.UI.ComboBorderSizeEditable.txtNoBorders": "Nessun bordo", "Common.UI.ComboDataView.emptyComboText": "Nessuno stile", @@ -1002,21 +1010,18 @@ "DE.Views.BookmarksDialog.textSort": "Ordina per", "DE.Views.BookmarksDialog.textTitle": "Segnalibri", "DE.Views.BookmarksDialog.txtInvalidName": "il nome del Segnalibro può contenere solo lettere, numeri e underscore, e dovrebbe iniziare con la lettera", + "DE.Views.CaptionDialog.textBefore": "Prima", + "DE.Views.CaptionDialog.textColon": "due punti", + "DE.Views.CaptionDialog.textSeparator": "Usa separatore", + "DE.Views.CellsAddDialog.textCol": "Colonne", + "DE.Views.CellsRemoveDialog.textTitle": "Elimina celle", "DE.Views.ChartSettings.textAdvanced": "Mostra impostazioni avanzate", - "DE.Views.ChartSettings.textArea": "Aerogramma", - "DE.Views.ChartSettings.textBar": "A barre", "DE.Views.ChartSettings.textChartType": "Cambia tipo grafico", - "DE.Views.ChartSettings.textColumn": "Istogramma", "DE.Views.ChartSettings.textEditData": "Modifica dati", "DE.Views.ChartSettings.textHeight": "Altezza", - "DE.Views.ChartSettings.textLine": "A linee", "DE.Views.ChartSettings.textOriginalSize": "Predefinita", - "DE.Views.ChartSettings.textPie": "A torta", - "DE.Views.ChartSettings.textPoint": "XY (A dispersione)", "DE.Views.ChartSettings.textSize": "Dimensione", - "DE.Views.ChartSettings.textStock": "Azionario", "DE.Views.ChartSettings.textStyle": "Stile", - "DE.Views.ChartSettings.textSurface": "Superficie", "DE.Views.ChartSettings.textUndock": "Disancora dal pannello", "DE.Views.ChartSettings.textWidth": "Larghezza", "DE.Views.ChartSettings.textWrap": "Stile di disposizione testo", @@ -1119,6 +1124,7 @@ "DE.Views.DocumentHolder.textArrangeBackward": "Porta indietro", "DE.Views.DocumentHolder.textArrangeForward": "Porta avanti", "DE.Views.DocumentHolder.textArrangeFront": "Porta in primo piano", + "DE.Views.DocumentHolder.textCells": "Celle", "DE.Views.DocumentHolder.textContentControls": "Controllo Contenuto", "DE.Views.DocumentHolder.textContinueNumbering": "Continua la numerazione", "DE.Views.DocumentHolder.textCopy": "Copia", @@ -1321,6 +1327,7 @@ "DE.Views.FileMenuPanels.CreateNew.newDescriptionText": "Crea un nuovo documento di testo vuoto che potrai formattare in seguito durante la modifica. Oppure scegli uno dei modelli per creare un documento di un certo tipo al quale sono già applicati certi stili.", "DE.Views.FileMenuPanels.CreateNew.newDocumentText": "Nuovo documento di testo", "DE.Views.FileMenuPanels.CreateNew.noTemplatesText": "Nessun modello", + "DE.Views.FileMenuPanels.DocumentInfo.okButtonText": "Applica", "DE.Views.FileMenuPanels.DocumentInfo.txtAddAuthor": "Aggiungi Autore", "DE.Views.FileMenuPanels.DocumentInfo.txtAddText": "Aggiungi testo", "DE.Views.FileMenuPanels.DocumentInfo.txtAppName": "Applicazione", @@ -2032,13 +2039,9 @@ "DE.Views.Toolbar.mniImageFromStorage": "Immagine dallo spazio di archiviazione", "DE.Views.Toolbar.mniImageFromUrl": "Immagine da URL", "DE.Views.Toolbar.strMenuNoFill": "Nessun riempimento", - "DE.Views.Toolbar.textArea": "Aerogramma", "DE.Views.Toolbar.textAutoColor": "Automatico", - "DE.Views.Toolbar.textBar": "A barre", "DE.Views.Toolbar.textBold": "Grassetto", "DE.Views.Toolbar.textBottom": "Bottom: ", - "DE.Views.Toolbar.textCharts": "Grafici", - "DE.Views.Toolbar.textColumn": "Istogramma", "DE.Views.Toolbar.textColumnsCustom": "Colonne personalizzate", "DE.Views.Toolbar.textColumnsLeft": "Left", "DE.Views.Toolbar.textColumnsOne": "One", @@ -2058,7 +2061,6 @@ "DE.Views.Toolbar.textItalic": "Corsivo", "DE.Views.Toolbar.textLandscape": "Orizzontale", "DE.Views.Toolbar.textLeft": "Left: ", - "DE.Views.Toolbar.textLine": "A linee", "DE.Views.Toolbar.textMarginsLast": "Last Custom", "DE.Views.Toolbar.textMarginsModerate": "Moderare", "DE.Views.Toolbar.textMarginsNarrow": "Narrow", @@ -2072,15 +2074,12 @@ "DE.Views.Toolbar.textOddPage": "Pagina dispari", "DE.Views.Toolbar.textPageMarginsCustom": "Custom margins", "DE.Views.Toolbar.textPageSizeCustom": "Custom Page Size", - "DE.Views.Toolbar.textPie": "A torta", "DE.Views.Toolbar.textPlainControl": "Inserisci il controllo del contenuto in testo normale", - "DE.Views.Toolbar.textPoint": "XY (A dispersione)", "DE.Views.Toolbar.textPortrait": "Verticale", "DE.Views.Toolbar.textRemoveControl": "Rimuovi il controllo del contenuto", "DE.Views.Toolbar.textRemWatermark": "Rimuovi filigrana", "DE.Views.Toolbar.textRichControl": "Inserisci il controllo del contenuto RTF", "DE.Views.Toolbar.textRight": "Right: ", - "DE.Views.Toolbar.textStock": "Azionario", "DE.Views.Toolbar.textStrikeout": "Barrato", "DE.Views.Toolbar.textStyleMenuDelete": "Elimina stile", "DE.Views.Toolbar.textStyleMenuDeleteAll": "Elimina tutti gli stili personalizzati", @@ -2090,7 +2089,6 @@ "DE.Views.Toolbar.textStyleMenuUpdate": "Aggiorna da selezione", "DE.Views.Toolbar.textSubscript": "Pedice", "DE.Views.Toolbar.textSuperscript": "Apice", - "DE.Views.Toolbar.textSurface": "Superficie", "DE.Views.Toolbar.textTabCollaboration": "Collaborazione", "DE.Views.Toolbar.textTabFile": "File", "DE.Views.Toolbar.textTabHome": "Home", diff --git a/apps/documenteditor/main/locale/ja.json b/apps/documenteditor/main/locale/ja.json index 664e2cf97..d2b165951 100644 --- a/apps/documenteditor/main/locale/ja.json +++ b/apps/documenteditor/main/locale/ja.json @@ -63,6 +63,13 @@ "Common.Controllers.ReviewChanges.textTabs": "タブの変更", "Common.Controllers.ReviewChanges.textUnderline": "下線", "Common.Controllers.ReviewChanges.textWidow": "改ページ時1行残して段落を区切らないを制御する。", + "Common.define.chartData.textArea": "面グラフ", + "Common.define.chartData.textBar": "横棒グラフ", + "Common.define.chartData.textColumn": "縦棒グラフ", + "Common.define.chartData.textLine": "折れ線グラフ", + "Common.define.chartData.textPie": "円グラフ", + "Common.define.chartData.textPoint": "点グラフ", + "Common.define.chartData.textStock": "株価チャート", "Common.UI.ComboBorderSize.txtNoBorders": "罫線なし", "Common.UI.ComboBorderSizeEditable.txtNoBorders": "罫線なし", "Common.UI.ComboDataView.emptyComboText": "スタイルなし", @@ -589,18 +596,11 @@ "DE.Controllers.Toolbar.txtSymbol_xsi": "グザイ", "DE.Controllers.Toolbar.txtSymbol_zeta": "ゼータ", "DE.Views.ChartSettings.textAdvanced": "詳細設定の表示", - "DE.Views.ChartSettings.textArea": "面グラフ", - "DE.Views.ChartSettings.textBar": "横棒グラフ", "DE.Views.ChartSettings.textChartType": "グラフの種類の変更", - "DE.Views.ChartSettings.textColumn": "縦棒グラフ", "DE.Views.ChartSettings.textEditData": "データの編集", "DE.Views.ChartSettings.textHeight": "高さ", - "DE.Views.ChartSettings.textLine": "折れ線グラフ", "DE.Views.ChartSettings.textOriginalSize": "既定のサイズ", - "DE.Views.ChartSettings.textPie": "円グラフ", - "DE.Views.ChartSettings.textPoint": "点グラフ", "DE.Views.ChartSettings.textSize": "サイズ", - "DE.Views.ChartSettings.textStock": "株価チャート", "DE.Views.ChartSettings.textStyle": "スタイル", "DE.Views.ChartSettings.textUndock": "パネルからのドッキング解除", "DE.Views.ChartSettings.textWidth": "幅", @@ -1327,12 +1327,9 @@ "DE.Views.Toolbar.mniImageFromFile": "ファイルからの画像", "DE.Views.Toolbar.mniImageFromUrl": "ファイルからのURL", "DE.Views.Toolbar.strMenuNoFill": "塗りつぶしなし", - "DE.Views.Toolbar.textArea": "面グラフ", "DE.Views.Toolbar.textAutoColor": "自動", - "DE.Views.Toolbar.textBar": "横棒グラフ", "DE.Views.Toolbar.textBold": "太字", "DE.Views.Toolbar.textBottom": "下：", - "DE.Views.Toolbar.textColumn": "縦棒グラフ", "DE.Views.Toolbar.textColumnsLeft": "左", "DE.Views.Toolbar.textColumnsOne": "1", "DE.Views.Toolbar.textColumnsRight": "右に", @@ -1348,7 +1345,6 @@ "DE.Views.Toolbar.textInText": "テキスト", "DE.Views.Toolbar.textItalic": "斜体", "DE.Views.Toolbar.textLeft": "左：", - "DE.Views.Toolbar.textLine": "折れ線グラフ", "DE.Views.Toolbar.textMarginsLast": "最後に適用したユーザー", "DE.Views.Toolbar.textMarginsModerate": "標準", "DE.Views.Toolbar.textMarginsNarrow": "狭い", @@ -1361,10 +1357,7 @@ "DE.Views.Toolbar.textOddPage": "奇数ページから開始", "DE.Views.Toolbar.textPageMarginsCustom": "カスタム マージン", "DE.Views.Toolbar.textPageSizeCustom": "ユーザー設定のページ サイズ", - "DE.Views.Toolbar.textPie": "円グラフ", - "DE.Views.Toolbar.textPoint": "点グラフ", "DE.Views.Toolbar.textRight": "右：", - "DE.Views.Toolbar.textStock": "株価チャート", "DE.Views.Toolbar.textStrikeout": "取り消し線", "DE.Views.Toolbar.textStyleMenuDelete": "スタイルの削除", "DE.Views.Toolbar.textStyleMenuDeleteAll": "ユーザー設定のスタイルの削除", diff --git a/apps/documenteditor/main/locale/ko.json b/apps/documenteditor/main/locale/ko.json index 78813432a..b44ca93c4 100644 --- a/apps/documenteditor/main/locale/ko.json +++ b/apps/documenteditor/main/locale/ko.json @@ -777,20 +777,12 @@ "DE.Views.BookmarksDialog.textSort": "정렬", "DE.Views.BookmarksDialog.textTitle": "책갈피", "DE.Views.ChartSettings.textAdvanced": "고급 설정 표시", - "DE.Views.ChartSettings.textArea": "영역", - "DE.Views.ChartSettings.textBar": "Bar", "DE.Views.ChartSettings.textChartType": "차트 유형 변경", - "DE.Views.ChartSettings.textColumn": "열", "DE.Views.ChartSettings.textEditData": "데이터 편집", "DE.Views.ChartSettings.textHeight": "높이", - "DE.Views.ChartSettings.textLine": "Line", "DE.Views.ChartSettings.textOriginalSize": "기본 크기", - "DE.Views.ChartSettings.textPie": "파이", - "DE.Views.ChartSettings.textPoint": "XY (Scatter)", "DE.Views.ChartSettings.textSize": "크기", - "DE.Views.ChartSettings.textStock": "Stock", "DE.Views.ChartSettings.textStyle": "스타일", - "DE.Views.ChartSettings.textSurface": "표면", "DE.Views.ChartSettings.textUndock": "패널에서 도킹 해제", "DE.Views.ChartSettings.textWidth": "너비", "DE.Views.ChartSettings.textWrap": "포장 스타일", @@ -1707,13 +1699,9 @@ "DE.Views.Toolbar.mniImageFromFile": "그림 파일에서", "DE.Views.Toolbar.mniImageFromUrl": "URL에서 그림", "DE.Views.Toolbar.strMenuNoFill": "채우기 없음", - "DE.Views.Toolbar.textArea": "Area", "DE.Views.Toolbar.textAutoColor": "자동", - "DE.Views.Toolbar.textBar": "Bar", "DE.Views.Toolbar.textBold": "Bold", "DE.Views.Toolbar.textBottom": "Bottom :", - "DE.Views.Toolbar.textCharts": "차트", - "DE.Views.Toolbar.textColumn": "Column", "DE.Views.Toolbar.textColumnsCustom": "사용자 정의 열", "DE.Views.Toolbar.textColumnsLeft": "왼쪽", "DE.Views.Toolbar.textColumnsOne": "하나", @@ -1732,7 +1720,6 @@ "DE.Views.Toolbar.textItalic": "Italic", "DE.Views.Toolbar.textLandscape": "Landscape", "DE.Views.Toolbar.textLeft": "왼쪽 :", - "DE.Views.Toolbar.textLine": "Line", "DE.Views.Toolbar.textMarginsLast": "마지막 사용자 정의", "DE.Views.Toolbar.textMarginsModerate": "보통", "DE.Views.Toolbar.textMarginsNarrow": "좁다", @@ -1745,14 +1732,11 @@ "DE.Views.Toolbar.textOddPage": "홀수 페이지", "DE.Views.Toolbar.textPageMarginsCustom": "사용자 정의 여백", "DE.Views.Toolbar.textPageSizeCustom": "사용자 정의 페이지 크기", - "DE.Views.Toolbar.textPie": "파이", "DE.Views.Toolbar.textPlainControl": "일반 텍스트 콘텐트 제어 삽입", - "DE.Views.Toolbar.textPoint": "XY (Scatter)", "DE.Views.Toolbar.textPortrait": "Portrait", "DE.Views.Toolbar.textRemoveControl": "콘텐트 제어 삭제", "DE.Views.Toolbar.textRichControl": "리치 텍스트 콘텐트 제어 삽입", "DE.Views.Toolbar.textRight": "오른쪽 :", - "DE.Views.Toolbar.textStock": "Stock", "DE.Views.Toolbar.textStrikeout": "Strikeout", "DE.Views.Toolbar.textStyleMenuDelete": "스타일 삭제", "DE.Views.Toolbar.textStyleMenuDeleteAll": "모든 사용자 정의 스타일 삭제", @@ -1762,7 +1746,6 @@ "DE.Views.Toolbar.textStyleMenuUpdate": "선택 항목에서 업데이트", "DE.Views.Toolbar.textSubscript": "Subscript", "DE.Views.Toolbar.textSuperscript": "Superscript", - "DE.Views.Toolbar.textSurface": "Surface", "DE.Views.Toolbar.textTabCollaboration": "합치기", "DE.Views.Toolbar.textTabFile": "파일", "DE.Views.Toolbar.textTabHome": "집", diff --git a/apps/documenteditor/main/locale/lv.json b/apps/documenteditor/main/locale/lv.json index ae216079a..7f1b4ad5c 100644 --- a/apps/documenteditor/main/locale/lv.json +++ b/apps/documenteditor/main/locale/lv.json @@ -774,20 +774,12 @@ "DE.Views.BookmarksDialog.textSort": "Šķirot pēc", "DE.Views.BookmarksDialog.textTitle": "Grāmatzīmes", "DE.Views.ChartSettings.textAdvanced": "Show advanced settings", - "DE.Views.ChartSettings.textArea": "Area Chart", - "DE.Views.ChartSettings.textBar": "Bar Chart", "DE.Views.ChartSettings.textChartType": "Change Chart Type", - "DE.Views.ChartSettings.textColumn": "Column Chart", "DE.Views.ChartSettings.textEditData": "Edit Data", "DE.Views.ChartSettings.textHeight": "Height", - "DE.Views.ChartSettings.textLine": "Line Chart", "DE.Views.ChartSettings.textOriginalSize": "Default Size", - "DE.Views.ChartSettings.textPie": "Pie Chart", - "DE.Views.ChartSettings.textPoint": "XY (Scatter) Chart", "DE.Views.ChartSettings.textSize": "Size", - "DE.Views.ChartSettings.textStock": "Stock Chart", "DE.Views.ChartSettings.textStyle": "Style", - "DE.Views.ChartSettings.textSurface": "Virsma", "DE.Views.ChartSettings.textUndock": "Undock from panel", "DE.Views.ChartSettings.textWidth": "Width", "DE.Views.ChartSettings.textWrap": "Wrapping Style", @@ -1704,13 +1696,9 @@ "DE.Views.Toolbar.mniImageFromFile": "Attēls no faila", "DE.Views.Toolbar.mniImageFromUrl": "Attēls no URL", "DE.Views.Toolbar.strMenuNoFill": "Bez aizpildījuma", - "DE.Views.Toolbar.textArea": "Area Chart", "DE.Views.Toolbar.textAutoColor": "Automatic", - "DE.Views.Toolbar.textBar": "Bar Chart", "DE.Views.Toolbar.textBold": "Treknraksts", "DE.Views.Toolbar.textBottom": "Bottom: ", - "DE.Views.Toolbar.textCharts": "Diagrammas", - "DE.Views.Toolbar.textColumn": "Column Chart", "DE.Views.Toolbar.textColumnsCustom": "Pielāgotās kolonnas", "DE.Views.Toolbar.textColumnsLeft": "Left", "DE.Views.Toolbar.textColumnsOne": "One", @@ -1729,7 +1717,6 @@ "DE.Views.Toolbar.textItalic": "Kursīvs", "DE.Views.Toolbar.textLandscape": "Ainava", "DE.Views.Toolbar.textLeft": "Left: ", - "DE.Views.Toolbar.textLine": "Line Chart", "DE.Views.Toolbar.textMarginsLast": "Last Custom", "DE.Views.Toolbar.textMarginsModerate": "Moderate", "DE.Views.Toolbar.textMarginsNarrow": "Narrow", @@ -1742,14 +1729,11 @@ "DE.Views.Toolbar.textOddPage": "Odd Page", "DE.Views.Toolbar.textPageMarginsCustom": "Custom margins", "DE.Views.Toolbar.textPageSizeCustom": "Custom Page Size", - "DE.Views.Toolbar.textPie": "Pie Chart", "DE.Views.Toolbar.textPlainControl": "Ievietot parastā teksta satura kontroli", - "DE.Views.Toolbar.textPoint": "XY (Scatter) Chart", "DE.Views.Toolbar.textPortrait": "Portrets", "DE.Views.Toolbar.textRemoveControl": "Noņemt satura kontroles elementu", "DE.Views.Toolbar.textRichControl": "Ievietot formatētā teksta satura kontroli", "DE.Views.Toolbar.textRight": "Right: ", - "DE.Views.Toolbar.textStock": "Stock Chart", "DE.Views.Toolbar.textStrikeout": "Pārsvītrots", "DE.Views.Toolbar.textStyleMenuDelete": "Delete style", "DE.Views.Toolbar.textStyleMenuDeleteAll": "Delete all custom styles", @@ -1759,7 +1743,6 @@ "DE.Views.Toolbar.textStyleMenuUpdate": "Update from selection", "DE.Views.Toolbar.textSubscript": "Apakšraksts", "DE.Views.Toolbar.textSuperscript": "Augšraksts", - "DE.Views.Toolbar.textSurface": "Virsma", "DE.Views.Toolbar.textTabCollaboration": "Sadarbība", "DE.Views.Toolbar.textTabFile": "Fails", "DE.Views.Toolbar.textTabHome": "Sākums", diff --git a/apps/documenteditor/main/locale/nl.json b/apps/documenteditor/main/locale/nl.json index 1c4a716b7..3711ccc66 100644 --- a/apps/documenteditor/main/locale/nl.json +++ b/apps/documenteditor/main/locale/nl.json @@ -69,6 +69,14 @@ "Common.Controllers.ReviewChanges.textTabs": "Tabs wijzigen", "Common.Controllers.ReviewChanges.textUnderline": "Onderstrepen", "Common.Controllers.ReviewChanges.textWidow": "Zwevende regels voorkomen", + "Common.define.chartData.textArea": "Vlak", + "Common.define.chartData.textBar": "Staaf", + "Common.define.chartData.textColumn": "Kolom", + "Common.define.chartData.textLine": "Lijn", + "Common.define.chartData.textPie": "Cirkel", + "Common.define.chartData.textPoint": "Spreiding", + "Common.define.chartData.textStock": "Voorraad", + "Common.define.chartData.textSurface": "Oppervlak", "Common.UI.ComboBorderSize.txtNoBorders": "Geen randen", "Common.UI.ComboBorderSizeEditable.txtNoBorders": "Geen randen", "Common.UI.ComboDataView.emptyComboText": "Geen stijlen", @@ -874,20 +882,12 @@ "DE.Views.BookmarksDialog.textSort": "Sorteren op", "DE.Views.BookmarksDialog.textTitle": "Bladwijzers", "DE.Views.ChartSettings.textAdvanced": "Geavanceerde instellingen tonen", - "DE.Views.ChartSettings.textArea": "Vlak", - "DE.Views.ChartSettings.textBar": "Staaf", "DE.Views.ChartSettings.textChartType": "Grafiektype wijzigen", - "DE.Views.ChartSettings.textColumn": "Kolom", "DE.Views.ChartSettings.textEditData": "Gegevens bewerken", "DE.Views.ChartSettings.textHeight": "Hoogte", - "DE.Views.ChartSettings.textLine": "Lijn", "DE.Views.ChartSettings.textOriginalSize": "Standaardgrootte", - "DE.Views.ChartSettings.textPie": "Cirkel", - "DE.Views.ChartSettings.textPoint": "Spreiding", "DE.Views.ChartSettings.textSize": "Grootte", - "DE.Views.ChartSettings.textStock": "Voorraad", "DE.Views.ChartSettings.textStyle": "Stijl", - "DE.Views.ChartSettings.textSurface": "Oppervlak", "DE.Views.ChartSettings.textUndock": "Loskoppelen van deelvenster", "DE.Views.ChartSettings.textWidth": "Breedte", "DE.Views.ChartSettings.textWrap": "Terugloopstijl", @@ -1845,13 +1845,9 @@ "DE.Views.Toolbar.mniImageFromFile": "Afbeelding uit bestand", "DE.Views.Toolbar.mniImageFromUrl": "Afbeelding van URL", "DE.Views.Toolbar.strMenuNoFill": "Geen vulling", - "DE.Views.Toolbar.textArea": "Vlak", "DE.Views.Toolbar.textAutoColor": "Automatisch", - "DE.Views.Toolbar.textBar": "Staaf", "DE.Views.Toolbar.textBold": "Vet", "DE.Views.Toolbar.textBottom": "Onder:", - "DE.Views.Toolbar.textCharts": "Grafieken", - "DE.Views.Toolbar.textColumn": "Kolom", "DE.Views.Toolbar.textColumnsCustom": "Aangepaste kolommen", "DE.Views.Toolbar.textColumnsLeft": "Links", "DE.Views.Toolbar.textColumnsOne": "Eén", @@ -1870,7 +1866,6 @@ "DE.Views.Toolbar.textItalic": "Cursief", "DE.Views.Toolbar.textLandscape": "Liggend", "DE.Views.Toolbar.textLeft": "Links:", - "DE.Views.Toolbar.textLine": "Lijn", "DE.Views.Toolbar.textMarginsLast": "Laatste aangepaste", "DE.Views.Toolbar.textMarginsModerate": "Gemiddeld", "DE.Views.Toolbar.textMarginsNarrow": "Smal", @@ -1883,14 +1878,11 @@ "DE.Views.Toolbar.textOddPage": "Oneven pagina", "DE.Views.Toolbar.textPageMarginsCustom": "Aangepaste marges", "DE.Views.Toolbar.textPageSizeCustom": "Aangepast paginaformaat", - "DE.Views.Toolbar.textPie": "Cirkel", "DE.Views.Toolbar.textPlainControl": "Platte tekst inhoud beheer toevoegen", - "DE.Views.Toolbar.textPoint": "Spreiding", "DE.Views.Toolbar.textPortrait": "Staand", "DE.Views.Toolbar.textRemoveControl": "Inhoud beheer verwijderen", "DE.Views.Toolbar.textRichControl": "Uitgebreide tekst inhoud beheer toevoegen", "DE.Views.Toolbar.textRight": "Rechts:", - "DE.Views.Toolbar.textStock": "Voorraad", "DE.Views.Toolbar.textStrikeout": "Doorhalen", "DE.Views.Toolbar.textStyleMenuDelete": "Stijl verwijderen", "DE.Views.Toolbar.textStyleMenuDeleteAll": "Alle aangepaste stijlen verwijderen", @@ -1900,7 +1892,6 @@ "DE.Views.Toolbar.textStyleMenuUpdate": "Bijwerken op basis van selectie", "DE.Views.Toolbar.textSubscript": "Subscript", "DE.Views.Toolbar.textSuperscript": "Superscript", - "DE.Views.Toolbar.textSurface": "Oppervlak", "DE.Views.Toolbar.textTabCollaboration": "Samenwerking", "DE.Views.Toolbar.textTabFile": "Bestand", "DE.Views.Toolbar.textTabHome": "Home", diff --git a/apps/documenteditor/main/locale/pl.json b/apps/documenteditor/main/locale/pl.json index c144bb4a6..e17d7a20c 100644 --- a/apps/documenteditor/main/locale/pl.json +++ b/apps/documenteditor/main/locale/pl.json @@ -67,6 +67,14 @@ "Common.Controllers.ReviewChanges.textTabs": "Zmień zakładki", "Common.Controllers.ReviewChanges.textUnderline": "Podkreśl", "Common.Controllers.ReviewChanges.textWidow": "Kontrola okna", + "Common.define.chartData.textArea": "Obszar", + "Common.define.chartData.textBar": "Pasek", + "Common.define.chartData.textColumn": "Kolumna", + "Common.define.chartData.textLine": "Liniowy", + "Common.define.chartData.textPie": "Kołowe", + "Common.define.chartData.textPoint": "XY (Punktowy)", + "Common.define.chartData.textStock": "Zbiory", + "Common.define.chartData.textSurface": "Powierzchnia", "Common.UI.ComboBorderSize.txtNoBorders": "Bez krawędzi", "Common.UI.ComboBorderSizeEditable.txtNoBorders": "Bez krawędzi", "Common.UI.ComboDataView.emptyComboText": "Brak styli", @@ -775,20 +783,12 @@ "DE.Views.BookmarksDialog.textTitle": "Zakładki", "DE.Views.BookmarksDialog.txtInvalidName": "Nazwa zakładki powinna zaczynać się literą i zawierać może ona tylko litery, liczby i znaki podkreślenia ", "DE.Views.ChartSettings.textAdvanced": "Pokaż ustawienia zaawansowane", - "DE.Views.ChartSettings.textArea": "Obszar", - "DE.Views.ChartSettings.textBar": "Pasek", "DE.Views.ChartSettings.textChartType": "Zmień typ wykresu", - "DE.Views.ChartSettings.textColumn": "Kolumna", "DE.Views.ChartSettings.textEditData": "Edytuj dane", "DE.Views.ChartSettings.textHeight": "Wysokość", - "DE.Views.ChartSettings.textLine": "Liniowy", "DE.Views.ChartSettings.textOriginalSize": "Domyślny rozmiar", - "DE.Views.ChartSettings.textPie": "Kołowe", - "DE.Views.ChartSettings.textPoint": "XY (Punktowy)", "DE.Views.ChartSettings.textSize": "Rozmiar", - "DE.Views.ChartSettings.textStock": "Zbiory", "DE.Views.ChartSettings.textStyle": "Styl", - "DE.Views.ChartSettings.textSurface": "Powierzchnia", "DE.Views.ChartSettings.textUndock": "Odepnij od panelu", "DE.Views.ChartSettings.textWidth": "Szerokość", "DE.Views.ChartSettings.textWrap": "Styl zawijania", @@ -1678,13 +1678,9 @@ "DE.Views.Toolbar.mniImageFromFile": "Obraz z pliku", "DE.Views.Toolbar.mniImageFromUrl": "Obraz z URL", "DE.Views.Toolbar.strMenuNoFill": "Brak wypełnienia", - "DE.Views.Toolbar.textArea": "Obszar", "DE.Views.Toolbar.textAutoColor": "Automatyczny", - "DE.Views.Toolbar.textBar": "Pasek", "DE.Views.Toolbar.textBold": "Pogrubienie", "DE.Views.Toolbar.textBottom": "Dół:", - "DE.Views.Toolbar.textCharts": "Wykresy", - "DE.Views.Toolbar.textColumn": "Kolumna", "DE.Views.Toolbar.textColumnsCustom": "Niestandardowe kolumny", "DE.Views.Toolbar.textColumnsLeft": "Lewy", "DE.Views.Toolbar.textColumnsOne": "Jeden", @@ -1704,7 +1700,6 @@ "DE.Views.Toolbar.textItalic": "Kursywa", "DE.Views.Toolbar.textLandscape": "Krajobraz", "DE.Views.Toolbar.textLeft": "Lewo:", - "DE.Views.Toolbar.textLine": "Wiersz", "DE.Views.Toolbar.textMarginsLast": "Ostatni niestandardowy", "DE.Views.Toolbar.textMarginsModerate": "Umiarkowany", "DE.Views.Toolbar.textMarginsNarrow": "Wąski", @@ -1718,13 +1713,10 @@ "DE.Views.Toolbar.textOddPage": "Nieparzysta strona", "DE.Views.Toolbar.textPageMarginsCustom": "Niestandardowe marginesy", "DE.Views.Toolbar.textPageSizeCustom": "Własny rozmiar strony", - "DE.Views.Toolbar.textPie": "Kołowe", - "DE.Views.Toolbar.textPoint": "XY (Punktowy)", "DE.Views.Toolbar.textPortrait": "Portret", "DE.Views.Toolbar.textRemoveControl": "Usuń kontrolę treści", "DE.Views.Toolbar.textRemWatermark": "Usuń znak wodny", "DE.Views.Toolbar.textRight": "Prawo:", - "DE.Views.Toolbar.textStock": "Zbiory", "DE.Views.Toolbar.textStrikeout": "Skreślenie", "DE.Views.Toolbar.textStyleMenuDelete": "Usuń styl", "DE.Views.Toolbar.textStyleMenuDeleteAll": "Usuń wszystkie niestandardowe style", @@ -1734,7 +1726,6 @@ "DE.Views.Toolbar.textStyleMenuUpdate": "Aktualizuj z wyboru", "DE.Views.Toolbar.textSubscript": "Indeks", "DE.Views.Toolbar.textSuperscript": "Indeks górny", - "DE.Views.Toolbar.textSurface": "Powierzchnia", "DE.Views.Toolbar.textTabCollaboration": "Współpraca", "DE.Views.Toolbar.textTabFile": "Plik", "DE.Views.Toolbar.textTabHome": "Narzędzia główne", diff --git a/apps/documenteditor/main/locale/pt.json b/apps/documenteditor/main/locale/pt.json index c73d897d5..e4817ad29 100644 --- a/apps/documenteditor/main/locale/pt.json +++ b/apps/documenteditor/main/locale/pt.json @@ -63,6 +63,14 @@ "Common.Controllers.ReviewChanges.textTabs": "Change tabs", "Common.Controllers.ReviewChanges.textUnderline": "Underline", "Common.Controllers.ReviewChanges.textWidow": "Widow control", + "Common.define.chartData.textArea": "Área", + "Common.define.chartData.textBar": "Barra", + "Common.define.chartData.textColumn": "Coluna", + "Common.define.chartData.textLine": "Linha", + "Common.define.chartData.textPie": "Gráfico de pizza", + "Common.define.chartData.textPoint": "Gráfico de pontos", + "Common.define.chartData.textStock": "Gráfico de ações", + "Common.define.chartData.textSurface": "Superfície", "Common.UI.ComboBorderSize.txtNoBorders": "Sem bordas", "Common.UI.ComboBorderSizeEditable.txtNoBorders": "Sem bordas", "Common.UI.ComboDataView.emptyComboText": "Sem estilos", @@ -744,20 +752,12 @@ "DE.Views.BookmarksDialog.textHidden": "Favoritos ocultos", "DE.Views.BookmarksDialog.textTitle": "Favoritos", "DE.Views.ChartSettings.textAdvanced": "Exibir configurações avançadas", - "DE.Views.ChartSettings.textArea": "Área", - "DE.Views.ChartSettings.textBar": "Barra", "DE.Views.ChartSettings.textChartType": "Alterar tipo de gráfico", - "DE.Views.ChartSettings.textColumn": "Coluna", "DE.Views.ChartSettings.textEditData": "Editar dados", "DE.Views.ChartSettings.textHeight": "Altura", - "DE.Views.ChartSettings.textLine": "Linha", "DE.Views.ChartSettings.textOriginalSize": "Tamanho padrão", - "DE.Views.ChartSettings.textPie": "Gráfico de pizza", - "DE.Views.ChartSettings.textPoint": "Gráfico de pontos", "DE.Views.ChartSettings.textSize": "Tamanho", - "DE.Views.ChartSettings.textStock": "Gráfico de ações", "DE.Views.ChartSettings.textStyle": "Estilo", - "DE.Views.ChartSettings.textSurface": "Superfície", "DE.Views.ChartSettings.textUndock": "Desencaixar do painel", "DE.Views.ChartSettings.textWidth": "Largura", "DE.Views.ChartSettings.textWrap": "Estilo da quebra automática", @@ -1633,13 +1633,9 @@ "DE.Views.Toolbar.mniImageFromFile": "Imagem do arquivo", "DE.Views.Toolbar.mniImageFromUrl": "Imagem da URL", "DE.Views.Toolbar.strMenuNoFill": "Sem preenchimento", - "DE.Views.Toolbar.textArea": "Área", "DE.Views.Toolbar.textAutoColor": "Automático", - "DE.Views.Toolbar.textBar": "Barra", "DE.Views.Toolbar.textBold": "Negrito", "DE.Views.Toolbar.textBottom": "Inferior:", - "DE.Views.Toolbar.textCharts": "Gráficos", - "DE.Views.Toolbar.textColumn": "Coluna", "DE.Views.Toolbar.textColumnsCustom": "Personalizar colunas", "DE.Views.Toolbar.textColumnsLeft": "Esquerda", "DE.Views.Toolbar.textColumnsOne": "Uma", @@ -1658,7 +1654,6 @@ "DE.Views.Toolbar.textItalic": "Itálico", "DE.Views.Toolbar.textLandscape": "Paisagem", "DE.Views.Toolbar.textLeft": "Esquerda:", - "DE.Views.Toolbar.textLine": "Linha", "DE.Views.Toolbar.textMarginsLast": "Últimos personalizados", "DE.Views.Toolbar.textMarginsModerate": "Moderado", "DE.Views.Toolbar.textMarginsNarrow": "Estreito", @@ -1671,14 +1666,11 @@ "DE.Views.Toolbar.textOddPage": "Página ímpar", "DE.Views.Toolbar.textPageMarginsCustom": "Margens personalizadas", "DE.Views.Toolbar.textPageSizeCustom": "Tamanho de página personalizado", - "DE.Views.Toolbar.textPie": "Gráfico de pizza", "DE.Views.Toolbar.textPlainControl": "Adicionar Controle de Conteúdo de Texto sem formatação", - "DE.Views.Toolbar.textPoint": "Gráfico de pontos", "DE.Views.Toolbar.textPortrait": "Retrato ", "DE.Views.Toolbar.textRemoveControl": "Remover Controle de Conteúdo", "DE.Views.Toolbar.textRichControl": "Adicionar Controle de Conteúdo de Rich Text", "DE.Views.Toolbar.textRight": "Direita:", - "DE.Views.Toolbar.textStock": "Gráfico de ações", "DE.Views.Toolbar.textStrikeout": "Taxado", "DE.Views.Toolbar.textStyleMenuDelete": "Delete style", "DE.Views.Toolbar.textStyleMenuDeleteAll": "Delete all custom styles", @@ -1688,7 +1680,6 @@ "DE.Views.Toolbar.textStyleMenuUpdate": "Update from selection", "DE.Views.Toolbar.textSubscript": "Subscrito", "DE.Views.Toolbar.textSuperscript": "Sobrescrito", - "DE.Views.Toolbar.textSurface": "Superfície", "DE.Views.Toolbar.textTabCollaboration": "Colaboração", "DE.Views.Toolbar.textTabFile": "Arquivo", "DE.Views.Toolbar.textTabHome": "Página Inicial", diff --git a/apps/documenteditor/main/locale/ru.json b/apps/documenteditor/main/locale/ru.json index 1b9481d80..da81f10f4 100644 --- a/apps/documenteditor/main/locale/ru.json +++ b/apps/documenteditor/main/locale/ru.json @@ -230,6 +230,8 @@ "Common.Views.ReviewChanges.strStrictDesc": "Используйте кнопку 'Сохранить' для синхронизации изменений, вносимых вами и другими пользователями.", "Common.Views.ReviewChanges.tipAcceptCurrent": "Принять текущее изменение", "Common.Views.ReviewChanges.tipCoAuthMode": "Задать режим совместного редактирования", + "Common.Views.ReviewChanges.tipCommentRem": "Удалить комментарии", + "Common.Views.ReviewChanges.tipCommentRemCurrent": "Удалить текущие комментарии", "Common.Views.ReviewChanges.tipHistory": "Показать историю версий", "Common.Views.ReviewChanges.tipRejectCurrent": "Отклонить текущее изменение", "Common.Views.ReviewChanges.tipReview": "Отслеживать изменения", @@ -244,6 +246,11 @@ "Common.Views.ReviewChanges.txtChat": "Чат", "Common.Views.ReviewChanges.txtClose": "Закрыть", "Common.Views.ReviewChanges.txtCoAuthMode": "Режим совместного редактирования", + "Common.Views.ReviewChanges.txtCommentRemAll": "Удалить все комментарии", + "Common.Views.ReviewChanges.txtCommentRemCurrent": "Удалить текущие комментарии", + "Common.Views.ReviewChanges.txtCommentRemMy": "Удалить мои комментарии", + "Common.Views.ReviewChanges.txtCommentRemMyCurrent": "Удалить мои текущие комментарии", + "Common.Views.ReviewChanges.txtCommentRemove": "Удалить", "Common.Views.ReviewChanges.txtDocLang": "Язык", "Common.Views.ReviewChanges.txtFinal": "Все изменения приняты (просмотр)", "Common.Views.ReviewChanges.txtFinalCap": "Измененный документ", @@ -308,6 +315,11 @@ "Common.Views.SignSettingsDialog.textShowDate": "Показывать дату подписи в строке подписи", "Common.Views.SignSettingsDialog.textTitle": "Настройка подписи", "Common.Views.SignSettingsDialog.txtEmpty": "Это поле необходимо заполнить", + "Common.Views.SymbolTableDialog.textCode": "Код знака из Юникод (шестн.)", + "Common.Views.SymbolTableDialog.textFont": "Шрифт", + "Common.Views.SymbolTableDialog.textRange": "Набор", + "Common.Views.SymbolTableDialog.textRecent": "Ранее использовавшиеся символы", + "Common.Views.SymbolTableDialog.textTitle": "Символ", "DE.Controllers.LeftMenu.leavePageText": "Все несохраненные изменения в этом документе будут потеряны.
Нажмите кнопку \"Отмена\", а затем нажмите кнопку \"Сохранить\", чтобы сохранить их. Нажмите кнопку \"OK\", чтобы сбросить все несохраненные изменения.", "DE.Controllers.LeftMenu.newDocumentTitle": "Документ без имени", "DE.Controllers.LeftMenu.notcriticalErrorTitle": "Внимание", @@ -357,6 +369,7 @@ "DE.Controllers.Main.errorToken": "Токен безопасности документа имеет неправильный формат.
Пожалуйста, обратитесь к администратору Сервера документов.", "DE.Controllers.Main.errorTokenExpire": "Истек срок действия токена безопасности документа.
Пожалуйста, обратитесь к администратору Сервера документов.", "DE.Controllers.Main.errorUpdateVersion": "Версия файла была изменена. Страница будет перезагружена.", + "DE.Controllers.Main.errorUpdateVersionOnDisconnect": "Подключение к Интернету было восстановлено, и версия файла изменилась.
Прежде чем продолжить работу, надо скачать файл или скопировать его содержимое, чтобы обеспечить сохранность данных, а затем перезагрузить страницу.", "DE.Controllers.Main.errorUserDrop": "В настоящий момент файл недоступен.", "DE.Controllers.Main.errorUsersExceed": "Превышено количество пользователей, разрешенных согласно тарифному плану", "DE.Controllers.Main.errorViewerDisconnect": "Подключение прервано. Вы по-прежнему можете просматривать документ,
но не сможете скачать или напечатать его до восстановления подключения и обновления страницы.", @@ -673,6 +686,7 @@ "DE.Controllers.Toolbar.textFontSizeErr": "Введенное значение некорректно.
Введите числовое значение от 1 до 100", "DE.Controllers.Toolbar.textFraction": "Дроби", "DE.Controllers.Toolbar.textFunction": "Функции", + "DE.Controllers.Toolbar.textInsert": "Вставить", "DE.Controllers.Toolbar.textIntegral": "Интегралы", "DE.Controllers.Toolbar.textLargeOperator": "Крупные операторы", "DE.Controllers.Toolbar.textLimitAndLog": "Пределы и логарифмы", @@ -1051,20 +1065,12 @@ "DE.Views.CellsRemoveDialog.textRow": "Удалить всю строку", "DE.Views.CellsRemoveDialog.textTitle": "Удалить ячейки", "DE.Views.ChartSettings.textAdvanced": "Дополнительные параметры", - "DE.Views.ChartSettings.textArea": "С областями", - "DE.Views.ChartSettings.textBar": "Линейчатая", "DE.Views.ChartSettings.textChartType": "Изменить тип диаграммы", - "DE.Views.ChartSettings.textColumn": "Гистограмма", "DE.Views.ChartSettings.textEditData": "Изменить данные", "DE.Views.ChartSettings.textHeight": "Высота", - "DE.Views.ChartSettings.textLine": "График", "DE.Views.ChartSettings.textOriginalSize": "Реальный размер", - "DE.Views.ChartSettings.textPie": "Круговая", - "DE.Views.ChartSettings.textPoint": "Точечная", "DE.Views.ChartSettings.textSize": "Размер", - "DE.Views.ChartSettings.textStock": "Биржевая", "DE.Views.ChartSettings.textStyle": "Стиль", - "DE.Views.ChartSettings.textSurface": "Поверхность", "DE.Views.ChartSettings.textUndock": "Открепить от панели", "DE.Views.ChartSettings.textWidth": "Ширина", "DE.Views.ChartSettings.textWrap": "Стиль обтекания", @@ -2058,6 +2064,7 @@ "DE.Views.TextArtSettings.textTemplate": "Шаблон", "DE.Views.TextArtSettings.textTransform": "Трансформация", "DE.Views.TextArtSettings.txtNoBorders": "Без обводки", + "DE.Views.Toolbar.capBtnAddComment": "Добавить комментарий", "DE.Views.Toolbar.capBtnBlankPage": "Пустая страница", "DE.Views.Toolbar.capBtnColumns": "Колонки", "DE.Views.Toolbar.capBtnComment": "Комментарий", @@ -2069,6 +2076,7 @@ "DE.Views.Toolbar.capBtnInsImage": "Изображение", "DE.Views.Toolbar.capBtnInsPagebreak": "Разрывы", "DE.Views.Toolbar.capBtnInsShape": "Фигура", + "DE.Views.Toolbar.capBtnInsSymbol": "Символ", "DE.Views.Toolbar.capBtnInsTable": "Таблица", "DE.Views.Toolbar.capBtnInsTextart": "Text Art", "DE.Views.Toolbar.capBtnInsTextbox": "Надпись", @@ -2093,13 +2101,9 @@ "DE.Views.Toolbar.mniImageFromStorage": "Изображение из хранилища", "DE.Views.Toolbar.mniImageFromUrl": "Изображение по URL", "DE.Views.Toolbar.strMenuNoFill": "Без заливки", - "DE.Views.Toolbar.textArea": "С областями", "DE.Views.Toolbar.textAutoColor": "Автоматический", - "DE.Views.Toolbar.textBar": "Линейчатая", "DE.Views.Toolbar.textBold": "Полужирный", "DE.Views.Toolbar.textBottom": "Нижнее: ", - "DE.Views.Toolbar.textCharts": "Диаграммы", - "DE.Views.Toolbar.textColumn": "Гистограмма", "DE.Views.Toolbar.textColumnsCustom": "Настраиваемые колонки", "DE.Views.Toolbar.textColumnsLeft": "Слева", "DE.Views.Toolbar.textColumnsOne": "Одна", @@ -2119,7 +2123,6 @@ "DE.Views.Toolbar.textItalic": "Курсив", "DE.Views.Toolbar.textLandscape": "Альбомная", "DE.Views.Toolbar.textLeft": "Левое: ", - "DE.Views.Toolbar.textLine": "График", "DE.Views.Toolbar.textMarginsLast": "Последние настраиваемые", "DE.Views.Toolbar.textMarginsModerate": "Средние", "DE.Views.Toolbar.textMarginsNarrow": "Узкие", @@ -2133,15 +2136,12 @@ "DE.Views.Toolbar.textOddPage": "С нечетной страницы", "DE.Views.Toolbar.textPageMarginsCustom": "Настраиваемые поля", "DE.Views.Toolbar.textPageSizeCustom": "Особый размер страницы", - "DE.Views.Toolbar.textPie": "Круговая", "DE.Views.Toolbar.textPlainControl": "Вставить элемент управления \"Обычный текст\"", - "DE.Views.Toolbar.textPoint": "Точечная", "DE.Views.Toolbar.textPortrait": "Книжная", "DE.Views.Toolbar.textRemoveControl": "Удалить элемент управления содержимым", "DE.Views.Toolbar.textRemWatermark": "Удалить подложку", "DE.Views.Toolbar.textRichControl": "Вставить элемент управления \"Форматированный текст\"", "DE.Views.Toolbar.textRight": "Правое: ", - "DE.Views.Toolbar.textStock": "Биржевая", "DE.Views.Toolbar.textStrikeout": "Зачеркнутый", "DE.Views.Toolbar.textStyleMenuDelete": "Удалить стиль", "DE.Views.Toolbar.textStyleMenuDeleteAll": "Удалить все пользовательские стили", @@ -2151,7 +2151,6 @@ "DE.Views.Toolbar.textStyleMenuUpdate": "Обновить из выделенного фрагмента", "DE.Views.Toolbar.textSubscript": "Подстрочные знаки", "DE.Views.Toolbar.textSuperscript": "Надстрочные знаки", - "DE.Views.Toolbar.textSurface": "Поверхность", "DE.Views.Toolbar.textTabCollaboration": "Совместная работа", "DE.Views.Toolbar.textTabFile": "Файл", "DE.Views.Toolbar.textTabHome": "Главная", @@ -2196,6 +2195,7 @@ "DE.Views.Toolbar.tipInsertImage": "Вставить изображение", "DE.Views.Toolbar.tipInsertNum": "Вставить номер страницы", "DE.Views.Toolbar.tipInsertShape": "Вставить автофигуру", + "DE.Views.Toolbar.tipInsertSymbol": "Вставить символ", "DE.Views.Toolbar.tipInsertTable": "Вставить таблицу", "DE.Views.Toolbar.tipInsertText": "Вставить надпись", "DE.Views.Toolbar.tipInsertTextArt": "Вставить объект Text Art", diff --git a/apps/documenteditor/main/locale/sk.json b/apps/documenteditor/main/locale/sk.json index bd72be34a..eeea2a32f 100644 --- a/apps/documenteditor/main/locale/sk.json +++ b/apps/documenteditor/main/locale/sk.json @@ -63,6 +63,14 @@ "Common.Controllers.ReviewChanges.textTabs": "Zmeniť tabuľky", "Common.Controllers.ReviewChanges.textUnderline": "Podčiarknuť", "Common.Controllers.ReviewChanges.textWidow": "Ovládanie okien", + "Common.define.chartData.textArea": "Plošný graf", + "Common.define.chartData.textBar": "Pruhový graf", + "Common.define.chartData.textColumn": "Stĺpec", + "Common.define.chartData.textLine": "Čiara/líniový graf", + "Common.define.chartData.textPie": "Koláčový graf", + "Common.define.chartData.textPoint": "Bodový graf", + "Common.define.chartData.textStock": "Akcie/burzový graf", + "Common.define.chartData.textSurface": "Povrch", "Common.UI.ComboBorderSize.txtNoBorders": "Bez orámovania", "Common.UI.ComboBorderSizeEditable.txtNoBorders": "Bez orámovania", "Common.UI.ComboDataView.emptyComboText": "Žiadne štýly", @@ -747,20 +755,12 @@ "DE.Views.BookmarksDialog.textDelete": "Vymazať", "DE.Views.BookmarksDialog.textTitle": "Záložky", "DE.Views.ChartSettings.textAdvanced": "Zobraziť pokročilé nastavenia", - "DE.Views.ChartSettings.textArea": "Plošný graf", - "DE.Views.ChartSettings.textBar": "Pruhový graf", "DE.Views.ChartSettings.textChartType": "Zmeniť typ grafu", - "DE.Views.ChartSettings.textColumn": "Stĺpec", "DE.Views.ChartSettings.textEditData": "Upravovať dáta", "DE.Views.ChartSettings.textHeight": "Výška", - "DE.Views.ChartSettings.textLine": "Čiara/líniový graf", "DE.Views.ChartSettings.textOriginalSize": "Predvolená veľkosť", - "DE.Views.ChartSettings.textPie": "Koláčový graf", - "DE.Views.ChartSettings.textPoint": "Bodový graf", "DE.Views.ChartSettings.textSize": "Veľkosť", - "DE.Views.ChartSettings.textStock": "Akcie/burzový graf", "DE.Views.ChartSettings.textStyle": "Štýl", - "DE.Views.ChartSettings.textSurface": "Povrch", "DE.Views.ChartSettings.textUndock": "Odpojiť z panelu", "DE.Views.ChartSettings.textWidth": "Šírka", "DE.Views.ChartSettings.textWrap": "Obtekanie textu", @@ -1580,13 +1580,9 @@ "DE.Views.Toolbar.mniImageFromFile": "Obrázok zo súboru", "DE.Views.Toolbar.mniImageFromUrl": "Obrázok z URL adresy", "DE.Views.Toolbar.strMenuNoFill": "Bez výplne", - "DE.Views.Toolbar.textArea": "Plošný graf", "DE.Views.Toolbar.textAutoColor": "Automaticky", - "DE.Views.Toolbar.textBar": "Pruhový graf", "DE.Views.Toolbar.textBold": "Tučné", "DE.Views.Toolbar.textBottom": "Dole", - "DE.Views.Toolbar.textCharts": "Grafy", - "DE.Views.Toolbar.textColumn": "Stĺpec", "DE.Views.Toolbar.textColumnsCustom": "Vlastné stĺpce", "DE.Views.Toolbar.textColumnsLeft": "Vľavo", "DE.Views.Toolbar.textColumnsOne": "Jeden", @@ -1605,7 +1601,6 @@ "DE.Views.Toolbar.textItalic": "Kurzíva", "DE.Views.Toolbar.textLandscape": "Na šírku", "DE.Views.Toolbar.textLeft": "Vľavo:", - "DE.Views.Toolbar.textLine": "Čiara/líniový graf", "DE.Views.Toolbar.textMarginsLast": "Posledná úprava", "DE.Views.Toolbar.textMarginsModerate": "Primeraný/pomerne malý", "DE.Views.Toolbar.textMarginsNarrow": "Úzky", @@ -1618,11 +1613,8 @@ "DE.Views.Toolbar.textOddPage": "Nepárna strana", "DE.Views.Toolbar.textPageMarginsCustom": "Vlastné okraje", "DE.Views.Toolbar.textPageSizeCustom": "Vlastná veľkosť stránky", - "DE.Views.Toolbar.textPie": "Koláčový graf", - "DE.Views.Toolbar.textPoint": "Bodový graf", "DE.Views.Toolbar.textPortrait": "Na výšku", "DE.Views.Toolbar.textRight": "Vpravo:", - "DE.Views.Toolbar.textStock": "Akcie/burzový graf", "DE.Views.Toolbar.textStrikeout": "Prečiarknuť", "DE.Views.Toolbar.textStyleMenuDelete": "Odstrániť štýl", "DE.Views.Toolbar.textStyleMenuDeleteAll": "Odstrániť všetky vlastné štýly", @@ -1632,7 +1624,6 @@ "DE.Views.Toolbar.textStyleMenuUpdate": "Aktualizovať z výberu", "DE.Views.Toolbar.textSubscript": "Dolný index", "DE.Views.Toolbar.textSuperscript": "Horný index", - "DE.Views.Toolbar.textSurface": "Povrch", "DE.Views.Toolbar.textTabFile": "Súbor", "DE.Views.Toolbar.textTabHome": "Hlavná stránka", "DE.Views.Toolbar.textTabInsert": "Vložiť", diff --git a/apps/documenteditor/main/locale/sl.json b/apps/documenteditor/main/locale/sl.json index 3c8cf64e8..4ae359026 100644 --- a/apps/documenteditor/main/locale/sl.json +++ b/apps/documenteditor/main/locale/sl.json @@ -63,6 +63,13 @@ "Common.Controllers.ReviewChanges.textTabs": "Change tabs", "Common.Controllers.ReviewChanges.textUnderline": "Underline", "Common.Controllers.ReviewChanges.textWidow": "Widow control", + "Common.define.chartData.textArea": "Ploščinski grafikon", + "Common.define.chartData.textBar": "Stolpični grafikon", + "Common.define.chartData.textColumn": "Stolpični grafikon", + "Common.define.chartData.textLine": "Vrstični grafikon", + "Common.define.chartData.textPie": "Tortni grafikon", + "Common.define.chartData.textPoint": "Točkovni grafikon", + "Common.define.chartData.textStock": "Založni grafikon", "Common.UI.ComboBorderSize.txtNoBorders": "Ni mej", "Common.UI.ComboBorderSizeEditable.txtNoBorders": "Ni mej", "Common.UI.ComboDataView.emptyComboText": "Ni slogov", @@ -586,18 +593,11 @@ "DE.Controllers.Toolbar.txtSymbol_xsi": "Xi", "DE.Controllers.Toolbar.txtSymbol_zeta": "Zeta", "DE.Views.ChartSettings.textAdvanced": "Prikaži napredne nastavitve", - "DE.Views.ChartSettings.textArea": "Ploščinski grafikon", - "DE.Views.ChartSettings.textBar": "Stolpični grafikon", "DE.Views.ChartSettings.textChartType": "Spremeni vrsto razpredelnice", - "DE.Views.ChartSettings.textColumn": "Stolpični grafikon", "DE.Views.ChartSettings.textEditData": "Uredi podatke", "DE.Views.ChartSettings.textHeight": "Višina", - "DE.Views.ChartSettings.textLine": "Vrstični grafikon", "DE.Views.ChartSettings.textOriginalSize": "Privzeta velikost", - "DE.Views.ChartSettings.textPie": "Tortni grafikon", - "DE.Views.ChartSettings.textPoint": "Točkovni grafikon", "DE.Views.ChartSettings.textSize": "Velikost", - "DE.Views.ChartSettings.textStock": "Založni grafikon", "DE.Views.ChartSettings.textStyle": "Slog", "DE.Views.ChartSettings.textUndock": "Odklopi s plošče", "DE.Views.ChartSettings.textWidth": "Širina", @@ -1304,12 +1304,9 @@ "DE.Views.Toolbar.mniImageFromFile": "Slika z datoteke", "DE.Views.Toolbar.mniImageFromUrl": "Slika z URL", "DE.Views.Toolbar.strMenuNoFill": "Ni polnila", - "DE.Views.Toolbar.textArea": "Ploščinski grafikon", "DE.Views.Toolbar.textAutoColor": "Samodejen", - "DE.Views.Toolbar.textBar": "Stolpični grafikon", "DE.Views.Toolbar.textBold": "Krepko", "DE.Views.Toolbar.textBottom": "Bottom: ", - "DE.Views.Toolbar.textColumn": "Stolpični grafikon", "DE.Views.Toolbar.textColumnsLeft": "Left", "DE.Views.Toolbar.textColumnsOne": "One", "DE.Views.Toolbar.textColumnsRight": "Right", @@ -1325,7 +1322,6 @@ "DE.Views.Toolbar.textInText": "v Besedilu", "DE.Views.Toolbar.textItalic": "Poševno", "DE.Views.Toolbar.textLeft": "Left: ", - "DE.Views.Toolbar.textLine": "Vrstični grafikon", "DE.Views.Toolbar.textMarginsLast": "Last Custom", "DE.Views.Toolbar.textMarginsModerate": "Moderate", "DE.Views.Toolbar.textMarginsNarrow": "Narrow", @@ -1337,10 +1333,7 @@ "DE.Views.Toolbar.textOddPage": "Čudna stran", "DE.Views.Toolbar.textPageMarginsCustom": "Custom margins", "DE.Views.Toolbar.textPageSizeCustom": "Custom Page Size", - "DE.Views.Toolbar.textPie": "Tortni grafikon", - "DE.Views.Toolbar.textPoint": "Točkovni grafikon", "DE.Views.Toolbar.textRight": "Right: ", - "DE.Views.Toolbar.textStock": "Založni grafikon", "DE.Views.Toolbar.textStrikeout": "Prečrtaj", "DE.Views.Toolbar.textStyleMenuDelete": "Delete style", "DE.Views.Toolbar.textStyleMenuDeleteAll": "Delete all custom styles", diff --git a/apps/documenteditor/main/locale/tr.json b/apps/documenteditor/main/locale/tr.json index ca868bb43..bcd3daabe 100644 --- a/apps/documenteditor/main/locale/tr.json +++ b/apps/documenteditor/main/locale/tr.json @@ -63,6 +63,14 @@ "Common.Controllers.ReviewChanges.textTabs": "Change tabs", "Common.Controllers.ReviewChanges.textUnderline": "Underline", "Common.Controllers.ReviewChanges.textWidow": "Widow control", + "Common.define.chartData.textArea": "Bölge Grafiği", + "Common.define.chartData.textBar": "Çubuk grafik", + "Common.define.chartData.textColumn": "Sütun grafik", + "Common.define.chartData.textLine": "Çizgi grafiği", + "Common.define.chartData.textPie": "Dilim grafik", + "Common.define.chartData.textPoint": "Nokta grafiği", + "Common.define.chartData.textStock": "Stok Grafiği", + "Common.define.chartData.textSurface": "Yüzey", "Common.UI.ComboBorderSize.txtNoBorders": "Sınır yok", "Common.UI.ComboBorderSizeEditable.txtNoBorders": "Sınır yok", "Common.UI.ComboDataView.emptyComboText": "Stil yok", @@ -722,20 +730,12 @@ "DE.Views.BookmarksDialog.textDelete": "Sil", "DE.Views.BookmarksDialog.textName": "İsim", "DE.Views.ChartSettings.textAdvanced": "Gelişmiş ayarları göster", - "DE.Views.ChartSettings.textArea": "Bölge Grafiği", - "DE.Views.ChartSettings.textBar": "Çubuk grafik", "DE.Views.ChartSettings.textChartType": "Grafik Tipini Değiştir", - "DE.Views.ChartSettings.textColumn": "Sütun grafik", "DE.Views.ChartSettings.textEditData": "Veri düzenle", "DE.Views.ChartSettings.textHeight": "Yükseklik", - "DE.Views.ChartSettings.textLine": "Çizgi grafiği", "DE.Views.ChartSettings.textOriginalSize": "Varsayılan Boyut", - "DE.Views.ChartSettings.textPie": "Dilim grafik", - "DE.Views.ChartSettings.textPoint": "Nokta grafiği", "DE.Views.ChartSettings.textSize": "Boyut", - "DE.Views.ChartSettings.textStock": "Stok Grafiği", "DE.Views.ChartSettings.textStyle": "Stil", - "DE.Views.ChartSettings.textSurface": "Yüzey", "DE.Views.ChartSettings.textUndock": "Panelden çıkar", "DE.Views.ChartSettings.textWidth": "Genişlik", "DE.Views.ChartSettings.textWrap": "Kaydırma Stili", @@ -1552,13 +1552,9 @@ "DE.Views.Toolbar.mniImageFromFile": "Dosyadan resim", "DE.Views.Toolbar.mniImageFromUrl": "URL'den resim", "DE.Views.Toolbar.strMenuNoFill": "Dolgu Yok", - "DE.Views.Toolbar.textArea": "Bölge Grafiği", "DE.Views.Toolbar.textAutoColor": "Otomatik", - "DE.Views.Toolbar.textBar": "Çubuk grafik", "DE.Views.Toolbar.textBold": "Kalın", "DE.Views.Toolbar.textBottom": "Bottom: ", - "DE.Views.Toolbar.textCharts": "Grafikler", - "DE.Views.Toolbar.textColumn": "Sütun grafik", "DE.Views.Toolbar.textColumnsCustom": "Özel Sütunlar", "DE.Views.Toolbar.textColumnsLeft": "Left", "DE.Views.Toolbar.textColumnsOne": "One", @@ -1577,7 +1573,6 @@ "DE.Views.Toolbar.textItalic": "İtalik", "DE.Views.Toolbar.textLandscape": "Yatay", "DE.Views.Toolbar.textLeft": "Left: ", - "DE.Views.Toolbar.textLine": "Çizgi grafiği", "DE.Views.Toolbar.textMarginsLast": "Last Custom", "DE.Views.Toolbar.textMarginsModerate": "Moderate", "DE.Views.Toolbar.textMarginsNarrow": "Narrow", @@ -1590,11 +1585,8 @@ "DE.Views.Toolbar.textOddPage": "Tek Sayfa", "DE.Views.Toolbar.textPageMarginsCustom": "Custom margins", "DE.Views.Toolbar.textPageSizeCustom": "Custom Page Size", - "DE.Views.Toolbar.textPie": "Dilim grafik", - "DE.Views.Toolbar.textPoint": "Nokta grafiği", "DE.Views.Toolbar.textPortrait": "Dikey", "DE.Views.Toolbar.textRight": "Right: ", - "DE.Views.Toolbar.textStock": "Stok Grafiği", "DE.Views.Toolbar.textStrikeout": "Üstü çizili", "DE.Views.Toolbar.textStyleMenuDelete": "Delete style", "DE.Views.Toolbar.textStyleMenuDeleteAll": "Delete all custom styles", @@ -1604,7 +1596,6 @@ "DE.Views.Toolbar.textStyleMenuUpdate": "Update from selection", "DE.Views.Toolbar.textSubscript": "Altsimge", "DE.Views.Toolbar.textSuperscript": "Üstsimge", - "DE.Views.Toolbar.textSurface": "Yüzey", "DE.Views.Toolbar.textTabFile": "Dosya", "DE.Views.Toolbar.textTabHome": "Ana Sayfa", "DE.Views.Toolbar.textTabInsert": "Ekle", diff --git a/apps/documenteditor/main/locale/uk.json b/apps/documenteditor/main/locale/uk.json index 05443f36f..92ce612ed 100644 --- a/apps/documenteditor/main/locale/uk.json +++ b/apps/documenteditor/main/locale/uk.json @@ -63,6 +63,14 @@ "Common.Controllers.ReviewChanges.textTabs": "Змінити вкладки", "Common.Controllers.ReviewChanges.textUnderline": "Підкреслений", "Common.Controllers.ReviewChanges.textWidow": "Контроль над", + "Common.define.chartData.textArea": "Площа", + "Common.define.chartData.textBar": "Вставити", + "Common.define.chartData.textColumn": "Колона", + "Common.define.chartData.textLine": "Лінія", + "Common.define.chartData.textPie": "Пиріг", + "Common.define.chartData.textPoint": "XY (розсіювання)", + "Common.define.chartData.textStock": "Запас", + "Common.define.chartData.textSurface": "Поверхня", "Common.UI.ComboBorderSize.txtNoBorders": "Немає кордонів", "Common.UI.ComboBorderSizeEditable.txtNoBorders": "Немає кордонів", "Common.UI.ComboDataView.emptyComboText": "Немає стилів", @@ -689,20 +697,12 @@ "DE.Controllers.Toolbar.txtSymbol_xsi": "ксі", "DE.Controllers.Toolbar.txtSymbol_zeta": "Зета", "DE.Views.ChartSettings.textAdvanced": "Показати додаткові налаштування", - "DE.Views.ChartSettings.textArea": "Площа", - "DE.Views.ChartSettings.textBar": "Вставити", "DE.Views.ChartSettings.textChartType": "Змінити тип діаграми", - "DE.Views.ChartSettings.textColumn": "Колона", "DE.Views.ChartSettings.textEditData": "Редагувати дату", "DE.Views.ChartSettings.textHeight": "Висота", - "DE.Views.ChartSettings.textLine": "Лінія", "DE.Views.ChartSettings.textOriginalSize": "За замовчуванням", - "DE.Views.ChartSettings.textPie": "Пиріг", - "DE.Views.ChartSettings.textPoint": "XY (розсіювання)", "DE.Views.ChartSettings.textSize": "Розмір", - "DE.Views.ChartSettings.textStock": "Запас", "DE.Views.ChartSettings.textStyle": "Стиль", - "DE.Views.ChartSettings.textSurface": "Поверхня", "DE.Views.ChartSettings.textUndock": "Скасувати з панелі", "DE.Views.ChartSettings.textWidth": "Ширина", "DE.Views.ChartSettings.textWrap": "Стиль упаковки", @@ -1508,13 +1508,9 @@ "DE.Views.Toolbar.mniImageFromFile": "Картинка з файлу", "DE.Views.Toolbar.mniImageFromUrl": "Зображення з URL", "DE.Views.Toolbar.strMenuNoFill": "Немає заповнення", - "DE.Views.Toolbar.textArea": "Площа", "DE.Views.Toolbar.textAutoColor": "Автоматично", - "DE.Views.Toolbar.textBar": "Риска", "DE.Views.Toolbar.textBold": "Жирний", "DE.Views.Toolbar.textBottom": "Внизу:", - "DE.Views.Toolbar.textCharts": "Діаграми", - "DE.Views.Toolbar.textColumn": "Колона", "DE.Views.Toolbar.textColumnsCustom": "Спеціальні стовпці", "DE.Views.Toolbar.textColumnsLeft": "Лівий", "DE.Views.Toolbar.textColumnsOne": "Один", @@ -1533,7 +1529,6 @@ "DE.Views.Toolbar.textItalic": "Курсив", "DE.Views.Toolbar.textLandscape": "ландшафт", "DE.Views.Toolbar.textLeft": "Вліво:", - "DE.Views.Toolbar.textLine": "Лінія", "DE.Views.Toolbar.textMarginsLast": "Останній користувач", "DE.Views.Toolbar.textMarginsModerate": "Помірний", "DE.Views.Toolbar.textMarginsNarrow": "Вузький", @@ -1546,11 +1541,8 @@ "DE.Views.Toolbar.textOddPage": "Непарна сторінка", "DE.Views.Toolbar.textPageMarginsCustom": "Користувацькі поля", "DE.Views.Toolbar.textPageSizeCustom": "Спеціальний розмір сторінки", - "DE.Views.Toolbar.textPie": "Пиріг", - "DE.Views.Toolbar.textPoint": "XY (розсіювання)", "DE.Views.Toolbar.textPortrait": "Портрет", "DE.Views.Toolbar.textRight": "Право:", - "DE.Views.Toolbar.textStock": "Запас", "DE.Views.Toolbar.textStrikeout": "Викреслити", "DE.Views.Toolbar.textStyleMenuDelete": "Видалити стиль", "DE.Views.Toolbar.textStyleMenuDeleteAll": "Видалити всі власні стилі", @@ -1560,7 +1552,6 @@ "DE.Views.Toolbar.textStyleMenuUpdate": "Оновлення від вибору", "DE.Views.Toolbar.textSubscript": "Підрядковий", "DE.Views.Toolbar.textSuperscript": "Надрядковий", - "DE.Views.Toolbar.textSurface": "Поверхня", "DE.Views.Toolbar.textTabCollaboration": "Співпраця", "DE.Views.Toolbar.textTabFile": "Файл", "DE.Views.Toolbar.textTabHome": "Головна", diff --git a/apps/documenteditor/main/locale/vi.json b/apps/documenteditor/main/locale/vi.json index 011501c93..9042b2260 100644 --- a/apps/documenteditor/main/locale/vi.json +++ b/apps/documenteditor/main/locale/vi.json @@ -63,6 +63,14 @@ "Common.Controllers.ReviewChanges.textTabs": "Thay đổi tab", "Common.Controllers.ReviewChanges.textUnderline": "Gạch chân", "Common.Controllers.ReviewChanges.textWidow": "Kiểm soát dòng lẻ cuối trang trước", + "Common.define.chartData.textArea": "Vùng", + "Common.define.chartData.textBar": "Gạch", + "Common.define.chartData.textColumn": "Cột", + "Common.define.chartData.textLine": "Đường kẻ", + "Common.define.chartData.textPie": "Hình bánh", + "Common.define.chartData.textPoint": "XY (Phân tán)", + "Common.define.chartData.textStock": "Cổ phiếu", + "Common.define.chartData.textSurface": "Bề mặt", "Common.UI.ComboBorderSize.txtNoBorders": "Không viền", "Common.UI.ComboBorderSizeEditable.txtNoBorders": "Không viền", "Common.UI.ComboDataView.emptyComboText": "Không có kiểu", @@ -686,20 +694,12 @@ "DE.Controllers.Toolbar.txtSymbol_xsi": "Xi", "DE.Controllers.Toolbar.txtSymbol_zeta": "Zeta", "DE.Views.ChartSettings.textAdvanced": "Hiển thị Cài đặt Nâng cao", - "DE.Views.ChartSettings.textArea": "Vùng", - "DE.Views.ChartSettings.textBar": "Gạch", "DE.Views.ChartSettings.textChartType": "Thay đổi Loại biểu đồ", - "DE.Views.ChartSettings.textColumn": "Cột", "DE.Views.ChartSettings.textEditData": "Chỉnh sửa Dữ liệu", "DE.Views.ChartSettings.textHeight": "Chiều cao", - "DE.Views.ChartSettings.textLine": "Đường kẻ", "DE.Views.ChartSettings.textOriginalSize": "Kích thước mặc định", - "DE.Views.ChartSettings.textPie": "Hình bánh", - "DE.Views.ChartSettings.textPoint": "XY (Phân tán)", "DE.Views.ChartSettings.textSize": "Kích thước", - "DE.Views.ChartSettings.textStock": "Cổ phiếu", "DE.Views.ChartSettings.textStyle": "Kiểu", - "DE.Views.ChartSettings.textSurface": "Bề mặt", "DE.Views.ChartSettings.textUndock": "Tháo khỏi bảng điều khiển", "DE.Views.ChartSettings.textWidth": "Chiều rộng", "DE.Views.ChartSettings.textWrap": "Kiểu ngắt dòng", @@ -1492,13 +1492,9 @@ "DE.Views.Toolbar.mniImageFromFile": "Hình ảnh từ file", "DE.Views.Toolbar.mniImageFromUrl": "Hình ảnh từ URL", "DE.Views.Toolbar.strMenuNoFill": "Không đổ màu", - "DE.Views.Toolbar.textArea": "Vùng", "DE.Views.Toolbar.textAutoColor": "Tự động", - "DE.Views.Toolbar.textBar": "Gạch", "DE.Views.Toolbar.textBold": "Đậm", "DE.Views.Toolbar.textBottom": "Dưới cùng:", - "DE.Views.Toolbar.textCharts": "Biểu đồ", - "DE.Views.Toolbar.textColumn": "Cột", "DE.Views.Toolbar.textColumnsCustom": "Tùy chỉnh cột", "DE.Views.Toolbar.textColumnsLeft": "Trái", "DE.Views.Toolbar.textColumnsOne": "Một", @@ -1517,7 +1513,6 @@ "DE.Views.Toolbar.textItalic": "Nghiêng", "DE.Views.Toolbar.textLandscape": "Nằm ngang", "DE.Views.Toolbar.textLeft": "Trái:", - "DE.Views.Toolbar.textLine": "Đường kẻ", "DE.Views.Toolbar.textMarginsLast": "Tuỳ chỉnh cuối cùng", "DE.Views.Toolbar.textMarginsModerate": "Vừa phải", "DE.Views.Toolbar.textMarginsNarrow": "Thu hẹp", @@ -1530,11 +1525,8 @@ "DE.Views.Toolbar.textOddPage": "Trang lẻ", "DE.Views.Toolbar.textPageMarginsCustom": "Tùy chỉnh lề", "DE.Views.Toolbar.textPageSizeCustom": "Tùy chỉnh kích thước trang", - "DE.Views.Toolbar.textPie": "Hình bánh", - "DE.Views.Toolbar.textPoint": "XY (Phân tán)", "DE.Views.Toolbar.textPortrait": "Thẳng đứng", "DE.Views.Toolbar.textRight": "Bên phải:", - "DE.Views.Toolbar.textStock": "Cổ phiếu", "DE.Views.Toolbar.textStrikeout": "Gạch bỏ", "DE.Views.Toolbar.textStyleMenuDelete": "Xóa kiểu", "DE.Views.Toolbar.textStyleMenuDeleteAll": "Xóa tất cả kiểu tùy chỉnh", @@ -1544,7 +1536,6 @@ "DE.Views.Toolbar.textStyleMenuUpdate": "Cập nhật từ lựa chọn", "DE.Views.Toolbar.textSubscript": "Chỉ số dưới", "DE.Views.Toolbar.textSuperscript": "Chỉ số trên", - "DE.Views.Toolbar.textSurface": "Bề mặt", "DE.Views.Toolbar.textTabFile": "File", "DE.Views.Toolbar.textTabHome": "Trang chủ", "DE.Views.Toolbar.textTabInsert": "Chèn", diff --git a/apps/documenteditor/main/locale/zh.json b/apps/documenteditor/main/locale/zh.json index 39a366b6c..601d4ccfc 100644 --- a/apps/documenteditor/main/locale/zh.json +++ b/apps/documenteditor/main/locale/zh.json @@ -69,6 +69,14 @@ "Common.Controllers.ReviewChanges.textTabs": "更改选项卡", "Common.Controllers.ReviewChanges.textUnderline": "下划线", "Common.Controllers.ReviewChanges.textWidow": "视窗控制", + "Common.define.chartData.textArea": "区域", + "Common.define.chartData.textBar": "条", + "Common.define.chartData.textColumn": "列", + "Common.define.chartData.textLine": "线", + "Common.define.chartData.textPie": "派", + "Common.define.chartData.textPoint": "XY（散射）", + "Common.define.chartData.textStock": "股票", + "Common.define.chartData.textSurface": "平面", "Common.UI.ComboBorderSize.txtNoBorders": "没有边框", "Common.UI.ComboBorderSizeEditable.txtNoBorders": "没有边框", "Common.UI.ComboDataView.emptyComboText": "没有风格", @@ -1000,20 +1008,12 @@ "DE.Views.BookmarksDialog.textTitle": "书签", "DE.Views.BookmarksDialog.txtInvalidName": "书签名称只能包含字母、数字和下划线，并且应以字母开头", "DE.Views.ChartSettings.textAdvanced": "显示高级设置", - "DE.Views.ChartSettings.textArea": "区域", - "DE.Views.ChartSettings.textBar": "条", "DE.Views.ChartSettings.textChartType": "更改图表类型", - "DE.Views.ChartSettings.textColumn": "列", "DE.Views.ChartSettings.textEditData": "编辑数据", "DE.Views.ChartSettings.textHeight": "高度", - "DE.Views.ChartSettings.textLine": "线", "DE.Views.ChartSettings.textOriginalSize": "默认大小", - "DE.Views.ChartSettings.textPie": "派", - "DE.Views.ChartSettings.textPoint": "XY（散射）", "DE.Views.ChartSettings.textSize": "大小", - "DE.Views.ChartSettings.textStock": "股票", "DE.Views.ChartSettings.textStyle": "类型", - "DE.Views.ChartSettings.textSurface": "平面", "DE.Views.ChartSettings.textUndock": "离开面板", "DE.Views.ChartSettings.textWidth": "宽度", "DE.Views.ChartSettings.textWrap": "包裹风格", @@ -1994,13 +1994,9 @@ "DE.Views.Toolbar.mniImageFromStorage": "图片来自存储", "DE.Views.Toolbar.mniImageFromUrl": "图片来自网络", "DE.Views.Toolbar.strMenuNoFill": "没有填充", - "DE.Views.Toolbar.textArea": "区域", "DE.Views.Toolbar.textAutoColor": "自动化的", - "DE.Views.Toolbar.textBar": "条", "DE.Views.Toolbar.textBold": "加粗", "DE.Views.Toolbar.textBottom": "底部： ", - "DE.Views.Toolbar.textCharts": "图表", - "DE.Views.Toolbar.textColumn": "列", "DE.Views.Toolbar.textColumnsCustom": "自定义列", "DE.Views.Toolbar.textColumnsLeft": "左", "DE.Views.Toolbar.textColumnsOne": "一", @@ -2019,7 +2015,6 @@ "DE.Views.Toolbar.textItalic": "斜体", "DE.Views.Toolbar.textLandscape": "横向", "DE.Views.Toolbar.textLeft": "左： ", - "DE.Views.Toolbar.textLine": "线", "DE.Views.Toolbar.textMarginsLast": "最后自定义", "DE.Views.Toolbar.textMarginsModerate": "中等", "DE.Views.Toolbar.textMarginsNarrow": "缩小", @@ -2033,14 +2028,11 @@ "DE.Views.Toolbar.textOddPage": "奇数页", "DE.Views.Toolbar.textPageMarginsCustom": "自定义边距", "DE.Views.Toolbar.textPageSizeCustom": "自定义页面大小", - "DE.Views.Toolbar.textPie": "派", "DE.Views.Toolbar.textPlainControl": "插入纯文本内容控件", - "DE.Views.Toolbar.textPoint": "XY (散点图)", "DE.Views.Toolbar.textPortrait": "肖像", "DE.Views.Toolbar.textRemoveControl": "删除内容控件", "DE.Views.Toolbar.textRichControl": "插入多信息文本内容控件", "DE.Views.Toolbar.textRight": "右： ", - "DE.Views.Toolbar.textStock": "股票", "DE.Views.Toolbar.textStrikeout": "加删除线", "DE.Views.Toolbar.textStyleMenuDelete": "删除样式", "DE.Views.Toolbar.textStyleMenuDeleteAll": "删除所有自定义样式", @@ -2050,7 +2042,6 @@ "DE.Views.Toolbar.textStyleMenuUpdate": "从选择更新", "DE.Views.Toolbar.textSubscript": "下标", "DE.Views.Toolbar.textSuperscript": "上标", - "DE.Views.Toolbar.textSurface": "平面", "DE.Views.Toolbar.textTabCollaboration": "协作", "DE.Views.Toolbar.textTabFile": "文件", "DE.Views.Toolbar.textTabHome": "主页", diff --git a/apps/presentationeditor/main/locale/bg.json b/apps/presentationeditor/main/locale/bg.json index 576178f73..5ef0fb04d 100644 --- a/apps/presentationeditor/main/locale/bg.json +++ b/apps/presentationeditor/main/locale/bg.json @@ -5,6 +5,15 @@ "Common.Controllers.ExternalDiagramEditor.textClose": "Затвори", "Common.Controllers.ExternalDiagramEditor.warningText": "Обектът е деактивиран, а кой е редактиран от друг потребител.", "Common.Controllers.ExternalDiagramEditor.warningTitle": "Внимание", + "Common.define.chartData.textArea": "Площ", + "Common.define.chartData.textBar": "Бар", + "Common.define.chartData.textColumn": "Колона", + "Common.define.chartData.textLine": "Линия", + "Common.define.chartData.textPie": "Кръгова", + "Common.define.chartData.textPoint": "XY (точкова)", + "Common.define.chartData.textStock": "Борсова", + "Common.define.chartData.textSurface": "Повърхност", + "Common.define.chartData.textCharts": "Диаграми", "Common.UI.ComboBorderSize.txtNoBorders": "Няма граници", "Common.UI.ComboBorderSizeEditable.txtNoBorders": "Няма граници", "Common.UI.ComboDataView.emptyComboText": "Няма стилове", @@ -901,20 +910,12 @@ "PE.Controllers.Viewport.textFitPage": "Плъзгайте се", "PE.Controllers.Viewport.textFitWidth": "Поставя се в ширина", "PE.Views.ChartSettings.textAdvanced": "Показване на разширените настройки", - "PE.Views.ChartSettings.textArea": "Площ", - "PE.Views.ChartSettings.textBar": "Бар", "PE.Views.ChartSettings.textChartType": "Промяна на типа на диаграмата", - "PE.Views.ChartSettings.textColumn": "Колона", "PE.Views.ChartSettings.textEditData": "Редактиране на данни", "PE.Views.ChartSettings.textHeight": "Височина", "PE.Views.ChartSettings.textKeepRatio": "Постоянни пропорции", - "PE.Views.ChartSettings.textLine": "Линия", - "PE.Views.ChartSettings.textPie": "Кръгова", - "PE.Views.ChartSettings.textPoint": "XY (точкова)", "PE.Views.ChartSettings.textSize": "Размер", - "PE.Views.ChartSettings.textStock": "Борсова", "PE.Views.ChartSettings.textStyle": "Стил", - "PE.Views.ChartSettings.textSurface": "Повърхност", "PE.Views.ChartSettings.textWidth": "Ширина", "PE.Views.ChartSettingsAdvanced.textAlt": "Алтернативен текст", "PE.Views.ChartSettingsAdvanced.textAltDescription": "Описание", @@ -1622,20 +1623,13 @@ "PE.Views.Toolbar.textAlignMiddle": "Подравнете текста към средата", "PE.Views.Toolbar.textAlignRight": "Подравняване на текста вдясно", "PE.Views.Toolbar.textAlignTop": "Подравняване на текста до върха", - "PE.Views.Toolbar.textArea": "Площ", "PE.Views.Toolbar.textArrangeBack": "Изпращане до фона", "PE.Views.Toolbar.textArrangeBackward": "Изпращане назад", "PE.Views.Toolbar.textArrangeForward": "Изведи напред", "PE.Views.Toolbar.textArrangeFront": "Доведете до преден план", - "PE.Views.Toolbar.textBar": "Бар", "PE.Views.Toolbar.textBold": "Получер", - "PE.Views.Toolbar.textCharts": "Диаграми", - "PE.Views.Toolbar.textColumn": "Колона", "PE.Views.Toolbar.textItalic": "Курсив", - "PE.Views.Toolbar.textLine": "Линия", "PE.Views.Toolbar.textNewColor": "Цвят по избор", - "PE.Views.Toolbar.textPie": "Кръгова", - "PE.Views.Toolbar.textPoint": "XY (точкова)", "PE.Views.Toolbar.textShapeAlignBottom": "Подравняване отдолу", "PE.Views.Toolbar.textShapeAlignCenter": "Подравняване на центъра", "PE.Views.Toolbar.textShapeAlignLeft": "Подравняване вляво", @@ -1646,11 +1640,9 @@ "PE.Views.Toolbar.textShowCurrent": "Показване от текущата слайд", "PE.Views.Toolbar.textShowPresenterView": "Показване на изгледа на презентатора", "PE.Views.Toolbar.textShowSettings": "Покажи настройките", - "PE.Views.Toolbar.textStock": "Борсова", "PE.Views.Toolbar.textStrikeout": "Зачеркнато", "PE.Views.Toolbar.textSubscript": "Долен", "PE.Views.Toolbar.textSuperscript": "Горен индекс", - "PE.Views.Toolbar.textSurface": "Повърхност", "PE.Views.Toolbar.textTabCollaboration": "Сътрудничество", "PE.Views.Toolbar.textTabFile": "Файл", "PE.Views.Toolbar.textTabHome": "У дома", diff --git a/apps/presentationeditor/main/locale/cs.json b/apps/presentationeditor/main/locale/cs.json index 25e24bc9b..7a5feba4b 100644 --- a/apps/presentationeditor/main/locale/cs.json +++ b/apps/presentationeditor/main/locale/cs.json @@ -5,6 +5,14 @@ "Common.Controllers.ExternalDiagramEditor.textClose": "Zavřít", "Common.Controllers.ExternalDiagramEditor.warningText": "Objekt je vypnut, protože je upravován jiným uživatelem.", "Common.Controllers.ExternalDiagramEditor.warningTitle": "Varování", + "Common.define.chartData.textArea": "Plošný graf", + "Common.define.chartData.textBar": "Pruhový graf", + "Common.define.chartData.textColumn": "Sloupcový graf", + "Common.define.chartData.textLine": "Liniový graf", + "Common.define.chartData.textPie": "Kruhový diagram", + "Common.define.chartData.textPoint": "Bodový graf", + "Common.define.chartData.textStock": "Burzovní graf", + "Common.define.chartData.textSurface": "Povrch", "Common.UI.ComboBorderSize.txtNoBorders": "Bez ohraničení", "Common.UI.ComboBorderSizeEditable.txtNoBorders": "Bez ohraničení", "Common.UI.ComboDataView.emptyComboText": "Žádné styly", @@ -600,20 +608,12 @@ "PE.Controllers.Toolbar.txtSymbol_xsi": "Ksí", "PE.Controllers.Toolbar.txtSymbol_zeta": "Zeta", "PE.Views.ChartSettings.textAdvanced": "Zobrazit pokročilé nastavení", - "PE.Views.ChartSettings.textArea": "Plošný graf", - "PE.Views.ChartSettings.textBar": "Vodorovná čárka", "PE.Views.ChartSettings.textChartType": "Změnit typ grafu", - "PE.Views.ChartSettings.textColumn": "Sloupec", "PE.Views.ChartSettings.textEditData": "Upravit data", "PE.Views.ChartSettings.textHeight": "Výška", "PE.Views.ChartSettings.textKeepRatio": "Konstantní rozměry", - "PE.Views.ChartSettings.textLine": "Čára", - "PE.Views.ChartSettings.textPie": "Kruhový diagram", - "PE.Views.ChartSettings.textPoint": "Bodový graf", "PE.Views.ChartSettings.textSize": "Velikost", - "PE.Views.ChartSettings.textStock": "Akcie", "PE.Views.ChartSettings.textStyle": "Styl", - "PE.Views.ChartSettings.textSurface": "Povrch", "PE.Views.ChartSettings.textWidth": "Šířka", "PE.Views.ChartSettingsAdvanced.textAlt": "Alternativní text", "PE.Views.ChartSettingsAdvanced.textAltDescription": "Popis", @@ -1238,20 +1238,13 @@ "PE.Views.Toolbar.textAlignMiddle": "Zarovnat text doprostřed", "PE.Views.Toolbar.textAlignRight": "Zarovnat text doprava", "PE.Views.Toolbar.textAlignTop": "Zarovnat text nahoru", - "PE.Views.Toolbar.textArea": "Plošný graf", "PE.Views.Toolbar.textArrangeBack": "Přesunout do pozadí", "PE.Views.Toolbar.textArrangeBackward": "Odeslat zpět", "PE.Views.Toolbar.textArrangeForward": "Předložit", "PE.Views.Toolbar.textArrangeFront": "Přenést do popředí", - "PE.Views.Toolbar.textBar": "Vodorovná čárka", "PE.Views.Toolbar.textBold": "Tučně", - "PE.Views.Toolbar.textCharts": "Grafy", - "PE.Views.Toolbar.textColumn": "Sloupec", "PE.Views.Toolbar.textItalic": "Kurzíva", - "PE.Views.Toolbar.textLine": "Čára", "PE.Views.Toolbar.textNewColor": "Vlastní barva", - "PE.Views.Toolbar.textPie": "Kruhový diagram", - "PE.Views.Toolbar.textPoint": "Bodový graf", "PE.Views.Toolbar.textShapeAlignBottom": "Zarovnat dolů", "PE.Views.Toolbar.textShapeAlignCenter": "Zarovnat na střed", "PE.Views.Toolbar.textShapeAlignLeft": "Zarovnat vlevo", @@ -1262,11 +1255,9 @@ "PE.Views.Toolbar.textShowCurrent": "Zobrazit od aktuálního snímku", "PE.Views.Toolbar.textShowPresenterView": "Ukázat zobrazení přednášejícího", "PE.Views.Toolbar.textShowSettings": "Zobrazit nastavení", - "PE.Views.Toolbar.textStock": "Akcie", "PE.Views.Toolbar.textStrikeout": "Přeškrtnout", "PE.Views.Toolbar.textSubscript": "Dolní index", "PE.Views.Toolbar.textSuperscript": "Horní index", - "PE.Views.Toolbar.textSurface": "Povrch", "PE.Views.Toolbar.textTabFile": "Soubor", "PE.Views.Toolbar.textTabHome": "Domů", "PE.Views.Toolbar.textTabInsert": "Vložit", diff --git a/apps/presentationeditor/main/locale/de.json b/apps/presentationeditor/main/locale/de.json index f7205b884..5171ee146 100644 --- a/apps/presentationeditor/main/locale/de.json +++ b/apps/presentationeditor/main/locale/de.json @@ -910,20 +910,12 @@ "PE.Controllers.Viewport.textFitPage": "Folie anpassen", "PE.Controllers.Viewport.textFitWidth": "Breite anpassen", "PE.Views.ChartSettings.textAdvanced": "Erweiterte Einstellungen anzeigen", - "PE.Views.ChartSettings.textArea": "Flächen", - "PE.Views.ChartSettings.textBar": "Balken", "PE.Views.ChartSettings.textChartType": "Diagrammtyp ändern", - "PE.Views.ChartSettings.textColumn": "Spalte", "PE.Views.ChartSettings.textEditData": "Daten ändern", "PE.Views.ChartSettings.textHeight": "Höhe", "PE.Views.ChartSettings.textKeepRatio": "Seitenverhältnis beibehalten", - "PE.Views.ChartSettings.textLine": "Linie", - "PE.Views.ChartSettings.textPie": "Kreis", - "PE.Views.ChartSettings.textPoint": "Punkt (XY)", "PE.Views.ChartSettings.textSize": "Größe", - "PE.Views.ChartSettings.textStock": "Bestand", "PE.Views.ChartSettings.textStyle": "Stil", - "PE.Views.ChartSettings.textSurface": "Oberfläche", "PE.Views.ChartSettings.textWidth": "Breite", "PE.Views.ChartSettingsAdvanced.textAlt": "Der alternative Text", "PE.Views.ChartSettingsAdvanced.textAltDescription": "Beschreibung", @@ -1631,20 +1623,13 @@ "PE.Views.Toolbar.textAlignMiddle": "Text mittig ausrichten", "PE.Views.Toolbar.textAlignRight": "Text rechtsbündig ausrichten", "PE.Views.Toolbar.textAlignTop": "Text am oberen Rand ausrichten", - "PE.Views.Toolbar.textArea": "Flächen", "PE.Views.Toolbar.textArrangeBack": "In den Hintergrund", "PE.Views.Toolbar.textArrangeBackward": "Eine Ebene nach hinten", "PE.Views.Toolbar.textArrangeForward": "Eine Ebene nach vorne", "PE.Views.Toolbar.textArrangeFront": "In den Vordergrund ", - "PE.Views.Toolbar.textBar": "Balken", "PE.Views.Toolbar.textBold": "Fett", - "PE.Views.Toolbar.textCharts": "Diagramme", - "PE.Views.Toolbar.textColumn": "Spalte", "PE.Views.Toolbar.textItalic": "Kursiv", - "PE.Views.Toolbar.textLine": "Linie", "PE.Views.Toolbar.textNewColor": "Benutzerdefinierte Farbe", - "PE.Views.Toolbar.textPie": "Kreis", - "PE.Views.Toolbar.textPoint": "Punkt (XY)", "PE.Views.Toolbar.textShapeAlignBottom": "Unten ausrichten", "PE.Views.Toolbar.textShapeAlignCenter": "Zentriert ausrichten", "PE.Views.Toolbar.textShapeAlignLeft": "Links ausrichten", @@ -1655,11 +1640,9 @@ "PE.Views.Toolbar.textShowCurrent": "Von aktueller Folie abschauen", "PE.Views.Toolbar.textShowPresenterView": "Referentenansicht", "PE.Views.Toolbar.textShowSettings": "Einstellungen anzeigen", - "PE.Views.Toolbar.textStock": "Bestand", "PE.Views.Toolbar.textStrikeout": "Durchgestrichen", "PE.Views.Toolbar.textSubscript": "Tiefgestellt", "PE.Views.Toolbar.textSuperscript": "Hochgestellt", - "PE.Views.Toolbar.textSurface": "Oberfläche", "PE.Views.Toolbar.textTabCollaboration": "Zusammenarbeit", "PE.Views.Toolbar.textTabFile": "Datei", "PE.Views.Toolbar.textTabHome": "Startseite", diff --git a/apps/presentationeditor/main/locale/en.json b/apps/presentationeditor/main/locale/en.json index a2332c607..9af942158 100644 --- a/apps/presentationeditor/main/locale/en.json +++ b/apps/presentationeditor/main/locale/en.json @@ -161,6 +161,8 @@ "Common.Views.ReviewChanges.strStrictDesc": "Use the 'Save' button to sync the changes you and others make.", "Common.Views.ReviewChanges.tipAcceptCurrent": "Accept current change", "Common.Views.ReviewChanges.tipCoAuthMode": "Set co-editing mode", + "Common.Views.ReviewChanges.tipCommentRem": "Remove comments", + "Common.Views.ReviewChanges.tipCommentRemCurrent": "Remove current comments", "Common.Views.ReviewChanges.tipHistory": "Show version history", "Common.Views.ReviewChanges.tipRejectCurrent": "Reject current change", "Common.Views.ReviewChanges.tipReview": "Track changes", @@ -175,6 +177,11 @@ "Common.Views.ReviewChanges.txtChat": "Chat", "Common.Views.ReviewChanges.txtClose": "Close", "Common.Views.ReviewChanges.txtCoAuthMode": "Co-editing Mode", + "Common.Views.ReviewChanges.txtCommentRemAll": "Remove All Comments", + "Common.Views.ReviewChanges.txtCommentRemCurrent": "Remove Current Comments", + "Common.Views.ReviewChanges.txtCommentRemMy": "Remove My Comments", + "Common.Views.ReviewChanges.txtCommentRemMyCurrent": "Remove My Current Comments", + "Common.Views.ReviewChanges.txtCommentRemove": "Remove", "Common.Views.ReviewChanges.txtDocLang": "Language", "Common.Views.ReviewChanges.txtFinal": "All changes accepted (Preview)", "Common.Views.ReviewChanges.txtFinalCap": "Final", @@ -193,13 +200,6 @@ "Common.Views.ReviewChanges.txtSpelling": "Spell Checking", "Common.Views.ReviewChanges.txtTurnon": "Track Changes", "Common.Views.ReviewChanges.txtView": "Display Mode", - "Common.Views.ReviewChanges.txtCommentRemove": "Remove", - "Common.Views.ReviewChanges.tipCommentRemCurrent": "Remove current comments", - "Common.Views.ReviewChanges.tipCommentRem": "Remove comments", - "Common.Views.ReviewChanges.txtCommentRemCurrent": "Remove Current Comments", - "Common.Views.ReviewChanges.txtCommentRemMyCurrent": "Remove My Current Comments", - "Common.Views.ReviewChanges.txtCommentRemMy": "Remove My Comments", - "Common.Views.ReviewChanges.txtCommentRemAll": "Remove All Comments", "Common.Views.ReviewPopover.textAdd": "Add", "Common.Views.ReviewPopover.textAddReply": "Add Reply", "Common.Views.ReviewPopover.textCancel": "Cancel", @@ -236,11 +236,11 @@ "Common.Views.SignSettingsDialog.textShowDate": "Show sign date in signature line", "Common.Views.SignSettingsDialog.textTitle": "Signature Setup", "Common.Views.SignSettingsDialog.txtEmpty": "This field is required", - "Common.Views.SymbolTableDialog.textTitle": "Symbol", + "Common.Views.SymbolTableDialog.textCode": "Unicode HEX value", "Common.Views.SymbolTableDialog.textFont": "Font", "Common.Views.SymbolTableDialog.textRange": "Range", "Common.Views.SymbolTableDialog.textRecent": "Recently used symbols", - "Common.Views.SymbolTableDialog.textCode": "Unicode HEX value", + "Common.Views.SymbolTableDialog.textTitle": "Symbol", "PE.Controllers.LeftMenu.newDocumentTitle": "Unnamed presentation", "PE.Controllers.LeftMenu.notcriticalErrorTitle": "Warning", "PE.Controllers.LeftMenu.requestEditRightsText": "Requesting editing rights...", @@ -281,6 +281,7 @@ "PE.Controllers.Main.errorToken": "The document security token is not correctly formed.
Please contact your Document Server administrator.", "PE.Controllers.Main.errorTokenExpire": "The document security token has expired.
Please contact your Document Server administrator.", "PE.Controllers.Main.errorUpdateVersion": "The file version has been changed. The page will be reloaded.", + "PE.Controllers.Main.errorUpdateVersionOnDisconnect": "Internet connection has been restored, and the file version has been changed.
Before you can continue working, you need to download the file or copy its content to make sure nothing is lost, and then reload this page.", "PE.Controllers.Main.errorUserDrop": "The file cannot be accessed right now.", "PE.Controllers.Main.errorUsersExceed": "The number of users allowed by the pricing plan was exceeded", "PE.Controllers.Main.errorViewerDisconnect": "Connection is lost. You can still view the document,
but will not be able to download or print it until the connection is restored and page is reloaded.", @@ -595,7 +596,6 @@ "PE.Controllers.Main.warnNoLicense": "This version of %1 editors has certain limitations for concurrent connections to the document server.
If you need more please consider purchasing a commercial license.", "PE.Controllers.Main.warnNoLicenseUsers": "This version of %1 editors has certain limitations for concurrent users.
If you need more please consider purchasing a commercial license.", "PE.Controllers.Main.warnProcessRightsChange": "You have been denied the right to edit the file.", - "PE.Controllers.Main.errorUpdateVersionOnDisconnect": "Internet connection has been restored, and the file version has been changed.
Before you can continue working, you need to download the file or copy its content to make sure nothing is lost, and then reload this page.", "PE.Controllers.Statusbar.zoomText": "Zoom {0}%", "PE.Controllers.Toolbar.confirmAddFontName": "The font you are going to save is not available on the current device.
The text style will be displayed using one of the system fonts, the saved font will be used when it is available.
Do you want to continue?", "PE.Controllers.Toolbar.textAccent": "Accents", @@ -604,6 +604,7 @@ "PE.Controllers.Toolbar.textFontSizeErr": "The entered value is incorrect.
Please enter a numeric value between 1 and 100", "PE.Controllers.Toolbar.textFraction": "Fractions", "PE.Controllers.Toolbar.textFunction": "Functions", + "PE.Controllers.Toolbar.textInsert": "Insert", "PE.Controllers.Toolbar.textIntegral": "Integrals", "PE.Controllers.Toolbar.textLargeOperator": "Large Operators", "PE.Controllers.Toolbar.textLimitAndLog": "Limits And Logarithms", @@ -929,24 +930,15 @@ "PE.Controllers.Toolbar.txtSymbol_vdots": "Vertical ellipsis", "PE.Controllers.Toolbar.txtSymbol_xsi": "Xi", "PE.Controllers.Toolbar.txtSymbol_zeta": "Zeta", - "PE.Controllers.Toolbar.textInsert": "Insert", "PE.Controllers.Viewport.textFitPage": "Fit to Slide", "PE.Controllers.Viewport.textFitWidth": "Fit to Width", "PE.Views.ChartSettings.textAdvanced": "Show advanced settings", - "del_PE.Views.ChartSettings.textArea": "Area", - "del_PE.Views.ChartSettings.textBar": "Bar", "PE.Views.ChartSettings.textChartType": "Change Chart Type", - "del_PE.Views.ChartSettings.textColumn": "Column", "PE.Views.ChartSettings.textEditData": "Edit Data", "PE.Views.ChartSettings.textHeight": "Height", "PE.Views.ChartSettings.textKeepRatio": "Constant proportions", - "del_PE.Views.ChartSettings.textLine": "Line", - "del_PE.Views.ChartSettings.textPie": "Pie", - "del_PE.Views.ChartSettings.textPoint": "XY (Scatter)", "PE.Views.ChartSettings.textSize": "Size", - "del_PE.Views.ChartSettings.textStock": "Stock", "PE.Views.ChartSettings.textStyle": "Style", - "del_PE.Views.ChartSettings.textSurface": "Surface", "PE.Views.ChartSettings.textWidth": "Width", "PE.Views.ChartSettingsAdvanced.textAlt": "Alternative Text", "PE.Views.ChartSettingsAdvanced.textAltDescription": "Description", @@ -1315,6 +1307,11 @@ "PE.Views.LeftMenu.tipTitles": "Titles", "PE.Views.LeftMenu.txtDeveloper": "DEVELOPER MODE", "PE.Views.LeftMenu.txtTrial": "TRIAL MODE", + "del_PE.Views.ListSettingsDialog.textNewColor": "Add New Custom Color", + "del_PE.Views.ListSettingsDialog.txtColor": "Color", + "del_PE.Views.ListSettingsDialog.txtOfText": "% of text", + "del_PE.Views.ListSettingsDialog.txtSize": "Size", + "del_PE.Views.ListSettingsDialog.txtTitle": "List Settings", "PE.Views.ParagraphSettings.strLineHeight": "Line Spacing", "PE.Views.ParagraphSettings.strParagraphSpacing": "Paragraph Spacing", "PE.Views.ParagraphSettings.strSpacingAfter": "After", @@ -1692,6 +1689,7 @@ "PE.Views.Toolbar.capBtnComment": "Comment", "PE.Views.Toolbar.capBtnDateTime": "Date & Time", "PE.Views.Toolbar.capBtnInsHeader": "Header/Footer", + "PE.Views.Toolbar.capBtnInsSymbol": "Symbol", "PE.Views.Toolbar.capBtnSlideNum": "Slide Number", "PE.Views.Toolbar.capInsertChart": "Chart", "PE.Views.Toolbar.capInsertEquation": "Equation", @@ -1717,21 +1715,14 @@ "PE.Views.Toolbar.textAlignMiddle": "Align text to the middle", "PE.Views.Toolbar.textAlignRight": "Align text right", "PE.Views.Toolbar.textAlignTop": "Align text to the top", - "del_PE.Views.Toolbar.textArea": "Area", "PE.Views.Toolbar.textArrangeBack": "Send to Background", "PE.Views.Toolbar.textArrangeBackward": "Send Backward", "PE.Views.Toolbar.textArrangeForward": "Bring Forward", "PE.Views.Toolbar.textArrangeFront": "Bring to Foreground", - "del_PE.Views.Toolbar.textBar": "Bar", "PE.Views.Toolbar.textBold": "Bold", - "del_PE.Views.Toolbar.textCharts": "Charts", - "del_PE.Views.Toolbar.textColumn": "Column", "PE.Views.Toolbar.textItalic": "Italic", - "del_PE.Views.Toolbar.textLine": "Line", "PE.Views.Toolbar.textListSettings": "List Settings", "PE.Views.Toolbar.textNewColor": "Custom Color", - "del_PE.Views.Toolbar.textPie": "Pie", - "del_PE.Views.Toolbar.textPoint": "XY (Scatter)", "PE.Views.Toolbar.textShapeAlignBottom": "Align Bottom", "PE.Views.Toolbar.textShapeAlignCenter": "Align Center", "PE.Views.Toolbar.textShapeAlignLeft": "Align Left", @@ -1742,11 +1733,9 @@ "PE.Views.Toolbar.textShowCurrent": "Show from Current Slide", "PE.Views.Toolbar.textShowPresenterView": "Show Presenter View", "PE.Views.Toolbar.textShowSettings": "Show Settings", - "del_PE.Views.Toolbar.textStock": "Stock", "PE.Views.Toolbar.textStrikeout": "Strikethrough", "PE.Views.Toolbar.textSubscript": "Subscript", "PE.Views.Toolbar.textSuperscript": "Superscript", - "del_PE.Views.Toolbar.textSurface": "Surface", "PE.Views.Toolbar.textTabCollaboration": "Collaboration", "PE.Views.Toolbar.textTabFile": "File", "PE.Views.Toolbar.textTabHome": "Home", @@ -1775,6 +1764,7 @@ "PE.Views.Toolbar.tipInsertHyperlink": "Add hyperlink", "PE.Views.Toolbar.tipInsertImage": "Insert image", "PE.Views.Toolbar.tipInsertShape": "Insert autoshape", + "PE.Views.Toolbar.tipInsertSymbol": "Insert symbol", "PE.Views.Toolbar.tipInsertTable": "Insert table", "PE.Views.Toolbar.tipInsertText": "Insert text box", "PE.Views.Toolbar.tipInsertTextArt": "Insert Text Art", @@ -1821,7 +1811,5 @@ "PE.Views.Toolbar.txtScheme8": "Flow", "PE.Views.Toolbar.txtScheme9": "Foundry", "PE.Views.Toolbar.txtSlideAlign": "Align to Slide", - "PE.Views.Toolbar.txtUngroup": "Ungroup", - "PE.Views.Toolbar.capBtnInsSymbol": "Symbol", - "PE.Views.Toolbar.tipInsertSymbol": "Insert symbol" + "PE.Views.Toolbar.txtUngroup": "Ungroup" } \ No newline at end of file diff --git a/apps/presentationeditor/main/locale/es.json b/apps/presentationeditor/main/locale/es.json index 626419319..f6bf6c3db 100644 --- a/apps/presentationeditor/main/locale/es.json +++ b/apps/presentationeditor/main/locale/es.json @@ -5,6 +5,14 @@ "Common.Controllers.ExternalDiagramEditor.textClose": "Cerrar", "Common.Controllers.ExternalDiagramEditor.warningText": "El objeto está desactivado porque se está editando por otro usuario.", "Common.Controllers.ExternalDiagramEditor.warningTitle": "Aviso", + "Common.define.chartData.textArea": "Área", + "Common.define.chartData.textBar": "Barra", + "Common.define.chartData.textColumn": "Gráfico de columnas", + "Common.define.chartData.textLine": "Línea", + "Common.define.chartData.textPie": "Gráfico circular", + "Common.define.chartData.textPoint": "XY (Dispersión)", + "Common.define.chartData.textStock": "De cotizaciones", + "Common.define.chartData.textSurface": "Superficie", "Common.UI.ComboBorderSize.txtNoBorders": "Sin bordes", "Common.UI.ComboBorderSizeEditable.txtNoBorders": "Sin bordes", "Common.UI.ComboDataView.emptyComboText": "Sin estilo", @@ -902,20 +910,12 @@ "PE.Controllers.Viewport.textFitPage": "Ajustar a la diapositiva", "PE.Controllers.Viewport.textFitWidth": "Ajustar al ancho", "PE.Views.ChartSettings.textAdvanced": "Mostrar ajustes avanzados", - "PE.Views.ChartSettings.textArea": "Gráfico de área", - "PE.Views.ChartSettings.textBar": "Gráfico de barras", "PE.Views.ChartSettings.textChartType": "Cambiar tipo de gráfico", - "PE.Views.ChartSettings.textColumn": "Histograma", "PE.Views.ChartSettings.textEditData": "Editar datos", "PE.Views.ChartSettings.textHeight": "Altura", "PE.Views.ChartSettings.textKeepRatio": "Proporciones constantes", - "PE.Views.ChartSettings.textLine": "Línea", - "PE.Views.ChartSettings.textPie": "Gráfico circular", - "PE.Views.ChartSettings.textPoint": "XY (Dispersión)", "PE.Views.ChartSettings.textSize": "Tamaño", - "PE.Views.ChartSettings.textStock": "De cotizaciones", "PE.Views.ChartSettings.textStyle": "Estilo", - "PE.Views.ChartSettings.textSurface": "Superficie", "PE.Views.ChartSettings.textWidth": "Ancho", "PE.Views.ChartSettingsAdvanced.textAlt": "Texto alternativo", "PE.Views.ChartSettingsAdvanced.textAltDescription": "Descripción", @@ -1653,20 +1653,13 @@ "PE.Views.Toolbar.textAlignMiddle": "Alinear texto al medio", "PE.Views.Toolbar.textAlignRight": "Alinear texto a la derecha", "PE.Views.Toolbar.textAlignTop": "Alinear texto en la parte superior", - "PE.Views.Toolbar.textArea": "Gráfico de área", "PE.Views.Toolbar.textArrangeBack": "Enviar al fondo", "PE.Views.Toolbar.textArrangeBackward": "Enviar atrás", "PE.Views.Toolbar.textArrangeForward": "Traer adelante", "PE.Views.Toolbar.textArrangeFront": "Traer al frente", - "PE.Views.Toolbar.textBar": "Gráfico de barras", "PE.Views.Toolbar.textBold": "Negrita", - "PE.Views.Toolbar.textCharts": "Gráficos", - "PE.Views.Toolbar.textColumn": "Histograma", "PE.Views.Toolbar.textItalic": "Cursiva", - "PE.Views.Toolbar.textLine": "Línea", "PE.Views.Toolbar.textNewColor": "Color personalizado", - "PE.Views.Toolbar.textPie": "Gráfico circular", - "PE.Views.Toolbar.textPoint": "XY (Dispersión)", "PE.Views.Toolbar.textShapeAlignBottom": "Alinear en la parte inferior", "PE.Views.Toolbar.textShapeAlignCenter": "Alinear al centro", "PE.Views.Toolbar.textShapeAlignLeft": "Alinear a la izquierda", @@ -1677,11 +1670,9 @@ "PE.Views.Toolbar.textShowCurrent": "Mostrar desde la diapositiva actual", "PE.Views.Toolbar.textShowPresenterView": "Observar vista del presentador", "PE.Views.Toolbar.textShowSettings": "Mostrar los ajustes", - "PE.Views.Toolbar.textStock": "De cotizaciones", "PE.Views.Toolbar.textStrikeout": "Tachado", "PE.Views.Toolbar.textSubscript": "Subíndice", "PE.Views.Toolbar.textSuperscript": "Sobreíndice", - "PE.Views.Toolbar.textSurface": "Superficie", "PE.Views.Toolbar.textTabCollaboration": "Colaboración", "PE.Views.Toolbar.textTabFile": "Archivo", "PE.Views.Toolbar.textTabHome": "Inicio", diff --git a/apps/presentationeditor/main/locale/fr.json b/apps/presentationeditor/main/locale/fr.json index 670e2b29b..751bec8e8 100644 --- a/apps/presentationeditor/main/locale/fr.json +++ b/apps/presentationeditor/main/locale/fr.json @@ -5,6 +5,14 @@ "Common.Controllers.ExternalDiagramEditor.textClose": "Fermer", "Common.Controllers.ExternalDiagramEditor.warningText": "L'objet est désactivé car il est en cours d'être modifié par un autre utilisateur.", "Common.Controllers.ExternalDiagramEditor.warningTitle": "Avertissement", + "Common.define.chartData.textArea": "En aires", + "Common.define.chartData.textBar": "En barre", + "Common.define.chartData.textColumn": "Colonne", + "Common.define.chartData.textLine": "Graphique en ligne", + "Common.define.chartData.textPie": "Graphiques à secteurs", + "Common.define.chartData.textPoint": "Nuages de points (XY)", + "Common.define.chartData.textStock": "Boursier", + "Common.define.chartData.textSurface": "Surface", "Common.UI.ComboBorderSize.txtNoBorders": "Pas de bordures", "Common.UI.ComboBorderSizeEditable.txtNoBorders": "Pas de bordures", "Common.UI.ComboDataView.emptyComboText": "Aucun style", @@ -903,20 +911,12 @@ "PE.Controllers.Viewport.textFitPage": "Ajuster à la diapositive", "PE.Controllers.Viewport.textFitWidth": "Ajuster à la largeur", "PE.Views.ChartSettings.textAdvanced": "Afficher les paramètres avancés", - "PE.Views.ChartSettings.textArea": "En aires", - "PE.Views.ChartSettings.textBar": "À barres", "PE.Views.ChartSettings.textChartType": "Modifier le type de graphique", - "PE.Views.ChartSettings.textColumn": "Histogramme", "PE.Views.ChartSettings.textEditData": "Modifier les données", "PE.Views.ChartSettings.textHeight": "Hauteur", "PE.Views.ChartSettings.textKeepRatio": "Proportions constantes", - "PE.Views.ChartSettings.textLine": "En ligne", - "PE.Views.ChartSettings.textPie": "À secteurs", - "PE.Views.ChartSettings.textPoint": "Nuages de points (XY)", "PE.Views.ChartSettings.textSize": "Taille", - "PE.Views.ChartSettings.textStock": "Boursier", "PE.Views.ChartSettings.textStyle": "Style", - "PE.Views.ChartSettings.textSurface": "Surface", "PE.Views.ChartSettings.textWidth": "Largeur", "PE.Views.ChartSettingsAdvanced.textAlt": "Texte de remplacement", "PE.Views.ChartSettingsAdvanced.textAltDescription": "Description", @@ -1681,20 +1681,13 @@ "PE.Views.Toolbar.textAlignMiddle": "Aligner le texte au milieu", "PE.Views.Toolbar.textAlignRight": "Aligner le texte à droite", "PE.Views.Toolbar.textAlignTop": "Aligner le texte en haut", - "PE.Views.Toolbar.textArea": "En aires", "PE.Views.Toolbar.textArrangeBack": "Mettre en arrière-plan", "PE.Views.Toolbar.textArrangeBackward": "Envoyer vers l'arrière.", "PE.Views.Toolbar.textArrangeForward": "Déplacer vers l'avant", "PE.Views.Toolbar.textArrangeFront": "Mettre au premier plan", - "PE.Views.Toolbar.textBar": "À barres", "PE.Views.Toolbar.textBold": "Gras", - "PE.Views.Toolbar.textCharts": "Graphiques", - "PE.Views.Toolbar.textColumn": "Histogramme", "PE.Views.Toolbar.textItalic": "Italique", - "PE.Views.Toolbar.textLine": "En ligne", "PE.Views.Toolbar.textNewColor": "Couleur personnalisée", - "PE.Views.Toolbar.textPie": "À secteurs", - "PE.Views.Toolbar.textPoint": "Nuages de points (XY)", "PE.Views.Toolbar.textShapeAlignBottom": "Aligner en bas", "PE.Views.Toolbar.textShapeAlignCenter": "Aligner au centre", "PE.Views.Toolbar.textShapeAlignLeft": "Aligner à gauche", @@ -1705,11 +1698,9 @@ "PE.Views.Toolbar.textShowCurrent": "Afficher de la diapositive actuelle", "PE.Views.Toolbar.textShowPresenterView": "Afficher en mode présentateur", "PE.Views.Toolbar.textShowSettings": "Afficher les paramètres", - "PE.Views.Toolbar.textStock": "Boursier", "PE.Views.Toolbar.textStrikeout": "Barré", "PE.Views.Toolbar.textSubscript": "Indice", "PE.Views.Toolbar.textSuperscript": "Exposant", - "PE.Views.Toolbar.textSurface": "Surface", "PE.Views.Toolbar.textTabCollaboration": "Collaboration", "PE.Views.Toolbar.textTabFile": "Fichier", "PE.Views.Toolbar.textTabHome": "Accueil", diff --git a/apps/presentationeditor/main/locale/hu.json b/apps/presentationeditor/main/locale/hu.json index 0170d625d..fc0fc68c5 100644 --- a/apps/presentationeditor/main/locale/hu.json +++ b/apps/presentationeditor/main/locale/hu.json @@ -5,6 +5,14 @@ "Common.Controllers.ExternalDiagramEditor.textClose": "Bezár", "Common.Controllers.ExternalDiagramEditor.warningText": "Az objektum le van tiltva, mert azt egy másik felhasználó szerkeszti.", "Common.Controllers.ExternalDiagramEditor.warningTitle": "Figyelmeztetés", + "Common.define.chartData.textArea": "Terület", + "Common.define.chartData.textBar": "Sáv", + "Common.define.chartData.textColumn": "Oszlop", + "Common.define.chartData.textLine": "Vonal", + "Common.define.chartData.textPie": "Kör", + "Common.define.chartData.textPoint": "Pont", + "Common.define.chartData.textStock": "Részvény", + "Common.define.chartData.textSurface": "Felület", "Common.UI.ComboBorderSize.txtNoBorders": "Nincsenek szegélyek", "Common.UI.ComboBorderSizeEditable.txtNoBorders": "Nincsenek szegélyek", "Common.UI.ComboDataView.emptyComboText": "Nincsenek stílusok", @@ -843,20 +851,12 @@ "PE.Controllers.Viewport.textFitPage": "A diához igazít", "PE.Controllers.Viewport.textFitWidth": "Szélességhez igazít", "PE.Views.ChartSettings.textAdvanced": "Speciális beállítások megjelenítése", - "PE.Views.ChartSettings.textArea": "Terület", - "PE.Views.ChartSettings.textBar": "Sáv", "PE.Views.ChartSettings.textChartType": "Diagramtípus módosítása", - "PE.Views.ChartSettings.textColumn": "Oszlop", "PE.Views.ChartSettings.textEditData": "Adat szerkesztése", "PE.Views.ChartSettings.textHeight": "Magasság", "PE.Views.ChartSettings.textKeepRatio": "Állandó arányok", - "PE.Views.ChartSettings.textLine": "Vonal", - "PE.Views.ChartSettings.textPie": "Kördiagram", - "PE.Views.ChartSettings.textPoint": "Gráf", "PE.Views.ChartSettings.textSize": "Méret", - "PE.Views.ChartSettings.textStock": "Állomány", "PE.Views.ChartSettings.textStyle": "Stílus", - "PE.Views.ChartSettings.textSurface": "Felület", "PE.Views.ChartSettings.textWidth": "Szélesség", "PE.Views.ChartSettingsAdvanced.textAlt": "Alternatív szöveg", "PE.Views.ChartSettingsAdvanced.textAltDescription": "Leírás", @@ -1559,20 +1559,13 @@ "PE.Views.Toolbar.textAlignMiddle": "Szöveg középre rendezése", "PE.Views.Toolbar.textAlignRight": "Szöveg jobbra rendezése", "PE.Views.Toolbar.textAlignTop": "Szöveg felülre rendezése", - "PE.Views.Toolbar.textArea": "Terület", "PE.Views.Toolbar.textArrangeBack": "Háttérbe küld", "PE.Views.Toolbar.textArrangeBackward": "Visszafelé küld", "PE.Views.Toolbar.textArrangeForward": "Előre hoz", "PE.Views.Toolbar.textArrangeFront": "Előre hoz", - "PE.Views.Toolbar.textBar": "Sáv", "PE.Views.Toolbar.textBold": "Félkövér", - "PE.Views.Toolbar.textCharts": "Diagramok", - "PE.Views.Toolbar.textColumn": "Hasáb", "PE.Views.Toolbar.textItalic": "Dőlt", - "PE.Views.Toolbar.textLine": "Vonal", "PE.Views.Toolbar.textNewColor": "Egyéni szín", - "PE.Views.Toolbar.textPie": "Kördiagram", - "PE.Views.Toolbar.textPoint": "Gráf", "PE.Views.Toolbar.textShapeAlignBottom": "Alulra rendez", "PE.Views.Toolbar.textShapeAlignCenter": "Középre rendez", "PE.Views.Toolbar.textShapeAlignLeft": "Balra rendez", @@ -1583,11 +1576,9 @@ "PE.Views.Toolbar.textShowCurrent": "Indítás az aktuális diától", "PE.Views.Toolbar.textShowPresenterView": "Megjelenítő nézet", "PE.Views.Toolbar.textShowSettings": "Beállítások megjelenítése", - "PE.Views.Toolbar.textStock": "Állomány", "PE.Views.Toolbar.textStrikeout": "Áthúzott", "PE.Views.Toolbar.textSubscript": "Alsó index", "PE.Views.Toolbar.textSuperscript": "Felső index", - "PE.Views.Toolbar.textSurface": "Felület", "PE.Views.Toolbar.textTabCollaboration": "Együttműködés", "PE.Views.Toolbar.textTabFile": "Fájl", "PE.Views.Toolbar.textTabHome": "Kezdőlap", diff --git a/apps/presentationeditor/main/locale/it.json b/apps/presentationeditor/main/locale/it.json index c73f1758c..5771cbe1d 100644 --- a/apps/presentationeditor/main/locale/it.json +++ b/apps/presentationeditor/main/locale/it.json @@ -5,6 +5,14 @@ "Common.Controllers.ExternalDiagramEditor.textClose": "Chiudi", "Common.Controllers.ExternalDiagramEditor.warningText": "L'oggetto è disabilitato perché si sta modificando da un altro utente.", "Common.Controllers.ExternalDiagramEditor.warningTitle": "Avviso", + "Common.define.chartData.textArea": "Aerogramma", + "Common.define.chartData.textBar": "A barre", + "Common.define.chartData.textColumn": "Istogramma", + "Common.define.chartData.textLine": "A linee", + "Common.define.chartData.textPie": "A torta", + "Common.define.chartData.textPoint": "XY (A dispersione)", + "Common.define.chartData.textStock": "Azionario", + "Common.define.chartData.textSurface": "Superficie", "Common.UI.ComboBorderSize.txtNoBorders": "Nessun bordo", "Common.UI.ComboBorderSizeEditable.txtNoBorders": "Nessun bordo", "Common.UI.ComboDataView.emptyComboText": "Nessuno stile", @@ -108,6 +116,8 @@ "Common.Views.InsertTableDialog.txtTitle": "Dimensioni tabella", "Common.Views.InsertTableDialog.txtTitleSplit": "Dividi cella", "Common.Views.LanguageDialog.labelSelect": "Seleziona la lingua del documento", + "Common.Views.ListSettingsDialog.txtSize": "Dimensioni", + "Common.Views.ListSettingsDialog.txtStart": "Inizia da", "Common.Views.OpenDialog.closeButtonText": "Chiudi File", "Common.Views.OpenDialog.txtEncoding": "Codifica", "Common.Views.OpenDialog.txtIncorrectPwd": "Password errata", @@ -904,20 +914,12 @@ "PE.Controllers.Viewport.textFitPage": "Adatta alla diapositiva", "PE.Controllers.Viewport.textFitWidth": "Adatta alla larghezza", "PE.Views.ChartSettings.textAdvanced": "Mostra impostazioni avanzate", - "PE.Views.ChartSettings.textArea": "Area", - "PE.Views.ChartSettings.textBar": "Barra", "PE.Views.ChartSettings.textChartType": "Cambia tipo grafico", - "PE.Views.ChartSettings.textColumn": "Colonna", "PE.Views.ChartSettings.textEditData": "Modifica dati", "PE.Views.ChartSettings.textHeight": "Altezza", "PE.Views.ChartSettings.textKeepRatio": "Proporzioni costanti", - "PE.Views.ChartSettings.textLine": "Linea", - "PE.Views.ChartSettings.textPie": "Torta", - "PE.Views.ChartSettings.textPoint": "XY (A dispersione)", "PE.Views.ChartSettings.textSize": "Dimensione", - "PE.Views.ChartSettings.textStock": "Azionario", "PE.Views.ChartSettings.textStyle": "Style", - "PE.Views.ChartSettings.textSurface": "Superficie", "PE.Views.ChartSettings.textWidth": "Larghezza", "PE.Views.ChartSettingsAdvanced.textAlt": "Testo alternativo", "PE.Views.ChartSettingsAdvanced.textAltDescription": "Descrizione", @@ -1283,6 +1285,7 @@ "PE.Views.LeftMenu.tipTitles": "Titoli", "PE.Views.LeftMenu.txtDeveloper": "MODALITÀ SVILUPPATORE", "PE.Views.LeftMenu.txtTrial": "Modalità di prova", + "PE.Views.ListSettingsDialog.txtSize": "Dimensioni", "PE.Views.ParagraphSettings.strLineHeight": "Interlinea", "PE.Views.ParagraphSettings.strParagraphSpacing": "Spaziatura del paragrafo", "PE.Views.ParagraphSettings.strSpacingAfter": "Dopo", @@ -1676,20 +1679,13 @@ "PE.Views.Toolbar.textAlignMiddle": "Allinea testo in mezzo", "PE.Views.Toolbar.textAlignRight": "Allinea testo a destra", "PE.Views.Toolbar.textAlignTop": "Allinea testo in alto", - "PE.Views.Toolbar.textArea": "Area", "PE.Views.Toolbar.textArrangeBack": "Porta in secondo piano", "PE.Views.Toolbar.textArrangeBackward": "Porta indietro", "PE.Views.Toolbar.textArrangeForward": "Porta avanti", "PE.Views.Toolbar.textArrangeFront": "Porta in primo piano", - "PE.Views.Toolbar.textBar": "Barra", "PE.Views.Toolbar.textBold": "Grassetto", - "PE.Views.Toolbar.textCharts": "Grafici", - "PE.Views.Toolbar.textColumn": "Colonna", "PE.Views.Toolbar.textItalic": "Corsivo", - "PE.Views.Toolbar.textLine": "Linea", "PE.Views.Toolbar.textNewColor": "Colore personalizzato", - "PE.Views.Toolbar.textPie": "Torta", - "PE.Views.Toolbar.textPoint": "XY (A dispersione)", "PE.Views.Toolbar.textShapeAlignBottom": "Allinea in basso", "PE.Views.Toolbar.textShapeAlignCenter": "Allinea al centro", "PE.Views.Toolbar.textShapeAlignLeft": "Allinea a sinistra", @@ -1700,11 +1696,9 @@ "PE.Views.Toolbar.textShowCurrent": "Mostra dalla diapositiva corrente", "PE.Views.Toolbar.textShowPresenterView": "Mostra la visualizzazione del presenter", "PE.Views.Toolbar.textShowSettings": "Mostra Impostazioni", - "PE.Views.Toolbar.textStock": "Azionario", "PE.Views.Toolbar.textStrikeout": "Barrato", "PE.Views.Toolbar.textSubscript": "Pedice", "PE.Views.Toolbar.textSuperscript": "Apice", - "PE.Views.Toolbar.textSurface": "Superficie", "PE.Views.Toolbar.textTabCollaboration": "Collaborazione", "PE.Views.Toolbar.textTabFile": "File", "PE.Views.Toolbar.textTabHome": "Home", diff --git a/apps/presentationeditor/main/locale/ja.json b/apps/presentationeditor/main/locale/ja.json index fde3bdf53..abc82799f 100644 --- a/apps/presentationeditor/main/locale/ja.json +++ b/apps/presentationeditor/main/locale/ja.json @@ -5,6 +5,13 @@ "Common.Controllers.ExternalDiagramEditor.textClose": "閉じる", "Common.Controllers.ExternalDiagramEditor.warningText": "他のユーザは編集しているのためオブジェクトが無効になります。", "Common.Controllers.ExternalDiagramEditor.warningTitle": " 警告", + "Common.define.chartData.textArea": "面グラフ", + "Common.define.chartData.textBar": "横棒グラフ", + "Common.define.chartData.textColumn": "縦棒グラフ", + "Common.define.chartData.textLine": "折れ線グラフ", + "Common.define.chartData.textPie": "円グラフ", + "Common.define.chartData.textPoint": "点グラフ", + "Common.define.chartData.textStock": "株価チャート", "Common.UI.ComboBorderSize.txtNoBorders": "枠線なし", "Common.UI.ComboBorderSizeEditable.txtNoBorders": "枠線なし", "Common.UI.ComboDataView.emptyComboText": "スタイルなし", @@ -207,18 +214,11 @@ "PE.Controllers.Toolbar.textEmptyImgUrl": "画像のURLを指定しなければなりません。", "PE.Controllers.Toolbar.textFontSizeErr": "入力された値が正しくありません。
1〜100の数値を入力してください。", "PE.Controllers.Toolbar.textWarning": " 警告", - "PE.Views.ChartSettings.textArea": "面グラフ", - "PE.Views.ChartSettings.textBar": "横棒グラフ", "PE.Views.ChartSettings.textChartType": "グラフの種類の変更", - "PE.Views.ChartSettings.textColumn": "縦棒グラフ", "PE.Views.ChartSettings.textEditData": "データの編集", "PE.Views.ChartSettings.textHeight": "高さ", "PE.Views.ChartSettings.textKeepRatio": "比例の定数", - "PE.Views.ChartSettings.textLine": "折れ線グラフ", - "PE.Views.ChartSettings.textPie": "円グラフ", - "PE.Views.ChartSettings.textPoint": "点グラフ", "PE.Views.ChartSettings.textSize": "サイズ", - "PE.Views.ChartSettings.textStock": "株価チャート", "PE.Views.ChartSettings.textStyle": "スタイル", "PE.Views.ChartSettings.textWidth": "幅", "PE.Views.DocumentHolder.aboveText": "上", @@ -706,26 +706,19 @@ "PE.Views.Toolbar.textAlignMiddle": "テキストを中央に揃えます", "PE.Views.Toolbar.textAlignRight": "テキストの右揃え", "PE.Views.Toolbar.textAlignTop": "テキストの上揃え", - "PE.Views.Toolbar.textArea": "面グラフ", "PE.Views.Toolbar.textArrangeBack": "背景へ移動", "PE.Views.Toolbar.textArrangeBackward": "背面へ移動", "PE.Views.Toolbar.textArrangeForward": "前面へ移動", "PE.Views.Toolbar.textArrangeFront": "前景に移動", - "PE.Views.Toolbar.textBar": "横棒グラフ", "PE.Views.Toolbar.textBold": "太字", - "PE.Views.Toolbar.textColumn": "縦棒グラフ", "PE.Views.Toolbar.textItalic": "斜体", - "PE.Views.Toolbar.textLine": "折れ線グラフ", "PE.Views.Toolbar.textNewColor": "ユーザー設定の色", - "PE.Views.Toolbar.textPie": "円グラフ", - "PE.Views.Toolbar.textPoint": "点グラフ", "PE.Views.Toolbar.textShapeAlignBottom": "下揃え", "PE.Views.Toolbar.textShapeAlignCenter": "中央揃え\t", "PE.Views.Toolbar.textShapeAlignLeft": "左揃え", "PE.Views.Toolbar.textShapeAlignMiddle": "上下中央揃え", "PE.Views.Toolbar.textShapeAlignRight": "右揃え", "PE.Views.Toolbar.textShapeAlignTop": "上揃え", - "PE.Views.Toolbar.textStock": "株価チャート", "PE.Views.Toolbar.textStrikeout": "取り消し線", "PE.Views.Toolbar.textSubscript": "下付き", "PE.Views.Toolbar.textSuperscript": "上付き文字", diff --git a/apps/presentationeditor/main/locale/ko.json b/apps/presentationeditor/main/locale/ko.json index ad51867d6..b6e6097ae 100644 --- a/apps/presentationeditor/main/locale/ko.json +++ b/apps/presentationeditor/main/locale/ko.json @@ -696,20 +696,12 @@ "PE.Controllers.Viewport.textFitPage": "슬라이드에 맞추기", "PE.Controllers.Viewport.textFitWidth": "너비에 맞춤", "PE.Views.ChartSettings.textAdvanced": "고급 설정 표시", - "PE.Views.ChartSettings.textArea": "영역", - "PE.Views.ChartSettings.textBar": "Bar", "PE.Views.ChartSettings.textChartType": "차트 유형 변경", - "PE.Views.ChartSettings.textColumn": "열", "PE.Views.ChartSettings.textEditData": "데이터 편집", "PE.Views.ChartSettings.textHeight": "높이", "PE.Views.ChartSettings.textKeepRatio": "일정 비율", - "PE.Views.ChartSettings.textLine": "Line", - "PE.Views.ChartSettings.textPie": "파이", - "PE.Views.ChartSettings.textPoint": "XY (분산 형)", "PE.Views.ChartSettings.textSize": "크기", - "PE.Views.ChartSettings.textStock": "Stock", "PE.Views.ChartSettings.textStyle": "스타일", - "PE.Views.ChartSettings.textSurface": "표면", "PE.Views.ChartSettings.textWidth": "너비", "PE.Views.ChartSettingsAdvanced.textAlt": "대체 텍스트", "PE.Views.ChartSettingsAdvanced.textAltDescription": "설명", @@ -1372,20 +1364,13 @@ "PE.Views.Toolbar.textAlignMiddle": "중간에 텍스트 정렬", "PE.Views.Toolbar.textAlignRight": "텍스트 정렬", "PE.Views.Toolbar.textAlignTop": "텍스트를 상단에 정렬", - "PE.Views.Toolbar.textArea": "Area", "PE.Views.Toolbar.textArrangeBack": "배경에 보내기", "PE.Views.Toolbar.textArrangeBackward": "뒤로 이동", "PE.Views.Toolbar.textArrangeForward": "앞으로 이동", "PE.Views.Toolbar.textArrangeFront": "전경으로 가져 오기", - "PE.Views.Toolbar.textBar": "Bar", "PE.Views.Toolbar.textBold": "Bold", - "PE.Views.Toolbar.textCharts": "차트", - "PE.Views.Toolbar.textColumn": "Column", "PE.Views.Toolbar.textItalic": "Italic", - "PE.Views.Toolbar.textLine": "Line", "PE.Views.Toolbar.textNewColor": "사용자 정의 색상", - "PE.Views.Toolbar.textPie": "파이", - "PE.Views.Toolbar.textPoint": "XY (분산 형)", "PE.Views.Toolbar.textShapeAlignBottom": "아래쪽 정렬", "PE.Views.Toolbar.textShapeAlignCenter": "정렬 중심", "PE.Views.Toolbar.textShapeAlignLeft": "왼쪽 정렬", @@ -1396,11 +1381,9 @@ "PE.Views.Toolbar.textShowCurrent": "현재 슬라이드에서보기", "PE.Views.Toolbar.textShowPresenterView": "프리젠터뷰를 보기", "PE.Views.Toolbar.textShowSettings": "설정 표시", - "PE.Views.Toolbar.textStock": "Stock", "PE.Views.Toolbar.textStrikeout": "Strikeout", "PE.Views.Toolbar.textSubscript": "아래 첨자", "PE.Views.Toolbar.textSuperscript": "위첨자", - "PE.Views.Toolbar.textSurface": "Surface", "PE.Views.Toolbar.textTabCollaboration": "합치기", "PE.Views.Toolbar.textTabFile": "파일", "PE.Views.Toolbar.textTabHome": "집", diff --git a/apps/presentationeditor/main/locale/lv.json b/apps/presentationeditor/main/locale/lv.json index 96a43824f..c22503300 100644 --- a/apps/presentationeditor/main/locale/lv.json +++ b/apps/presentationeditor/main/locale/lv.json @@ -693,20 +693,12 @@ "PE.Controllers.Viewport.textFitPage": "Saskaņot ar slaidu", "PE.Controllers.Viewport.textFitWidth": "Saskaņot ar platumu", "PE.Views.ChartSettings.textAdvanced": "Radīt papildu iestatījumus", - "PE.Views.ChartSettings.textArea": "Area Chart", - "PE.Views.ChartSettings.textBar": "Bar Chart", "PE.Views.ChartSettings.textChartType": "Change Chart Type", - "PE.Views.ChartSettings.textColumn": "Column Chart", "PE.Views.ChartSettings.textEditData": "Edit Data", "PE.Views.ChartSettings.textHeight": "Height", "PE.Views.ChartSettings.textKeepRatio": "Constant Proportions", - "PE.Views.ChartSettings.textLine": "Line Chart", - "PE.Views.ChartSettings.textPie": "Pie Chart", - "PE.Views.ChartSettings.textPoint": "XY (Scatter) Chart", "PE.Views.ChartSettings.textSize": "Size", - "PE.Views.ChartSettings.textStock": "Stock Chart", "PE.Views.ChartSettings.textStyle": "Style", - "PE.Views.ChartSettings.textSurface": "Virsma", "PE.Views.ChartSettings.textWidth": "Width", "PE.Views.ChartSettingsAdvanced.textAlt": "Alternatīvs teksts", "PE.Views.ChartSettingsAdvanced.textAltDescription": "Apraksts", @@ -1369,20 +1361,13 @@ "PE.Views.Toolbar.textAlignMiddle": "Align text to the middle", "PE.Views.Toolbar.textAlignRight": "Align text right", "PE.Views.Toolbar.textAlignTop": "Align text to the top", - "PE.Views.Toolbar.textArea": "Area Chart", "PE.Views.Toolbar.textArrangeBack": "Send to Background", "PE.Views.Toolbar.textArrangeBackward": "Sūtīt atpakaļ", "PE.Views.Toolbar.textArrangeForward": "Pārnest uz priekšu", "PE.Views.Toolbar.textArrangeFront": "Bring To Foreground", - "PE.Views.Toolbar.textBar": "Bar Chart", "PE.Views.Toolbar.textBold": "Bold", - "PE.Views.Toolbar.textCharts": "Diagrammas", - "PE.Views.Toolbar.textColumn": "Column Chart", "PE.Views.Toolbar.textItalic": "Italic", - "PE.Views.Toolbar.textLine": "Line Chart", "PE.Views.Toolbar.textNewColor": "Custom Color", - "PE.Views.Toolbar.textPie": "Pie Chart", - "PE.Views.Toolbar.textPoint": "XY (Scatter) Chart", "PE.Views.Toolbar.textShapeAlignBottom": "Align Bottom", "PE.Views.Toolbar.textShapeAlignCenter": "Align Center", "PE.Views.Toolbar.textShapeAlignLeft": "Align Left", @@ -1393,11 +1378,9 @@ "PE.Views.Toolbar.textShowCurrent": "Rādīt no šī slaida", "PE.Views.Toolbar.textShowPresenterView": "Rādīt prezentētāja režīmā", "PE.Views.Toolbar.textShowSettings": "Rādīt uzstādījumus", - "PE.Views.Toolbar.textStock": "Stock Chart", "PE.Views.Toolbar.textStrikeout": "Strikeout", "PE.Views.Toolbar.textSubscript": "Subscript", "PE.Views.Toolbar.textSuperscript": "Superscript", - "PE.Views.Toolbar.textSurface": "Virsma", "PE.Views.Toolbar.textTabCollaboration": "Sadarbība", "PE.Views.Toolbar.textTabFile": "Fails", "PE.Views.Toolbar.textTabHome": "Sākums", diff --git a/apps/presentationeditor/main/locale/nl.json b/apps/presentationeditor/main/locale/nl.json index 501d1076c..fbec7d1a8 100644 --- a/apps/presentationeditor/main/locale/nl.json +++ b/apps/presentationeditor/main/locale/nl.json @@ -5,6 +5,14 @@ "Common.Controllers.ExternalDiagramEditor.textClose": "Sluiten", "Common.Controllers.ExternalDiagramEditor.warningText": "Het object is gedeactiveerd omdat het wordt bewerkt door een andere gebruiker.", "Common.Controllers.ExternalDiagramEditor.warningTitle": "Waarschuwing", + "Common.define.chartData.textArea": "Vlak", + "Common.define.chartData.textBar": "Staaf", + "Common.define.chartData.textColumn": "Kolom", + "Common.define.chartData.textLine": "Lijn", + "Common.define.chartData.textPie": "Cirkel", + "Common.define.chartData.textPoint": "Spreiding", + "Common.define.chartData.textStock": "Voorraad", + "Common.define.chartData.textSurface": "Oppervlak", "Common.UI.ComboBorderSize.txtNoBorders": "Geen randen", "Common.UI.ComboBorderSizeEditable.txtNoBorders": "Geen randen", "Common.UI.ComboDataView.emptyComboText": "Geen stijlen", @@ -702,20 +710,12 @@ "PE.Controllers.Viewport.textFitPage": "Aanpassen aan dia", "PE.Controllers.Viewport.textFitWidth": "Aan breedte aanpassen", "PE.Views.ChartSettings.textAdvanced": "Geavanceerde instellingen tonen", - "PE.Views.ChartSettings.textArea": "Vlak", - "PE.Views.ChartSettings.textBar": "Staaf", "PE.Views.ChartSettings.textChartType": "Grafiektype wijzigen", - "PE.Views.ChartSettings.textColumn": "Kolom", "PE.Views.ChartSettings.textEditData": "Gegevens bewerken", "PE.Views.ChartSettings.textHeight": "Hoogte", "PE.Views.ChartSettings.textKeepRatio": "Constante verhoudingen", - "PE.Views.ChartSettings.textLine": "Lijn", - "PE.Views.ChartSettings.textPie": "Cirkel", - "PE.Views.ChartSettings.textPoint": "Spreiding", "PE.Views.ChartSettings.textSize": "Grootte", - "PE.Views.ChartSettings.textStock": "Voorraad", "PE.Views.ChartSettings.textStyle": "Stijl", - "PE.Views.ChartSettings.textSurface": "Oppervlak", "PE.Views.ChartSettings.textWidth": "Breedte", "PE.Views.ChartSettingsAdvanced.textAlt": "Alternatieve tekst", "PE.Views.ChartSettingsAdvanced.textAltDescription": "Beschrijving", @@ -1378,20 +1378,13 @@ "PE.Views.Toolbar.textAlignMiddle": "Tekst centreren", "PE.Views.Toolbar.textAlignRight": "Tekst rechts uitlijnen", "PE.Views.Toolbar.textAlignTop": "Tekst bovenaan uitlijnen", - "PE.Views.Toolbar.textArea": "Vlak", "PE.Views.Toolbar.textArrangeBack": "Naar achtergrond sturen", "PE.Views.Toolbar.textArrangeBackward": "Naar achteren", "PE.Views.Toolbar.textArrangeForward": "Naar Voren Verplaatsen", "PE.Views.Toolbar.textArrangeFront": "Naar voorgrond brengen", - "PE.Views.Toolbar.textBar": "Staaf", "PE.Views.Toolbar.textBold": "Vet", - "PE.Views.Toolbar.textCharts": "Grafieken", - "PE.Views.Toolbar.textColumn": "Kolom", "PE.Views.Toolbar.textItalic": "Cursief", - "PE.Views.Toolbar.textLine": "Lijn", "PE.Views.Toolbar.textNewColor": "Aangepaste kleur", - "PE.Views.Toolbar.textPie": "Cirkel", - "PE.Views.Toolbar.textPoint": "Spreiding", "PE.Views.Toolbar.textShapeAlignBottom": "Onder uitlijnen", "PE.Views.Toolbar.textShapeAlignCenter": "Midden uitlijnen", "PE.Views.Toolbar.textShapeAlignLeft": "Links uitlijnen", @@ -1402,11 +1395,9 @@ "PE.Views.Toolbar.textShowCurrent": "Vanaf huidige dia tonen", "PE.Views.Toolbar.textShowPresenterView": "Presentatieweergave tonen", "PE.Views.Toolbar.textShowSettings": "Instellingen tonen", - "PE.Views.Toolbar.textStock": "Voorraad", "PE.Views.Toolbar.textStrikeout": "Doorhalen", "PE.Views.Toolbar.textSubscript": "Subscript", "PE.Views.Toolbar.textSuperscript": "Superscript", - "PE.Views.Toolbar.textSurface": "Oppervlak", "PE.Views.Toolbar.textTabCollaboration": "Samenwerking", "PE.Views.Toolbar.textTabFile": "Bestand", "PE.Views.Toolbar.textTabHome": "Home", diff --git a/apps/presentationeditor/main/locale/pl.json b/apps/presentationeditor/main/locale/pl.json index 0ffa70439..6a052896a 100644 --- a/apps/presentationeditor/main/locale/pl.json +++ b/apps/presentationeditor/main/locale/pl.json @@ -5,6 +5,14 @@ "Common.Controllers.ExternalDiagramEditor.textClose": "Zamknąć", "Common.Controllers.ExternalDiagramEditor.warningText": "Obiekt jest wyłączony, ponieważ jest edytowany przez innego użytkownika.", "Common.Controllers.ExternalDiagramEditor.warningTitle": "Ostrzeżenie", + "Common.define.chartData.textArea": "Obszar", + "Common.define.chartData.textBar": "Pasek", + "Common.define.chartData.textColumn": "Kolumna", + "Common.define.chartData.textLine": "Liniowy", + "Common.define.chartData.textPie": "Kołowe", + "Common.define.chartData.textPoint": "XY (Punktowy)", + "Common.define.chartData.textStock": "Zbiory", + "Common.define.chartData.textSurface": "Powierzchnia", "Common.UI.ComboBorderSize.txtNoBorders": "Bez krawędzi", "Common.UI.ComboBorderSizeEditable.txtNoBorders": "Bez krawędzi", "Common.UI.ComboDataView.emptyComboText": "Brak styli", @@ -598,20 +606,12 @@ "PE.Controllers.Toolbar.txtSymbol_xsi": "Xi", "PE.Controllers.Toolbar.txtSymbol_zeta": "Zeta", "PE.Views.ChartSettings.textAdvanced": "Pokaż ustawienia zaawansowane", - "PE.Views.ChartSettings.textArea": "Obszar", - "PE.Views.ChartSettings.textBar": "Pasek", "PE.Views.ChartSettings.textChartType": "Zmień typ wykresu", - "PE.Views.ChartSettings.textColumn": "Kolumna", "PE.Views.ChartSettings.textEditData": "Edytuj dane", "PE.Views.ChartSettings.textHeight": "Wysokość", "PE.Views.ChartSettings.textKeepRatio": "Stałe proporcje", - "PE.Views.ChartSettings.textLine": "Wykres", - "PE.Views.ChartSettings.textPie": "Kołowe", - "PE.Views.ChartSettings.textPoint": "XY (Punktowy)", "PE.Views.ChartSettings.textSize": "Rozmiar", - "PE.Views.ChartSettings.textStock": "Zbiory", "PE.Views.ChartSettings.textStyle": "Styl", - "PE.Views.ChartSettings.textSurface": "Powierzchnia", "PE.Views.ChartSettings.textWidth": "Szerokość", "PE.Views.ChartSettingsAdvanced.textAlt": "Tekst alternatywny", "PE.Views.ChartSettingsAdvanced.textAltDescription": "Opis", @@ -1236,20 +1236,13 @@ "PE.Views.Toolbar.textAlignMiddle": "Wyrównaj tekst do środka", "PE.Views.Toolbar.textAlignRight": "Wyrównaj tekst do prawej", "PE.Views.Toolbar.textAlignTop": "Wyrównaj tekst do góry", - "PE.Views.Toolbar.textArea": "Obszar", "PE.Views.Toolbar.textArrangeBack": "Wyślij do tła", "PE.Views.Toolbar.textArrangeBackward": "Przenieś do tyłu", "PE.Views.Toolbar.textArrangeForward": "Przenieś do przodu", "PE.Views.Toolbar.textArrangeFront": "Przejdź na pierwszy plan", - "PE.Views.Toolbar.textBar": "Pasek", "PE.Views.Toolbar.textBold": "Pogrubione", - "PE.Views.Toolbar.textCharts": "Wykresy", - "PE.Views.Toolbar.textColumn": "Kolumna", "PE.Views.Toolbar.textItalic": "Kursywa", - "PE.Views.Toolbar.textLine": "Wykres", "PE.Views.Toolbar.textNewColor": "Własny kolor", - "PE.Views.Toolbar.textPie": "Kołowe", - "PE.Views.Toolbar.textPoint": "XY (Punktowy)", "PE.Views.Toolbar.textShapeAlignBottom": "Wyrównaj do dołu", "PE.Views.Toolbar.textShapeAlignCenter": "Wyrównaj do środka", "PE.Views.Toolbar.textShapeAlignLeft": "Wyrównaj do lewej", @@ -1260,11 +1253,9 @@ "PE.Views.Toolbar.textShowCurrent": "Pokaż z aktualnego slajdu", "PE.Views.Toolbar.textShowPresenterView": "Pokaz slajdów w trybie prezentera", "PE.Views.Toolbar.textShowSettings": "Pokaż ustawienia", - "PE.Views.Toolbar.textStock": "Zbiory", "PE.Views.Toolbar.textStrikeout": "Skreślenie", "PE.Views.Toolbar.textSubscript": "Indeks dolny", "PE.Views.Toolbar.textSuperscript": "Indeks górny", - "PE.Views.Toolbar.textSurface": "Powierzchnia", "PE.Views.Toolbar.textTabCollaboration": "Współpraca", "PE.Views.Toolbar.textTabFile": "Plik", "PE.Views.Toolbar.textTabHome": "Narzędzia główne", diff --git a/apps/presentationeditor/main/locale/pt.json b/apps/presentationeditor/main/locale/pt.json index d6895ab0e..bb7dc4ca4 100644 --- a/apps/presentationeditor/main/locale/pt.json +++ b/apps/presentationeditor/main/locale/pt.json @@ -5,6 +5,14 @@ "Common.Controllers.ExternalDiagramEditor.textClose": "Fechar", "Common.Controllers.ExternalDiagramEditor.warningText": "O objeto está desabilitado por que está sendo editado por outro usuário.", "Common.Controllers.ExternalDiagramEditor.warningTitle": "Aviso", + "Common.define.chartData.textArea": "Área", + "Common.define.chartData.textBar": "Barra", + "Common.define.chartData.textColumn": "Coluna", + "Common.define.chartData.textLine": "Linha", + "Common.define.chartData.textPie": "Gráfico de pizza", + "Common.define.chartData.textPoint": "Gráfico de pontos", + "Common.define.chartData.textStock": "Gráfico de ações", + "Common.define.chartData.textSurface": "Superfície", "Common.UI.ComboBorderSize.txtNoBorders": "Sem bordas", "Common.UI.ComboBorderSizeEditable.txtNoBorders": "Sem bordas", "Common.UI.ComboDataView.emptyComboText": "Sem estilos", @@ -597,20 +605,12 @@ "PE.Controllers.Toolbar.txtSymbol_xsi": "Xi", "PE.Controllers.Toolbar.txtSymbol_zeta": "Zeta", "PE.Views.ChartSettings.textAdvanced": "Exibir configurações avançadas", - "PE.Views.ChartSettings.textArea": "Gráfico de área", - "PE.Views.ChartSettings.textBar": "Gráfico de barras", "PE.Views.ChartSettings.textChartType": "Alterar tipo de gráfico", - "PE.Views.ChartSettings.textColumn": "Gráfico de coluna", "PE.Views.ChartSettings.textEditData": "Editar dados", "PE.Views.ChartSettings.textHeight": "Altura", "PE.Views.ChartSettings.textKeepRatio": "Proporções constantes", - "PE.Views.ChartSettings.textLine": "Gráfico de linha", - "PE.Views.ChartSettings.textPie": "Gráfico de pizza", - "PE.Views.ChartSettings.textPoint": "Gráfico de pontos", "PE.Views.ChartSettings.textSize": "Tamanho", - "PE.Views.ChartSettings.textStock": "Gráfico de ações", "PE.Views.ChartSettings.textStyle": "Estilo", - "PE.Views.ChartSettings.textSurface": "Superfície", "PE.Views.ChartSettings.textWidth": "Largura", "PE.Views.ChartSettingsAdvanced.textAlt": "Texto Alternativo", "PE.Views.ChartSettingsAdvanced.textAltDescription": "Descrição", @@ -1235,20 +1235,13 @@ "PE.Views.Toolbar.textAlignMiddle": "Alinhar texto ao meio", "PE.Views.Toolbar.textAlignRight": "Alinhar texto à direita", "PE.Views.Toolbar.textAlignTop": "Alinhar texto à parte superior", - "PE.Views.Toolbar.textArea": "Gráfico de área", "PE.Views.Toolbar.textArrangeBack": "Enviar para plano de fundo", "PE.Views.Toolbar.textArrangeBackward": "Enviar para trás", "PE.Views.Toolbar.textArrangeForward": "Trazer para frente", "PE.Views.Toolbar.textArrangeFront": "Trazer para primeiro plano", - "PE.Views.Toolbar.textBar": "Gráfico de barras", "PE.Views.Toolbar.textBold": "Negrito", - "PE.Views.Toolbar.textCharts": "Gráficos", - "PE.Views.Toolbar.textColumn": "Gráfico de coluna", "PE.Views.Toolbar.textItalic": "Itálico", - "PE.Views.Toolbar.textLine": "Gráfico de linha", "PE.Views.Toolbar.textNewColor": "Cor personalizada", - "PE.Views.Toolbar.textPie": "Gráfico de pizza", - "PE.Views.Toolbar.textPoint": "Gráfico de pontos", "PE.Views.Toolbar.textShapeAlignBottom": "Alinhar à parte inferior", "PE.Views.Toolbar.textShapeAlignCenter": "Alinhar ao centro", "PE.Views.Toolbar.textShapeAlignLeft": "Alinhar à esquerda", @@ -1259,11 +1252,9 @@ "PE.Views.Toolbar.textShowCurrent": "Mostrar a partir do slide atual", "PE.Views.Toolbar.textShowPresenterView": "Exibir vista de apresentador", "PE.Views.Toolbar.textShowSettings": "Exibir configurações", - "PE.Views.Toolbar.textStock": "Gráfico de ações", "PE.Views.Toolbar.textStrikeout": "Riscado", "PE.Views.Toolbar.textSubscript": "Subscrito", "PE.Views.Toolbar.textSuperscript": "Sobrescrito", - "PE.Views.Toolbar.textSurface": "Superfície", "PE.Views.Toolbar.textTabFile": "Arquivo", "PE.Views.Toolbar.textTabHome": "Página Inicial", "PE.Views.Toolbar.textTabInsert": "Inserir", diff --git a/apps/presentationeditor/main/locale/ru.json b/apps/presentationeditor/main/locale/ru.json index f46f4cf5d..5eb21bc52 100644 --- a/apps/presentationeditor/main/locale/ru.json +++ b/apps/presentationeditor/main/locale/ru.json @@ -161,6 +161,8 @@ "Common.Views.ReviewChanges.strStrictDesc": "Используйте кнопку 'Сохранить' для синхронизации изменений, вносимых вами и другими пользователями.", "Common.Views.ReviewChanges.tipAcceptCurrent": "Принять текущее изменение", "Common.Views.ReviewChanges.tipCoAuthMode": "Задать режим совместного редактирования", + "Common.Views.ReviewChanges.tipCommentRem": "Удалить комментарии", + "Common.Views.ReviewChanges.tipCommentRemCurrent": "Удалить текущие комментарии", "Common.Views.ReviewChanges.tipHistory": "Показать историю версий", "Common.Views.ReviewChanges.tipRejectCurrent": "Отклонить текущее изменение", "Common.Views.ReviewChanges.tipReview": "Отслеживать изменения", @@ -175,6 +177,11 @@ "Common.Views.ReviewChanges.txtChat": "Чат", "Common.Views.ReviewChanges.txtClose": "Закрыть", "Common.Views.ReviewChanges.txtCoAuthMode": "Режим совместного редактирования", + "Common.Views.ReviewChanges.txtCommentRemAll": "Удалить все комментарии", + "Common.Views.ReviewChanges.txtCommentRemCurrent": "Удалить текущие комментарии", + "Common.Views.ReviewChanges.txtCommentRemMy": "Удалить мои комментарии", + "Common.Views.ReviewChanges.txtCommentRemMyCurrent": "Удалить мои текущие комментарии", + "Common.Views.ReviewChanges.txtCommentRemove": "Удалить", "Common.Views.ReviewChanges.txtDocLang": "Язык", "Common.Views.ReviewChanges.txtFinal": "Все изменения приняты (просмотр)", "Common.Views.ReviewChanges.txtFinalCap": "Измененный документ", @@ -229,6 +236,11 @@ "Common.Views.SignSettingsDialog.textShowDate": "Показывать дату подписи в строке подписи", "Common.Views.SignSettingsDialog.textTitle": "Настройка подписи", "Common.Views.SignSettingsDialog.txtEmpty": "Это поле необходимо заполнить", + "Common.Views.SymbolTableDialog.textCode": "Код знака из Юникод (шестн.)", + "Common.Views.SymbolTableDialog.textFont": "Шрифт", + "Common.Views.SymbolTableDialog.textRange": "Набор", + "Common.Views.SymbolTableDialog.textRecent": "Ранее использовавшиеся символы", + "Common.Views.SymbolTableDialog.textTitle": "Символ", "PE.Controllers.LeftMenu.newDocumentTitle": "Презентация без имени", "PE.Controllers.LeftMenu.notcriticalErrorTitle": "Внимание", "PE.Controllers.LeftMenu.requestEditRightsText": "Запрос прав на редактирование...", @@ -269,6 +281,7 @@ "PE.Controllers.Main.errorToken": "Токен безопасности документа имеет неправильный формат.
Пожалуйста, обратитесь к администратору Сервера документов.", "PE.Controllers.Main.errorTokenExpire": "Истек срок действия токена безопасности документа.
Пожалуйста, обратитесь к администратору Сервера документов.", "PE.Controllers.Main.errorUpdateVersion": "Версия файла была изменена. Страница будет перезагружена.", + "PE.Controllers.Main.errorUpdateVersionOnDisconnect": "Подключение к Интернету было восстановлено, и версия файла изменилась.
Прежде чем продолжить работу, надо скачать файл или скопировать его содержимое, чтобы обеспечить сохранность данных, а затем перезагрузить страницу.", "PE.Controllers.Main.errorUserDrop": "В настоящий момент файл недоступен.", "PE.Controllers.Main.errorUsersExceed": "Превышено количество пользователей, разрешенных согласно тарифному плану", "PE.Controllers.Main.errorViewerDisconnect": "Подключение прервано. Вы по-прежнему можете просматривать документ,
но не сможете скачать или напечатать его до восстановления подключения и обновления страницы.", @@ -591,6 +604,7 @@ "PE.Controllers.Toolbar.textFontSizeErr": "Введенное значение некорректно.
Введите числовое значение от 1 до 100", "PE.Controllers.Toolbar.textFraction": "Дроби", "PE.Controllers.Toolbar.textFunction": "Функции", + "PE.Controllers.Toolbar.textInsert": "Вставить", "PE.Controllers.Toolbar.textIntegral": "Интегралы", "PE.Controllers.Toolbar.textLargeOperator": "Крупные операторы", "PE.Controllers.Toolbar.textLimitAndLog": "Пределы и логарифмы", @@ -919,20 +933,12 @@ "PE.Controllers.Viewport.textFitPage": "По размеру слайда", "PE.Controllers.Viewport.textFitWidth": "По ширине", "PE.Views.ChartSettings.textAdvanced": "Дополнительные параметры", - "PE.Views.ChartSettings.textArea": "С областями", - "PE.Views.ChartSettings.textBar": "Линейчатая", "PE.Views.ChartSettings.textChartType": "Изменить тип диаграммы", - "PE.Views.ChartSettings.textColumn": "Гистограмма", "PE.Views.ChartSettings.textEditData": "Изменить данные", "PE.Views.ChartSettings.textHeight": "Высота", "PE.Views.ChartSettings.textKeepRatio": "Сохранять пропорции", - "PE.Views.ChartSettings.textLine": "График", - "PE.Views.ChartSettings.textPie": "Круговая", - "PE.Views.ChartSettings.textPoint": "Точечная", "PE.Views.ChartSettings.textSize": "Размер", - "PE.Views.ChartSettings.textStock": "Биржевая", "PE.Views.ChartSettings.textStyle": "Стиль", - "PE.Views.ChartSettings.textSurface": "Поверхность", "PE.Views.ChartSettings.textWidth": "Ширина", "PE.Views.ChartSettingsAdvanced.textAlt": "Альтернативный текст", "PE.Views.ChartSettingsAdvanced.textAltDescription": "Описание", @@ -1679,9 +1685,11 @@ "PE.Views.TextArtSettings.txtPapyrus": "Папирус", "PE.Views.TextArtSettings.txtWood": "Дерево", "PE.Views.Toolbar.capAddSlide": "Добавить слайд", + "PE.Views.Toolbar.capBtnAddComment": "Добавить комментарий", "PE.Views.Toolbar.capBtnComment": "Комментарий", "PE.Views.Toolbar.capBtnDateTime": "Дата и время", "PE.Views.Toolbar.capBtnInsHeader": "Колонтитулы", + "PE.Views.Toolbar.capBtnInsSymbol": "Символ", "PE.Views.Toolbar.capBtnSlideNum": "Номер слайда", "PE.Views.Toolbar.capInsertChart": "Диаграмма", "PE.Views.Toolbar.capInsertEquation": "Уравнение", @@ -1707,21 +1715,14 @@ "PE.Views.Toolbar.textAlignMiddle": "Выравнивание текста по середине", "PE.Views.Toolbar.textAlignRight": "Выравнивание текста по правому краю", "PE.Views.Toolbar.textAlignTop": "Выравнивание текста по верхнему краю", - "PE.Views.Toolbar.textArea": "С областями", "PE.Views.Toolbar.textArrangeBack": "Перенести на задний план", "PE.Views.Toolbar.textArrangeBackward": "Перенести назад", "PE.Views.Toolbar.textArrangeForward": "Перенести вперед", "PE.Views.Toolbar.textArrangeFront": "Перенести на передний план", - "PE.Views.Toolbar.textBar": "Линейчатая", "PE.Views.Toolbar.textBold": "Полужирный", - "PE.Views.Toolbar.textCharts": "Диаграммы", - "PE.Views.Toolbar.textColumn": "Гистограмма", "PE.Views.Toolbar.textItalic": "Курсив", - "PE.Views.Toolbar.textLine": "График", "PE.Views.Toolbar.textListSettings": "Параметры списка", "PE.Views.Toolbar.textNewColor": "Пользовательский цвет", - "PE.Views.Toolbar.textPie": "Круговая", - "PE.Views.Toolbar.textPoint": "Точечная", "PE.Views.Toolbar.textShapeAlignBottom": "Выровнять по нижнему краю", "PE.Views.Toolbar.textShapeAlignCenter": "Выровнять по центру", "PE.Views.Toolbar.textShapeAlignLeft": "Выровнять по левому краю", @@ -1732,11 +1733,9 @@ "PE.Views.Toolbar.textShowCurrent": "Показ слайдов с текущего слайда", "PE.Views.Toolbar.textShowPresenterView": "Показ слайдов в режиме докладчика", "PE.Views.Toolbar.textShowSettings": "Параметры показа слайдов", - "PE.Views.Toolbar.textStock": "Биржевая", "PE.Views.Toolbar.textStrikeout": "Зачеркнутый", "PE.Views.Toolbar.textSubscript": "Подстрочные знаки", "PE.Views.Toolbar.textSuperscript": "Надстрочные знаки", - "PE.Views.Toolbar.textSurface": "Поверхность", "PE.Views.Toolbar.textTabCollaboration": "Совместная работа", "PE.Views.Toolbar.textTabFile": "Файл", "PE.Views.Toolbar.textTabHome": "Главная", @@ -1765,6 +1764,7 @@ "PE.Views.Toolbar.tipInsertHyperlink": "Добавить гиперссылку", "PE.Views.Toolbar.tipInsertImage": "Вставить изображение", "PE.Views.Toolbar.tipInsertShape": "Вставить автофигуру", + "PE.Views.Toolbar.tipInsertSymbol": "Вставить символ", "PE.Views.Toolbar.tipInsertTable": "Вставить таблицу", "PE.Views.Toolbar.tipInsertText": "Вставить надпись", "PE.Views.Toolbar.tipInsertTextArt": "Вставить объект Text Art", diff --git a/apps/presentationeditor/main/locale/sk.json b/apps/presentationeditor/main/locale/sk.json index 8c61ca126..70b93332a 100644 --- a/apps/presentationeditor/main/locale/sk.json +++ b/apps/presentationeditor/main/locale/sk.json @@ -5,6 +5,14 @@ "Common.Controllers.ExternalDiagramEditor.textClose": "Zatvoriť", "Common.Controllers.ExternalDiagramEditor.warningText": "Objekt je blokovaný, pretože ho práve upravuje iný používateľ.", "Common.Controllers.ExternalDiagramEditor.warningTitle": "Upozornenie", + "Common.define.chartData.textArea": "Plošný graf", + "Common.define.chartData.textBar": "Pruhový graf", + "Common.define.chartData.textColumn": "Stĺpec", + "Common.define.chartData.textLine": "Čiara/líniový graf", + "Common.define.chartData.textPie": "Koláčový graf", + "Common.define.chartData.textPoint": "Bodový graf", + "Common.define.chartData.textStock": "Akcie/burzový graf", + "Common.define.chartData.textSurface": "Povrch", "Common.UI.ComboBorderSize.txtNoBorders": "Bez orámovania", "Common.UI.ComboBorderSizeEditable.txtNoBorders": "Bez orámovania", "Common.UI.ComboDataView.emptyComboText": "Žiadne štýly", @@ -656,20 +664,12 @@ "PE.Controllers.Viewport.textFitPage": "Prispôsobiť snímke", "PE.Controllers.Viewport.textFitWidth": "Prispôsobiť na šírku", "PE.Views.ChartSettings.textAdvanced": "Zobraziť pokročilé nastavenia", - "PE.Views.ChartSettings.textArea": "Plošný graf", - "PE.Views.ChartSettings.textBar": "Vodorovná čiarka", "PE.Views.ChartSettings.textChartType": "Zmeniť typ grafu", - "PE.Views.ChartSettings.textColumn": "Stĺpec", "PE.Views.ChartSettings.textEditData": "Upravovať dáta", "PE.Views.ChartSettings.textHeight": "Výška", "PE.Views.ChartSettings.textKeepRatio": "Konštantné rozmery", - "PE.Views.ChartSettings.textLine": "Čiara/líniový graf", - "PE.Views.ChartSettings.textPie": "Koláčový graf", - "PE.Views.ChartSettings.textPoint": "Bodový graf", "PE.Views.ChartSettings.textSize": "Veľkosť", - "PE.Views.ChartSettings.textStock": "Akcie/burzový graf", "PE.Views.ChartSettings.textStyle": "Štýl", - "PE.Views.ChartSettings.textSurface": "Povrch", "PE.Views.ChartSettings.textWidth": "Šírka", "PE.Views.ChartSettingsAdvanced.textAlt": "Alternatívny text", "PE.Views.ChartSettingsAdvanced.textAltDescription": "Popis", @@ -1311,20 +1311,13 @@ "PE.Views.Toolbar.textAlignMiddle": "Zarovnať text na stred", "PE.Views.Toolbar.textAlignRight": "Zarovnať text doprava", "PE.Views.Toolbar.textAlignTop": "Zarovnať text nahor", - "PE.Views.Toolbar.textArea": "Plošný graf", "PE.Views.Toolbar.textArrangeBack": "Presunúť do pozadia", "PE.Views.Toolbar.textArrangeBackward": "Posunúť späť", "PE.Views.Toolbar.textArrangeForward": "Posunúť vpred", "PE.Views.Toolbar.textArrangeFront": "Premiestniť do popredia", - "PE.Views.Toolbar.textBar": "Pruhový graf", "PE.Views.Toolbar.textBold": "Tučné", - "PE.Views.Toolbar.textCharts": "Grafy", - "PE.Views.Toolbar.textColumn": "Stĺpec", "PE.Views.Toolbar.textItalic": "Kurzíva", - "PE.Views.Toolbar.textLine": "Čiara/líniový graf", "PE.Views.Toolbar.textNewColor": "Vlastná farba", - "PE.Views.Toolbar.textPie": "Koláčový graf", - "PE.Views.Toolbar.textPoint": "Bodový graf", "PE.Views.Toolbar.textShapeAlignBottom": "Zarovnať dole", "PE.Views.Toolbar.textShapeAlignCenter": "Centrovať", "PE.Views.Toolbar.textShapeAlignLeft": "Zarovnať doľava", @@ -1335,11 +1328,9 @@ "PE.Views.Toolbar.textShowCurrent": "Zobraziť od aktuálnej snímky", "PE.Views.Toolbar.textShowPresenterView": "Zobraziť režim prezentácie", "PE.Views.Toolbar.textShowSettings": "Ukázať Nastavenia", - "PE.Views.Toolbar.textStock": "Akcie/burzový graf", "PE.Views.Toolbar.textStrikeout": "Prečiarknuť", "PE.Views.Toolbar.textSubscript": "Dolný index", "PE.Views.Toolbar.textSuperscript": "Horný index", - "PE.Views.Toolbar.textSurface": "Povrch", "PE.Views.Toolbar.textTabCollaboration": "Spolupráca", "PE.Views.Toolbar.textTabFile": "Súbor", "PE.Views.Toolbar.textTabHome": "Hlavná stránka", diff --git a/apps/presentationeditor/main/locale/sl.json b/apps/presentationeditor/main/locale/sl.json index b7e47dcdb..08bba243c 100644 --- a/apps/presentationeditor/main/locale/sl.json +++ b/apps/presentationeditor/main/locale/sl.json @@ -5,6 +5,13 @@ "Common.Controllers.ExternalDiagramEditor.textClose": "Zapri", "Common.Controllers.ExternalDiagramEditor.warningText": "Objekt je onemogočen, saj ga ureja drug uporabnik.", "Common.Controllers.ExternalDiagramEditor.warningTitle": "Opozorilo", + "Common.define.chartData.textArea": "Ploščinski grafikon", + "Common.define.chartData.textBar": "Stolpični grafikon", + "Common.define.chartData.textColumn": "Stolpični grafikon", + "Common.define.chartData.textLine": "Vrstični grafikon", + "Common.define.chartData.textPie": "Tortni grafikon", + "Common.define.chartData.textPoint": "Točkovni grafikon", + "Common.define.chartData.textStock": "Založni grafikon", "Common.UI.ComboBorderSize.txtNoBorders": "Ni mej", "Common.UI.ComboBorderSizeEditable.txtNoBorders": "Ni mej", "Common.UI.ComboDataView.emptyComboText": "Ni slogov", @@ -203,18 +210,11 @@ "PE.Controllers.Toolbar.textEmptyImgUrl": "Določiti morate URL slike.", "PE.Controllers.Toolbar.textFontSizeErr": "Vnesena vrednost je nepravilna.
Prosim vnesite numerično vrednost med 1 in 100", "PE.Controllers.Toolbar.textWarning": "Opozorilo", - "PE.Views.ChartSettings.textArea": "Ploščinski grafikon", - "PE.Views.ChartSettings.textBar": "Stolpični grafikon", "PE.Views.ChartSettings.textChartType": "Spremeni vrsto razpredelnice", - "PE.Views.ChartSettings.textColumn": "Stolpični grafikon", "PE.Views.ChartSettings.textEditData": "Uredi podatke", "PE.Views.ChartSettings.textHeight": "Višina", "PE.Views.ChartSettings.textKeepRatio": "Nenehna razmerja", - "PE.Views.ChartSettings.textLine": "Vrstični grafikon", - "PE.Views.ChartSettings.textPie": "Tortni grafikon", - "PE.Views.ChartSettings.textPoint": "Točkovni grafikon", "PE.Views.ChartSettings.textSize": "Velikost", - "PE.Views.ChartSettings.textStock": "Založni grafikon", "PE.Views.ChartSettings.textStyle": "Slog", "PE.Views.ChartSettings.textWidth": "Širina", "PE.Views.DocumentHolder.aboveText": "Nad", @@ -698,26 +698,19 @@ "PE.Views.Toolbar.textAlignMiddle": "Besedilo poravnaj na sredino", "PE.Views.Toolbar.textAlignRight": "Uskladi Besedilo Desno", "PE.Views.Toolbar.textAlignTop": "Besedilo poravnaj na vrh", - "PE.Views.Toolbar.textArea": "Ploščinski grafikon", "PE.Views.Toolbar.textArrangeBack": "Pošlji k ozadju", "PE.Views.Toolbar.textArrangeBackward": "Premakni nazaj", "PE.Views.Toolbar.textArrangeForward": "Premakni naprej", "PE.Views.Toolbar.textArrangeFront": "Premakni v ospredje", - "PE.Views.Toolbar.textBar": "Stolpični grafikon", "PE.Views.Toolbar.textBold": "Krepko", - "PE.Views.Toolbar.textColumn": "Stolpični grafikon", "PE.Views.Toolbar.textItalic": "Poševno", - "PE.Views.Toolbar.textLine": "Vrstični grafikon", "PE.Views.Toolbar.textNewColor": "Barva po meri", - "PE.Views.Toolbar.textPie": "Tortni grafikon", - "PE.Views.Toolbar.textPoint": "Točkovni grafikon", "PE.Views.Toolbar.textShapeAlignBottom": "Poravnaj dno", "PE.Views.Toolbar.textShapeAlignCenter": "Poravnaj središče", "PE.Views.Toolbar.textShapeAlignLeft": "Poravnaj levo", "PE.Views.Toolbar.textShapeAlignMiddle": "Poravnaj sredino", "PE.Views.Toolbar.textShapeAlignRight": "Poravnaj desno", "PE.Views.Toolbar.textShapeAlignTop": "Poravnaj vrh", - "PE.Views.Toolbar.textStock": "Založni grafikon", "PE.Views.Toolbar.textStrikeout": "Prečrtaj", "PE.Views.Toolbar.textSubscript": "Pripis", "PE.Views.Toolbar.textSuperscript": "Nadpis", diff --git a/apps/presentationeditor/main/locale/tr.json b/apps/presentationeditor/main/locale/tr.json index a0d02a2db..7f3c44ef6 100644 --- a/apps/presentationeditor/main/locale/tr.json +++ b/apps/presentationeditor/main/locale/tr.json @@ -5,6 +5,14 @@ "Common.Controllers.ExternalDiagramEditor.textClose": "Kapat", "Common.Controllers.ExternalDiagramEditor.warningText": "Obje devre dışı bırakıldı, çünkü başka kullanıcı tarafından düzenleniyor.", "Common.Controllers.ExternalDiagramEditor.warningTitle": "Dikkat", + "Common.define.chartData.textArea": "Bölge Grafiği", + "Common.define.chartData.textBar": "Çubuk grafik", + "Common.define.chartData.textColumn": "Sütun grafik", + "Common.define.chartData.textLine": "Çizgi grafiği", + "Common.define.chartData.textPie": "Dilim grafik", + "Common.define.chartData.textPoint": "Nokta grafiği", + "Common.define.chartData.textStock": "Stok Grafiği", + "Common.define.chartData.textSurface": "Yüzey", "Common.UI.ComboBorderSize.txtNoBorders": "Sınır yok", "Common.UI.ComboBorderSizeEditable.txtNoBorders": "Sınır yok", "Common.UI.ComboDataView.emptyComboText": "Stil yok", @@ -624,20 +632,12 @@ "PE.Controllers.Toolbar.txtSymbol_xsi": "Xi", "PE.Controllers.Toolbar.txtSymbol_zeta": "Zeta", "PE.Views.ChartSettings.textAdvanced": "Gelişmiş Ayarları Göster", - "PE.Views.ChartSettings.textArea": "Bölge Grafiği", - "PE.Views.ChartSettings.textBar": "Çubuk grafik", "PE.Views.ChartSettings.textChartType": "Grafik Tipini Değiştir", - "PE.Views.ChartSettings.textColumn": "Sütun grafik", "PE.Views.ChartSettings.textEditData": "Veri düzenle", "PE.Views.ChartSettings.textHeight": "Yükseklik", "PE.Views.ChartSettings.textKeepRatio": "Sabit Orantılar", - "PE.Views.ChartSettings.textLine": "Çizgi grafiği", - "PE.Views.ChartSettings.textPie": "Dilim grafik", - "PE.Views.ChartSettings.textPoint": "Nokta grafiği", "PE.Views.ChartSettings.textSize": "Boyut", - "PE.Views.ChartSettings.textStock": "Stok Grafiği", "PE.Views.ChartSettings.textStyle": "Stil", - "PE.Views.ChartSettings.textSurface": "Yüzey", "PE.Views.ChartSettings.textWidth": "Genişlik", "PE.Views.ChartSettingsAdvanced.textAlt": "Alternatif Metin", "PE.Views.ChartSettingsAdvanced.textAltDescription": "Açıklama", @@ -1267,20 +1267,13 @@ "PE.Views.Toolbar.textAlignMiddle": "Metni ortaya hizala", "PE.Views.Toolbar.textAlignRight": "Metni Sağa Hizala", "PE.Views.Toolbar.textAlignTop": "Metni yukarı hizala", - "PE.Views.Toolbar.textArea": "Bölge Grafiği", "PE.Views.Toolbar.textArrangeBack": "Arkaplana gönder", "PE.Views.Toolbar.textArrangeBackward": "Geri Gönder", "PE.Views.Toolbar.textArrangeForward": "İleri Taşı", "PE.Views.Toolbar.textArrangeFront": "Önplana Getir", - "PE.Views.Toolbar.textBar": "Çubuk grafik", "PE.Views.Toolbar.textBold": "Kalın", - "PE.Views.Toolbar.textCharts": "Grafikler", - "PE.Views.Toolbar.textColumn": "Sütun grafik", "PE.Views.Toolbar.textItalic": "İtalik", - "PE.Views.Toolbar.textLine": "Çizgi grafiği", "PE.Views.Toolbar.textNewColor": "Özel Renk", - "PE.Views.Toolbar.textPie": "Dilim grafik", - "PE.Views.Toolbar.textPoint": "Nokta grafiği", "PE.Views.Toolbar.textShapeAlignBottom": "Alta Hizala", "PE.Views.Toolbar.textShapeAlignCenter": "Ortaya Hizala", "PE.Views.Toolbar.textShapeAlignLeft": "Sola Hizala", @@ -1291,11 +1284,9 @@ "PE.Views.Toolbar.textShowCurrent": "Mevcut slayttan itibaren göster", "PE.Views.Toolbar.textShowPresenterView": "Sunucu görünümüne geç", "PE.Views.Toolbar.textShowSettings": "Ayarları göster", - "PE.Views.Toolbar.textStock": "Stok Grafiği", "PE.Views.Toolbar.textStrikeout": "Üstü çizili", "PE.Views.Toolbar.textSubscript": "Altsimge", "PE.Views.Toolbar.textSuperscript": "Üstsimge", - "PE.Views.Toolbar.textSurface": "Yüzey", "PE.Views.Toolbar.textTabFile": "Dosya", "PE.Views.Toolbar.textTabHome": "Ana Sayfa", "PE.Views.Toolbar.textTabInsert": "Ekle", diff --git a/apps/presentationeditor/main/locale/uk.json b/apps/presentationeditor/main/locale/uk.json index 988def4f7..d6bdd1098 100644 --- a/apps/presentationeditor/main/locale/uk.json +++ b/apps/presentationeditor/main/locale/uk.json @@ -5,6 +5,14 @@ "Common.Controllers.ExternalDiagramEditor.textClose": "Закрити", "Common.Controllers.ExternalDiagramEditor.warningText": "Об'єкт вимкнено, оскільки його редагує інший користувач.", "Common.Controllers.ExternalDiagramEditor.warningTitle": "Застереження", + "Common.define.chartData.textArea": "Площа", + "Common.define.chartData.textBar": "Вставити", + "Common.define.chartData.textColumn": "Колона", + "Common.define.chartData.textLine": "Лінія", + "Common.define.chartData.textPie": "Пиріг", + "Common.define.chartData.textPoint": "XY (розсіювання)", + "Common.define.chartData.textStock": "Запас", + "Common.define.chartData.textSurface": "Поверхня", "Common.UI.ComboBorderSize.txtNoBorders": "Немає кордонів", "Common.UI.ComboBorderSizeEditable.txtNoBorders": "Немає кордонів", "Common.UI.ComboDataView.emptyComboText": "Немає стилів", @@ -600,20 +608,12 @@ "PE.Controllers.Toolbar.txtSymbol_xsi": "ксі", "PE.Controllers.Toolbar.txtSymbol_zeta": "Зета", "PE.Views.ChartSettings.textAdvanced": "Показати додаткові налаштування", - "PE.Views.ChartSettings.textArea": "Площа", - "PE.Views.ChartSettings.textBar": "Вставити", "PE.Views.ChartSettings.textChartType": "Змінити тип діаграми", - "PE.Views.ChartSettings.textColumn": "Колона", "PE.Views.ChartSettings.textEditData": "Редагувати дату", "PE.Views.ChartSettings.textHeight": "Висота", "PE.Views.ChartSettings.textKeepRatio": "Сталі пропорції", - "PE.Views.ChartSettings.textLine": "Лінія", - "PE.Views.ChartSettings.textPie": "Пиріг", - "PE.Views.ChartSettings.textPoint": "XY (розсіювання)", "PE.Views.ChartSettings.textSize": "Розмір", - "PE.Views.ChartSettings.textStock": "Запас", "PE.Views.ChartSettings.textStyle": "Стиль", - "PE.Views.ChartSettings.textSurface": "Поверхня", "PE.Views.ChartSettings.textWidth": "Ширина", "PE.Views.ChartSettingsAdvanced.textAlt": "Альтернативний текст", "PE.Views.ChartSettingsAdvanced.textAltDescription": "Опис", @@ -1248,20 +1248,13 @@ "PE.Views.Toolbar.textAlignMiddle": "Вирівняти текст по центру", "PE.Views.Toolbar.textAlignRight": "Вирівняти текст праворуч", "PE.Views.Toolbar.textAlignTop": "Вирівняти текст догори", - "PE.Views.Toolbar.textArea": "Площа", "PE.Views.Toolbar.textArrangeBack": "Надіслати до фону", "PE.Views.Toolbar.textArrangeBackward": "Відправити назад", "PE.Views.Toolbar.textArrangeForward": "Висувати", "PE.Views.Toolbar.textArrangeFront": "Перенести на передній план", - "PE.Views.Toolbar.textBar": "Вставити", "PE.Views.Toolbar.textBold": "Жирний", - "PE.Views.Toolbar.textCharts": "Діаграми", - "PE.Views.Toolbar.textColumn": "Колона", "PE.Views.Toolbar.textItalic": "Курсив", - "PE.Views.Toolbar.textLine": "Лінія", "PE.Views.Toolbar.textNewColor": "Власний колір", - "PE.Views.Toolbar.textPie": "Пиріг", - "PE.Views.Toolbar.textPoint": "XY (розсіювання)", "PE.Views.Toolbar.textShapeAlignBottom": "Вирівняти знизу", "PE.Views.Toolbar.textShapeAlignCenter": "Вирівняти центр", "PE.Views.Toolbar.textShapeAlignLeft": "Вирівняти зліва", @@ -1272,11 +1265,9 @@ "PE.Views.Toolbar.textShowCurrent": "Показати з поточного слайда", "PE.Views.Toolbar.textShowPresenterView": "Показати представлення провідника", "PE.Views.Toolbar.textShowSettings": "Показати налаштування", - "PE.Views.Toolbar.textStock": "Запас", "PE.Views.Toolbar.textStrikeout": "Викреслити", "PE.Views.Toolbar.textSubscript": "Підрядковий", "PE.Views.Toolbar.textSuperscript": "Надрядковий", - "PE.Views.Toolbar.textSurface": "Поверхня", "PE.Views.Toolbar.textTabCollaboration": "Співпраця", "PE.Views.Toolbar.textTabFile": "Файл", "PE.Views.Toolbar.textTabHome": "Домашній", diff --git a/apps/presentationeditor/main/locale/vi.json b/apps/presentationeditor/main/locale/vi.json index eaf2505f7..2303cfeb3 100644 --- a/apps/presentationeditor/main/locale/vi.json +++ b/apps/presentationeditor/main/locale/vi.json @@ -5,6 +5,14 @@ "Common.Controllers.ExternalDiagramEditor.textClose": "Đóng", "Common.Controllers.ExternalDiagramEditor.warningText": "Đối tượng bị vô hiệu vì nó đang được chỉnh sửa bởi một người dùng khác.", "Common.Controllers.ExternalDiagramEditor.warningTitle": "Cảnh báo", + "Common.define.chartData.textArea": "Vùng", + "Common.define.chartData.textBar": "Gạch", + "Common.define.chartData.textColumn": "Cột", + "Common.define.chartData.textLine": "Đường kẻ", + "Common.define.chartData.textPie": "Hình bánh", + "Common.define.chartData.textPoint": "XY (Phân tán)", + "Common.define.chartData.textStock": "Cổ phiếu", + "Common.define.chartData.textSurface": "Bề mặt", "Common.UI.ComboBorderSize.txtNoBorders": "Không viền", "Common.UI.ComboBorderSizeEditable.txtNoBorders": "Không viền", "Common.UI.ComboDataView.emptyComboText": "Không có kiểu", @@ -597,20 +605,12 @@ "PE.Controllers.Toolbar.txtSymbol_xsi": "Xi", "PE.Controllers.Toolbar.txtSymbol_zeta": "Zeta", "PE.Views.ChartSettings.textAdvanced": "Hiển thị Cài đặt Nâng cao", - "PE.Views.ChartSettings.textArea": "Vùng", - "PE.Views.ChartSettings.textBar": "Cột", "PE.Views.ChartSettings.textChartType": "Thay đổi Loại biểu đồ", - "PE.Views.ChartSettings.textColumn": "Cột", "PE.Views.ChartSettings.textEditData": "Chỉnh sửa Dữ liệu", "PE.Views.ChartSettings.textHeight": "Chiều cao", "PE.Views.ChartSettings.textKeepRatio": "Tỷ lệ không đổi", - "PE.Views.ChartSettings.textLine": "Đường kẻ", - "PE.Views.ChartSettings.textPie": "Hình bánh", - "PE.Views.ChartSettings.textPoint": "XY (Phân tán)", "PE.Views.ChartSettings.textSize": "Kích thước", - "PE.Views.ChartSettings.textStock": "Cổ phiếu", "PE.Views.ChartSettings.textStyle": "Kiểu", - "PE.Views.ChartSettings.textSurface": "Bề mặt", "PE.Views.ChartSettings.textWidth": "Chiều rộng", "PE.Views.ChartSettingsAdvanced.textAlt": "Văn bản thay thế", "PE.Views.ChartSettingsAdvanced.textAltDescription": "Mô tả", @@ -1235,20 +1235,13 @@ "PE.Views.Toolbar.textAlignMiddle": "Căn chỉnh văn bản vào giữa", "PE.Views.Toolbar.textAlignRight": "Căn chỉnh văn bản sang phải", "PE.Views.Toolbar.textAlignTop": "Căn chỉnh văn bản lên trên cùng", - "PE.Views.Toolbar.textArea": "Vùng", "PE.Views.Toolbar.textArrangeBack": "Gửi tới Nền", "PE.Views.Toolbar.textArrangeBackward": "Gửi về phía sau", "PE.Views.Toolbar.textArrangeForward": "Di chuyển tiến lên", "PE.Views.Toolbar.textArrangeFront": "Đưa lên Cận cảnh", - "PE.Views.Toolbar.textBar": "Cột", "PE.Views.Toolbar.textBold": "Đậm", - "PE.Views.Toolbar.textCharts": "Biểu đồ", - "PE.Views.Toolbar.textColumn": "Cột", "PE.Views.Toolbar.textItalic": "Nghiêng", - "PE.Views.Toolbar.textLine": "Đường kẻ", "PE.Views.Toolbar.textNewColor": "Màu tùy chỉnh", - "PE.Views.Toolbar.textPie": "Hình bánh", - "PE.Views.Toolbar.textPoint": "XY (Phân tán)", "PE.Views.Toolbar.textShapeAlignBottom": "Căn dưới cùng", "PE.Views.Toolbar.textShapeAlignCenter": "Căn trung tâm", "PE.Views.Toolbar.textShapeAlignLeft": "Căn trái", @@ -1259,11 +1252,9 @@ "PE.Views.Toolbar.textShowCurrent": "Hiển thị từ slide Hiện tại", "PE.Views.Toolbar.textShowPresenterView": "Hiển thị presenter view", "PE.Views.Toolbar.textShowSettings": "Hiển thị cài đặt", - "PE.Views.Toolbar.textStock": "Cổ phiếu", "PE.Views.Toolbar.textStrikeout": "Gạch bỏ", "PE.Views.Toolbar.textSubscript": "Chỉ số dưới", "PE.Views.Toolbar.textSuperscript": "Chỉ số trên", - "PE.Views.Toolbar.textSurface": "Bề mặt", "PE.Views.Toolbar.textTabFile": "File", "PE.Views.Toolbar.textTabHome": "Trang chủ", "PE.Views.Toolbar.textTabInsert": "Chèn", diff --git a/apps/presentationeditor/main/locale/zh.json b/apps/presentationeditor/main/locale/zh.json index 59de74f48..d937626fe 100644 --- a/apps/presentationeditor/main/locale/zh.json +++ b/apps/presentationeditor/main/locale/zh.json @@ -5,6 +5,14 @@ "Common.Controllers.ExternalDiagramEditor.textClose": "关闭", "Common.Controllers.ExternalDiagramEditor.warningText": "该对象被禁用，因为它被另一个用户编辑。", "Common.Controllers.ExternalDiagramEditor.warningTitle": "警告", + "Common.define.chartData.textArea": "区域", + "Common.define.chartData.textBar": "条", + "Common.define.chartData.textColumn": "列", + "Common.define.chartData.textLine": "线", + "Common.define.chartData.textPie": "派", + "Common.define.chartData.textPoint": "XY（散射）", + "Common.define.chartData.textStock": "股票", + "Common.define.chartData.textSurface": "平面", "Common.UI.ComboBorderSize.txtNoBorders": "没有边框", "Common.UI.ComboBorderSizeEditable.txtNoBorders": "没有边框", "Common.UI.ComboDataView.emptyComboText": "没有风格", @@ -901,20 +909,12 @@ "PE.Controllers.Viewport.textFitPage": "适合幻灯片", "PE.Controllers.Viewport.textFitWidth": "适合宽度", "PE.Views.ChartSettings.textAdvanced": "显示高级设置", - "PE.Views.ChartSettings.textArea": "区域", - "PE.Views.ChartSettings.textBar": "条", "PE.Views.ChartSettings.textChartType": "更改图表类型", - "PE.Views.ChartSettings.textColumn": "列", "PE.Views.ChartSettings.textEditData": "编辑数据", "PE.Views.ChartSettings.textHeight": "高度", "PE.Views.ChartSettings.textKeepRatio": "不变比例", - "PE.Views.ChartSettings.textLine": "线", - "PE.Views.ChartSettings.textPie": "派", - "PE.Views.ChartSettings.textPoint": "XY（散射）", "PE.Views.ChartSettings.textSize": "大小", - "PE.Views.ChartSettings.textStock": "股票", "PE.Views.ChartSettings.textStyle": "类型", - "PE.Views.ChartSettings.textSurface": "平面", "PE.Views.ChartSettings.textWidth": "宽度", "PE.Views.ChartSettingsAdvanced.textAlt": "可选文本", "PE.Views.ChartSettingsAdvanced.textAltDescription": "描述", @@ -1622,20 +1622,13 @@ "PE.Views.Toolbar.textAlignMiddle": "将文本对齐到底部", "PE.Views.Toolbar.textAlignRight": "对齐文本", "PE.Views.Toolbar.textAlignTop": "将文本对齐到顶部", - "PE.Views.Toolbar.textArea": "区域", "PE.Views.Toolbar.textArrangeBack": "发送到背景", "PE.Views.Toolbar.textArrangeBackward": "向后移动", "PE.Views.Toolbar.textArrangeForward": "向前移动", "PE.Views.Toolbar.textArrangeFront": "放到最上面", - "PE.Views.Toolbar.textBar": "条", "PE.Views.Toolbar.textBold": "加粗", - "PE.Views.Toolbar.textCharts": "图表", - "PE.Views.Toolbar.textColumn": "列", "PE.Views.Toolbar.textItalic": "斜体", - "PE.Views.Toolbar.textLine": "线", "PE.Views.Toolbar.textNewColor": "自定义颜色", - "PE.Views.Toolbar.textPie": "派", - "PE.Views.Toolbar.textPoint": "XY（散射）", "PE.Views.Toolbar.textShapeAlignBottom": "底部对齐", "PE.Views.Toolbar.textShapeAlignCenter": "居中对齐", "PE.Views.Toolbar.textShapeAlignLeft": "左对齐", @@ -1646,11 +1639,9 @@ "PE.Views.Toolbar.textShowCurrent": "从当前幻灯片展示", "PE.Views.Toolbar.textShowPresenterView": "显示演示者视图", "PE.Views.Toolbar.textShowSettings": "显示设置", - "PE.Views.Toolbar.textStock": "股票", "PE.Views.Toolbar.textStrikeout": "加删除线", "PE.Views.Toolbar.textSubscript": "下标", "PE.Views.Toolbar.textSuperscript": "上标", - "PE.Views.Toolbar.textSurface": "平面", "PE.Views.Toolbar.textTabCollaboration": "协作", "PE.Views.Toolbar.textTabFile": "文件", "PE.Views.Toolbar.textTabHome": "主页", diff --git a/apps/spreadsheeteditor/main/locale/bg.json b/apps/spreadsheeteditor/main/locale/bg.json index f5d0d07b4..1d0843128 100644 --- a/apps/spreadsheeteditor/main/locale/bg.json +++ b/apps/spreadsheeteditor/main/locale/bg.json @@ -2,6 +2,19 @@ "cancelButtonText": "Отказ", "Common.Controllers.Chat.notcriticalErrorTitle": "Внимание", "Common.Controllers.Chat.textEnterMessage": "Въведете съобщението си тук", + "Common.define.chartData.textArea": "Площ", + "Common.define.chartData.textBar": "Бар", + "Common.define.chartData.textColumn": "Колона", + "Common.define.chartData.textLine": "Линия", + "Common.define.chartData.textPie": "Кръгова", + "Common.define.chartData.textPoint": "XY (точкова)", + "Common.define.chartData.textStock": "Борсова", + "Common.define.chartData.textSurface": "Повърхност", + "Common.define.chartData.textCharts": "Диаграми", + "Common.define.chartData.textSparks": "Блещукащи", + "Common.define.chartData.textColumnSpark": "Колона", + "Common.define.chartData.textLineSpark": "Линия", + "Common.define.chartData.textWinLossSpark": "Печалба/Загуба", "Common.UI.ComboBorderSize.txtNoBorders": "Няма граници", "Common.UI.ComboBorderSizeEditable.txtNoBorders": "Няма граници", "Common.UI.ComboDataView.emptyComboText": "Няма стилове", @@ -1128,36 +1141,25 @@ "SSE.Views.ChartSettings.strSparkColor": "Цвят", "SSE.Views.ChartSettings.strTemplate": "Шаблон", "SSE.Views.ChartSettings.textAdvanced": "Показване на разширените настройки", - "SSE.Views.ChartSettings.textArea": "Площ", - "SSE.Views.ChartSettings.textBar": "Бар", "SSE.Views.ChartSettings.textBorderSizeErr": "Въведената стойност е неправилна.
Въведете стойност между 0 pt и 1584 pt.", "SSE.Views.ChartSettings.textChartType": "Промяна на типа на диаграмата", - "SSE.Views.ChartSettings.textColumn": "Колона", - "SSE.Views.ChartSettings.textColumnSpark": "Колона", "SSE.Views.ChartSettings.textEditData": "Редактиране на данни и местоположение", "SSE.Views.ChartSettings.textFirstPoint": "Първа точка", "SSE.Views.ChartSettings.textHeight": "Височина", "SSE.Views.ChartSettings.textHighPoint": "Висока точка", "SSE.Views.ChartSettings.textKeepRatio": "Постоянни пропорции", "SSE.Views.ChartSettings.textLastPoint": "Последна точка", - "SSE.Views.ChartSettings.textLine": "Линия", - "SSE.Views.ChartSettings.textLineSpark": "Линия", "SSE.Views.ChartSettings.textLowPoint": "Ниска точка", "SSE.Views.ChartSettings.textMarkers": "Маркери", "SSE.Views.ChartSettings.textNegativePoint": "Отрицателна точка", "SSE.Views.ChartSettings.textNewColor": "Нов потребителски цвят", - "SSE.Views.ChartSettings.textPie": "Кръгова", - "SSE.Views.ChartSettings.textPoint": "XY (точкова)", "SSE.Views.ChartSettings.textRanges": "Диапазон на данните", "SSE.Views.ChartSettings.textSelectData": "Изберете данни", "SSE.Views.ChartSettings.textShow": "Покажи", "SSE.Views.ChartSettings.textSize": "Размер", - "SSE.Views.ChartSettings.textStock": "Борсова", "SSE.Views.ChartSettings.textStyle": "Стил", - "SSE.Views.ChartSettings.textSurface": "Повърхност", "SSE.Views.ChartSettings.textType": "Тип", "SSE.Views.ChartSettings.textWidth": "Ширина", - "SSE.Views.ChartSettings.textWinLossSpark": "Печалба/Загуба", "SSE.Views.ChartSettingsDlg.errorMaxPoints": "ГРЕШКА! Максималният брой точки в серия на графиката е 4096.", "SSE.Views.ChartSettingsDlg.errorMaxRows": "Максимален брой поредици данни за диаграма е 255", "SSE.Views.ChartSettingsDlg.errorStockChart": "Неправилен ред на ред. За изграждане на борсова карта поставете данните на листа в следния ред:
цена на отваряне, максимална цена, мин. цена, цена на затваряне.", @@ -1165,14 +1167,12 @@ "SSE.Views.ChartSettingsDlg.textAltDescription": "Описание", "SSE.Views.ChartSettingsDlg.textAltTip": "Алтернативното текстово представяне на визуалната информация за обекта, което ще бъде прочетено на хората с визуални или когнитивни увреждания, за да им помогне да разберат по-добре каква информация има в изображението, автосистемата, диаграмата или таблицата.", "SSE.Views.ChartSettingsDlg.textAltTitle": "Заглавие", - "SSE.Views.ChartSettingsDlg.textArea": "Площ", "SSE.Views.ChartSettingsDlg.textAuto": "Автоматичен", "SSE.Views.ChartSettingsDlg.textAutoEach": "Авто за всеки", "SSE.Views.ChartSettingsDlg.textAxisCrosses": "Ос Кръстове", "SSE.Views.ChartSettingsDlg.textAxisOptions": "Опции за ос", "SSE.Views.ChartSettingsDlg.textAxisPos": "Позиция на ос", "SSE.Views.ChartSettingsDlg.textAxisSettings": "Настройки на ос", - "SSE.Views.ChartSettingsDlg.textBar": "Бар", "SSE.Views.ChartSettingsDlg.textBetweenTickMarks": "Между отметки с отметки", "SSE.Views.ChartSettingsDlg.textBillions": "Милиарди", "SSE.Views.ChartSettingsDlg.textBottom": "Отдоло", @@ -1180,8 +1180,6 @@ "SSE.Views.ChartSettingsDlg.textCenter": "Център", "SSE.Views.ChartSettingsDlg.textChartElementsLegend": "Елементи на диаграмата &
Легенда на диаграмата", "SSE.Views.ChartSettingsDlg.textChartTitle": "Заглавие на диаграмата", - "SSE.Views.ChartSettingsDlg.textColumn": "Колона", - "SSE.Views.ChartSettingsDlg.textColumnSpark": "Колона", "SSE.Views.ChartSettingsDlg.textCross": "Крос", "SSE.Views.ChartSettingsDlg.textCustom": "Персонализиран", "SSE.Views.ChartSettingsDlg.textDataColumns": "в колони", @@ -1222,9 +1220,7 @@ "SSE.Views.ChartSettingsDlg.textLegendPos": "Легенда", "SSE.Views.ChartSettingsDlg.textLegendRight": "Прав", "SSE.Views.ChartSettingsDlg.textLegendTop": "Отгоре", - "SSE.Views.ChartSettingsDlg.textLine": "Графика на линията", "SSE.Views.ChartSettingsDlg.textLines": "Линии", - "SSE.Views.ChartSettingsDlg.textLineSpark": "Линия", "SSE.Views.ChartSettingsDlg.textLocationRange": "Обхват на местоположението", "SSE.Views.ChartSettingsDlg.textLow": "Нисък", "SSE.Views.ChartSettingsDlg.textMajor": "Голям", @@ -1245,8 +1241,6 @@ "SSE.Views.ChartSettingsDlg.textOut": "От", "SSE.Views.ChartSettingsDlg.textOuterTop": "Външен връх", "SSE.Views.ChartSettingsDlg.textOverlay": "Настилка", - "SSE.Views.ChartSettingsDlg.textPie": "Кръгова", - "SSE.Views.ChartSettingsDlg.textPoint": "XY (точкова)", "SSE.Views.ChartSettingsDlg.textReverse": "Стойности в обратен ред", "SSE.Views.ChartSettingsDlg.textReverseOrder": "Обратен ред", "SSE.Views.ChartSettingsDlg.textRight": "Прав", @@ -1267,10 +1261,8 @@ "SSE.Views.ChartSettingsDlg.textSingle": "Единична Sparkline", "SSE.Views.ChartSettingsDlg.textSmooth": "Гладък", "SSE.Views.ChartSettingsDlg.textSparkRanges": "Спарклайн диапазони", - "SSE.Views.ChartSettingsDlg.textStock": "Борсова", "SSE.Views.ChartSettingsDlg.textStraight": "Направо", "SSE.Views.ChartSettingsDlg.textStyle": "Стил", - "SSE.Views.ChartSettingsDlg.textSurface": "Повърхност", "SSE.Views.ChartSettingsDlg.textTenMillions": "10 000 000", "SSE.Views.ChartSettingsDlg.textTenThousands": "10 000", "SSE.Views.ChartSettingsDlg.textThousands": "Хиляди", @@ -1287,7 +1279,6 @@ "SSE.Views.ChartSettingsDlg.textVertAxis": "Вертикална ос", "SSE.Views.ChartSettingsDlg.textVertGrid": "Вертикални решетки", "SSE.Views.ChartSettingsDlg.textVertTitle": "Заглавие на вертикалната ос", - "SSE.Views.ChartSettingsDlg.textWinLossSpark": "Печалба/Загуба", "SSE.Views.ChartSettingsDlg.textXAxisTitle": "X Заглавие на ос", "SSE.Views.ChartSettingsDlg.textYAxisTitle": "Заглавие на ос", "SSE.Views.ChartSettingsDlg.textZero": "Нула", @@ -2050,19 +2041,14 @@ "SSE.Views.Toolbar.textAlignRight": "Подравняване надясно", "SSE.Views.Toolbar.textAlignTop": "Подравняване отгоре", "SSE.Views.Toolbar.textAllBorders": "Всички граници", - "SSE.Views.Toolbar.textArea": "Площ", - "SSE.Views.Toolbar.textBar": "Бар", "SSE.Views.Toolbar.textBold": "Получер", "SSE.Views.Toolbar.textBordersColor": "Цвят на границата", "SSE.Views.Toolbar.textBordersStyle": "Стил на границата", "SSE.Views.Toolbar.textBottom": "Отдоло:", "SSE.Views.Toolbar.textBottomBorders": "Долни граници", "SSE.Views.Toolbar.textCenterBorders": "Вътрешни вертикални граници", - "SSE.Views.Toolbar.textCharts": "Диаграми", "SSE.Views.Toolbar.textClearPrintArea": "Изчистване на зоната за печат", "SSE.Views.Toolbar.textClockwise": "Ъгъл по часовниковата стрелка", - "SSE.Views.Toolbar.textColumn": "Колона", - "SSE.Views.Toolbar.textColumnSpark": "Колона", "SSE.Views.Toolbar.textCounterCw": "Ъгъл обратно на часовниковата стрелка", "SSE.Views.Toolbar.textDelLeft": "Преместване на клетките вляво", "SSE.Views.Toolbar.textDelUp": "Преместете клетки нагоре", @@ -2078,8 +2064,6 @@ "SSE.Views.Toolbar.textLandscape": "Пейзаж", "SSE.Views.Toolbar.textLeft": "Наляво:", "SSE.Views.Toolbar.textLeftBorders": "Ляви граници", - "SSE.Views.Toolbar.textLine": "Линия", - "SSE.Views.Toolbar.textLineSpark": "Линия", "SSE.Views.Toolbar.textMarginsLast": "Последно персонализирано", "SSE.Views.Toolbar.textMarginsNarrow": "Тесен", "SSE.Views.Toolbar.textMarginsNormal": "Нормален", @@ -2090,8 +2074,6 @@ "SSE.Views.Toolbar.textNoBorders": "Няма граници", "SSE.Views.Toolbar.textOutBorders": "Външни граници", "SSE.Views.Toolbar.textPageMarginsCustom": "Персонализирани полета", - "SSE.Views.Toolbar.textPie": "Кръгова", - "SSE.Views.Toolbar.textPoint": "XY (точкова)", "SSE.Views.Toolbar.textPortrait": "Портрет", "SSE.Views.Toolbar.textPrint": "Печат", "SSE.Views.Toolbar.textPrintOptions": "Настройки за печат", @@ -2100,13 +2082,10 @@ "SSE.Views.Toolbar.textRotateDown": "Завъртете текста надолу", "SSE.Views.Toolbar.textRotateUp": "Завъртете текста нагоре", "SSE.Views.Toolbar.textSetPrintArea": "Задайте област на печат", - "SSE.Views.Toolbar.textSparks": "Блещукащи", - "SSE.Views.Toolbar.textStock": "Борсова", "SSE.Views.Toolbar.textStrikeout": "Зачеркнат", "SSE.Views.Toolbar.textSubscript": "Долен", "SSE.Views.Toolbar.textSubSuperscript": "Долен / Горен индекс", "SSE.Views.Toolbar.textSuperscript": "Горен индекс", - "SSE.Views.Toolbar.textSurface": "Повърхност", "SSE.Views.Toolbar.textTabCollaboration": "Сътрудничество", "SSE.Views.Toolbar.textTabFile": "досие", "SSE.Views.Toolbar.textTabHome": "У дома", @@ -2116,7 +2095,6 @@ "SSE.Views.Toolbar.textTop": "Връх:", "SSE.Views.Toolbar.textTopBorders": "Топ граници", "SSE.Views.Toolbar.textUnderline": "Подчертавам", - "SSE.Views.Toolbar.textWinLossSpark": "Печалба/Загуба", "SSE.Views.Toolbar.textZoom": "Мащаб", "SSE.Views.Toolbar.tipAlignBottom": "Подравняване отдолу", "SSE.Views.Toolbar.tipAlignCenter": "Подравняване на центъра", diff --git a/apps/spreadsheeteditor/main/locale/cs.json b/apps/spreadsheeteditor/main/locale/cs.json index 59d987622..bc1b55523 100644 --- a/apps/spreadsheeteditor/main/locale/cs.json +++ b/apps/spreadsheeteditor/main/locale/cs.json @@ -2,6 +2,18 @@ "cancelButtonText": "Zrušit", "Common.Controllers.Chat.notcriticalErrorTitle": "Varování", "Common.Controllers.Chat.textEnterMessage": "Zde napište svou zprávu", + "Common.define.chartData.textArea": "Plošný graf", + "Common.define.chartData.textBar": "Pruhový graf", + "Common.define.chartData.textColumn": "Sloupcový graf", + "Common.define.chartData.textLine": "Liniový graf", + "Common.define.chartData.textPie": "Kruhový diagram", + "Common.define.chartData.textPoint": "Bodový graf", + "Common.define.chartData.textStock": "Burzovní graf", + "Common.define.chartData.textSurface": "Povrch", + "Common.define.chartData.textColumnSpark": "Sloupec", + "Common.define.chartData.textLineSpark": "Čára", + "Common.define.chartData.textWinLossSpark": "Zisk/Ztráta ", + "Common.define.chartData.textSparks": "Sparklines", "Common.UI.ComboBorderSize.txtNoBorders": "Bez ohraničení", "Common.UI.ComboBorderSizeEditable.txtNoBorders": "Bez ohraničení", "Common.UI.ComboDataView.emptyComboText": "Žádné styly", @@ -780,50 +792,37 @@ "SSE.Views.ChartSettings.strSparkColor": "Barva", "SSE.Views.ChartSettings.strTemplate": "Šablona", "SSE.Views.ChartSettings.textAdvanced": "Zobrazit pokročilé nastavení", - "SSE.Views.ChartSettings.textArea": "Plošný graf", - "SSE.Views.ChartSettings.textBar": "Vodorovná čárka", "SSE.Views.ChartSettings.textBorderSizeErr": "Zadaná hodnota není správná.
Zadejte prosím hodnotu mezi 0 a 1584.", "SSE.Views.ChartSettings.textChartType": "Změnit typ grafu", - "SSE.Views.ChartSettings.textColumn": "Sloupec", - "SSE.Views.ChartSettings.textColumnSpark": "Sloupec", "SSE.Views.ChartSettings.textEditData": "Upravit data a umístění", "SSE.Views.ChartSettings.textFirstPoint": "První bod", "SSE.Views.ChartSettings.textHeight": "Výška", "SSE.Views.ChartSettings.textHighPoint": "Vysoký bod", "SSE.Views.ChartSettings.textKeepRatio": "Konstantní rozměry", "SSE.Views.ChartSettings.textLastPoint": "Poslední bod", - "SSE.Views.ChartSettings.textLine": "Čára", - "SSE.Views.ChartSettings.textLineSpark": "Čára", "SSE.Views.ChartSettings.textLowPoint": "Nízký bod", "SSE.Views.ChartSettings.textMarkers": "Značky", "SSE.Views.ChartSettings.textNegativePoint": "Záporný bod", "SSE.Views.ChartSettings.textNewColor": "Přidat novou vlastní barvu", - "SSE.Views.ChartSettings.textPie": "Kruhový diagram", - "SSE.Views.ChartSettings.textPoint": "Bodový graf", "SSE.Views.ChartSettings.textRanges": "Rozsah dat", "SSE.Views.ChartSettings.textSelectData": "Vybrat data", "SSE.Views.ChartSettings.textShow": "Zobrazit", "SSE.Views.ChartSettings.textSize": "Velikost", - "SSE.Views.ChartSettings.textStock": "Akcie", "SSE.Views.ChartSettings.textStyle": "Styl", - "SSE.Views.ChartSettings.textSurface": "Povrch", "SSE.Views.ChartSettings.textType": "Typ", "SSE.Views.ChartSettings.textWidth": "Šířka", - "SSE.Views.ChartSettings.textWinLossSpark": "Zisk/Ztráta ", "SSE.Views.ChartSettingsDlg.errorMaxRows": "CHYBA! Maximální počet datových řad na grafu je 255", "SSE.Views.ChartSettingsDlg.errorStockChart": "Nespravné pořadí řádků. Chcete-li vytvořit burzovní graf umístěte data na list v následujícím pořadí:
otevírací cena, maximální cena, minimální cena, uzavírací cena.", "SSE.Views.ChartSettingsDlg.textAlt": "Alternativní text", "SSE.Views.ChartSettingsDlg.textAltDescription": "Popis", "SSE.Views.ChartSettingsDlg.textAltTip": "Alternativní textová reprezentace informací vizuálního objektu, která bude čtena lidem se zrakovým nebo kognitivním postižením, aby jim pomohla lépe porozumět informacím, které se nacházejí v obrázku, automatickém tvarování, grafu nebo v tabulce.", "SSE.Views.ChartSettingsDlg.textAltTitle": "Název", - "SSE.Views.ChartSettingsDlg.textArea": "Plošný graf", "SSE.Views.ChartSettingsDlg.textAuto": "Automaticky", "SSE.Views.ChartSettingsDlg.textAutoEach": "Automaticky pro každý", "SSE.Views.ChartSettingsDlg.textAxisCrosses": "Křížení os", "SSE.Views.ChartSettingsDlg.textAxisOptions": "Možnosti os", "SSE.Views.ChartSettingsDlg.textAxisPos": "Umístění osy", "SSE.Views.ChartSettingsDlg.textAxisSettings": "Axis Settings", - "SSE.Views.ChartSettingsDlg.textBar": "Pruhový graf", "SSE.Views.ChartSettingsDlg.textBetweenTickMarks": "Mezi značkami", "SSE.Views.ChartSettingsDlg.textBillions": "Miliardy", "SSE.Views.ChartSettingsDlg.textBottom": "Dole", @@ -831,8 +830,6 @@ "SSE.Views.ChartSettingsDlg.textCenter": "Střed", "SSE.Views.ChartSettingsDlg.textChartElementsLegend": "Prvky grafu a
Legenda grafu", "SSE.Views.ChartSettingsDlg.textChartTitle": "Nadpis grafu", - "SSE.Views.ChartSettingsDlg.textColumn": "Sloupcový graf", - "SSE.Views.ChartSettingsDlg.textColumnSpark": "Sloupec", "SSE.Views.ChartSettingsDlg.textCross": "Kříž", "SSE.Views.ChartSettingsDlg.textCustom": "Vlastní", "SSE.Views.ChartSettingsDlg.textDataColumns": "ve sloupcích", @@ -873,9 +870,7 @@ "SSE.Views.ChartSettingsDlg.textLegendPos": "Legenda", "SSE.Views.ChartSettingsDlg.textLegendRight": "Vpravo", "SSE.Views.ChartSettingsDlg.textLegendTop": "Nahoře", - "SSE.Views.ChartSettingsDlg.textLine": "Liniový graf", "SSE.Views.ChartSettingsDlg.textLines": "Čáry", - "SSE.Views.ChartSettingsDlg.textLineSpark": "Čára", "SSE.Views.ChartSettingsDlg.textLocationRange": "Rozsah umístění", "SSE.Views.ChartSettingsDlg.textLow": "Nízko", "SSE.Views.ChartSettingsDlg.textMajor": "Hlavní", @@ -896,8 +891,6 @@ "SSE.Views.ChartSettingsDlg.textOut": "Vně", "SSE.Views.ChartSettingsDlg.textOuterTop": "Vně nahoře", "SSE.Views.ChartSettingsDlg.textOverlay": "Překrytí", - "SSE.Views.ChartSettingsDlg.textPie": "Kruhový diagram", - "SSE.Views.ChartSettingsDlg.textPoint": "Bodový graf", "SSE.Views.ChartSettingsDlg.textReverse": "Hodnoty v obráceném pořádí", "SSE.Views.ChartSettingsDlg.textReverseOrder": "Obrácené pořadí", "SSE.Views.ChartSettingsDlg.textRight": "Vpravo", @@ -918,10 +911,8 @@ "SSE.Views.ChartSettingsDlg.textSingle": "Jednoduchý Sparkline", "SSE.Views.ChartSettingsDlg.textSmooth": "Plynulé", "SSE.Views.ChartSettingsDlg.textSparkRanges": "Rozsahy Sparkline", - "SSE.Views.ChartSettingsDlg.textStock": "Burzovní graf", "SSE.Views.ChartSettingsDlg.textStraight": "Rovné", "SSE.Views.ChartSettingsDlg.textStyle": "Styl", - "SSE.Views.ChartSettingsDlg.textSurface": "Povrch", "SSE.Views.ChartSettingsDlg.textTenMillions": "10 000 000", "SSE.Views.ChartSettingsDlg.textTenThousands": "10 000", "SSE.Views.ChartSettingsDlg.textThousands": "Tisíce", @@ -938,7 +929,6 @@ "SSE.Views.ChartSettingsDlg.textVertAxis": "Svislá osa", "SSE.Views.ChartSettingsDlg.textVertGrid": "Svislá mřížka", "SSE.Views.ChartSettingsDlg.textVertTitle": "Titulek svislé osy", - "SSE.Views.ChartSettingsDlg.textWinLossSpark": "Zisk/Ztráta ", "SSE.Views.ChartSettingsDlg.textXAxisTitle": "Titulek osy x", "SSE.Views.ChartSettingsDlg.textYAxisTitle": "Titulek osy y", "SSE.Views.ChartSettingsDlg.textZero": "Nula", @@ -1521,17 +1511,12 @@ "SSE.Views.Toolbar.textAlignRight": "Zarovnat vpravo", "SSE.Views.Toolbar.textAlignTop": "Zarovnat nahoru", "SSE.Views.Toolbar.textAllBorders": "Všechny ohraničení", - "SSE.Views.Toolbar.textArea": "Plošný graf", - "SSE.Views.Toolbar.textBar": "Vodorovná čárka", "SSE.Views.Toolbar.textBold": "Tučně", "SSE.Views.Toolbar.textBordersColor": "Barva ohraničení", "SSE.Views.Toolbar.textBordersStyle": "Styl ohraničení", "SSE.Views.Toolbar.textBottomBorders": "Spodní ohraničení", "SSE.Views.Toolbar.textCenterBorders": "Vnitřní svislé ohraničení", - "SSE.Views.Toolbar.textCharts": "Grafy", "SSE.Views.Toolbar.textClockwise": "Otočit ve směru hodinových ručiček", - "SSE.Views.Toolbar.textColumn": "Sloupec", - "SSE.Views.Toolbar.textColumnSpark": "Sloupec", "SSE.Views.Toolbar.textCounterCw": "Otočit proti směru hodinových ručiček", "SSE.Views.Toolbar.textDelLeft": "Posunout buňky vlevo", "SSE.Views.Toolbar.textDelUp": "Posunout buňky nahoru", @@ -1545,29 +1530,21 @@ "SSE.Views.Toolbar.textInsRight": "Posunout buňky vpravo", "SSE.Views.Toolbar.textItalic": "Kurzíva", "SSE.Views.Toolbar.textLeftBorders": "Levé ohraničení", - "SSE.Views.Toolbar.textLine": "Čára", - "SSE.Views.Toolbar.textLineSpark": "Čára", "SSE.Views.Toolbar.textMiddleBorders": "Vnitřní horizontální ohraničení", "SSE.Views.Toolbar.textMoreFormats": "Více formátů", "SSE.Views.Toolbar.textNewColor": "Přidat novou vlastní barvu", "SSE.Views.Toolbar.textNoBorders": "Bez ohraničení", "SSE.Views.Toolbar.textOutBorders": "Vnější ohraničení", - "SSE.Views.Toolbar.textPie": "Kruhový diagram", - "SSE.Views.Toolbar.textPoint": "Bodový graf", "SSE.Views.Toolbar.textPrint": "Tisk", "SSE.Views.Toolbar.textPrintOptions": "Nastavení tisku", "SSE.Views.Toolbar.textRightBorders": "Pravé ohraničení", "SSE.Views.Toolbar.textRotateDown": "Otočit text dolů", "SSE.Views.Toolbar.textRotateUp": "Otočit text nahoru", - "SSE.Views.Toolbar.textSparks": "Sparklines", - "SSE.Views.Toolbar.textStock": "Burzovní graf", - "SSE.Views.Toolbar.textSurface": "Povrch", "SSE.Views.Toolbar.textTabFile": "Soubor", "SSE.Views.Toolbar.textTabHome": "Domů", "SSE.Views.Toolbar.textTabInsert": "Vložit", "SSE.Views.Toolbar.textTopBorders": "Horní ohraničení", "SSE.Views.Toolbar.textUnderline": "Podtržení", - "SSE.Views.Toolbar.textWinLossSpark": "Zisk/Ztráta ", "SSE.Views.Toolbar.textZoom": "Přiblížit", "SSE.Views.Toolbar.tipAlignBottom": "Zarovnat dolů", "SSE.Views.Toolbar.tipAlignCenter": "Zarovnat na střed", diff --git a/apps/spreadsheeteditor/main/locale/de.json b/apps/spreadsheeteditor/main/locale/de.json index 5feab7090..8b1b79928 100644 --- a/apps/spreadsheeteditor/main/locale/de.json +++ b/apps/spreadsheeteditor/main/locale/de.json @@ -11,6 +11,10 @@ "Common.define.chartData.textPoint": "Punkt (XY)", "Common.define.chartData.textStock": "Kurs", "Common.define.chartData.textSurface": "Oberfläche", + "Common.define.chartData.textWinLossSpark": "Gewinn/Verlust", + "Common.define.chartData.textColumnSpark": "Spalte", + "Common.define.chartData.textLineSpark": "Linie", + "Common.define.chartData.textSparks": "Sparklines", "Common.UI.ComboBorderSize.txtNoBorders": "Keine Rahmen", "Common.UI.ComboBorderSizeEditable.txtNoBorders": "Keine Rahmen", "Common.UI.ComboDataView.emptyComboText": "Keine Formate", @@ -1150,36 +1154,25 @@ "SSE.Views.ChartSettings.strSparkColor": "Farbe", "SSE.Views.ChartSettings.strTemplate": "Vorlage", "SSE.Views.ChartSettings.textAdvanced": "Erweiterte Einstellungen anzeigen", - "SSE.Views.ChartSettings.textArea": "Fläche", - "SSE.Views.ChartSettings.textBar": "Balken", "SSE.Views.ChartSettings.textBorderSizeErr": "Der eingegebene Wert ist falsch.
Bitte geben Sie einen Wert zwischen 0 pt und 1584 pt ein.", "SSE.Views.ChartSettings.textChartType": "Diagrammtyp ändern", - "SSE.Views.ChartSettings.textColumn": "Säule", - "SSE.Views.ChartSettings.textColumnSpark": "Spalte", "SSE.Views.ChartSettings.textEditData": "Daten und Standort ändern", "SSE.Views.ChartSettings.textFirstPoint": "Erster Punkt", "SSE.Views.ChartSettings.textHeight": "Höhe", "SSE.Views.ChartSettings.textHighPoint": "Höchstpunkt", "SSE.Views.ChartSettings.textKeepRatio": "Seitenverhältnis beibehalten", "SSE.Views.ChartSettings.textLastPoint": "Letzter Punkt", - "SSE.Views.ChartSettings.textLine": "Linie", - "SSE.Views.ChartSettings.textLineSpark": "Linie", "SSE.Views.ChartSettings.textLowPoint": "Tiefpunkt", "SSE.Views.ChartSettings.textMarkers": "Markierungen", "SSE.Views.ChartSettings.textNegativePoint": "Negativpunkt", "SSE.Views.ChartSettings.textNewColor": "Benutzerdefinierte Farbe", - "SSE.Views.ChartSettings.textPie": "Kreis", - "SSE.Views.ChartSettings.textPoint": "Punkt (XY)", "SSE.Views.ChartSettings.textRanges": "Datenbereich", "SSE.Views.ChartSettings.textSelectData": "Daten auswählen", "SSE.Views.ChartSettings.textShow": "Anzeigen", "SSE.Views.ChartSettings.textSize": "Größe", - "SSE.Views.ChartSettings.textStock": "Kurs", "SSE.Views.ChartSettings.textStyle": "Stil", - "SSE.Views.ChartSettings.textSurface": "Oberfläche", "SSE.Views.ChartSettings.textType": "Typ", "SSE.Views.ChartSettings.textWidth": "Breite", - "SSE.Views.ChartSettings.textWinLossSpark": "Gewinn/Verlust", "SSE.Views.ChartSettingsDlg.errorMaxPoints": "FEHLER! Die maximale Punktzahl pro eine Tabelle beträgt 4096 Punkte.", "SSE.Views.ChartSettingsDlg.errorMaxRows": "FEHLER! Die maximale Anzahl der Datenreihen per Diagramm ist 255", "SSE.Views.ChartSettingsDlg.errorStockChart": "Falsche Reihenfolge der Zeilen. Um ein Kursdiagramm zu erstellen, ordnen Sie die Daten auf dem Blatt folgendermaßen an:
Eröffnungspreis, Höchstpreis, Tiefstpreis, Schlusskurs.", @@ -1187,14 +1180,12 @@ "SSE.Views.ChartSettingsDlg.textAltDescription": "Beschreibung", "SSE.Views.ChartSettingsDlg.textAltTip": "Die alternative textbasierte Darstellung der visuellen Objektinformation, die den Menschen mit geistigen Behinderungen oder Sehbehinderungen vorgelesen wird, um besser verstehen zu können, was genau auf dem Bild, AutoForm, Diagramm oder der Tabelle dargestellt wurde.", "SSE.Views.ChartSettingsDlg.textAltTitle": "Titel", - "SSE.Views.ChartSettingsDlg.textArea": "Flächen", "SSE.Views.ChartSettingsDlg.textAuto": "Automatisch", "SSE.Views.ChartSettingsDlg.textAutoEach": "Automatisch für jeden", "SSE.Views.ChartSettingsDlg.textAxisCrosses": "Schnittpunkt mit der Achse", "SSE.Views.ChartSettingsDlg.textAxisOptions": "Parameter der Achse", "SSE.Views.ChartSettingsDlg.textAxisPos": "Position der Achse", "SSE.Views.ChartSettingsDlg.textAxisSettings": "Achseneinstellungen", - "SSE.Views.ChartSettingsDlg.textBar": "Balken", "SSE.Views.ChartSettingsDlg.textBetweenTickMarks": "Zwischen den Teilstrichen", "SSE.Views.ChartSettingsDlg.textBillions": "Milliarden", "SSE.Views.ChartSettingsDlg.textBottom": "Unten", @@ -1202,8 +1193,6 @@ "SSE.Views.ChartSettingsDlg.textCenter": "Zentriert", "SSE.Views.ChartSettingsDlg.textChartElementsLegend": "Diagrammelemente und
Diagrammlegende", "SSE.Views.ChartSettingsDlg.textChartTitle": "Diagrammtitel", - "SSE.Views.ChartSettingsDlg.textColumn": "Säule", - "SSE.Views.ChartSettingsDlg.textColumnSpark": "Spalte", "SSE.Views.ChartSettingsDlg.textCross": "Schnittpunkt", "SSE.Views.ChartSettingsDlg.textCustom": "Benutzerdefiniert", "SSE.Views.ChartSettingsDlg.textDataColumns": "in Spalten", @@ -1244,9 +1233,7 @@ "SSE.Views.ChartSettingsDlg.textLegendPos": "Legende", "SSE.Views.ChartSettingsDlg.textLegendRight": "Rechts", "SSE.Views.ChartSettingsDlg.textLegendTop": "Oben", - "SSE.Views.ChartSettingsDlg.textLine": "Linie", "SSE.Views.ChartSettingsDlg.textLines": "Linien", - "SSE.Views.ChartSettingsDlg.textLineSpark": "Linie", "SSE.Views.ChartSettingsDlg.textLocationRange": "Positionsbereich", "SSE.Views.ChartSettingsDlg.textLow": "Niedrig", "SSE.Views.ChartSettingsDlg.textMajor": "Primäre", @@ -1267,8 +1254,6 @@ "SSE.Views.ChartSettingsDlg.textOut": "Außen", "SSE.Views.ChartSettingsDlg.textOuterTop": "Außen oben", "SSE.Views.ChartSettingsDlg.textOverlay": "Überlagerung", - "SSE.Views.ChartSettingsDlg.textPie": "Kreis", - "SSE.Views.ChartSettingsDlg.textPoint": "Punkt (XY)", "SSE.Views.ChartSettingsDlg.textReverse": "Werte in umgekehrter Reihenfolge", "SSE.Views.ChartSettingsDlg.textReverseOrder": "Reihenfolge umkehren", "SSE.Views.ChartSettingsDlg.textRight": "Rechts", @@ -1289,10 +1274,8 @@ "SSE.Views.ChartSettingsDlg.textSingle": "Einzelne Sparkline", "SSE.Views.ChartSettingsDlg.textSmooth": "Glatt", "SSE.Views.ChartSettingsDlg.textSparkRanges": "Sparkline Bereiche", - "SSE.Views.ChartSettingsDlg.textStock": "Kurs", "SSE.Views.ChartSettingsDlg.textStraight": "Gerade", "SSE.Views.ChartSettingsDlg.textStyle": "Stil", - "SSE.Views.ChartSettingsDlg.textSurface": "Oberfläche", "SSE.Views.ChartSettingsDlg.textTenMillions": "10 000 000", "SSE.Views.ChartSettingsDlg.textTenThousands": "10 000", "SSE.Views.ChartSettingsDlg.textThousands": "Tausende", @@ -1309,7 +1292,6 @@ "SSE.Views.ChartSettingsDlg.textVertAxis": "Vertikale Achse", "SSE.Views.ChartSettingsDlg.textVertGrid": "Vertikale Gitternetzlinien ", "SSE.Views.ChartSettingsDlg.textVertTitle": "Titel der vertikalen Achse", - "SSE.Views.ChartSettingsDlg.textWinLossSpark": "Gewinn/Verlust", "SSE.Views.ChartSettingsDlg.textXAxisTitle": "X-Achsentitel", "SSE.Views.ChartSettingsDlg.textYAxisTitle": "Y-Achsentitel", "SSE.Views.ChartSettingsDlg.textZero": "Null", @@ -2072,19 +2054,14 @@ "SSE.Views.Toolbar.textAlignRight": "Rechts ausrichten", "SSE.Views.Toolbar.textAlignTop": "Oben ausrichten", "SSE.Views.Toolbar.textAllBorders": "Alle Rahmenlinien", - "SSE.Views.Toolbar.textArea": "Flächen", - "SSE.Views.Toolbar.textBar": "Balken", "SSE.Views.Toolbar.textBold": "Fett", "SSE.Views.Toolbar.textBordersColor": "Rahmenfarbe", "SSE.Views.Toolbar.textBordersStyle": "Rahmenart", "SSE.Views.Toolbar.textBottom": "Unten: ", "SSE.Views.Toolbar.textBottomBorders": "Untere Ränder", "SSE.Views.Toolbar.textCenterBorders": "Innere vertikale Rahmenlinien", - "SSE.Views.Toolbar.textCharts": "Diagramme", "SSE.Views.Toolbar.textClearPrintArea": "Druckbereich aufheben", "SSE.Views.Toolbar.textClockwise": "Im Uhrzeigersinn drehen", - "SSE.Views.Toolbar.textColumn": "Spalte", - "SSE.Views.Toolbar.textColumnSpark": "Spalte", "SSE.Views.Toolbar.textCounterCw": "Gegen den Uhrzeigersinn drehen", "SSE.Views.Toolbar.textDelLeft": "Zellen nach links verschieben", "SSE.Views.Toolbar.textDelUp": "Zellen nach oben verschieben", @@ -2100,8 +2077,6 @@ "SSE.Views.Toolbar.textLandscape": "Querformat", "SSE.Views.Toolbar.textLeft": "Links: ", "SSE.Views.Toolbar.textLeftBorders": "Rahmenlinien links", - "SSE.Views.Toolbar.textLine": "Linie", - "SSE.Views.Toolbar.textLineSpark": "Linie", "SSE.Views.Toolbar.textMarginsLast": " Benutzerdefiniert als letzte", "SSE.Views.Toolbar.textMarginsNarrow": "Schmal", "SSE.Views.Toolbar.textMarginsNormal": "Normal", @@ -2112,8 +2087,6 @@ "SSE.Views.Toolbar.textNoBorders": "Keine Rahmen", "SSE.Views.Toolbar.textOutBorders": "Rahmenlinien außen", "SSE.Views.Toolbar.textPageMarginsCustom": "Benutzerdefinierte Seitenränder", - "SSE.Views.Toolbar.textPie": "Kreis", - "SSE.Views.Toolbar.textPoint": "Punkt (XY)", "SSE.Views.Toolbar.textPortrait": "Hochformat", "SSE.Views.Toolbar.textPrint": "Drucken", "SSE.Views.Toolbar.textPrintOptions": "Druck-Einstellungen", @@ -2122,13 +2095,10 @@ "SSE.Views.Toolbar.textRotateDown": "Text nach unten drehen", "SSE.Views.Toolbar.textRotateUp": "Text nach oben drehen", "SSE.Views.Toolbar.textSetPrintArea": "Druckbereich festlegen", - "SSE.Views.Toolbar.textSparks": "Sparklines", - "SSE.Views.Toolbar.textStock": "Bestand", "SSE.Views.Toolbar.textStrikeout": "Durchgestrichen", "SSE.Views.Toolbar.textSubscript": "Tiefgestellt", "SSE.Views.Toolbar.textSubSuperscript": "Tiefgestellt/hochgestellt", "SSE.Views.Toolbar.textSuperscript": "Hochgestellt", - "SSE.Views.Toolbar.textSurface": "Oberfläche", "SSE.Views.Toolbar.textTabCollaboration": "Zusammenarbeit", "SSE.Views.Toolbar.textTabFile": "Datei", "SSE.Views.Toolbar.textTabHome": "Startseite", @@ -2138,7 +2108,6 @@ "SSE.Views.Toolbar.textTop": "Oben: ", "SSE.Views.Toolbar.textTopBorders": "Rahmenlinien oben", "SSE.Views.Toolbar.textUnderline": "Unterstrichen", - "SSE.Views.Toolbar.textWinLossSpark": "Gewinn/Verlust", "SSE.Views.Toolbar.textZoom": "Zoom", "SSE.Views.Toolbar.tipAlignBottom": "Unten ausrichten", "SSE.Views.Toolbar.tipAlignCenter": "Zentriert ausrichten", diff --git a/apps/spreadsheeteditor/main/locale/en.json b/apps/spreadsheeteditor/main/locale/en.json index 8f39480be..487e071c4 100644 --- a/apps/spreadsheeteditor/main/locale/en.json +++ b/apps/spreadsheeteditor/main/locale/en.json @@ -6,14 +6,14 @@ "Common.define.chartData.textBar": "Bar", "Common.define.chartData.textCharts": "Charts", "Common.define.chartData.textColumn": "Column", + "Common.define.chartData.textColumnSpark": "Column", "Common.define.chartData.textLine": "Line", + "Common.define.chartData.textLineSpark": "Line", "Common.define.chartData.textPie": "Pie", "Common.define.chartData.textPoint": "XY (Scatter)", + "Common.define.chartData.textSparks": "Sparklines", "Common.define.chartData.textStock": "Stock", "Common.define.chartData.textSurface": "Surface", - "Common.define.chartData.textSparks": "Sparklines", - "Common.define.chartData.textColumnSpark": "Column", - "Common.define.chartData.textLineSpark": "Line", "Common.define.chartData.textWinLossSpark": "Win/Loss", "Common.UI.ComboBorderSize.txtNoBorders": "No borders", "Common.UI.ComboBorderSizeEditable.txtNoBorders": "No borders", @@ -159,6 +159,8 @@ "Common.Views.ReviewChanges.strStrictDesc": "Use the 'Save' button to sync the changes you and others make.", "Common.Views.ReviewChanges.tipAcceptCurrent": "Accept current change", "Common.Views.ReviewChanges.tipCoAuthMode": "Set co-editing mode", + "Common.Views.ReviewChanges.tipCommentRem": "Remove comments", + "Common.Views.ReviewChanges.tipCommentRemCurrent": "Remove current comments", "Common.Views.ReviewChanges.tipHistory": "Show version history", "Common.Views.ReviewChanges.tipRejectCurrent": "Reject current change", "Common.Views.ReviewChanges.tipReview": "Track changes", @@ -173,6 +175,11 @@ "Common.Views.ReviewChanges.txtChat": "Chat", "Common.Views.ReviewChanges.txtClose": "Close", "Common.Views.ReviewChanges.txtCoAuthMode": "Co-editing Mode", + "Common.Views.ReviewChanges.txtCommentRemAll": "Remove All Comments", + "Common.Views.ReviewChanges.txtCommentRemCurrent": "Remove Current Comments", + "Common.Views.ReviewChanges.txtCommentRemMy": "Remove My Comments", + "Common.Views.ReviewChanges.txtCommentRemMyCurrent": "Remove My Current Comments", + "Common.Views.ReviewChanges.txtCommentRemove": "Remove", "Common.Views.ReviewChanges.txtDocLang": "Language", "Common.Views.ReviewChanges.txtFinal": "All changes accepted (Preview)", "Common.Views.ReviewChanges.txtFinalCap": "Final", @@ -191,13 +198,6 @@ "Common.Views.ReviewChanges.txtSpelling": "Spell Checking", "Common.Views.ReviewChanges.txtTurnon": "Track Changes", "Common.Views.ReviewChanges.txtView": "Display Mode", - "Common.Views.ReviewChanges.txtCommentRemove": "Remove", - "Common.Views.ReviewChanges.tipCommentRemCurrent": "Remove current comments", - "Common.Views.ReviewChanges.tipCommentRem": "Remove comments", - "Common.Views.ReviewChanges.txtCommentRemCurrent": "Remove Current Comments", - "Common.Views.ReviewChanges.txtCommentRemMyCurrent": "Remove My Current Comments", - "Common.Views.ReviewChanges.txtCommentRemMy": "Remove My Comments", - "Common.Views.ReviewChanges.txtCommentRemAll": "Remove All Comments", "Common.Views.ReviewPopover.textAdd": "Add", "Common.Views.ReviewPopover.textAddReply": "Add Reply", "Common.Views.ReviewPopover.textCancel": "Cancel", @@ -234,11 +234,11 @@ "Common.Views.SignSettingsDialog.textShowDate": "Show sign date in signature line", "Common.Views.SignSettingsDialog.textTitle": "Signature Setup", "Common.Views.SignSettingsDialog.txtEmpty": "This field is required", - "Common.Views.SymbolTableDialog.textTitle": "Symbol", + "Common.Views.SymbolTableDialog.textCode": "Unicode HEX value", "Common.Views.SymbolTableDialog.textFont": "Font", "Common.Views.SymbolTableDialog.textRange": "Range", "Common.Views.SymbolTableDialog.textRecent": "Recently used symbols", - "Common.Views.SymbolTableDialog.textCode": "Unicode HEX value", + "Common.Views.SymbolTableDialog.textTitle": "Symbol", "SSE.Controllers.DataTab.textWizard": "Text to Columns", "SSE.Controllers.DocumentHolder.alignmentText": "Alignment", "SSE.Controllers.DocumentHolder.centerText": "Center", @@ -482,6 +482,7 @@ "SSE.Controllers.Main.errorTokenExpire": "The document security token has expired.
Please contact your Document Server administrator.", "SSE.Controllers.Main.errorUnexpectedGuid": "External error.
Unexpected GUID. Please contact support in case the error persists.", "SSE.Controllers.Main.errorUpdateVersion": "The file version has been changed. The page will be reloaded.", + "SSE.Controllers.Main.errorUpdateVersionOnDisconnect": "Internet connection has been restored, and the file version has been changed.
Before you can continue working, you need to download the file or copy its content to make sure nothing is lost, and then reload this page.", "SSE.Controllers.Main.errorUserDrop": "The file cannot be accessed right now.", "SSE.Controllers.Main.errorUsersExceed": "The number of users allowed by the pricing plan was exceeded", "SSE.Controllers.Main.errorViewerDisconnect": "Connection is lost. You can still view the document,
but will not be able to download or print it until the connection is restored and page is reloaded.", @@ -768,7 +769,6 @@ "SSE.Controllers.Main.warnNoLicense": "This version of %1 editors has certain limitations for concurrent connections to the document server.
If you need more please consider purchasing a commercial license.", "SSE.Controllers.Main.warnNoLicenseUsers": "This version of %1 editors has certain limitations for concurrent users.
If you need more please consider purchasing a commercial license.", "SSE.Controllers.Main.warnProcessRightsChange": "You have been denied the right to edit the file.", - "SSE.Controllers.Main.errorUpdateVersionOnDisconnect": "Internet connection has been restored, and the file version has been changed.
Before you can continue working, you need to download the file or copy its content to make sure nothing is lost, and then reload this page.", "SSE.Controllers.Print.strAllSheets": "All Sheets", "SSE.Controllers.Print.textWarning": "Warning", "SSE.Controllers.Print.txtCustom": "Custom", @@ -786,6 +786,7 @@ "SSE.Controllers.Toolbar.textFontSizeErr": "The entered value is incorrect.
Please enter a numeric value between 1 and 409", "SSE.Controllers.Toolbar.textFraction": "Fractions", "SSE.Controllers.Toolbar.textFunction": "Functions", + "SSE.Controllers.Toolbar.textInsert": "Insert", "SSE.Controllers.Toolbar.textIntegral": "Integrals", "SSE.Controllers.Toolbar.textLargeOperator": "Large Operators", "SSE.Controllers.Toolbar.textLimitAndLog": "Limits And Logarithms", @@ -1123,7 +1124,6 @@ "SSE.Controllers.Toolbar.txtTable_TableStyleMedium": "Table Style Medium", "SSE.Controllers.Toolbar.warnLongOperation": "The operation you are about to perform might take rather much time to complete.
Are you sure you want to continue?", "SSE.Controllers.Toolbar.warnMergeLostData": "Only the data from the upper-left cell will remain in the merged cell.
Are you sure you want to continue?", - "SSE.Controllers.Toolbar.textInsert": "Insert", "SSE.Controllers.Viewport.textFreezePanes": "Freeze Panes", "SSE.Controllers.Viewport.textHideFBar": "Hide Formula Bar", "SSE.Controllers.Viewport.textHideGridlines": "Hide Gridlines", @@ -1205,36 +1205,25 @@ "SSE.Views.ChartSettings.strSparkColor": "Color", "SSE.Views.ChartSettings.strTemplate": "Template", "SSE.Views.ChartSettings.textAdvanced": "Show advanced settings", - "del_SSE.Views.ChartSettings.textArea": "Area", - "del_SSE.Views.ChartSettings.textBar": "Bar", "SSE.Views.ChartSettings.textBorderSizeErr": "The entered value is incorrect.
Please enter a value between 0 pt and 1584 pt.", "SSE.Views.ChartSettings.textChartType": "Change Chart Type", - "del_SSE.Views.ChartSettings.textColumn": "Column", - "del_SSE.Views.ChartSettings.textColumnSpark": "Column", "SSE.Views.ChartSettings.textEditData": "Edit Data and Location", "SSE.Views.ChartSettings.textFirstPoint": "First Point", "SSE.Views.ChartSettings.textHeight": "Height", "SSE.Views.ChartSettings.textHighPoint": "High Point", "SSE.Views.ChartSettings.textKeepRatio": "Constant proportions", "SSE.Views.ChartSettings.textLastPoint": "Last Point", - "del_SSE.Views.ChartSettings.textLine": "Line", - "del_SSE.Views.ChartSettings.textLineSpark": "Line", "SSE.Views.ChartSettings.textLowPoint": "Low Point", "SSE.Views.ChartSettings.textMarkers": "Markers", "SSE.Views.ChartSettings.textNegativePoint": "Negative Point", "SSE.Views.ChartSettings.textNewColor": "Add New Custom Color", - "del_SSE.Views.ChartSettings.textPie": "Pie", - "del_SSE.Views.ChartSettings.textPoint": "XY (Scatter)", "SSE.Views.ChartSettings.textRanges": "Data Range", "SSE.Views.ChartSettings.textSelectData": "Select Data", "SSE.Views.ChartSettings.textShow": "Show", "SSE.Views.ChartSettings.textSize": "Size", - "del_SSE.Views.ChartSettings.textStock": "Stock", "SSE.Views.ChartSettings.textStyle": "Style", - "del_SSE.Views.ChartSettings.textSurface": "Surface", "SSE.Views.ChartSettings.textType": "Type", "SSE.Views.ChartSettings.textWidth": "Width", - "del_SSE.Views.ChartSettings.textWinLossSpark": "Win/Loss", "SSE.Views.ChartSettingsDlg.errorMaxPoints": "ERROR! The maximum number of points in series per chart is 4096.", "SSE.Views.ChartSettingsDlg.errorMaxRows": "ERROR! The maximum number of data series per chart is 255", "SSE.Views.ChartSettingsDlg.errorStockChart": "Incorrect row order. To build a stock chart place the data on the sheet in the following order:
opening price, max price, min price, closing price.", @@ -1243,14 +1232,12 @@ "SSE.Views.ChartSettingsDlg.textAltDescription": "Description", "SSE.Views.ChartSettingsDlg.textAltTip": "The alternative text-based representation of the visual object information, which will be read to the people with vision or cognitive impairments to help them better understand what information there is in the image, autoshape, chart or table.", "SSE.Views.ChartSettingsDlg.textAltTitle": "Title", - "del_SSE.Views.ChartSettingsDlg.textArea": "Area", "SSE.Views.ChartSettingsDlg.textAuto": "Auto", "SSE.Views.ChartSettingsDlg.textAutoEach": "Auto for Each", "SSE.Views.ChartSettingsDlg.textAxisCrosses": "Axis Crosses", "SSE.Views.ChartSettingsDlg.textAxisOptions": "Axis Options", "SSE.Views.ChartSettingsDlg.textAxisPos": "Axis Position", "SSE.Views.ChartSettingsDlg.textAxisSettings": "Axis Settings", - "del_SSE.Views.ChartSettingsDlg.textBar": "Bar", "SSE.Views.ChartSettingsDlg.textBetweenTickMarks": "Between Tick Marks", "SSE.Views.ChartSettingsDlg.textBillions": "Billions", "SSE.Views.ChartSettingsDlg.textBottom": "Bottom", @@ -1258,8 +1245,6 @@ "SSE.Views.ChartSettingsDlg.textCenter": "Center", "SSE.Views.ChartSettingsDlg.textChartElementsLegend": "Chart Elements &
Chart Legend", "SSE.Views.ChartSettingsDlg.textChartTitle": "Chart Title", - "del_SSE.Views.ChartSettingsDlg.textColumn": "Column", - "del_SSE.Views.ChartSettingsDlg.textColumnSpark": "Column", "SSE.Views.ChartSettingsDlg.textCross": "Cross", "SSE.Views.ChartSettingsDlg.textCustom": "Custom", "SSE.Views.ChartSettingsDlg.textDataColumns": "in columns", @@ -1300,9 +1285,7 @@ "SSE.Views.ChartSettingsDlg.textLegendPos": "Legend", "SSE.Views.ChartSettingsDlg.textLegendRight": "Right", "SSE.Views.ChartSettingsDlg.textLegendTop": "Top", - "del_SSE.Views.ChartSettingsDlg.textLine": "Line Chart", "SSE.Views.ChartSettingsDlg.textLines": "Lines ", - "del_SSE.Views.ChartSettingsDlg.textLineSpark": "Line", "SSE.Views.ChartSettingsDlg.textLocationRange": "Location Range", "SSE.Views.ChartSettingsDlg.textLow": "Low", "SSE.Views.ChartSettingsDlg.textMajor": "Major", @@ -1324,8 +1307,6 @@ "SSE.Views.ChartSettingsDlg.textOut": "Out", "SSE.Views.ChartSettingsDlg.textOuterTop": "Outer Top", "SSE.Views.ChartSettingsDlg.textOverlay": "Overlay", - "del_SSE.Views.ChartSettingsDlg.textPie": "Pie", - "del_SSE.Views.ChartSettingsDlg.textPoint": "XY (Scatter)", "SSE.Views.ChartSettingsDlg.textReverse": "Values in reverse order", "SSE.Views.ChartSettingsDlg.textReverseOrder": "Reverse order", "SSE.Views.ChartSettingsDlg.textRight": "Right", @@ -1347,10 +1328,8 @@ "SSE.Views.ChartSettingsDlg.textSmooth": "Smooth", "SSE.Views.ChartSettingsDlg.textSnap": "Cell Snapping", "SSE.Views.ChartSettingsDlg.textSparkRanges": "Sparkline Ranges", - "del_SSE.Views.ChartSettingsDlg.textStock": "Stock", "SSE.Views.ChartSettingsDlg.textStraight": "Straight", "SSE.Views.ChartSettingsDlg.textStyle": "Style", - "del_SSE.Views.ChartSettingsDlg.textSurface": "Surface", "SSE.Views.ChartSettingsDlg.textTenMillions": "10 000 000", "SSE.Views.ChartSettingsDlg.textTenThousands": "10 000", "SSE.Views.ChartSettingsDlg.textThousands": "Thousands", @@ -1368,7 +1347,6 @@ "SSE.Views.ChartSettingsDlg.textVertAxis": "Vertical Axis", "SSE.Views.ChartSettingsDlg.textVertGrid": "Vertical Gridlines", "SSE.Views.ChartSettingsDlg.textVertTitle": "Vertical Axis Title", - "del_SSE.Views.ChartSettingsDlg.textWinLossSpark": "Win/Loss", "SSE.Views.ChartSettingsDlg.textXAxisTitle": "X Axis Title", "SSE.Views.ChartSettingsDlg.textYAxisTitle": "Y Axis Title", "SSE.Views.ChartSettingsDlg.textZero": "Zero", @@ -1449,6 +1427,7 @@ "SSE.Views.DocumentHolder.textFreezePanes": "Freeze Panes", "SSE.Views.DocumentHolder.textFromFile": "From File", "SSE.Views.DocumentHolder.textFromUrl": "From URL", + "SSE.Views.DocumentHolder.textListSettings": "List Settings", "SSE.Views.DocumentHolder.textMoreFormats": "More formats", "SSE.Views.DocumentHolder.textNone": "None", "SSE.Views.DocumentHolder.textReplace": "Replace image", @@ -1528,7 +1507,6 @@ "SSE.Views.DocumentHolder.txtUngroup": "Ungroup", "SSE.Views.DocumentHolder.txtWidth": "Width", "SSE.Views.DocumentHolder.vertAlignText": "Vertical Alignment", - "SSE.Views.DocumentHolder.textListSettings": "List Settings", "SSE.Views.FileMenu.btnBackCaption": "Open file location", "SSE.Views.FileMenu.btnCloseMenuCaption": "Close Menu", "SSE.Views.FileMenu.btnCreateNewCaption": "Create New", @@ -2229,6 +2207,7 @@ "SSE.Views.Toolbar.capBtnAddComment": "Add Comment", "SSE.Views.Toolbar.capBtnComment": "Comment", "SSE.Views.Toolbar.capBtnInsHeader": "Header/Footer", + "SSE.Views.Toolbar.capBtnInsSymbol": "Symbol", "SSE.Views.Toolbar.capBtnMargins": "Margins", "SSE.Views.Toolbar.capBtnPageOrient": "Orientation", "SSE.Views.Toolbar.capBtnPageSize": "Size", @@ -2257,20 +2236,15 @@ "SSE.Views.Toolbar.textAlignRight": "Align Right", "SSE.Views.Toolbar.textAlignTop": "Align Top", "SSE.Views.Toolbar.textAllBorders": "All Borders", - "del_SSE.Views.Toolbar.textArea": "Area", "SSE.Views.Toolbar.textAuto": "Auto", - "del_SSE.Views.Toolbar.textBar": "Bar", "SSE.Views.Toolbar.textBold": "Bold", "SSE.Views.Toolbar.textBordersColor": "Border Color", "SSE.Views.Toolbar.textBordersStyle": "Border Style", "SSE.Views.Toolbar.textBottom": "Bottom: ", "SSE.Views.Toolbar.textBottomBorders": "Bottom Borders", "SSE.Views.Toolbar.textCenterBorders": "Inside Vertical Borders", - "del_SSE.Views.Toolbar.textCharts": "Charts", "SSE.Views.Toolbar.textClearPrintArea": "Clear Print Area", "SSE.Views.Toolbar.textClockwise": "Angle Clockwise", - "del_SSE.Views.Toolbar.textColumn": "Column", - "del_SSE.Views.Toolbar.textColumnSpark": "Column", "SSE.Views.Toolbar.textCounterCw": "Angle Counterclockwise", "SSE.Views.Toolbar.textDelLeft": "Shift Cells Left", "SSE.Views.Toolbar.textDelUp": "Shift Cells Up", @@ -2288,8 +2262,6 @@ "SSE.Views.Toolbar.textLandscape": "Landscape", "SSE.Views.Toolbar.textLeft": "Left: ", "SSE.Views.Toolbar.textLeftBorders": "Left Borders", - "del_SSE.Views.Toolbar.textLine": "Line", - "del_SSE.Views.Toolbar.textLineSpark": "Line", "SSE.Views.Toolbar.textManyPages": "pages", "SSE.Views.Toolbar.textMarginsLast": "Last Custom", "SSE.Views.Toolbar.textMarginsNarrow": "Narrow", @@ -2303,8 +2275,6 @@ "SSE.Views.Toolbar.textOnePage": "page", "SSE.Views.Toolbar.textOutBorders": "Outside Borders", "SSE.Views.Toolbar.textPageMarginsCustom": "Custom margins", - "del_SSE.Views.Toolbar.textPie": "Pie", - "del_SSE.Views.Toolbar.textPoint": "XY (Scatter)", "SSE.Views.Toolbar.textPortrait": "Portrait", "SSE.Views.Toolbar.textPrint": "Print", "SSE.Views.Toolbar.textPrintOptions": "Print Settings", @@ -2313,13 +2283,10 @@ "SSE.Views.Toolbar.textRotateDown": "Rotate Text Down", "SSE.Views.Toolbar.textRotateUp": "Rotate Text Up", "SSE.Views.Toolbar.textSetPrintArea": "Set Print Area", - "del_SSE.Views.Toolbar.textSparks": "Sparklines", - "del_SSE.Views.Toolbar.textStock": "Stock", "SSE.Views.Toolbar.textStrikeout": "Strikeout", "SSE.Views.Toolbar.textSubscript": "Subscript", "SSE.Views.Toolbar.textSubSuperscript": "Subscript/Superscript", "SSE.Views.Toolbar.textSuperscript": "Superscript", - "del_SSE.Views.Toolbar.textSurface": "Surface", "SSE.Views.Toolbar.textTabCollaboration": "Collaboration", "SSE.Views.Toolbar.textTabData": "Data", "SSE.Views.Toolbar.textTabFile": "File", @@ -2332,7 +2299,6 @@ "SSE.Views.Toolbar.textTopBorders": "Top Borders", "SSE.Views.Toolbar.textUnderline": "Underline", "SSE.Views.Toolbar.textWidth": "Width", - "del_SSE.Views.Toolbar.textWinLossSpark": "Win/Loss", "SSE.Views.Toolbar.textZoom": "Zoom", "SSE.Views.Toolbar.tipAlignBottom": "Align bottom", "SSE.Views.Toolbar.tipAlignCenter": "Align center", @@ -2373,6 +2339,7 @@ "SSE.Views.Toolbar.tipInsertImage": "Insert image", "SSE.Views.Toolbar.tipInsertOpt": "Insert cells", "SSE.Views.Toolbar.tipInsertShape": "Insert autoshape", + "SSE.Views.Toolbar.tipInsertSymbol": "Insert symbol", "SSE.Views.Toolbar.tipInsertTable": "Insert table", "SSE.Views.Toolbar.tipInsertText": "Insert text box", "SSE.Views.Toolbar.tipInsertTextart": "Insert Text Art", @@ -2464,8 +2431,6 @@ "SSE.Views.Toolbar.txtTime": "Time", "SSE.Views.Toolbar.txtUnmerge": "Unmerge Cells", "SSE.Views.Toolbar.txtYen": "¥ Yen", - "SSE.Views.Toolbar.capBtnInsSymbol": "Symbol", - "SSE.Views.Toolbar.tipInsertSymbol": "Insert symbol", "SSE.Views.Top10FilterDialog.textType": "Show", "SSE.Views.Top10FilterDialog.txtBottom": "Bottom", "SSE.Views.Top10FilterDialog.txtItems": "Item", diff --git a/apps/spreadsheeteditor/main/locale/es.json b/apps/spreadsheeteditor/main/locale/es.json index 5c64cc382..c8cdc5f2f 100644 --- a/apps/spreadsheeteditor/main/locale/es.json +++ b/apps/spreadsheeteditor/main/locale/es.json @@ -2,6 +2,18 @@ "cancelButtonText": "Cancelar", "Common.Controllers.Chat.notcriticalErrorTitle": "Aviso", "Common.Controllers.Chat.textEnterMessage": "Introduzca su mensaje aquí", + "Common.define.chartData.textArea": "Área", + "Common.define.chartData.textBar": "Barra", + "Common.define.chartData.textColumn": "Gráfico de columnas", + "Common.define.chartData.textLine": "Línea", + "Common.define.chartData.textPie": "Gráfico circular", + "Common.define.chartData.textPoint": "XY (Dispersión)", + "Common.define.chartData.textStock": "De cotizaciones", + "Common.define.chartData.textSurface": "Superficie", + "Common.define.chartData.textColumnSpark": "Histograma", + "Common.define.chartData.textLineSpark": "Línea", + "Common.define.chartData.textWinLossSpark": "Ganancia/pérdida", + "Common.define.chartData.textSparks": "Sparklines", "Common.UI.ComboBorderSize.txtNoBorders": "Sin bordes", "Common.UI.ComboBorderSizeEditable.txtNoBorders": "Sin bordes", "Common.UI.ComboDataView.emptyComboText": "Sin estilo", @@ -1145,36 +1157,25 @@ "SSE.Views.ChartSettings.strSparkColor": "Color", "SSE.Views.ChartSettings.strTemplate": "Plantilla", "SSE.Views.ChartSettings.textAdvanced": "Mostrar ajustes avanzados", - "SSE.Views.ChartSettings.textArea": "Gráfico de área", - "SSE.Views.ChartSettings.textBar": "Barra", "SSE.Views.ChartSettings.textBorderSizeErr": "El valor numérico es incorrecto.
Por favor, introduzca un valor de 0 a 1584 puntos.", "SSE.Views.ChartSettings.textChartType": "Cambiar tipo de gráfico", - "SSE.Views.ChartSettings.textColumn": "Columna", - "SSE.Views.ChartSettings.textColumnSpark": "Histograma", "SSE.Views.ChartSettings.textEditData": "Editar datos y ubicación", "SSE.Views.ChartSettings.textFirstPoint": "Primer punto", "SSE.Views.ChartSettings.textHeight": "Altura", "SSE.Views.ChartSettings.textHighPoint": "Punto alto", "SSE.Views.ChartSettings.textKeepRatio": "Proporciones constantes", "SSE.Views.ChartSettings.textLastPoint": "Último punto", - "SSE.Views.ChartSettings.textLine": "Línea", - "SSE.Views.ChartSettings.textLineSpark": "Línea", "SSE.Views.ChartSettings.textLowPoint": "Punto bajo", "SSE.Views.ChartSettings.textMarkers": "Marcadores", "SSE.Views.ChartSettings.textNegativePoint": "Punto negativo", "SSE.Views.ChartSettings.textNewColor": "Color personalizado", - "SSE.Views.ChartSettings.textPie": "Gráfico circular", - "SSE.Views.ChartSettings.textPoint": "XY (Dispersión)", "SSE.Views.ChartSettings.textRanges": "Rango de datos", "SSE.Views.ChartSettings.textSelectData": "Seleccionar datos", "SSE.Views.ChartSettings.textShow": "Mostrar", "SSE.Views.ChartSettings.textSize": "Tamaño", - "SSE.Views.ChartSettings.textStock": "De cotizaciones", "SSE.Views.ChartSettings.textStyle": "Estilo", - "SSE.Views.ChartSettings.textSurface": "Superficie", "SSE.Views.ChartSettings.textType": "Tipo", "SSE.Views.ChartSettings.textWidth": "Ancho", - "SSE.Views.ChartSettings.textWinLossSpark": "Ganancia/pérdida", "SSE.Views.ChartSettingsDlg.errorMaxPoints": "¡ERROR! El máximo", "SSE.Views.ChartSettingsDlg.errorMaxRows": "¡ERROR! El número máximo de series de datos por gráfico es 225", "SSE.Views.ChartSettingsDlg.errorStockChart": "Orden de las filas incorrecto. Para compilar un gráfico de cotizaciones introduzca los datos en la hoja de la forma siguiente:
precio de apertura, precio máximo, precio mínimo, precio de cierre.", @@ -1182,14 +1183,12 @@ "SSE.Views.ChartSettingsDlg.textAltDescription": "Descripción", "SSE.Views.ChartSettingsDlg.textAltTip": "Representación de texto alternativa de la información sobre el objeto visual, que se leerá para las personas con deficiencia visual o deterioro cognitivo para ayudarles a entender mejor, que información contiene la imagen, autoforma, gráfico o tabla.", "SSE.Views.ChartSettingsDlg.textAltTitle": "Título", - "SSE.Views.ChartSettingsDlg.textArea": "Gráfico de área", "SSE.Views.ChartSettingsDlg.textAuto": "Auto", "SSE.Views.ChartSettingsDlg.textAutoEach": "Automático para cada", "SSE.Views.ChartSettingsDlg.textAxisCrosses": "Intersección con eje", "SSE.Views.ChartSettingsDlg.textAxisOptions": "Parámetros de eje", "SSE.Views.ChartSettingsDlg.textAxisPos": "Posición de eje", "SSE.Views.ChartSettingsDlg.textAxisSettings": "Ajustes de eje", - "SSE.Views.ChartSettingsDlg.textBar": "Gráfico de barras", "SSE.Views.ChartSettingsDlg.textBetweenTickMarks": "Entre marcas de graduación", "SSE.Views.ChartSettingsDlg.textBillions": "Millardos", "SSE.Views.ChartSettingsDlg.textBottom": "Abajo ", @@ -1197,8 +1196,6 @@ "SSE.Views.ChartSettingsDlg.textCenter": "Al centro", "SSE.Views.ChartSettingsDlg.textChartElementsLegend": "Elementos de gráfico y
leyenda de gráfico", "SSE.Views.ChartSettingsDlg.textChartTitle": "Título de gráfico", - "SSE.Views.ChartSettingsDlg.textColumn": "Gráfico de columnas", - "SSE.Views.ChartSettingsDlg.textColumnSpark": "Histograma", "SSE.Views.ChartSettingsDlg.textCross": "Intersección", "SSE.Views.ChartSettingsDlg.textCustom": "Personalizado", "SSE.Views.ChartSettingsDlg.textDataColumns": "en columnas", @@ -1239,9 +1236,7 @@ "SSE.Views.ChartSettingsDlg.textLegendPos": "Leyenda", "SSE.Views.ChartSettingsDlg.textLegendRight": "Derecho", "SSE.Views.ChartSettingsDlg.textLegendTop": "Superior", - "SSE.Views.ChartSettingsDlg.textLine": "Gráfico de líneas", "SSE.Views.ChartSettingsDlg.textLines": "Líneas", - "SSE.Views.ChartSettingsDlg.textLineSpark": "Línea", "SSE.Views.ChartSettingsDlg.textLocationRange": "Rango de ubicación", "SSE.Views.ChartSettingsDlg.textLow": "Bajo", "SSE.Views.ChartSettingsDlg.textMajor": "Principal", @@ -1262,8 +1257,6 @@ "SSE.Views.ChartSettingsDlg.textOut": "Fuera", "SSE.Views.ChartSettingsDlg.textOuterTop": "Arriba en el exterior", "SSE.Views.ChartSettingsDlg.textOverlay": "Superposición", - "SSE.Views.ChartSettingsDlg.textPie": "Gráfico circular", - "SSE.Views.ChartSettingsDlg.textPoint": "XY (Dispersión)", "SSE.Views.ChartSettingsDlg.textReverse": "Valores en orden inverso", "SSE.Views.ChartSettingsDlg.textReverseOrder": "Orden inverso", "SSE.Views.ChartSettingsDlg.textRight": "Derecho", @@ -1284,10 +1277,8 @@ "SSE.Views.ChartSettingsDlg.textSingle": "Sparkline único", "SSE.Views.ChartSettingsDlg.textSmooth": "Suave", "SSE.Views.ChartSettingsDlg.textSparkRanges": "Rangos de Sparkline", - "SSE.Views.ChartSettingsDlg.textStock": "De cotizaciones", "SSE.Views.ChartSettingsDlg.textStraight": "Recto", "SSE.Views.ChartSettingsDlg.textStyle": "Estilo", - "SSE.Views.ChartSettingsDlg.textSurface": "Superficie", "SSE.Views.ChartSettingsDlg.textTenMillions": "10 000 000", "SSE.Views.ChartSettingsDlg.textTenThousands": "10 000", "SSE.Views.ChartSettingsDlg.textThousands": "Miles", @@ -1304,7 +1295,6 @@ "SSE.Views.ChartSettingsDlg.textVertAxis": "Eje vertical", "SSE.Views.ChartSettingsDlg.textVertGrid": "Líneas de cuadrícula verticales", "SSE.Views.ChartSettingsDlg.textVertTitle": "Título de eje vertical", - "SSE.Views.ChartSettingsDlg.textWinLossSpark": "Ganancia/pérdida", "SSE.Views.ChartSettingsDlg.textXAxisTitle": "Título del eje X", "SSE.Views.ChartSettingsDlg.textYAxisTitle": "Título del eje Y", "SSE.Views.ChartSettingsDlg.textZero": "Cero", @@ -2127,19 +2117,14 @@ "SSE.Views.Toolbar.textAlignRight": "Alinear a la derecha", "SSE.Views.Toolbar.textAlignTop": "Alinear arriba", "SSE.Views.Toolbar.textAllBorders": "Todos los bordes", - "SSE.Views.Toolbar.textArea": "Área", - "SSE.Views.Toolbar.textBar": "Gráfico de barras", "SSE.Views.Toolbar.textBold": "Negrita", "SSE.Views.Toolbar.textBordersColor": "Color de borde", "SSE.Views.Toolbar.textBordersStyle": "Estilo de borde", "SSE.Views.Toolbar.textBottom": "Inferior: ", "SSE.Views.Toolbar.textBottomBorders": "Bordes inferiores", "SSE.Views.Toolbar.textCenterBorders": "Bordes verticales internos", - "SSE.Views.Toolbar.textCharts": "Gráficos", "SSE.Views.Toolbar.textClearPrintArea": "Vaciar área de impresión", "SSE.Views.Toolbar.textClockwise": "En la dirección de manecillas de reloj", - "SSE.Views.Toolbar.textColumn": "Histograma", - "SSE.Views.Toolbar.textColumnSpark": "Histograma", "SSE.Views.Toolbar.textCounterCw": "En el sentido antihorario", "SSE.Views.Toolbar.textDelLeft": "Desplazar celdas a la izquierda", "SSE.Views.Toolbar.textDelUp": "Desplazar celdas hacia arriba", @@ -2155,8 +2140,6 @@ "SSE.Views.Toolbar.textLandscape": "Horizontal", "SSE.Views.Toolbar.textLeft": "Izquierdo: ", "SSE.Views.Toolbar.textLeftBorders": "Bordes izquierdos", - "SSE.Views.Toolbar.textLine": "Línea", - "SSE.Views.Toolbar.textLineSpark": "Línea", "SSE.Views.Toolbar.textMarginsLast": "Último personalizado", "SSE.Views.Toolbar.textMarginsNarrow": "Estrecho", "SSE.Views.Toolbar.textMarginsNormal": "Normal", @@ -2167,8 +2150,6 @@ "SSE.Views.Toolbar.textNoBorders": "Sin bordes", "SSE.Views.Toolbar.textOutBorders": "Bordes externos", "SSE.Views.Toolbar.textPageMarginsCustom": "Márgenes personalizados", - "SSE.Views.Toolbar.textPie": "Gráfico circular", - "SSE.Views.Toolbar.textPoint": "XY (Dispersión)", "SSE.Views.Toolbar.textPortrait": "Vertical", "SSE.Views.Toolbar.textPrint": "Imprimir", "SSE.Views.Toolbar.textPrintOptions": "Opciones de impresión", @@ -2177,13 +2158,10 @@ "SSE.Views.Toolbar.textRotateDown": "Girar texto hacia abajo", "SSE.Views.Toolbar.textRotateUp": "Girar texto hacia arriba", "SSE.Views.Toolbar.textSetPrintArea": "Establecer área de impresión", - "SSE.Views.Toolbar.textSparks": "Sparklines", - "SSE.Views.Toolbar.textStock": "De cotizaciones", "SSE.Views.Toolbar.textStrikeout": "Tachado", "SSE.Views.Toolbar.textSubscript": "Subíndice", "SSE.Views.Toolbar.textSubSuperscript": "Subíndice/superíndice", "SSE.Views.Toolbar.textSuperscript": "Sobreíndice", - "SSE.Views.Toolbar.textSurface": "Superficie", "SSE.Views.Toolbar.textTabCollaboration": "Colaboración", "SSE.Views.Toolbar.textTabData": "Datos", "SSE.Views.Toolbar.textTabFile": "Archivo", @@ -2195,7 +2173,6 @@ "SSE.Views.Toolbar.textTop": "Superior:", "SSE.Views.Toolbar.textTopBorders": "Bordes superiores", "SSE.Views.Toolbar.textUnderline": "Subrayar", - "SSE.Views.Toolbar.textWinLossSpark": "Ganancia/pérdida", "SSE.Views.Toolbar.textZoom": "Zoom", "SSE.Views.Toolbar.tipAlignBottom": "Alinear en la parte inferior", "SSE.Views.Toolbar.tipAlignCenter": "Alinear al centro", diff --git a/apps/spreadsheeteditor/main/locale/fr.json b/apps/spreadsheeteditor/main/locale/fr.json index ffd93bbd6..dafdc2782 100644 --- a/apps/spreadsheeteditor/main/locale/fr.json +++ b/apps/spreadsheeteditor/main/locale/fr.json @@ -2,6 +2,18 @@ "cancelButtonText": "Annuler", "Common.Controllers.Chat.notcriticalErrorTitle": "Avertissement", "Common.Controllers.Chat.textEnterMessage": "Entrez votre message ici", + "Common.define.chartData.textArea": "En aires", + "Common.define.chartData.textBar": "En barre", + "Common.define.chartData.textColumn": "Colonne", + "Common.define.chartData.textLine": "Graphique en ligne", + "Common.define.chartData.textPie": "Graphiques à secteurs", + "Common.define.chartData.textPoint": "Nuages de points (XY)", + "Common.define.chartData.textStock": "Boursier", + "Common.define.chartData.textSurface": "Surface", + "Common.define.chartData.textColumnSpark": "Histogramme", + "Common.define.chartData.textLineSpark": "Ligne", + "Common.define.chartData.textWinLossSpark": "Positif/Négatif", + "Common.define.chartData.textSparks": "Graphiques sparkline", "Common.UI.ComboBorderSize.txtNoBorders": "Pas de bordures", "Common.UI.ComboBorderSizeEditable.txtNoBorders": "Pas de bordures", "Common.UI.ComboDataView.emptyComboText": "Aucun style", @@ -1171,36 +1183,25 @@ "SSE.Views.ChartSettings.strSparkColor": "Couleur", "SSE.Views.ChartSettings.strTemplate": "Modèle", "SSE.Views.ChartSettings.textAdvanced": "Afficher les paramètres avancés", - "SSE.Views.ChartSettings.textArea": "En aires", - "SSE.Views.ChartSettings.textBar": "À barres", "SSE.Views.ChartSettings.textBorderSizeErr": "La valeur saisie est incorrecte.
Entrez une valeur de 0 à 1584 points.", "SSE.Views.ChartSettings.textChartType": "Modifier le type de graphique", - "SSE.Views.ChartSettings.textColumn": "Histogramme", - "SSE.Views.ChartSettings.textColumnSpark": "Histogramme", "SSE.Views.ChartSettings.textEditData": "Modifier les données et l'emplacement", "SSE.Views.ChartSettings.textFirstPoint": "Premier point", "SSE.Views.ChartSettings.textHeight": "Hauteur", "SSE.Views.ChartSettings.textHighPoint": "Point élevé", "SSE.Views.ChartSettings.textKeepRatio": "Proportions constantes", "SSE.Views.ChartSettings.textLastPoint": "Dernier point", - "SSE.Views.ChartSettings.textLine": "Ligne", - "SSE.Views.ChartSettings.textLineSpark": "Ligne", "SSE.Views.ChartSettings.textLowPoint": "Point bas", "SSE.Views.ChartSettings.textMarkers": "Marqueurs", "SSE.Views.ChartSettings.textNegativePoint": "Point négatif", "SSE.Views.ChartSettings.textNewColor": "Couleur personnalisée", - "SSE.Views.ChartSettings.textPie": "À secteurs", - "SSE.Views.ChartSettings.textPoint": "Nuages de points (XY)", "SSE.Views.ChartSettings.textRanges": "Plage de données", "SSE.Views.ChartSettings.textSelectData": "Sélectionner des données", "SSE.Views.ChartSettings.textShow": "Afficher", "SSE.Views.ChartSettings.textSize": "Taille", - "SSE.Views.ChartSettings.textStock": "Boursier", "SSE.Views.ChartSettings.textStyle": "Style", - "SSE.Views.ChartSettings.textSurface": "Surface", "SSE.Views.ChartSettings.textType": "Type", "SSE.Views.ChartSettings.textWidth": "Largeur", - "SSE.Views.ChartSettings.textWinLossSpark": "Positif/Négatif", "SSE.Views.ChartSettingsDlg.errorMaxPoints": "ERREUR! Maximum de 4096 points en série par graphique.", "SSE.Views.ChartSettingsDlg.errorMaxRows": "ERREUR! Maximum de 255 séries de données par graphique.", "SSE.Views.ChartSettingsDlg.errorStockChart": "Ordre des lignes est incorrect. Pour créer un graphique boursier organisez vos données sur la feuille de calcul dans l'ordre suivant:
cours à l'ouverture, cours maximal, cours minimal, cours à la clôture.", @@ -1208,14 +1209,12 @@ "SSE.Views.ChartSettingsDlg.textAltDescription": "Description", "SSE.Views.ChartSettingsDlg.textAltTip": "La représentation textuelle alternative des informations sur l’objet visuel, qui sera lue aux personnes avec des déficiences cognitives ou visuelles pour les aider à mieux comprendre l'information de l’image, de la forme automatique, du graphique ou du tableau.", "SSE.Views.ChartSettingsDlg.textAltTitle": "Titre", - "SSE.Views.ChartSettingsDlg.textArea": "En aires", "SSE.Views.ChartSettingsDlg.textAuto": "Auto", "SSE.Views.ChartSettingsDlg.textAutoEach": "Automatique pour chaque", "SSE.Views.ChartSettingsDlg.textAxisCrosses": "Intersection de l'axe", "SSE.Views.ChartSettingsDlg.textAxisOptions": "Options d'axe", "SSE.Views.ChartSettingsDlg.textAxisPos": "Position de l'axe", "SSE.Views.ChartSettingsDlg.textAxisSettings": "Paramètres de l’axe", - "SSE.Views.ChartSettingsDlg.textBar": "Diagramme à barres", "SSE.Views.ChartSettingsDlg.textBetweenTickMarks": "Entre graduations", "SSE.Views.ChartSettingsDlg.textBillions": "Milliards", "SSE.Views.ChartSettingsDlg.textBottom": "En bas", @@ -1223,8 +1222,6 @@ "SSE.Views.ChartSettingsDlg.textCenter": "Au centre", "SSE.Views.ChartSettingsDlg.textChartElementsLegend": "Éléments de graphique,
légende de graphique", "SSE.Views.ChartSettingsDlg.textChartTitle": "Titre du graphique", - "SSE.Views.ChartSettingsDlg.textColumn": "Histogramme", - "SSE.Views.ChartSettingsDlg.textColumnSpark": "Histogramme", "SSE.Views.ChartSettingsDlg.textCross": "Sur l'axe", "SSE.Views.ChartSettingsDlg.textCustom": "Personnalisé", "SSE.Views.ChartSettingsDlg.textDataColumns": "en colonnes", @@ -1265,9 +1262,7 @@ "SSE.Views.ChartSettingsDlg.textLegendPos": "Légende", "SSE.Views.ChartSettingsDlg.textLegendRight": "A droite", "SSE.Views.ChartSettingsDlg.textLegendTop": "En haut", - "SSE.Views.ChartSettingsDlg.textLine": "Graphique en ligne", "SSE.Views.ChartSettingsDlg.textLines": "Lignes", - "SSE.Views.ChartSettingsDlg.textLineSpark": "Ligne", "SSE.Views.ChartSettingsDlg.textLocationRange": "Plage d’emplacements", "SSE.Views.ChartSettingsDlg.textLow": "En bas", "SSE.Views.ChartSettingsDlg.textMajor": "Principaux", @@ -1288,8 +1283,6 @@ "SSE.Views.ChartSettingsDlg.textOut": "A l'extérieur", "SSE.Views.ChartSettingsDlg.textOuterTop": "En haut à l'extérieur", "SSE.Views.ChartSettingsDlg.textOverlay": "Superposition", - "SSE.Views.ChartSettingsDlg.textPie": "Graphiques à secteurs", - "SSE.Views.ChartSettingsDlg.textPoint": "Nuages de points (XY)", "SSE.Views.ChartSettingsDlg.textReverse": "Valeurs en ordre inverse", "SSE.Views.ChartSettingsDlg.textReverseOrder": "Inverser l’ordre", "SSE.Views.ChartSettingsDlg.textRight": "A droite", @@ -1310,10 +1303,8 @@ "SSE.Views.ChartSettingsDlg.textSingle": "Sparkline unique", "SSE.Views.ChartSettingsDlg.textSmooth": "Lisse", "SSE.Views.ChartSettingsDlg.textSparkRanges": "Plage de graphiques sparklines", - "SSE.Views.ChartSettingsDlg.textStock": "Boursier", "SSE.Views.ChartSettingsDlg.textStraight": "Droit", "SSE.Views.ChartSettingsDlg.textStyle": "Style", - "SSE.Views.ChartSettingsDlg.textSurface": "Surface", "SSE.Views.ChartSettingsDlg.textTenMillions": "10 000 000", "SSE.Views.ChartSettingsDlg.textTenThousands": "10 000", "SSE.Views.ChartSettingsDlg.textThousands": "Milliers", @@ -1330,7 +1321,6 @@ "SSE.Views.ChartSettingsDlg.textVertAxis": "Axe vertical", "SSE.Views.ChartSettingsDlg.textVertGrid": "Quadrillage vertical", "SSE.Views.ChartSettingsDlg.textVertTitle": "Titre de l'axe vertical", - "SSE.Views.ChartSettingsDlg.textWinLossSpark": "Positif/Négatif", "SSE.Views.ChartSettingsDlg.textXAxisTitle": "Titre de l'axe X", "SSE.Views.ChartSettingsDlg.textYAxisTitle": "Titre de l'axe Y", "SSE.Views.ChartSettingsDlg.textZero": "Valeur nulle", @@ -2198,19 +2188,14 @@ "SSE.Views.Toolbar.textAlignRight": "Aligner à droite", "SSE.Views.Toolbar.textAlignTop": "Aligner en haut", "SSE.Views.Toolbar.textAllBorders": "Toutes les bordures", - "SSE.Views.Toolbar.textArea": "En aires", - "SSE.Views.Toolbar.textBar": "À barres", "SSE.Views.Toolbar.textBold": "Gras", "SSE.Views.Toolbar.textBordersColor": "Couleur de la bordure", "SSE.Views.Toolbar.textBordersStyle": "Style de la bordure", "SSE.Views.Toolbar.textBottom": "Bas: ", "SSE.Views.Toolbar.textBottomBorders": "Bordures inférieures", "SSE.Views.Toolbar.textCenterBorders": "Bordures intérieures verticales", - "SSE.Views.Toolbar.textCharts": "Graphiques", "SSE.Views.Toolbar.textClearPrintArea": "Vider la zone d'impression", "SSE.Views.Toolbar.textClockwise": "Rotation dans le sens des aiguilles d'une montre", - "SSE.Views.Toolbar.textColumn": "Histogramme", - "SSE.Views.Toolbar.textColumnSpark": "Histogramme", "SSE.Views.Toolbar.textCounterCw": "Rotation dans le sens inverse des aiguilles d'une montre", "SSE.Views.Toolbar.textDelLeft": "Décaler les cellules vers la gauche", "SSE.Views.Toolbar.textDelUp": "Décaler les cellules vers le haut", @@ -2226,8 +2211,6 @@ "SSE.Views.Toolbar.textLandscape": "Paysage", "SSE.Views.Toolbar.textLeft": "À gauche:", "SSE.Views.Toolbar.textLeftBorders": "Bordures gauches", - "SSE.Views.Toolbar.textLine": "Ligne", - "SSE.Views.Toolbar.textLineSpark": "Ligne", "SSE.Views.Toolbar.textMarginsLast": "Dernière mesure", "SSE.Views.Toolbar.textMarginsNarrow": "Étroit", "SSE.Views.Toolbar.textMarginsNormal": "Normal", @@ -2238,8 +2221,6 @@ "SSE.Views.Toolbar.textNoBorders": "Pas de bordures", "SSE.Views.Toolbar.textOutBorders": "Bordures extérieures", "SSE.Views.Toolbar.textPageMarginsCustom": "Marges personnalisées", - "SSE.Views.Toolbar.textPie": "À secteurs", - "SSE.Views.Toolbar.textPoint": "Nuages de points (XY)", "SSE.Views.Toolbar.textPortrait": "Portrait", "SSE.Views.Toolbar.textPrint": "Imprimer", "SSE.Views.Toolbar.textPrintOptions": "Paramètres d'impression", @@ -2248,13 +2229,10 @@ "SSE.Views.Toolbar.textRotateDown": "Rotation du texte vers le bas", "SSE.Views.Toolbar.textRotateUp": "Rotation du texte vers le haut", "SSE.Views.Toolbar.textSetPrintArea": "Selectionner la zone d'impression", - "SSE.Views.Toolbar.textSparks": "Graphiques sparkline", - "SSE.Views.Toolbar.textStock": "Boursier", "SSE.Views.Toolbar.textStrikeout": "Barré", "SSE.Views.Toolbar.textSubscript": "Indice", "SSE.Views.Toolbar.textSubSuperscript": "Indice/Exposant", "SSE.Views.Toolbar.textSuperscript": "Exposant", - "SSE.Views.Toolbar.textSurface": "Surface", "SSE.Views.Toolbar.textTabCollaboration": "Collaboration", "SSE.Views.Toolbar.textTabData": "Données", "SSE.Views.Toolbar.textTabFile": "Fichier", @@ -2266,7 +2244,6 @@ "SSE.Views.Toolbar.textTop": "En haut: ", "SSE.Views.Toolbar.textTopBorders": "Bordures supérieures", "SSE.Views.Toolbar.textUnderline": "Souligné", - "SSE.Views.Toolbar.textWinLossSpark": "Positif/Négatif", "SSE.Views.Toolbar.textZoom": "Zoom", "SSE.Views.Toolbar.tipAlignBottom": "Aligner en bas", "SSE.Views.Toolbar.tipAlignCenter": "Aligner au centre", diff --git a/apps/spreadsheeteditor/main/locale/hu.json b/apps/spreadsheeteditor/main/locale/hu.json index de88caf59..6948ec7e7 100644 --- a/apps/spreadsheeteditor/main/locale/hu.json +++ b/apps/spreadsheeteditor/main/locale/hu.json @@ -2,6 +2,18 @@ "cancelButtonText": "Mégse", "Common.Controllers.Chat.notcriticalErrorTitle": "Figyelmeztetés", "Common.Controllers.Chat.textEnterMessage": "Írja be ide az üzenetet", + "Common.define.chartData.textArea": "Terület", + "Common.define.chartData.textBar": "Sáv", + "Common.define.chartData.textColumn": "Oszlop", + "Common.define.chartData.textLine": "Vonal", + "Common.define.chartData.textPie": "Kör", + "Common.define.chartData.textPoint": "Pont", + "Common.define.chartData.textStock": "Részvény", + "Common.define.chartData.textSurface": "Felület", + "Common.define.chartData.textColumnSpark": "Oszlop", + "Common.define.chartData.textLineSpark": "Vonal", + "Common.define.chartData.textWinLossSpark": "Nyereség/veszteség", + "Common.define.chartData.textSparks": "Értékgörbék", "Common.UI.ComboBorderSize.txtNoBorders": "Nincsenek szegélyek", "Common.UI.ComboBorderSizeEditable.txtNoBorders": "Nincsenek szegélyek", "Common.UI.ComboDataView.emptyComboText": "Nincsenek stílusok", @@ -1065,36 +1077,25 @@ "SSE.Views.ChartSettings.strSparkColor": "Szín", "SSE.Views.ChartSettings.strTemplate": "Sablon", "SSE.Views.ChartSettings.textAdvanced": "Speciális beállítások megjelenítése", - "SSE.Views.ChartSettings.textArea": "Terület", - "SSE.Views.ChartSettings.textBar": "Sáv", "SSE.Views.ChartSettings.textBorderSizeErr": "A megadott érték helytelen.
Kérjük, adjon meg egy számértéket 0 és 1584 között", "SSE.Views.ChartSettings.textChartType": "Diagramtípus módosítása", - "SSE.Views.ChartSettings.textColumn": "Oszlop", - "SSE.Views.ChartSettings.textColumnSpark": "Oszlop", "SSE.Views.ChartSettings.textEditData": "Adatok és hely szerkesztése", "SSE.Views.ChartSettings.textFirstPoint": "Első pont", "SSE.Views.ChartSettings.textHeight": "Magasság", "SSE.Views.ChartSettings.textHighPoint": "Csúcspont", "SSE.Views.ChartSettings.textKeepRatio": "Állandó arányok", "SSE.Views.ChartSettings.textLastPoint": "Utolsó pont", - "SSE.Views.ChartSettings.textLine": "Vonal", - "SSE.Views.ChartSettings.textLineSpark": "Vonal", "SSE.Views.ChartSettings.textLowPoint": "Alacsony pont", "SSE.Views.ChartSettings.textMarkers": "Jelölők", "SSE.Views.ChartSettings.textNegativePoint": "Negatív pont", "SSE.Views.ChartSettings.textNewColor": "Új egyedi szín hozzáadása", - "SSE.Views.ChartSettings.textPie": "Kördiagram", - "SSE.Views.ChartSettings.textPoint": "Pont", "SSE.Views.ChartSettings.textRanges": "Adattartomány", "SSE.Views.ChartSettings.textSelectData": "Adatok kiválasztása", "SSE.Views.ChartSettings.textShow": "Mutat", "SSE.Views.ChartSettings.textSize": "Méret", - "SSE.Views.ChartSettings.textStock": "Részvény", "SSE.Views.ChartSettings.textStyle": "Stílus", - "SSE.Views.ChartSettings.textSurface": "Felület", "SSE.Views.ChartSettings.textType": "Típus", "SSE.Views.ChartSettings.textWidth": "Szélesség", - "SSE.Views.ChartSettings.textWinLossSpark": "Nyereség/veszteség", "SSE.Views.ChartSettingsDlg.errorMaxPoints": "HIBA! A soronkénti maximális pontszám a diagramon 4096.", "SSE.Views.ChartSettingsDlg.errorMaxRows": "HIBA! Az adatsorok maximális száma diagramonként 255", "SSE.Views.ChartSettingsDlg.errorStockChart": "Helytelen sor sorrend. Részvénydiagram létrehozásához az adatokat az alábbi sorrendben vigye fel:
nyitó ár, maximum ár, minimum ár, záró ár.", @@ -1102,14 +1103,12 @@ "SSE.Views.ChartSettingsDlg.textAltDescription": "Leírás", "SSE.Views.ChartSettingsDlg.textAltTip": "A vizuális objektumok alternatív szövegalapú ábrázolása, amely a látás vagy kognitív károsodottak számára is olvasható, hogy segítsen nekik jobban megérteni, hogy milyen információ, alakzat, diagram vagy táblázat látható.", "SSE.Views.ChartSettingsDlg.textAltTitle": "Cím", - "SSE.Views.ChartSettingsDlg.textArea": "Terület", "SSE.Views.ChartSettingsDlg.textAuto": "Auto", "SSE.Views.ChartSettingsDlg.textAutoEach": "Mind automatikus", "SSE.Views.ChartSettingsDlg.textAxisCrosses": "Tengelykeresztek", "SSE.Views.ChartSettingsDlg.textAxisOptions": "Tengely beállítások", "SSE.Views.ChartSettingsDlg.textAxisPos": "Tengely pozíció", "SSE.Views.ChartSettingsDlg.textAxisSettings": "Tengely beállítások", - "SSE.Views.ChartSettingsDlg.textBar": "Sáv", "SSE.Views.ChartSettingsDlg.textBetweenTickMarks": "Tengely osztások között", "SSE.Views.ChartSettingsDlg.textBillions": "Milliárdok", "SSE.Views.ChartSettingsDlg.textBottom": "Alsó", @@ -1117,8 +1116,6 @@ "SSE.Views.ChartSettingsDlg.textCenter": "Közép", "SSE.Views.ChartSettingsDlg.textChartElementsLegend": "Diagramelemek és
Diagrammagyarázat", "SSE.Views.ChartSettingsDlg.textChartTitle": "Diagram címe", - "SSE.Views.ChartSettingsDlg.textColumn": "Oszlop", - "SSE.Views.ChartSettingsDlg.textColumnSpark": "Oszlop", "SSE.Views.ChartSettingsDlg.textCross": "Kereszt", "SSE.Views.ChartSettingsDlg.textCustom": "Egyéni", "SSE.Views.ChartSettingsDlg.textDataColumns": "oszlopokban", @@ -1159,9 +1156,7 @@ "SSE.Views.ChartSettingsDlg.textLegendPos": "Jelmagyarázat", "SSE.Views.ChartSettingsDlg.textLegendRight": "Jobb", "SSE.Views.ChartSettingsDlg.textLegendTop": "Felső", - "SSE.Views.ChartSettingsDlg.textLine": "Vonal", "SSE.Views.ChartSettingsDlg.textLines": "Vonalak", - "SSE.Views.ChartSettingsDlg.textLineSpark": "Vonal", "SSE.Views.ChartSettingsDlg.textLocationRange": "Pozíció tartomány", "SSE.Views.ChartSettingsDlg.textLow": "Alacsony", "SSE.Views.ChartSettingsDlg.textMajor": "Jelentősebb", @@ -1182,8 +1177,6 @@ "SSE.Views.ChartSettingsDlg.textOut": "Ki", "SSE.Views.ChartSettingsDlg.textOuterTop": "Kívül fent", "SSE.Views.ChartSettingsDlg.textOverlay": "Átfedés", - "SSE.Views.ChartSettingsDlg.textPie": "Kör", - "SSE.Views.ChartSettingsDlg.textPoint": "Pont", "SSE.Views.ChartSettingsDlg.textReverse": "Értékek fordított sorrendben", "SSE.Views.ChartSettingsDlg.textReverseOrder": "Fordított sorrend", "SSE.Views.ChartSettingsDlg.textRight": "Jobb", @@ -1204,10 +1197,8 @@ "SSE.Views.ChartSettingsDlg.textSingle": "Egyedi értékgörbe", "SSE.Views.ChartSettingsDlg.textSmooth": "Sima", "SSE.Views.ChartSettingsDlg.textSparkRanges": "Értékgörbe tartományok", - "SSE.Views.ChartSettingsDlg.textStock": "Részvény", "SSE.Views.ChartSettingsDlg.textStraight": "Egyenes", "SSE.Views.ChartSettingsDlg.textStyle": "Stílus", - "SSE.Views.ChartSettingsDlg.textSurface": "Felület", "SSE.Views.ChartSettingsDlg.textTenMillions": "10 000 000", "SSE.Views.ChartSettingsDlg.textTenThousands": "10 000", "SSE.Views.ChartSettingsDlg.textThousands": "Ezrek", @@ -1224,7 +1215,6 @@ "SSE.Views.ChartSettingsDlg.textVertAxis": "Függőleges tengely", "SSE.Views.ChartSettingsDlg.textVertGrid": "Függőleges rácsvonalak", "SSE.Views.ChartSettingsDlg.textVertTitle": "Függőleges tengely címe", - "SSE.Views.ChartSettingsDlg.textWinLossSpark": "Nyereség/veszteség", "SSE.Views.ChartSettingsDlg.textXAxisTitle": "X tengely címe", "SSE.Views.ChartSettingsDlg.textYAxisTitle": "Y tengely címe", "SSE.Views.ChartSettingsDlg.textZero": "Nulla", @@ -1978,19 +1968,14 @@ "SSE.Views.Toolbar.textAlignRight": "Jobbra rendez", "SSE.Views.Toolbar.textAlignTop": "Felfelé rendez", "SSE.Views.Toolbar.textAllBorders": "Jobb szegély", - "SSE.Views.Toolbar.textArea": "Terület", - "SSE.Views.Toolbar.textBar": "Sáv", "SSE.Views.Toolbar.textBold": "Félkövér", "SSE.Views.Toolbar.textBordersColor": "Szegély színe", "SSE.Views.Toolbar.textBordersStyle": "Szegély stílus", "SSE.Views.Toolbar.textBottom": "Alsó:", "SSE.Views.Toolbar.textBottomBorders": "Alsó szegélyek", "SSE.Views.Toolbar.textCenterBorders": "Belső függőleges szegélyek", - "SSE.Views.Toolbar.textCharts": "Diagramok", "SSE.Views.Toolbar.textClearPrintArea": "Nyomtatási terület törlése", "SSE.Views.Toolbar.textClockwise": "Lejtő szöveg", - "SSE.Views.Toolbar.textColumn": "Oszlop", - "SSE.Views.Toolbar.textColumnSpark": "Oszlop", "SSE.Views.Toolbar.textCounterCw": "Emelkedő szöveg", "SSE.Views.Toolbar.textDelLeft": "Cella helyettesítése jobbról", "SSE.Views.Toolbar.textDelUp": "Cella helyettesítése lentről", @@ -2006,8 +1991,6 @@ "SSE.Views.Toolbar.textLandscape": "Tájkép", "SSE.Views.Toolbar.textLeft": "Bal:", "SSE.Views.Toolbar.textLeftBorders": "Bal szegélyek", - "SSE.Views.Toolbar.textLine": "Vonal", - "SSE.Views.Toolbar.textLineSpark": "Vonal", "SSE.Views.Toolbar.textMarginsLast": "Előző egyéni beállítások", "SSE.Views.Toolbar.textMarginsNarrow": "Keskeny", "SSE.Views.Toolbar.textMarginsNormal": "Normál", @@ -2018,8 +2001,6 @@ "SSE.Views.Toolbar.textNoBorders": "Nincsenek szegélyek", "SSE.Views.Toolbar.textOutBorders": "Külső szegélyek", "SSE.Views.Toolbar.textPageMarginsCustom": "Egyéni margók", - "SSE.Views.Toolbar.textPie": "Kördiagram", - "SSE.Views.Toolbar.textPoint": "Pont", "SSE.Views.Toolbar.textPortrait": "Portré", "SSE.Views.Toolbar.textPrint": "Nyomtat", "SSE.Views.Toolbar.textPrintOptions": "Nyomtatási beállítások", @@ -2028,13 +2009,10 @@ "SSE.Views.Toolbar.textRotateDown": "Szöveg elforgatása lefelé", "SSE.Views.Toolbar.textRotateUp": "Szöveg elforgatása felfelé", "SSE.Views.Toolbar.textSetPrintArea": "Nyomtatási terület beállítása", - "SSE.Views.Toolbar.textSparks": "Értékgörbék", - "SSE.Views.Toolbar.textStock": "Részvény", "SSE.Views.Toolbar.textStrikeout": "áthúzás", "SSE.Views.Toolbar.textSubscript": "Alsó index", "SSE.Views.Toolbar.textSubSuperscript": "Alsó/felső index", "SSE.Views.Toolbar.textSuperscript": "Felső index", - "SSE.Views.Toolbar.textSurface": "Felület", "SSE.Views.Toolbar.textTabCollaboration": "Együttműködés", "SSE.Views.Toolbar.textTabFile": "Fájl", "SSE.Views.Toolbar.textTabHome": "Kezdőlap", @@ -2044,7 +2022,6 @@ "SSE.Views.Toolbar.textTop": "Felső:", "SSE.Views.Toolbar.textTopBorders": "Felső szegélyek", "SSE.Views.Toolbar.textUnderline": "Aláhúzott", - "SSE.Views.Toolbar.textWinLossSpark": "Nyereség/veszteség", "SSE.Views.Toolbar.textZoom": "Zoom", "SSE.Views.Toolbar.tipAlignBottom": "Alulra rendez", "SSE.Views.Toolbar.tipAlignCenter": "Középre rendez", diff --git a/apps/spreadsheeteditor/main/locale/it.json b/apps/spreadsheeteditor/main/locale/it.json index d6bc6736b..151757008 100644 --- a/apps/spreadsheeteditor/main/locale/it.json +++ b/apps/spreadsheeteditor/main/locale/it.json @@ -2,6 +2,18 @@ "cancelButtonText": "Annulla", "Common.Controllers.Chat.notcriticalErrorTitle": "Avviso", "Common.Controllers.Chat.textEnterMessage": "Scrivi il tuo messaggio qui", + "Common.define.chartData.textArea": "Aerogramma", + "Common.define.chartData.textBar": "A barre", + "Common.define.chartData.textColumn": "Istogramma", + "Common.define.chartData.textLine": "A linee", + "Common.define.chartData.textPie": "A torta", + "Common.define.chartData.textPoint": "XY (A dispersione)", + "Common.define.chartData.textStock": "Azionario", + "Common.define.chartData.textSurface": "Superficie", + "Common.define.chartData.textColumnSpark": "Colonna", + "Common.define.chartData.textLineSpark": "Linea", + "Common.define.chartData.textWinLossSpark": "Vinci/Perdi", + "Common.define.chartData.textSparks": "Sparklines", "Common.UI.ComboBorderSize.txtNoBorders": "Nessun bordo", "Common.UI.ComboBorderSizeEditable.txtNoBorders": "Nessun bordo", "Common.UI.ComboDataView.emptyComboText": "Nessuno stile", @@ -1172,36 +1184,25 @@ "SSE.Views.ChartSettings.strSparkColor": "Colore", "SSE.Views.ChartSettings.strTemplate": "Modello", "SSE.Views.ChartSettings.textAdvanced": "Mostra impostazioni avanzate", - "SSE.Views.ChartSettings.textArea": "Area", - "SSE.Views.ChartSettings.textBar": "Barra", "SSE.Views.ChartSettings.textBorderSizeErr": "Il valore inserito non è corretto.
Inserisci un valore tra 0 pt e 1584 pt.", "SSE.Views.ChartSettings.textChartType": "Cambia tipo di grafico", - "SSE.Views.ChartSettings.textColumn": "Colonna", - "SSE.Views.ChartSettings.textColumnSpark": "Colonna", "SSE.Views.ChartSettings.textEditData": "Modifica Dati e Posizione", "SSE.Views.ChartSettings.textFirstPoint": "Primo punto", "SSE.Views.ChartSettings.textHeight": "Altezza", "SSE.Views.ChartSettings.textHighPoint": "Punto alto", "SSE.Views.ChartSettings.textKeepRatio": "Proporzioni costanti", "SSE.Views.ChartSettings.textLastPoint": "Ultimo punto", - "SSE.Views.ChartSettings.textLine": "Linea", - "SSE.Views.ChartSettings.textLineSpark": "Linea", "SSE.Views.ChartSettings.textLowPoint": "Punto basso", "SSE.Views.ChartSettings.textMarkers": "Indicatori", "SSE.Views.ChartSettings.textNegativePoint": "Punto negativo", "SSE.Views.ChartSettings.textNewColor": "Colore personalizzato", - "SSE.Views.ChartSettings.textPie": "A torta", - "SSE.Views.ChartSettings.textPoint": "XY (A dispersione)", "SSE.Views.ChartSettings.textRanges": "Intervallo di dati", "SSE.Views.ChartSettings.textSelectData": "Seleziona dati", "SSE.Views.ChartSettings.textShow": "Mostra", "SSE.Views.ChartSettings.textSize": "Dimensione", - "SSE.Views.ChartSettings.textStock": "Stock", "SSE.Views.ChartSettings.textStyle": "Stile", - "SSE.Views.ChartSettings.textSurface": "Superficie", "SSE.Views.ChartSettings.textType": "Tipo", "SSE.Views.ChartSettings.textWidth": "Larghezza", - "SSE.Views.ChartSettings.textWinLossSpark": "Vinci/Perdi", "SSE.Views.ChartSettingsDlg.errorMaxPoints": "ERRORE! Il numero massimo di punti in serie per grafico è 4096.", "SSE.Views.ChartSettingsDlg.errorMaxRows": "ERRORE! Il numero massimo di serie di dati per grafico è 255.", "SSE.Views.ChartSettingsDlg.errorStockChart": "Ordine di righe scorretto. Per creare o grafico in pila posiziona i dati nel foglio nel seguente ordine:
prezzo di apertura, prezzo massimo, prezzo minimo, prezzo di chiusura.", @@ -1210,14 +1211,12 @@ "SSE.Views.ChartSettingsDlg.textAltDescription": "Descrizione", "SSE.Views.ChartSettingsDlg.textAltTip": "La rappresentazione alternativa del testo delle informazioni riguardanti gli oggetti visivi, che verrà letta alle persone con deficit visivi o cognitivi per aiutarli a comprendere meglio quali informazioni sono contenute nell'immagine, nella forma, nel grafico o nella tabella.", "SSE.Views.ChartSettingsDlg.textAltTitle": "Titolo", - "SSE.Views.ChartSettingsDlg.textArea": "Ad area", "SSE.Views.ChartSettingsDlg.textAuto": "Auto", "SSE.Views.ChartSettingsDlg.textAutoEach": "Adatta per ognuno", "SSE.Views.ChartSettingsDlg.textAxisCrosses": "Intersezione asse", "SSE.Views.ChartSettingsDlg.textAxisOptions": "Opzioni assi", "SSE.Views.ChartSettingsDlg.textAxisPos": "Posizione asse", "SSE.Views.ChartSettingsDlg.textAxisSettings": "Axis Settings", - "SSE.Views.ChartSettingsDlg.textBar": "A barre", "SSE.Views.ChartSettingsDlg.textBetweenTickMarks": "Tra segni di graduazione", "SSE.Views.ChartSettingsDlg.textBillions": "Miliardi", "SSE.Views.ChartSettingsDlg.textBottom": "In basso", @@ -1225,8 +1224,6 @@ "SSE.Views.ChartSettingsDlg.textCenter": "Al centro", "SSE.Views.ChartSettingsDlg.textChartElementsLegend": "Elementi di grafico e
legenda di grafico", "SSE.Views.ChartSettingsDlg.textChartTitle": "Titolo di grafico", - "SSE.Views.ChartSettingsDlg.textColumn": "Istogramma", - "SSE.Views.ChartSettingsDlg.textColumnSpark": "Colonna", "SSE.Views.ChartSettingsDlg.textCross": "Interseca", "SSE.Views.ChartSettingsDlg.textCustom": "Personalizzato", "SSE.Views.ChartSettingsDlg.textDataColumns": "in colonne", @@ -1267,9 +1264,7 @@ "SSE.Views.ChartSettingsDlg.textLegendPos": "Legenda", "SSE.Views.ChartSettingsDlg.textLegendRight": "A destra", "SSE.Views.ChartSettingsDlg.textLegendTop": "In alto", - "SSE.Views.ChartSettingsDlg.textLine": "A linee", "SSE.Views.ChartSettingsDlg.textLines": "Linee", - "SSE.Views.ChartSettingsDlg.textLineSpark": "Linea", "SSE.Views.ChartSettingsDlg.textLocationRange": "Campo di ubicazione", "SSE.Views.ChartSettingsDlg.textLow": "In basso", "SSE.Views.ChartSettingsDlg.textMajor": "Principali", @@ -1291,8 +1286,6 @@ "SSE.Views.ChartSettingsDlg.textOut": "All'esterno", "SSE.Views.ChartSettingsDlg.textOuterTop": "Alto esterno", "SSE.Views.ChartSettingsDlg.textOverlay": "Sovrapposizione", - "SSE.Views.ChartSettingsDlg.textPie": "A torta", - "SSE.Views.ChartSettingsDlg.textPoint": "XY (A dispersione)", "SSE.Views.ChartSettingsDlg.textReverse": "Valori in ordine inverso", "SSE.Views.ChartSettingsDlg.textReverseOrder": "ordine inverso", "SSE.Views.ChartSettingsDlg.textRight": "A destra", @@ -1314,10 +1307,8 @@ "SSE.Views.ChartSettingsDlg.textSmooth": "Sfumate", "SSE.Views.ChartSettingsDlg.textSnap": "Aggancia celle", "SSE.Views.ChartSettingsDlg.textSparkRanges": "Intervalli di Sparkline ", - "SSE.Views.ChartSettingsDlg.textStock": "Azionario", "SSE.Views.ChartSettingsDlg.textStraight": "Rette", "SSE.Views.ChartSettingsDlg.textStyle": "Stile", - "SSE.Views.ChartSettingsDlg.textSurface": "Superficie", "SSE.Views.ChartSettingsDlg.textTenMillions": "10 000 000", "SSE.Views.ChartSettingsDlg.textTenThousands": "10 000", "SSE.Views.ChartSettingsDlg.textThousands": "Migliaia", @@ -1335,7 +1326,6 @@ "SSE.Views.ChartSettingsDlg.textVertAxis": "Asse verticale", "SSE.Views.ChartSettingsDlg.textVertGrid": "Linee verticali della griglia", "SSE.Views.ChartSettingsDlg.textVertTitle": "Titolo asse verticale", - "SSE.Views.ChartSettingsDlg.textWinLossSpark": "Vinci/Perdi", "SSE.Views.ChartSettingsDlg.textXAxisTitle": "Titolo di asse X", "SSE.Views.ChartSettingsDlg.textYAxisTitle": "Titolo di asse Y", "SSE.Views.ChartSettingsDlg.textZero": "Zero", @@ -2220,19 +2210,14 @@ "SSE.Views.Toolbar.textAlignRight": "Allinea a destra", "SSE.Views.Toolbar.textAlignTop": "Allinea in alto", "SSE.Views.Toolbar.textAllBorders": "Tutti i bordi", - "SSE.Views.Toolbar.textArea": "Ad area", - "SSE.Views.Toolbar.textBar": "Barra", "SSE.Views.Toolbar.textBold": "Grassetto", "SSE.Views.Toolbar.textBordersColor": "Colore bordo", "SSE.Views.Toolbar.textBordersStyle": "Stile bordo", "SSE.Views.Toolbar.textBottom": "In basso: ", "SSE.Views.Toolbar.textBottomBorders": "Bordi inferiori", "SSE.Views.Toolbar.textCenterBorders": "Bordi verticali interni", - "SSE.Views.Toolbar.textCharts": "Grafici", "SSE.Views.Toolbar.textClearPrintArea": "Pulisci area di stampa", "SSE.Views.Toolbar.textClockwise": "Angolo in senso orario", - "SSE.Views.Toolbar.textColumn": "Colonna", - "SSE.Views.Toolbar.textColumnSpark": "Colonna", "SSE.Views.Toolbar.textCounterCw": "Angolo in senso antiorario", "SSE.Views.Toolbar.textDelLeft": "Sposta celle a sinistra", "SSE.Views.Toolbar.textDelUp": "Sposta celle in alto", @@ -2248,8 +2233,6 @@ "SSE.Views.Toolbar.textLandscape": "Orizzontale", "SSE.Views.Toolbar.textLeft": "Sinistra:", "SSE.Views.Toolbar.textLeftBorders": "Bordi sinistri", - "SSE.Views.Toolbar.textLine": "Linea", - "SSE.Views.Toolbar.textLineSpark": "Linea", "SSE.Views.Toolbar.textMarginsLast": "Ultima personalizzazione", "SSE.Views.Toolbar.textMarginsNarrow": "Stretto", "SSE.Views.Toolbar.textMarginsNormal": "Normale", @@ -2260,8 +2243,6 @@ "SSE.Views.Toolbar.textNoBorders": "Nessun bordo", "SSE.Views.Toolbar.textOutBorders": "Bordi esterni", "SSE.Views.Toolbar.textPageMarginsCustom": "Margini personalizzati", - "SSE.Views.Toolbar.textPie": "A torta", - "SSE.Views.Toolbar.textPoint": "XY (A dispersione)", "SSE.Views.Toolbar.textPortrait": "Verticale", "SSE.Views.Toolbar.textPrint": "Stampa", "SSE.Views.Toolbar.textPrintOptions": "Impostazioni stampa", @@ -2270,13 +2251,10 @@ "SSE.Views.Toolbar.textRotateDown": "Ruota testo verso il basso", "SSE.Views.Toolbar.textRotateUp": "Ruota testo verso l'alto", "SSE.Views.Toolbar.textSetPrintArea": "Imposta area di stampa", - "SSE.Views.Toolbar.textSparks": "Sparklines", - "SSE.Views.Toolbar.textStock": "Azionario", "SSE.Views.Toolbar.textStrikeout": "Barrato", "SSE.Views.Toolbar.textSubscript": "Pedice", "SSE.Views.Toolbar.textSubSuperscript": "Pedice/Apice", "SSE.Views.Toolbar.textSuperscript": "Apice", - "SSE.Views.Toolbar.textSurface": "Superficie", "SSE.Views.Toolbar.textTabCollaboration": "Collaborazione", "SSE.Views.Toolbar.textTabData": "Dati", "SSE.Views.Toolbar.textTabFile": "File", @@ -2288,7 +2266,6 @@ "SSE.Views.Toolbar.textTop": "in alto:", "SSE.Views.Toolbar.textTopBorders": "Bordi superiori", "SSE.Views.Toolbar.textUnderline": "Sottolineato", - "SSE.Views.Toolbar.textWinLossSpark": "Vinci/Perdi", "SSE.Views.Toolbar.textZoom": "Zoom", "SSE.Views.Toolbar.tipAlignBottom": "Allinea in basso", "SSE.Views.Toolbar.tipAlignCenter": "Allinea al centro", diff --git a/apps/spreadsheeteditor/main/locale/ja.json b/apps/spreadsheeteditor/main/locale/ja.json index 86850aacb..1e0ef300f 100644 --- a/apps/spreadsheeteditor/main/locale/ja.json +++ b/apps/spreadsheeteditor/main/locale/ja.json @@ -2,6 +2,13 @@ "cancelButtonText": "キャンセル", "Common.Controllers.Chat.notcriticalErrorTitle": "警告", "Common.Controllers.Chat.textEnterMessage": "ここでメッセージを挿入してください。", + "Common.define.chartData.textArea": "面グラフ", + "Common.define.chartData.textBar": "横棒グラフ", + "Common.define.chartData.textColumn": "縦棒グラフ", + "Common.define.chartData.textLine": "折れ線グラフ", + "Common.define.chartData.textPie": "円グラフ", + "Common.define.chartData.textPoint": "点グラフ", + "Common.define.chartData.textStock": "株価チャート", "Common.UI.ComboBorderSize.txtNoBorders": "枠線なし", "Common.UI.ComboBorderSizeEditable.txtNoBorders": "枠線なし", "Common.UI.ComboDataView.emptyComboText": "スタイルなし", @@ -261,36 +268,26 @@ "SSE.Views.CellRangeDialog.txtInvalidRange": "エラー！セルの範囲が正しくありません。", "SSE.Views.CellRangeDialog.txtTitle": "データ範囲の選択", "SSE.Views.ChartSettings.textAdvanced": "詳細設定の表示", - "SSE.Views.ChartSettings.textArea": "面グラフ", - "SSE.Views.ChartSettings.textBar": "横棒グラフ", "SSE.Views.ChartSettings.textChartType": "グラフの種類の変更", - "SSE.Views.ChartSettings.textColumn": "縦棒グラフ", "SSE.Views.ChartSettings.textEditData": "データの編集", "SSE.Views.ChartSettings.textHeight": "高さ", "SSE.Views.ChartSettings.textKeepRatio": "比例の定数", - "SSE.Views.ChartSettings.textLine": "折れ線グラフ", - "SSE.Views.ChartSettings.textPie": "円グラフ", - "SSE.Views.ChartSettings.textPoint": "点グラフ", "SSE.Views.ChartSettings.textSize": "サイズ", - "SSE.Views.ChartSettings.textStock": "株価チャート", "SSE.Views.ChartSettings.textStyle": "スタイル", "SSE.Views.ChartSettings.textWidth": "幅", "SSE.Views.ChartSettingsDlg.errorMaxRows": "エラー！使用可能なデータ系列の数は、1グラフあたり最大255個です。", "SSE.Views.ChartSettingsDlg.errorStockChart": "行の順序が正しくありません。この株価チャートを作成するには、
始値、高値、安値、終値の順でシートのデータを配置してください。", - "SSE.Views.ChartSettingsDlg.textArea": "面グラフ", "SSE.Views.ChartSettingsDlg.textAuto": "自動", "SSE.Views.ChartSettingsDlg.textAxisCrosses": "軸との交点", "SSE.Views.ChartSettingsDlg.textAxisOptions": "軸のオプション", "SSE.Views.ChartSettingsDlg.textAxisPos": "軸位置", "SSE.Views.ChartSettingsDlg.textAxisSettings": "軸の設定", - "SSE.Views.ChartSettingsDlg.textBar": "横棒グラフ", "SSE.Views.ChartSettingsDlg.textBetweenTickMarks": "目盛りの間", "SSE.Views.ChartSettingsDlg.textBillions": "十億", "SSE.Views.ChartSettingsDlg.textCategoryName": "カテゴリ名", "SSE.Views.ChartSettingsDlg.textCenter": "中央揃え", "SSE.Views.ChartSettingsDlg.textChartElementsLegend": "グラフ要素&
グラフの凡例", "SSE.Views.ChartSettingsDlg.textChartTitle": "グラフのタイトル", - "SSE.Views.ChartSettingsDlg.textColumn": "縦棒グラフ", "SSE.Views.ChartSettingsDlg.textCross": "十字形", "SSE.Views.ChartSettingsDlg.textCustom": "カスタム", "SSE.Views.ChartSettingsDlg.textDataColumns": "列に", @@ -325,7 +322,6 @@ "SSE.Views.ChartSettingsDlg.textLegendPos": "凡例", "SSE.Views.ChartSettingsDlg.textLegendRight": "右に", "SSE.Views.ChartSettingsDlg.textLegendTop": "トップ", - "SSE.Views.ChartSettingsDlg.textLine": "折れ線グラフ", "SSE.Views.ChartSettingsDlg.textLines": "行", "SSE.Views.ChartSettingsDlg.textLow": "ロー", "SSE.Views.ChartSettingsDlg.textMajor": "メジャー", @@ -346,8 +342,6 @@ "SSE.Views.ChartSettingsDlg.textOut": "外", "SSE.Views.ChartSettingsDlg.textOuterTop": "外トップ", "SSE.Views.ChartSettingsDlg.textOverlay": "オーバーレイ", - "SSE.Views.ChartSettingsDlg.textPie": "円グラフ", - "SSE.Views.ChartSettingsDlg.textPoint": "点グラフ", "SSE.Views.ChartSettingsDlg.textReverse": "軸を反転する", "SSE.Views.ChartSettingsDlg.textRightOverlay": "右オーバーレイ", "SSE.Views.ChartSettingsDlg.textRotated": "回転", @@ -360,7 +354,6 @@ "SSE.Views.ChartSettingsDlg.textShowGrid": "グリッド線", "SSE.Views.ChartSettingsDlg.textShowValues": "グラフ値の表示", "SSE.Views.ChartSettingsDlg.textSmooth": "スムーズ", - "SSE.Views.ChartSettingsDlg.textStock": "株価チャート", "SSE.Views.ChartSettingsDlg.textStraight": "直線", "SSE.Views.ChartSettingsDlg.textStyle": "スタイル", "SSE.Views.ChartSettingsDlg.textTenMillions": "10 000 000", diff --git a/apps/spreadsheeteditor/main/locale/ko.json b/apps/spreadsheeteditor/main/locale/ko.json index f6a213d7b..564eabeb6 100644 --- a/apps/spreadsheeteditor/main/locale/ko.json +++ b/apps/spreadsheeteditor/main/locale/ko.json @@ -879,36 +879,25 @@ "SSE.Views.ChartSettings.strSparkColor": "Color", "SSE.Views.ChartSettings.strTemplate": "템플릿", "SSE.Views.ChartSettings.textAdvanced": "고급 설정 표시", - "SSE.Views.ChartSettings.textArea": "Area", - "SSE.Views.ChartSettings.textBar": "Bar", "SSE.Views.ChartSettings.textBorderSizeErr": "입력 한 값이 잘못되었습니다.
0pt ~ 1584pt 사이의 값을 입력하십시오.", "SSE.Views.ChartSettings.textChartType": "차트 유형 변경", - "SSE.Views.ChartSettings.textColumn": "Column", - "SSE.Views.ChartSettings.textColumnSpark": "열", "SSE.Views.ChartSettings.textEditData": "데이터 및 위치 편집", "SSE.Views.ChartSettings.textFirstPoint": "첫 번째 지점", "SSE.Views.ChartSettings.textHeight": "높이", "SSE.Views.ChartSettings.textHighPoint": "높은 점수", "SSE.Views.ChartSettings.textKeepRatio": "상수 비율", "SSE.Views.ChartSettings.textLastPoint": "마지막 지점", - "SSE.Views.ChartSettings.textLine": "Line", - "SSE.Views.ChartSettings.textLineSpark": "Line", "SSE.Views.ChartSettings.textLowPoint": "Low Point", "SSE.Views.ChartSettings.textMarkers": "마커", "SSE.Views.ChartSettings.textNegativePoint": "Negative Point", "SSE.Views.ChartSettings.textNewColor": "새 사용자 지정 색 추가", - "SSE.Views.ChartSettings.textPie": "파이", - "SSE.Views.ChartSettings.textPoint": "XY (Scatter)", "SSE.Views.ChartSettings.textRanges": "데이터 범위", "SSE.Views.ChartSettings.textSelectData": "데이터 선택", "SSE.Views.ChartSettings.textShow": "표시", "SSE.Views.ChartSettings.textSize": "크기", - "SSE.Views.ChartSettings.textStock": "Stock", "SSE.Views.ChartSettings.textStyle": "스타일", - "SSE.Views.ChartSettings.textSurface": "Surface", "SSE.Views.ChartSettings.textType": "유형", "SSE.Views.ChartSettings.textWidth": "너비", - "SSE.Views.ChartSettings.textWinLossSpark": "Win / Loss", "SSE.Views.ChartSettingsDlg.errorMaxPoints": "문제발생! 차트당 시리즈내 포인트의 최대값은 4096임", "SSE.Views.ChartSettingsDlg.errorMaxRows": "오류! 차트 당 최대 데이터 시리즈 수는 255입니다.", "SSE.Views.ChartSettingsDlg.errorStockChart": "잘못된 행 순서. 주식형 차트를 작성하려면 시트의 데이터를 다음 순서로 배치하십시오 :
개시 가격, 최대 가격, 최소 가격, 마감 가격.", @@ -916,14 +905,12 @@ "SSE.Views.ChartSettingsDlg.textAltDescription": "설명", "SSE.Views.ChartSettingsDlg.textAltTip": "시력이나인지 장애가있는 사람들에게 읽혀지는 시각적 객체 정보의 대체 텍스트 기반 표현으로 이미지에 어떤 정보가 있는지 더 잘 이해할 수 있도록 도와줍니다. 차트 또는 표. ", "SSE.Views.ChartSettingsDlg.textAltTitle": "제목", - "SSE.Views.ChartSettingsDlg.textArea": "Area", "SSE.Views.ChartSettingsDlg.textAuto": "Auto", "SSE.Views.ChartSettingsDlg.textAutoEach": "각자 자동", "SSE.Views.ChartSettingsDlg.textAxisCrosses": "Axis Crosses", "SSE.Views.ChartSettingsDlg.textAxisOptions": "축 옵션", "SSE.Views.ChartSettingsDlg.textAxisPos": "축 위치", "SSE.Views.ChartSettingsDlg.textAxisSettings": "축 설정", - "SSE.Views.ChartSettingsDlg.textBar": "Bar", "SSE.Views.ChartSettingsDlg.textBetweenTickMarks": "눈금 사이", "SSE.Views.ChartSettingsDlg.textBillions": "10 억", "SSE.Views.ChartSettingsDlg.textBottom": "Bottom", @@ -931,8 +918,6 @@ "SSE.Views.ChartSettingsDlg.textCenter": "Center", "SSE.Views.ChartSettingsDlg.textChartElementsLegend": "차트 요소 & 차트 범례", "SSE.Views.ChartSettingsDlg.textChartTitle": "차트 제목", - "SSE.Views.ChartSettingsDlg.textColumn": "Column", - "SSE.Views.ChartSettingsDlg.textColumnSpark": "열", "SSE.Views.ChartSettingsDlg.textCross": "Cross", "SSE.Views.ChartSettingsDlg.textCustom": "사용자 지정", "SSE.Views.ChartSettingsDlg.textDataColumns": "열에 있음", @@ -973,9 +958,7 @@ "SSE.Views.ChartSettingsDlg.textLegendPos": "범례", "SSE.Views.ChartSettingsDlg.textLegendRight": "오른쪽", "SSE.Views.ChartSettingsDlg.textLegendTop": "Top", - "SSE.Views.ChartSettingsDlg.textLine": "꺾은 선형 차트", "SSE.Views.ChartSettingsDlg.textLines": "Lines", - "SSE.Views.ChartSettingsDlg.textLineSpark": "Line", "SSE.Views.ChartSettingsDlg.textLocationRange": "위치 범위", "SSE.Views.ChartSettingsDlg.textLow": "낮음", "SSE.Views.ChartSettingsDlg.textMajor": "Major", @@ -996,8 +979,6 @@ "SSE.Views.ChartSettingsDlg.textOut": "Out", "SSE.Views.ChartSettingsDlg.textOuterTop": "외부 상단", "SSE.Views.ChartSettingsDlg.textOverlay": "오버레이", - "SSE.Views.ChartSettingsDlg.textPie": "파이", - "SSE.Views.ChartSettingsDlg.textPoint": "XY (Scatter)", "SSE.Views.ChartSettingsDlg.textReverse": "역순으로 값", "SSE.Views.ChartSettingsDlg.textReverseOrder": "역순", "SSE.Views.ChartSettingsDlg.textRight": "오른쪽", @@ -1018,10 +999,8 @@ "SSE.Views.ChartSettingsDlg.textSingle": "단일 스파크 라인", "SSE.Views.ChartSettingsDlg.textSmooth": "부드럽게", "SSE.Views.ChartSettingsDlg.textSparkRanges": "스파크 라인 범위", - "SSE.Views.ChartSettingsDlg.textStock": "Stock", "SSE.Views.ChartSettingsDlg.textStraight": "직선", "SSE.Views.ChartSettingsDlg.textStyle": "스타일", - "SSE.Views.ChartSettingsDlg.textSurface": "Surface", "SSE.Views.ChartSettingsDlg.textTenMillions": "10 000 000", "SSE.Views.ChartSettingsDlg.textTenThousands": "10 000", "SSE.Views.ChartSettingsDlg.textThousands": "수천", @@ -1038,7 +1017,6 @@ "SSE.Views.ChartSettingsDlg.textVertAxis": "세로 축", "SSE.Views.ChartSettingsDlg.textVertGrid": "수직 눈금 선", "SSE.Views.ChartSettingsDlg.textVertTitle": "세로 축 제목", - "SSE.Views.ChartSettingsDlg.textWinLossSpark": "Win / Loss", "SSE.Views.ChartSettingsDlg.textXAxisTitle": "X 축 제목", "SSE.Views.ChartSettingsDlg.textYAxisTitle": "Y 축 제목", "SSE.Views.ChartSettingsDlg.textZero": "Zero", @@ -1724,17 +1702,12 @@ "SSE.Views.Toolbar.textAlignRight": "오른쪽 정렬", "SSE.Views.Toolbar.textAlignTop": "Align Top", "SSE.Views.Toolbar.textAllBorders": "모든 테두리", - "SSE.Views.Toolbar.textArea": "Area", - "SSE.Views.Toolbar.textBar": "Bar", "SSE.Views.Toolbar.textBold": "Bold", "SSE.Views.Toolbar.textBordersColor": "테두리 색상", "SSE.Views.Toolbar.textBordersStyle": "테두리 스타일", "SSE.Views.Toolbar.textBottomBorders": "Bottom Borders", "SSE.Views.Toolbar.textCenterBorders": "내부 세로 테두리", - "SSE.Views.Toolbar.textCharts": "차트", "SSE.Views.Toolbar.textClockwise": "시계 방향으로 각도", - "SSE.Views.Toolbar.textColumn": "Column", - "SSE.Views.Toolbar.textColumnSpark": "Column", "SSE.Views.Toolbar.textCounterCw": "시계 반대 방향 각도", "SSE.Views.Toolbar.textDelLeft": "셀 왼쪽으로 시프트", "SSE.Views.Toolbar.textDelUp": "셀 이동", @@ -1748,27 +1721,20 @@ "SSE.Views.Toolbar.textInsRight": "셀 오른쪽으로 이동", "SSE.Views.Toolbar.textItalic": "Italic", "SSE.Views.Toolbar.textLeftBorders": "왼쪽 테두리", - "SSE.Views.Toolbar.textLine": "Line", - "SSE.Views.Toolbar.textLineSpark": "Line", "SSE.Views.Toolbar.textMiddleBorders": "내부 수평 테두리", "SSE.Views.Toolbar.textMoreFormats": "기타 형식", "SSE.Views.Toolbar.textNewColor": "새 사용자 지정 색 추가", "SSE.Views.Toolbar.textNoBorders": "테두리 없음", "SSE.Views.Toolbar.textOutBorders": "테두리 밖", - "SSE.Views.Toolbar.textPie": "파이", - "SSE.Views.Toolbar.textPoint": "XY (Scatter)", "SSE.Views.Toolbar.textPrint": "인쇄", "SSE.Views.Toolbar.textPrintOptions": "인쇄 설정", "SSE.Views.Toolbar.textRightBorders": "오른쪽 테두리", "SSE.Views.Toolbar.textRotateDown": "텍스트 아래로 회전", "SSE.Views.Toolbar.textRotateUp": "텍스트 회전", - "SSE.Views.Toolbar.textSparks": "스파크 라인", - "SSE.Views.Toolbar.textStock": "Stock", "SSE.Views.Toolbar.textStrikeout": "줄긋기", "SSE.Views.Toolbar.textSubscript": "첨자", "SSE.Views.Toolbar.textSubSuperscript": "첨자/위에 쓴", "SSE.Views.Toolbar.textSuperscript": "위에 쓴", - "SSE.Views.Toolbar.textSurface": "Surface", "SSE.Views.Toolbar.textTabCollaboration": "합치기", "SSE.Views.Toolbar.textTabFile": "파일", "SSE.Views.Toolbar.textTabHome": "집", @@ -1776,7 +1742,6 @@ "SSE.Views.Toolbar.textTabProtect": "보호", "SSE.Views.Toolbar.textTopBorders": "위쪽 테두리", "SSE.Views.Toolbar.textUnderline": "밑줄", - "SSE.Views.Toolbar.textWinLossSpark": "Win / Loss", "SSE.Views.Toolbar.textZoom": "확대 / 축소", "SSE.Views.Toolbar.tipAlignBottom": "아래쪽 정렬", "SSE.Views.Toolbar.tipAlignCenter": "정렬 센터", diff --git a/apps/spreadsheeteditor/main/locale/lv.json b/apps/spreadsheeteditor/main/locale/lv.json index 058f2dde0..ff4cc38db 100644 --- a/apps/spreadsheeteditor/main/locale/lv.json +++ b/apps/spreadsheeteditor/main/locale/lv.json @@ -872,36 +872,25 @@ "SSE.Views.ChartSettings.strSparkColor": "Krāsa", "SSE.Views.ChartSettings.strTemplate": "Veidne", "SSE.Views.ChartSettings.textAdvanced": "Show advanced settings", - "SSE.Views.ChartSettings.textArea": "Apgabals", - "SSE.Views.ChartSettings.textBar": "Josla", "SSE.Views.ChartSettings.textBorderSizeErr": "Ievadītā vērtība nav pareiza.
Lūdzu, ievadiet vērtību starp 0 pt un 1584 pt.", "SSE.Views.ChartSettings.textChartType": "Izmainīt diagrammas veidu", - "SSE.Views.ChartSettings.textColumn": "Kolonna", - "SSE.Views.ChartSettings.textColumnSpark": "Kolonna", "SSE.Views.ChartSettings.textEditData": "Edit Data", "SSE.Views.ChartSettings.textFirstPoint": "Pirmais punkts", "SSE.Views.ChartSettings.textHeight": "Height", "SSE.Views.ChartSettings.textHighPoint": "Augstais punkts", "SSE.Views.ChartSettings.textKeepRatio": "Constant Proportions", "SSE.Views.ChartSettings.textLastPoint": "Pēdējais punkts", - "SSE.Views.ChartSettings.textLine": "Līnija", - "SSE.Views.ChartSettings.textLineSpark": "Līnija", "SSE.Views.ChartSettings.textLowPoint": "Minimālais punkts", "SSE.Views.ChartSettings.textMarkers": "Marķieri", "SSE.Views.ChartSettings.textNegativePoint": "Negatīvais punkts", "SSE.Views.ChartSettings.textNewColor": "Pievienot jaunu krāsu", - "SSE.Views.ChartSettings.textPie": "Sektoru diagramma", - "SSE.Views.ChartSettings.textPoint": "Punkts", "SSE.Views.ChartSettings.textRanges": "Datu diapazons", "SSE.Views.ChartSettings.textSelectData": "Izvēlēties datus", "SSE.Views.ChartSettings.textShow": "Rādīt", "SSE.Views.ChartSettings.textSize": "Size", - "SSE.Views.ChartSettings.textStock": "Akcijas", "SSE.Views.ChartSettings.textStyle": "Style", - "SSE.Views.ChartSettings.textSurface": "Virsma", "SSE.Views.ChartSettings.textType": "Veids", "SSE.Views.ChartSettings.textWidth": "Width", - "SSE.Views.ChartSettings.textWinLossSpark": "Ieguvums/zaudējums", "SSE.Views.ChartSettingsDlg.errorMaxPoints": "KĻŪDA! Kopējais maksimālais sērijas punktu skaits diagrammā ir 4096.", "SSE.Views.ChartSettingsDlg.errorMaxRows": "ERROR! The maximum number of data series per chart is 255", "SSE.Views.ChartSettingsDlg.errorStockChart": "Nederīga rindu kārtība. Lai izveidotu akciju diagrammu novietojiet datus lapā šādā secībā:
Sākumcena, maksimālā cena, minimālā cena, slēgšanas cena.", @@ -909,14 +898,12 @@ "SSE.Views.ChartSettingsDlg.textAltDescription": "Apraksts", "SSE.Views.ChartSettingsDlg.textAltTip": "Vizuālās objekta informācijas attainojums alternatīvā teksta veidā, kuru lasīs cilvēki ar redze vai uztveres traucējumiem un kuriem tas labāk palīdzēs izprast, kāda informācija ir ietverta tekstā, automātiskajā figūrā, diagrammā vai tabulā.", "SSE.Views.ChartSettingsDlg.textAltTitle": "Nosaukums", - "SSE.Views.ChartSettingsDlg.textArea": "Apgabals", "SSE.Views.ChartSettingsDlg.textAuto": "Auto", "SSE.Views.ChartSettingsDlg.textAutoEach": "Automātiski katram", "SSE.Views.ChartSettingsDlg.textAxisCrosses": "Axis Crosses", "SSE.Views.ChartSettingsDlg.textAxisOptions": "Axis Options", "SSE.Views.ChartSettingsDlg.textAxisPos": "Axis Position", "SSE.Views.ChartSettingsDlg.textAxisSettings": "Axis Settings", - "SSE.Views.ChartSettingsDlg.textBar": "Josla", "SSE.Views.ChartSettingsDlg.textBetweenTickMarks": "Between Tick Marks", "SSE.Views.ChartSettingsDlg.textBillions": "Billions", "SSE.Views.ChartSettingsDlg.textBottom": "Apakšā", @@ -924,8 +911,6 @@ "SSE.Views.ChartSettingsDlg.textCenter": "Center", "SSE.Views.ChartSettingsDlg.textChartElementsLegend": "Chart Elements &
Chart Legend", "SSE.Views.ChartSettingsDlg.textChartTitle": "Grafika nosaukums", - "SSE.Views.ChartSettingsDlg.textColumn": "Kolonna", - "SSE.Views.ChartSettingsDlg.textColumnSpark": "Kolonna", "SSE.Views.ChartSettingsDlg.textCross": "Cross", "SSE.Views.ChartSettingsDlg.textCustom": "Custom", "SSE.Views.ChartSettingsDlg.textDataColumns": "Datu sērijas kolonnās", @@ -966,9 +951,7 @@ "SSE.Views.ChartSettingsDlg.textLegendPos": "Legend", "SSE.Views.ChartSettingsDlg.textLegendRight": "Pa labi", "SSE.Views.ChartSettingsDlg.textLegendTop": "Augšā", - "SSE.Views.ChartSettingsDlg.textLine": "Līnija", "SSE.Views.ChartSettingsDlg.textLines": "Lines ", - "SSE.Views.ChartSettingsDlg.textLineSpark": "Rinda", "SSE.Views.ChartSettingsDlg.textLocationRange": "Atrašanās vietas diapazons", "SSE.Views.ChartSettingsDlg.textLow": "Low", "SSE.Views.ChartSettingsDlg.textMajor": "Major", @@ -989,8 +972,6 @@ "SSE.Views.ChartSettingsDlg.textOut": "Out", "SSE.Views.ChartSettingsDlg.textOuterTop": "Outer Top", "SSE.Views.ChartSettingsDlg.textOverlay": "Overlay", - "SSE.Views.ChartSettingsDlg.textPie": "Sektoru diagramma", - "SSE.Views.ChartSettingsDlg.textPoint": "Punkts", "SSE.Views.ChartSettingsDlg.textReverse": "Values in reverse order", "SSE.Views.ChartSettingsDlg.textReverseOrder": "Apgrieztā secībā", "SSE.Views.ChartSettingsDlg.textRight": "Pa labi", @@ -1011,10 +992,8 @@ "SSE.Views.ChartSettingsDlg.textSingle": "Atsevišķs spārklains", "SSE.Views.ChartSettingsDlg.textSmooth": "Smooth", "SSE.Views.ChartSettingsDlg.textSparkRanges": "Spārklainu diapazoni", - "SSE.Views.ChartSettingsDlg.textStock": "Akcijas", "SSE.Views.ChartSettingsDlg.textStraight": "Straight", "SSE.Views.ChartSettingsDlg.textStyle": "Style", - "SSE.Views.ChartSettingsDlg.textSurface": "Virsma", "SSE.Views.ChartSettingsDlg.textTenMillions": "10 000 000", "SSE.Views.ChartSettingsDlg.textTenThousands": "10 000", "SSE.Views.ChartSettingsDlg.textThousands": "Thousands", @@ -1031,7 +1010,6 @@ "SSE.Views.ChartSettingsDlg.textVertAxis": "Vertical Axis", "SSE.Views.ChartSettingsDlg.textVertGrid": "Vertical Gridlines", "SSE.Views.ChartSettingsDlg.textVertTitle": "Vertical Axis Title", - "SSE.Views.ChartSettingsDlg.textWinLossSpark": "Ieguvums/zaudējums", "SSE.Views.ChartSettingsDlg.textXAxisTitle": "X ass virsraksts", "SSE.Views.ChartSettingsDlg.textYAxisTitle": "Y ass virsraksts", "SSE.Views.ChartSettingsDlg.textZero": "Nulle", @@ -1720,17 +1698,12 @@ "SSE.Views.Toolbar.textAlignRight": "Līdzināt pa labi", "SSE.Views.Toolbar.textAlignTop": "Līdzināt uz augšu", "SSE.Views.Toolbar.textAllBorders": "Visas Apmales", - "SSE.Views.Toolbar.textArea": "Apgabals", - "SSE.Views.Toolbar.textBar": "Josla", "SSE.Views.Toolbar.textBold": "Treknraksts", "SSE.Views.Toolbar.textBordersColor": "Apmales krāsa", "SSE.Views.Toolbar.textBordersStyle": "Robežas stils", "SSE.Views.Toolbar.textBottomBorders": "Apakšējās Apmales", "SSE.Views.Toolbar.textCenterBorders": "Iekšējās Vertikālās Apmales", - "SSE.Views.Toolbar.textCharts": "Diagrammas", "SSE.Views.Toolbar.textClockwise": "Angle Clockwise", - "SSE.Views.Toolbar.textColumn": "Kolonna", - "SSE.Views.Toolbar.textColumnSpark": "Kolonna", "SSE.Views.Toolbar.textCounterCw": "Angle Counterclockwise", "SSE.Views.Toolbar.textDelLeft": "Shift Cells Left", "SSE.Views.Toolbar.textDelUp": "Shift Cells Up", @@ -1744,27 +1717,20 @@ "SSE.Views.Toolbar.textInsRight": "Shift Cells Right", "SSE.Views.Toolbar.textItalic": "Kursīvs", "SSE.Views.Toolbar.textLeftBorders": "Kreisās Apmales", - "SSE.Views.Toolbar.textLine": "Līnija", - "SSE.Views.Toolbar.textLineSpark": "Līnija", "SSE.Views.Toolbar.textMiddleBorders": "Iekšējās Horizontālās Apmales", "SSE.Views.Toolbar.textMoreFormats": "Vairāk formātu", "SSE.Views.Toolbar.textNewColor": "Pievienot jauno krāsu", "SSE.Views.Toolbar.textNoBorders": "Nav apmales", "SSE.Views.Toolbar.textOutBorders": "Ārējās Apmales", - "SSE.Views.Toolbar.textPie": "Sektoru diagramma", - "SSE.Views.Toolbar.textPoint": "Punkts (XY)", "SSE.Views.Toolbar.textPrint": "Drukāt", "SSE.Views.Toolbar.textPrintOptions": "Drukāšanas opcijas", "SSE.Views.Toolbar.textRightBorders": "Labās Apmales", "SSE.Views.Toolbar.textRotateDown": "Rotate Text Down", "SSE.Views.Toolbar.textRotateUp": "Rotate Text Up", - "SSE.Views.Toolbar.textSparks": "Spārklaini", - "SSE.Views.Toolbar.textStock": "Akcijas", "SSE.Views.Toolbar.textStrikeout": "Izsvītrošana", "SSE.Views.Toolbar.textSubscript": "Apakšteksts", "SSE.Views.Toolbar.textSubSuperscript": "Apakšraksts/augšraksts", "SSE.Views.Toolbar.textSuperscript": "Augšraksts", - "SSE.Views.Toolbar.textSurface": "Virsma", "SSE.Views.Toolbar.textTabCollaboration": "Sadarbība", "SSE.Views.Toolbar.textTabFile": "Fails", "SSE.Views.Toolbar.textTabHome": "Sākums", @@ -1772,7 +1738,6 @@ "SSE.Views.Toolbar.textTabProtect": "Aizsardzība", "SSE.Views.Toolbar.textTopBorders": "Augšējās Apmales", "SSE.Views.Toolbar.textUnderline": "Pasvītrots", - "SSE.Views.Toolbar.textWinLossSpark": "Ieguvums/zaudējums", "SSE.Views.Toolbar.textZoom": "Zoom", "SSE.Views.Toolbar.tipAlignBottom": "Align Bottom", "SSE.Views.Toolbar.tipAlignCenter": "Align Center", diff --git a/apps/spreadsheeteditor/main/locale/nl.json b/apps/spreadsheeteditor/main/locale/nl.json index 998fa9e6a..7b53b6968 100644 --- a/apps/spreadsheeteditor/main/locale/nl.json +++ b/apps/spreadsheeteditor/main/locale/nl.json @@ -2,6 +2,18 @@ "cancelButtonText": "Annuleren", "Common.Controllers.Chat.notcriticalErrorTitle": "Waarschuwing", "Common.Controllers.Chat.textEnterMessage": "Voer hier uw bericht in", + "Common.define.chartData.textArea": "Vlak", + "Common.define.chartData.textBar": "Staaf", + "Common.define.chartData.textColumn": "Kolom", + "Common.define.chartData.textLine": "Lijn", + "Common.define.chartData.textPie": "Cirkel", + "Common.define.chartData.textPoint": "Spreiding", + "Common.define.chartData.textStock": "Voorraad", + "Common.define.chartData.textSurface": "Oppervlak", + "Common.define.chartData.textColumnSpark": "Kolom", + "Common.define.chartData.textLineSpark": "Lijn", + "Common.define.chartData.textWinLossSpark": "Winst/verlies", + "Common.define.chartData.textSparks": "Sparklines", "Common.UI.ComboBorderSize.txtNoBorders": "Geen randen", "Common.UI.ComboBorderSizeEditable.txtNoBorders": "Geen randen", "Common.UI.ComboDataView.emptyComboText": "Geen stijlen", @@ -879,36 +891,25 @@ "SSE.Views.ChartSettings.strSparkColor": "Kleur", "SSE.Views.ChartSettings.strTemplate": "Sjabloon", "SSE.Views.ChartSettings.textAdvanced": "Geavanceerde instellingen tonen", - "SSE.Views.ChartSettings.textArea": "Vlak", - "SSE.Views.ChartSettings.textBar": "Staaf", "SSE.Views.ChartSettings.textBorderSizeErr": "De ingevoerde waarde is onjuist.
Voer een waarde tussen 0 pt en 1584 pt in.", "SSE.Views.ChartSettings.textChartType": "Grafiektype wijzigen", - "SSE.Views.ChartSettings.textColumn": "Kolom", - "SSE.Views.ChartSettings.textColumnSpark": "Kolom", "SSE.Views.ChartSettings.textEditData": "Gegevens en locatie bewerken", "SSE.Views.ChartSettings.textFirstPoint": "Eerste punt", "SSE.Views.ChartSettings.textHeight": "Hoogte", "SSE.Views.ChartSettings.textHighPoint": "Hoogste punt", "SSE.Views.ChartSettings.textKeepRatio": "Constante verhoudingen", "SSE.Views.ChartSettings.textLastPoint": "Laatste punt", - "SSE.Views.ChartSettings.textLine": "Lijn", - "SSE.Views.ChartSettings.textLineSpark": "Lijn", "SSE.Views.ChartSettings.textLowPoint": "Laagste punt", "SSE.Views.ChartSettings.textMarkers": "Markeringen", "SSE.Views.ChartSettings.textNegativePoint": "Negatief punt", "SSE.Views.ChartSettings.textNewColor": "Nieuwe aangepaste kleur toevoegen", - "SSE.Views.ChartSettings.textPie": "Cirkel", - "SSE.Views.ChartSettings.textPoint": "Spreiding", "SSE.Views.ChartSettings.textRanges": "Gegevensbereik", "SSE.Views.ChartSettings.textSelectData": "Gegevens selecteren", "SSE.Views.ChartSettings.textShow": "Tonen", "SSE.Views.ChartSettings.textSize": "Grootte", - "SSE.Views.ChartSettings.textStock": "Voorraad", "SSE.Views.ChartSettings.textStyle": "Stijl", - "SSE.Views.ChartSettings.textSurface": "Oppervlak", "SSE.Views.ChartSettings.textType": "Type", "SSE.Views.ChartSettings.textWidth": "Breedte", - "SSE.Views.ChartSettings.textWinLossSpark": "Winst/verlies", "SSE.Views.ChartSettingsDlg.errorMaxPoints": "Fout! Het maximaal aantal punten in een serie per grafiek is 4096", "SSE.Views.ChartSettingsDlg.errorMaxRows": "FOUT! Het maximumaantal gegevensreeksen per grafiek is 255", "SSE.Views.ChartSettingsDlg.errorStockChart": "Onjuiste volgorde rijen. Als u een aandelengrafiek wilt maken, zet u de rijen in de volgende volgorde op het blad:
beginkoers, hoogste koers, laagste koers, slotkoers.", @@ -916,14 +917,12 @@ "SSE.Views.ChartSettingsDlg.textAltDescription": "Beschrijving", "SSE.Views.ChartSettingsDlg.textAltTip": "De alternatieve, op tekst gebaseerde weergave van de visuele objectinformatie. Deze wordt voorgelezen voor mensen met visuele of cognitieve handicaps om hen te helpen begrijpen welke informatie aanwezig is in de afbeelding, AutoVorm, grafiek of tabel.", "SSE.Views.ChartSettingsDlg.textAltTitle": "Titel", - "SSE.Views.ChartSettingsDlg.textArea": "Vlak", "SSE.Views.ChartSettingsDlg.textAuto": "Automatisch", "SSE.Views.ChartSettingsDlg.textAutoEach": "Automatisch voor elk", "SSE.Views.ChartSettingsDlg.textAxisCrosses": "Snijpunten assen", "SSE.Views.ChartSettingsDlg.textAxisOptions": "Asopties", "SSE.Views.ChartSettingsDlg.textAxisPos": "Aspositie", "SSE.Views.ChartSettingsDlg.textAxisSettings": "Asinstellingen", - "SSE.Views.ChartSettingsDlg.textBar": "Staaf", "SSE.Views.ChartSettingsDlg.textBetweenTickMarks": "Tussen maatstreepjes", "SSE.Views.ChartSettingsDlg.textBillions": "Miljarden", "SSE.Views.ChartSettingsDlg.textBottom": "Onder", @@ -931,8 +930,6 @@ "SSE.Views.ChartSettingsDlg.textCenter": "Centreren", "SSE.Views.ChartSettingsDlg.textChartElementsLegend": "Grafiekelementen en
grafieklegenda", "SSE.Views.ChartSettingsDlg.textChartTitle": "Grafiektitel", - "SSE.Views.ChartSettingsDlg.textColumn": "Kolom", - "SSE.Views.ChartSettingsDlg.textColumnSpark": "Kolom", "SSE.Views.ChartSettingsDlg.textCross": "Snijpunt", "SSE.Views.ChartSettingsDlg.textCustom": "Aangepast", "SSE.Views.ChartSettingsDlg.textDataColumns": "in kolommen", @@ -973,9 +970,7 @@ "SSE.Views.ChartSettingsDlg.textLegendPos": "Legenda", "SSE.Views.ChartSettingsDlg.textLegendRight": "Rechts", "SSE.Views.ChartSettingsDlg.textLegendTop": "Boven", - "SSE.Views.ChartSettingsDlg.textLine": "Lijngrafiek", "SSE.Views.ChartSettingsDlg.textLines": "Lijnen", - "SSE.Views.ChartSettingsDlg.textLineSpark": "Lijn", "SSE.Views.ChartSettingsDlg.textLocationRange": "Locatiebereik", "SSE.Views.ChartSettingsDlg.textLow": "Laag", "SSE.Views.ChartSettingsDlg.textMajor": "Primair", @@ -996,8 +991,6 @@ "SSE.Views.ChartSettingsDlg.textOut": "Buiten", "SSE.Views.ChartSettingsDlg.textOuterTop": "Buiten boven", "SSE.Views.ChartSettingsDlg.textOverlay": "Overlay", - "SSE.Views.ChartSettingsDlg.textPie": "Cirkel", - "SSE.Views.ChartSettingsDlg.textPoint": "Spreiding", "SSE.Views.ChartSettingsDlg.textReverse": "Waarden in omgekeerde volgorde", "SSE.Views.ChartSettingsDlg.textReverseOrder": "Volgorde omkeren", "SSE.Views.ChartSettingsDlg.textRight": "Rechts", @@ -1018,10 +1011,8 @@ "SSE.Views.ChartSettingsDlg.textSingle": "Enkele sparkline", "SSE.Views.ChartSettingsDlg.textSmooth": "Glad", "SSE.Views.ChartSettingsDlg.textSparkRanges": "Bereiken sparkline", - "SSE.Views.ChartSettingsDlg.textStock": "Voorraad", "SSE.Views.ChartSettingsDlg.textStraight": "Recht", "SSE.Views.ChartSettingsDlg.textStyle": "Stijl", - "SSE.Views.ChartSettingsDlg.textSurface": "Oppervlak", "SSE.Views.ChartSettingsDlg.textTenMillions": "10 000 000", "SSE.Views.ChartSettingsDlg.textTenThousands": "10 000", "SSE.Views.ChartSettingsDlg.textThousands": "Duizenden", @@ -1038,7 +1029,6 @@ "SSE.Views.ChartSettingsDlg.textVertAxis": "Verticale as", "SSE.Views.ChartSettingsDlg.textVertGrid": "Verticale rasterlijnen", "SSE.Views.ChartSettingsDlg.textVertTitle": "Titel verticale as", - "SSE.Views.ChartSettingsDlg.textWinLossSpark": "Winst/verlies", "SSE.Views.ChartSettingsDlg.textXAxisTitle": "Titel x-as", "SSE.Views.ChartSettingsDlg.textYAxisTitle": "Titel Y-as", "SSE.Views.ChartSettingsDlg.textZero": "Nul", @@ -1730,17 +1720,12 @@ "SSE.Views.Toolbar.textAlignRight": "Rechts uitlijnen", "SSE.Views.Toolbar.textAlignTop": "Boven uitlijnen", "SSE.Views.Toolbar.textAllBorders": "Alle randen", - "SSE.Views.Toolbar.textArea": "Vlak", - "SSE.Views.Toolbar.textBar": "Staaf", "SSE.Views.Toolbar.textBold": "Vet", "SSE.Views.Toolbar.textBordersColor": "Randkleur", "SSE.Views.Toolbar.textBordersStyle": "Stijl rand", "SSE.Views.Toolbar.textBottomBorders": "Onderranden", "SSE.Views.Toolbar.textCenterBorders": "Verticale binnenranden", - "SSE.Views.Toolbar.textCharts": "Grafieken", "SSE.Views.Toolbar.textClockwise": "Rechtsom draaien", - "SSE.Views.Toolbar.textColumn": "Kolom", - "SSE.Views.Toolbar.textColumnSpark": "Kolom", "SSE.Views.Toolbar.textCounterCw": "Linksom draaien", "SSE.Views.Toolbar.textDelLeft": "Cellen naar links verplaatsen", "SSE.Views.Toolbar.textDelUp": "Cellen naar boven verplaatsen", @@ -1754,27 +1739,20 @@ "SSE.Views.Toolbar.textInsRight": "Cellen naar rechts verplaatsen", "SSE.Views.Toolbar.textItalic": "Cursief", "SSE.Views.Toolbar.textLeftBorders": "Linkerranden", - "SSE.Views.Toolbar.textLine": "Lijn", - "SSE.Views.Toolbar.textLineSpark": "Lijn", "SSE.Views.Toolbar.textMiddleBorders": "Horizontale binnenranden", "SSE.Views.Toolbar.textMoreFormats": "Meer indelingen", "SSE.Views.Toolbar.textNewColor": "Nieuwe aangepaste kleur toevoegen", "SSE.Views.Toolbar.textNoBorders": "Geen randen", "SSE.Views.Toolbar.textOutBorders": "Buitenranden", - "SSE.Views.Toolbar.textPie": "Cirkel", - "SSE.Views.Toolbar.textPoint": "Spreiding", "SSE.Views.Toolbar.textPrint": "Afdrukken", "SSE.Views.Toolbar.textPrintOptions": "Afdrukinstellingen", "SSE.Views.Toolbar.textRightBorders": "Rechterranden", "SSE.Views.Toolbar.textRotateDown": "Tekst omlaag draaien", "SSE.Views.Toolbar.textRotateUp": "Tekst omhoog draaien", - "SSE.Views.Toolbar.textSparks": "Sparklines", - "SSE.Views.Toolbar.textStock": "Voorraad", "SSE.Views.Toolbar.textStrikeout": "Doorhalen", "SSE.Views.Toolbar.textSubscript": "Subscript", "SSE.Views.Toolbar.textSubSuperscript": "Subscript/Superscript", "SSE.Views.Toolbar.textSuperscript": "Superscript", - "SSE.Views.Toolbar.textSurface": "Oppervlak", "SSE.Views.Toolbar.textTabCollaboration": "Samenwerking", "SSE.Views.Toolbar.textTabFile": "Bestand", "SSE.Views.Toolbar.textTabHome": "Home", @@ -1782,7 +1760,6 @@ "SSE.Views.Toolbar.textTabProtect": "Beveiliging", "SSE.Views.Toolbar.textTopBorders": "Bovenranden", "SSE.Views.Toolbar.textUnderline": "Onderstrepen", - "SSE.Views.Toolbar.textWinLossSpark": "Winst/verlies", "SSE.Views.Toolbar.textZoom": "Zoomen", "SSE.Views.Toolbar.tipAlignBottom": "Onder uitlijnen", "SSE.Views.Toolbar.tipAlignCenter": "Midden uitlijnen", diff --git a/apps/spreadsheeteditor/main/locale/pl.json b/apps/spreadsheeteditor/main/locale/pl.json index f9d7522c8..9d81f4c32 100644 --- a/apps/spreadsheeteditor/main/locale/pl.json +++ b/apps/spreadsheeteditor/main/locale/pl.json @@ -2,6 +2,18 @@ "cancelButtonText": "Anuluj", "Common.Controllers.Chat.notcriticalErrorTitle": "Ostrzeżenie", "Common.Controllers.Chat.textEnterMessage": "Wprowadź swoją wiadomość tutaj", + "Common.define.chartData.textArea": "Obszar", + "Common.define.chartData.textBar": "Pasek", + "Common.define.chartData.textColumn": "Kolumna", + "Common.define.chartData.textLine": "Liniowy", + "Common.define.chartData.textPie": "Kołowe", + "Common.define.chartData.textPoint": "XY (Punktowy)", + "Common.define.chartData.textStock": "Zbiory", + "Common.define.chartData.textSurface": "Powierzchnia", + "Common.define.chartData.textColumnSpark": "Kolumna", + "Common.define.chartData.textWinLossSpark": "Wygrana/przegrana", + "Common.define.chartData.textLineSpark": "Wiersz", + "Common.define.chartData.textSparks": "Sparklines", "Common.UI.ComboBorderSize.txtNoBorders": "Bez krawędzi", "Common.UI.ComboBorderSizeEditable.txtNoBorders": "Bez krawędzi", "Common.UI.ComboDataView.emptyComboText": "Brak styli", @@ -793,50 +805,37 @@ "SSE.Views.ChartSettings.strSparkColor": "Kolor", "SSE.Views.ChartSettings.strTemplate": "Szablon", "SSE.Views.ChartSettings.textAdvanced": "Pokaż ustawienia zaawansowane", - "SSE.Views.ChartSettings.textArea": "Obszar", - "SSE.Views.ChartSettings.textBar": "Paskowy", "SSE.Views.ChartSettings.textBorderSizeErr": "Wprowadzona wartość jest nieprawidłowa.
Wprowadź wartość w zakresie od 0 do 1584 pt.", "SSE.Views.ChartSettings.textChartType": "Zmień typ wykresu", - "SSE.Views.ChartSettings.textColumn": "Kolumna", - "SSE.Views.ChartSettings.textColumnSpark": "Kolumna", "SSE.Views.ChartSettings.textEditData": "Edytuj datę i lokalizację", "SSE.Views.ChartSettings.textFirstPoint": "Pierwszy punkt", "SSE.Views.ChartSettings.textHeight": "Wysokość", "SSE.Views.ChartSettings.textHighPoint": "Punkt wysokości", "SSE.Views.ChartSettings.textKeepRatio": "Stałe proporcje", "SSE.Views.ChartSettings.textLastPoint": "Punkt końcowy", - "SSE.Views.ChartSettings.textLine": "Wiersz", - "SSE.Views.ChartSettings.textLineSpark": "Wiersz", "SSE.Views.ChartSettings.textLowPoint": "Najniższy punkt", "SSE.Views.ChartSettings.textMarkers": "Znaczniki", "SSE.Views.ChartSettings.textNegativePoint": "Punkt negatywny", "SSE.Views.ChartSettings.textNewColor": "Nowy niestandardowy kolor", - "SSE.Views.ChartSettings.textPie": "Kołowe", - "SSE.Views.ChartSettings.textPoint": "XY (Punktowy)", "SSE.Views.ChartSettings.textRanges": "Zakres danych", "SSE.Views.ChartSettings.textSelectData": "Wybierz dane", "SSE.Views.ChartSettings.textShow": "Pokaż", "SSE.Views.ChartSettings.textSize": "Rozmiar", - "SSE.Views.ChartSettings.textStock": "Zbiory", "SSE.Views.ChartSettings.textStyle": "Styl", - "SSE.Views.ChartSettings.textSurface": "Powierzchnia", "SSE.Views.ChartSettings.textType": "Typ", "SSE.Views.ChartSettings.textWidth": "Szerokość", - "SSE.Views.ChartSettings.textWinLossSpark": "Wygrana/przegrana", "SSE.Views.ChartSettingsDlg.errorMaxRows": "BŁĄD! Maksymalna liczba serii danych na wykresie wynosi 255", "SSE.Views.ChartSettingsDlg.errorStockChart": "Nieprawidłowa kolejność wierszy. Aby zbudować wykres akcji, umieść dane na arkuszu w następującej kolejności:
cena otwarcia, cena maksymalna, cena minimalna, cena zamknięcia.", "SSE.Views.ChartSettingsDlg.textAlt": "Tekst alternatywny", "SSE.Views.ChartSettingsDlg.textAltDescription": "Opis", "SSE.Views.ChartSettingsDlg.textAltTip": "Alternatywna prezentacja wizualnych informacji o obiektach, które będą czytane osobom z wadami wzroku lub zmysłu poznawczego, aby lepiej zrozumieć, jakie informacje znajdują się na obrazie, kształtach, wykresie lub tabeli.", "SSE.Views.ChartSettingsDlg.textAltTitle": "Tytuł", - "SSE.Views.ChartSettingsDlg.textArea": "Obszar", "SSE.Views.ChartSettingsDlg.textAuto": "Automatyczny", "SSE.Views.ChartSettingsDlg.textAutoEach": "Automatycznie dla każdego", "SSE.Views.ChartSettingsDlg.textAxisCrosses": "Krzywe osie", "SSE.Views.ChartSettingsDlg.textAxisOptions": "Opcje osi", "SSE.Views.ChartSettingsDlg.textAxisPos": "Pozycja osi", "SSE.Views.ChartSettingsDlg.textAxisSettings": "Ustawienia osi", - "SSE.Views.ChartSettingsDlg.textBar": "Paskowy", "SSE.Views.ChartSettingsDlg.textBetweenTickMarks": "Pomiędzy znakami Tick", "SSE.Views.ChartSettingsDlg.textBillions": "Miliardy", "SSE.Views.ChartSettingsDlg.textBottom": "Dół", @@ -844,8 +843,6 @@ "SSE.Views.ChartSettingsDlg.textCenter": "Środek", "SSE.Views.ChartSettingsDlg.textChartElementsLegend": "Elementy wykresu", "SSE.Views.ChartSettingsDlg.textChartTitle": "Tytuł wykresu", - "SSE.Views.ChartSettingsDlg.textColumn": "Kolumna", - "SSE.Views.ChartSettingsDlg.textColumnSpark": "Kolumna", "SSE.Views.ChartSettingsDlg.textCross": "Na skrzyżowaniu", "SSE.Views.ChartSettingsDlg.textCustom": "Niestandardowy", "SSE.Views.ChartSettingsDlg.textDataColumns": "w kolumnach", @@ -886,9 +883,7 @@ "SSE.Views.ChartSettingsDlg.textLegendPos": "Legenda", "SSE.Views.ChartSettingsDlg.textLegendRight": "Prawy", "SSE.Views.ChartSettingsDlg.textLegendTop": "Góra", - "SSE.Views.ChartSettingsDlg.textLine": "Wykres liniowy", "SSE.Views.ChartSettingsDlg.textLines": "Linie", - "SSE.Views.ChartSettingsDlg.textLineSpark": "Wiersz", "SSE.Views.ChartSettingsDlg.textLocationRange": "Zakres lokalizacji", "SSE.Views.ChartSettingsDlg.textLow": "Niski", "SSE.Views.ChartSettingsDlg.textMajor": "Główny", @@ -909,8 +904,6 @@ "SSE.Views.ChartSettingsDlg.textOut": "Wyjście", "SSE.Views.ChartSettingsDlg.textOuterTop": "Wierzchołek zewnętrzny", "SSE.Views.ChartSettingsDlg.textOverlay": "Nałożenie", - "SSE.Views.ChartSettingsDlg.textPie": "Kołowe", - "SSE.Views.ChartSettingsDlg.textPoint": "XY (Punktowy)", "SSE.Views.ChartSettingsDlg.textReverse": "Wartości w odwrotnej kolejności", "SSE.Views.ChartSettingsDlg.textReverseOrder": "Odwrotna kolejność", "SSE.Views.ChartSettingsDlg.textRight": "Prawy", @@ -931,10 +924,8 @@ "SSE.Views.ChartSettingsDlg.textSingle": "Pojedynczy Sparkline", "SSE.Views.ChartSettingsDlg.textSmooth": "Gładki", "SSE.Views.ChartSettingsDlg.textSparkRanges": "Sparkline Ranges", - "SSE.Views.ChartSettingsDlg.textStock": "Zbiory", "SSE.Views.ChartSettingsDlg.textStraight": "Prosty", "SSE.Views.ChartSettingsDlg.textStyle": "Styl", - "SSE.Views.ChartSettingsDlg.textSurface": "Powierzchnia", "SSE.Views.ChartSettingsDlg.textTenMillions": "10 000 000", "SSE.Views.ChartSettingsDlg.textTenThousands": "10 000", "SSE.Views.ChartSettingsDlg.textThousands": "Tysiące", @@ -951,7 +942,6 @@ "SSE.Views.ChartSettingsDlg.textVertAxis": "Oś pionowa", "SSE.Views.ChartSettingsDlg.textVertGrid": "Pionowe linie siatki", "SSE.Views.ChartSettingsDlg.textVertTitle": "Tytuł osi pionowej", - "SSE.Views.ChartSettingsDlg.textWinLossSpark": "Wygrana/przegrana", "SSE.Views.ChartSettingsDlg.textXAxisTitle": "Tytuł osi X", "SSE.Views.ChartSettingsDlg.textYAxisTitle": "Tytuł osi Y", "SSE.Views.ChartSettingsDlg.textZero": "Zero", @@ -1538,17 +1528,12 @@ "SSE.Views.Toolbar.textAlignRight": "Wyrównaj do prawej", "SSE.Views.Toolbar.textAlignTop": "Wyrównaj do góry", "SSE.Views.Toolbar.textAllBorders": "Wszystkie krawędzie", - "SSE.Views.Toolbar.textArea": "Obszar", - "SSE.Views.Toolbar.textBar": "Pasek", "SSE.Views.Toolbar.textBold": "Pogrubienie", "SSE.Views.Toolbar.textBordersColor": "Kolor obramowania", "SSE.Views.Toolbar.textBordersStyle": "Styl obramowania", "SSE.Views.Toolbar.textBottomBorders": "Dolne krawędzie", "SSE.Views.Toolbar.textCenterBorders": "Wewnątrz pionowych granic", - "SSE.Views.Toolbar.textCharts": "Wykresy", "SSE.Views.Toolbar.textClockwise": "Kąt w prawo", - "SSE.Views.Toolbar.textColumn": "Kolumna", - "SSE.Views.Toolbar.textColumnSpark": "Kolumna", "SSE.Views.Toolbar.textCounterCw": "Kąt w lewo", "SSE.Views.Toolbar.textDelLeft": "Przesuń komórki w lewo", "SSE.Views.Toolbar.textDelUp": "Przesuń komórki w górę", @@ -1562,23 +1547,16 @@ "SSE.Views.Toolbar.textInsRight": "Przesuń komórki w prawo", "SSE.Views.Toolbar.textItalic": "Kursywa", "SSE.Views.Toolbar.textLeftBorders": "Lewe krawędzie", - "SSE.Views.Toolbar.textLine": "Wiersz", - "SSE.Views.Toolbar.textLineSpark": "Wiersz", "SSE.Views.Toolbar.textMiddleBorders": "Wewnątrz poziomych granic", "SSE.Views.Toolbar.textMoreFormats": "Więcej formatów", "SSE.Views.Toolbar.textNewColor": "Nowy niestandardowy kolor", "SSE.Views.Toolbar.textNoBorders": "Bez krawędzi", "SSE.Views.Toolbar.textOutBorders": "Krawędzie zewnętrzne", - "SSE.Views.Toolbar.textPie": "Kołowe", - "SSE.Views.Toolbar.textPoint": "XY (Punktowy)", "SSE.Views.Toolbar.textPrint": "Drukuj", "SSE.Views.Toolbar.textPrintOptions": "Ustawienia drukowania", "SSE.Views.Toolbar.textRightBorders": "Prawe krawędzie", "SSE.Views.Toolbar.textRotateDown": "Obróć tekst w dół", "SSE.Views.Toolbar.textRotateUp": "Obróć tekst w górę", - "SSE.Views.Toolbar.textSparks": "Sparklines", - "SSE.Views.Toolbar.textStock": "Zbiory", - "SSE.Views.Toolbar.textSurface": "Powierzchnia", "SSE.Views.Toolbar.textTabCollaboration": "Współpraca", "SSE.Views.Toolbar.textTabFile": "Plik", "SSE.Views.Toolbar.textTabHome": "Narzędzia główne", @@ -1586,7 +1564,6 @@ "SSE.Views.Toolbar.textTabLayout": "Układ", "SSE.Views.Toolbar.textTopBorders": "Górne krawędzie", "SSE.Views.Toolbar.textUnderline": "Podkreśl", - "SSE.Views.Toolbar.textWinLossSpark": "Wygrana/przegrana", "SSE.Views.Toolbar.textZoom": "Powiększenie", "SSE.Views.Toolbar.tipAlignBottom": "Wyrównaj do dołu", "SSE.Views.Toolbar.tipAlignCenter": "Wyrównaj do środka", diff --git a/apps/spreadsheeteditor/main/locale/pt.json b/apps/spreadsheeteditor/main/locale/pt.json index 1083b085e..cb0105d67 100644 --- a/apps/spreadsheeteditor/main/locale/pt.json +++ b/apps/spreadsheeteditor/main/locale/pt.json @@ -2,6 +2,18 @@ "cancelButtonText": "Cancelar", "Common.Controllers.Chat.notcriticalErrorTitle": "Aviso", "Common.Controllers.Chat.textEnterMessage": "Inserir sua mensagem aqui", + "Common.define.chartData.textArea": "Área", + "Common.define.chartData.textBar": "Barra", + "Common.define.chartData.textColumn": "Coluna", + "Common.define.chartData.textLine": "Linha", + "Common.define.chartData.textPie": "Gráfico de pizza", + "Common.define.chartData.textPoint": "Gráfico de pontos", + "Common.define.chartData.textStock": "Gráfico de ações", + "Common.define.chartData.textSurface": "Superfície", + "Common.define.chartData.textColumnSpark": "Coluna", + "Common.define.chartData.textLineSpark": "Linha", + "Common.define.chartData.textWinLossSpark": "Ganhos/Perdas", + "Common.define.chartData.textSparks": "Minigráficos", "Common.UI.ComboBorderSize.txtNoBorders": "Sem bordas", "Common.UI.ComboBorderSizeEditable.txtNoBorders": "Sem bordas", "Common.UI.ComboDataView.emptyComboText": "Sem estilos", @@ -777,50 +789,37 @@ "SSE.Views.ChartSettings.strSparkColor": "Cor", "SSE.Views.ChartSettings.strTemplate": "Modelo", "SSE.Views.ChartSettings.textAdvanced": "Exibir configurações avançadas", - "SSE.Views.ChartSettings.textArea": "Gráfico de área", - "SSE.Views.ChartSettings.textBar": "Gráfico de Barras", "SSE.Views.ChartSettings.textBorderSizeErr": "O valor inserido está incorreto.
Insira um valor entre 0 pt e 1.584 pt.", "SSE.Views.ChartSettings.textChartType": "Alterar tipo de gráfico", - "SSE.Views.ChartSettings.textColumn": "Gráfico de coluna", - "SSE.Views.ChartSettings.textColumnSpark": "Coluna", "SSE.Views.ChartSettings.textEditData": "Editar dados", "SSE.Views.ChartSettings.textFirstPoint": "Primeiro ponto", "SSE.Views.ChartSettings.textHeight": "Altura", "SSE.Views.ChartSettings.textHighPoint": "Ponto alto", "SSE.Views.ChartSettings.textKeepRatio": "Proporções constantes", "SSE.Views.ChartSettings.textLastPoint": "Último ponto", - "SSE.Views.ChartSettings.textLine": "Gráfico de linha", - "SSE.Views.ChartSettings.textLineSpark": "Linha", "SSE.Views.ChartSettings.textLowPoint": "Ponto baixo", "SSE.Views.ChartSettings.textMarkers": "Marcadores", "SSE.Views.ChartSettings.textNegativePoint": "Ponto negativo", "SSE.Views.ChartSettings.textNewColor": "Adicionar nova cor personalizada", - "SSE.Views.ChartSettings.textPie": "Gráfico de pizza", - "SSE.Views.ChartSettings.textPoint": "Gráfico de pontos", "SSE.Views.ChartSettings.textRanges": "Intervalo de dados", "SSE.Views.ChartSettings.textSelectData": "Selecionar dados", "SSE.Views.ChartSettings.textShow": "Exibir", "SSE.Views.ChartSettings.textSize": "Tamanho", - "SSE.Views.ChartSettings.textStock": "Gráfico de ações", "SSE.Views.ChartSettings.textStyle": "Estilo", - "SSE.Views.ChartSettings.textSurface": "Superfície", "SSE.Views.ChartSettings.textType": "Tipo", "SSE.Views.ChartSettings.textWidth": "Largura", - "SSE.Views.ChartSettings.textWinLossSpark": "Ganhos/Perdas", "SSE.Views.ChartSettingsDlg.errorMaxRows": "ERRO! O número máximo de séries de dado por gráfico é 255", "SSE.Views.ChartSettingsDlg.errorStockChart": "Ordem da linha incorreta. Para criar um gráfico de ações coloque os dados na planilha na seguinte ordem:
preço de abertura, preço máx., preço mín., preço de fechamento.", "SSE.Views.ChartSettingsDlg.textAlt": "Texto Alternativo", "SSE.Views.ChartSettingsDlg.textAltDescription": "Descrição", "SSE.Views.ChartSettingsDlg.textAltTip": "A representação alternativa baseada em texto da informação visual do objeto, que será lida para as pessoas com deficiências visuais ou cognitivas para ajudá-las a entender melhor que informação, forma automática, gráfico ou tabela existe na imagem.", "SSE.Views.ChartSettingsDlg.textAltTitle": "Título", - "SSE.Views.ChartSettingsDlg.textArea": "Gráfico de área", "SSE.Views.ChartSettingsDlg.textAuto": "Automático", "SSE.Views.ChartSettingsDlg.textAutoEach": "Auto para cada", "SSE.Views.ChartSettingsDlg.textAxisCrosses": "Eixos cruzam", "SSE.Views.ChartSettingsDlg.textAxisOptions": "Opções de eixo", "SSE.Views.ChartSettingsDlg.textAxisPos": "Posição de eixos", "SSE.Views.ChartSettingsDlg.textAxisSettings": "Axis Settings", - "SSE.Views.ChartSettingsDlg.textBar": "Gráfico de Barras", "SSE.Views.ChartSettingsDlg.textBetweenTickMarks": "Entre marcas de escala", "SSE.Views.ChartSettingsDlg.textBillions": "Bilhões", "SSE.Views.ChartSettingsDlg.textBottom": "Inferior", @@ -828,8 +827,6 @@ "SSE.Views.ChartSettingsDlg.textCenter": "Centro", "SSE.Views.ChartSettingsDlg.textChartElementsLegend": "Elementos do gráfico e
Legenda do gráfico", "SSE.Views.ChartSettingsDlg.textChartTitle": "Título do gráfico", - "SSE.Views.ChartSettingsDlg.textColumn": "Gráfico de coluna", - "SSE.Views.ChartSettingsDlg.textColumnSpark": "Coluna", "SSE.Views.ChartSettingsDlg.textCross": "Cruz", "SSE.Views.ChartSettingsDlg.textCustom": "Personalizar", "SSE.Views.ChartSettingsDlg.textDataColumns": "em colunas", @@ -870,9 +867,7 @@ "SSE.Views.ChartSettingsDlg.textLegendPos": "Legenda", "SSE.Views.ChartSettingsDlg.textLegendRight": "Direita", "SSE.Views.ChartSettingsDlg.textLegendTop": "Parte superior", - "SSE.Views.ChartSettingsDlg.textLine": "Gráfico de linha", "SSE.Views.ChartSettingsDlg.textLines": "Linhas", - "SSE.Views.ChartSettingsDlg.textLineSpark": "Linha", "SSE.Views.ChartSettingsDlg.textLocationRange": "Intervalo de localização", "SSE.Views.ChartSettingsDlg.textLow": "Baixo", "SSE.Views.ChartSettingsDlg.textMajor": "Maior", @@ -893,8 +888,6 @@ "SSE.Views.ChartSettingsDlg.textOut": "Fora", "SSE.Views.ChartSettingsDlg.textOuterTop": "Fora do topo", "SSE.Views.ChartSettingsDlg.textOverlay": "Sobreposição", - "SSE.Views.ChartSettingsDlg.textPie": "Gráfico de pizza", - "SSE.Views.ChartSettingsDlg.textPoint": "Gráfico de pontos", "SSE.Views.ChartSettingsDlg.textReverse": "Valores na ordem reversa", "SSE.Views.ChartSettingsDlg.textReverseOrder": "Ordem reversa", "SSE.Views.ChartSettingsDlg.textRight": "Direita", @@ -915,10 +908,8 @@ "SSE.Views.ChartSettingsDlg.textSingle": "Minigráfico único", "SSE.Views.ChartSettingsDlg.textSmooth": "Suave", "SSE.Views.ChartSettingsDlg.textSparkRanges": "Variedade de minigráficos", - "SSE.Views.ChartSettingsDlg.textStock": "Gráfico de ações", "SSE.Views.ChartSettingsDlg.textStraight": "Reto", "SSE.Views.ChartSettingsDlg.textStyle": "Estilo", - "SSE.Views.ChartSettingsDlg.textSurface": "Superfície", "SSE.Views.ChartSettingsDlg.textTenMillions": "10.000.000 ", "SSE.Views.ChartSettingsDlg.textTenThousands": "10.000 ", "SSE.Views.ChartSettingsDlg.textThousands": "Milhares", @@ -935,7 +926,6 @@ "SSE.Views.ChartSettingsDlg.textVertAxis": "Eixo vertical", "SSE.Views.ChartSettingsDlg.textVertGrid": "Linhas de grade verticais", "SSE.Views.ChartSettingsDlg.textVertTitle": "Título do eixo vertical", - "SSE.Views.ChartSettingsDlg.textWinLossSpark": "Ganhos/Perdas", "SSE.Views.ChartSettingsDlg.textXAxisTitle": "Título do eixo X", "SSE.Views.ChartSettingsDlg.textYAxisTitle": "Título do eixo Y", "SSE.Views.ChartSettingsDlg.textZero": "Zero", @@ -1518,17 +1508,12 @@ "SSE.Views.Toolbar.textAlignRight": "Alinhar à direita", "SSE.Views.Toolbar.textAlignTop": "Alinhar à parte superior", "SSE.Views.Toolbar.textAllBorders": "Todas as bordas", - "SSE.Views.Toolbar.textArea": "Área", - "SSE.Views.Toolbar.textBar": "Barra", "SSE.Views.Toolbar.textBold": "Negrito", "SSE.Views.Toolbar.textBordersColor": "Cor da borda", "SSE.Views.Toolbar.textBordersStyle": "Estilo de borda", "SSE.Views.Toolbar.textBottomBorders": "Bordas inferiores", "SSE.Views.Toolbar.textCenterBorders": "Bordas verticais interiores", - "SSE.Views.Toolbar.textCharts": "Gráficos", "SSE.Views.Toolbar.textClockwise": "Ângulo no sentido horário", - "SSE.Views.Toolbar.textColumn": "Coluna", - "SSE.Views.Toolbar.textColumnSpark": "Coluna", "SSE.Views.Toolbar.textCounterCw": "Ângulo no sentido antihorário", "SSE.Views.Toolbar.textDelLeft": "Deslocar células para a esquerda", "SSE.Views.Toolbar.textDelUp": "Deslocar células para cima", @@ -1542,29 +1527,21 @@ "SSE.Views.Toolbar.textInsRight": "Deslocar células para a direita", "SSE.Views.Toolbar.textItalic": "Itálico", "SSE.Views.Toolbar.textLeftBorders": "Bordas esquerdas", - "SSE.Views.Toolbar.textLine": "Linha", - "SSE.Views.Toolbar.textLineSpark": "Linha", "SSE.Views.Toolbar.textMiddleBorders": "Bordas horizontais interiores", "SSE.Views.Toolbar.textMoreFormats": "Mais formatos", "SSE.Views.Toolbar.textNewColor": "Adicionar nova cor personalizada", "SSE.Views.Toolbar.textNoBorders": "Sem bordas", "SSE.Views.Toolbar.textOutBorders": "Bordas externas", - "SSE.Views.Toolbar.textPie": "Gráfico de pizza", - "SSE.Views.Toolbar.textPoint": "XY (Dispersão)", "SSE.Views.Toolbar.textPrint": "Imprimir", "SSE.Views.Toolbar.textPrintOptions": "Configurações de impressão", "SSE.Views.Toolbar.textRightBorders": "Bordas direitas", "SSE.Views.Toolbar.textRotateDown": "Girar Texto para Baixo", "SSE.Views.Toolbar.textRotateUp": "Girar Texto para Cima", - "SSE.Views.Toolbar.textSparks": "Minigráficos", - "SSE.Views.Toolbar.textStock": "Ações", - "SSE.Views.Toolbar.textSurface": "Superfície", "SSE.Views.Toolbar.textTabFile": "Arquivo", "SSE.Views.Toolbar.textTabHome": "Página Inicial", "SSE.Views.Toolbar.textTabInsert": "Inserir", "SSE.Views.Toolbar.textTopBorders": "Bordas superiores", "SSE.Views.Toolbar.textUnderline": "Sublinhado", - "SSE.Views.Toolbar.textWinLossSpark": "Ganhos/Perdas", "SSE.Views.Toolbar.textZoom": "Zoom", "SSE.Views.Toolbar.tipAlignBottom": "Alinhar à parte inferior", "SSE.Views.Toolbar.tipAlignCenter": "Alinhar ao centro", diff --git a/apps/spreadsheeteditor/main/locale/ru.json b/apps/spreadsheeteditor/main/locale/ru.json index 60fb87fc5..a9d76e45f 100644 --- a/apps/spreadsheeteditor/main/locale/ru.json +++ b/apps/spreadsheeteditor/main/locale/ru.json @@ -6,14 +6,14 @@ "Common.define.chartData.textBar": "Линейчатая", "Common.define.chartData.textCharts": "Диаграммы", "Common.define.chartData.textColumn": "Гистограмма", + "Common.define.chartData.textColumnSpark": "Гистограмма", "Common.define.chartData.textLine": "График", + "Common.define.chartData.textLineSpark": "График", "Common.define.chartData.textPie": "Круговая", "Common.define.chartData.textPoint": "Точечная", + "Common.define.chartData.textSparks": "Спарклайны", "Common.define.chartData.textStock": "Биржевая", "Common.define.chartData.textSurface": "Поверхность", - "Common.define.chartData.textSparks": "Спарклайны", - "Common.define.chartData.textColumnSpark": "Гистограмма", - "Common.define.chartData.textLineSpark": "График", "Common.define.chartData.textWinLossSpark": "Выигрыш/проигрыш", "Common.UI.ComboBorderSize.txtNoBorders": "Без границ", "Common.UI.ComboBorderSizeEditable.txtNoBorders": "Без границ", @@ -159,6 +159,8 @@ "Common.Views.ReviewChanges.strStrictDesc": "Используйте кнопку 'Сохранить' для синхронизации изменений, вносимых вами и другими пользователями.", "Common.Views.ReviewChanges.tipAcceptCurrent": "Принять текущее изменение", "Common.Views.ReviewChanges.tipCoAuthMode": "Задать режим совместного редактирования", + "Common.Views.ReviewChanges.tipCommentRem": "Удалить комментарии", + "Common.Views.ReviewChanges.tipCommentRemCurrent": "Удалить текущие комментарии", "Common.Views.ReviewChanges.tipHistory": "Показать историю версий", "Common.Views.ReviewChanges.tipRejectCurrent": "Отклонить текущее изменение", "Common.Views.ReviewChanges.tipReview": "Отслеживать изменения", @@ -173,6 +175,11 @@ "Common.Views.ReviewChanges.txtChat": "Чат", "Common.Views.ReviewChanges.txtClose": "Закрыть", "Common.Views.ReviewChanges.txtCoAuthMode": "Режим совместного редактирования", + "Common.Views.ReviewChanges.txtCommentRemAll": "Удалить все комментарии", + "Common.Views.ReviewChanges.txtCommentRemCurrent": "Удалить текущие комментарии", + "Common.Views.ReviewChanges.txtCommentRemMy": "Удалить мои комментарии", + "Common.Views.ReviewChanges.txtCommentRemMyCurrent": "Удалить мои текущие комментарии", + "Common.Views.ReviewChanges.txtCommentRemove": "Удалить", "Common.Views.ReviewChanges.txtDocLang": "Язык", "Common.Views.ReviewChanges.txtFinal": "Все изменения приняты (просмотр)", "Common.Views.ReviewChanges.txtFinalCap": "Измененный документ", @@ -227,6 +234,11 @@ "Common.Views.SignSettingsDialog.textShowDate": "Показывать дату подписи в строке подписи", "Common.Views.SignSettingsDialog.textTitle": "Настройка подписи", "Common.Views.SignSettingsDialog.txtEmpty": "Это поле необходимо заполнить", + "Common.Views.SymbolTableDialog.textCode": "Код знака из Юникод (шестн.)", + "Common.Views.SymbolTableDialog.textFont": "Шрифт", + "Common.Views.SymbolTableDialog.textRange": "Набор", + "Common.Views.SymbolTableDialog.textRecent": "Ранее использовавшиеся символы", + "Common.Views.SymbolTableDialog.textTitle": "Символ", "SSE.Controllers.DataTab.textWizard": "Текст по столбцам", "SSE.Controllers.DocumentHolder.alignmentText": "Выравнивание", "SSE.Controllers.DocumentHolder.centerText": "По центру", @@ -470,6 +482,7 @@ "SSE.Controllers.Main.errorTokenExpire": "Истек срок действия токена безопасности документа.
Пожалуйста, обратитесь к администратору Сервера документов.", "SSE.Controllers.Main.errorUnexpectedGuid": "Внешняя ошибка.
Непредвиденный идентификатор GUID. Если ошибка повторяется, пожалуйста, обратитесь в службу поддержки.", "SSE.Controllers.Main.errorUpdateVersion": "Версия файла была изменена. Страница будет перезагружена.", + "SSE.Controllers.Main.errorUpdateVersionOnDisconnect": "Подключение к Интернету было восстановлено, и версия файла изменилась.
Прежде чем продолжить работу, надо скачать файл или скопировать его содержимое, чтобы обеспечить сохранность данных, а затем перезагрузить страницу.", "SSE.Controllers.Main.errorUserDrop": "В настоящий момент файл недоступен.", "SSE.Controllers.Main.errorUsersExceed": "Превышено количество пользователей, разрешенных согласно тарифному плану", "SSE.Controllers.Main.errorViewerDisconnect": "Подключение прервано. Вы по-прежнему можете просматривать документ,
но не сможете скачать или напечатать его до восстановления подключения и обновления страницы.", @@ -773,6 +786,7 @@ "SSE.Controllers.Toolbar.textFontSizeErr": "Введенное значение некорректно.
Введите числовое значение от 1 до 409", "SSE.Controllers.Toolbar.textFraction": "Дроби", "SSE.Controllers.Toolbar.textFunction": "Функции", + "SSE.Controllers.Toolbar.textInsert": "Вставить", "SSE.Controllers.Toolbar.textIntegral": "Интегралы", "SSE.Controllers.Toolbar.textLargeOperator": "Крупные операторы", "SSE.Controllers.Toolbar.textLimitAndLog": "Пределы и логарифмы", @@ -1191,36 +1205,25 @@ "SSE.Views.ChartSettings.strSparkColor": "Цвет", "SSE.Views.ChartSettings.strTemplate": "Шаблон", "SSE.Views.ChartSettings.textAdvanced": "Дополнительные параметры", - "SSE.Views.ChartSettings.textArea": "С областями", - "SSE.Views.ChartSettings.textBar": "Линейчатая", "SSE.Views.ChartSettings.textBorderSizeErr": "Введено некорректное значение.
Пожалуйста, введите значение от 0 до 1584 пунктов.", "SSE.Views.ChartSettings.textChartType": "Изменить тип диаграммы", - "SSE.Views.ChartSettings.textColumn": "Гистограмма", - "SSE.Views.ChartSettings.textColumnSpark": "Гистограмма", "SSE.Views.ChartSettings.textEditData": "Изменить данные и место", "SSE.Views.ChartSettings.textFirstPoint": "Первая точка", "SSE.Views.ChartSettings.textHeight": "Высота", "SSE.Views.ChartSettings.textHighPoint": "Максимальная точка", "SSE.Views.ChartSettings.textKeepRatio": "Сохранять пропорции", "SSE.Views.ChartSettings.textLastPoint": "Последняя точка", - "SSE.Views.ChartSettings.textLine": "График", - "SSE.Views.ChartSettings.textLineSpark": "График", "SSE.Views.ChartSettings.textLowPoint": "Минимальная точка", "SSE.Views.ChartSettings.textMarkers": "Маркеры", "SSE.Views.ChartSettings.textNegativePoint": "Отрицательная точка", "SSE.Views.ChartSettings.textNewColor": "Пользовательский цвет", - "SSE.Views.ChartSettings.textPie": "Круговая", - "SSE.Views.ChartSettings.textPoint": "Точечная", "SSE.Views.ChartSettings.textRanges": "Диапазон данных", "SSE.Views.ChartSettings.textSelectData": "Выбор данных", "SSE.Views.ChartSettings.textShow": "Показать", "SSE.Views.ChartSettings.textSize": "Размер", - "SSE.Views.ChartSettings.textStock": "Биржевая", "SSE.Views.ChartSettings.textStyle": "Стиль", - "SSE.Views.ChartSettings.textSurface": "Поверхность", "SSE.Views.ChartSettings.textType": "Тип", "SSE.Views.ChartSettings.textWidth": "Ширина", - "SSE.Views.ChartSettings.textWinLossSpark": "Выигрыш/проигрыш", "SSE.Views.ChartSettingsDlg.errorMaxPoints": "ОШИБКА! Максимальное число точек в серии для диаграммы составляет 4096.", "SSE.Views.ChartSettingsDlg.errorMaxRows": "ОШИБКА! Максимальное число рядов данных для одной диаграммы - 255", "SSE.Views.ChartSettingsDlg.errorStockChart": "Неверный порядок строк. Чтобы создать биржевую диаграмму, расположите данные на листе в следующем порядке:
цена открытия, максимальная цена, минимальная цена, цена закрытия.", @@ -1229,14 +1232,12 @@ "SSE.Views.ChartSettingsDlg.textAltDescription": "Описание", "SSE.Views.ChartSettingsDlg.textAltTip": "Альтернативное текстовое представление информации о визуальном объекте, которое будет зачитываться для людей с нарушениями зрения или когнитивными нарушениями, чтобы помочь им лучше понять, какую информацию содержит изображение, автофигура, диаграмма или таблица.", "SSE.Views.ChartSettingsDlg.textAltTitle": "Заголовок", - "SSE.Views.ChartSettingsDlg.textArea": "С областями", "SSE.Views.ChartSettingsDlg.textAuto": "Авто", "SSE.Views.ChartSettingsDlg.textAutoEach": "Автоматическое для каждого", "SSE.Views.ChartSettingsDlg.textAxisCrosses": "Пересечение с осью", "SSE.Views.ChartSettingsDlg.textAxisOptions": "Параметры оси", "SSE.Views.ChartSettingsDlg.textAxisPos": "Положение оси", "SSE.Views.ChartSettingsDlg.textAxisSettings": "Параметры оси", - "SSE.Views.ChartSettingsDlg.textBar": "Линейчатая", "SSE.Views.ChartSettingsDlg.textBetweenTickMarks": "Между делениями", "SSE.Views.ChartSettingsDlg.textBillions": "Миллиарды", "SSE.Views.ChartSettingsDlg.textBottom": "Снизу", @@ -1244,8 +1245,6 @@ "SSE.Views.ChartSettingsDlg.textCenter": "По центру", "SSE.Views.ChartSettingsDlg.textChartElementsLegend": "Элементы диаграммы и
легенда диаграммы", "SSE.Views.ChartSettingsDlg.textChartTitle": "Заголовок диаграммы", - "SSE.Views.ChartSettingsDlg.textColumn": "Гистограмма", - "SSE.Views.ChartSettingsDlg.textColumnSpark": "Гистограмма", "SSE.Views.ChartSettingsDlg.textCross": "На пересечении", "SSE.Views.ChartSettingsDlg.textCustom": "Пользовательский", "SSE.Views.ChartSettingsDlg.textDataColumns": "в столбцах", @@ -1286,9 +1285,7 @@ "SSE.Views.ChartSettingsDlg.textLegendPos": "Условные обозначения", "SSE.Views.ChartSettingsDlg.textLegendRight": "Справа", "SSE.Views.ChartSettingsDlg.textLegendTop": "Сверху", - "SSE.Views.ChartSettingsDlg.textLine": "График", "SSE.Views.ChartSettingsDlg.textLines": "Линии", - "SSE.Views.ChartSettingsDlg.textLineSpark": "График", "SSE.Views.ChartSettingsDlg.textLocationRange": "Диапазон расположения:", "SSE.Views.ChartSettingsDlg.textLow": "Ниже", "SSE.Views.ChartSettingsDlg.textMajor": "Основные", @@ -1310,8 +1307,6 @@ "SSE.Views.ChartSettingsDlg.textOut": "Снаружи", "SSE.Views.ChartSettingsDlg.textOuterTop": "Снаружи сверху", "SSE.Views.ChartSettingsDlg.textOverlay": "Наложение", - "SSE.Views.ChartSettingsDlg.textPie": "Круговая", - "SSE.Views.ChartSettingsDlg.textPoint": "Точечная", "SSE.Views.ChartSettingsDlg.textReverse": "Значения в обратном порядке", "SSE.Views.ChartSettingsDlg.textReverseOrder": "В обратном порядке", "SSE.Views.ChartSettingsDlg.textRight": "Справа", @@ -1333,10 +1328,8 @@ "SSE.Views.ChartSettingsDlg.textSmooth": "Сглаженные", "SSE.Views.ChartSettingsDlg.textSnap": "Привязка ячейки", "SSE.Views.ChartSettingsDlg.textSparkRanges": "Диапазоны спарклайнов", - "SSE.Views.ChartSettingsDlg.textStock": "Биржевая", "SSE.Views.ChartSettingsDlg.textStraight": "Прямые", "SSE.Views.ChartSettingsDlg.textStyle": "Стиль", - "SSE.Views.ChartSettingsDlg.textSurface": "Поверхность", "SSE.Views.ChartSettingsDlg.textTenMillions": "10 000 000", "SSE.Views.ChartSettingsDlg.textTenThousands": "10 000", "SSE.Views.ChartSettingsDlg.textThousands": "Тысячи", @@ -1354,7 +1347,6 @@ "SSE.Views.ChartSettingsDlg.textVertAxis": "Вертикальная ось", "SSE.Views.ChartSettingsDlg.textVertGrid": "Вертикальные линии", "SSE.Views.ChartSettingsDlg.textVertTitle": "Название вертикальной оси", - "SSE.Views.ChartSettingsDlg.textWinLossSpark": "Выигрыш/проигрыш", "SSE.Views.ChartSettingsDlg.textXAxisTitle": "Название оси X", "SSE.Views.ChartSettingsDlg.textYAxisTitle": "Название оси Y", "SSE.Views.ChartSettingsDlg.textZero": "Нулевые значения", @@ -2212,8 +2204,10 @@ "SSE.Views.TextArtSettings.txtNoBorders": "Без обводки", "SSE.Views.TextArtSettings.txtPapyrus": "Папирус", "SSE.Views.TextArtSettings.txtWood": "Дерево", + "SSE.Views.Toolbar.capBtnAddComment": "Добавить комментарий", "SSE.Views.Toolbar.capBtnComment": "Комментарий", "SSE.Views.Toolbar.capBtnInsHeader": "Колонтитулы", + "SSE.Views.Toolbar.capBtnInsSymbol": "Символ", "SSE.Views.Toolbar.capBtnMargins": "Поля", "SSE.Views.Toolbar.capBtnPageOrient": "Ориентация", "SSE.Views.Toolbar.capBtnPageSize": "Размер", @@ -2242,20 +2236,15 @@ "SSE.Views.Toolbar.textAlignRight": "По правому краю", "SSE.Views.Toolbar.textAlignTop": "По верхнему краю", "SSE.Views.Toolbar.textAllBorders": "Все границы", - "SSE.Views.Toolbar.textArea": "С областями", "SSE.Views.Toolbar.textAuto": "Авто", - "SSE.Views.Toolbar.textBar": "Линейчатая", "SSE.Views.Toolbar.textBold": "Полужирный", "SSE.Views.Toolbar.textBordersColor": "Цвет границ", "SSE.Views.Toolbar.textBordersStyle": "Стиль границ", "SSE.Views.Toolbar.textBottom": "Нижнее: ", "SSE.Views.Toolbar.textBottomBorders": "Нижние границы", "SSE.Views.Toolbar.textCenterBorders": "Внутренние вертикальные границы", - "SSE.Views.Toolbar.textCharts": "Диаграммы", "SSE.Views.Toolbar.textClearPrintArea": "Очистить область печати", "SSE.Views.Toolbar.textClockwise": "Текст по часовой стрелке", - "SSE.Views.Toolbar.textColumn": "Гистограмма", - "SSE.Views.Toolbar.textColumnSpark": "Гистограмма", "SSE.Views.Toolbar.textCounterCw": "Текст против часовой стрелки", "SSE.Views.Toolbar.textDelLeft": "Ячейки со сдвигом влево", "SSE.Views.Toolbar.textDelUp": "Ячейки со сдвигом вверх", @@ -2273,8 +2262,6 @@ "SSE.Views.Toolbar.textLandscape": "Альбомная", "SSE.Views.Toolbar.textLeft": "Левое: ", "SSE.Views.Toolbar.textLeftBorders": "Левые границы", - "SSE.Views.Toolbar.textLine": "График", - "SSE.Views.Toolbar.textLineSpark": "График", "SSE.Views.Toolbar.textManyPages": "страниц", "SSE.Views.Toolbar.textMarginsLast": "Последние настраиваемые", "SSE.Views.Toolbar.textMarginsNarrow": "Узкие", @@ -2288,8 +2275,6 @@ "SSE.Views.Toolbar.textOnePage": "страница", "SSE.Views.Toolbar.textOutBorders": "Внешние границы", "SSE.Views.Toolbar.textPageMarginsCustom": "Настраиваемые поля", - "SSE.Views.Toolbar.textPie": "Круговая", - "SSE.Views.Toolbar.textPoint": "Точечная", "SSE.Views.Toolbar.textPortrait": "Книжная", "SSE.Views.Toolbar.textPrint": "Печать", "SSE.Views.Toolbar.textPrintOptions": "Параметры печати", @@ -2298,13 +2283,10 @@ "SSE.Views.Toolbar.textRotateDown": "Повернуть текст вниз", "SSE.Views.Toolbar.textRotateUp": "Повернуть текст вверх", "SSE.Views.Toolbar.textSetPrintArea": "Задать область печати", - "SSE.Views.Toolbar.textSparks": "Спарклайны", - "SSE.Views.Toolbar.textStock": "Биржевая", "SSE.Views.Toolbar.textStrikeout": "Зачеркнутый", "SSE.Views.Toolbar.textSubscript": "Подстрочные знаки", "SSE.Views.Toolbar.textSubSuperscript": "Подстрочные/надстрочные знаки", "SSE.Views.Toolbar.textSuperscript": "Надстрочные знаки", - "SSE.Views.Toolbar.textSurface": "Поверхность", "SSE.Views.Toolbar.textTabCollaboration": "Совместная работа", "SSE.Views.Toolbar.textTabData": "Данные", "SSE.Views.Toolbar.textTabFile": "Файл", @@ -2317,7 +2299,6 @@ "SSE.Views.Toolbar.textTopBorders": "Верхние границы", "SSE.Views.Toolbar.textUnderline": "Подчеркнутый", "SSE.Views.Toolbar.textWidth": "Ширина", - "SSE.Views.Toolbar.textWinLossSpark": "Выигрыш/проигрыш", "SSE.Views.Toolbar.textZoom": "Масштаб", "SSE.Views.Toolbar.tipAlignBottom": "Выровнять по нижнему краю", "SSE.Views.Toolbar.tipAlignCenter": "Выровнять по центру", @@ -2358,6 +2339,7 @@ "SSE.Views.Toolbar.tipInsertImage": "Вставить изображение", "SSE.Views.Toolbar.tipInsertOpt": "Вставить ячейки", "SSE.Views.Toolbar.tipInsertShape": "Вставить автофигуру", + "SSE.Views.Toolbar.tipInsertSymbol": "Вставить символ", "SSE.Views.Toolbar.tipInsertTable": "Вставить таблицу", "SSE.Views.Toolbar.tipInsertText": "Вставить надпись", "SSE.Views.Toolbar.tipInsertTextart": "Вставить объект Text Art", diff --git a/apps/spreadsheeteditor/main/locale/sk.json b/apps/spreadsheeteditor/main/locale/sk.json index cb41aba3c..196d33cd6 100644 --- a/apps/spreadsheeteditor/main/locale/sk.json +++ b/apps/spreadsheeteditor/main/locale/sk.json @@ -2,6 +2,18 @@ "cancelButtonText": "Zrušiť", "Common.Controllers.Chat.notcriticalErrorTitle": "Upozornenie", "Common.Controllers.Chat.textEnterMessage": "Zadať svoju správu tu", + "Common.define.chartData.textArea": "Plošný graf", + "Common.define.chartData.textBar": "Pruhový graf", + "Common.define.chartData.textColumn": "Stĺpec", + "Common.define.chartData.textLine": "Čiara/líniový graf", + "Common.define.chartData.textPie": "Koláčový graf", + "Common.define.chartData.textPoint": "Bodový graf", + "Common.define.chartData.textStock": "Akcie/burzový graf", + "Common.define.chartData.textSurface": "Povrch", + "Common.define.chartData.textColumnSpark": "Stĺpec", + "Common.define.chartData.textLineSpark": "Čiara", + "Common.define.chartData.textWinLossSpark": "Zisk/strata", + "Common.define.chartData.textSparks": "Sparklines", "Common.UI.ComboBorderSize.txtNoBorders": "Bez orámovania", "Common.UI.ComboBorderSizeEditable.txtNoBorders": "Bez orámovania", "Common.UI.ComboDataView.emptyComboText": "Žiadne štýly", @@ -797,50 +809,37 @@ "SSE.Views.ChartSettings.strSparkColor": "Farba", "SSE.Views.ChartSettings.strTemplate": "Šablóna", "SSE.Views.ChartSettings.textAdvanced": "Zobraziť pokročilé nastavenia", - "SSE.Views.ChartSettings.textArea": "Plošný graf", - "SSE.Views.ChartSettings.textBar": "Pruhový graf", "SSE.Views.ChartSettings.textBorderSizeErr": "Zadaná hodnota je nesprávna.
Prosím, zadajte hodnotu medzi 0 pt a 1584 pt.", "SSE.Views.ChartSettings.textChartType": "Zmeniť typ grafu", - "SSE.Views.ChartSettings.textColumn": "Stĺpec", - "SSE.Views.ChartSettings.textColumnSpark": "Stĺpec", "SSE.Views.ChartSettings.textEditData": "Upraviť údaje a umiestnenie", "SSE.Views.ChartSettings.textFirstPoint": "Prvý bod", "SSE.Views.ChartSettings.textHeight": "Výška", "SSE.Views.ChartSettings.textHighPoint": "Vysoký bod", "SSE.Views.ChartSettings.textKeepRatio": "Konštantné rozmery", "SSE.Views.ChartSettings.textLastPoint": "Posledný bod", - "SSE.Views.ChartSettings.textLine": "Čiara", - "SSE.Views.ChartSettings.textLineSpark": "Čiara", "SSE.Views.ChartSettings.textLowPoint": "Nízky bod", "SSE.Views.ChartSettings.textMarkers": "Značky", "SSE.Views.ChartSettings.textNegativePoint": "Záporný bod", "SSE.Views.ChartSettings.textNewColor": "Pridať novú vlastnú farbu", - "SSE.Views.ChartSettings.textPie": "Koláčový graf", - "SSE.Views.ChartSettings.textPoint": "Bodový graf", "SSE.Views.ChartSettings.textRanges": "Rozsah údajov", "SSE.Views.ChartSettings.textSelectData": "Vybrať údaje", "SSE.Views.ChartSettings.textShow": "Zobraziť", "SSE.Views.ChartSettings.textSize": "Veľkosť", - "SSE.Views.ChartSettings.textStock": "Akcie/burzový graf", "SSE.Views.ChartSettings.textStyle": "Štýl", - "SSE.Views.ChartSettings.textSurface": "Povrch", "SSE.Views.ChartSettings.textType": "Typ", "SSE.Views.ChartSettings.textWidth": "Šírka", - "SSE.Views.ChartSettings.textWinLossSpark": "Zisk/strata", "SSE.Views.ChartSettingsDlg.errorMaxRows": "CHYBA! Maximálny počet dátových radov na graf je 255", "SSE.Views.ChartSettingsDlg.errorStockChart": "Nesprávne poradie riadkov. Ak chcete vytvoriť burzový graf, umiestnite údaje na hárok v nasledujúcom poradí:
začiatočná cena, max cena, min cena, konečná cena.", "SSE.Views.ChartSettingsDlg.textAlt": "Alternatívny text", "SSE.Views.ChartSettingsDlg.textAltDescription": "Popis", "SSE.Views.ChartSettingsDlg.textAltTip": "Alternatívne textové zobrazenie informácií o vizuálnych objektoch, ktoré sa prečítajú ľuďom s poruchou videnia alebo kognitívnymi poruchami, aby sa im pomohlo lepšie porozumieť, aké informácie sú na obrázku, automatickom tvarovaní, grafe alebo tabuľke. ", "SSE.Views.ChartSettingsDlg.textAltTitle": "Názov", - "SSE.Views.ChartSettingsDlg.textArea": "Plošný graf", "SSE.Views.ChartSettingsDlg.textAuto": "Automaticky", "SSE.Views.ChartSettingsDlg.textAutoEach": "Automaticky pre každé", "SSE.Views.ChartSettingsDlg.textAxisCrosses": "Kríženie os", "SSE.Views.ChartSettingsDlg.textAxisOptions": "Možnosti osi", "SSE.Views.ChartSettingsDlg.textAxisPos": "Umiestnenie osi", "SSE.Views.ChartSettingsDlg.textAxisSettings": "Nastavenia osi", - "SSE.Views.ChartSettingsDlg.textBar": "Vodorovná čiarka", "SSE.Views.ChartSettingsDlg.textBetweenTickMarks": "Medzi značkami rozsahu", "SSE.Views.ChartSettingsDlg.textBillions": "Miliardy", "SSE.Views.ChartSettingsDlg.textBottom": "Dole", @@ -848,8 +847,6 @@ "SSE.Views.ChartSettingsDlg.textCenter": "Stred", "SSE.Views.ChartSettingsDlg.textChartElementsLegend": "Elementy grafu &
Legenda grafu", "SSE.Views.ChartSettingsDlg.textChartTitle": "Názov grafu", - "SSE.Views.ChartSettingsDlg.textColumn": "Stĺpec", - "SSE.Views.ChartSettingsDlg.textColumnSpark": "Stĺpec", "SSE.Views.ChartSettingsDlg.textCross": "Pretínať", "SSE.Views.ChartSettingsDlg.textCustom": "Vlastný", "SSE.Views.ChartSettingsDlg.textDataColumns": "V stĺpcoch", @@ -890,9 +887,7 @@ "SSE.Views.ChartSettingsDlg.textLegendPos": "Legenda", "SSE.Views.ChartSettingsDlg.textLegendRight": "Vpravo", "SSE.Views.ChartSettingsDlg.textLegendTop": "Hore", - "SSE.Views.ChartSettingsDlg.textLine": "Čiarový graf", "SSE.Views.ChartSettingsDlg.textLines": "Čiary", - "SSE.Views.ChartSettingsDlg.textLineSpark": "Čiara", "SSE.Views.ChartSettingsDlg.textLocationRange": "Rozsah umiestnenia", "SSE.Views.ChartSettingsDlg.textLow": "Nízko", "SSE.Views.ChartSettingsDlg.textMajor": "Hlavný", @@ -913,8 +908,6 @@ "SSE.Views.ChartSettingsDlg.textOut": "Von", "SSE.Views.ChartSettingsDlg.textOuterTop": "Mimo hore", "SSE.Views.ChartSettingsDlg.textOverlay": "Prekrytie", - "SSE.Views.ChartSettingsDlg.textPie": "Koláčový graf", - "SSE.Views.ChartSettingsDlg.textPoint": "Bodový graf", "SSE.Views.ChartSettingsDlg.textReverse": "Hodnoty v opačnom poradí", "SSE.Views.ChartSettingsDlg.textReverseOrder": "Obrátené poradie", "SSE.Views.ChartSettingsDlg.textRight": "Vpravo", @@ -935,10 +928,8 @@ "SSE.Views.ChartSettingsDlg.textSingle": "Jednoduchý Sparkline", "SSE.Views.ChartSettingsDlg.textSmooth": "Plynulý", "SSE.Views.ChartSettingsDlg.textSparkRanges": "Sparkline - Rozsahy", - "SSE.Views.ChartSettingsDlg.textStock": "Akcie/burzový graf", "SSE.Views.ChartSettingsDlg.textStraight": "Priamy/rovný", "SSE.Views.ChartSettingsDlg.textStyle": "Štýl", - "SSE.Views.ChartSettingsDlg.textSurface": "Povrch", "SSE.Views.ChartSettingsDlg.textTenMillions": "10 000 000", "SSE.Views.ChartSettingsDlg.textTenThousands": "10 000", "SSE.Views.ChartSettingsDlg.textThousands": "Tisíce", @@ -955,7 +946,6 @@ "SSE.Views.ChartSettingsDlg.textVertAxis": "Vertikálna os", "SSE.Views.ChartSettingsDlg.textVertGrid": "Vertikálne mriežky", "SSE.Views.ChartSettingsDlg.textVertTitle": "Názov vertikálnej osi", - "SSE.Views.ChartSettingsDlg.textWinLossSpark": "Zisk/strata", "SSE.Views.ChartSettingsDlg.textXAxisTitle": "Názov osi X", "SSE.Views.ChartSettingsDlg.textYAxisTitle": "Názov osi Y", "SSE.Views.ChartSettingsDlg.textZero": "Nula", @@ -1548,17 +1538,12 @@ "SSE.Views.Toolbar.textAlignRight": "Zarovnať doprava", "SSE.Views.Toolbar.textAlignTop": "Zarovnať nahor", "SSE.Views.Toolbar.textAllBorders": "Všetky orámovania", - "SSE.Views.Toolbar.textArea": "Plošný graf", - "SSE.Views.Toolbar.textBar": "Pruhový graf", "SSE.Views.Toolbar.textBold": "Tučné", "SSE.Views.Toolbar.textBordersColor": "Farba orámovania", "SSE.Views.Toolbar.textBordersStyle": "Štýl orámovania", "SSE.Views.Toolbar.textBottomBorders": "Spodné orámovanie", "SSE.Views.Toolbar.textCenterBorders": "Vnútorné vertikálne orámovanie", - "SSE.Views.Toolbar.textCharts": "Grafy", "SSE.Views.Toolbar.textClockwise": "Otočiť v smere hodinových ručičiek", - "SSE.Views.Toolbar.textColumn": "Stĺpec", - "SSE.Views.Toolbar.textColumnSpark": "Stĺpec", "SSE.Views.Toolbar.textCounterCw": "Otočiť proti smeru hodinových ručičiek", "SSE.Views.Toolbar.textDelLeft": "Posunúť bunky vľavo", "SSE.Views.Toolbar.textDelUp": "Posunúť bunky hore", @@ -1572,31 +1557,23 @@ "SSE.Views.Toolbar.textInsRight": "Posunúť bunky vpravo", "SSE.Views.Toolbar.textItalic": "Kurzíva", "SSE.Views.Toolbar.textLeftBorders": "Orámovanie vľavo", - "SSE.Views.Toolbar.textLine": "Čiara", - "SSE.Views.Toolbar.textLineSpark": "Čiara", "SSE.Views.Toolbar.textMiddleBorders": "Vnútorné horizontálne orámovanie", "SSE.Views.Toolbar.textMoreFormats": "Ďalšie formáty", "SSE.Views.Toolbar.textNewColor": "Pridať novú vlastnú farbu", "SSE.Views.Toolbar.textNoBorders": "Bez orámovania", "SSE.Views.Toolbar.textOutBorders": "Vonkajšie orámovanie", - "SSE.Views.Toolbar.textPie": "Koláčový graf", - "SSE.Views.Toolbar.textPoint": "Bodový graf", "SSE.Views.Toolbar.textPrint": "Tlačiť", "SSE.Views.Toolbar.textPrintOptions": "Nastavenia tlače", "SSE.Views.Toolbar.textRightBorders": "Orámovanie vpravo", "SSE.Views.Toolbar.textRotateDown": "Otočiť text nadol", "SSE.Views.Toolbar.textRotateUp": "Otočiť text nahor", - "SSE.Views.Toolbar.textSparks": "Sparklines", - "SSE.Views.Toolbar.textStock": "Akcie/burzový graf", "SSE.Views.Toolbar.textSubscript": "Dolný index", - "SSE.Views.Toolbar.textSurface": "Povrch", "SSE.Views.Toolbar.textTabCollaboration": "Spolupráca", "SSE.Views.Toolbar.textTabFile": "Súbor", "SSE.Views.Toolbar.textTabHome": "Hlavná stránka", "SSE.Views.Toolbar.textTabInsert": "Vložiť", "SSE.Views.Toolbar.textTopBorders": "Horné orámovanie", "SSE.Views.Toolbar.textUnderline": "Podčiarknuť", - "SSE.Views.Toolbar.textWinLossSpark": "Zisk/strata", "SSE.Views.Toolbar.textZoom": "Priblíženie", "SSE.Views.Toolbar.tipAlignBottom": "Zarovnať dole", "SSE.Views.Toolbar.tipAlignCenter": "Centrovať", diff --git a/apps/spreadsheeteditor/main/locale/sl.json b/apps/spreadsheeteditor/main/locale/sl.json index 50ce402ec..6b623c38e 100644 --- a/apps/spreadsheeteditor/main/locale/sl.json +++ b/apps/spreadsheeteditor/main/locale/sl.json @@ -2,6 +2,13 @@ "cancelButtonText": "Prekliči", "Common.Controllers.Chat.notcriticalErrorTitle": "Opozorilo", "Common.Controllers.Chat.textEnterMessage": "Svoje sporočilo vnesite tu", + "Common.define.chartData.textArea": "Ploščinski grafikon", + "Common.define.chartData.textBar": "Stolpični grafikon", + "Common.define.chartData.textColumn": "Stolpični grafikon", + "Common.define.chartData.textLine": "Vrstični grafikon", + "Common.define.chartData.textPie": "Tortni grafikon", + "Common.define.chartData.textPoint": "Točkovni grafikon", + "Common.define.chartData.textStock": "Založni grafikon", "Common.UI.ComboBorderSize.txtNoBorders": "Ni mej", "Common.UI.ComboBorderSizeEditable.txtNoBorders": "Ni mej", "Common.UI.ComboDataView.emptyComboText": "Ni slogov", @@ -227,36 +234,26 @@ "SSE.Views.CellRangeDialog.txtInvalidRange": "NAPAKA! Neveljaven razpon celic", "SSE.Views.CellRangeDialog.txtTitle": "Izberi območje podatkov", "SSE.Views.ChartSettings.textAdvanced": "Prikaži napredne nastavitve", - "SSE.Views.ChartSettings.textArea": "Ploščinski grafikon", - "SSE.Views.ChartSettings.textBar": "Stolpični grafikon", "SSE.Views.ChartSettings.textChartType": "Spremeni vrsto razpredelnice", - "SSE.Views.ChartSettings.textColumn": "Stolpični grafikon", "SSE.Views.ChartSettings.textEditData": "Uredi podatke", "SSE.Views.ChartSettings.textHeight": "Višina", "SSE.Views.ChartSettings.textKeepRatio": "Nenehna razmerja", - "SSE.Views.ChartSettings.textLine": "Vrstični grafikon", - "SSE.Views.ChartSettings.textPie": "Tortni grafikon", - "SSE.Views.ChartSettings.textPoint": "Točkovni grafikon", "SSE.Views.ChartSettings.textSize": "Velikost", - "SSE.Views.ChartSettings.textStock": "Založni grafikon", "SSE.Views.ChartSettings.textStyle": "Slog", "SSE.Views.ChartSettings.textWidth": "Širina", "SSE.Views.ChartSettingsDlg.errorMaxRows": "NAPAKA! Maksimalno število podatkovnih serij na grafikon je 255", "SSE.Views.ChartSettingsDlg.errorStockChart": "Nepravilen vrstni red vrstic. Za izgradnjo razpredelnice delnic podatke na strani navedite v sledečem vrstnem redu:
otvoritvena cena, maksimalna cena, minimalna cena, zaključna cena.", - "SSE.Views.ChartSettingsDlg.textArea": "Ploščinski grafikon", "SSE.Views.ChartSettingsDlg.textAuto": "Samodejno", "SSE.Views.ChartSettingsDlg.textAxisCrosses": "Križi osi", "SSE.Views.ChartSettingsDlg.textAxisOptions": "Možnosti osi", "SSE.Views.ChartSettingsDlg.textAxisPos": "Položaj osi", "SSE.Views.ChartSettingsDlg.textAxisSettings": "Axis Settings", - "SSE.Views.ChartSettingsDlg.textBar": "Stolpični grafikon", "SSE.Views.ChartSettingsDlg.textBetweenTickMarks": "Med obkljukanimi oznakami", "SSE.Views.ChartSettingsDlg.textBillions": "Milijarde", "SSE.Views.ChartSettingsDlg.textCategoryName": "Ime kategorije", "SSE.Views.ChartSettingsDlg.textCenter": "Središče", "SSE.Views.ChartSettingsDlg.textChartElementsLegend": "Elementi grafa &
Legenda grafa", "SSE.Views.ChartSettingsDlg.textChartTitle": "Naslov grafa", - "SSE.Views.ChartSettingsDlg.textColumn": "Stolpični grafikon", "SSE.Views.ChartSettingsDlg.textCross": "Križ", "SSE.Views.ChartSettingsDlg.textCustom": "Po meri", "SSE.Views.ChartSettingsDlg.textDataColumns": "v stolpcih", @@ -291,7 +288,6 @@ "SSE.Views.ChartSettingsDlg.textLegendPos": "Legenda", "SSE.Views.ChartSettingsDlg.textLegendRight": "Desno", "SSE.Views.ChartSettingsDlg.textLegendTop": "Vrh", - "SSE.Views.ChartSettingsDlg.textLine": "Vrstični grafikon", "SSE.Views.ChartSettingsDlg.textLines": "Vrste", "SSE.Views.ChartSettingsDlg.textLow": "Nizko", "SSE.Views.ChartSettingsDlg.textMajor": "Velik", @@ -312,8 +308,6 @@ "SSE.Views.ChartSettingsDlg.textOut": "Ven", "SSE.Views.ChartSettingsDlg.textOuterTop": "Zunanji vrh", "SSE.Views.ChartSettingsDlg.textOverlay": "Prekrij", - "SSE.Views.ChartSettingsDlg.textPie": "Tortni grafikon", - "SSE.Views.ChartSettingsDlg.textPoint": "Točkovni grafikon", "SSE.Views.ChartSettingsDlg.textReverse": "Vrednosti v obratnem vrstnem redu", "SSE.Views.ChartSettingsDlg.textRightOverlay": "Desno prekrivanje", "SSE.Views.ChartSettingsDlg.textRotated": "Zavrteno", @@ -326,7 +320,6 @@ "SSE.Views.ChartSettingsDlg.textShowGrid": "Mrežne črte", "SSE.Views.ChartSettingsDlg.textShowValues": "Prikaži vrednosti grafikona", "SSE.Views.ChartSettingsDlg.textSmooth": "Gladek", - "SSE.Views.ChartSettingsDlg.textStock": "Založni grafikon", "SSE.Views.ChartSettingsDlg.textStraight": "Raven", "SSE.Views.ChartSettingsDlg.textStyle": "Slog", "SSE.Views.ChartSettingsDlg.textTenMillions": "10 000 000", diff --git a/apps/spreadsheeteditor/main/locale/tr.json b/apps/spreadsheeteditor/main/locale/tr.json index c8a3c70c4..408ec24a7 100644 --- a/apps/spreadsheeteditor/main/locale/tr.json +++ b/apps/spreadsheeteditor/main/locale/tr.json @@ -2,6 +2,14 @@ "cancelButtonText": "İptal Et", "Common.Controllers.Chat.notcriticalErrorTitle": "Dikkat", "Common.Controllers.Chat.textEnterMessage": "Mesajınızı buraya giriniz", + "Common.define.chartData.textArea": "Bölge Grafiği", + "Common.define.chartData.textBar": "Çubuk grafik", + "Common.define.chartData.textColumn": "Sütun grafik", + "Common.define.chartData.textLine": "Çizgi grafiği", + "Common.define.chartData.textPie": "Dilim grafik", + "Common.define.chartData.textPoint": "Nokta grafiği", + "Common.define.chartData.textStock": "Stok Grafiği", + "Common.define.chartData.textSurface": "Yüzey", "Common.UI.ComboBorderSize.txtNoBorders": "Sınır yok", "Common.UI.ComboBorderSizeEditable.txtNoBorders": "Sınır yok", "Common.UI.ComboDataView.emptyComboText": "Stil yok", @@ -777,50 +785,37 @@ "SSE.Views.ChartSettings.strSparkColor": "Renk", "SSE.Views.ChartSettings.strTemplate": "Şablon", "SSE.Views.ChartSettings.textAdvanced": "Gelişmiş ayarları göster", - "SSE.Views.ChartSettings.textArea": "Bölge Grafiği", - "SSE.Views.ChartSettings.textBar": "Çubuk grafik", "SSE.Views.ChartSettings.textBorderSizeErr": "Girilen değer yanlış.
Lütfen 0 ile 1584 pt arasında değer giriniz.", "SSE.Views.ChartSettings.textChartType": "Grafik Tipini Değiştir", - "SSE.Views.ChartSettings.textColumn": "Sütun grafik", - "SSE.Views.ChartSettings.textColumnSpark": "Sütun", "SSE.Views.ChartSettings.textEditData": "Veri düzenle", "SSE.Views.ChartSettings.textFirstPoint": "İlk Nokta", "SSE.Views.ChartSettings.textHeight": "Yükseklik", "SSE.Views.ChartSettings.textHighPoint": "Yüksek Nokta", "SSE.Views.ChartSettings.textKeepRatio": "Sabit Orantılar", "SSE.Views.ChartSettings.textLastPoint": "Son Nokta", - "SSE.Views.ChartSettings.textLine": "Çizgi grafiği", - "SSE.Views.ChartSettings.textLineSpark": "Çizgi Grafiği", "SSE.Views.ChartSettings.textLowPoint": "Düşük Nokta", "SSE.Views.ChartSettings.textMarkers": "İşaretler", "SSE.Views.ChartSettings.textNegativePoint": "Negatif Nokta", "SSE.Views.ChartSettings.textNewColor": "Yeni Özel Renk Ekle", - "SSE.Views.ChartSettings.textPie": "Dilim grafik", - "SSE.Views.ChartSettings.textPoint": "Nokta grafiği", "SSE.Views.ChartSettings.textRanges": "Veri Aralığı", "SSE.Views.ChartSettings.textSelectData": "Veriyi Seç", "SSE.Views.ChartSettings.textShow": "Göster", "SSE.Views.ChartSettings.textSize": "Boyut", - "SSE.Views.ChartSettings.textStock": "Stok Grafiği", "SSE.Views.ChartSettings.textStyle": "Stil", - "SSE.Views.ChartSettings.textSurface": "Yüzey", "SSE.Views.ChartSettings.textType": "Tip", "SSE.Views.ChartSettings.textWidth": "Genişlik", - "SSE.Views.ChartSettings.textWinLossSpark": "Kazanç/Kayıp", "SSE.Views.ChartSettingsDlg.errorMaxRows": "HATA! Her grafik için maksimum veri serileri sayısı 255'tir", "SSE.Views.ChartSettingsDlg.errorStockChart": "Yanlış dizi sırası. Stok grafiği oluşturma için tablodaki verileri şu sırada yerleştirin:
açılış fiyatı, maksimum fiyat, minimum fiyat, kapanış fiyatı. ", "SSE.Views.ChartSettingsDlg.textAlt": "Alternatif Metin", "SSE.Views.ChartSettingsDlg.textAltDescription": "Açıklama", "SSE.Views.ChartSettingsDlg.textAltTip": "Görsel obje bilgilerinin alternatif metin tabanlı sunumu görsel veya bilinçsel açıdan problem yaşan kişilere okunarak resimdeki, şekildeki, grafikteki veya tablodaki bilgileri daha kolay anlamalarını sağlamayı amaçlar.", "SSE.Views.ChartSettingsDlg.textAltTitle": "Başlık", - "SSE.Views.ChartSettingsDlg.textArea": "Bölge Grafiği", "SSE.Views.ChartSettingsDlg.textAuto": "Otomatik", "SSE.Views.ChartSettingsDlg.textAutoEach": "Her Biri için Otomatik", "SSE.Views.ChartSettingsDlg.textAxisCrosses": "Eksen kesişmeleri", "SSE.Views.ChartSettingsDlg.textAxisOptions": "Eksen Seçenekleri", "SSE.Views.ChartSettingsDlg.textAxisPos": "Eksen Pozisyonu", "SSE.Views.ChartSettingsDlg.textAxisSettings": "Axis Settings", - "SSE.Views.ChartSettingsDlg.textBar": "Çubuk grafik", "SSE.Views.ChartSettingsDlg.textBetweenTickMarks": "Tik İşaretleri Arasında", "SSE.Views.ChartSettingsDlg.textBillions": "Milyar", "SSE.Views.ChartSettingsDlg.textBottom": "Alt", @@ -828,8 +823,6 @@ "SSE.Views.ChartSettingsDlg.textCenter": "Orta", "SSE.Views.ChartSettingsDlg.textChartElementsLegend": "Grafik Elementleri &
Grafik Göstergesi", "SSE.Views.ChartSettingsDlg.textChartTitle": "Grafik başlığı", - "SSE.Views.ChartSettingsDlg.textColumn": "Sütun grafik", - "SSE.Views.ChartSettingsDlg.textColumnSpark": "Sütun", "SSE.Views.ChartSettingsDlg.textCross": "Kesişme", "SSE.Views.ChartSettingsDlg.textCustom": "Özel", "SSE.Views.ChartSettingsDlg.textDataColumns": "sütunlarda", @@ -870,9 +863,7 @@ "SSE.Views.ChartSettingsDlg.textLegendPos": "Gösterge", "SSE.Views.ChartSettingsDlg.textLegendRight": "Sağ", "SSE.Views.ChartSettingsDlg.textLegendTop": "Üst", - "SSE.Views.ChartSettingsDlg.textLine": "Çizgi grafiği", "SSE.Views.ChartSettingsDlg.textLines": "Satırlar", - "SSE.Views.ChartSettingsDlg.textLineSpark": "Çizgi Grafiği", "SSE.Views.ChartSettingsDlg.textLocationRange": "Konum Aralığı", "SSE.Views.ChartSettingsDlg.textLow": "Düşük", "SSE.Views.ChartSettingsDlg.textMajor": "Majör", @@ -893,8 +884,6 @@ "SSE.Views.ChartSettingsDlg.textOut": "Dışarı", "SSE.Views.ChartSettingsDlg.textOuterTop": "Dış Üst", "SSE.Views.ChartSettingsDlg.textOverlay": "Bindirme", - "SSE.Views.ChartSettingsDlg.textPie": "Dilim grafik", - "SSE.Views.ChartSettingsDlg.textPoint": "Nokta grafiği", "SSE.Views.ChartSettingsDlg.textReverse": "Ters sıralanmış değerler", "SSE.Views.ChartSettingsDlg.textReverseOrder": "Sırayı tersine çevir", "SSE.Views.ChartSettingsDlg.textRight": "Sağ", @@ -915,10 +904,8 @@ "SSE.Views.ChartSettingsDlg.textSingle": "Tek Sparkline", "SSE.Views.ChartSettingsDlg.textSmooth": "Düz", "SSE.Views.ChartSettingsDlg.textSparkRanges": "Sparkline Aralıkları", - "SSE.Views.ChartSettingsDlg.textStock": "Stok Grafiği", "SSE.Views.ChartSettingsDlg.textStraight": "Düz", "SSE.Views.ChartSettingsDlg.textStyle": "Stil", - "SSE.Views.ChartSettingsDlg.textSurface": "Yüzey", "SSE.Views.ChartSettingsDlg.textTenMillions": "10 000 000", "SSE.Views.ChartSettingsDlg.textTenThousands": "10 000", "SSE.Views.ChartSettingsDlg.textThousands": "Binlerce", @@ -935,7 +922,6 @@ "SSE.Views.ChartSettingsDlg.textVertAxis": "Dikey Eksen", "SSE.Views.ChartSettingsDlg.textVertGrid": "Dikey Çizgi Kılavuzları", "SSE.Views.ChartSettingsDlg.textVertTitle": "Dikey Eksen Başlığı", - "SSE.Views.ChartSettingsDlg.textWinLossSpark": "Kazanç/Kayıp", "SSE.Views.ChartSettingsDlg.textXAxisTitle": "X Eksen Başlığı", "SSE.Views.ChartSettingsDlg.textYAxisTitle": "Y eksen başlığı", "SSE.Views.ChartSettingsDlg.textZero": "Sıfır", @@ -1518,17 +1504,12 @@ "SSE.Views.Toolbar.textAlignRight": "Sağa Hizala", "SSE.Views.Toolbar.textAlignTop": "Üste Hizala", "SSE.Views.Toolbar.textAllBorders": "Tüm Sınırlar", - "SSE.Views.Toolbar.textArea": "Bölge Grafiği", - "SSE.Views.Toolbar.textBar": "Çubuk grafik", "SSE.Views.Toolbar.textBold": "Kalın", "SSE.Views.Toolbar.textBordersColor": "Sınır Rengi", "SSE.Views.Toolbar.textBordersStyle": "Sınır Stili", "SSE.Views.Toolbar.textBottomBorders": "Alt Sınırlar", "SSE.Views.Toolbar.textCenterBorders": "Dikey İç Sınırlar", - "SSE.Views.Toolbar.textCharts": "Grafikler", "SSE.Views.Toolbar.textClockwise": "Saat yönünde açı", - "SSE.Views.Toolbar.textColumn": "Sütun", - "SSE.Views.Toolbar.textColumnSpark": "Sütun", "SSE.Views.Toolbar.textCounterCw": "Saat yönü tersi açı", "SSE.Views.Toolbar.textDelLeft": "Hücreleri sola kaydır", "SSE.Views.Toolbar.textDelUp": "Hücreleri yukarı kaydır", @@ -1542,29 +1523,21 @@ "SSE.Views.Toolbar.textInsRight": "Hücreleri sağa kaydır", "SSE.Views.Toolbar.textItalic": "İtalik", "SSE.Views.Toolbar.textLeftBorders": "Sol Sınırlar", - "SSE.Views.Toolbar.textLine": "Çizgi Grafiği", - "SSE.Views.Toolbar.textLineSpark": "Çizgi Grafiği", "SSE.Views.Toolbar.textMiddleBorders": "Yatay İç Sınırlar", "SSE.Views.Toolbar.textMoreFormats": "Daha fazla format", "SSE.Views.Toolbar.textNewColor": "Yeni Özel Renk Ekle", "SSE.Views.Toolbar.textNoBorders": "Sınır yok", "SSE.Views.Toolbar.textOutBorders": "Dış Sınırlar", - "SSE.Views.Toolbar.textPie": "Dilim", - "SSE.Views.Toolbar.textPoint": "XY (Noktalı)", "SSE.Views.Toolbar.textPrint": "Yazdır", "SSE.Views.Toolbar.textPrintOptions": "Yazdırma Ayarları", "SSE.Views.Toolbar.textRightBorders": "Sağ Sınırlar", "SSE.Views.Toolbar.textRotateDown": "Metini Aşağı Döndür", "SSE.Views.Toolbar.textRotateUp": "Metini Yukarı Döndür", - "SSE.Views.Toolbar.textSparks": "Sparklinelar", - "SSE.Views.Toolbar.textStock": "Stok Grafiği", - "SSE.Views.Toolbar.textSurface": "Yüzey", "SSE.Views.Toolbar.textTabFile": "Dosya", "SSE.Views.Toolbar.textTabHome": "Ana Sayfa", "SSE.Views.Toolbar.textTabInsert": "Ekle", "SSE.Views.Toolbar.textTopBorders": "Üst Sınırlar", "SSE.Views.Toolbar.textUnderline": "Altı çizili", - "SSE.Views.Toolbar.textWinLossSpark": "Kazanç/Kayıp", "SSE.Views.Toolbar.textZoom": "Zum", "SSE.Views.Toolbar.tipAlignBottom": "Alta Hizala", "SSE.Views.Toolbar.tipAlignCenter": "Ortaya Hizala", diff --git a/apps/spreadsheeteditor/main/locale/uk.json b/apps/spreadsheeteditor/main/locale/uk.json index 1fd245c66..6e7c37b06 100644 --- a/apps/spreadsheeteditor/main/locale/uk.json +++ b/apps/spreadsheeteditor/main/locale/uk.json @@ -2,6 +2,18 @@ "cancelButtonText": "Скасувати", "Common.Controllers.Chat.notcriticalErrorTitle": "Застереження", "Common.Controllers.Chat.textEnterMessage": "ВВедіть своє повідомлення тут", + "Common.define.chartData.textArea": "Площа", + "Common.define.chartData.textBar": "Вставити", + "Common.define.chartData.textColumn": "Колона", + "Common.define.chartData.textLine": "Лінія", + "Common.define.chartData.textPie": "Пиріг", + "Common.define.chartData.textPoint": "XY (розсіювання)", + "Common.define.chartData.textStock": "Запас", + "Common.define.chartData.textSurface": "Поверхня", + "Common.define.chartData.textColumnSpark": "Колона", + "Common.define.chartData.textLineSpark": "Лінія", + "Common.define.chartData.textWinLossSpark": "Win / Loss", + "Common.define.chartData.textSparks": "Міні-діграми", "Common.UI.ComboBorderSize.txtNoBorders": "Немає кордонів", "Common.UI.ComboBorderSizeEditable.txtNoBorders": "Немає кордонів", "Common.UI.ComboDataView.emptyComboText": "Немає стилів", @@ -782,50 +794,37 @@ "SSE.Views.ChartSettings.strSparkColor": "Колір", "SSE.Views.ChartSettings.strTemplate": "Шаблон", "SSE.Views.ChartSettings.textAdvanced": "Показати додаткові налаштування", - "SSE.Views.ChartSettings.textArea": "Площа", - "SSE.Views.ChartSettings.textBar": "Вставити", "SSE.Views.ChartSettings.textBorderSizeErr": "Введене значення невірно.
Будь ласка, введіть значення від 0 pt до 1584 pt.", "SSE.Views.ChartSettings.textChartType": "Змінити тип діаграми", - "SSE.Views.ChartSettings.textColumn": "Колона", - "SSE.Views.ChartSettings.textColumnSpark": "Колона", "SSE.Views.ChartSettings.textEditData": "Редагувати дату і місцезнаходження", "SSE.Views.ChartSettings.textFirstPoint": "Перша точка", "SSE.Views.ChartSettings.textHeight": "Висота", "SSE.Views.ChartSettings.textHighPoint": "Висока точка", "SSE.Views.ChartSettings.textKeepRatio": "Сталі пропорції", "SSE.Views.ChartSettings.textLastPoint": "останній пункт", - "SSE.Views.ChartSettings.textLine": "Лінія", - "SSE.Views.ChartSettings.textLineSpark": "Лінія", "SSE.Views.ChartSettings.textLowPoint": "Низька точка", "SSE.Views.ChartSettings.textMarkers": "Маркери", "SSE.Views.ChartSettings.textNegativePoint": "Негативний момент", "SSE.Views.ChartSettings.textNewColor": "Додати новий спеціальний колір", - "SSE.Views.ChartSettings.textPie": "Пиріг", - "SSE.Views.ChartSettings.textPoint": "XY (розсіювання)", "SSE.Views.ChartSettings.textRanges": "Діапазон даних", "SSE.Views.ChartSettings.textSelectData": "Вибрати дату", "SSE.Views.ChartSettings.textShow": "Відобразити", "SSE.Views.ChartSettings.textSize": "Розмір", - "SSE.Views.ChartSettings.textStock": "Запас", "SSE.Views.ChartSettings.textStyle": "Стиль", - "SSE.Views.ChartSettings.textSurface": "Поверхня", "SSE.Views.ChartSettings.textType": "Тип", "SSE.Views.ChartSettings.textWidth": "Ширина", - "SSE.Views.ChartSettings.textWinLossSpark": "Win / Loss", "SSE.Views.ChartSettingsDlg.errorMaxRows": "ПОМИЛКА! Максимальна кількість даних на кожну діаграму становить 255", "SSE.Views.ChartSettingsDlg.errorStockChart": "Невірний порядок рядків. Щоб побудувати фондову діаграму, помістіть дані на аркуші в наступному порядку: ціна відкриття, максимальна ціна, мінімальна ціна, ціна закриття.", "SSE.Views.ChartSettingsDlg.textAlt": "Альтернативний текст", "SSE.Views.ChartSettingsDlg.textAltDescription": "Опис угоди", "SSE.Views.ChartSettingsDlg.textAltTip": "Альтернативне текстове представлення інформації про візуальний об'єкт, яке може бути прочитано людям із порушеннями зору або когнітивними дисфункціями, щоб вони могли краще зрозуміти, яка інформація знаходиться в зображенні, автошопі, діаграмі або таблиці.", "SSE.Views.ChartSettingsDlg.textAltTitle": "Назва", - "SSE.Views.ChartSettingsDlg.textArea": "Площа", "SSE.Views.ChartSettingsDlg.textAuto": "Авто", "SSE.Views.ChartSettingsDlg.textAutoEach": "Авто для кожного", "SSE.Views.ChartSettingsDlg.textAxisCrosses": "Осі Хрести", "SSE.Views.ChartSettingsDlg.textAxisOptions": "Параметри осей", "SSE.Views.ChartSettingsDlg.textAxisPos": "Позиція осі", "SSE.Views.ChartSettingsDlg.textAxisSettings": "Налаштування осі", - "SSE.Views.ChartSettingsDlg.textBar": "Риска", "SSE.Views.ChartSettingsDlg.textBetweenTickMarks": "Між відмітками", "SSE.Views.ChartSettingsDlg.textBillions": "Мільярди", "SSE.Views.ChartSettingsDlg.textBottom": "Внизу", @@ -833,8 +832,6 @@ "SSE.Views.ChartSettingsDlg.textCenter": "Центр", "SSE.Views.ChartSettingsDlg.textChartElementsLegend": "Графічні елементи та
Графічна легенда", "SSE.Views.ChartSettingsDlg.textChartTitle": "Назва діграми", - "SSE.Views.ChartSettingsDlg.textColumn": "Колона", - "SSE.Views.ChartSettingsDlg.textColumnSpark": "Колона", "SSE.Views.ChartSettingsDlg.textCross": "Перетинати", "SSE.Views.ChartSettingsDlg.textCustom": "Користувальницький", "SSE.Views.ChartSettingsDlg.textDataColumns": "в колонках", @@ -875,9 +872,7 @@ "SSE.Views.ChartSettingsDlg.textLegendPos": "Підпис", "SSE.Views.ChartSettingsDlg.textLegendRight": "Право", "SSE.Views.ChartSettingsDlg.textLegendTop": "Верх", - "SSE.Views.ChartSettingsDlg.textLine": "Лінійна діаграма", "SSE.Views.ChartSettingsDlg.textLines": "Рядки", - "SSE.Views.ChartSettingsDlg.textLineSpark": "Лінія", "SSE.Views.ChartSettingsDlg.textLocationRange": "Діапазон місць", "SSE.Views.ChartSettingsDlg.textLow": "Низький", "SSE.Views.ChartSettingsDlg.textMajor": "Мажор", @@ -898,8 +893,6 @@ "SSE.Views.ChartSettingsDlg.textOut": "з", "SSE.Views.ChartSettingsDlg.textOuterTop": "Зовнішній зверху", "SSE.Views.ChartSettingsDlg.textOverlay": "Накладання", - "SSE.Views.ChartSettingsDlg.textPie": "Пиріг", - "SSE.Views.ChartSettingsDlg.textPoint": "XY (розсіювання)", "SSE.Views.ChartSettingsDlg.textReverse": "Значення у зворотному порядку", "SSE.Views.ChartSettingsDlg.textReverseOrder": "Зворотний порядок", "SSE.Views.ChartSettingsDlg.textRight": "Право", @@ -920,10 +913,8 @@ "SSE.Views.ChartSettingsDlg.textSingle": "Єдина міні-діаграма", "SSE.Views.ChartSettingsDlg.textSmooth": "Гладкий", "SSE.Views.ChartSettingsDlg.textSparkRanges": "Діапазони міні-діаграм", - "SSE.Views.ChartSettingsDlg.textStock": "Запас", "SSE.Views.ChartSettingsDlg.textStraight": "Строгий", "SSE.Views.ChartSettingsDlg.textStyle": "Стиль", - "SSE.Views.ChartSettingsDlg.textSurface": "Поверхня", "SSE.Views.ChartSettingsDlg.textTenMillions": "10 000 000", "SSE.Views.ChartSettingsDlg.textTenThousands": "10 000", "SSE.Views.ChartSettingsDlg.textThousands": "Тисячі", @@ -940,7 +931,6 @@ "SSE.Views.ChartSettingsDlg.textVertAxis": "Вертикальні вісі", "SSE.Views.ChartSettingsDlg.textVertGrid": "Вертикальні сітки", "SSE.Views.ChartSettingsDlg.textVertTitle": "Назва вертикальної вісі", - "SSE.Views.ChartSettingsDlg.textWinLossSpark": "Win / Loss", "SSE.Views.ChartSettingsDlg.textXAxisTitle": "Назва осі X", "SSE.Views.ChartSettingsDlg.textYAxisTitle": "Назва осі Y", "SSE.Views.ChartSettingsDlg.textZero": "Нуль", @@ -1535,17 +1525,12 @@ "SSE.Views.Toolbar.textAlignRight": "Вирівняти справа", "SSE.Views.Toolbar.textAlignTop": "Вирівняти догори", "SSE.Views.Toolbar.textAllBorders": "Всі кордони", - "SSE.Views.Toolbar.textArea": "Площа", - "SSE.Views.Toolbar.textBar": "Риска", "SSE.Views.Toolbar.textBold": "Жирний", "SSE.Views.Toolbar.textBordersColor": "Колір кордону", "SSE.Views.Toolbar.textBordersStyle": "Стиль межі", "SSE.Views.Toolbar.textBottomBorders": "Нижні межі", "SSE.Views.Toolbar.textCenterBorders": "Всередині вертикальних кордонів", - "SSE.Views.Toolbar.textCharts": "Діаграми", "SSE.Views.Toolbar.textClockwise": "Кут за годинниковою стрілкою", - "SSE.Views.Toolbar.textColumn": "Колона", - "SSE.Views.Toolbar.textColumnSpark": "Колона", "SSE.Views.Toolbar.textCounterCw": "Кут за годинниковою стрілкою", "SSE.Views.Toolbar.textDelLeft": "Перемістити клітини вліво", "SSE.Views.Toolbar.textDelUp": "Перемістити клітини вгору", @@ -1559,24 +1544,17 @@ "SSE.Views.Toolbar.textInsRight": "Перемістити клітини вправо", "SSE.Views.Toolbar.textItalic": "Курсив", "SSE.Views.Toolbar.textLeftBorders": "Ліві кордони", - "SSE.Views.Toolbar.textLine": "Лінія", - "SSE.Views.Toolbar.textLineSpark": "Лінія", "SSE.Views.Toolbar.textMiddleBorders": "Внутрішні горизонтальні межі", "SSE.Views.Toolbar.textMoreFormats": "Більше форматів", "SSE.Views.Toolbar.textNewColor": "Додати новий спеціальний колір", "SSE.Views.Toolbar.textNoBorders": "Немає кордонів", "SSE.Views.Toolbar.textOutBorders": "За межами кордонів", "SSE.Views.Toolbar.textPageMarginsCustom": "Користувацькі поля", - "SSE.Views.Toolbar.textPie": "Пиріг", - "SSE.Views.Toolbar.textPoint": "XY (розсіювання)", "SSE.Views.Toolbar.textPrint": "Роздрукувати", "SSE.Views.Toolbar.textPrintOptions": "Налаштування друку", "SSE.Views.Toolbar.textRightBorders": "Праві кордони", "SSE.Views.Toolbar.textRotateDown": "Повернути текст вниз", "SSE.Views.Toolbar.textRotateUp": "Повернути текст вгору", - "SSE.Views.Toolbar.textSparks": "Міні-діграми", - "SSE.Views.Toolbar.textStock": "Запас", - "SSE.Views.Toolbar.textSurface": "Поверхня", "SSE.Views.Toolbar.textTabCollaboration": "Співпраця", "SSE.Views.Toolbar.textTabData": "Дані", "SSE.Views.Toolbar.textTabFile": "Файл", @@ -1586,7 +1564,6 @@ "SSE.Views.Toolbar.textTabLayout": "Розмітка", "SSE.Views.Toolbar.textTopBorders": "Межі угорі", "SSE.Views.Toolbar.textUnderline": "Підкреслений", - "SSE.Views.Toolbar.textWinLossSpark": "Win / Loss", "SSE.Views.Toolbar.textZoom": "Збільшити", "SSE.Views.Toolbar.tipAlignBottom": "Вирівняти знизу", "SSE.Views.Toolbar.tipAlignCenter": "Вирівняти центр", diff --git a/apps/spreadsheeteditor/main/locale/vi.json b/apps/spreadsheeteditor/main/locale/vi.json index a3af836cb..d164c2d01 100644 --- a/apps/spreadsheeteditor/main/locale/vi.json +++ b/apps/spreadsheeteditor/main/locale/vi.json @@ -2,6 +2,18 @@ "cancelButtonText": "Hủy", "Common.Controllers.Chat.notcriticalErrorTitle": "Cảnh báo", "Common.Controllers.Chat.textEnterMessage": "Nhập tin nhắn của bạn ở đây", + "Common.define.chartData.textArea": "Vùng", + "Common.define.chartData.textBar": "Gạch", + "Common.define.chartData.textColumn": "Cột", + "Common.define.chartData.textLine": "Đường kẻ", + "Common.define.chartData.textPie": "Hình bánh", + "Common.define.chartData.textPoint": "XY (Phân tán)", + "Common.define.chartData.textStock": "Cổ phiếu", + "Common.define.chartData.textSurface": "Bề mặt", + "Common.define.chartData.textColumnSpark": "Cột", + "Common.define.chartData.textLineSpark": "Đường kẻ", + "Common.define.chartData.textWinLossSpark": "Win/Loss", + "Common.define.chartData.textSparks": "Sparklines", "Common.UI.ComboBorderSize.txtNoBorders": "Không viền", "Common.UI.ComboBorderSizeEditable.txtNoBorders": "Không viền", "Common.UI.ComboDataView.emptyComboText": "Không có kiểu", @@ -776,50 +788,37 @@ "SSE.Views.ChartSettings.strSparkColor": "Màu sắc", "SSE.Views.ChartSettings.strTemplate": "Template", "SSE.Views.ChartSettings.textAdvanced": "Hiển thị Cài đặt Nâng cao", - "SSE.Views.ChartSettings.textArea": "Vùng", - "SSE.Views.ChartSettings.textBar": "Cột", "SSE.Views.ChartSettings.textBorderSizeErr": "Giá trị đã nhập không chính xác.
Nhập một giá trị từ thuộc từ 0 pt đến 1584 pt.", "SSE.Views.ChartSettings.textChartType": "Thay đổi Loại biểu đồ", - "SSE.Views.ChartSettings.textColumn": "Cột", - "SSE.Views.ChartSettings.textColumnSpark": "Cột", "SSE.Views.ChartSettings.textEditData": "Chỉnh sửa Dữ liệu và Vị trí", "SSE.Views.ChartSettings.textFirstPoint": "Điểm đầu tiên", "SSE.Views.ChartSettings.textHeight": "Chiều cao", "SSE.Views.ChartSettings.textHighPoint": "Điểm cao", "SSE.Views.ChartSettings.textKeepRatio": "Tỷ lệ không đổi", "SSE.Views.ChartSettings.textLastPoint": "Điểm cuối", - "SSE.Views.ChartSettings.textLine": "Đường kẻ", - "SSE.Views.ChartSettings.textLineSpark": "Đường kẻ", "SSE.Views.ChartSettings.textLowPoint": "Điểm thấp", "SSE.Views.ChartSettings.textMarkers": "Đánh dấu", "SSE.Views.ChartSettings.textNegativePoint": "Điểm âm", "SSE.Views.ChartSettings.textNewColor": "Thêm màu tùy chỉnh mới", - "SSE.Views.ChartSettings.textPie": "Hình bánh", - "SSE.Views.ChartSettings.textPoint": "XY (Phân tán)", "SSE.Views.ChartSettings.textRanges": "Phạm vi dữ liệu", "SSE.Views.ChartSettings.textSelectData": "Chọn dữ liệu", "SSE.Views.ChartSettings.textShow": "Hiển thị", "SSE.Views.ChartSettings.textSize": "Kích thước", - "SSE.Views.ChartSettings.textStock": "Cổ phiếu", "SSE.Views.ChartSettings.textStyle": "Kiểu", - "SSE.Views.ChartSettings.textSurface": "Bề mặt", "SSE.Views.ChartSettings.textType": "Loại", "SSE.Views.ChartSettings.textWidth": "Chiều rộng", - "SSE.Views.ChartSettings.textWinLossSpark": "Win/Loss", "SSE.Views.ChartSettingsDlg.errorMaxRows": "LỖI! Số chuỗi dữ liệu tối đa cho mỗi biểu đồ là 255", "SSE.Views.ChartSettingsDlg.errorStockChart": "Thứ tự hàng không chính xác. Để xây dựng một biểu đồ chứng khoán đặt dữ liệu trên giấy theo thứ tự sau:
giá mở phiên, giá cao nhất, giá thấp nhất, giá đóng phiên.", "SSE.Views.ChartSettingsDlg.textAlt": "Văn bản thay thế", "SSE.Views.ChartSettingsDlg.textAltDescription": "Mô tả", "SSE.Views.ChartSettingsDlg.textAltTip": "Miêu tả thay thế dưới dạng văn bản thông tin đối tượng trực quan, sẽ được đọc cho những người bị suy giảm thị lực hoặc nhận thức để giúp họ hiểu rõ hơn về những thông tin có trong hình ảnh, autoshape, biểu đồ hoặc bảng.", "SSE.Views.ChartSettingsDlg.textAltTitle": "Tiêu đề", - "SSE.Views.ChartSettingsDlg.textArea": "Vùng", "SSE.Views.ChartSettingsDlg.textAuto": "Tự động", "SSE.Views.ChartSettingsDlg.textAutoEach": "Tự động cho từng", "SSE.Views.ChartSettingsDlg.textAxisCrosses": "Trục giao nhau", "SSE.Views.ChartSettingsDlg.textAxisOptions": "Tùy chọn trục", "SSE.Views.ChartSettingsDlg.textAxisPos": "Vị trí trục", "SSE.Views.ChartSettingsDlg.textAxisSettings": "Thiết lập trục", - "SSE.Views.ChartSettingsDlg.textBar": "Cột", "SSE.Views.ChartSettingsDlg.textBetweenTickMarks": "Giữa các dấu kiểm", "SSE.Views.ChartSettingsDlg.textBillions": "Hàng tỷ", "SSE.Views.ChartSettingsDlg.textBottom": "Dưới cùng", @@ -827,8 +826,6 @@ "SSE.Views.ChartSettingsDlg.textCenter": "Trung tâm", "SSE.Views.ChartSettingsDlg.textChartElementsLegend": "Chi tiết Biểu đồ &
Chú thích", "SSE.Views.ChartSettingsDlg.textChartTitle": "Tiêu đề biểu đồ", - "SSE.Views.ChartSettingsDlg.textColumn": "Cột", - "SSE.Views.ChartSettingsDlg.textColumnSpark": "Cột", "SSE.Views.ChartSettingsDlg.textCross": "Chéo", "SSE.Views.ChartSettingsDlg.textCustom": "Tuỳ chỉnh", "SSE.Views.ChartSettingsDlg.textDataColumns": "trong cột", @@ -869,9 +866,7 @@ "SSE.Views.ChartSettingsDlg.textLegendPos": "Chú thích", "SSE.Views.ChartSettingsDlg.textLegendRight": "Bên phải", "SSE.Views.ChartSettingsDlg.textLegendTop": "Trên cùng", - "SSE.Views.ChartSettingsDlg.textLine": "Biểu đồ đường kẻ", "SSE.Views.ChartSettingsDlg.textLines": "Đường kẻ", - "SSE.Views.ChartSettingsDlg.textLineSpark": "Đường kẻ", "SSE.Views.ChartSettingsDlg.textLocationRange": "Phạm vi địa điểm", "SSE.Views.ChartSettingsDlg.textLow": "Thấp", "SSE.Views.ChartSettingsDlg.textMajor": "Chính", @@ -892,8 +887,6 @@ "SSE.Views.ChartSettingsDlg.textOut": "Ngoài", "SSE.Views.ChartSettingsDlg.textOuterTop": "Trên cùng bên ngoài", "SSE.Views.ChartSettingsDlg.textOverlay": "Xếp chồng", - "SSE.Views.ChartSettingsDlg.textPie": "Hình bánh", - "SSE.Views.ChartSettingsDlg.textPoint": "XY (Phân tán)", "SSE.Views.ChartSettingsDlg.textReverse": "Giá trị theo thứ tự ngược", "SSE.Views.ChartSettingsDlg.textReverseOrder": "Trật tự đảo ngược", "SSE.Views.ChartSettingsDlg.textRight": "Bên phải", @@ -914,10 +907,8 @@ "SSE.Views.ChartSettingsDlg.textSingle": "Sparkline đơn", "SSE.Views.ChartSettingsDlg.textSmooth": "Trơn", "SSE.Views.ChartSettingsDlg.textSparkRanges": "Phạm vi Sparkline", - "SSE.Views.ChartSettingsDlg.textStock": "Cổ phiếu", "SSE.Views.ChartSettingsDlg.textStraight": "Thẳng", "SSE.Views.ChartSettingsDlg.textStyle": "Kiểu", - "SSE.Views.ChartSettingsDlg.textSurface": "Bề mặt", "SSE.Views.ChartSettingsDlg.textTenMillions": "10 000 000", "SSE.Views.ChartSettingsDlg.textTenThousands": "10 000", "SSE.Views.ChartSettingsDlg.textThousands": "Hàng nghìn", @@ -934,7 +925,6 @@ "SSE.Views.ChartSettingsDlg.textVertAxis": "Trục đứng", "SSE.Views.ChartSettingsDlg.textVertGrid": "Đường lưới dọc", "SSE.Views.ChartSettingsDlg.textVertTitle": "Tiêu đề trục đứng", - "SSE.Views.ChartSettingsDlg.textWinLossSpark": "Win/Loss", "SSE.Views.ChartSettingsDlg.textXAxisTitle": "Tiêu đề Trục X", "SSE.Views.ChartSettingsDlg.textYAxisTitle": "Tiêu đề Trục Y", "SSE.Views.ChartSettingsDlg.textZero": "0", @@ -1516,17 +1506,12 @@ "SSE.Views.Toolbar.textAlignRight": "Căn phải", "SSE.Views.Toolbar.textAlignTop": "Căn trên cùng", "SSE.Views.Toolbar.textAllBorders": "Tất cả viền", - "SSE.Views.Toolbar.textArea": "Vùng", - "SSE.Views.Toolbar.textBar": "Cột", "SSE.Views.Toolbar.textBold": "Đậm", "SSE.Views.Toolbar.textBordersColor": "Màu đường viền", "SSE.Views.Toolbar.textBordersStyle": "Kiểu đường viền", "SSE.Views.Toolbar.textBottomBorders": "Đường viền dưới cùng", "SSE.Views.Toolbar.textCenterBorders": "Đường viền dọc bên trong", - "SSE.Views.Toolbar.textCharts": "Biểu đồ", "SSE.Views.Toolbar.textClockwise": "Góc theo chiều kim đồng hồ", - "SSE.Views.Toolbar.textColumn": "Cột", - "SSE.Views.Toolbar.textColumnSpark": "Cột", "SSE.Views.Toolbar.textCounterCw": "Góc ngược chiều kim đồng hồ", "SSE.Views.Toolbar.textDelLeft": "Chuyển ô sang trái", "SSE.Views.Toolbar.textDelUp": "Chuyển ô lên trên", @@ -1540,29 +1525,21 @@ "SSE.Views.Toolbar.textInsRight": "Chuyển ô sang phải", "SSE.Views.Toolbar.textItalic": "Nghiêng", "SSE.Views.Toolbar.textLeftBorders": "Đường viền bên trái", - "SSE.Views.Toolbar.textLine": "Đường kẻ", - "SSE.Views.Toolbar.textLineSpark": "Đường kẻ", "SSE.Views.Toolbar.textMiddleBorders": "Đường viền ngang bên trong", "SSE.Views.Toolbar.textMoreFormats": "Thêm định dạng", "SSE.Views.Toolbar.textNewColor": "Thêm màu tùy chỉnh mới", "SSE.Views.Toolbar.textNoBorders": "Không viền", "SSE.Views.Toolbar.textOutBorders": "Đường viền ngoài", - "SSE.Views.Toolbar.textPie": "Hình bánh", - "SSE.Views.Toolbar.textPoint": "XY (Phân tán)", "SSE.Views.Toolbar.textPrint": "In", "SSE.Views.Toolbar.textPrintOptions": "Cài đặt In", "SSE.Views.Toolbar.textRightBorders": "Đường viền phải", "SSE.Views.Toolbar.textRotateDown": "Xoay văn bản xuống", "SSE.Views.Toolbar.textRotateUp": "Xoay văn bản lên", - "SSE.Views.Toolbar.textSparks": "Sparklines", - "SSE.Views.Toolbar.textStock": "Cổ phiếu", - "SSE.Views.Toolbar.textSurface": "Bề mặt", "SSE.Views.Toolbar.textTabFile": "File", "SSE.Views.Toolbar.textTabHome": "Trang chủ", "SSE.Views.Toolbar.textTabInsert": "Chèn", "SSE.Views.Toolbar.textTopBorders": "Đường viền trên cùng", "SSE.Views.Toolbar.textUnderline": "Gạch chân", - "SSE.Views.Toolbar.textWinLossSpark": "Win/Loss", "SSE.Views.Toolbar.textZoom": "Thu phóng", "SSE.Views.Toolbar.tipAlignBottom": "Căn dưới cùng", "SSE.Views.Toolbar.tipAlignCenter": "Căn trung tâm", diff --git a/apps/spreadsheeteditor/main/locale/zh.json b/apps/spreadsheeteditor/main/locale/zh.json index 002cff8a5..6831637a4 100644 --- a/apps/spreadsheeteditor/main/locale/zh.json +++ b/apps/spreadsheeteditor/main/locale/zh.json @@ -2,6 +2,18 @@ "cancelButtonText": "取消", "Common.Controllers.Chat.notcriticalErrorTitle": "警告", "Common.Controllers.Chat.textEnterMessage": "在这里输入你的信息", + "Common.define.chartData.textArea": "区域", + "Common.define.chartData.textBar": "条", + "Common.define.chartData.textColumn": "列", + "Common.define.chartData.textLine": "线", + "Common.define.chartData.textPie": "派", + "Common.define.chartData.textPoint": "XY（散射）", + "Common.define.chartData.textStock": "股票", + "Common.define.chartData.textSurface": "平面", + "Common.define.chartData.textColumnSpark": "列", + "Common.define.chartData.textLineSpark": "线", + "Common.define.chartData.textWinLossSpark": "赢/输", + "Common.define.chartData.textSparks": "迷你", "Common.UI.ComboBorderSize.txtNoBorders": "没有边框", "Common.UI.ComboBorderSizeEditable.txtNoBorders": "没有边框", "Common.UI.ComboDataView.emptyComboText": "没有风格", @@ -1128,36 +1140,25 @@ "SSE.Views.ChartSettings.strSparkColor": "颜色", "SSE.Views.ChartSettings.strTemplate": "模板", "SSE.Views.ChartSettings.textAdvanced": "显示高级设置", - "SSE.Views.ChartSettings.textArea": "区域", - "SSE.Views.ChartSettings.textBar": "条", "SSE.Views.ChartSettings.textBorderSizeErr": "输入的值不正确。
请输入介于0 pt和1584 pt之间的值。", "SSE.Views.ChartSettings.textChartType": "更改图表类型", - "SSE.Views.ChartSettings.textColumn": "列", - "SSE.Views.ChartSettings.textColumnSpark": "列", "SSE.Views.ChartSettings.textEditData": "编辑数据和位置", "SSE.Views.ChartSettings.textFirstPoint": "第一点", "SSE.Views.ChartSettings.textHeight": "高低", "SSE.Views.ChartSettings.textHighPoint": "高点", "SSE.Views.ChartSettings.textKeepRatio": "不变比例", "SSE.Views.ChartSettings.textLastPoint": "最后一点", - "SSE.Views.ChartSettings.textLine": "线", - "SSE.Views.ChartSettings.textLineSpark": "线", "SSE.Views.ChartSettings.textLowPoint": "低点", "SSE.Views.ChartSettings.textMarkers": "标记", "SSE.Views.ChartSettings.textNegativePoint": "负点", "SSE.Views.ChartSettings.textNewColor": "添加新的自定义颜色", - "SSE.Views.ChartSettings.textPie": "派", - "SSE.Views.ChartSettings.textPoint": "XY（散射）", "SSE.Views.ChartSettings.textRanges": "数据范围", "SSE.Views.ChartSettings.textSelectData": "选择数据", "SSE.Views.ChartSettings.textShow": "显示", "SSE.Views.ChartSettings.textSize": "大小", - "SSE.Views.ChartSettings.textStock": "股票", "SSE.Views.ChartSettings.textStyle": "类型", - "SSE.Views.ChartSettings.textSurface": "平面", "SSE.Views.ChartSettings.textType": "类型", "SSE.Views.ChartSettings.textWidth": "宽度", - "SSE.Views.ChartSettings.textWinLossSpark": "赢/输", "SSE.Views.ChartSettingsDlg.errorMaxPoints": "错误！每个图表序列的最大点值为4096。", "SSE.Views.ChartSettingsDlg.errorMaxRows": "错误！每个图表的最大数据系列数为255", "SSE.Views.ChartSettingsDlg.errorStockChart": "行顺序不正确。建立股票图表将数据按照以下顺序放置在表格上：
开盘价，最高价格，最低价格，收盘价。", @@ -1165,14 +1166,12 @@ "SSE.Views.ChartSettingsDlg.textAltDescription": "描述", "SSE.Views.ChartSettingsDlg.textAltTip": "视觉对象信息的替代的基于文本的表示，将被视为具有视觉或认知障碍的人阅读，以帮助他们更好地了解图像，自动图像，图表或表中的哪些信息。", "SSE.Views.ChartSettingsDlg.textAltTitle": "标题", - "SSE.Views.ChartSettingsDlg.textArea": "区域", "SSE.Views.ChartSettingsDlg.textAuto": "自动", "SSE.Views.ChartSettingsDlg.textAutoEach": "自动调整", "SSE.Views.ChartSettingsDlg.textAxisCrosses": "轴十字架", "SSE.Views.ChartSettingsDlg.textAxisOptions": "轴的选择", "SSE.Views.ChartSettingsDlg.textAxisPos": "轴的位置", "SSE.Views.ChartSettingsDlg.textAxisSettings": "轴设置", - "SSE.Views.ChartSettingsDlg.textBar": "条", "SSE.Views.ChartSettingsDlg.textBetweenTickMarks": "刻度线之间", "SSE.Views.ChartSettingsDlg.textBillions": "十亿", "SSE.Views.ChartSettingsDlg.textBottom": "底部", @@ -1180,8 +1179,6 @@ "SSE.Views.ChartSettingsDlg.textCenter": "中心", "SSE.Views.ChartSettingsDlg.textChartElementsLegend": "图表元素＆图表图例", "SSE.Views.ChartSettingsDlg.textChartTitle": "图表标题", - "SSE.Views.ChartSettingsDlg.textColumn": "列", - "SSE.Views.ChartSettingsDlg.textColumnSpark": "列", "SSE.Views.ChartSettingsDlg.textCross": "交叉", "SSE.Views.ChartSettingsDlg.textCustom": "自定义", "SSE.Views.ChartSettingsDlg.textDataColumns": "在列中", @@ -1222,9 +1219,7 @@ "SSE.Views.ChartSettingsDlg.textLegendPos": "传说", "SSE.Views.ChartSettingsDlg.textLegendRight": "右", "SSE.Views.ChartSettingsDlg.textLegendTop": "顶部", - "SSE.Views.ChartSettingsDlg.textLine": "折线图", "SSE.Views.ChartSettingsDlg.textLines": "行 ", - "SSE.Views.ChartSettingsDlg.textLineSpark": "线", "SSE.Views.ChartSettingsDlg.textLocationRange": "位置范围", "SSE.Views.ChartSettingsDlg.textLow": "低", "SSE.Views.ChartSettingsDlg.textMajor": "主要", @@ -1245,8 +1240,6 @@ "SSE.Views.ChartSettingsDlg.textOut": "向外", "SSE.Views.ChartSettingsDlg.textOuterTop": "外顶", "SSE.Views.ChartSettingsDlg.textOverlay": "覆盖", - "SSE.Views.ChartSettingsDlg.textPie": "派", - "SSE.Views.ChartSettingsDlg.textPoint": "XY（散射）", "SSE.Views.ChartSettingsDlg.textReverse": "值相反的顺序", "SSE.Views.ChartSettingsDlg.textReverseOrder": "相反的顺序", "SSE.Views.ChartSettingsDlg.textRight": "右", @@ -1267,10 +1260,8 @@ "SSE.Views.ChartSettingsDlg.textSingle": "单一的迷你图", "SSE.Views.ChartSettingsDlg.textSmooth": "光滑", "SSE.Views.ChartSettingsDlg.textSparkRanges": "迷你图范围", - "SSE.Views.ChartSettingsDlg.textStock": "股票", "SSE.Views.ChartSettingsDlg.textStraight": "直行", "SSE.Views.ChartSettingsDlg.textStyle": "类型", - "SSE.Views.ChartSettingsDlg.textSurface": "平面", "SSE.Views.ChartSettingsDlg.textTenMillions": "10 000 000", "SSE.Views.ChartSettingsDlg.textTenThousands": "10 000", "SSE.Views.ChartSettingsDlg.textThousands": "成千上万", @@ -1287,7 +1278,6 @@ "SSE.Views.ChartSettingsDlg.textVertAxis": "垂直轴", "SSE.Views.ChartSettingsDlg.textVertGrid": "垂直网格线", "SSE.Views.ChartSettingsDlg.textVertTitle": "垂直轴标题", - "SSE.Views.ChartSettingsDlg.textWinLossSpark": "赢/输", "SSE.Views.ChartSettingsDlg.textXAxisTitle": "X轴标题", "SSE.Views.ChartSettingsDlg.textYAxisTitle": "Y轴标题", "SSE.Views.ChartSettingsDlg.textZero": "零", @@ -2050,19 +2040,14 @@ "SSE.Views.Toolbar.textAlignRight": "右对齐", "SSE.Views.Toolbar.textAlignTop": "顶端对齐", "SSE.Views.Toolbar.textAllBorders": "所有边框", - "SSE.Views.Toolbar.textArea": "区域", - "SSE.Views.Toolbar.textBar": "条", "SSE.Views.Toolbar.textBold": "加粗", "SSE.Views.Toolbar.textBordersColor": "边框颜色", "SSE.Views.Toolbar.textBordersStyle": "边框风格", "SSE.Views.Toolbar.textBottom": "底部： ", "SSE.Views.Toolbar.textBottomBorders": "底部边界", "SSE.Views.Toolbar.textCenterBorders": "内部垂直边界", - "SSE.Views.Toolbar.textCharts": "图表", "SSE.Views.Toolbar.textClearPrintArea": "清除打印区域", "SSE.Views.Toolbar.textClockwise": "顺时针方向角", - "SSE.Views.Toolbar.textColumn": "列", - "SSE.Views.Toolbar.textColumnSpark": "列", "SSE.Views.Toolbar.textCounterCw": "角逆时针", "SSE.Views.Toolbar.textDelLeft": "移动单元格", "SSE.Views.Toolbar.textDelUp": "向上移动单元格", @@ -2078,8 +2063,6 @@ "SSE.Views.Toolbar.textLandscape": "横向", "SSE.Views.Toolbar.textLeft": "左： ", "SSE.Views.Toolbar.textLeftBorders": "左边界", - "SSE.Views.Toolbar.textLine": "线", - "SSE.Views.Toolbar.textLineSpark": "线", "SSE.Views.Toolbar.textMarginsLast": "最后自定义", "SSE.Views.Toolbar.textMarginsNarrow": "缩小", "SSE.Views.Toolbar.textMarginsNormal": "正常", @@ -2090,8 +2073,6 @@ "SSE.Views.Toolbar.textNoBorders": "没有边框", "SSE.Views.Toolbar.textOutBorders": "境外", "SSE.Views.Toolbar.textPageMarginsCustom": "自定义边距", - "SSE.Views.Toolbar.textPie": "派", - "SSE.Views.Toolbar.textPoint": "XY（散射）", "SSE.Views.Toolbar.textPortrait": "肖像", "SSE.Views.Toolbar.textPrint": "打印", "SSE.Views.Toolbar.textPrintOptions": "打印设置", @@ -2100,13 +2081,10 @@ "SSE.Views.Toolbar.textRotateDown": "旋转90°", "SSE.Views.Toolbar.textRotateUp": "旋转270°", "SSE.Views.Toolbar.textSetPrintArea": "设置打印区域", - "SSE.Views.Toolbar.textSparks": "迷你", - "SSE.Views.Toolbar.textStock": "股票", "SSE.Views.Toolbar.textStrikeout": "删除线", "SSE.Views.Toolbar.textSubscript": "下标", "SSE.Views.Toolbar.textSubSuperscript": "下标/上标", "SSE.Views.Toolbar.textSuperscript": "上标", - "SSE.Views.Toolbar.textSurface": "平面", "SSE.Views.Toolbar.textTabCollaboration": "协作", "SSE.Views.Toolbar.textTabFile": "文件", "SSE.Views.Toolbar.textTabHome": "主页", @@ -2116,7 +2094,6 @@ "SSE.Views.Toolbar.textTop": "顶边： ", "SSE.Views.Toolbar.textTopBorders": "顶部边界", "SSE.Views.Toolbar.textUnderline": "下划线", - "SSE.Views.Toolbar.textWinLossSpark": "赢/输", "SSE.Views.Toolbar.textZoom": "放大", "SSE.Views.Toolbar.tipAlignBottom": "底部对齐", "SSE.Views.Toolbar.tipAlignCenter": "居中对齐", From ad1c4a2a0e934b25e1815e6ee2a4aae54e7fb6ab Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Tue, 19 Nov 2019 12:02:00 +0300 Subject: [PATCH 274/419] [PE] Click on table placeholder --- .../main/app/view/DocumentHolder.js | 81 ++++++++++++++++--- apps/presentationeditor/main/locale/en.json | 1 + 2 files changed, 69 insertions(+), 13 deletions(-) diff --git a/apps/presentationeditor/main/app/view/DocumentHolder.js b/apps/presentationeditor/main/app/view/DocumentHolder.js index 8c56779bf..adf8cee6e 100644 --- a/apps/presentationeditor/main/app/view/DocumentHolder.js +++ b/apps/presentationeditor/main/app/view/DocumentHolder.js @@ -1581,7 +1581,7 @@ define([ me.api.asc_registerPlaceholderCallback(AscCommon.PlaceholderButtonType.Image, _.bind(me.onInsertImage, me, true)); me.api.asc_registerPlaceholderCallback(AscCommon.PlaceholderButtonType.ImageUrl, _.bind(me.onInsertImageUrl, me, true)); me.api.asc_registerPlaceholderCallback(AscCommon.PlaceholderButtonType.Chart, _.bind(me.onClickPlaceholderChart, me)); - me.api.asc_registerPlaceholderCallback(AscCommon.PlaceholderButtonType.Table, _.bind(me.onClickPlaceholder, me, AscCommon.PlaceholderButtonType.Table)); + me.api.asc_registerPlaceholderCallback(AscCommon.PlaceholderButtonType.Table, _.bind(me.onClickPlaceholderTable, me)); me.api.asc_registerPlaceholderCallback(AscCommon.PlaceholderButtonType.Video, _.bind(me.onClickPlaceholder, me, AscCommon.PlaceholderButtonType.Video)); me.api.asc_registerPlaceholderCallback(AscCommon.PlaceholderButtonType.Audio, _.bind(me.onClickPlaceholder, me, AscCommon.PlaceholderButtonType.Audio)); } @@ -3492,24 +3492,78 @@ define([ this._fromShowPlaceholder = false; }, + onClickPlaceholderTable: function(obj, x, y) { + if (!this.api) return; + var menu = this.placeholderMenuTable, + menuContainer = menu ? this.cmpEl.find(Common.Utils.String.format('#menu-container-{0}', menu.id)) : null, + me = this; + this._fromShowPlaceholder = true; + Common.UI.Menu.Manager.hideAll(); + + if (!menu) { + this.placeholderMenuTable = menu = new Common.UI.Menu({ + items: [ + {template: _.template('
')}, + {caption: me.mniCustomTable, value: 'custom'} + ] + }); + // Prepare menu container + menuContainer = $(Common.Utils.String.format('', menu.id)); + this.cmpEl.append(menuContainer); + menu.render(menuContainer); + menu.cmpEl.attr({tabindex: "-1"}); + menu.on('hide:after', function(){ + if (!me._fromShowPlaceholder) + me.api.asc_uncheckPlaceholders(); + }); + + var picker = new Common.UI.DimensionPicker({ + el: $('#id-placeholder-menu-tablepicker'), + minRows: 8, + minColumns: 10, + maxRows: 8, + maxColumns: 10 + }); + picker.on('select', function(picker, columns, rows){ + me.api.put_Table(columns, rows); + me.fireEvent('editcomplete', me); + }); + menu.on('item:click', function(menu, item, e){ + if (item.value === 'custom') { + (new Common.Views.InsertTableDialog({ + handler: function(result, value) { + if (result == 'ok') + me.api.put_Table(value.columns, value.rows); + me.fireEvent('editcomplete', me); + } + })).show(); + } + }); + } + menuContainer.css({left: x, top : y}); + menuContainer.attr('data-value', 'prevent-canvas-click'); + this._preventClick = true; + menu.show(); + + menu.alignPosition(); + _.delay(function() { + menu.cmpEl.focus(); + }, 10); + this._fromShowPlaceholder = false; + }, + onHidePlaceholderActions: function() { this.placeholderMenuChart && this.placeholderMenuChart.hide(); }, onClickPlaceholder: function(type, obj, x, y) { if (!this.api) return; - - switch (type) { - case AscCommon.PlaceholderButtonType.Table: - break; - case AscCommon.PlaceholderButtonType.Video: - // this.api.addVideo(); - break; - case AscCommon.PlaceholderButtonType.Audio: - // this.api.addAudio(); - break; + if (type == AscCommon.PlaceholderButtonType.Video) { + // this.api.addVideo(); + } else if (type == AscCommon.PlaceholderButtonType.Audio) { + // this.api.addAudio(); } - + this.fireEvent('editcomplete', this); }, insertRowAboveText : 'Row Above', @@ -3687,7 +3741,8 @@ define([ toDictionaryText: 'Add to Dictionary', txtPrintSelection: 'Print Selection', addToLayoutText: 'Add to Layout', - txtResetLayout: 'Reset Slide' + txtResetLayout: 'Reset Slide', + mniCustomTable: 'Insert custom table' }, PE.Views.DocumentHolder || {})); }); \ No newline at end of file diff --git a/apps/presentationeditor/main/locale/en.json b/apps/presentationeditor/main/locale/en.json index a2332c607..a3fabd528 100644 --- a/apps/presentationeditor/main/locale/en.json +++ b/apps/presentationeditor/main/locale/en.json @@ -1133,6 +1133,7 @@ "PE.Views.DocumentHolder.txtUnderbar": "Bar under text", "PE.Views.DocumentHolder.txtUngroup": "Ungroup", "PE.Views.DocumentHolder.vertAlignText": "Vertical Alignment", + "PE.Views.DocumentHolder.mniCustomTable": "Insert custom table", "PE.Views.DocumentPreview.goToSlideText": "Go to Slide", "PE.Views.DocumentPreview.slideIndexText": "Slide {0} of {1}", "PE.Views.DocumentPreview.txtClose": "Close slideshow", From db8a18486d65dd6892e905e3222d0867a3158910 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Tue, 19 Nov 2019 13:12:38 +0300 Subject: [PATCH 275/419] [DE] Refactoring control settings, add translation --- .../main/app/view/ControlSettingsDialog.js | 6 ++++-- apps/documenteditor/main/app/view/Toolbar.js | 16 +++++++------- apps/documenteditor/main/locale/en.json | 21 +++++++++++++++++++ 3 files changed, 33 insertions(+), 10 deletions(-) diff --git a/apps/documenteditor/main/app/view/ControlSettingsDialog.js b/apps/documenteditor/main/app/view/ControlSettingsDialog.js index 3d9e3a31e..99d10656c 100644 --- a/apps/documenteditor/main/app/view/ControlSettingsDialog.js +++ b/apps/documenteditor/main/app/view/ControlSettingsDialog.js @@ -51,7 +51,7 @@ define([ 'text!documenteditor/main/app/template/ControlSettingsDialog.template', DE.Views.ControlSettingsDialog = Common.Views.AdvancedSettingsWindow.extend(_.extend({ options: { contentWidth: 310, - height: 412, + height: 392, toggleGroup: 'control-adv-settings-group', storageName: 'de-control-settings-adv-category' }, @@ -344,6 +344,7 @@ define([ 'text!documenteditor/main/app/template/ControlSettingsDialog.template', //for list controls this.btnsCategory[2].setVisible(type == Asc.c_oAscContentControlSpecificType.ComboBox || type == Asc.c_oAscContentControlSpecificType.DropDownList); if (type == Asc.c_oAscContentControlSpecificType.ComboBox || type == Asc.c_oAscContentControlSpecificType.DropDownList) { + this.btnsCategory[2].setCaption(type == Asc.c_oAscContentControlSpecificType.ComboBox ? this.textCombobox : this.textDropDown); var specProps = (type == Asc.c_oAscContentControlSpecificType.ComboBox) ? props.get_ComboBoxPr() : props.get_DropDownListPr(); if (specProps) { var count = specProps.get_ItemsCount(); @@ -648,9 +649,10 @@ define([ 'text!documenteditor/main/app/template/ControlSettingsDialog.template', textUp: 'Up', textDown: 'Down', textCombobox: 'Combo box', + textDropDown: 'Drop-down list', textDisplayName: 'Display name', textValue: 'Value', - textDate: 'Date Format', + textDate: 'Date format', textLang: 'Language', textFormat: 'Display the date like this', textCheckbox: 'Check box', diff --git a/apps/documenteditor/main/app/view/Toolbar.js b/apps/documenteditor/main/app/view/Toolbar.js index cffc823cb..a60980b14 100644 --- a/apps/documenteditor/main/app/view/Toolbar.js +++ b/apps/documenteditor/main/app/view/Toolbar.js @@ -638,43 +638,43 @@ define([ items: [ { caption: this.textPlainControl, - iconCls: 'mnu-control-plain', + // iconCls: 'mnu-control-plain', value: 'plain' }, { caption: this.textRichControl, - iconCls: 'mnu-control-rich', + // iconCls: 'mnu-control-rich', value: 'rich' }, { caption: this.textPictureControl, - iconCls: 'mnu-control-rich', + // iconCls: 'mnu-control-rich', value: 'picture' }, { caption: this.textComboboxControl, - iconCls: 'mnu-control-rich', + // iconCls: 'mnu-control-rich', value: 'combobox' }, { caption: this.textDropdownControl, - iconCls: 'mnu-control-rich', + // iconCls: 'mnu-control-rich', value: 'dropdown' }, { caption: this.textDateControl, - iconCls: 'mnu-control-rich', + // iconCls: 'mnu-control-rich', value: 'date' }, { caption: this.textCheckboxControl, - iconCls: 'mnu-control-rich', + // iconCls: 'mnu-control-rich', value: 'checkbox' }, {caption: '--'}, { caption: this.textRemoveControl, - iconCls: 'mnu-control-remove', + // iconCls: 'mnu-control-remove', value: 'remove' }, {caption: '--'}, diff --git a/apps/documenteditor/main/locale/en.json b/apps/documenteditor/main/locale/en.json index b9a16dd19..b749848be 100644 --- a/apps/documenteditor/main/locale/en.json +++ b/apps/documenteditor/main/locale/en.json @@ -1088,6 +1088,22 @@ "DE.Views.ControlSettingsDialog.textTitle": "Content Control Settings", "DE.Views.ControlSettingsDialog.txtLockDelete": "Content control cannot be deleted", "DE.Views.ControlSettingsDialog.txtLockEdit": "Contents cannot be edited", + "DE.Views.ControlSettingsDialog.strGeneral": "General", + "DE.Views.ControlSettingsDialog.textAdd": "Add", + "DE.Views.ControlSettingsDialog.textChange": "Edit", + "DE.Views.ControlSettingsDialog.textDelete": "Delete", + "DE.Views.ControlSettingsDialog.textUp": "Up", + "DE.Views.ControlSettingsDialog.textDown": "Down", + "DE.Views.ControlSettingsDialog.textCombobox": "Combo box", + "DE.Views.ControlSettingsDialog.textDropDown": "Drop-down list", + "DE.Views.ControlSettingsDialog.textDisplayName": "Display name", + "DE.Views.ControlSettingsDialog.textValue": "Value", + "DE.Views.ControlSettingsDialog.textDate": "Date format", + "DE.Views.ControlSettingsDialog.textLang": "Language", + "DE.Views.ControlSettingsDialog.textFormat": "Display the date like this", + "DE.Views.ControlSettingsDialog.textCheckbox": "Check box", + "DE.Views.ControlSettingsDialog.textChecked": "Checked symbol", + "DE.Views.ControlSettingsDialog.textUnchecked": "Unchecked symbol", "DE.Views.CustomColumnsDialog.textColumns": "Number of columns", "DE.Views.CustomColumnsDialog.textSeparator": "Column divider", "DE.Views.CustomColumnsDialog.textSpacing": "Spacing between columns", @@ -2247,6 +2263,11 @@ "DE.Views.Toolbar.txtScheme9": "Foundry", "DE.Views.Toolbar.capBtnInsSymbol": "Symbol", "DE.Views.Toolbar.tipInsertSymbol": "Insert symbol", + "DE.Views.Toolbar.textPictureControl": "Picture", + "DE.Views.Toolbar.textComboboxControl": "Combo box", + "DE.Views.Toolbar.textCheckboxControl": "Check box", + "DE.Views.Toolbar.textDropdownControl": "Drop-down list", + "DE.Views.Toolbar.textDateControl": "Date", "DE.Views.WatermarkSettingsDialog.textAuto": "Auto", "DE.Views.WatermarkSettingsDialog.textBold": "Bold", "DE.Views.WatermarkSettingsDialog.textColor": "Text color", From 949b83df4a769f54898c87570cbf711ba9983aee Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Tue, 19 Nov 2019 13:28:29 +0300 Subject: [PATCH 276/419] [DE] Add translation --- apps/documenteditor/main/locale/en.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/apps/documenteditor/main/locale/en.json b/apps/documenteditor/main/locale/en.json index ad5eb6581..bc9a61c79 100644 --- a/apps/documenteditor/main/locale/en.json +++ b/apps/documenteditor/main/locale/en.json @@ -1370,6 +1370,10 @@ "DE.Views.DropcapSettingsAdvanced.textWidth": "Width", "DE.Views.DropcapSettingsAdvanced.tipFontName": "Font", "DE.Views.DropcapSettingsAdvanced.txtNoBorders": "No borders", + "DE.Views.EditListItemDialog.textDisplayName": "Display name", + "DE.Views.EditListItemDialog.textValue": "Value", + "DE.Views.EditListItemDialog.textNameError": "Display name must not be empty.", + "DE.Views.EditListItemDialog.textValueError": "An item with the same value already exists.", "DE.Views.FileMenu.btnBackCaption": "Open file location", "DE.Views.FileMenu.btnCloseMenuCaption": "Close Menu", "DE.Views.FileMenu.btnCreateNewCaption": "Create New", From 6c55bd0f24fefee7fde4237cf535ad4ab1a83733 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Tue, 19 Nov 2019 15:43:26 +0300 Subject: [PATCH 277/419] Image settings: fix buttons size --- .../main/app/template/ImageSettings.template | 6 +++--- .../main/app/view/ImageSettings.js | 9 ++++++-- .../main/app/template/ImageSettings.template | 6 +++--- .../main/app/view/ImageSettings.js | 21 ++++++++++++------- .../main/app/template/ImageSettings.template | 4 ++-- .../main/app/view/ImageSettings.js | 5 +++-- 6 files changed, 31 insertions(+), 20 deletions(-) diff --git a/apps/documenteditor/main/app/template/ImageSettings.template b/apps/documenteditor/main/app/template/ImageSettings.template index 8abc9eaf0..9fae4b54e 100644 --- a/apps/documenteditor/main/app/template/ImageSettings.template +++ b/apps/documenteditor/main/app/template/ImageSettings.template @@ -14,17 +14,17 @@ - + - + -
+
diff --git a/apps/documenteditor/main/app/view/ImageSettings.js b/apps/documenteditor/main/app/view/ImageSettings.js index 527037a2b..d0717940b 100644 --- a/apps/documenteditor/main/app/view/ImageSettings.js +++ b/apps/documenteditor/main/app/view/ImageSettings.js @@ -159,6 +159,10 @@ define([ }); this.lockedControls.push(this.btnFitMargins); + var w = Math.max(this.btnOriginalSize.cmpEl.width(), this.btnFitMargins.cmpEl.width()); + this.btnOriginalSize.cmpEl.width(w); + this.btnFitMargins.cmpEl.width(w); + this.btnInsertFromFile = new Common.UI.Button({ el: $('#image-button-from-file') }); @@ -229,6 +233,7 @@ define([ this.btnFlipH.on('click', _.bind(this.onBtnFlipClick, this)); this.lockedControls.push(this.btnFlipH); + var w = this.btnOriginalSize.cmpEl.outerWidth(); this.btnCrop = new Common.UI.Button({ cls: 'btn-text-split-default', caption: this.textCrop, @@ -236,9 +241,9 @@ define([ enableToggle: true, allowDepress: true, pressed: this._state.cropMode, - width: 100, + width: w, menu : new Common.UI.Menu({ - style : 'min-width: 100px;', + style : 'min-width:' + w + 'px;', items: [ { caption: this.textCrop, diff --git a/apps/presentationeditor/main/app/template/ImageSettings.template b/apps/presentationeditor/main/app/template/ImageSettings.template index 75032587c..6b41d6507 100644 --- a/apps/presentationeditor/main/app/template/ImageSettings.template +++ b/apps/presentationeditor/main/app/template/ImageSettings.template @@ -14,17 +14,17 @@ - + - + -
+
diff --git a/apps/presentationeditor/main/app/view/ImageSettings.js b/apps/presentationeditor/main/app/view/ImageSettings.js index 439bced4d..51a8dabca 100644 --- a/apps/presentationeditor/main/app/view/ImageSettings.js +++ b/apps/presentationeditor/main/app/view/ImageSettings.js @@ -143,6 +143,17 @@ define([ this.fireEvent('editcomplete', this); }, this)); + this.btnFitSlide = new Common.UI.Button({ + el: $('#image-button-fit-slide') + }); + this.lockedControls.push(this.btnFitSlide); + this.btnFitSlide.on('click', _.bind(this.setFitSlide, this)); + + var w = Math.max(this.btnOriginalSize.cmpEl.width(), this.btnFitSlide.cmpEl.width()); + this.btnOriginalSize.cmpEl.width(w); + this.btnFitSlide.cmpEl.width(w); + + w = this.btnOriginalSize.cmpEl.outerWidth(); this.btnCrop = new Common.UI.Button({ cls: 'btn-text-split-default', caption: this.textCrop, @@ -150,9 +161,9 @@ define([ enableToggle: true, allowDepress: true, pressed: this._state.cropMode, - width: 100, + width: w, menu : new Common.UI.Menu({ - style : 'min-width: 100px;', + style : 'min-width:' + w + 'px;', items: [ { caption: this.textCrop, @@ -176,12 +187,6 @@ define([ this.btnCrop.menu.on('item:click', _.bind(this.onCropMenu, this)); this.lockedControls.push(this.btnCrop); - this.btnFitSlide = new Common.UI.Button({ - el: $('#image-button-fit-slide') - }); - this.lockedControls.push(this.btnFitSlide); - this.btnFitSlide.on('click', _.bind(this.setFitSlide, this)); - this.btnRotate270 = new Common.UI.Button({ cls: 'btn-toolbar', iconCls: 'rotate-270', diff --git a/apps/spreadsheeteditor/main/app/template/ImageSettings.template b/apps/spreadsheeteditor/main/app/template/ImageSettings.template index 8e90e9ace..ace66d110 100644 --- a/apps/spreadsheeteditor/main/app/template/ImageSettings.template +++ b/apps/spreadsheeteditor/main/app/template/ImageSettings.template @@ -21,12 +21,12 @@ diff --git a/apps/spreadsheeteditor/main/app/view/ImageSettings.js b/apps/spreadsheeteditor/main/app/view/ImageSettings.js index 525ffa781..1f19a8851 100644 --- a/apps/spreadsheeteditor/main/app/view/ImageSettings.js +++ b/apps/spreadsheeteditor/main/app/view/ImageSettings.js @@ -199,6 +199,7 @@ define([ this.lblReplace = $('#image-lbl-replace'); + var w = this.btnOriginalSize.cmpEl.outerWidth(); this.btnCrop = new Common.UI.Button({ cls: 'btn-text-split-default', caption: this.textCrop, @@ -206,9 +207,9 @@ define([ enableToggle: true, allowDepress: true, pressed: this._state.cropMode, - width: 100, + width: w, menu : new Common.UI.Menu({ - style : 'min-width: 100px;', + style : 'min-width:' + w + 'px;', items: [ { caption: this.textCrop, From 90d65ddff54cd10b9e8d82a648a47859747dca03 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Tue, 19 Nov 2019 17:05:02 +0300 Subject: [PATCH 278/419] [PE][SSE] Change bullet in the list settings dialog --- .../main/lib/view/ListSettingsDialog.js | 69 ++++++++++++++++--- .../common/main/lib/view/SymbolTableDialog.js | 2 + .../main/app/controller/Toolbar.js | 2 + apps/presentationeditor/main/locale/en.json | 2 + .../main/app/controller/DocumentHolder.js | 4 +- apps/spreadsheeteditor/main/locale/en.json | 2 + 6 files changed, 71 insertions(+), 10 deletions(-) diff --git a/apps/common/main/lib/view/ListSettingsDialog.js b/apps/common/main/lib/view/ListSettingsDialog.js index e0820cd4d..8f783c8d0 100644 --- a/apps/common/main/lib/view/ListSettingsDialog.js +++ b/apps/common/main/lib/view/ListSettingsDialog.js @@ -46,15 +46,16 @@ define([ 'common/main/lib/component/Window', 'common/main/lib/component/MetricSpinner', 'common/main/lib/component/ThemeColorPalette', - 'common/main/lib/component/ColorButton' + 'common/main/lib/component/ColorButton', + 'common/main/lib/view/SymbolTableDialog' ], function () { 'use strict'; Common.Views.ListSettingsDialog = Common.UI.Window.extend(_.extend({ options: { type: 0, // 0 - markers, 1 - numbers width: 230, - height: 156, - style: 'min-width: 230px;', + height: 200, + style: 'min-width: 240px;', cls: 'modal-dlg', split: false, buttons: ['ok', 'cancel'] @@ -64,20 +65,25 @@ define([ this.type = options.type || 0; _.extend(this.options, { - title: this.txtTitle, - height: this.type==1 ? 190 : 156 + title: this.txtTitle }, options || {}); this.template = [ '
', - '
', + '
', '
', '
', - '
', + '
', '
', '
', + '<% if (type == 0) { %>', + '
', + '', + '', + '
', + '<% } %>', '<% if (type == 1) { %>', - '
', + '
', '
', '
', '<% } %>', @@ -163,6 +169,13 @@ define([ } }); + this.btnEdit = new Common.UI.Button({ + el: $window.find('#id-dlg-list-edit'), + hint: this.tipChange + }); + this.btnEdit.on('click', _.bind(this.onEditBullet, this)); + this.btnEdit.cmpEl.css({'font-size': '12px'}); + this.afterRender(); }, @@ -186,6 +199,36 @@ define([ } }, + onEditBullet: function() { + var me = this, + props = me.bulletProps, + handler = function(dlg, result, settings) { + if (result == 'ok') { + props.changed = true; + props.code = settings.code; + props.font = settings.font; + props.symbol = settings.symbol; + props.font && me.btnEdit.cmpEl.css('font-family', props.font); + settings.symbol && me.btnEdit.setCaption(settings.symbol); + if (me._changedProps) { + me._changedProps.asc_putBulletFont(props.font); + me._changedProps.asc_putBulletSymbol(props.symbol); + } + } + }, + win = new Common.Views.SymbolTableDialog({ + api: me.options.api, + lang: me.options.interfaceLang, + modal: true, + type: 0, + font: props.font, + symbol: props.symbol, + handler: handler + }); + win.show(); + win.on('symbol:dblclick', handler); + }, + _handleInput: function(state) { if (this.options.handler) { this.options.handler.call(this, state, this._changedProps); @@ -228,6 +271,12 @@ define([ if (!isselected) this.colors.clearSelection(); } else this.colors.select(color,true); + + if (this.type==0) { + this.bulletProps = {symbol: props.asc_getBulletSymbol(), font: props.asc_getBulletFont()}; + this.bulletProps.font && this.btnEdit.cmpEl.css('font-family', this.bulletProps.font); + this.bulletProps.symbol && this.btnEdit.setCaption(this.bulletProps.symbol); + } } this._changedProps = new Asc.asc_CParagraphProperty(); }, @@ -237,6 +286,8 @@ define([ txtColor: 'Color', txtOfText: '% of text', textNewColor: 'Add New Custom Color', - txtStart: 'Start at' + txtStart: 'Start at', + txtBullet: 'Bullet', + tipChange: 'Change bullet' }, Common.Views.ListSettingsDialog || {})) }); \ No newline at end of file diff --git a/apps/common/main/lib/view/SymbolTableDialog.js b/apps/common/main/lib/view/SymbolTableDialog.js index d048cdc99..a0e808329 100644 --- a/apps/common/main/lib/view/SymbolTableDialog.js +++ b/apps/common/main/lib/view/SymbolTableDialog.js @@ -488,6 +488,8 @@ define([ if (options.code) { nCurrentSymbol = options.code; + } else if (options.symbol) { + nCurrentSymbol = this.fixedCharCodeAt(options.symbol, 0); } if (init && this.options.lang && this.options.lang != 'en') { diff --git a/apps/presentationeditor/main/app/controller/Toolbar.js b/apps/presentationeditor/main/app/controller/Toolbar.js index c40f6b3cb..da92ea020 100644 --- a/apps/presentationeditor/main/app/controller/Toolbar.js +++ b/apps/presentationeditor/main/app/controller/Toolbar.js @@ -1126,8 +1126,10 @@ define([ } if (props) { (new Common.Views.ListSettingsDialog({ + api: me.api, props: props, type: type, + interfaceLang: me.toolbar.mode.lang, handler: function(result, value) { if (result == 'ok') { if (me.api) { diff --git a/apps/presentationeditor/main/locale/en.json b/apps/presentationeditor/main/locale/en.json index 9af942158..730c9b098 100644 --- a/apps/presentationeditor/main/locale/en.json +++ b/apps/presentationeditor/main/locale/en.json @@ -123,6 +123,8 @@ "Common.Views.ListSettingsDialog.txtSize": "Size", "Common.Views.ListSettingsDialog.txtStart": "Start at", "Common.Views.ListSettingsDialog.txtTitle": "List Settings", + "Common.Views.ListSettingsDialog.txtBullet": "Bullet", + "Common.Views.ListSettingsDialog.tipChange": "Change bullet", "Common.Views.OpenDialog.closeButtonText": "Close File", "Common.Views.OpenDialog.txtEncoding": "Encoding ", "Common.Views.OpenDialog.txtIncorrectPwd": "Password is incorrect.", diff --git a/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js b/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js index 6c332e45b..a1a5434ff 100644 --- a/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js +++ b/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js @@ -763,8 +763,10 @@ define([ } if (props) { (new Common.Views.ListSettingsDialog({ + api: me.api, props: props, - type: this.api.asc_getCurrentListType().get_ListType(), + type: me.api.asc_getCurrentListType().get_ListType(), + interfaceLang: me.permissions.lang, handler: function(result, value) { if (result == 'ok') { if (me.api) { diff --git a/apps/spreadsheeteditor/main/locale/en.json b/apps/spreadsheeteditor/main/locale/en.json index 487e071c4..ff5e1a54f 100644 --- a/apps/spreadsheeteditor/main/locale/en.json +++ b/apps/spreadsheeteditor/main/locale/en.json @@ -113,6 +113,8 @@ "Common.Views.ListSettingsDialog.txtSize": "Size", "Common.Views.ListSettingsDialog.txtStart": "Start at", "Common.Views.ListSettingsDialog.txtTitle": "List Settings", + "Common.Views.ListSettingsDialog.txtBullet": "Bullet", + "Common.Views.ListSettingsDialog.tipChange": "Change bullet", "Common.Views.OpenDialog.closeButtonText": "Close File", "Common.Views.OpenDialog.txtColon": "Colon", "Common.Views.OpenDialog.txtComma": "Comma", From b56f407328cd0c2e70519a9cd417e781811424dc Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Tue, 19 Nov 2019 17:34:52 +0300 Subject: [PATCH 279/419] [PE] Change default state for slide settings(show color fill mode) --- .../main/app/template/SlideSettings.template | 2 +- .../main/app/view/SlideSettings.js | 31 ++++++++++--------- 2 files changed, 17 insertions(+), 16 deletions(-) diff --git a/apps/presentationeditor/main/app/template/SlideSettings.template b/apps/presentationeditor/main/app/template/SlideSettings.template index fbe24606d..ce824dadc 100644 --- a/apps/presentationeditor/main/app/template/SlideSettings.template +++ b/apps/presentationeditor/main/app/template/SlideSettings.template @@ -11,7 +11,7 @@
- +
-
+
-
+
diff --git a/apps/presentationeditor/main/app/view/SlideSettings.js b/apps/presentationeditor/main/app/view/SlideSettings.js index 11ef1102a..a7708b734 100644 --- a/apps/presentationeditor/main/app/view/SlideSettings.js +++ b/apps/presentationeditor/main/app/view/SlideSettings.js @@ -129,9 +129,23 @@ define([ data: this._arrFillSrc, disabled: true }); - this.cmbFillSrc.setValue(''); + this.cmbFillSrc.setValue(Asc.c_oAscFill.FILL_TYPE_SOLID); this.cmbFillSrc.on('selected', _.bind(this.onFillSrcSelect, this)); + this.btnBackColor = new Common.UI.ColorButton({ + style: "width:45px;", + disabled: true, + menu : new Common.UI.Menu({ + items: [ + { template: _.template('
') }, + { template: _.template('' + this.textNewColor + '') } + ] + }) + }); + this.btnBackColor.render( $('#slide-back-color-btn')); + this.btnBackColor.setColor('ffffff'); + this.FillItems.push(this.btnBackColor); + this.FillColorContainer = $('#slide-panel-color-fill'); this.FillImageContainer = $('#slide-panel-image-fill'); this.FillPatternContainer = $('#slide-panel-pattern-fill'); @@ -1056,20 +1070,7 @@ define([ UpdateThemeColors: function() { if (this._initSettings) return; - if (!this.btnBackColor) { - this.btnBackColor = new Common.UI.ColorButton({ - style: "width:45px;", - disabled: true, - menu : new Common.UI.Menu({ - items: [ - { template: _.template('
') }, - { template: _.template('' + this.textNewColor + '') } - ] - }) - }); - this.btnBackColor.render( $('#slide-back-color-btn')); - this.btnBackColor.setColor('ffffff'); - this.FillItems.push(this.btnBackColor); + if (!this.colorsBack) { this.colorsBack = new Common.UI.ThemeColorPalette({ el: $('#slide-back-color-menu'), value: 'ffffff', From e3876d82e644c9b246ae89c7ef3ba8f64142f893 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Wed, 20 Nov 2019 11:20:05 +0300 Subject: [PATCH 280/419] [SSE] Fix Bug 43587. Hide list settings for chart title --- apps/spreadsheeteditor/main/app/controller/DocumentHolder.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js b/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js index a1a5434ff..7d94140a5 100644 --- a/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js +++ b/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js @@ -1831,6 +1831,8 @@ define([ documentHolder.menuParagraphDirection.setVisible(false); // убрать после того, как заголовок можно будет растягивать по вертикали!! documentHolder.pmiTextAdvanced.setVisible(false); documentHolder.textInShapeMenu.items[9].setVisible(false); + documentHolder.menuParagraphBullets.setVisible(false); + documentHolder.textInShapeMenu.items[3].setVisible(false); documentHolder.pmiTextCopy.setDisabled(false); if (showMenu) this.showPopupMenu(documentHolder.textInShapeMenu, {}, event); } From bf9925d0dbdaf7df1ac370671ab3be72ee60cd81 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Wed, 20 Nov 2019 11:36:05 +0300 Subject: [PATCH 281/419] [SSE] Bug 43587 --- apps/spreadsheeteditor/main/app/controller/DocumentHolder.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js b/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js index 7d94140a5..e4b1b96e8 100644 --- a/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js +++ b/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js @@ -1689,10 +1689,12 @@ define([ var hyperinfo = cellinfo.asc_getHyperlink(), can_add_hyperlink = this.api.asc_canAddShapeHyperlink(); + documentHolder.menuParagraphBullets.setVisible(istextchartmenu!==true); documentHolder.menuHyperlinkShape.setVisible(istextshapemenu && can_add_hyperlink!==false && hyperinfo); documentHolder.menuAddHyperlinkShape.setVisible(istextshapemenu && can_add_hyperlink!==false && !hyperinfo); documentHolder.menuParagraphVAlign.setVisible(istextchartmenu!==true && !isEquation); // убрать после того, как заголовок можно будет растягивать по вертикали!! documentHolder.menuParagraphDirection.setVisible(istextchartmenu!==true && !isEquation); // убрать после того, как заголовок можно будет растягивать по вертикали!! + documentHolder.textInShapeMenu.items[3].setVisible(istextchartmenu!==true || istextshapemenu && can_add_hyperlink!==false); documentHolder.pmiTextAdvanced.setVisible(documentHolder.pmiTextAdvanced.textInfo!==undefined); _.each(documentHolder.textInShapeMenu.items, function(item) { From 00caf68082b8f029d73d5ca93cc0715176ef0bb2 Mon Sep 17 00:00:00 2001 From: Maxim Kadushkin Date: Wed, 20 Nov 2019 12:05:59 +0300 Subject: [PATCH 282/419] [component] hide 'check' marker for custom style of 'checked' state --- apps/common/main/lib/component/MenuItem.js | 1 + apps/common/main/resources/less/dropdown-menu.less | 13 ++++++++++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/apps/common/main/lib/component/MenuItem.js b/apps/common/main/lib/component/MenuItem.js index c54501185..6d710cbec 100644 --- a/apps/common/main/lib/component/MenuItem.js +++ b/apps/common/main/lib/component/MenuItem.js @@ -183,6 +183,7 @@ define([ if (this.checkable && firstChild) { firstChild.toggleClass('checkable', this.checkable); + firstChild.toggleClass('no-checkmark', this.options.checkmark===false); firstChild.toggleClass('checked', this.checked); if (!_.isEmpty(this.iconCls)) { firstChild.css('background-image', 'none'); diff --git a/apps/common/main/resources/less/dropdown-menu.less b/apps/common/main/resources/less/dropdown-menu.less index 0c6a49ffb..3c645efd1 100644 --- a/apps/common/main/resources/less/dropdown-menu.less +++ b/apps/common/main/resources/less/dropdown-menu.less @@ -47,7 +47,7 @@ background-color: @dropdown-link-hover-bg; } - .checked { + .checked:not(.no-checkmark) { &:before { content: ''; width: 16px; @@ -71,11 +71,18 @@ .menu-item-icon { display: inline-block; float: left; - width: 22px; - height: 22px; + width: 20px; + height: 20px; margin: -3px 5px 0 -15px; .background-ximage-v2('popupmenu-btns.png', 66px, @commonimage: false); background-repeat: no-repeat; } + + .no-checkmark.checked { + .menu-item-icon { + background-color: @primary; + border-radius: 2px; + } + } } } \ No newline at end of file From fa5c9d5626879baac102e03df7238cf1afeda52f Mon Sep 17 00:00:00 2001 From: Maxim Kadushkin Date: Wed, 20 Nov 2019 12:42:39 +0300 Subject: [PATCH 283/419] [all] changed 'notify' button state --- apps/common/main/resources/less/buttons.less | 27 +++++++++++++++++++ .../main/app/controller/Main.js | 6 ++--- .../main/app/controller/Toolbar.js | 2 +- apps/documenteditor/main/app/view/Toolbar.js | 14 ++++------ .../main/app/controller/Main.js | 6 ++--- .../main/app/controller/Toolbar.js | 4 +-- .../main/app/view/Toolbar.js | 13 ++++----- .../main/app/controller/Main.js | 4 +-- .../main/app/controller/Toolbar.js | 2 +- .../main/app/view/Toolbar.js | 13 ++++----- 10 files changed, 54 insertions(+), 37 deletions(-) diff --git a/apps/common/main/resources/less/buttons.less b/apps/common/main/resources/less/buttons.less index 5d9654e57..9b38ec6a7 100644 --- a/apps/common/main/resources/less/buttons.less +++ b/apps/common/main/resources/less/buttons.less @@ -84,6 +84,33 @@ padding: 0 4px; } } + + &.notify { + .icon { + &::after { + content: ' '; + position: absolute; + border: 1px solid #000; + border-left: 0 none; + border-right: 0 none; + width: 6px; + height: 3px; + bottom: 4px; + right: 2px; + } + + &::before { + content: ' '; + position: absolute; + width: 10px; + height: 7px; + bottom: 2px; + background-color: #ffd112; + border-radius: 2px; + right: 0; + } + } + } } .btn.icon-top, .btn-group.icon-top { diff --git a/apps/documenteditor/main/app/controller/Main.js b/apps/documenteditor/main/app/controller/Main.js index 27e70e8a1..2679fff35 100644 --- a/apps/documenteditor/main/app/controller/Main.js +++ b/apps/documenteditor/main/app/controller/Main.js @@ -679,7 +679,7 @@ define([ if (this.api && this.appOptions.isEdit && !toolbarView._state.previewmode) { var cansave = this.api.asc_isDocumentCanSave(), forcesave = this.appOptions.forcesave, - isSyncButton = (toolbarView.btnCollabChanges.rendered) ? toolbarView.btnCollabChanges.$icon.hasClass('btn-synch') : false, + isSyncButton = (toolbarView.btnCollabChanges.rendered) ? toolbarView.btnCollabChanges.cmpEl.hasClass('notify') : false, isDisabled = !cansave && !isSyncButton && !forcesave || this._state.isDisconnected || this._state.fastCoauth && this._state.usersCount>1 && !forcesave; toolbarView.btnSave.setDisabled(isDisabled); } @@ -1642,7 +1642,7 @@ define([ var toolbarView = this.getApplication().getController('Toolbar').getView(); if (toolbarView && toolbarView.btnCollabChanges && !toolbarView._state.previewmode) { - var isSyncButton = toolbarView.btnCollabChanges.$icon.hasClass('btn-synch'), + var isSyncButton = toolbarView.btnCollabChanges.cmpEl.hasClass('notify'), forcesave = this.appOptions.forcesave, isDisabled = !isModified && !isSyncButton && !forcesave || this._state.isDisconnected || this._state.fastCoauth && this._state.usersCount>1 && !forcesave; toolbarView.btnSave.setDisabled(isDisabled); @@ -1659,7 +1659,7 @@ define([ var toolbarView = this.getApplication().getController('Toolbar').getView(); if (toolbarView && this.api && !toolbarView._state.previewmode) { - var isSyncButton = toolbarView.btnCollabChanges.$icon.hasClass('btn-synch'), + var isSyncButton = toolbarView.btnCollabChanges.cmpEl.hasClass('notify'), forcesave = this.appOptions.forcesave, isDisabled = !isCanSave && !isSyncButton && !forcesave || this._state.isDisconnected || this._state.fastCoauth && this._state.usersCount>1 && !forcesave; toolbarView.btnSave.setDisabled(isDisabled); diff --git a/apps/documenteditor/main/app/controller/Toolbar.js b/apps/documenteditor/main/app/controller/Toolbar.js index 704255430..144770160 100644 --- a/apps/documenteditor/main/app/controller/Toolbar.js +++ b/apps/documenteditor/main/app/controller/Toolbar.js @@ -985,7 +985,7 @@ define([ var toolbar = this.toolbar; if (this.api) { var isModified = this.api.asc_isDocumentCanSave(); - var isSyncButton = toolbar.btnCollabChanges && toolbar.btnCollabChanges.$icon.hasClass('btn-synch'); + var isSyncButton = toolbar.btnCollabChanges && toolbar.btnCollabChanges.cmpEl.hasClass('notify'); if (!isModified && !isSyncButton && !toolbar.mode.forcesave) return; diff --git a/apps/documenteditor/main/app/view/Toolbar.js b/apps/documenteditor/main/app/view/Toolbar.js index acdb1b86a..062396d6b 100644 --- a/apps/documenteditor/main/app/view/Toolbar.js +++ b/apps/documenteditor/main/app/view/Toolbar.js @@ -2025,7 +2025,7 @@ define([ } this._state.hasCollaborativeChanges = true; - this.btnCollabChanges.$icon.removeClass(this.btnSaveCls).addClass('btn-synch'); + this.btnCollabChanges.cmpEl.addClass('notify'); if (this.showSynchTip) { this.btnCollabChanges.updateHint(''); if (this.synchTooltip === undefined) @@ -2061,8 +2061,8 @@ define([ if ( !this._state.previewmode && this.btnCollabChanges.rendered ) { var me = this; - if ( me.btnCollabChanges.$icon.hasClass('btn-synch') ) { - me.btnCollabChanges.$icon.removeClass('btn-synch').addClass(me.btnSaveCls); + if ( me.btnCollabChanges.cmpEl.hasClass('notify') ) { + me.btnCollabChanges.cmpEl.removeClass('notify'); if (this.synchTooltip) this.synchTooltip.hide(); this.btnCollabChanges.updateHint(this.btnSaveTip); @@ -2085,12 +2085,8 @@ define([ var cls = (length > 1) ? 'btn-save-coauth' : 'btn-save'; if ( cls !== me.btnSaveCls && me.btnCollabChanges.rendered ) { me.btnSaveTip = ((length > 1) ? me.tipSaveCoauth : me.tipSave ) + Common.Utils.String.platformKey('Ctrl+S'); - - if ( !me.btnCollabChanges.$icon.hasClass('btn-synch') ) { - me.btnCollabChanges.$icon.removeClass(me.btnSaveCls).addClass(cls); - me.btnCollabChanges.updateHint(me.btnSaveTip); - - } + me.btnCollabChanges.updateHint(me.btnSaveTip); + me.btnCollabChanges.$icon.removeClass(me.btnSaveCls).addClass(cls); me.btnSaveCls = cls; } }, diff --git a/apps/presentationeditor/main/app/controller/Main.js b/apps/presentationeditor/main/app/controller/Main.js index 8ac192e66..5bbd04965 100644 --- a/apps/presentationeditor/main/app/controller/Main.js +++ b/apps/presentationeditor/main/app/controller/Main.js @@ -463,7 +463,7 @@ define([ if (this.api && this.appOptions.isEdit && this.api.asc_isDocumentCanSave) { var cansave = this.api.asc_isDocumentCanSave(), forcesave = this.appOptions.forcesave, - isSyncButton = (toolbarView.btnCollabChanges.rendered) ? toolbarView.btnCollabChanges.$icon.hasClass('btn-synch') : false, + isSyncButton = (toolbarView.btnCollabChanges.rendered) ? toolbarView.btnCollabChanges.cmpEl.hasClass('notify') : false, isDisabled = !cansave && !isSyncButton && !forcesave || this._state.isDisconnected || this._state.fastCoauth && this._state.usersCount>1 && !forcesave; toolbarView.btnSave.setDisabled(isDisabled); } @@ -1354,7 +1354,7 @@ define([ var toolbarView = this.getApplication().getController('Toolbar').getView('Toolbar'); if (toolbarView && toolbarView.btnCollabChanges) { - var isSyncButton = toolbarView.btnCollabChanges.$icon.hasClass('btn-synch'), + var isSyncButton = toolbarView.btnCollabChanges.cmpEl.hasClass('notify'), forcesave = this.appOptions.forcesave, isDisabled = !isModified && !isSyncButton && !forcesave || this._state.isDisconnected || this._state.fastCoauth && this._state.usersCount>1 && !forcesave; toolbarView.btnSave.setDisabled(isDisabled); @@ -1363,7 +1363,7 @@ define([ onDocumentCanSaveChanged: function (isCanSave) { var toolbarView = this.getApplication().getController('Toolbar').getView('Toolbar'); if ( toolbarView ) { - var isSyncButton = toolbarView.btnCollabChanges.$icon.hasClass('btn-synch'), + var isSyncButton = toolbarView.btnCollabChanges.cmpEl.hasClass('notify'), forcesave = this.appOptions.forcesave, isDisabled = !isCanSave && !isSyncButton && !forcesave || this._state.isDisconnected || this._state.fastCoauth && this._state.usersCount>1 && !forcesave; toolbarView.btnSave.setDisabled(isDisabled); diff --git a/apps/presentationeditor/main/app/controller/Toolbar.js b/apps/presentationeditor/main/app/controller/Toolbar.js index 830ceaa55..c2f5ae14e 100644 --- a/apps/presentationeditor/main/app/controller/Toolbar.js +++ b/apps/presentationeditor/main/app/controller/Toolbar.js @@ -905,7 +905,7 @@ define([ var toolbar = this.toolbar; if (this.api && this.api.asc_isDocumentCanSave) { var isModified = this.api.asc_isDocumentCanSave(); - var isSyncButton = this.toolbar.btnCollabChanges && this.toolbar.btnCollabChanges.$icon.hasClass('btn-synch'); + var isSyncButton = toolbar.btnCollabChanges && toolbar.btnCollabChanges.cmpEl.hasClass('notify'); if (!isModified && !isSyncButton && !this.toolbar.mode.forcesave) return; @@ -2125,7 +2125,7 @@ define([ this.btnsComment = []; if ( config.canCoAuthoring && config.canComments ) { var _set = PE.enumLock; - this.btnsComment = Common.Utils.injectButtons(this.toolbar.$el.find('.slot-comment'), 'tlbtn-addcomment-', 'btn-menu-comments', me.toolbar.capBtnComment, [_set.lostConnect, _set.noSlides]); + this.btnsComment = Common.Utils.injectButtons(this.toolbar.$el.find('.slot-comment'), 'tlbtn-addcomment-', 'toolbar__icon btn-menu-comments', me.toolbar.capBtnComment, [_set.lostConnect, _set.noSlides]); if ( this.btnsComment.length ) { var _comments = PE.getController('Common.Controllers.Comments').getView(); diff --git a/apps/presentationeditor/main/app/view/Toolbar.js b/apps/presentationeditor/main/app/view/Toolbar.js index ee4c99e5c..77bca5712 100644 --- a/apps/presentationeditor/main/app/view/Toolbar.js +++ b/apps/presentationeditor/main/app/view/Toolbar.js @@ -1340,7 +1340,7 @@ define([ } this._state.hasCollaborativeChanges = true; - this.btnCollabChanges.$icon.removeClass(this.btnSaveCls).addClass('btn-synch'); + this.btnCollabChanges.cmpEl.addClass('notify'); if (this.showSynchTip) { this.btnCollabChanges.updateHint(''); if (this.synchTooltip === undefined) @@ -1376,8 +1376,8 @@ define([ if (this.btnCollabChanges.rendered) { var me = this; - if ( me.btnCollabChanges.$icon.hasClass('btn-synch') ) { - me.btnCollabChanges.$icon.removeClass('btn-synch').addClass(this.btnSaveCls); + if ( me.btnCollabChanges.cmpEl.hasClass('notify') ) { + me.btnCollabChanges.cmpEl.removeClass('notify'); if (this.synchTooltip) this.synchTooltip.hide(); this.btnCollabChanges.updateHint(this.btnSaveTip); @@ -1399,11 +1399,8 @@ define([ var cls = (length > 1) ? 'btn-save-coauth' : 'btn-save'; if (cls !== this.btnSaveCls && this.btnCollabChanges.rendered) { this.btnSaveTip = ((length > 1) ? this.tipSaveCoauth : this.tipSave ) + Common.Utils.String.platformKey('Ctrl+S'); - - if ( !this.btnCollabChanges.$icon.hasClass('btn-synch') ) { - this.btnCollabChanges.$icon.removeClass(this.btnSaveCls).addClass(cls); - this.btnCollabChanges.updateHint(this.btnSaveTip); - } + this.btnCollabChanges.updateHint(this.btnSaveTip); + this.btnCollabChanges.$icon.removeClass(this.btnSaveCls).addClass(cls); this.btnSaveCls = cls; } }, diff --git a/apps/spreadsheeteditor/main/app/controller/Main.js b/apps/spreadsheeteditor/main/app/controller/Main.js index 9c399ae43..3489d5f97 100644 --- a/apps/spreadsheeteditor/main/app/controller/Main.js +++ b/apps/spreadsheeteditor/main/app/controller/Main.js @@ -1539,7 +1539,7 @@ define([ Common.Gateway.setDocumentModified(change); if (this.toolbarView && this.toolbarView.btnCollabChanges && this.api) { - var isSyncButton = this.toolbarView.btnCollabChanges.$icon.hasClass('btn-synch'), + var isSyncButton = this.toolbarView.btnCollabChanges.cmpEl.hasClass('notify'), forcesave = this.appOptions.forcesave, cansave = this.api.asc_isDocumentCanSave(), isDisabled = !cansave && !isSyncButton && !forcesave || this._state.isDisconnected || this._state.fastCoauth && this._state.usersCount>1 && !forcesave; @@ -1549,7 +1549,7 @@ define([ onDocumentCanSaveChanged: function (isCanSave) { if (this.toolbarView && this.toolbarView.btnCollabChanges) { - var isSyncButton = this.toolbarView.btnCollabChanges.$icon.hasClass('btn-synch'), + var isSyncButton = this.toolbarView.btnCollabChanges.cmpEl.hasClass('notify'), forcesave = this.appOptions.forcesave, isDisabled = !isCanSave && !isSyncButton && !forcesave || this._state.isDisconnected || this._state.fastCoauth && this._state.usersCount>1 && !forcesave; this.toolbarView.btnSave.setDisabled(isDisabled); diff --git a/apps/spreadsheeteditor/main/app/controller/Toolbar.js b/apps/spreadsheeteditor/main/app/controller/Toolbar.js index e886614c7..f1615017f 100644 --- a/apps/spreadsheeteditor/main/app/controller/Toolbar.js +++ b/apps/spreadsheeteditor/main/app/controller/Toolbar.js @@ -428,7 +428,7 @@ define([ onSave: function(e) { if (this.api) { var isModified = this.api.asc_isDocumentCanSave(); - var isSyncButton = this.toolbar.btnCollabChanges && this.toolbar.btnCollabChanges.$icon.hasClass('btn-synch'); + var isSyncButton = this.toolbar.btnCollabChanges && this.toolbar.btnCollabChanges.cmpEl.hasClass('notify'); if (!isModified && !isSyncButton && !this.toolbar.mode.forcesave) return; diff --git a/apps/spreadsheeteditor/main/app/view/Toolbar.js b/apps/spreadsheeteditor/main/app/view/Toolbar.js index 14173f21d..464d42911 100644 --- a/apps/spreadsheeteditor/main/app/view/Toolbar.js +++ b/apps/spreadsheeteditor/main/app/view/Toolbar.js @@ -2103,7 +2103,7 @@ define([ } this._state.hasCollaborativeChanges = true; - this.btnCollabChanges.$icon.removeClass(this.btnSaveCls).addClass('btn-synch'); + this.btnCollabChanges.cmpEl.addClass('notify'); if (this.showSynchTip){ this.btnCollabChanges.updateHint(''); @@ -2140,8 +2140,8 @@ define([ if (this.btnCollabChanges.rendered) { var me = this; - if ( me.btnCollabChanges.$icon.hasClass('btn-synch') ) { - me.btnCollabChanges.$icon.removeClass('btn-synch').addClass(this.btnSaveCls); + if ( me.btnCollabChanges.cmpEl.hasClass('notify') ) { + me.btnCollabChanges.cmpEl.removeClass('notify'); if (this.synchTooltip) this.synchTooltip.hide(); this.btnCollabChanges.updateHint(this.btnSaveTip); @@ -2163,11 +2163,8 @@ define([ var cls = (length>1) ? 'btn-save-coauth' : 'btn-save'; if (cls !== this.btnSaveCls && this.btnCollabChanges.rendered) { this.btnSaveTip = ((length>1) ? this.tipSaveCoauth : this.tipSave )+ Common.Utils.String.platformKey('Ctrl+S'); - - if ( !this.btnCollabChanges.$icon.hasClass('btn-synch') ) { - this.btnCollabChanges.$icon.removeClass(this.btnSaveCls).addClass(cls); - this.btnCollabChanges.updateHint(this.btnSaveTip); - } + this.btnCollabChanges.updateHint(this.btnSaveTip); + this.btnCollabChanges.$icon.removeClass(this.btnSaveCls).addClass(cls); this.btnSaveCls = cls; } }, From 3d0c23450fb3e8629c9c40af656f1cae18dba589 Mon Sep 17 00:00:00 2001 From: GoshaZotov Date: Wed, 20 Nov 2019 14:26:00 +0300 Subject: [PATCH 284/419] [SSE] Add HeaderFooter.js --- apps/spreadsheeteditor/sdk_dev_scripts.js | 1 + 1 file changed, 1 insertion(+) diff --git a/apps/spreadsheeteditor/sdk_dev_scripts.js b/apps/spreadsheeteditor/sdk_dev_scripts.js index efedf8018..8d31b6a46 100644 --- a/apps/spreadsheeteditor/sdk_dev_scripts.js +++ b/apps/spreadsheeteditor/sdk_dev_scripts.js @@ -111,6 +111,7 @@ var sdk_dev_scrpipts = [ "../../../../sdkjs/cell/model/Serialize.js", "../../../../sdkjs/cell/model/ConditionalFormatting.js", "../../../../sdkjs/cell/model/DataValidation.js", + "../../../../sdkjs/cell/model/HeaderFooter.js", "../../../../sdkjs/cell/model/CellInfo.js", "../../../../sdkjs/cell/view/mobileTouch.js", "../../../../sdkjs/cell/view/StringRender.js", From 3a74ce23353af0e8a178596e83a6f98e39db9354 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Wed, 20 Nov 2019 14:56:32 +0300 Subject: [PATCH 285/419] [DE] Show menu for table of contents and date content control --- .../main/app/controller/Links.js | 68 +++++++++++++++---- 1 file changed, 53 insertions(+), 15 deletions(-) diff --git a/apps/documenteditor/main/app/controller/Links.js b/apps/documenteditor/main/app/controller/Links.js index fdd1a2a24..28193dd4b 100644 --- a/apps/documenteditor/main/app/controller/Links.js +++ b/apps/documenteditor/main/app/controller/Links.js @@ -94,10 +94,8 @@ define([ this.api.asc_registerCallback('asc_onCanAddHyperlink', _.bind(this.onApiCanAddHyperlink, this)); this.api.asc_registerCallback('asc_onCoAuthoringDisconnect',_.bind(this.onCoAuthoringDisconnect, this)); Common.NotificationCenter.on('api:disconnect', _.bind(this.onCoAuthoringDisconnect, this)); - this.api.asc_registerCallback('asc_onShowContentControlsActions',_.bind(this.onShowControlsActions, this)); - this.api.asc_registerCallback('asc_onHideContentControlsActions',_.bind(this.onHideControlsActions, this)); - // this.api.asc_registerCallback('asc_onShowContentControlsActions',_.bind(this.onShowContentControlsActions, this)); - // this.api.asc_registerCallback('asc_onHideContentControlsActions',_.bind(this.onHideContentControlsActions, this)); + this.api.asc_registerCallback('asc_onShowContentControlsActions',_.bind(this.onShowContentControlsActions, this)); + this.api.asc_registerCallback('asc_onHideContentControlsActions',_.bind(this.onHideContentControlsActions, this)); } return this; @@ -354,8 +352,9 @@ define([ })).show(); }, - onShowContentControlsActions: function(action, x, y) { - var menu = (action==1) ? this.view.contentsUpdateMenu : this.view.contentsMenu, + onShowTOCActions: function(obj, x, y) { + var action = obj.button, + menu = (action==AscCommon.CCButtonType.Toc) ? this.view.contentsUpdateMenu : this.view.contentsMenu, documentHolderView = this.getApplication().getController('DocumentHolder').documentHolder, menuContainer = documentHolderView.cmpEl.find(Common.Utils.String.format('#menu-container-{0}', menu.id)), me = this; @@ -394,15 +393,22 @@ define([ onHideContentControlsActions: function() { this.view.contentsMenu && this.view.contentsMenu.hide(); this.view.contentsUpdateMenu && this.view.contentsUpdateMenu.hide(); + var controlsContainer = this.getApplication().getController('DocumentHolder').documentHolder.cmpEl.find('#calendar-control-container'); + if (controlsContainer.is(':visible')) + controlsContainer.hide(); }, - onShowControlsActions: function(action, x, y) { - var documentHolderView = this.getApplication().getController('DocumentHolder').documentHolder, + onShowDateActions: function(obj, x, y) { + var action = obj.button, + props = obj.pr, + specProps = props.get_DateTimePr(), + id = props.get_InternalId(), + documentHolderView = this.getApplication().getController('DocumentHolder').documentHolder, controlsContainer = documentHolderView.cmpEl.find('#calendar-control-container'), me = this; if (controlsContainer.length < 1) { - controlsContainer = $('
'); + controlsContainer = $('
'); documentHolderView.cmpEl.append(controlsContainer); } @@ -418,7 +424,10 @@ define([ firstday: 1 }); this.cmpCalendar.on('date:click', function (cmp, date) { - me.selectDate = new Date(date); + specProps.put_FullDate(new Date(date)); + me.api.asc_SetContentControlProperties(props, id); + controlsContainer.hide(); + me.api.asc_UncheckContentControlButtons(); }); this.cmpCalendar.on('calendar:keydown', function (cmp, e) { if (e.keyCode==Common.UI.Keys.ESC) { @@ -427,16 +436,45 @@ define([ } }); } - this.cmpCalendar.setDate(this.selectDate ? this.selectDate : new Date()); + this.cmpCalendar.setDate(new Date(specProps ? specProps.get_FullDate() : undefined)); + // align + var offset = controlsContainer.offset(), + docW = Common.Utils.innerWidth(), + docH = Common.Utils.innerHeight() - 10, // Yep, it's magic number + menuW = this.cmpCalendar.cmpEl.outerWidth(), + menuH = this.cmpCalendar.cmpEl.outerHeight(), + buttonOffset = 22, + left = offset.left - menuW + buttonOffset, + top = offset.top; + if (top + menuH > docH) { + top = docH - menuH; + left -= buttonOffset; + } + if (top < 0) + top = 0; + if (left + menuW > docW) + left = docW - menuW; + this.cmpCalendar.cmpEl.css({left: left, top : top}); documentHolderView._preventClick = true; }, - onHideControlsActions: function() { - var controlsContainer = this.getApplication().getController('DocumentHolder').documentHolder.cmpEl.find('#calendar-control-container'); - if (controlsContainer.is(':visible')) - controlsContainer.hide(); + onShowContentControlsActions: function(obj, x, y) { + var type = obj.type; + switch (type) { + case Asc.c_oAscContentControlSpecificType.TOC: + this.onShowTOCActions(obj, x, y); + break; + case Asc.c_oAscContentControlSpecificType.DateTime: + this.onShowDateActions(obj, x, y); + break; + case Asc.c_oAscContentControlSpecificType.Picture: + break; + case Asc.c_oAscContentControlSpecificType.DropDownList: + case Asc.c_oAscContentControlSpecificType.ComboBox: + break; + } } }, DE.Controllers.Links || {})); From cb238bf14ff4d169d10d95db8317ec3c367f832a Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Wed, 20 Nov 2019 16:04:32 +0300 Subject: [PATCH 286/419] [DE] Show menu for list content controls --- .../main/app/controller/Links.js | 66 ++++++++++++++++++- 1 file changed, 64 insertions(+), 2 deletions(-) diff --git a/apps/documenteditor/main/app/controller/Links.js b/apps/documenteditor/main/app/controller/Links.js index 28193dd4b..28dcbf2f0 100644 --- a/apps/documenteditor/main/app/controller/Links.js +++ b/apps/documenteditor/main/app/controller/Links.js @@ -393,14 +393,14 @@ define([ onHideContentControlsActions: function() { this.view.contentsMenu && this.view.contentsMenu.hide(); this.view.contentsUpdateMenu && this.view.contentsUpdateMenu.hide(); + this.view.listControlMenu && this.view.listControlMenu.isVisible() && this.view.listControlMenu.hide(); var controlsContainer = this.getApplication().getController('DocumentHolder').documentHolder.cmpEl.find('#calendar-control-container'); if (controlsContainer.is(':visible')) controlsContainer.hide(); }, onShowDateActions: function(obj, x, y) { - var action = obj.button, - props = obj.pr, + var props = obj.pr, specProps = props.get_DateTimePr(), id = props.get_InternalId(), documentHolderView = this.getApplication().getController('DocumentHolder').documentHolder, @@ -460,6 +460,66 @@ define([ documentHolderView._preventClick = true; }, + onShowListActions: function(obj, x, y) { + var type = obj.type, + props = obj.pr, + id = props.get_InternalId(), + specProps = (type == Asc.c_oAscContentControlSpecificType.ComboBox) ? props.get_ComboBoxPr() : props.get_DropDownListPr(), + menu = this.view.listControlMenu, + documentHolderView = this.getApplication().getController('DocumentHolder').documentHolder, + menuContainer = menu ? documentHolderView.cmpEl.find(Common.Utils.String.format('#menu-container-{0}', menu.id)) : null, + me = this; + + this._fromShowContentControls = true; + Common.UI.Menu.Manager.hideAll(); + + if (!menu) { + this.view.listControlMenu = menu = new Common.UI.Menu({ + menuAlign: 'tr-bl', + items: [] + }); + menu.on('item:click', function(menu, item) { + setTimeout(function(){ + me.api.asc_SelectContentControlListItem(item.value, id); + }, 1); + }); + + // Prepare menu container + if (!menuContainer || menuContainer.length < 1) { + menuContainer = $(Common.Utils.String.format('', menu.id)); + documentHolderView.cmpEl.append(menuContainer); + } + + menu.render(menuContainer); + menu.cmpEl.attr({tabindex: "-1"}); + menu.on('hide:after', function(){ + me.view.listControlMenu.removeAll(); + if (!me._fromShowContentControls) + me.api.asc_UncheckContentControlButtons(); + }); + } + if (specProps) { + var count = specProps.get_ItemsCount(); + for (var i=0; i Date: Wed, 20 Nov 2019 16:15:34 +0300 Subject: [PATCH 287/419] [DE] Fix menu position for content controls --- apps/documenteditor/main/app/controller/Links.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/documenteditor/main/app/controller/Links.js b/apps/documenteditor/main/app/controller/Links.js index 28dcbf2f0..352cea19e 100644 --- a/apps/documenteditor/main/app/controller/Links.js +++ b/apps/documenteditor/main/app/controller/Links.js @@ -445,7 +445,7 @@ define([ menuW = this.cmpCalendar.cmpEl.outerWidth(), menuH = this.cmpCalendar.cmpEl.outerHeight(), buttonOffset = 22, - left = offset.left - menuW + buttonOffset, + left = offset.left - menuW, top = offset.top; if (top + menuH > docH) { top = docH - menuH; @@ -508,7 +508,7 @@ define([ } } - menuContainer.css({left: x + 22, top : y}); + menuContainer.css({left: x, top : y}); menuContainer.attr('data-value', 'prevent-canvas-click'); documentHolderView._preventClick = true; menu.show(); From 8c4d467b5257689593a0858795a0ae50b138f1b1 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Wed, 20 Nov 2019 17:10:32 +0300 Subject: [PATCH 288/419] [DE] Draw/Erase table --- .../documenteditor/main/app/controller/Toolbar.js | 15 +++++++++++++++ apps/documenteditor/main/app/view/Toolbar.js | 8 ++++++-- apps/documenteditor/main/locale/en.json | 2 ++ 3 files changed, 23 insertions(+), 2 deletions(-) diff --git a/apps/documenteditor/main/app/controller/Toolbar.js b/apps/documenteditor/main/app/controller/Toolbar.js index fd627f077..5ca5abd66 100644 --- a/apps/documenteditor/main/app/controller/Toolbar.js +++ b/apps/documenteditor/main/app/controller/Toolbar.js @@ -382,6 +382,8 @@ define([ this.api.asc_registerCallback('asc_onChangeSdtGlobalSettings', _.bind(this.onChangeSdtGlobalSettings, this)); this.api.asc_registerCallback('asc_onTextLanguage', _.bind(this.onTextLanguage, this)); Common.NotificationCenter.on('fonts:change', _.bind(this.onApiChangeFont, this)); + this.api.asc_registerCallback('asc_TableDrawModeCallback', _.bind(this.onTableDraw, this)); + this.api.asc_registerCallback('asc_TableEraseModeCallback', _.bind(this.onTableErase, this)); } else if (this.mode.isRestrictedEdit) { this.api.asc_registerCallback('asc_onFocusObject', _.bind(this.onApiFocusObjectRestrictedEdit, this)); this.api.asc_registerCallback('asc_onCoAuthoringDisconnect', _.bind(this.onApiCoAuthoringDisconnect, this)); @@ -856,6 +858,13 @@ define([ this.modeAlwaysSetStyle = false; }, + onTableDraw: function(v) { + this.toolbar.mnuInsertTable && this.toolbar.mnuInsertTable.items[2].setChecked(!!v, true); + }, + onTableErase: function(v) { + this.toolbar.mnuInsertTable && this.toolbar.mnuInsertTable.items[3].setChecked(!!v, true); + }, + onApiParagraphStyleChange: function(name) { if (this._state.prstyle != name) { var listStyle = this.toolbar.listStyles, @@ -1412,6 +1421,12 @@ define([ Common.NotificationCenter.trigger('edit:complete', me.toolbar); } })).show(); + } else if (item.value == 'draw') { + item.isChecked() && menu.items[3].setChecked(false, true); + this.api.SetTableDrawMode(item.isChecked()); + } else if (item.value == 'erase') { + item.isChecked() && menu.items[2].setChecked(false, true); + this.api.SetTableEraseMode(item.isChecked()); } }, diff --git a/apps/documenteditor/main/app/view/Toolbar.js b/apps/documenteditor/main/app/view/Toolbar.js index 67bf09d39..5c286102b 100644 --- a/apps/documenteditor/main/app/view/Toolbar.js +++ b/apps/documenteditor/main/app/view/Toolbar.js @@ -480,7 +480,9 @@ define([ menu: new Common.UI.Menu({ items: [ {template: _.template('
')}, - {caption: this.mniCustomTable, value: 'custom'} + {caption: this.mniCustomTable, value: 'custom'}, + {caption: this.mniDrawTable, value: 'draw', checkable: true}, + {caption: this.mniEraseTable, value: 'erase', checkable: true} ] }) }); @@ -2318,7 +2320,9 @@ define([ textDateControl: 'Date', capBtnAddComment: 'Add Comment', capBtnInsSymbol: 'Symbol', - tipInsertSymbol: 'Insert symbol' + tipInsertSymbol: 'Insert symbol', + mniDrawTable: 'Draw table', + mniEraseTable: 'Erase table' } })(), DE.Views.Toolbar || {})); }); diff --git a/apps/documenteditor/main/locale/en.json b/apps/documenteditor/main/locale/en.json index bcd5528bc..3b2bac95c 100644 --- a/apps/documenteditor/main/locale/en.json +++ b/apps/documenteditor/main/locale/en.json @@ -2305,6 +2305,8 @@ "DE.Views.Toolbar.textCheckboxControl": "Check box", "DE.Views.Toolbar.textDropdownControl": "Drop-down list", "DE.Views.Toolbar.textDateControl": "Date", + "DE.Views.Toolbar.mniDrawTable": "Draw table", + "DE.Views.Toolbar.mniEraseTable": "Erase table", "DE.Views.WatermarkSettingsDialog.textAuto": "Auto", "DE.Views.WatermarkSettingsDialog.textBold": "Bold", "DE.Views.WatermarkSettingsDialog.textColor": "Text color", From 5238c494ae697701bee223a2cd9795423526566c Mon Sep 17 00:00:00 2001 From: Maxim Kadushkin Date: Wed, 20 Nov 2019 17:58:55 +0300 Subject: [PATCH 289/419] [DE SSE] removed unused buttons --- .../main/app/controller/Toolbar.js | 27 ----- apps/documenteditor/main/app/view/Toolbar.js | 48 --------- apps/documenteditor/main/locale/en.json | 2 +- .../main/app/controller/Toolbar.js | 50 --------- .../main/app/view/Toolbar.js | 102 +----------------- apps/spreadsheeteditor/main/locale/en.json | 4 +- 6 files changed, 5 insertions(+), 228 deletions(-) diff --git a/apps/documenteditor/main/app/controller/Toolbar.js b/apps/documenteditor/main/app/controller/Toolbar.js index 144770160..895a2e1a4 100644 --- a/apps/documenteditor/main/app/controller/Toolbar.js +++ b/apps/documenteditor/main/app/controller/Toolbar.js @@ -264,7 +264,6 @@ define([ toolbar.btnAlignCenter.on('click', _.bind(this.onHorizontalAlign, this, 2)); toolbar.btnAlignRight.on('click', _.bind(this.onHorizontalAlign, this, 0)); toolbar.btnAlignJust.on('click', _.bind(this.onHorizontalAlign, this, 3)); - toolbar.btnHorizontalAlign.menu.on('item:click', _.bind(this.onMenuHorizontalAlignSelect, this)); toolbar.btnDecLeftOffset.on('click', _.bind(this.onDecOffset, this)); toolbar.btnIncLeftOffset.on('click', _.bind(this.onIncOffset, this)); toolbar.btnMarkers.on('click', _.bind(this.onMarkers, this)); @@ -541,18 +540,6 @@ define([ case 3: index = 3; align = 'btn-align-just'; break; default: index = -255; align = 'btn-align-left'; break; } - if (!(index < 0)) { - this.toolbar.btnHorizontalAlign.menu.items[index].setChecked(true); - } else if (index == -255) { - this.toolbar.btnHorizontalAlign.menu.clearAll(); - } - - var btnHorizontalAlign = this.toolbar.btnHorizontalAlign; - - if ( btnHorizontalAlign.rendered && btnHorizontalAlign.$icon ) { - btnHorizontalAlign.$icon.removeClass(btnHorizontalAlign.options.icls).addClass(align); - btnHorizontalAlign.options.icls = align; - } if (v === null || v===undefined) { toolbar.btnAlignRight.toggle(false, true); @@ -1143,20 +1130,6 @@ define([ Common.component.Analytics.trackEvent('ToolBar', 'Align'); }, - onMenuHorizontalAlignSelect: function(menu, item) { - this._state.pralign = undefined; - var btnHorizontalAlign = this.toolbar.btnHorizontalAlign; - - btnHorizontalAlign.$icon.removeClass(btnHorizontalAlign.options.icls); - btnHorizontalAlign.options.icls = !item.checked ? 'btn-align-left' : item.options.icls; - btnHorizontalAlign.$icon.addClass(btnHorizontalAlign.options.icls); - - if (this.api && item.checked) - this.api.put_PrAlign(item.value); - - Common.NotificationCenter.trigger('edit:complete', this.toolbar); - Common.component.Analytics.trackEvent('ToolBar', 'Horizontal Align'); - }, onMarkers: function(btn, e) { var record = { diff --git a/apps/documenteditor/main/app/view/Toolbar.js b/apps/documenteditor/main/app/view/Toolbar.js index 062396d6b..0c501b03a 100644 --- a/apps/documenteditor/main/app/view/Toolbar.js +++ b/apps/documenteditor/main/app/view/Toolbar.js @@ -329,51 +329,6 @@ define([ }); this.paragraphControls.push(this.btnAlignJust); - this.btnHorizontalAlign = new Common.UI.Button({ - id: 'id-toolbar-btn-halign', - cls: 'btn-toolbar', - iconCls: 'btn-align-left', - icls: 'btn-align-left', - menu: new Common.UI.Menu({ - cls: 'ppm-toolbar', - items: [ - { - caption: this.tipAlignLeft + Common.Utils.String.platformKey('Ctrl+L'), - iconCls: 'mnu-align-left', - icls: 'btn-align-left', - checkable: true, - toggleGroup: 'halignGroup', - checked: true, - value: 1 - }, - { - caption: this.tipAlignCenter + Common.Utils.String.platformKey('Ctrl+E'), - iconCls: 'mnu-align-center', - icls: 'btn-align-center', - checkable: true, - toggleGroup: 'halignGroup', - value: 2 - }, - { - caption: this.tipAlignRight + Common.Utils.String.platformKey('Ctrl+R'), - iconCls: 'mnu-align-right', - icls: 'btn-align-right', - checkable: true, - toggleGroup: 'halignGroup', - value: 0 - }, - { - caption: this.tipAlignJust + Common.Utils.String.platformKey('Ctrl+J'), - iconCls: 'mnu-align-just', - icls: 'btn-align-just', - checkable: true, - toggleGroup: 'halignGroup', - value: 3 - } - ] - }) - }); - this.paragraphControls.push(this.btnHorizontalAlign); this.btnDecLeftOffset = new Common.UI.Button({ id: 'id-toolbar-btn-decoffset', @@ -1317,7 +1272,6 @@ define([ _injectComponent('#slot-btn-colorschemas', this.btnColorSchemas); _injectComponent('#slot-btn-paracolor', this.btnParagraphColor); _injectComponent('#slot-field-styles', this.listStyles); - _injectComponent('#slot-btn-halign', this.btnHorizontalAlign); _injectComponent('#slot-btn-mailrecepients', this.btnMailRecepients); _injectComponent('#slot-img-align', this.btnImgAlign); _injectComponent('#slot-img-group', this.btnImgGroup); @@ -1562,7 +1516,6 @@ define([ this.btnAlignCenter.updateHint(this.tipAlignCenter + Common.Utils.String.platformKey('Ctrl+E')); this.btnAlignRight.updateHint(this.tipAlignRight + Common.Utils.String.platformKey('Ctrl+R')); this.btnAlignJust.updateHint(this.tipAlignJust + Common.Utils.String.platformKey('Ctrl+J')); - this.btnHorizontalAlign.updateHint(this.tipHAligh); this.btnDecLeftOffset.updateHint(this.tipDecPrLeft + Common.Utils.String.platformKey('Ctrl+Shift+M')); this.btnIncLeftOffset.updateHint(this.tipIncPrLeft + Common.Utils.String.platformKey('Ctrl+M')); this.btnLineSpace.updateHint(this.tipLineSpace); @@ -2200,7 +2153,6 @@ define([ tipColorSchemas: 'Change Color Scheme', tipInsertText: 'Insert Text', tipInsertTextArt: 'Insert Text Art', - tipHAligh: 'Horizontal Align', mniEditDropCap: 'Drop Cap Settings', textNone: 'None', textInText: 'In Text', diff --git a/apps/documenteditor/main/locale/en.json b/apps/documenteditor/main/locale/en.json index 31b794527..367533650 100644 --- a/apps/documenteditor/main/locale/en.json +++ b/apps/documenteditor/main/locale/en.json @@ -2175,7 +2175,7 @@ "DE.Views.Toolbar.tipFontColor": "Font color", "DE.Views.Toolbar.tipFontName": "Font", "DE.Views.Toolbar.tipFontSize": "Font size", - "DE.Views.Toolbar.tipHAligh": "Horizontal Align", + "del_DE.Views.Toolbar.tipHAligh": "Horizontal Align", "DE.Views.Toolbar.tipHighlightColor": "Highlight color", "DE.Views.Toolbar.tipImgAlign": "Align objects", "DE.Views.Toolbar.tipImgGroup": "Group objects", diff --git a/apps/spreadsheeteditor/main/app/controller/Toolbar.js b/apps/spreadsheeteditor/main/app/controller/Toolbar.js index f1615017f..7b7725220 100644 --- a/apps/spreadsheeteditor/main/app/controller/Toolbar.js +++ b/apps/spreadsheeteditor/main/app/controller/Toolbar.js @@ -308,8 +308,6 @@ define([ toolbar.btnAlignCenter.on('click', _.bind(this.onHorizontalAlign, this, AscCommon.align_Center)); toolbar.btnAlignRight.on('click', _.bind(this.onHorizontalAlign, this, AscCommon.align_Right)); toolbar.btnAlignJust.on('click', _.bind(this.onHorizontalAlign, this, AscCommon.align_Justify)); - toolbar.btnHorizontalAlign.menu.on('item:click', _.bind(this.onHorizontalAlignMenu, this)); - toolbar.btnVerticalAlign.menu.on('item:click', _.bind(this.onVerticalAlignMenu, this)); toolbar.btnMerge.on('click', _.bind(this.onMergeCellsMenu, this, toolbar.btnMerge.menu, toolbar.btnMerge.menu.items[0])); toolbar.btnMerge.menu.on('item:click', _.bind(this.onMergeCellsMenu, this)); toolbar.btnAlignTop.on('click', _.bind(this.onVerticalAlign, this, Asc.c_oAscVAlign.Top)); @@ -715,38 +713,6 @@ define([ Common.component.Analytics.trackEvent('ToolBar', 'Horizontal align'); }, - onHorizontalAlignMenu: function(menu, item) { - var btnHorizontalAlign = this.toolbar.btnHorizontalAlign; - - btnHorizontalAlign.$icon.removeClass(btnHorizontalAlign.options.icls); - btnHorizontalAlign.options.icls = !item.checked ? 'btn-align-left' : item.options.icls; - btnHorizontalAlign.$icon.addClass(btnHorizontalAlign.options.icls); - - this._state.pralign = undefined; - if (this.api) - this.api.asc_setCellAlign(!item.checked ? null : item.value); - - this.toolbar.btnWrap.allowDepress = !(item.value == AscCommon.align_Justify); - - Common.NotificationCenter.trigger('edit:complete', this.toolbar); - Common.component.Analytics.trackEvent('ToolBar', 'Horizontal Align'); - }, - - onVerticalAlignMenu: function(menu, item) { - var btnVerticalAlign = this.toolbar.btnVerticalAlign; - - btnVerticalAlign.$icon.removeClass(btnVerticalAlign.options.icls); - btnVerticalAlign.options.icls = !item.checked ? 'btn-valign-bottom' : item.options.icls; - btnVerticalAlign.$icon.addClass(btnVerticalAlign.options.icls); - - this._state.valign = undefined; - if (this.api) - this.api.asc_setCellVertAlign(!item.checked ? Asc.c_oAscVAlign.Bottom : item.value); - - Common.NotificationCenter.trigger('edit:complete', this.toolbar); - Common.component.Analytics.trackEvent('ToolBar', 'Vertical Align'); - }, - onVerticalAlign: function(type, btn, e) { this._state.valign = undefined; if (this.api) { @@ -2210,20 +2176,11 @@ define([ toolbar.btnAlignLeft.toggle(index===0, true); toolbar.btnAlignCenter.toggle(index===1, true); toolbar.btnAlignJust.toggle(index===3, true); - toolbar.btnHorizontalAlign.menu.items[index].setChecked(true, false); } else if (index == -255) { toolbar.btnAlignRight.toggle(false, true); toolbar.btnAlignLeft.toggle(false, true); toolbar.btnAlignCenter.toggle(false, true); toolbar.btnAlignJust.toggle(false, true); - - toolbar.btnHorizontalAlign.menu.clearAll(); - } - - var btnHorizontalAlign = this.toolbar.btnHorizontalAlign; - if ( btnHorizontalAlign.rendered ) { - btnHorizontalAlign.$icon.removeClass(btnHorizontalAlign.options.icls).addClass(align); - btnHorizontalAlign.options.icls = align; } } @@ -2248,13 +2205,6 @@ define([ toolbar.btnAlignTop.toggle(index===0, true); toolbar.btnAlignMiddle.toggle(index===1, true); toolbar.btnAlignBottom.toggle(index===2, true); - toolbar.btnVerticalAlign.menu.items[index].setChecked(true, false); - - var btnVerticalAlign = this.toolbar.btnVerticalAlign; - if ( btnVerticalAlign.rendered ) { - btnVerticalAlign.$icon.removeClass(btnVerticalAlign.options.icls).addClass(align); - btnVerticalAlign.options.icls = align; - } } } diff --git a/apps/spreadsheeteditor/main/app/view/Toolbar.js b/apps/spreadsheeteditor/main/app/view/Toolbar.js index 464d42911..a4db4d264 100644 --- a/apps/spreadsheeteditor/main/app/view/Toolbar.js +++ b/apps/spreadsheeteditor/main/app/view/Toolbar.js @@ -1011,97 +1011,6 @@ define([ }) }); - // Is unique for the short view - - me.btnHorizontalAlign = new Common.UI.Button({ - id : 'id-toolbar-btn-halign', - cls : 'btn-toolbar', - iconCls : 'btn-align-left', - icls : 'btn-align-left', - lock : [_set.editCell, _set.selChart, _set.selChartText, _set.lostConnect, _set.coAuth, _set.coAuthText], - menu : new Common.UI.Menu({ - items: [ - { - caption : me.tipAlignLeft, - iconCls : 'mnu-align-left', - icls : 'btn-align-left', - checkable : true, - allowDepress: true, - toggleGroup : 'halignGroup', - checked : true, - value : AscCommon.align_Left - }, - { - caption : me.tipAlignCenter, - iconCls : 'mnu-align-center', - icls : 'btn-align-center', - checkable : true, - allowDepress: true, - toggleGroup : 'halignGroup', - value : AscCommon.align_Center - }, - { - caption : me.tipAlignRight, - iconCls : 'mnu-align-right', - icls : 'btn-align-right', - checkable : true, - allowDepress: true, - toggleGroup : 'halignGroup', - value : AscCommon.align_Right - }, - { - caption : me.tipAlignJust, - iconCls : 'mnu-align-just', - icls : 'btn-align-just', - checkable : true, - allowDepress: true, - toggleGroup : 'halignGroup', - value : AscCommon.align_Justify - } - ] - }) - }); - - me.btnVerticalAlign = new Common.UI.Button({ - id : 'id-toolbar-btn-valign', - cls : 'btn-toolbar', - iconCls : 'btn-valign-bottom', - icls : 'btn-valign-bottom', - lock : [_set.editCell, _set.selChart, _set.selChartText, _set.lostConnect, _set.coAuth, _set.coAuthText], - menu : new Common.UI.Menu({ - items: [ - { - caption : me.tipAlignTop, - iconCls : 'mnu-valign-top', - icls : 'btn-valign-top', - checkable : true, - allowDepress: true, - toggleGroup : 'valignGroup', - value : Asc.c_oAscVAlign.Top - }, - { - caption : me.tipAlignMiddle, - iconCls : 'mnu-valign-middle', - icls : 'btn-valign-middle', - checkable : true, - allowDepress: true, - toggleGroup : 'valignGroup', - value : Asc.c_oAscVAlign.Center - }, - { - caption : me.tipAlignBottom, - iconCls : 'mnu-valign-bottom', - icls : 'btn-valign-bottom', - checkable : true, - allowDepress: true, - checked : true, - toggleGroup : 'valignGroup', - value : Asc.c_oAscVAlign.Bottom - } - ] - }) - }); - var hidetip = Common.localStorage.getItem("sse-hide-synch"); me.showSynchTip = !(hidetip && parseInt(hidetip) == 1); // me.needShowSynchTip = false; @@ -1439,8 +1348,8 @@ define([ if (config.isEdit) { me.lockControls = [ me.cmbFontName, me.cmbFontSize, me.btnIncFontSize, me.btnDecFontSize, me.btnBold, - me.btnItalic, me.btnUnderline, me.btnStrikeout, me.btnSubscript, me.btnTextColor, me.btnHorizontalAlign, me.btnAlignLeft, - me.btnAlignCenter,me.btnAlignRight,me.btnAlignJust, me.btnVerticalAlign, me.btnAlignTop, + me.btnItalic, me.btnUnderline, me.btnStrikeout, me.btnSubscript, me.btnTextColor, me.btnAlignLeft, + me.btnAlignCenter,me.btnAlignRight,me.btnAlignJust, me.btnAlignTop, me.btnAlignMiddle, me.btnAlignBottom, me.btnWrap, me.btnTextOrient, me.btnBackColor, me.btnInsertTable, me.btnMerge, me.btnInsertFormula, me.btnNamedRange, me.btnIncDecimal, me.btnInsertShape, me.btnInsertEquation, me.btnInsertText, me.btnInsertTextArt, me.btnSortUp, me.btnSortDown, me.btnSetAutofilter, me.btnClearAutofilter, @@ -1651,9 +1560,6 @@ define([ [SSE.enumLock.editCell, SSE.enumLock.selRangeEdit, SSE.enumLock.headerLock, SSE.enumLock.lostConnect, SSE.enumLock.coAuth]); Array.prototype.push.apply(this.lockControls, this.btnsEditHeader); - // replacePlacholder('#id-toolbar-short-placeholder-btn-halign', this.btnHorizontalAlign); - // replacePlacholder('#id-toolbar-short-placeholder-btn-valign', this.btnVerticalAlign); - return $host; }, @@ -1716,8 +1622,6 @@ define([ _updateHint(this.btnAddCell, this.tipInsertOpt); _updateHint(this.btnDeleteCell, this.tipDeleteOpt); _updateHint(this.btnColorSchemas, this.tipColorSchemas); - _updateHint(this.btnHorizontalAlign, this.tipHAligh); - _updateHint(this.btnVerticalAlign, this.tipVAligh); _updateHint(this.btnPageOrient, this.tipPageOrient); _updateHint(this.btnPageSize, this.tipPageSize); _updateHint(this.btnPageMargins, this.tipPageMargins); @@ -2277,8 +2181,6 @@ define([ tipClearStyle: 'Clear', tipCopyStyle: 'Copy Style', tipBack: 'Back', - tipHAligh: 'Horizontal Align', - tipVAligh: 'Vertical Align', tipAlignLeft: 'Align Left', tipAlignRight: 'Align Right', tipAlignCenter: 'Align Center', diff --git a/apps/spreadsheeteditor/main/locale/en.json b/apps/spreadsheeteditor/main/locale/en.json index 7fde51798..2dbd7c85d 100644 --- a/apps/spreadsheeteditor/main/locale/en.json +++ b/apps/spreadsheeteditor/main/locale/en.json @@ -2304,7 +2304,7 @@ "SSE.Views.Toolbar.tipFontColor": "Font color", "SSE.Views.Toolbar.tipFontName": "Font", "SSE.Views.Toolbar.tipFontSize": "Font size", - "SSE.Views.Toolbar.tipHAligh": "Horizontal Alignment", + "del_SSE.Views.Toolbar.tipHAligh": "Horizontal Alignment", "SSE.Views.Toolbar.tipImgAlign": "Align objects", "SSE.Views.Toolbar.tipImgGroup": "Group objects", "SSE.Views.Toolbar.tipIncDecimal": "Increase decimal", @@ -2336,7 +2336,7 @@ "SSE.Views.Toolbar.tipSynchronize": "The document has been changed by another user. Please click to save your changes and reload the updates.", "SSE.Views.Toolbar.tipTextOrientation": "Orientation", "SSE.Views.Toolbar.tipUndo": "Undo", - "SSE.Views.Toolbar.tipVAligh": "Vertical Alignment", + "del_SSE.Views.Toolbar.tipVAligh": "Vertical Alignment", "SSE.Views.Toolbar.tipWrap": "Wrap text", "SSE.Views.Toolbar.txtAccounting": "Accounting", "SSE.Views.Toolbar.txtAdditional": "Additional", From 8a7aa454ac8fd673578e309cae7b0bca1a8234cf Mon Sep 17 00:00:00 2001 From: Maxim Kadushkin Date: Thu, 21 Nov 2019 10:58:05 +0300 Subject: [PATCH 290/419] [DE] build icon sprite from source images --- apps/common/main/lib/view/Protection.js | 2 +- apps/common/main/lib/view/ReviewChanges.js | 26 +-- apps/common/main/lib/view/SearchDialog.js | 2 +- .../img/right-panels/SmallBorders.png | Bin 4674 -> 0 bytes .../img/right-panels/SmallBorders@2x.png | Bin 14016 -> 0 bytes .../resources/img/toolbar/1x/arrange-back.png | Bin 0 -> 161 bytes .../img/toolbar/1x/arrange-backward.png | Bin 0 -> 146 bytes .../img/toolbar/1x/arrange-forward.png | Bin 0 -> 147 bytes .../img/toolbar/1x/arrange-front.png | Bin 0 -> 174 bytes .../img/toolbar/1x/big/btn-controls.png | Bin 0 -> 187 bytes .../img/toolbar/1x/big/btn-editheader.png | Bin 0 -> 139 bytes .../img/toolbar/1x/big/btn-ic-chat.png | Bin 0 -> 247 bytes .../img/toolbar/1x/big/btn-ic-coedit.png | Bin 0 -> 430 bytes .../img/toolbar/1x/big/btn-ic-history.png | Bin 0 -> 429 bytes .../img/toolbar/1x/big/btn-ic-protect.png | Bin 0 -> 312 bytes .../img/toolbar/1x/big/btn-ic-sharing.png | Bin 0 -> 422 bytes .../img/toolbar/1x/big/btn-ic-signature.png | Bin 0 -> 660 bytes .../img/toolbar/1x/big/btn-img-align.png | Bin 0 -> 150 bytes .../img/toolbar/1x/big/btn-img-bkwd.png | Bin 0 -> 154 bytes .../img/toolbar/1x/big/btn-img-frwd.png | Bin 0 -> 154 bytes .../img/toolbar/1x/big/btn-img-group.png | Bin 0 -> 166 bytes .../img/toolbar/1x/big/btn-insertchart.png | Bin 0 -> 150 bytes .../img/toolbar/1x/big/btn-insertequation.png | Bin 0 -> 403 bytes .../toolbar/1x/big/btn-inserthyperlink.png | Bin 0 -> 322 bytes .../img/toolbar/1x/big/btn-insertimage.png | Bin 0 -> 278 bytes .../img/toolbar/1x/big/btn-insertshape.png | Bin 0 -> 352 bytes .../img/toolbar/1x/big/btn-inserttable.png | Bin 0 -> 172 bytes .../img/toolbar/1x/big/btn-menu-comments.png | Bin 0 -> 236 bytes .../img/toolbar/1x/big/btn-pagemargins.png | Bin 0 -> 139 bytes .../img/toolbar/1x/big/btn-pageorient.png | Bin 0 -> 229 bytes .../img/toolbar/1x/big/btn-pagesize.png | Bin 0 -> 192 bytes .../resources/img/toolbar/1x/big/btn-text.png | Bin 0 -> 158 bytes .../img/toolbar/1x/big/btn-textart.png | Bin 0 -> 359 bytes .../img/toolbar/1x/btn-align-bottom.png | Bin 0 -> 138 bytes .../img/toolbar/1x/btn-align-center.png | Bin 0 -> 192 bytes .../img/toolbar/1x/btn-align-just.png | Bin 0 -> 169 bytes .../img/toolbar/1x/btn-align-left.png | Bin 0 -> 187 bytes .../img/toolbar/1x/btn-align-middle.png | Bin 0 -> 162 bytes .../img/toolbar/1x/btn-align-right.png | Bin 0 -> 188 bytes .../img/toolbar/1x/btn-align-top.png | Bin 0 -> 140 bytes .../resources/img/toolbar/1x/btn-bold(ru).png | Bin 0 -> 286 bytes .../resources/img/toolbar/1x/btn-bold.png | Bin 0 -> 226 bytes .../img/toolbar/1x/btn-border-all.png | Bin 0 -> 106 bytes .../img/toolbar/1x/btn-border-bottom.png | Bin 0 -> 107 bytes .../img/toolbar/1x/btn-border-diagdown.png | Bin 0 -> 174 bytes .../img/toolbar/1x/btn-border-diagup.png | Bin 0 -> 174 bytes .../img/toolbar/1x/btn-border-inside.png | Bin 0 -> 123 bytes .../img/toolbar/1x/btn-border-insidehor.png | Bin 0 -> 108 bytes .../img/toolbar/1x/btn-border-insidevert.png | Bin 0 -> 115 bytes .../img/toolbar/1x/btn-border-left.png | Bin 0 -> 116 bytes .../img/toolbar/1x/btn-border-no.png | Bin 0 -> 99 bytes .../img/toolbar/1x/btn-border-out.png | Bin 0 -> 120 bytes .../img/toolbar/1x/btn-border-right.png | Bin 0 -> 111 bytes .../img/toolbar/1x/btn-border-top.png | Bin 0 -> 106 bytes .../img/toolbar/1x/btn-clearstyle.png | Bin 0 -> 497 bytes .../img/toolbar/1x/btn-colorschemas.png | Bin 0 -> 115 bytes .../resources/img/toolbar/1x/btn-copy.png | Bin 0 -> 164 bytes .../img/toolbar/1x/btn-copystyle.png | Bin 0 -> 271 bytes .../resources/img/toolbar/1x/btn-decfont.png | Bin 0 -> 438 bytes .../img/toolbar/1x/btn-decoffset.png | Bin 0 -> 326 bytes .../resources/img/toolbar/1x/btn-download.png | Bin 0 -> 181 bytes .../resources/img/toolbar/1x/btn-edit.png | Bin 0 -> 150 bytes .../img/toolbar/1x/btn-firstitem.png | Bin 0 -> 208 bytes .../resources/img/toolbar/1x/btn-flip-hor.png | Bin 0 -> 207 bytes .../img/toolbar/1x/btn-flip-vert.png | Bin 0 -> 178 bytes .../img/toolbar/1x/btn-fontcolor.png | Bin 0 -> 242 bytes .../resources/img/toolbar/1x/btn-goback.png | Bin 0 -> 192 bytes .../resources/img/toolbar/1x/btn-higlight.png | Bin 0 -> 246 bytes .../img/toolbar/1x/btn-ic-doclang.png | Bin 0 -> 323 bytes .../img/toolbar/1x/btn-ic-docspell(ru).png | Bin 0 -> 270 bytes .../img/toolbar/1x/btn-ic-docspell.png | Bin 0 -> 266 bytes .../img/toolbar/1x/btn-ic-review.png | Bin 0 -> 246 bytes .../img/toolbar/1x/btn-ic-zoomtopage.png | Bin 0 -> 242 bytes .../img/toolbar/1x/btn-ic-zoomtowidth.png | Bin 0 -> 193 bytes .../resources/img/toolbar/1x/btn-incfont.png | Bin 0 -> 478 bytes .../img/toolbar/1x/btn-incoffset.png | Bin 0 -> 340 bytes .../img/toolbar/1x/btn-italic(ru).png | Bin 0 -> 235 bytes .../resources/img/toolbar/1x/btn-italic.png | Bin 0 -> 153 bytes .../resources/img/toolbar/1x/btn-lastitem.png | Bin 0 -> 205 bytes .../img/toolbar/1x/btn-linespace.png | Bin 0 -> 203 bytes .../img/toolbar/1x/btn-menu-about.png | Bin 0 -> 303 bytes .../img/toolbar/1x/btn-menu-chart.png | Bin 0 -> 140 bytes .../img/toolbar/1x/btn-menu-chat.png | Bin 0 -> 217 bytes .../img/toolbar/1x/btn-menu-comments.png | Bin 0 -> 181 bytes .../img/toolbar/1x/btn-menu-image.png | Bin 0 -> 226 bytes .../img/toolbar/1x/btn-menu-navigation.png | Bin 0 -> 90 bytes .../img/toolbar/1x/btn-menu-search.png | Bin 0 -> 287 bytes .../img/toolbar/1x/btn-menu-shape.png | Bin 0 -> 298 bytes .../img/toolbar/1x/btn-menu-sign.png | Bin 0 -> 503 bytes .../img/toolbar/1x/btn-menu-signature.png | Bin 0 -> 503 bytes .../img/toolbar/1x/btn-menu-support.png | Bin 0 -> 287 bytes .../img/toolbar/1x/btn-menu-table.png | Bin 0 -> 122 bytes .../img/toolbar/1x/btn-menu-textart.png | Bin 0 -> 301 bytes .../resources/img/toolbar/1x/btn-nextitem.png | Bin 0 -> 193 bytes .../img/toolbar/1x/btn-numbering.png | Bin 0 -> 152 bytes .../resources/img/toolbar/1x/btn-options.png | Bin 0 -> 90 bytes .../img/toolbar/1x/btn-paracolor.png | Bin 0 -> 287 bytes .../img/toolbar/1x/btn-paragraph.png | Bin 0 -> 151 bytes .../resources/img/toolbar/1x/btn-paste.png | Bin 0 -> 168 bytes .../resources/img/toolbar/1x/btn-previtem.png | Bin 0 -> 197 bytes .../resources/img/toolbar/1x/btn-print.png | Bin 0 -> 176 bytes .../resources/img/toolbar/1x/btn-redo.png | Bin 0 -> 225 bytes .../img/toolbar/1x/btn-rotate-270.png | Bin 0 -> 238 bytes .../img/toolbar/1x/btn-rotate-90.png | Bin 0 -> 239 bytes .../img/toolbar/1x/btn-save-coauth.png | Bin 0 -> 292 bytes .../resources/img/toolbar/1x/btn-save.png | Bin 0 -> 173 bytes .../img/toolbar/1x/btn-setmarkers.png | Bin 0 -> 120 bytes .../resources/img/toolbar/1x/btn-settings.png | Bin 0 -> 451 bytes .../img/toolbar/1x/btn-strikeout(ru).png | Bin 0 -> 109 bytes .../img/toolbar/1x/btn-strikeout.png | Bin 0 -> 222 bytes .../img/toolbar/1x/btn-subscript.png | Bin 0 -> 265 bytes .../img/toolbar/1x/btn-superscript.png | Bin 0 -> 272 bytes .../img/toolbar/1x/btn-underline(ru).png | Bin 0 -> 160 bytes .../img/toolbar/1x/btn-underline.png | Bin 0 -> 166 bytes .../resources/img/toolbar/1x/btn-undo.png | Bin 0 -> 223 bytes .../resources/img/toolbar/1x/btn-users.png | Bin 0 -> 338 bytes .../resources/img/toolbar/1x/btn-zoomdown.png | Bin 0 -> 88 bytes .../resources/img/toolbar/1x/btn-zoomup.png | Bin 0 -> 100 bytes .../img/toolbar/1x/page-landscape.png | Bin 0 -> 149 bytes .../img/toolbar/1x/page-portrait.png | Bin 0 -> 147 bytes .../img/toolbar/1x/shape-align-bottom.png | Bin 0 -> 139 bytes .../img/toolbar/1x/shape-align-center.png | Bin 0 -> 143 bytes .../img/toolbar/1x/shape-align-left.png | Bin 0 -> 145 bytes .../img/toolbar/1x/shape-align-middle.png | Bin 0 -> 149 bytes .../img/toolbar/1x/shape-align-right.png | Bin 0 -> 149 bytes .../img/toolbar/1x/shape-align-top.png | Bin 0 -> 140 bytes .../img/toolbar/1x/shape-distribute-hor.png | Bin 0 -> 145 bytes .../img/toolbar/1x/shape-distribute-vert.png | Bin 0 -> 146 bytes .../resources/img/toolbar/1x/shape-group.png | Bin 0 -> 154 bytes .../img/toolbar/1x/shape-ungroup.png | Bin 0 -> 164 bytes .../img/toolbar/1x/text-orient-hor.png | Bin 0 -> 259 bytes .../img/toolbar/1x/text-orient-rdown.png | Bin 0 -> 257 bytes .../img/toolbar/1x/text-orient-rup.png | Bin 0 -> 258 bytes apps/common/main/resources/less/buttons.less | 15 -- .../main/resources/less/dropdown-menu.less | 1 - apps/common/main/resources/less/toolbar.less | 104 +--------- .../main/app/controller/Toolbar.js | 2 +- .../main/app/controller/Viewport.js | 4 +- .../main/app/template/LeftMenu.template | 14 +- .../main/app/template/RightMenu.template | 18 +- .../main/app/template/StatusBar.template | 8 +- .../main/app/view/DocumentHolder.js | 67 +++--- .../main/app/view/ImageSettings.js | 8 +- apps/documenteditor/main/app/view/Links.js | 16 +- .../main/app/view/MailMergeSettings.js | 8 +- .../main/app/view/ShapeSettings.js | 8 +- .../main/app/view/TableSettings.js | 22 +- apps/documenteditor/main/app/view/Toolbar.js | 193 ++++++++++-------- .../main/resources/img/popupmenu-btns.png | Bin 5534 -> 0 bytes .../main/resources/img/popupmenu-btns@2x.png | Bin 12440 -> 0 bytes .../main/resources/img/toolbar-menu.png | Bin 27934 -> 0 bytes .../main/resources/img/toolbar-menu@1.5x.png | Bin 8475 -> 0 bytes .../main/resources/img/toolbar-menu@2x.png | Bin 71804 -> 0 bytes .../resources/img/toolbar/1x/.css.handlebars | 31 +++ .../img/toolbar/1x/big/.css.handlebars | 26 +++ .../img/toolbar/1x/big/btn-blankpage.png | Bin 0 -> 176 bytes .../img/toolbar/1x/big/btn-bookmarks.png | Bin 0 -> 252 bytes .../img/toolbar/1x/big/btn-caption.png | Bin 0 -> 266 bytes .../img/toolbar/1x/big/btn-columns.png | Bin 0 -> 105 bytes .../toolbar/1x/big/btn-contents-update.png | Bin 0 -> 396 bytes .../img/toolbar/1x/big/btn-contents.png | Bin 0 -> 113 bytes .../img/toolbar/1x/big/btn-controls.png | Bin 0 -> 187 bytes .../img/toolbar/1x/big/btn-dropcap.png | Bin 0 -> 235 bytes .../img/toolbar/1x/big/btn-ic-review.png | Bin 0 -> 286 bytes .../img/toolbar/1x/big/btn-ic-reviewview.png | Bin 0 -> 353 bytes .../img/toolbar/1x/big/btn-img-wrap.png | Bin 0 -> 363 bytes .../img/toolbar/1x/big/btn-notes.png | Bin 0 -> 413 bytes .../img/toolbar/1x/big/btn-pagebreak.png | Bin 0 -> 150 bytes .../img/toolbar/1x/big/btn-review-deny.png | Bin 0 -> 254 bytes .../img/toolbar/1x/big/btn-review-next.png | Bin 0 -> 229 bytes .../img/toolbar/1x/big/btn-review-prev.png | Bin 0 -> 224 bytes .../img/toolbar/1x/big/btn-review-save.png | Bin 0 -> 336 bytes .../img/toolbar/1x/big/btn-watermark.png | Bin 0 -> 362 bytes .../img/toolbar/1x/btn-highlight.png | Bin 0 -> 246 bytes .../img/toolbar/1x/btn-mailmerge.png | Bin 0 -> 228 bytes .../img/toolbar/1x/btn-menu-header.png | Bin 0 -> 131 bytes .../img/toolbar/1x/btn-multilevels.png | Bin 0 -> 133 bytes .../resources/img/toolbar/1x/cc-plaintext.png | Bin 0 -> 93 bytes .../resources/img/toolbar/1x/cc-remove.png | Bin 0 -> 140 bytes .../resources/img/toolbar/1x/cc-richtext.png | Bin 0 -> 166 bytes .../resources/img/toolbar/1x/columns-left.png | Bin 0 -> 96 bytes .../resources/img/toolbar/1x/columns-one.png | Bin 0 -> 96 bytes .../img/toolbar/1x/columns-right.png | Bin 0 -> 100 bytes .../img/toolbar/1x/columns-three.png | Bin 0 -> 93 bytes .../resources/img/toolbar/1x/columns-two.png | Bin 0 -> 99 bytes .../img/toolbar/1x/dropcap-inmargin.png | Bin 0 -> 183 bytes .../img/toolbar/1x/dropcap-intext.png | Bin 0 -> 185 bytes .../resources/img/toolbar/1x/dropcap-none.png | Bin 0 -> 96 bytes .../resources/img/toolbar/1x/wrap-behind.png | Bin 0 -> 207 bytes .../resources/img/toolbar/1x/wrap-infront.png | Bin 0 -> 313 bytes .../resources/img/toolbar/1x/wrap-inline.png | Bin 0 -> 299 bytes .../resources/img/toolbar/1x/wrap-square.png | Bin 0 -> 306 bytes .../resources/img/toolbar/1x/wrap-through.png | Bin 0 -> 306 bytes .../resources/img/toolbar/1x/wrap-tight.png | Bin 0 -> 307 bytes .../img/toolbar/1x/wrap-topandbottom.png | Bin 0 -> 287 bytes .../resources/img/toolbar/2x/.css.handlebars | 12 ++ .../main/resources/less/app.less | 3 + .../main/resources/less/leftmenu.less | 13 -- .../main/resources/less/rightmenu.less | 44 ---- .../main/resources/less/statusbar.less | 5 - .../main/resources/less/toolbar.less | 118 ----------- build/sprites/Gruntfile.js | 99 +++++++++ 202 files changed, 392 insertions(+), 477 deletions(-) delete mode 100644 apps/common/main/resources/img/right-panels/SmallBorders.png delete mode 100644 apps/common/main/resources/img/right-panels/SmallBorders@2x.png create mode 100644 apps/common/main/resources/img/toolbar/1x/arrange-back.png create mode 100644 apps/common/main/resources/img/toolbar/1x/arrange-backward.png create mode 100644 apps/common/main/resources/img/toolbar/1x/arrange-forward.png create mode 100644 apps/common/main/resources/img/toolbar/1x/arrange-front.png create mode 100644 apps/common/main/resources/img/toolbar/1x/big/btn-controls.png create mode 100644 apps/common/main/resources/img/toolbar/1x/big/btn-editheader.png create mode 100644 apps/common/main/resources/img/toolbar/1x/big/btn-ic-chat.png create mode 100644 apps/common/main/resources/img/toolbar/1x/big/btn-ic-coedit.png create mode 100644 apps/common/main/resources/img/toolbar/1x/big/btn-ic-history.png create mode 100644 apps/common/main/resources/img/toolbar/1x/big/btn-ic-protect.png create mode 100644 apps/common/main/resources/img/toolbar/1x/big/btn-ic-sharing.png create mode 100644 apps/common/main/resources/img/toolbar/1x/big/btn-ic-signature.png create mode 100644 apps/common/main/resources/img/toolbar/1x/big/btn-img-align.png create mode 100644 apps/common/main/resources/img/toolbar/1x/big/btn-img-bkwd.png create mode 100644 apps/common/main/resources/img/toolbar/1x/big/btn-img-frwd.png create mode 100644 apps/common/main/resources/img/toolbar/1x/big/btn-img-group.png create mode 100644 apps/common/main/resources/img/toolbar/1x/big/btn-insertchart.png create mode 100644 apps/common/main/resources/img/toolbar/1x/big/btn-insertequation.png create mode 100644 apps/common/main/resources/img/toolbar/1x/big/btn-inserthyperlink.png create mode 100644 apps/common/main/resources/img/toolbar/1x/big/btn-insertimage.png create mode 100644 apps/common/main/resources/img/toolbar/1x/big/btn-insertshape.png create mode 100644 apps/common/main/resources/img/toolbar/1x/big/btn-inserttable.png create mode 100644 apps/common/main/resources/img/toolbar/1x/big/btn-menu-comments.png create mode 100644 apps/common/main/resources/img/toolbar/1x/big/btn-pagemargins.png create mode 100644 apps/common/main/resources/img/toolbar/1x/big/btn-pageorient.png create mode 100644 apps/common/main/resources/img/toolbar/1x/big/btn-pagesize.png create mode 100644 apps/common/main/resources/img/toolbar/1x/big/btn-text.png create mode 100644 apps/common/main/resources/img/toolbar/1x/big/btn-textart.png create mode 100644 apps/common/main/resources/img/toolbar/1x/btn-align-bottom.png create mode 100644 apps/common/main/resources/img/toolbar/1x/btn-align-center.png create mode 100644 apps/common/main/resources/img/toolbar/1x/btn-align-just.png create mode 100644 apps/common/main/resources/img/toolbar/1x/btn-align-left.png create mode 100644 apps/common/main/resources/img/toolbar/1x/btn-align-middle.png create mode 100644 apps/common/main/resources/img/toolbar/1x/btn-align-right.png create mode 100644 apps/common/main/resources/img/toolbar/1x/btn-align-top.png create mode 100644 apps/common/main/resources/img/toolbar/1x/btn-bold(ru).png create mode 100644 apps/common/main/resources/img/toolbar/1x/btn-bold.png create mode 100644 apps/common/main/resources/img/toolbar/1x/btn-border-all.png create mode 100644 apps/common/main/resources/img/toolbar/1x/btn-border-bottom.png create mode 100644 apps/common/main/resources/img/toolbar/1x/btn-border-diagdown.png create mode 100644 apps/common/main/resources/img/toolbar/1x/btn-border-diagup.png create mode 100644 apps/common/main/resources/img/toolbar/1x/btn-border-inside.png create mode 100644 apps/common/main/resources/img/toolbar/1x/btn-border-insidehor.png create mode 100644 apps/common/main/resources/img/toolbar/1x/btn-border-insidevert.png create mode 100644 apps/common/main/resources/img/toolbar/1x/btn-border-left.png create mode 100644 apps/common/main/resources/img/toolbar/1x/btn-border-no.png create mode 100644 apps/common/main/resources/img/toolbar/1x/btn-border-out.png create mode 100644 apps/common/main/resources/img/toolbar/1x/btn-border-right.png create mode 100644 apps/common/main/resources/img/toolbar/1x/btn-border-top.png create mode 100644 apps/common/main/resources/img/toolbar/1x/btn-clearstyle.png create mode 100644 apps/common/main/resources/img/toolbar/1x/btn-colorschemas.png create mode 100644 apps/common/main/resources/img/toolbar/1x/btn-copy.png create mode 100644 apps/common/main/resources/img/toolbar/1x/btn-copystyle.png create mode 100644 apps/common/main/resources/img/toolbar/1x/btn-decfont.png create mode 100644 apps/common/main/resources/img/toolbar/1x/btn-decoffset.png create mode 100644 apps/common/main/resources/img/toolbar/1x/btn-download.png create mode 100644 apps/common/main/resources/img/toolbar/1x/btn-edit.png create mode 100644 apps/common/main/resources/img/toolbar/1x/btn-firstitem.png create mode 100644 apps/common/main/resources/img/toolbar/1x/btn-flip-hor.png create mode 100644 apps/common/main/resources/img/toolbar/1x/btn-flip-vert.png create mode 100644 apps/common/main/resources/img/toolbar/1x/btn-fontcolor.png create mode 100644 apps/common/main/resources/img/toolbar/1x/btn-goback.png create mode 100644 apps/common/main/resources/img/toolbar/1x/btn-higlight.png create mode 100644 apps/common/main/resources/img/toolbar/1x/btn-ic-doclang.png create mode 100644 apps/common/main/resources/img/toolbar/1x/btn-ic-docspell(ru).png create mode 100644 apps/common/main/resources/img/toolbar/1x/btn-ic-docspell.png create mode 100644 apps/common/main/resources/img/toolbar/1x/btn-ic-review.png create mode 100644 apps/common/main/resources/img/toolbar/1x/btn-ic-zoomtopage.png create mode 100644 apps/common/main/resources/img/toolbar/1x/btn-ic-zoomtowidth.png create mode 100644 apps/common/main/resources/img/toolbar/1x/btn-incfont.png create mode 100644 apps/common/main/resources/img/toolbar/1x/btn-incoffset.png create mode 100644 apps/common/main/resources/img/toolbar/1x/btn-italic(ru).png create mode 100644 apps/common/main/resources/img/toolbar/1x/btn-italic.png create mode 100644 apps/common/main/resources/img/toolbar/1x/btn-lastitem.png create mode 100644 apps/common/main/resources/img/toolbar/1x/btn-linespace.png create mode 100644 apps/common/main/resources/img/toolbar/1x/btn-menu-about.png create mode 100644 apps/common/main/resources/img/toolbar/1x/btn-menu-chart.png create mode 100644 apps/common/main/resources/img/toolbar/1x/btn-menu-chat.png create mode 100644 apps/common/main/resources/img/toolbar/1x/btn-menu-comments.png create mode 100644 apps/common/main/resources/img/toolbar/1x/btn-menu-image.png create mode 100644 apps/common/main/resources/img/toolbar/1x/btn-menu-navigation.png create mode 100644 apps/common/main/resources/img/toolbar/1x/btn-menu-search.png create mode 100644 apps/common/main/resources/img/toolbar/1x/btn-menu-shape.png create mode 100644 apps/common/main/resources/img/toolbar/1x/btn-menu-sign.png create mode 100644 apps/common/main/resources/img/toolbar/1x/btn-menu-signature.png create mode 100644 apps/common/main/resources/img/toolbar/1x/btn-menu-support.png create mode 100644 apps/common/main/resources/img/toolbar/1x/btn-menu-table.png create mode 100644 apps/common/main/resources/img/toolbar/1x/btn-menu-textart.png create mode 100644 apps/common/main/resources/img/toolbar/1x/btn-nextitem.png create mode 100644 apps/common/main/resources/img/toolbar/1x/btn-numbering.png create mode 100644 apps/common/main/resources/img/toolbar/1x/btn-options.png create mode 100644 apps/common/main/resources/img/toolbar/1x/btn-paracolor.png create mode 100644 apps/common/main/resources/img/toolbar/1x/btn-paragraph.png create mode 100644 apps/common/main/resources/img/toolbar/1x/btn-paste.png create mode 100644 apps/common/main/resources/img/toolbar/1x/btn-previtem.png create mode 100644 apps/common/main/resources/img/toolbar/1x/btn-print.png create mode 100644 apps/common/main/resources/img/toolbar/1x/btn-redo.png create mode 100644 apps/common/main/resources/img/toolbar/1x/btn-rotate-270.png create mode 100644 apps/common/main/resources/img/toolbar/1x/btn-rotate-90.png create mode 100644 apps/common/main/resources/img/toolbar/1x/btn-save-coauth.png create mode 100644 apps/common/main/resources/img/toolbar/1x/btn-save.png create mode 100644 apps/common/main/resources/img/toolbar/1x/btn-setmarkers.png create mode 100644 apps/common/main/resources/img/toolbar/1x/btn-settings.png create mode 100644 apps/common/main/resources/img/toolbar/1x/btn-strikeout(ru).png create mode 100644 apps/common/main/resources/img/toolbar/1x/btn-strikeout.png create mode 100644 apps/common/main/resources/img/toolbar/1x/btn-subscript.png create mode 100644 apps/common/main/resources/img/toolbar/1x/btn-superscript.png create mode 100644 apps/common/main/resources/img/toolbar/1x/btn-underline(ru).png create mode 100644 apps/common/main/resources/img/toolbar/1x/btn-underline.png create mode 100644 apps/common/main/resources/img/toolbar/1x/btn-undo.png create mode 100644 apps/common/main/resources/img/toolbar/1x/btn-users.png create mode 100644 apps/common/main/resources/img/toolbar/1x/btn-zoomdown.png create mode 100644 apps/common/main/resources/img/toolbar/1x/btn-zoomup.png create mode 100644 apps/common/main/resources/img/toolbar/1x/page-landscape.png create mode 100644 apps/common/main/resources/img/toolbar/1x/page-portrait.png create mode 100644 apps/common/main/resources/img/toolbar/1x/shape-align-bottom.png create mode 100644 apps/common/main/resources/img/toolbar/1x/shape-align-center.png create mode 100644 apps/common/main/resources/img/toolbar/1x/shape-align-left.png create mode 100644 apps/common/main/resources/img/toolbar/1x/shape-align-middle.png create mode 100644 apps/common/main/resources/img/toolbar/1x/shape-align-right.png create mode 100644 apps/common/main/resources/img/toolbar/1x/shape-align-top.png create mode 100644 apps/common/main/resources/img/toolbar/1x/shape-distribute-hor.png create mode 100644 apps/common/main/resources/img/toolbar/1x/shape-distribute-vert.png create mode 100644 apps/common/main/resources/img/toolbar/1x/shape-group.png create mode 100644 apps/common/main/resources/img/toolbar/1x/shape-ungroup.png create mode 100644 apps/common/main/resources/img/toolbar/1x/text-orient-hor.png create mode 100644 apps/common/main/resources/img/toolbar/1x/text-orient-rdown.png create mode 100644 apps/common/main/resources/img/toolbar/1x/text-orient-rup.png delete mode 100644 apps/documenteditor/main/resources/img/popupmenu-btns.png delete mode 100644 apps/documenteditor/main/resources/img/popupmenu-btns@2x.png delete mode 100644 apps/documenteditor/main/resources/img/toolbar-menu.png delete mode 100644 apps/documenteditor/main/resources/img/toolbar-menu@1.5x.png delete mode 100644 apps/documenteditor/main/resources/img/toolbar-menu@2x.png create mode 100644 apps/documenteditor/main/resources/img/toolbar/1x/.css.handlebars create mode 100644 apps/documenteditor/main/resources/img/toolbar/1x/big/.css.handlebars create mode 100644 apps/documenteditor/main/resources/img/toolbar/1x/big/btn-blankpage.png create mode 100644 apps/documenteditor/main/resources/img/toolbar/1x/big/btn-bookmarks.png create mode 100644 apps/documenteditor/main/resources/img/toolbar/1x/big/btn-caption.png create mode 100644 apps/documenteditor/main/resources/img/toolbar/1x/big/btn-columns.png create mode 100644 apps/documenteditor/main/resources/img/toolbar/1x/big/btn-contents-update.png create mode 100644 apps/documenteditor/main/resources/img/toolbar/1x/big/btn-contents.png create mode 100644 apps/documenteditor/main/resources/img/toolbar/1x/big/btn-controls.png create mode 100644 apps/documenteditor/main/resources/img/toolbar/1x/big/btn-dropcap.png create mode 100644 apps/documenteditor/main/resources/img/toolbar/1x/big/btn-ic-review.png create mode 100644 apps/documenteditor/main/resources/img/toolbar/1x/big/btn-ic-reviewview.png create mode 100644 apps/documenteditor/main/resources/img/toolbar/1x/big/btn-img-wrap.png create mode 100644 apps/documenteditor/main/resources/img/toolbar/1x/big/btn-notes.png create mode 100644 apps/documenteditor/main/resources/img/toolbar/1x/big/btn-pagebreak.png create mode 100644 apps/documenteditor/main/resources/img/toolbar/1x/big/btn-review-deny.png create mode 100644 apps/documenteditor/main/resources/img/toolbar/1x/big/btn-review-next.png create mode 100644 apps/documenteditor/main/resources/img/toolbar/1x/big/btn-review-prev.png create mode 100644 apps/documenteditor/main/resources/img/toolbar/1x/big/btn-review-save.png create mode 100644 apps/documenteditor/main/resources/img/toolbar/1x/big/btn-watermark.png create mode 100644 apps/documenteditor/main/resources/img/toolbar/1x/btn-highlight.png create mode 100644 apps/documenteditor/main/resources/img/toolbar/1x/btn-mailmerge.png create mode 100644 apps/documenteditor/main/resources/img/toolbar/1x/btn-menu-header.png create mode 100644 apps/documenteditor/main/resources/img/toolbar/1x/btn-multilevels.png create mode 100644 apps/documenteditor/main/resources/img/toolbar/1x/cc-plaintext.png create mode 100644 apps/documenteditor/main/resources/img/toolbar/1x/cc-remove.png create mode 100644 apps/documenteditor/main/resources/img/toolbar/1x/cc-richtext.png create mode 100644 apps/documenteditor/main/resources/img/toolbar/1x/columns-left.png create mode 100644 apps/documenteditor/main/resources/img/toolbar/1x/columns-one.png create mode 100644 apps/documenteditor/main/resources/img/toolbar/1x/columns-right.png create mode 100644 apps/documenteditor/main/resources/img/toolbar/1x/columns-three.png create mode 100644 apps/documenteditor/main/resources/img/toolbar/1x/columns-two.png create mode 100644 apps/documenteditor/main/resources/img/toolbar/1x/dropcap-inmargin.png create mode 100644 apps/documenteditor/main/resources/img/toolbar/1x/dropcap-intext.png create mode 100644 apps/documenteditor/main/resources/img/toolbar/1x/dropcap-none.png create mode 100644 apps/documenteditor/main/resources/img/toolbar/1x/wrap-behind.png create mode 100644 apps/documenteditor/main/resources/img/toolbar/1x/wrap-infront.png create mode 100644 apps/documenteditor/main/resources/img/toolbar/1x/wrap-inline.png create mode 100644 apps/documenteditor/main/resources/img/toolbar/1x/wrap-square.png create mode 100644 apps/documenteditor/main/resources/img/toolbar/1x/wrap-through.png create mode 100644 apps/documenteditor/main/resources/img/toolbar/1x/wrap-tight.png create mode 100644 apps/documenteditor/main/resources/img/toolbar/1x/wrap-topandbottom.png create mode 100644 apps/documenteditor/main/resources/img/toolbar/2x/.css.handlebars create mode 100644 build/sprites/Gruntfile.js diff --git a/apps/common/main/lib/view/Protection.js b/apps/common/main/lib/view/Protection.js index 6bcf79d6d..04f2dbcc7 100644 --- a/apps/common/main/lib/view/Protection.js +++ b/apps/common/main/lib/view/Protection.js @@ -126,7 +126,7 @@ define([ this.btnPwd = new Common.UI.Button({ cls: 'btn-toolbar x-huge icon-top', - iconCls: 'btn-ic-protect', + iconCls: 'toolbar__icon btn-ic-protect', caption: this.txtEncrypt, menu: true, visible: false diff --git a/apps/common/main/lib/view/ReviewChanges.js b/apps/common/main/lib/view/ReviewChanges.js index 2325f1b31..fed83ae7a 100644 --- a/apps/common/main/lib/view/ReviewChanges.js +++ b/apps/common/main/lib/view/ReviewChanges.js @@ -178,19 +178,19 @@ define([ cls: 'btn-toolbar x-huge icon-top', caption: this.txtAccept, split: true, - iconCls: 'review-save' + iconCls: 'toolbar__icon btn-review-save' }); this.btnReject = new Common.UI.Button({ cls: 'btn-toolbar x-huge icon-top', caption: this.txtReject, split: true, - iconCls: 'review-deny' + iconCls: 'toolbar__icon btn-review-deny' }); this.btnTurnOn = new Common.UI.Button({ cls: 'btn-toolbar x-huge icon-top', - iconCls: 'btn-ic-review', + iconCls: 'toolbar__icon btn-ic-review', caption: this.txtTurnon, enableToggle: true }); @@ -199,13 +199,13 @@ define([ if (this.appConfig.canViewReview) { this.btnPrev = new Common.UI.Button({ cls: 'btn-toolbar x-huge icon-top', - iconCls: 'review-prev', + iconCls: 'toolbar__icon btn-review-prev', caption: this.txtPrev }); this.btnNext = new Common.UI.Button({ cls: 'btn-toolbar x-huge icon-top', - iconCls: 'review-next', + iconCls: 'toolbar__icon btn-review-next', caption: this.txtNext }); @@ -216,7 +216,7 @@ define([ this.btnReviewView = new Common.UI.Button({ cls: 'btn-toolbar x-huge icon-top', - iconCls: 'btn-ic-reviewview', + iconCls: 'toolbar__icon btn-ic-reviewview', caption: this.txtView, menu: new Common.UI.Menu({ cls: 'ppm-toolbar', @@ -257,7 +257,7 @@ define([ if (!!this.appConfig.sharingSettingsUrl && this.appConfig.sharingSettingsUrl.length && this._readonlyRights!==true) { this.btnSharing = new Common.UI.Button({ cls: 'btn-toolbar x-huge icon-top', - iconCls: 'btn-ic-sharing', + iconCls: 'toolbar__icon btn-ic-sharing', caption: this.txtSharing }); } @@ -265,7 +265,7 @@ define([ if (this.appConfig.isEdit && !this.appConfig.isOffline && this.appConfig.canCoAuthoring) { this.btnCoAuthMode = new Common.UI.Button({ cls: 'btn-toolbar x-huge icon-top', - iconCls: 'btn-ic-coedit', + iconCls: 'toolbar__icon btn-ic-coedit', caption: this.txtCoAuthMode, menu: true }); @@ -277,7 +277,7 @@ define([ if (this.appConfig.canUseHistory && !this.appConfig.isDisconnected) { this.btnHistory = new Common.UI.Button({ cls: 'btn-toolbar x-huge icon-top', - iconCls: 'btn-ic-history', + iconCls: 'toolbar__icon btn-ic-history', caption: this.txtHistory }); } @@ -285,7 +285,7 @@ define([ if (this.appConfig.canCoAuthoring && this.appConfig.canChat) { this.btnChat = new Common.UI.Button({ cls: 'btn-toolbar x-huge icon-top', - iconCls: 'btn-ic-chat', + iconCls: 'toolbar__icon btn-ic-chat', caption: this.txtChat, enableToggle: true }); @@ -461,7 +461,7 @@ define([ if ( type == 'turn' && parent == 'statusbar' ) { var button = new Common.UI.Button({ cls : 'btn-toolbar', - iconCls : 'btn-ic-review', + iconCls : 'toolbar__icon btn-ic-review', hintAnchor : 'top', hint : this.tipReview, enableToggle: true @@ -474,7 +474,7 @@ define([ if ( type == 'spelling' ) { button = new Common.UI.Button({ cls: 'btn-toolbar', - iconCls: 'btn-ic-docspell', + iconCls: 'toolbar__icon btn-ic-docspell', hintAnchor : 'top', hint: this.tipSetSpelling, enableToggle: true @@ -485,7 +485,7 @@ define([ } else if (type == 'doclang' && parent == 'statusbar' ) { button = new Common.UI.Button({ cls: 'btn-toolbar', - iconCls: 'btn-ic-doclang', + iconCls: 'toolbar__icon btn-ic-doclang', hintAnchor : 'top', hint: this.tipSetDocLang, disabled: true diff --git a/apps/common/main/lib/view/SearchDialog.js b/apps/common/main/lib/view/SearchDialog.js index 683a89eb1..22b65ef54 100644 --- a/apps/common/main/lib/view/SearchDialog.js +++ b/apps/common/main/lib/view/SearchDialog.js @@ -131,7 +131,7 @@ this.btnOptions = new Common.UI.Button({ id : 'search-btn-options', cls : 'btn-toolbar', - iconCls : 'btn-settings', + iconCls : 'toolbar__icon btn-settings', // hint : me.tipMerge, menu : new Common.UI.Menu({ items : [ diff --git a/apps/common/main/resources/img/right-panels/SmallBorders.png b/apps/common/main/resources/img/right-panels/SmallBorders.png deleted file mode 100644 index c8a4bfcc29c596296d2ecd9270c8f0a4185e9d74..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4674 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 diff --git a/apps/common/main/resources/img/right-panels/SmallBorders@2x.png b/apps/common/main/resources/img/right-panels/SmallBorders@2x.png deleted file mode 100644 index 4c5ce4e90aa79fa7d756feb49e8081a5097d0a9a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 14016 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 z%0A#}qOd=m604W~-OwQN;TO?cgCCF-Yf}!Fdw?4g3maDWT z)&;D7d+U=b&LDDCz<7svz;ei+u81E;Z^g&QY{{87tfl^pmR7pBt)p!u`%)KO#DbEP zF71()=wHvjjZdIvj&%s|WV{(>W!Lh#4Z%%P(($0QsnWup2T@4j`kWAvSy$&fUjug8 zDuAFy@T3Cous1+jZiwwLor*|EDFcd#v2^}XEyM|X2OdBZ1sCML77WUC%e9TYx>Ua- zu3;`W!A-esn3Xz`X2HYqxopS=8}prI7logiay+DN?ZI_Ef+_Y+O~4P;e*a+U%S{q> z>;8E!F#;jhEsQ8Q_%LBM@7Vr;csAHlWW?^LS<_x)j82tCG2V)kx@EUkCuN;uFLy0VNGsZ?tJ93X@0oz3j57s;w-<%W>_`^}kgVdmMQF!QW zI`cWUMtb5tOP;Fr<5hb}vl%VJ8u}h|iv#mU0L16p|3Z}62*H(BwK-f=J~Ny$4esR; zpO)481!Mi+K3oiS#3A0y$(MEaIFKyl=0k3gy#j5@Mixy{%KUXjI=rN>Y=4JwHj*kp zQ43Px$+2bR-~L5wu7VnR#T#)swkQeSX#j4Sfi-+Ya-Y`>K&vXiuU%{Lo2}to`Bx97 z6z6zNmi;~dmEiRNov9h(>jR_Pro7aD>=KKCt--TA>9MLqDiP-vcOL->ngH^GY^g9D z-^XMwoF4b=pX?VFBTJ`$TJ$fXgec>h{1QcepPv&Fo1gWrM3tOg{uXvy4woXH->p=^ zso;&AhPdfA(-Z-JoZ6jIp~Gt(IhDUoGPZs=G{Vd}3TIHV=OcUVExy6{A7>!MdUb0q zjGNSPlCa3ZYDqY9Df7qKYljih-M^x{i|8r;pC#adI!%TkNC%*>kCFh93&HLC(`UsA zqirlZ{clW8H0`L$Jv8lTTC%hU6dh3Sef>xn96k6{E`sR6W(|7>uma8B zdJ867`!x6_7Pa+nRKasN8?B((Kzg*cG^tOfThONeS(GxT7K(d`uv&lO4)p<8bH2c# z1E^sj9V)vGs308LupoXa>?hfJ(by=oxl<1$R>6Rw=kpd|V+%hnE7&U!xKE4ce?LG9 zLrM=Cz1ip%q)iUD_f+65%mA_7XGK&eWHX{z$PM!5fH!2R#K= zdF1A*I?I9vz&OHbASCkm8GU}o=|=$CrgUV*0Mv}2;q`%Tx`x41kAQqKv@Csi#zb(C z#q=WpXtT%92E%XKqhwLNl~bi#&s7fP_v!-Y5`Krp87xgsCxZBcLO}1cM+`fgah4G* zMe43$n4Lu+z4?4t<*sBw{>RiU%sp(e{<{k zwPu=+m@*;uW=+3>Z9;dq3qf;T7MtaPg+Z8*gel7wPf_OZ<14tAupyi*;Wfz&u@D5D z3%l~*MlmDT>8g#p3CPB%+?^e@7YK$yEY4-6LcKE=)#(1z&3(T6^>XjMhb-ZgTfr zTF*RhVG!w*7_&w04EF7*8C7!7B1jeBe#s=|9=OK$Js&<5msHpB@&eIA3jhn{N8(Fd z7tVn_N65G-eDrW2@kfz}a!KT%psV9df{}8`L31)WkSIObWKcHF&DygnAR6swJ7nc! zR1-f<=@efJC%;eMQGm6Ti-%lsm>2F6enm?T6?DuDyo}K3f{fWdX5_0(8GHhVM%A`G>i-2C2OC z9q{0Vc2)4&u5PEEE=gAw*JKac*0el(J~@UPp5l&K25NI^C@deMEnyU~5l`GDt80hp zs#AK5%N#)L6WH}TAoib~Lu3>n%4C-=kmbrmK{ODXvShBox(uMmPKD|j-hMzE_n49f za8OL?$TO6Qd0vbyTjBaQf0bMSN9CXKhNd02s{Kb;zY$s86668u+ZH3IIc%2bPO!DR z_)l4WvPi&46t(3yV&AjQYYS#PJ}b%OEe*65neKOtQB8R&*B@pj;3f?rN31^Jr`d`k z%nQuclo3btm@FBt?-h?;1Sz%pKX$gukI6fqnrZx9O%VixG@0&7pReAAl@cJVc>E56 zM-xoI-;dd1`VO;(T8x07f}5At-gYsD4qXJGVufnHfFo-sVDz#8BOvNNHpQ_AwNmV# z1P*I42t8K`4yDsUMva*?C{u#Wh#g{P((8Ur1FZGNkn?vHm7hE?n?yvZ1bPKhWX;yJ z{WkIJU_>dsz=q4i6(q7OTrgZVSc;X^VT158kJSqg8qy(&{=smsZ^to{c;O*Lmv;OL z3gam@x@gjybca(sdKsYKEt~3yd)*{uyLMq0%AX=)(Be%!D!25hX?VjR8&>rtvpE8U ztGnBkmcJN^A@!aXN*=Ezu$c$cQcyf3g|PEEApI?O1CaKbtptRO9?abOAAH;P2sANs zb;TcwPlc}Fw}J@y00-O&Z@nnGsm6DEdh?Xv)OWepFtqJz@@3pbf4<6}0C`d{pn?x~!3Q_)#7e6hmjGrdo&~(A{ zDg6spuhieNp8yci$W>ul`D$5RA#z=mKJH{QXem52kpFc;-6LiOi}w?iYrZQ~yhx&7 zQA+uYFg0sRycxjIjc4J$*UwYI{<+|Nvs2#?5&)Xk41Rjkb!Txz;_L;ufud;r9F-U4sM#4gKeL}Oas@(~%ucea@DRuaI2GF;Bi+fqfPR_o(>bkS zgS-Gb95}zw4yokXdiyjF=+|V#rRA&UVZ23{)(koZfG za#i>y>Qi$l|3x_Xi}L;BfRK}O_lq6Lh#W(Rqr4lqIsxQtLXUQI)iuqY9s4#S2%MdA zXV7`x(w=n9;4q@Z%<}-=(z=F2&;qe5rJ8o^wCMxJ|D1m4O>tW`W(|H|?*!rwI8+1+p+}P6{eqk@x(w(P09lWn z^nY2D<5k9AziP|&0eOHU;wzoN>_D6z)b6O$A48?Q+GV=ya#|ouamh+qIYXy8pmqU;e4wz~ zfHwxV3r;NqumJ_fRbhcieOJg(Q=|6JE`3ujUBD0M{fN_^4Q0=Q#rx}V0W2ALLw1;W z9LPc8o7c@?_M0mNu#ZP-7o7r`od!U+^>a|+b1^|>hA~$Y$NyOqzsJ?YZS@TzeF_JZ zL!`G*3YLl=tW=r<&Snmp)9yaT!V$){#~^ajF)sK{l`dA&ecTbL{P6Vw-Mgh#Cp*N+ zUY;p-r`>moyB{H4E(cOTx;Duul$=F5<-@dZo>Xp*uu}sh#~7OXCE&09rx{_c1X#+O zFmkZ14^*X|3;7&j+2s`0a=Gqa*6?H$} z48EB~L{-8~++xkjDx*4pIe3YM8~80?l?i$3AL#VRA9Ka}NC@isWPcm{#7nfylIv!k8sh2tGbW7u8iX&+>Npm!(wiUhOCr7Mt_q&ks>E6&zxWB3dy3ZZ;GzK z)}U2h@IgwTBVn;k9r%iB_0ik~SWQOZ=m*m)u`X5Ryr*x7s$>xrT_K#{`;~IrvxrJ^ z%*xLJfia9vc&Q*SW31)JJ^BhK9!9l?LD{eQ!DYCpG^35Uo1d^$=D4Ff)f8 z%J{XGxTi*yc?jek(mxXorQH^_N+d?S26Nr=CJ5hWdP6i<37Z+!?E{AB!5{h2x1+q; zMo0gQHKYV4q6kl9fco&0Ds26$n2&7SRy4{YjSj<+Z=Nj%kB(i|eApOuutq3gtoYu? zJtND8a+r1C3gsg>ktsy)uvd9Of!;TcYv1caC5jB)za-VOQtnA2ag;R}+qY7#30HHe zjdem?rbDt}Dn=K7`6BK&=EpL8E zB0l#cMyC4`WiTe^p$bSf9Ny=RlqC25qf0EV@m^P%F2IjXwu>0%e&%*{h|x70pk&&OzGi>$L^CQvd(ss7cjo}0ofzn z=r*qz=>7&mP$8q&D}Pt4+nmWf428`qV}=3ML*^Z$lE2axv(IuUY_;9lHuqOJf22iY z66Gqf#`FUdYry$@^dW&OS%1I>GKa2|kN1DDq+gXt|GrLjo>8aTn~h8BfD@i@jSC+h zv5NrEv|Siqf3%kn=dXOxFHXt{L*gFH+MKz|aCWiTTl0{B!2jiHZNESqJH90#`^Ln_ zoGh+zj5XjiaF6Q<&-@Gy=Jf2NH(q57Y*h4R(#XtJ!b6>-ErV{3i>I09o3V=aRZmz-A zV!z0SClSQ)B^SLcevSF%(&U!Z;~4DVs)a6@83w)`qWG-zwm<4VZeoSDb+Gyjm|dE= z+nWymy-hZN@l*gfvbBx}CzPsyzC!4)T;CHj@=V=U1_R zvs(LkA81}pa>l;+MJL_TFhi@BwoI%-S2dDYW`b6~Kx|LB8MDjqjERncto-$x*W~40 zm+Bax<)2-NPZSZe+FOg`7f{ljC{gR9V|EK%d8$j$#bO`ECyI%&FT;n9=Cm>IALiXF z^RYH=37F5hFg;Bd)hr^9amPEIvZ(mPWn$0brTsqZJ(hKd^{KnZEGcojC@l73_cD60 zkU2)f{V)oP^$!=Bu<`9K;)5XidUP3K;J)B0K7s!07gz(e5mLWE8K)DQP&Dc%l7IpT()u3 zeKsFhh@Q|)BdR@8U7cDYW))U1?GOhieDLom`60)GiDT(r`|hHLOW&1Er(Liw=Eeb^ zYB?C@ZYl(=Pu6tPiH<*!$zrQ|{Oe=sP?zFRBLjDnjaNf)_jz^W#-OM7ic z=M)ffUpIc^%2*Qj=m0k7rgZYiQjGTGxeLdXr-17nv)cgz>>bGxhqgS%#K+KXHzvfABl+{o0%**-Ut|y3> zo9VIm@$i5J*a4$T2Uz4wlUqY20Rn#H228)#8q`QAGd1U9`RnFvS$`k=gBg#`Uj033 IyX>I<1KfS$?*IS* diff --git a/apps/common/main/resources/img/toolbar/1x/arrange-back.png b/apps/common/main/resources/img/toolbar/1x/arrange-back.png new file mode 100644 index 0000000000000000000000000000000000000000..d0573b178c17e992d433d9562e11d4b1d8ae5e91 GIT binary patch literal 161 zcmeAS@N?(olHy`uVBq!ia0vp^8bB<h{kIzcsSHmS$B>F!PcJvJ9WdZwxo~T} z>EHkUJN$PhK1$GQob^(aNp9k63p4J6&vki(nD zk>Zq4D$;1jl*^LWx^C@WpCzjTrBZva9+rNWLfOax? My85}Sb4q9e00h{kIzcsYp*3$B>F!ZzpZ!J)pqDvUW|| z&H5Jkr@>a0Jq6B!6Mz3JnUs6{(!-i{hl4owH9oZ{6@GZ&dFwU@Q|0T+KD#UozWv!L v==OIm=`N=!EeE|U#Q!+i`meeA|3gULCr19|Yo`W)>|*eA^>bP0l+XkKMtnIb literal 0 HcmV?d00001 diff --git a/apps/common/main/resources/img/toolbar/1x/arrange-forward.png b/apps/common/main/resources/img/toolbar/1x/arrange-forward.png new file mode 100644 index 0000000000000000000000000000000000000000..b162e3869852b218b913932d0b1cb86027e4ca90 GIT binary patch literal 147 zcmeAS@N?(olHy`uVBq!ia0vp^8bB<h{kIzcsVGku$B>F!Z!aEYWH97#39RCN zxxYm-^_x`UwX=5L#Shv=w{4!o!>t^_-d(&+`M^5E5A3hMW*Efu?^{@WkN0Hq!IoLx w0tylAjH{vo+|RLm**Bm6)z>R8zt(JJlr{|5Zn2F?3}_33r>mdKI;Vst05woFh5!Hn literal 0 HcmV?d00001 diff --git a/apps/common/main/resources/img/toolbar/1x/arrange-front.png b/apps/common/main/resources/img/toolbar/1x/arrange-front.png new file mode 100644 index 0000000000000000000000000000000000000000..3325085a979ad5fbe8a69f6d693f45ced4f08459 GIT binary patch literal 174 zcmeAS@N?(olHy`uVBq!ia0vp^8bB<h{kIzcsZviD$B>F!Pp2@lF&pr>7H?nn z-TsjMDe1J=+kS|OEY=tJ@WlJpj%h2OL&FT^eC_c2rd|~X_Rf^g=>B%k6{r~+5Uh~lX|K=T2 Z*|*+S$}-ZvQw4MYgQu&X%Q~loCIF8jL|Fg; literal 0 HcmV?d00001 diff --git a/apps/common/main/resources/img/toolbar/1x/big/btn-controls.png b/apps/common/main/resources/img/toolbar/1x/big/btn-controls.png new file mode 100644 index 0000000000000000000000000000000000000000..ce08b6f44c833e1bb30932b6178f9ebe555498a4 GIT binary patch literal 187 zcmeAS@N?(olHy`uVBq!ia0vp^7CD8y zOI*4Bn$5edwcr1l(61c$gw6TTUjF7S9Pij)s?4dIJ*&_0+rC@{cVk0|b1a;XLIM`% z23-DmJZ!?tKgoI#R)RWnxuo7~H2sq?xvF%^vBe>~y>D++h_IG;Bg0*`jwO5zTlgQ% n6|>E?TF)r#U=?!hJHfET@Mr%05~mEHYZyFT{an^LB{Ts5Z)Zp} literal 0 HcmV?d00001 diff --git a/apps/common/main/resources/img/toolbar/1x/big/btn-editheader.png b/apps/common/main/resources/img/toolbar/1x/big/btn-editheader.png new file mode 100644 index 0000000000000000000000000000000000000000..9709077473e82391c09a9ed0abb96bb412170f8b GIT binary patch literal 139 zcmeAS@N?(olHy`uVBq!ia0vp^7C&iUtQJ8>PHn;=TKFiQfulj^E`!rV1!J owQyMa&sm;0f5pY$E{^=t(~KT0`MvXqJJ`Pj!nQ;RQx0PfAZQ1s?za002ovPDHLkV1nsCUb6rI literal 0 HcmV?d00001 diff --git a/apps/common/main/resources/img/toolbar/1x/big/btn-ic-coedit.png b/apps/common/main/resources/img/toolbar/1x/big/btn-ic-coedit.png new file mode 100644 index 0000000000000000000000000000000000000000..3f99add7965c6e18f331a0101a1e275436076109 GIT binary patch literal 430 zcmV;f0a5;mP)ieH0t%58?4o$Um*-d^Gf!k2Pr)D1#v5rXV2;9Dt$^);hekTR)J78(Tlnkm+JQ zW@23j8uIe&k%cNinFNX1Vi`CA(bu7A*V$-zfF?RXoj|eINd@U%L#=%w6zE<=U@{7F&eXedV2nVgPXb+49v5ebD8~vghW2M(Yp?skzH1p6SopXy&=exgFMN9vgcu6I{KB6A2<|Ow z)yBxZ)+k^;7f^a3ssE;=2ei5t%Qz1~5cc0zV;%SsX8^!_;OJ29Lb~Qplse=Nn9l>W zaY-737sv@v!asoXK;``0$Qp1F=ov7dJJQ{k{rDp_pC4%Q039ci3gsui94IyE=6(9; Y7j^sQv02oY8UO$Q07*qoM6N<$f}aMsfdBvi literal 0 HcmV?d00001 diff --git a/apps/common/main/resources/img/toolbar/1x/big/btn-ic-history.png b/apps/common/main/resources/img/toolbar/1x/big/btn-ic-history.png new file mode 100644 index 0000000000000000000000000000000000000000..df21c490b79615b678739ae6b8eef2d0839e1390 GIT binary patch literal 429 zcmV;e0aE^nP)0Xi@pxr8fWOQ3{zmX%0IS>qh{cgpa=2O7PdwHP-a zee@>@P1fjSk?7T{Y!W4m?$`&9w__oqC>xQ0djr_F!#b$HU%r|w-(99buc2>`fwZhB zcOE`ECX_&X2ppYP3C5S%YdI(2Pz)b4iaP*$9d0ix&hnGjQc6JC`Plh#&bA1AJ}nx>|;Pra*-E#z4yh^CGC@lfyMz_0+t^3f)7NGm9Jp+7}W`1E4p3y>J(vMloT1HLV{j`_qU}Jh!CzaR?ZS z*h8Tb<|tTPX0mP)bq7D^1$&8Ep%?5WriI^ksilRAV`-t73#+DuhNEd=8(sKRrB1d| z$A!;q8t}<3{F8HN@yEouJbo3i?oFesZ@myKTfIw_2*Yzbui^`Uk5xfrMDY{=0000< KMNUMnLSTYX%ZUmA literal 0 HcmV?d00001 diff --git a/apps/common/main/resources/img/toolbar/1x/big/btn-ic-sharing.png b/apps/common/main/resources/img/toolbar/1x/big/btn-ic-sharing.png new file mode 100644 index 0000000000000000000000000000000000000000..7356986d8a152fc2576d31b5e91450b166966fde GIT binary patch literal 422 zcmV;X0a^ZuP);}34Zr})v&=DM=BfKNrAE1yJp`vFdKAbd!hbv8g zieG;DzU-_-Q9+uWeW!;dqCkUvi}T4JoN;DTm1#MNC2_!Ds7P;+(v%*=z`n-`MXB>(lrW5aB~4M3XW{-FGhk%w zQPK7|GbGb1oGsIK-)$NRJ~`XXc?9*vrrBdKgxjV;8PfK$q%=ay#Ex4E_GAMnvE#B} zK5`tv`kfv}hRpYzk<61VZRFgQZ=ShJPPA zp_!i7AK%QM={MtGF#Sr976LtgA-Di|{!ValY=_=+|G1fs-~vW>93C+GgtLp3>E1Kk zv11?4qL>kpaqk+=U_?cfEUlD!f<98Ph7#q|lol&eS1=;LAR(U~*@22@f6<1y(Xq&~ zI{|_L1q^i@Mz9=N1&cD3PJK-IX8eOzb=r*1I508{9$0(WBpnw@6sS&JrB!6hM} zpy1N2V;6tAal^&4HFY_TJ-bn_V?Tdl{0|o+%V97^t&Ww-&5)JzvPHy47aOJ4Xg#ck zp}@e(dD$X@h`7nBJ@o9al&cVh8jsg;-GmyYdJn<4B8yO{@c?7pgc_x459z~2p)ghn zDt4&fulvbOjnZcAN$vwtM59O)4E6hUCt+%oHtAEWsaWGi&lP`{XxVK37l*neCDsK- zrezUXcANJ&$dVL0=W3guk4f}Q_eNw-zc0r4LjDt|BeOc2?+yJS-w1rTqR=Zw( zrkS_{Qr>YGh1glE@3dc3SZJyJY)1-&bMln^Vv&H$xOzkYzOgOap~CORt)p)8OyL__ z@F4Jydq*cQ!uK}eK&j?X&Ot@5PLT{qFz+Y;MXyemTz#y2hQCnp*B^Y)SP@ZP#|sMj u<1||-)E<)6QR&-?Aepo~P9R)QOmNV~>el&1X5O&^Z2-ZDoJX0WD(iboFyt=akR{0R0R( AVE_OC literal 0 HcmV?d00001 diff --git a/apps/common/main/resources/img/toolbar/1x/big/btn-img-bkwd.png b/apps/common/main/resources/img/toolbar/1x/big/btn-img-bkwd.png new file mode 100644 index 0000000000000000000000000000000000000000..8e4f6e36d57c5e63de35c46335d84d6bd1e37224 GIT binary patch literal 154 zcmeAS@N?(olHy`uVBq!ia0vp^7C&1-Z zAJYXi_p{AFVdQ&MBb@ E0E&b-LI3~& literal 0 HcmV?d00001 diff --git a/apps/common/main/resources/img/toolbar/1x/big/btn-img-frwd.png b/apps/common/main/resources/img/toolbar/1x/big/btn-img-frwd.png new file mode 100644 index 0000000000000000000000000000000000000000..59212571950e1cc7ad54ce6219f9c4ff16c5a9dc GIT binary patch literal 154 zcmeAS@N?(olHy`uVBq!ia0vp^7Cx!QI{ zLX)rH^_B%PstlG48&4*DH@dKoV}?S$PK)&K8Jqa^{ob**PyfOXw2Z;i)z4*}Q$iB} D_9!{{v4) Sh(-Y|X7F_Nb6Mw<&;$TQTSTG& literal 0 HcmV?d00001 diff --git a/apps/common/main/resources/img/toolbar/1x/big/btn-insertchart.png b/apps/common/main/resources/img/toolbar/1x/big/btn-insertchart.png new file mode 100644 index 0000000000000000000000000000000000000000..55f8608d1fa7ea11f9e63ff05a308747a040acaa GIT binary patch literal 150 zcmeAS@N?(olHy`uVBq!ia0vp^7C literal 0 HcmV?d00001 diff --git a/apps/common/main/resources/img/toolbar/1x/big/btn-insertequation.png b/apps/common/main/resources/img/toolbar/1x/big/btn-insertequation.png new file mode 100644 index 0000000000000000000000000000000000000000..cb65838acc9e772c88dc5f5d8417db577d5d7157 GIT binary patch literal 403 zcmV;E0c`$>P)%dntgLB2V^5O+|r6iagOy+oHgZwk$B~Pf=i|$P*nyJ&)TE z=kZxPGjL?~Xqi3ESe|#v;;zyx6QQxIgk#}Rar0;}JyEay>H~X`L#4g1%s|hRN5)UV zJ*FoiYFfQO_AU(G)`ZBDhbQA0sKh2*LwqSwnx2_(CBBp>@!q?iA)3SXWt;Ry5C9@% zRvsO_*o0xXnL4^aPnt9z?DZSiF!JPaB9SpY(G;SNGIKA>uCb2-5|M>>FAELrhxOB> zc^xO>-G1=ST)#wK$BEz=aCSpkZf@=GWzp7}BN145^xQmJbB>`=9(~+j9wGJ|X@J?| xGKYMcW2lv|E&4Hm;hD#pcLjkCaPsBf@CysM2ZFk3Qi1>g002ovPDHLkV1k$Ww@&~7 literal 0 HcmV?d00001 diff --git a/apps/common/main/resources/img/toolbar/1x/big/btn-inserthyperlink.png b/apps/common/main/resources/img/toolbar/1x/big/btn-inserthyperlink.png new file mode 100644 index 0000000000000000000000000000000000000000..0c912d724a51871229df7bf7cfb4e1a1fd6927b7 GIT binary patch literal 322 zcmV-I0lof-P)+x!(BGNcur`m2I>$hp$3@+z=Qvl!PdArzeXT=8hs(M}jy7`8bPGfb1WiY*l|#}I zH0-=Pqm892$*ynrpW&jVL&EjkclKp#OILbHOINzpt$i8o)^#NQhIKcFs_Ga+6?N=R zUdQg#b?lDo%f!tP|)-5=oP3wtyY U)J%M4?*IS*07*qoM6N<$g3`>C8vpwvp}+o;;4^eBh{g`kJQCTm(#)i5YXNYF4?bx(UL5(f1LO1$AHQuWf7 z3Kae39}P*%Okz zw3X*MXfykC<2*@0n^`x`lN2N~JCF?I?L5gr%6O82obevJBvn+lC5Es>*+f^n zrpF+Oin0+yAhMwt$pcSrwe>yx=u*Zc^c=>oIm$_TV9)iW)CXYC^<*7_{qDlB(JrCi zT^NRPIH0I(VOZWp9Zr|;1CYW5C4 zo7`dF{0{pr&QqEX2lSs(FR4-n|CVgQjmlt-f(5@NWs~xkThaqCVHEGA@k!15_gR{E yQK=p0lgfUcr8`RPIKNBxweWT~@wIsM6ny}=eJ7YEKj$$30000BswC=T3HaN8OsOQAsStq#qyIzTlczEr$Shnj?<*ciUjA}AGhbOF<*(4L+#5T=) z$%AyxrthU6?y^<=PBh4$VZP^-bd|o(qUl*e2LflXaQQ4U)Bdji=i59Up5qgym=!X8 WEKYlKpW_C|Jq(_%elF{r5}E)Va6%9O literal 0 HcmV?d00001 diff --git a/apps/common/main/resources/img/toolbar/1x/big/btn-menu-comments.png b/apps/common/main/resources/img/toolbar/1x/big/btn-menu-comments.png new file mode 100644 index 0000000000000000000000000000000000000000..8a9ccb3f3734287d4b9e773587a78ac1868c3319 GIT binary patch literal 236 zcmVQS5JV#-PCmGji&jdUMaoK833Ci{ILDONzn#3`Zn%&_;eV*S!s)NJQNNkP0EdEs za-p{07zBP}vnIYdw{R0tycC*&OPD#AmjcS?u@+;@d#OUssWMBmbRHwEpR%TsC m%B<^1S!L4c%1pYCr7#B9cV5PukDa{$0000%MP%`MdtVy<$VCeDmpg4$oD0{{K%9T7Rcw>jZ%#sfvjPQtcK`+;nBO7F;!}F}%e{x^=7$w(|5U;>EKlN|W?%7q}XMT)X>XlyR`Qgl;sJACl>XtfMeJE`x zdBAw7F;qb`g7s39f-1+QhS#sTEGL9}G@faEvs0lM2-O>c9VQ4L&{Q~KZp_Mg--1=@ ziAcqS;0KO=jqH}Jax9vT6PS*Oa7+kJaCqi0?T<|(b0rg}5&I_g2I(VTe|}#Rwm*1H ccDcWNa8)*o_|`5~pt~77UHx3vIVCg!07>yx&Hw-a literal 0 HcmV?d00001 diff --git a/apps/common/main/resources/img/toolbar/1x/big/btn-pagesize.png b/apps/common/main/resources/img/toolbar/1x/big/btn-pagesize.png new file mode 100644 index 0000000000000000000000000000000000000000..9a0427b59227a66104821c0e7901a833145f7794 GIT binary patch literal 192 zcmeAS@N?(olHy`uVBq!ia0vp^7CeKgnD&dFc<_YeUI=8LC=fPtSl?L_+oNKsL8bTe?3??x!?PQC7Xsr_P&n1E5;03jU s1B~o42Jr{hesRCt#BH(kSNvt}i8mAMYW{mN0iDF)>FVdQ&MBb@07A)1o&W#< literal 0 HcmV?d00001 diff --git a/apps/common/main/resources/img/toolbar/1x/big/btn-text.png b/apps/common/main/resources/img/toolbar/1x/big/btn-text.png new file mode 100644 index 0000000000000000000000000000000000000000..5de3fb3166897b8761e0bacd14291c9123f536c2 GIT binary patch literal 158 zcmeAS@N?(olHy`uVBq!ia0vp^7Cq{2O2978H@ zU75hh#$dq1{CUTp|K5_p2WK%Qmo+?I(zRc~Qp?j|xl&Yy>X!>$jQVZ?OI(G;K3b(r zbP_E;eD~b)U(>UjeIKtlra0xq$4|4|E|G{=)qe!gtQ;@};u6{1-oD!M< DM3y!8 literal 0 HcmV?d00001 diff --git a/apps/common/main/resources/img/toolbar/1x/big/btn-textart.png b/apps/common/main/resources/img/toolbar/1x/big/btn-textart.png new file mode 100644 index 0000000000000000000000000000000000000000..882cd08931a8189f4bbfc1c1863e12894ac4ef0c GIT binary patch literal 359 zcmV-t0hs=YP)Q^t4 zaJl9AxKc5=nxs572u7DPukF{L(6ODS<8 z(7g{(jBBk=b)*D{p~VvjPykFV)BK&4Mo3SfVOAKSQKxm2O)e013SpBCTxeNWN$H+! zpyuF1Ls5hay~BmF2+=!S$d7Q8t7V^{jPS0H(f6x2)jxUY_dx7qoV)-4002ovPDHLk FV1iA!oc;g+ literal 0 HcmV?d00001 diff --git a/apps/common/main/resources/img/toolbar/1x/btn-align-bottom.png b/apps/common/main/resources/img/toolbar/1x/btn-align-bottom.png new file mode 100644 index 0000000000000000000000000000000000000000..7cc8f59d0ccf7e9df70418d49f6f4eb4ac4b7688 GIT binary patch literal 138 zcmeAS@N?(olHy`uVBq!ia0vp^8bB<h{kIzcsX$K`$B>F!Z_gd%JP^Rqoalav z?`rLx8-YO!!xe39qdrWJvETAm-12SclO}hE^9`G)GkG_?S<1j1Zn>C=iKY9^L7&N! msyz-`E|*?lXnmpF?oOV^?9w`4`#(OfFBPzBhOHsH}MP;otMNGY-;Lh0C{Q{aY2eX4czPbLUNV|85Xvw5wg$ kyNG>t#D=cvEiaN8WgZx?JN3Od1hjy`)78&qol`;+0C`oAuCvTQs=;zq7 zLh0|+3laK^88>SSzF%>0iTHkg(a8mi<_8pXH${uwS@b}RwXvOfwSWP;pibxwph*m# Lu6{1-oD!Mv0 z3@wB8SKREFnOvSky>INu5n1u-)4T7jr<(PAg0v*AZmM8Cesxn#zCpC{?t>dmcOKLe fd-KTONyNg**?>Lf_<|civl%>H{an^LB{Ts5?E^eB literal 0 HcmV?d00001 diff --git a/apps/common/main/resources/img/toolbar/1x/btn-align-middle.png b/apps/common/main/resources/img/toolbar/1x/btn-align-middle.png new file mode 100644 index 0000000000000000000000000000000000000000..ad16348f38b55cb7edba10480e70dd7135554230 GIT binary patch literal 162 zcmeAS@N?(olHy`uVBq!ia0vp^8bB<h{kIzcsZ387$B>F!Zzo^mJfOhiBCBb9 z<&I5SvinZ9TmBDqLc9)&ztgulqLRugoj$YakJAgr;xwldO>SvU9En@4FD5!=yh%~} zy(Q?C-qH(}?xq5~ny(}NJ4wj>UwFatb#<`aJ6o68cMgARzI=O*^7Q_D)3x=CfR-|N My85}Sb4q9e09w^M?*IS* literal 0 HcmV?d00001 diff --git a/apps/common/main/resources/img/toolbar/1x/btn-align-right.png b/apps/common/main/resources/img/toolbar/1x/btn-align-right.png new file mode 100644 index 0000000000000000000000000000000000000000..f31893691031490bef607efa96ad15486e075738 GIT binary patch literal 188 zcmeAS@N?(olHy`uVBq!ia0vp^8bB<xWqV(SG`Fcg6_m92QqmH?Z#{gn+3JotXA literal 0 HcmV?d00001 diff --git a/apps/common/main/resources/img/toolbar/1x/btn-align-top.png b/apps/common/main/resources/img/toolbar/1x/btn-align-top.png new file mode 100644 index 0000000000000000000000000000000000000000..8e2e176bfd5ad50bd838f66d8b4336b1f7d90aae GIT binary patch literal 140 zcmeAS@N?(olHy`uVBq!ia0vp^8bB<h{kIzcsbEhR$B>F!Z_gd%Y%maTxu~0& zb>VK+q`u%&;(Mhe^qZXS-LV%w-LAU%C~xrox`;kF+gB<(irH% zvWR(neh-1|$p<5!mNt}#$hx@YDU=HIe2*B4|Mf5;iW*&O1K|VsjmSG^&#Nf6w%D?6 ku~*>sRBVf4zxBHM0f!jcWZqlS>Hq)$07*qoM6N<$f}#t1w*UYD literal 0 HcmV?d00001 diff --git a/apps/common/main/resources/img/toolbar/1x/btn-bold.png b/apps/common/main/resources/img/toolbar/1x/btn-bold.png new file mode 100644 index 0000000000000000000000000000000000000000..c45974bf015800aff476b0ff78fbeb0d781c1318 GIT binary patch literal 226 zcmeAS@N?(olHy`uVBq!ia0vp^8bB<h{kIzcsg<5Cjv*Dd-cB+UJ#4_^!s^JQ z#L@WRy2krb?iL3iG7xbTXj%Q{df!%~v=jRe&ihwjRkg#iD?jG^_6zYJ4i`EZC0^YX zFNU0d#FOL6|z&hY8nutDr-l1s9p1ZzX=3xh|m=afrWJagG0BN)79 zT1kZqPs3ALw$-gw{#HD@iq7{R@?8&t;ucLK6VL CNE_b( literal 0 HcmV?d00001 diff --git a/apps/common/main/resources/img/toolbar/1x/btn-border-bottom.png b/apps/common/main/resources/img/toolbar/1x/btn-border-bottom.png new file mode 100644 index 0000000000000000000000000000000000000000..3cdf4900c6872387226f375c18a0cad025a9250b GIT binary patch literal 107 zcmeAS@N?(olHy`uVBq!ia0vp^8bB<h{kIzcDI-r8$B>F!$qVEpSkKv67;^o1 z-^_jaUTez@4)LT-?p@sO$(2`H_5K$+nutGQ;ZYW4U|9Yosz|wEY7S60gQu&X%Q~lo FCIFM}9`^tM literal 0 HcmV?d00001 diff --git a/apps/common/main/resources/img/toolbar/1x/btn-border-diagdown.png b/apps/common/main/resources/img/toolbar/1x/btn-border-diagdown.png new file mode 100644 index 0000000000000000000000000000000000000000..881124c095a284d10dfd4215b9d760c7dd4d485a GIT binary patch literal 174 zcmeAS@N?(olHy`uVBq!ia0vp^8bB<h{kIzcsZviD$B>F!Z_hEZ9WdZ=dnl(_ zeuC*q%iD)lQ*;=<9%^H_?LXzw&tvV&PrKO0-`g0W`0(eabE$c=dyc2(weJzEnz`h{ zYn7I_USF*|6(@^)(^Pbvh{kIzcsZviD$B>F!Z!a^lF+1?MT$Ix+ zzri*`xQu_h`^-fNXO{~s;AMPNJ>hu$v$W1_uYc}(uM;)>z4g3xcCq*0$JnhCD9Y1p znX&m;sZNg!w{d#!>j();v9xouu5C0Z);TlBbRBo%vxpOx*%8wZ-JQCh=g{AuT({)s ZnrF6@DXHW-zXUpf!PC{xWt~$(695duLi7Lt literal 0 HcmV?d00001 diff --git a/apps/common/main/resources/img/toolbar/1x/btn-border-inside.png b/apps/common/main/resources/img/toolbar/1x/btn-border-inside.png new file mode 100644 index 0000000000000000000000000000000000000000..ca05a76ac34ac16e79dad2a36a65803c8d8b1e1a GIT binary patch literal 123 zcmeAS@N?(olHy`uVBq!ia0vp^8bB<h{kIzcDJM@C$B>F!$qVEpSkKvUy!j;G z+Ryawx5C5!8Z|KtNeYP!MiUyi4SA2ebMj$!kL56A5qB|WQI}v!w0Pxo>hmWLR))u` W%aV>fNvH;z#^CAd=d#Wzp$Pz^rzFMz literal 0 HcmV?d00001 diff --git a/apps/common/main/resources/img/toolbar/1x/btn-border-insidehor.png b/apps/common/main/resources/img/toolbar/1x/btn-border-insidehor.png new file mode 100644 index 0000000000000000000000000000000000000000..23b8f263408483792a20e4405473d1623f6e3126 GIT binary patch literal 108 zcmeAS@N?(olHy`uVBq!ia0vp^8bB<h{kIzcDPvC;$B>F!$qVEpSkKv67;^o1 z-^_jaaBIua!ksBsS`{9Ak{5R==Ja#eDeabAX`;^`#lR4CC73H|;j$+{?F^o-elF{r G5}E+j#2^;{ literal 0 HcmV?d00001 diff --git a/apps/common/main/resources/img/toolbar/1x/btn-border-insidevert.png b/apps/common/main/resources/img/toolbar/1x/btn-border-insidevert.png new file mode 100644 index 0000000000000000000000000000000000000000..ff3d9d6d4bc23882f6846e965e12674846c6f2ee GIT binary patch literal 115 zcmeAS@N?(olHy`uVBq!ia0vp^8bB<h{kIzcDJxGG$B>F!$qVEpSkKvUy!j;G z+Ryawx5C5!8Z|KtNeYP!MiUyi4SA2ebMj$!@8NcjwRq)p>hmWLR)(l6!CcP2c7_8@ OVeoYIb6Mw<&;$U!H6t1T literal 0 HcmV?d00001 diff --git a/apps/common/main/resources/img/toolbar/1x/btn-border-left.png b/apps/common/main/resources/img/toolbar/1x/btn-border-left.png new file mode 100644 index 0000000000000000000000000000000000000000..0e4d160a7b770868ae2a815a9f22336e2140aff5 GIT binary patch literal 116 zcmeAS@N?(olHy`uVBq!ia0vp^8bB<h{kIzcDQiy`$B>F!$qVEpSoQu(O3bO< zkRa@%50+VU(S_};PI-`ot-M*O* PG={;`)z4*}Q$iB}^K>MC literal 0 HcmV?d00001 diff --git a/apps/common/main/resources/img/toolbar/1x/btn-border-no.png b/apps/common/main/resources/img/toolbar/1x/btn-border-no.png new file mode 100644 index 0000000000000000000000000000000000000000..c7f1994e7cca99eb57b6a46bacb9db9530254ef2 GIT binary patch literal 99 zcmeAS@N?(olHy`uVBq!ia0vp^8bB<h{kIzcDJ@SI$B>F!$qVEpSkKv67;^o1 x-^_jaUTez@4)LT-?y(k9r(K#aM#!yXU|4+6R{HOiYeqm_44$rjF6*2UngFaS9Yp{D literal 0 HcmV?d00001 diff --git a/apps/common/main/resources/img/toolbar/1x/btn-border-out.png b/apps/common/main/resources/img/toolbar/1x/btn-border-out.png new file mode 100644 index 0000000000000000000000000000000000000000..bd851e41a19ecef6948c1b8d3c98f30d16027c63 GIT binary patch literal 120 zcmeAS@N?(olHy`uVBq!ia0vp^8bB<<0VEi1=_;fHDW;MjzhDN2vdL#HfILG_7srr_ zTgehy2UsN?j{Z|--r=O;ThQu}l))8iAgXkt(OgjSkg8xo#jjZfG5kQ&HX6CV2~(fA P6=bBRtDnm{r-UW|OPU{~ literal 0 HcmV?d00001 diff --git a/apps/common/main/resources/img/toolbar/1x/btn-border-right.png b/apps/common/main/resources/img/toolbar/1x/btn-border-right.png new file mode 100644 index 0000000000000000000000000000000000000000..67d248fbbf22099ab2ab2ba16422fa1648d5cc8f GIT binary patch literal 111 zcmeAS@N?(olHy`uVBq!ia0vp^8bB<h{kIzcDKk$O$B>F!$qVEpSkKwr*m$}= zr1XDn!Gr%UQBR!aIQcNot=+KMFt(%D_SK<_5o)(u7jLu)Vr2Md5>>P|I{hHf1O`u6 KKbLh*2~7a!izT-J literal 0 HcmV?d00001 diff --git a/apps/common/main/resources/img/toolbar/1x/btn-border-top.png b/apps/common/main/resources/img/toolbar/1x/btn-border-top.png new file mode 100644 index 0000000000000000000000000000000000000000..8b1c9196b1f46b18195ec84dc10b82bfcd1b4975 GIT binary patch literal 106 zcmeAS@N?(olHy`uVBq!ia0vp^8bB<h{kIzcDML>e$B>F!$qVEpSoQuFI);?~ zFJy|^ec>j%zVt&U`Izw^o|@^oM<6+`mhX8`;Dlg#D0ZJpk@Y7S3j3^P6_9tJEJtH|pmXPpd^2N^F$U4jG z)$K_l+OT0l9LE77q(8zqjsYUHt@FqMS(Zg0>pai9iPXNX>o0l{;EFJGhzB3IwR}D~ zh{I5UUk_j(hDy8e5S+)6|p8d@KU-WS?rQoRfn%oqcLv&eh-hstCDL^_22lRx;0X?xBk3 zWD!R{mHWjf=CYEdT(`tWy2@$R9Qfe491v6ED{Bto;4JeMMG@L8GudzW<4|XrvL>=^ z;$d;$_cxS1Ky_j=h$Dmj25`gkYY~${92x94!gRl_shldp<$x@~(~0E!4Ii!d8?GAb nQ#pIqtbC}X)6=_Q!++u%4mcrSjd)gm00000NkvXXu0mjfQoGv+ literal 0 HcmV?d00001 diff --git a/apps/common/main/resources/img/toolbar/1x/btn-colorschemas.png b/apps/common/main/resources/img/toolbar/1x/btn-colorschemas.png new file mode 100644 index 0000000000000000000000000000000000000000..3bea84e40bb7fbf637ef111e1729acec080cb631 GIT binary patch literal 115 zcmeAS@N?(olHy`uVBq!ia0vp^8bB<h{kIzcDJxGG$B>F!$r2k6Jhjj3So6+a zuHm+Wh-Qdfo^o4L<6^d5lFAE;rI?Z=GJ04p3ls!MS!5}Eh{kIzcsccUd$B>F!ZznUd9WdZ=t=_)u zyS-E2CpNEbp>+|7+sqYo=Bek}@0Q4$v;Sc(<2liM?VcJVMpMrH?)!5T8%rKay`3!a zYT9MbZ6;Z|j@x_MHa#_&qPtzX%-pMu@79N>-+x@#aR1$g>-WEeTQWRM;8Yf1ao-HI Omci52&t;ucLK6V|EIn}m literal 0 HcmV?d00001 diff --git a/apps/common/main/resources/img/toolbar/1x/btn-copystyle.png b/apps/common/main/resources/img/toolbar/1x/btn-copystyle.png new file mode 100644 index 0000000000000000000000000000000000000000..131a25bd827c9e0327ad55b8080718a3199f25e0 GIT binary patch literal 271 zcmeAS@N?(olHy`uVBq!ia0vp^8bB<iX>7srqa#2C0VLM1l$Qce!1)CDm!IC@ReUmsV2azAl9{oup zXGZwxd7Lqk!{K;}H|Ap@L>vUcH-1Klx@nrZl=4KDD5YX7e|m_y=Xodd8=pqNW*}N< z@nVWOMw=;gTJ+7mB+IfmNfL$5MP@xs(+{$MJEpEgz4}AFryXqDR$!61)}>i5%kn^W z2-ZW~>7jE6D}!K-%`2QRr~hG%SRwLvH#{_ms})_>Np$Pz`@ZCyCV)cN}pA$jXr(}k>==FzX zh+wG5!vRylq{7srqa#nWXGW>c&y)?S+UDSDNN|=qIIu(Z6uBxZmhk} z@RNgam$2LIZMl*6zn`u%Q+@4K!0u?&ve_d&*VfcA_v5lmxf{DmW4kkF#gz!{sCktr z`eT3i-X5N!h?r^Iz5$aSZ;B~s5}4y^U85q?WNel;dBeoacNSe`nX^76O3eHHv{UlQ z7w-?z?=zaBTxPFcHS6@IloG~8XO%p+8oL|Za?;zM#HM=ECWY<)ydRTXl=$umU8!s- Tv1d6C^d^I+tDnm{r-UW|KF)Z^ literal 0 HcmV?d00001 diff --git a/apps/common/main/resources/img/toolbar/1x/btn-download.png b/apps/common/main/resources/img/toolbar/1x/btn-download.png new file mode 100644 index 0000000000000000000000000000000000000000..7a4af09cb11cc0009f0b164851022afbbfb5cdc9 GIT binary patch literal 181 zcmeAS@N?(olHy`uVBq!ia0vp^8bB<h{kIzcsTxlg$B>F!Z_hWfx)|~_JnXq3 zXyxQ)q4)Ideh2rT{4Opgd@|?v?q6_3d}4LliSUDW53twta>WIE^>76}U-$E#xABgW z-1x_aH#67*%@$Aao@+8ET1)kc=ZXKynJVu*oKCZ5vRt1i5aTU%aI4C}uPF~_9j>2N gST*Uh{kIzcsaQ`J$B>F!Z_jV!Z3y6D4s1Ie zckdFVdQ&MBb@0K5@7 AH2?qr literal 0 HcmV?d00001 diff --git a/apps/common/main/resources/img/toolbar/1x/btn-firstitem.png b/apps/common/main/resources/img/toolbar/1x/btn-firstitem.png new file mode 100644 index 0000000000000000000000000000000000000000..97c79749f98576de293aaa609eb89b280c0143a2 GIT binary patch literal 208 zcmV;>05AWEP)|6olbOK|&l{TV^674h{#A5(!8^3KEd;U+?8H_3BQee$?il-->9?(mBQZ{6002ov JPDHLkV1lisRKEZK literal 0 HcmV?d00001 diff --git a/apps/common/main/resources/img/toolbar/1x/btn-flip-vert.png b/apps/common/main/resources/img/toolbar/1x/btn-flip-vert.png new file mode 100644 index 0000000000000000000000000000000000000000..4b90546a377c3d2cbad75a6b20d71bcee4a365eb GIT binary patch literal 178 zcmeAS@N?(olHy`uVBq!ia0vp^8bB<h{kIzcsY*{5$B>F!PcLrdZ7|?*xphNq!VJBI&E(< zNH=w=&WLCb&SA5QsQkk;drA0haf^pcYCa~8O^-aU3X0Un%Q}Aa12W{jfQ+wK1w-oJ ZvT^5$+3c4&QUG)WgQu&X%Q~loCIHT9Ko0-_ literal 0 HcmV?d00001 diff --git a/apps/common/main/resources/img/toolbar/1x/btn-fontcolor.png b/apps/common/main/resources/img/toolbar/1x/btn-fontcolor.png new file mode 100644 index 0000000000000000000000000000000000000000..fd05b85f3a2d9d53e9e0514dc7f73866af3c7bbc GIT binary patch literal 242 zcmVe(@W8Wli)ItEfg?DIqr4H`2v?y&2%zR?3%Nr;IF66UJ#PJlP*ASq zSa>BDRk sIlAt6P<%f96G~^$ryLV&?uT{j0|Xj*D?k~t`~Uy|07*qoM6N<$g5Qi}6aWAK literal 0 HcmV?d00001 diff --git a/apps/common/main/resources/img/toolbar/1x/btn-goback.png b/apps/common/main/resources/img/toolbar/1x/btn-goback.png new file mode 100644 index 0000000000000000000000000000000000000000..7fa05a93c99b145e8d910713b495b5d761b4a1d8 GIT binary patch literal 192 zcmeAS@N?(olHy`uVBq!ia0vp^8bB<h{kIzcsdi5n$B>F!ZzpZ!J)pqDBH1V? z(I}|Yxb)5b1O1;emSq7gKrNAL(&6$e5Jkqk7I5f%`h50Ol)Yl^=E zL6Ii7+*p>DDdZZ&nxb@lDWBUXjq4~oOK!Sn9TW?zo30KD0(H1dBi*ay_DBv#`(3P) z$Bnsi&*XAruIQkcvpMG6{jF(|OEa7mD@)87qL7$7cII=(&O(m3Gpr@Y{~oMmj@wwL wxD9IDAB%B)P6?g*03af=Nw%F=ZE)!VI zl6BSRWDA*vt{bBy^PU#kOr1zFA9u&ywcjN(_w08mDo=AgY4$Hsvw`w7*OSFB)Vv{O z=*<=!dMRduLT}!JJ;l5sn2)E~0Q32TAAiE%+~N4mTlR0f<%%SUo2e6hHt!)3H&Z8) z%?AeOv&7Xx3k`1d#g`ISfA^(WQl}tASh6a~a;KycD6nLeWVsXL?r-DY_}lyiz5vio Vj1eXaiI!~*r8}L(vg}zl6@NW3oFA?ERAr7_5oIgC3v3?R~v41QrcnPaH~=) zwC8G1t{HMq&>Gb5q6ILYZ@d#5b%7 literal 0 HcmV?d00001 diff --git a/apps/common/main/resources/img/toolbar/1x/btn-ic-docspell.png b/apps/common/main/resources/img/toolbar/1x/btn-ic-docspell.png new file mode 100644 index 0000000000000000000000000000000000000000..f2b30e50beaddb1fe0599b345ce8f98695b84a17 GIT binary patch literal 266 zcmV+l0rmcgP)3lc#)-du$~?yWym)4d(7ry8Jg2Qz~*WhS;j6**OZZEj8voy%M=$D zz$h*(I5MUAAY5Kp8UncT^o*Du|k5oyHz<=aaxEc8y@CG3YpIA*{g{H30)?@7cHMClKl80||V`{0hUd QJOBUy07*qoM6N<$f>>c__W%F@ literal 0 HcmV?d00001 diff --git a/apps/common/main/resources/img/toolbar/1x/btn-ic-review.png b/apps/common/main/resources/img/toolbar/1x/btn-ic-review.png new file mode 100644 index 0000000000000000000000000000000000000000..b6c316dfefc75e945e97f368d7e18b41b3c96b96 GIT binary patch literal 246 zcmVu5JdGf|jW-GB`OKu|Xz*%OfL8EB$yAlghg2tgZ2}UC?XwI|qK+CK?`l|i4Zq#x-djcV`{Fxn s+ewK=*gcbyh{kIzcsSZyU$B>F!Z!cZsY%t(q32=YG zA*-k?a;xFD{)9lk2LZerT?HHue)jKo_n7l3n>iunO8Wo+ literal 0 HcmV?d00001 diff --git a/apps/common/main/resources/img/toolbar/1x/btn-incfont.png b/apps/common/main/resources/img/toolbar/1x/btn-incfont.png new file mode 100644 index 0000000000000000000000000000000000000000..db86354a7969aa8375bf9d4326700fdf41671215 GIT binary patch literal 478 zcmV<40U`d0P)-vI^`#jIN zI)CB3MciE1_0u%1Xu22=N%A?4!`1nh58>m!GT*pEgiX_YAeD$$1Xp67X*urrl$b$2 zYX=!)TXg6Gl07Od(77Gw{6-4_4$&pqJw$=nfqRtCI)j_dM$AN+WtphB#QB{bgXDuK z$%mN4XBCKw6U0#+KW#%i0}0}&`RGURDE<@}MbQhAhib24r9hk*1-5j(;JxHST-8dE zd_(I+!)6juEkWQxW$`0oUgU7od?YF#jJrvEJ(Fm2z!W}AQR#ctz0+K?80NTJA*y>P z8Zk@nFV^NT#R-T#NXyKk%~6?`Vh_>;v-AXZ%t0N}^8&M&=IG)~6V0+>#R?0)0n1IS Uz0u#lX8-^I07*qoM6N<$f`e7exBvhE literal 0 HcmV?d00001 diff --git a/apps/common/main/resources/img/toolbar/1x/btn-incoffset.png b/apps/common/main/resources/img/toolbar/1x/btn-incoffset.png new file mode 100644 index 0000000000000000000000000000000000000000..826d99155e35cc3dde773b92f47440465a45e399 GIT binary patch literal 340 zcmV-a0jvIrP)E)O2rBs3NgY51H>ew!5u8B#t~AApQIqCJ3;7_(#rSx<^9Yg0h0zt+IXI#{qdZ!XBibAAmI^=nN zBL~2Xz#6cO^|Wr;+%!#97=~qC*S&)T*<6KHBBcIof`>x_9oe?+l`PpXBH`h*-etX^ z5_z?^f>_D5ZGtM1Wr7;xALrlo)*&8{D2nbZ#_gpq;Q_(psmJX#`F3xL1*TZ4+QC04 mU`{S-`zih<{7vHV9Pj}2%X&GmP4kri0000-E7E!t#y zU}a{8iK?>lr6kP1){LG+S*F*M1kXDC09F!tRdvr!l2|S!Nh%kTpb=00TS@vqHT3Wq l%fK4kFiH0mRORq+citjfW55snIduR4002ovPDHLkV1flsU>5)Y literal 0 HcmV?d00001 diff --git a/apps/common/main/resources/img/toolbar/1x/btn-italic.png b/apps/common/main/resources/img/toolbar/1x/btn-italic.png new file mode 100644 index 0000000000000000000000000000000000000000..c4a3b53c0761884c531aa2b2bb6db9743d5732b9 GIT binary patch literal 153 zcmeAS@N?(olHy`uVBq!ia0vp^8bB<h{kIzcsRU0K$B>F!$r4NnB0K)HJN|j~ z?=YjIvaQIR_rl3v>s$Z3tV}N8E12g$rIGP}XVCEnR`)IEX)r(k->tC7nwoLR~FLW5Xml}1A#1B2Q+m-M;?oNs`3F?hQAxvX CH#a;0 literal 0 HcmV?d00001 diff --git a/apps/common/main/resources/img/toolbar/1x/btn-lastitem.png b/apps/common/main/resources/img/toolbar/1x/btn-lastitem.png new file mode 100644 index 0000000000000000000000000000000000000000..d0054afb95d92d44e9a3caec8809d54301ede213 GIT binary patch literal 205 zcmeAS@N?(olHy`uVBq!ia0vp^8bB<h{kIzcsVSZ=jv*Dd-cE8CJz~J)!h2MJ zNilVgz7EsDHUYK91db*pjy8j6zuQY6Ppg?ed6(LoKjN9QlXo!j_&+=*ZEa-3?o$;Z z!|3_+5!a35o{GgL%x+q(7kMQ7dRTd1|8AJRe?#F`=6MeMi=-I+H>gLRZP4%xE(=|8 z=30;y$CB;oHv(gfUA%8@eR}N8&7!xpR%_b$%I$iU<+}3X*WcaW3UnWXr>mdKI;Vst E020h{kIzcsY#wLjv*Dd-d?`QdBlL@SfP6X zi+e$fgUGJ`Op;HnbJk5bl*sog`F}01y^`sdu$im*!*8)2ZTNRo@|UO7wfF4po{z-V zn)cn6jQO20=}uoWlV6yIwuJMADPlYVCU0jyeyZ$#y<*4IhTR+N!}+iE->GP750I*8 zI&oh1(*Eqn%D>M~NX@lSO=jke+j2uZ^23*T-@h@2>g{;R^RMbJ&~*%+u6{1-oD!M< D9ph5Y literal 0 HcmV?d00001 diff --git a/apps/common/main/resources/img/toolbar/1x/btn-menu-about.png b/apps/common/main/resources/img/toolbar/1x/btn-menu-about.png new file mode 100644 index 0000000000000000000000000000000000000000..3ff96653741eb1b767887ba1f987ffe46bac3da9 GIT binary patch literal 303 zcmV+~0nq-5P)!BpnMoAJYV> zaT{uLWD*L7d}Rc23Bw9JMg1 zBG%Q27^~0P;g})#vJA;(hKDD*9A4gKEo3A!2q~1Vo0$_I6FZ;rE)=8@=Vz0WmXk6d zCB)lV4iSRf;uKOC?`Antm^+-xQk^#8<)_WB(j_aJ&~3+I5<36@002ovPDHLkV1mur BetiG{ literal 0 HcmV?d00001 diff --git a/apps/common/main/resources/img/toolbar/1x/btn-menu-chart.png b/apps/common/main/resources/img/toolbar/1x/btn-menu-chart.png new file mode 100644 index 0000000000000000000000000000000000000000..bfcc8815232e7823e98a864e890eb76ab2ad9a2a GIT binary patch literal 140 zcmeAS@N?(olHy`uVBq!ia0vp^8bB<h{kIzcsbEhR$B>F!PbV_69dO`bSscIn z&j0xv{BLF@D!yBw`I^m8VMg!zorh+0rW7fe3Dh{e@p!dPp;TJxm(82`PTS@kDwraF p`sAykX}m`(r1_?VndrO?$@7|CWEr5d$pUCRgQu&X%Q~loCIA{CG7A6z literal 0 HcmV?d00001 diff --git a/apps/common/main/resources/img/toolbar/1x/btn-menu-chat.png b/apps/common/main/resources/img/toolbar/1x/btn-menu-chat.png new file mode 100644 index 0000000000000000000000000000000000000000..f2bc02d8dcaba16d4d5d460d5c145ce77ac41a78 GIT binary patch literal 217 zcmV;~04D#5P)Nklpl^77g873ps3d8Si*+ku*uL$$>#`Lw9w8TAwg(oT{x)2&>A(gvnHe>l7ubVDJ5ir zQ%cB7nh{kIzcsTxlg$B>F!Z>O{hvM36$sEZg? zPG4hog?H)w+P?Dr%QTW#eY`r~=#=8w+$mAcLCRYbJNyh6hZKLvS$KP$a8kjcvevUs zd=)=*>sJ;`SgmiSdufYI{gHzouX}g7D89XZ+puTnD(m+PwOBl-A9><8#kuF4rlQ_z gYuQ*9*;-xW-=Fw)ZH@Vw2XqI6r>mdKI;Vst01vK4SpWb4 literal 0 HcmV?d00001 diff --git a/apps/common/main/resources/img/toolbar/1x/btn-menu-image.png b/apps/common/main/resources/img/toolbar/1x/btn-menu-image.png new file mode 100644 index 0000000000000000000000000000000000000000..525cd552a6fd6796a5689656544bda5019bcbb9c GIT binary patch literal 226 zcmV<803H8{P)ycWD)`(Ob`LfMwS3rfa1ZQe?ya;a?9x)B+*DC&~W#4-bfER zZhey;)K>lYB0Z?B?C3yk^;mSVJNXTMS}i-LO+DDP>KE@o(@t~PF!q;~`S-S&hlj%) cKOC-_CtJq{uBv%qumAu607*qoM6N<$fh{kIzcDMe2g$B>F!$r7y15^>bP0l+XkKn^PD= literal 0 HcmV?d00001 diff --git a/apps/common/main/resources/img/toolbar/1x/btn-menu-search.png b/apps/common/main/resources/img/toolbar/1x/btn-menu-search.png new file mode 100644 index 0000000000000000000000000000000000000000..abc610898ed191b411051198187cdcf3e551120b GIT binary patch literal 287 zcmV+)0pR|LP)`!@rhUv}#w(tSf^*N02@k8Zrum^pv(^CE zc;rW>MnK=oYN9;=uIfSP0Z@6Fj!+i?`*D0+Ve%ljGp?r^0qbgpCA9!pS2HZM0JxX* zXv^mNH*NV2u_V_r%LQDE`CWqG4hwP#FZf-8sLGaH(XMqbHfh6A07FvZ9~LS!I( lGt$nM52T1OGM{0j0s!iwqbdjSFT56$3djD*FYl7_Sgm zBwK#`P4gpJkrjww{M+M!AptNCt?oxvdjK4`Jt{o{+S6U5h|U0Lhyw~U04h;j0g&7L ze~Ya1*uBGKzS!^gWM3RwRGz-vu%!{W>B|ipBLF@nxs=zd-lXi6&t%$)Ts>_0>R}{K wjD}qB=6mQ}jyDvY+MPS^a$vxuBilFY2OTcXJ?jNeL;wH)07*qoM6N<$g7MvdlmGw# literal 0 HcmV?d00001 diff --git a/apps/common/main/resources/img/toolbar/1x/btn-menu-sign.png b/apps/common/main/resources/img/toolbar/1x/btn-menu-sign.png new file mode 100644 index 0000000000000000000000000000000000000000..2aef06f361ad2fd98816330a1538c4b7f93445a8 GIT binary patch literal 503 zcmV>ushPMraKonjf8Ivtrp#56OMS?GM827M%YZnC*~)c{XA z3>nWv-n+q$PjREnRwK)>dmWy1MCKYF410iF><;m)%8 zGu%lP*@O#Hw3pSBJF4SkS3Kfv-h~Sk?WKBB9jW5MH<4u#@3PIGHz|Xuj_c%HT=(Vt z04{j4_KiZ-Q71>N`{%#7!CuyAe|N=YcXCH{d$+NP8@SYH4;`5kM>2O}e-5L&ZmWt> z&*NZz9q-OzWYbYGOuej literal 0 HcmV?d00001 diff --git a/apps/common/main/resources/img/toolbar/1x/btn-menu-signature.png b/apps/common/main/resources/img/toolbar/1x/btn-menu-signature.png new file mode 100644 index 0000000000000000000000000000000000000000..2aef06f361ad2fd98816330a1538c4b7f93445a8 GIT binary patch literal 503 zcmV>ushPMraKonjf8Ivtrp#56OMS?GM827M%YZnC*~)c{XA z3>nWv-n+q$PjREnRwK)>dmWy1MCKYF410iF><;m)%8 zGu%lP*@O#Hw3pSBJF4SkS3Kfv-h~Sk?WKBB9jW5MH<4u#@3PIGHz|Xuj_c%HT=(Vt z04{j4_KiZ-Q71>N`{%#7!CuyAe|N=YcXCH{d$+NP8@SYH4;`5kM>2O}e-5L&ZmWt> z&*NZz9q-OzWYbYGOuej literal 0 HcmV?d00001 diff --git a/apps/common/main/resources/img/toolbar/1x/btn-menu-support.png b/apps/common/main/resources/img/toolbar/1x/btn-menu-support.png new file mode 100644 index 0000000000000000000000000000000000000000..ca61c137cea9306c263ec88e7a41facbc701b46c GIT binary patch literal 287 zcmV+)0pR|LP)wAmf{Z&q+g2D8z zS?3M14GDsVJ2K`EP`<*EhuTlqEht|hII!#51sjVV*jRMI==CwWU_B5X4>;Jt4kOP% z&_dD@mJ2&fC|KlR%v?!=Q}mH1+8r~$t~|9X?}Clw_Dbz2vI{nnU^(~?2{w}8%yvg0 lNrE$+^rBh%Au0d-JWtJC+vm36^UDAL002ovPDHLkV1hQ(b`Ssn literal 0 HcmV?d00001 diff --git a/apps/common/main/resources/img/toolbar/1x/btn-menu-table.png b/apps/common/main/resources/img/toolbar/1x/btn-menu-table.png new file mode 100644 index 0000000000000000000000000000000000000000..b6b58a8ec2c45415615c85214accc0ff0b905f5f GIT binary patch literal 122 zcmeAS@N?(olHy`uVBq!ia0vp^8bB<h{kIzcDMwEi$B>F!$r4KvM0VUO|Jg6S z>t6fH-}V3P?HIz3GhAsCKg6rTFo8#<@2k9iHyc}@hJJt5P04(}LN(3h0eo(Z4CU>C V73c2$UIjFa!PC{xWt~$(696IOCc^*# literal 0 HcmV?d00001 diff --git a/apps/common/main/resources/img/toolbar/1x/btn-menu-textart.png b/apps/common/main/resources/img/toolbar/1x/btn-menu-textart.png new file mode 100644 index 0000000000000000000000000000000000000000..07a04a6ba7fef47cf4a9a5c798ee5e5cfdf4607b GIT binary patch literal 301 zcmV+|0n+}7P)8f!3DZ+8Cszrwu_}bt$#Dj^`jN3l(P!z}MYW^cjF#58)Y3RDb$aTX?q0Mtq6*YE(G*m|@9XoD`2Bt?@MSV*LBvZOLA=A}13 z1rsyi^mudCNYaP7qUfrlq@x~*2M)l>$U$#=E~Q$x{o$@u^IP8KGEQad(NS^o5%>Fk z@-v!C+T}iajQGwiCF}J6%m&Fj;8%}<+*~Gq>@dY#(wGgz00000NkvXXu0mjf4&8%x literal 0 HcmV?d00001 diff --git a/apps/common/main/resources/img/toolbar/1x/btn-nextitem.png b/apps/common/main/resources/img/toolbar/1x/btn-nextitem.png new file mode 100644 index 0000000000000000000000000000000000000000..22a0c1646a035a67a67ea8232d8cedad1873ca2c GIT binary patch literal 193 zcmeAS@N?(olHy`uVBq!ia0vp^8bB<h{kIzcsSZyU$B>F!Z!aeD9yZ`{Npv=B zaq8H1+C;2%f|JH%Cyo{e&K8FX?k3CnR61|V sQeM-djRFQ5V!^(7+$(n6tvkxD_%u*#KHs%|pqm&xUHx3vIVCg!0FDJl&;S4c literal 0 HcmV?d00001 diff --git a/apps/common/main/resources/img/toolbar/1x/btn-numbering.png b/apps/common/main/resources/img/toolbar/1x/btn-numbering.png new file mode 100644 index 0000000000000000000000000000000000000000..4907f3c6e8a823c9036810880f0b849020bb70e8 GIT binary patch literal 152 zcmeAS@N?(olHy`uVBq!ia0vp^8bB<h{kIzcsd!Hp$B>F!Zzmq)YzW{vYBkH@ zdzN|emI|T3p8|pcSH8&o@~D}i!pYbW*7j(T!Oi;~CmN&W?Zj1YyDpr&X|t0 literal 0 HcmV?d00001 diff --git a/apps/common/main/resources/img/toolbar/1x/btn-options.png b/apps/common/main/resources/img/toolbar/1x/btn-options.png new file mode 100644 index 0000000000000000000000000000000000000000..aa6efff405ed24571a7618d326f270d25811fb34 GIT binary patch literal 90 zcmeAS@N?(olHy`uVBq!ia0vp^8bB<h{kIzcDMe2g$B>F!$r7x}>^uG(=armr mpx!3Igvb4G0gzynV_+!p=~yi<cm)#bz3CgbpqR3>I@IYA*#z6g=^@zwEKU!|%C&ErQv=eO z=9H5ucTcS-C&7WDl)UF++oEC_7u$xy&Kh>^bchvQZuoSFv$n-Vvl++0pvjD5;(kSL zCONF8h{kIzcsW?v;$B>F!Z_ga$ZE)al3CuFi zk)PtQe2RnSV)4z@6V9r<>iz%Te^-96{K^^Lf-;?|m3cR~axJ129afom7(@uDa0tnG zHhDI+PhK$jf$JVR AA^-pY literal 0 HcmV?d00001 diff --git a/apps/common/main/resources/img/toolbar/1x/btn-paste.png b/apps/common/main/resources/img/toolbar/1x/btn-paste.png new file mode 100644 index 0000000000000000000000000000000000000000..9b0cfdf31cd9b3e9dd524420eb56280f1cbb967e GIT binary patch literal 168 zcmeAS@N?(olHy`uVBq!ia0vp^8bB<h{kIzcseDft$B>F!PbY2Ubv5KTav}b$ z>hFFBvyb|k@0{F4FGq{*s+i*%YZ4$ZZ!Y)Vxr@AHGH=B!ENjwc(GJ-Y@Um4m?8eqN zZ~k*!k6$L5_3{wc&aMC1ju{7?SUGRohmd|Tt$hI!zaQ2t{B)9UKhM$kA431-{$gGJ TF!0r8pw$eXu6{1-oD!M<4p>Bl literal 0 HcmV?d00001 diff --git a/apps/common/main/resources/img/toolbar/1x/btn-previtem.png b/apps/common/main/resources/img/toolbar/1x/btn-previtem.png new file mode 100644 index 0000000000000000000000000000000000000000..44065fa4aa9ac8770ea3e7f45a0cc8d9190b1113 GIT binary patch literal 197 zcmeAS@N?(olHy`uVBq!ia0vp^8bB<h{kIzcsUA-k$B>F!ZzeeM9ySnQVLmFr zq?mOrD51sitilAIg8_U^iay%f@7Mi5yYHQ$RBztT`?l7TUh%jmwFL)?&s%)q;C9ok zd$?|2%UF|etLVx19R|4vAJlP$wr+c$*b?&KSx=>`E^7K&Y*XDT<38(G;)H~c x)pM&en4YNY`S9+J{cQgfE0$H#PZC5J82+ydl+Lcww*h{kIzcsd7&j$B>F!PbWL_H5hQPNbe8( z^#>Ag@WOyP&5y!maynEOp3ELH^bOR@xI7?z*!VMf~E|l&qf6JwMZ)Y|Lg5m;> zyuXT;sQ@QXn&R2)daGyh3^p8g)T|x)e{P3F7;Ab3| byMI#$RCBKv<|*wpc)tj0Kmj!3>3}jLI3~&07*qoM6N<$fg zIPWn8Q%~du7(A6!PbU43BOP}TTt-!Q1dheV@?GLMxBbPQBMU6JQswc0NkIscmg+gV+O?*s*eBw002ovPDHLkV1h8VSZx3R literal 0 HcmV?d00001 diff --git a/apps/common/main/resources/img/toolbar/1x/btn-save-coauth.png b/apps/common/main/resources/img/toolbar/1x/btn-save-coauth.png new file mode 100644 index 0000000000000000000000000000000000000000..5d2609bc71f77759285421c3d28add2b6faef309 GIT binary patch literal 292 zcmV+<0o(qGP){sde$y#;}J z(+lIlnR$seHAU-7960q58U|D(0y}5A=akb|Q5&QK5saNgqF_h}YJGl>dDj+#mC<9T z#UMHT&N-=tAdDUfi$PmJLeLhF34AOY)~5SKqebfkE*qwC^?*X%qGVCia)Fj5>LD1V qgJUTnSvwg0%0bo(1b)UaBme-sE-vNr7#Y3*0000h{kIzcsS-~Y$B>F!Z!d4;J)pqj64-x8 zW1>Oz#+SWCf;;vEuhQ`SA;uB7hfQ#Qu7akqv(k#Q7bb1JzUJ~(t0^kk>%XlObh0vV z^5AykSedY}+sCf4HE$BvEt?g!jIX@;BLd>3#MY>m^OcmpZ)ShvvFqi8{coJ-#Jy(Q X^q%*r>Ej6?$1r%h`njxgN@xNAG{!&s literal 0 HcmV?d00001 diff --git a/apps/common/main/resources/img/toolbar/1x/btn-setmarkers.png b/apps/common/main/resources/img/toolbar/1x/btn-setmarkers.png new file mode 100644 index 0000000000000000000000000000000000000000..8b139f56993df239c893937149fe355431a13643 GIT binary patch literal 120 zcmeAS@N?(olHy`uVBq!ia0vp^8bB<h{kIzcDSJ;B$B>F!Z!b2oGB^r2Ulf_X zFU{)z^S-S*J;{ufj$A)>soy!aR*-i~+OxaAY-N9}xnEKwIo(YppmUOjy{eZ@o7yaf UkCSd(1{%fS>FVdQ&MBb@053Nv>;M1& literal 0 HcmV?d00001 diff --git a/apps/common/main/resources/img/toolbar/1x/btn-settings.png b/apps/common/main/resources/img/toolbar/1x/btn-settings.png new file mode 100644 index 0000000000000000000000000000000000000000..bff9990c3de2963129bf94bb36d6c3dc7a349bd2 GIT binary patch literal 451 zcmV;!0X+VRP)-+v1NjOVU=kqf(8J-10lvib-wl!{Tm1Z02M=51Ck4-Cqs^sj z^O_{ZBEP(k1_oWRmWUas0*zct9n`Gm^@?UcyQ@$D$6U*RdHn)*9qvW;Qjk+~%GEr^ z6=_m_6ZwQ@j6*ty*~b}4hY3ER*(Q0K9zgv7Z@@H?YfGCR(?{S82T|0JCPu5U!e*7L zN`o#fPmE^EjKNS?rbzN>|J-ZywAqTHh7q!`-@~9NM*%$By4&gwefB0SzUmOr)!jC# z8@Wr~+}_EhBU^VUJVxB$s>b%{U=iv(PP8OI%uf&6kf%k83V6bj05Ly3z@(=qz8ECQ t7i{B!LCF^!$Wk@2f5Rcrf`fHG6aPx3E=oHs26q4e002ovPDHLkV1h-%$fN)O literal 0 HcmV?d00001 diff --git a/apps/common/main/resources/img/toolbar/1x/btn-strikeout(ru).png b/apps/common/main/resources/img/toolbar/1x/btn-strikeout(ru).png new file mode 100644 index 0000000000000000000000000000000000000000..d3d0236cacf3b3e214b43dcd9a443fdcc151d3a8 GIT binary patch literal 109 zcmeAS@N?(olHy`uVBq!ia0vp^8bB<<0VEi1=_;fHDW;MjzhDN2vdL#HfIKx%7srr_ zTgeh_2UwW`j{I|GSQe%8OK=ri+(K?11?{Fr$M-WIax!!q%6Tr++0g?s$J5o%Wt~$( F696eq9R~ma literal 0 HcmV?d00001 diff --git a/apps/common/main/resources/img/toolbar/1x/btn-strikeout.png b/apps/common/main/resources/img/toolbar/1x/btn-strikeout.png new file mode 100644 index 0000000000000000000000000000000000000000..0f8331c8b30bcf56d29e815ea46cf059c5fe64e0 GIT binary patch literal 222 zcmV<403rX0P)uh-E=+WqSf_#1!!4>9gm^pg9 z^4Oam3x%F<$6@Bj>NqziOzco%KMe}fVUWUpp2Bn(M1#ygmoP}Mr&I~DdekKh6OE}F zWMvO?3COh|D|;9Q=30=Q*uv)ROhYBe4qMv1oiT_{>|=(B3wvgoJoq3675j;TP8TP; P00000NkvXXu0mjf=TvNg literal 0 HcmV?d00001 diff --git a/apps/common/main/resources/img/toolbar/1x/btn-superscript.png b/apps/common/main/resources/img/toolbar/1x/btn-superscript.png new file mode 100644 index 0000000000000000000000000000000000000000..99d8a826be7163db00ec7fc0eba3835e333cd331 GIT binary patch literal 272 zcmeAS@N?(olHy`uVBq!ia0vp^8bB<h{kIzcsq3CDjv*Dd-cCHo+ibw&D%mI~ z(I}|%Fl6sRw$$dHLmWMi1dW{BPH^mRbP3}(eYuf+-_jH9%hyM&-~CzeUW8oq?89u0 zMbj(!Wa=IoDBKWDxD=aVpv`b8HlbkdZOac~-(N6w2kuZ_P}ITk<6PkRlf83R!>~1A>Uj`Pi#^D&O`x~Suw}{$iQtZ7mD9Ktr7G6$|GdAFIjp&} UiF;aM7SM|fp00i_>zopr0O|*Ey#N3J literal 0 HcmV?d00001 diff --git a/apps/common/main/resources/img/toolbar/1x/btn-underline(ru).png b/apps/common/main/resources/img/toolbar/1x/btn-underline(ru).png new file mode 100644 index 0000000000000000000000000000000000000000..292c768cab97c95f6dc884f4f89ae4757154f0a7 GIT binary patch literal 160 zcmeAS@N?(olHy`uVBq!ia0vp^8bB<h{kIzcsdP^l$B>F!$qV!(SoQt~-mp0M z|Nn_Mig^o~84B6{i7T8t@K=vl;nvjyOBvTU{{C;?klFm7w}Q7MpkUtns{3E}ovzzn zv4>6T&;0-Y?F8Qam+v>2P|zdH>c+dI@R)PE#hn(m6>pCPGBE6`On$jX>z6aoN(N6? KKbLh*2~7a75kK<) literal 0 HcmV?d00001 diff --git a/apps/common/main/resources/img/toolbar/1x/btn-underline.png b/apps/common/main/resources/img/toolbar/1x/btn-underline.png new file mode 100644 index 0000000000000000000000000000000000000000..ae2557e24af4b8692760f2f1567daf1dd4cc5160 GIT binary patch literal 166 zcmeAS@N?(olHy`uVBq!ia0vp^8bB<h{kIzcsa#JN$B>F!Z_l_h9yZ`{2z2C7 z$(Q15Zds@((X`;tyV$Q+w$AgD`}OJjGof^K=7{Cr`TsRXPQLv-=2cq2&Hsll9u<1F zX6dfPsi&n@OU?<@I;_Rn9u{^n_@PVtx4*2D_C7g{L`LNWjV literal 0 HcmV?d00001 diff --git a/apps/common/main/resources/img/toolbar/1x/btn-undo.png b/apps/common/main/resources/img/toolbar/1x/btn-undo.png new file mode 100644 index 0000000000000000000000000000000000000000..41e405429df3624632db8436cb75e32ac52fbd1f GIT binary patch literal 223 zcmV<503iQ~P)7!qNPAdA(Jx9qdww@xXbiS$fP8v=S+u|LZ+LowF#Wq4a%swE19sc z)&>Wcl13;`xB6bjO;`)z!et$X`dMhjXLz2HLc}^e)RS=f%Nw44yrEc!7DAyEfKa~t ZAp=7xuXpN&uE78R002ovPDHLkV1gdsU!(v4 literal 0 HcmV?d00001 diff --git a/apps/common/main/resources/img/toolbar/1x/btn-users.png b/apps/common/main/resources/img/toolbar/1x/btn-users.png new file mode 100644 index 0000000000000000000000000000000000000000..cebb158309bb2917f44107796c352ff6a6fdbf4a GIT binary patch literal 338 zcmV-Y0j>UtP)=N+VHk>{6wF``inZQU`3r&pDA3Z56Ypge~ z!nEg@N-34Y*|OuBL@ST>XwNx}1UNsr?jrA2A(Z9kk6%B(;H&^-oR+IKB)Nw7x7zY> zn!B|(O`=k literal 0 HcmV?d00001 diff --git a/apps/common/main/resources/img/toolbar/1x/btn-zoomdown.png b/apps/common/main/resources/img/toolbar/1x/btn-zoomdown.png new file mode 100644 index 0000000000000000000000000000000000000000..f18a224f90ba4ff3823d81d586a5eeac2ca91bdb GIT binary patch literal 88 zcmeAS@N?(olHy`uVBq!ia0vp^8bB<h{kIzcDS1y9$B>F!$r7xK6GSGk#r#Wl mV$*qGFLuCy%kAI?HU?K=h3@CvcYgzwGI+ZBxvXpF literal 0 HcmV?d00001 diff --git a/apps/common/main/resources/img/toolbar/1x/page-landscape.png b/apps/common/main/resources/img/toolbar/1x/page-landscape.png new file mode 100644 index 0000000000000000000000000000000000000000..56b2a47d3f9411bb56f595bba9a9d7f08348d82f GIT binary patch literal 149 zcmeAS@N?(olHy`uVBq!ia0vp^8bB<h{kIzcsTfZe$B>F!Z!a>k9WW4ZxoGLt z7i6|KJm1QFrjtXOhRDHxtV(ia7iDjsU1`9-&1LBu`DFt4x~w%1PI6H;uIP2GYdm~{ yoC@C3{jB5Nl{otkbBZ~=j{X7K!{F)a=d#Wzp$Pyh!!@`7 literal 0 HcmV?d00001 diff --git a/apps/common/main/resources/img/toolbar/1x/page-portrait.png b/apps/common/main/resources/img/toolbar/1x/page-portrait.png new file mode 100644 index 0000000000000000000000000000000000000000..b82d21c84642e0b70e4bbc03660b33ea7b583d7b GIT binary patch literal 147 zcmeAS@N?(olHy`uVBq!ia0vp^8bB<h{kIzcsVGku$B>F!Z?816GC1gTe~DWM4f)}A** literal 0 HcmV?d00001 diff --git a/apps/common/main/resources/img/toolbar/1x/shape-align-bottom.png b/apps/common/main/resources/img/toolbar/1x/shape-align-bottom.png new file mode 100644 index 0000000000000000000000000000000000000000..82abc47a8a730083884a9a277ffafdd358dda437 GIT binary patch literal 139 zcmeAS@N?(olHy`uVBq!ia0vp^8bB<h{kIzcsUS}m$B>F!Z!a>k9WW4SewZGf zUG-o2iN=4PJ!jvDid?N#Wmh{kIzcsW49$$B>F!ZzqN_Is|eY%`;z6 z&$8&v&fTwnJdgO%8F)zN!JqbLUWLz;*U#aa|I&BnbKY|`8e2~oS$}d4U-v%R{`15Q tr8Ud6Q|D=0{94H4GVSKX{5_xiS?v4QZoi#h5Cyb>!PC{xWt~$(69DQ*IV%7F literal 0 HcmV?d00001 diff --git a/apps/common/main/resources/img/toolbar/1x/shape-align-left.png b/apps/common/main/resources/img/toolbar/1x/shape-align-left.png new file mode 100644 index 0000000000000000000000000000000000000000..fc54e31707b3544acab160f991004a85dc8d1512 GIT binary patch literal 145 zcmeAS@N?(olHy`uVBq!ia0vp^8bB<h{kIzcsR&OO$B>F!ZznRc9dO`bd7pps z?|;t9QzBROu5j%LyUoeLlYBhg(~WyaxP|u3{At2LGE+p=eytVwo84Nd=5GDdRQq+> u&6L10k%>D3S=I;~b1m93S$_AY^K4)DZn0cbXY(6q2ZN`ppUXO@geCxg(ld7e literal 0 HcmV?d00001 diff --git a/apps/common/main/resources/img/toolbar/1x/shape-align-middle.png b/apps/common/main/resources/img/toolbar/1x/shape-align-middle.png new file mode 100644 index 0000000000000000000000000000000000000000..6c170991d56e2b4b802e56404c496c77e8d29607 GIT binary patch literal 149 zcmeAS@N?(olHy`uVBq!ia0vp^8bB<h{kIzcsTfZe$B>F!ZznUdF(`_-{J%Tv zU42Xalt_7>?3oKfUmTVAAQ2i9c1f6}`WTB^caP+POO9IGIZf|#|E>8jJ8s3Fc#dm< z(!Zm_R`mY;aWd|P5Xh{kIzcsTfZe$B>F!ZznRc9dO`bd7pps z?|;t9Qz9YG+XG# yX-s(7wN+7(|DD}0CS71OS(vl*le+f*Qt9BVUAymw-0%k4!{F)a=d#Wzp$Pzwmo^9h literal 0 HcmV?d00001 diff --git a/apps/common/main/resources/img/toolbar/1x/shape-align-top.png b/apps/common/main/resources/img/toolbar/1x/shape-align-top.png new file mode 100644 index 0000000000000000000000000000000000000000..053b3b9c950e167896fbfc8f1a0c42b67fa70334 GIT binary patch literal 140 zcmeAS@N?(olHy`uVBq!ia0vp^8bB<h{kIzcsbEhR$B>F!$r2k6Jhjj3So6+a z&VXg_+ba1dj@N&$$np8`-|j~H_lY+x4hc>^lJ%h8XObIRpVSMUzR2glfAG2-(a~f6 pxLb^0B8^SykTBziw&xyf4609d?S84Lau#SjgQu&X%Q~loCIG6^Grs@; literal 0 HcmV?d00001 diff --git a/apps/common/main/resources/img/toolbar/1x/shape-distribute-hor.png b/apps/common/main/resources/img/toolbar/1x/shape-distribute-hor.png new file mode 100644 index 0000000000000000000000000000000000000000..71870473bbafc7f5640e16b112cca1fa62222740 GIT binary patch literal 145 zcmeAS@N?(olHy`uVBq!ia0vp^8bB<h{kIzcsR&OO$B>F!ZznUd9WW4aF5mv| z-hU3uQ?nTvBR?L`Xl7rlZnD?RcVn5?9`<6D}`ERKDVJNd$Gw}qEm uXS%9;K;kIk{VIxPN9SokXelF{r5}E)z9X9I# literal 0 HcmV?d00001 diff --git a/apps/common/main/resources/img/toolbar/1x/shape-distribute-vert.png b/apps/common/main/resources/img/toolbar/1x/shape-distribute-vert.png new file mode 100644 index 0000000000000000000000000000000000000000..476c5255734fe3a817e93a975097e4140ccc9f62 GIT binary patch literal 146 zcmeAS@N?(olHy`uVBq!ia0vp^8bB<h{kIzcsYp*3$B>F!Z>KP_F&Of&eBQp~ zf4$Q@BlfC8FN^wiUC>;UBTHHPef!hnI?J8Qqu5bP|el-5`8mXb9?*_ vJ>Al+Wee)B86TMERIl;d{AuyNe}`Dz6K}g7H<_Ucw1mOa)z4*}Q$iB}!>KdQ literal 0 HcmV?d00001 diff --git a/apps/common/main/resources/img/toolbar/1x/shape-group.png b/apps/common/main/resources/img/toolbar/1x/shape-group.png new file mode 100644 index 0000000000000000000000000000000000000000..18cc003a20a3a45b9e6d6975b2458f16ec3ead92 GIT binary patch literal 154 zcmeAS@N?(olHy`uVBq!ia0vp^8bB<h{kIzcsYFi~$B>F!PbV|7F&Of&Jl;3$ z%YXk9!OtA-UcAS}vOGBA=!UR25lss|@h3<#{A!sz@nDVeTj5FVQ?^du!+LE^tCa4> z)f+1UwE1>b%)el)!71Fbq4G7`!u?_2KAp1P`!sk5V_MJJU!U!N76L6}@O1TaS?83{ F1OU4;JmUZW literal 0 HcmV?d00001 diff --git a/apps/common/main/resources/img/toolbar/1x/shape-ungroup.png b/apps/common/main/resources/img/toolbar/1x/shape-ungroup.png new file mode 100644 index 0000000000000000000000000000000000000000..b8f4b39d5d22888e99d8ea052c86dab95e7bbc97 GIT binary patch literal 164 zcmeAS@N?(olHy`uVBq!ia0vp^8bB<h{kIzcsccUd$B>F!PbV|79WW4J`Mo{n z-~X1{QzAzcZ$DF5YSd`ab1rjTGAEPqOok7WYY#2amRSCJC)>mqrq#P{zi;`;m(Y6B zX~vqC*997F>}q!y>}vLJ(A3~$b$c;AzoqQwd@kP~7Hj`h|9|2-{}ivj?`cOC83{h1 OwG5uFelF{r5}E)B;670R literal 0 HcmV?d00001 diff --git a/apps/common/main/resources/img/toolbar/1x/text-orient-hor.png b/apps/common/main/resources/img/toolbar/1x/text-orient-hor.png new file mode 100644 index 0000000000000000000000000000000000000000..e92bfc722dec4fa8dbe2409fa31fec2c480a7557 GIT binary patch literal 259 zcmV+e0sQ`nP)~=GV3W=eWZ<9@iUTAd0SQQ`gpsfk9+L&QbPjtUfdj9ZWSYMG{7gFh z`6N;VDQ!bd>i!&i6rg#4Q3*XqFS1JeDEM2REcUpt(me3V#NHuEE#qWmd^MD77?-Gw z7~{L)HSTwms^&AdhK`!%An-_SG49bkjKCXY)m^*e?a@%pw*Xe$qi}mRG~d30W;ykE zWV*beq{(_BNmv*ugiqN7#B99aH&TgGT3fB3*JUButNe`vFc%qkI4)Rm0)4a zz|Bu($oG(q6GOU(dGOj(rd`PlX(iwkB7XlQV6>-)&8~*4%?)(5+QDWNQ09iA)DGx6 zg>lE+A4=Fdg)JRW2_R4rHiDI45$TiR+Ww{0C$;^{r4R20x6_)YS^{ z|CAFp^g@uUHj) zqPW*j%moF{=zy=_fL^EoKG+9Ml6?>X3E6vcFN>NK?VKm~SYRmV{69SUFq!vc00#oh zeX@4bCWWzgzz!P & { - :not(svg).icon { - .background-ximage-v2('controls/toolbarbig.png', 78px); - } - } - - &:not(.x-huge) { - .icon { - //.background-ximage('@{app-image-path}/toolbar-menu.png', '@{app-image-path}/toolbar-menu@2x.png', 60px); - } - } - &.dropdown-toggle { min-width: 7px; } diff --git a/apps/common/main/resources/less/dropdown-menu.less b/apps/common/main/resources/less/dropdown-menu.less index 3c645efd1..557526847 100644 --- a/apps/common/main/resources/less/dropdown-menu.less +++ b/apps/common/main/resources/less/dropdown-menu.less @@ -74,7 +74,6 @@ width: 20px; height: 20px; margin: -3px 5px 0 -15px; - .background-ximage-v2('popupmenu-btns.png', 66px, @commonimage: false); background-repeat: no-repeat; } diff --git a/apps/common/main/resources/less/toolbar.less b/apps/common/main/resources/less/toolbar.less index c859507d1..720fcbd72 100644 --- a/apps/common/main/resources/less/toolbar.less +++ b/apps/common/main/resources/less/toolbar.less @@ -459,108 +459,18 @@ fill: @gray-deep; } -} -.button-otherstates-icon2(btn-toolbar, @toolbar-icon-size); + &.borders--small { + border-radius: 2px; + background-color: #fff; -.button-normal-icon(btn-inserttable, 0, @x-huge-btn-icon-size); -.button-normal-icon(btn-insertimage, 1, @x-huge-btn-icon-size); -.button-normal-icon(btn-insertchart, 2, @x-huge-btn-icon-size); -.button-normal-icon(btn-text, 3, @x-huge-btn-icon-size); -.button-normal-icon(btn-insertshape, 4, @x-huge-btn-icon-size); -.button-normal-icon(btn-ic-doclang, 5, @x-huge-btn-icon-size); -.button-normal-icon(btn-textart, 6, @x-huge-btn-icon-size); -.button-normal-icon(btn-insertequation, 7, @x-huge-btn-icon-size); -.button-normal-icon(btn-notes, 8, @x-huge-btn-icon-size); -.button-normal-icon(btn-inserthyperlink, 9, @x-huge-btn-icon-size); -.button-normal-icon(~'x-huge .btn-menu-comments', 10, @x-huge-btn-icon-size); -.button-normal-icon(btn-addslide, 11, @x-huge-btn-icon-size); -.button-normal-icon(~'x-huge .btn-ic-docspell', 12, @x-huge-btn-icon-size); -.button-normal-icon(~'x-huge .btn-ic-review', 13, @x-huge-btn-icon-size); -.button-normal-icon(review-save, 14, @x-huge-btn-icon-size); -.button-normal-icon(review-deny, 15, @x-huge-btn-icon-size); -.button-normal-icon(review-next, 16, @x-huge-btn-icon-size); -.button-normal-icon(review-prev, 17, @x-huge-btn-icon-size); -.button-normal-icon(btn-dropcap, 18, @x-huge-btn-icon-size); -.button-normal-icon(~'x-huge .btn-pagebreak', 19, @x-huge-btn-icon-size); -.button-normal-icon(btn-editheader, 20, @x-huge-btn-icon-size); -.button-normal-icon(btn-pageorient, 21, @x-huge-btn-icon-size); -.button-normal-icon(btn-pagemargins, 22, @x-huge-btn-icon-size); -.button-normal-icon(btn-pagesize, 23, @x-huge-btn-icon-size); -.button-normal-icon(btn-columns, 24, @x-huge-btn-icon-size); -.button-normal-icon(btn-img-align, 25, @x-huge-btn-icon-size); -.button-normal-icon(btn-img-group, 26, @x-huge-btn-icon-size); -.button-normal-icon(btn-img-bkwd, 27, @x-huge-btn-icon-size); -.button-normal-icon(btn-img-frwd, 28, @x-huge-btn-icon-size); -.button-normal-icon(btn-img-wrap, 29, @x-huge-btn-icon-size); -.button-normal-icon(~'x-huge .btn-ic-reviewview', 30, @x-huge-btn-icon-size); -.button-normal-icon(~'x-huge .btn-ic-sharing', 31, @x-huge-btn-icon-size); -.button-normal-icon(~'x-huge .btn-ic-coedit', 32, @x-huge-btn-icon-size); -.button-normal-icon(~'x-huge .btn-ic-chat', 33, @x-huge-btn-icon-size); -.button-normal-icon(~'x-huge .btn-ic-history', 34, @x-huge-btn-icon-size); -.button-normal-icon(~'x-huge .btn-ic-protect', 35, @x-huge-btn-icon-size); -.button-normal-icon(~'x-huge .btn-ic-signature', 36, @x-huge-btn-icon-size); -.button-normal-icon(~'x-huge .btn-add-pivot', 37, @x-huge-btn-icon-size); -.button-normal-icon(~'x-huge .btn-update-pivot', 38, @x-huge-btn-icon-size); -.button-normal-icon(btn-contents-update, 38, @x-huge-btn-icon-size); -.button-normal-icon(~'x-huge .btn-pivot-layout', 39, @x-huge-btn-icon-size); -.button-normal-icon(~'x-huge .btn-blank-rows', 43, @x-huge-btn-icon-size); -.button-normal-icon(~'x-huge .btn-subtotals', 46, @x-huge-btn-icon-size); -.button-normal-icon(~'x-huge .btn-grand-totals', 52, @x-huge-btn-icon-size); -.button-normal-icon(~'x-huge .btn-contents', 53, @x-huge-btn-icon-size); -.button-normal-icon(btn-controls, 54, @x-huge-btn-icon-size); -.button-normal-icon(~'x-huge .btn-select-pivot', 55, @x-huge-btn-icon-size); -.button-normal-icon(~'x-huge .btn-bookmarks', 56, @x-huge-btn-icon-size); -.button-normal-icon(btn-blankpage, 57, @x-huge-btn-icon-size); -.button-normal-icon(btn-print-area, 58, @x-huge-btn-icon-size); -.button-normal-icon(btn-cell-group, 59, @x-huge-btn-icon-size); -.button-normal-icon(btn-cell-ungroup, 60, @x-huge-btn-icon-size); -.button-normal-icon(btn-to-columns, 61, @x-huge-btn-icon-size); -.button-normal-icon(btn-watermark, 63, @x-huge-btn-icon-size); -.button-normal-icon(btn-color-schema, 64, @x-huge-btn-icon-size); -.button-normal-icon(btn-ins-formula, 65, @x-huge-btn-icon-size); -.button-normal-icon(btn-autosum, 66, @x-huge-btn-icon-size); -.button-normal-icon(btn-recent, 67, @x-huge-btn-icon-size); -.button-normal-icon(btn-finance, 68, @x-huge-btn-icon-size); -.button-normal-icon(btn-logic, 69, @x-huge-btn-icon-size); -.button-normal-icon(btn-func-text, 70, @x-huge-btn-icon-size); -.button-normal-icon(btn-datetime, 71, @x-huge-btn-icon-size); -.button-normal-icon(btn-lookup, 72, @x-huge-btn-icon-size); -.button-normal-icon(btn-func-math, 73, @x-huge-btn-icon-size); -.button-normal-icon(btn-more, 74, @x-huge-btn-icon-size); -.button-normal-icon(btn-pagenum, 75, @x-huge-btn-icon-size); -.button-normal-icon(btn-caption, 76, @x-huge-btn-icon-size); -.button-normal-icon(btn-calculation, 80, @x-huge-btn-icon-size); -.button-normal-icon(btn-scale, 81, @x-huge-btn-icon-size); - -[applang=ru] { - .btn-toolbar { - &:not(.x-huge) { - .icon:not(svg) { - &.btn-bold, &.btn-italic, &.btn-strikeout, &.btn-underline, &.btn-ic-docspell, &.btn-sort-down, &.btn-sort-up, &.btn-currency-style - { - .background-ximage-v2('controls/toolbar-menu-ru.png', @toolbarmenu-sprite-width); - } - } + &:not(:active) { + box-shadow: inset 0 0 0 1px #cbcbcb; } } +} - .img-toolbarmenu.btn-ic-docspell { - .background-ximage-v2('controls/toolbar-menu-ru.png', @toolbarmenu-sprite-width); - } - - .button-normal-icon(btn-notes, 77, @x-huge-btn-icon-size); - .button-normal-icon(btn-controls, 78, @x-huge-btn-icon-size); - - .button-normal-icon(btn-bold, 0, @toolbar-icon-size); - .button-normal-icon(btn-italic, 1, @toolbar-icon-size); - .button-normal-icon(btn-strikeout, 2, @toolbar-icon-size); - .button-normal-icon(btn-underline, 3, @toolbar-icon-size); - .button-normal-icon(btn-ic-docspell, 4, @toolbar-icon-size); - .button-normal-icon(btn-sort-down, 5, @toolbar-icon-size); - .button-normal-icon(btn-sort-up, 6, @toolbar-icon-size); - .button-normal-icon(btn-currency-style, 7, @toolbar-icon-size); - +[applang=ru] { .dropdown-menu.toc-menu { --bckgHOffset: -144px; } diff --git a/apps/documenteditor/main/app/controller/Toolbar.js b/apps/documenteditor/main/app/controller/Toolbar.js index 895a2e1a4..3f9caafcf 100644 --- a/apps/documenteditor/main/app/controller/Toolbar.js +++ b/apps/documenteditor/main/app/controller/Toolbar.js @@ -2846,7 +2846,7 @@ define([ me.appOptions = config; if ( config.canCoAuthoring && config.canComments ) { - this.btnsComment = Common.Utils.injectButtons(this.toolbar.$el.find('.slot-comment'), 'tlbtn-addcomment-', 'btn-menu-comments', this.toolbar.capBtnComment); + this.btnsComment = Common.Utils.injectButtons(this.toolbar.$el.find('.slot-comment'), 'tlbtn-addcomment-', 'toolbar__icon btn-menu-comments', this.toolbar.capBtnComment); if ( this.btnsComment.length ) { var _comments = DE.getController('Common.Controllers.Comments').getView(); this.btnsComment.forEach(function (btn) { diff --git a/apps/documenteditor/main/app/controller/Viewport.js b/apps/documenteditor/main/app/controller/Viewport.js index 54ad031fd..5780631da 100644 --- a/apps/documenteditor/main/app/controller/Viewport.js +++ b/apps/documenteditor/main/app/controller/Viewport.js @@ -269,9 +269,9 @@ define([ 'data-stopPropagation="true"', '<% } %>', '>', '', - '', + '', '', - '', + '', '
' ].join('')), stopPropagation: true, diff --git a/apps/documenteditor/main/app/template/LeftMenu.template b/apps/documenteditor/main/app/template/LeftMenu.template index 01f72350d..2466925d3 100644 --- a/apps/documenteditor/main/app/template/LeftMenu.template +++ b/apps/documenteditor/main/app/template/LeftMenu.template @@ -1,14 +1,14 @@
- + - - + + - - - - + + + +
diff --git a/apps/documenteditor/main/app/template/RightMenu.template b/apps/documenteditor/main/app/template/RightMenu.template index 6605f9949..306a80310 100644 --- a/apps/documenteditor/main/app/template/RightMenu.template +++ b/apps/documenteditor/main/app/template/RightMenu.template @@ -21,14 +21,14 @@
- - - - - - - - - + + + + + + + + +
\ No newline at end of file diff --git a/apps/documenteditor/main/app/template/StatusBar.template b/apps/documenteditor/main/app/template/StatusBar.template index e313b8191..8f10cfc6d 100644 --- a/apps/documenteditor/main/app/template/StatusBar.template +++ b/apps/documenteditor/main/app/template/StatusBar.template @@ -23,14 +23,14 @@
- - - + + +
- +
diff --git a/apps/documenteditor/main/app/view/DocumentHolder.js b/apps/documenteditor/main/app/view/DocumentHolder.js index 198369d9d..f9d5065b3 100644 --- a/apps/documenteditor/main/app/view/DocumentHolder.js +++ b/apps/documenteditor/main/app/view/DocumentHolder.js @@ -2086,43 +2086,43 @@ define([ items: [ new Common.UI.MenuItem({ caption : me.textShapeAlignLeft, - iconCls : 'mnu-img-align-left', + iconCls : 'menu__icon shape-align-left', value: Asc.c_oAscAlignShapeType.ALIGN_LEFT }).on('click', onItemClick), new Common.UI.MenuItem({ caption : me.textShapeAlignCenter, - iconCls : 'mnu-img-align-center', + iconCls : 'menu__icon shape-align-center', value: Asc.c_oAscAlignShapeType.ALIGN_CENTER }).on('click', onItemClick), new Common.UI.MenuItem({ caption : me.textShapeAlignRight, - iconCls : 'mnu-img-align-right', + iconCls : 'menu__icon shape-align-right', value: Asc.c_oAscAlignShapeType.ALIGN_RIGHT }).on('click', onItemClick), new Common.UI.MenuItem({ caption : me.textShapeAlignTop, - iconCls : 'mnu-img-align-top', + iconCls : 'menu__icon shape-align-top', value: Asc.c_oAscAlignShapeType.ALIGN_TOP }).on('click', onItemClick), new Common.UI.MenuItem({ caption : me.textShapeAlignMiddle, - iconCls : 'mnu-img-align-middle', + iconCls : 'menu__icon shape-align-middle', value: Asc.c_oAscAlignShapeType.ALIGN_MIDDLE }).on('click', onItemClick), new Common.UI.MenuItem({ caption : me.textShapeAlignBottom, - iconCls : 'mnu-img-align-bottom', + iconCls : 'menu__icon shape-align-bottom', value: Asc.c_oAscAlignShapeType.ALIGN_BOTTOM }).on('click', onItemClick), {caption : '--'}, new Common.UI.MenuItem({ caption : me.txtDistribHor, - iconCls : 'mnu-distrib-hor', + iconCls : 'menu__icon shape-distribute-hor', value : 6 }).on('click', onItemClick), new Common.UI.MenuItem({ caption : me.txtDistribVert, - iconCls : 'mnu-distrib-vert', + iconCls : 'menu__icon shape-distribute-vert', value : 7 }).on('click', onItemClick) ] @@ -2132,7 +2132,7 @@ define([ var mnuGroup = new Common.UI.MenuItem({ caption : this.txtGroup, - iconCls : 'mnu-arrange-group' + iconCls : 'menu__icon shape-group' }).on('click', function(item, e) { if (me.api) { var properties = new Asc.asc_CImgProperty(); @@ -2143,7 +2143,7 @@ define([ }); var mnuUnGroup = new Common.UI.MenuItem({ - iconCls : 'mnu-arrange-ungroup', + iconCls : 'menu__icon shape-ungroup', caption : this.txtUngroup }).on('click', function(item, e) { if (me.api) { @@ -2172,22 +2172,22 @@ define([ items: [ new Common.UI.MenuItem({ caption : me.textArrangeFront, - iconCls : 'mnu-arrange-front', + iconCls : 'menu__icon arrange-front', valign : Asc.c_oAscChangeLevel.BringToFront }).on('click', onItemClick), new Common.UI.MenuItem({ caption : me.textArrangeBack, - iconCls : 'mnu-arrange-back', + iconCls : 'menu__icon arrange-back', valign : Asc.c_oAscChangeLevel.SendToBack }).on('click', onItemClick), new Common.UI.MenuItem({ caption : me.textArrangeForward, - iconCls : 'mnu-arrange-forward', + iconCls : 'menu__icon arrange-forward', valign : Asc.c_oAscChangeLevel.BringForward }).on('click', onItemClick), new Common.UI.MenuItem({ caption : me.textArrangeBackward, - iconCls : 'mnu-arrange-backward', + iconCls : 'menu__icon arrange-backward', valign : Asc.c_oAscChangeLevel.BringBackward }).on('click', onItemClick), { caption: '--' }, @@ -2240,51 +2240,58 @@ define([ items: [ new Common.UI.MenuItem({ caption : me.txtInline, - iconCls : 'mnu-wrap-inline', + iconCls : 'menu__icon wrap-inline', toggleGroup : 'popuppicturewrapping', wrapType : Asc.c_oAscWrapStyle2.Inline, + checkmark : false, checkable : true }).on('click', onItemClick), new Common.UI.MenuItem({ caption : me.txtSquare, - iconCls : 'mnu-wrap-square', + iconCls : 'menu__icon wrap-square', toggleGroup : 'popuppicturewrapping', wrapType : Asc.c_oAscWrapStyle2.Square, + checkmark : false, checkable : true }).on('click', onItemClick), new Common.UI.MenuItem({ caption : me.txtTight, - iconCls : 'mnu-wrap-tight', + iconCls : 'menu__icon wrap-tight', toggleGroup : 'popuppicturewrapping', wrapType : Asc.c_oAscWrapStyle2.Tight, + checkmark : false, checkable : true }).on('click', onItemClick), new Common.UI.MenuItem({ caption : me.txtThrough, - iconCls : 'mnu-wrap-through', + iconCls : 'menu__icon wrap-through', toggleGroup : 'popuppicturewrapping', wrapType : Asc.c_oAscWrapStyle2.Through, + checkmark : false, checkable : true }).on('click', onItemClick), new Common.UI.MenuItem({ caption : me.txtTopAndBottom, - iconCls : 'mnu-wrap-topAndBottom', + iconCls : 'menu__icon wrap-topandbottom', toggleGroup : 'popuppicturewrapping', wrapType : Asc.c_oAscWrapStyle2.TopAndBottom, + checkmark : false, checkable : true }).on('click', onItemClick), new Common.UI.MenuItem({ caption : me.txtInFront, - iconCls : 'mnu-wrap-inFront', + iconCls : 'menu__icon wrap-infront', toggleGroup : 'popuppicturewrapping', wrapType : Asc.c_oAscWrapStyle2.InFront, + checkmark : false, checkable : true }).on('click', onItemClick), new Common.UI.MenuItem({ caption : me.txtBehind, - iconCls : 'mnu-wrap-behind', + iconCls : 'menu__icon wrap-behind', toggleGroup : 'popuppicturewrapping', wrapType : Asc.c_oAscWrapStyle2.Behind, + checkmark : false, checkable : true }).on('click', onItemClick), { caption: '--' }, @@ -2912,24 +2919,27 @@ define([ items : [ me.menuTableDirectH = new Common.UI.MenuItem({ caption : me.directHText, - iconCls : 'mnu-direct-horiz', + iconCls : 'menu__icon text-orient-hor', checkable : true, + checkmark : false, checked : false, toggleGroup : 'popuptabledirect', direction : Asc.c_oAscCellTextDirection.LRTB }).on('click', _.bind(tableDirection, me)), me.menuTableDirect90 = new Common.UI.MenuItem({ caption : me.direct90Text, - iconCls : 'mnu-direct-rdown', + iconCls : 'menu__icon text-orient-rdown', checkable : true, + checkmark : false, checked : false, toggleGroup : 'popuptabledirect', direction : Asc.c_oAscCellTextDirection.TBRL }).on('click', _.bind(tableDirection, me)), me.menuTableDirect270 = new Common.UI.MenuItem({ caption : me.direct270Text, - iconCls : 'mnu-direct-rup', + iconCls : 'menu__icon text-orient-rup', checkable : true, + checkmark : false, checked : false, toggleGroup : 'popuptabledirect', direction : Asc.c_oAscCellTextDirection.BTLR @@ -3344,24 +3354,27 @@ define([ items : [ me.menuParagraphDirectH = new Common.UI.MenuItem({ caption : me.directHText, - iconCls : 'mnu-direct-horiz', + iconCls : 'menu__icon text-orient-hor', checkable : true, + checkmark : false, checked : false, toggleGroup : 'popupparagraphdirect', direction : Asc.c_oAscVertDrawingText.normal }).on('click', _.bind(paragraphDirection, me)), me.menuParagraphDirect90 = new Common.UI.MenuItem({ caption : me.direct90Text, - iconCls : 'mnu-direct-rdown', + iconCls : 'menu__icon text-orient-rdown', checkable : true, + checkmark : false, checked : false, toggleGroup : 'popupparagraphdirect', direction : Asc.c_oAscVertDrawingText.vert }).on('click', _.bind(paragraphDirection, me)), me.menuParagraphDirect270 = new Common.UI.MenuItem({ caption : me.direct270Text, - iconCls : 'mnu-direct-rup', + iconCls : 'menu__icon text-orient-rup', checkable : true, + checkmark : false, checked : false, toggleGroup : 'popupparagraphdirect', direction : Asc.c_oAscVertDrawingText.vert270 diff --git a/apps/documenteditor/main/app/view/ImageSettings.js b/apps/documenteditor/main/app/view/ImageSettings.js index 84b2e50fd..d00ccc5b0 100644 --- a/apps/documenteditor/main/app/view/ImageSettings.js +++ b/apps/documenteditor/main/app/view/ImageSettings.js @@ -191,7 +191,7 @@ define([ this.btnRotate270 = new Common.UI.Button({ cls: 'btn-toolbar', - iconCls: 'rotate-270', + iconCls: 'toolbar__icon btn-rotate-270', value: 0, hint: this.textHint270 }); @@ -201,7 +201,7 @@ define([ this.btnRotate90 = new Common.UI.Button({ cls: 'btn-toolbar', - iconCls: 'rotate-90', + iconCls: 'toolbar__icon btn-rotate-90', value: 1, hint: this.textHint90 }); @@ -211,7 +211,7 @@ define([ this.btnFlipV = new Common.UI.Button({ cls: 'btn-toolbar', - iconCls: 'flip-vert', + iconCls: 'toolbar__icon btn-flip-vert', value: 0, hint: this.textHintFlipV }); @@ -221,7 +221,7 @@ define([ this.btnFlipH = new Common.UI.Button({ cls: 'btn-toolbar', - iconCls: 'flip-hor', + iconCls: 'toolbar__icon btn-flip-hor', value: 1, hint: this.textHintFlipH }); diff --git a/apps/documenteditor/main/app/view/Links.js b/apps/documenteditor/main/app/view/Links.js index e2ec9b0c5..1d63305d2 100644 --- a/apps/documenteditor/main/app/view/Links.js +++ b/apps/documenteditor/main/app/view/Links.js @@ -126,14 +126,14 @@ define([ var me = this, $host = me.toolbar.$el; - this.btnsContents = Common.Utils.injectButtons($host.find('.btn-slot.btn-contents'), '', 'btn-contents', me.capBtnInsContents, undefined, true, true ); - this.btnsNotes = Common.Utils.injectButtons($host.find('.btn-slot.slot-notes'), '', 'btn-notes', me.capBtnInsFootnote, undefined, true, true); - this.btnsHyperlink = Common.Utils.injectButtons($host.find('.btn-slot.slot-inshyperlink'), '', 'btn-inserthyperlink', me.capBtnInsLink); + this.btnsContents = Common.Utils.injectButtons($host.find('.btn-slot.btn-contents'), '', 'toolbar__icon btn-contents', me.capBtnInsContents, undefined, true, true ); + this.btnsNotes = Common.Utils.injectButtons($host.find('.btn-slot.slot-notes'), '', 'toolbar__icon btn-notes', me.capBtnInsFootnote, undefined, true, true); + this.btnsHyperlink = Common.Utils.injectButtons($host.find('.btn-slot.slot-inshyperlink'), '', 'toolbar__icon btn-inserthyperlink', me.capBtnInsLink); Array.prototype.push.apply(this.paragraphControls, this.btnsContents.concat(this.btnsNotes, this.btnsHyperlink)); this.btnContentsUpdate = new Common.UI.Button({ cls: 'btn-toolbar x-huge icon-top', - iconCls: 'btn-contents-update', + iconCls: 'toolbar__icon btn-contents-update', caption: this.capBtnContentsUpdate, split: true, menu: true, @@ -144,7 +144,7 @@ define([ this.btnBookmarks = new Common.UI.Button({ cls: 'btn-toolbar x-huge icon-top', - iconCls: 'btn-bookmarks', + iconCls: 'toolbar__icon btn-bookmarks', caption: this.capBtnBookmarks, disabled: true }); @@ -153,7 +153,7 @@ define([ this.btnCaption = new Common.UI.Button({ cls: 'btn-toolbar x-huge icon-top', - iconCls: 'btn-caption', + iconCls: 'toolbar__icon btn-caption', caption: this.capBtnCaption, disabled: true }); @@ -229,8 +229,8 @@ define([ 'data-stopPropagation="true"', '<% } %>', '>', '', - '', - '', + '', + '', '' ].join('')), stopPropagation: true diff --git a/apps/documenteditor/main/app/view/MailMergeSettings.js b/apps/documenteditor/main/app/view/MailMergeSettings.js index ad24da6ef..3d520ea6e 100644 --- a/apps/documenteditor/main/app/view/MailMergeSettings.js +++ b/apps/documenteditor/main/app/view/MailMergeSettings.js @@ -182,7 +182,7 @@ define([ this.btnFirst = new Common.UI.Button({ cls: 'btn-toolbar', - iconCls: 'mmerge-first', + iconCls: 'toolbar__icon btn-firstitem', disabled: true, value: 0, hint: this.txtFirst, @@ -194,7 +194,7 @@ define([ this.btnPrev = new Common.UI.Button({ cls: 'btn-toolbar', - iconCls: 'mmerge-prev', + iconCls: 'toolbar__icon btn-previtem', disabled: true, value: 1, hint: this.txtPrev, @@ -206,7 +206,7 @@ define([ this.btnNext = new Common.UI.Button({ cls: 'btn-toolbar', - iconCls: 'mmerge-next', + iconCls: 'toolbar__icon btn-nextitem', value: 2, hint: this.txtNext, lock: [_set.noRecipients, _set.lostConnect] @@ -217,7 +217,7 @@ define([ this.btnLast = new Common.UI.Button({ cls: 'btn-toolbar', - iconCls: 'mmerge-last', + iconCls: 'toolbar__icon btn-lastitem', value: 3, hint: this.txtLast, lock: [_set.noRecipients, _set.lostConnect] diff --git a/apps/documenteditor/main/app/view/ShapeSettings.js b/apps/documenteditor/main/app/view/ShapeSettings.js index 1d227611a..b74f8d7b3 100644 --- a/apps/documenteditor/main/app/view/ShapeSettings.js +++ b/apps/documenteditor/main/app/view/ShapeSettings.js @@ -1384,7 +1384,7 @@ define([ this.btnRotate270 = new Common.UI.Button({ cls: 'btn-toolbar', - iconCls: 'rotate-270', + iconCls: 'toolbar__icon btn-rotate-270', value: 0, hint: this.textHint270 }); @@ -1394,7 +1394,7 @@ define([ this.btnRotate90 = new Common.UI.Button({ cls: 'btn-toolbar', - iconCls: 'rotate-90', + iconCls: 'toolbar__icon btn-rotate-90', value: 1, hint: this.textHint90 }); @@ -1404,7 +1404,7 @@ define([ this.btnFlipV = new Common.UI.Button({ cls: 'btn-toolbar', - iconCls: 'flip-vert', + iconCls: 'toolbar__icon btn-flip-vert', value: 0, hint: this.textHintFlipV }); @@ -1414,7 +1414,7 @@ define([ this.btnFlipH = new Common.UI.Button({ cls: 'btn-toolbar', - iconCls: 'flip-hor', + iconCls: 'toolbar__icon btn-flip-hor', value: 1, hint: this.textHintFlipH }); diff --git a/apps/documenteditor/main/app/view/TableSettings.js b/apps/documenteditor/main/app/view/TableSettings.js index 6a26cf3f9..44b14df3e 100644 --- a/apps/documenteditor/main/app/view/TableSettings.js +++ b/apps/documenteditor/main/app/view/TableSettings.js @@ -290,22 +290,22 @@ define([ this.chColBanded.on('change', _.bind(this.onCheckTemplateChange, this, 5)); var _arrBorderPosition = [ - ['l', 'btn-borders-small btn-position-left', 'table-button-border-left', this.tipLeft], - ['c','btn-borders-small btn-position-inner-vert', 'table-button-border-inner-vert', this.tipInnerVert], - ['r','btn-borders-small btn-position-right', 'table-button-border-right', this.tipRight], - ['t','btn-borders-small btn-position-top', 'table-button-border-top', this.tipTop], - ['m','btn-borders-small btn-position-inner-hor', 'table-button-border-inner-hor', this.tipInnerHor], - ['b', 'btn-borders-small btn-position-bottom', 'table-button-border-bottom', this.tipBottom], - ['cm', 'btn-borders-small btn-position-inner', 'table-button-border-inner', this.tipInner], - ['lrtb', 'btn-borders-small btn-position-outer', 'table-button-border-outer', this.tipOuter], - ['lrtbcm', 'btn-borders-small btn-position-all', 'table-button-border-all', this.tipAll], - ['', 'btn-borders-small btn-position-none', 'table-button-border-none', this.tipNone] + ['l', 'toolbar__icon btn-border-left', 'table-button-border-left', this.tipLeft], + ['c', 'toolbar__icon btn-border-insidevert', 'table-button-border-inner-vert', this.tipInnerVert], + ['r', 'toolbar__icon btn-border-right', 'table-button-border-right', this.tipRight], + ['t', 'toolbar__icon btn-border-top', 'table-button-border-top', this.tipTop], + ['m', 'toolbar__icon btn-border-insidehor', 'table-button-border-inner-hor', this.tipInnerHor], + ['b', 'toolbar__icon btn-border-bottom', 'table-button-border-bottom', this.tipBottom], + ['cm', 'toolbar__icon btn-border-inside', 'table-button-border-inner', this.tipInner], + ['lrtb', 'toolbar__icon btn-border-out', 'table-button-border-outer', this.tipOuter], + ['lrtbcm', 'toolbar__icon btn-border-all', 'table-button-border-all', this.tipAll], + ['', 'toolbar__icon btn-border-no', 'table-button-border-none', this.tipNone] ]; this._btnsBorderPosition = []; _.each(_arrBorderPosition, function(item, index, list){ var _btn = new Common.UI.Button({ - cls: 'btn-toolbar', + cls: 'btn-toolbar borders--small', iconCls: item[1], strId :item[0], hint: item[3] diff --git a/apps/documenteditor/main/app/view/Toolbar.js b/apps/documenteditor/main/app/view/Toolbar.js index 0c501b03a..faab4e1ca 100644 --- a/apps/documenteditor/main/app/view/Toolbar.js +++ b/apps/documenteditor/main/app/view/Toolbar.js @@ -124,7 +124,7 @@ define([ this.btnPrint = new Common.UI.Button({ id: 'id-toolbar-btn-print', cls: 'btn-toolbar', - iconCls: 'btn-print no-mask', + iconCls: 'toolbar__icon btn-print no-mask', signals: ['disabled'] }); this.toolbarControls.push(this.btnPrint); @@ -132,7 +132,7 @@ define([ this.btnSave = new Common.UI.Button({ id: 'id-toolbar-btn-save', cls: 'btn-toolbar', - iconCls: 'no-mask ' + this.btnSaveCls, + iconCls: 'toolbar__icon no-mask ' + this.btnSaveCls, signals: ['disabled'] }); this.toolbarControls.push(this.btnSave); @@ -141,7 +141,7 @@ define([ this.btnUndo = new Common.UI.Button({ id: 'id-toolbar-btn-undo', cls: 'btn-toolbar', - iconCls: 'btn-undo', + iconCls: 'toolbar__icon btn-undo', signals: ['disabled'] }); this.toolbarControls.push(this.btnUndo); @@ -149,7 +149,7 @@ define([ this.btnRedo = new Common.UI.Button({ id: 'id-toolbar-btn-redo', cls: 'btn-toolbar', - iconCls: 'btn-redo', + iconCls: 'toolbar__icon btn-redo', signals: ['disabled'] }); this.toolbarControls.push(this.btnRedo); @@ -157,35 +157,35 @@ define([ this.btnCopy = new Common.UI.Button({ id: 'id-toolbar-btn-copy', cls: 'btn-toolbar', - iconCls: 'btn-copy' + iconCls: 'toolbar__icon btn-copy' }); this.toolbarControls.push(this.btnCopy); this.btnPaste = new Common.UI.Button({ id: 'id-toolbar-btn-paste', cls: 'btn-toolbar', - iconCls: 'btn-paste' + iconCls: 'toolbar__icon btn-paste' }); this.paragraphControls.push(this.btnPaste); this.btnIncFontSize = new Common.UI.Button({ id: 'id-toolbar-btn-incfont', cls: 'btn-toolbar', - iconCls: 'btn-incfont' + iconCls: 'toolbar__icon btn-incfont' }); this.paragraphControls.push(this.btnIncFontSize); this.btnDecFontSize = new Common.UI.Button({ id: 'id-toolbar-btn-decfont', cls: 'btn-toolbar', - iconCls: 'btn-decfont' + iconCls: 'toolbar__icon btn-decfont' }); this.paragraphControls.push(this.btnDecFontSize); this.btnBold = new Common.UI.Button({ id: 'id-toolbar-btn-bold', cls: 'btn-toolbar', - iconCls: 'btn-bold', + iconCls: 'toolbar__icon btn-bold', enableToggle: true }); this.paragraphControls.push(this.btnBold); @@ -193,7 +193,7 @@ define([ this.btnItalic = new Common.UI.Button({ id: 'id-toolbar-btn-italic', cls: 'btn-toolbar', - iconCls: 'btn-italic', + iconCls: 'toolbar__icon btn-italic', enableToggle: true }); this.paragraphControls.push(this.btnItalic); @@ -201,7 +201,7 @@ define([ this.btnUnderline = new Common.UI.Button({ id: 'id-toolbar-btn-underline', cls: 'btn-toolbar', - iconCls: 'btn-underline', + iconCls: 'toolbar__icon btn-underline', enableToggle: true }); this.paragraphControls.push(this.btnUnderline); @@ -209,7 +209,7 @@ define([ this.btnStrikeout = new Common.UI.Button({ id: 'id-toolbar-btn-strikeout', cls: 'btn-toolbar', - iconCls: 'btn-strikeout', + iconCls: 'toolbar__icon btn-strikeout', enableToggle: true }); this.paragraphControls.push(this.btnStrikeout); @@ -217,7 +217,7 @@ define([ this.btnSuperscript = new Common.UI.Button({ id: 'id-toolbar-btn-superscript', cls: 'btn-toolbar', - iconCls: 'btn-superscript', + iconCls: 'toolbar__icon btn-superscript', enableToggle: true, toggleGroup: 'superscriptGroup' }); @@ -226,7 +226,7 @@ define([ this.btnSubscript = new Common.UI.Button({ id: 'id-toolbar-btn-subscript', cls: 'btn-toolbar', - iconCls: 'btn-subscript', + iconCls: 'toolbar__icon btn-subscript', enableToggle: true, toggleGroup: 'superscriptGroup' }); @@ -235,7 +235,7 @@ define([ this.btnHighlightColor = new Common.UI.Button({ id: 'id-toolbar-btn-highlight', cls: 'btn-toolbar', - iconCls: 'btn-highlight', + iconCls: 'toolbar__icon btn-highlight', enableToggle: true, allowDepress: true, split: true, @@ -257,7 +257,7 @@ define([ this.btnFontColor = new Common.UI.Button({ id: 'id-toolbar-btn-fontcolor', cls: 'btn-toolbar', - iconCls: 'btn-fontcolor', + iconCls: 'toolbar__icon btn-fontcolor', split: true, menu: new Common.UI.Menu({ items: [ @@ -277,7 +277,7 @@ define([ this.btnParagraphColor = new Common.UI.Button({ id: 'id-toolbar-btn-paracolor', cls: 'btn-toolbar', - iconCls: 'btn-paracolor', + iconCls: 'toolbar__icon btn-paracolor', split: true, menu: new Common.UI.Menu({ items: [ @@ -292,7 +292,7 @@ define([ this.btnAlignLeft = new Common.UI.Button({ id: 'id-toolbar-btn-align-left', cls: 'btn-toolbar', - iconCls: 'btn-align-left', + iconCls: 'toolbar__icon btn-align-left', enableToggle: true, allowDepress: false, toggleGroup: 'alignGroup' @@ -302,7 +302,7 @@ define([ this.btnAlignCenter = new Common.UI.Button({ id: 'id-toolbar-btn-align-center', cls: 'btn-toolbar', - iconCls: 'btn-align-center', + iconCls: 'toolbar__icon btn-align-center', enableToggle: true, allowDepress: false, toggleGroup: 'alignGroup' @@ -312,7 +312,7 @@ define([ this.btnAlignRight = new Common.UI.Button({ id: 'id-toolbar-btn-align-right', cls: 'btn-toolbar', - iconCls: 'btn-align-right', + iconCls: 'toolbar__icon btn-align-right', enableToggle: true, allowDepress: false, toggleGroup: 'alignGroup' @@ -322,7 +322,7 @@ define([ this.btnAlignJust = new Common.UI.Button({ id: 'id-toolbar-btn-align-just', cls: 'btn-toolbar', - iconCls: 'btn-align-just', + iconCls: 'toolbar__icon btn-align-just', enableToggle: true, allowDepress: false, toggleGroup: 'alignGroup' @@ -333,21 +333,21 @@ define([ this.btnDecLeftOffset = new Common.UI.Button({ id: 'id-toolbar-btn-decoffset', cls: 'btn-toolbar', - iconCls: 'btn-decoffset' + iconCls: 'toolbar__icon btn-decoffset' }); this.paragraphControls.push(this.btnDecLeftOffset); this.btnIncLeftOffset = new Common.UI.Button({ id: 'id-toolbar-btn-incoffset', cls: 'btn-toolbar', - iconCls: 'btn-incoffset' + iconCls: 'toolbar__icon btn-incoffset' }); this.paragraphControls.push(this.btnIncLeftOffset); this.btnLineSpace = new Common.UI.Button({ id: 'id-toolbar-btn-linespace', cls: 'btn-toolbar', - iconCls: 'btn-linespace', + iconCls: 'toolbar__icon btn-linespace', menu: new Common.UI.Menu({ style: 'min-width: 60px;', items: [ @@ -365,7 +365,7 @@ define([ this.btnShowHidenChars = new Common.UI.Button({ id: 'id-toolbar-btn-hidenchars', cls: 'btn-toolbar', - iconCls: 'btn-hidenchars', + iconCls: 'toolbar__icon btn-paragraph', enableToggle: true, split: true, menu: new Common.UI.Menu({ @@ -381,7 +381,7 @@ define([ this.btnMarkers = new Common.UI.Button({ id: 'id-toolbar-btn-markers', cls: 'btn-toolbar', - iconCls: 'btn-setmarkers', + iconCls: 'toolbar__icon btn-setmarkers', enableToggle: true, toggleGroup: 'markersGroup', split: true, @@ -393,7 +393,7 @@ define([ this.btnNumbers = new Common.UI.Button({ id: 'id-toolbar-btn-numbering', cls: 'btn-toolbar', - iconCls: 'btn-numbering', + iconCls: 'toolbar__icon btn-numbering', enableToggle: true, toggleGroup: 'markersGroup', split: true, @@ -405,7 +405,7 @@ define([ this.btnMultilevels = new Common.UI.Button({ id: 'id-toolbar-btn-multilevels', cls: 'btn-toolbar', - iconCls: 'btn-multilevels', + iconCls: 'toolbar__icon btn-multilevels', menu: true }); this.paragraphControls.push(this.btnMultilevels); @@ -430,7 +430,7 @@ define([ this.btnInsertTable = new Common.UI.Button({ id: 'tlbtn-inserttable', cls: 'btn-toolbar x-huge icon-top', - iconCls: 'btn-inserttable', + iconCls: 'toolbar__icon btn-inserttable', caption: me.capBtnInsTable, menu: new Common.UI.Menu({ items: [ @@ -444,7 +444,7 @@ define([ this.btnInsertImage = new Common.UI.Button({ id: 'tlbtn-insertimage', cls: 'btn-toolbar x-huge icon-top', - iconCls: 'btn-insertimage', + iconCls: 'toolbar__icon btn-insertimage', caption: me.capBtnInsImage, menu: new Common.UI.Menu({ items: [ @@ -460,7 +460,7 @@ define([ id: 'tlbtn-insertchart', cls: 'btn-toolbar x-huge icon-top', caption: me.capBtnInsChart, - iconCls: 'btn-insertchart', + iconCls: 'toolbar__icon btn-insertchart', menu: true }); this.paragraphControls.push(this.btnInsertChart); @@ -468,7 +468,7 @@ define([ this.btnInsertText = new Common.UI.Button({ id: 'tlbtn-inserttext', cls: 'btn-toolbar x-huge icon-top', - iconCls: 'btn-text', + iconCls: 'toolbar__icon btn-text', caption: me.capBtnInsTextbox, enableToggle: true }); @@ -476,7 +476,7 @@ define([ this.btnInsertTextArt = new Common.UI.Button({ id: 'tlbtn-inserttextart', cls: 'btn-toolbar x-huge icon-top', - iconCls: 'btn-textart', + iconCls: 'toolbar__icon btn-textart', caption: me.capBtnInsTextart, menu: new Common.UI.Menu({ cls: 'menu-shapes', @@ -490,7 +490,7 @@ define([ this.btnEditHeader = new Common.UI.Button({ id: 'id-toolbar-btn-editheader', cls: 'btn-toolbar x-huge icon-top', - iconCls: 'btn-editheader', + iconCls: 'toolbar__icon btn-editheader', caption: me.capBtnInsHeader, menu: true }); @@ -513,7 +513,7 @@ define([ this.btnBlankPage = new Common.UI.Button({ id: 'id-toolbar-btn-blankpage', cls: 'btn-toolbar x-huge icon-top', - iconCls: 'btn-blankpage', + iconCls: 'toolbar__icon btn-blankpage', caption: me.capBtnBlankPage }); this.paragraphControls.push(this.btnBlankPage); @@ -521,7 +521,7 @@ define([ this.btnInsertShape = new Common.UI.Button({ id: 'tlbtn-insertshape', cls: 'btn-toolbar x-huge icon-top', - iconCls: 'btn-insertshape', + iconCls: 'toolbar__icon btn-insertshape', caption: me.capBtnInsShape, enableToggle: true, menu: new Common.UI.Menu({cls: 'menu-shapes'}) @@ -531,7 +531,7 @@ define([ this.btnInsertEquation = new Common.UI.Button({ id: 'tlbtn-insertequation', cls: 'btn-toolbar x-huge icon-top', - iconCls: 'btn-insertequation', + iconCls: 'toolbar__icon btn-insertequation', caption: me.capBtnInsEquation, split: true, menu: new Common.UI.Menu({cls: 'menu-shapes'}) @@ -541,30 +541,33 @@ define([ this.btnDropCap = new Common.UI.Button({ id: 'tlbtn-dropcap', cls: 'btn-toolbar x-huge icon-top', - iconCls: 'btn-dropcap', + iconCls: 'toolbar__icon btn-dropcap', caption: me.capBtnInsDropcap, menu: new Common.UI.Menu({ cls: 'ppm-toolbar', items: [ { caption: this.textNone, - iconCls: 'mnu-dropcap-none', + iconCls: 'menu__icon dropcap-none', checkable: true, + checkmark: false, toggleGroup: 'menuDropCap', value: Asc.c_oAscDropCap.None, checked: true }, { caption: this.textInText, - iconCls: 'mnu-dropcap-intext', + iconCls: 'menu__icon dropcap-intext', checkable: true, + checkmark: false, toggleGroup: 'menuDropCap', value: Asc.c_oAscDropCap.Drop }, { caption: this.textInMargin, - iconCls: 'mnu-dropcap-inmargin', + iconCls: 'menu__icon dropcap-inmargin', checkable: true, + checkmark: false, toggleGroup: 'menuDropCap', value: Asc.c_oAscDropCap.Margin }, @@ -578,25 +581,25 @@ define([ this.btnContentControls = new Common.UI.Button({ id: 'tlbtn-controls', cls: 'btn-toolbar x-huge icon-top', - iconCls: 'btn-controls', + iconCls: 'toolbar__icon btn-controls', caption: me.capBtnInsControls, menu: new Common.UI.Menu({ cls: 'ppm-toolbar', items: [ { caption: this.textPlainControl, - iconCls: 'mnu-control-plain', + iconCls: 'menu__icon cc-plaintext', value: Asc.c_oAscSdtLevelType.Inline }, { caption: this.textRichControl, - iconCls: 'mnu-control-rich', + iconCls: 'menu__icon cc-richtext', value: Asc.c_oAscSdtLevelType.Block }, {caption: '--'}, { caption: this.textRemoveControl, - iconCls: 'mnu-control-remove', + iconCls: 'menu__icon cc-remove', value: 'remove' }, {caption: '--'}, @@ -629,42 +632,47 @@ define([ this.btnColumns = new Common.UI.Button({ id: 'tlbtn-columns', cls: 'btn-toolbar x-huge icon-top', - iconCls: 'btn-columns', + iconCls: 'toolbar__icon btn-columns', caption: me.capBtnColumns, menu: new Common.UI.Menu({ cls: 'ppm-toolbar', items: [ { caption: this.textColumnsOne, - iconCls: 'mnu-columns-one', + iconCls: 'menu__icon columns-one', checkable: true, + checkmark: false, toggleGroup: 'menuColumns', value: 0 }, { caption: this.textColumnsTwo, - iconCls: 'mnu-columns-two', + iconCls: 'menu__icon columns-two', checkable: true, + checkmark: false, toggleGroup: 'menuColumns', value: 1 }, { caption: this.textColumnsThree, - iconCls: 'mnu-columns-three', + iconCls: 'menu__icon columns-three', checkable: true, + checkmark: false, toggleGroup: 'menuColumns', value: 2 }, { caption: this.textColumnsLeft, - iconCls: 'mnu-columns-left', + iconCls: 'menu__icon columns-left', + checkmark: false, checkable: true, toggleGroup: 'menuColumns', value: 3 }, { caption: this.textColumnsRight, - iconCls: 'mnu-columns-right', + iconCls: 'menu__icon columns-right', + checkmark: false, checkable: true, toggleGroup: 'menuColumns', value: 4 @@ -679,22 +687,24 @@ define([ this.btnPageOrient = new Common.UI.Button({ id: 'tlbtn-pageorient', cls: 'btn-toolbar x-huge icon-top', - iconCls: 'btn-pageorient', + iconCls: 'toolbar__icon btn-pageorient', caption: me.capBtnPageOrient, menu: new Common.UI.Menu({ cls: 'ppm-toolbar', items: [ { caption: this.textPortrait, - iconCls: 'mnu-orient-portrait', + iconCls: 'menu__icon page-portrait', checkable: true, + checkmark: false, toggleGroup: 'menuOrient', value: true }, { caption: this.textLandscape, - iconCls: 'mnu-orient-landscape', + iconCls: 'menu__icon page-landscape', checkable: true, + checkmark: false, toggleGroup: 'menuOrient', value: false } @@ -715,7 +725,7 @@ define([ this.btnPageMargins = new Common.UI.Button({ id: 'tlbtn-pagemargins', cls: 'btn-toolbar x-huge icon-top', - iconCls: 'btn-pagemargins', + iconCls: 'toolbar__icon btn-pagemargins', caption: me.capBtnMargins, menu: new Common.UI.Menu({ items: [ @@ -774,7 +784,7 @@ define([ this.btnPageSize = new Common.UI.Button({ id: 'tlbtn-pagesize', cls: 'btn-toolbar x-huge icon-top', - iconCls: 'btn-pagesize', + iconCls: 'toolbar__icon btn-pagesize', caption: me.capBtnPageSize, menu: new Common.UI.Menu({ restoreHeight: true, @@ -894,14 +904,14 @@ define([ this.btnClearStyle = new Common.UI.Button({ id: 'id-toolbar-btn-clearstyle', cls: 'btn-toolbar', - iconCls: 'btn-clearstyle' + iconCls: 'toolbar__icon btn-clearstyle' }); this.toolbarControls.push(this.btnClearStyle); this.btnCopyStyle = new Common.UI.Button({ id: 'id-toolbar-btn-copystyle', cls: 'btn-toolbar', - iconCls: 'btn-copystyle', + iconCls: 'toolbar__icon btn-copystyle', enableToggle: true }); this.toolbarControls.push(this.btnCopyStyle); @@ -909,7 +919,7 @@ define([ this.btnColorSchemas = new Common.UI.Button({ id: 'id-toolbar-btn-colorschemas', cls: 'btn-toolbar', - iconCls: 'btn-colorschemas', + iconCls: 'toolbar__icon btn-colorschemas', menu: new Common.UI.Menu({ items: [], restoreHeight: true @@ -920,46 +930,46 @@ define([ this.btnMailRecepients = new Common.UI.Button({ id: 'id-toolbar-btn-mailrecepients', cls: 'btn-toolbar', - iconCls: 'btn-mailrecepients' + iconCls: 'toolbar__icon btn-mailmerge' }); me.btnImgAlign = new Common.UI.Button({ cls: 'btn-toolbar x-huge icon-top', - iconCls: 'btn-img-align', + iconCls: 'toolbar__icon btn-img-align', caption: me.capImgAlign, menu: true }); me.btnImgGroup = new Common.UI.Button({ cls: 'btn-toolbar x-huge icon-top', - iconCls: 'btn-img-group', + iconCls: 'toolbar__icon btn-img-group', caption: me.capImgGroup, menu: true }); me.btnImgForward = new Common.UI.Button({ cls: 'btn-toolbar x-huge icon-top', - iconCls: 'btn-img-frwd', + iconCls: 'toolbar__icon btn-img-frwd', caption: me.capImgForward, split: true, menu: true }); me.btnImgBackward = new Common.UI.Button({ cls: 'btn-toolbar x-huge icon-top', - iconCls: 'btn-img-bkwd', + iconCls: 'toolbar__icon btn-img-bkwd', caption: me.capImgBackward, split: true, menu: true }); me.btnImgWrapping = new Common.UI.Button({ cls: 'btn-toolbar x-huge icon-top', - iconCls: 'btn-img-wrap', + iconCls: 'toolbar__icon btn-img-wrap', caption: me.capImgWrapping, menu: true }); me.btnWatermark = new Common.UI.Button({ cls: 'btn-toolbar x-huge icon-top', - iconCls: 'btn-watermark', + iconCls: 'toolbar__icon btn-watermark', caption: me.capBtnWatermark, menu: new Common.UI.Menu({ cls: 'ppm-toolbar', @@ -1280,7 +1290,7 @@ define([ _injectComponent('#slot-img-wrapping', this.btnImgWrapping); _injectComponent('#slot-btn-watermark', this.btnWatermark); - this.btnsPageBreak = Common.Utils.injectButtons($host.find('.btn-slot.btn-pagebreak'), '', 'btn-pagebreak', this.capBtnInsPagebreak, undefined, true, true); + this.btnsPageBreak = Common.Utils.injectButtons($host.find('.btn-slot.btn-pagebreak'), '', 'toolbar__icon btn-pagebreak', this.capBtnInsPagebreak, undefined, true, true); Array.prototype.push.apply(this.paragraphControls, this.btnsPageBreak); return $host; @@ -1322,11 +1332,11 @@ define([ me.btnImgForward.setMenu(new Common.UI.Menu({ items: [{ caption : _holder_view.textArrangeFront, - iconCls : 'mnu-arrange-front', + iconCls : 'menu__icon arrange-front', valign : Asc.c_oAscChangeLevel.BringToFront }, { caption : _holder_view.textArrangeForward, - iconCls : 'mnu-arrange-forward', + iconCls : 'menu__icon arrange-forward', valign : Asc.c_oAscChangeLevel.BringForward } ]}) @@ -1336,11 +1346,11 @@ define([ me.btnImgBackward.setMenu(new Common.UI.Menu({ items: [{ caption : _holder_view.textArrangeBack, - iconCls : 'mnu-arrange-back', + iconCls : 'menu__icon arrange-back', valign : Asc.c_oAscChangeLevel.SendToBack }, { caption : _holder_view.textArrangeBackward, - iconCls : 'mnu-arrange-backward', + iconCls : 'menu__icon arrange-backward', valign : Asc.c_oAscChangeLevel.BringBackward }] })); @@ -1374,39 +1384,39 @@ define([ me.mniDistribHor = new Common.UI.MenuItem({ caption: me.txtDistribHor, - iconCls: 'mnu-distrib-hor', + iconCls: 'menu__icon shape-distribute-hor', value: 6 }); me.mniDistribVert = new Common.UI.MenuItem({ caption: me.txtDistribVert, - iconCls: 'mnu-distrib-vert', + iconCls: 'menu__icon shape-distribute-vert', value: 7 }); me.btnImgAlign.setMenu(new Common.UI.Menu({ items: [{ caption : _holder_view.textShapeAlignLeft, - iconCls : 'mnu-img-align-left', + iconCls : 'menu__icon shape-align-left', value: Asc.c_oAscAlignShapeType.ALIGN_LEFT }, { caption : _holder_view.textShapeAlignCenter, - iconCls : 'mnu-img-align-center', + iconCls : 'menu__icon shape-align-center', value: Asc.c_oAscAlignShapeType.ALIGN_CENTER }, { caption : _holder_view.textShapeAlignRight, - iconCls : 'mnu-img-align-right', + iconCls : 'menu__icon shape-align-right', value: Asc.c_oAscAlignShapeType.ALIGN_RIGHT }, { caption : _holder_view.textShapeAlignTop, - iconCls : 'mnu-img-align-top', + iconCls : 'menu__icon shape-align-top', value: Asc.c_oAscAlignShapeType.ALIGN_TOP }, { caption : _holder_view.textShapeAlignMiddle, - iconCls : 'mnu-img-align-middle', + iconCls : 'menu__icon shape-align-middle', value: Asc.c_oAscAlignShapeType.ALIGN_MIDDLE }, { caption : _holder_view.textShapeAlignBottom, - iconCls : 'mnu-img-align-bottom', + iconCls : 'menu__icon shape-align-bottom', value: Asc.c_oAscAlignShapeType.ALIGN_BOTTOM }, {caption: '--'}, @@ -1423,11 +1433,11 @@ define([ me.btnImgGroup.setMenu(new Common.UI.Menu({ items: [{ caption : _holder_view.txtGroup, - iconCls : 'mnu-arrange-group', + iconCls : 'menu__icon shape-group', groupval: 1 }, { caption : _holder_view.txtUngroup, - iconCls : 'mnu-arrange-ungroup', + iconCls : 'menu__icon shape-ungroup', groupval: -1 }] })); @@ -1437,45 +1447,52 @@ define([ cls: 'ppm-toolbar', items: [{ caption : _holder_view.txtInline, - iconCls : 'mnu-wrap-inline', + iconCls : 'menu__icon wrap-inline', toggleGroup : 'imgwrapping', wrapType : Asc.c_oAscWrapStyle2.Inline, + checkmark : false, checkable : true }, { caption : _holder_view.txtSquare, - iconCls : 'mnu-wrap-square', + iconCls : 'menu__icon wrap-square', toggleGroup : 'imgwrapping', wrapType : Asc.c_oAscWrapStyle2.Square, + checkmark : false, checkable : true }, { caption : _holder_view.txtTight, - iconCls : 'mnu-wrap-tight', + iconCls : 'menu__icon wrap-tight', toggleGroup : 'imgwrapping', wrapType : Asc.c_oAscWrapStyle2.Tight, + checkmark : false, checkable : true }, { caption : _holder_view.txtThrough, - iconCls : 'mnu-wrap-through', + iconCls : 'menu__icon wrap-through', toggleGroup : 'imgwrapping', wrapType : Asc.c_oAscWrapStyle2.Through, + checkmark : false, checkable : true }, { caption : _holder_view.txtTopAndBottom, - iconCls : 'mnu-wrap-topAndBottom', + iconCls : 'menu__icon wrap-topandbottom', toggleGroup : 'imgwrapping', wrapType : Asc.c_oAscWrapStyle2.TopAndBottom, + checkmark : false, checkable : true }, { caption : _holder_view.txtInFront, - iconCls : 'mnu-wrap-inFront', + iconCls : 'menu__icon wrap-infront', toggleGroup : 'imgwrapping', wrapType : Asc.c_oAscWrapStyle2.InFront, + checkmark : false, checkable : true }, { caption : _holder_view.txtBehind, - iconCls : 'mnu-wrap-behind', + iconCls : 'menu__icon wrap-behind', toggleGroup : 'imgwrapping', wrapType : Asc.c_oAscWrapStyle2.Behind, + checkmark : false, checkable : true } ] diff --git a/apps/documenteditor/main/resources/img/popupmenu-btns.png b/apps/documenteditor/main/resources/img/popupmenu-btns.png deleted file mode 100644 index cd89e203e9c5ae4875c469922917df3c17f90afa..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5534 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 HH4pkfzwYYN diff --git a/apps/documenteditor/main/resources/img/toolbar-menu.png b/apps/documenteditor/main/resources/img/toolbar-menu.png deleted file mode 100644 index d482095147b1e3fc34a5b7719e4aa34d1c979185..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 27934 zcma&NbzD^4*EWv8&?(&^DcuM|iHJx_H$#iG)X*>>DWITqNJ|f00uDo{Gzbh`N=S~R zAn+c%@B16i^Zq`+_m7!J~UF+JhI$Em41oQ+L7#PHAj~?g(B^Uz(rv(oO z*qSG9ivo&UUb?FHF{+0dw}2gNMb*13$0;i=9I?c9(hLrxY1VYi+<%=33Nks)XlZ7Tby1l&8`Fpq zt>oHUgJl#$QpYEmtPGt*vlBS#!igLyzQBo+C>&B@CXbE$f@X?8dq^ga;)rHze)gaV zqD#ooAY@n5cvu1&<1hau>XP-ZCwuB)C*`n1cPJ6IrFg@=eiBq-8PpF1-z5X~&hwQ$ zFMb;@6fXk20f*=3PYtYYIOmJTK6R;LK ze!Ah_wBGd34Xnv6c6O#@QW2cU*0Va=o0@N@z0@FFb%5Lb{YYk6l>-zn%nNOy*?Ut3 z;rp9AP9K+>JAGdrD9CKFV~agx7c^<1YY^iXT#Nei=5M2g>g6d;4LLHZVgmVUiRLa> z<>k{&2po7V{LkvjxCBieVRpo*Q~Odo*|Pw)m`HejzMs6MVqV8X7s4U7b7M$y24KkT z0l4hL6sNWDKh;XO#VyzVt36uJs!MFRCSadH`l7(w267ryH$;8>cU{R(5Px24OU%<< z9qbw+kEGd1BS}K zp9}QE-;L6*^=B0Q?^AU8@cr*&TU%R)z;N+b`C9A+?qvMYX&!gX#DV-3^C=6mPt%?p zY+>a`6)uHX6!PViRV;;?_cx~sT+o89Az7}1>6w|C4lGkGH7(ziJmFczpK+l{N5ML6 zb!46f;IB(!OA^z(%)J)PLBFWl)b6y8P$E)RlW}|5J}$te5S@u9IpfpZNI&Ev_Jz!j zmT%ZFU8nD_pV~SH&CPRrcZ}!Cc9duMkP^xtou?~J>dno8Y6YjeWqJ#x{aE_wldPKE z7N}Q~qX~LSp2JZ7v)qCvgWF=5+GMgxOz-r-1Rtzt>IQhuP6V2uQl!RrP0fG4lQwP~ zA>TsUe!H{!3|&;C2ac;hwcahHi#C5S?+RD%t+rvoJo$X^*Cy^}_KLe(*JVHNS&3`& zCE4uuOti$w7mp#bgP-B2D+AUMyGZyQ*?lD8Ew?WxTyg>b*#WJ~&z?mD`b^p|*p<_m ztGEhJ>uo()Tfy%Zd9GqV=v8bWc0Qo5K*=`AG5fnrv0Sa;mtLeku}7i<>eyWeyIBWY zmLD5I`dA`XGPF{G&oWDajYszj1(1b>|BRey%#8+`&DJ!Ztv#aQW}$S2U3!^*Jw%X_`ACPJo?hS= z4=Mdh@u5irmNCjlZ^!MjyyHq?{wr)2>p#ltpBhz;8;HMnk|WNC!mV2qsi)Lf8Moi$ zFzxOB;Ewf$N>k~uZT$n?bUGgnEwL#}Y~Gm^zH68n^=gw6F*=HRIfIh`-FfqjjA}q8yCRrYo6?XT zH{K8-UmM4l>3Xg{K{&O);D~>rM5R4D25mAffSJ@SQ4jfgrzFN2=zCk$67(aA-k8|L z3Z%PIE!<6Qh~;e4ZjR;DXPspA7z=Kb$mL6If&C&W@Zb@4w->kJuH}2HkZ#7bjXtf-uvY^(yC%R=TayR zP({oe-EB6Wu%{hW9F@`UFsKl>hu=clt<l0HFh{1|0 z9+K~1-ufPF${^-S$ISG{xdMJ98*8|XcVl@|j+-G{Pj49U89nbMJS0cznB&L$s9Z@m zh_d|kvsaWXFJMKc;h!6cE`nh1X+PT`UGgaPiPTw|vrJi`BB}D;Xnv|@*FszV;LTN&a>NYYi9ITJt=A$*<0a4R@-_vH^EQ({Eg2$HfhyaIuC`j+Z|DyTo2XIPi$=70M^?q&&weNeW`;TE{fjS z7@xy~b>W~iBEnXfUUgOB={uKqoZn|-JA_zuE-lr?>!nSG(^@(v*QO)0LvaPH;GW2L3M}`QEjZx zfZjn%n%9B}^mr<>AZA3838Al^C1@bt3Y9NH@4;L}$gcTQDG9c@jKzo!<+)Y5?!8j0 zr+PXTJk3CQxvt1HWGId_Rz7B&rmn;lrF*QbqFx{MTZ|qzmzIojK6-|Q{tB&!$N!5ZHoZrCAY;9tb&&W7K^t};OI+w+iu^UMkILrL0M zd<(t(hJ_ypzPP-%6Jkt7>LVn|2-2qa?V-3#$xx!2zlS9A4Cj1r3Nd=O0`upMT0}cI zIyOhYN-Jlj8q_ua`HHBET+%LT32#nXtn$;T192RIo?_jcQ3Bsc6;w&-=}Uo%VP*-2ARyQ(EHtj$@{C$M&`*p#=S!jm<_-Xq%PH$=3N z{2temy<`F@v^*VC>FBw8x2?t)glXU{RQu&70??%VU0Bt8^~}ANpzh*%rg$J$zEG)J zJq?-j$x6HA(r=1!2{(P=%Is)WwST_9zoSqKgkBZ$U?--A%#zch<73JTB*gC3&DSAo zo!}Uv3q0bRh zquWB8Yl5;M<$IgriZ1~)V~6KISWXlT>T{WrV5KD`C%*^3yk#kZpk8DiYZY)7POiSG zE>JPP!`vnlTOv%4Id!t4RUnd|YC_ZL!=ozRBQD=(8W5!ZpDprJ?vA{1)IIp7VdWn;!gJNjm4+VZ_Q)kT7-(GQVDUT+qSkd>{}bK z1U7H6r~YfEVFo>+-ELaevZ10H!f2?rp(4ndmTFF;-D1>MS*riFUh@w4kYwTw$UImG zcKHm$KL)S+&Dw z5Mck7(6NH}+D@@R*D0cpl`>QQVv*8r!)@2)K8gLB#$toP>2wZxL>qT7^Y}EI@&@Fc z9PVINKr8FDGiP*`Ntut|*Ync)t|;L$H3V)9%{Jp-oa=_e`?vj(`9IJX5NFxkiTQlkgAQ8GZ|vL~8%1RST1GrF*J5_W697L3R-n6s0{ z>*-`Z5#G6ukbB%F>u4>pLzfE39N?bXPU-1W}|B(FfAJTLTx1CwRtlNAE5?@cw_i6Tgw^|H2?_A0@U} zCW>Yl%tfz7G&4JN5Praz>o2ZgfxJwu5!8CI9lMQSn zuhZ7fW-~OcK6V~QU3-44+hAG1J9-&VHeBFZJKl@C$)DN%;N2z2CPzh&7Bp+cDha%d z5BC_^k&98K=)x}FYOX*x;KWWtulZJKpAKb83={+L+RPEzaaR(!BgvUK_J%PMYqXE$xr%1Ee{tl2H5CHwJj47DG@(<>zZgL zHih&qbt3gso*tHBmT`@(Ym=Yvu3!(35lvW?hv&sKRcDzZiyhN&++=OGCoP0+RBwv0nI=2;}%4QYC=-_xDZF_{2__=AEV4@v?TY@TgSwJnw zEAPc2WMgHj_cakh4Xq2(#XqEk4d4zd0lf~$W$X0#7&O94T}XUZ z6fE-(h?1tsHX4u?F3DD511$@j2;=eOU@2u%u9$^%LhWQdwNvHC$kcKy||<_G_sWua75xb z!|u99b#^+m{}oK?#}J*%B_cNVl$19;qvh}FjluB#VhW0DpGOD=IkNK@3n$nAFdv8j zwA>N7Gy^a$y@F+3QM!!Vy}`BoCpMWHpKYH%f6ky0qCG5C-xF5t3fT`QzP*2?5^wn! z(Uq5e_R8A_*W{buqPY-V2gz!n+(7sz3+rj*Cm*;aI{jtMPRm*#&)HJb;(6$a)|aEB zqkh(-2Lumu6jGM989uTd*up8ws1F=}2KFk8CVueGavdbbxOxo6*8Z%cz++qbz`bH2IST{znE>9#I4y*0T79W)#Y-j$)f%3RG7%w(DT8w7%FhUVi5;6SX3C5a) zDJ70uG5_Szq@}c38qjSExb+%L+Lc!9eOz$rZ(NsQC(20>$$3Yw03udxp-CK4+*pfM z`~5TW{Y^{!6(mfU30J>6B3>OMl`DY}@&remv7*nS+$~jV?E>)-jq0lHyJBLzuo#IJ zR~83d?9=huT_&`HE>X-Vk?K-h9)bANDBM^nXcP^72gr<0@B%(EScJzuwcHe(u0}q8 zS-*p{Ep3MIA?;aCGBPNYdH@td3e?vgni~AyY}HNIOuaR1P5rOy0&~o(i~ENmuqqAr zuNOa!{N~XM%J|j0rM`2LYuRBpW-$QeUSY?nHOPj#rxR=(MMFR)v!gWd<>+CnkaJY% zhe^ZVpF%<(xHNXny6z6#m>?;lMTfc&p34DlDvL3T9~}jX!+;{MjCuXSR#(#Vnt$(I4RgL2*wfi=;8Qa#t9oHqPjf61B-t zJPWN`&TLT$U%t!y<4KPI0k(ow`K9|RIbIpHH1?>-Q!ri`wzA7Lk+!z>$Ri&zR_G}7 zWTO;^{KKnF0b13Mj@BtxDH6_8{AtyetnDMPOMI7CPyi4mnYH`whHOt&&B1mpVXb9~ zJ5unZ57hSi+UCj}U0OdF;M3g!{cEbb@Fv^WZ?I}R)lQD7J`lrpqk_-6SeLVAqQ?Wh z4aF$16gd=pn;CYxK5Bs9JQ?i4s4%RW)tG_`_hjYW+VOew5ME5?$%)-XKcsTlv4A*F z>#mOMpr4XuHYTc_AZzbxxUi?aemzO{dju|oSma#D3I8++4~+`O2QKN^i;-ZCZO5WfD8S>1y~I)9tck!>I#mV$=iyxSzE5_-Jz2pq0E`JviGd1f+x_scOTWOPY@y72ua2aJYuS0u4M1*q%$OyEI`ql zcTqUEm@|k}`JqJyO8jDYeR@j#le2CZ50d67Sq-MHEy|zRgqU~en`p<;92R1f{iO7f zQ3op?fh$8S0f<4x?o;y_S^-J@c&4@x|FW4Nb&!s&mdFdNCLD`jt46M2bKgZ5J0*D~ zdBuMgyV*khg8vLhjK6c&bXHZEnVO{|)wlm?_MM4-rT>J$eh9B>*Yp-HwvB0?)y&A? zT;iPQUY{Vv9acK6w!qJA8KaoD)4flVsl@U@7jXk=)*Wq+hrP4Nm`2DLk0;QQ3cb`Y z`~;$HXcHv0x^<0z4i0K<`KzGw?Kf!}=PIgLCX-oQFGbxK&bMo+UnT?EV)XADIgvRx z4I>?y*!+vPiA;lsZjWF3ff0hu`@@iS?F&dZE1g^Wxaet)u@r@ASYi{O07VjD$qPhH z1NCjPxlafG_7v698w+0mYSgRgm=!q_IgAv|#=-vnA${t+M0E4BzetrtZZLxUc4Y|- z%M+dlCVts(gKLP)q!@B*35~C8a~Gq9*&LFFa^i zC`&pwYf7 z-OSYy&rNl4d%}--SpHP^jebW%Lc7lEzY1WFuBkr-#ewZ5R{V-&eStBbZ6mQbK`M7Y z<95|yF(-}CB>(-xmgi*-Ww(rg}7CtA2jtmj8e!XS`Mlo#n79#jLb?pWk$ZY z6#{eIS3@__FyGEEI-4bI-u6gjZm7eq_a0*A_Fd@Xh84%lY3;NnXk)8OAy1@hwYqXpy%2-$*X6ycmec``;ln1Zf$ERWC)+@>^}Kfqj;0ODOn7Zen*S; z7w?V(%3aercL{m+VyMr(a!tVU?2DAH=q^ z_1nhv#2PkJ6x!;&)eqm(`^NGlBZC$*eDS3k!hJ_I45|Mpu^rOtcaJKp08eh)FeN1BxUpWaol#r(r`N09f9wRv5K#k?6} z(q?Y^@o9JYlA?1&4Z}=Y;-0fQtpd|`=G8?K6}8E)lMM-w(3i;t*HhAsiYmGiKE2Nr zuzYEDKz(H(z!{fSK+=DOIDxCa3!P*~J=gY(FIW-9dX!f%|Ypa5@MP_(C38Pfbn?9n6mB~01` zNLARv`%;SO`lu%##?=UvCs10MQ6eIjl?INFb+J`xb0AZ}T*w)i$tl~P|BmlUQR-10 zEp$g2L}^49kI3`C5pboC$|7CUQkxd|CSZ!n!xtrHOPybRotzkg?PsAe_R#+b{kAw! zUe;sJL?`3THSE~*I$CI`8&EHBHA~L_gC~9l;=&dKw=7FO2Q|OuYoRg|-e#kqIXq$G zU*&^)6<0(Fq#u*5-p{LoScUtq0mhZ~<_e&Pq@UJon6VXABnp%yP-sb8d!2>efJ~}! z3ncXfj=5BHFt9twFhX6peCs})nJ3<#>hW9&wT%mni{cxd8G2OSuKyI+Ok|}xeo6n z3GTq9a>OK$E6Yl+M>Aht`y@S7Ye1+ z1nKP3+?H|6+0e!zltd1t7`~noLJ53mks?ghMmM+aHZGDP>;&nif*(8~TU*V~DW({sr)%4AOr%+#aGY=UHdPOxoWYHcZOZTIP41E_NO-kA!AAuimd9t6~ z?v~a6$VlkCuO5_j@^O1^(*u;0`{yeOUIs<$fOoz9~xfVa<`VWSMm5}otPeGxBYN?d^7N({!5x1VY>S7w{D+wUCAP_rcQR`B_ zhvj_jOu#x`y=oFHQOin8Iuk$-LfHt9*`+r_QPC2UJ#|BEG-fdtw_Wyrr<>IocTZkC zhW+4$+tv0^7jSYhAWmHXQp#Ab%@`9m#X2UC>I-SD;I5wCJbxl5=0h4)Rz&5!YYQvihka{#^rD}|mUr$VMjx&&8Ssb(QcZEd!(u8d{v7_aY6u`cA8G(MYj zXj9u(az0XYIVB{O&AP`m!SIN^{x!gXg|<03qNKD^wlrPU`|kiQPWo|F+pTcYZh2PCCaWb?acp_Kiq-t9bNPbO(o(CF1S-BO zQ?ZvPN*xcB8S9_9rStBjJd-3-eTGJ{O}ap5Vm1&pPY|1nazI0sD8h;a2Km3{Tg1%i{WFD!srl zvOoIl2d?4?)}PRC%PL2;vlaM++Fx#oe#IxRf-myr1~RX2T-!g*2Czv3<9}cifE5sX z4>6ZIOmWOhb8z=q7}U-srY6;Z=Zn?EzI+6#yCGt_O8>mq$ zWwTUZO+IiQcj{OZX@}lDi*z=ulx}T?xOGP}K98As^M^wWZo5}s`2(1)Zo`?T>=tv6 zQUscVBth41V+EB~Emdq;UT;BDyF>J(zT!K|@UMAt%j@R7woLkH9R>P6scO#Nl%bjV zFG{0o1Xst&oY!+iFoO!i-MB{00+;IS}Y^$RqiEE1wt}wD0_cpP!G}9eYzw-~tCDA5~NuEt$LkRE@1367UpDsmRlcaPk{) z5cOmDYoO@~ahR4i=`Q!BuSHaSc=`{uE`azZ#TS;sJjzWC#A3~Ax-e~3G(YMz6b!H; zyfySB^AD-33^etM%L51&-EfqR(}|owlf5*lTiYJj&bB(JE$9?3<34rPZ*;0G>caFM>a;9Gr*&QjtqmEmC0Q`CntNgzW9LNg1>Q)qBp8YNQTMPXF#jeo=Is}dq zUiE(c`Zau99G-BMr!Gdgc@C3J9mHg54v+` zXld<*ojcCBGm3`8{kowFvpveKSUdGQQY0A=feP#G(1uCFk^JRoF0Rg~$V%I;mTznd z=7^e??ZkZyQ2y)8%hhC1Bs!Y!?5$@r0#Ch3wihd&?ZAmft1GX|wXo-Jw3xBhEi!k)JcL7q2KX8}vk1uqt z$b4CLZlRhz!>@e7RC7<}3zl1zs7Q~oAo~%Qf1k5g&BU~ZkauxqL8_{?H4svTK681r_kj`P;!beW0|c#XtRHwY;^z@Sc;wib(vsWG?f$Nr(f&Qw z%y+&R^^;pnU@2IvrWj{w8XW{A`;INF-6JlssS{L1nl9HY123sS3gRMY1J9L(3|Dxy zvdC4zl!n>;gcSv!79xp{XB<01#akdua~N7!5g?eJ0lj|0jLhkbqPtlKBO^l zjq&NqtL3p<`QO3dXa6v#e`qF0VMLHjj3fPiU*nO*UZaHOd@@2p)QTlUYDdr*%X1*S zhE!pVN+yuQ*xE3Uok9Ug{RoD=xcDZ+21 z3^|qI?WvQ`r?9u&N&o!`Z_yY41wX%8|2tY8U8eiG4MqP+1VwBoPNP?qKP7Gutk1FC z99)q0QR#g=VeWHGt{JY+tJ$Px2sVSqy=C*7oHS|RGejR3D_ZMw4-r^d5lJ&3x=ic7 z(J$E-*9gVFf-}Q94%-N(oSo7vVb(zu>W!>Z?QY|gIA>g`cXPM4TGaG}r|O==HBEc# z-uNzEPRH2ux+XJegO<9W=<5Q-IETqX@%MW6gAujM1*5#;#WX!n%8yQw;~lWO&8#uK}+lZwd0kiZdU?LCWZt%_W_(*iprJZq}4Ag9nexj>#w$ z8x{?3Pbuq!#X;~l9>W2Xry?5gJ=DngCpmPn)h97F>eS|n@P<25J55Uh5a(Vs#f4~` zu2jpX|HU&Hd5~PdHnN>x+ODP&4cAzuD+~pEPK-X>9s`e@4a9F0CSB6geWvjER^9>R$jl0p5EMdvf|N%(5V z^)xj;(x)RH8j;DX74b>2I=VqV=q5aADQt>7cPv5XlcaH%7oDy!rRU)D=P+>w547}; zsZKp1j`Y!HO*r{0Cncr3tSJyM6(q}@rD^CAR{&~5$ISVUE56b2xYqD3#Cy#h_I6NZ z>&;mjwb7(9l5TvR-F_^70e*>|7;BDhX;yxsTQ!M42hhJGivBdPPQ|uDfaG!Z>6V1z zytI1!hB67W*mRQot6e&*wv%Zrl>Uocf*yk_%;aZamda6p7+H8+(GM#A@A<-UZVA&| z>8>G55-PR{Xm=*AYRI%*Ox6?|UO>Ef#Cx9Zws<1X9WrBQu#xc4Vv+q*n}s%?Bm}*7 zsspXrS29#V)JN*dMVsqoPao zbnOEI;|j=>Q|8JdOb?Mgy&SF}I7Dv@^#yDA6W_pXppgnxohp;M9*W)>lA%4aH2vZM zI_E+!TSa6^AXo2zom3OM-5vQjy+wri&VlIL<>1p4_fr-K=Moyneuf!JY@&rW~Qt0HiG} zxQME>a>Cnr%TNA}fB?*?r`cLs3{N<8Z!M*Y_%j^rfvs*T4ZhQc=P~%X?IFFrUQ#aC zWG;YA+SA;e&j!}s6Hl<{{CU^G^5KV;We?%T=-x*5yDiEe-Y*-d{|(GrNb9R8c0(kX z#3%$@5S4r-3v9UnKsP-OI(t<-gPs*N*CfhlF?=u0()p`8)>%ay$u8|6`kfR7+r1{6 zlli=7LptD8x7sa2{ zj#s{B&%9go>>W?DwzWdcO@!h6>n8;-?bIia!lB3tpD2$3+Zw@%T0g>I@W5i#D=ld>6KdXh^^-m>* z{9!HPF$t|UP930;!NJO(85fGr@L@)voxv~_5TJ1i!JTtk^qt$#J#bIu|K(U|Z#6Bg zS|Sy$OkU{_-;m&SgTa~4dd2~cQ3c-J&j*WN)<9Tjlt?YFwzEz!pst@v$O-ra{DhN* zqkaZKzy2Ya&W#x+*wQM%!|A}jAkk?u&IFWt0ra>$Wk$694+Q7EM!Je1mg?KL z%F`fu(pFY?3(DBPro~-+3lCQDAd&a%?9_jtr}AFtttCwF)W|B2v{KF~^zAdyMUV%J z0eM^3$?YAA(;kig9&eoQmM|<7{~r<92rz ztsjRX5)uZx$jbVC7&kayhSWK4#9ds`W$m%^UoQ%X#XSV2o7b-g%p9J2ND@gqgI zu2q7t`p?23b)$rvFagk@=HvN(qN4s`bcMveNzec}8Tj)RCEfow8NmNd4a);FqfLOM zx;k7$>)Zm;M3>6%F;W{)@-7#Dq_B6T-|8a>vely|U9MSOG0k;BrO9`V!@WMkGj~~v zG{e-(mw|7K&qJ`36NqF$m|x_o5;B_pC0^PfC;#BPJA3JIelHJ5FJqSGUP3m2MHa*F zm#qXW0(LVcoKw~P~#t zSk3=Hc5)llZ0*;byt?9fO|c`6I+WUhBjbHi`ZBqGVU6ynUh1EJek1%FUru@naSZ^) zui@{lfJDHdabm3hQ zflx>{#bOc6sK&B`vo477;+|Glkp}WL9au5*Jbv5}IrWI9_wcl}>&_4l8G^_Vt+OHY zIFA_MojMixd6~uDw=+f#?<3Vy&9OXX>2N=Kx~+~AVLiF%e%*B|KwyrimF}A2OLO6e zOxLY0YFD?#i#jGu_LCPmBw}ct=VDjfs5xt+dV$O7?iPR5HKnhj;1hZ1{MyXb*&53= zJ;BxY@#3YPwj`x%j*EN4Ls?fYfh()lOVPovvV=qjmhN6!iMl9WRKV2|2NWW%7FC|3 z;rmE=ytQ@UTve~~MTIaRJm~*5@~%sYnI@@U=5^A@5Y6@+I(fnG+H0X`E248l@$7Np zMADVg811*$XF*P)@ii(JIpgB*E{!%rBg7fJT;Lweu@xd;tq3cC3Tq$+;PZ(h6Rc~y zLy3FiMJ-qg_0PXoFe0>(0lCi@!(>Zw7$uN2!VzcMOeCIGDb`qhossV*7)$fcn(fap zX~m$@mDHrWLWmOk?2szD^|o}SozkRsyXJ*O2w~q@{YrB@<42Ox&@T?bIFXsbB*&x( zZRgbnCq=C{HWtgb;mF{6=SNzv~WiKD)NMac2X% zEnoTZp7$F`Tx=K-spp&O)%?W^o}u7r>9B8w4Z+MMJYN|$tSw!Az@&O__Q8V{HHcxP zx!III?KPtL<1Z}-GJBumUftObUq3{IINT>BL+}Y$ss-aZSUGv-*=MDtQ)UGfzvx$Z zOV?1-Fe;y&B?1f^g^Y2ME3x(2)EUa~M(3@j!8XO0vC+vhM;7Xiy%U4P&johb3;Hiz zobunntiR)YHZNk^!7ym`pL7+@A^w?-oynbbfob#{y(%bws zLBH3oU&54uYs5q%KTrqt1FDwoBCt8Y#vbc&SkVRLyy;kd!ZGD@cj|Mqe$IK0{Xp(C z9}+wKY*nh>ugTkISQy|H&os-S<0tHbN<664-OsRo9 zPF6=#X|#BT49QJ%Nc>+*D?pX<&+BIs4p-2u`5%ax^xxZg^z~Zlyki4G->zWxPX-XiZKaRoOoMw85Ap*?Mt;o&!k+#mCGDCb|CX)NuXeykn-=6O4^*i8&FR z&hkkVt%I`y#S3I9In$QELf7oQU3r1iBQILYY2`2pFimPDG@fer0a^a(f2_<()&W*i z1*7c^HO=c@*#(fNap-$|_OJ@dFrY}|=g6?^;l!sh7X=&sCsSep%Blz$^Iyx)voh`WJXcxM)Y1}+U|pP;&9lNJ!s%ZWBYL*e6v&qTi8ntz3j()S-kZkqmb6=p_EhQJ}YpB6noy; zk$U%s8Z472W4~SL!f5;m^VYn11@yhtE4D;e()hlJn28J}C&>`bTrOpe>J`f!py~lgj^3;v5A#-VztE*?VcznhUf($hg@E@Rod{Ymm>>tQv^(dGC(8{JRj zDVV*i%kSs}VHY~sr{Bn_KAbKFTD4DG1}yE@Z5?=jE=3JU_%nQ~^X>{c~-c0k7@(`;mIGqXH7s?MQ^5(`;YJ@&5e;VQ%;0u;Q z8c(3vk7juMsGGgPu%t-TJ=8@pA7RXM(BW=Rksg3SRcsO*3&0xYKV$H6m4ivQw4%Ng zJyX;JrR+f25aMoAtJM9}PSbu1KGWavyaiMSuADo+brRowU2e9KAPbO7LqjsW%qou? zxz0`jtspY9MQxvG&B3)(Tmhe|oRjNN!H}t_Awgql(3gSCcGdWM2K)!BePhaM*;BIv zSM{_ImTgg7-c(9r+1OnUo~dCEE7m^Np+%ia0b0XhWFhwbUm_R;S54jt40sC`*h}md zYbAd*_7*4YMx)#j3@MR&*dsuf?fa`i=z;GCpY18v3L3^|jta+R*BLMt^M=jR)v1K7 zUs9DpYMCA3ik;T>aH#Q;lJQb~pgpROdeG>%iDQY=*+}Q4v^|9I;b(4=Ad*VEelO5c zGZej>d0bXjRvK#tz+!^0Z84>rm8D)}_Jko72BpwssuAw=%b<2F6|Y07#4;2N|3#g4 zkDkXA69Hbi>-c*;o(rB_yIwDl0$2p?zGLglOKZQ#L}~`d>&UVx?n;A{9d5Dq)@cRc zUkxR5`swgr1QI^PICM79l~Vng3;Wfx)T3Oc`qL5?+Wd4(8&#wFvlG@zw=^iJeud@D zPlZp^du@)vmQ6YUqPA?Whhs=b7t)q~IMr2_$#6NB8>8QUy5RA5wTd zS-%Nt#C2}GUOQ;l%X|Xt8Gi{BO<7g?+L!e51(1!KYYIh1Elf7 zM4(9tpxRn}u=t|^7EpyL;?QF)m%655Cq&}^d->rq!7KhLjVL0wxn8P|P4Pr@^G)%5 zAA#k>qIQICcZ@t3T45_-jVMonHo_li@ZDNLBg`=}S}4T3!d`_d`cV z$5WWs9puhN%UL5~R4~SgT7`w!)-}h=kTH-h#u>(7PnP@C>nrW0=P=A=B!1SMIfLULNeVvsBZq zJ9iteR+4eyqLax{Pam{!ky0Y^hxZjo0Q;c|7O|9 z04b+Lq~%wx0Fejg5n)0pzLe)DG871o)|%5%JzcHusQ>v9v;0bD_9%B=#Ch z!)@EDfgQ|+fiCtm85;-c-lulFVSera&QM=_ahG5c1^- zJ&|`e$T*+k-;!(Zhp^BBmE1N2-mx;Osx`BS%_e z(eA6@qzVG?&ig1Ku~vLV?3#DU)eZBSgP`~&iax&gU-_z@f-Uc@)K-j8MPUP&LoF?h z^47)=Q~K-Tw_y5uJG1i|SBeT9?7_~|_3&6#+tiarZ(VTQM|%3{aj>GNCeW|R#)KC$ z<5h56NV8hjh4EB9LriU+0DAWP7Rq&ey)&1JR6JL}x}y~0x;Y%w)bJ_{wW;Ln{fBee zQ)(^kO?KT9I&BEj!LFR2_^G6TCUsr>o@@B8o?4cxB15^zEKCsGy52mr_CveETD5^L z-G;0nWSQ9xNPl?u-@*PZyMV^S7d&ln`O}h!KvTBcCo7fEqYbdr)N<#iVBO3pNyMK$ zME8JP741=>Lb>b4%5&|37i+6Vdrqx7*i$-tPSzdYbEh_WZY1RM5t{qC)H~ahQupq) zQe2pPQCQg)%?;Gv-ew=}vE_9=aa@{!$(^psoxIP9=1sk1)RrOD!_Ibp0iXT8{6v-M zMS5u1+L1GbCb@8~pEG*2x_7PRjB{aPd_WyrBuiY(g%P{85?rk5eUO{Vmp%&gQGk>x zzdTf%FgO8vL~%X3&h(-5I{{b6p3^U2eBX>>;FSYSH&6Qt{|s*_BfJB7v!D1}M`^)r z_|(iFN~vzY)NGrO6F7>-_G<(72A!RUQyiE8+PD7>2krGc&kk*MeEi{#(&EUz(HtLb zLZt$j(rKV6*`-C9q4$t50$9m*F0(YzeNJzMSiAu2lCcK3Aup9b12E!({bo42AY9rD zwnqHND-A6FU{3T*(( z&7^8IPG|daze=g_pID4U=f?(W# zA&*$CU$fQ{W@g@IEHiAdr|q`lp5(%d@%QgphoEQBHeLtD8|sai!%q;M_oz-*O_DNN zI0+r(qHg|kPD-O0e>SHJpAHnO?~ln(YnN*Z(+0uGYVXzdMn9seyz$k?DbFZ~a9Car z{tqEqbrfn<%?-S?ipDUA@>-k3uHTzQP6uMmoWM1tP%smB4AIm*z1`mDy{O6OW*Q7ZdYZ8Z`$Ym20X}Z(LJPBd6jyypsQ__f6 zt^5`H(k~wE?zYr!1m3!k*?M2at0;>XCr zJawEm46MbwE{4!bZCRp;@Y<5}iM`Ua`7_!*f2kZQ8JbJ^?f%@goUdJGRe1mYeErCnJ*C)Xus zUcJlz$V4_`0trB7^P4yZkY>-v0V2m&vGM-b*wkn$RO`3_l6o)z&oiGi)NGee*!@N~ z*nq-qJaZw~JqDOH?bp>ZP3e-~7G(3H<%kZiP^|(b#4SIMZRE28Xx9@Q@=8R4;^o#ses6eoR=`GqP)4L%DeA5#J z{j_FMAcw%5JWxGYQ#Mzyn3Un$XV~G{d@1=~+J)W8fcKav$i_^G1w%D1ABZWlULP8C zE66_b$XS(E-{44e0+;Pu&S*{yAo7gt)xSD%c5&3epy194W?XyZKK$c+q*%cs1-871 zp^j&m>o1A)p3ZwSBeXq*<6&rb1gJo+hKca2SUmw@Gfkow43B<>qDQOZ8Wp0w@Hj@;e`!v27##OI%7SoO=`^eFT(eBCXZdKzPj*OYivK+SVL$ z{MLrju1^|bs`d}_%X@pnCqP%>d9Sh0@9XO*Lp@+f$i5Y3nikhPvsm~--}NlT^=c9! z|I0ktCgervFEmNtbvzR!QTdVN`6n&j;@{uz-iap9CxT*%7@*$|k{>o?-o=70wX-p1 zDg;_1Wp-(Z>-A}YU3`d(5My#X+C@4Zp-D8Jy6*DMOj@h03fhral^MXwuLHw%@CWx7 z`7egXhIfwCA-D`jsSJ&bLQ{^!P;VYcY(ET#FM-)J8d-5&(dp)>inj}%n5wa{vE^U# zhJF~t_qn+_8A&d(5xxuR&3Bo<53FQ)7xwa#t~~VH zsh}@9G_X+Gj5Ki%=!h%gxzyW-VlCMhg0uFsGGP~pUBZpODWuf@`0!_Lu@Oj_CLMkb zFf4a9J`t6weULZCVy{7_U=CG}UY8WIaW}TWYqoC&7YUa9iW1r1_-eNt@!X(+IV*?- z6+*USAD^+(2Mvy>%SYhCjO*fJ_(XYMa&v-VlfTL^vV_{B-&IV^3JfQ&^IN^Ru}6Lh ze8FE3`scJ6lIV^$^#UA zGRysh{iQiJ2SGv5(8S2%r-}0sifT49ACoAuVZ51gH+r25$UXRoo&oG|~ zcaqlTjwMG`VeK*)$;dmxM?9XLKhN)gIVwjeO9VT}ydg`DRweTtXJTfaS2>)Bi_5za zDqn;ZS?fjr93`oP)r^I5Dc=q+9?$_ICn4Ubo2Q-kGcDR-IP+i_;rojjqOg#A#__lx zU6rOS3+q7%1HiP>Ihn2*Paz4<)(7=3N3c{kIg_x`;p^|VD(1d)cCYDipiA=h_Mp(J z8@q=0;>l!T&~M8cgXqG{DJ)fO+=K-Kc@~;~LL#dilkw;RWZ2k*WAl|{U07vyV>ZJ2 z+>H=MnPTXJN$S?CIOFj^Y%A5tK)@>qCSeQ{0rN&bP)W!>vU=eL^R7M`;D_&S3e-te zFJlkmg;$nJHK>hr+=y%Yr<)}@epL(F3#vZfJJlJGK7ZUzSbyN^Nxo!UUz1n+dcoH5 zHhWvD+fLWDq*XaFE+tODVEHOw&-28lBNbjSh2aq|@ z_*v>*H}@67i1Em!rE>fG*(0xIaJ$u0Z}G z8KXzC2al5UJxF5~gIV7p`aGX=kmL#v29y_3g|DmopeUA#p1#0#f|C(w`TK7|W(R5~e2P}c> zKvh2jvB{ftOqzFuM_)=kWxxIz5#Cok$XQXd^G5FwkQGXbMa}T{tZt}aZ!z@VZ@+fE z(EC7a&v|)_j178{v?sJh--*5Ai?PpbFIo567jzWcYwmdB;nZS($h&{fA%KVaVUTVk z-D6TME*z7Tc227xKTaCC#ZWtS5XaK9I*|H$MZ;lPd6r0;QoS0xN;|wg=bd*j=xv|v zBTxNeJHUmTQTaimM+w}k^%Y9N_kwJ|H?DsJXFM>9tL|Y#WyKb*5g@5(;2S0U?000{ zsN%JD$YCEF)K4hG{ZjRdU zqAu)|H(cVsqYj9~N909M`LkO6>*$JLl$cNbnPr*ptkK7lPI>?^RkyVGpK_)MNT;Y1 z{n;g`=Dx`&nRsE-HLH)UU=D#Fo!7?uG*T)5^CexerCGVo4(fF z??!L0hCgkI`N^P60^)OaU?Ck8-BN9akw2;Q;uYlNw#8L;^lSqUJ4mQrzDDhnsttG9 zv`s{u!c(@endhF(_fK8sSC5nzq3kp2sT<7bKqdm>04U7@!egD<_ROR2phIJVd9MBQ zBQU4~?53-iHQ8UrrdZei!1Ao(bca}$)^}iZ;w-WW+KkT9lTLYd-{{&A89I3E+WzIt zzcL=urewT`%~@is{x&Jev$noSRnAT*YQk(>J#8Zny^B%olbTEH)aH9z_x99J>O@&? zT`{Wxna|c6V+aRwQLLgQSJKmWA=949Edv>Lu-6Bj)>~#c%7lYW#iU1O@U2oxMo(qJ zI^Wy)m;fO2T==qA1|C!@D^D&y7{!@dm?Hyt#~vI4e=HY2af$Z2=m^2 zrVAn{lxo@R?hzMf3uGtkbQkBuIB@7k^a-o0ua3UHKLz}sbYk(3mMj^RY3z~)g5ffU zu3V?I*`SS($q}OMZHBF45P6>?^x9GIq|?R4WJGl^$FC6Afzu;-CfDgPbiVm(@J=#f zMXfQfDt{fF#E)=qD)AGQCsrf5W{qD6PV5+8;bK5VtKMYR4`PU%Gz!n!(%JX;`58P;u}I#KWc@f& zrq%Fu75#9PRmqrjm7X7J48k2)F65%@!pzA+E1At3)Xz=Wk;6?MYfa6k!G#?k#K(6F zasmshIeVIa%-&&3G_!I&!8QH3tw?hsXswKc;H$Svf2{Z{(`p7t1Yb%R`5{i#kl8tI zh#B7~FJwQ*Xqn5K^q*`D)#?7Pc?p{FwI?z`tslP$+jB(@bPi$!luT*HBr6_NH zxNZIsaLqqXulX!h#NpSw&4fn)s^SQZjTW2$(8X;PD`U4Oay-eQhtklg;9aa77Wo4$ zH(V$Dm*6}X%{SeXSCrK3l7nBvulnk;-(Z4SBd&rLvNJp2JCX%MOQ#|k>Ly%w!<%R4 zjr{jUhXzU#eE&s?|Akh~1K#;RqxmN4WPcu+eF10PUE6=rs!gsz;^O%Orb?RsfI4gJ zZGSN+-B2)Yr(eltycH;S3&7WzWnBLm9Owok@xzCPU_JkHHP zT)5)5F2*shdeb{^9-tnWw$;|@q#q^W((SIO&~G;r{MF|YqHrXeo!WpNuQvlVttl3j zSvLjfIdhqMieL{pLrcDgj_?b_M|RFRwKwj*)_QaO0o_lPfIz&h%frSO$rp?U9R1xBtQ7`tqy( zf?EDe8&L0b$^hPwjH>)o)T1URCT;e+(P93A?UZzeuOP>;;?4gL#L9-8d+uhp29sx5 zS>d{k#g}|(y_&+4ae0sp)k<)2=FLLNIy&3vosw21ue~IC$yi3(0X!L3jn0$!W6(HJ z&>JkiG)CV(+Ml^4H1$7`s>ZmOl^!QOTAEn;6>NUNe={yI+Yz4d7AnUnt{%100neK< zxN`|taP_83o8cz(Ek(CmsB!IS@9pN_%vnB5M>N_etNM2I^w72N^fbz41@BD6RD^7n zV#SAaiH#bqsw@)QH(`3`z{(vaC2_ifzBlZG)kN49;G0KlWr$IU@gl*BCHmVP9aqQq zBCEDL)@YoWd7`vjy@`yU3Bp%~DWgV_2l^^^;We5UYbyGu3cSpn-G%?aFV!%X)^1-^ z4E>Oe>%+COz1fazwg>QJ4Wk*XCwm6S-hWnbs~Em`tTj7`4$UTm9H#{_P=wkiu70Hr z5v=ELA2hf4t@*^Jz843_H*BER?NHBcRnE&&i6ksX0D6dsr5m;&#%~+0>5eldcsy_> zs_hG0xZPp_;?3IS4fVQsynFI1n$wiyehG!2z_+zMGDioY`NbD!3D6{yik#V>=%2nu zH54C4u?*@e`&|-Tw_e7+Oy95s#-MoSl(gHvNkyFV*%s)U43;MXsz%Wbm?Kv6x3|0t z9Ea~0Gc$fZ%Fv?e?gOH`$#VaK&V!F36s@$Cmr&lJs$H~KWf}_1Kyn8$E)Hq}bFK66 zMok+M&8cIT0SkmhS}Zo>Bw1WB|Kd%5Go)00px9?-@g4k_AH6wHGR z*fg5sIj1W@Z^=`FGESiTZY`OJBiHssCC!Vm{poufzt!6^Ti+v#H!7J9*K{8>PSj2X zctDy%*X@pd|L|GD;0ZgM6>6(Q{fD*QJopetdHNc2-B;y^(3yoZ`_X-Rit}31B*&DF zv%LxizAdELs2s> zI&Uxox4{b=(Xrq!llv=2{|w%vom9BBVe&F>K8u!(cXk=(2R$ZDAi{8)Gr*5g23!^K zg%5bpdqO$pJ336ZjZ{tii-+*#7=Ov(khXkz-Y}04{~8~PaO%qp9Z9fexj$G~?h`B?-=}AR3==kH!>ob}-e@ zCvYAm4D{#w-Bw|Z{xamx5v)6g@*j%Yv2gCJh+^_*{v$ZvZw4G+YWU3SdiQ}k zB!r}G9gJ+s5FF~Ht@nDiHZ!QI^1>b#UDAvqO71RbhAFNzG|i5o#;%>qb*Jo%zl7ZS z*M@%@b4&E>Q(6c*7)+wJ6!5gaXhRZOO{O`o1xbB6fLQ5 z%~UMcf+yU&2|MvcRHamE8!6rUf6AtMmSmwgPJvwNkf$iyBL<7li_5sfd4=5!M~@5X zxLgoGLfw3HkY+e5k!4FRMgD(C)B=ZzvA*c>Y@C$FVbEGTCJ-R#IkQnK&gh1cIY}Mjwi% z|EYv&vaV>z-1B$tT?Wk5Y3+fl&X3s|8N)t4DwO-zy<=d!Cc_kz?2`y(N@y{N1YTYh zJJkMFl#vL?%~DI5W`;QXUZV)z%7^}Z2Ie(DgW^9I#Rq*Axz`l-4UY(VKdPJyi5{g2 zP&b)P3sKvz^`QKGOZZhXF0D)WgcUqa)&A6ybEmxyLMq49K6b4LCfDZnSXiqur049r z=DzToKI|Cfk4;iop=9ad_HFbs(~ho8;r4Ce)rZZLnoqs?RXW~`qS;zsIOG2$v-Tl9 z*y7ZS^QP#w?Df$`kHt&y@V?84Mp4}9UhHL4GVAYsq_qi2arAh#eFHtUZVKD^BdocF zSekfXjQPQ%{x4&#@^5;vCOOf1YsK5Bd$)x8UJjsO`eQ{hhnE2BP`9coVFr7Vv+5j0 zp5H=Lm0(pF1e54DyQ&hFgFu8Vg8Uq4@y6|GpoQ4OZ-EvpDs!q5-{n7pW#oW^@Ml3x zeNkcCt*z#w`%kzCz!CUuG0>=+HQI3@(4tI4HeuR&x5^4r(61_y2lG*-$viJ5P&YZi zb?JZG#Q{sS+6}bCFpg5{(mgw1>htQarB6#h)aD79bVflk9o6>wk(W6aJ+xEJ_`y=V zwV68lVw`=XC!8Ka+DC5JHy*YhOtj*MKgQk=#F|g5<9i*7Tj+0CC&ELyk&_l|((fD; zX%C$mpVMvEUi|WbX~}~u*|M8YD1*)^{3Jmk?e(#|fWO?|nqAD>3sPtPmD`^_A!?`9 zj|SA;tPpz%Au@vTRwe=$P2RkGJZxV5gqGEH_xo>QliAiW6?CSg8(vaOK%m%dGRlr{ z4($JMobnVTs^EowoYuv6pVLLat_a;hPZ$9K!t?`PxZY`04ePmcgYqkHw5r+#__H3* zCe?zXk2ANQGxI;Q3;0GQEsZZ))Pq2fDw>DfexPi3o5}TAX)&Y3z46X_Y~ z#(n$n_T_}_^O@$ioz0t73X)^eMmLcC3%v8TpW!ZTZOQ- zRF~P1L7qNLH&qAdt?}(65smk9uunpYb0cSxrVPFa4l!Jz+_tYNu)wnNY`C1!CEmQ` zVD=YOU<5_-uFCQ%R})MLV3K9-zpUfrRRy=yA8`)lBRRAYP`l9R6@175;kfTWH}qbC zc{tg3Fuyg`9^(fYjxC%H^Wkx&9MaiT-E1evh6)bXRm(1E5Tp<-(F5HDmmop45kE;9 z7=#b71ruRWC#0RLgzNDXEz1bM)|H4MJ5j*E+d64zEc=aUp;GF4m8e_-MN>bf`J9l@ zg)rBU_*VGnXuhg#dsY;YH*LDc^G6=>9T({qCfI?(S=!DCqbVg< zZ*E1(<Af5n~S#^Zd6IDvs^f30Wx=f#^&i=UXNl|WDyCS`n zKa*FDipG%(Ev>yXmg#D}hk!f`i5k}>vuk4$v@qb2r=^OMGN>}ED)1e`4g z^B7u=3>dlT8tFTGPSbfuixBD&Kf}Is*%C5>ZdLWNGrnFuuVUlP^fw2rjRXC=7L)Z! z9l&4t(|H*8u=VU8)-;xo%QkA{QzVw8_+2+}8BGd2S5nzAsmOfx=H)MYlc$16>2awr zFI@1I@h8)j3PjF)Et!38@?gkUOWU3cmv77r^}D}07Ut1zZTK5rU+;pz^vro6jKZb6 zBcB(niLot)wvl)$^lHJy8vmCJ8k9+-lm;aQ7M|n^X*+-So5w?e{jZ&?Bs5=$6MxM~kCKi6a z`>O;iAOjVxGLn=g7Kj|1IR>7N;q! zqYZiR&ZAA9+LQO#d;TNsNwp~T0k2FG|5x1ln)}N$q`_>#40f&-^<0Sc1&qFUdZXkq zudD9pDgsGPO=2zvLwv0S{`GR+evhvGJ*jX5KAL%jTY)q})bg}MP8~fn zrwcx8o!*|SaEPB$tZLMou@wpAYh#e{(TA!q0(u7NY0DL7QMeCqz>%u`%FU!3YPAQ_ ztaetbl~ak<88RS%a2;qa+E$kuUGihFX;IyntB#p>AN`XL586;IjS1NZ=&@W!3$rc1 z{O1r zXCA`ZIUIbs5c%!!5hs{tIqo>ed&JG;yg%`q0&w}!H8m%mHCy|A8g7k1d5tOvyE)5` zf0`b2c)736fXB&{BY?(RCAYzx!zuF$(|p@BhBNWPyo2;Yo6p zhw*jt5#FZRPbiSaefP#=4rF!Ir5CiqIesfX_m2a*8>fdwb1!9?S;FxSzp)}?zXgQ| zmO*!{>y7{07!JM5340~Em&q5c9J{{Wfj-nC!!mv;_Vnx%ebiL zk5J`|jBP!)O90$fIV-!ik> zU^2HhGBdNvq3AxJVwkMNgpd%Dv1xnTwrRvujU^8+#!;)`LAi;8)g=P$W` z(ct&^RksFhb-FbM)HB;+cj=b`t(|~Jaq~HI0<^9%YIuhCt^`&D`5^{cKW9KoMKH$^)h*c*8kzL7LNU!* zQ9Q^){6tU+2qq_E^fP~U^G#kMvQ8Gr zuV`ShQp)%^IFXNHq*Ojq~IQ7sW+P{(r~X|9u}rdG5HrRoe8B2{*`)D$lht!Hlzw ztiM4ODuFI9VImzwQwcaMCGwTsXqR`E^EwYb?L33Dp=N_IIWGgPnkf*`c-1xSF7wFx ztJ9SNXm;E_0?X{Vj~UmPMg)SgOCZBFbxG|1xr_e2OPoA0b)&HIpAW~_tz5DcEp~J$ z@Ne=@T-q3w-kF(+kI9pr55FFAy}R9>CZGfF(wd0~Dfej^iDZhj`Rz=*lEF$nr;K#P zG|ftr)J$8OXZmfMj`ZJdiD9qf^4gHSy>1DU>4Dx@&Ai`R#=qB# zHZ%{1rQPFm+i*M$K#B2J00I~fU(M%v_mvxDcPi3r<$ey#+*7&Z8@I*OTpDNI7hg2? zm}1k-py$y}0}}S>YncT6tAh8-ZPN?IUnNu2B%c2&LBb=xlwHcQ?~&F+Iuk}@ z6uKErx+POWBq~3;I*kY`DtBkWyUQR$sjvEi_wW5kAiY>kIQOS~_VrhBK#1V)j&0Kj zeUvH(j&+dL%`=b+>!wE1>iyXuWlAKR;{;B*ui~5M{l6o@)>-uI?@h{f3sDMaAu zl5=inqwb)Ur^CEbR#623T#G8Z8$N?X>QXJQx&_gMg=y;(b3G9wTNNrN@S+M!Eq{n* z??9^8SDmu9DM2kme^Md#kn zL85sfzqaM_&fe8xt*V?|e`G>2p_So)VQg#2IGl?&D^3;TxPq)r&9hpE-1(Nr!tmUR zM*48>>mM zkY|qruYO3T0#~%p(^3N|?5M(CW#Ci;??s>+Lmy*pPm2!kpMg$k*Nil1wSt69@bDu3 z^6L{|u=@Mkfbk`eF>IuZBy=Vs^S-3Z-j00Ya_-xJn3Yu;x*uD1OU|p8UkJRbD6H(2 zr`L^Z6!sE{+(EKlOVLJkfF(cRYP&DO$=Xxj^p1fK{@Rm#UQaS2sEy@{=u38?F@Rq~ sqL$LA|8Oy=Ve;QnpOukbKOwVCe*URKQC|VPzU<5m9mA_-S_ssC0pR036aWAK diff --git a/apps/documenteditor/main/resources/img/toolbar-menu@1.5x.png b/apps/documenteditor/main/resources/img/toolbar-menu@1.5x.png deleted file mode 100644 index 805f4756753c8edbae84eebd71d0b5e6742fdbe3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8475 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 Q9{>OV07*qoM6N<$f=$nCRR910 literal 0 HcmV?d00001 diff --git a/apps/documenteditor/main/resources/img/toolbar/1x/big/btn-columns.png b/apps/documenteditor/main/resources/img/toolbar/1x/big/btn-columns.png new file mode 100644 index 0000000000000000000000000000000000000000..414b95449e1d6872352c8a6ea01cce301bebb513 GIT binary patch literal 105 zcmeAS@N?(olHy`uVBq!ia0vp^7Cq?9~e978H@ zB`dJFHFAq6Y<%#*UPK{cv7c<|s};fSbFG*d7%~fb17lZ4tAfn%boFyt=akR{0H}r< AtpET3 literal 0 HcmV?d00001 diff --git a/apps/documenteditor/main/resources/img/toolbar/1x/big/btn-contents-update.png b/apps/documenteditor/main/resources/img/toolbar/1x/big/btn-contents-update.png new file mode 100644 index 0000000000000000000000000000000000000000..afc6bc1a7b70af6267f3b798cb1386b7acaac2ec GIT binary patch literal 396 zcmV;70dxL|P)OzqoODWmBQsgH!SW^C4YT)Cu#m#quxrG`hiUBD4EM+ zW<@DX-N3s~D(B&^NKSh9b|C(F_$y=-59V}9% z^!SZ&ol)HYc!oSDB`!mOg=H+Trg=vXx+r_R0`O*A` zZ#+B=&qwodTr(OOxJDGSQN<>7g>R+cfR6sdBY qJHJY{W^2q@s2nItCF9+P|B|1{=IFiy|3`rU0000q_jL;978H@ zB}>>Pi0oLv&>`US&Yr7*gO_hPQ>DdRE^#T|s}}=gV-iFd7#;_O3v{2Jy&7ber>mdK II;Vst0BhMC!~g&Q literal 0 HcmV?d00001 diff --git a/apps/documenteditor/main/resources/img/toolbar/1x/big/btn-controls.png b/apps/documenteditor/main/resources/img/toolbar/1x/big/btn-controls.png new file mode 100644 index 0000000000000000000000000000000000000000..ce08b6f44c833e1bb30932b6178f9ebe555498a4 GIT binary patch literal 187 zcmeAS@N?(olHy`uVBq!ia0vp^7CD8y zOI*4Bn$5edwcr1l(61c$gw6TTUjF7S9Pij)s?4dIJ*&_0+rC@{cVk0|b1a;XLIM`% z23-DmJZ!?tKgoI#R)RWnxuo7~H2sq?xvF%^vBe>~y>D++h_IG;Bg0*`jwO5zTlgQ% n6|>E?TF)r#U=?!hJHfET@Mr%05~mEHYZyFT{an^LB{Ts5Z)Zp} literal 0 HcmV?d00001 diff --git a/apps/documenteditor/main/resources/img/toolbar/1x/big/btn-dropcap.png b/apps/documenteditor/main/resources/img/toolbar/1x/big/btn-dropcap.png new file mode 100644 index 0000000000000000000000000000000000000000..977c60cf3b5b87711323041b33a1ed0a82f03efb GIT binary patch literal 235 zcmV;YffF{3o5xm*}Qw zI)0oZ7q9_Gk26=j=#(*Q5hFMtWA4c`D-W+|6cfyV2clJI)?9D0DJ7HZO(v!9Z7n4_ z!#>Z4f-?%$Wlyq6twNVQ35YhK&-NA literal 0 HcmV?d00001 diff --git a/apps/documenteditor/main/resources/img/toolbar/1x/big/btn-ic-review.png b/apps/documenteditor/main/resources/img/toolbar/1x/big/btn-ic-review.png new file mode 100644 index 0000000000000000000000000000000000000000..c356a9489d3056c2cf4bb6b2f162dbd0c5fedfee GIT binary patch literal 286 zcmV+(0pb3MP)tEFi^fxfk26QxkLE%w|S^gor6P- zQ_w*FmTy3w10HZ`6ezx*ugh4gRJOV literal 0 HcmV?d00001 diff --git a/apps/documenteditor/main/resources/img/toolbar/1x/big/btn-ic-reviewview.png b/apps/documenteditor/main/resources/img/toolbar/1x/big/btn-ic-reviewview.png new file mode 100644 index 0000000000000000000000000000000000000000..d010e487af452a250e4c811ccc33187f7dc604f8 GIT binary patch literal 353 zcmV-n0iOPeP)z7Li zkLyco9SYhiA)u?ZV<@Mj!)c(rOxT=Tk4)Z zJv3T})NcWom!sbQvijqx|7G|jfv1WTZVErAj&VcxFbA3P`=UtavU z2s-&Q!zA`>Unn5k!T;on)T(~&U(W2@+s|3B3MWu;=8HQWEoTO*lSlz)a&VKpnbL_f zz)_?C4HKf{#DtNr4je9dJ##a<)Hx=^X`ob3`{K403#Cz zx+1K*cydw3u^WK1NOzv1j3ZZFrKR^#2Bj7HCmP_$$dbS&9h}duVtJo+=*3}qpS4H< ziP86A8x7PV1-RkmKC`Y8>E_F-hnC7TAifm!zA{Zc?R?SM84YA#zIdM7BDLQTtp)&R zzJA@UDN;)^a@EnSes9%CrKbiNtGfY>aHQy{Ib6S|zsVKp#V?VeryJbm_~`%u002ov JPDHLkV1kTrp$Gr~ literal 0 HcmV?d00001 diff --git a/apps/documenteditor/main/resources/img/toolbar/1x/big/btn-notes.png b/apps/documenteditor/main/resources/img/toolbar/1x/big/btn-notes.png new file mode 100644 index 0000000000000000000000000000000000000000..754c1df51abfa9b42a6bb19c18f1abbc16779b3f GIT binary patch literal 413 zcmV;O0b>4%P)(6!GE*4G2O+1hqgB77Qvd#Ne2C=>li|Q707P zKv=rK8Jh2IISYnN1C(!xtb()1f`REgX@XUNVf2G!@xz|#>El+Mc_pLf8!_xzb|0RI zf0ePK>l0v+4CFYq34{9{Ip4K}MKZu4wF%)cA}a}*eBmS|kJ`>KOuTe)gn}d`k9wHl zgpN-Z=2kVITcAu)S(sbZeEtAhr0&Ah&B^$31o}rWA#Bs!pnL!yShNe%& zm^Lr9TdK_P*p7+Qwx#dW7F_p15A8rm+m=?RO?;OwUDEXn()a&3zf!ci00000NkvXX Hu0mjf93i<{ literal 0 HcmV?d00001 diff --git a/apps/documenteditor/main/resources/img/toolbar/1x/big/btn-pagebreak.png b/apps/documenteditor/main/resources/img/toolbar/1x/big/btn-pagebreak.png new file mode 100644 index 0000000000000000000000000000000000000000..c83e595a01b060ef0a6c0358a63e607c6aed2bc9 GIT binary patch literal 150 zcmeAS@N?(olHy`uVBq!ia0vp^7CbnPZr(r7$k?q^Y2#X!BRmyB?MW8TtWsRoAKtaZ+j`04KFMo*-A7AAjx(H* zIsU)n=uM{X&;3Q;rab!>92Gz77o&Z>=jz9%leZ=A-F+nQInW{oPgg&ebxsLQ026yV A{Qv*} literal 0 HcmV?d00001 diff --git a/apps/documenteditor/main/resources/img/toolbar/1x/big/btn-review-deny.png b/apps/documenteditor/main/resources/img/toolbar/1x/big/btn-review-deny.png new file mode 100644 index 0000000000000000000000000000000000000000..7882b091d0cbdbc1aea8773625067cdb05cfd764 GIT binary patch literal 254 zcmVdl2AuR)1O_B<0A7*6G3cao3^P)4G6bL!FY)Tc)}is0!Wz>cYq{|=c> zM*cLYckeVvnE?MwnzmJO>dy*`8E*8&x~0dI9jN0%FkcK-(W0XwJ;)%)0_kU1t@55IA6v2 fr_IMm{~p~6Kxk~^ASESI00000NkvXXu0mjf=YD2Y literal 0 HcmV?d00001 diff --git a/apps/documenteditor/main/resources/img/toolbar/1x/big/btn-review-prev.png b/apps/documenteditor/main/resources/img/toolbar/1x/big/btn-review-prev.png new file mode 100644 index 0000000000000000000000000000000000000000..ea95b14407b4b4983f7f5167cbb2c20f01058663 GIT binary patch literal 224 zcmeAS@N?(olHy`uVBq!ia0vp^7C}?e1Bz6NI&0v z=wFt{POHxcc6A3mYczcj)AmBVxP3yGQ}=G?XIEV3@_Nh>IVGpE?uWGt5Py+rp2sX; zaj*9G`rQtE<@axH-l8YlJcr#-p?!w8QLNz-dGBjK-Hh(Lt641#Ep00i_>zopr0Ej$awgDlxuNEg~ct^=lg3P(@TzaGjl6)yqf1 z3@kT6NYQ&1+}MZ>NButJ`Da;*3gxrq4jC|yhypclBkS))kww@e?Y$0)5dsVBk@nt1 z>auPzHoe$l*-p+jy%<_aQC2|~K`3u+j$IurY&3aB8TN|D;DUi~nmt2C`<1z11YDjW ilTFVB6MpaFqRtn_CRD4De9Tk;00005-PuS%R5+r85rf{oo1u0=3|bh}2tx3x z?WE@Vai=99H12yCp+%r;T%+bb+I}wr8{GHMVlM*yWH;Ym>MtU2!e;r>ivSFjyY=HT z@ocytD%>zG6Jgk(xBVNP4fU~OgBI%^YIIDHF3d{Co#udaVJJlCBA9z&P6ykT!0Zci zK+6K@!cbT30tciELqQ`jzmSq7gKrNAL(&6$e5Jkqk7I5f%`h50Ol)Yl^=E zL6Ii7+*p>DDdZZ&nxb@lDWBUXjq4~oOK!Sn9TW?zo30KD0(H1dBi*ay_DBv#`(3P) z$Bnsi&*XAruIQkcvpMG6{jF(|OEa7mD@)87qL7$7cII=(&O(m3Gpr@Y{~oMmj@wwL wxD9IDAB%B)P6?g*0gjxJ4*9$XP8>(s-yUV+h`cEe{fSEP eS60fl+`lxBj}_Iu|LExe0000h{kIzcDKAeK$B>F!$r4rvzV16+@AINc zKKAba-~Tr<@|5!E{dZJJy!hWh&?nGm?TdGZQx$f7&PY=O(OOvM5zbFVGs1e(g=>FVdQ&MBb@0OrauC;$Ke literal 0 HcmV?d00001 diff --git a/apps/documenteditor/main/resources/img/toolbar/1x/btn-multilevels.png b/apps/documenteditor/main/resources/img/toolbar/1x/btn-multilevels.png new file mode 100644 index 0000000000000000000000000000000000000000..5ff44579c37ce727a0d8e7b07a004bb6e0c140fe GIT binary patch literal 133 zcmeAS@N?(olHy`uVBq!ia0vp^8bB<h{kIzcDIZT4$B>F!Z!d0VJYc}VdeL5{ z`rxzYE3R1Ve(ZUGVflI$?!!*YITT9HMa1oV9NZqdQ~B!|-r~837_a+Ex*heD5S4uP i-$2Xn(25fV`o1h1W-%Pi32y?L%i!ti=d#Wzp$P!J_AZ$K literal 0 HcmV?d00001 diff --git a/apps/documenteditor/main/resources/img/toolbar/1x/cc-plaintext.png b/apps/documenteditor/main/resources/img/toolbar/1x/cc-plaintext.png new file mode 100644 index 0000000000000000000000000000000000000000..56822d13eed1db1ba761f0a9321b06b765cde51e GIT binary patch literal 93 zcmeAS@N?(olHy`uVBq!ia0vp^8bB<h{kIzcDHTr_$B>F!$r7xK6Fx9Z|Gz_# rS?EVUd(SQbQKJV8CWTiuBv=`QO-ofPk4~2cs%P+Y^>bP0l+XkKy+;?$ literal 0 HcmV?d00001 diff --git a/apps/documenteditor/main/resources/img/toolbar/1x/cc-remove.png b/apps/documenteditor/main/resources/img/toolbar/1x/cc-remove.png new file mode 100644 index 0000000000000000000000000000000000000000..9a459ed91f0691f9ca6ec666988b5909399021ea GIT binary patch literal 140 zcmeAS@N?(olHy`uVBq!ia0vp^8bB<h{kIzcsbEhR$B>F!ZznUdF$8kBJkR@I z{$Ke_VA@*NW=@tIea{a(T-;sZ`Jxwh{kIzcsa#JN$B>F!Zzr>gGAIhTbh@-| zmNQZ13Jg1cx3*yRcf;c7zg~$JGiD{YJQvK$p0(kub=Lj(eC`FY@+wQ7+-|FFnNoAR zV1mKs$P;f&6eBpMEaSMTSLQiGCB@o3b56j^8)ZP^h*;VFr|CHO}&Qc)df OF@vY8pUXO@geCwh{kIzcDRoa5$B>F!$r7y15h{kIzcDHTr_$B>F!$r7y15%5Zh>`tARJM;igvGkCiCxvXelF{r5}E+uHyCID literal 0 HcmV?d00001 diff --git a/apps/documenteditor/main/resources/img/toolbar/1x/dropcap-inmargin.png b/apps/documenteditor/main/resources/img/toolbar/1x/dropcap-inmargin.png new file mode 100644 index 0000000000000000000000000000000000000000..21b9fc50668c398669f41598b80521297ddd3c5d GIT binary patch literal 183 zcmeAS@N?(olHy`uVBq!ia0vp^8bB<h{kIzcsX9*=$B>F!Zzr$|9yZ`%U_B^s zNX2`fc8`I^6ekW5X9E^zftL68oVV}#d@s0uQfI%LwCn7%J;@WbGaAm?`c24wv?5ac z(IJmx`^{HhnRQ{hnvL0#LmVPa$r9{aBf@gu{os{gJ-kzWR`TAH$wfTITRC`78rCTF i^ZNe`IefApiBosolI7Q>3bcVPVeoYIb6Mw<&;$Sj_CgE* literal 0 HcmV?d00001 diff --git a/apps/documenteditor/main/resources/img/toolbar/1x/dropcap-intext.png b/apps/documenteditor/main/resources/img/toolbar/1x/dropcap-intext.png new file mode 100644 index 0000000000000000000000000000000000000000..df836a92bbdf603e024190b1ab651d7a0b4ed139 GIT binary patch literal 185 zcmeAS@N?(olHy`uVBq!ia0vp^8bB<h{kIzcsRmCM$B>F!Zzr$|9yZ`%U_B^s zNX2`fc8`I^6ekW5X9E^zftL68oVV}#{AphOq|SafY1i3jJCaX`njCm0qkh7)@X8wQ z!bFwF^Jj-<`M&TLmXi)jWZ^n!*wY-Pv)Zcs4_i;u!#TodH{N?+Y^+(E- k+lt}^N1sdjwF!IwzH{I5KpW2)pj#L`UHx3vIVCg!0EY}jw*UYD literal 0 HcmV?d00001 diff --git a/apps/documenteditor/main/resources/img/toolbar/1x/dropcap-none.png b/apps/documenteditor/main/resources/img/toolbar/1x/dropcap-none.png new file mode 100644 index 0000000000000000000000000000000000000000..f77c6a39a5e2eb1d2760011ddba24b3bbf394962 GIT binary patch literal 96 zcmeAS@N?(olHy`uVBq!ia0vp^8bB<<0VEi1=_;fHDW;MjzhDN2vdL#HfILZ07srr_ sTgeh-2Us}|9Qmi*xG?w8icV&J29pO-H_tw24*+TPboFyt=akR{0PB((5C8xG literal 0 HcmV?d00001 diff --git a/apps/documenteditor/main/resources/img/toolbar/1x/wrap-behind.png b/apps/documenteditor/main/resources/img/toolbar/1x/wrap-behind.png new file mode 100644 index 0000000000000000000000000000000000000000..f6457509efcffe6b615e0643ffc7b898e5df254d GIT binary patch literal 207 zcmeAS@N?(olHy`uVBq!ia0vp^8bB<h{kIzcscD`rjv*Ddk|h=%cxqqA5&V5V zgG7;DNq4y)vs0qL?SAny-N)1Z{{Qhm(?NqL?Q>J*$1jBoH>=)g&GZX9mnAT5v2B=m z)IWb_=hgqS0;bvSO}ZJ$D^e67@m{Y}Tj>AlMkhX|Mjg*zOPxDz%apv)J(wujdAc=V z`%4FB<4JXTC7)P#onb##wB`6qr}zcCYaZzQzPQKc1S3PL_M5{yWc4=yUC7|+>gTe~ HDWM4fKtxj? literal 0 HcmV?d00001 diff --git a/apps/documenteditor/main/resources/img/toolbar/1x/wrap-infront.png b/apps/documenteditor/main/resources/img/toolbar/1x/wrap-infront.png new file mode 100644 index 0000000000000000000000000000000000000000..542a8d65ee805775c2366bd38a5fb0c934da5663 GIT binary patch literal 313 zcmV-90mlA`P)_0uF+n_nW;)RLNwx<-BcyCgIr^urJKG=I6(B=d#`NS zTsS$Y*tU%#To6$d(JEUm$&t@}QQu)nPWqz0Lt(R>q-h>1p{UDgK2$L?uTNcvtrp@FF{uWSlTyw}!SgajW?8^6aJ`D-Lz=11~&ZiLz^%Pop z6KOX4O+%q#VmRhtm}o5AxrDvly{peqxWn0TXZMVSg~IV!OA3Vr&bVrln0j*=bww87 z<}&J*b60ZJYhMbP9BY4Z!P~>rthN+752nev<;5w9X{s#XffLizwXn~Fvg3{;(EXt7 xI2Z4kn{Bz;(J_Qz&)h6BY<4*L8(*8>=L1-lZ5ol`y(0hs002ovPDHLkV1mMjh*$ss literal 0 HcmV?d00001 diff --git a/apps/documenteditor/main/resources/img/toolbar/1x/wrap-square.png b/apps/documenteditor/main/resources/img/toolbar/1x/wrap-square.png new file mode 100644 index 0000000000000000000000000000000000000000..da6b9a3ce8ccd3d810a5d386f9867d883fea171c GIT binary patch literal 306 zcmV-20nPr2P)5+(%+NT>uP^nku&$wJ?c zwWQn2*LJjL*>l_+6t}%ZMh#L5DUxNrCtEu+YA@T`KUT}HAE)XTk}6%>$o)7~gK!u! zeHtH+=@o;pi{;aD9(h?4CM+SvQ?qa{36rRjoXGAqA;GZzBl#sEiK@=%QF|*KY6d%U zhU8E)*pad2XL3Pfc5X%ZOb#*6+WH5NmrgUVNvOIoO*RR&Ve*(}u?W$y$25ygm}jFI zJ6=k%Hj3=F2}w8G?@3_tCLxW@>OEm(zX8GUEN$oy0A`S??cV?uNB{r;07*qoM6N<$ Eg2AnP&Hw-a literal 0 HcmV?d00001 diff --git a/apps/documenteditor/main/resources/img/toolbar/1x/wrap-through.png b/apps/documenteditor/main/resources/img/toolbar/1x/wrap-through.png new file mode 100644 index 0000000000000000000000000000000000000000..d5379f68f7b948160a59abf3319e6a1157575759 GIT binary patch literal 306 zcmV-20nPr2P)7%TAfX8(ITxFQNkIZqkbs0rKtgY&-IiSF z`_uQb?B%1-x0d6ba@=|*OD3h@&W+=f;+09$f9;T;a}@uDnMPQM2aDqLFw^h|rI7G* z@zLB~cL+tqpUczqeN9;G5=uVQrMe_6tSWq%t7}5E!f{W8B_XnEJQEg#qO@z7)nRbN zyOvoUI`8n^T+-P>SiQq{b2i)k#VO9GZZnZfs5)(%aHMh5!Hn literal 0 HcmV?d00001 diff --git a/apps/documenteditor/main/resources/img/toolbar/1x/wrap-tight.png b/apps/documenteditor/main/resources/img/toolbar/1x/wrap-tight.png new file mode 100644 index 0000000000000000000000000000000000000000..05c5f2ec492100eafb1894c481acfc28b99dbeec GIT binary patch literal 307 zcmV-30nGl1P)B9VWzYVdvAn(cjnnC7}J+&_f8_9aYHj4RCBHn*S zzy)8wXNxsCBP17FBC`Mu6=xkB8fY!-qdivM?L76RuwyXmVCSi8HylFpH)9gb={4ns z1H!8ggh5*ivn(N}jk8de!VD&3ldPHv+2UhjdB)>Dy-b7WJMSHW3$Nx l;!N4IY!(g#`~TZ~mL~%#T-CP$j&%S4002ovPDHLkV1n0JZ?6CV literal 0 HcmV?d00001 diff --git a/apps/documenteditor/main/resources/img/toolbar/2x/.css.handlebars b/apps/documenteditor/main/resources/img/toolbar/2x/.css.handlebars new file mode 100644 index 000000000..c6772c331 --- /dev/null +++ b/apps/documenteditor/main/resources/img/toolbar/2x/.css.handlebars @@ -0,0 +1,12 @@ +{{#spritesheet}} +@media only screen { + @media (-webkit-min-device-pixel-ratio: 2), + (min-resolution: 2dppx), (min-resolution: 192dpi) + { + .toolbar__icon { + background-image: url(resources/{{{escaped_image}}}); + background-size: {{half width}}px auto; + } + } +} +{{/spritesheet}} diff --git a/apps/documenteditor/main/resources/less/app.less b/apps/documenteditor/main/resources/less/app.less index d58af5311..485fdbc95 100644 --- a/apps/documenteditor/main/resources/less/app.less +++ b/apps/documenteditor/main/resources/less/app.less @@ -131,6 +131,9 @@ @import "advanced-settings.less"; @import "navigation.less"; +@import "sprites/iconssmall@1x"; +@import "sprites/iconsbig@1x"; + .font-size-small { .fontsize(@font-size-small); } diff --git a/apps/documenteditor/main/resources/less/leftmenu.less b/apps/documenteditor/main/resources/less/leftmenu.less index 3eae9bff6..cee2142f2 100644 --- a/apps/documenteditor/main/resources/less/leftmenu.less +++ b/apps/documenteditor/main/resources/less/leftmenu.less @@ -11,19 +11,6 @@ } } -button.notify .btn-menu-chat {background-position: -0*@toolbar-icon-size -63*@toolbar-icon-size;} -button.notify .btn-menu-comments {background-position: -0*@toolbar-icon-size -60*@toolbar-icon-size;} - -.button-normal-icon(btn-menu-history, 59, @toolbar-icon-size); -//.button-normal-icon(btn-menu-file, 66, @toolbar-icon-size); -.button-normal-icon(btn-menu-search, 64, @toolbar-icon-size); -.button-normal-icon(btn-menu-comments, 65, @toolbar-icon-size); -.button-normal-icon(btn-menu-chat, 62, @toolbar-icon-size); -.button-normal-icon(btn-menu-about, 68, @toolbar-icon-size); -.button-normal-icon(btn-menu-support, 70, @toolbar-icon-size); -.button-normal-icon(btn-menu-plugin, 77, @toolbar-icon-size); -.button-normal-icon(btn-menu-navigation, 83, @toolbar-icon-size); - .tool-menu-btns { width: 40px; height: 100%; diff --git a/apps/documenteditor/main/resources/less/rightmenu.less b/apps/documenteditor/main/resources/less/rightmenu.less index 0718b0fcb..3969d629d 100644 --- a/apps/documenteditor/main/resources/less/rightmenu.less +++ b/apps/documenteditor/main/resources/less/rightmenu.less @@ -86,33 +86,6 @@ } } -/*menuText*/ -.button-normal-icon(btn-menu-text, 37, @toolbar-icon-size); - -/*menuImage*/ -.button-normal-icon(btn-menu-image, 17, @toolbar-icon-size); - -/*menuTable*/ -.button-normal-icon(btn-menu-table, 18, @toolbar-icon-size); - -/*menuChart*/ -.button-normal-icon(btn-menu-chart, 45, @toolbar-icon-size); - -/*menuHeader*/ -.button-normal-icon(btn-menu-header, 39, @toolbar-icon-size); - -/*menuMailMerge*/ -.button-normal-icon(btn-menu-mail-merge, 40, @toolbar-icon-size); - -/*menuShape*/ -.button-normal-icon(btn-menu-shape, 43, @toolbar-icon-size); - -/*menuTextArt*/ -.button-normal-icon(btn-menu-textart, 54, @toolbar-icon-size); -.button-normal-icon(btn-menu-signature, 78, @toolbar-icon-size); - -.button-otherstates-icon2(btn-category, @toolbar-icon-size); - .icon-right-panel { .background-ximage-v2('right-panels/RightPanelBigBtns.png', 148px, @commonimage: false); } @@ -177,23 +150,6 @@ background-position: -250px 0; } -.btn-toolbar:not(.x-huge) .icon:not(svg).btn-borders-small { - .background-ximage-v2('right-panels/SmallBorders.png', 84px); -} - -.button-normal-icon(btn-position-all, 0, 21px); -.button-normal-icon(btn-position-inner, 1, 21px); -.button-normal-icon(btn-position-bottom, 2, 21px); -.button-normal-icon(btn-position-inner-hor, 3, 21px); -.button-normal-icon(btn-position-top, 4, 21px); -.button-normal-icon(btn-position-none, 5, 21px); -.button-normal-icon(btn-position-outer, 6, 21px); -.button-normal-icon(btn-position-left, 7, 21px); -.button-normal-icon(btn-position-inner-vert, 8, 21px); -.button-normal-icon(btn-position-right, 9, 21px); - -.button-otherstates-icon(btn-borders-small, 21px); - .btn-edit-table, .btn-change-shape { .background-ximage-v2('right-panels/rowscols_icon.png', 84px); diff --git a/apps/documenteditor/main/resources/less/statusbar.less b/apps/documenteditor/main/resources/less/statusbar.less index 4c4fdca81..176835bb4 100644 --- a/apps/documenteditor/main/resources/less/statusbar.less +++ b/apps/documenteditor/main/resources/less/statusbar.less @@ -195,8 +195,3 @@ } } } - -.button-normal-icon(btn-ic-zoomtowidth, 55, @toolbar-icon-size); -.button-normal-icon(btn-ic-zoomtopage, 56, @toolbar-icon-size); -.button-normal-icon(btn-ic-changes, 30, @toolbar-icon-size); -.button-normal-icon(spellcheck-lang, 69, @toolbar-icon-size); diff --git a/apps/documenteditor/main/resources/less/toolbar.less b/apps/documenteditor/main/resources/less/toolbar.less index 87a829578..bf05feaaf 100644 --- a/apps/documenteditor/main/resources/less/toolbar.less +++ b/apps/documenteditor/main/resources/less/toolbar.less @@ -292,124 +292,6 @@ background-position: -150px -300px; } -@toolbar-icon-size: 20px; -.button-normal-icon(btn-align-center, 0, @toolbar-icon-size); -.button-normal-icon(btn-align-just, 1, @toolbar-icon-size); -.button-normal-icon(btn-align-left, 2, @toolbar-icon-size); -.button-normal-icon(btn-align-right, 3, @toolbar-icon-size); -.button-normal-icon(btn-bold, 5, @toolbar-icon-size); -.button-normal-icon(btn-pagebreak, 6, @toolbar-icon-size); -.button-normal-icon(btn-clearstyle, 7, @toolbar-icon-size); -//.toolbar-btn-icon(btn-editheader, 8, @toolbar-icon-size); // dublicate !!! index-39 -.button-normal-icon(btn-copy, 9, @toolbar-icon-size); -.button-normal-icon(btn-copystyle, 10, @toolbar-icon-size); -.button-normal-icon(btn-decoffset, 11, @toolbar-icon-size); -.button-normal-icon(btn-decfont, 12, @toolbar-icon-size); -.button-normal-icon(btn-paracolor, 13, @toolbar-icon-size); -.button-normal-icon(btn-fontcolor, 14, @toolbar-icon-size); -.button-normal-icon(btn-incoffset, 15, @toolbar-icon-size); -.button-normal-icon(btn-incfont, 16, @toolbar-icon-size); -.button-normal-icon(btn-italic, 19, @toolbar-icon-size); -.button-normal-icon(btn-linespace, 20, @toolbar-icon-size); -.button-normal-icon(btn-setmarkers, 21, @toolbar-icon-size); -.button-normal-icon(btn-multilevels, 22, @toolbar-icon-size); -.button-normal-icon(btn-numbering, 23, @toolbar-icon-size); -//.button-normal-icon(btn-pageorient, 24, @toolbar-icon-size); -//.button-normal-icon(btn-pagesize, 25, @toolbar-icon-size); -.button-normal-icon(btn-paste, 26, @toolbar-icon-size); -.button-normal-icon(btn-print, 27, @toolbar-icon-size); -.button-normal-icon(btn-redo, 28, @toolbar-icon-size); -.button-normal-icon(btn-save, 29, @toolbar-icon-size); -.button-normal-icon(btn-highlight, 31, @toolbar-icon-size); -.button-normal-icon(btn-strikeout, 32, @toolbar-icon-size); -.button-normal-icon(btn-subscript, 33, @toolbar-icon-size); -.button-normal-icon(btn-superscript, 34, @toolbar-icon-size); -.button-normal-icon(btn-underline, 35, @toolbar-icon-size); -.button-normal-icon(btn-undo, 36, @toolbar-icon-size); -.button-normal-icon(btn-hidenchars, 37, @toolbar-icon-size); -//.button-normal-icon(btn-editheader, 39, @toolbar-icon-size); -.button-normal-icon(btn-mailrecepients, 40, @toolbar-icon-size); -.button-normal-icon(btn-synch, 42, @toolbar-icon-size); -.button-normal-icon(btn-save-coauth, 41, @toolbar-icon-size); -.button-normal-icon(btn-colorschemas, 44, @toolbar-icon-size); -.button-normal-icon(btn-hidebars, 47, @toolbar-icon-size); -.button-normal-icon(btn-settings, 48, @toolbar-icon-size); -//.toolbar-btn-icon(btn-bold, 5, @toolbar-icon-size); -.button-normal-icon(btn-zoomup, 57, @toolbar-icon-size); -.button-normal-icon(btn-zoomdown, 58, @toolbar-icon-size); - -.button-normal-icon(btn-ic-review, 61, @toolbar-icon-size); -.button-normal-icon(btn-ic-docspell, 69, @toolbar-icon-size); - -.button-normal-icon(mmerge-next, 71, @toolbar-icon-size); -.button-normal-icon(mmerge-last, 72, @toolbar-icon-size); -.button-normal-icon(mmerge-prev, 73, @toolbar-icon-size); -.button-normal-icon(mmerge-first, 74, @toolbar-icon-size); -//.button-normal-icon(btn-columns, 75, @toolbar-icon-size); -//.button-normal-icon(btn-pagemargins, 76, @toolbar-icon-size); - -//.button-normal-icon(btn-insertimage, 17, @toolbar-icon-size); -//.button-normal-icon(btn-inserttable, 18, @toolbar-icon-size); -//.button-normal-icon(btn-inserthyperlink, 38, @toolbar-icon-size); -//.button-normal-icon(btn-insertshape, 43, @toolbar-icon-size); -//.button-normal-icon(btn-insertchart, 45, @toolbar-icon-size); -//.button-normal-icon(btn-text, 46, @toolbar-icon-size); -//.button-normal-icon(btn-insertequation, 53, @toolbar-icon-size); -//.button-normal-icon(btn-dropcap, 50, @toolbar-icon-size); -.button-normal-icon(btn-ic-doclang, 67, @toolbar-icon-size); - -.button-normal-icon(rotate-90, 81, @toolbar-icon-size); -.button-normal-icon(rotate-270, 82, @toolbar-icon-size); -.button-normal-icon(flip-hor, 84, @toolbar-icon-size); -.button-normal-icon(flip-vert, 85, @toolbar-icon-size); - -@menu-icon-size: 22px; -.menu-icon-normal(mnu-wrap-inline, 0, @menu-icon-size); -.menu-icon-normal(mnu-wrap-square, 1, @menu-icon-size); -.menu-icon-normal(mnu-wrap-tight, 2, @menu-icon-size); -.menu-icon-normal(mnu-wrap-through, 3, @menu-icon-size); -.menu-icon-normal(mnu-wrap-topAndBottom, 4, @menu-icon-size); -.menu-icon-normal(mnu-wrap-inFront, 5, @menu-icon-size); -.menu-icon-normal(mnu-wrap-behind, 6, @menu-icon-size); -.menu-icon-normal(mnu-arrange-front, 7, @menu-icon-size); -.menu-icon-normal(mnu-arrange-back, 8, @menu-icon-size); -.menu-icon-normal(mnu-arrange-forward, 9, @menu-icon-size); -.menu-icon-normal(mnu-arrange-backward, 10, @menu-icon-size); -.menu-icon-normal(mnu-arrange-group, 11, @menu-icon-size); -.menu-icon-normal(mnu-arrange-ungroup, 12, @menu-icon-size); -.menu-icon-normal(mnu-img-align-left, 13, @menu-icon-size); -.menu-icon-normal(mnu-img-align-center, 14, @menu-icon-size); -.menu-icon-normal(mnu-img-align-right, 15, @menu-icon-size); -.menu-icon-normal(mnu-img-align-top, 16, @menu-icon-size); -.menu-icon-normal(mnu-img-align-middle, 17, @menu-icon-size); -.menu-icon-normal(mnu-img-align-bottom, 18, @menu-icon-size); -.menu-icon-normal(mnu-distrib-hor, 19, @menu-icon-size); -.menu-icon-normal(mnu-distrib-vert, 20, @menu-icon-size); -.menu-icon-normal(mnu-align-center, 21, @menu-icon-size); -.menu-icon-normal(mnu-align-just, 22, @menu-icon-size); -.menu-icon-normal(mnu-align-left, 23, @menu-icon-size); -.menu-icon-normal(mnu-align-right, 24, @menu-icon-size); -.menu-icon-normal(mnu-dropcap-none, 25, @menu-icon-size); -.menu-icon-normal(mnu-dropcap-intext, 26, @menu-icon-size); -.menu-icon-normal(mnu-dropcap-inmargin, 27, @menu-icon-size); -.menu-icon-normal(mnu-columns-one, 28, @menu-icon-size); -.menu-icon-normal(mnu-columns-two, 29, @menu-icon-size); -.menu-icon-normal(mnu-columns-three, 30, @menu-icon-size); -.menu-icon-normal(mnu-columns-left, 31, @menu-icon-size); -.menu-icon-normal(mnu-columns-right, 32, @menu-icon-size); -.menu-icon-normal(mnu-direct-horiz, 33, @menu-icon-size); -.menu-icon-normal(mnu-direct-rup, 34, @menu-icon-size); -.menu-icon-normal(mnu-direct-rdown, 35, @menu-icon-size); - -.menu-icon-normal(mnu-orient-portrait, 36, @menu-icon-size); -.menu-icon-normal(mnu-orient-landscape, 37, @menu-icon-size); -.menu-icon-normal(mnu-control-plain, 38, @menu-icon-size); -.menu-icon-normal(mnu-control-rich, 39, @menu-icon-size); -.menu-icon-normal(mnu-control-remove, 40, @menu-icon-size); - -.menu-otherstates-icon(ppm-toolbar, @menu-icon-size); - - .username-tip { background-color: #ee3525; border: none; diff --git a/build/sprites/Gruntfile.js b/build/sprites/Gruntfile.js new file mode 100644 index 000000000..7a412243d --- /dev/null +++ b/build/sprites/Gruntfile.js @@ -0,0 +1,99 @@ +module.exports = function (grunt) { + const sprite_name = 'iconssmall'; + const sprite_name_big = 'iconsbig'; + + const fs = require('fs'); + const path = '../../apps/documenteditor/main/resources/img/' + sprite_name + '.png'; + const path2x = '../../apps/documenteditor/main/resources/img/' + sprite_name + '@2x.png'; + + try { + // fs.unlinkSync(path); + // fs.unlinkSync(path2x); + //file removed + } catch(err) { + console.error(err) + } + + const helpers = { + parselang: (name, options) => { + if (/\((\S+)\)$/.test(name)) { + let _match = /(.+)\((\S+)\)$/.exec(name); + return '[applang=' + _match[2] + '] ' + options.fn({name:_match[1]}); + } + + return options.fn({name:name}); + }, + half: num => {num/2;} + }; + + // Configure grunt + grunt.initConfig({ + sprite:{ + word_small: { + src: ['../../apps/documenteditor/main/resources/img/toolbar/1x/*.png', '../../apps/common/main/resources/img/toolbar/1x/*.png'], + dest: '../../apps/documenteditor/main/resources/img/' + sprite_name + '.png', + destCss: '../../apps/documenteditor/main/resources/less/sprites/'+ sprite_name +'@1x.less', + cssTemplate: '../../apps/documenteditor/main/resources/img/toolbar/1x/.css.handlebars', + algorithm: 'top-down', + cssHandlebarsHelpers: helpers + }, + word_big: { + src: ['../../apps/documenteditor/main/resources/img/toolbar/1x/big/*.png', '../../apps/common/main/resources/img/toolbar/1x/big/*.png'], + dest: '../../apps/documenteditor/main/resources/img/' + sprite_name_big + '.png', + destCss: '../../apps/documenteditor/main/resources/less/sprites/' + sprite_name_big + '@1x.less', + cssTemplate: '../../apps/documenteditor/main/resources/img/toolbar/1x/big/.css.handlebars', + algorithm: 'top-down', + cssHandlebarsHelpers: helpers + }, + scale2x: { + src: '../../apps/documenteditor/main/resources/img/toolbar/2x/*.png', + dest: '../../apps/documenteditor/main/resources/img/' + sprite_name + '@2x.png', + destCss: '../../apps/documenteditor/main/resources/less/sprites/toolbar@2x.less', + cssTemplate: '../../apps/documenteditor/main/resources/img/toolbar/2x/.css.handlebars', + algorithm: 'top-down', + cssHandlebarsHelpers: helpers + }, + slide_small: { + src: ['../../apps/presentationeditor/main/resources/img/toolbar/1x/*.png', '../../apps/common/main/resources/img/toolbar/1x/*.png'], + dest: '../../apps/presentationeditor/main/resources/img/' + sprite_name + '.png', + destCss: '../../apps/presentationeditor/main/resources/less/sprites/'+ sprite_name +'@1x.less', + cssTemplate: '../../apps/presentationeditor/main/resources/img/toolbar/1x/.css.handlebars', + algorithm: 'top-down', + cssHandlebarsHelpers: helpers + }, + slide_big: { + src: ['../../apps/presentationeditor/main/resources/img/toolbar/1x/big/*.png', '../../apps/common/main/resources/img/toolbar/1x/big/*.png'], + dest: '../../apps/presentationeditor/main/resources/img/' + sprite_name_big + '.png', + destCss: '../../apps/presentationeditor/main/resources/less/sprites/'+ sprite_name_big +'@1x.less', + cssTemplate: '../../apps/presentationeditor/main/resources/img/toolbar/1x/big/.css.handlebars', + algorithm: 'top-down', + cssHandlebarsHelpers: helpers + }, + cell_small: { + src: ['../../apps/spreadsheeteditor/main/resources/img/toolbar/1x/*.png', '../../apps/common/main/resources/img/toolbar/1x/*.png'], + dest: '../../apps/spreadsheeteditor/main/resources/img/' + sprite_name + '.png', + destCss: '../../apps/spreadsheeteditor/main/resources/less/sprites/'+ sprite_name +'@1x.less', + cssTemplate: '../../apps/spreadsheeteditor/main/resources/img/toolbar/1x/.css.handlebars', + algorithm: 'top-down', + cssHandlebarsHelpers: helpers + }, + cell_big: { + src: ['../../apps/spreadsheeteditor/main/resources/img/toolbar/1x/big/*.png', '../../apps/common/main/resources/img/toolbar/1x/big/*.png'], + dest: '../../apps/spreadsheeteditor/main/resources/img/' + sprite_name_big + '.png', + destCss: '../../apps/spreadsheeteditor/main/resources/less/sprites/'+ sprite_name_big +'@1x.less', + cssTemplate: '../../apps/spreadsheeteditor/main/resources/img/toolbar/1x/big/.css.handlebars', + algorithm: 'top-down', + cssHandlebarsHelpers: helpers + } + } + }); + + // Load in `grunt-spritesmith` + grunt.loadNpmTasks('grunt-spritesmith'); + + grunt.registerTask('word-icons', ['sprite:word_small', 'sprite:word_big', 'sprite:scale2x']); + grunt.registerTask('slide-icons', ['sprite:slide_small', 'sprite:slide_big']); + grunt.registerTask('cell-icons', ['sprite:cell_small', 'sprite:cell_big']); + + grunt.registerTask('default', ['word-icons','slide-icons','cell-icons']); +}; \ No newline at end of file From 7a42e934e281cf4fe33fed1cfc6dd64e7a5022bd Mon Sep 17 00:00:00 2001 From: Julia Svinareva Date: Thu, 21 Nov 2019 13:43:23 +0300 Subject: [PATCH 291/419] [SSE] Fix commit: fe4a450465c69f2c4b161bbe0017dca427e36a8e --- apps/common/main/resources/less/buttons.less | 6 ++++-- apps/spreadsheeteditor/main/app/view/Toolbar.js | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/apps/common/main/resources/less/buttons.less b/apps/common/main/resources/less/buttons.less index 3642c73af..8771a15a0 100644 --- a/apps/common/main/resources/less/buttons.less +++ b/apps/common/main/resources/less/buttons.less @@ -400,8 +400,10 @@ } } .dropdown-menu { - li.disabled { - opacity: 0.65; + &.scale-menu { + li.disabled { + opacity: 0.65; + } } } } diff --git a/apps/spreadsheeteditor/main/app/view/Toolbar.js b/apps/spreadsheeteditor/main/app/view/Toolbar.js index 36085e6f3..950599b6a 100644 --- a/apps/spreadsheeteditor/main/app/view/Toolbar.js +++ b/apps/spreadsheeteditor/main/app/view/Toolbar.js @@ -1363,8 +1363,8 @@ define([ caption: me.capBtnScale, lock: [_set.docPropsLock, _set.lostConnect, _set.coAuth], menu: new Common.UI.Menu({ - items: [ - ]}) + items: [], + cls: 'scale-menu'}) }); var menuWidthItem = new Common.UI.MenuItem({ caption: me.textWidth, From b82812abd64875a6834c1f1dc4937c0a40eacde3 Mon Sep 17 00:00:00 2001 From: Julia Svinareva Date: Thu, 21 Nov 2019 13:55:04 +0300 Subject: [PATCH 292/419] [SSE] Cell Settings: set no fill for default --- apps/spreadsheeteditor/main/app/view/CellSettings.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/spreadsheeteditor/main/app/view/CellSettings.js b/apps/spreadsheeteditor/main/app/view/CellSettings.js index 2c41c3736..bc7e5bf88 100644 --- a/apps/spreadsheeteditor/main/app/view/CellSettings.js +++ b/apps/spreadsheeteditor/main/app/view/CellSettings.js @@ -188,7 +188,7 @@ define([ editable: false, data: this._arrFillSrc }); - this.cmbFillSrc.setValue(this._arrFillSrc[0].value); + this.cmbFillSrc.setValue(Asc.c_oAscFill.FILL_TYPE_NOFILL); this.fillControls.push(this.cmbFillSrc); this.cmbFillSrc.on('selected', _.bind(this.onFillSrcSelect, this)); From d433d525bbb93d42628e022a4916f4204770ce35 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Thu, 21 Nov 2019 17:29:39 +0300 Subject: [PATCH 293/419] [DE] Fix Bug 40362, Bug 43365, Bug 42936 --- .../main/app/controller/Links.js | 13 ++++++- .../main/app/controller/Toolbar.js | 37 +++++++++++-------- apps/documenteditor/main/app/view/Toolbar.js | 3 +- 3 files changed, 33 insertions(+), 20 deletions(-) diff --git a/apps/documenteditor/main/app/controller/Links.js b/apps/documenteditor/main/app/controller/Links.js index 352cea19e..e4a30288b 100644 --- a/apps/documenteditor/main/app/controller/Links.js +++ b/apps/documenteditor/main/app/controller/Links.js @@ -130,7 +130,8 @@ define([ in_header = false, in_equation = false, in_image = false, - in_table = false; + in_table = false, + frame_pr = null; while (++i < selectedObjects.length) { type = selectedObjects[i].get_ObjectType(); @@ -138,6 +139,7 @@ define([ if (type === Asc.c_oAscTypeSelectElement.Paragraph) { paragraph_locked = pr.get_Locked(); + frame_pr = pr; } else if (type === Asc.c_oAscTypeSelectElement.Header) { header_locked = pr.get_Locked(); in_header = true; @@ -154,12 +156,19 @@ define([ var control_props = this.api.asc_IsContentControl() ? this.api.asc_GetContentControlProperties() : null, control_plain = (control_props) ? (control_props.get_ContentControlType()==Asc.c_oAscSdtLevelType.Inline) : false; + var rich_del_lock = (frame_pr) ? !frame_pr.can_DeleteBlockContentControl() : true, + rich_edit_lock = (frame_pr) ? !frame_pr.can_EditBlockContentControl() : true, + plain_del_lock = (frame_pr) ? !frame_pr.can_DeleteInlineContentControl() : true, + plain_edit_lock = (frame_pr) ? !frame_pr.can_EditInlineContentControl() : true; - var need_disable = paragraph_locked || in_equation || in_image || in_header || control_plain; + var need_disable = paragraph_locked || in_equation || in_image || in_header || control_plain || rich_edit_lock || plain_edit_lock; this.view.btnsNotes.setDisabled(need_disable); need_disable = paragraph_locked || header_locked || in_header || control_plain; this.view.btnBookmarks.setDisabled(need_disable); + + need_disable = in_header || rich_edit_lock || plain_edit_lock || rich_del_lock || plain_del_lock; + this.view.btnsContents.setDisabled(need_disable); }, onApiCanAddHyperlink: function(value) { diff --git a/apps/documenteditor/main/app/controller/Toolbar.js b/apps/documenteditor/main/app/controller/Toolbar.js index 5ca5abd66..6cb0f668a 100644 --- a/apps/documenteditor/main/app/controller/Toolbar.js +++ b/apps/documenteditor/main/app/controller/Toolbar.js @@ -739,7 +739,11 @@ define([ if (sh) this.onParagraphColor(sh); - var need_disable = paragraph_locked || header_locked; + var rich_del_lock = (frame_pr) ? !frame_pr.can_DeleteBlockContentControl() : true, + rich_edit_lock = (frame_pr) ? !frame_pr.can_EditBlockContentControl() : true, + plain_del_lock = (frame_pr) ? !frame_pr.can_DeleteInlineContentControl() : true, + plain_edit_lock = (frame_pr) ? !frame_pr.can_EditInlineContentControl() : true; + var need_disable = paragraph_locked || header_locked || rich_edit_lock || plain_edit_lock; if (this._state.prcontrolsdisable != need_disable) { if (this._state.activated) this._state.prcontrolsdisable = need_disable; @@ -753,16 +757,17 @@ define([ lock_type = (in_control&&control_props) ? control_props.get_Lock() : Asc.c_oAscSdtLockType.Unlocked, control_plain = (in_control&&control_props) ? (control_props.get_ContentControlType()==Asc.c_oAscSdtLevelType.Inline) : false; (lock_type===undefined) && (lock_type = Asc.c_oAscSdtLockType.Unlocked); + var content_locked = lock_type==Asc.c_oAscSdtLockType.SdtContentLocked || lock_type==Asc.c_oAscSdtLockType.ContentLocked; - if (!paragraph_locked && !header_locked) { - var control_disable = control_plain || lock_type==Asc.c_oAscSdtLockType.SdtContentLocked || lock_type==Asc.c_oAscSdtLockType.ContentLocked; + if (!need_disable) { + var control_disable = control_plain || content_locked; for (var i=0; i<7; i++) toolbar.btnContentControls.menu.items[i].setDisabled(control_disable); - toolbar.btnContentControls.menu.items[8].setDisabled(!in_control || lock_type==Asc.c_oAscSdtLockType.SdtContentLocked || lock_type==Asc.c_oAscSdtLockType.SdtLocked); + toolbar.btnContentControls.menu.items[8].setDisabled(!in_control || content_locked); toolbar.btnContentControls.menu.items[10].setDisabled(!in_control); } - var need_text_disable = paragraph_locked || header_locked || in_chart; + var need_text_disable = paragraph_locked || header_locked || in_chart || rich_edit_lock || plain_edit_lock; if (this._state.textonlycontrolsdisable != need_text_disable) { if (this._state.activated) this._state.textonlycontrolsdisable = need_text_disable; if (!need_disable) { @@ -770,7 +775,7 @@ define([ item.setDisabled(need_text_disable); }, this); } - toolbar.btnCopyStyle.setDisabled(need_text_disable); + // toolbar.btnCopyStyle.setDisabled(need_text_disable); toolbar.btnClearStyle.setDisabled(need_text_disable); } @@ -796,22 +801,22 @@ define([ if ( !toolbar.btnDropCap.isDisabled() ) toolbar.mnuDropCapAdvanced.setDisabled(disable_dropcapadv); - need_disable = !can_add_table || header_locked || in_equation || control_plain; + need_disable = !can_add_table || header_locked || in_equation || control_plain || rich_edit_lock || plain_edit_lock || rich_del_lock || plain_del_lock; toolbar.btnInsertTable.setDisabled(need_disable); need_disable = toolbar.mnuPageNumCurrentPos.isDisabled() && toolbar.mnuPageNumberPosPicker.isDisabled() || control_plain; toolbar.mnuInsertPageNum.setDisabled(need_disable); var in_footnote = this.api.asc_IsCursorInFootnote(); - need_disable = paragraph_locked || header_locked || in_header || in_image || in_equation && !btn_eq_state || in_footnote || in_control; + need_disable = paragraph_locked || header_locked || in_header || in_image || in_equation && !btn_eq_state || in_footnote || in_control || rich_edit_lock || plain_edit_lock || rich_del_lock; toolbar.btnsPageBreak.setDisabled(need_disable); toolbar.btnBlankPage.setDisabled(need_disable); - need_disable = paragraph_locked || header_locked || in_equation || control_plain; + need_disable = paragraph_locked || header_locked || in_equation || control_plain || content_locked; toolbar.btnInsertShape.setDisabled(need_disable); toolbar.btnInsertText.setDisabled(need_disable); - need_disable = paragraph_locked || header_locked || in_para && !can_add_image || in_equation || control_plain; + need_disable = paragraph_locked || header_locked || in_para && !can_add_image || in_equation || control_plain || rich_del_lock || plain_del_lock || content_locked; toolbar.btnInsertImage.setDisabled(need_disable); toolbar.btnInsertTextArt.setDisabled(need_disable || in_footnote); @@ -820,28 +825,28 @@ define([ this._state.in_chart = in_chart; } - need_disable = in_chart && image_locked || !in_chart && need_disable || control_plain; + need_disable = in_chart && image_locked || !in_chart && need_disable || control_plain || rich_del_lock || plain_del_lock || content_locked; toolbar.btnInsertChart.setDisabled(need_disable); - need_disable = paragraph_locked || header_locked || in_chart || !can_add_image&&!in_equation || control_plain; + need_disable = paragraph_locked || header_locked || in_chart || !can_add_image&&!in_equation || control_plain || rich_edit_lock || plain_edit_lock || rich_del_lock || plain_del_lock; toolbar.btnInsertEquation.setDisabled(need_disable); - toolbar.btnInsertSymbol.setDisabled(!in_para || paragraph_locked || header_locked); + toolbar.btnInsertSymbol.setDisabled(!in_para || paragraph_locked || header_locked || rich_edit_lock || plain_edit_lock || rich_del_lock || plain_del_lock); - need_disable = paragraph_locked || header_locked || in_equation; + need_disable = paragraph_locked || header_locked || in_equation || rich_edit_lock || plain_edit_lock; toolbar.btnSuperscript.setDisabled(need_disable); toolbar.btnSubscript.setDisabled(need_disable); toolbar.btnEditHeader.setDisabled(in_equation); - need_disable = paragraph_locked || header_locked || in_image || control_plain; + need_disable = paragraph_locked || header_locked || in_image || control_plain || rich_edit_lock || plain_edit_lock; if (need_disable != toolbar.btnColumns.isDisabled()) toolbar.btnColumns.setDisabled(need_disable); if (toolbar.listStylesAdditionalMenuItem && (frame_pr===undefined) !== toolbar.listStylesAdditionalMenuItem.isDisabled()) toolbar.listStylesAdditionalMenuItem.setDisabled(frame_pr===undefined); - need_disable = !this.api.can_AddQuotedComment() || paragraph_locked || header_locked || image_locked; + need_disable = !this.api.can_AddQuotedComment() || paragraph_locked || header_locked || image_locked || rich_del_lock || rich_edit_lock || plain_del_lock || plain_edit_lock; if (this.mode.compatibleFeatures) { need_disable = need_disable || in_image; } diff --git a/apps/documenteditor/main/app/view/Toolbar.js b/apps/documenteditor/main/app/view/Toolbar.js index 5c286102b..e9339bee6 100644 --- a/apps/documenteditor/main/app/view/Toolbar.js +++ b/apps/documenteditor/main/app/view/Toolbar.js @@ -1955,8 +1955,7 @@ define([ this.btnMailRecepients.setVisible(mode.canCoAuthoring == true && mode.canUseMailMerge); this.listStylesAdditionalMenuItem.setVisible(mode.canEditStyles); - this.btnContentControls.menu.items[4].setVisible(mode.canEditContentControl); - this.btnContentControls.menu.items[5].setVisible(mode.canEditContentControl); + this.btnContentControls.menu.items[10].setVisible(mode.canEditContentControl); this.mnuInsertImage.items[2].setVisible(this.mode.canRequestInsertImage || this.mode.fileChoiceUrl && this.mode.fileChoiceUrl.indexOf("{documentType}")>-1); }, From 25a9ca56ed899cc3ed88d412701670204101b9a6 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Thu, 21 Nov 2019 17:44:29 +0300 Subject: [PATCH 294/419] [DE] Change events for table drawing --- apps/documenteditor/main/app/controller/Toolbar.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/documenteditor/main/app/controller/Toolbar.js b/apps/documenteditor/main/app/controller/Toolbar.js index 6cb0f668a..19a846b5e 100644 --- a/apps/documenteditor/main/app/controller/Toolbar.js +++ b/apps/documenteditor/main/app/controller/Toolbar.js @@ -382,8 +382,8 @@ define([ this.api.asc_registerCallback('asc_onChangeSdtGlobalSettings', _.bind(this.onChangeSdtGlobalSettings, this)); this.api.asc_registerCallback('asc_onTextLanguage', _.bind(this.onTextLanguage, this)); Common.NotificationCenter.on('fonts:change', _.bind(this.onApiChangeFont, this)); - this.api.asc_registerCallback('asc_TableDrawModeCallback', _.bind(this.onTableDraw, this)); - this.api.asc_registerCallback('asc_TableEraseModeCallback', _.bind(this.onTableErase, this)); + this.api.asc_registerCallback('asc_onTableDrawModeChanged', _.bind(this.onTableDraw, this)); + this.api.asc_registerCallback('asc_onTableEraseModeChanged', _.bind(this.onTableErase, this)); } else if (this.mode.isRestrictedEdit) { this.api.asc_registerCallback('asc_onFocusObject', _.bind(this.onApiFocusObjectRestrictedEdit, this)); this.api.asc_registerCallback('asc_onCoAuthoringDisconnect', _.bind(this.onApiCoAuthoringDisconnect, this)); From 1926f2fee9ee761d3b12daecb8b198fd0a5862fc Mon Sep 17 00:00:00 2001 From: Maxim Kadushkin Date: Thu, 21 Nov 2019 19:10:02 +0300 Subject: [PATCH 295/419] [PE] build icons sprite from source images --- .../main/app/controller/Viewport.js | 4 +- .../main/app/template/LeftMenu.template | 12 +- .../main/app/template/RightMenu.template | 16 +-- .../main/app/template/StatusBar.template | 8 +- .../main/app/view/DocumentHolder.js | 9 +- .../main/app/view/ImageSettings.js | 8 +- .../main/app/view/ShapeSettings.js | 8 +- .../main/app/view/Statusbar.js | 2 +- .../main/app/view/TableSettings.js | 22 +-- .../main/app/view/Toolbar.js | 129 +++++++++--------- .../main/resources/img/popupmenu-btns.png | Bin 8185 -> 0 bytes .../main/resources/img/popupmenu-btns@2x.png | Bin 19260 -> 0 bytes .../main/resources/img/toolbar-menu.png | Bin 26330 -> 0 bytes .../main/resources/img/toolbar-menu@2x.png | Bin 69064 -> 0 bytes .../resources/img/toolbar/1x/.css.handlebars | 31 +++++ .../img/toolbar/1x/big/.css.handlebars | 26 ++++ .../img/toolbar/1x/big/btn-addslide.png | Bin 0 -> 144 bytes .../img/toolbar/1x/big/btn-datetime.png | Bin 0 -> 398 bytes .../img/toolbar/1x/big/btn-pagenum.png | Bin 0 -> 248 bytes .../img/toolbar/1x/btn-arrange-shape.png | Bin 0 -> 174 bytes .../img/toolbar/1x/btn-changeslide.png | Bin 0 -> 143 bytes .../img/toolbar/1x/btn-ic-zoomtoslide.png | Bin 0 -> 240 bytes .../img/toolbar/1x/btn-menu-slide.png | Bin 0 -> 145 bytes .../img/toolbar/1x/btn-menu-thumbs.png | Bin 0 -> 137 bytes .../resources/img/toolbar/1x/btn-preview.png | Bin 0 -> 174 bytes .../img/toolbar/1x/btn-shape-alignleft.png | Bin 0 -> 145 bytes .../img/toolbar/1x/btn-slidesize.png | Bin 0 -> 137 bytes .../main/resources/less/app.less | 3 + .../main/resources/less/leftmenu.less | 12 -- .../main/resources/less/rightmenu.less | 43 ------ .../main/resources/less/statusbar.less | 12 -- .../main/resources/less/toolbar.less | 77 ----------- 32 files changed, 174 insertions(+), 248 deletions(-) delete mode 100644 apps/presentationeditor/main/resources/img/popupmenu-btns.png delete mode 100644 apps/presentationeditor/main/resources/img/popupmenu-btns@2x.png delete mode 100644 apps/presentationeditor/main/resources/img/toolbar-menu.png delete mode 100644 apps/presentationeditor/main/resources/img/toolbar-menu@2x.png create mode 100644 apps/presentationeditor/main/resources/img/toolbar/1x/.css.handlebars create mode 100644 apps/presentationeditor/main/resources/img/toolbar/1x/big/.css.handlebars create mode 100644 apps/presentationeditor/main/resources/img/toolbar/1x/big/btn-addslide.png create mode 100644 apps/presentationeditor/main/resources/img/toolbar/1x/big/btn-datetime.png create mode 100644 apps/presentationeditor/main/resources/img/toolbar/1x/big/btn-pagenum.png create mode 100644 apps/presentationeditor/main/resources/img/toolbar/1x/btn-arrange-shape.png create mode 100644 apps/presentationeditor/main/resources/img/toolbar/1x/btn-changeslide.png create mode 100644 apps/presentationeditor/main/resources/img/toolbar/1x/btn-ic-zoomtoslide.png create mode 100644 apps/presentationeditor/main/resources/img/toolbar/1x/btn-menu-slide.png create mode 100644 apps/presentationeditor/main/resources/img/toolbar/1x/btn-menu-thumbs.png create mode 100644 apps/presentationeditor/main/resources/img/toolbar/1x/btn-preview.png create mode 100644 apps/presentationeditor/main/resources/img/toolbar/1x/btn-shape-alignleft.png create mode 100644 apps/presentationeditor/main/resources/img/toolbar/1x/btn-slidesize.png diff --git a/apps/presentationeditor/main/app/controller/Viewport.js b/apps/presentationeditor/main/app/controller/Viewport.js index 50de61e27..4f56044e9 100644 --- a/apps/presentationeditor/main/app/controller/Viewport.js +++ b/apps/presentationeditor/main/app/controller/Viewport.js @@ -272,9 +272,9 @@ define([ 'data-stopPropagation="true"', '<% } %>', '>', '', - '', + '', '', - '', + '', '' ].join('')), stopPropagation: true, diff --git a/apps/presentationeditor/main/app/template/LeftMenu.template b/apps/presentationeditor/main/app/template/LeftMenu.template index 408883566..2e85b7171 100644 --- a/apps/presentationeditor/main/app/template/LeftMenu.template +++ b/apps/presentationeditor/main/app/template/LeftMenu.template @@ -1,14 +1,14 @@
- - + + - - + + - - + +
diff --git a/apps/presentationeditor/main/app/template/RightMenu.template b/apps/presentationeditor/main/app/template/RightMenu.template index f4cfb2d7b..c5b460b6a 100644 --- a/apps/presentationeditor/main/app/template/RightMenu.template +++ b/apps/presentationeditor/main/app/template/RightMenu.template @@ -19,13 +19,13 @@
- - - - - - - - + + + + + + + +
\ No newline at end of file diff --git a/apps/presentationeditor/main/app/template/StatusBar.template b/apps/presentationeditor/main/app/template/StatusBar.template index 411948a61..f4d7afebb 100644 --- a/apps/presentationeditor/main/app/template/StatusBar.template +++ b/apps/presentationeditor/main/app/template/StatusBar.template @@ -36,14 +36,14 @@
- - - + + +
- +
diff --git a/apps/presentationeditor/main/app/view/DocumentHolder.js b/apps/presentationeditor/main/app/view/DocumentHolder.js index 529e5359c..669121698 100644 --- a/apps/presentationeditor/main/app/view/DocumentHolder.js +++ b/apps/presentationeditor/main/app/view/DocumentHolder.js @@ -2703,24 +2703,27 @@ define([ items : [ me.menuParagraphDirectH = new Common.UI.MenuItem({ caption : me.directHText, - iconCls : 'mnu-direct-horiz', + iconCls : 'menu__icon text-orient-hor', checkable : true, + checkmark : false, checked : false, toggleGroup : 'popupparagraphdirect', direction : Asc.c_oAscVertDrawingText.normal }).on('click', _.bind(paragraphDirection, me)), me.menuParagraphDirect90 = new Common.UI.MenuItem({ caption : me.direct90Text, - iconCls : 'mnu-direct-rdown', + iconCls : 'menu__icon text-orient-rdown', checkable : true, + checkmark : false, checked : false, toggleGroup : 'popupparagraphdirect', direction : Asc.c_oAscVertDrawingText.vert }).on('click', _.bind(paragraphDirection, me)), me.menuParagraphDirect270 = new Common.UI.MenuItem({ caption : me.direct270Text, - iconCls : 'mnu-direct-rup', + iconCls : 'menu__icon text-orient-rup', checkable : true, + checkmark : false, checked : false, toggleGroup : 'popupparagraphdirect', direction : Asc.c_oAscVertDrawingText.vert270 diff --git a/apps/presentationeditor/main/app/view/ImageSettings.js b/apps/presentationeditor/main/app/view/ImageSettings.js index 447502f11..479115a28 100644 --- a/apps/presentationeditor/main/app/view/ImageSettings.js +++ b/apps/presentationeditor/main/app/view/ImageSettings.js @@ -178,7 +178,7 @@ define([ this.btnRotate270 = new Common.UI.Button({ cls: 'btn-toolbar', - iconCls: 'rotate-270', + iconCls: 'toolbar__icon btn-rotate-270', value: 0, hint: this.textHint270 }); @@ -188,7 +188,7 @@ define([ this.btnRotate90 = new Common.UI.Button({ cls: 'btn-toolbar', - iconCls: 'rotate-90', + iconCls: 'toolbar__icon btn-rotate-90', value: 1, hint: this.textHint90 }); @@ -198,7 +198,7 @@ define([ this.btnFlipV = new Common.UI.Button({ cls: 'btn-toolbar', - iconCls: 'flip-vert', + iconCls: 'toolbar__icon btn-flip-vert', value: 0, hint: this.textHintFlipV }); @@ -208,7 +208,7 @@ define([ this.btnFlipH = new Common.UI.Button({ cls: 'btn-toolbar', - iconCls: 'flip-hor', + iconCls: 'toolbar__icon btn-flip-hor', value: 1, hint: this.textHintFlipH }); diff --git a/apps/presentationeditor/main/app/view/ShapeSettings.js b/apps/presentationeditor/main/app/view/ShapeSettings.js index 0ab44f978..1ce17c08d 100644 --- a/apps/presentationeditor/main/app/view/ShapeSettings.js +++ b/apps/presentationeditor/main/app/view/ShapeSettings.js @@ -1308,7 +1308,7 @@ define([ this.btnRotate270 = new Common.UI.Button({ cls: 'btn-toolbar', - iconCls: 'rotate-270', + iconCls: 'toolbar__icon btn-rotate-270', value: 0, hint: this.textHint270 }); @@ -1318,7 +1318,7 @@ define([ this.btnRotate90 = new Common.UI.Button({ cls: 'btn-toolbar', - iconCls: 'rotate-90', + iconCls: 'toolbar__icon btn-rotate-90', value: 1, hint: this.textHint90 }); @@ -1328,7 +1328,7 @@ define([ this.btnFlipV = new Common.UI.Button({ cls: 'btn-toolbar', - iconCls: 'flip-vert', + iconCls: 'toolbar__icon btn-flip-vert', value: 0, hint: this.textHintFlipV }); @@ -1338,7 +1338,7 @@ define([ this.btnFlipH = new Common.UI.Button({ cls: 'btn-toolbar', - iconCls: 'flip-hor', + iconCls: 'toolbar__icon btn-flip-hor', value: 1, hint: this.textHintFlipH }); diff --git a/apps/presentationeditor/main/app/view/Statusbar.js b/apps/presentationeditor/main/app/view/Statusbar.js index 07b70a2b6..bc1f27ab4 100644 --- a/apps/presentationeditor/main/app/view/Statusbar.js +++ b/apps/presentationeditor/main/app/view/Statusbar.js @@ -231,7 +231,7 @@ define([ this.btnPreview = new Common.UI.Button({ cls: 'btn-toolbar', - iconCls: 'btn-preview', + iconCls: 'toolbar__icon btn-preview', hint: this.tipPreview, hintAnchor: 'top', split: true, diff --git a/apps/presentationeditor/main/app/view/TableSettings.js b/apps/presentationeditor/main/app/view/TableSettings.js index 4fc127f91..9c0caf84b 100644 --- a/apps/presentationeditor/main/app/view/TableSettings.js +++ b/apps/presentationeditor/main/app/view/TableSettings.js @@ -280,22 +280,22 @@ define([ this.chColBanded.on('change', _.bind(this.onCheckTemplateChange, this, 5)); var _arrBorderPosition = [ - ['l', 'btn-borders-small btn-position-left', 'table-button-border-left', this.tipLeft], - ['c','btn-borders-small btn-position-inner-vert', 'table-button-border-inner-vert', this.tipInnerVert], - ['r','btn-borders-small btn-position-right', 'table-button-border-right', this.tipRight], - ['t','btn-borders-small btn-position-top', 'table-button-border-top', this.tipTop], - ['m','btn-borders-small btn-position-inner-hor', 'table-button-border-inner-hor', this.tipInnerHor], - ['b', 'btn-borders-small btn-position-bottom', 'table-button-border-bottom', this.tipBottom], - ['cm', 'btn-borders-small btn-position-inner', 'table-button-border-inner', this.tipInner], - ['lrtb', 'btn-borders-small btn-position-outer', 'table-button-border-outer', this.tipOuter], - ['lrtbcm', 'btn-borders-small btn-position-all', 'table-button-border-all', this.tipAll], - ['', 'btn-borders-small btn-position-none', 'table-button-border-none', this.tipNone] + ['l', 'toolbar__icon btn-border-left', 'table-button-border-left', this.tipLeft], + ['c', 'toolbar__icon btn-border-insidevert', 'table-button-border-inner-vert', this.tipInnerVert], + ['r', 'toolbar__icon btn-border-right', 'table-button-border-right', this.tipRight], + ['t', 'toolbar__icon btn-border-top', 'table-button-border-top', this.tipTop], + ['m', 'toolbar__icon btn-border-insidehor', 'table-button-border-inner-hor', this.tipInnerHor], + ['b', 'toolbar__icon btn-border-bottom', 'table-button-border-bottom', this.tipBottom], + ['cm', 'toolbar__icon btn-border-inside', 'table-button-border-inner', this.tipInner], + ['lrtb', 'toolbar__icon btn-border-out', 'table-button-border-outer', this.tipOuter], + ['lrtbcm', 'toolbar__icon btn-border-all', 'table-button-border-all', this.tipAll], + ['', 'toolbar__icon btn-border-no', 'table-button-border-none', this.tipNone] ]; this._btnsBorderPosition = []; _.each(_arrBorderPosition, function(item, index, list){ var _btn = new Common.UI.Button({ - cls: 'btn-toolbar', + cls: 'btn-toolbar borders--small', iconCls: item[1], strId :item[0], hint: item[3] diff --git a/apps/presentationeditor/main/app/view/Toolbar.js b/apps/presentationeditor/main/app/view/Toolbar.js index 77bca5712..06f473aa8 100644 --- a/apps/presentationeditor/main/app/view/Toolbar.js +++ b/apps/presentationeditor/main/app/view/Toolbar.js @@ -144,7 +144,7 @@ define([ me.btnChangeSlide = new Common.UI.Button({ id: 'id-toolbar-button-change-slide', cls: 'btn-toolbar', - iconCls: 'btn-changeslide', + iconCls: 'toolbar__icon btn-changeslide', lock: [_set.menuFileOpen, _set.slideDeleted, _set.slideLock, _set.lostConnect, _set.noSlides, _set.disableOnStart], menu: true }); @@ -153,7 +153,7 @@ define([ me.btnPreview = new Common.UI.Button({ id: 'id-toolbar-button-preview', cls: 'btn-toolbar', - iconCls: 'btn-preview', + iconCls: 'toolbar__icon btn-preview', lock: [_set.menuFileOpen, _set.slideDeleted, _set.noSlides, _set.disableOnStart], split: true, menu: new Common.UI.Menu({ @@ -175,7 +175,7 @@ define([ me.btnPrint = new Common.UI.Button({ id: 'id-toolbar-btn-print', cls: 'btn-toolbar', - iconCls: 'btn-print no-mask', + iconCls: 'toolbar__icon btn-print no-mask', lock: [_set.slideDeleted, _set.noSlides, _set.cantPrint, _set.disableOnStart], signals: ['disabled'] }); @@ -184,7 +184,7 @@ define([ me.btnSave = new Common.UI.Button({ id: 'id-toolbar-btn-save', cls: 'btn-toolbar', - iconCls: 'no-mask ' + me.btnSaveCls, + iconCls: 'toolbar__icon no-mask ' + me.btnSaveCls, lock: [_set.lostConnect], signals: ['disabled'] }); @@ -193,7 +193,7 @@ define([ me.btnUndo = new Common.UI.Button({ id: 'id-toolbar-btn-undo', cls: 'btn-toolbar', - iconCls: 'btn-undo', + iconCls: 'toolbar__icon btn-undo', lock: [_set.undoLock, _set.slideDeleted, _set.lostConnect, _set.disableOnStart], signals: ['disabled'] }); @@ -202,7 +202,7 @@ define([ me.btnRedo = new Common.UI.Button({ id: 'id-toolbar-btn-redo', cls: 'btn-toolbar', - iconCls: 'btn-redo', + iconCls: 'toolbar__icon btn-redo', lock: [_set.redoLock, _set.slideDeleted, _set.lostConnect, _set.disableOnStart], signals: ['disabled'] }); @@ -211,7 +211,7 @@ define([ me.btnCopy = new Common.UI.Button({ id: 'id-toolbar-btn-copy', cls: 'btn-toolbar', - iconCls: 'btn-copy', + iconCls: 'toolbar__icon btn-copy', lock: [_set.slideDeleted, _set.lostConnect, _set.noSlides, _set.disableOnStart] }); me.slideOnlyControls.push(me.btnCopy); @@ -219,7 +219,7 @@ define([ me.btnPaste = new Common.UI.Button({ id: 'id-toolbar-btn-paste', cls: 'btn-toolbar', - iconCls: 'btn-paste', + iconCls: 'toolbar__icon btn-paste', lock: [_set.slideDeleted, _set.paragraphLock, _set.lostConnect, _set.noSlides] }); me.paragraphControls.push(me.btnPaste); @@ -264,7 +264,7 @@ define([ me.btnBold = new Common.UI.Button({ id: 'id-toolbar-btn-bold', cls: 'btn-toolbar', - iconCls: 'btn-bold', + iconCls: 'toolbar__icon btn-bold', lock: [_set.slideDeleted, _set.paragraphLock, _set.lostConnect, _set.noSlides, _set.noTextSelected, _set.shapeLock], enableToggle: true }); @@ -273,7 +273,7 @@ define([ me.btnItalic = new Common.UI.Button({ id: 'id-toolbar-btn-italic', cls: 'btn-toolbar', - iconCls: 'btn-italic', + iconCls: 'toolbar__icon btn-italic', lock: [_set.slideDeleted, _set.paragraphLock, _set.lostConnect, _set.noSlides, _set.noTextSelected, _set.shapeLock], enableToggle: true }); @@ -282,7 +282,7 @@ define([ me.btnUnderline = new Common.UI.Button({ id: 'id-toolbar-btn-underline', cls: 'btn-toolbar', - iconCls: 'btn-underline', + iconCls: 'toolbar__icon btn-underline', lock: [_set.slideDeleted, _set.paragraphLock, _set.lostConnect, _set.noSlides, _set.noTextSelected, _set.shapeLock], enableToggle: true }); @@ -291,7 +291,7 @@ define([ me.btnStrikeout = new Common.UI.Button({ id: 'id-toolbar-btn-strikeout', cls: 'btn-toolbar', - iconCls: 'btn-strikeout', + iconCls: 'toolbar__icon btn-strikeout', lock: [_set.slideDeleted, _set.paragraphLock, _set.lostConnect, _set.noSlides, _set.noTextSelected, _set.shapeLock], enableToggle: true }); @@ -300,7 +300,7 @@ define([ me.btnSuperscript = new Common.UI.Button({ id: 'id-toolbar-btn-superscript', cls: 'btn-toolbar', - iconCls: 'btn-superscript', + iconCls: 'toolbar__icon btn-superscript', lock: [_set.slideDeleted, _set.paragraphLock, _set.lostConnect, _set.noSlides, _set.noTextSelected, _set.shapeLock, _set.inEquation], enableToggle: true, toggleGroup: 'superscriptGroup' @@ -310,7 +310,7 @@ define([ me.btnSubscript = new Common.UI.Button({ id: 'id-toolbar-btn-subscript', cls: 'btn-toolbar', - iconCls: 'btn-subscript', + iconCls: 'toolbar__icon btn-subscript', lock: [_set.slideDeleted, _set.paragraphLock, _set.lostConnect, _set.noSlides, _set.noTextSelected, _set.shapeLock, _set.inEquation], enableToggle: true, toggleGroup: 'superscriptGroup' @@ -320,7 +320,7 @@ define([ me.btnFontColor = new Common.UI.Button({ id: 'id-toolbar-btn-fontcolor', cls: 'btn-toolbar', - iconCls: 'btn-fontcolor', + iconCls: 'toolbar__icon btn-fontcolor', lock: [_set.slideDeleted, _set.paragraphLock, _set.lostConnect, _set.noSlides, _set.noTextSelected, _set.shapeLock], split: true, menu: new Common.UI.Menu({ @@ -335,7 +335,7 @@ define([ me.btnClearStyle = new Common.UI.Button({ id: 'id-toolbar-btn-clearstyle', cls: 'btn-toolbar', - iconCls: 'btn-clearstyle', + iconCls: 'toolbar__icon btn-clearstyle', lock: [_set.slideDeleted, _set.paragraphLock, _set.lostConnect, _set.noSlides, _set.noParagraphSelected] }); me.paragraphControls.push(me.btnClearStyle); @@ -343,7 +343,7 @@ define([ me.btnCopyStyle = new Common.UI.Button({ id: 'id-toolbar-btn-copystyle', cls: 'btn-toolbar', - iconCls: 'btn-copystyle', + iconCls: 'toolbar__icon btn-copystyle', lock: [_set.slideDeleted, _set.lostConnect, _set.noSlides, _set.noParagraphSelected, _set.disableOnStart], enableToggle: true }); @@ -352,7 +352,7 @@ define([ me.btnMarkers = new Common.UI.Button({ id: 'id-toolbar-btn-markers', cls: 'btn-toolbar', - iconCls: 'btn-setmarkers', + iconCls: 'toolbar__icon btn-setmarkers', lock: [_set.slideDeleted, _set.paragraphLock, _set.lostConnect, _set.noSlides, _set.noTextSelected], enableToggle: true, toggleGroup: 'markersGroup', @@ -364,7 +364,7 @@ define([ me.btnNumbers = new Common.UI.Button({ id: 'id-toolbar-btn-numbering', cls: 'btn-toolbar', - iconCls: 'btn-numbering', + iconCls: 'toolbar__icon btn-numbering', lock: [_set.slideDeleted, _set.paragraphLock, _set.lostConnect, _set.noSlides, _set.noTextSelected], enableToggle: true, toggleGroup: 'markersGroup', @@ -391,41 +391,45 @@ define([ me.btnHorizontalAlign = new Common.UI.Button({ id: 'id-toolbar-btn-halign', cls: 'btn-toolbar', - iconCls: 'btn-align-left', + iconCls: 'toolbar__icon btn-align-left', icls: 'btn-align-left', lock: [_set.slideDeleted, _set.paragraphLock, _set.lostConnect, _set.noSlides, _set.noTextSelected], menu: new Common.UI.Menu({ items: [ { caption: me.textAlignLeft + Common.Utils.String.platformKey('Ctrl+L'), - iconCls: 'mnu-align-left', + iconCls: 'menu__icon btn-align-left', icls: 'btn-align-left', checkable: true, + checkmark: false, toggleGroup: 'halignGroup', checked: true, value: 1 }, { caption: me.textAlignCenter + Common.Utils.String.platformKey('Ctrl+E'), - iconCls: 'mnu-align-center', + iconCls: 'menu__icon btn-align-center', icls: 'btn-align-center', checkable: true, + checkmark: false, toggleGroup: 'halignGroup', value: 2 }, { caption: me.textAlignRight + Common.Utils.String.platformKey('Ctrl+R'), - iconCls: 'mnu-align-right', + iconCls: 'menu__icon btn-align-right', icls: 'btn-align-right', checkable: true, + checkmark: false, toggleGroup: 'halignGroup', value: 0 }, { caption: me.textAlignJust + Common.Utils.String.platformKey('Ctrl+J'), - iconCls: 'mnu-align-just', + iconCls: 'menu__icon btn-align-just', icls: 'btn-align-just', checkable: true, + checkmark: false, toggleGroup: 'halignGroup', value: 3 } @@ -438,32 +442,35 @@ define([ id: 'id-toolbar-btn-valign', cls: 'btn-toolbar', lock: [_set.slideDeleted, _set.paragraphLock, _set.lostConnect, _set.noSlides, _set.noTextSelected, _set.noObjectSelected], - iconCls: 'btn-align-middle', + iconCls: 'toolbar__icon btn-align-middle', icls: 'btn-align-middle', menu: new Common.UI.Menu({ items: [ { caption: me.textAlignTop, - iconCls: 'mnu-align-top', + iconCls: 'menu__icon btn-align-top', icls: 'btn-align-top', checkable: true, + checkmark: false, toggleGroup: 'valignGroup', value: Asc.c_oAscVAlign.Top }, { caption: me.textAlignMiddle, - iconCls: 'mnu-align-middle', + iconCls: 'menu__icon btn-align-middle', icls: 'btn-align-middle', checkable: true, + checkmark: false, toggleGroup: 'valignGroup', value: Asc.c_oAscVAlign.Center, checked: true }, { caption: me.textAlignBottom, - iconCls: 'mnu-align-bottom', + iconCls: 'menu__icon btn-align-bottom', icls: 'btn-align-bottom', checkable: true, + checkmark: false, toggleGroup: 'valignGroup', value: Asc.c_oAscVAlign.Bottom } @@ -475,7 +482,7 @@ define([ me.btnDecLeftOffset = new Common.UI.Button({ id: 'id-toolbar-btn-decoffset', cls: 'btn-toolbar', - iconCls: 'btn-decoffset', + iconCls: 'toolbar__icon btn-decoffset', lock: [_set.decIndentLock, _set.slideDeleted, _set.paragraphLock, _set.lostConnect, _set.noSlides, _set.noParagraphSelected] }); me.paragraphControls.push(me.btnDecLeftOffset); @@ -483,7 +490,7 @@ define([ me.btnIncLeftOffset = new Common.UI.Button({ id: 'id-toolbar-btn-incoffset', cls: 'btn-toolbar', - iconCls: 'btn-incoffset', + iconCls: 'toolbar__icon btn-incoffset', lock: [_set.incIndentLock, _set.slideDeleted, _set.paragraphLock, _set.lostConnect, _set.noSlides, _set.noParagraphSelected] }); me.paragraphControls.push(me.btnIncLeftOffset); @@ -491,7 +498,7 @@ define([ me.btnLineSpace = new Common.UI.Button({ id: 'id-toolbar-btn-linespace', cls: 'btn-toolbar', - iconCls: 'btn-linespace', + iconCls: 'toolbar__icon btn-linespace', lock: [_set.slideDeleted, _set.paragraphLock, _set.lostConnect, _set.noSlides, _set.noTextSelected], menu: new Common.UI.Menu({ style: 'min-width: 60px;', @@ -510,7 +517,7 @@ define([ me.btnInsertTable = new Common.UI.Button({ id: 'tlbtn-inserttable', cls: 'btn-toolbar x-huge icon-top', - iconCls: 'btn-inserttable', + iconCls: 'toolbar__icon btn-inserttable', caption: me.capInsertTable, lock: [_set.slideDeleted, _set.lostConnect, _set.noSlides, _set.disableOnStart], menu: new Common.UI.Menu({ @@ -525,7 +532,7 @@ define([ me.btnInsertChart = new Common.UI.Button({ id: 'tlbtn-insertchart', cls: 'btn-toolbar x-huge icon-top', - iconCls: 'btn-insertchart', + iconCls: 'toolbar__icon btn-insertchart', caption: me.capInsertChart, lock: [_set.slideDeleted, _set.lostConnect, _set.noSlides, _set.disableOnStart], menu: true @@ -535,7 +542,7 @@ define([ me.btnInsertEquation = new Common.UI.Button({ id: 'tlbtn-insertequation', cls: 'btn-toolbar x-huge icon-top', - iconCls: 'btn-insertequation', + iconCls: 'toolbar__icon btn-insertequation', caption: me.capInsertEquation, lock: [_set.slideDeleted, _set.lostConnect, _set.noSlides, _set.disableOnStart], split: true, @@ -546,7 +553,7 @@ define([ me.btnInsertHyperlink = new Common.UI.Button({ id: 'tlbtn-insertlink', cls: 'btn-toolbar x-huge icon-top', - iconCls: 'btn-inserthyperlink', + iconCls: 'toolbar__icon btn-inserthyperlink', caption: me.capInsertHyperlink, lock: [_set.hyperlinkLock, _set.slideDeleted, _set.paragraphLock, _set.lostConnect, _set.noSlides, _set.noParagraphSelected] }); @@ -555,7 +562,7 @@ define([ me.btnInsertTextArt = new Common.UI.Button({ id: 'tlbtn-inserttextart', cls: 'btn-toolbar x-huge icon-top', - iconCls: 'btn-textart', + iconCls: 'toolbar__icon btn-textart', caption: me.capInsertTextArt, lock: [_set.slideDeleted, _set.lostConnect, _set.noSlides, _set.disableOnStart], menu: new Common.UI.Menu({ @@ -570,7 +577,7 @@ define([ me.btnEditHeader = new Common.UI.Button({ id: 'id-toolbar-btn-editheader', cls: 'btn-toolbar x-huge icon-top', - iconCls: 'btn-editheader', + iconCls: 'toolbar__icon btn-editheader', caption: me.capBtnInsHeader, lock: [_set.slideDeleted, _set.lostConnect, _set.noSlides, _set.disableOnStart] }); @@ -579,7 +586,7 @@ define([ me.btnInsDateTime = new Common.UI.Button({ id: 'id-toolbar-btn-datetime', cls: 'btn-toolbar x-huge icon-top', - iconCls: 'btn-datetime', + iconCls: 'toolbar__icon btn-datetime', caption: me.capBtnDateTime, lock: [_set.slideDeleted, _set.lostConnect, _set.noSlides, _set.paragraphLock, _set.disableOnStart] }); @@ -588,7 +595,7 @@ define([ me.btnInsSlideNum = new Common.UI.Button({ id: 'id-toolbar-btn-slidenum', cls: 'btn-toolbar x-huge icon-top', - iconCls: 'btn-pagenum', + iconCls: 'toolbar__icon btn-pagenum', caption: me.capBtnSlideNum, lock: [_set.slideDeleted, _set.lostConnect, _set.noSlides, _set.paragraphLock, _set.disableOnStart] }); @@ -597,7 +604,7 @@ define([ me.btnColorSchemas = new Common.UI.Button({ id: 'id-toolbar-btn-colorschemas', cls: 'btn-toolbar', - iconCls: 'btn-colorschemas', + iconCls: 'toolbar__icon btn-colorschemas', lock: [_set.themeLock, _set.slideDeleted, _set.lostConnect, _set.noSlides, _set.disableOnStart], menu: new Common.UI.Menu({ items: [], @@ -625,50 +632,50 @@ define([ me.mniDistribHor = new Common.UI.MenuItem({ caption: me.txtDistribHor, - iconCls: 'mnu-distrib-hor', + iconCls: 'menu__icon shape-distribute-hor', value: 6 }); me.mniDistribVert = new Common.UI.MenuItem({ caption: me.txtDistribVert, - iconCls: 'mnu-distrib-vert', + iconCls: 'menu__icon shape-distribute-vert', value: 7 }); me.btnShapeAlign = new Common.UI.Button({ id: 'id-toolbar-btn-shape-align', cls: 'btn-toolbar', - iconCls: 'btn-align-shape', + iconCls: 'toolbar__icon btn-shape-alignleft', lock: [_set.slideDeleted, _set.shapeLock, _set.lostConnect, _set.noSlides, _set.noObjectSelected, _set.disableOnStart], menu: new Common.UI.Menu({ items: [ { caption: me.textShapeAlignLeft, - iconCls: 'mnu-shape-align-left', + iconCls: 'menu__icon shape-align-left', value: Asc.c_oAscAlignShapeType.ALIGN_LEFT }, { caption: me.textShapeAlignCenter, - iconCls: 'mnu-shape-align-center', + iconCls: 'menu__icon shape-align-center', value: Asc.c_oAscAlignShapeType.ALIGN_CENTER }, { caption: me.textShapeAlignRight, - iconCls: 'mnu-shape-align-right', + iconCls: 'menu__icon shape-align-right', value: Asc.c_oAscAlignShapeType.ALIGN_RIGHT }, { caption: me.textShapeAlignTop, - iconCls: 'mnu-shape-align-top', + iconCls: 'menu__icon shape-align-top', value: Asc.c_oAscAlignShapeType.ALIGN_TOP }, { caption: me.textShapeAlignMiddle, - iconCls: 'mnu-shape-align-middle', + iconCls: 'menu__icon shape-align-middle', value: Asc.c_oAscAlignShapeType.ALIGN_MIDDLE }, { caption: me.textShapeAlignBottom, - iconCls: 'mnu-shape-align-bottom', + iconCls: 'menu__icon shape-align-bottom', value: Asc.c_oAscAlignShapeType.ALIGN_BOTTOM }, {caption: '--'}, @@ -686,39 +693,39 @@ define([ me.btnShapeArrange = new Common.UI.Button({ id: 'id-toolbar-btn-shape-arrange', cls: 'btn-toolbar', - iconCls: 'btn-arrange-shape', + iconCls: 'toolbar__icon arrange-front', lock: [_set.slideDeleted, _set.lostConnect, _set.noSlides, _set.noObjectSelected, _set.disableOnStart], menu: new Common.UI.Menu({ items: [ { caption: me.textArrangeFront, - iconCls: 'mnu-arrange-front', + iconCls: 'menu__icon arrange-front', value: 1 }, { caption: me.textArrangeBack, - iconCls: 'mnu-arrange-back', + iconCls: 'menu__icon arrange-back', value: 2 }, { caption: me.textArrangeForward, - iconCls: 'mnu-arrange-forward', + iconCls: 'menu__icon arrange-forward', value: 3 }, { caption: me.textArrangeBackward, - iconCls: 'mnu-arrange-backward', + iconCls: 'menu__icon arrange-backward', value: 4 }, {caption: '--'}, me.mnuGroupShapes = new Common.UI.MenuItem({ caption: me.txtGroup, - iconCls: 'mnu-group', + iconCls: 'menu__icon shape-group', value: 5 }), me.mnuUnGroupShapes = new Common.UI.MenuItem({ caption: me.txtUngroup, - iconCls: 'mnu-ungroup', + iconCls: 'menu__icon shape-ungroup', value: 6 }) ] @@ -729,7 +736,7 @@ define([ me.btnSlideSize = new Common.UI.Button({ id: 'id-toolbar-btn-slide-size', cls: 'btn-toolbar', - iconCls: 'btn-slidesize', + iconCls: 'toolbar__icon btn-slidesize', lock: [_set.docPropsLock, _set.slideDeleted, _set.lostConnect, _set.disableOnStart], menu: new Common.UI.Menu({ items: [ @@ -944,13 +951,13 @@ define([ _injectComponent('#slot-btn-datetime', this.btnInsDateTime); _injectComponent('#slot-btn-slidenum', this.btnInsSlideNum); - this.btnsInsertImage = Common.Utils.injectButtons($host.find('.slot-insertimg'), 'tlbtn-insertimage-', 'btn-insertimage', this.capInsertImage, + this.btnsInsertImage = Common.Utils.injectButtons($host.find('.slot-insertimg'), 'tlbtn-insertimage-', 'toolbar__icon btn-insertimage', this.capInsertImage, [PE.enumLock.slideDeleted, PE.enumLock.lostConnect, PE.enumLock.noSlides, PE.enumLock.disableOnStart], false, true); - this.btnsInsertText = Common.Utils.injectButtons($host.find('.slot-instext'), 'tlbtn-inserttext-', 'btn-text', this.capInsertText, + this.btnsInsertText = Common.Utils.injectButtons($host.find('.slot-instext'), 'tlbtn-inserttext-', 'toolbar__icon btn-text', this.capInsertText, [PE.enumLock.slideDeleted, PE.enumLock.lostConnect, PE.enumLock.noSlides, PE.enumLock.disableOnStart], false, false, true); - this.btnsInsertShape = Common.Utils.injectButtons($host.find('.slot-insertshape'), 'tlbtn-insertshape-', 'btn-insertshape', this.capInsertShape, + this.btnsInsertShape = Common.Utils.injectButtons($host.find('.slot-insertshape'), 'tlbtn-insertshape-', 'toolbar__icon btn-insertshape', this.capInsertShape, [PE.enumLock.slideDeleted, PE.enumLock.lostConnect, PE.enumLock.noSlides, PE.enumLock.disableOnStart], false, true, true); - this.btnsAddSlide = Common.Utils.injectButtons($host.find('.slot-addslide'), 'tlbtn-addslide-', 'btn-addslide', this.capAddSlide, + this.btnsAddSlide = Common.Utils.injectButtons($host.find('.slot-addslide'), 'tlbtn-addslide-', 'toolbar__icon btn-addslide', this.capAddSlide, [PE.enumLock.menuFileOpen, PE.enumLock.lostConnect, PE.enumLock.disableOnStart], true, true); var created = this.btnsInsertImage.concat(this.btnsInsertText, this.btnsInsertShape, this.btnsAddSlide); diff --git a/apps/presentationeditor/main/resources/img/popupmenu-btns.png b/apps/presentationeditor/main/resources/img/popupmenu-btns.png deleted file mode 100644 index 7712e0858e8ced94f984e114ad269b2bdb6d1c15..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8185 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 I`p#kh4+4N?r2qf` diff --git a/apps/presentationeditor/main/resources/img/popupmenu-btns@2x.png b/apps/presentationeditor/main/resources/img/popupmenu-btns@2x.png deleted file mode 100644 index e2c0cbf3657dadb39385ccc7fcbb3ddae98b1e5c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 19260 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 u!PcXsl)Ws#Yr_QU3)?h{_BA diff --git a/apps/presentationeditor/main/resources/img/toolbar-menu@2x.png b/apps/presentationeditor/main/resources/img/toolbar-menu@2x.png deleted file mode 100644 index 96422249e9360658205853a4809e8eabbdf161c4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 69064 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 literal 0 HcmV?d00001 diff --git a/apps/presentationeditor/main/resources/img/toolbar/1x/big/btn-datetime.png b/apps/presentationeditor/main/resources/img/toolbar/1x/big/btn-datetime.png new file mode 100644 index 0000000000000000000000000000000000000000..c53184b79332692beec17ea2f96a0d4cc3a5d171 GIT binary patch literal 398 zcmV;90df9`P)Pi%?P~A3Bo*|2N#Dp6eblMz6uzwl`h|ca?BNM}IKuw&gm(S6!ajegb1H_8{=ctl$k={_%n}sTP_rC-~mMjg@A||ip4M7b!lZfrcCnOlx`s& zSV6}Wgr`y3cP2b4(|J2gqY8HlkB6zC^L9W`uu~{yoa{7ZDentWFxe?GiYKfb?UYHX zBdmya3PL@F(d&cK&ZTFcP?q2CnlH;2#`# zYitFCM`KH13|80@7*N;(XxN;~L2O0)hsiQq`iBXbErFI}VoP8~V!!tywGsnc`iBL9 yt$}Ue*%H{`+5aOA&wV&P<0@W6G1dL^$V>nSJ800vb%VPA0000h{kIzcsZviD$B>F!Pp2@lF&pr>7H?nn z-TsjMDe1J=+kS|OEY=tJ@WlJpj%h2OL&FT^eC_c2rd|~X_Rf^g=>B%k6{r~+5Uh~lX|K=T2 Z*|*+S$}-ZvQw4MYgQu&X%Q~loCIF8jL|Fg; literal 0 HcmV?d00001 diff --git a/apps/presentationeditor/main/resources/img/toolbar/1x/btn-changeslide.png b/apps/presentationeditor/main/resources/img/toolbar/1x/btn-changeslide.png new file mode 100644 index 0000000000000000000000000000000000000000..521a8695c36ada057ec1da35868608bf9ba56867 GIT binary patch literal 143 zcmeAS@N?(olHy`uVBq!ia0vp^8bB<h{kIzcsW49$$B>F!$qU3JSl4}z{g>Rn z?)${6fA{~F7k3Ce{@{~*XS4e=doKRaHaWIM)#B3|U+h~tvC-Ltr*Vdc{^F`?g&2;9 r!expr_A1IpCDY@|)a>;8Ll_w3SN%CZU&i<_&;|xiS3j3^P6eK3nd>?t~I30Xm($P;wY!Klmlf3$YrVc8_V4{!)791dV!n-yQu?Sofs98f*Rh-iqNT%`; zNhjcP*iOrB-Yt;Bc1qFSnlMgAYgpP7Rz5;w!jhTEP%bibRff`Oc@qtaM(=J~76K4) qkM?jGvxh~mh{kIzcsR&OO$B>F!Z>KP_IT-RdS8w0; z-QKBh62HNuLqBG`A|YdyZ@6 u<+(~Vho;h{kIzcsQ^zG$B>F!$r1+-Jhdb}nrjJC9ig&(%(3s4cc1-gr^o#NzI)-FS{b$`gE+yK#{Yq?Z5tZTX(YbziInI& lW|YY6o;>r{(z6p78I(`xznlGZ@fx7n44$rjF6*2UngB~+Fx3D6 literal 0 HcmV?d00001 diff --git a/apps/presentationeditor/main/resources/img/toolbar/1x/btn-preview.png b/apps/presentationeditor/main/resources/img/toolbar/1x/btn-preview.png new file mode 100644 index 0000000000000000000000000000000000000000..f197632c8d64363b27d4e279525247455016203d GIT binary patch literal 174 zcmeAS@N?(olHy`uVBq!ia0vp^8bB<h{kIzcsZviD$B>F!Z!a^l9WdZ&eRxM_ z>B*f{TjW&TD}xs#K3vFkJO03rkj*FVue9NLf82SSz=|#wDV5M##w8p(m~U-4)-WSO zhQrxOyI^Yo+nEerwJmJhjX4TTS4i)gWFGQ}H}<4?NYbfwPo{kRQC}hc=BZwJ-Sqvp am^C_n&VGJ!^#-5=7(8A5T-G@yGywoQkVDG= literal 0 HcmV?d00001 diff --git a/apps/presentationeditor/main/resources/img/toolbar/1x/btn-shape-alignleft.png b/apps/presentationeditor/main/resources/img/toolbar/1x/btn-shape-alignleft.png new file mode 100644 index 0000000000000000000000000000000000000000..fc54e31707b3544acab160f991004a85dc8d1512 GIT binary patch literal 145 zcmeAS@N?(olHy`uVBq!ia0vp^8bB<h{kIzcsR&OO$B>F!ZznRc9dO`bd7pps z?|;t9QzBROu5j%LyUoeLlYBhg(~WyaxP|u3{At2LGE+p=eytVwo84Nd=5GDdRQq+> u&6L10k%>D3S=I;~b1m93S$_AY^K4)DZn0cbXY(6q2ZN`ppUXO@geCxg(ld7e literal 0 HcmV?d00001 diff --git a/apps/presentationeditor/main/resources/img/toolbar/1x/btn-slidesize.png b/apps/presentationeditor/main/resources/img/toolbar/1x/btn-slidesize.png new file mode 100644 index 0000000000000000000000000000000000000000..2bba946e7eccceb0c347ac23941e0683d37fc8c3 GIT binary patch literal 137 zcmeAS@N?(olHy`uVBq!ia0vp^8bB<h{kIzcsQ^zG$B>F!$qURRSoQvY>{K}L z|38b1z^#jldd!B5Ut>Lj89vW>U0cGx``+;{S`+s5KYaXK!tK#_qeC7sadLOq`lLEM m%+5)iJT~)4inFBzD+A---Mib4MePNe&EV Date: Thu, 21 Nov 2019 19:15:47 +0300 Subject: [PATCH 296/419] [SSE] build icons sprite from source images --- .../main/app/controller/Toolbar.js | 2 +- .../main/app/controller/Viewport.js | 4 +- .../main/app/template/LeftMenu.template | 14 +- .../main/app/template/RightMenu.template | 18 +- .../main/app/template/StatusBar.template | 14 +- .../main/app/template/Toolbar.template | 2 +- .../main/app/view/CellSettings.js | 26 +-- .../main/app/view/DataTab.js | 14 +- .../main/app/view/DocumentHolder.js | 37 +-- .../main/app/view/FormulaTab.js | 22 +- .../main/app/view/ImageSettings.js | 8 +- .../main/app/view/PivotTable.js | 2 +- .../main/app/view/ShapeSettings.js | 8 +- .../main/app/view/Spellcheck.js | 2 +- .../main/app/view/Toolbar.js | 215 +++++++++--------- .../main/resources/img/popupmenu-btns.png | Bin 15936 -> 0 bytes .../main/resources/img/popupmenu-btns@2x.png | Bin 44074 -> 0 bytes .../main/resources/img/toolbar-menu.png | Bin 29395 -> 0 bytes .../main/resources/img/toolbar-menu@2x.png | Bin 78914 -> 0 bytes .../resources/img/toolbar/1x/.css.handlebars | 31 +++ .../img/toolbar/1x/big/.css.handlebars | 26 +++ .../img/toolbar/1x/big/btn-add-pivot.png | Bin 0 -> 259 bytes .../img/toolbar/1x/big/btn-autosum.png | Bin 0 -> 230 bytes .../img/toolbar/1x/big/btn-blank-rows.png | Bin 0 -> 122 bytes .../img/toolbar/1x/big/btn-calculation.png | Bin 0 -> 193 bytes .../img/toolbar/1x/big/btn-cell-group.png | Bin 0 -> 154 bytes .../img/toolbar/1x/big/btn-cell-ungroup.png | Bin 0 -> 190 bytes .../img/toolbar/1x/big/btn-datetime.png | Bin 0 -> 398 bytes .../img/toolbar/1x/big/btn-finance.png | Bin 0 -> 206 bytes .../img/toolbar/1x/big/btn-func-math.png | Bin 0 -> 110 bytes .../img/toolbar/1x/big/btn-func-text.png | Bin 0 -> 354 bytes .../img/toolbar/1x/big/btn-grand-totals.png | Bin 0 -> 135 bytes .../img/toolbar/1x/big/btn-ins-formula.png | Bin 0 -> 419 bytes .../img/toolbar/1x/big/btn-logic.png | Bin 0 -> 279 bytes .../img/toolbar/1x/big/btn-lookup.png | Bin 0 -> 389 bytes .../resources/img/toolbar/1x/big/btn-more.png | Bin 0 -> 117 bytes .../img/toolbar/1x/big/btn-pageorient.png | Bin 0 -> 229 bytes .../img/toolbar/1x/big/btn-pagesize.png | Bin 0 -> 192 bytes .../img/toolbar/1x/big/btn-pivot-layout.png | Bin 0 -> 121 bytes .../img/toolbar/1x/big/btn-print-area.png | Bin 0 -> 243 bytes .../img/toolbar/1x/big/btn-recent.png | Bin 0 -> 475 bytes .../img/toolbar/1x/big/btn-scale.png | Bin 0 -> 216 bytes .../img/toolbar/1x/big/btn-select-pivot.png | Bin 0 -> 265 bytes .../img/toolbar/1x/big/btn-subtotals.png | Bin 0 -> 112 bytes .../img/toolbar/1x/big/btn-to-columns.png | Bin 0 -> 223 bytes .../img/toolbar/1x/big/btn-update-pivot.png | Bin 0 -> 396 bytes .../resources/img/toolbar/1x/btn-addcell.png | Bin 0 -> 135 bytes .../img/toolbar/1x/btn-autofilter.png | Bin 0 -> 136 bytes .../img/toolbar/1x/btn-border-style.png | Bin 0 -> 110 bytes .../img/toolbar/1x/btn-clear-filter.png | Bin 0 -> 207 bytes .../img/toolbar/1x/btn-currency-style.png | Bin 0 -> 216 bytes .../img/toolbar/1x/btn-decdecimal.png | Bin 0 -> 193 bytes .../resources/img/toolbar/1x/btn-delcell.png | Bin 0 -> 123 bytes .../resources/img/toolbar/1x/btn-formula.png | Bin 0 -> 188 bytes .../img/toolbar/1x/btn-incdecimal.png | Bin 0 -> 211 bytes .../img/toolbar/1x/btn-menu-cell.png | Bin 0 -> 159 bytes .../img/toolbar/1x/btn-menu-pivot.png | Bin 0 -> 196 bytes .../resources/img/toolbar/1x/btn-merge.png | Bin 0 -> 112 bytes .../img/toolbar/1x/btn-named-range.png | Bin 0 -> 229 bytes .../img/toolbar/1x/btn-percent-style.png | Bin 0 -> 258 bytes .../img/toolbar/1x/btn-sort-down(ru).png | Bin 0 -> 286 bytes .../img/toolbar/1x/btn-sort-down.png | Bin 0 -> 276 bytes .../img/toolbar/1x/btn-sort-up(ru).png | Bin 0 -> 285 bytes .../resources/img/toolbar/1x/btn-sort-up.png | Bin 0 -> 271 bytes .../img/toolbar/1x/btn-spellcheck-next.png | Bin 0 -> 231 bytes .../resources/img/toolbar/1x/btn-wrap.png | Bin 0 -> 124 bytes .../img/toolbar/1x/text-orient-ccw.png | Bin 0 -> 295 bytes .../img/toolbar/1x/text-orient-cw.png | Bin 0 -> 293 bytes .../main/resources/less/app.less | 3 + .../main/resources/less/leftmenu.less | 12 - .../main/resources/less/rightmenu.less | 40 ---- .../main/resources/less/statusbar.less | 7 - .../main/resources/less/toolbar.less | 135 ----------- 73 files changed, 260 insertions(+), 382 deletions(-) delete mode 100644 apps/spreadsheeteditor/main/resources/img/popupmenu-btns.png delete mode 100644 apps/spreadsheeteditor/main/resources/img/popupmenu-btns@2x.png delete mode 100644 apps/spreadsheeteditor/main/resources/img/toolbar-menu.png delete mode 100644 apps/spreadsheeteditor/main/resources/img/toolbar-menu@2x.png create mode 100644 apps/spreadsheeteditor/main/resources/img/toolbar/1x/.css.handlebars create mode 100644 apps/spreadsheeteditor/main/resources/img/toolbar/1x/big/.css.handlebars create mode 100644 apps/spreadsheeteditor/main/resources/img/toolbar/1x/big/btn-add-pivot.png create mode 100644 apps/spreadsheeteditor/main/resources/img/toolbar/1x/big/btn-autosum.png create mode 100644 apps/spreadsheeteditor/main/resources/img/toolbar/1x/big/btn-blank-rows.png create mode 100644 apps/spreadsheeteditor/main/resources/img/toolbar/1x/big/btn-calculation.png create mode 100644 apps/spreadsheeteditor/main/resources/img/toolbar/1x/big/btn-cell-group.png create mode 100644 apps/spreadsheeteditor/main/resources/img/toolbar/1x/big/btn-cell-ungroup.png create mode 100644 apps/spreadsheeteditor/main/resources/img/toolbar/1x/big/btn-datetime.png create mode 100644 apps/spreadsheeteditor/main/resources/img/toolbar/1x/big/btn-finance.png create mode 100644 apps/spreadsheeteditor/main/resources/img/toolbar/1x/big/btn-func-math.png create mode 100644 apps/spreadsheeteditor/main/resources/img/toolbar/1x/big/btn-func-text.png create mode 100644 apps/spreadsheeteditor/main/resources/img/toolbar/1x/big/btn-grand-totals.png create mode 100644 apps/spreadsheeteditor/main/resources/img/toolbar/1x/big/btn-ins-formula.png create mode 100644 apps/spreadsheeteditor/main/resources/img/toolbar/1x/big/btn-logic.png create mode 100644 apps/spreadsheeteditor/main/resources/img/toolbar/1x/big/btn-lookup.png create mode 100644 apps/spreadsheeteditor/main/resources/img/toolbar/1x/big/btn-more.png create mode 100644 apps/spreadsheeteditor/main/resources/img/toolbar/1x/big/btn-pageorient.png create mode 100644 apps/spreadsheeteditor/main/resources/img/toolbar/1x/big/btn-pagesize.png create mode 100644 apps/spreadsheeteditor/main/resources/img/toolbar/1x/big/btn-pivot-layout.png create mode 100644 apps/spreadsheeteditor/main/resources/img/toolbar/1x/big/btn-print-area.png create mode 100644 apps/spreadsheeteditor/main/resources/img/toolbar/1x/big/btn-recent.png create mode 100644 apps/spreadsheeteditor/main/resources/img/toolbar/1x/big/btn-scale.png create mode 100644 apps/spreadsheeteditor/main/resources/img/toolbar/1x/big/btn-select-pivot.png create mode 100644 apps/spreadsheeteditor/main/resources/img/toolbar/1x/big/btn-subtotals.png create mode 100644 apps/spreadsheeteditor/main/resources/img/toolbar/1x/big/btn-to-columns.png create mode 100644 apps/spreadsheeteditor/main/resources/img/toolbar/1x/big/btn-update-pivot.png create mode 100644 apps/spreadsheeteditor/main/resources/img/toolbar/1x/btn-addcell.png create mode 100644 apps/spreadsheeteditor/main/resources/img/toolbar/1x/btn-autofilter.png create mode 100644 apps/spreadsheeteditor/main/resources/img/toolbar/1x/btn-border-style.png create mode 100644 apps/spreadsheeteditor/main/resources/img/toolbar/1x/btn-clear-filter.png create mode 100644 apps/spreadsheeteditor/main/resources/img/toolbar/1x/btn-currency-style.png create mode 100644 apps/spreadsheeteditor/main/resources/img/toolbar/1x/btn-decdecimal.png create mode 100644 apps/spreadsheeteditor/main/resources/img/toolbar/1x/btn-delcell.png create mode 100644 apps/spreadsheeteditor/main/resources/img/toolbar/1x/btn-formula.png create mode 100644 apps/spreadsheeteditor/main/resources/img/toolbar/1x/btn-incdecimal.png create mode 100644 apps/spreadsheeteditor/main/resources/img/toolbar/1x/btn-menu-cell.png create mode 100644 apps/spreadsheeteditor/main/resources/img/toolbar/1x/btn-menu-pivot.png create mode 100644 apps/spreadsheeteditor/main/resources/img/toolbar/1x/btn-merge.png create mode 100644 apps/spreadsheeteditor/main/resources/img/toolbar/1x/btn-named-range.png create mode 100644 apps/spreadsheeteditor/main/resources/img/toolbar/1x/btn-percent-style.png create mode 100644 apps/spreadsheeteditor/main/resources/img/toolbar/1x/btn-sort-down(ru).png create mode 100644 apps/spreadsheeteditor/main/resources/img/toolbar/1x/btn-sort-down.png create mode 100644 apps/spreadsheeteditor/main/resources/img/toolbar/1x/btn-sort-up(ru).png create mode 100644 apps/spreadsheeteditor/main/resources/img/toolbar/1x/btn-sort-up.png create mode 100644 apps/spreadsheeteditor/main/resources/img/toolbar/1x/btn-spellcheck-next.png create mode 100644 apps/spreadsheeteditor/main/resources/img/toolbar/1x/btn-wrap.png create mode 100644 apps/spreadsheeteditor/main/resources/img/toolbar/1x/text-orient-ccw.png create mode 100644 apps/spreadsheeteditor/main/resources/img/toolbar/1x/text-orient-cw.png diff --git a/apps/spreadsheeteditor/main/app/controller/Toolbar.js b/apps/spreadsheeteditor/main/app/controller/Toolbar.js index 7b7725220..1cc699713 100644 --- a/apps/spreadsheeteditor/main/app/controller/Toolbar.js +++ b/apps/spreadsheeteditor/main/app/controller/Toolbar.js @@ -3151,7 +3151,7 @@ define([ this.btnsComment = []; if ( config.canCoAuthoring && config.canComments ) { var _set = SSE.enumLock; - this.btnsComment = Common.Utils.injectButtons(this.toolbar.$el.find('.slot-comment'), 'tlbtn-addcomment-', 'btn-menu-comments', this.toolbar.capBtnComment, [_set.lostConnect, _set.commentLock, _set.editCell]); + this.btnsComment = Common.Utils.injectButtons(this.toolbar.$el.find('.slot-comment'), 'tlbtn-addcomment-', 'toolbar__icon btn-menu-comments', this.toolbar.capBtnComment, [_set.lostConnect, _set.commentLock, _set.editCell]); if ( this.btnsComment.length ) { var _comments = SSE.getController('Common.Controllers.Comments').getView(); diff --git a/apps/spreadsheeteditor/main/app/controller/Viewport.js b/apps/spreadsheeteditor/main/app/controller/Viewport.js index 9002db7a2..151f68b4c 100644 --- a/apps/spreadsheeteditor/main/app/controller/Viewport.js +++ b/apps/spreadsheeteditor/main/app/controller/Viewport.js @@ -242,9 +242,9 @@ define([ 'data-stopPropagation="true"', '<% } %>', '>', '', - '', + '', '', - '', + '', '' ].join('')), stopPropagation: true, diff --git a/apps/spreadsheeteditor/main/app/template/LeftMenu.template b/apps/spreadsheeteditor/main/app/template/LeftMenu.template index a5ff8e732..e01779e68 100644 --- a/apps/spreadsheeteditor/main/app/template/LeftMenu.template +++ b/apps/spreadsheeteditor/main/app/template/LeftMenu.template @@ -1,14 +1,14 @@
- + - - + + - - - - + + + +
diff --git a/apps/spreadsheeteditor/main/app/template/RightMenu.template b/apps/spreadsheeteditor/main/app/template/RightMenu.template index 1264bef4d..0ac2c35f4 100644 --- a/apps/spreadsheeteditor/main/app/template/RightMenu.template +++ b/apps/spreadsheeteditor/main/app/template/RightMenu.template @@ -21,14 +21,14 @@
- - - - - - - - - + + + + + + + + +
\ No newline at end of file diff --git a/apps/spreadsheeteditor/main/app/template/StatusBar.template b/apps/spreadsheeteditor/main/app/template/StatusBar.template index 4c979f33b..0d913dd6d 100644 --- a/apps/spreadsheeteditor/main/app/template/StatusBar.template +++ b/apps/spreadsheeteditor/main/app/template/StatusBar.template @@ -1,23 +1,23 @@
- - - - + + + +
- +
- +
- +
diff --git a/apps/spreadsheeteditor/main/app/template/Toolbar.template b/apps/spreadsheeteditor/main/app/template/Toolbar.template index 9d812e6b3..3f3b82929 100644 --- a/apps/spreadsheeteditor/main/app/template/Toolbar.template +++ b/apps/spreadsheeteditor/main/app/template/Toolbar.template @@ -151,7 +151,7 @@ - +
diff --git a/apps/spreadsheeteditor/main/app/view/CellSettings.js b/apps/spreadsheeteditor/main/app/view/CellSettings.js index 483d0f9ed..576336f30 100644 --- a/apps/spreadsheeteditor/main/app/view/CellSettings.js +++ b/apps/spreadsheeteditor/main/app/view/CellSettings.js @@ -305,23 +305,23 @@ define([ } var _arrBorderPosition = [ - [Asc.c_oAscBorderOptions.Left, 'btn-borders-small btn-position-left', 'cell-button-border-left', this.tipLeft], - [Asc.c_oAscBorderOptions.InnerV,'btn-borders-small btn-position-inner-vert','cell-button-border-inner-vert', this.tipInnerVert], - [Asc.c_oAscBorderOptions.Right, 'btn-borders-small btn-position-right', 'cell-button-border-right', this.tipRight], - [Asc.c_oAscBorderOptions.Top, 'btn-borders-small btn-position-top', 'cell-button-border-top', this.tipTop], - [Asc.c_oAscBorderOptions.InnerH,'btn-borders-small btn-position-inner-hor', 'cell-button-border-inner-hor', this.tipInnerHor], - [Asc.c_oAscBorderOptions.Bottom,'btn-borders-small btn-position-bottom', 'cell-button-border-bottom', this.tipBottom], - [Asc.c_oAscBorderOptions.DiagU, 'btn-borders-small btn-position-diagu', 'cell-button-border-diagu', this.tipDiagU], - [Asc.c_oAscBorderOptions.DiagD, 'btn-borders-small btn-position-diagd', 'cell-button-border-diagd', this.tipDiagD], - ['inner', 'btn-borders-small btn-position-inner', 'cell-button-border-inner', this.tipInner], - ['outer', 'btn-borders-small btn-position-outer', 'cell-button-border-outer', this.tipOuter], - ['all', 'btn-borders-small btn-position-all', 'cell-button-border-all', this.tipAll], - ['none', 'btn-borders-small btn-position-none', 'cell-button-border-none', this.tipNone] + [Asc.c_oAscBorderOptions.Left, 'toolbar__icon btn-border-left', 'cell-button-border-left', this.tipLeft], + [Asc.c_oAscBorderOptions.InnerV,'toolbar__icon btn-border-insidevert', 'cell-button-border-inner-vert',this.tipInnerVert], + [Asc.c_oAscBorderOptions.Right, 'toolbar__icon btn-border-right', 'cell-button-border-right', this.tipRight], + [Asc.c_oAscBorderOptions.Top, 'toolbar__icon btn-border-top', 'cell-button-border-top', this.tipTop], + [Asc.c_oAscBorderOptions.InnerH,'toolbar__icon btn-border-insidehor', 'cell-button-border-inner-hor', this.tipInnerHor], + [Asc.c_oAscBorderOptions.Bottom,'toolbar__icon btn-border-bottom', 'cell-button-border-bottom', this.tipBottom], + [Asc.c_oAscBorderOptions.DiagU, 'toolbar__icon btn-border-diagup', 'cell-button-border-diagu', this.tipDiagU], + [Asc.c_oAscBorderOptions.DiagD, 'toolbar__icon btn-border-diagdown', 'cell-button-border-diagd', this.tipDiagD], + ['inner', 'toolbar__icon btn-border-inside', 'cell-button-border-inner', this.tipInner], + ['outer', 'toolbar__icon btn-border-out', 'cell-button-border-outer', this.tipOuter], + ['all', 'toolbar__icon btn-border-all', 'cell-button-border-all', this.tipAll], + ['none', 'toolbar__icon btn-border-no', 'cell-button-border-none', this.tipNone] ]; _.each(_arrBorderPosition, function(item, index, list){ var _btn = new Common.UI.Button({ - cls: 'btn-toolbar', + cls: 'btn-toolbar borders--small', iconCls: item[1], borderId:item[0], hint: item[3], diff --git a/apps/spreadsheeteditor/main/app/view/DataTab.js b/apps/spreadsheeteditor/main/app/view/DataTab.js index 1c4fce192..bd0adcf03 100644 --- a/apps/spreadsheeteditor/main/app/view/DataTab.js +++ b/apps/spreadsheeteditor/main/app/view/DataTab.js @@ -109,7 +109,7 @@ define([ this.btnGroup = new Common.UI.Button({ cls: 'btn-toolbar x-huge icon-top', - iconCls: 'btn-cell-group', + iconCls: 'toolbar__icon btn-cell-group', caption: this.capBtnGroup, split: true, menu: true, @@ -121,7 +121,7 @@ define([ this.btnUngroup = new Common.UI.Button({ cls: 'btn-toolbar x-huge icon-top', - iconCls: 'btn-cell-ungroup', + iconCls: 'toolbar__icon btn-cell-ungroup', caption: this.capBtnUngroup, split: true, menu: true, @@ -133,7 +133,7 @@ define([ this.btnTextToColumns = new Common.UI.Button({ cls: 'btn-toolbar x-huge icon-top', - iconCls: 'btn-to-columns', + iconCls: 'toolbar__icon btn-to-columns', caption: this.capBtnTextToCol, split: false, disabled: true, @@ -162,17 +162,17 @@ define([ Common.Utils.injectComponent($host.find('#slot-btn-hide-details'), this.btnHide); this.lockedControls.push(this.btnHide); - this.btnsSortDown = Common.Utils.injectButtons($host.find('.slot-sortdesc'), '', 'btn-sort-down', '', + this.btnsSortDown = Common.Utils.injectButtons($host.find('.slot-sortdesc'), '', 'toolbar__icon btn-sort-down', '', [_set.editCell, _set.selChart, _set.selChartText, _set.selShape, _set.selShapeText, _set.selImage, _set.lostConnect, _set.coAuth, _set.ruleFilter, _set.editPivot, _set.cantModifyFilter]); - this.btnsSortUp = Common.Utils.injectButtons($host.find('.slot-sortasc'), '', 'btn-sort-up', '', + this.btnsSortUp = Common.Utils.injectButtons($host.find('.slot-sortasc'), '', 'toolbar__icon btn-sort-up', '', [_set.editCell, _set.selChart, _set.selChartText, _set.selShape, _set.selShapeText, _set.selImage, _set.lostConnect, _set.coAuth, _set.ruleFilter, _set.editPivot, _set.cantModifyFilter]); - this.btnsSetAutofilter = Common.Utils.injectButtons($host.find('.slot-btn-setfilter'), '', 'btn-autofilter', '', + this.btnsSetAutofilter = Common.Utils.injectButtons($host.find('.slot-btn-setfilter'), '', 'toolbar__icon btn-autofilter', '', [_set.editCell, _set.selChart, _set.selChartText, _set.selShape, _set.selShapeText, _set.selImage, _set.lostConnect, _set.coAuth, _set.ruleFilter, _set.editPivot, _set.cantModifyFilter], false, false, true); - this.btnsClearAutofilter = Common.Utils.injectButtons($host.find('.slot-btn-clear-filter'), '', 'btn-clear-filter', '', + this.btnsClearAutofilter = Common.Utils.injectButtons($host.find('.slot-btn-clear-filter'), '', 'toolbar__icon btn-clear-filter', '', [_set.editCell, _set.selChart, _set.selChartText, _set.selShape, _set.selShapeText, _set.selImage, _set.lostConnect, _set.coAuth, _set.ruleDelFilter, _set.editPivot]); Array.prototype.push.apply(this.lockedControls, this.btnsSortDown.concat(this.btnsSortUp, this.btnsSetAutofilter,this.btnsClearAutofilter)); diff --git a/apps/spreadsheeteditor/main/app/view/DocumentHolder.js b/apps/spreadsheeteditor/main/app/view/DocumentHolder.js index 5613d6d40..a589efccf 100644 --- a/apps/spreadsheeteditor/main/app/view/DocumentHolder.js +++ b/apps/spreadsheeteditor/main/app/view/DocumentHolder.js @@ -543,14 +543,14 @@ define([ me.mnuGroupImg = new Common.UI.MenuItem({ caption : this.txtGroup, - iconCls : 'mnu-group', + iconCls : 'menu__icon shape-group', type : 'group', value : 'grouping' }); me.mnuUnGroupImg = new Common.UI.MenuItem({ caption : this.txtUngroup, - iconCls : 'mnu-ungroup', + iconCls : 'menu__icon shape-ungroup', type : 'group', value : 'ungrouping' }); @@ -630,25 +630,25 @@ define([ me.mnuBringToFront = new Common.UI.MenuItem({ caption : this.textArrangeFront, - iconCls : 'mnu-arrange-front', + iconCls : 'menu__icon arrange-front', type : 'arrange', value : Asc.c_oAscDrawingLayerType.BringToFront }); me.mnuSendToBack = new Common.UI.MenuItem({ caption : this.textArrangeBack, - iconCls : 'mnu-arrange-back', + iconCls : 'menu__icon arrange-back', type : 'arrange', value : Asc.c_oAscDrawingLayerType.SendToBack }); me.mnuBringForward = new Common.UI.MenuItem({ caption : this.textArrangeForward, - iconCls : 'mnu-arrange-forward', + iconCls : 'menu__icon arrange-forward', type : 'arrange', value : Asc.c_oAscDrawingLayerType.BringForward }); me.mnuSendBackward = new Common.UI.MenuItem({ caption: this.textArrangeBackward, - iconCls : 'mnu-arrange-backward', + iconCls : 'menu__icon arrange-backward', type : 'arrange', value : Asc.c_oAscDrawingLayerType.SendBackward }); @@ -675,38 +675,38 @@ define([ menuAlign: 'tl-tr', items: [{ caption : me.textShapeAlignLeft, - iconCls : 'mnu-img-align-left', + iconCls : 'menu__icon shape-align-left', value : 0 }, { caption : me.textShapeAlignCenter, - iconCls : 'mnu-img-align-center', + iconCls : 'menu__icon shape-align-center', value : 4 }, { caption : me.textShapeAlignRight, - iconCls : 'mnu-img-align-right', + iconCls : 'menu__icon shape-align-right', value : 1 }, { caption : me.textShapeAlignTop, - iconCls : 'mnu-img-align-top', + iconCls : 'menu__icon shape-align-top', value : 3 }, { caption : me.textShapeAlignMiddle, - iconCls : 'mnu-img-align-middle', + iconCls : 'menu__icon shape-align-middle', value : 5 }, { caption : me.textShapeAlignBottom, - iconCls : 'mnu-img-align-bottom', + iconCls : 'menu__icon shape-align-bottom', value : 2 }, {caption: '--'}, { caption: me.txtDistribHor, - iconCls: 'mnu-distrib-hor', + iconCls: 'menu__icon shape-distribute-hor', value: 6 }, { caption: me.txtDistribVert, - iconCls: 'mnu-distrib-vert', + iconCls: 'menu__icon shape-distribute-vert', value: 7 }] }) @@ -798,24 +798,27 @@ define([ items : [ me.menuParagraphDirectH = new Common.UI.MenuItem({ caption : me.directHText, - iconCls : 'mnu-direct-horiz', + iconCls : 'menu__icon text-orient-hor', checkable : true, + checkmark : false, checked : false, toggleGroup : 'popupparagraphdirect', direction : Asc.c_oAscVertDrawingText.normal }), me.menuParagraphDirect90 = new Common.UI.MenuItem({ caption : me.direct90Text, - iconCls : 'mnu-direct-rdown', + iconCls : 'menu__icon text-orient-rdown', checkable : true, + checkmark : false, checked : false, toggleGroup : 'popupparagraphdirect', direction : Asc.c_oAscVertDrawingText.vert }), me.menuParagraphDirect270 = new Common.UI.MenuItem({ caption : me.direct270Text, - iconCls : 'mnu-direct-rup', + iconCls : 'menu__icon text-orient-rup', checkable : true, + checkmark : false, checked : false, toggleGroup : 'popupparagraphdirect', direction : Asc.c_oAscVertDrawingText.vert270 diff --git a/apps/spreadsheeteditor/main/app/view/FormulaTab.js b/apps/spreadsheeteditor/main/app/view/FormulaTab.js index 158d3c125..97a14d3a1 100644 --- a/apps/spreadsheeteditor/main/app/view/FormulaTab.js +++ b/apps/spreadsheeteditor/main/app/view/FormulaTab.js @@ -82,7 +82,7 @@ define([ this.btnFinancial = new Common.UI.Button({ cls: 'btn-toolbar x-huge icon-top', - iconCls: 'btn-finance', + iconCls: 'toolbar__icon btn-finance', caption: formulaDialog.sCategoryFinancial, hint: formulaDialog.sCategoryFinancial, menu: true, @@ -95,7 +95,7 @@ define([ this.btnLogical = new Common.UI.Button({ cls: 'btn-toolbar x-huge icon-top', - iconCls: 'btn-logic', + iconCls: 'toolbar__icon btn-logic', caption: formulaDialog.sCategoryLogical, hint: formulaDialog.sCategoryLogical, menu: true, @@ -108,7 +108,7 @@ define([ this.btnTextData = new Common.UI.Button({ cls: 'btn-toolbar x-huge icon-top', - iconCls: 'btn-func-text', + iconCls: 'toolbar__icon btn-func-text', caption: formulaDialog.sCategoryTextAndData, hint: formulaDialog.sCategoryTextAndData, menu: true, @@ -121,7 +121,7 @@ define([ this.btnDateTime = new Common.UI.Button({ cls: 'btn-toolbar x-huge icon-top', - iconCls: 'btn-datetime', + iconCls: 'toolbar__icon btn-datetime', caption: formulaDialog.sCategoryDateAndTime, hint: formulaDialog.sCategoryDateAndTime, menu: true, @@ -134,7 +134,7 @@ define([ this.btnReference = new Common.UI.Button({ cls: 'btn-toolbar x-huge icon-top', - iconCls: 'btn-lookup', + iconCls: 'toolbar__icon btn-lookup', caption: formulaDialog.sCategoryLookupAndReference, hint: formulaDialog.sCategoryLookupAndReference, menu: true, @@ -147,7 +147,7 @@ define([ this.btnMath = new Common.UI.Button({ cls: 'btn-toolbar x-huge icon-top', - iconCls: 'btn-func-math', + iconCls: 'toolbar__icon btn-func-math', caption: formulaDialog.sCategoryMathematic, hint: formulaDialog.sCategoryMathematic, menu: true, @@ -160,7 +160,7 @@ define([ this.btnRecent = new Common.UI.Button({ cls: 'btn-toolbar x-huge icon-top', - iconCls: 'btn-recent', + iconCls: 'toolbar__icon btn-recent', caption: this.txtRecent, hint: this.txtRecent, menu: true, @@ -173,7 +173,7 @@ define([ this.btnAutosum = new Common.UI.Button({ cls: 'btn-toolbar x-huge icon-top', - iconCls: 'btn-autosum', + iconCls: 'toolbar__icon btn-autosum', caption: this.txtAutosum, hint: this.txtAutosumTip, split: true, @@ -198,7 +198,7 @@ define([ this.btnFormula = new Common.UI.Button({ cls: 'btn-toolbar x-huge icon-top', - iconCls: 'btn-ins-formula', + iconCls: 'toolbar__icon btn-ins-formula', caption: this.txtFormula, hint: this.txtFormulaTip, disabled: true, @@ -209,7 +209,7 @@ define([ this.btnMore = new Common.UI.Button({ cls: 'btn-toolbar x-huge icon-top', - iconCls: 'btn-more', + iconCls: 'toolbar__icon btn-more', caption: this.txtMore, hint: this.txtMore, menu: true, @@ -222,7 +222,7 @@ define([ this.btnCalculate = new Common.UI.Button({ cls: 'btn-toolbar x-huge icon-top', - iconCls: 'btn-calculation', + iconCls: 'toolbar__icon btn-calculation', caption: this.txtCalculation, split: true, menu: true, diff --git a/apps/spreadsheeteditor/main/app/view/ImageSettings.js b/apps/spreadsheeteditor/main/app/view/ImageSettings.js index 8f251fb6d..d85764d27 100644 --- a/apps/spreadsheeteditor/main/app/view/ImageSettings.js +++ b/apps/spreadsheeteditor/main/app/view/ImageSettings.js @@ -234,7 +234,7 @@ define([ this.btnRotate270 = new Common.UI.Button({ cls: 'btn-toolbar', - iconCls: 'rotate-270', + iconCls: 'toolbar__icon btn-rotate-270', value: 0, hint: this.textHint270 }); @@ -244,7 +244,7 @@ define([ this.btnRotate90 = new Common.UI.Button({ cls: 'btn-toolbar', - iconCls: 'rotate-90', + iconCls: 'toolbar__icon btn-rotate-90', value: 1, hint: this.textHint90 }); @@ -254,7 +254,7 @@ define([ this.btnFlipV = new Common.UI.Button({ cls: 'btn-toolbar', - iconCls: 'flip-vert', + iconCls: 'toolbar__icon btn-flip-vert', value: 0, hint: this.textHintFlipV }); @@ -264,7 +264,7 @@ define([ this.btnFlipH = new Common.UI.Button({ cls: 'btn-toolbar', - iconCls: 'flip-hor', + iconCls: 'toolbar__icon btn-flip-hor', value: 1, hint: this.textHintFlipH }); diff --git a/apps/spreadsheeteditor/main/app/view/PivotTable.js b/apps/spreadsheeteditor/main/app/view/PivotTable.js index 057329caf..436783782 100644 --- a/apps/spreadsheeteditor/main/app/view/PivotTable.js +++ b/apps/spreadsheeteditor/main/app/view/PivotTable.js @@ -253,7 +253,7 @@ define([ this.btnSelectPivot = new Common.UI.Button({ cls: 'btn-toolbar x-huge icon-top', - iconCls: 'btn-select-pivot', + iconCls: 'toolbar__icon btn-select-pivot', caption: this.txtSelect }); this.lockedControls.push(this.btnSelectPivot); diff --git a/apps/spreadsheeteditor/main/app/view/ShapeSettings.js b/apps/spreadsheeteditor/main/app/view/ShapeSettings.js index 2a5281b4a..52800acdd 100644 --- a/apps/spreadsheeteditor/main/app/view/ShapeSettings.js +++ b/apps/spreadsheeteditor/main/app/view/ShapeSettings.js @@ -1332,7 +1332,7 @@ define([ this.btnRotate270 = new Common.UI.Button({ cls: 'btn-toolbar', - iconCls: 'rotate-270', + iconCls: 'toolbar__icon btn-rotate-270', value: 0, hint: this.textHint270 }); @@ -1342,7 +1342,7 @@ define([ this.btnRotate90 = new Common.UI.Button({ cls: 'btn-toolbar', - iconCls: 'rotate-90', + iconCls: 'toolbar__icon btn-rotate-90', value: 1, hint: this.textHint90 }); @@ -1352,7 +1352,7 @@ define([ this.btnFlipV = new Common.UI.Button({ cls: 'btn-toolbar', - iconCls: 'flip-vert', + iconCls: 'toolbar__icon btn-flip-vert', value: 0, hint: this.textHintFlipV }); @@ -1362,7 +1362,7 @@ define([ this.btnFlipH = new Common.UI.Button({ cls: 'btn-toolbar', - iconCls: 'flip-hor', + iconCls: 'toolbar__icon btn-flip-hor', value: 1, hint: this.textHintFlipH }); diff --git a/apps/spreadsheeteditor/main/app/view/Spellcheck.js b/apps/spreadsheeteditor/main/app/view/Spellcheck.js index 1d6a3ad83..d915417ac 100644 --- a/apps/spreadsheeteditor/main/app/view/Spellcheck.js +++ b/apps/spreadsheeteditor/main/app/view/Spellcheck.js @@ -82,7 +82,7 @@ define([ this.buttonNext = new Common.UI.Button({ style: 'margin-left: 5px; width: 22px; height: 22px; border: 1px solid #cfcfcf;', cls: 'btn-toolbar bg-white', - iconCls: 'btn-spellcheck-next', + iconCls: 'toolbar__icon btn-spellcheck-next', hint: this.txtNextTip }); this.buttonNext.render($('#spellcheck-next')); diff --git a/apps/spreadsheeteditor/main/app/view/Toolbar.js b/apps/spreadsheeteditor/main/app/view/Toolbar.js index a4db4d264..5071ed5a2 100644 --- a/apps/spreadsheeteditor/main/app/view/Toolbar.js +++ b/apps/spreadsheeteditor/main/app/view/Toolbar.js @@ -171,20 +171,20 @@ define([ me.btnCopy = new Common.UI.Button({ id : 'id-toolbar-btn-copy', cls : 'btn-toolbar', - iconCls : 'btn-copy' + iconCls : 'toolbar__icon btn-copy' }); me.btnPaste = new Common.UI.Button({ id : 'id-toolbar-btn-paste', cls : 'btn-toolbar', - iconCls : 'btn-paste', + iconCls : 'toolbar__icon btn-paste', lock : [/*_set.editCell,*/ _set.coAuth, _set.lostConnect] }); me.btnUndo = new Common.UI.Button({ id : 'id-toolbar-btn-undo', cls : 'btn-toolbar', - iconCls : 'btn-undo', + iconCls : 'toolbar__icon btn-undo', disabled : true, lock : [_set.lostConnect], signals : ['disabled'] @@ -193,7 +193,7 @@ define([ me.btnRedo = new Common.UI.Button({ id : 'id-toolbar-btn-redo', cls : 'btn-toolbar', - iconCls : 'btn-redo', + iconCls : 'toolbar__icon btn-redo', disabled : true, lock : [_set.lostConnect], signals : ['disabled'] @@ -205,7 +205,7 @@ define([ me.btnInsertFormula = new Common.UI.Button({ id : 'id-toolbar-btn-insertformula', cls : 'btn-toolbar', - iconCls : 'btn-formula', + iconCls : 'toolbar__icon btn-formula', split : true, lock : [_set.editText, _set.selChart, _set.selChartText, _set.selShape, _set.selShapeText, _set.selImage, _set.selRangeEdit, _set.lostConnect, _set.coAuth], menu : new Common.UI.Menu({ @@ -227,14 +227,14 @@ define([ me.btnDecDecimal = new Common.UI.Button({ id : 'id-toolbar-btn-decdecimal', cls : 'btn-toolbar', - iconCls : 'btn-decdecimal', + iconCls : 'toolbar__icon btn-decdecimal', lock : [_set.editCell, _set.selChart, _set.selChartText, _set.selShape, _set.selShapeText, _set.selImage, _set.lostConnect, _set.coAuth] }); me.btnIncDecimal = new Common.UI.Button({ id : 'id-toolbar-btn-incdecimal', cls : 'btn-toolbar', - iconCls : 'btn-incdecimal', + iconCls : 'toolbar__icon btn-incdecimal', lock : [_set.editCell, _set.selChart, _set.selChartText, _set.selShape, _set.selShapeText, _set.selImage, _set.lostConnect, _set.coAuth] }); @@ -274,28 +274,28 @@ define([ me.btnSearch = new Common.UI.Button({ id : 'id-toolbar-btn-search', cls : 'btn-toolbar', - iconCls : 'btn-search', + iconCls : 'toolbar__icon btn-menu-search', lock : [_set.lostConnect] }); me.btnSortDown = new Common.UI.Button({ id : 'id-toolbar-btn-sort-down', cls : 'btn-toolbar', - iconCls : 'btn-sort-down', + iconCls : 'toolbar__icon btn-sort-down', lock : [_set.editCell, _set.selChart, _set.selChartText, _set.selShape, _set.selShapeText, _set.selImage, _set.lostConnect, _set.coAuth, _set.ruleFilter, _set.editPivot] }); me.btnSortUp = new Common.UI.Button({ id : 'id-toolbar-btn-sort-up', cls : 'btn-toolbar', - iconCls : 'btn-sort-up', + iconCls : 'toolbar__icon btn-sort-up', lock : [_set.editCell, _set.selChart, _set.selChartText, _set.selShape, _set.selShapeText, _set.selImage, _set.lostConnect, _set.coAuth, _set.ruleFilter, _set.editPivot] }); me.btnSetAutofilter = new Common.UI.Button({ id : 'id-toolbar-btn-setautofilter', cls : 'btn-toolbar', - iconCls : 'btn-autofilter', + iconCls : 'toolbar__icon btn-autofilter', lock : [_set.editCell, _set.selChart, _set.selChartText, _set.selShape, _set.selShapeText, _set.selImage, _set.lostConnect, _set.coAuth, _set.ruleFilter, _set.editPivot], enableToggle: true }); @@ -303,7 +303,7 @@ define([ me.btnClearAutofilter = new Common.UI.Button({ id : 'id-toolbar-btn-clearfilter', cls : 'btn-toolbar', - iconCls : 'btn-clear-filter', + iconCls : 'toolbar__icon btn-clear-filter', lock : [_set.editCell, _set.selChart, _set.selChartText, _set.selShape, _set.selShapeText, _set.selImage, _set.lostConnect, _set.coAuth, _set.ruleDelFilter, _set.editPivot] }); } else @@ -358,7 +358,7 @@ define([ me.btnPrint = new Common.UI.Button({ id : 'id-toolbar-btn-print', cls : 'btn-toolbar', - iconCls : 'btn-print no-mask', + iconCls : 'toolbar__icon btn-print no-mask', lock : [_set.editCell, _set.cantPrint, _set.disableOnStart], signals: ['disabled'] }); @@ -366,7 +366,7 @@ define([ me.btnSave = new Common.UI.Button({ id : 'id-toolbar-btn-save', cls : 'btn-toolbar', - iconCls : 'no-mask ' + me.btnSaveCls, + iconCls : 'toolbar__icon no-mask ' + me.btnSaveCls, signals : ['disabled'] }); me.btnCollabChanges = me.btnSave; @@ -374,21 +374,21 @@ define([ me.btnIncFontSize = new Common.UI.Button({ id : 'id-toolbar-btn-incfont', cls : 'btn-toolbar', - iconCls : 'btn-incfont', + iconCls : 'toolbar__icon btn-incfont', lock : [_set.selImage, _set.editFormula, _set.selRangeEdit, _set.coAuth, _set.coAuthText, _set.lostConnect] }); me.btnDecFontSize = new Common.UI.Button({ id : 'id-toolbar-btn-decfont', cls : 'btn-toolbar', - iconCls : 'btn-decfont', + iconCls : 'toolbar__icon btn-decfont', lock : [_set.selImage, _set.editFormula, _set.selRangeEdit, _set.coAuth, _set.coAuthText, _set.lostConnect] }); me.btnBold = new Common.UI.Button({ id : 'id-toolbar-btn-bold', cls : 'btn-toolbar', - iconCls : 'btn-bold', + iconCls : 'toolbar__icon btn-bold', lock : [_set.selImage, _set.editFormula, _set.selRangeEdit, _set.coAuth, _set.coAuthText, _set.lostConnect], enableToggle: true }); @@ -396,7 +396,7 @@ define([ me.btnItalic = new Common.UI.Button({ id : 'id-toolbar-btn-italic', cls : 'btn-toolbar', - iconCls : 'btn-italic', + iconCls : 'toolbar__icon btn-italic', lock : [_set.selImage, _set.editFormula, _set.selRangeEdit, _set.coAuth, _set.coAuthText, _set.lostConnect], enableToggle: true }); @@ -404,7 +404,7 @@ define([ me.btnUnderline = new Common.UI.Button({ id : 'id-toolbar-btn-underline', cls : 'btn-toolbar', - iconCls : 'btn-underline', + iconCls : 'toolbar__icon btn-underline', lock : [_set.selImage, _set.editFormula, _set.selRangeEdit, _set.coAuth, _set.coAuthText, _set.lostConnect], enableToggle: true }); @@ -412,7 +412,7 @@ define([ me.btnStrikeout = new Common.UI.Button({ id: 'id-toolbar-btn-strikeout', cls: 'btn-toolbar', - iconCls: 'btn-strikeout', + iconCls: 'toolbar__icon btn-strikeout', lock : [_set.selImage, _set.editFormula, _set.selRangeEdit, _set.coAuth, _set.coAuthText, _set.lostConnect], enableToggle: true }); @@ -420,7 +420,7 @@ define([ me.btnSubscript = new Common.UI.Button({ id : 'id-toolbar-btn-subscript', cls : 'btn-toolbar', - iconCls : 'btn-subscript', + iconCls : 'toolbar__icon btn-subscript', icls : 'btn-subscript', split : true, enableToggle: true, @@ -429,18 +429,20 @@ define([ items: [ { caption : me.textSuperscript, - iconCls : 'mnu-text-superscript', + iconCls : 'menu__icon btn-superscript', icls : 'btn-superscript', checkable : true, + checkmark : false, allowDepress: true, toggleGroup : 'textsubscriptgroup', value : 'super' }, { caption : me.textSubscript, - iconCls : 'mnu-text-subscript', + iconCls : 'menu__icon btn-subscript', icls : 'btn-subscript', checkable : true, + checkmark : false, allowDepress: true, toggleGroup : 'textsubscriptgroup', value : 'sub' @@ -453,7 +455,7 @@ define([ me.btnTextColor = new Common.UI.Button({ id : 'id-toolbar-btn-fontcolor', cls : 'btn-toolbar', - iconCls : 'btn-fontcolor', + iconCls : 'toolbar__icon btn-fontcolor', split : true, lock : [_set.selImage, _set.editFormula, _set.selRangeEdit, _set.coAuth, _set.coAuthText, _set.lostConnect], menu : new Common.UI.Menu({ @@ -468,7 +470,7 @@ define([ me.btnBackColor = new Common.UI.Button({ id : 'id-toolbar-btn-fillparag', cls : 'btn-toolbar', - iconCls : 'btn-fillparag', + iconCls : 'toolbar__icon btn-paracolor', split : true, lock : [_set.selImage, _set.editCell, _set.coAuth, _set.coAuthText, _set.lostConnect], menu : new Common.UI.Menu({ @@ -482,7 +484,7 @@ define([ me.btnBorders = new Common.UI.Button({ id : 'id-toolbar-btn-borders', cls : 'btn-toolbar', - iconCls : 'btn-border-out', + iconCls : 'toolbar__icon btn-border-out', icls : 'btn-border-out', borderId : 'outer', borderswidth: Asc.c_oAscBorderStyles.Thin, @@ -494,7 +496,7 @@ define([ me.btnAlignLeft = new Common.UI.Button({ id : 'id-toolbar-btn-align-left', cls : 'btn-toolbar', - iconCls : 'btn-align-left', + iconCls : 'toolbar__icon btn-align-left', enableToggle: true, lock : [_set.editCell, _set.selChart, _set.selChartText, _set.selImage, _set.lostConnect, _set.coAuth, _set.coAuthText], toggleGroup : 'alignGroup' @@ -503,7 +505,7 @@ define([ me.btnAlignCenter = new Common.UI.Button({ id : 'id-toolbar-btn-align-center', cls : 'btn-toolbar', - iconCls : 'btn-align-center', + iconCls : 'toolbar__icon btn-align-center', enableToggle: true, lock : [_set.editCell, _set.selChart, _set.selChartText, _set.selImage, _set.lostConnect, _set.coAuth, _set.coAuthText], toggleGroup : 'alignGroup' @@ -512,7 +514,7 @@ define([ me.btnAlignRight = new Common.UI.Button({ id : 'id-toolbar-btn-align-right', cls : 'btn-toolbar', - iconCls : 'btn-align-right', + iconCls : 'toolbar__icon btn-align-right', enableToggle: true, lock : [_set.editCell, _set.selChart, _set.selChartText, _set.selImage, _set.lostConnect, _set.coAuth, _set.coAuthText], toggleGroup : 'alignGroup' @@ -521,7 +523,7 @@ define([ me.btnAlignJust = new Common.UI.Button({ id : 'id-toolbar-btn-align-just', cls : 'btn-toolbar', - iconCls : 'btn-align-just', + iconCls : 'toolbar__icon btn-align-just', enableToggle: true, lock : [_set.editCell, _set.selChart, _set.selChartText, _set.selImage, _set.lostConnect, _set.coAuth, _set.coAuthText], toggleGroup: 'alignGroup' @@ -530,7 +532,7 @@ define([ me.btnMerge = new Common.UI.Button({ id : 'id-toolbar-rtn-merge', cls : 'btn-toolbar', - iconCls : 'btn-merge', + iconCls : 'toolbar__icon btn-merge', enableToggle: true, allowDepress: true, split : true, @@ -560,7 +562,7 @@ define([ me.btnAlignTop = new Common.UI.Button({ id : 'id-toolbar-rtn-valign-top', cls : 'btn-toolbar', - iconCls : 'btn-valign-top', + iconCls : 'toolbar__icon btn-align-top', lock : [_set.editCell, _set.selChart, _set.selChartText, _set.selImage, _set.lostConnect, _set.coAuth, _set.coAuthText], enableToggle: true, toggleGroup : 'vAlignGroup' @@ -569,7 +571,7 @@ define([ me.btnAlignMiddle = new Common.UI.Button({ id : 'id-toolbar-rtn-valign-middle', cls : 'btn-toolbar', - iconCls : 'btn-valign-middle', + iconCls : 'toolbar__icon btn-align-middle', enableToggle: true, lock : [_set.editCell, _set.selChart, _set.selChartText, _set.selImage, _set.lostConnect, _set.coAuth, _set.coAuthText], toggleGroup : 'vAlignGroup' @@ -578,7 +580,7 @@ define([ me.btnAlignBottom = new Common.UI.Button({ id : 'id-toolbar-rtn-valign-bottom', cls : 'btn-toolbar', - iconCls : 'btn-valign-bottom', + iconCls : 'toolbar__icon btn-align-bottom', lock : [_set.editCell, _set.selChart, _set.selChartText, _set.selImage, _set.lostConnect, _set.coAuth, _set.coAuthText], enableToggle: true, toggleGroup : 'vAlignGroup' @@ -587,7 +589,7 @@ define([ me.btnWrap = new Common.UI.Button({ id : 'id-toolbar-rtn-wrap', cls : 'btn-toolbar', - iconCls : 'btn-wrap', + iconCls : 'toolbar__icon btn-wrap', lock : [_set.editCell, _set.selChart, _set.selChartText, _set.selShape, _set.selShapeText, _set.selImage, _set.lostConnect, _set.coAuth], enableToggle: true, allowDepress: true @@ -596,42 +598,47 @@ define([ me.btnTextOrient = new Common.UI.Button({ id : 'id-toolbar-rtn-textorient', cls : 'btn-toolbar', - iconCls : 'btn-text-orient', + iconCls : 'toolbar__icon text-orient-ccw', lock : [_set.editCell, _set.selChart, _set.selChartText, _set.selShape, _set.selImage, _set.lostConnect, _set.coAuth, _set.coAuthText], menu : new Common.UI.Menu({ items: [ { caption : me.textHorizontal, - iconCls : 'mnu-direct-horiz', + iconCls : 'menu__icon text-orient-hor', checkable : true, + checkmark : false, toggleGroup : 'textorientgroup', value : 'horiz' }, { caption : me.textCounterCw, - iconCls : 'mnu-direct-ccw', + iconCls : 'menu__icon text-orient-ccw', checkable : true, + checkmark : false, toggleGroup : 'textorientgroup', value : 'countcw' }, { caption : me.textClockwise, - iconCls : 'mnu-direct-cw', + iconCls : 'menu__icon text-orient-cw', checkable : true, + checkmark : false, toggleGroup : 'textorientgroup', value : 'clockwise' }, { caption : me.textRotateUp, - iconCls : 'mnu-direct-rup', + iconCls : 'menu__icon text-orient-rup', checkable : true, + checkmark : false, toggleGroup : 'textorientgroup', value : 'rotateup' }, { caption : me.textRotateDown, - iconCls : 'mnu-direct-rdown', + iconCls : 'menu__icon text-orient-rdown', checkable : true, + checkmark : false, toggleGroup : 'textorientgroup', value : 'rotatedown' } @@ -642,7 +649,7 @@ define([ me.btnInsertImage = new Common.UI.Button({ id : 'tlbtn-insertimage', cls : 'btn-toolbar x-huge icon-top', - iconCls : 'btn-insertimage', + iconCls : 'toolbar__icon btn-insertimage', caption : me.capInsertImage, lock : [_set.editCell, _set.lostConnect, _set.coAuth], menu : new Common.UI.Menu({ @@ -657,7 +664,7 @@ define([ me.btnInsertHyperlink = new Common.UI.Button({ id : 'tlbtn-insertlink', cls : 'btn-toolbar x-huge icon-top', - iconCls : 'btn-inserthyperlink', + iconCls : 'toolbar__icon btn-inserthyperlink', caption : me.capInsertHyperlink, lock : [_set.editCell, _set.selChart, _set.selChartText, _set.selImage, _set.selShape, _set.cantHyperlink, _set.multiselect, _set.lostConnect, _set.coAuth, _set.editPivot] }); @@ -665,7 +672,7 @@ define([ me.btnInsertChart = new Common.UI.Button({ id : 'tlbtn-insertchart', cls : 'btn-toolbar x-huge icon-top', - iconCls : 'btn-insertchart', + iconCls : 'toolbar__icon btn-insertchart', lock : [_set.editCell, _set.lostConnect, _set.coAuth, _set.coAuthText], caption : me.capInsertChart, menu : true @@ -674,7 +681,7 @@ define([ me.btnInsertShape = new Common.UI.Button({ id : 'tlbtn-insertshape', cls : 'btn-toolbar x-huge icon-top', - iconCls : 'btn-insertshape', + iconCls : 'toolbar__icon btn-insertshape', enableToggle: true, caption : me.capInsertShape, lock : [_set.editCell, _set.lostConnect, _set.coAuth], @@ -684,7 +691,7 @@ define([ me.btnInsertText = new Common.UI.Button({ id : 'tlbtn-inserttext', cls : 'btn-toolbar x-huge icon-top', - iconCls : 'btn-text', + iconCls : 'toolbar__icon btn-text', caption : me.capInsertText, lock : [_set.editCell, _set.lostConnect, _set.coAuth], enableToggle: true @@ -693,7 +700,7 @@ define([ me.btnInsertTextArt = new Common.UI.Button({ id : 'tlbtn-inserttextart', cls : 'btn-toolbar x-huge icon-top', - iconCls : 'btn-textart', + iconCls : 'toolbar__icon btn-textart', caption : me.capInsertTextart, lock : [_set.editCell, _set.lostConnect, _set.coAuth], menu : new Common.UI.Menu({ @@ -707,7 +714,7 @@ define([ me.btnInsertEquation = new Common.UI.Button({ id : 'tlbtn-insertequation', cls : 'btn-toolbar x-huge icon-top', - iconCls : 'btn-insertequation', + iconCls : 'toolbar__icon btn-insertequation', caption : me.capInsertEquation, split : true, lock : [_set.editCell, _set.lostConnect, _set.coAuth], @@ -717,7 +724,7 @@ define([ me.btnTableTemplate = new Common.UI.Button({ id : 'id-toolbar-btn-ttempl', cls : 'btn-toolbar', - iconCls : 'btn-ttempl', + iconCls : 'toolbar__icon btn-menu-table', lock : [_set.editCell, _set.selChart, _set.selChartText, _set.selShape, _set.selShapeText, _set.selImage, _set.lostConnect, _set.coAuth, _set.ruleFilter, _set.multiselect, _set.cantModifyFilter], menu : new Common.UI.Menu({ items: [ @@ -729,7 +736,7 @@ define([ me.btnInsertTable = new Common.UI.Button({ id : 'tlbtn-inserttable', cls : 'btn-toolbar x-huge icon-top', - iconCls : 'btn-inserttable', + iconCls : 'toolbar__icon btn-inserttable', caption : me.capInsertTable, lock : [_set.editCell, _set.selChart, _set.selChartText, _set.selShape, _set.selShapeText, _set.selImage, _set.lostConnect, _set.coAuth, _set.ruleFilter, _set.multiselect, _set.cantModifyFilter, _set.ruleMerge, _set.editPivot] }); @@ -796,7 +803,7 @@ define([ me.btnPercentStyle = new Common.UI.Button({ id : 'id-toolbar-btn-percent-style', cls : 'btn-toolbar', - iconCls : 'btn-percent-style', + iconCls : 'toolbar__icon btn-percent-style', lock : [_set.editCell, _set.selChart, _set.selChartText, _set.selShape, _set.selShapeText, _set.selImage, _set.lostConnect, _set.coAuth], styleName : 'Percent' }); @@ -804,7 +811,7 @@ define([ me.btnCurrencyStyle = new Common.UI.Button({ id : 'id-toolbar-btn-accounting-style', cls : 'btn-toolbar', - iconCls : 'btn-currency-style', + iconCls : 'toolbar__icon btn-currency-style', lock : [_set.editCell, _set.selChart, _set.selChartText, _set.selShape, _set.selShapeText, _set.selImage, _set.lostConnect, _set.coAuth], styleName : 'Currency', split : true, @@ -842,21 +849,21 @@ define([ me.btnDecDecimal = new Common.UI.Button({ id : 'id-toolbar-btn-decdecimal', cls : 'btn-toolbar', - iconCls : 'btn-decdecimal', + iconCls : 'toolbar__icon btn-decdecimal', lock : [_set.editCell, _set.selChart, _set.selChartText, _set.selShape, _set.selShapeText, _set.selImage, _set.lostConnect, _set.coAuth] }); me.btnIncDecimal = new Common.UI.Button({ id : 'id-toolbar-btn-incdecimal', cls : 'btn-toolbar', - iconCls : 'btn-incdecimal', + iconCls : 'toolbar__icon btn-incdecimal', lock : [_set.editCell, _set.selChart, _set.selChartText, _set.selShape, _set.selShapeText, _set.selImage, _set.lostConnect, _set.coAuth] }); me.btnInsertFormula = new Common.UI.Button({ id : 'id-toolbar-btn-insertformula', cls : 'btn-toolbar', - iconCls : 'btn-formula', + iconCls : 'toolbar__icon btn-formula', split : true, lock : [_set.editText, _set.selChart, _set.selChartText, _set.selShape, _set.selShapeText, _set.selImage, _set.selRangeEdit, _set.lostConnect, _set.coAuth], menu : new Common.UI.Menu({ @@ -878,7 +885,7 @@ define([ me.btnNamedRange = new Common.UI.Button({ id : 'id-toolbar-btn-insertrange', cls : 'btn-toolbar', - iconCls : 'btn-named-range', + iconCls : 'toolbar__icon btn-named-range', lock : [_set.selChart, _set.selChartText, _set.selShape, _set.selShapeText, _set.selImage, _set.lostConnect, _set.coAuth, _set.selRangeEdit], menu : new Common.UI.Menu({ style : 'min-width: 110px', @@ -904,7 +911,7 @@ define([ me.btnClearStyle = new Common.UI.Button({ id : 'id-toolbar-btn-clear', cls : 'btn-toolbar', - iconCls : 'btn-clearstyle', + iconCls : 'toolbar__icon btn-clearstyle', lock : [_set.lostConnect, _set.coAuth, _set.selRangeEdit], menu : new Common.UI.Menu({ style : 'min-width: 110px', @@ -941,7 +948,7 @@ define([ me.btnCopyStyle = new Common.UI.Button({ id : 'id-toolbar-btn-copystyle', cls : 'btn-toolbar', - iconCls : 'btn-copystyle', + iconCls : 'toolbar__icon btn-copystyle', lock : [_set.editCell, _set.lostConnect, _set.coAuth, _set.selChart], enableToggle: true }); @@ -949,7 +956,7 @@ define([ me.btnAddCell = new Common.UI.Button({ id : 'id-toolbar-btn-addcell', cls : 'btn-toolbar', - iconCls : 'btn-addcell', + iconCls : 'toolbar__icon btn-addcell', lock : [_set.editCell, _set.selChart, _set.selChartText, _set.selShape, _set.selShapeText, _set.selImage, _set.lostConnect, _set.coAuth], menu : new Common.UI.Menu({ items : [ @@ -976,7 +983,7 @@ define([ me.btnDeleteCell = new Common.UI.Button({ id : 'id-toolbar-btn-delcell', cls : 'btn-toolbar', - iconCls : 'btn-delcell', + iconCls : 'toolbar__icon btn-delcell', lock : [_set.editCell, _set.selChart, _set.selChartText, _set.selShape, _set.selShapeText, _set.selImage, _set.lostConnect, _set.coAuth], menu : new Common.UI.Menu({ items : [ @@ -1003,7 +1010,7 @@ define([ me.btnColorSchemas = new Common.UI.Button({ id : 'id-toolbar-btn-colorschemas', cls : 'btn-toolbar', - iconCls : 'btn-colorschemas', + iconCls : 'toolbar__icon toolbar__icon btn-colorschemas', lock : [_set.editCell, _set.lostConnect, _set.coAuth], menu : new Common.UI.Menu({ items: [], @@ -1018,7 +1025,7 @@ define([ me.btnPageOrient = new Common.UI.Button({ id: 'tlbtn-pageorient', cls: 'btn-toolbar x-huge icon-top', - iconCls: 'btn-pageorient', + iconCls: 'toolbar__icon btn-pageorient', caption: me.capBtnPageOrient, lock : [_set.docPropsLock, _set.lostConnect, _set.coAuth], menu: new Common.UI.Menu({ @@ -1026,15 +1033,17 @@ define([ items: [ { caption: me.textPortrait, - iconCls: 'mnu-orient-portrait', + iconCls: 'menu__icon page-portrait', checkable: true, + checkmark: false, toggleGroup: 'menuOrient', value: Asc.c_oAscPageOrientation.PagePortrait }, { caption: me.textLandscape, - iconCls: 'mnu-orient-landscape', + iconCls: 'menu__icon page-landscape', checkable: true, + checkmark: false, toggleGroup: 'menuOrient', value: Asc.c_oAscPageOrientation.PageLandscape } @@ -1053,7 +1062,7 @@ define([ me.btnPageMargins = new Common.UI.Button({ id: 'tlbtn-pagemargins', cls: 'btn-toolbar x-huge icon-top', - iconCls: 'btn-pagemargins', + iconCls: 'toolbar__icon btn-pagemargins', caption: me.capBtnMargins, lock : [_set.docPropsLock, _set.lostConnect, _set.coAuth], menu: new Common.UI.Menu({ @@ -1098,7 +1107,7 @@ define([ me.btnPageSize = new Common.UI.Button({ id: 'tlbtn-pagesize', cls: 'btn-toolbar x-huge icon-top', - iconCls: 'btn-pagesize', + iconCls: 'toolbar__icon btn-pagesize', caption: me.capBtnPageSize, lock : [_set.docPropsLock, _set.lostConnect, _set.coAuth], menu: new Common.UI.Menu({ @@ -1217,7 +1226,7 @@ define([ me.btnPrintArea = new Common.UI.Button({ id: 'tlbtn-printarea', cls: 'btn-toolbar x-huge icon-top', - iconCls: 'btn-print-area', + iconCls: 'toolbar__icon btn-print-area', caption: me.capBtnPrintArea, lock : [_set.selChart, _set.selChartText, _set.selShape, _set.selShapeText, _set.selImage, _set.editCell, _set.selRangeEdit, _set.printAreaLock, _set.lostConnect, _set.coAuth], menu: new Common.UI.Menu({ @@ -1248,9 +1257,9 @@ define([ 'data-stopPropagation="true"', '<% } %>', '>', '', - '', + '', '', - '', + '', '
' ].join('')), stopPropagation: true, @@ -1262,7 +1271,7 @@ define([ me.btnScale = new Common.UI.Button({ id: 'tlbtn-scale', cls: 'btn-toolbar x-huge icon-top', - iconCls: 'btn-scale', + iconCls: 'toolbar__icon btn-scale', caption: me.capBtnScale, lock: [_set.docPropsLock, _set.lostConnect, _set.coAuth], menu: new Common.UI.Menu({ @@ -1305,7 +1314,7 @@ define([ me.btnImgAlign = new Common.UI.Button({ cls: 'btn-toolbar x-huge icon-top', - iconCls: 'btn-img-align', + iconCls: 'toolbar__icon btn-img-align', caption: me.capImgAlign, lock : [_set.selRange, _set.selRangeEdit, _set.cantGroup, _set.lostConnect, _set.coAuth, _set.coAuthText], menu: true @@ -1313,14 +1322,14 @@ define([ me.btnImgGroup = new Common.UI.Button({ cls: 'btn-toolbar x-huge icon-top', - iconCls: 'btn-img-group', + iconCls: 'toolbar__icon btn-img-group', caption: me.capImgGroup, lock : [_set.selRange, _set.selRangeEdit, _set.cantGroupUngroup, _set.lostConnect, _set.coAuth, _set.coAuthText], menu: true }); me.btnImgForward = new Common.UI.Button({ cls: 'btn-toolbar x-huge icon-top', - iconCls: 'btn-img-frwd', + iconCls: 'toolbar__icon btn-img-frwd', caption: me.capImgForward, split: true, lock : [_set.selRange, _set.selRangeEdit, _set.lostConnect, _set.coAuth, _set.coAuthText], @@ -1328,7 +1337,7 @@ define([ }); me.btnImgBackward = new Common.UI.Button({ cls: 'btn-toolbar x-huge icon-top', - iconCls: 'btn-img-bkwd', + iconCls: 'toolbar__icon btn-img-bkwd', caption: me.capImgBackward, lock : [_set.selRange, _set.selRangeEdit, _set.lostConnect, _set.coAuth, _set.coAuthText], split: true, @@ -1556,7 +1565,7 @@ define([ _injectComponent('#slot-img-movefrwd', this.btnImgForward); _injectComponent('#slot-img-movebkwd', this.btnImgBackward); _injectComponent('#slot-btn-scale', this.btnScale); - this.btnsEditHeader = Common.Utils.injectButtons($host.find('.slot-editheader'), 'tlbtn-editheader-', 'btn-editheader', this.capBtnInsHeader, + this.btnsEditHeader = Common.Utils.injectButtons($host.find('.slot-editheader'), 'tlbtn-editheader-', 'toolbar__icon btn-editheader', this.capBtnInsHeader, [SSE.enumLock.editCell, SSE.enumLock.selRangeEdit, SSE.enumLock.headerLock, SSE.enumLock.lostConnect, SSE.enumLock.coAuth]); Array.prototype.push.apply(this.lockControls, this.btnsEditHeader); @@ -1637,74 +1646,74 @@ define([ items: [ { caption : this.textOutBorders, - iconCls : 'mnu-border-out', + iconCls : 'menu__icon btn-border-out', icls : 'btn-border-out', borderId : 'outer' }, { caption : this.textAllBorders, - iconCls : 'mnu-border-all', + iconCls : 'menu__icon btn-border-all', icls : 'btn-border-all', borderId : 'all' }, { caption : this.textTopBorders, - iconCls : 'mnu-border-top', + iconCls : 'menu__icon btn-border-top', icls : 'btn-border-top', borderId : Asc.c_oAscBorderOptions.Top }, { caption : this.textBottomBorders, - iconCls : 'mnu-border-bottom', + iconCls : 'menu__icon btn-border-bottom', icls : 'btn-border-bottom', borderId : Asc.c_oAscBorderOptions.Bottom }, { caption : this.textLeftBorders, - iconCls : 'mnu-border-left', + iconCls : 'menu__icon btn-border-left', icls : 'btn-border-left', borderId : Asc.c_oAscBorderOptions.Left }, { caption : this.textRightBorders, - iconCls : 'mnu-border-right', + iconCls : 'menu__icon btn-border-right', icls : 'btn-border-right', borderId : Asc.c_oAscBorderOptions.Right }, { caption : this.textNoBorders, - iconCls : 'mnu-border-no', + iconCls : 'menu__icon btn-border-no', icls : 'btn-border-no', borderId : 'none' }, {caption: '--'}, { caption : this.textInsideBorders, - iconCls : 'mnu-border-center', + iconCls : 'menu__icon btn-border-inside', icls : 'btn-border-center', borderId : 'inner' }, { caption : this.textCenterBorders, - iconCls : 'mnu-border-vmiddle', + iconCls : 'menu__icon btn-border-insidevert', icls : 'btn-border-vmiddle', borderId : Asc.c_oAscBorderOptions.InnerV }, { caption : this.textMiddleBorders, - iconCls : 'mnu-border-hmiddle', + iconCls : 'menu__icon btn-border-insidehor', icls : 'btn-border-hmiddle', borderId : Asc.c_oAscBorderOptions.InnerH }, { caption : this.textDiagUpBorder, - iconCls : 'mnu-border-diagup', + iconCls : 'menu__icon btn-border-diagup', icls : 'btn-border-diagup', borderId : Asc.c_oAscBorderOptions.DiagU }, { caption : this.textDiagDownBorder, - iconCls : 'mnu-border-diagdown', + iconCls : 'menu__icon btn-border-diagdown', icls : 'btn-border-diagdown', borderId : Asc.c_oAscBorderOptions.DiagD }, @@ -1712,8 +1721,8 @@ define([ { id : 'id-toolbar-mnu-item-border-width', caption : this.textBordersStyle, - iconCls : 'mnu-icon-item mnu-border-width', - template : _.template('<%= caption %>'), + iconCls : 'menu__icon btn-border-style', + // template : _.template('<%= caption %>'), menu : (function(){ var itemTemplate = _.template('
'); @@ -2082,11 +2091,11 @@ define([ me.btnImgForward.setMenu(new Common.UI.Menu({ items: [{ caption : _holder_view.textArrangeFront, - iconCls : 'mnu-arrange-front', + iconCls : 'menu__icon arrange-front', value : Asc.c_oAscDrawingLayerType.BringToFront }, { caption : _holder_view.textArrangeForward, - iconCls : 'mnu-arrange-forward', + iconCls : 'menu__icon arrange-forward', value : Asc.c_oAscDrawingLayerType.BringForward } ]}) @@ -2096,11 +2105,11 @@ define([ me.btnImgBackward.setMenu(new Common.UI.Menu({ items: [{ caption : _holder_view.textArrangeBack, - iconCls : 'mnu-arrange-back', + iconCls : 'menu__icon arrange-back', value : Asc.c_oAscDrawingLayerType.SendToBack }, { caption : _holder_view.textArrangeBackward, - iconCls : 'mnu-arrange-backward', + iconCls : 'menu__icon arrange-backward', value : Asc.c_oAscDrawingLayerType.SendBackward }] })); @@ -2109,38 +2118,38 @@ define([ me.btnImgAlign.setMenu(new Common.UI.Menu({ items: [{ caption : _holder_view.textShapeAlignLeft, - iconCls : 'mnu-img-align-left', + iconCls : 'menu__icon shape-align-left', value : 0 }, { caption : _holder_view.textShapeAlignCenter, - iconCls : 'mnu-img-align-center', + iconCls : 'menu__icon shape-align-center', value : 4 }, { caption : _holder_view.textShapeAlignRight, - iconCls : 'mnu-img-align-right', + iconCls : 'menu__icon shape-align-right', value : 1 }, { caption : _holder_view.textShapeAlignTop, - iconCls : 'mnu-img-align-top', + iconCls : 'menu__icon shape-align-top', value : 3 }, { caption : _holder_view.textShapeAlignMiddle, - iconCls : 'mnu-img-align-middle', + iconCls : 'menu__icon shape-align-middle', value : 5 }, { caption : _holder_view.textShapeAlignBottom, - iconCls : 'mnu-img-align-bottom', + iconCls : 'menu__icon shape-align-bottom', value : 2 }, {caption: '--'}, { caption: _holder_view.txtDistribHor, - iconCls: 'mnu-distrib-hor', + iconCls: 'menu__icon shape-distribute-hor', value: 6 }, { caption: _holder_view.txtDistribVert, - iconCls: 'mnu-distrib-vert', + iconCls: 'menu__icon shape-distribute-vert', value: 7 }] })); @@ -2149,11 +2158,11 @@ define([ me.btnImgGroup.setMenu(new Common.UI.Menu({ items: [{ caption : _holder_view.txtGroup, - iconCls : 'mnu-group', + iconCls : 'menu__icon shape-group', value: 'grouping' }, { caption : _holder_view.txtUngroup, - iconCls : 'mnu-ungroup', + iconCls : 'menu__icon shape-ungroup', value: 'ungrouping' }] })); diff --git a/apps/spreadsheeteditor/main/resources/img/popupmenu-btns.png b/apps/spreadsheeteditor/main/resources/img/popupmenu-btns.png deleted file mode 100644 index 34acaf74c0db121044866dea7bc506731c7853f0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 15936 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 VL1J7D&UX_LDJiJQ=U+AU`+stz7exR7 diff --git a/apps/spreadsheeteditor/main/resources/img/popupmenu-btns@2x.png b/apps/spreadsheeteditor/main/resources/img/popupmenu-btns@2x.png deleted file mode 100644 index 563a3c086c9a3b884776e740bf610763a81ffe97..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 44074 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 diff --git a/apps/spreadsheeteditor/main/resources/img/toolbar-menu.png b/apps/spreadsheeteditor/main/resources/img/toolbar-menu.png deleted file mode 100644 index 4ce4dbf4214e2145bcc9bc8c6cc79c6e499d747d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 29395 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
^8w$bLI+t>RVB}4KkX}_lPrqVlHgH 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 diff --git a/apps/spreadsheeteditor/main/resources/img/toolbar-menu@2x.png b/apps/spreadsheeteditor/main/resources/img/toolbar-menu@2x.png deleted file mode 100644 index b00640538744047dfbae6b2194900d4f8265d3c5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 78914 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 t0q=G$N978H@ zy}jJXcECV@`NE3YsDJ;b8|gk0kS;m*;;`k4j%^j?1x&oHY9|6NUhZD$qt6`u#AV45 z?fE_}4g9iS9o_XT15fu`o83u194*WHzi|I!w&|W;9miz&CV(vUboFyt=akR{022c> AegFUf literal 0 HcmV?d00001 diff --git a/apps/spreadsheeteditor/main/resources/img/toolbar/1x/big/btn-cell-ungroup.png b/apps/spreadsheeteditor/main/resources/img/toolbar/1x/big/btn-cell-ungroup.png new file mode 100644 index 0000000000000000000000000000000000000000..1125c7eb24d022f2183f00c6af07d115841593a0 GIT binary patch literal 190 zcmeAS@N?(olHy`uVBq!ia0vp^7CtV!Eg(rX8fEF0(j8we^CiV(SG?&6ah~AKQksu1injZ(nz?)S`rUlkPi%?P~A3Bo*|2N#Dp6eblMz6uzwl`h|ca?BNM}IKuw&gm(S6!ajegb1H_8{=ctl$k={_%n}sTP_rC-~mMjg@A||ip4M7b!lZfrcCnOlx`s& zSV6}Wgr`y3cP2b4(|J2gqY8HlkB6zC^L9W`uu~{yoa{7ZDentWFxe?GiYKfb?UYHX zBdmya3PL@;M1&07*qo IM6N<$f&d>-UjP6A literal 0 HcmV?d00001 diff --git a/apps/spreadsheeteditor/main/resources/img/toolbar/1x/big/btn-func-math.png b/apps/spreadsheeteditor/main/resources/img/toolbar/1x/big/btn-func-math.png new file mode 100644 index 0000000000000000000000000000000000000000..c0f8d830bf25bf4c8a4a61243bf96688223f2a60 GIT binary patch literal 110 zcmeAS@N?(olHy`uVBq!ia0vp^7Cq|`lK978H@ zB})_@VC}zCKgqN&tHhD*MbrewyK}5o6^aDR3gc`JWMEhzt^c`e;{`X6L7uLDF6*2U FngE?fA2|R3 literal 0 HcmV?d00001 diff --git a/apps/spreadsheeteditor/main/resources/img/toolbar/1x/big/btn-func-text.png b/apps/spreadsheeteditor/main/resources/img/toolbar/1x/big/btn-func-text.png new file mode 100644 index 0000000000000000000000000000000000000000..48ce2ddd356a8302756295e9e88383f17859ae93 GIT binary patch literal 354 zcmV-o0iFJdP)w}OOcg#d%f=Qc_|M|~5 zCUllw)1xE3Zoq7Kr}xN!-V3KDTe2t*cOsLJdpk=_XVHp0V4@?U_HOq^ICy86mxkK| z2OQuv?CTX;%k~H8?m5t3BcX zr*ef^p9Gemk6;8i|M{W015ZTwlRE4=#Q*>R07*qoM6N<$f+lf~ A#Q*>R literal 0 HcmV?d00001 diff --git a/apps/spreadsheeteditor/main/resources/img/toolbar/1x/big/btn-grand-totals.png b/apps/spreadsheeteditor/main/resources/img/toolbar/1x/big/btn-grand-totals.png new file mode 100644 index 0000000000000000000000000000000000000000..dc2507a01e2dedd683773922a3e90a66dae08109 GIT binary patch literal 135 zcmeAS@N?(olHy`uVBq!ia0vp^7CM}X_xu( z<-gJ${GjP~s`WT9Fj4F2tkIaCzKfM{XR=36owu_}&YEhlBsO?Pp_|PH2yF3m657{$ zoPg}rHs+!vx>?Tm3O??vF~0TD$3kN+Bw)tT6NqGwmbjufbx|-koK@1avl_MUjwO!^ z;iE4nEF*hLo@<03%mY7nab17X056Z3$h>m?3IFF6*bCpToPY50=z&#Uu9MQoRVzx3 z`Kr^0M++R+1x78O@qTTSMzUAkq&xdrBb}VR_Tu%vYYLct|sX*~b{ N002ovPDHLkV1o5=%ZC5} literal 0 HcmV?d00001 diff --git a/apps/spreadsheeteditor/main/resources/img/toolbar/1x/big/btn-logic.png b/apps/spreadsheeteditor/main/resources/img/toolbar/1x/big/btn-logic.png new file mode 100644 index 0000000000000000000000000000000000000000..f4b3b43ed8b90811cc3fb42b085cc38d800054cd GIT binary patch literal 279 zcmV+y0qFjTP)btvkTPf)6ha^rLZA$Uf$+B4z4p-jW0g1OrzekX2j7bi zeo{OJ_IlxUjUN2H?fkKhv(ouz+mWr$xaH`BS(aCt@DGDeZj8J<3M=5I5RYt%$Ac#B zGRPwB5{fBg%Te)YjOv7=HlY-ZYt?pmMe%;-piV+=1}0&;==CB^*V*sIy*BAS?=<#% zIoIYV=`$OGXR+0b39un~7Cnm;>=Z4CN$}n~@FAD8a-#!_bfa|&>M8^$K=3R)$VCV` du-L&@^9!{afzq(<_#XfO002ovPDHLkV1l<_e5(Ke literal 0 HcmV?d00001 diff --git a/apps/spreadsheeteditor/main/resources/img/toolbar/1x/big/btn-lookup.png b/apps/spreadsheeteditor/main/resources/img/toolbar/1x/big/btn-lookup.png new file mode 100644 index 0000000000000000000000000000000000000000..51a44500c372cf518bb342b36f47ad71d2f83c84 GIT binary patch literal 389 zcmV;00eb$4P)%^4xEl$f=h4-?*i}@u^T>5i2ciqMo%Nf^YgvW zJBgyH3WAiBPu;sYB1#3Ika;f`!*G=*(_we}O8sFR>QQ6ZgaxiNChj?UMk-3!#N9f@ zu+mhDk0jhXg_Wk14dl{JU+FR*)dgO8=`-WyPTf#rFq$`sCa$9rjOLAK0#hE&mM4>_ z3Cx%|Ca0s6)O+nMk3#RYw}DuW@8ag*{{T}x>`bqhVtG`|96iPEpfZ`jambd3V&)jh z-lR3_S)>{}XVRMaEUG(kqC<8E!S0xyLGY(-y_}0S3o&j^n-W&q48-j<)l`q?$BT@e zT%;|^eyEG$BbCaT{`vYYG?YE{q4>~l$WjC$)f?>bm-@&jCQ|^YDEAz_jr7k(`u9a{ jBh#;G`p6~sy-&G63>xzqap`$h00000NkvXXu0mjf$vn02 literal 0 HcmV?d00001 diff --git a/apps/spreadsheeteditor/main/resources/img/toolbar/1x/big/btn-more.png b/apps/spreadsheeteditor/main/resources/img/toolbar/1x/big/btn-more.png new file mode 100644 index 0000000000000000000000000000000000000000..d70b5d47049848fadd3e2f60ce83edf043cf54b8 GIT binary patch literal 117 zcmeAS@N?(olHy`uVBq!ia0vp^7CJ(-{|_!}F}%e{x^=7$w(|5U;>EKlN|W?%7q}XMT)X>XlyR`Qgl;sJACl>XtfMeJE`x zdBAw7F;qb`g7s39f-1+QhS#sTEGL9}G@faEvs0lM2-O>c9VQ4L&{Q~KZp_Mg--1=@ ziAcqS;0KO=jqH}Jax9vT6PS*Oa7+kJaCqi0?T<|(b0rg}5&I_g2I(VTe|}#Rwm*1H ccDcWNa8)*o_|`5~pt~77UHx3vIVCg!07>yx&Hw-a literal 0 HcmV?d00001 diff --git a/apps/spreadsheeteditor/main/resources/img/toolbar/1x/big/btn-pagesize.png b/apps/spreadsheeteditor/main/resources/img/toolbar/1x/big/btn-pagesize.png new file mode 100644 index 0000000000000000000000000000000000000000..9a0427b59227a66104821c0e7901a833145f7794 GIT binary patch literal 192 zcmeAS@N?(olHy`uVBq!ia0vp^7CeKgnD&dFc<_YeUI=8LC=fPtSl?L_+oNKsL8bTe?3??x!?PQC7Xsr_P&n1E5;03jU s1B~o42Jr{hesRCt#BH(kSNvt}i8mAMYW{mN0iDF)>FVdQ&MBb@07A)1o&W#< literal 0 HcmV?d00001 diff --git a/apps/spreadsheeteditor/main/resources/img/toolbar/1x/big/btn-pivot-layout.png b/apps/spreadsheeteditor/main/resources/img/toolbar/1x/big/btn-pivot-layout.png new file mode 100644 index 0000000000000000000000000000000000000000..cce10270b6c99885907ea0aa9e495101a007f6d3 GIT binary patch literal 121 zcmeAS@N?(olHy`uVBq!ia0vp^7CFVdQ&MBb@0D0mhQUCw| literal 0 HcmV?d00001 diff --git a/apps/spreadsheeteditor/main/resources/img/toolbar/1x/big/btn-print-area.png b/apps/spreadsheeteditor/main/resources/img/toolbar/1x/big/btn-print-area.png new file mode 100644 index 0000000000000000000000000000000000000000..8099e9ea3c60b659f26107689ab5726e2edb47ed GIT binary patch literal 243 zcmV9Crv#^%)(>VyAh;Dii?FlG;~jGn t;q|`J5yt2UU%%RPVi&9O%lpqGX#nr#fC}3!t~CGv002ovPDHLkV1jW(Xkq{W literal 0 HcmV?d00001 diff --git a/apps/spreadsheeteditor/main/resources/img/toolbar/1x/big/btn-recent.png b/apps/spreadsheeteditor/main/resources/img/toolbar/1x/big/btn-recent.png new file mode 100644 index 0000000000000000000000000000000000000000..b9f0c6d960d6062887c9714f4a1146b0f5d57907 GIT binary patch literal 475 zcmV<10VMv3P)nXiogBPmHfT1DBrq)BcrnP_s{N$B-+i#BXw@+r}%jdP1^a(og|m&Ufq zsFhNZt6Mgv_ayG~~D`Aw!p$-kqI7SX}7fJ4E z_H2%gKZzNKAs)=oN$4uq>Fz+LqM10ZOdJJuc;xNfW}Ba@NiNvo@W|iEWGY8s*f;cH zhwnCVp+;Mf^rCAKdx8%JG>L#h5lHA-#I9g@9$a?*ch`!MvMX2^$oN^;8uqyFt)(oR zrpBIW${7k}*)(Lpv`;Xs#aB(*ac3kFYq6IZ+k)Pxtv5|U&j#1=SA1^$uP^ulH=S-I R8z2Ax002ovPDHLkV1m&p)tUeR literal 0 HcmV?d00001 diff --git a/apps/spreadsheeteditor/main/resources/img/toolbar/1x/big/btn-scale.png b/apps/spreadsheeteditor/main/resources/img/toolbar/1x/big/btn-scale.png new file mode 100644 index 0000000000000000000000000000000000000000..3c1916854c36953a99a4a3f02f8ed1f690900126 GIT binary patch literal 216 zcmeAS@N?(olHy`uVBq!ia0vp^7C#8N+Yti+*Z+c5 zEpm$P8oT!bSyOZ#MAj#zi#g3U?^&?tpZ>*1c6+K#CcV$E>PWfW`dHZI&_~W!PAj+* zvkq}O&5v1nE?Fyf`xSNd5~qhLZ|>{5HeK(w(OcqrW++r*_z_N?tpgm+%Ub!I P00000NkvXXu0mjfKfr6{ literal 0 HcmV?d00001 diff --git a/apps/spreadsheeteditor/main/resources/img/toolbar/1x/big/btn-subtotals.png b/apps/spreadsheeteditor/main/resources/img/toolbar/1x/big/btn-subtotals.png new file mode 100644 index 0000000000000000000000000000000000000000..d97463fb17534253fd602f7fef580c28e8e52a7b GIT binary patch literal 112 zcmeAS@N?(olHy`uVBq!ia0vp^7CV*iPo_Lk$LobG^z}d^U3`1C3zt MboFyt=akR{051$CE&u=k literal 0 HcmV?d00001 diff --git a/apps/spreadsheeteditor/main/resources/img/toolbar/1x/big/btn-to-columns.png b/apps/spreadsheeteditor/main/resources/img/toolbar/1x/big/btn-to-columns.png new file mode 100644 index 0000000000000000000000000000000000000000..2d50021cd4a3584bbdd36226d1a135c4bad03a68 GIT binary patch literal 223 zcmV<503iQ~P)EVgb*6_RjD#^s1ONfdT{>torRs%Tvk(&H@4QQ)G`vc=^;h9L?w%W}*K zKc0@UeFX`2kcB&8iERP8aJ`r330ZPbxH)us4_QO#;e+S!`91v2p}=nr?{d;Se-3|q Z5F@aZbP9l0)Z_pF002ovPDHLkV1j=NUA_PS literal 0 HcmV?d00001 diff --git a/apps/spreadsheeteditor/main/resources/img/toolbar/1x/big/btn-update-pivot.png b/apps/spreadsheeteditor/main/resources/img/toolbar/1x/big/btn-update-pivot.png new file mode 100644 index 0000000000000000000000000000000000000000..afc6bc1a7b70af6267f3b798cb1386b7acaac2ec GIT binary patch literal 396 zcmV;70dxL|P)OzqoODWmBQsgH!SW^C4YT)Cu#m#quxrG`hiUBD4EM+ zW<@DX-N3s~D(B&^NKSh9b|C(F_$y=-59V}9% z^!SZ&ol)HYc!oSDB`!mOg=H+Trg=vXx+r_R0`O*A` zZ#+B=&qwodTr(OOxJDGSQN<>7g>R+cfR6sdBY qJHJY{W^2q@s2nItCF9+P|B|1{=IFiy|3`rU0000h{kIzcDL+pa$B>F!Z~Gb94mb!fzc2jx ze|nI>nz&mVR_&O(p}}x>A6tyz6M3hA>dBou0*cOxZ~CCI<~sN3uN4bBS|8L#Uv1mK kd*;@yL;CUarnlRPn_Ri;`oJymKG0+aPgg&ebxsLQ0HAU-1poj5 literal 0 HcmV?d00001 diff --git a/apps/spreadsheeteditor/main/resources/img/toolbar/1x/btn-autofilter.png b/apps/spreadsheeteditor/main/resources/img/toolbar/1x/btn-autofilter.png new file mode 100644 index 0000000000000000000000000000000000000000..e96d0fe25d2d17c394eed138861e3e65a1dab16e GIT binary patch literal 136 zcmeAS@N?(olHy`uVBq!ia0vp^8bB<h{kIzcDSuBF$B>F!Z!c`*JmA3N9LW28 z@4pva>v`K&aK=1*{;zpy>BdDiGF682Ca7LKz_Qb@GiriLwaiup&uyx|5*FPlY~tFH lxy|vA!ZxE;CAZh?{Ocdj{L&&4dk| literal 0 HcmV?d00001 diff --git a/apps/spreadsheeteditor/main/resources/img/toolbar/1x/btn-border-style.png b/apps/spreadsheeteditor/main/resources/img/toolbar/1x/btn-border-style.png new file mode 100644 index 0000000000000000000000000000000000000000..fe567234a7a1e3a1fd6b4e84da43e33be2d0dde1 GIT binary patch literal 110 zcmeAS@N?(olHy`uVBq!ia0vp^8bB<h{kIzcDN|1u$B>F!$r7y15e3 literal 0 HcmV?d00001 diff --git a/apps/spreadsheeteditor/main/resources/img/toolbar/1x/btn-clear-filter.png b/apps/spreadsheeteditor/main/resources/img/toolbar/1x/btn-clear-filter.png new file mode 100644 index 0000000000000000000000000000000000000000..826b9208bdc29d8eac5f754de283f964e244814d GIT binary patch literal 207 zcmeAS@N?(olHy`uVBq!ia0vp^8bB<h{kIzcscD`rjv*Dd-cAfX*kZ`TqO2+9 zWfsLAFYA)E|E=M06~pk4l_)vR^Hsq*TUuA>U=Wd$^1J)NvX** z|4TJ^soS15sLr^!SuRY^IH#M3Gx6SG8_wjbhduYjbjn9I9DDVvkf##pLIzJ)KbLh* G2~7aT=ucn( literal 0 HcmV?d00001 diff --git a/apps/spreadsheeteditor/main/resources/img/toolbar/1x/btn-currency-style.png b/apps/spreadsheeteditor/main/resources/img/toolbar/1x/btn-currency-style.png new file mode 100644 index 0000000000000000000000000000000000000000..a1691fa8790b0e227931168d7a87ccea6e9b22f3 GIT binary patch literal 216 zcmV;}04M*6P)bHeVVrZqd8X(|A!hkr7`01| zSu|is4%in`$7ChOWH_PCwE0eGGHt#WmNzdf;)LhGGv-!{5;rWhx%S6DkD~%=A@h{kIzcsSZyU$B>F!Z!fV5vKsQRT=3{@ z@v=}7U)yYbTw77-o3Zn+!WH@HMtfW}>sETs{hG1ZVnznb;)<$}sLb>{#TBn-R9L-R z-fVN$Ui{XQ$=eFJdw22Ox%+jcYkKaNvg0lnB%VJ1bwPJhW21LiY``!|skF#BB1<*|lp00i_>zopr0AgcKWdHyG literal 0 HcmV?d00001 diff --git a/apps/spreadsheeteditor/main/resources/img/toolbar/1x/btn-delcell.png b/apps/spreadsheeteditor/main/resources/img/toolbar/1x/btn-delcell.png new file mode 100644 index 0000000000000000000000000000000000000000..6b7f02571d5f42237f44d6fa512a3402b84183b2 GIT binary patch literal 123 zcmeAS@N?(olHy`uVBq!ia0vp^8bB<<0VEi1=_;fHDW;MjzhDN2vdL#HfIJgV7srr_ zTgei62UuAy9QoJG!1q+3VVz8HGq=P-%@!qv1f{z(CBpuh{kIzcsb)_X$B>F!Z!aI@J#4_k?9jU? zu&0f2kMG`v?iV>E8*8Tv2H1Yd){A!%NIvn)rtLA)*Ui#a`u8H9ZQbye`;vmVs(Tcl zv^U$b9Xq|4+vN@K)-5uQIFXsVbgS#iZI^DbO1MWbvM=88@TXp0#L0!<<^AlFOZIKL o#+qF^^ZA8p&CL&|{lCJ_lHYNP|Mh=OpmP{JUHx3vIVCg!0B3PXt^fc4 literal 0 HcmV?d00001 diff --git a/apps/spreadsheeteditor/main/resources/img/toolbar/1x/btn-incdecimal.png b/apps/spreadsheeteditor/main/resources/img/toolbar/1x/btn-incdecimal.png new file mode 100644 index 0000000000000000000000000000000000000000..f558f816c8b5f43eb99ce8a8a6ff685a2621d095 GIT binary patch literal 211 zcmV;^04)EBP)z3EmoC+UrQisH1h{kIzcsWeX)$B>F!ZznUd9WdZ=t=_&Q z{N&c+Ddy21&95d#Oa5{?VSavh{kIzcscugf$B>F!Zzpc#Z7|?rv2}7g z!O@yN?&xAeCS@C4{fdc9R(h?oUwp~GeZJb_iZRoq?f^d~fzQDYzfYB%JK>@e z|0(rWj#J0yh_3yzcIxjv>8xC4BBxesRacw|aZ~6KIJEJHoobB3f0xwF6Kz{3Y-@A5 vWt?5Q7~@&-%U5_zg13)78&q Iol`;+08*J97XSbN literal 0 HcmV?d00001 diff --git a/apps/spreadsheeteditor/main/resources/img/toolbar/1x/btn-named-range.png b/apps/spreadsheeteditor/main/resources/img/toolbar/1x/btn-named-range.png new file mode 100644 index 0000000000000000000000000000000000000000..c21506f872c4d7ab1332096dfbda47bf7fcd82ba GIT binary patch literal 229 zcmV^P)veUHfwEE8 zAnktcdwncP;B${^$l%>_coN<%$C?yKw7|DKKxnXTDKLXbKllMAkaq9`R168)TQc@u zzaiPF*QEKg$e8P=3duBWbk?_4Y#W^wGoZNc2Xw7PdQQY8C(?6bE;x~q;w+hlQ(B2B f&X9%q;{JI80?@fLnTC-e00000NkvXXu0mjfHS1r+ literal 0 HcmV?d00001 diff --git a/apps/spreadsheeteditor/main/resources/img/toolbar/1x/btn-percent-style.png b/apps/spreadsheeteditor/main/resources/img/toolbar/1x/btn-percent-style.png new file mode 100644 index 0000000000000000000000000000000000000000..b74da82bcfd44a365e3039f2916296806bafd802 GIT binary patch literal 258 zcmV+d0sa1oP)za9zJ%5xhCVG&pg;}~2p(bnu$=rgm&t1K zI6k+mR^%<1P~mvxpddL(9yF-cwxugM=ujx?zLA_54s(gC5P-v6KyzX>Yu4x@+YCw% zRwxuMvQ4Nk(iGil9K+C>q#ZgcMhvaV55&9OtdGmBiSICmGlo#R=sM2Xh$`{PZydjee@ZKqp=)E!`a|; zy-1381I#2YdUpf-9UF=P?j2j3s(So+en(j;9G;XL-mZ zn+eW5nAl8EfhtRE`}Z8Zpf`^lm4)`ld(a!Zn8U44jy^O6Tl52$x%J6PHP9P6r6%_S kc5>vtDclZrQoA>PU#Xdvs>wu--T(jq07*qoM6N<$f^;!;`Tzg` literal 0 HcmV?d00001 diff --git a/apps/spreadsheeteditor/main/resources/img/toolbar/1x/btn-sort-down.png b/apps/spreadsheeteditor/main/resources/img/toolbar/1x/btn-sort-down.png new file mode 100644 index 0000000000000000000000000000000000000000..1b2caf519f067166b04299e42e12043d2f5ac0e9 GIT binary patch literal 276 zcmV+v0qg#WP)VLM<-NC}8If?G;pI$%104pM?kpp+>grTq8+$kGrchrKP1e2Db)Nl(eo zcm8%{-T%59tsE;ZM=O_RDaYIgnJMG}P>St+04%omE_j+^m8&b=0GX&RA$0* z17Onq^v0GH1l#2UsJwG51R$`@rPvXXI literal 0 HcmV?d00001 diff --git a/apps/spreadsheeteditor/main/resources/img/toolbar/1x/btn-sort-up(ru).png b/apps/spreadsheeteditor/main/resources/img/toolbar/1x/btn-sort-up(ru).png new file mode 100644 index 0000000000000000000000000000000000000000..b1055d61114a1184f2dc3f2d2af6e48ba02e102c GIT binary patch literal 285 zcmV+&0pk9NP)C~z!4lFBRGO1WR$;` zq82da=DmR<1P&jZfI_)POJe5e!4J^S-YK(~;EeWIOz;}zC7rA$7bYl<5|1kb#L%0m`IF6`=M= zCU|fAEaN^}qIZHO7XFjWxQ`~{Kod)Y!?ls%pP!pk9-qA{3=TA!PY*{1&8c^c?PvXL j-Is+U`_)T zmp}UwEXd$)fc+(!U>}ryylFt}xT)Sy(j%zeFd-;FNt{gqCeC&V@(&hSYH5ky3OKRx z2Md;38W9%Y#8%;OA0+tKakJ#%i?@x!0R!jAktzV^CwG>u--cv^`<4ZBl_dAi>kUl^ Vj9c?14=4Zt002ovPDHLkV1nFja7h3F literal 0 HcmV?d00001 diff --git a/apps/spreadsheeteditor/main/resources/img/toolbar/1x/btn-spellcheck-next.png b/apps/spreadsheeteditor/main/resources/img/toolbar/1x/btn-spellcheck-next.png new file mode 100644 index 0000000000000000000000000000000000000000..740ee0088caeb32b8eec75ed30fe3f17416bb5e7 GIT binary patch literal 231 zcmVIpPfNCmn_M=^D2{L={I-Q_D1ZtCpj1F2$io-$mOqb`a($pAkOylD zIG{Non%#RXArLThlmxIA?qVy2z=93~g}_(7X){(I_|6K0#=vJ(^3{R4oIss1zkGFk z`T}*vS9LV2afk8zopr025Ww*`#c7?+>89EJCf2&tspk@>I>o6@bvmbYiqrqgP47jT^yJMv>A%+5`OR*w z`}X^dVs0M$)*OQ4^i58)1-+wEx5Zy@Yo}DWcBIOE`wzZ-s&r3a*KGg*002ovPDHLkV1nidjzjIL&A9~DQl+66|&GYm+ zJDJ1hnH@8u-R$B`)}TQLl;g&V(%;3a6d|OTL+Wx@3XsU8L0>KOTcPp(h{fUXtk@1e zU~6CAI4MDUrDU>k1^t7Rd-UzsGG8{XzD`z|cg&r(W8q@lf@5X3+dfdAq}3&P#2hug z??8_}N#ha^GK%dENGtoQt>yRs5ou+0N1^RHm9 Date: Thu, 21 Nov 2019 19:18:15 +0300 Subject: [PATCH 297/419] [SSE] skip of creating unusable buttons --- .../main/app/view/DataTab.js | 49 ++++++++++--------- 1 file changed, 25 insertions(+), 24 deletions(-) diff --git a/apps/spreadsheeteditor/main/app/view/DataTab.js b/apps/spreadsheeteditor/main/app/view/DataTab.js index bd0adcf03..d40b527ae 100644 --- a/apps/spreadsheeteditor/main/app/view/DataTab.js +++ b/apps/spreadsheeteditor/main/app/view/DataTab.js @@ -66,12 +66,13 @@ define([ me.btnTextToColumns.on('click', function (b, e) { me.fireEvent('data:tocolumns'); }); - me.btnShow.on('click', function (b, e) { - me.fireEvent('data:show'); - }); - me.btnHide.on('click', function (b, e) { - me.fireEvent('data:hide'); - }); + // isn't used for awhile + // me.btnShow.on('click', function (b, e) { + // me.fireEvent('data:show'); + // }); + // me.btnHide.on('click', function (b, e) { + // me.fireEvent('data:hide'); + // }); me.btnsSortDown.forEach(function(button) { button.on('click', function (b, e) { me.fireEvent('data:sort', [Asc.c_oAscSortOptions.Ascending]); @@ -142,25 +143,25 @@ define([ Common.Utils.injectComponent($host.find('#slot-btn-text-column'), this.btnTextToColumns); this.lockedControls.push(this.btnTextToColumns); - this.btnShow = new Common.UI.Button({ - cls : 'btn-toolbar', - iconCls : 'btn-show-details', - style: 'padding-right: 2px;', - caption: this.capBtnTextShow, - lock : [_set.editCell, _set.selChart, _set.selChartText, _set.selShape, _set.selShapeText, _set.selImage, _set.lostConnect, _set.coAuth] - }); - Common.Utils.injectComponent($host.find('#slot-btn-show-details'), this.btnShow); - this.lockedControls.push(this.btnShow); + // this.btnShow = new Common.UI.Button({ + // cls : 'btn-toolbar', + // iconCls : 'btn-show-details', + // style: 'padding-right: 2px;', + // caption: this.capBtnTextShow, + // lock : [_set.editCell, _set.selChart, _set.selChartText, _set.selShape, _set.selShapeText, _set.selImage, _set.lostConnect, _set.coAuth] + // }); + // Common.Utils.injectComponent($host.find('#slot-btn-show-details'), this.btnShow); + // this.lockedControls.push(this.btnShow); - this.btnHide = new Common.UI.Button({ - cls : 'btn-toolbar', - iconCls : 'btn-hide-details', - style: 'padding-right: 2px;', - caption: this.capBtnTextHide, - lock : [_set.editCell, _set.selChart, _set.selChartText, _set.selShape, _set.selShapeText, _set.selImage, _set.lostConnect, _set.coAuth] - }); - Common.Utils.injectComponent($host.find('#slot-btn-hide-details'), this.btnHide); - this.lockedControls.push(this.btnHide); + // this.btnHide = new Common.UI.Button({ + // cls : 'btn-toolbar', + // iconCls : 'btn-hide-details', + // style: 'padding-right: 2px;', + // caption: this.capBtnTextHide, + // lock : [_set.editCell, _set.selChart, _set.selChartText, _set.selShape, _set.selShapeText, _set.selImage, _set.lostConnect, _set.coAuth] + // }); + // Common.Utils.injectComponent($host.find('#slot-btn-hide-details'), this.btnHide); + // this.lockedControls.push(this.btnHide); this.btnsSortDown = Common.Utils.injectButtons($host.find('.slot-sortdesc'), '', 'toolbar__icon btn-sort-down', '', [_set.editCell, _set.selChart, _set.selChartText, _set.selShape, _set.selShapeText, _set.selImage, _set.lostConnect, _set.coAuth, _set.ruleFilter, _set.editPivot, _set.cantModifyFilter]); From 35619396f5cf438824c670e7982dc3eb41a26cda Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Fri, 22 Nov 2019 10:43:56 +0300 Subject: [PATCH 298/419] [DE] Fix locking for content controls --- apps/documenteditor/main/app/controller/Toolbar.js | 5 +++-- apps/documenteditor/main/app/view/Toolbar.js | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/apps/documenteditor/main/app/controller/Toolbar.js b/apps/documenteditor/main/app/controller/Toolbar.js index 19a846b5e..1affbdbd8 100644 --- a/apps/documenteditor/main/app/controller/Toolbar.js +++ b/apps/documenteditor/main/app/controller/Toolbar.js @@ -759,11 +759,12 @@ define([ (lock_type===undefined) && (lock_type = Asc.c_oAscSdtLockType.Unlocked); var content_locked = lock_type==Asc.c_oAscSdtLockType.SdtContentLocked || lock_type==Asc.c_oAscSdtLockType.ContentLocked; - if (!need_disable) { + toolbar.btnContentControls.setDisabled(paragraph_locked || header_locked); + if (!(paragraph_locked || header_locked)) { var control_disable = control_plain || content_locked; for (var i=0; i<7; i++) toolbar.btnContentControls.menu.items[i].setDisabled(control_disable); - toolbar.btnContentControls.menu.items[8].setDisabled(!in_control || content_locked); + toolbar.btnContentControls.menu.items[8].setDisabled(!in_control || lock_type==Asc.c_oAscSdtLockType.SdtContentLocked || lock_type==Asc.c_oAscSdtLockType.SdtLocked); toolbar.btnContentControls.menu.items[10].setDisabled(!in_control); } diff --git a/apps/documenteditor/main/app/view/Toolbar.js b/apps/documenteditor/main/app/view/Toolbar.js index e9339bee6..ee80a4da9 100644 --- a/apps/documenteditor/main/app/view/Toolbar.js +++ b/apps/documenteditor/main/app/view/Toolbar.js @@ -704,7 +704,7 @@ define([ ] }) }); - this.paragraphControls.push(this.btnContentControls); + // this.paragraphControls.push(this.btnContentControls); this.btnColumns = new Common.UI.Button({ id: 'tlbtn-columns', From b4c9a098ec14dd16333678feac3555ada7d98896 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Fri, 22 Nov 2019 17:38:04 +0300 Subject: [PATCH 299/419] Add ComboBoxColor component --- .../main/lib/component/ComboBorderSize.js | 67 +++++++++++++++++++ 1 file changed, 67 insertions(+) diff --git a/apps/common/main/lib/component/ComboBorderSize.js b/apps/common/main/lib/component/ComboBorderSize.js index a22123a92..8f76db4fa 100644 --- a/apps/common/main/lib/component/ComboBorderSize.js +++ b/apps/common/main/lib/component/ComboBorderSize.js @@ -268,4 +268,71 @@ define([ formcontrol.css('background-position', '0 -' + record.get('offsety') + 'px'); } }, Common.UI.ComboBorderType || {})); + + Common.UI.ComboBoxColor = Common.UI.ComboBox.extend(_.extend({ + template: _.template([ + '

', + '
', + '
', + '
', + '', + '', + '
' + ].join('')), + + itemClicked: function (e) { + var el = $(e.currentTarget).parent(); + + this._selectedItem = this.store.findWhere({ + id: el.attr('id') + }); + if (this._selectedItem) { + $('.selected', $(this.el)).removeClass('selected'); + el.addClass('selected'); + this.updateFormControl(this._selectedItem); + + this.trigger('selected', this, _.extend({}, this._selectedItem.toJSON()), e); + e.preventDefault(); + } + }, + + updateFormControl: function(record) { + var formcontrol = $(this.el).find('.form-control > div'); + + if (record.get('value')!=-1) { + formcontrol[0].innerHTML = ''; + formcontrol.css({'background': '#' + record.get('value'), 'margin-top': '0'}); + } else { + formcontrol[0].innerHTML = record.get('displayValue'); + formcontrol.css({'background': '', 'margin-top': '1px'}); + } + }, + + setValue: function(value) { + var obj; + this._selectedItem = this.store.findWhere((obj={}, obj[this.valueField]=value, obj)); + + $('.selected', $(this.el)).removeClass('selected'); + + if (this._selectedItem) { + this.updateFormControl(this._selectedItem); + $('#' + this._selectedItem.get('id'), $(this.el)).addClass('selected'); + } else { + var formcontrol = $(this.el).find('.form-control > div'); + formcontrol[0].innerHTML = ''; + formcontrol.css('background', ''); + } + } + }, Common.UI.ComboBoxColor || {})); + }); \ No newline at end of file From f6ad6e730718a82e041b121ccb3ac93c14fee2da Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Fri, 22 Nov 2019 17:40:08 +0300 Subject: [PATCH 300/419] [SSE] Add sort by color --- .../main/app/view/SortDialog.js | 61 +++++++++++++++++-- 1 file changed, 55 insertions(+), 6 deletions(-) diff --git a/apps/spreadsheeteditor/main/app/view/SortDialog.js b/apps/spreadsheeteditor/main/app/view/SortDialog.js index 368946aaf..66f17f8a3 100644 --- a/apps/spreadsheeteditor/main/app/view/SortDialog.js +++ b/apps/spreadsheeteditor/main/app/view/SortDialog.js @@ -97,9 +97,14 @@ define([ 'text!spreadsheeteditor/main/app/template/SortDialog.template', template: _.template(['
'].join('')), itemTemplate: _.template([ '
', - '
', - '
', - '
', + '
', + '
', + '<% if (sort==Asc.c_oAscSortOptions.ByColorFill || sort==Asc.c_oAscSortOptions.ByColorFont) { %>', + '
', + '
', + '<% } else { %>', + '
', + '<% } %>', '
' ].join('')) }); @@ -257,6 +262,21 @@ define([ 'text!spreadsheeteditor/main/app/template/SortDialog.template', (val!==null) && combo.setValue(val); level.cmbSort = combo; + var sort = item.get('sort'); + if (sort==Asc.c_oAscSortOptions.ByColorFill || sort==Asc.c_oAscSortOptions.ByColorFont) { + combo = new Common.UI.ComboBoxColor({ + el : cmpEl.find('#sort-dialog-btn-color-' + i), + editable : false, + menuCls : 'menu-absolute', + data : level.color_data + }).on('selected', function(combo, record) { + item.set('color', record.value); + }); + val = item.get('color'); + (val!==null) && combo.setValue(val); + level.cmbColor = combo; + } + el = cmpEl.find('#sort-dialog-cmb-order-' + i); combo = new Common.UI.ComboBox({ el : el, @@ -304,10 +324,10 @@ define([ 'text!spreadsheeteditor/main/app/template/SortDialog.template', levelIndex = item.get('levelIndex'); item.set('columnIndex', columnIndex, {silent: true} ); item.set('order', Asc.c_oAscSortOptions.Ascending, {silent: true} ); + item.set('color', -1, {silent: true} ); me.levels[levelIndex].levelProps = (columnIndex!==null) ? me.props.asc_getLevelProps(columnIndex) : undefined; me.addControls(null, null, item); me.updateOrderList(levelIndex); - }); }, @@ -386,6 +406,28 @@ define([ 'text!spreadsheeteditor/main/app/template/SortDialog.template', ]; level.cmbOrder.setData(level.order_data); level.cmbOrder.setValue(order); + + if (iscolor) { + level.color_data = [{ value: -1, displayValue: (level.cmbSort.getValue()==Asc.c_oAscSortOptions.ByColorFill) ? this.textNone : this.textAuto , color: null}]; + if (level.levelProps) { + var levelColors = (level.cmbSort.getValue()==Asc.c_oAscSortOptions.ByColorFill) ? level.levelProps.asc_getColorsFill() : level.levelProps.asc_getColorsFont(); + levelColors.forEach(function(item, index) { + item && level.color_data.push({ + value: Common.Utils.ThemeColor.getHexColor(item.get_r(), item.get_g(), item.get_b()).toLocaleUpperCase(), + displayValue: Common.Utils.ThemeColor.getHexColor(item.get_r(), item.get_g(), item.get_b()).toLocaleUpperCase(), + color: item + }); + }); + } + level.cmbColor.setData(level.color_data); + level.cmbColor.setDisabled(level.color_data.length<1); + (level.color_data.length>0) && level.cmbColor.setValue(level.color_data[0].value); + + var item = this.sortList.store.at(levelIndex); + if (item) { + item.set('color', -1); + } + } }, getSettings: function() { @@ -404,7 +446,12 @@ define([ 'text!spreadsheeteditor/main/app/template/SortDialog.template', level.asc_setIndex(columnIndex); level.asc_setSortBy(levelProp.cmbSort.getValue()); level.asc_setDescending(levelProp.cmbOrder.getValue()); - // level.asc_setColor(level.color); + if (levelProp.cmbSort.getValue() == Asc.c_oAscSortOptions.ByColorFill || levelProp.cmbSort.getValue()==Asc.c_oAscSortOptions.ByColorFont) { + var rec = levelProp.cmbColor.getSelectedRecord(); + if (rec) { + level.asc_setColor(rec.color); + } + } arr.push(level); } }); @@ -466,7 +513,9 @@ define([ 'text!spreadsheeteditor/main/app/template/SortDialog.template', textBelow: 'Below', textLeft: 'Left', textRight: 'Right', - errorEmpty: 'All sort criteria must have a column or row specified.' + errorEmpty: 'All sort criteria must have a column or row specified.', + textAuto: 'Automatic', + textNone: 'None' }, SSE.Views.SortDialog || {})); }); \ No newline at end of file From 79eb7974318a1dc13b5d9ac68ce5ed863d24e8b3 Mon Sep 17 00:00:00 2001 From: Alexander Yuzhin Date: Fri, 22 Nov 2019 17:41:04 +0300 Subject: [PATCH 301/419] [DE] Skeletone loader bugfix --- apps/documenteditor/main/index.html | 6 +++--- apps/documenteditor/main/index.html.deploy | 6 +++--- apps/documenteditor/main/resources/less/app.less | 11 +++-------- apps/documenteditor/main/resources/less/layout.less | 4 ++++ 4 files changed, 13 insertions(+), 14 deletions(-) diff --git a/apps/documenteditor/main/index.html b/apps/documenteditor/main/index.html index 48fe2d650..1c0ef16cf 100644 --- a/apps/documenteditor/main/index.html +++ b/apps/documenteditor/main/index.html @@ -18,7 +18,7 @@ width: 100%; overflow: hidden; border: none; - background: #f1f1f1; + background: #e2e2e2; z-index: 1001; } @@ -101,10 +101,10 @@ .loadmask > .placeholder { background: #fbfbfb; - width: 796px; + width: 816px; margin: 46px auto; height: 100%; - border: 1px solid #dfdfdf; + border: 1px solid #bebebe; padding-top: 50px; } diff --git a/apps/documenteditor/main/index.html.deploy b/apps/documenteditor/main/index.html.deploy index ee8e63733..332fa9c13 100644 --- a/apps/documenteditor/main/index.html.deploy +++ b/apps/documenteditor/main/index.html.deploy @@ -19,7 +19,7 @@ width: 100%; overflow: hidden; border: none; - background: #f1f1f1; + background: #e2e2e2; z-index: 1001; } @@ -102,10 +102,10 @@ .loadmask > .placeholder { background: #fbfbfb; - width: 796px; + width: 816px; margin: 46px auto; height: 100%; - border: 1px solid #dfdfdf; + border: 1px solid #bebebe; padding-top: 50px; } diff --git a/apps/documenteditor/main/resources/less/app.less b/apps/documenteditor/main/resources/less/app.less index ac0285aa6..33b313db0 100644 --- a/apps/documenteditor/main/resources/less/app.less +++ b/apps/documenteditor/main/resources/less/app.less @@ -152,10 +152,10 @@ .doc-placeholder { background: #fbfbfb; - width: 796px; - margin: 40px auto; + width: 816px; + margin: 46px auto; height: 100%; - border: 1px solid #dfdfdf; + border: 1px solid #bebebe; padding-top: 50px; position: absolute; left: 0; @@ -164,11 +164,6 @@ bottom: 0; z-index: 1; - -webkit-animation: flickerAnimation 2s infinite ease-in-out; - -moz-animation: flickerAnimation 2s infinite ease-in-out; - -o-animation: flickerAnimation 2s infinite ease-in-out; - animation: flickerAnimation 2s infinite ease-in-out; - > .line { height: 15px; margin: 30px 80px; diff --git a/apps/documenteditor/main/resources/less/layout.less b/apps/documenteditor/main/resources/less/layout.less index 430037262..2b5240838 100644 --- a/apps/documenteditor/main/resources/less/layout.less +++ b/apps/documenteditor/main/resources/less/layout.less @@ -77,6 +77,10 @@ label { display: none; } +#editor-container { + background: #e2e2e2; +} + #editor_sdk { width: 100%; height: 100%; From 39f6b9123bbe7fd23f69cc80532c5836a512aeda Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Fri, 22 Nov 2019 17:46:48 +0300 Subject: [PATCH 302/419] [SSE] Change lock for sort options --- apps/spreadsheeteditor/main/app/view/SortDialog.js | 3 ++- apps/spreadsheeteditor/main/app/view/SortOptionsDialog.js | 8 ++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/apps/spreadsheeteditor/main/app/view/SortDialog.js b/apps/spreadsheeteditor/main/app/view/SortDialog.js index 66f17f8a3..f3d67c442 100644 --- a/apps/spreadsheeteditor/main/app/view/SortDialog.js +++ b/apps/spreadsheeteditor/main/app/view/SortDialog.js @@ -162,7 +162,8 @@ define([ 'text!spreadsheeteditor/main/app/template/SortDialog.template', headers: props.asc_getHasHeaders(), // sensitive: props.asc_getCaseSensitive(), sortcol: props.asc_getColumnSort(), - infilter: !!props.asc_getFilterInside() + lockHeaders: !!props.asc_getLockChangeHeaders(), + lockOrientation: !!props.asc_getLockChangeOrientation() }; this.lblColumn.text(props.asc_getColumnSort() ? this.textColumn : this.textRow); diff --git a/apps/spreadsheeteditor/main/app/view/SortOptionsDialog.js b/apps/spreadsheeteditor/main/app/view/SortOptionsDialog.js index 471837f72..7fb804652 100644 --- a/apps/spreadsheeteditor/main/app/view/SortOptionsDialog.js +++ b/apps/spreadsheeteditor/main/app/view/SortOptionsDialog.js @@ -117,7 +117,7 @@ define([ labelText: this.textTopBottom, name: 'asc-radio-sort-orient' }).on('change', _.bind(function(field, newValue, eOpts) { - newValue && this.chHeaders.setDisabled(this.props.infilter); + newValue && this.chHeaders.setDisabled(this.props.lockHeaders); }, this)); this.radioLeft = new Common.UI.RadioBox({ @@ -139,13 +139,13 @@ define([ if (props) { this.chHeaders.setValue(props.headers); this.chCase.setValue(props.sensitive); - (props.sortcol || props.infilter) ? this.radioTop.setValue(true) : this.radioLeft.setValue(true); - this.radioLeft.setDisabled(props.infilter); + (props.sortcol || props.lockOrientation) ? this.radioTop.setValue(true) : this.radioLeft.setValue(true); + this.radioLeft.setDisabled(props.lockOrientation); } }, getSettings: function () { - return {headers: this.radioTop.getValue() && (this.chHeaders.getValue()=='checked'), sensitive: this.chCase.getValue()=='checked', sortcol: this.radioTop.getValue(), infilter: this.props.infilter}; + return {headers: this.radioTop.getValue() && (this.chHeaders.getValue()=='checked'), sensitive: this.chCase.getValue()=='checked', sortcol: this.radioTop.getValue(), lockHeaders: this.props.lockHeaders, lockOrientation: this.props.lockOrientation}; }, textTitle: 'Sort Options', From e12898afa3b1313b9df2e6b63c5f7fb9e6bf80c1 Mon Sep 17 00:00:00 2001 From: Alexander Yuzhin Date: Fri, 22 Nov 2019 17:58:21 +0300 Subject: [PATCH 303/419] [DE] Skeletone loader bugfix --- apps/documenteditor/main/index.html | 2 +- apps/documenteditor/main/index.html.deploy | 2 +- apps/documenteditor/main/resources/less/app.less | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/apps/documenteditor/main/index.html b/apps/documenteditor/main/index.html index 1c0ef16cf..768376559 100644 --- a/apps/documenteditor/main/index.html +++ b/apps/documenteditor/main/index.html @@ -101,7 +101,7 @@ .loadmask > .placeholder { background: #fbfbfb; - width: 816px; + width: 794px; margin: 46px auto; height: 100%; border: 1px solid #bebebe; diff --git a/apps/documenteditor/main/index.html.deploy b/apps/documenteditor/main/index.html.deploy index 332fa9c13..c1cc8886d 100644 --- a/apps/documenteditor/main/index.html.deploy +++ b/apps/documenteditor/main/index.html.deploy @@ -102,7 +102,7 @@ .loadmask > .placeholder { background: #fbfbfb; - width: 816px; + width: 794px; margin: 46px auto; height: 100%; border: 1px solid #bebebe; diff --git a/apps/documenteditor/main/resources/less/app.less b/apps/documenteditor/main/resources/less/app.less index 33b313db0..b53f686d0 100644 --- a/apps/documenteditor/main/resources/less/app.less +++ b/apps/documenteditor/main/resources/less/app.less @@ -152,7 +152,7 @@ .doc-placeholder { background: #fbfbfb; - width: 816px; + width: 794px; margin: 46px auto; height: 100%; border: 1px solid #bebebe; From d6584c6e4940318ce9b5ba4b467c657a3c0f7529 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Mon, 25 Nov 2019 11:02:50 +0300 Subject: [PATCH 304/419] Change loader for modes with compact header --- apps/api/documents/api.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/apps/api/documents/api.js b/apps/api/documents/api.js index ee1428a8b..0730607db 100644 --- a/apps/api/documents/api.js +++ b/apps/api/documents/api.js @@ -782,7 +782,11 @@ if (config.frameEditorId) params += "&frameEditorId=" + config.frameEditorId; - + + if (config.editorConfig && (config.editorConfig.mode == 'view' || config.editorConfig.customization && !!config.editorConfig.customization.compactHeader) || + config.document && config.document.permissions && (config.document.permissions.edit === false && !config.document.permissions.review )) + params += "&mode=view"; + return params; } From e0aecd9704f4904ef7c5c18c018eb86dfa17cb4c Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Mon, 25 Nov 2019 11:13:00 +0300 Subject: [PATCH 305/419] Fix loader for view mode --- apps/documenteditor/main/index.html | 1 + apps/documenteditor/main/index.html.deploy | 1 + apps/presentationeditor/main/index.html | 1 + apps/presentationeditor/main/index.html.deploy | 1 + apps/spreadsheeteditor/main/index.html | 1 + apps/spreadsheeteditor/main/index.html.deploy | 1 + 6 files changed, 6 insertions(+) diff --git a/apps/documenteditor/main/index.html b/apps/documenteditor/main/index.html index 768376559..412918523 100644 --- a/apps/documenteditor/main/index.html +++ b/apps/documenteditor/main/index.html @@ -227,6 +227,7 @@ if (view) { document.querySelector('.brendpanel > :nth-child(2)').remove(); + document.querySelector('.brendpanel > :nth-child(1)').style.height = '32px'; document.querySelector('.sktoolbar').remove(); } diff --git a/apps/documenteditor/main/index.html.deploy b/apps/documenteditor/main/index.html.deploy index c1cc8886d..81e17b32c 100644 --- a/apps/documenteditor/main/index.html.deploy +++ b/apps/documenteditor/main/index.html.deploy @@ -212,6 +212,7 @@ view = params["mode"] == 'view'; if (view) { document.querySelector('.brendpanel > :nth-child(2)').remove(); + document.querySelector('.brendpanel > :nth-child(1)').style.height = '32px'; document.querySelector('.sktoolbar').remove(); } if (stopLoading) { diff --git a/apps/presentationeditor/main/index.html b/apps/presentationeditor/main/index.html index 20afe4b5e..d69b5614d 100644 --- a/apps/presentationeditor/main/index.html +++ b/apps/presentationeditor/main/index.html @@ -256,6 +256,7 @@ if (view) { document.querySelector('.brendpanel > :nth-child(2)').remove(); + document.querySelector('.brendpanel > :nth-child(1)').style.height = '32px'; document.querySelector('.sktoolbar').remove(); } diff --git a/apps/presentationeditor/main/index.html.deploy b/apps/presentationeditor/main/index.html.deploy index 94c177ec3..260031a36 100644 --- a/apps/presentationeditor/main/index.html.deploy +++ b/apps/presentationeditor/main/index.html.deploy @@ -262,6 +262,7 @@ if (view) { document.querySelector('.brendpanel > :nth-child(2)').remove(); + document.querySelector('.brendpanel > :nth-child(1)').style.height = '32px'; document.querySelector('.sktoolbar').remove(); } diff --git a/apps/spreadsheeteditor/main/index.html b/apps/spreadsheeteditor/main/index.html index f7b30e527..eda5a47d2 100644 --- a/apps/spreadsheeteditor/main/index.html +++ b/apps/spreadsheeteditor/main/index.html @@ -233,6 +233,7 @@ if (view) { document.querySelector('.brendpanel > :nth-child(2)').remove(); + document.querySelector('.brendpanel > :nth-child(1)').style.height = '32px'; document.querySelector('.sktoolbar').remove(); } diff --git a/apps/spreadsheeteditor/main/index.html.deploy b/apps/spreadsheeteditor/main/index.html.deploy index 95e61a8ba..3688e43f4 100644 --- a/apps/spreadsheeteditor/main/index.html.deploy +++ b/apps/spreadsheeteditor/main/index.html.deploy @@ -238,6 +238,7 @@ if (view) { document.querySelector('.brendpanel > :nth-child(2)').remove(); + document.querySelector('.brendpanel > :nth-child(1)').style.height = '32px'; document.querySelector('.sktoolbar').remove(); } From 9e246ec42456141314aa4161f2e956358b4b3492 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Mon, 25 Nov 2019 14:23:27 +0300 Subject: [PATCH 306/419] Fix loader for compact header mode --- apps/api/documents/api.js | 5 ++++- apps/documenteditor/main/index.html | 5 ++++- apps/documenteditor/main/index.html.deploy | 7 ++++++- apps/presentationeditor/main/index.html | 5 ++++- apps/presentationeditor/main/index.html.deploy | 5 ++++- apps/spreadsheeteditor/main/index.html | 5 ++++- apps/spreadsheeteditor/main/index.html.deploy | 5 ++++- 7 files changed, 30 insertions(+), 7 deletions(-) diff --git a/apps/api/documents/api.js b/apps/api/documents/api.js index 0730607db..aa509db4f 100644 --- a/apps/api/documents/api.js +++ b/apps/api/documents/api.js @@ -783,10 +783,13 @@ if (config.frameEditorId) params += "&frameEditorId=" + config.frameEditorId; - if (config.editorConfig && (config.editorConfig.mode == 'view' || config.editorConfig.customization && !!config.editorConfig.customization.compactHeader) || + if (config.editorConfig && config.editorConfig.mode == 'view' || config.document && config.document.permissions && (config.document.permissions.edit === false && !config.document.permissions.review )) params += "&mode=view"; + if (config.editorConfig && config.editorConfig.customization && !!config.editorConfig.customization.compactHeader) + params += "&compact=true"; + return params; } diff --git a/apps/documenteditor/main/index.html b/apps/documenteditor/main/index.html index 412918523..b33401e7f 100644 --- a/apps/documenteditor/main/index.html +++ b/apps/documenteditor/main/index.html @@ -223,11 +223,14 @@ - + diff --git a/apps/documenteditor/embed/index_loader.html b/apps/documenteditor/embed/index_loader.html index c0e763364..82e2fa3bf 100644 --- a/apps/documenteditor/embed/index_loader.html +++ b/apps/documenteditor/embed/index_loader.html @@ -334,9 +334,9 @@ - + diff --git a/apps/documenteditor/main/index.html b/apps/documenteditor/main/index.html index e30257d83..b5d3c4ecb 100644 --- a/apps/documenteditor/main/index.html +++ b/apps/documenteditor/main/index.html @@ -272,9 +272,9 @@ - + - + - + - + - + diff --git a/apps/presentationeditor/embed/index_loader.html b/apps/presentationeditor/embed/index_loader.html index c0fd70dd0..53fb0a0bd 100644 --- a/apps/presentationeditor/embed/index_loader.html +++ b/apps/presentationeditor/embed/index_loader.html @@ -336,9 +336,9 @@ - + diff --git a/apps/presentationeditor/main/index.html b/apps/presentationeditor/main/index.html index 0d370b8b7..56f0d0641 100644 --- a/apps/presentationeditor/main/index.html +++ b/apps/presentationeditor/main/index.html @@ -301,9 +301,9 @@ - + - + - + - + - + - + diff --git a/apps/spreadsheeteditor/embed/index_loader.html b/apps/spreadsheeteditor/embed/index_loader.html index 746b49971..b29cba7c5 100644 --- a/apps/spreadsheeteditor/embed/index_loader.html +++ b/apps/spreadsheeteditor/embed/index_loader.html @@ -337,9 +337,9 @@ - + diff --git a/apps/spreadsheeteditor/main/index.html b/apps/spreadsheeteditor/main/index.html index 41feaa9dd..b77340bb8 100644 --- a/apps/spreadsheeteditor/main/index.html +++ b/apps/spreadsheeteditor/main/index.html @@ -279,9 +279,9 @@ - + - + - + - +