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

[SSE] Enhancement: apply text orientation for shapes from toolbar menu (disable 45/-45).

Browse source
This commit is contained in:
Julia Radzhabova 2017-05-15 16:32:01 +03:00
parent af56c9bc73
commit 5d08a22c80
4 changed files with 41 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -639,7 +639,7 @@ define([
this.api.asc_setGraphicObjectProps(properties); this.api.asc_setGraphicObjectProps(properties);
Common.NotificationCenter.trigger('edit:complete', this.documentHolder); Common.NotificationCenter.trigger('edit:complete', this.documentHolder);
Common.component.Analytics.trackEvent('DocumentHolder', 'Text Directio'); Common.component.Analytics.trackEvent('DocumentHolder', 'Text Direction');
} }
}, },

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

@ -672,19 +672,31 @@ define([
}, },
onTextOrientationMenu: function(menu, item) { onTextOrientationMenu: function(menu, item) {
var angle = 0; if (this.api.asc_getCellInfo().asc_getFlags().asc_getSelectionType() == Asc.c_oAscSelectionType.RangeShapeText) {
var angle = Asc.c_oAscVertDrawingText.normal;
switch (item.value) {
case 'rotateup': angle = Asc.c_oAscVertDrawingText.vert270; break;
case 'rotatedown': angle = Asc.c_oAscVertDrawingText.vert; break;
}
switch (item.value) { var properties = new Asc.asc_CImgProperty();
case 'countcw': angle = 45; break; properties.asc_putVert(angle);
case 'clockwise': angle = -45; break; this.api.asc_setGraphicObjectProps(properties);
case 'rotateup': angle = 90; break; } else {
case 'rotatedown': angle = -90; break; var angle = 0;
switch (item.value) {
case 'countcw': angle = 45; break;
case 'clockwise': angle = -45; break;
case 'rotateup': angle = 90; break;
case 'rotatedown': angle = -90; break;
}
this._state.angle = undefined;
if (this.api)
this.api.asc_setCellAngle(angle);
} }
this._state.angle = undefined;
if (this.api)
this.api.asc_setCellAngle(angle);
Common.NotificationCenter.trigger('edit:complete', this.toolbar); Common.NotificationCenter.trigger('edit:complete', this.toolbar);
Common.component.Analytics.trackEvent('ToolBar', 'Text orientation'); Common.component.Analytics.trackEvent('ToolBar', 'Text orientation');
}, },
@ -1906,11 +1918,12 @@ define([
hIconEl.addClass(btnHorizontalAlign.options.icls); hIconEl.addClass(btnHorizontalAlign.options.icls);
} }
} }
toolbar.btnTextOrient.menu.items[1].setDisabled(fontparam == 'justify');
toolbar.btnTextOrient.menu.items[2].setDisabled(fontparam == 'justify');
} }
need_disable = (fontparam == 'justify' || selectionType == Asc.c_oAscSelectionType.RangeShapeText);
toolbar.btnTextOrient.menu.items[1].setDisabled(need_disable);
toolbar.btnTextOrient.menu.items[2].setDisabled(need_disable);
/* read cell vertical align */ /* read cell vertical align */
fontparam = info.asc_getVertAlign(); fontparam = info.asc_getVertAlign();
@ -2013,14 +2026,22 @@ define([
} }
} }
val = info.asc_getAngle(); if (selectionType == Asc.c_oAscSelectionType.RangeShapeText) {
var SelectedObjects = this.api.asc_getGraphicObjectProps();
for (var i=0; i<SelectedObjects.length; ++i)
{
if (SelectedObjects[i].asc_getObjectType() == Asc.c_oAscTypeSelectElement.Image)
val = SelectedObjects[i].asc_getObjectValue().asc_getVert();
}
} else
val = info.asc_getAngle();
if (this._state.angle !== val) { if (this._state.angle !== val) {
this._clearChecked(toolbar.btnTextOrient.menu); this._clearChecked(toolbar.btnTextOrient.menu);
switch(val) { switch(val) {
case 45: toolbar.btnTextOrient.menu.items[1].setChecked(true, true); break; case 45: toolbar.btnTextOrient.menu.items[1].setChecked(true, true); break;
case -45: toolbar.btnTextOrient.menu.items[2].setChecked(true, true); break; case -45: toolbar.btnTextOrient.menu.items[2].setChecked(true, true); break;
case 90: toolbar.btnTextOrient.menu.items[3].setChecked(true, true); break; case 90: case Asc.c_oAscVertDrawingText.vert270: toolbar.btnTextOrient.menu.items[3].setChecked(true, true); break;
case -90: toolbar.btnTextOrient.menu.items[4].setChecked(true, true); break; case -90: case Asc.c_oAscVertDrawingText.vert: toolbar.btnTextOrient.menu.items[4].setChecked(true, true); break;
default: toolbar.btnTextOrient.menu.items[0].setChecked(true, true); break; default: toolbar.btnTextOrient.menu.items[0].setChecked(true, true); break;
} }
this._state.angle = val; this._state.angle = val;

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

@ -679,8 +679,8 @@ define([
chartText: 'Chart Advanced Settings', chartText: 'Chart Advanced Settings',
directionText: 'Text Direction', directionText: 'Text Direction',
directHText: 'Horizontal', directHText: 'Horizontal',
direct90Text: 'Rotate at 90°', direct90Text: 'Rotate Text Down',
direct270Text: 'Rotate at 270°', direct270Text: 'Rotate Text Up',
txtAddNamedRange: 'Define Name', txtAddNamedRange: 'Define Name',
textFreezePanes: 'Freeze Panes', textFreezePanes: 'Freeze Panes',
textUnFreezePanes: 'Unfreeze Panes', textUnFreezePanes: 'Unfreeze Panes',

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

@ -556,7 +556,7 @@ define([
id : 'id-toolbar-rtn-textorient', id : 'id-toolbar-rtn-textorient',
cls : 'btn-toolbar', cls : 'btn-toolbar',
iconCls : 'btn-text-orient', iconCls : 'btn-text-orient',
lock : [_set.editCell, _set.selChart, _set.selChartText, _set.selShape, _set.selShapeText, _set.selImage, _set.lostConnect, _set.coAuth, _set.coAuthText], lock : [_set.editCell, _set.selChart, _set.selChartText, _set.selShape, _set.selImage, _set.lostConnect, _set.coAuth, _set.coAuthText],
menu : new Common.UI.Menu({ menu : new Common.UI.Menu({
items: [ items: [
{ {