pengjunjie/web-apps
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/web-apps.git synced 2026-07-25 10:27:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

[DE,PE,SSE] update tooltips for mnuInsertSymbolsPicker

Browse Source
This commit is contained in:
OVSharova
2023-06-16 05:21:55 +03:00
parent 88d6b51c6a
commit b6ab1845c4
13 changed files with 397 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -815,7 +815,7 @@ define([
getSpecialSymbol: function() {
var rec = this.specialList.getSelectedRec();
return {font: undefined, symbol: this.encodeSurrogateChar(rec.get('code')), code: parseInt(rec.get('code'), 16), special: rec.get('special')};
return {font: undefined, symbol: this.encodeSurrogateChar(rec.get('code')), code: parseInt(rec.get('code'), 16), special: rec.get('special'), speccharacter: true};
},
onBtnClick: function(event) {

8
apps/documenteditor/main/app/controller/Toolbar.js
View File

@ -2894,14 +2894,14 @@ define([
buttons: [{value: 'ok', caption: this.textInsert}, 'close'],
handler: function(dlg, result, settings) {
if (result == 'ok') {
me.insertSymbol(settings.font, settings.code, settings.special);
me.insertSymbol(settings.font, settings.code, settings.special, settings.speccharacter);
} else
Common.NotificationCenter.trigger('edit:complete', me.toolbar);
}
});
me.dlgSymbolTable.show();
me.dlgSymbolTable.on('symbol:dblclick', function(cmp, result, settings) {
me.insertSymbol(settings.font, settings.code, settings.special);
me.insertSymbol(settings.font, settings.code, settings.special, settings.speccharacter);
});
me.dlgSymbolTable.on('close', function(obj){
Common.NotificationCenter.trigger('edit:complete', me.toolbar);
@ -2914,10 +2914,10 @@ define([
this.insertSymbol(record.get('font'), record.get('symbol'), record.get('special'));
},
insertSymbol: function(fontRecord, symbol, special){
insertSymbol: function(fontRecord, symbol, special, specCharacter){
var font = fontRecord ? fontRecord: this.api.get_TextProps().get_TextPr().get_FontFamily().get_Name();
this.api.asc_insertSymbol(font, symbol, special);
this.toolbar.saveSymbol(symbol, font);
!specCharacter && this.toolbar.saveSymbol(symbol, font);
},
onApiMathTypes: function(equation) {

125
apps/documenteditor/main/app/view/Toolbar.js
View File

@ -2362,6 +2362,33 @@ define([
}));
// set dataviews
this.specSymbols = [
{symbol: 8226, description: this.textBullet},
{symbol: 8364, description: this.textEuro},
{symbol: 65284, description: this.textDollar},
{symbol: 165, description: this.textYen},
{symbol: 169, description: this.textCopyright},
{symbol: 174, description: this.textRegistered},
{symbol: 189, description: this.textOneHalf},
{symbol: 188, description: this.textOneQuarter},
{symbol: 8800, description: this.textNotEqualTo},
{symbol: 177, description: this.textPlusMinus},
{symbol: 247, description: this.textDivision},
{symbol: 8730, description: this.textSquareRoot},
{symbol: 8804, description: this.textLessEqual},
{symbol: 8805, description: this.textGreaterEqual},
{symbol: 8482, description: this.textTradeMark},
{symbol: 8734, description: this.textInfinity},
{symbol: 126, description: this.textTilde},
{symbol: 176, description: this.textDegree},
{symbol: 167, description: this.textSection},
{symbol: 945, description: this.textAlpha},
{symbol: 946, description: this.textBetta},
{symbol: 960, description: this.textLetterPi},
{symbol: 916, description: this.textDelta},
{symbol: 9786, description: this.textSmile},
{symbol: 9829, description: this.textBlackHeart}
];
this.mnuInsertSymbolsPicker = new Common.UI.DataView({
el: $('#id-toolbar-menu-symbols'),
parentMenu: this.btnInsertSymbol.menu,
@ -2890,36 +2917,40 @@ define([
},
loadRecentSymbolsFromStorage: function(){
//Common.localStorage.removeItem('de-fastRecentSymbols');
var recents = Common.localStorage.getItem('de-fastRecentSymbols');
if(!!recents)
return JSON.parse(recents);
return [
{ symbol: 8226, font: 'Arial', tip: 'Symbol: 8226'},
{ symbol: 8364, font: 'Arial', tip: 'Symbol: 8364'},
{ symbol: 65284, font: 'Arial', tip: 'Symbol: 65284'},
{ symbol: 165, font: 'Arial', tip: 'Symbol: 165'},
{ symbol: 169, font: 'Arial', tip: 'Symbol: 169'},
{ symbol: 174, font: 'Arial', tip: 'Symbol: 174'},
{ symbol: 189, font: 'Arial', tip: 'Symbol: 189'},
{ symbol: 188, font: 'Arial', tip: 'Symbol: 188'},
{ symbol: 8800, font: 'Arial', tip: 'Symbol: 8800'},
{ symbol: 177, font: 'Arial', tip: 'Symbol: 177'},
{ symbol: 247, font: 'Arial', tip: 'Symbol: 247'},
{ symbol: 8730, font: 'Arial', tip: 'Symbol: 8730'},
{ symbol: 8804, font: 'Arial', tip: 'Symbol: 8804'},
{ symbol: 8805, font: 'Arial', tip: 'Symbol: 8805'},
{ symbol: 8482, font: 'Arial', tip: 'Symbol: 8482'},
{ symbol: 8734, font: 'Arial', tip: 'Symbol: 8734'},
{ symbol: 126, font: 'Arial', tip: 'Symbol: 126'},
{ symbol: 176, font: 'Arial', tip: 'Symbol: 176'},
{ symbol: 167, font: 'Arial', tip: 'Symbol: 167'},
{ symbol: 945, font: 'Arial', tip: 'Symbol: 945'},
{ symbol: 946, font: 'Arial', tip: 'Symbol: 946'},
{ symbol: 960, font: 'Arial', tip: 'Symbol: 960'},
{ symbol: 916, font: 'Arial', tip: 'Symbol: 916'},
{ symbol: 9786, font: 'Arial', tip: 'Symbol: 9786'},
{ symbol: 9829, font: 'Arial', tip: 'Symbol: 9829'}
];
var arr =(!!recents) ? JSON.parse(recents) :
[
{ symbol: 8226, font: 'Arial'},
{ symbol: 8364, font: 'Arial'},
{ symbol: 65284, font: 'Arial'},
{ symbol: 165, font: 'Arial'},
{ symbol: 169, font: 'Arial'},
{ symbol: 174, font: 'Arial'},
{ symbol: 189, font: 'Arial'},
{ symbol: 188, font: 'Arial'},
{ symbol: 8800, font: 'Arial'},
{ symbol: 177, font: 'Arial'},
{ symbol: 247, font: 'Arial'},
{ symbol: 8730, font: 'Arial'},
{ symbol: 8804, font: 'Arial'},
{ symbol: 8805, font: 'Arial'},
{ symbol: 8482, font: 'Arial'},
{ symbol: 8734, font: 'Arial'},
{ symbol: 126, font: 'Arial'},
{ symbol: 176, font: 'Arial'},
{ symbol: 167, font: 'Arial'},
{ symbol: 945, font: 'Arial'},
{ symbol: 946, font: 'Arial'},
{ symbol: 960, font: 'Arial'},
{ symbol: 916, font: 'Arial'},
{ symbol: 9786, font: 'Arial'},
{ symbol: 9829, font: 'Arial'}
];
arr.forEach(function (item){
item.tip = this.getSymbolDescription(item.symbol);
}.bind(this));
return arr;
},
saveSymbol: function(symbol, font) {
@ -2930,16 +2961,21 @@ define([
});
item && picker.store.remove(item);
picker.store.add({symbol: symbol, font: font, tip: 'Symbol: ' + symbol},{at:0});
picker.store.add({symbol: symbol, font: font, tip: this.getSymbolDescription(symbol)},{at:0});
picker.store.length > maxLength && picker.store.remove(picker.store.last());
var arr = picker.store.map(function (item){
return {symbol: item.get('symbol'), font: item.get('font'), tip: item.get('tip')};
return {symbol: item.get('symbol'), font: item.get('font')};
});
var sJSON = JSON.stringify(arr);
Common.localStorage.setItem( 'de-fastRecentSymbols', sJSON);
},
getSymbolDescription: function(symbol){
var specSymbol = this.specSymbols.find(function (item){return item.symbol == symbol});
return !!specSymbol ? specSymbol.description : this.capBtnInsSymbol + ': ' + symbol;
},
loadListPresetsFromStorage: function(path, groupId) {
var recents = Common.localStorage.getItem(path),
arr = [];
@ -3220,7 +3256,32 @@ define([
txtGroupNumDoc: 'Document numbering formats',
txtGroupMultiDoc: 'Lists in current document',
textTabDraw: 'Draw',
textMoreSymbols: 'More symbols'
textMoreSymbols: 'More symbols',
textAlpha: 'Greek Small Letter Alpha',
textBetta: 'Greek Small Letter Betta',
textBlackHeart: 'Black Heart Suit',
textBullet: 'Bullet',
textCopyright: 'Copyright Sign',
textDegree: 'Degree Sign',
textDelta: 'Greek Small Letter Delta',
textDivision: 'Division Sign',
textDollar: 'Dollar Sign',
textEuro: 'Euro Sign',
textGreaterEqual: 'Greater-Than Or Equal To',
textInfinity: 'Infinity',
textLessEqual: 'Less-Than Or Equal To',
textLetterPi: 'Greek Small Letter Pi',
textNotEqualTo: 'Not Equal To',
textOneHalf: 'Vulgar Fraction One Half',
textOneQuarter: 'Vulgar Fraction One Quarter',
textPlusMinus: 'Plus-Minus Sign',
textRegistered: 'Registered Sign',
textSection: 'Section Sign',
textSmile: 'White Smiling Fase',
textSquareRoot: 'Square Root',
textTilde: 'Tilde',
textTradeMark: 'Trade Mark Sign',
textYen: 'Yen Sign'
}
})(), DE.Views.Toolbar || {}));
});

25
apps/documenteditor/main/locale/en.json
View File

@ -3196,11 +3196,16 @@
"DE.Views.Toolbar.mniToggleCase": "tOGGLE cASE",
"DE.Views.Toolbar.mniUpperCase": "UPPERCASE",
"DE.Views.Toolbar.strMenuNoFill": "No fill",
"DE.Views.Toolbar.textAlpha": "Greek Small Letter Alpha",
"DE.Views.Toolbar.textAutoColor": "Automatic",
"DE.Views.Toolbar.textBetta": "Greek Small Letter Betta",
"DE.Views.Toolbar.textBlackHeart": "Black Heart Suit",
"DE.Views.Toolbar.textBold": "Bold",
"DE.Views.Toolbar.textBottom": "Bottom: ",
"DE.Views.Toolbar.textBullet": "Bullet",
"DE.Views.Toolbar.textChangeLevel": "Change List Level",
"DE.Views.Toolbar.textCheckboxControl": "Check box",
"DE.Views.Toolbar.textCopyright": "Copyright Sign",
"DE.Views.Toolbar.textColumnsCustom": "Custom columns",
"DE.Views.Toolbar.textColumnsLeft": "Left",
"DE.Views.Toolbar.textColumnsOne": "One",
@ -3212,9 +3217,16 @@
"DE.Views.Toolbar.textContPage": "Continuous page",
"DE.Views.Toolbar.textCustomLineNumbers": "Line numbering options",
"DE.Views.Toolbar.textDateControl": "Date",
"DE.Views.Toolbar.textDegree": "Degree Sign",
"DE.Views.Toolbar.textDelta": "Greek Small Letter Delta",
"DE.Views.Toolbar.textDivision": "Division Sign",
"DE.Views.Toolbar.textDollar": "Dollar Sign",
"DE.Views.Toolbar.textDropdownControl": "Drop-down list",
"DE.Views.Toolbar.textEditWatermark": "Custom watermark",
"DE.Views.Toolbar.textEuro": "Euro Sign",
"DE.Views.Toolbar.textEvenPage": "Even page",
"DE.Views.Toolbar.textGreaterEqual": "Greater-Than Or Equal To",
"DE.Views.Toolbar.textInfinity": "Infinity",
"DE.Views.Toolbar.textInMargin": "In Margin",
"DE.Views.Toolbar.textInsColumnBreak": "Insert column break",
"DE.Views.Toolbar.textInsertPageCount": "Insert number of pages",
@ -3225,6 +3237,8 @@
"DE.Views.Toolbar.textItalic": "Italic",
"DE.Views.Toolbar.textLandscape": "Landscape",
"DE.Views.Toolbar.textLeft": "Left: ",
"DE.Views.Toolbar.textLessEqual": "Less-Than Or Equal To",
"DE.Views.Toolbar.textLetterPi": "Greek Small Letter Pi",
"DE.Views.Toolbar.textListSettings": "List Settings",
"DE.Views.Toolbar.textMarginsLast": "Last Custom",
"DE.Views.Toolbar.textMarginsModerate": "Moderate",
@ -3237,18 +3251,26 @@
"DE.Views.Toolbar.textNextPage": "Next page",
"DE.Views.Toolbar.textNoHighlight": "No highlighting",
"DE.Views.Toolbar.textNone": "None",
"DE.Views.Toolbar.textNotEqualTo": "Not Equal To",
"DE.Views.Toolbar.textOddPage": "Odd page",
"DE.Views.Toolbar.textOneHalf": "Vulgar Fraction One Half",
"DE.Views.Toolbar.textOneQuarter": "Vulgar Fraction One Quarter",
"DE.Views.Toolbar.textPageMarginsCustom": "Custom margins",
"DE.Views.Toolbar.textPageSizeCustom": "Custom page size",
"DE.Views.Toolbar.textPictureControl": "Picture",
"DE.Views.Toolbar.textPlainControl": "Plain text",
"DE.Views.Toolbar.textPlusMinus": "Plus-Minus Sign",
"DE.Views.Toolbar.textPortrait": "Portrait",
"DE.Views.Toolbar.textRegistered": "Registered Sign",
"DE.Views.Toolbar.textRemoveControl": "Remove Content Control",
"DE.Views.Toolbar.textRemWatermark": "Remove watermark",
"DE.Views.Toolbar.textRestartEachPage": "Restart each page",
"DE.Views.Toolbar.textRestartEachSection": "Restart each section",
"DE.Views.Toolbar.textRichControl": "Rich text",
"DE.Views.Toolbar.textRight": "Right: ",
"DE.Views.Toolbar.textSection": "Section Sign",
"DE.Views.Toolbar.textSmile": "White Smiling Fase",
"DE.Views.Toolbar.textSquareRoot": "Square Root",
"DE.Views.Toolbar.textStrikeout": "Strikethrough",
"DE.Views.Toolbar.textStyleMenuDelete": "Delete style",
"DE.Views.Toolbar.textStyleMenuDeleteAll": "Delete all custom styles",
@ -3269,10 +3291,13 @@
"DE.Views.Toolbar.textTabProtect": "Protection",
"DE.Views.Toolbar.textTabReview": "Review",
"DE.Views.Toolbar.textTabView": "View",
"DE.Views.Toolbar.textTilde": "Tilde",
"DE.Views.Toolbar.textTitleError": "Error",
"DE.Views.Toolbar.textToCurrent": "To current position",
"DE.Views.Toolbar.textTop": "Top: ",
"DE.Views.Toolbar.textTradeMark": "Trade Mark Sign",
"DE.Views.Toolbar.textUnderline": "Underline",
"DE.Views.Toolbar.textYen": "Yen Sign",
"DE.Views.Toolbar.tipAlignCenter": "Align center",
"DE.Views.Toolbar.tipAlignJust": "Justified",
"DE.Views.Toolbar.tipAlignLeft": "Align left",

10
apps/documenteditor/main/resources/less/toolbar.less
View File

@ -33,16 +33,24 @@
display: inline-block;
width: 160px;
padding-left: 3px;
.rtl & {
padding-left: 0;
padding-right: 3px;
}
.item {
.box-shadow(none);
margin-left: 6px;
.rtl & {
margin-left: 4px;
margin-right: 6px;
}
&:hover, &.selected{
.box-shadow( 0 0 0 2px @border-preview-select-ie);
.box-shadow( 0 0 0 @scaled-two-px-value @border-preview-select);
}
}
.item-symbol {
font-family: @font-family-base;//Arial;
font-family: @font-family-base;
font-size: 14px;
display: block;
width: 20px;

8
apps/presentationeditor/main/app/controller/Toolbar.js
View File

@ -2352,14 +2352,14 @@ define([
symbol: selected && selected.length>0 ? selected.charAt(0) : undefined,
handler: function(dlg, result, settings) {
if (result == 'ok') {
me.insertSymbol(settings.font, settings.code, settings.special);
me.insertSymbol(settings.font, settings.code, settings.special, settings.speccharacter);
} else
Common.NotificationCenter.trigger('edit:complete', me.toolbar);
}
});
win.show();
win.on('symbol:dblclick', function(cmp, result, settings) {
me.insertSymbol(settings.font, settings.code, settings.special); });
me.insertSymbol(settings.font, settings.code, settings.special, settings.speccharacter); });
}
},
@ -2368,10 +2368,10 @@ define([
this.insertSymbol(record.get('font') , record.get('symbol'), record.get('special'));
},
insertSymbol: function(fontRecord, symbol, special){
insertSymbol: function(fontRecord, symbol, special, specCharacter){
var font = fontRecord ? fontRecord: this.api.get_TextProps().get_TextPr().get_FontFamily().get_Name();
this.api.asc_insertSymbol(font, symbol, special);
this.toolbar.saveSymbol(symbol, font);
!specCharacter && this.toolbar.saveSymbol(symbol, font);
},
onApiMathTypes: function(equation) {

129
apps/presentationeditor/main/app/view/Toolbar.js
View File

@ -1631,6 +1631,33 @@ define([
this.btnInsertTextArt.menu.on('show:before', onShowBeforeTextArt);
// set dataviews
this.specSymbols = [
{symbol: 8226, description: this.textBullet},
{symbol: 8364, description: this.textEuro},
{symbol: 65284, description: this.textDollar},
{symbol: 165, description: this.textYen},
{symbol: 169, description: this.textCopyright},
{symbol: 174, description: this.textRegistered},
{symbol: 189, description: this.textOneHalf},
{symbol: 188, description: this.textOneQuarter},
{symbol: 8800, description: this.textNotEqualTo},
{symbol: 177, description: this.textPlusMinus},
{symbol: 247, description: this.textDivision},
{symbol: 8730, description: this.textSquareRoot},
{symbol: 8804, description: this.textLessEqual},
{symbol: 8805, description: this.textGreaterEqual},
{symbol: 8482, description: this.textTradeMark},
{symbol: 8734, description: this.textInfinity},
{symbol: 126, description: this.textTilde},
{symbol: 176, description: this.textDegree},
{symbol: 167, description: this.textSection},
{symbol: 945, description: this.textAlpha},
{symbol: 946, description: this.textBetta},
{symbol: 960, description: this.textLetterPi},
{symbol: 916, description: this.textDelta},
{symbol: 9786, description: this.textSmile},
{symbol: 9829, description: this.textBlackHeart}
];
this.mnuInsertSymbolsPicker = new Common.UI.DataView({
el: $('#id-toolbar-menu-symbols'),
parentMenu: this.btnInsertSymbol.menu,
@ -2070,37 +2097,39 @@ define([
},
loadRecentSymbolsFromStorage: function(){
var recents = Common.localStorage.getItem('pe-fastRecentSymbols');
if(!!recents)
return JSON.parse(recents);
return [
{ symbol: 8226, font: 'Arial', tip: 'Symbol: 8226'},
{ symbol: 8364, font: 'Arial', tip: 'Symbol: 8364'},
{ symbol: 65284, font: 'Arial', tip: 'Symbol: 65284'},
{ symbol: 165, font: 'Arial', tip: 'Symbol: 165'},
{ symbol: 169, font: 'Arial', tip: 'Symbol: 169'},
{ symbol: 174, font: 'Arial', tip: 'Symbol: 174'},
{ symbol: 189, font: 'Arial', tip: 'Symbol: 189'},
{ symbol: 188, font: 'Arial', tip: 'Symbol: 188'},
{ symbol: 8800, font: 'Arial', tip: 'Symbol: 8800'},
{ symbol: 177, font: 'Arial', tip: 'Symbol: 177'},
{ symbol: 247, font: 'Arial', tip: 'Symbol: 247'},
{ symbol: 8730, font: 'Arial', tip: 'Symbol: 8730'},
{ symbol: 8804, font: 'Arial', tip: 'Symbol: 8804'},
{ symbol: 8805, font: 'Arial', tip: 'Symbol: 8805'},
{ symbol: 8482, font: 'Arial', tip: 'Symbol: 8482'},
{ symbol: 8734, font: 'Arial', tip: 'Symbol: 8734'},
{ symbol: 126, font: 'Arial', tip: 'Symbol: 126'},
{ symbol: 176, font: 'Arial', tip: 'Symbol: 176'},
{ symbol: 167, font: 'Arial', tip: 'Symbol: 167'},
{ symbol: 945, font: 'Arial', tip: 'Symbol: 945'},
{ symbol: 946, font: 'Arial', tip: 'Symbol: 946'},
{ symbol: 960, font: 'Arial', tip: 'Symbol: 960'},
{ symbol: 916, font: 'Arial', tip: 'Symbol: 916'},
{ symbol: 9786, font: 'Arial', tip: 'Symbol: 9786'},
{ symbol: 9829, font: 'Arial', tip: 'Symbol: 9829'}
];
var recents = Common.localStorage.getItem('de-fastRecentSymbols');
var arr = (!!recents) ? JSON.parse(recents) :
[
{ symbol: 8226, font: 'Arial'},
{ symbol: 8364, font: 'Arial'},
{ symbol: 65284, font: 'Arial'},
{ symbol: 165, font: 'Arial'},
{ symbol: 169, font: 'Arial'},
{ symbol: 174, font: 'Arial'},
{ symbol: 189, font: 'Arial'},
{ symbol: 188, font: 'Arial'},
{ symbol: 8800, font: 'Arial'},
{ symbol: 177, font: 'Arial'},
{ symbol: 247, font: 'Arial'},
{ symbol: 8730, font: 'Arial'},
{ symbol: 8804, font: 'Arial'},
{ symbol: 8805, font: 'Arial'},
{ symbol: 8482, font: 'Arial'},
{ symbol: 8734, font: 'Arial'},
{ symbol: 126, font: 'Arial'},
{ symbol: 176, font: 'Arial'},
{ symbol: 167, font: 'Arial'},
{ symbol: 945, font: 'Arial'},
{ symbol: 946, font: 'Arial'},
{ symbol: 960, font: 'Arial'},
{ symbol: 916, font: 'Arial'},
{ symbol: 9786, font: 'Arial'},
{ symbol: 9829, font: 'Arial'}
];
arr.forEach(function (item){
item.tip = this.getSymbolDescription(item.symbol);
}.bind(this));
return arr;
},
saveSymbol: function(symbol, font) {
@ -2111,14 +2140,19 @@ define([
});
item && picker.store.remove(item);
picker.store.add({symbol: symbol, font: font, tip: 'Symbol: ' + symbol},{at:0});
picker.store.add({symbol: symbol, font: font, tip: this.getSymbolDescription(symbol)},{at:0});
picker.store.length > maxLength && picker.store.remove(picker.store.last());
var arr = picker.store.map(function (item){
return {symbol: item.get('symbol'), font: item.get('font'), tip: item.get('tip')};
return {symbol: item.get('symbol'), font: item.get('font')};
});
var sJSON = JSON.stringify(arr);
Common.localStorage.setItem( 'pe-fastRecentSymbols', sJSON);
Common.localStorage.setItem( 'de-fastRecentSymbols', sJSON);
},
getSymbolDescription: function(symbol){
var specSymbol = this.specSymbols.find(function (item){return item.symbol == symbol});
return !!specSymbol ? specSymbol.description : this.capBtnInsSymbol + ': ' + symbol;
},
textBold: 'Bold',
@ -2299,7 +2333,32 @@ define([
tipSelectAll: 'Select all',
tipCut: 'Cut',
textTabDraw: 'Draw',
textMoreSymbols: 'More symbols'
textMoreSymbols: 'More symbols',
textAlpha: 'Greek Small Letter Alpha',
textBetta: 'Greek Small Letter Betta',
textBlackHeart: 'Black Heart Suit',
textBullet: 'Bullet',
textCopyright: 'Copyright Sign',
textDegree: 'Degree Sign',
textDelta: 'Greek Small Letter Delta',
textDivision: 'Division Sign',
textDollar: 'Dollar Sign',
textEuro: 'Euro Sign',
textGreaterEqual: 'Greater-Than Or Equal To',
textInfinity: 'Infinity',
textLessEqual: 'Less-Than Or Equal To',
textLetterPi: 'Greek Small Letter Pi',
textNotEqualTo: 'Not Equal To',
textOneHalf: 'Vulgar Fraction One Half',
textOneQuarter: 'Vulgar Fraction One Quarter',
textPlusMinus: 'Plus-Minus Sign',
textRegistered: 'Registered Sign',
textSection: 'Section Sign',
textSmile: 'White Smiling Fase',
textSquareRoot: 'Square Root',
textTilde: 'Tilde',
textTradeMark: 'Trade Mark Sign',
textYen: 'Yen Sign'
}
}()), PE.Views.Toolbar || {}));
});

25
apps/presentationeditor/main/locale/en.json
View File

@ -2533,19 +2533,39 @@
"PE.Views.Toolbar.textAlignMiddle": "Align text to the middle",
"PE.Views.Toolbar.textAlignRight": "Align text right",
"PE.Views.Toolbar.textAlignTop": "Align text to the top",
"PE.Views.Toolbar.textAlpha": "Greek Small Letter Alpha",
"PE.Views.Toolbar.textArrangeBack": "Send to background",
"PE.Views.Toolbar.textArrangeBackward": "Send backward",
"PE.Views.Toolbar.textArrangeForward": "Bring forward",
"PE.Views.Toolbar.textArrangeFront": "Bring to foreground",
"PE.Views.Toolbar.textBetta": "Greek Small Letter Betta",
"PE.Views.Toolbar.textBlackHeart": "Black Heart Suit",
"PE.Views.Toolbar.textBold": "Bold",
"PE.Views.Toolbar.textBullet": "Bullet",
"PE.Views.Toolbar.textColumnsCustom": "Custom columns",
"PE.Views.Toolbar.textColumnsOne": "One Column",
"PE.Views.Toolbar.textColumnsThree": "Three Columns",
"PE.Views.Toolbar.textColumnsTwo": "Two Columns",
"PE.Views.Toolbar.textCopyright": "Copyright Sign",
"PE.Views.Toolbar.textDegree": "Degree Sign",
"PE.Views.Toolbar.textDelta": "Greek Small Letter Delta",
"PE.Views.Toolbar.textDivision": "Division Sign",
"PE.Views.Toolbar.textDollar": "Dollar Sign",
"PE.Views.Toolbar.textEuro": "Euro Sign",
"PE.Views.Toolbar.textGreaterEqual": "Greater-Than Or Equal To",
"PE.Views.Toolbar.textInfinity": "Infinity",
"PE.Views.Toolbar.textItalic": "Italic",
"PE.Views.Toolbar.textLessEqual": "Less-Than Or Equal To",
"PE.Views.Toolbar.textLetterPi": "Greek Small Letter Pi",
"PE.Views.Toolbar.textListSettings": "List Settings",
"PE.Views.Toolbar.textMoreSymbols": "More symbols",
"PE.Views.Toolbar.textNotEqualTo": "Not Equal To",
"PE.Views.Toolbar.textOneHalf": "Vulgar Fraction One Half",
"PE.Views.Toolbar.textOneQuarter": "Vulgar Fraction One Quarter",
"PE.Views.Toolbar.textPlusMinus": "Plus-Minus Sign",
"PE.Views.Toolbar.textRecentlyUsed": "Recently Used",
"PE.Views.Toolbar.textRegistered": "Registered Sign",
"PE.Views.Toolbar.textSection": "Section Sign",
"PE.Views.Toolbar.textShapeAlignBottom": "Align Bottom",
"PE.Views.Toolbar.textShapeAlignCenter": "Align Center",
"PE.Views.Toolbar.textShapeAlignLeft": "Align Left",
@ -2556,6 +2576,8 @@
"PE.Views.Toolbar.textShowCurrent": "Show from Current Slide",
"PE.Views.Toolbar.textShowPresenterView": "Show Presenter View",
"PE.Views.Toolbar.textShowSettings": "Show Settings",
"PE.Views.Toolbar.textSmile": "White Smiling Fase",
"PE.Views.Toolbar.textSquareRoot": "Square Root",
"PE.Views.Toolbar.textStrikeout": "Strikethrough",
"PE.Views.Toolbar.textSubscript": "Subscript",
"PE.Views.Toolbar.textSuperscript": "Superscript",
@ -2568,8 +2590,11 @@
"PE.Views.Toolbar.textTabProtect": "Protection",
"PE.Views.Toolbar.textTabTransitions": "Transitions",
"PE.Views.Toolbar.textTabView": "View",
"PE.Views.Toolbar.textTilde": "Tilde",
"PE.Views.Toolbar.textTitleError": "Error",
"PE.Views.Toolbar.textTradeMark": "Trade Mark Sign",
"PE.Views.Toolbar.textUnderline": "Underline",
"PE.Views.Toolbar.textYen": "Yen Sign",
"PE.Views.Toolbar.tipAddSlide": "Add slide",
"PE.Views.Toolbar.tipBack": "Back",
"PE.Views.Toolbar.tipChangeCase": "Change case",

8
apps/presentationeditor/main/resources/less/toolbar.less
View File

@ -52,9 +52,17 @@
display: inline-block;
width: 160px;
padding-left: 3px;
.rtl & {
padding-left: 0;
padding-right: 3px;
}
.item {
.box-shadow(none);
margin-left: 6px;
.rtl & {
margin-left: 4px;
margin-right: 6px;
}
&:hover, &.selected{
.box-shadow( 0 0 0 2px @border-preview-select-ie);
.box-shadow( 0 0 0 @scaled-two-px-value @border-preview-select);

8
apps/spreadsheeteditor/main/app/controller/Toolbar.js
View File

@ -4081,14 +4081,14 @@ define([
symbol: selected && selected.length>0 ? selected.charAt(0) : undefined,
handler: function(dlg, result, settings) {
if (result == 'ok') {
me.insertSymbol(settings.font, settings.code, settings.special);
me.insertSymbol(settings.font, settings.code, settings.special, settings.speccharacter);
} else
Common.NotificationCenter.trigger('edit:complete', me.toolbar);
}
});
win.show();
win.on('symbol:dblclick', function(cmp, result, settings) {
me.insertSymbol(settings.font, settings.code, settings.special);
me.insertSymbol(settings.font, settings.code, settings.special, settings.speccharacter);
});
}
},
@ -4098,10 +4098,10 @@ define([
this.insertSymbol(record.get('font'), record.get('symbol'), record.get('special'));
},
insertSymbol: function(fontRecord, symbol, special){
insertSymbol: function(fontRecord, symbol, special, specCharacter){
var font = fontRecord ? fontRecord: this.api.asc_getCellInfo().asc_getXfs().asc_getFontName();
this.api.asc_insertSymbol(font, symbol, special);
this.toolbar.saveSymbol(symbol, font);
!specCharacter && this.toolbar.saveSymbol(symbol, font);
},
onInsertSlicerClick: function() {

130
apps/spreadsheeteditor/main/app/view/Toolbar.js
View File

@ -2759,6 +2759,34 @@ define([
this.btnInsertTextArt.menu.on('show:before', onShowBeforeTextArt);
}
this.specSymbols = [
{symbol: 8226, description: this.textBullet},
{symbol: 8364, description: this.textEuro},
{symbol: 65284, description: this.textDollar},
{symbol: 165, description: this.textYen},
{symbol: 169, description: this.textCopyright},
{symbol: 174, description: this.textRegistered},
{symbol: 189, description: this.textOneHalf},
{symbol: 188, description: this.textOneQuarter},
{symbol: 8800, description: this.textNotEqualTo},
{symbol: 177, description: this.textPlusMinus},
{symbol: 247, description: this.textDivision},
{symbol: 8730, description: this.textSquareRoot},
{symbol: 8804, description: this.textLessEqual},
{symbol: 8805, description: this.textGreaterEqual},
{symbol: 8482, description: this.textTradeMark},
{symbol: 8734, description: this.textInfinity},
{symbol: 126, description: this.textTilde},
{symbol: 176, description: this.textDegree},
{symbol: 167, description: this.textSection},
{symbol: 945, description: this.textAlpha},
{symbol: 946, description: this.textBetta},
{symbol: 960, description: this.textLetterPi},
{symbol: 916, description: this.textDelta},
{symbol: 9786, description: this.textSmile},
{symbol: 9829, description: this.textBlackHeart}
];
this.mnuInsertSymbolsPicker = new Common.UI.DataView({
el: $('#id-toolbar-menu-symbols'),
parentMenu: this.btnInsertSymbol.menu,
@ -3258,37 +3286,39 @@ define([
},
loadRecentSymbolsFromStorage: function(){
var recents = Common.localStorage.getItem('sse-fastRecentSymbols');
if(!!recents)
return JSON.parse(recents);
return [
{ symbol: 8226, font: 'Arial', tip: 'Symbol: 8226'},
{ symbol: 8364, font: 'Arial', tip: 'Symbol: 8364'},
{ symbol: 65284, font: 'Arial', tip: 'Symbol: 65284'},
{ symbol: 165, font: 'Arial', tip: 'Symbol: 165'},
{ symbol: 169, font: 'Arial', tip: 'Symbol: 169'},
{ symbol: 174, font: 'Arial', tip: 'Symbol: 174'},
{ symbol: 189, font: 'Arial', tip: 'Symbol: 189'},
{ symbol: 188, font: 'Arial', tip: 'Symbol: 188'},
{ symbol: 8800, font: 'Arial', tip: 'Symbol: 8800'},
{ symbol: 177, font: 'Arial', tip: 'Symbol: 177'},
{ symbol: 247, font: 'Arial', tip: 'Symbol: 247'},
{ symbol: 8730, font: 'Arial', tip: 'Symbol: 8730'},
{ symbol: 8804, font: 'Arial', tip: 'Symbol: 8804'},
{ symbol: 8805, font: 'Arial', tip: 'Symbol: 8805'},
{ symbol: 8482, font: 'Arial', tip: 'Symbol: 8482'},
{ symbol: 8734, font: 'Arial', tip: 'Symbol: 8734'},
{ symbol: 126, font: 'Arial', tip: 'Symbol: 126'},
{ symbol: 176, font: 'Arial', tip: 'Symbol: 176'},
{ symbol: 167, font: 'Arial', tip: 'Symbol: 167'},
{ symbol: 945, font: 'Arial', tip: 'Symbol: 945'},
{ symbol: 946, font: 'Arial', tip: 'Symbol: 946'},
{ symbol: 960, font: 'Arial', tip: 'Symbol: 960'},
{ symbol: 916, font: 'Arial', tip: 'Symbol: 916'},
{ symbol: 9786, font: 'Arial', tip: 'Symbol: 9786'},
{ symbol: 9829, font: 'Arial', tip: 'Symbol: 9829'}
];
var recents = Common.localStorage.getItem('de-fastRecentSymbols');
var arr = (!!recents) ? JSON.parse(recents) :
[
{ symbol: 8226, font: 'Arial'},
{ symbol: 8364, font: 'Arial'},
{ symbol: 65284, font: 'Arial'},
{ symbol: 165, font: 'Arial'},
{ symbol: 169, font: 'Arial'},
{ symbol: 174, font: 'Arial'},
{ symbol: 189, font: 'Arial'},
{ symbol: 188, font: 'Arial'},
{ symbol: 8800, font: 'Arial'},
{ symbol: 177, font: 'Arial'},
{ symbol: 247, font: 'Arial'},
{ symbol: 8730, font: 'Arial'},
{ symbol: 8804, font: 'Arial'},
{ symbol: 8805, font: 'Arial'},
{ symbol: 8482, font: 'Arial'},
{ symbol: 8734, font: 'Arial'},
{ symbol: 126, font: 'Arial'},
{ symbol: 176, font: 'Arial'},
{ symbol: 167, font: 'Arial'},
{ symbol: 945, font: 'Arial'},
{ symbol: 946, font: 'Arial'},
{ symbol: 960, font: 'Arial'},
{ symbol: 916, font: 'Arial'},
{ symbol: 9786, font: 'Arial'},
{ symbol: 9829, font: 'Arial'}
];
arr.forEach(function (item){
item.tip = this.getSymbolDescription(item.symbol);
}.bind(this));
return arr;
},
saveSymbol: function(symbol, font) {
@ -3299,14 +3329,19 @@ define([
});
item && picker.store.remove(item);
picker.store.add({symbol: symbol, font: font, tip: 'Symbol: ' + symbol},{at:0});
picker.store.add({symbol: symbol, font: font, tip: this.getSymbolDescription(symbol)},{at:0});
picker.store.length > maxLength && picker.store.remove(picker.store.last());
var arr = picker.store.map(function (item){
return {symbol: item.get('symbol'), font: item.get('font'), tip: item.get('tip')};
return {symbol: item.get('symbol'), font: item.get('font')};
});
var sJSON = JSON.stringify(arr);
Common.localStorage.setItem( 'sse-fastRecentSymbols', sJSON);
Common.localStorage.setItem( 'de-fastRecentSymbols', sJSON);
},
getSymbolDescription: function(symbol){
var specSymbol = this.specSymbols.find(function (item){return item.symbol == symbol});
return !!specSymbol ? specSymbol.description : this.capBtnInsSymbol + ': ' + symbol;
},
textBold: 'Bold',
@ -3589,6 +3624,31 @@ define([
mniUpperCase: 'UPPERCASE',
mniCapitalizeWords: 'Capitalize Each Word',
mniToggleCase: 'tOGGLE cASE',
textMoreSymbols: 'More symbols'
textMoreSymbols: 'More symbols',
textAlpha: 'Greek Small Letter Alpha',
textBetta: 'Greek Small Letter Betta',
textBlackHeart: 'Black Heart Suit',
textBullet: 'Bullet',
textCopyright: 'Copyright Sign',
textDegree: 'Degree Sign',
textDelta: 'Greek Small Letter Delta',
textDivision: 'Division Sign',
textDollar: 'Dollar Sign',
textEuro: 'Euro Sign',
textGreaterEqual: 'Greater-Than Or Equal To',
textInfinity: 'Infinity',
textLessEqual: 'Less-Than Or Equal To',
textLetterPi: 'Greek Small Letter Pi',
textNotEqualTo: 'Not Equal To',
textOneHalf: 'Vulgar Fraction One Half',
textOneQuarter: 'Vulgar Fraction One Quarter',
textPlusMinus: 'Plus-Minus Sign',
textRegistered: 'Registered Sign',
textSection: 'Section Sign',
textSmile: 'White Smiling Fase',
textSquareRoot: 'Square Root',
textTilde: 'Tilde',
textTradeMark: 'Trade Mark Sign',
textYen: 'Yen Sign'
}, SSE.Views.Toolbar || {}));
});

25
apps/spreadsheeteditor/main/locale/en.json
View File

@ -3837,33 +3837,45 @@
"SSE.Views.Toolbar.textAlignRight": "Align Right",
"SSE.Views.Toolbar.textAlignTop": "Align Top",
"SSE.Views.Toolbar.textAllBorders": "All Borders",
"SSE.Views.Toolbar.textAlpha": "Greek Small Letter Alpha",
"SSE.Views.Toolbar.textAuto": "Auto",
"SSE.Views.Toolbar.textAutoColor": "Automatic",
"SSE.Views.Toolbar.textBetta": "Greek Small Letter Betta",
"SSE.Views.Toolbar.textBlackHeart": "Black Heart Suit",
"SSE.Views.Toolbar.textBold": "Bold",
"SSE.Views.Toolbar.textBordersColor": "Border color",
"SSE.Views.Toolbar.textBordersStyle": "Border style",
"SSE.Views.Toolbar.textBottom": "Bottom: ",
"SSE.Views.Toolbar.textBottomBorders": "Bottom borders",
"SSE.Views.Toolbar.textBullet": "Bullet",
"SSE.Views.Toolbar.textCenterBorders": "Inside vertical borders",
"SSE.Views.Toolbar.textClearPrintArea": "Clear print area",
"SSE.Views.Toolbar.textClearRule": "Clear rules",
"SSE.Views.Toolbar.textClockwise": "Angle clockwise",
"SSE.Views.Toolbar.textColorScales": "Color scales",
"SSE.Views.Toolbar.textCopyright": "Copyright Sign",
"SSE.Views.Toolbar.textCounterCw": "Angle counterclockwise",
"SSE.Views.Toolbar.textCustom": "Custom",
"SSE.Views.Toolbar.textDataBars": "Data bars",
"SSE.Views.Toolbar.textDegree": "Degree Sign",
"SSE.Views.Toolbar.textDelLeft": "Shift cells left",
"SSE.Views.Toolbar.textDelta": "Greek Small Letter Delta",
"SSE.Views.Toolbar.textDelUp": "Shift cells up",
"SSE.Views.Toolbar.textDiagDownBorder": "Diagonal down border",
"SSE.Views.Toolbar.textDiagUpBorder": "Diagonal up border",
"SSE.Views.Toolbar.textDivision": "Division Sign",
"SSE.Views.Toolbar.textDollar": "Dollar Sign",
"SSE.Views.Toolbar.textDone": "Done",
"SSE.Views.Toolbar.textEditVA": "Edit Visible Area",
"SSE.Views.Toolbar.textEntireCol": "Entire column",
"SSE.Views.Toolbar.textEntireRow": "Entire row",
"SSE.Views.Toolbar.textEuro": "Euro Sign",
"SSE.Views.Toolbar.textFewPages": "pages",
"SSE.Views.Toolbar.textGreaterEqual": "Greater-Than Or Equal To",
"SSE.Views.Toolbar.textHeight": "Height",
"SSE.Views.Toolbar.textHideVA": "Hide Visible Area",
"SSE.Views.Toolbar.textHorizontal": "Horizontal text",
"SSE.Views.Toolbar.textInfinity": "Infinity",
"SSE.Views.Toolbar.textInsDown": "Shift cells down",
"SSE.Views.Toolbar.textInsideBorders": "Inside borders",
"SSE.Views.Toolbar.textInsRight": "Shift cells right",
@ -3872,6 +3884,8 @@
"SSE.Views.Toolbar.textLandscape": "Landscape",
"SSE.Views.Toolbar.textLeft": "Left: ",
"SSE.Views.Toolbar.textLeftBorders": "Left borders",
"SSE.Views.Toolbar.textLessEqual": "Less-Than Or Equal To",
"SSE.Views.Toolbar.textLetterPi": "Greek Small Letter Pi",
"SSE.Views.Toolbar.textManageRule": "Manage rules",
"SSE.Views.Toolbar.textManyPages": "pages",
"SSE.Views.Toolbar.textMarginsLast": "Last Custom",
@ -3885,23 +3899,31 @@
"SSE.Views.Toolbar.textNewColor": "More colors",
"SSE.Views.Toolbar.textNewRule": "New rule",
"SSE.Views.Toolbar.textNoBorders": "No borders",
"SSE.Views.Toolbar.textNotEqualTo": "Not Equal To",
"SSE.Views.Toolbar.textOneHalf": "Vulgar Fraction One Half",
"SSE.Views.Toolbar.textOnePage": "page",
"SSE.Views.Toolbar.textOneQuarter": "Vulgar Fraction One Quarter",
"SSE.Views.Toolbar.textOutBorders": "Outside borders",
"SSE.Views.Toolbar.textPageMarginsCustom": "Custom margins",
"SSE.Views.Toolbar.textPlusMinus": "Plus-Minus Sign",
"SSE.Views.Toolbar.textPortrait": "Portrait",
"SSE.Views.Toolbar.textPrint": "Print",
"SSE.Views.Toolbar.textPrintGridlines": "Print Gridlines",
"SSE.Views.Toolbar.textPrintHeadings": "Print Headings",
"SSE.Views.Toolbar.textPrintOptions": "Print Settings",
"SSE.Views.Toolbar.textRegistered": "Registered Sign",
"SSE.Views.Toolbar.textRight": "Right: ",
"SSE.Views.Toolbar.textRightBorders": "Right borders",
"SSE.Views.Toolbar.textRotateDown": "Rotate text down",
"SSE.Views.Toolbar.textRotateUp": "Rotate text up",
"SSE.Views.Toolbar.textScale": "Scale",
"SSE.Views.Toolbar.textScaleCustom": "Custom",
"SSE.Views.Toolbar.textSection": "Section Sign",
"SSE.Views.Toolbar.textSelection": "From current selection",
"SSE.Views.Toolbar.textSetPrintArea": "Set print area",
"SSE.Views.Toolbar.textShowVA": "Show Visible Area",
"SSE.Views.Toolbar.textSmile": "White Smiling Fase",
"SSE.Views.Toolbar.textSquareRoot": "Square Root",
"SSE.Views.Toolbar.textStrikeout": "Strikethrough",
"SSE.Views.Toolbar.textSubscript": "Subscript",
"SSE.Views.Toolbar.textSubSuperscript": "Subscript/Superscript",
@ -3919,11 +3941,14 @@
"SSE.Views.Toolbar.textThisPivot": "From this pivot",
"SSE.Views.Toolbar.textThisSheet": "From this worksheet",
"SSE.Views.Toolbar.textThisTable": "From this table",
"SSE.Views.Toolbar.textTilde": "Tilde",
"SSE.Views.Toolbar.textTop": "Top: ",
"SSE.Views.Toolbar.textTopBorders": "Top borders",
"SSE.Views.Toolbar.textTradeMark": "Trade Mark Sign",
"SSE.Views.Toolbar.textUnderline": "Underline",
"SSE.Views.Toolbar.textVertical": "Vertical text",
"SSE.Views.Toolbar.textWidth": "Width",
"SSE.Views.Toolbar.textYen": "Yen Sign",
"SSE.Views.Toolbar.textZoom": "Zoom",
"SSE.Views.Toolbar.tipAlignBottom": "Align bottom",
"SSE.Views.Toolbar.tipAlignCenter": "Align center",

12
apps/spreadsheeteditor/main/resources/less/toolbar.less
View File

@ -130,16 +130,24 @@
display: inline-block;
width: 160px;
padding-left: 3px;
.rtl & {
padding-left: 0;
padding-right: 3px;
}
.item {
.box-shadow(none);
margin-left: 6px;
.rtl & {
margin-left: 4px;
margin-right: 6px;
}
&:hover, &.selected{
.box-shadow( 0 0 0 2px @border-preview-select-ie);
.box-shadow( 0 0 0 @scaled-two-px-value @border-preview-select-ie);
.box-shadow( 0 0 0 @scaled-two-px-value @border-preview-select);
}
}
.item-symbol {
font-family: @font-family-base;//Arial;
font-family: @font-family-base;
font-size: 14px;
display: block;
width: 20px;