[SSE] Change rules in the toolbar
This commit is contained in:
parent
abcb2d78e3
commit
35cab5fe73
|
@ -593,7 +593,8 @@ define(function(){ 'use strict';
|
|||
textIconSets: 'Icon sets',
|
||||
textFormula: 'Formula',
|
||||
exampleText: 'AaBbCcYyZz',
|
||||
noFormatText: 'No format set'
|
||||
noFormatText: 'No format set',
|
||||
textValue: 'Value is'
|
||||
}
|
||||
})(), Common.define.conditionalData || {});
|
||||
});
|
||||
|
|
|
@ -396,9 +396,10 @@ define([
|
|||
if (toolbar.btnCondFormat.rendered) {
|
||||
toolbar.btnCondFormat.menu.on('show:before', _.bind(this.onShowBeforeCondFormat, this));
|
||||
toolbar.btnCondFormat.menu.on('item:click', _.bind(this.onCondFormatMenu, this));
|
||||
toolbar.btnCondFormat.menu.items[7].menu.on('item:click', _.bind(this.onCondFormatMenu, this));
|
||||
toolbar.btnCondFormat.menu.items[9].menu.on('item:click', _.bind(this.onCondFormatMenu, this));
|
||||
toolbar.btnCondFormat.menu.items[21].menu.on('item:click', _.bind(this.onCondFormatMenu, this));
|
||||
for (var i=0; i<7; i++) {
|
||||
toolbar.btnCondFormat.menu.items[i].menu.on('item:click', _.bind(this.onCondFormatMenu, this));
|
||||
}
|
||||
toolbar.btnCondFormat.menu.items[15].menu.on('item:click', _.bind(this.onCondFormatMenu, this));
|
||||
}
|
||||
Common.Gateway.on('insertimage', _.bind(this.insertImage, this));
|
||||
|
||||
|
|
|
@ -91,7 +91,7 @@ define([ 'text!spreadsheeteditor/main/app/template/FormatRulesEditDlg.template',
|
|||
|
||||
var rules = [
|
||||
{
|
||||
name: this.textValue,
|
||||
name: Common.define.conditionalData.textValue,
|
||||
type: Asc.c_oAscCFType.cellIs,
|
||||
rules: [
|
||||
{ name: Common.define.conditionalData.textGreater, subtype: Asc.c_oAscCFOperator.greaterThan},
|
||||
|
@ -105,7 +105,7 @@ define([ 'text!spreadsheeteditor/main/app/template/FormatRulesEditDlg.template',
|
|||
]
|
||||
},
|
||||
{
|
||||
name: this.textRanked,
|
||||
name: Common.define.conditionalData.textTop + '/' + Common.define.conditionalData.textBottom,
|
||||
type: Asc.c_oAscCFType.top10,
|
||||
rules: [
|
||||
{ name: Common.define.conditionalData.textTop, subtype: 0},
|
||||
|
@ -2045,8 +2045,6 @@ define([ 'text!spreadsheeteditor/main/app/template/FormatRulesEditDlg.template',
|
|||
textInvalidRange: 'ERROR! Invalid cells range',
|
||||
notcriticalErrorTitle: 'Warning',
|
||||
textFormat: 'Format',
|
||||
textValue: 'Value is',
|
||||
textRanked: 'Ranked',
|
||||
textCustom: 'Custom',
|
||||
textBold: 'Bold',
|
||||
textItalic: 'Italic',
|
||||
|
|
|
@ -1945,32 +1945,50 @@ define([
|
|||
this.btnCondFormat.setMenu( new Common.UI.Menu({
|
||||
items: [
|
||||
{
|
||||
caption : Common.define.conditionalData.textGreater,
|
||||
type : Asc.c_oAscCFType.cellIs,
|
||||
value : Asc.c_oAscCFOperator.greaterThan
|
||||
caption : Common.define.conditionalData.textValue,
|
||||
menu : new Common.UI.Menu({
|
||||
menuAlign : 'tl-tr',
|
||||
items: [
|
||||
{ caption : Common.define.conditionalData.textGreater, type : Asc.c_oAscCFType.cellIs, value : Asc.c_oAscCFOperator.greaterThan },
|
||||
{ caption : Common.define.conditionalData.textGreaterEq, type : Asc.c_oAscCFType.cellIs, value : Asc.c_oAscCFOperator.greaterThanOrEqual },
|
||||
{ caption : Common.define.conditionalData.textLess, type : Asc.c_oAscCFType.cellIs, value : Asc.c_oAscCFOperator.lessThan },
|
||||
{ caption : Common.define.conditionalData.textLessEq, type : Asc.c_oAscCFType.cellIs, value : Asc.c_oAscCFOperator.lessThanOrEqual },
|
||||
{ caption : Common.define.conditionalData.textEqual, type : Asc.c_oAscCFType.cellIs, value : Asc.c_oAscCFOperator.equal },
|
||||
{ caption : Common.define.conditionalData.textNotEqual, type : Asc.c_oAscCFType.cellIs, value : Asc.c_oAscCFOperator.notEqual },
|
||||
{ caption : Common.define.conditionalData.textBetween, type : Asc.c_oAscCFType.cellIs, value : Asc.c_oAscCFOperator.between },
|
||||
{ caption : Common.define.conditionalData.textNotBetween, type : Asc.c_oAscCFType.cellIs, value : Asc.c_oAscCFOperator.notBetween }
|
||||
]
|
||||
})
|
||||
},
|
||||
{
|
||||
caption : Common.define.conditionalData.textLess,
|
||||
type : Asc.c_oAscCFType.cellIs,
|
||||
value : Asc.c_oAscCFOperator.lessThan
|
||||
},
|
||||
{
|
||||
caption : Common.define.conditionalData.textEqual,
|
||||
type : Asc.c_oAscCFType.cellIs,
|
||||
value : Asc.c_oAscCFOperator.equal
|
||||
},
|
||||
{caption: '--'},
|
||||
{
|
||||
caption : Common.define.conditionalData.textBetween,
|
||||
type : Asc.c_oAscCFType.cellIs,
|
||||
value : Asc.c_oAscCFOperator.between
|
||||
},
|
||||
{
|
||||
caption : this.textTop10,
|
||||
caption : Common.define.conditionalData.textTop + '/' + Common.define.conditionalData.textBottom,
|
||||
type : Asc.c_oAscCFType.top10,
|
||||
value : 0
|
||||
menu : new Common.UI.Menu({
|
||||
menuAlign : 'tl-tr',
|
||||
items: [
|
||||
{ caption: Common.define.conditionalData.textTop + ' 10', type: Asc.c_oAscCFType.top10, value: 0 },
|
||||
{ caption: Common.define.conditionalData.textBottom + ' 10', type: Asc.c_oAscCFType.top10, value: 1 }
|
||||
]
|
||||
})
|
||||
},
|
||||
{
|
||||
caption: Common.define.conditionalData.textAverage,
|
||||
menu: new Common.UI.Menu({
|
||||
menuAlign : 'tl-tr',
|
||||
items: [
|
||||
{ caption: Common.define.conditionalData.textAbove, type: Asc.c_oAscCFType.aboveAverage, value: 0},
|
||||
{ caption: Common.define.conditionalData.textBelow, type: Asc.c_oAscCFType.aboveAverage, value: 1},
|
||||
{ caption: Common.define.conditionalData.textEqAbove, type: Asc.c_oAscCFType.aboveAverage, value: 2},
|
||||
{ caption: Common.define.conditionalData.textEqBelow, type: Asc.c_oAscCFType.aboveAverage,value: 3},
|
||||
{ caption: Common.define.conditionalData.text1Above, type: Asc.c_oAscCFType.aboveAverage, value: 4},
|
||||
{ caption: Common.define.conditionalData.text1Below, type: Asc.c_oAscCFType.aboveAverage, value: 5},
|
||||
{ caption: Common.define.conditionalData.text2Above, type: Asc.c_oAscCFType.aboveAverage, value: 6},
|
||||
{ caption: Common.define.conditionalData.text2Below, type: Asc.c_oAscCFType.aboveAverage, value: 7},
|
||||
{ caption: Common.define.conditionalData.text3Above, type: Asc.c_oAscCFType.aboveAverage, value: 8},
|
||||
{ caption: Common.define.conditionalData.text3Below, type: Asc.c_oAscCFType.aboveAverage, value: 9}
|
||||
]
|
||||
})
|
||||
},
|
||||
{caption: '--'},
|
||||
{
|
||||
caption : Common.define.conditionalData.textText,
|
||||
menu : new Common.UI.Menu({
|
||||
|
@ -1983,7 +2001,6 @@ define([
|
|||
]
|
||||
})
|
||||
},
|
||||
{caption: '--'},
|
||||
{
|
||||
caption : Common.define.conditionalData.textDate,
|
||||
menu : new Common.UI.Menu({
|
||||
|
@ -2002,14 +2019,27 @@ define([
|
|||
]
|
||||
})
|
||||
},
|
||||
{caption: '--'},
|
||||
{
|
||||
caption : Common.define.conditionalData.textBlank,
|
||||
type : Asc.c_oAscCFType.containsBlanks
|
||||
caption: Common.define.conditionalData.textBlank + '/' + Common.define.conditionalData.textError,
|
||||
menu : new Common.UI.Menu({
|
||||
menuAlign : 'tl-tr',
|
||||
items: [
|
||||
{ caption: Common.define.conditionalData.textBlanks, type: Asc.c_oAscCFType.containsBlanks },
|
||||
{ caption: Common.define.conditionalData.textNotBlanks,type: Asc.c_oAscCFType.notContainsBlanks },
|
||||
{ caption: Common.define.conditionalData.textErrors, type: Asc.c_oAscCFType.containsErrors },
|
||||
{ caption: Common.define.conditionalData.textNotErrors,type: Asc.c_oAscCFType.notContainsErrors }
|
||||
]
|
||||
})
|
||||
},
|
||||
{
|
||||
caption : Common.define.conditionalData.textDuplicate,
|
||||
type : Asc.c_oAscCFType.duplicateValues
|
||||
caption: Common.define.conditionalData.textDuplicate + '/' + Common.define.conditionalData.textUnique,
|
||||
menu : new Common.UI.Menu({
|
||||
menuAlign : 'tl-tr',
|
||||
items: [
|
||||
{ caption: Common.define.conditionalData.textDuplicate, type: Asc.c_oAscCFType.duplicateValues },
|
||||
{ caption: Common.define.conditionalData.textUnique, type: Asc.c_oAscCFType.uniqueValues }
|
||||
]
|
||||
})
|
||||
},
|
||||
{caption: '--'},
|
||||
this.mnuDataBars = new Common.UI.MenuItem({
|
||||
|
@ -2600,7 +2630,6 @@ define([
|
|||
tipPrintTitles: 'Print titles',
|
||||
capBtnColorSchemas: 'Color Scheme',
|
||||
tipCondFormat: 'Conditional formatting',
|
||||
textTop10: 'Top 10',
|
||||
textDataBars: 'Data Bars',
|
||||
textColorScales: 'Color Scales',
|
||||
textNewRule: 'New Rule',
|
||||
|
|
|
@ -98,6 +98,7 @@
|
|||
"Common.define.conditionalData.textTop": "Top",
|
||||
"Common.define.conditionalData.textUnique": "Unique",
|
||||
"Common.define.conditionalData.textYesterday": "Yesterday",
|
||||
"Common.define.conditionalData.textValue": "Value is",
|
||||
"Common.Translation.warnFileLocked": "The file is being edited in another app. You can continue editing and save it as a copy.",
|
||||
"Common.UI.ColorButton.textAutoColor": "Automatic",
|
||||
"Common.UI.ColorButton.textNewColor": "Add New Custom Color",
|
||||
|
@ -2073,7 +2074,6 @@
|
|||
"SSE.Views.FormatRulesEditDlg.textPosition": "Position",
|
||||
"SSE.Views.FormatRulesEditDlg.textPositive": "Positive",
|
||||
"SSE.Views.FormatRulesEditDlg.textPreview": "Preview",
|
||||
"SSE.Views.FormatRulesEditDlg.textRanked": "Ranked",
|
||||
"SSE.Views.FormatRulesEditDlg.textRelativeRef": "You cannot use relative references in conditional formatting criteria for color scales, data bars, and icon sets.",
|
||||
"SSE.Views.FormatRulesEditDlg.textReverse": "Reverse Icons Order",
|
||||
"SSE.Views.FormatRulesEditDlg.textRight2Left": "Right to left",
|
||||
|
@ -2091,7 +2091,6 @@
|
|||
"SSE.Views.FormatRulesEditDlg.textSuperscript": "Superscript",
|
||||
"SSE.Views.FormatRulesEditDlg.textTopBorders": "Top Borders",
|
||||
"SSE.Views.FormatRulesEditDlg.textUnderline": "Underline",
|
||||
"SSE.Views.FormatRulesEditDlg.textValue": "Value is",
|
||||
"SSE.Views.FormatRulesEditDlg.tipBorders": "Borders",
|
||||
"SSE.Views.FormatRulesEditDlg.tipNumFormat": "Number Format",
|
||||
"SSE.Views.FormatRulesEditDlg.txtAccounting": "Accounting",
|
||||
|
@ -3104,7 +3103,6 @@
|
|||
"SSE.Views.Toolbar.textThisSheet": "From this worksheet",
|
||||
"SSE.Views.Toolbar.textThisTable": "From this table",
|
||||
"SSE.Views.Toolbar.textTop": "Top: ",
|
||||
"SSE.Views.Toolbar.textTop10": "Top 10",
|
||||
"SSE.Views.Toolbar.textTopBorders": "Top Borders",
|
||||
"SSE.Views.Toolbar.textUnderline": "Underline",
|
||||
"SSE.Views.Toolbar.textVertical": "Vertical Text",
|
||||
|
|
Loading…
Reference in a new issue