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

Merge pull request #393 from ONLYOFFICE/feature/color-button

Browse source 
Feature/color button
This commit is contained in:
Julia Radzhabova 2020-04-30 15:21:52 +03:00 committed by GitHub
parent 8f327d08cb 7e49822439
commit cf37f3390d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
26 changed files with 468 additions and 1173 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

91
apps/common/main/lib/component/ColorButton.js
View file

@ -34,11 +34,12 @@ if (Common === undefined)
var Common = {};
define([
'common/main/lib/component/Button'
'common/main/lib/component/Button',
'common/main/lib/component/ThemeColorPalette'
], function () {
'use strict';
Common.UI.ColorButton = Common.UI.Button.extend({
Common.UI.ColorButton = Common.UI.Button.extend(_.extend({
options : {
hint: false,
enableToggle: false,
@ -49,25 +50,85 @@ define([
'<div class="btn-group" id="<%= id %>">',
'<button type="button" class="btn btn-color dropdown-toggle <%= cls %>" data-toggle="dropdown" style="<%= style %>">',
'<span>&nbsp;</span>',
'<span class="inner-box-caret"><i class="caret img-commonctrl"></i></span>',
'</button>',
'</div>'
].join('')),
initialize : function(options) {
if (!options.menu && options.menu !== false) {// menu==null or undefined
// set default menu
var me = this;
options.menu = me.getMenu(options);
me.on('render:after', function(btn) {
me.getPicker(options.color);
});
}
Common.UI.Button.prototype.initialize.call(this, options);
},
render: function(parentEl) {
Common.UI.Button.prototype.render.call(this, parentEl);
if (this.options.color!==undefined)
this.setColor(this.options.color);
},
onColorSelect: function(picker, color) {
this.setColor(color);
this.trigger('color:select', this, color);
},
setColor: function(color) {
var border_color, clr,
span = $(this.cmpEl).find('button span');
var span = $(this.cmpEl).find('button span:nth-child(1)');
this.color = color;
if ( color== 'transparent' ) {
border_color = '#BEBEBE';
clr = color;
span.addClass('color-transparent');
} else {
border_color = 'transparent';
clr = (typeof(color) == 'object') ? '#'+color.color : '#'+color;
span.removeClass('color-transparent');
span.toggleClass('color-transparent', color=='transparent');
span.css({'background-color': (color=='transparent') ? color : ((typeof(color) == 'object') ? '#'+color.color : '#'+color)});
},
getPicker: function(color) {
if (!this.colorPicker) {
this.colorPicker = new Common.UI.ThemeColorPalette({
el: this.cmpEl.find('#' + this.menu.id + '-color-menu'),
transparent: this.options.transparent,
value: color
});
this.colorPicker.on('select', _.bind(this.onColorSelect, this));
this.cmpEl.find('#' + this.menu.id + '-color-new').on('click', _.bind(this.addNewColor, this));
}
span.css({'background-color': clr, 'border-color': border_color});
}
});
return this.colorPicker;
},
getMenu: function(options) {
if (typeof this.menu !== 'object') {
options = options || this.options;
var id = Common.UI.getId(),
menu = new Common.UI.Menu({
id: id,
additionalAlign: options.additionalAlign,
items: (options.additionalItems ? options.additionalItems : []).concat([
{ template: _.template('<div id="' + id + '-color-menu" style="width: 169px; height: 220px; margin: 10px;"></div>') },
{ template: _.template('<a id="' + id + '-color-new" style="padding-left:12px;">' + this.textNewColor + '</a>') }
])
});
return menu;
}
return this.menu;
},
setMenu: function (m) {
m = m || this.getMenu();
Common.UI.Button.prototype.setMenu.call(this, m);
this.getPicker(this.options.color);
},
addNewColor: function() {
this.colorPicker && this.colorPicker.addNewColor((typeof(this.color) == 'object') ? this.color.color : this.color);
},
textNewColor: 'Add New Custom Color'
}, Common.UI.ColorButton || {}));
});

28
apps/common/main/lib/view/ListSettingsDialog.js
View file

@ -119,24 +119,12 @@ define([
});
this.btnColor = new Common.UI.ColorButton({
parentEl: $window.find('#id-dlg-list-color'),
style: "width:53px;",
menu : new Common.UI.Menu({
additionalAlign: this.menuAddAlign,
items: [
{ template: _.template('<div id="id-dlg-list-color-menu" style="width: 169px; height: 220px; margin: 10px;"></div>') },
{ template: _.template('<a id="id-dlg-list-color-new" style="padding-left:12px;">' + this.textNewColor + '</a>') }
]
})
additionalAlign: this.menuAddAlign
});
this.btnColor.on('render:after', function(btn) {
me.colors = new Common.UI.ThemeColorPalette({
el: $('#id-dlg-list-color-menu'),
transparent: false
});
me.colors.on('select', _.bind(me.onColorsSelect, me));
});
this.btnColor.render($window.find('#id-dlg-list-color'));
$('#id-dlg-list-color-new').on('click', _.bind(this.addNewColor, this, this.colors));
this.btnColor.on('color:select', _.bind(this.onColorsSelect, this));
this.colors = this.btnColor.getPicker();
this.spnStart = new Common.UI.MetricSpinner({
el : $window.find('#id-dlg-list-start'),
@ -172,12 +160,7 @@ define([
this.colors.updateColors(Common.Utils.ThemeColor.getEffectColors(), Common.Utils.ThemeColor.getStandartColors());
},
addNewColor: function(picker, btn) {
picker.addNewColor((typeof(btn.color) == 'object') ? btn.color.color : btn.color);
},
onColorsSelect: function(picker, color) {
this.btnColor.setColor(color);
onColorsSelect: function(btn, color) {
if (this._changedProps) {
this._changedProps.asc_putBulletColor(Common.Utils.ThemeColor.getRgbColor(color));
}
@ -271,7 +254,6 @@ define([
txtSize: 'Size',
txtColor: 'Color',
txtOfText: '% of text',
textNewColor: 'Add New Custom Color',
txtStart: 'Start at',
txtBullet: 'Bullet',
tipChange: 'Change bullet'

30
apps/common/main/resources/less/buttons.less
View file

@ -544,16 +544,26 @@
}
.btn-color {
padding: 2px;
width: 45px;
height: 22px;
padding: 1px 11px 1px 1px;
border:1px solid @input-border;
.border-radius(@border-radius-small);
span {
display:block;
border:1px solid @input-border;
span:nth-child(1) {
float: left;
width: 100%;
height: 100%;
border: 1px solid rgba(0, 0, 0, 0.2);
background-color: transparent;
}
.inner-box-caret {
position: absolute;
right: 0;
top: 2px;
}
&,
&:hover,
.over,
@ -570,11 +580,19 @@
.color-transparent {
&:before {
height: 40px;
transform: translate(20px, -12px) rotate(69deg);
border-right: 1px solid red;
height: 34px;
transform: translate(16px, -9px) rotate(62deg);
left: 0;
}
}
&:active:not(.disabled),
&.active:not(.disabled) {
.caret {
background-position: @arrow-small-offset-x @arrow-small-offset-y;
}
}
}
.btn-options {

43
apps/documenteditor/main/app/view/ControlSettingsDialog.js
View file

@ -126,31 +126,18 @@ define([ 'text!documenteditor/main/app/template/ControlSettingsDialog.template',
this.cmbShow.setValue(Asc.c_oAscSdtAppearance.Frame);
this.btnColor = new Common.UI.ColorButton({
style: "width:45px;",
menu : new Common.UI.Menu({
additionalAlign: this.menuAddAlign,
items: [
{
id: 'control-settings-system-color',
caption: this.textSystemColor,
template: _.template('<a tabindex="-1" type="menuitem"><span class="menu-item-icon" style="background-image: none; width: 12px; height: 12px; margin: 1px 7px 0 -7px; background-color: #dcdcdc;"></span><%= caption %></a>')
},
{caption: '--'},
{ template: _.template('<div id="control-settings-color-menu" style="width: 169px; height: 220px; margin: 10px;"></div>') },
{ template: _.template('<a id="control-settings-color-new" style="padding-left:12px;">' + me.textNewColor + '</a>') }
]
})
parentEl: $('#control-settings-color-btn'),
additionalItems: [{
id: 'control-settings-system-color',
caption: this.textSystemColor,
template: _.template('<a tabindex="-1" type="menuitem"><span class="menu-item-icon" style="background-image: none; width: 12px; height: 12px; margin: 1px 7px 0 -7px; background-color: #dcdcdc;"></span><%= caption %></a>')
},
{caption: '--'}],
additionalAlign: this.menuAddAlign,
color: '000000'
});
this.btnColor.on('render:after', function(btn) {
me.colors = new Common.UI.ThemeColorPalette({
el: $('#control-settings-color-menu')
});
me.colors.on('select', _.bind(me.onColorsSelect, me));
});
this.btnColor.render( $('#control-settings-color-btn'));
this.btnColor.setColor('000000');
this.btnColor.menu.items[3].on('click', _.bind(this.addNewColor, this, this.colors, this.btnColor));
this.btnColor.on('color:select', _.bind(this.onColorsSelect, this));
this.colors = this.btnColor.getPicker();
$('#control-settings-system-color').on('click', _.bind(this.onSystemColor, this));
this.btnApplyAll = new Common.UI.Button({
@ -264,8 +251,7 @@ define([ 'text!documenteditor/main/app/template/ControlSettingsDialog.template',
this.afterRender();
},
onColorsSelect: function(picker, color) {
this.btnColor.setColor(color);
onColorsSelect: function(btn, color) {
var clr_item = this.btnColor.menu.$el.find('#control-settings-system-color > a');
clr_item.hasClass('selected') && clr_item.removeClass('selected');
this.isSystemColor = false;
@ -275,10 +261,6 @@ define([ 'text!documenteditor/main/app/template/ControlSettingsDialog.template',
this.colors.updateColors(Common.Utils.ThemeColor.getEffectColors(), Common.Utils.ThemeColor.getStandartColors());
},
addNewColor: function(picker, btn) {
picker.addNewColor((typeof(btn.color) == 'object') ? btn.color.color : btn.color);
},
onSystemColor: function(e) {
var color = Common.Utils.ThemeColor.getHexColor(220, 220, 220);
this.btnColor.setColor(color);
@ -634,7 +616,6 @@ define([ 'text!documenteditor/main/app/template/ControlSettingsDialog.template',
textColor: 'Color',
textBox: 'Bounding box',
textNone: 'None',
textNewColor: 'Add New Custom Color',
textApplyAll: 'Apply to All',
textAppearance: 'Appearance',
textSystemColor: 'System',

89
apps/documenteditor/main/app/view/DropcapSettingsAdvanced.js
View file

@ -160,73 +160,39 @@ define([
this.BorderSize = {ptValue: rec.get('value'), pxValue: rec.get('pxValue')};
this.btnBorderColor = new Common.UI.ColorButton({
style: "width:45px;",
menu : new Common.UI.Menu({
additionalAlign: this.menuAddAlign,
items: [
{ template: _.template('<div id="drop-advanced-border-color-menu" style="width: 169px; height: 220px; margin: 10px;"></div>') },
{ template: _.template('<a id="drop-advanced-border-color-new" style="padding-left:12px;">' + me.textNewColor + '</a>') }
]
})
parentEl: $('#drop-advanced-button-bordercolor'),
additionalAlign: this.menuAddAlign,
color: '000000'
});
this.btnBorderColor.on('render:after', function(btn) {
me.colorsBorder = new Common.UI.ThemeColorPalette({
el: $('#drop-advanced-border-color-menu')
})
.on('select', _.bind(function(picker, color) {
me.btnBorderColor.setColor(color);
me.tableStyler.setVirtualBorderColor((typeof(color) == 'object') ? color.color : color);
}, me));
});
this.btnBorderColor.render( $('#drop-advanced-button-bordercolor'));
this.btnBorderColor.setColor('000000');
this.btnBorderColor.menu.cmpEl.on('click', '#drop-advanced-border-color-new', _.bind(function() {
me.colorsBorder.addNewColor((typeof(me.btnBorderColor.color) == 'object') ? me.btnBorderColor.color.color : me.btnBorderColor.color);
}, me));
this.btnBorderColor.on('color:select', _.bind(function(btn, color) {
this.tableStyler.setVirtualBorderColor((typeof(color) == 'object') ? color.color : color);
}, this));
this.colorsBorder = this.btnBorderColor.getPicker();
this.btnBackColor = new Common.UI.ColorButton({
style: "width:45px;",
menu : new Common.UI.Menu({
additionalAlign: this.menuAddAlign,
items: [
{ template: _.template('<div id="drop-advanced-back-color-menu" style="width: 169px; height: 220px; margin: 10px;"></div>') },
{ template: _.template('<a id="drop-advanced-back-color-new" style="padding-left:12px;">' + me.textNewColor + '</a>') }
]
})
parentEl: $('#drop-advanced-button-color'),
additionalAlign: this.menuAddAlign,
transparent: true
});
this.btnBackColor.on('color:select', _.bind(function(btn, color) {
var clr, border;
me.paragraphShade = color;
this.btnBackColor.on('render:after', function(btn) {
me.colorsBack = new Common.UI.ThemeColorPalette({
el: $('#drop-advanced-back-color-menu'),
transparent: true
})
.on('select', _.bind(function(picker, color) {
var clr, border;
me.btnBackColor.setColor(color);
me.paragraphShade = color;
if (me._changedProps) {
if (me._changedProps.get_Shade()===undefined || me._changedProps.get_Shade()===null) {
me._changedProps.put_Shade(new Asc.asc_CParagraphShd());
}
if (color=='transparent') {
me._changedProps.get_Shade().put_Value(Asc.c_oAscShdNil);
} else {
me._changedProps.get_Shade().put_Value(Asc.c_oAscShdClear);
me._changedProps.get_Shade().put_Color(Common.Utils.ThemeColor.getRgbColor(color));
}
if (me._changedProps) {
if (me._changedProps.get_Shade()===undefined || me._changedProps.get_Shade()===null) {
me._changedProps.put_Shade(new Asc.asc_CParagraphShd());
}
var colorstr = (typeof(color) == 'object') ? color.color : color;
me.tableStyler.setCellsColor(colorstr);
}, me));
});
this.btnBackColor.render( $('#drop-advanced-button-color'));
this.btnBackColor.menu.cmpEl.on('click', '#drop-advanced-back-color-new', _.bind(function() {
me.colorsBack.addNewColor();
}, me));
if (color=='transparent') {
me._changedProps.get_Shade().put_Value(Asc.c_oAscShdNil);
} else {
me._changedProps.get_Shade().put_Value(Asc.c_oAscShdClear);
me._changedProps.get_Shade().put_Color(Common.Utils.ThemeColor.getRgbColor(color));
}
}
var colorstr = (typeof(color) == 'object') ? color.color : color;
me.tableStyler.setCellsColor(colorstr);
}, this));
this.colorsBack = this.btnBackColor.getPicker();
this.spnMarginTop = new Common.UI.MetricSpinner({
el : $('#drop-advanced-input-top'),
@ -1163,7 +1129,6 @@ define([
textBackColor: 'Background Color',
textBorderDesc: 'Click on diagramm or use buttons to select borders',
txtNoBorders: 'No borders',
textNewColor: 'Add New Custom Color',
textPosition: 'Position',
textAlign: 'Alignment',
textTop: 'Top',

55
apps/documenteditor/main/app/view/ListSettingsDialog.js
View file

@ -155,39 +155,26 @@ define([
$window.find('.dlg-btn').on('click', _.bind(this.onBtnClick, this));
this.btnColor = new Common.UI.ColorButton({
style: 'width:45px;',
menu : new Common.UI.Menu({
additionalAlign: this.menuAddAlign,
items: [
{
id: 'id-dlg-bullet-text-color',
caption: this.txtLikeText,
checkable: true,
toggleGroup: 'list-settings-color'
},
{
id: 'id-dlg-bullet-auto-color',
caption: this.textAuto,
checkable: true,
toggleGroup: 'list-settings-color'
},
{caption: '--'},
{ template: _.template('<div id="id-dlg-bullet-color-menu" style="width: 169px; height: 220px; margin: 10px;"></div>') },
{ template: _.template('<a id="id-dlg-bullet-color-new" style="padding-left:12px;">' + this.textNewColor + '</a>') }
]
})
parentEl: $window.find('#id-dlg-bullet-color'),
additionalItems: [{
id: 'id-dlg-bullet-text-color',
caption: this.txtLikeText,
checkable: true,
toggleGroup: 'list-settings-color'
},
{
id: 'id-dlg-bullet-auto-color',
caption: this.textAuto,
checkable: true,
toggleGroup: 'list-settings-color'
},
{caption: '--'}],
additionalAlign: this.menuAddAlign
});
this.btnColor.on('render:after', function(btn) {
me.colors = new Common.UI.ThemeColorPalette({
el: $window.find('#id-dlg-bullet-color-menu'),
transparent: false
});
me.colors.on('select', _.bind(me.onColorsSelect, me));
});
this.btnColor.render($window.find('#id-dlg-bullet-color'));
$window.find('#id-dlg-bullet-color-new').on('click', _.bind(this.addNewColor, this, this.colors));
this.btnColor.on('color:select', _.bind(this.onColorsSelect, this));
this.btnColor.menu.items[0].on('toggle', _.bind(this.onLikeTextColor, this));
this.btnColor.menu.items[1].on('toggle', _.bind(this.onAutoColor, this));
this.colors = this.btnColor.getPicker();
this.btnEdit = new Common.UI.Button({
el: $window.find('#id-dlg-bullet-font')
@ -363,10 +350,6 @@ define([
this.colors.updateColors(Common.Utils.ThemeColor.getEffectColors(), Common.Utils.ThemeColor.getStandartColors());
},
addNewColor: function(picker, btn) {
picker.addNewColor((typeof(btn.color) == 'object') ? btn.color.color : btn.color);
},
onAutoColor: function(item, state) {
if (!!state) {
var color = Common.Utils.ThemeColor.getHexColor(0, 0, 0);
@ -399,8 +382,7 @@ define([
}
},
onColorsSelect: function(picker, color) {
this.btnColor.setColor(color);
onColorsSelect: function(btn, color) {
if (this._changedProps) {
if (!this._changedProps.get_TextPr()) this._changedProps.put_TextPr(new AscCommonWord.CTextPr());
this._changedProps.get_TextPr().put_Color(Common.Utils.ThemeColor.getRgbColor(color));
@ -564,7 +546,6 @@ define([
txtTitle: 'List Settings',
txtSize: 'Size',
txtColor: 'Color',
textNewColor: 'Add New Custom Color',
txtBullet: 'Bullet',
txtFont: 'Font and Symbol',
txtAlign: 'Alignment',

29
apps/documenteditor/main/app/view/ParagraphSettings.js
View file

@ -162,11 +162,11 @@ define([
this.lockedControls.push(this.chAddInterval);
this.btnColor = new Common.UI.ColorButton({
style: "width:45px;",
parentEl: $markup.findById('#paragraph-color-btn'),
disabled: this._locked,
transparent: true,
menu : true
});
this.btnColor.render($markup.findById('#paragraph-color-btn'));
this.lockedControls.push(this.btnColor);
this.numLineHeight.on('change', this.onNumLineHeightChange.bind(this));
@ -178,6 +178,7 @@ define([
this.chAddInterval.on('change', this.onAddIntervalChange.bind(this));
this.cmbLineRule.on('selected', this.onLineRuleSelect.bind(this));
this.cmbLineRule.on('hide:after', this.onHideMenus.bind(this));
this.btnColor.on('color:select', this.onColorPickerSelect.bind(this));
this.linkAdvanced = $markup.findById('#paragraph-advanced-link');
this.linkAdvanced.toggleClass('disabled', this._locked);
@ -264,8 +265,7 @@ define([
}
},
onColorPickerSelect: function(picker, color) {
this.btnColor.setColor(color);
onColorPickerSelect: function(btn, color) {
this.BackColor = color;
this._state.BackColor = this.BackColor;
@ -441,24 +441,10 @@ define([
}
},
addNewColor: function() {
this.mnuColorPicker.addNewColor((typeof(this.btnColor.color) == 'object') ? this.btnColor.color.color : this.btnColor.color);
},
UpdateThemeColors: function() {
if (!this.mnuColorPicker) {
this.btnColor.setMenu( new Common.UI.Menu({
items: [
{ template: _.template('<div id="paragraph-color-menu" style="width: 169px; height: 220px; margin: 10px;"></div>') },
{ template: _.template('<a id="paragraph-color-new" style="padding-left:12px;">' + this.textNewColor + '</a>') }
]
}));
this.mnuColorPicker = new Common.UI.ThemeColorPalette({
el: $('#paragraph-color-menu'),
transparent: true
});
this.mnuColorPicker.on('select', _.bind(this.onColorPickerSelect, this));
this.btnColor.menu.items[1].on('click', _.bind(this.addNewColor, this));
this.btnColor.setMenu();
this.mnuColorPicker = this.btnColor.getPicker();
}
this.mnuColorPicker.updateColors(Common.Utils.ThemeColor.getEffectColors(), Common.Utils.ThemeColor.getStandartColors());
},
@ -499,7 +485,6 @@ define([
textAdvanced: 'Show advanced settings',
textAt: 'At',
txtAutoText: 'Auto',
textBackColor: 'Background color',
textNewColor: 'Add New Custom Color'
textBackColor: 'Background color'
}, DE.Views.ParagraphSettings || {}));
});

57
apps/documenteditor/main/app/view/ParagraphSettingsAdvanced.js
View file

@ -358,25 +358,12 @@ define([ 'text!documenteditor/main/app/template/ParagraphSettingsAdvanced.tem
this.cmbBorderSize.on('selected', _.bind(this.onBorderSizeSelect, this));
this.btnBorderColor = new Common.UI.ColorButton({
style: "width:45px;",
menu : new Common.UI.Menu({
additionalAlign: this.menuAddAlign,
items: [
{ template: _.template('<div id="paragraphadv-border-color-menu" style="width: 169px; height: 220px; margin: 10px;"></div>') },
{ template: _.template('<a id="paragraphadv-border-color-new" style="padding-left:12px;">' + me.textNewColor + '</a>') }
]
})
parentEl: $('#paragraphadv-border-color-btn'),
additionalAlign: this.menuAddAlign,
color: '000000'
});
this.btnBorderColor.on('render:after', function(btn) {
me.colorsBorder = new Common.UI.ThemeColorPalette({
el: $('#paragraphadv-border-color-menu')
});
me.colorsBorder.on('select', _.bind(me.onColorsBorderSelect, me));
});
this.btnBorderColor.render( $('#paragraphadv-border-color-btn'));
this.btnBorderColor.setColor('000000');
$('#paragraphadv-border-color-new').on('click', _.bind(this.addNewColor, this, this.colorsBorder, this.btnBorderColor));
this.colorsBorder = this.btnBorderColor.getPicker();
this.btnBorderColor.on('color:select', _.bind(this.onColorsBorderSelect, this));
this.BordersImage = new Common.UI.TableStyler({
el: $('#id-deparagraphstyler'),
@ -413,25 +400,12 @@ define([ 'text!documenteditor/main/app/template/ParagraphSettingsAdvanced.tem
}, this);
this.btnBackColor = new Common.UI.ColorButton({
style: "width:45px;",
menu : new Common.UI.Menu({
additionalAlign: this.menuAddAlign,
items: [
{ template: _.template('<div id="paragraphadv-back-color-menu" style="width: 169px; height: 220px; margin: 10px;"></div>') },
{ template: _.template('<a id="paragraphadv-back-color-new" style="padding-left:12px;">' + me.textNewColor + '</a>') }
]
})
parentEl: $('#paragraphadv-back-color-btn'),
transparent: true,
additionalAlign: this.menuAddAlign
});
this.btnBackColor.on('render:after', function(btn) {
me.colorsBack = new Common.UI.ThemeColorPalette({
el: $('#paragraphadv-back-color-menu'),
transparent: true
});
me.colorsBack.on('select', _.bind(me.onColorsBackSelect, me));
});
this.btnBackColor.render( $('#paragraphadv-back-color-btn'));
$('#paragraphadv-back-color-new').on('click', _.bind(this.addNewColor, this, this.colorsBack, this.btnBackColor));
this.colorsBack = this.btnBackColor.getPicker();
this.btnBackColor.on('color:select', _.bind(this.onColorsBackSelect, this));
// Font
@ -1094,17 +1068,11 @@ define([ 'text!documenteditor/main/app/template/ParagraphSettingsAdvanced.tem
this.BordersImage.setVirtualBorderSize( this.BorderSize.pxValue );
},
addNewColor: function(picker, btn) {
picker.addNewColor((typeof(btn.color) == 'object') ? btn.color.color : btn.color);
},
onColorsBorderSelect: function(picker, color) {
this.btnBorderColor.setColor(color);
onColorsBorderSelect: function(btn, color) {
this.BordersImage.setVirtualBorderColor((typeof(color) == 'object') ? color.color : color);
},
onColorsBackSelect: function(picker, color) {
this.btnBackColor.setColor(color);
onColorsBackSelect: function(btn, color) {
this.paragraphShade = color;
if (this._changedProps) {
@ -1447,7 +1415,6 @@ define([ 'text!documenteditor/main/app/template/ParagraphSettingsAdvanced.tem
textBackColor: 'Background Color',
textBorderDesc: 'Click on diagramm or use buttons to select borders',
txtNoBorders: 'No borders',
textNewColor: 'Add New Custom Color',
textEffects: 'Effects',
textCharacterSpacing: 'Character Spacing',
textSpacing: 'Spacing',

118
apps/documenteditor/main/app/view/ShapeSettings.js
View file

@ -248,8 +248,7 @@ define([
this.fireEvent('editcomplete', this);
},
onColorsBackSelect: function(picker, color) {
this.btnBackColor.setColor(color);
onColorsBackSelect: function(btn, color) {
this.ShapeColor = {Value: 1, Color: color};
if (this.api && !this._noApply) {
@ -272,10 +271,6 @@ define([
this.fireEvent('editcomplete', this);
},
addNewColor: function(picker, btn) {
picker.addNewColor((typeof(btn.color) == 'object') ? btn.color.color : btn.color);
},
onPatternSelect: function(combo, record){
if (this.api && !this._noApply) {
this.PatternFillType = record.get('type');
@ -295,8 +290,7 @@ define([
this.fireEvent('editcomplete', this);
},
onColorsFGSelect: function(picker, color) {
this.btnFGColor.setColor(color);
onColorsFGSelect: function(btn, color) {
this.FGColor = {Value: 1, Color: color};
if (this.api && !this._noApply) {
var props = new Asc.asc_CShapeProperty();
@ -315,8 +309,7 @@ define([
this.fireEvent('editcomplete', this);
},
onColorsBGSelect: function(picker, color) {
this.btnBGColor.setColor(color);
onColorsBGSelect: function(btn, color) {
this.BGColor = {Value: 1, Color: color};
if (this.api && !this._noApply) {
var props = new Asc.asc_CShapeProperty();
@ -479,8 +472,7 @@ define([
this.fireEvent('editcomplete', this);
},
onColorsGradientSelect: function(picker, color) {
this.btnGradColor.setColor(color);
onColorsGradientSelect: function(btn, color) {
this.GradColor.colors[this.GradColor.currentIdx] = color;
this.sldrGradient.setColorValue(Common.Utils.String.format('#{0}', (typeof(color) == 'object') ? color.color : color));
@ -641,8 +633,7 @@ define([
this.fireEvent('editcomplete', this);
},
onColorsBorderSelect: function(picker, color) {
this.btnBorderColor.setColor(color);
onColorsBorderSelect: function(btn, color) {
this.BorderColor = {Value: 1, Color: color};
if (this.api && this.BorderSize>0 && !this._noApply) {
var props = new Asc.asc_CShapeProperty();
@ -1696,99 +1687,45 @@ define([
if (!this.btnBackColor) {
// create color buttons
this.btnBackColor = new Common.UI.ColorButton({
style: "width:45px;",
menu : new Common.UI.Menu({
items: [
{ template: _.template('<div id="shape-back-color-menu" style="width: 169px; height: 220px; margin: 10px;"></div>') },
{ template: _.template('<a id="shape-back-color-new" style="padding-left:12px;">' + this.textNewColor + '</a>') }
]
})
parentEl: $('#shape-back-color-btn'),
transparent: true,
color: 'transparent'
});
this.btnBackColor.render( $('#shape-back-color-btn'));
this.btnBackColor.setColor('transparent');
this.fillControls.push(this.btnBackColor);
this.colorsBack = new Common.UI.ThemeColorPalette({
el: $('#shape-back-color-menu'),
value: 'transparent',
transparent: true
});
this.colorsBack.on('select', _.bind(this.onColorsBackSelect, this));
this.btnBackColor.menu.items[1].on('click', _.bind(this.addNewColor, this, this.colorsBack, this.btnBackColor));
this.colorsBack = this.btnBackColor.getPicker();
this.btnBackColor.on('color:select', _.bind(this.onColorsBackSelect, this));
this.btnFGColor = new Common.UI.ColorButton({
style: "width:45px;",
menu : new Common.UI.Menu({
items: [
{ template: _.template('<div id="shape-foreground-color-menu" style="width: 169px; height: 220px; margin: 10px;"></div>') },
{ template: _.template('<a id="shape-foreground-color-new" style="padding-left:12px;">' + this.textNewColor + '</a>') }
]
})
parentEl: $('#shape-foreground-color-btn'),
color: '000000'
});
this.btnFGColor.render( $('#shape-foreground-color-btn'));
this.btnFGColor.setColor('000000');
this.fillControls.push(this.btnFGColor);
this.colorsFG = new Common.UI.ThemeColorPalette({
el: $('#shape-foreground-color-menu'),
value: '000000'
});
this.colorsFG.on('select', _.bind(this.onColorsFGSelect, this));
this.btnFGColor.menu.items[1].on('click', _.bind(this.addNewColor, this, this.colorsFG, this.btnFGColor));
this.colorsFG = this.btnFGColor.getPicker();
this.btnFGColor.on('color:select', _.bind(this.onColorsFGSelect, this));
this.btnBGColor = new Common.UI.ColorButton({
style: "width:45px;",
menu : new Common.UI.Menu({
items: [
{ template: _.template('<div id="shape-background-color-menu" style="width: 169px; height: 220px; margin: 10px;"></div>') },
{ template: _.template('<a id="shape-background-color-new" style="padding-left:12px;">' + this.textNewColor + '</a>') }
]
})
parentEl: $('#shape-background-color-btn'),
color: 'ffffff'
});
this.btnBGColor.render( $('#shape-background-color-btn'));
this.btnBGColor.setColor('ffffff');
this.fillControls.push(this.btnBGColor);
this.colorsBG = new Common.UI.ThemeColorPalette({
el: $('#shape-background-color-menu'),
value: 'ffffff'
});
this.colorsBG.on('select', _.bind(this.onColorsBGSelect, this));
this.btnBGColor.menu.items[1].on('click', _.bind(this.addNewColor, this, this.colorsBG, this.btnBGColor));
this.colorsBG = this.btnBGColor.getPicker();
this.btnBGColor.on('color:select', _.bind(this.onColorsBGSelect, this));
this.btnGradColor = new Common.UI.ColorButton({
style: "width:45px;",
menu : new Common.UI.Menu({
items: [
{ template: _.template('<div id="shape-gradient-color-menu" style="width: 169px; height: 220px; margin: 10px;"></div>') },
{ template: _.template('<a id="shape-gradient-color-new" style="padding-left:12px;">' + this.textNewColor + '</a>') }
]
})
parentEl: $('#shape-gradient-color-btn'),
color: '000000'
});
this.btnGradColor.render( $('#shape-gradient-color-btn'));
this.btnGradColor.setColor('000000');
this.fillControls.push(this.btnGradColor);
this.colorsGrad = new Common.UI.ThemeColorPalette({
el: $('#shape-gradient-color-menu'),
value: '000000'
});
this.colorsGrad.on('select', _.bind(this.onColorsGradientSelect, this));
this.btnGradColor.menu.items[1].on('click', _.bind(this.addNewColor, this, this.colorsGrad, this.btnGradColor));
this.colorsGrad = this.btnGradColor.getPicker();
this.btnGradColor.on('color:select', _.bind(this.onColorsGradientSelect, this));
this.btnBorderColor = new Common.UI.ColorButton({
style: "width:45px;",
menu : new Common.UI.Menu({
items: [
{ template: _.template('<div id="shape-border-color-menu" style="width: 169px; height: 220px; margin: 10px;"></div>') },
{ template: _.template('<a id="shape-border-color-new" style="padding-left:12px;">' + this.textNewColor + '</a>') }
]
})
parentEl: $('#shape-border-color-btn'),
color: '000000'
});
this.btnBorderColor.render( $('#shape-border-color-btn'));
this.btnBorderColor.setColor('000000');
this.lockedControls.push(this.btnBorderColor);
this.colorsBorder = new Common.UI.ThemeColorPalette({
el: $('#shape-border-color-menu'),
value: '000000'
});
this.colorsBorder.on('select', _.bind(this.onColorsBorderSelect, this));
this.btnBorderColor.menu.items[1].on('click', _.bind(this.addNewColor, this, this.colorsBorder, this.btnBorderColor));
this.colorsBorder = this.btnBorderColor.getPicker();
this.btnBorderColor.on('color:select', _.bind(this.onColorsBorderSelect, this));
}
this.colorsBorder.updateColors(Common.Utils.ThemeColor.getEffectColors(), Common.Utils.ThemeColor.getStandartColors());
this.colorsBack.updateColors(Common.Utils.ThemeColor.getEffectColors(), Common.Utils.ThemeColor.getStandartColors());
@ -1879,7 +1816,6 @@ define([
txtBrownPaper : 'Brown Paper',
txtPapyrus : 'Papyrus',
txtWood : 'Wood',
textNewColor : 'Add New Custom Color',
textAdvanced : 'Show advanced settings',
strTransparency : 'Opacity',
textNoFill : 'No Fill',

47
apps/documenteditor/main/app/view/TableSettings.js
View file

@ -148,8 +148,7 @@ define([
this.fireEvent('editcomplete', this);
},
onColorsBackSelect: function(picker, color) {
this.btnBackColor.setColor(color);
onColorsBackSelect: function(btn, color) {
this.CellColor = {Value: 1, Color: color};
if (this.api) {
@ -171,14 +170,6 @@ define([
this.fireEvent('editcomplete', this);
},
addNewColor: function(picker, btn) {
picker.addNewColor((typeof(btn.color) == 'object') ? btn.color.color : btn.color);
},
onColorsBorderSelect: function(picker, color) {
this.btnBorderColor.setColor(color);
},
onBtnBordersClick: function(btn, eOpts){
this._UpdateBordersStyle(btn.options.strId, true);
if (this.api) {
@ -648,40 +639,19 @@ define([
if (!this.btnBackColor) {
// create color buttons
this.btnBorderColor = new Common.UI.ColorButton({
style: "width:45px;",
menu : new Common.UI.Menu({
items: [
{ template: _.template('<div id="table-border-color-menu" style="width: 169px; height: 220px; margin: 10px;"></div>') },
{ template: _.template('<a id="table-border-color-new" style="padding-left:12px;">' + this.textNewColor + '</a>') }
]
})
parentEl: $('#table-border-color-btn'),
color: '000000'
});
this.btnBorderColor.render( $('#table-border-color-btn'));
this.btnBorderColor.setColor('000000');
this.lockedControls.push(this.btnBorderColor);
this.borderColor = new Common.UI.ThemeColorPalette({
el: $('#table-border-color-menu')
});
this.borderColor.on('select', _.bind(this.onColorsBorderSelect, this));
this.btnBorderColor.menu.items[1].on('click', _.bind(this.addNewColor, this, this.borderColor, this.btnBorderColor));
this.borderColor = this.btnBorderColor.getPicker();
this.btnBackColor = new Common.UI.ColorButton({
style: "width:45px;",
menu : new Common.UI.Menu({
items: [
{ template: _.template('<div id="table-back-color-menu" style="width: 169px; height: 220px; margin: 10px;"></div>') },
{ template: _.template('<a id="table-back-color-new" style="padding-left:12px;">' + this.textNewColor + '</a>') }
]
})
});
this.btnBackColor.render( $('#table-back-color-btn'));
this.lockedControls.push(this.btnBackColor);
this.colorsBack = new Common.UI.ThemeColorPalette({
el: $('#table-back-color-menu'),
parentEl: $('#table-back-color-btn'),
transparent: true
});
this.colorsBack.on('select', _.bind(this.onColorsBackSelect, this));
this.btnBackColor.menu.items[1].on('click', _.bind(this.addNewColor, this, this.colorsBack, this.btnBackColor));
this.lockedControls.push(this.btnBackColor);
this.colorsBack = this.btnBackColor.getPicker();
this.btnBackColor.on('color:select', _.bind(this.onColorsBackSelect, this));
}
this.colorsBack.updateColors(Common.Utils.ThemeColor.getEffectColors(), Common.Utils.ThemeColor.getStandartColors());
this.borderColor.updateColors(Common.Utils.ThemeColor.getEffectColors(), Common.Utils.ThemeColor.getStandartColors());
@ -842,7 +812,6 @@ define([
textSelectBorders : 'Select borders that you want to change',
textAdvanced : 'Show advanced settings',
txtNoBorders : 'No borders',
textNewColor : 'Add New Custom Color',
textTemplate : 'Select From Template',
textRows : 'Rows',
textColumns : 'Columns',

83
apps/documenteditor/main/app/view/TableSettingsAdvanced.js
View file

@ -879,67 +879,28 @@ define([ 'text!documenteditor/main/app/template/TableSettingsAdvanced.templat
this.cmbBorderSize.on('selected', _.bind(this.onBorderSizeSelect, this));
this.btnBorderColor = new Common.UI.ColorButton({
style: "width:45px;",
menu : new Common.UI.Menu({
additionalAlign: this.menuAddAlign,
items: [
{ template: _.template('<div id="tableadv-border-color-menu" style="width: 169px; height: 220px; margin: 10px;"></div>') },
{ template: _.template('<a id="tableadv-border-color-new" style="padding-left:12px;">' + me.textNewColor + '</a>') }
]
})
parentEl: $('#tableadv-border-color-btn'),
additionalAlign: this.menuAddAlign,
color: '000000'
});
this.btnBorderColor.on('render:after', function(btn) {
me.colorsBorder = new Common.UI.ThemeColorPalette({
el: $('#tableadv-border-color-menu')
});
me.colorsBorder.on('select', _.bind(me.onColorsBorderSelect, me));
});
this.btnBorderColor.render( $('#tableadv-border-color-btn'));
this.btnBorderColor.setColor('000000');
$('#tableadv-border-color-new').on('click', _.bind(this.addNewColor, this, this.colorsBorder, this.btnBorderColor));
this.btnBorderColor.on('color:select', _.bind(me.onColorsBorderSelect, me));
this.colorsBorder = this.btnBorderColor.getPicker();
this.btnBackColor = new Common.UI.ColorButton({
style: "width:45px;",
menu : new Common.UI.Menu({
additionalAlign: this.menuAddAlign,
items: [
{ template: _.template('<div id="tableadv-back-color-menu" style="width: 169px; height: 220px; margin: 10px;"></div>') },
{ template: _.template('<a id="tableadv-back-color-new" style="padding-left:12px;">' + me.textNewColor + '</a>') }
]
})
parentEl: $('#tableadv-button-back-color'),
additionalAlign: this.menuAddAlign,
transparent: true
});
this.btnBackColor.on('render:after', function(btn) {
me.colorsBack = new Common.UI.ThemeColorPalette({
el: $('#tableadv-back-color-menu'),
transparent: true
});
me.colorsBack.on('select', _.bind(me.onColorsBackSelect, me));
});
this.btnBackColor.render( $('#tableadv-button-back-color'));
$('#tableadv-back-color-new').on('click', _.bind(this.addNewColor, this, this.colorsBack, this.btnBackColor));
this.btnBackColor.on('color:select', _.bind(this.onColorsBackSelect, this));
this.colorsBack = this.btnBackColor.getPicker();
this.btnTableBackColor = new Common.UI.ColorButton({
style: "width:45px;",
menu : new Common.UI.Menu({
additionalAlign: this.menuAddAlign,
items: [
{ template: _.template('<div id="tableadv-table-back-color-menu" style="width: 169px; height: 220px; margin: 10px;"></div>') },
{ template: _.template('<a id="tableadv-table-back-color-new" style="padding-left:12px;">' + me.textNewColor + '</a>') }
]
})
parentEl: $('#tableadv-button-table-back-color'),
additionalAlign: this.menuAddAlign,
transparent: true
});
this.btnTableBackColor.on('render:after', function(btn) {
me.colorsTableBack = new Common.UI.ThemeColorPalette({
el: $('#tableadv-table-back-color-menu'),
transparent: true
});
me.colorsTableBack.on('select', _.bind(me.onColorsTableBackSelect, me));
});
this.btnTableBackColor.render( $('#tableadv-button-table-back-color'));
$('#tableadv-table-back-color-new').on('click', _.bind(this.addNewColor, this, this.colorsTableBack, this.btnTableBackColor));
this.btnTableBackColor.on('color:select', _.bind(this.onColorsTableBackSelect, this));
this.colorsTableBack = this.btnTableBackColor.getPicker();
this.tableBordersImageSpacing = new Common.UI.TableStyler({
el: $('#id-detablestyler-spacing'),
@ -1688,19 +1649,13 @@ define([ 'text!documenteditor/main/app/template/TableSettingsAdvanced.templat
this.tableBordersImageSpacing.setVirtualBorderSize( this.BorderSize.pxValue );
},
addNewColor: function(picker, btn) {
picker.addNewColor((typeof(btn.color) == 'object') ? btn.color.color : btn.color);
},
onColorsBorderSelect: function(picker, color) {
this.btnBorderColor.setColor(color);
onColorsBorderSelect: function(btn, color) {
var colorstr = (typeof(color) == 'object') ? color.color : color;
this.tableBordersImage.setVirtualBorderColor(colorstr);
this.tableBordersImageSpacing.setVirtualBorderColor(colorstr);
},
onColorsBackSelect: function(picker, color) {
this.btnBackColor.setColor(color);
onColorsBackSelect: function(btn, color) {
this.CellColor = {Value: 1, Color: color};
if (this._cellBackground === null)
@ -1719,8 +1674,7 @@ define([ 'text!documenteditor/main/app/template/TableSettingsAdvanced.templat
this.tableBordersImage.setCellsColor(colorstr);
},
onColorsTableBackSelect: function(picker, color) {
this.btnTableBackColor.setColor(color);
onColorsTableBackSelect: function(btn, color) {
this.TableColor.Color = color;
if (this._changedProps) {
@ -2132,7 +2086,6 @@ define([ 'text!documenteditor/main/app/template/TableSettingsAdvanced.templat
textBorderDesc: 'Click on diagramm or use buttons to select borders',
textTableBackColor: 'Table Background',
txtNoBorders: 'No borders',
textNewColor: 'Add New Custom Color',
textCenter: 'Center',
textMargin: 'Margin',
textPage: 'Page',

73
apps/documenteditor/main/app/view/TextArtSettings.js
View file

@ -193,8 +193,7 @@ define([
this.fireEvent('editcomplete', this);
},
onColorsBackSelect: function(picker, color) {
this.btnBackColor.setColor(color);
onColorsBackSelect: function(btn, color) {
this.ShapeColor = {Value: 1, Color: color};
if (this.api && !this._noApply) {
@ -217,10 +216,6 @@ define([
this.fireEvent('editcomplete', this);
},
addNewColor: function(picker, btn) {
picker.addNewColor((typeof(btn.color) == 'object') ? btn.color.color : btn.color);
},
onNumTransparencyChange: function(field, newValue, oldValue, eOpts){
this.sldrTransparency.setValue(field.getNumberValue(), true);
if (this.api) {
@ -347,8 +342,7 @@ define([
this.fireEvent('editcomplete', this);
},
onColorsGradientSelect: function(picker, color) {
this.btnGradColor.setColor(color);
onColorsGradientSelect: function(btn, color) {
this.GradColor.colors[this.GradColor.currentIdx] = color;
this.sldrGradient.setColorValue(Common.Utils.String.format('#{0}', (typeof(color) == 'object') ? color.color : color));
@ -510,8 +504,7 @@ define([
this.fireEvent('editcomplete', this);
},
onColorsBorderSelect: function(picker, color) {
this.btnBorderColor.setColor(color);
onColorsBorderSelect: function(btn, color) {
this.BorderColor = {Value: 1, Color: color};
if (this.api && this.BorderSize>0 && !this._noApply) {
var props = new Asc.asc_TextArtProperties();
@ -1100,62 +1093,29 @@ define([
if (this._initSettings) return;
if (!this.btnBackColor) {
this.btnBorderColor = new Common.UI.ColorButton({
style: "width:45px;",
menu : new Common.UI.Menu({
items: [
{ template: _.template('<div id="textart-border-color-menu" style="width: 169px; height: 220px; margin: 10px;"></div>') },
{ template: _.template('<a id="textart-border-color-new" style="padding-left:12px;">' + this.textNewColor + '</a>') }
]
})
parentEl: $('#textart-border-color-btn'),
color: '000000'
});
this.btnBorderColor.render( $('#textart-border-color-btn'));
this.btnBorderColor.setColor('000000');
this.lockedControls.push(this.btnBorderColor);
this.colorsBorder = new Common.UI.ThemeColorPalette({
el: $('#textart-border-color-menu'),
value: '000000'
});
this.colorsBorder.on('select', _.bind(this.onColorsBorderSelect, this));
this.btnBorderColor.menu.items[1].on('click', _.bind(this.addNewColor, this, this.colorsBorder, this.btnBorderColor));
this.colorsBorder = this.btnBorderColor.getPicker();
this.btnBorderColor.on('color:select', _.bind(this.onColorsBorderSelect, this));
this.btnGradColor = new Common.UI.ColorButton({
style: "width:45px;",
menu : new Common.UI.Menu({
items: [
{ template: _.template('<div id="textart-gradient-color-menu" style="width: 169px; height: 220px; margin: 10px;"></div>') },
{ template: _.template('<a id="textart-gradient-color-new" style="padding-left:12px;">' + this.textNewColor + '</a>') }
]
})
parentEl: $('#textart-gradient-color-btn'),
color: '000000'
});
this.btnGradColor.render( $('#textart-gradient-color-btn'));
this.btnGradColor.setColor('000000');
this.lockedControls.push(this.btnGradColor);
this.colorsGrad = new Common.UI.ThemeColorPalette({
el: $('#textart-gradient-color-menu'),
value: '000000'
});
this.colorsGrad.on('select', _.bind(this.onColorsGradientSelect, this));
this.btnGradColor.menu.items[1].on('click', _.bind(this.addNewColor, this, this.colorsGrad, this.btnGradColor));
this.colorsGrad = this.btnGradColor.getPicker();
this.btnGradColor.on('color:select', _.bind(this.onColorsGradientSelect, this));
this.btnBackColor = new Common.UI.ColorButton({
style: "width:45px;",
menu : new Common.UI.Menu({
items: [
{ template: _.template('<div id="textart-back-color-menu" style="width: 169px; height: 220px; margin: 10px;"></div>') },
{ template: _.template('<a id="textart-back-color-new" style="padding-left:12px;">' + this.textNewColor + '</a>') }
]
})
parentEl: $('#textart-back-color-btn'),
transparent: true,
color: 'transparent'
});
this.btnBackColor.render( $('#textart-back-color-btn'));
this.btnBackColor.setColor('transparent');
this.lockedControls.push(this.btnBackColor);
this.colorsBack = new Common.UI.ThemeColorPalette({
el: $('#textart-back-color-menu'),
value: 'transparent',
transparent: true
});
this.colorsBack.on('select', _.bind(this.onColorsBackSelect, this));
this.btnBackColor.menu.items[1].on('click', _.bind(this.addNewColor, this, this.colorsBack, this.btnBackColor));
this.colorsBack = this.btnBackColor.getPicker();
this.btnBackColor.on('color:select', _.bind(this.onColorsBackSelect, this));
}
this.colorsBorder.updateColors(Common.Utils.ThemeColor.getEffectColors(), Common.Utils.ThemeColor.getStandartColors());
this.colorsBack.updateColors(Common.Utils.ThemeColor.getEffectColors(), Common.Utils.ThemeColor.getStandartColors());
@ -1197,7 +1157,6 @@ define([
strSize : 'Size',
strFill : 'Fill',
textColor : 'Color Fill',
textNewColor : 'Add New Custom Color',
strTransparency : 'Opacity',
textNoFill : 'No Fill',
textSelectTexture : 'Select',

19
apps/documenteditor/main/locale/en.json
View file

@ -114,6 +114,7 @@
"Common.UI.Calendar.textShortTuesday": "Tu",
"Common.UI.Calendar.textShortWednesday": "We",
"Common.UI.Calendar.textYears": "Years",
"Common.UI.ColorButton.textNewColor": "Add New Custom Color",
"Common.UI.ComboBorderSize.txtNoBorders": "No borders",
"Common.UI.ComboBorderSizeEditable.txtNoBorders": "No borders",
"Common.UI.ComboDataView.emptyComboText": "No styles",
@ -1182,7 +1183,7 @@
"DE.Views.ControlSettingsDialog.textLang": "Language",
"DE.Views.ControlSettingsDialog.textLock": "Locking",
"DE.Views.ControlSettingsDialog.textName": "Title",
"DE.Views.ControlSettingsDialog.textNewColor": "Add New Custom Color",
"del_DE.Views.ControlSettingsDialog.textNewColor": "Add New Custom Color",
"DE.Views.ControlSettingsDialog.textNone": "None",
"DE.Views.ControlSettingsDialog.textShowAs": "Show as",
"DE.Views.ControlSettingsDialog.textSystemColor": "System",
@ -1444,7 +1445,7 @@
"DE.Views.DropcapSettingsAdvanced.textLeft": "Left",
"DE.Views.DropcapSettingsAdvanced.textMargin": "Margin",
"DE.Views.DropcapSettingsAdvanced.textMove": "Move with text",
"DE.Views.DropcapSettingsAdvanced.textNewColor": "Add New Custom Color",
"del_DE.Views.DropcapSettingsAdvanced.textNewColor": "Add New Custom Color",
"DE.Views.DropcapSettingsAdvanced.textNone": "None",
"DE.Views.DropcapSettingsAdvanced.textPage": "Page",
"DE.Views.DropcapSettingsAdvanced.textParagraph": "Paragraph",
@ -1740,7 +1741,7 @@
"DE.Views.ListSettingsDialog.textCenter": "Center",
"DE.Views.ListSettingsDialog.textLeft": "Left",
"DE.Views.ListSettingsDialog.textLevel": "Level",
"DE.Views.ListSettingsDialog.textNewColor": "Add New Custom Color",
"del_DE.Views.ListSettingsDialog.textNewColor": "Add New Custom Color",
"DE.Views.ListSettingsDialog.textPreview": "Preview",
"DE.Views.ListSettingsDialog.textRight": "Right",
"DE.Views.ListSettingsDialog.txtAlign": "Alignment",
@ -1865,7 +1866,7 @@
"DE.Views.ParagraphSettings.textAuto": "Multiple",
"DE.Views.ParagraphSettings.textBackColor": "Background color",
"DE.Views.ParagraphSettings.textExact": "Exactly",
"DE.Views.ParagraphSettings.textNewColor": "Add New Custom Color",
"del_DE.Views.ParagraphSettings.textNewColor": "Add New Custom Color",
"DE.Views.ParagraphSettings.txtAutoText": "Auto",
"DE.Views.ParagraphSettingsAdvanced.noTabs": "The specified tabs will appear in this field",
"DE.Views.ParagraphSettingsAdvanced.strAllCaps": "All caps",
@ -1915,7 +1916,7 @@
"DE.Views.ParagraphSettingsAdvanced.textLeader": "Leader",
"DE.Views.ParagraphSettingsAdvanced.textLeft": "Left",
"DE.Views.ParagraphSettingsAdvanced.textLevel": "Level",
"DE.Views.ParagraphSettingsAdvanced.textNewColor": "Add New Custom Color",
"del_DE.Views.ParagraphSettingsAdvanced.textNewColor": "Add New Custom Color",
"DE.Views.ParagraphSettingsAdvanced.textNone": "None",
"DE.Views.ParagraphSettingsAdvanced.textNoneSpecial": "(none)",
"DE.Views.ParagraphSettingsAdvanced.textPosition": "Position",
@ -1976,7 +1977,7 @@
"DE.Views.ShapeSettings.textHintFlipV": "Flip Vertically",
"DE.Views.ShapeSettings.textImageTexture": "Picture or Texture",
"DE.Views.ShapeSettings.textLinear": "Linear",
"DE.Views.ShapeSettings.textNewColor": "Add New Custom Color",
"del_DE.Views.ShapeSettings.textNewColor": "Add New Custom Color",
"DE.Views.ShapeSettings.textNoFill": "No Fill",
"DE.Views.ShapeSettings.textPatternFill": "Pattern",
"DE.Views.ShapeSettings.textRadial": "Radial",
@ -2092,7 +2093,7 @@
"DE.Views.TableSettings.textHeader": "Header",
"DE.Views.TableSettings.textHeight": "Height",
"DE.Views.TableSettings.textLast": "Last",
"DE.Views.TableSettings.textNewColor": "Add New Custom Color",
"del_DE.Views.TableSettings.textNewColor": "Add New Custom Color",
"DE.Views.TableSettings.textRows": "Rows",
"DE.Views.TableSettings.textSelectBorders": "Select borders you want to change applying style chosen above",
"DE.Views.TableSettings.textTemplate": "Select From Template",
@ -2149,7 +2150,7 @@
"DE.Views.TableSettingsAdvanced.textMargins": "Cell Margins",
"DE.Views.TableSettingsAdvanced.textMeasure": "Measure in",
"DE.Views.TableSettingsAdvanced.textMove": "Move object with text",
"DE.Views.TableSettingsAdvanced.textNewColor": "Add New Custom Color",
"del_DE.Views.TableSettingsAdvanced.textNewColor": "Add New Custom Color",
"DE.Views.TableSettingsAdvanced.textOnlyCells": "For selected cells only",
"DE.Views.TableSettingsAdvanced.textOptions": "Options",
"DE.Views.TableSettingsAdvanced.textOverlap": "Allow overlap",
@ -2202,7 +2203,7 @@
"DE.Views.TextArtSettings.textGradient": "Gradient",
"DE.Views.TextArtSettings.textGradientFill": "Gradient Fill",
"DE.Views.TextArtSettings.textLinear": "Linear",
"DE.Views.TextArtSettings.textNewColor": "Add New Custom Color",
"del_DE.Views.TextArtSettings.textNewColor": "Add New Custom Color",
"DE.Views.TextArtSettings.textNoFill": "No Fill",
"DE.Views.TextArtSettings.textRadial": "Radial",
"DE.Views.TextArtSettings.textSelectTexture": "Select",

1
apps/documenteditor/main/locale/ru.json
View file

@ -113,6 +113,7 @@
"Common.UI.Calendar.textShortTuesday": "Вт",
"Common.UI.Calendar.textShortWednesday": "Ср",
"Common.UI.Calendar.textYears": "Годы",
"Common.UI.ColorButton.textNewColor": "Пользовательский цвет",
"Common.UI.ComboBorderSize.txtNoBorders": "Без границ",
"Common.UI.ComboBorderSizeEditable.txtNoBorders": "Без границ",
"Common.UI.ComboDataView.emptyComboText": "Без стилей",

117
apps/presentationeditor/main/app/view/ShapeSettings.js
View file

@ -239,8 +239,7 @@ define([
this.fireEvent('editcomplete', this);
},
onColorsBackSelect: function(picker, color) {
this.btnBackColor.setColor(color);
onColorsBackSelect: function(btn, color) {
this.ShapeColor = {Value: 1, Color: color};
if (this.api && !this._noApply) {
@ -262,10 +261,6 @@ define([
this.fireEvent('editcomplete', this);
},
addNewColor: function(picker, btn) {
picker.addNewColor((typeof(btn.color) == 'object') ? btn.color.color : btn.color);
},
onPatternSelect: function(combo, record){
if (this.api && !this._noApply) {
this.PatternFillType = record.get('type');
@ -284,8 +279,7 @@ define([
this.fireEvent('editcomplete', this);
},
onColorsFGSelect: function(picker, color) {
this.btnFGColor.setColor(color);
onColorsFGSelect: function(btn, color) {
this.FGColor = {Value: 1, Color: color};
if (this.api && !this._noApply) {
var props = new Asc.asc_CShapeProperty();
@ -303,8 +297,7 @@ define([
this.fireEvent('editcomplete', this);
},
onColorsBGSelect: function(picker, color) {
this.btnBGColor.setColor(color);
onColorsBGSelect: function(btn, color) {
this.BGColor = {Value: 1, Color: color};
if (this.api && !this._noApply) {
var props = new Asc.asc_CShapeProperty();
@ -461,8 +454,7 @@ define([
this.fireEvent('editcomplete', this);
},
onColorsGradientSelect: function(picker, color) {
this.btnGradColor.setColor(color);
onColorsGradientSelect: function(btn, color) {
this.GradColor.colors[this.GradColor.currentIdx] = color;
this.sldrGradient.setColorValue(Common.Utils.String.format('#{0}', (typeof(color) == 'object') ? color.color : color));
@ -619,8 +611,7 @@ define([
this.fireEvent('editcomplete', this);
},
onColorsBorderSelect: function(picker, color) {
this.btnBorderColor.setColor(color);
onColorsBorderSelect: function(btn, color) {
this.BorderColor = {Value: 1, Color: color};
if (this.api && this.BorderSize>0 && !this._noApply) {
var props = new Asc.asc_CShapeProperty();
@ -1550,100 +1541,45 @@ define([
if (this._initSettings) return;
if (!this.btnBackColor) {
this.btnBackColor = new Common.UI.ColorButton({
style: "width:45px;",
menu : new Common.UI.Menu({
items: [
{ template: _.template('<div id="shape-back-color-menu" style="width: 169px; height: 220px; margin: 10px;"></div>') },
{ template: _.template('<a id="shape-back-color-new" style="padding-left:12px;">' + this.textNewColor + '</a>') }
]
})
parentEl: $('#shape-back-color-btn'),
transparent: true,
color: 'transparent'
});
this.btnBackColor.render( $('#shape-back-color-btn'));
this.btnBackColor.setColor('transparent');
this.fillControls.push(this.btnBackColor);
this.colorsBack = new Common.UI.ThemeColorPalette({
el: $('#shape-back-color-menu'),
value: 'transparent',
transparent: true
});
this.colorsBack.on('select', _.bind(this.onColorsBackSelect, this));
this.btnBackColor.menu.items[1].on('click', _.bind(this.addNewColor, this, this.colorsBack, this.btnBackColor));
this.colorsBack = this.btnBackColor.getPicker();
this.btnBackColor.on('color:select', _.bind(this.onColorsBackSelect, this));
this.btnFGColor = new Common.UI.ColorButton({
style: "width:45px;",
menu : new Common.UI.Menu({
items: [
{ template: _.template('<div id="shape-foreground-color-menu" style="width: 169px; height: 220px; margin: 10px;"></div>') },
{ template: _.template('<a id="shape-foreground-color-new" style="padding-left:12px;">' + this.textNewColor + '</a>') }
]
})
parentEl: $('#shape-foreground-color-btn'),
color: '000000'
});
this.btnFGColor.render( $('#shape-foreground-color-btn'));
this.btnFGColor.setColor('000000');
this.fillControls.push(this.btnFGColor);
this.colorsFG = new Common.UI.ThemeColorPalette({
el: $('#shape-foreground-color-menu'),
value: '000000'
});
this.colorsFG.on('select', _.bind(this.onColorsFGSelect, this));
this.btnFGColor.menu.items[1].on('click', _.bind(this.addNewColor, this, this.colorsFG, this.btnFGColor));
this.colorsFG = this.btnFGColor.getPicker();
this.btnFGColor.on('color:select', _.bind(this.onColorsFGSelect, this));
this.btnBGColor = new Common.UI.ColorButton({
style: "width:45px;",
menu : new Common.UI.Menu({
items: [
{ template: _.template('<div id="shape-background-color-menu" style="width: 169px; height: 220px; margin: 10px;"></div>') },
{ template: _.template('<a id="shape-background-color-new" style="padding-left:12px;">' + this.textNewColor + '</a>') }
]
})
parentEl: $('#shape-background-color-btn'),
color: 'ffffff'
});
this.btnBGColor.render( $('#shape-background-color-btn'));
this.btnBGColor.setColor('ffffff');
this.fillControls.push(this.btnBGColor);
this.colorsBG = new Common.UI.ThemeColorPalette({
el: $('#shape-background-color-menu'),
value: 'ffffff'
});
this.colorsBG.on('select', _.bind(this.onColorsBGSelect, this));
this.btnBGColor.menu.items[1].on('click', _.bind(this.addNewColor, this, this.colorsBG, this.btnBGColor));
this.colorsBG = this.btnBGColor.getPicker();
this.btnBGColor.on('color:select', _.bind(this.onColorsBGSelect, this));
this.btnGradColor = new Common.UI.ColorButton({
style: "width:45px;",
menu : new Common.UI.Menu({
items: [
{ template: _.template('<div id="shape-gradient-color-menu" style="width: 169px; height: 220px; margin: 10px;"></div>') },
{ template: _.template('<a id="shape-gradient-color-new" style="padding-left:12px;">' + this.textNewColor + '</a>') }
]
})
parentEl: $('#shape-gradient-color-btn'),
color: '000000'
});
this.btnGradColor.render( $('#shape-gradient-color-btn'));
this.btnGradColor.setColor('000000');
this.fillControls.push(this.btnGradColor);
this.colorsGrad = new Common.UI.ThemeColorPalette({
el: $('#shape-gradient-color-menu'),
value: '000000'
});
this.colorsGrad.on('select', _.bind(this.onColorsGradientSelect, this));
this.btnGradColor.menu.items[1].on('click', _.bind(this.addNewColor, this, this.colorsGrad, this.btnGradColor));
this.colorsGrad = this.btnGradColor.getPicker();
this.btnGradColor.on('color:select', _.bind(this.onColorsGradientSelect, this));
this.btnBorderColor = new Common.UI.ColorButton({
style: "width:45px;",
menu : new Common.UI.Menu({
items: [
{ template: _.template('<div id="shape-border-color-menu" style="width: 169px; height: 220px; margin: 10px;"></div>') },
{ template: _.template('<a id="shape-border-color-new" style="padding-left:12px;">' + this.textNewColor + '</a>') }
]
})
parentEl: $('#shape-border-color-btn'),
color: '000000'
});
this.btnBorderColor.render( $('#shape-border-color-btn'));
this.btnBorderColor.setColor('000000');
this.lockedControls.push(this.btnBorderColor);
this.colorsBorder = new Common.UI.ThemeColorPalette({
el: $('#shape-border-color-menu'),
value: '000000'
});
this.colorsBorder.on('select', _.bind(this.onColorsBorderSelect, this));
this.btnBorderColor.menu.items[1].on('click', _.bind(this.addNewColor, this, this.colorsBorder, this.btnBorderColor));
this.colorsBorder = this.btnBorderColor.getPicker();
this.btnBorderColor.on('color:select', _.bind(this.onColorsBorderSelect, this));
}
this.colorsBorder.updateColors(Common.Utils.ThemeColor.getEffectColors(), Common.Utils.ThemeColor.getStandartColors());
@ -1752,7 +1688,6 @@ define([
txtBrownPaper : 'Brown Paper',
txtPapyrus : 'Papyrus',
txtWood : 'Wood',
textNewColor : 'Add New Custom Color',
textAdvanced : 'Show advanced settings',
strTransparency : 'Opacity',
textNoFill : 'No Fill',

97
apps/presentationeditor/main/app/view/SlideSettings.js
View file

@ -134,17 +134,12 @@ define([
this.cmbFillSrc.on('selected', _.bind(this.onFillSrcSelect, this));
this.btnBackColor = new Common.UI.ColorButton({
style: "width:45px;",
parentEl: $('#slide-back-color-btn'),
disabled: true,
menu : new Common.UI.Menu({
items: [
{ template: _.template('<div id="slide-back-color-menu" style="width: 169px; height: 220px; margin: 10px;"></div>') },
{ template: _.template('<a id="slide-back-color-new" style="padding-left:12px;">' + this.textNewColor + '</a>') }
]
})
transparent: true,
menu: true,
color: 'ffffff'
});
this.btnBackColor.render( $('#slide-back-color-btn'));
this.btnBackColor.setColor('ffffff');
this.FillItems.push(this.btnBackColor);
this.FillColorContainer = $('#slide-panel-color-fill');
@ -389,8 +384,7 @@ define([
this.fireEvent('editcomplete', this);
},
onColorsBackSelect: function(picker, color) {
this.btnBackColor.setColor(color);
onColorsBackSelect: function(btn, color) {
this.SlideColor = {Value: 1, Color: color};
if (this.api && !this._noApply) {
@ -412,10 +406,6 @@ define([
this.fireEvent('editcomplete', this);
},
addNewColor: function(picker, btn) {
picker.addNewColor((typeof(btn.color) == 'object') ? btn.color.color : btn.color);
},
onPatternSelect: function(combo, record){
if (this.api && !this._noApply) {
this.PatternFillType = record.get('type');
@ -434,8 +424,7 @@ define([
this.fireEvent('editcomplete', this);
},
onColorsFGSelect: function(picker, color) {
this.btnFGColor.setColor(color);
onColorsFGSelect: function(btn, color) {
this.FGColor = {Value: 1, Color: color};
if (this.api && !this._noApply) {
var props = new Asc.CAscSlideProps();
@ -453,8 +442,7 @@ define([
this.fireEvent('editcomplete', this);
},
onColorsBGSelect: function(picker, color) {
this.btnBGColor.setColor(color);
onColorsBGSelect: function(btn, color) {
this.BGColor = {Value: 1, Color: color};
if (this.api && !this._noApply) {
var props = new Asc.CAscSlideProps();
@ -567,8 +555,7 @@ define([
this.fireEvent('editcomplete', this);
},
onColorsGradientSelect: function(picker, color) {
this.btnGradColor.setColor(color);
onColorsGradientSelect: function(btn, color) {
this.GradColor.colors[this.GradColor.currentIdx] = color;
this.sldrGradient.setColorValue(Common.Utils.String.format('#{0}', (typeof(color) == 'object') ? color.color : color));
@ -1072,70 +1059,33 @@ define([
UpdateThemeColors: function() {
if (this._initSettings) return;
if (!this.colorsBack) {
this.colorsBack = new Common.UI.ThemeColorPalette({
el: $('#slide-back-color-menu'),
value: 'ffffff',
transparent: true
});
this.colorsBack.on('select', _.bind(this.onColorsBackSelect, this));
this.btnBackColor.menu.items[1].on('click', _.bind(this.addNewColor, this, this.colorsBack, this.btnBackColor));
this.btnBackColor.setMenu();
this.btnBackColor.on('color:select', _.bind(this.onColorsBackSelect, this));
this.colorsBack = this.btnBackColor.getPicker();
this.btnFGColor = new Common.UI.ColorButton({
style: "width:45px;",
menu : new Common.UI.Menu({
items: [
{ template: _.template('<div id="slide-foreground-color-menu" style="width: 169px; height: 220px; margin: 10px;"></div>') },
{ template: _.template('<a id="slide-foreground-color-new" style="padding-left:12px;">' + this.textNewColor + '</a>') }
]
})
parentEl: $('#slide-foreground-color-btn'),
color: '000000'
});
this.btnFGColor.render( $('#slide-foreground-color-btn'));
this.btnFGColor.setColor('000000');
this.FillItems.push(this.btnFGColor);
this.colorsFG = new Common.UI.ThemeColorPalette({
el: $('#slide-foreground-color-menu'),
value: '000000'
});
this.colorsFG.on('select', _.bind(this.onColorsFGSelect, this));
this.btnFGColor.menu.items[1].on('click', _.bind(this.addNewColor, this, this.colorsFG, this.btnFGColor));
this.colorsFG = this.btnFGColor.getPicker();
this.btnFGColor.on('color:select', _.bind(this.onColorsFGSelect, this));
this.btnBGColor = new Common.UI.ColorButton({
style: "width:45px;",
menu : new Common.UI.Menu({
items: [
{ template: _.template('<div id="slide-background-color-menu" style="width: 169px; height: 220px; margin: 10px;"></div>') },
{ template: _.template('<a id="slide-background-color-new" style="padding-left:12px;">' + this.textNewColor + '</a>') }
]
})
parentEl: $('#slide-background-color-btn'),
color: 'ffffff'
});
this.btnBGColor.render( $('#slide-background-color-btn'));
this.btnBGColor.setColor('ffffff');
this.FillItems.push(this.btnBGColor);
this.colorsBG = new Common.UI.ThemeColorPalette({
el: $('#slide-background-color-menu'),
value: 'ffffff'
});
this.colorsBG.on('select', _.bind(this.onColorsBGSelect, this));
this.btnBGColor.menu.items[1].on('click', _.bind(this.addNewColor, this, this.colorsBG, this.btnBGColor));
this.colorsBG = this.btnBGColor.getPicker();
this.btnBGColor.on('color:select', _.bind(this.onColorsBGSelect, this));
this.btnGradColor = new Common.UI.ColorButton({
style: "width:45px;",
menu : new Common.UI.Menu({
items: [
{ template: _.template('<div id="slide-gradient-color-menu" style="width: 169px; height: 220px; margin: 10px;"></div>') },
{ template: _.template('<a id="slide-gradient-color-new" style="padding-left:12px;">' + this.textNewColor + '</a>') }
]
})
parentEl: $('#slide-gradient-color-btn'),
color: '000000'
});
this.btnGradColor.render( $('#slide-gradient-color-btn'));
this.btnGradColor.setColor('000000');
this.FillItems.push(this.btnGradColor);
this.colorsGrad = new Common.UI.ThemeColorPalette({
el: $('#slide-gradient-color-menu'),
value: '000000'
});
this.colorsGrad.on('select', _.bind(this.onColorsGradientSelect, this));
this.btnGradColor.menu.items[1].on('click', _.bind(this.addNewColor, this, this.colorsGrad, this.btnGradColor));
this.colorsGrad = this.btnGradColor.getPicker();
this.btnGradColor.on('color:select', _.bind(this.onColorsGradientSelect, this));
}
this.colorsBack.updateColors(Common.Utils.ThemeColor.getEffectColors(), Common.Utils.ThemeColor.getStandartColors());
@ -1533,7 +1483,6 @@ define([
txtBrownPaper : 'Brown Paper',
txtPapyrus : 'Papyrus',
txtWood : 'Wood',
textNewColor : 'Add New Custom Color',
textAdvanced : 'Show advanced settings',
textNoFill : 'No Fill',
textSelectTexture : 'Select',

47
apps/presentationeditor/main/app/view/TableSettings.js
View file

@ -137,8 +137,7 @@ define([
this.fireEvent('editcomplete', this);
},
onColorsBackSelect: function(picker, color) {
this.btnBackColor.setColor(color);
onColorsBackSelect: function(btn, color) {
this.CellColor = {Value: 1, Color: color};
if (this.api) {
@ -159,14 +158,6 @@ define([
this.fireEvent('editcomplete', this);
},
addNewColor: function(picker, btn) {
picker.addNewColor((typeof(btn.color) == 'object') ? btn.color.color : btn.color);
},
onColorsBorderSelect: function(picker, color) {
this.btnBorderColor.setColor(color);
},
onBtnBordersClick: function(btn, eOpts){
this._UpdateBordersStyle(btn.options.strId, true);
if (this.api) {
@ -615,40 +606,19 @@ define([
if (this._initSettings) return;
if (!this.btnBackColor) {
this.btnBorderColor = new Common.UI.ColorButton({
style: "width:45px;",
menu : new Common.UI.Menu({
items: [
{ template: _.template('<div id="table-border-color-menu" style="width: 169px; height: 220px; margin: 10px;"></div>') },
{ template: _.template('<a id="table-border-color-new" style="padding-left:12px;">' + this.textNewColor + '</a>') }
]
})
parentEl: $('#table-border-color-btn'),
color: '000000'
});
this.btnBorderColor.render( $('#table-border-color-btn'));
this.btnBorderColor.setColor('000000');
this.lockedControls.push(this.btnBorderColor);
this.borderColor = new Common.UI.ThemeColorPalette({
el: $('#table-border-color-menu')
});
this.borderColor.on('select', _.bind(this.onColorsBorderSelect, this));
this.btnBorderColor.menu.items[1].on('click', _.bind(this.addNewColor, this, this.borderColor, this.btnBorderColor));
this.borderColor = this.btnBorderColor.getPicker();
this.btnBackColor = new Common.UI.ColorButton({
style: "width:45px;",
menu : new Common.UI.Menu({
items: [
{ template: _.template('<div id="table-back-color-menu" style="width: 169px; height: 220px; margin: 10px;"></div>') },
{ template: _.template('<a id="table-back-color-new" style="padding-left:12px;">' + this.textNewColor + '</a>') }
]
})
});
this.btnBackColor.render( $('#table-back-color-btn'));
this.lockedControls.push(this.btnBackColor);
this.colorsBack = new Common.UI.ThemeColorPalette({
el: $('#table-back-color-menu'),
parentEl: $('#table-back-color-btn'),
transparent: true
});
this.colorsBack.on('select', _.bind(this.onColorsBackSelect, this));
this.btnBackColor.menu.items[1].on('click', _.bind(this.addNewColor, this, this.colorsBack, this.btnBackColor));
this.lockedControls.push(this.btnBackColor);
this.colorsBack = this.btnBackColor.getPicker();
this.btnBackColor.on('color:select', _.bind(this.onColorsBackSelect, this));
}
this.colorsBack.updateColors(Common.Utils.ThemeColor.getEffectColors(), Common.Utils.ThemeColor.getStandartColors());
this.borderColor.updateColors(Common.Utils.ThemeColor.getEffectColors(), Common.Utils.ThemeColor.getStandartColors());
@ -783,7 +753,6 @@ define([
textSelectBorders : 'Select borders that you want to change',
textAdvanced : 'Show advanced settings',
txtNoBorders : 'No borders',
textNewColor : 'Add New Custom Color',
textTemplate : 'Select From Template',
textRows : 'Rows',
textColumns : 'Columns',

117
apps/presentationeditor/main/app/view/TextArtSettings.js
View file

@ -238,8 +238,7 @@ define([
this.fireEvent('editcomplete', this);
},
onColorsBackSelect: function(picker, color) {
this.btnBackColor.setColor(color);
onColorsBackSelect: function(btn, color) {
this.ShapeColor = {Value: 1, Color: color};
if (this.api && !this._noApply) {
@ -262,10 +261,6 @@ define([
this.fireEvent('editcomplete', this);
},
addNewColor: function(picker, btn) {
picker.addNewColor((typeof(btn.color) == 'object') ? btn.color.color : btn.color);
},
onPatternSelect: function(combo, record){
if (this.api && !this._noApply) {
this.PatternFillType = record.get('type');
@ -285,8 +280,7 @@ define([
this.fireEvent('editcomplete', this);
},
onColorsFGSelect: function(picker, color) {
this.btnFGColor.setColor(color);
onColorsFGSelect: function(btn, color) {
this.FGColor = {Value: 1, Color: color};
if (this.api && !this._noApply) {
var props = new Asc.asc_TextArtProperties();
@ -305,8 +299,7 @@ define([
this.fireEvent('editcomplete', this);
},
onColorsBGSelect: function(picker, color) {
this.btnBGColor.setColor(color);
onColorsBGSelect: function(btn, color) {
this.BGColor = {Value: 1, Color: color};
if (this.api && !this._noApply) {
var props = new Asc.asc_TextArtProperties();
@ -469,8 +462,7 @@ define([
this.fireEvent('editcomplete', this);
},
onColorsGradientSelect: function(picker, color) {
this.btnGradColor.setColor(color);
onColorsGradientSelect: function(btn, color) {
this.GradColor.colors[this.GradColor.currentIdx] = color;
this.sldrGradient.setColorValue(Common.Utils.String.format('#{0}', (typeof(color) == 'object') ? color.color : color));
@ -632,8 +624,7 @@ define([
this.fireEvent('editcomplete', this);
},
onColorsBorderSelect: function(picker, color) {
this.btnBorderColor.setColor(color);
onColorsBorderSelect: function(btn, color) {
this.BorderColor = {Value: 1, Color: color};
if (this.api && this.BorderSize>0 && !this._noApply) {
var props = new Asc.asc_TextArtProperties();
@ -1512,100 +1503,45 @@ define([
if (this._initSettings) return;
if (!this.btnBackColor) {
this.btnBackColor = new Common.UI.ColorButton({
style: "width:45px;",
menu : new Common.UI.Menu({
items: [
{ template: _.template('<div id="textart-back-color-menu" style="width: 169px; height: 220px; margin: 10px;"></div>') },
{ template: _.template('<a id="textart-back-color-new" style="padding-left:12px;">' + this.textNewColor + '</a>') }
]
})
parentEl: $('#textart-back-color-btn'),
transparent: true,
color: 'transparent'
});
this.btnBackColor.render( $('#textart-back-color-btn'));
this.btnBackColor.setColor('transparent');
this.lockedControls.push(this.btnBackColor);
this.colorsBack = new Common.UI.ThemeColorPalette({
el: $('#textart-back-color-menu'),
value: 'transparent',
transparent: true
});
this.colorsBack.on('select', _.bind(this.onColorsBackSelect, this));
this.btnBackColor.menu.items[1].on('click', _.bind(this.addNewColor, this, this.colorsBack, this.btnBackColor));
this.colorsBack = this.btnBackColor.getPicker();
this.btnBackColor.on('color:select', _.bind(this.onColorsBackSelect, this));
this.btnFGColor = new Common.UI.ColorButton({
style: "width:45px;",
menu : new Common.UI.Menu({
items: [
{ template: _.template('<div id="textart-foreground-color-menu" style="width: 169px; height: 220px; margin: 10px;"></div>') },
{ template: _.template('<a id="textart-foreground-color-new" style="padding-left:12px;">' + this.textNewColor + '</a>') }
]
})
parentEl: $('#textart-foreground-color-btn'),
color: '000000'
});
this.btnFGColor.render( $('#textart-foreground-color-btn'));
this.btnFGColor.setColor('000000');
this.lockedControls.push(this.btnFGColor);
this.colorsFG = new Common.UI.ThemeColorPalette({
el: $('#textart-foreground-color-menu'),
value: '000000'
});
this.colorsFG.on('select', _.bind(this.onColorsFGSelect, this));
this.btnFGColor.menu.items[1].on('click', _.bind(this.addNewColor, this, this.colorsFG, this.btnFGColor));
this.colorsFG = this.btnFGColor.getPicker();
this.btnFGColor.on('color:select', _.bind(this.onColorsFGSelect, this));
this.btnBGColor = new Common.UI.ColorButton({
style: "width:45px;",
menu : new Common.UI.Menu({
items: [
{ template: _.template('<div id="textart-background-color-menu" style="width: 169px; height: 220px; margin: 10px;"></div>') },
{ template: _.template('<a id="textart-background-color-new" style="padding-left:12px;">' + this.textNewColor + '</a>') }
]
})
parentEl: $('#textart-background-color-btn'),
color: 'ffffff'
});
this.btnBGColor.render( $('#textart-background-color-btn'));
this.btnBGColor.setColor('ffffff');
this.lockedControls.push(this.btnBGColor);
this.colorsBG = new Common.UI.ThemeColorPalette({
el: $('#textart-background-color-menu'),
value: 'ffffff'
});
this.colorsBG.on('select', _.bind(this.onColorsBGSelect, this));
this.btnBGColor.menu.items[1].on('click', _.bind(this.addNewColor, this, this.colorsBG, this.btnBGColor));
this.colorsBG = this.btnBGColor.getPicker();
this.btnBGColor.on('color:select', _.bind(this.onColorsBGSelect, this));
this.btnGradColor = new Common.UI.ColorButton({
style: "width:45px;",
menu : new Common.UI.Menu({
items: [
{ template: _.template('<div id="textart-gradient-color-menu" style="width: 169px; height: 220px; margin: 10px;"></div>') },
{ template: _.template('<a id="textart-gradient-color-new" style="padding-left:12px;">' + this.textNewColor + '</a>') }
]
})
parentEl: $('#textart-gradient-color-btn'),
color: '000000'
});
this.btnGradColor.render( $('#textart-gradient-color-btn'));
this.btnGradColor.setColor('000000');
this.lockedControls.push(this.btnGradColor);
this.colorsGrad = new Common.UI.ThemeColorPalette({
el: $('#textart-gradient-color-menu'),
value: '000000'
});
this.colorsGrad.on('select', _.bind(this.onColorsGradientSelect, this));
this.btnGradColor.menu.items[1].on('click', _.bind(this.addNewColor, this, this.colorsGrad, this.btnGradColor));
this.colorsGrad = this.btnGradColor.getPicker();
this.btnGradColor.on('color:select', _.bind(this.onColorsGradientSelect, this));
this.btnBorderColor = new Common.UI.ColorButton({
style: "width:45px;",
menu : new Common.UI.Menu({
items: [
{ template: _.template('<div id="textart-border-color-menu" style="width: 169px; height: 220px; margin: 10px;"></div>') },
{ template: _.template('<a id="textart-border-color-new" style="padding-left:12px;">' + this.textNewColor + '</a>') }
]
})
parentEl: $('#textart-border-color-btn'),
color: '000000'
});
this.btnBorderColor.render( $('#textart-border-color-btn'));
this.btnBorderColor.setColor('000000');
this.lockedControls.push(this.btnBorderColor);
this.colorsBorder = new Common.UI.ThemeColorPalette({
el: $('#textart-border-color-menu'),
value: '000000'
});
this.colorsBorder.on('select', _.bind(this.onColorsBorderSelect, this));
this.btnBorderColor.menu.items[1].on('click', _.bind(this.addNewColor, this, this.colorsBorder, this.btnBorderColor));
this.colorsBorder = this.btnBorderColor.getPicker();
this.btnBorderColor.on('color:select', _.bind(this.onColorsBorderSelect, this));
}
this.colorsBorder.updateColors(Common.Utils.ThemeColor.getEffectColors(), Common.Utils.ThemeColor.getStandartColors());
@ -1669,7 +1605,6 @@ define([
txtBrownPaper : 'Brown Paper',
txtPapyrus : 'Papyrus',
txtWood : 'Wood',
textNewColor : 'Add New Custom Color',
strTransparency : 'Opacity',
textNoFill : 'No Fill',
textSelectTexture : 'Select',

11
apps/presentationeditor/main/locale/en.json
View file

@ -15,6 +15,7 @@
"Common.define.chartData.textPoint": "XY (Scatter)",
"Common.define.chartData.textStock": "Stock",
"Common.define.chartData.textSurface": "Surface",
"Common.UI.ColorButton.textNewColor": "Add New Custom Color",
"Common.UI.ComboBorderSize.txtNoBorders": "No borders",
"Common.UI.ComboBorderSizeEditable.txtNoBorders": "No borders",
"Common.UI.ComboDataView.emptyComboText": "No styles",
@ -118,7 +119,7 @@
"Common.Views.InsertTableDialog.txtTitle": "Table Size",
"Common.Views.InsertTableDialog.txtTitleSplit": "Split Cell",
"Common.Views.LanguageDialog.labelSelect": "Select document language",
"Common.Views.ListSettingsDialog.textNewColor": "Add New Custom Color",
"del_Common.Views.ListSettingsDialog.textNewColor": "Add New Custom Color",
"Common.Views.ListSettingsDialog.tipChange": "Change bullet",
"Common.Views.ListSettingsDialog.txtBullet": "Bullet",
"Common.Views.ListSettingsDialog.txtColor": "Color",
@ -1421,7 +1422,7 @@
"PE.Views.ShapeSettings.textHintFlipV": "Flip Vertically",
"PE.Views.ShapeSettings.textImageTexture": "Picture or Texture",
"PE.Views.ShapeSettings.textLinear": "Linear",
"PE.Views.ShapeSettings.textNewColor": "Custom Color",
"del_PE.Views.ShapeSettings.textNewColor": "Custom Color",
"PE.Views.ShapeSettings.textNoFill": "No Fill",
"PE.Views.ShapeSettings.textPatternFill": "Pattern",
"PE.Views.ShapeSettings.textRadial": "Radial",
@ -1531,7 +1532,7 @@
"PE.Views.SlideSettings.textImageTexture": "Picture or Texture",
"PE.Views.SlideSettings.textLeft": "Left",
"PE.Views.SlideSettings.textLinear": "Linear",
"PE.Views.SlideSettings.textNewColor": "Custom Color",
"del_PE.Views.SlideSettings.textNewColor": "Custom Color",
"PE.Views.SlideSettings.textNoFill": "No Fill",
"PE.Views.SlideSettings.textNone": "None",
"PE.Views.SlideSettings.textPatternFill": "Pattern",
@ -1636,7 +1637,7 @@
"PE.Views.TableSettings.textHeader": "Header",
"PE.Views.TableSettings.textHeight": "Height",
"PE.Views.TableSettings.textLast": "Last",
"PE.Views.TableSettings.textNewColor": "Custom Color",
"del_PE.Views.TableSettings.textNewColor": "Custom Color",
"PE.Views.TableSettings.textRows": "Rows",
"PE.Views.TableSettings.textSelectBorders": "Select borders you want to change applying style chosen above",
"PE.Views.TableSettings.textTemplate": "Select From Template",
@ -1693,7 +1694,7 @@
"PE.Views.TextArtSettings.textGradientFill": "Gradient Fill",
"PE.Views.TextArtSettings.textImageTexture": "Picture or Texture",
"PE.Views.TextArtSettings.textLinear": "Linear",
"PE.Views.TextArtSettings.textNewColor": "Add New Custom Color",
"del_PE.Views.TextArtSettings.textNewColor": "Add New Custom Color",
"PE.Views.TextArtSettings.textNoFill": "No Fill",
"PE.Views.TextArtSettings.textPatternFill": "Pattern",
"PE.Views.TextArtSettings.textRadial": "Radial",

1
apps/presentationeditor/main/locale/ru.json
View file

@ -14,6 +14,7 @@
"Common.define.chartData.textPoint": "Точечная",
"Common.define.chartData.textStock": "Биржевая",
"Common.define.chartData.textSurface": "Поверхность",
"Common.UI.ColorButton.textNewColor": "Пользовательский цвет",
"Common.UI.ComboBorderSize.txtNoBorders": "Без границ",
"Common.UI.ComboBorderSizeEditable.txtNoBorders": "Без границ",
"Common.UI.ComboDataView.emptyComboText": "Без стилей",

122
apps/spreadsheeteditor/main/app/view/CellSettings.js
View file

@ -99,9 +99,7 @@ define([
this.FillGradientContainer = $('#cell-panel-gradient-fill');
},
onColorsBackSelect: function(picker, color) {
this.btnBackColor.setColor(color);
onColorsBackSelect: function(btn, color) {
if (this.api) {
this.api.asc_setCellBackgroundColor(color == 'transparent' ? null : Common.Utils.ThemeColor.getRgbColor(color));
}
@ -109,14 +107,6 @@ define([
Common.NotificationCenter.trigger('edit:complete', this);
},
addNewColor: function(picker, btn) {
picker.addNewColor((typeof(btn.color) == 'object') ? btn.color.color : btn.color);
},
onColorsBorderSelect: function(picker, color) {
this.btnBorderColor.setColor(color);
},
onBtnBordersClick: function(btn, eOpts){
if (this.api) {
var new_borders = [],
@ -409,21 +399,20 @@ define([
this.lockedControls.push(this.cmbBorderType);
this.btnBorderColor = new Common.UI.ColorButton({
style: "width:45px;",
parentEl: $('#cell-border-color-btn'),
disabled: this._locked,
menu : true
menu : true,
color: '000000'
});
this.btnBorderColor.render( $('#cell-border-color-btn'));
this.btnBorderColor.setColor('000000');
this.lockedControls.push(this.btnBorderColor);
this.btnBackColor = new Common.UI.ColorButton({
style: "width:45px;",
parentEl: $('#cell-back-color-btn'),
disabled: this._locked,
menu : true
menu : true,
transparent : true,
color: 'transparent'
});
this.btnBackColor.render( $('#cell-back-color-btn'));
this.btnBackColor.setColor('transparent');
this.lockedControls.push(this.btnBackColor);
this.spnAngle = new Common.UI.MetricSpinner({
@ -755,88 +744,37 @@ define([
UpdateThemeColors: function() {
if (!this.borderColor) {
// create color buttons
this.btnBorderColor.setMenu( new Common.UI.Menu({
items: [
{ template: _.template('<div id="cell-border-color-menu" style="width: 169px; height: 220px; margin: 10px;"></div>') },
{ template: _.template('<a id="cell-border-color-new" style="padding-left:12px;">' + this.textNewColor + '</a>') }
]
}));
this.borderColor = new Common.UI.ThemeColorPalette({
el: $('#cell-border-color-menu')
});
this.borderColor.on('select', _.bind(this.onColorsBorderSelect, this));
this.btnBorderColor.menu.items[1].on('click', _.bind(this.addNewColor, this, this.borderColor, this.btnBorderColor));
this.btnBorderColor.setMenu();
this.borderColor = this.btnBorderColor.getPicker();
this.btnBackColor.setMenu( new Common.UI.Menu({
items: [
{ template: _.template('<div id="cell-back-color-menu" style="width: 169px; height: 220px; margin: 10px;"></div>') },
{ template: _.template('<a id="cell-back-color-new" style="padding-left:12px;">' + this.textNewColor + '</a>') }
]
}));
this.colorsBack = new Common.UI.ThemeColorPalette({
el: $('#cell-back-color-menu'),
transparent: true
});
this.colorsBack.on('select', _.bind(this.onColorsBackSelect, this));
this.btnBackColor.menu.items[1].on('click', _.bind(this.addNewColor, this, this.colorsBack, this.btnBackColor));
this.btnBackColor.setMenu();
this.btnBackColor.on('color:select', _.bind(this.onColorsBackSelect, this));
this.colorsBack = this.btnBackColor.getPicker();
this.fillControls.push(this.btnBackColor);
this.btnGradColor = new Common.UI.ColorButton({
style: "width:45px;",
menu : new Common.UI.Menu({
items: [
{ template: _.template('<div id="cell-gradient-color" style="width: 169px; height: 220px; margin: 10px;"></div>') },
{ template: _.template('<a id="cell-gradient-color-new" style="padding-left:12px;">' + this.textNewColor + '</a>') }
]
})
parentEl: $('#cell-gradient-color-btn'),
color: '000000'
});
this.btnGradColor.render( $('#cell-gradient-color-btn'));
this.btnGradColor.setColor('000000');
this.colorsGrad = new Common.UI.ThemeColorPalette({
el: $('#cell-gradient-color'),
value: '000000'
});
this.colorsGrad.on('select', _.bind(this.onColorsGradientSelect, this));
this.btnGradColor.menu.items[1].on('click', _.bind(this.addNewColor, this, this.colorsGrad, this.btnGradColor));
this.fillControls.push(this.btnGradColor);
this.colorsGrad = this.btnGradColor.getPicker();
this.btnGradColor.on('color:select', _.bind(this.onColorsGradientSelect, this));
this.btnFGColor = new Common.UI.ColorButton({
style: "width:45px;",
menu : new Common.UI.Menu({
items: [
{ template: _.template('<div id="cell-foreground-color-menu" style="width: 169px; height: 220px; margin: 10px;"></div>') },
{ template: _.template('<a id="cell-foreground-color-new" style="padding-left:12px;">' + this.textNewColor + '</a>') }
]
})
parentEl: $('#cell-foreground-color-btn'),
color: '000000'
});
this.btnFGColor.render( $('#cell-foreground-color-btn'));
this.btnFGColor.setColor('000000');
this.colorsFG = new Common.UI.ThemeColorPalette({
el: $('#cell-foreground-color-menu'),
value: '000000'
});
this.colorsFG.on('select', _.bind(this.onColorsFGSelect, this));
this.btnFGColor.menu.items[1].on('click', _.bind(this.addNewColor, this, this.colorsFG, this.btnFGColor));
this.fillControls.push(this.btnFGColor);
this.colorsFG = this.btnFGColor.getPicker();
this.btnFGColor.on('color:select', _.bind(this.onColorsFGSelect, this));
this.btnBGColor = new Common.UI.ColorButton({
style: "width:45px;",
menu : new Common.UI.Menu({
items: [
{ template: _.template('<div id="cell-background-color-menu" style="width: 169px; height: 220px; margin: 10px;"></div>') },
{ template: _.template('<a id="cell-background-color-new" style="padding-left:12px;">' + this.textNewColor + '</a>') }
]
})
parentEl: $('#cell-background-color-btn'),
color: 'ffffff'
});
this.btnBGColor.render( $('#cell-background-color-btn'));
this.btnBGColor.setColor('ffffff');
this.colorsBG = new Common.UI.ThemeColorPalette({
el: $('#cell-background-color-menu'),
value: 'ffffff'
});
this.colorsBG.on('select', _.bind(this.onColorsBGSelect, this));
this.btnBGColor.menu.items[1].on('click', _.bind(this.addNewColor, this, this.colorsBG, this.btnBGColor));
this.fillControls.push(this.btnBGColor);
this.colorsBG = this.btnBGColor.getPicker();
this.btnBGColor.on('color:select', _.bind(this.onColorsBGSelect, this));
}
this.colorsBack.updateColors(Common.Utils.ThemeColor.getEffectColors(), Common.Utils.ThemeColor.getStandartColors());
this.borderColor.updateColors(Common.Utils.ThemeColor.getEffectColors(), Common.Utils.ThemeColor.getStandartColors());
@ -1058,9 +996,8 @@ define([
Common.NotificationCenter.trigger('edit:complete', this);
},
onColorsGradientSelect: function(picker, color) {
onColorsGradientSelect: function(btn, color) {
var me = this;
this.btnGradColor.setColor(color);
this.GradColor.colors[this.GradColor.currentIdx] = color;
this.sldrGradient.setColorValue(Common.Utils.String.format('#{0}', (typeof(color) == 'object') ? color.color : color));
@ -1159,8 +1096,7 @@ define([
Common.NotificationCenter.trigger('edit:complete', this);
},
onColorsFGSelect: function(picker, color) {
this.btnFGColor.setColor(color);
onColorsFGSelect: function(btn, color) {
this.FGColor = {Value: 1, Color: color};
if (this.api && !this._noApply) {
if (this.pattern == null) {
@ -1175,8 +1111,7 @@ define([
Common.NotificationCenter.trigger('edit:complete', this);
},
onColorsBGSelect: function(picker, color) {
this.btnBGColor.setColor(color);
onColorsBGSelect: function(btn, color) {
this.BGColor = {Value: 1, Color: color};
if (this.api && !this._noApply) {
if (this.pattern == null) {
@ -1195,7 +1130,6 @@ define([
textBorderColor: 'Color',
textBackColor: 'Background color',
textSelectBorders : 'Select borders that you want to change',
textNewColor : 'Add New Custom Color',
tipTop: 'Set Outer Top Border Only',
tipLeft: 'Set Outer Left Border Only',
tipBottom: 'Set Outer Bottom Border Only',

120
apps/spreadsheeteditor/main/app/view/ChartSettings.js
View file

@ -524,113 +524,60 @@ define([
defValue = this.defColor;
this.btnSparkColor = new Common.UI.ColorButton({
style: "width:45px;",
menu : new Common.UI.Menu({
items: [
{ template: _.template('<div id="spark-color-menu" style="width: 169px; height: 220px; margin: 10px;"></div>') },
{ template: _.template('<a id="spark-color-new" style="padding-left:12px;">' + this.textNewColor + '</a>') }
]
})
parentEl: $('#spark-color-btn'),
color: '000000'
});
this.btnSparkColor.render( $('#spark-color-btn'));
this.btnSparkColor.setColor('000000');
this.lockedControls.push(this.btnSparkColor);
this.colorsSpark = new Common.UI.ThemeColorPalette({
el: $('#spark-color-menu'),
value: '000000'
});
this.colorsSpark.on('select', _.bind(this.onColorsSparkSelect, this));
this.btnSparkColor.menu.items[1].on('click', _.bind(this.addNewColor, this, this.colorsSpark, this.btnSparkColor));
this.colorsSpark = this.btnSparkColor.getPicker();
this.btnSparkColor.on('color:select', _.bind(this.onColorsSparkSelect, this));
this.btnHighColor = new Common.UI.ColorButton({
style: "width:45px;",
menu : new Common.UI.Menu({
items: [
{ template: _.template('<div id="spark-high-color-menu" style="width: 169px; height: 220px; margin: 10px;"></div>') },
{ template: _.template('<a id="spark-high-color-new" style="padding-left:12px;">' + this.textNewColor + '</a>') }
]
})
}).render( $('#spark-high-color-btn'));
parentEl: $('#spark-high-color-btn')
});
this.btnHighColor.setColor(this.defColor.color);
this.lockedControls.push(this.btnHighColor);
this.colorsHigh = new Common.UI.ThemeColorPalette({ el: $('#spark-high-color-menu') });
this.colorsHigh.on('select', _.bind(this.onColorsPointSelect, this, 0, this.btnHighColor));
this.btnHighColor.menu.items[1].on('click', _.bind(this.addNewColor, this, this.colorsHigh, this.btnHighColor));
this.colorsHigh = this.btnHighColor.getPicker();
this.btnHighColor.on('color:select', _.bind(this.onColorsPointSelect, this, 0));
this.btnLowColor = new Common.UI.ColorButton({
style: "width:45px;",
menu : new Common.UI.Menu({
items: [
{ template: _.template('<div id="spark-low-color-menu" style="width: 169px; height: 220px; margin: 10px;"></div>') },
{ template: _.template('<a id="spark-low-color-new" style="padding-left:12px;">' + this.textNewColor + '</a>') }
]
})
}).render( $('#spark-low-color-btn'));
parentEl: $('#spark-low-color-btn')
});
this.btnLowColor.setColor(this.defColor.color);
this.lockedControls.push(this.btnLowColor);
this.colorsLow = new Common.UI.ThemeColorPalette({ el: $('#spark-low-color-menu') });
this.colorsLow.on('select', _.bind(this.onColorsPointSelect, this, 1, this.btnLowColor));
this.btnLowColor.menu.items[1].on('click', _.bind(this.addNewColor, this, this.colorsLow, this.btnLowColor));
this.colorsLow = this.btnLowColor.getPicker();
this.btnLowColor.on('color:select', _.bind(this.onColorsPointSelect, this, 1));
this.btnNegativeColor = new Common.UI.ColorButton({
style: "width:45px;",
menu : new Common.UI.Menu({
items: [
{ template: _.template('<div id="spark-negative-color-menu" style="width: 169px; height: 220px; margin: 10px;"></div>') },
{ template: _.template('<a id="spark-negative-color-new" style="padding-left:12px;">' + this.textNewColor + '</a>') }
]
})
}).render( $('#spark-negative-color-btn'));
parentEl: $('#spark-negative-color-btn')
});
this.btnNegativeColor.setColor(this.defColor.color);
this.lockedControls.push(this.btnNegativeColor);
this.colorsNegative = new Common.UI.ThemeColorPalette({ el: $('#spark-negative-color-menu') });
this.colorsNegative.on('select', _.bind(this.onColorsPointSelect, this, 2, this.btnNegativeColor));
this.btnNegativeColor.menu.items[1].on('click', _.bind(this.addNewColor, this, this.colorsNegative, this.btnNegativeColor));
this.colorsNegative = this.btnNegativeColor.getPicker();
this.btnNegativeColor.on('color:select', _.bind(this.onColorsPointSelect, this, 2));
this.btnFirstColor = new Common.UI.ColorButton({
style: "width:45px;",
menu : new Common.UI.Menu({
items: [
{ template: _.template('<div id="spark-first-color-menu" style="width: 169px; height: 220px; margin: 10px;"></div>') },
{ template: _.template('<a id="spark-first-color-new" style="padding-left:12px;">' + this.textNewColor + '</a>') }
]
})
}).render( $('#spark-first-color-btn'));
parentEl: $('#spark-first-color-btn')
});
this.lockedControls.push(this.btnFirstColor);
this.colorsFirst = new Common.UI.ThemeColorPalette({ el: $('#spark-first-color-menu') });
this.colorsFirst.on('select', _.bind(this.onColorsPointSelect, this, 3, this.btnFirstColor));
this.btnFirstColor.setColor(this.defColor.color);
this.btnFirstColor.menu.items[1].on('click', _.bind(this.addNewColor, this, this.colorsFirst, this.btnFirstColor));
this.colorsFirst = this.btnFirstColor.getPicker();
this.btnFirstColor.on('color:select', _.bind(this.onColorsPointSelect, this, 3));
this.btnLastColor = new Common.UI.ColorButton({
style: "width:45px;",
menu : new Common.UI.Menu({
items: [
{ template: _.template('<div id="spark-last-color-menu" style="width: 169px; height: 220px; margin: 10px;"></div>') },
{ template: _.template('<a id="spark-last-color-new" style="padding-left:12px;">' + this.textNewColor + '</a>') }
]
})
}).render( $('#spark-last-color-btn'));
parentEl: $('#spark-last-color-btn')
});
this.btnLastColor.setColor(this.defColor.color);
this.lockedControls.push(this.btnLastColor);
this.colorsLast = new Common.UI.ThemeColorPalette({ el: $('#spark-last-color-menu') });
this.colorsLast.on('select', _.bind(this.onColorsPointSelect, this, 4, this.btnLastColor));
this.btnLastColor.menu.items[1].on('click', _.bind(this.addNewColor, this, this.colorsLast, this.btnLastColor));
this.colorsLast = this.btnLastColor.getPicker();
this.btnLastColor.on('color:select', _.bind(this.onColorsPointSelect, this, 4));
this.btnMarkersColor = new Common.UI.ColorButton({
style: "width:45px;",
menu : new Common.UI.Menu({
items: [
{ template: _.template('<div id="spark-markers-color-menu" style="width: 169px; height: 220px; margin: 10px;"></div>') },
{ template: _.template('<a id="spark-markers-color-new" style="padding-left:12px;">' + this.textNewColor + '</a>') }
]
})
}).render( $('#spark-markers-color-btn'));
parentEl: $('#spark-markers-color-btn')
});
this.btnMarkersColor.setColor(this.defColor.color);
this.lockedControls.push(this.btnMarkersColor);
this.colorsMarkers = new Common.UI.ThemeColorPalette({ el: $('#spark-markers-color-menu') });
this.colorsMarkers.on('select', _.bind(this.onColorsPointSelect, this, 5, this.btnMarkersColor));
this.btnMarkersColor.menu.items[1].on('click', _.bind(this.addNewColor, this, this.colorsMarkers, this.btnMarkersColor));
this.colorsMarkers = this.btnMarkersColor.getPicker();
this.btnMarkersColor.on('color:select', _.bind(this.onColorsPointSelect, this, 5));
}
this.colorsSpark.updateColors(Common.Utils.ThemeColor.getEffectColors(), Common.Utils.ThemeColor.getStandartColors());
this.colorsHigh.updateColors(Common.Utils.ThemeColor.getEffectColors(), Common.Utils.ThemeColor.getStandartColors(), defValue);
@ -1174,8 +1121,7 @@ define([
this.applyBorderSize(record.value);
},
onColorsSparkSelect: function(picker, color) {
this.btnSparkColor.setColor(color);
onColorsSparkSelect: function(btn, color) {
if (this.api && !this._noApply && this._originalProps) {
var props = new Asc.sparklineGroup();
props.asc_setColorSeries(Common.Utils.ThemeColor.getRgbColor(color));
@ -1184,10 +1130,6 @@ define([
Common.NotificationCenter.trigger('edit:complete', this);
},
addNewColor: function(picker, btn) {
picker.addNewColor((typeof(btn.color) == 'object') ? btn.color.color : btn.color);
},
onCheckPointChange: function(type, field, newValue, oldValue, eOpts) {
if (this.api && !this._noApply && this._originalProps) {
var props = new Asc.sparklineGroup();
@ -1216,8 +1158,7 @@ define([
Common.NotificationCenter.trigger('edit:complete', this);
},
onColorsPointSelect: function(type, btn, picker, color) {
btn.setColor(color);
onColorsPointSelect: function(type, btn, color) {
if (this.chPoints[type].getValue() !== 'checked')
this.chPoints[type].setValue(true, true);
if (this.api && !this._noApply && this._originalProps) {
@ -1280,7 +1221,6 @@ define([
strSparkColor: 'Color',
strLineWeight: 'Line Weight',
textMarkers: 'Markers',
textNewColor: 'Add New Custom Color',
textHighPoint: 'High Point',
textLowPoint: 'Low Point',
textNegativePoint: 'Negative Point',

117
apps/spreadsheeteditor/main/app/view/ShapeSettings.js
View file

@ -244,8 +244,7 @@ define([
Common.NotificationCenter.trigger('edit:complete', this);
},
onColorsBackSelect: function(picker, color) {
this.btnBackColor.setColor(color);
onColorsBackSelect: function(btn, color) {
this.ShapeColor = {Value: 1, Color: color};
if (this.api && !this._noApply) {
@ -268,10 +267,6 @@ define([
Common.NotificationCenter.trigger('edit:complete', this);
},
addNewColor: function(picker, btn) {
picker.addNewColor((typeof(btn.color) == 'object') ? btn.color.color : btn.color);
},
onPatternSelect: function(combo, record){
if (this.api && !this._noApply) {
this.PatternFillType = record.get('type');
@ -291,8 +286,7 @@ define([
Common.NotificationCenter.trigger('edit:complete', this);
},
onColorsFGSelect: function(picker, color) {
this.btnFGColor.setColor(color);
onColorsFGSelect: function(btn, color) {
this.FGColor = {Value: 1, Color: color};
if (this.api && !this._noApply) {
var props = new Asc.asc_CShapeProperty();
@ -311,8 +305,7 @@ define([
Common.NotificationCenter.trigger('edit:complete', this);
},
onColorsBGSelect: function(picker, color) {
this.btnBGColor.setColor(color);
onColorsBGSelect: function(btn, color) {
this.BGColor = {Value: 1, Color: color};
if (this.api && !this._noApply) {
var props = new Asc.asc_CShapeProperty();
@ -475,8 +468,7 @@ define([
Common.NotificationCenter.trigger('edit:complete', this);
},
onColorsGradientSelect: function(picker, color) {
this.btnGradColor.setColor(color);
onColorsGradientSelect: function(btn, color) {
this.GradColor.colors[this.GradColor.currentIdx] = color;
this.sldrGradient.setColorValue(Common.Utils.String.format('#{0}', (typeof(color) == 'object') ? color.color : color));
@ -637,8 +629,7 @@ define([
Common.NotificationCenter.trigger('edit:complete', this);
},
onColorsBorderSelect: function(picker, color) {
this.btnBorderColor.setColor(color);
onColorsBorderSelect: function(btn, color) {
this.BorderColor = {Value: 1, Color: color};
if (this.api && this.BorderSize>0 && !this._noApply) {
var props = new Asc.asc_CShapeProperty();
@ -1595,100 +1586,45 @@ define([
if (this._initSettings) return;
if (!this.btnBackColor) {
this.btnBackColor = new Common.UI.ColorButton({
style: "width:45px;",
menu : new Common.UI.Menu({
items: [
{ template: _.template('<div id="shape-back-color-menu" style="width: 169px; height: 220px; margin: 10px;"></div>') },
{ template: _.template('<a id="shape-back-color-new" style="padding-left:12px;">' + this.textNewColor + '</a>') }
]
})
parentEl: $('#shape-back-color-btn'),
transparent: true,
color: 'transparent'
});
this.btnBackColor.render( $('#shape-back-color-btn'));
this.btnBackColor.setColor('transparent');
this.fillControls.push(this.btnBackColor);
this.colorsBack = new Common.UI.ThemeColorPalette({
el: $('#shape-back-color-menu'),
value: 'transparent',
transparent: true
});
this.colorsBack.on('select', _.bind(this.onColorsBackSelect, this));
this.btnBackColor.menu.items[1].on('click', _.bind(this.addNewColor, this, this.colorsBack, this.btnBackColor));
this.colorsBack = this.btnBackColor.getPicker();
this.btnBackColor.on('color:select', _.bind(this.onColorsBackSelect, this));
this.btnBorderColor = new Common.UI.ColorButton({
style: "width:45px;",
menu : new Common.UI.Menu({
items: [
{ template: _.template('<div id="shape-border-color-menu" style="width: 169px; height: 220px; margin: 10px;"></div>') },
{ template: _.template('<a id="shape-border-color-new" style="padding-left:12px;">' + this.textNewColor + '</a>') }
]
})
parentEl: $('#shape-border-color-btn'),
color: '000000'
});
this.btnBorderColor.render( $('#shape-border-color-btn'));
this.btnBorderColor.setColor('000000');
this.lockedControls.push(this.btnBorderColor);
this.colorsBorder = new Common.UI.ThemeColorPalette({
el: $('#shape-border-color-menu'),
value: '000000'
});
this.colorsBorder.on('select', _.bind(this.onColorsBorderSelect, this));
this.btnBorderColor.menu.items[1].on('click', _.bind(this.addNewColor, this, this.colorsBorder, this.btnBorderColor));
this.colorsBorder = this.btnBorderColor.getPicker();
this.btnBorderColor.on('color:select', _.bind(this.onColorsBorderSelect, this));
this.btnFGColor = new Common.UI.ColorButton({
style: "width:45px;",
menu : new Common.UI.Menu({
items: [
{ template: _.template('<div id="shape-foreground-color-menu" style="width: 169px; height: 220px; margin: 10px;"></div>') },
{ template: _.template('<a id="shape-foreground-color-new" style="padding-left:12px;">' + this.textNewColor + '</a>') }
]
})
parentEl: $('#shape-foreground-color-btn'),
color: '000000'
});
this.btnFGColor.render( $('#shape-foreground-color-btn'));
this.btnFGColor.setColor('000000');
this.fillControls.push(this.btnFGColor);
this.colorsFG = new Common.UI.ThemeColorPalette({
el: $('#shape-foreground-color-menu'),
value: '000000'
});
this.colorsFG.on('select', _.bind(this.onColorsFGSelect, this));
this.btnFGColor.menu.items[1].on('click', _.bind(this.addNewColor, this, this.colorsFG, this.btnFGColor));
this.colorsFG = this.btnFGColor.getPicker();
this.btnFGColor.on('color:select', _.bind(this.onColorsFGSelect, this));
this.btnBGColor = new Common.UI.ColorButton({
style: "width:45px;",
menu : new Common.UI.Menu({
items: [
{ template: _.template('<div id="shape-background-color-menu" style="width: 169px; height: 220px; margin: 10px;"></div>') },
{ template: _.template('<a id="shape-background-color-new" style="padding-left:12px;">' + this.textNewColor + '</a>') }
]
})
parentEl: $('#shape-background-color-btn'),
color: 'ffffff'
});
this.btnBGColor.render( $('#shape-background-color-btn'));
this.btnBGColor.setColor('ffffff');
this.fillControls.push(this.btnBGColor);
this.colorsBG = new Common.UI.ThemeColorPalette({
el: $('#shape-background-color-menu'),
value: 'ffffff'
});
this.colorsBG.on('select', _.bind(this.onColorsBGSelect, this));
this.btnBGColor.menu.items[1].on('click', _.bind(this.addNewColor, this, this.colorsBG, this.btnBGColor));
this.colorsBG = this.btnBGColor.getPicker();
this.btnBGColor.on('color:select', _.bind(this.onColorsBGSelect, this));
this.btnGradColor = new Common.UI.ColorButton({
style: "width:45px;",
menu : new Common.UI.Menu({
items: [
{ template: _.template('<div id="shape-gradient-color-menu" style="width: 169px; height: 220px; margin: 10px;"></div>') },
{ template: _.template('<a id="shape-gradient-color-new" style="padding-left:12px;">' + this.textNewColor + '</a>') }
]
})
parentEl: $('#shape-gradient-color-btn'),
color: '000000'
});
this.btnGradColor.render( $('#shape-gradient-color-btn'));
this.btnGradColor.setColor('000000');
this.fillControls.push(this.btnGradColor);
this.colorsGrad = new Common.UI.ThemeColorPalette({
el: $('#shape-gradient-color-menu'),
value: '000000'
});
this.colorsGrad.on('select', _.bind(this.onColorsGradientSelect, this));
this.btnGradColor.menu.items[1].on('click', _.bind(this.addNewColor, this, this.colorsGrad, this.btnGradColor));
this.colorsGrad = this.btnGradColor.getPicker();
this.btnGradColor.on('color:select', _.bind(this.onColorsGradientSelect, this));
}
this.colorsBorder.updateColors(Common.Utils.ThemeColor.getEffectColors(), Common.Utils.ThemeColor.getStandartColors());
@ -1780,7 +1716,6 @@ define([
txtBrownPaper : 'Brown Paper',
txtPapyrus : 'Papyrus',
txtWood : 'Wood',
textNewColor : 'Add New Custom Color',
textAdvanced : 'Show advanced settings',
strTransparency : 'Opacity',
textNoFill : 'No Fill',

117
apps/spreadsheeteditor/main/app/view/TextArtSettings.js
View file

@ -239,8 +239,7 @@ define([
Common.NotificationCenter.trigger('edit:complete', this);
},
onColorsBackSelect: function(picker, color) {
this.btnBackColor.setColor(color);
onColorsBackSelect: function(btn, color) {
this.ShapeColor = {Value: 1, Color: color};
if (this.api && !this._noApply) {
@ -263,10 +262,6 @@ define([
Common.NotificationCenter.trigger('edit:complete', this);
},
addNewColor: function(picker, btn) {
picker.addNewColor((typeof(btn.color) == 'object') ? btn.color.color : btn.color);
},
onPatternSelect: function(combo, record){
if (this.api && !this._noApply) {
this.PatternFillType = record.get('type');
@ -286,8 +281,7 @@ define([
Common.NotificationCenter.trigger('edit:complete', this);
},
onColorsFGSelect: function(picker, color) {
this.btnFGColor.setColor(color);
onColorsFGSelect: function(btn, color) {
this.FGColor = {Value: 1, Color: color};
if (this.api && !this._noApply) {
var props = new Asc.asc_TextArtProperties();
@ -306,8 +300,7 @@ define([
Common.NotificationCenter.trigger('edit:complete', this);
},
onColorsBGSelect: function(picker, color) {
this.btnBGColor.setColor(color);
onColorsBGSelect: function(btn, color) {
this.BGColor = {Value: 1, Color: color};
if (this.api && !this._noApply) {
var props = new Asc.asc_TextArtProperties();
@ -470,8 +463,7 @@ define([
Common.NotificationCenter.trigger('edit:complete', this);
},
onColorsGradientSelect: function(picker, color) {
this.btnGradColor.setColor(color);
onColorsGradientSelect: function(btn, color) {
this.GradColor.colors[this.GradColor.currentIdx] = color;
this.sldrGradient.setColorValue(Common.Utils.String.format('#{0}', (typeof(color) == 'object') ? color.color : color));
@ -633,8 +625,7 @@ define([
Common.NotificationCenter.trigger('edit:complete', this);
},
onColorsBorderSelect: function(picker, color) {
this.btnBorderColor.setColor(color);
onColorsBorderSelect: function(btn, color) {
this.BorderColor = {Value: 1, Color: color};
if (this.api && this.BorderSize>0 && !this._noApply) {
var props = new Asc.asc_TextArtProperties();
@ -1517,100 +1508,45 @@ define([
if (this._initSettings) return;
if (!this.btnBackColor) {
this.btnBorderColor = new Common.UI.ColorButton({
style: "width:45px;",
menu : new Common.UI.Menu({
items: [
{ template: _.template('<div id="textart-border-color-menu" style="width: 169px; height: 220px; margin: 10px;"></div>') },
{ template: _.template('<a id="textart-border-color-new" style="padding-left:12px;">' + this.textNewColor + '</a>') }
]
})
parentEl: $('#textart-border-color-btn'),
color: '000000'
});
this.btnBorderColor.render( $('#textart-border-color-btn'));
this.btnBorderColor.setColor('000000');
this.lockedControls.push(this.btnBorderColor);
this.colorsBorder = new Common.UI.ThemeColorPalette({
el: $('#textart-border-color-menu'),
value: '000000'
});
this.colorsBorder.on('select', _.bind(this.onColorsBorderSelect, this));
this.btnBorderColor.menu.items[1].on('click', _.bind(this.addNewColor, this, this.colorsBorder, this.btnBorderColor));
this.colorsBorder = this.btnBorderColor.getPicker();
this.btnBorderColor.on('color:select', _.bind(this.onColorsBorderSelect, this));
this.btnBackColor = new Common.UI.ColorButton({
style: "width:45px;",
menu : new Common.UI.Menu({
items: [
{ template: _.template('<div id="textart-back-color-menu" style="width: 169px; height: 220px; margin: 10px;"></div>') },
{ template: _.template('<a id="textart-back-color-new" style="padding-left:12px;">' + this.textNewColor + '</a>') }
]
})
parentEl: $('#textart-back-color-btn'),
transparent: true,
color: 'transparent'
});
this.btnBackColor.render( $('#textart-back-color-btn'));
this.btnBackColor.setColor('transparent');
this.lockedControls.push(this.btnBackColor);
this.colorsBack = new Common.UI.ThemeColorPalette({
el: $('#textart-back-color-menu'),
value: 'transparent',
transparent: true
});
this.colorsBack.on('select', _.bind(this.onColorsBackSelect, this));
this.btnBackColor.menu.items[1].on('click', _.bind(this.addNewColor, this, this.colorsBack, this.btnBackColor));
this.colorsBack = this.btnBackColor.getPicker();
this.btnBackColor.on('color:select', _.bind(this.onColorsBackSelect, this));
this.btnFGColor = new Common.UI.ColorButton({
style: "width:45px;",
menu : new Common.UI.Menu({
items: [
{ template: _.template('<div id="textart-foreground-color-menu" style="width: 169px; height: 220px; margin: 10px;"></div>') },
{ template: _.template('<a id="textart-foreground-color-new" style="padding-left:12px;">' + this.textNewColor + '</a>') }
]
})
parentEl: $('#textart-foreground-color-btn'),
color: '000000'
});
this.btnFGColor.render( $('#textart-foreground-color-btn'));
this.btnFGColor.setColor('000000');
this.lockedControls.push(this.btnFGColor);
this.colorsFG = new Common.UI.ThemeColorPalette({
el: $('#textart-foreground-color-menu'),
value: '000000'
});
this.colorsFG.on('select', _.bind(this.onColorsFGSelect, this));
this.btnFGColor.menu.items[1].on('click', _.bind(this.addNewColor, this, this.colorsFG, this.btnFGColor));
this.colorsFG = this.btnFGColor.getPicker();
this.btnFGColor.on('color:select', _.bind(this.onColorsFGSelect, this));
this.btnBGColor = new Common.UI.ColorButton({
style: "width:45px;",
menu : new Common.UI.Menu({
items: [
{ template: _.template('<div id="textart-background-color-menu" style="width: 169px; height: 220px; margin: 10px;"></div>') },
{ template: _.template('<a id="textart-background-color-new" style="padding-left:12px;">' + this.textNewColor + '</a>') }
]
})
parentEl: $('#textart-background-color-btn'),
color: 'ffffff'
});
this.btnBGColor.render( $('#textart-background-color-btn'));
this.btnBGColor.setColor('ffffff');
this.lockedControls.push(this.btnBGColor);
this.colorsBG = new Common.UI.ThemeColorPalette({
el: $('#textart-background-color-menu'),
value: 'ffffff'
});
this.colorsBG.on('select', _.bind(this.onColorsBGSelect, this));
this.btnBGColor.menu.items[1].on('click', _.bind(this.addNewColor, this, this.colorsBG, this.btnBGColor));
this.colorsBG = this.btnBGColor.getPicker();
this.btnBGColor.on('color:select', _.bind(this.onColorsBGSelect, this));
this.btnGradColor = new Common.UI.ColorButton({
style: "width:45px;",
menu : new Common.UI.Menu({
items: [
{ template: _.template('<div id="textart-gradient-color-menu" style="width: 169px; height: 220px; margin: 10px;"></div>') },
{ template: _.template('<a id="textart-gradient-color-new" style="padding-left:12px;">' + this.textNewColor + '</a>') }
]
})
parentEl: $('#textart-gradient-color-btn'),
color: '000000'
});
this.btnGradColor.render( $('#textart-gradient-color-btn'));
this.btnGradColor.setColor('000000');
this.lockedControls.push(this.btnGradColor);
this.colorsGrad = new Common.UI.ThemeColorPalette({
el: $('#textart-gradient-color-menu'),
value: '000000'
});
this.colorsGrad.on('select', _.bind(this.onColorsGradientSelect, this));
this.btnGradColor.menu.items[1].on('click', _.bind(this.addNewColor, this, this.colorsGrad, this.btnGradColor));
this.colorsGrad = this.btnGradColor.getPicker();
this.btnGradColor.on('color:select', _.bind(this.onColorsGradientSelect, this));
}
this.colorsBorder.updateColors(Common.Utils.ThemeColor.getEffectColors(), Common.Utils.ThemeColor.getStandartColors());
this.colorsBack.updateColors(Common.Utils.ThemeColor.getEffectColors(), Common.Utils.ThemeColor.getStandartColors());
@ -1673,7 +1609,6 @@ define([
txtBrownPaper : 'Brown Paper',
txtPapyrus : 'Papyrus',
txtWood : 'Wood',
textNewColor : 'Add New Custom Color',
strTransparency : 'Opacity',
textNoFill : 'No Fill',
textSelectTexture : 'Select',

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

@ -16,6 +16,7 @@
"Common.define.chartData.textStock": "Stock",
"Common.define.chartData.textSurface": "Surface",
"Common.define.chartData.textWinLossSpark": "Win/Loss",
"Common.UI.ColorButton.textNewColor": "Add New Custom Color",
"Common.UI.ComboBorderSize.txtNoBorders": "No borders",
"Common.UI.ComboBorderSizeEditable.txtNoBorders": "No borders",
"Common.UI.ComboDataView.emptyComboText": "No styles",
@ -108,7 +109,7 @@
"Common.Views.ImageFromUrlDialog.textUrl": "Paste an image URL:",
"Common.Views.ImageFromUrlDialog.txtEmpty": "This field is required",
"Common.Views.ImageFromUrlDialog.txtNotUrl": "This field should be a URL in the \"http://www.example.com\" format",
"Common.Views.ListSettingsDialog.textNewColor": "Add New Custom Color",
"del_Common.Views.ListSettingsDialog.textNewColor": "Add New Custom Color",
"Common.Views.ListSettingsDialog.tipChange": "Change bullet",
"Common.Views.ListSettingsDialog.txtBullet": "Bullet",
"Common.Views.ListSettingsDialog.txtColor": "Color",
@ -1235,7 +1236,7 @@
"SSE.Views.CellSettings.textGradient": "Gradient",
"SSE.Views.CellSettings.textGradientFill": "Gradient Fill",
"SSE.Views.CellSettings.textLinear": "Linear",
"SSE.Views.CellSettings.textNewColor": "Add New Custom Color",
"del_SSE.Views.CellSettings.textNewColor": "Add New Custom Color",
"SSE.Views.CellSettings.textNoFill": "No Fill",
"SSE.Views.CellSettings.textOrientation": "Text Orientation",
"SSE.Views.CellSettings.textPattern": "Pattern",
@ -1269,7 +1270,7 @@
"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.textNewColor": "Add New Custom Color",
"SSE.Views.ChartSettings.textRanges": "Data Range",
"SSE.Views.ChartSettings.textSelectData": "Select Data",
"SSE.Views.ChartSettings.textShow": "Show",
@ -2144,7 +2145,7 @@
"SSE.Views.ShapeSettings.textHintFlipV": "Flip Vertically",
"SSE.Views.ShapeSettings.textImageTexture": "Picture or Texture",
"SSE.Views.ShapeSettings.textLinear": "Linear",
"SSE.Views.ShapeSettings.textNewColor": "Custom Color",
"del_SSE.Views.ShapeSettings.textNewColor": "Custom Color",
"SSE.Views.ShapeSettings.textNoFill": "No Fill",
"SSE.Views.ShapeSettings.textOriginalSize": "Original Size",
"SSE.Views.ShapeSettings.textPatternFill": "Pattern",
@ -2403,7 +2404,7 @@
"SSE.Views.TextArtSettings.textGradientFill": "Gradient Fill",
"SSE.Views.TextArtSettings.textImageTexture": "Picture or Texture",
"SSE.Views.TextArtSettings.textLinear": "Linear",
"SSE.Views.TextArtSettings.textNewColor": "Add New Custom Color",
"del_SSE.Views.TextArtSettings.textNewColor": "Add New Custom Color",
"SSE.Views.TextArtSettings.textNoFill": "No Fill",
"SSE.Views.TextArtSettings.textPatternFill": "Pattern",
"SSE.Views.TextArtSettings.textRadial": "Radial",

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

@ -15,6 +15,7 @@
"Common.define.chartData.textStock": "Биржевая",
"Common.define.chartData.textSurface": "Поверхность",
"Common.define.chartData.textWinLossSpark": "Выигрыш/проигрыш",
"Common.UI.ColorButton.textNewColor": "Пользовательский цвет",
"Common.UI.ComboBorderSize.txtNoBorders": "Без границ",
"Common.UI.ComboBorderSizeEditable.txtNoBorders": "Без границ",
"Common.UI.ComboDataView.emptyComboText": "Без стилей",