Lea/web-apps
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #199 from ONLYOFFICE/feature/formula-tab

Browse source 
Feature/formula tab
This commit is contained in:
Julia Radzhabova 2019-06-28 13:35:18 +03:00 committed by GitHub
parent 0e1f01b413 21ad58aaaf
commit 0e264dbf04
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
16 changed files with 592 additions and 141 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
apps/common/main/resources/img/controls/toolbarbig.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 18 KiB

After

Width:  |  Height:  |  Size: 22 KiB

BIN
apps/common/main/resources/img/controls/toolbarbig@2x.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 40 KiB

After

Width:  |  Height:  |  Size: 47 KiB

10
apps/common/main/resources/less/toolbar.less
View file

@ -519,6 +519,16 @@
.button-normal-icon(btn-to-columns, 61, @toolbar-big-icon-size);
.button-normal-icon(btn-watermark, 63, @toolbar-big-icon-size);
.button-normal-icon(btn-color-schema, 64, @toolbar-big-icon-size);
.button-normal-icon(btn-ins-formula, 65, @toolbar-big-icon-size);
.button-normal-icon(btn-autosumm, 66, @toolbar-big-icon-size);
.button-normal-icon(btn-recent, 67, @toolbar-big-icon-size);
.button-normal-icon(btn-finance, 68, @toolbar-big-icon-size);
.button-normal-icon(btn-logic, 69, @toolbar-big-icon-size);
.button-normal-icon(btn-func-text, 70, @toolbar-big-icon-size);
.button-normal-icon(btn-datetime, 71, @toolbar-big-icon-size);
.button-normal-icon(btn-lookup, 72, @toolbar-big-icon-size);
.button-normal-icon(btn-func-math, 73, @toolbar-big-icon-size);
.button-normal-icon(btn-more, 74, @toolbar-big-icon-size);
.item-shape {
.icon {

86
apps/spreadsheeteditor/main/app/controller/FormulaDialog.js
View file

@ -43,16 +43,18 @@
define([
'core',
'spreadsheeteditor/main/app/collection/FormulaGroups',
'spreadsheeteditor/main/app/view/FormulaDialog'
'spreadsheeteditor/main/app/view/FormulaDialog',
'spreadsheeteditor/main/app/view/FormulaTab'
], function () {
'use strict';
SSE.Controllers = SSE.Controllers || {};
SSE.Controllers.FormulaDialog = Backbone.Controller.extend({
SSE.Controllers.FormulaDialog = Backbone.Controller.extend(_.extend({
models: [],
views: [
'FormulaDialog'
'FormulaDialog',
'FormulaTab'
],
collections: [
'FormulaGroups'
@ -74,18 +76,43 @@ define([
me.formulasGroups.reset();
me.reloadTranslations(lang);
}
},
'FormulaTab': {
'function:apply': this.applyFunction
},
'Toolbar': {
'function:apply': this.applyFunction
}
});
},
applyFunction: function(func, autocomplete, group) {
if (func) {
if (func.origin === 'more') {
this.showDialog(group);
} else {
this.api.asc_insertFormula(func.name, Asc.c_oAscPopUpSelectorType.Func, !!autocomplete);
!autocomplete && this.updateLast10Formulas(func.origin);
}
}
},
setConfig: function(config) {
this.toolbar = config.toolbar;
this.formulaTab = this.createView('FormulaTab', {
toolbar: this.toolbar.toolbar,
formulasGroups: this.formulasGroups
});
return this;
},
setApi: function (api) {
this.api = api;
if (this.formulasGroups && this.api) {
Common.Utils.InternalSettings.set("sse-settings-func-last", Common.localStorage.getItem("sse-settings-func-last"));
this.reloadTranslations(
Common.localStorage.getItem("sse-settings-func-locale") || this.appOptions.lang );
this.reloadTranslations(Common.localStorage.getItem("sse-settings-func-locale") || this.appOptions.lang );
var me = this;
@ -93,14 +120,8 @@ define([
api : this.api,
toolclose : 'hide',
formulasGroups : this.formulasGroups,
handler : function (func) {
if (func) {
me.api.asc_insertFormula(func.name, Asc.c_oAscPopUpSelectorType.Func);
me.updateLast10Formulas(func.origin);
}
}
handler : _.bind(this.applyFunction, this)
});
this.formulas.on({
'hide': function () {
me.api.asc_enableKeyEvents(true);
@ -108,6 +129,8 @@ define([
});
}
this.formulaTab && this.formulaTab.setApi(this.api);
return this;
},
@ -118,6 +141,9 @@ define([
onLaunch: function () {
this.formulasGroups = this.getApplication().getCollection('FormulaGroups');
var descriptions = ['Financial', 'Logical', 'TextAndData', 'DateAndTime', 'LookupAndReference', 'Mathematic', 'Cube', 'Database', 'Engineering', 'Information',
'Statistical', 'Last10'];
Common.Gateway.on('init', this.loadConfig.bind(this));
},
@ -176,7 +202,7 @@ define([
return null;
},
showDialog: function () {
showDialog: function (group) {
if (this.formulas) {
if ( this.needUpdateFormula ) {
this.needUpdateFormula = false;
@ -185,7 +211,7 @@ define([
this.formulas.fillFormulasGroups();
}
}
this.formulas.show();
this.formulas.show(group);
}
},
hideDialog: function () {
@ -207,6 +233,7 @@ define([
if (this.formulasGroups) {
var group = this.formulasGroups.findWhere({name : 'Last10'});
group && group.set('functions', this.loadingLast10Formulas(this.getDescription(Common.Utils.InternalSettings.get("sse-settings-func-locale"))));
this.formulaTab && this.formulaTab.updateRecent();
}
},
@ -248,7 +275,8 @@ define([
last10FunctionsGroup = new SSE.Models.FormulaGroup ({
name : ascGroupName,
index : index,
store : store
store : store,
caption : this['sCategory' + ascGroupName] || ascGroupName
});
if (last10FunctionsGroup) {
last10FunctionsGroup.set('functions', this.loadingLast10Formulas(descrarr));
@ -256,10 +284,12 @@ define([
index += 1;
}
ascGroupName = 'All';
allFunctionsGroup = new SSE.Models.FormulaGroup ({
name : 'All',
name : ascGroupName,
index : index,
store : store
store : store,
caption : this['sCategory' + ascGroupName] || ascGroupName
});
if (allFunctionsGroup) {
store.push(allFunctionsGroup);
@ -276,7 +306,8 @@ define([
formulaGroup = new SSE.Models.FormulaGroup({
name : ascGroupName,
index : index,
store : store
store : store,
caption : this['sCategory' + ascGroupName] || ascGroupName
});
index += 1;
@ -308,6 +339,21 @@ define([
_.sortBy(allFunctions, function (model) {return model.get('name'); }));
}
}
}
});
this.formulaTab && this.formulaTab.fillFunctions();
},
sCategoryAll: 'All',
sCategoryLast10: '10 last used',
sCategoryLogical: 'Logical',
sCategoryCube: 'Cube',
sCategoryDatabase: 'Database',
sCategoryDateAndTime: 'Date and time',
sCategoryEngineering: 'Engineering',
sCategoryFinancial: 'Financial',
sCategoryInformation: 'Information',
sCategoryLookupAndReference: 'Lookup and reference',
sCategoryMathematic: 'Math and trigonometry',
sCategoryStatistical: 'Statistical',
sCategoryTextAndData: 'Text and data'
}, SSE.Controllers.FormulaDialog || {}));
});

18
apps/spreadsheeteditor/main/app/controller/Toolbar.js
View file

@ -1182,10 +1182,8 @@ define([
controller.showDialog();
}
} else {
item.value = item.value || 'SUM';
this.api.asc_insertFormula(this.api.asc_getFormulaLocaleName(item.value), Asc.c_oAscPopUpSelectorType.Func, true);
this.toolbar.fireEvent('function:apply', [{name: this.api.asc_getFormulaLocaleName(item.value), origin: item.value}, true]);
Common.NotificationCenter.trigger('edit:complete', this.toolbar);
Common.component.Analytics.trackEvent('ToolBar', 'Insert formula');
@ -1703,7 +1701,7 @@ define([
toolbar.lockToolbar(SSE.enumLock.editFormula, is_formula,
{ array: [toolbar.cmbFontName, toolbar.cmbFontSize, toolbar.btnIncFontSize, toolbar.btnDecFontSize,
toolbar.btnBold, toolbar.btnItalic, toolbar.btnUnderline, toolbar.btnStrikeout, toolbar.btnSubscript, toolbar.btnTextColor]});
toolbar.lockToolbar(SSE.enumLock.editText, is_text, {array:[toolbar.btnInsertFormula]});
toolbar.lockToolbar(SSE.enumLock.editText, is_text, {array: [toolbar.btnInsertFormula].concat(toolbar.btnsFormula)});
}
this._state.coauthdisable = undefined;
this._state.selection_type = undefined;
@ -3105,11 +3103,17 @@ define([
me.toolbar.btnsSetAutofilter = datatab.getButtons('set-filter');
me.toolbar.btnsClearAutofilter = datatab.getButtons('clear-filter');
var formulatab = me.getApplication().getController('FormulaDialog');
formulatab.setConfig({toolbar: me});
formulatab = formulatab.getView('FormulaTab');
me.toolbar.btnsFormula = formulatab.getButtons('formula');
Array.prototype.push.apply(me.toolbar.lockControls, formulatab.getButtons());
if ( !config.isOffline ) {
tab = {action: 'pivot', caption: me.textPivot};
$panel = me.getApplication().getController('PivotTable').createToolbarPanel();
if ($panel) {
me.toolbar.addTab(tab, $panel, 4);
me.toolbar.addTab(tab, $panel, 5);
me.toolbar.setVisible('pivot', true);
}
}
@ -3117,7 +3121,7 @@ define([
var tab = {action: 'review', caption: me.toolbar.textTabCollaboration};
var $panel = me.getApplication().getController('Common.Controllers.ReviewChanges').createToolbarPanel();
if ( $panel )
me.toolbar.addTab(tab, $panel, 5);
me.toolbar.addTab(tab, $panel, 6);
if (!(config.customization && config.customization.compactHeader)) {
// hide 'print' and 'save' buttons group and next separator
@ -3136,7 +3140,7 @@ define([
tab = {action: 'protect', caption: me.toolbar.textTabProtect};
$panel = me.getApplication().getController('Common.Controllers.Protection').createToolbarPanel();
if ($panel)
me.toolbar.addTab(tab, $panel, 6);
me.toolbar.addTab(tab, $panel, 7);
}
}
}

17
apps/spreadsheeteditor/main/app/template/Toolbar.template
View file

@ -156,6 +156,23 @@
<span class="btn-slot text x-huge" id="slot-img-movebkwd"></span>
</div>
</section>
<section class="panel" data-tab="formula">
<div class="group">
<span class="btn-slot text x-huge" id="slot-btn-additional-formula"></span>
</div>
<div class="separator long"></div>
<div class="group">
<span class="btn-slot text x-huge" id="slot-btn-autosum"></span>
<span class="btn-slot text x-huge" id="slot-btn-recent"></span>
<span class="btn-slot text x-huge" id="slot-btn-financial"></span>
<span class="btn-slot text x-huge" id="slot-btn-logical"></span>
<span class="btn-slot text x-huge" id="slot-btn-text"></span>
<span class="btn-slot text x-huge" id="slot-btn-datetime"></span>
<span class="btn-slot text x-huge" id="slot-btn-lookup"></span>
<span class="btn-slot text x-huge" id="slot-btn-math"></span>
<span class="btn-slot text x-huge" id="slot-btn-more"></span>
</div>
</section>
<section class="panel" data-tab="data">
<div class="group">
<div class="elset">

29
apps/spreadsheeteditor/main/app/view/FormulaDialog.js
View file

@ -104,7 +104,7 @@ define([
this.descLabel = $('#formula-dlg-desc');
this.fillFormulasGroups();
},
show: function () {
show: function (group) {
if (this.$window) {
var main_width, main_height, top, left, win_height = this.initConfig.height;
@ -129,8 +129,8 @@ define([
this.mask.on('mousedown',_.bind(this.onUpdateFocus, this));
this.$window.on('mousedown',_.bind(this.onUpdateFocus, this));
if (this.cmbFuncGroup.getValue() == 0)
this.fillFunctions('Last10');
group && this.cmbFuncGroup.setValue(group);
(group || this.cmbFuncGroup.getValue()=='Last10') && this.fillFunctions(this.cmbFuncGroup.getValue());
if (this.cmbListFunctions) {
_.delay(function (me) {
@ -169,9 +169,7 @@ define([
},
onSelectGroup: function (combo, record) {
if (!_.isUndefined(record) && !_.isUndefined(record.value)) {
if (record.value < this.formulasGroups.length) {
this.fillFunctions(this.formulasGroups.at(record.value).get('name'));
}
record.value && this.fillFunctions(record.value);
}
this.onUpdateFocus();
@ -213,8 +211,8 @@ define([
var group = this.formulasGroups.at(i);
if (group.get('functions').length) {
groupsListItems.push({
value : group.get('index'),
displayValue : this['sCategory' + group.get('name')] || group.get('name')
value : group.get('name'),
displayValue : group.get('caption')
});
}
}
@ -232,7 +230,7 @@ define([
} else {
this.cmbFuncGroup.setData(groupsListItems);
}
this.cmbFuncGroup.setValue(0);
this.cmbFuncGroup.setValue('Last10');
this.fillFunctions('Last10');
}
@ -380,19 +378,6 @@ define([
cancelButtonText: 'Cancel',
okButtonText: 'Ok',
sCategoryAll: 'All',
sCategoryLast10: '10 last used',
sCategoryLogical: 'Logical',
sCategoryCube: 'Cube',
sCategoryDatabase: 'Database',
sCategoryDateAndTime: 'Date and time',
sCategoryEngineering: 'Engineering',
sCategoryFinancial: 'Financial',
sCategoryInformation: 'Information',
sCategoryLookupAndReference: 'Lookup and reference',
sCategoryMathematic: 'Math and trigonometry',
sCategoryStatistical: 'Statistical',
sCategoryTextAndData: 'Text and data',
textGroupDescription: 'Select Function Group',
textListDescription: 'Select Function',
sDescription: 'Description',

379
apps/spreadsheeteditor/main/app/view/FormulaTab.js Normal file
View file

@ -0,0 +1,379 @@
/*
*
* (c) Copyright Ascensio System SIA 2010-2019
*
* This program is a free software product. You can redistribute it and/or
* modify it under the terms of the GNU Affero General Public License (AGPL)
* version 3 as published by the Free Software Foundation. In accordance with
* Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect
* that Ascensio System SIA expressly excludes the warranty of non-infringement
* of any third-party rights.
*
* This program is distributed WITHOUT ANY WARRANTY; without even the implied
* warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For
* details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html
*
* You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha
* street, Riga, Latvia, EU, LV-1050.
*
* The interactive user interfaces in modified source and object code versions
* of the Program must display Appropriate Legal Notices, as required under
* Section 5 of the GNU AGPL version 3.
*
* Pursuant to Section 7(b) of the License you must retain the original Product
* logo when distributing the program. Pursuant to Section 7(e) we decline to
* grant you any rights under trademark law for use of our trademarks.
*
* All the Product's GUI elements, including illustrations and icon sets, as
* well as technical writing content are licensed under the terms of the
* Creative Commons Attribution-ShareAlike 4.0 International. See the License
* terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
*
*/
/**
* FormulaTab.js
*
* Created by Julia Radzhabova on 14.06.2019
* Copyright (c) 2019 Ascensio System SIA. All rights reserved.
*
*/
define([
'common/main/lib/util/utils',
'common/main/lib/component/BaseView',
'common/main/lib/component/Layout'
], function () {
'use strict';
SSE.Views.FormulaTab = Common.UI.BaseView.extend(_.extend((function(){
function setEvents() {
var me = this;
me.btnAutosum.on('click', function(){
me.fireEvent('function:apply', [{name: me.api.asc_getFormulaLocaleName('SUM'), origin: 'SUM'}, true]);
});
me.btnAutosum.menu.on('item:click', function (menu, item, e) {
me.fireEvent('function:apply', [{name: item.caption, origin: item.value}, true]);
});
me.btnFormula.on('click', function(){
me.fireEvent('function:apply', [{name: 'more', origin: 'more'}]);
});
}
return {
options: {},
initialize: function (options) {
Common.UI.BaseView.prototype.initialize.call(this);
this.toolbar = options.toolbar;
this.formulasGroups = options.formulasGroups;
this.lockedControls = [];
var me = this,
$host = me.toolbar.$el,
_set = SSE.enumLock;
var formulaDialog = SSE.getController('FormulaDialog');
this.btnFinancial = new Common.UI.Button({
cls: 'btn-toolbar x-huge icon-top',
iconCls: 'btn-finance',
caption: formulaDialog.sCategoryFinancial,
hint: formulaDialog.sCategoryFinancial,
menu: true,
split: false,
disabled: true,
lock: [_set.editText, _set.selChart, _set.selChartText, _set.selShape, _set.selShapeText, _set.selImage, _set.selRangeEdit, _set.lostConnect, _set.coAuth]
});
Common.Utils.injectComponent($host.find('#slot-btn-financial'), this.btnFinancial);
this.lockedControls.push(this.btnFinancial);
this.btnLogical = new Common.UI.Button({
cls: 'btn-toolbar x-huge icon-top',
iconCls: 'btn-logic',
caption: formulaDialog.sCategoryLogical,
hint: formulaDialog.sCategoryLogical,
menu: true,
split: false,
disabled: true,
lock: [_set.editText, _set.selChart, _set.selChartText, _set.selShape, _set.selShapeText, _set.selImage, _set.selRangeEdit, _set.lostConnect, _set.coAuth]
});
Common.Utils.injectComponent($host.find('#slot-btn-logical'), this.btnLogical);
this.lockedControls.push(this.btnLogical);
this.btnTextData = new Common.UI.Button({
cls: 'btn-toolbar x-huge icon-top',
iconCls: 'btn-func-text',
caption: formulaDialog.sCategoryTextAndData,
hint: formulaDialog.sCategoryTextAndData,
menu: true,
split: false,
disabled: true,
lock: [_set.editText, _set.selChart, _set.selChartText, _set.selShape, _set.selShapeText, _set.selImage, _set.selRangeEdit, _set.lostConnect, _set.coAuth]
});
Common.Utils.injectComponent($host.find('#slot-btn-text'), this.btnTextData);
this.lockedControls.push(this.btnTextData);
this.btnDateTime = new Common.UI.Button({
cls: 'btn-toolbar x-huge icon-top',
iconCls: 'btn-datetime',
caption: formulaDialog.sCategoryDateAndTime,
hint: formulaDialog.sCategoryDateAndTime,
menu: true,
split: false,
disabled: true,
lock: [_set.editText, _set.selChart, _set.selChartText, _set.selShape, _set.selShapeText, _set.selImage, _set.selRangeEdit, _set.lostConnect, _set.coAuth]
});
Common.Utils.injectComponent($host.find('#slot-btn-datetime'), this.btnDateTime);
this.lockedControls.push(this.btnDateTime);
this.btnReference = new Common.UI.Button({
cls: 'btn-toolbar x-huge icon-top',
iconCls: 'btn-lookup',
caption: formulaDialog.sCategoryLookupAndReference,
hint: formulaDialog.sCategoryLookupAndReference,
menu: true,
split: false,
disabled: true,
lock: [_set.editText, _set.selChart, _set.selChartText, _set.selShape, _set.selShapeText, _set.selImage, _set.selRangeEdit, _set.lostConnect, _set.coAuth]
});
Common.Utils.injectComponent($host.find('#slot-btn-lookup'), this.btnReference);
this.lockedControls.push(this.btnReference);
this.btnMath = new Common.UI.Button({
cls: 'btn-toolbar x-huge icon-top',
iconCls: 'btn-func-math',
caption: formulaDialog.sCategoryMathematic,
hint: formulaDialog.sCategoryMathematic,
menu: true,
split: false,
disabled: true,
lock: [_set.editText, _set.selChart, _set.selChartText, _set.selShape, _set.selShapeText, _set.selImage, _set.selRangeEdit, _set.lostConnect, _set.coAuth]
});
Common.Utils.injectComponent($host.find('#slot-btn-math'), this.btnMath);
this.lockedControls.push(this.btnMath);
this.btnRecent = new Common.UI.Button({
cls: 'btn-toolbar x-huge icon-top',
iconCls: 'btn-recent',
caption: this.txtRecent,
hint: this.txtRecent,
menu: true,
split: false,
disabled: true,
lock: [_set.editText, _set.selChart, _set.selChartText, _set.selShape, _set.selShapeText, _set.selImage, _set.selRangeEdit, _set.lostConnect, _set.coAuth]
});
Common.Utils.injectComponent($host.find('#slot-btn-recent'), this.btnRecent);
this.lockedControls.push(this.btnRecent);
this.btnAutosum = new Common.UI.Button({
cls: 'btn-toolbar x-huge icon-top',
iconCls: 'btn-autosum',
caption: this.txtAutosum,
hint: this.txtAutosumTip,
split: true,
disabled: 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({
items : [
{caption: 'SUM', value: 'SUM'},
{caption: 'MIN', value: 'MIN'},
{caption: 'MAX', value: 'MAX'},
{caption: 'COUNT', value: 'COUNT'},
{caption: '--'},
{
caption: me.txtAdditional,
value: 'more'
}
]
})
});
Common.Utils.injectComponent($host.find('#slot-btn-autosum'), this.btnAutosum);
this.lockedControls.push(this.btnAutosum);
this.btnFormula = new Common.UI.Button({
cls: 'btn-toolbar x-huge icon-top',
iconCls: 'btn-ins-formula',
caption: this.txtFormula,
hint: this.txtFormulaTip,
disabled: true,
lock: [_set.editText, _set.selChart, _set.selChartText, _set.selShape, _set.selShapeText, _set.selImage, _set.selRangeEdit, _set.lostConnect, _set.coAuth]
});
Common.Utils.injectComponent($host.find('#slot-btn-additional-formula'), this.btnFormula);
this.lockedControls.push(this.btnFormula);
this.btnMore = new Common.UI.Button({
cls: 'btn-toolbar x-huge icon-top',
iconCls: 'btn-more',
caption: this.txtMore,
hint: this.txtMore,
menu: true,
split: false,
disabled: true,
lock: [_set.editText, _set.selChart, _set.selChartText, _set.selShape, _set.selShapeText, _set.selImage, _set.selRangeEdit, _set.lostConnect, _set.coAuth]
});
Common.Utils.injectComponent($host.find('#slot-btn-more'), this.btnMore);
this.lockedControls.push(this.btnMore);
Common.NotificationCenter.on('app:ready', this.onAppReady.bind(this));
},
render: function (el) {
return this;
},
onAppReady: function (config) {
var me = this;
(new Promise(function (accept, reject) {
accept();
})).then(function(){
setEvents.call(me);
});
},
show: function () {
Common.UI.BaseView.prototype.show.call(this);
this.fireEvent('show', this);
},
getButtons: function(type) {
return this.lockedControls;
},
SetDisabled: function (state) {
this.lockedControls && this.lockedControls.forEach(function(button) {
if ( button ) {
button.setDisabled(state);
}
}, this);
},
setButtonMenu: function(btn, name) {
var me = this,
arr = [],
group = me.formulasGroups.findWhere({name : name});
if (group) {
var functions = group.get('functions');
functions && functions.forEach(function(item) {
arr.push(new Common.UI.MenuItem({
caption: item.get('name'),
value: item.get('origin')
}));
});
}
if (arr.length) {
arr.push(new Common.UI.MenuItem({
caption: '--'
}));
arr.push(new Common.UI.MenuItem({
caption: me.txtAdditional,
value: 'more'
}));
if (btn.menu && btn.menu.rendered) {
btn.menu.removeAll();
arr.forEach(function(item){
btn.menu.addItem(item);
});
} else {
btn.setMenu(new Common.UI.Menu({
restoreHeight: 415,
items: arr
}));
btn.menu.on('item:click', function (menu, item, e) {
me.fireEvent('function:apply', [{name: item.caption, origin: item.value}, false, name]);
});
}
}
btn.setDisabled(arr.length<1);
},
fillFunctions: function () {
if (this.formulasGroups) {
this.setButtonMenu(this.btnFinancial, 'Financial');
this.setButtonMenu(this.btnLogical, 'Logical');
this.setButtonMenu(this.btnTextData, 'TextAndData');
this.setButtonMenu(this.btnDateTime, 'DateAndTime');
this.setButtonMenu(this.btnReference, 'LookupAndReference');
this.setButtonMenu(this.btnMath, 'Mathematic');
this.setButtonMenu(this.btnRecent, 'Last10');
var formulas = this.btnAutosum.menu.items;
for (var i=0; i<Math.min(4,formulas.length); i++) {
this.api && formulas[i].setCaption(this.api.asc_getFormulaLocaleName(formulas[i].value));
}
// more button
var me = this,
morearr = [],
formulaDialog = SSE.getController('FormulaDialog');
['Cube', 'Database', 'Engineering', 'Information', 'Statistical'].forEach(function(name) {
var group = me.formulasGroups.findWhere({name : name});
if (group) {
var functions = group.get('functions'),
arr = [];
functions && functions.forEach(function(item) {
arr.push(new Common.UI.MenuItem({
caption: item.get('name'),
value: item.get('origin')
}));
});
if (arr.length) {
arr.push(new Common.UI.MenuItem({
caption: '--'
}));
arr.push(new Common.UI.MenuItem({
caption: me.txtAdditional,
value: 'more'
}));
var mnu = new Common.UI.MenuItem({
caption : formulaDialog['sCategory' + name] || name,
menu : new Common.UI.Menu({
restoreHeight: 415,
menuAlign: 'tl-tr',
items: arr
})
});
mnu.menu.on('item:click', function (menu, item, e) {
me.fireEvent('function:apply', [{name: item.caption, origin: item.value}, false, name]);
});
morearr.push(mnu);
}
}
});
var btn = this.btnMore;
if (morearr.length) {
if (btn.menu && btn.menu.rendered) {
btn.menu.removeAll();
morearr.forEach(function(item){
btn.menu.addItem(item);
});
} else {
btn.setMenu(new Common.UI.Menu({
restoreHeight: 415,
items: morearr
}));
}
}
btn.setDisabled(morearr.length<1);
}
},
updateRecent: function() {
this.formulasGroups && this.setButtonMenu(this.btnRecent, 'Last10');
},
setApi: function (api) {
this.api = api;
},
txtRecent: 'Recently used',
txtAutosum: 'Autosum',
txtAutosumTip: 'Summation',
txtAdditional: 'Additional',
txtFormula: 'Function',
txtFormulaTip: 'Insert function',
txtMore: 'More functions'
}
}()), SSE.Views.FormulaTab || {}));
});

4
apps/spreadsheeteditor/main/app/view/Toolbar.js
View file

@ -313,6 +313,7 @@ define([
{ caption: me.textTabHome, action: 'home', extcls: 'canedit'},
{ caption: me.textTabInsert, action: 'ins', extcls: 'canedit'},
{caption: me.textTabLayout, action: 'layout', extcls: 'canedit'},
{caption: me.textTabFormula, action: 'formula', extcls: 'canedit'},
{caption: me.textTabData, action: 'data', extcls: 'canedit'}
]}
);
@ -2347,6 +2348,7 @@ define([
tipEditHeader: 'Edit header or footer',
textTabData: 'Data',
capInsertTable: 'Table',
tipInsertTable: 'Insert table'
tipInsertTable: 'Insert table',
textTabFormula: 'Formula'
}, SSE.Views.Toolbar || {}));
});

26
apps/spreadsheeteditor/main/locale/de.json
View file

@ -369,6 +369,19 @@
"SSE.Controllers.DocumentHolder.txtUndoExpansion": "Automatische Erweiterung der Tabelle rückgängig machen",
"SSE.Controllers.DocumentHolder.txtUseTextImport": "Text Import-Assistenten verwenden",
"SSE.Controllers.DocumentHolder.txtWidth": "Breite",
"SSE.Controllers.FormulaDialog.sCategoryAll": "Alle",
"SSE.Controllers.FormulaDialog.sCategoryLast10": "10 zuletzt verwendete",
"SSE.Controllers.FormulaDialog.sCategoryCube": "Cube",
"SSE.Controllers.FormulaDialog.sCategoryDatabase": "Datenbank",
"SSE.Controllers.FormulaDialog.sCategoryDateAndTime": "Datum und Uhrzeit",
"SSE.Controllers.FormulaDialog.sCategoryEngineering": "Konstruktion",
"SSE.Controllers.FormulaDialog.sCategoryFinancial": "Finanzmathematik",
"SSE.Controllers.FormulaDialog.sCategoryInformation": "Information",
"SSE.Controllers.FormulaDialog.sCategoryLogical": "Logisch",
"SSE.Controllers.FormulaDialog.sCategoryLookupAndReference": "Suchen und Bezüge",
"SSE.Controllers.FormulaDialog.sCategoryMathematic": "Mathematik und Trigonometrie",
"SSE.Controllers.FormulaDialog.sCategoryStatistical": "Statistik",
"SSE.Controllers.FormulaDialog.sCategoryTextAndData": "Text und Daten",
"SSE.Controllers.LeftMenu.newDocumentTitle": "Unbetitelte Kalkulationstabelle",
"SSE.Controllers.LeftMenu.textByColumns": "Spaltenweise",
"SSE.Controllers.LeftMenu.textByRows": "Zeilenweise",
@ -1581,19 +1594,6 @@
"SSE.Views.FormulaDialog.textGroupDescription": "Funktionsgruppe auswählen",
"SSE.Views.FormulaDialog.textListDescription": "Funktion auswählen",
"SSE.Views.FormulaDialog.txtTitle": "Funktion einfügen",
"SSE.Views.FormulaDialog.sCategoryAll": "Alle",
"SSE.Views.FormulaDialog.sCategoryLast10": "10 zuletzt verwendete",
"SSE.Views.FormulaDialog.sCategoryCube": "Cube",
"SSE.Views.FormulaDialog.sCategoryDatabase": "Datenbank",
"SSE.Views.FormulaDialog.sCategoryDateAndTime": "Datum und Uhrzeit",
"SSE.Views.FormulaDialog.sCategoryEngineering": "Konstruktion",
"SSE.Views.FormulaDialog.sCategoryFinancial": "Finanzmathematik",
"SSE.Views.FormulaDialog.sCategoryInformation": "Information",
"SSE.Views.FormulaDialog.sCategoryLogical": "Logisch",
"SSE.Views.FormulaDialog.sCategoryLookupAndReference": "Suchen und Bezüge",
"SSE.Views.FormulaDialog.sCategoryMathematic": "Mathematik und Trigonometrie",
"SSE.Views.FormulaDialog.sCategoryStatistical": "Statistik",
"SSE.Views.FormulaDialog.sCategoryTextAndData": "Text und Daten",
"SSE.Views.HyperlinkSettingsDialog.cancelButtonText": "Abbrechen",
"SSE.Views.HyperlinkSettingsDialog.strDisplay": "Anzeigen",
"SSE.Views.HyperlinkSettingsDialog.strLinkTo": "Verknüpfen mit",

34
apps/spreadsheeteditor/main/locale/en.json
View file

@ -371,6 +371,19 @@
"SSE.Controllers.DocumentHolder.txtUndoExpansion": "Undo table autoexpansion",
"SSE.Controllers.DocumentHolder.txtUseTextImport": "Use text import wizard",
"SSE.Controllers.DocumentHolder.txtWidth": "Width",
"SSE.Controllers.FormulaDialog.sCategoryAll": "All",
"SSE.Controllers.FormulaDialog.sCategoryLast10": "10 last used",
"SSE.Controllers.FormulaDialog.sCategoryLogical": "Logical",
"SSE.Controllers.FormulaDialog.sCategoryCube": "Cube",
"SSE.Controllers.FormulaDialog.sCategoryDatabase": "Database",
"SSE.Controllers.FormulaDialog.sCategoryDateAndTime": "Date and time",
"SSE.Controllers.FormulaDialog.sCategoryEngineering": "Engineering",
"SSE.Controllers.FormulaDialog.sCategoryFinancial": "Financial",
"SSE.Controllers.FormulaDialog.sCategoryInformation": "Information",
"SSE.Controllers.FormulaDialog.sCategoryLookupAndReference": "Lookup and reference",
"SSE.Controllers.FormulaDialog.sCategoryMathematic": "Math and trigonometry",
"SSE.Controllers.FormulaDialog.sCategoryStatistical": "Statistical",
"SSE.Controllers.FormulaDialog.sCategoryTextAndData": "Text and data",
"SSE.Controllers.LeftMenu.newDocumentTitle": "Unnamed spreadsheet",
"SSE.Controllers.LeftMenu.textByColumns": "By columns",
"SSE.Controllers.LeftMenu.textByRows": "By rows",
@ -1603,19 +1616,13 @@
"SSE.Views.FormulaDialog.textGroupDescription": "Select Function Group",
"SSE.Views.FormulaDialog.textListDescription": "Select Function",
"SSE.Views.FormulaDialog.txtTitle": "Insert Function",
"SSE.Views.FormulaDialog.sCategoryAll": "All",
"SSE.Views.FormulaDialog.sCategoryLast10": "10 last used",
"SSE.Views.FormulaDialog.sCategoryLogical": "Logical",
"SSE.Views.FormulaDialog.sCategoryCube": "Cube",
"SSE.Views.FormulaDialog.sCategoryDatabase": "Database",
"SSE.Views.FormulaDialog.sCategoryDateAndTime": "Date and time",
"SSE.Views.FormulaDialog.sCategoryEngineering": "Engineering",
"SSE.Views.FormulaDialog.sCategoryFinancial": "Financial",
"SSE.Views.FormulaDialog.sCategoryInformation": "Information",
"SSE.Views.FormulaDialog.sCategoryLookupAndReference": "Lookup and reference",
"SSE.Views.FormulaDialog.sCategoryMathematic": "Math and trigonometry",
"SSE.Views.FormulaDialog.sCategoryStatistical": "Statistical",
"SSE.Views.FormulaDialog.sCategoryTextAndData": "Text and data",
"SSE.Views.FormulaTab.txtRecent": "Recently used",
"SSE.Views.FormulaTab.txtAutosum": "Autosum",
"SSE.Views.FormulaTab.txtAutosumTip": "Summation",
"SSE.Views.FormulaTab.txtAdditional": "Additional",
"SSE.Views.FormulaTab.txtFormula": "Function",
"SSE.Views.FormulaTab.txtFormulaTip": "Insert function",
"SSE.Views.FormulaTab.txtMore": "More functions",
"SSE.Views.GroupDialog.cancelButtonText": "Cancel",
"SSE.Views.GroupDialog.okButtonText": "Ok",
"SSE.Views.GroupDialog.textRows": "Rows",
@ -2377,6 +2384,7 @@
"SSE.Views.Toolbar.capBtnInsHeader": "Header/Footer",
"SSE.Views.Toolbar.tipEditHeader": "Edit header or footer",
"SSE.Views.Toolbar.textTabData": "Data",
"SSE.Views.Toolbar.textTabFormula": "Formula",
"SSE.Views.Top10FilterDialog.cancelButtonText": "Cancel",
"SSE.Views.Top10FilterDialog.okButtonText": "OK",
"SSE.Views.Top10FilterDialog.textType": "Show",

26
apps/spreadsheeteditor/main/locale/es.json
View file

@ -369,6 +369,19 @@
"SSE.Controllers.DocumentHolder.txtUndoExpansion": "Deshacer la expansión automática de la tabla",
"SSE.Controllers.DocumentHolder.txtUseTextImport": "Usar el Asistente para importar texto",
"SSE.Controllers.DocumentHolder.txtWidth": "Ancho",
"SSE.Controllers.FormulaDialog.sCategoryAll": "Todo",
"SSE.Controllers.FormulaDialog.sCategoryLast10": "10 últimas utilizadas",
"SSE.Controllers.FormulaDialog.sCategoryLogical": "Lógico",
"SSE.Controllers.FormulaDialog.sCategoryCube": "Cubo",
"SSE.Controllers.FormulaDialog.sCategoryDatabase": "Base de Datos",
"SSE.Controllers.FormulaDialog.sCategoryDateAndTime": "Fecha y hora",
"SSE.Controllers.FormulaDialog.sCategoryEngineering": "Ingenería",
"SSE.Controllers.FormulaDialog.sCategoryFinancial": "Financial",
"SSE.Controllers.FormulaDialog.sCategoryInformation": "Información",
"SSE.Controllers.FormulaDialog.sCategoryLookupAndReferences": "Búsqueda y referencia",
"SSE.Controllers.FormulaDialog.sCategoryMathematic": "Matemáticas y trigonometría",
"SSE.Controllers.FormulaDialog.sCategoryStatistical": "Estadístico",
"SSE.Controllers.FormulaDialog.sCategoryTextAndData": "Texto y datos",
"SSE.Controllers.LeftMenu.newDocumentTitle": "Hoja de cálculo sin nombre",
"SSE.Controllers.LeftMenu.textByColumns": "Columnas",
"SSE.Controllers.LeftMenu.textByRows": "Filas",
@ -1581,19 +1594,6 @@
"SSE.Views.FormulaDialog.textGroupDescription": "Seleccionar grupo de función",
"SSE.Views.FormulaDialog.textListDescription": "Seleccionar función",
"SSE.Views.FormulaDialog.txtTitle": "Insertar función",
"SSE.Views.FormulaDialog.sCategoryAll": "Todo",
"SSE.Views.FormulaDialog.sCategoryLast10": "10 últimas utilizadas",
"SSE.Views.FormulaDialog.sCategoryLogical": "Lógico",
"SSE.Views.FormulaDialog.sCategoryCube": "Cubo",
"SSE.Views.FormulaDialog.sCategoryDatabase": "Base de Datos",
"SSE.Views.FormulaDialog.sCategoryDateAndTime": "Fecha y hora",
"SSE.Views.FormulaDialog.sCategoryEngineering": "Ingenería",
"SSE.Views.FormulaDialog.sCategoryFinancial": "Financial",
"SSE.Views.FormulaDialog.sCategoryInformation": "Información",
"SSE.Views.FormulaDialog.sCategoryLookupAndReferences": "Búsqueda y referencia",
"SSE.Views.FormulaDialog.sCategoryMathematic": "Matemáticas y trigonometría",
"SSE.Views.FormulaDialog.sCategoryStatistical": "Estadístico",
"SSE.Views.FormulaDialog.sCategoryTextAndData": "Texto y datos",
"SSE.Views.HyperlinkSettingsDialog.cancelButtonText": "Cancelar",
"SSE.Views.HyperlinkSettingsDialog.strDisplay": "Mostrar",
"SSE.Views.HyperlinkSettingsDialog.strLinkTo": "Enlace a",

26
apps/spreadsheeteditor/main/locale/fr.json
View file

@ -223,6 +223,19 @@
"Common.Views.SignSettingsDialog.textShowDate": "Afficher la date de signature à côté de la signature",
"Common.Views.SignSettingsDialog.textTitle": "Mise en place de la signature",
"Common.Views.SignSettingsDialog.txtEmpty": "Ce champ est obligatoire",
"SSE.Controllers.FormulaDialog.sCategoryAll": "Tout",
"SSE.Controllers.FormulaDialog.sCategoryLast10": "10 dernières utilisées",
"SSE.Controllers.FormulaDialog.sCategoryLogical": "Logique",
"SSE.Controllers.FormulaDialog.sCategoryCube": "Cube",
"SSE.Controllers.FormulaDialog.sCategoryDatabase": "Base de données",
"SSE.Controllers.FormulaDialog.sCategoryDateAndTime": "Date et heure",
"SSE.Controllers.FormulaDialog.sCategoryEngineering": "Ingénierie",
"SSE.Controllers.FormulaDialog.sCategoryFinancial": "Financier",
"SSE.Controllers.FormulaDialog.sCategoryInformation": "Information",
"SSE.Controllers.FormulaDialog.sCategoryLookupAndReference": "Recherche et référence",
"SSE.Controllers.FormulaDialog.sCategoryMathematic": "Maths et trigonométrie",
"SSE.Controllers.FormulaDialog.sCategoryStatistical": "Statistiques",
"SSE.Controllers.FormulaDialog.sCategoryTextAndData": "Texte et données",
"SSE.Controllers.DocumentHolder.alignmentText": "Alignement",
"SSE.Controllers.DocumentHolder.centerText": "Au centre",
"SSE.Controllers.DocumentHolder.deleteColumnText": "Supprimer la colonne",
@ -1582,19 +1595,6 @@
"SSE.Views.FormulaDialog.textGroupDescription": "Sélectionner un groupe de fonctions",
"SSE.Views.FormulaDialog.textListDescription": "Sélectionner une fonction",
"SSE.Views.FormulaDialog.txtTitle": "Insérer une fonction",
"SSE.Views.FormulaDialog.sCategoryAll": "Tout",
"SSE.Views.FormulaDialog.sCategoryLast10": "10 dernières utilisées",
"SSE.Views.FormulaDialog.sCategoryLogical": "Logique",
"SSE.Views.FormulaDialog.sCategoryCube": "Cube",
"SSE.Views.FormulaDialog.sCategoryDatabase": "Base de données",
"SSE.Views.FormulaDialog.sCategoryDateAndTime": "Date et heure",
"SSE.Views.FormulaDialog.sCategoryEngineering": "Ingénierie",
"SSE.Views.FormulaDialog.sCategoryFinancial": "Financier",
"SSE.Views.FormulaDialog.sCategoryInformation": "Information",
"SSE.Views.FormulaDialog.sCategoryLookupAndReference": "Recherche et référence",
"SSE.Views.FormulaDialog.sCategoryMathematic": "Maths et trigonométrie",
"SSE.Views.FormulaDialog.sCategoryStatistical": "Statistiques",
"SSE.Views.FormulaDialog.sCategoryTextAndData": "Texte et données",
"SSE.Views.HyperlinkSettingsDialog.cancelButtonText": "Annuler",
"SSE.Views.HyperlinkSettingsDialog.strDisplay": "Afficher",
"SSE.Views.HyperlinkSettingsDialog.strLinkTo": "Lier à",

26
apps/spreadsheeteditor/main/locale/it.json
View file

@ -222,6 +222,19 @@
"Common.Views.SignSettingsDialog.textShowDate": "Mostra la data nella riga di Firma",
"Common.Views.SignSettingsDialog.textTitle": "Impostazioni firma",
"Common.Views.SignSettingsDialog.txtEmpty": "Campo obbligatorio",
"SSE.Controllers.FormulaDialog.sCategoryAll": "Tutto",
"SSE.Controllers.FormulaDialog.sCategoryLast10": "10 ultime utilizzate",
"SSE.Controllers.FormulaDialog.sCategoryLogical": "Logico",
"SSE.Controllers.FormulaDialog.sCategoryCube": "Cubo",
"SSE.Controllers.FormulaDialog.sCategoryDatabase": "Banca dati",
"SSE.Controllers.FormulaDialog.sCategoryDateAndTime": "Data e ora",
"SSE.Controllers.FormulaDialog.sCategoryEngineering": "Ingegneria",
"SSE.Controllers.FormulaDialog.sCategoryFinancial": "Finanziario",
"SSE.Controllers.FormulaDialog.sCategoryInformation": "Informazioni",
"SSE.Controllers.FormulaDialog.sCategoryLookupAndReference": "Ricerca e Riferimento",
"SSE.Controllers.FormulaDialog.sCategoryMathematic": "Matematiche e trigonometriche",
"SSE.Controllers.FormulaDialog.sCategoryStatistical": "Statistico",
"SSE.Controllers.FormulaDialog.sCategoryTextAndData": "Testo e dati",
"SSE.Controllers.DocumentHolder.alignmentText": "Allineamento",
"SSE.Controllers.DocumentHolder.centerText": "Al centro",
"SSE.Controllers.DocumentHolder.deleteColumnText": "Elimina colonna",
@ -1508,19 +1521,6 @@
"SSE.Views.FormulaDialog.textGroupDescription": "Seleziona gruppo di funzioni",
"SSE.Views.FormulaDialog.textListDescription": "Seleziona funzione",
"SSE.Views.FormulaDialog.txtTitle": "Inserisci funzione",
"SSE.Views.FormulaDialog.sCategoryAll": "Tutto",
"SSE.Views.FormulaDialog.sCategoryLast10": "10 ultime utilizzate",
"SSE.Views.FormulaDialog.sCategoryLogical": "Logico",
"SSE.Views.FormulaDialog.sCategoryCube": "Cubo",
"SSE.Views.FormulaDialog.sCategoryDatabase": "Banca dati",
"SSE.Views.FormulaDialog.sCategoryDateAndTime": "Data e ora",
"SSE.Views.FormulaDialog.sCategoryEngineering": "Ingegneria",
"SSE.Views.FormulaDialog.sCategoryFinancial": "Finanziario",
"SSE.Views.FormulaDialog.sCategoryInformation": "Informazioni",
"SSE.Views.FormulaDialog.sCategoryLookupAndReference": "Ricerca e Riferimento",
"SSE.Views.FormulaDialog.sCategoryMathematic": "Matematiche e trigonometriche",
"SSE.Views.FormulaDialog.sCategoryStatistical": "Statistico",
"SSE.Views.FormulaDialog.sCategoryTextAndData": "Testo e dati",
"SSE.Views.HyperlinkSettingsDialog.cancelButtonText": "Annulla",
"SSE.Views.HyperlinkSettingsDialog.strDisplay": "Visualizza",
"SSE.Views.HyperlinkSettingsDialog.strLinkTo": "Collega a",

26
apps/spreadsheeteditor/main/locale/pl.json
View file

@ -111,6 +111,19 @@
"Common.Views.RenameDialog.okButtonText": "OK",
"Common.Views.RenameDialog.textName": "Nazwa pliku",
"Common.Views.RenameDialog.txtInvalidName": "Nazwa pliku nie może zawierać żadnego z następujących znaków:",
"SSE.Controllers.FormulaDialog.sCategoryAll": "Wszystko",
"SSE.Controllers.FormulaDialog.sCategoryLast10": "10 ostatnio używanych",
"SSE.Controllers.FormulaDialog.sCategoryLogical": "Logiczny",
"SSE.Controllers.FormulaDialog.sCategoryCube": "Sześcian",
"SSE.Controllers.FormulaDialog.sCategoryDatabase": "Baza danych",
"SSE.Controllers.FormulaDialog.sCategoryDateAndTime": "Data i czas",
"SSE.Controllers.FormulaDialog.sCategoryEngineering": "Inżyniera",
"SSE.Controllers.FormulaDialog.sCategoryFinancial": "Finansowe",
"SSE.Controllers.FormulaDialog.sCategoryInformation": "Informacja",
"SSE.Controllers.FormulaDialog.sCategoryLookupAndReference": "Wyszukiwanie i odniesienie",
"SSE.Controllers.FormulaDialog.sCategoryMathematic": "Matematyczne i trygonometryczne",
"SSE.Controllers.FormulaDialog.sCategoryStatistical": "Statystyczny",
"SSE.Controllers.FormulaDialog.sCategoryTextAndData": "Tekst i data",
"SSE.Controllers.DocumentHolder.alignmentText": "Wyrównanie",
"SSE.Controllers.DocumentHolder.centerText": "Środek",
"SSE.Controllers.DocumentHolder.deleteColumnText": "Usuń kolumnę",
@ -1165,19 +1178,6 @@
"SSE.Views.FormulaDialog.textGroupDescription": "Wybierz grupę funkcji",
"SSE.Views.FormulaDialog.textListDescription": "Wybierz funkcję",
"SSE.Views.FormulaDialog.txtTitle": "Wstaw funkcję",
"SSE.Views.FormulaDialog.sCategoryAll": "Wszystko",
"SSE.Views.FormulaDialog.sCategoryLast10": "10 ostatnio używanych",
"SSE.Views.FormulaDialog.sCategoryLogical": "Logiczny",
"SSE.Views.FormulaDialog.sCategoryCube": "Sześcian",
"SSE.Views.FormulaDialog.sCategoryDatabase": "Baza danych",
"SSE.Views.FormulaDialog.sCategoryDateAndTime": "Data i czas",
"SSE.Views.FormulaDialog.sCategoryEngineering": "Inżyniera",
"SSE.Views.FormulaDialog.sCategoryFinancial": "Finansowe",
"SSE.Views.FormulaDialog.sCategoryInformation": "Informacja",
"SSE.Views.FormulaDialog.sCategoryLookupAndReference": "Wyszukiwanie i odniesienie",
"SSE.Views.FormulaDialog.sCategoryMathematic": "Matematyczne i trygonometryczne",
"SSE.Views.FormulaDialog.sCategoryStatistical": "Statystyczny",
"SSE.Views.FormulaDialog.sCategoryTextAndData": "Tekst i data",
"SSE.Views.HyperlinkSettingsDialog.cancelButtonText": "Anuluj",
"SSE.Views.HyperlinkSettingsDialog.strDisplay": "Pokaż",
"SSE.Views.HyperlinkSettingsDialog.strLinkTo": "Link do",

26
apps/spreadsheeteditor/main/locale/ru.json
View file

@ -223,6 +223,19 @@
"Common.Views.SignSettingsDialog.textShowDate": "Показывать дату подписи в строке подписи",
"Common.Views.SignSettingsDialog.textTitle": "Настройка подписи",
"Common.Views.SignSettingsDialog.txtEmpty": "Это поле необходимо заполнить",
"SSE.Controllers.FormulaDialog.sCategoryAll": "Все",
"SSE.Controllers.FormulaDialog.sCategoryLast10": "10 недавно использовавшихся",
"SSE.Controllers.FormulaDialog.sCategoryCube": "Кубические",
"SSE.Controllers.FormulaDialog.sCategoryDatabase": "Базы данных",
"SSE.Controllers.FormulaDialog.sCategoryDateAndTime": "Дата и время",
"SSE.Controllers.FormulaDialog.sCategoryEngineering": "Инженерные",
"SSE.Controllers.FormulaDialog.sCategoryFinancial": "Финансовые",
"SSE.Controllers.FormulaDialog.sCategoryInformation": "Информационные",
"SSE.Controllers.FormulaDialog.sCategoryLogical": "Логические",
"SSE.Controllers.FormulaDialog.sCategoryLookupAndReference": "Поиск и ссылки",
"SSE.Controllers.FormulaDialog.sCategoryMathematic": "Математические",
"SSE.Controllers.FormulaDialog.sCategoryStatistical": "Статистические",
"SSE.Controllers.FormulaDialog.sCategoryTextAndData": "Текст и данные",
"SSE.Controllers.DocumentHolder.alignmentText": "Выравнивание",
"SSE.Controllers.DocumentHolder.centerText": "По центру",
"SSE.Controllers.DocumentHolder.deleteColumnText": "Удалить столбец",
@ -1582,19 +1595,6 @@
"SSE.Views.FormulaDialog.textGroupDescription": "Выберите группу функций",
"SSE.Views.FormulaDialog.textListDescription": "Выберите функцию",
"SSE.Views.FormulaDialog.txtTitle": "Вставить функцию",
"SSE.Views.FormulaDialog.sCategoryAll": "Все",
"SSE.Views.FormulaDialog.sCategoryLast10": "10 недавно использовавшихся",
"SSE.Views.FormulaDialog.sCategoryCube": "Кубические",
"SSE.Views.FormulaDialog.sCategoryDatabase": "Базы данных",
"SSE.Views.FormulaDialog.sCategoryDateAndTime": "Дата и время",
"SSE.Views.FormulaDialog.sCategoryEngineering": "Инженерные",
"SSE.Views.FormulaDialog.sCategoryFinancial": "Финансовые",
"SSE.Views.FormulaDialog.sCategoryInformation": "Информационные",
"SSE.Views.FormulaDialog.sCategoryLogical": "Логические",
"SSE.Views.FormulaDialog.sCategoryLookupAndReference": "Поиск и ссылки",
"SSE.Views.FormulaDialog.sCategoryMathematic": "Математические",
"SSE.Views.FormulaDialog.sCategoryStatistical": "Статистические",
"SSE.Views.FormulaDialog.sCategoryTextAndData": "Текст и данные",
"SSE.Views.HyperlinkSettingsDialog.cancelButtonText": "Отмена",
"SSE.Views.HyperlinkSettingsDialog.strDisplay": "Отображать",
"SSE.Views.HyperlinkSettingsDialog.strLinkTo": "Связать с",