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

[PE][SSE] Change bullet in the list settings dialog

Browse source
This commit is contained in:
Julia Radzhabova 2019-11-19 17:05:02 +03:00
parent 6c55bd0f24
commit 90d65ddff5
6 changed files with 71 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -46,15 +46,16 @@ define([
'common/main/lib/component/Window',
'common/main/lib/component/MetricSpinner',
'common/main/lib/component/ThemeColorPalette',
'common/main/lib/component/ColorButton'
'common/main/lib/component/ColorButton',
'common/main/lib/view/SymbolTableDialog'
], function () { 'use strict';
Common.Views.ListSettingsDialog = Common.UI.Window.extend(_.extend({
options: {
type: 0, // 0 - markers, 1 - numbers
width: 230,
height: 156,
style: 'min-width: 230px;',
height: 200,
style: 'min-width: 240px;',
cls: 'modal-dlg',
split: false,
buttons: ['ok', 'cancel']
@ -64,20 +65,25 @@ define([
this.type = options.type || 0;
_.extend(this.options, {
title: this.txtTitle,
height: this.type==1 ? 190 : 156
title: this.txtTitle
}, options || {});
this.template = [
'<div class="box">',
'<div class="input-row">',
'<div class="input-row" style="margin-bottom: 10px;">',
'<label class="text" style="width: 70px;">' + this.txtSize + '</label><div id="id-dlg-list-size"></div><label class="text" style="margin-left: 10px;">' + this.txtOfText + '</label>',
'</div>',
'<div style="margin-top: 10px;">',
'<div style="margin-bottom: 10px;">',
'<label class="text" style="width: 70px;">' + this.txtColor + '</label><div id="id-dlg-list-color" style="display: inline-block;"></div>',
'</div>',
'<% if (type == 0) { %>',
'<div class="input-row" style="margin-bottom: 10px;">',
'<label class="text" style="width: 70px;vertical-align: top;">' + this.txtBullet + '</label>',
'<button type="button" class="btn btn-text-default" id="id-dlg-list-edit" style="width:53px;display: inline-block;vertical-align: top;"></button>',
'</div>',
'<% } %>',
'<% if (type == 1) { %>',
'<div class="input-row" style="margin-top: 10px;">',
'<div class="input-row" style="margin-bottom: 10px;">',
'<label class="text" style="width: 70px;">' + this.txtStart + '</label><div id="id-dlg-list-start"></div>',
'</div>',
'<% } %>',
@ -163,6 +169,13 @@ define([
}
});
this.btnEdit = new Common.UI.Button({
el: $window.find('#id-dlg-list-edit'),
hint: this.tipChange
});
this.btnEdit.on('click', _.bind(this.onEditBullet, this));
this.btnEdit.cmpEl.css({'font-size': '12px'});
this.afterRender();
},
@ -186,6 +199,36 @@ define([
}
},
onEditBullet: function() {
var me = this,
props = me.bulletProps,
handler = function(dlg, result, settings) {
if (result == 'ok') {
props.changed = true;
props.code = settings.code;
props.font = settings.font;
props.symbol = settings.symbol;
props.font && me.btnEdit.cmpEl.css('font-family', props.font);
settings.symbol && me.btnEdit.setCaption(settings.symbol);
if (me._changedProps) {
me._changedProps.asc_putBulletFont(props.font);
me._changedProps.asc_putBulletSymbol(props.symbol);
}
}
},
win = new Common.Views.SymbolTableDialog({
api: me.options.api,
lang: me.options.interfaceLang,
modal: true,
type: 0,
font: props.font,
symbol: props.symbol,
handler: handler
});
win.show();
win.on('symbol:dblclick', handler);
},
_handleInput: function(state) {
if (this.options.handler) {
this.options.handler.call(this, state, this._changedProps);
@ -228,6 +271,12 @@ define([
if (!isselected) this.colors.clearSelection();
} else
this.colors.select(color,true);
if (this.type==0) {
this.bulletProps = {symbol: props.asc_getBulletSymbol(), font: props.asc_getBulletFont()};
this.bulletProps.font && this.btnEdit.cmpEl.css('font-family', this.bulletProps.font);
this.bulletProps.symbol && this.btnEdit.setCaption(this.bulletProps.symbol);
}
}
this._changedProps = new Asc.asc_CParagraphProperty();
},
@ -237,6 +286,8 @@ define([
txtColor: 'Color',
txtOfText: '% of text',
textNewColor: 'Add New Custom Color',
txtStart: 'Start at'
txtStart: 'Start at',
txtBullet: 'Bullet',
tipChange: 'Change bullet'
}, Common.Views.ListSettingsDialog || {}))
});

2
apps/common/main/lib/view/SymbolTableDialog.js
View file

@ -488,6 +488,8 @@ define([
if (options.code) {
nCurrentSymbol = options.code;
} else if (options.symbol) {
nCurrentSymbol = this.fixedCharCodeAt(options.symbol, 0);
}
if (init && this.options.lang && this.options.lang != 'en') {

2
apps/presentationeditor/main/app/controller/Toolbar.js
View file

@ -1126,8 +1126,10 @@ define([
}
if (props) {
(new Common.Views.ListSettingsDialog({
api: me.api,
props: props,
type: type,
interfaceLang: me.toolbar.mode.lang,
handler: function(result, value) {
if (result == 'ok') {
if (me.api) {

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

@ -123,6 +123,8 @@
"Common.Views.ListSettingsDialog.txtSize": "Size",
"Common.Views.ListSettingsDialog.txtStart": "Start at",
"Common.Views.ListSettingsDialog.txtTitle": "List Settings",
"Common.Views.ListSettingsDialog.txtBullet": "Bullet",
"Common.Views.ListSettingsDialog.tipChange": "Change bullet",
"Common.Views.OpenDialog.closeButtonText": "Close File",
"Common.Views.OpenDialog.txtEncoding": "Encoding ",
"Common.Views.OpenDialog.txtIncorrectPwd": "Password is incorrect.",

4
apps/spreadsheeteditor/main/app/controller/DocumentHolder.js
View file

@ -763,8 +763,10 @@ define([
}
if (props) {
(new Common.Views.ListSettingsDialog({
api: me.api,
props: props,
type: this.api.asc_getCurrentListType().get_ListType(),
type: me.api.asc_getCurrentListType().get_ListType(),
interfaceLang: me.permissions.lang,
handler: function(result, value) {
if (result == 'ok') {
if (me.api) {

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

@ -113,6 +113,8 @@
"Common.Views.ListSettingsDialog.txtSize": "Size",
"Common.Views.ListSettingsDialog.txtStart": "Start at",
"Common.Views.ListSettingsDialog.txtTitle": "List Settings",
"Common.Views.ListSettingsDialog.txtBullet": "Bullet",
"Common.Views.ListSettingsDialog.tipChange": "Change bullet",
"Common.Views.OpenDialog.closeButtonText": "Close File",
"Common.Views.OpenDialog.txtColon": "Colon",
"Common.Views.OpenDialog.txtComma": "Comma",