Merge branch 'develop' into feature/print-area
This commit is contained in:
Julia Radzhabova
commit
72444bd988
|
|
@ -196,7 +196,7 @@ define([
|
||||||
}
|
}
|
||||||
|
|
||||||
parentView.scroller.scrollTop(scrollPos);
|
parentView.scroller.scrollTop(scrollPos);
|
||||||
view.autoScrollToEditButtons();
|
parentView.autoScrollToEditButtons();
|
||||||
}
|
}
|
||||||
|
|
||||||
if (textBox && textBox.length) {
|
if (textBox && textBox.length) {
|
||||||
|
|
@ -216,23 +216,6 @@ define([
|
||||||
this.textBox.unbind('input propertychange');
|
this.textBox.unbind('input propertychange');
|
||||||
this.textBox = undefined;
|
this.textBox = undefined;
|
||||||
}
|
}
|
||||||
},
|
|
||||||
autoScrollToEditButtons: function () {
|
|
||||||
var button = $('#id-comments-change-popover'), // TODO: add to cache
|
|
||||||
btnBounds = null,
|
|
||||||
contentBounds = this.el.getBoundingClientRect(),
|
|
||||||
moveY = 0,
|
|
||||||
padding = 7;
|
|
||||||
|
|
||||||
if (button.length) {
|
|
||||||
btnBounds = button.get(0).getBoundingClientRect();
|
|
||||||
if (btnBounds && contentBounds) {
|
|
||||||
moveY = contentBounds.bottom - (btnBounds.bottom + padding);
|
|
||||||
if (moveY < 0) {
|
|
||||||
parentView.scroller.scrollTop(parentView.scroller.getScrollTop() - moveY);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
})());
|
})());
|
||||||
|
|
@ -328,7 +311,7 @@ define([
|
||||||
|
|
||||||
me.hookTextBox();
|
me.hookTextBox();
|
||||||
|
|
||||||
this.autoScrollToEditButtons();
|
me.autoScrollToEditButtons();
|
||||||
this.setFocusToTextBox();
|
this.setFocusToTextBox();
|
||||||
} else {
|
} else {
|
||||||
if (!showEditBox) {
|
if (!showEditBox) {
|
||||||
|
|
@ -347,7 +330,7 @@ define([
|
||||||
|
|
||||||
me.hookTextBox();
|
me.hookTextBox();
|
||||||
|
|
||||||
this.autoScrollToEditButtons();
|
me.autoScrollToEditButtons();
|
||||||
this.setFocusToTextBox();
|
this.setFocusToTextBox();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -380,7 +363,7 @@ define([
|
||||||
this.autoHeightTextBox();
|
this.autoHeightTextBox();
|
||||||
me.hookTextBox();
|
me.hookTextBox();
|
||||||
|
|
||||||
this.autoScrollToEditButtons();
|
me.autoScrollToEditButtons();
|
||||||
this.setFocusToTextBox();
|
this.setFocusToTextBox();
|
||||||
} else if (btn.hasClass('btn-reply', false)) {
|
} else if (btn.hasClass('btn-reply', false)) {
|
||||||
if (showReplyBox) {
|
if (showReplyBox) {
|
||||||
|
|
@ -388,6 +371,7 @@ define([
|
||||||
|
|
||||||
me.fireEvent('comment:addReply', [commentId, this.getActiveTextBoxVal()]);
|
me.fireEvent('comment:addReply', [commentId, this.getActiveTextBoxVal()]);
|
||||||
me.fireEvent('comment:closeEditing');
|
me.fireEvent('comment:closeEditing');
|
||||||
|
me.calculateSizeOfContent();
|
||||||
|
|
||||||
readdresolves();
|
readdresolves();
|
||||||
}
|
}
|
||||||
|
|
@ -774,6 +758,8 @@ define([
|
||||||
sdkBoundsTopPos = 0;
|
sdkBoundsTopPos = 0;
|
||||||
|
|
||||||
if (commentsView && arrowView && commentsView.get(0)) {
|
if (commentsView && arrowView && commentsView.get(0)) {
|
||||||
|
var scrollPos = this.scroller.getScrollTop();
|
||||||
|
|
||||||
commentsView.css({height: '100%'});
|
commentsView.css({height: '100%'});
|
||||||
|
|
||||||
contentBounds = commentsView.get(0).getBoundingClientRect();
|
contentBounds = commentsView.get(0).getBoundingClientRect();
|
||||||
|
|
@ -813,6 +799,7 @@ define([
|
||||||
arrowPosY = Math.min(arrowPosY, sdkBoundsHeight - (sdkPanelHeight + this.arrow.margin + this.arrow.width));
|
arrowPosY = Math.min(arrowPosY, sdkBoundsHeight - (sdkPanelHeight + this.arrow.margin + this.arrow.width));
|
||||||
|
|
||||||
arrowView.css({top: arrowPosY + 'px'});
|
arrowView.css({top: arrowPosY + 'px'});
|
||||||
|
this.scroller.scrollTop(scrollPos);
|
||||||
} else {
|
} else {
|
||||||
|
|
||||||
outerHeight = windowHeight;
|
outerHeight = windowHeight;
|
||||||
|
|
@ -922,6 +909,24 @@ define([
|
||||||
return this.popover;
|
return this.popover;
|
||||||
},
|
},
|
||||||
|
|
||||||
|
autoScrollToEditButtons: function () {
|
||||||
|
var button = $('#id-comments-change-popover'), // TODO: add to cache
|
||||||
|
btnBounds = null,
|
||||||
|
contentBounds = this.$window[0].getBoundingClientRect(),
|
||||||
|
moveY = 0,
|
||||||
|
padding = 7;
|
||||||
|
|
||||||
|
if (button.length) {
|
||||||
|
btnBounds = button.get(0).getBoundingClientRect();
|
||||||
|
if (btnBounds && contentBounds) {
|
||||||
|
moveY = contentBounds.bottom - (btnBounds.bottom + padding);
|
||||||
|
if (moveY < 0) {
|
||||||
|
this.scroller.scrollTop(this.scroller.getScrollTop() - moveY);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
|
||||||
textAddReply : 'Add Reply',
|
textAddReply : 'Add Reply',
|
||||||
textAdd : "Add",
|
textAdd : "Add",
|
||||||
textCancel : 'Cancel',
|
textCancel : 'Cancel',
|
||||||
|
|
|
||||||
|
|
@ -34,6 +34,7 @@
|
||||||
opacity: 0;
|
opacity: 0;
|
||||||
|
|
||||||
position: fixed;
|
position: fixed;
|
||||||
|
cursor: default;
|
||||||
|
|
||||||
> .header {
|
> .header {
|
||||||
height: 34px;
|
height: 34px;
|
||||||
|
|
|
||||||
|
|
@ -27,6 +27,32 @@
|
||||||
<div class="separator horizontal"></div>
|
<div class="separator horizontal"></div>
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td colspan=2 class="padding-small">
|
||||||
|
<label class="header"><%= scope.textRotation %></label>
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td class="padding-small" width="50%">
|
||||||
|
<label class="input-label"><%= scope.textRotate90 %></label>
|
||||||
|
<div>
|
||||||
|
<div id="image-button-270" style="display: inline-block;margin-right: 4px;"></div>
|
||||||
|
<div id="image-button-90" style="display: inline-block;"></div>
|
||||||
|
</div>
|
||||||
|
</td>
|
||||||
|
<td class="padding-small" width="50%">
|
||||||
|
<label class="input-label"><%= scope.textFlip %></label>
|
||||||
|
<div>
|
||||||
|
<div id="image-button-fliph" style="display: inline-block;margin-right: 4px;"></div>
|
||||||
|
<div id="image-button-flipv" style="display: inline-block;"></div>
|
||||||
|
</div>
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td class="padding-small" colspan=2>
|
||||||
|
<div class="separator horizontal"></div>
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
<td colspan=2 class="padding-small">
|
<td colspan=2 class="padding-small">
|
||||||
<label class="header"><%= scope.textWrap %></label>
|
<label class="header"><%= scope.textWrap %></label>
|
||||||
|
|
|
||||||
|
|
@ -90,6 +90,32 @@
|
||||||
</table>
|
</table>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
<div id="id-adv-image-rotate" class="settings-panel active">
|
||||||
|
<div class="inner-content padding-large">
|
||||||
|
<div style="width: 100%;">
|
||||||
|
<label class="input-label"><%= scope.textAngle %></label>
|
||||||
|
<div id="image-advanced-spin-angle" style="display: inline-block; margin-left: 5px;"></div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="separator horizontal padding-large"></div>
|
||||||
|
<div class="inner-content padding-large">
|
||||||
|
<table cols="2">
|
||||||
|
<tr>
|
||||||
|
<td rowspan="2" class="padding-small" style="vertical-align: top;">
|
||||||
|
<label class="input-label" style="margin-right: 15px;vertical-align: top;"><%= scope.textFlipped %></label>
|
||||||
|
</td>
|
||||||
|
<td class="padding-small">
|
||||||
|
<div id="image-advanced-checkbox-hor"></div>
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td class="padding-small">
|
||||||
|
<div id="image-advanced-checkbox-vert"></div>
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
</table>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
<div id="id-adv-image-wrap" class="settings-panel">
|
<div id="id-adv-image-wrap" class="settings-panel">
|
||||||
<div class="inner-content padding-large">
|
<div class="inner-content padding-large">
|
||||||
<label class="header padding-small"><%= scope.textWrap %></label>
|
<label class="header padding-small"><%= scope.textWrap %></label>
|
||||||
|
|
|
||||||
|
|
@ -121,6 +121,38 @@
|
||||||
<div class="separator horizontal"></div>
|
<div class="separator horizontal"></div>
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
|
<tr class="shape-only">
|
||||||
|
<td class="padding-small">
|
||||||
|
<label class="header"><%= scope.textRotation %></label>
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
<tr class="shape-only">
|
||||||
|
<td>
|
||||||
|
<table cols="2" style="width: 100%;">
|
||||||
|
<tr>
|
||||||
|
<td class="padding-small" width="50%">
|
||||||
|
<label class="input-label"><%= scope.textRotate90 %></label>
|
||||||
|
<div>
|
||||||
|
<div id="shape-button-270" style="display: inline-block;margin-right: 4px;"></div>
|
||||||
|
<div id="shape-button-90" style="display: inline-block;"></div>
|
||||||
|
</div>
|
||||||
|
</td>
|
||||||
|
<td class="padding-small" width="50%">
|
||||||
|
<label class="input-label"><%= scope.textFlip %></label>
|
||||||
|
<div>
|
||||||
|
<div id="shape-button-fliph" style="display: inline-block;margin-right: 4px;"></div>
|
||||||
|
<div id="shape-button-flipv" style="display: inline-block;"></div>
|
||||||
|
</div>
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
</table>
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
<tr class="shape-only">
|
||||||
|
<td class="padding-small">
|
||||||
|
<div class="separator horizontal"></div>
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
<tr class="shape-only">
|
<tr class="shape-only">
|
||||||
<td class="padding-small">
|
<td class="padding-small">
|
||||||
<label class="header"><%= scope.textWrap %></label>
|
<label class="header"><%= scope.textWrap %></label>
|
||||||
|
|
|
||||||
|
|
@ -674,7 +674,7 @@ define([
|
||||||
|
|
||||||
var onDialogAddHyperlink = function() {
|
var onDialogAddHyperlink = function() {
|
||||||
var win, props, text;
|
var win, props, text;
|
||||||
if (me.api && me.mode.isEdit && !me._isDisabled){
|
if (me.api && me.mode.isEdit && !me._isDisabled && !DE.getController('LeftMenu').leftMenu.menuFile.isVisible()){
|
||||||
var handlerDlg = function(dlg, result) {
|
var handlerDlg = function(dlg, result) {
|
||||||
if (result == 'ok') {
|
if (result == 'ok') {
|
||||||
props = dlg.getSettings();
|
props = dlg.getSettings();
|
||||||
|
|
|
||||||
|
|
@ -186,6 +186,46 @@ define([
|
||||||
}, this));
|
}, this));
|
||||||
this.btnFitMargins.on('click', _.bind(this.setFitMargins, this));
|
this.btnFitMargins.on('click', _.bind(this.setFitMargins, this));
|
||||||
|
|
||||||
|
this.btnRotate270 = new Common.UI.Button({
|
||||||
|
cls: 'btn-toolbar',
|
||||||
|
iconCls: 'rotate-270',
|
||||||
|
value: 0,
|
||||||
|
hint: this.textHint270
|
||||||
|
});
|
||||||
|
this.btnRotate270.render( $('#image-button-270', me.$el));
|
||||||
|
this.btnRotate270.on('click', _.bind(this.onBtnRotateClick, this));
|
||||||
|
this.lockedControls.push(this.btnRotate270);
|
||||||
|
|
||||||
|
this.btnRotate90 = new Common.UI.Button({
|
||||||
|
cls: 'btn-toolbar',
|
||||||
|
iconCls: 'rotate-90',
|
||||||
|
value: 1,
|
||||||
|
hint: this.textHint90
|
||||||
|
});
|
||||||
|
this.btnRotate90.render( $('#image-button-90', me.$el));
|
||||||
|
this.btnRotate90.on('click', _.bind(this.onBtnRotateClick, this));
|
||||||
|
this.lockedControls.push(this.btnRotate90);
|
||||||
|
|
||||||
|
this.btnFlipV = new Common.UI.Button({
|
||||||
|
cls: 'btn-toolbar',
|
||||||
|
iconCls: 'flip-vert',
|
||||||
|
value: 0,
|
||||||
|
hint: this.textHintFlipV
|
||||||
|
});
|
||||||
|
this.btnFlipV.render( $('#image-button-flipv', me.$el));
|
||||||
|
this.btnFlipV.on('click', _.bind(this.onBtnFlipClick, this));
|
||||||
|
this.lockedControls.push(this.btnFlipV);
|
||||||
|
|
||||||
|
this.btnFlipH = new Common.UI.Button({
|
||||||
|
cls: 'btn-toolbar',
|
||||||
|
iconCls: 'flip-hor',
|
||||||
|
value: 1,
|
||||||
|
hint: this.textHintFlipH
|
||||||
|
});
|
||||||
|
this.btnFlipH.render( $('#image-button-fliph', me.$el));
|
||||||
|
this.btnFlipH.on('click', _.bind(this.onBtnFlipClick, this));
|
||||||
|
this.lockedControls.push(this.btnFlipH);
|
||||||
|
|
||||||
this.linkAdvanced = $('#image-advanced-link');
|
this.linkAdvanced = $('#image-advanced-link');
|
||||||
this.lblReplace = $('#image-lbl-replace');
|
this.lblReplace = $('#image-lbl-replace');
|
||||||
$(this.el).on('click', '#image-advanced-link', _.bind(this.openAdvancedSettings, this));
|
$(this.el).on('click', '#image-advanced-link', _.bind(this.openAdvancedSettings, this));
|
||||||
|
|
@ -384,6 +424,23 @@ define([
|
||||||
})).show();
|
})).show();
|
||||||
},
|
},
|
||||||
|
|
||||||
|
onBtnRotateClick: function(btn) {
|
||||||
|
var properties = new Asc.asc_CImgProperty();
|
||||||
|
properties.asc_putRot((btn.options.value==1 ? 90 : 270) * 3.14159265358979 / 180);
|
||||||
|
this.api.ImgApply(properties);
|
||||||
|
this.fireEvent('editcomplete', this);
|
||||||
|
},
|
||||||
|
|
||||||
|
onBtnFlipClick: function(btn) {
|
||||||
|
var properties = new Asc.asc_CImgProperty();
|
||||||
|
if (btn.options.value==1)
|
||||||
|
properties.asc_putFlipH(true);
|
||||||
|
else
|
||||||
|
properties.asc_putFlipV(true);
|
||||||
|
this.api.ImgApply(properties);
|
||||||
|
this.fireEvent('editcomplete', this);
|
||||||
|
},
|
||||||
|
|
||||||
openAdvancedSettings: function(e) {
|
openAdvancedSettings: function(e) {
|
||||||
if (this.linkAdvanced.hasClass('disabled')) return;
|
if (this.linkAdvanced.hasClass('disabled')) return;
|
||||||
|
|
||||||
|
|
@ -458,7 +515,14 @@ define([
|
||||||
txtInFront: 'In front',
|
txtInFront: 'In front',
|
||||||
textEditObject: 'Edit Object',
|
textEditObject: 'Edit Object',
|
||||||
textEdit: 'Edit',
|
textEdit: 'Edit',
|
||||||
textFitMargins: 'Fit to Margin'
|
textFitMargins: 'Fit to Margin',
|
||||||
|
textRotation: 'Rotation',
|
||||||
|
textRotate90: 'Rotate 90°',
|
||||||
|
textFlip: 'Flip',
|
||||||
|
textHint270: 'Rotate Left 90°',
|
||||||
|
textHint90: 'Rotate Right 90°',
|
||||||
|
textHintFlipV: 'Flip Vertical',
|
||||||
|
textHintFlipH: 'Flip Horizontal'
|
||||||
|
|
||||||
}, DE.Views.ImageSettings || {}));
|
}, DE.Views.ImageSettings || {}));
|
||||||
});
|
});
|
||||||
|
|
@ -64,6 +64,7 @@ define([ 'text!documenteditor/main/app/template/ImageSettingsAdvanced.templat
|
||||||
items: [
|
items: [
|
||||||
{panelId: 'id-adv-image-width', panelCaption: this.textSize},
|
{panelId: 'id-adv-image-width', panelCaption: this.textSize},
|
||||||
{panelId: 'id-adv-shape-size', panelCaption: this.textSize},
|
{panelId: 'id-adv-shape-size', panelCaption: this.textSize},
|
||||||
|
{panelId: 'id-adv-image-rotate', panelCaption: this.textRotation},
|
||||||
{panelId: 'id-adv-image-wrap', panelCaption: this.textBtnWrap},
|
{panelId: 'id-adv-image-wrap', panelCaption: this.textBtnWrap},
|
||||||
{panelId: 'id-adv-image-position', panelCaption: this.textPosition},
|
{panelId: 'id-adv-image-position', panelCaption: this.textPosition},
|
||||||
{panelId: 'id-adv-image-shape', panelCaption: this.textWeightArrows},
|
{panelId: 'id-adv-image-shape', panelCaption: this.textWeightArrows},
|
||||||
|
|
@ -370,6 +371,27 @@ define([ 'text!documenteditor/main/app/template/ImageSettingsAdvanced.templat
|
||||||
this.cmbHeightPc.setValue(this._state.ShapeHeightPcFrom);
|
this.cmbHeightPc.setValue(this._state.ShapeHeightPcFrom);
|
||||||
this.cmbHeightPc.on('selected', _.bind(this.onCmbHeightPcSelect, this));
|
this.cmbHeightPc.on('selected', _.bind(this.onCmbHeightPcSelect, this));
|
||||||
|
|
||||||
|
// Rotation
|
||||||
|
this.spnAngle = new Common.UI.MetricSpinner({
|
||||||
|
el: $('#image-advanced-spin-angle'),
|
||||||
|
step: 1,
|
||||||
|
width: 80,
|
||||||
|
defaultUnit : "°",
|
||||||
|
value: '0 °',
|
||||||
|
maxValue: 3600,
|
||||||
|
minValue: -3600
|
||||||
|
});
|
||||||
|
|
||||||
|
this.chFlipHor = new Common.UI.CheckBox({
|
||||||
|
el: $('#image-advanced-checkbox-hor'),
|
||||||
|
labelText: this.textHorizontally
|
||||||
|
});
|
||||||
|
|
||||||
|
this.chFlipVert = new Common.UI.CheckBox({
|
||||||
|
el: $('#image-advanced-checkbox-vert'),
|
||||||
|
labelText: this.textVertically
|
||||||
|
});
|
||||||
|
|
||||||
// Wrapping
|
// Wrapping
|
||||||
|
|
||||||
this.btnWrapInline = new Common.UI.Button({
|
this.btnWrapInline = new Common.UI.Button({
|
||||||
|
|
@ -1268,9 +1290,10 @@ define([ 'text!documenteditor/main/app/template/ImageSettingsAdvanced.templat
|
||||||
|
|
||||||
this.btnOriginalSize.setVisible(!(shapeprops || chartprops));
|
this.btnOriginalSize.setVisible(!(shapeprops || chartprops));
|
||||||
this.btnOriginalSize.setDisabled(props.get_ImageUrl()===null || props.get_ImageUrl()===undefined);
|
this.btnOriginalSize.setDisabled(props.get_ImageUrl()===null || props.get_ImageUrl()===undefined);
|
||||||
this.btnsCategory[4].setVisible(shapeprops!==null && !shapeprops.get_FromChart()); // Shapes
|
this.btnsCategory[5].setVisible(shapeprops!==null && !shapeprops.get_FromChart()); // Shapes
|
||||||
this.btnsCategory[5].setVisible(shapeprops!==null && !shapeprops.get_FromChart()); // Margins
|
this.btnsCategory[6].setVisible(shapeprops!==null && !shapeprops.get_FromChart()); // Margins
|
||||||
this.btnsCategory[2].setDisabled(props.get_FromGroup()); // Wrapping
|
this.btnsCategory[3].setDisabled(props.get_FromGroup()); // Wrapping
|
||||||
|
this.btnsCategory[2].setVisible(!chartprops); // Rotation
|
||||||
|
|
||||||
if (shapeprops) {
|
if (shapeprops) {
|
||||||
this._objectType = Asc.c_oAscTypeSelectElement.Shape;
|
this._objectType = Asc.c_oAscTypeSelectElement.Shape;
|
||||||
|
|
@ -1333,8 +1356,8 @@ define([ 'text!documenteditor/main/app/template/ImageSettingsAdvanced.templat
|
||||||
this.spnMarginBottom.setValue((null !== val && undefined !== val) ? Common.Utils.Metric.fnRecalcFromMM(val) : '', true);
|
this.spnMarginBottom.setValue((null !== val && undefined !== val) ? Common.Utils.Metric.fnRecalcFromMM(val) : '', true);
|
||||||
}
|
}
|
||||||
|
|
||||||
this.btnsCategory[5].setDisabled(null === margins); // Margins
|
this.btnsCategory[6].setDisabled(null === margins); // Margins
|
||||||
this.btnsCategory[4].setDisabled(shapeprops.get_stroke().get_type() == Asc.c_oAscStrokeType.STROKE_NONE); // Weights & Arrows
|
this.btnsCategory[5].setDisabled(shapeprops.get_stroke().get_type() == Asc.c_oAscStrokeType.STROKE_NONE); // Weights & Arrows
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
value = props.asc_getLockAspect();
|
value = props.asc_getLockAspect();
|
||||||
|
|
@ -1355,6 +1378,13 @@ define([ 'text!documenteditor/main/app/template/ImageSettingsAdvanced.templat
|
||||||
this.spnHeight.setValue((value!==undefined) ? Common.Utils.Metric.fnRecalcFromMM(value).toFixed(2) : '', true);
|
this.spnHeight.setValue((value!==undefined) ? Common.Utils.Metric.fnRecalcFromMM(value).toFixed(2) : '', true);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (!chartprops) {
|
||||||
|
value = props.asc_getRot();
|
||||||
|
this.spnAngle.setValue((value==undefined || value===null) ? '' : Math.floor(value*180/3.14159265358979+0.5), true);
|
||||||
|
this.chFlipHor.setValue(props.asc_getFlipH());
|
||||||
|
this.chFlipVert.setValue(props.asc_getFlipV());
|
||||||
|
}
|
||||||
|
|
||||||
value = props.asc_getTitle();
|
value = props.asc_getTitle();
|
||||||
this.inputAltTitle.setValue(value ? value : '');
|
this.inputAltTitle.setValue(value ? value : '');
|
||||||
|
|
||||||
|
|
@ -1397,6 +1427,12 @@ define([ 'text!documenteditor/main/app/template/ImageSettingsAdvanced.templat
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (this._objectType != Asc.c_oAscTypeSelectElement.Chart) {
|
||||||
|
properties.asc_putRot(this.spnAngle.getNumberValue() * 3.14159265358979 / 180);
|
||||||
|
properties.asc_putFlipH(this.chFlipHor.getValue()=='checked');
|
||||||
|
properties.asc_putFlipV(this.chFlipVert.getValue()=='checked');
|
||||||
|
}
|
||||||
|
|
||||||
if (this.isAltTitleChanged)
|
if (this.isAltTitleChanged)
|
||||||
properties.asc_putTitle(this.inputAltTitle.getValue());
|
properties.asc_putTitle(this.inputAltTitle.getValue());
|
||||||
|
|
||||||
|
|
@ -1515,7 +1551,7 @@ define([ 'text!documenteditor/main/app/template/ImageSettingsAdvanced.templat
|
||||||
this.spnTop.setDisabled(disabledTB);
|
this.spnTop.setDisabled(disabledTB);
|
||||||
this.spnBottom.setDisabled(disabledTB);
|
this.spnBottom.setDisabled(disabledTB);
|
||||||
|
|
||||||
this.btnsCategory[3].setDisabled(btnId == Asc.c_oAscWrapStyle2.Inline);
|
this.btnsCategory[4].setDisabled(btnId == Asc.c_oAscWrapStyle2.Inline);
|
||||||
},
|
},
|
||||||
|
|
||||||
onHAlignSelect: function(combo, record){
|
onHAlignSelect: function(combo, record){
|
||||||
|
|
@ -2033,7 +2069,12 @@ define([ 'text!documenteditor/main/app/template/ImageSettingsAdvanced.templat
|
||||||
textAltTitle: 'Title',
|
textAltTitle: 'Title',
|
||||||
textAltDescription: 'Description',
|
textAltDescription: 'Description',
|
||||||
textAltTip: 'The alternative text-based representation of the visual object information, which will be read to the people with vision or cognitive impairments to help them better understand what information there is in the image, autoshape, chart or table.',
|
textAltTip: 'The alternative text-based representation of the visual object information, which will be read to the people with vision or cognitive impairments to help them better understand what information there is in the image, autoshape, chart or table.',
|
||||||
textWeightArrows: 'Weights & Arrows'
|
textWeightArrows: 'Weights & Arrows',
|
||||||
|
textRotation: 'Rotation',
|
||||||
|
textAngle: 'Angle',
|
||||||
|
textFlipped: 'Flipped',
|
||||||
|
textHorizontally: 'Horizontally',
|
||||||
|
textVertically: 'Vertically'
|
||||||
|
|
||||||
}, DE.Views.ImageSettingsAdvanced || {}));
|
}, DE.Views.ImageSettingsAdvanced || {}));
|
||||||
});
|
});
|
||||||
|
|
@ -1366,6 +1366,46 @@ define([
|
||||||
this.cmbBorderType.setValue(this.BorderType);
|
this.cmbBorderType.setValue(this.BorderType);
|
||||||
this.lockedControls.push(this.cmbBorderType);
|
this.lockedControls.push(this.cmbBorderType);
|
||||||
|
|
||||||
|
this.btnRotate270 = new Common.UI.Button({
|
||||||
|
cls: 'btn-toolbar',
|
||||||
|
iconCls: 'rotate-270',
|
||||||
|
value: 0,
|
||||||
|
hint: this.textHint270
|
||||||
|
});
|
||||||
|
this.btnRotate270.render( $('#shape-button-270', me.$el));
|
||||||
|
this.btnRotate270.on('click', _.bind(this.onBtnRotateClick, this));
|
||||||
|
this.lockedControls.push(this.btnRotate270);
|
||||||
|
|
||||||
|
this.btnRotate90 = new Common.UI.Button({
|
||||||
|
cls: 'btn-toolbar',
|
||||||
|
iconCls: 'rotate-90',
|
||||||
|
value: 1,
|
||||||
|
hint: this.textHint90
|
||||||
|
});
|
||||||
|
this.btnRotate90.render( $('#shape-button-90', me.$el));
|
||||||
|
this.btnRotate90.on('click', _.bind(this.onBtnRotateClick, this));
|
||||||
|
this.lockedControls.push(this.btnRotate90);
|
||||||
|
|
||||||
|
this.btnFlipV = new Common.UI.Button({
|
||||||
|
cls: 'btn-toolbar',
|
||||||
|
iconCls: 'flip-vert',
|
||||||
|
value: 0,
|
||||||
|
hint: this.textHintFlipV
|
||||||
|
});
|
||||||
|
this.btnFlipV.render( $('#shape-button-flipv', me.$el));
|
||||||
|
this.btnFlipV.on('click', _.bind(this.onBtnFlipClick, this));
|
||||||
|
this.lockedControls.push(this.btnFlipV);
|
||||||
|
|
||||||
|
this.btnFlipH = new Common.UI.Button({
|
||||||
|
cls: 'btn-toolbar',
|
||||||
|
iconCls: 'flip-hor',
|
||||||
|
value: 1,
|
||||||
|
hint: this.textHintFlipH
|
||||||
|
});
|
||||||
|
this.btnFlipH.render( $('#shape-button-fliph', me.$el));
|
||||||
|
this.btnFlipH.on('click', _.bind(this.onBtnFlipClick, this));
|
||||||
|
this.lockedControls.push(this.btnFlipH);
|
||||||
|
|
||||||
var viewData = [
|
var viewData = [
|
||||||
{ offsetx: 0, data: Asc.c_oAscWrapStyle2.Inline, tip: this.txtInline, selected: true },
|
{ offsetx: 0, data: Asc.c_oAscWrapStyle2.Inline, tip: this.txtInline, selected: true },
|
||||||
{ offsetx: 50, data: Asc.c_oAscWrapStyle2.Square, tip: this.txtSquare },
|
{ offsetx: 50, data: Asc.c_oAscWrapStyle2.Square, tip: this.txtSquare },
|
||||||
|
|
@ -1523,6 +1563,23 @@ define([
|
||||||
this.fireEvent('editcomplete', this);
|
this.fireEvent('editcomplete', this);
|
||||||
},
|
},
|
||||||
|
|
||||||
|
onBtnRotateClick: function(btn) {
|
||||||
|
var properties = new Asc.asc_CImgProperty();
|
||||||
|
properties.asc_putRot((btn.options.value==1 ? 90 : 270) * 3.14159265358979 / 180);
|
||||||
|
this.api.ImgApply(properties);
|
||||||
|
this.fireEvent('editcomplete', this);
|
||||||
|
},
|
||||||
|
|
||||||
|
onBtnFlipClick: function(btn) {
|
||||||
|
var properties = new Asc.asc_CImgProperty();
|
||||||
|
if (btn.options.value==1)
|
||||||
|
properties.asc_putFlipH(true);
|
||||||
|
else
|
||||||
|
properties.asc_putFlipV(true);
|
||||||
|
this.api.ImgApply(properties);
|
||||||
|
this.fireEvent('editcomplete', this);
|
||||||
|
},
|
||||||
|
|
||||||
fillAutoShapes: function() {
|
fillAutoShapes: function() {
|
||||||
var me = this,
|
var me = this,
|
||||||
shapesStore = this.application.getCollection('ShapeGroups');
|
shapesStore = this.application.getCollection('ShapeGroups');
|
||||||
|
|
@ -1779,6 +1836,13 @@ define([
|
||||||
txtBehind: 'Behind',
|
txtBehind: 'Behind',
|
||||||
txtInFront: 'In front',
|
txtInFront: 'In front',
|
||||||
textBorderSizeErr: 'The entered value is incorrect.<br>Please enter a value between 0 pt and 1584 pt.',
|
textBorderSizeErr: 'The entered value is incorrect.<br>Please enter a value between 0 pt and 1584 pt.',
|
||||||
strType: 'Type'
|
strType: 'Type',
|
||||||
|
textRotation: 'Rotation',
|
||||||
|
textRotate90: 'Rotate 90°',
|
||||||
|
textFlip: 'Flip',
|
||||||
|
textHint270: 'Rotate Left 90°',
|
||||||
|
textHint90: 'Rotate Right 90°',
|
||||||
|
textHintFlipV: 'Flip Vertical',
|
||||||
|
textHintFlipH: 'Flip Horizontal'
|
||||||
}, DE.Views.ShapeSettings || {}));
|
}, DE.Views.ShapeSettings || {}));
|
||||||
});
|
});
|
||||||
|
|
|
||||||
|
|
@ -1247,6 +1247,13 @@
|
||||||
"DE.Views.ImageSettings.txtThrough": "Through",
|
"DE.Views.ImageSettings.txtThrough": "Through",
|
||||||
"DE.Views.ImageSettings.txtTight": "Tight",
|
"DE.Views.ImageSettings.txtTight": "Tight",
|
||||||
"DE.Views.ImageSettings.txtTopAndBottom": "Top and bottom",
|
"DE.Views.ImageSettings.txtTopAndBottom": "Top and bottom",
|
||||||
|
"DE.Views.ImageSettings.textRotation": "Rotation",
|
||||||
|
"DE.Views.ImageSettings.textRotate90": "Rotate 90°",
|
||||||
|
"DE.Views.ImageSettings.textFlip": "Flip",
|
||||||
|
"DE.Views.ImageSettings.textHint270": "Rotate Left 90°",
|
||||||
|
"DE.Views.ImageSettings.textHint90": "Rotate Right 90°",
|
||||||
|
"DE.Views.ImageSettings.textHintFlipV": "Flip Vertical",
|
||||||
|
"DE.Views.ImageSettings.textHintFlipH": "Flip Horizontal",
|
||||||
"DE.Views.ImageSettingsAdvanced.cancelButtonText": "Cancel",
|
"DE.Views.ImageSettingsAdvanced.cancelButtonText": "Cancel",
|
||||||
"DE.Views.ImageSettingsAdvanced.okButtonText": "OK",
|
"DE.Views.ImageSettingsAdvanced.okButtonText": "OK",
|
||||||
"DE.Views.ImageSettingsAdvanced.strMargins": "Text Padding",
|
"DE.Views.ImageSettingsAdvanced.strMargins": "Text Padding",
|
||||||
|
|
@ -1316,6 +1323,11 @@
|
||||||
"DE.Views.ImageSettingsAdvanced.textWrapThroughTooltip": "Through",
|
"DE.Views.ImageSettingsAdvanced.textWrapThroughTooltip": "Through",
|
||||||
"DE.Views.ImageSettingsAdvanced.textWrapTightTooltip": "Tight",
|
"DE.Views.ImageSettingsAdvanced.textWrapTightTooltip": "Tight",
|
||||||
"DE.Views.ImageSettingsAdvanced.textWrapTopbottomTooltip": "Top and bottom",
|
"DE.Views.ImageSettingsAdvanced.textWrapTopbottomTooltip": "Top and bottom",
|
||||||
|
"DE.Views.ImageSettingsAdvanced.textRotation": "Rotation",
|
||||||
|
"DE.Views.ImageSettingsAdvanced.textAngle": "Angle",
|
||||||
|
"DE.Views.ImageSettingsAdvanced.textFlipped": "Flipped",
|
||||||
|
"DE.Views.ImageSettingsAdvanced.textHorizontally": "Horizontally",
|
||||||
|
"DE.Views.ImageSettingsAdvanced.textVertically": "Vertically",
|
||||||
"DE.Views.LeftMenu.tipAbout": "About",
|
"DE.Views.LeftMenu.tipAbout": "About",
|
||||||
"DE.Views.LeftMenu.tipChat": "Chat",
|
"DE.Views.LeftMenu.tipChat": "Chat",
|
||||||
"DE.Views.LeftMenu.tipComments": "Comments",
|
"DE.Views.LeftMenu.tipComments": "Comments",
|
||||||
|
|
@ -1442,7 +1454,6 @@
|
||||||
"DE.Views.PageSizeDialog.cancelButtonText": "Cancel",
|
"DE.Views.PageSizeDialog.cancelButtonText": "Cancel",
|
||||||
"DE.Views.PageSizeDialog.okButtonText": "Ok",
|
"DE.Views.PageSizeDialog.okButtonText": "Ok",
|
||||||
"DE.Views.PageSizeDialog.textHeight": "Height",
|
"DE.Views.PageSizeDialog.textHeight": "Height",
|
||||||
"DE.Views.PageSizeDialog.textPreset": "Preset",
|
|
||||||
"DE.Views.PageSizeDialog.textTitle": "Page Size",
|
"DE.Views.PageSizeDialog.textTitle": "Page Size",
|
||||||
"DE.Views.PageSizeDialog.textWidth": "Width",
|
"DE.Views.PageSizeDialog.textWidth": "Width",
|
||||||
"DE.Views.PageSizeDialog.txtCustom": "Custom",
|
"DE.Views.PageSizeDialog.txtCustom": "Custom",
|
||||||
|
|
@ -1574,6 +1585,13 @@
|
||||||
"DE.Views.ShapeSettings.txtTight": "Tight",
|
"DE.Views.ShapeSettings.txtTight": "Tight",
|
||||||
"DE.Views.ShapeSettings.txtTopAndBottom": "Top and bottom",
|
"DE.Views.ShapeSettings.txtTopAndBottom": "Top and bottom",
|
||||||
"DE.Views.ShapeSettings.txtWood": "Wood",
|
"DE.Views.ShapeSettings.txtWood": "Wood",
|
||||||
|
"DE.Views.ShapeSettings.textRotation": "Rotation",
|
||||||
|
"DE.Views.ShapeSettings.textRotate90": "Rotate 90°",
|
||||||
|
"DE.Views.ShapeSettings.textFlip": "Flip",
|
||||||
|
"DE.Views.ShapeSettings.textHint270": "Rotate Left 90°",
|
||||||
|
"DE.Views.ShapeSettings.textHint90": "Rotate Right 90°",
|
||||||
|
"DE.Views.ShapeSettings.textHintFlipV": "Flip Vertical",
|
||||||
|
"DE.Views.ShapeSettings.textHintFlipH": "Flip Horizontal",
|
||||||
"DE.Views.SignatureSettings.notcriticalErrorTitle": "Warning",
|
"DE.Views.SignatureSettings.notcriticalErrorTitle": "Warning",
|
||||||
"DE.Views.SignatureSettings.strDelete": "Remove Signature",
|
"DE.Views.SignatureSettings.strDelete": "Remove Signature",
|
||||||
"DE.Views.SignatureSettings.strDetails": "Signature Details",
|
"DE.Views.SignatureSettings.strDetails": "Signature Details",
|
||||||
|
|
|
||||||
Binary file not shown.
|
Before Width: | Height: | Size: 16 KiB After Width: | Height: | Size: 16 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 37 KiB After Width: | Height: | Size: 38 KiB |
|
|
@ -341,6 +341,11 @@
|
||||||
//.button-normal-icon(btn-dropcap, 50, @toolbar-icon-size);
|
//.button-normal-icon(btn-dropcap, 50, @toolbar-icon-size);
|
||||||
.button-normal-icon(btn-ic-doclang, 67, @toolbar-icon-size);
|
.button-normal-icon(btn-ic-doclang, 67, @toolbar-icon-size);
|
||||||
|
|
||||||
|
.button-normal-icon(rotate-90, 81, @toolbar-icon-size);
|
||||||
|
.button-normal-icon(rotate-270, 82, @toolbar-icon-size);
|
||||||
|
.button-normal-icon(flip-hor, 84, @toolbar-icon-size);
|
||||||
|
.button-normal-icon(flip-vert, 85, @toolbar-icon-size);
|
||||||
|
|
||||||
@menu-icon-size: 22px;
|
@menu-icon-size: 22px;
|
||||||
.menu-icon-normal(mnu-wrap-inline, 0, @menu-icon-size);
|
.menu-icon-normal(mnu-wrap-inline, 0, @menu-icon-size);
|
||||||
.menu-icon-normal(mnu-wrap-square, 1, @menu-icon-size);
|
.menu-icon-normal(mnu-wrap-square, 1, @menu-icon-size);
|
||||||
|
|
|
||||||
|
|
@ -22,6 +22,32 @@
|
||||||
<div class="separator horizontal"></div>
|
<div class="separator horizontal"></div>
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td colspan=2 class="padding-small">
|
||||||
|
<label class="header"><%= scope.textRotation %></label>
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td class="padding-small" width="50%">
|
||||||
|
<label class="input-label"><%= scope.textRotate90 %></label>
|
||||||
|
<div>
|
||||||
|
<div id="image-button-270" style="display: inline-block;margin-right: 4px;"></div>
|
||||||
|
<div id="image-button-90" style="display: inline-block;"></div>
|
||||||
|
</div>
|
||||||
|
</td>
|
||||||
|
<td class="padding-small" width="50%">
|
||||||
|
<label class="input-label"><%= scope.textFlip %></label>
|
||||||
|
<div>
|
||||||
|
<div id="image-button-fliph" style="display: inline-block;margin-right: 4px;"></div>
|
||||||
|
<div id="image-button-flipv" style="display: inline-block;"></div>
|
||||||
|
</div>
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td class="padding-small" colspan=2>
|
||||||
|
<div class="separator horizontal"></div>
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
<td colspan=2>
|
<td colspan=2>
|
||||||
<label class="header" id="image-lbl-replace" ><%= scope.textInsert %></label>
|
<label class="header" id="image-lbl-replace" ><%= scope.textInsert %></label>
|
||||||
|
|
|
||||||
|
|
@ -45,6 +45,32 @@
|
||||||
</table>
|
</table>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
<div id="id-adv-image-rotate" class="settings-panel active">
|
||||||
|
<div class="inner-content padding-large">
|
||||||
|
<div style="width: 100%;">
|
||||||
|
<label class="input-label"><%= scope.textAngle %></label>
|
||||||
|
<div id="image-advanced-spin-angle" style="display: inline-block; margin-left: 5px;"></div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="separator horizontal padding-large"></div>
|
||||||
|
<div class="inner-content padding-large">
|
||||||
|
<table cols="2">
|
||||||
|
<tr>
|
||||||
|
<td rowspan="2" class="padding-small" style="vertical-align: top;">
|
||||||
|
<label class="input-label" style="margin-right: 15px;vertical-align: top;"><%= scope.textFlipped %></label>
|
||||||
|
</td>
|
||||||
|
<td class="padding-small">
|
||||||
|
<div id="image-advanced-checkbox-hor"></div>
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td class="padding-small">
|
||||||
|
<div id="image-advanced-checkbox-vert"></div>
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
</table>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
<div id="id-adv-image-alttext" class="settings-panel">
|
<div id="id-adv-image-alttext" class="settings-panel">
|
||||||
<div class="inner-content">
|
<div class="inner-content">
|
||||||
<table cols="1" width="100%">
|
<table cols="1" width="100%">
|
||||||
|
|
|
||||||
|
|
@ -116,6 +116,38 @@
|
||||||
</div>
|
</div>
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
|
<tr class="shape-only">
|
||||||
|
<td class="padding-small">
|
||||||
|
<div class="separator horizontal"></div>
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
<tr class="shape-only">
|
||||||
|
<td class="padding-small">
|
||||||
|
<label class="header"><%= scope.textRotation %></label>
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
<tr class="shape-only">
|
||||||
|
<td>
|
||||||
|
<table cols="2" style="width: 100%;">
|
||||||
|
<tr>
|
||||||
|
<td class="padding-small" width="50%">
|
||||||
|
<label class="input-label"><%= scope.textRotate90 %></label>
|
||||||
|
<div>
|
||||||
|
<div id="shape-button-270" style="display: inline-block;margin-right: 4px;"></div>
|
||||||
|
<div id="shape-button-90" style="display: inline-block;"></div>
|
||||||
|
</div>
|
||||||
|
</td>
|
||||||
|
<td class="padding-small" width="50%">
|
||||||
|
<label class="input-label"><%= scope.textFlip %></label>
|
||||||
|
<div>
|
||||||
|
<div id="shape-button-fliph" style="display: inline-block;margin-right: 4px;"></div>
|
||||||
|
<div id="shape-button-flipv" style="display: inline-block;"></div>
|
||||||
|
</div>
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
</table>
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
<tr class="change-type">
|
<tr class="change-type">
|
||||||
<td class="padding-small">
|
<td class="padding-small">
|
||||||
<div class="separator horizontal"></div>
|
<div class="separator horizontal"></div>
|
||||||
|
|
|
||||||
|
|
@ -17,6 +17,32 @@
|
||||||
</table>
|
</table>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
<div id="id-adv-shape-rotate" class="settings-panel active">
|
||||||
|
<div class="inner-content padding-large">
|
||||||
|
<div style="width: 100%;">
|
||||||
|
<label class="input-label"><%= scope.textAngle %></label>
|
||||||
|
<div id="shape-advanced-spin-angle" style="display: inline-block; margin-left: 5px;"></div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="separator horizontal padding-large"></div>
|
||||||
|
<div class="inner-content padding-large">
|
||||||
|
<table cols="2">
|
||||||
|
<tr>
|
||||||
|
<td rowspan="2" class="padding-small" style="vertical-align: top;">
|
||||||
|
<label class="input-label" style="margin-right: 15px;vertical-align: top;"><%= scope.textFlipped %></label>
|
||||||
|
</td>
|
||||||
|
<td class="padding-small">
|
||||||
|
<div id="shape-advanced-checkbox-hor"></div>
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td class="padding-small">
|
||||||
|
<div id="shape-advanced-checkbox-vert"></div>
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
</table>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
<div id="id-adv-shape-shape" class="settings-panel">
|
<div id="id-adv-shape-shape" class="settings-panel">
|
||||||
<div class="inner-content">
|
<div class="inner-content">
|
||||||
<table cols="2" style="width: 100%;">
|
<table cols="2" style="width: 100%;">
|
||||||
|
|
|
||||||
|
|
@ -583,7 +583,7 @@ define([
|
||||||
|
|
||||||
var onDialogAddHyperlink = function() {
|
var onDialogAddHyperlink = function() {
|
||||||
var win, props, text;
|
var win, props, text;
|
||||||
if (me.api && me.mode.isEdit && !me._isDisabled){
|
if (me.api && me.mode.isEdit && !me._isDisabled && !PE.getController('LeftMenu').leftMenu.menuFile.isVisible()){
|
||||||
var handlerDlg = function(dlg, result) {
|
var handlerDlg = function(dlg, result) {
|
||||||
if (result == 'ok') {
|
if (result == 'ok') {
|
||||||
props = dlg.getSettings();
|
props = dlg.getSettings();
|
||||||
|
|
|
||||||
|
|
@ -139,6 +139,46 @@ define([
|
||||||
this.fireEvent('editcomplete', this);
|
this.fireEvent('editcomplete', this);
|
||||||
}, this));
|
}, this));
|
||||||
|
|
||||||
|
this.btnRotate270 = new Common.UI.Button({
|
||||||
|
cls: 'btn-toolbar',
|
||||||
|
iconCls: 'rotate-270',
|
||||||
|
value: 0,
|
||||||
|
hint: this.textHint270
|
||||||
|
});
|
||||||
|
this.btnRotate270.render( $('#image-button-270', this.$el));
|
||||||
|
this.btnRotate270.on('click', _.bind(this.onBtnRotateClick, this));
|
||||||
|
this.lockedControls.push(this.btnRotate270);
|
||||||
|
|
||||||
|
this.btnRotate90 = new Common.UI.Button({
|
||||||
|
cls: 'btn-toolbar',
|
||||||
|
iconCls: 'rotate-90',
|
||||||
|
value: 1,
|
||||||
|
hint: this.textHint90
|
||||||
|
});
|
||||||
|
this.btnRotate90.render( $('#image-button-90', this.$el));
|
||||||
|
this.btnRotate90.on('click', _.bind(this.onBtnRotateClick, this));
|
||||||
|
this.lockedControls.push(this.btnRotate90);
|
||||||
|
|
||||||
|
this.btnFlipV = new Common.UI.Button({
|
||||||
|
cls: 'btn-toolbar',
|
||||||
|
iconCls: 'flip-vert',
|
||||||
|
value: 0,
|
||||||
|
hint: this.textHintFlipV
|
||||||
|
});
|
||||||
|
this.btnFlipV.render( $('#image-button-flipv', this.$el));
|
||||||
|
this.btnFlipV.on('click', _.bind(this.onBtnFlipClick, this));
|
||||||
|
this.lockedControls.push(this.btnFlipV);
|
||||||
|
|
||||||
|
this.btnFlipH = new Common.UI.Button({
|
||||||
|
cls: 'btn-toolbar',
|
||||||
|
iconCls: 'flip-hor',
|
||||||
|
value: 1,
|
||||||
|
hint: this.textHintFlipH
|
||||||
|
});
|
||||||
|
this.btnFlipH.render( $('#image-button-fliph', this.$el));
|
||||||
|
this.btnFlipH.on('click', _.bind(this.onBtnFlipClick, this));
|
||||||
|
this.lockedControls.push(this.btnFlipH);
|
||||||
|
|
||||||
this.linkAdvanced = $('#image-advanced-link');
|
this.linkAdvanced = $('#image-advanced-link');
|
||||||
this.lblReplace = $('#image-lbl-replace');
|
this.lblReplace = $('#image-lbl-replace');
|
||||||
$(this.el).on('click', '#image-advanced-link', _.bind(this.openAdvancedSettings, this));
|
$(this.el).on('click', '#image-advanced-link', _.bind(this.openAdvancedSettings, this));
|
||||||
|
|
@ -268,6 +308,23 @@ define([
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
|
onBtnRotateClick: function(btn) {
|
||||||
|
var properties = new Asc.asc_CImgProperty();
|
||||||
|
properties.asc_putRot((btn.options.value==1 ? 90 : 270) * 3.14159265358979 / 180);
|
||||||
|
this.api.ImgApply(properties);
|
||||||
|
this.fireEvent('editcomplete', this);
|
||||||
|
},
|
||||||
|
|
||||||
|
onBtnFlipClick: function(btn) {
|
||||||
|
var properties = new Asc.asc_CImgProperty();
|
||||||
|
if (btn.options.value==1)
|
||||||
|
properties.asc_putFlipH(true);
|
||||||
|
else
|
||||||
|
properties.asc_putFlipV(true);
|
||||||
|
this.api.ImgApply(properties);
|
||||||
|
this.fireEvent('editcomplete', this);
|
||||||
|
},
|
||||||
|
|
||||||
setLocked: function (locked) {
|
setLocked: function (locked) {
|
||||||
this._locked = locked;
|
this._locked = locked;
|
||||||
},
|
},
|
||||||
|
|
@ -293,7 +350,14 @@ define([
|
||||||
textFromFile: 'From File',
|
textFromFile: 'From File',
|
||||||
textAdvanced: 'Show advanced settings',
|
textAdvanced: 'Show advanced settings',
|
||||||
textEditObject: 'Edit Object',
|
textEditObject: 'Edit Object',
|
||||||
textEdit: 'Edit'
|
textEdit: 'Edit',
|
||||||
|
textRotation: 'Rotation',
|
||||||
|
textRotate90: 'Rotate 90°',
|
||||||
|
textFlip: 'Flip',
|
||||||
|
textHint270: 'Rotate Left 90°',
|
||||||
|
textHint90: 'Rotate Right 90°',
|
||||||
|
textHintFlipV: 'Flip Vertical',
|
||||||
|
textHintFlipH: 'Flip Horizontal'
|
||||||
|
|
||||||
}, PE.Views.ImageSettings || {}));
|
}, PE.Views.ImageSettings || {}));
|
||||||
});
|
});
|
||||||
|
|
@ -40,7 +40,8 @@
|
||||||
|
|
||||||
define([ 'text!presentationeditor/main/app/template/ImageSettingsAdvanced.template',
|
define([ 'text!presentationeditor/main/app/template/ImageSettingsAdvanced.template',
|
||||||
'common/main/lib/view/AdvancedSettingsWindow',
|
'common/main/lib/view/AdvancedSettingsWindow',
|
||||||
'common/main/lib/component/MetricSpinner'
|
'common/main/lib/component/MetricSpinner',
|
||||||
|
'common/main/lib/component/CheckBox'
|
||||||
], function (contentTemplate) {
|
], function (contentTemplate) {
|
||||||
'use strict';
|
'use strict';
|
||||||
|
|
||||||
|
|
@ -59,6 +60,7 @@ define([ 'text!presentationeditor/main/app/template/ImageSettingsAdvanced.tem
|
||||||
title: this.textTitle,
|
title: this.textTitle,
|
||||||
items: [
|
items: [
|
||||||
{panelId: 'id-adv-image-size', panelCaption: this.textPlacement},
|
{panelId: 'id-adv-image-size', panelCaption: this.textPlacement},
|
||||||
|
{panelId: 'id-adv-image-rotate', panelCaption: this.textRotation},
|
||||||
{panelId: 'id-adv-image-alttext', panelCaption: this.textAlt}
|
{panelId: 'id-adv-image-alttext', panelCaption: this.textAlt}
|
||||||
],
|
],
|
||||||
contentTemplate: _.template(contentTemplate)({
|
contentTemplate: _.template(contentTemplate)({
|
||||||
|
|
@ -171,6 +173,27 @@ define([ 'text!presentationeditor/main/app/template/ImageSettingsAdvanced.tem
|
||||||
});
|
});
|
||||||
this.spinners.push(this.spnY);
|
this.spinners.push(this.spnY);
|
||||||
|
|
||||||
|
// Rotation
|
||||||
|
this.spnAngle = new Common.UI.MetricSpinner({
|
||||||
|
el: $('#image-advanced-spin-angle'),
|
||||||
|
step: 1,
|
||||||
|
width: 80,
|
||||||
|
defaultUnit : "°",
|
||||||
|
value: '0 °',
|
||||||
|
maxValue: 3600,
|
||||||
|
minValue: -3600
|
||||||
|
});
|
||||||
|
|
||||||
|
this.chFlipHor = new Common.UI.CheckBox({
|
||||||
|
el: $('#image-advanced-checkbox-hor'),
|
||||||
|
labelText: this.textHorizontally
|
||||||
|
});
|
||||||
|
|
||||||
|
this.chFlipVert = new Common.UI.CheckBox({
|
||||||
|
el: $('#image-advanced-checkbox-vert'),
|
||||||
|
labelText: this.textVertically
|
||||||
|
});
|
||||||
|
|
||||||
// Alt Text
|
// Alt Text
|
||||||
|
|
||||||
this.inputAltTitle = new Common.UI.InputField({
|
this.inputAltTitle = new Common.UI.InputField({
|
||||||
|
|
@ -225,6 +248,11 @@ define([ 'text!presentationeditor/main/app/template/ImageSettingsAdvanced.tem
|
||||||
this.spnY.setValue('', true);
|
this.spnY.setValue('', true);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
value = props.asc_getRot();
|
||||||
|
this.spnAngle.setValue((value==undefined || value===null) ? '' : Math.floor(value*180/3.14159265358979+0.5), true);
|
||||||
|
this.chFlipHor.setValue(props.asc_getFlipH());
|
||||||
|
this.chFlipVert.setValue(props.asc_getFlipV());
|
||||||
|
|
||||||
value = props.asc_getTitle();
|
value = props.asc_getTitle();
|
||||||
this.inputAltTitle.setValue(value ? value : '');
|
this.inputAltTitle.setValue(value ? value : '');
|
||||||
|
|
||||||
|
|
@ -254,6 +282,10 @@ define([ 'text!presentationeditor/main/app/template/ImageSettingsAdvanced.tem
|
||||||
if (this.isAltDescChanged)
|
if (this.isAltDescChanged)
|
||||||
properties.asc_putDescription(this.textareaAltDescription.val());
|
properties.asc_putDescription(this.textareaAltDescription.val());
|
||||||
|
|
||||||
|
properties.asc_putRot(this.spnAngle.getNumberValue() * 3.14159265358979 / 180);
|
||||||
|
properties.asc_putFlipH(this.chFlipHor.getValue()=='checked');
|
||||||
|
properties.asc_putFlipV(this.chFlipVert.getValue()=='checked');
|
||||||
|
|
||||||
return { imageProps: properties };
|
return { imageProps: properties };
|
||||||
},
|
},
|
||||||
|
|
||||||
|
|
@ -289,7 +321,12 @@ define([ 'text!presentationeditor/main/app/template/ImageSettingsAdvanced.tem
|
||||||
textAlt: 'Alternative Text',
|
textAlt: 'Alternative Text',
|
||||||
textAltTitle: 'Title',
|
textAltTitle: 'Title',
|
||||||
textAltDescription: 'Description',
|
textAltDescription: 'Description',
|
||||||
textAltTip: 'The alternative text-based representation of the visual object information, which will be read to the people with vision or cognitive impairments to help them better understand what information there is in the image, autoshape, chart or table.'
|
textAltTip: 'The alternative text-based representation of the visual object information, which will be read to the people with vision or cognitive impairments to help them better understand what information there is in the image, autoshape, chart or table.',
|
||||||
|
textRotation: 'Rotation',
|
||||||
|
textAngle: 'Angle',
|
||||||
|
textFlipped: 'Flipped',
|
||||||
|
textHorizontally: 'Horizontally',
|
||||||
|
textVertically: 'Vertically'
|
||||||
|
|
||||||
}, PE.Views.ImageSettingsAdvanced || {}));
|
}, PE.Views.ImageSettingsAdvanced || {}));
|
||||||
});
|
});
|
||||||
|
|
@ -1290,6 +1290,46 @@ define([
|
||||||
this.btnChangeShape.render( $('#shape-btn-change')) ;
|
this.btnChangeShape.render( $('#shape-btn-change')) ;
|
||||||
this.lockedControls.push(this.btnChangeShape);
|
this.lockedControls.push(this.btnChangeShape);
|
||||||
|
|
||||||
|
this.btnRotate270 = new Common.UI.Button({
|
||||||
|
cls: 'btn-toolbar',
|
||||||
|
iconCls: 'rotate-270',
|
||||||
|
value: 0,
|
||||||
|
hint: this.textHint270
|
||||||
|
});
|
||||||
|
this.btnRotate270.render( $('#shape-button-270', me.$el));
|
||||||
|
this.btnRotate270.on('click', _.bind(this.onBtnRotateClick, this));
|
||||||
|
this.lockedControls.push(this.btnRotate270);
|
||||||
|
|
||||||
|
this.btnRotate90 = new Common.UI.Button({
|
||||||
|
cls: 'btn-toolbar',
|
||||||
|
iconCls: 'rotate-90',
|
||||||
|
value: 1,
|
||||||
|
hint: this.textHint90
|
||||||
|
});
|
||||||
|
this.btnRotate90.render( $('#shape-button-90', me.$el));
|
||||||
|
this.btnRotate90.on('click', _.bind(this.onBtnRotateClick, this));
|
||||||
|
this.lockedControls.push(this.btnRotate90);
|
||||||
|
|
||||||
|
this.btnFlipV = new Common.UI.Button({
|
||||||
|
cls: 'btn-toolbar',
|
||||||
|
iconCls: 'flip-vert',
|
||||||
|
value: 0,
|
||||||
|
hint: this.textHintFlipV
|
||||||
|
});
|
||||||
|
this.btnFlipV.render( $('#shape-button-flipv', me.$el));
|
||||||
|
this.btnFlipV.on('click', _.bind(this.onBtnFlipClick, this));
|
||||||
|
this.lockedControls.push(this.btnFlipV);
|
||||||
|
|
||||||
|
this.btnFlipH = new Common.UI.Button({
|
||||||
|
cls: 'btn-toolbar',
|
||||||
|
iconCls: 'flip-hor',
|
||||||
|
value: 1,
|
||||||
|
hint: this.textHintFlipH
|
||||||
|
});
|
||||||
|
this.btnFlipH.render( $('#shape-button-fliph', me.$el));
|
||||||
|
this.btnFlipH.on('click', _.bind(this.onBtnFlipClick, this));
|
||||||
|
this.lockedControls.push(this.btnFlipH);
|
||||||
|
|
||||||
this.linkAdvanced = $('#shape-advanced-link');
|
this.linkAdvanced = $('#shape-advanced-link');
|
||||||
$(this.el).on('click', '#shape-advanced-link', _.bind(this.openAdvancedSettings, this));
|
$(this.el).on('click', '#shape-advanced-link', _.bind(this.openAdvancedSettings, this));
|
||||||
},
|
},
|
||||||
|
|
@ -1544,6 +1584,23 @@ define([
|
||||||
this.colorsGrad.updateColors(Common.Utils.ThemeColor.getEffectColors(), Common.Utils.ThemeColor.getStandartColors());
|
this.colorsGrad.updateColors(Common.Utils.ThemeColor.getEffectColors(), Common.Utils.ThemeColor.getStandartColors());
|
||||||
},
|
},
|
||||||
|
|
||||||
|
onBtnRotateClick: function(btn) {
|
||||||
|
var properties = new Asc.asc_CShapeProperty();
|
||||||
|
properties.asc_putRot((btn.options.value==1 ? 90 : 270) * 3.14159265358979 / 180);
|
||||||
|
this.api.ShapeApply(properties);
|
||||||
|
this.fireEvent('editcomplete', this);
|
||||||
|
},
|
||||||
|
|
||||||
|
onBtnFlipClick: function(btn) {
|
||||||
|
var properties = new Asc.asc_CShapeProperty();
|
||||||
|
if (btn.options.value==1)
|
||||||
|
properties.asc_putFlipH(true);
|
||||||
|
else
|
||||||
|
properties.asc_putFlipV(true);
|
||||||
|
this.api.ShapeApply(properties);
|
||||||
|
this.fireEvent('editcomplete', this);
|
||||||
|
},
|
||||||
|
|
||||||
_pt2mm: function(value) {
|
_pt2mm: function(value) {
|
||||||
return (value * 25.4 / 72.0);
|
return (value * 25.4 / 72.0);
|
||||||
},
|
},
|
||||||
|
|
@ -1643,6 +1700,13 @@ define([
|
||||||
textStyle: 'Style',
|
textStyle: 'Style',
|
||||||
textGradient: 'Gradient',
|
textGradient: 'Gradient',
|
||||||
textBorderSizeErr: 'The entered value is incorrect.<br>Please enter a value between 0 pt and 1584 pt.',
|
textBorderSizeErr: 'The entered value is incorrect.<br>Please enter a value between 0 pt and 1584 pt.',
|
||||||
strType: 'Type'
|
strType: 'Type',
|
||||||
|
textRotation: 'Rotation',
|
||||||
|
textRotate90: 'Rotate 90°',
|
||||||
|
textFlip: 'Flip',
|
||||||
|
textHint270: 'Rotate Left 90°',
|
||||||
|
textHint90: 'Rotate Right 90°',
|
||||||
|
textHintFlipV: 'Flip Vertical',
|
||||||
|
textHintFlipH: 'Flip Horizontal'
|
||||||
}, PE.Views.ShapeSettings || {}));
|
}, PE.Views.ShapeSettings || {}));
|
||||||
});
|
});
|
||||||
|
|
|
||||||
|
|
@ -41,7 +41,8 @@
|
||||||
define([ 'text!presentationeditor/main/app/template/ShapeSettingsAdvanced.template',
|
define([ 'text!presentationeditor/main/app/template/ShapeSettingsAdvanced.template',
|
||||||
'common/main/lib/view/AdvancedSettingsWindow',
|
'common/main/lib/view/AdvancedSettingsWindow',
|
||||||
'common/main/lib/component/ComboBox',
|
'common/main/lib/component/ComboBox',
|
||||||
'common/main/lib/component/MetricSpinner'
|
'common/main/lib/component/MetricSpinner',
|
||||||
|
'common/main/lib/component/CheckBox'
|
||||||
], function (contentTemplate) {
|
], function (contentTemplate) {
|
||||||
'use strict';
|
'use strict';
|
||||||
|
|
||||||
|
|
@ -61,6 +62,7 @@ define([ 'text!presentationeditor/main/app/template/ShapeSettingsAdvanced.tem
|
||||||
title: this.textTitle,
|
title: this.textTitle,
|
||||||
items: [
|
items: [
|
||||||
{panelId: 'id-adv-shape-width', panelCaption: this.textSize},
|
{panelId: 'id-adv-shape-width', panelCaption: this.textSize},
|
||||||
|
{panelId: 'id-adv-shape-rotate', panelCaption: this.textRotation},
|
||||||
{panelId: 'id-adv-shape-shape', panelCaption: this.textWeightArrows},
|
{panelId: 'id-adv-shape-shape', panelCaption: this.textWeightArrows},
|
||||||
{panelId: 'id-adv-shape-margins', panelCaption: this.strMargins},
|
{panelId: 'id-adv-shape-margins', panelCaption: this.strMargins},
|
||||||
{panelId: 'id-adv-shape-columns', panelCaption: this.strColumns},
|
{panelId: 'id-adv-shape-columns', panelCaption: this.strColumns},
|
||||||
|
|
@ -230,6 +232,27 @@ define([ 'text!presentationeditor/main/app/template/ShapeSettingsAdvanced.tem
|
||||||
}, this));
|
}, this));
|
||||||
this.spinners.push(this.spnMarginRight);
|
this.spinners.push(this.spnMarginRight);
|
||||||
|
|
||||||
|
// Rotation
|
||||||
|
this.spnAngle = new Common.UI.MetricSpinner({
|
||||||
|
el: $('#shape-advanced-spin-angle'),
|
||||||
|
step: 1,
|
||||||
|
width: 80,
|
||||||
|
defaultUnit : "°",
|
||||||
|
value: '0 °',
|
||||||
|
maxValue: 3600,
|
||||||
|
minValue: -3600
|
||||||
|
});
|
||||||
|
|
||||||
|
this.chFlipHor = new Common.UI.CheckBox({
|
||||||
|
el: $('#shape-advanced-checkbox-hor'),
|
||||||
|
labelText: this.textHorizontally
|
||||||
|
});
|
||||||
|
|
||||||
|
this.chFlipVert = new Common.UI.CheckBox({
|
||||||
|
el: $('#shape-advanced-checkbox-vert'),
|
||||||
|
labelText: this.textVertically
|
||||||
|
});
|
||||||
|
|
||||||
// Shape
|
// Shape
|
||||||
this._arrCapType = [
|
this._arrCapType = [
|
||||||
{displayValue: this.textFlat, value: Asc.c_oAscLineCapType.Flat},
|
{displayValue: this.textFlat, value: Asc.c_oAscLineCapType.Flat},
|
||||||
|
|
@ -499,10 +522,10 @@ define([ 'text!presentationeditor/main/app/template/ShapeSettingsAdvanced.tem
|
||||||
val = margins.get_Bottom();
|
val = margins.get_Bottom();
|
||||||
this.spnMarginBottom.setValue((null !== val && undefined !== val) ? Common.Utils.Metric.fnRecalcFromMM(val) : '', true);
|
this.spnMarginBottom.setValue((null !== val && undefined !== val) ? Common.Utils.Metric.fnRecalcFromMM(val) : '', true);
|
||||||
}
|
}
|
||||||
this.btnsCategory[2].setDisabled(null === margins); // Margins
|
this.btnsCategory[3].setDisabled(null === margins); // Margins
|
||||||
|
|
||||||
var shapetype = props.asc_getType();
|
var shapetype = props.asc_getType();
|
||||||
this.btnsCategory[3].setDisabled(shapetype=='line' || shapetype=='bentConnector2' || shapetype=='bentConnector3'
|
this.btnsCategory[4].setDisabled(shapetype=='line' || shapetype=='bentConnector2' || shapetype=='bentConnector3'
|
||||||
|| shapetype=='bentConnector4' || shapetype=='bentConnector5' || shapetype=='curvedConnector2'
|
|| shapetype=='bentConnector4' || shapetype=='bentConnector5' || shapetype=='curvedConnector2'
|
||||||
|| shapetype=='curvedConnector3' || shapetype=='curvedConnector4' || shapetype=='curvedConnector5'
|
|| shapetype=='curvedConnector3' || shapetype=='curvedConnector4' || shapetype=='curvedConnector5'
|
||||||
|| shapetype=='straightConnector1');
|
|| shapetype=='straightConnector1');
|
||||||
|
|
@ -519,6 +542,11 @@ define([ 'text!presentationeditor/main/app/template/ShapeSettingsAdvanced.tem
|
||||||
value = props.asc_getDescription();
|
value = props.asc_getDescription();
|
||||||
this.textareaAltDescription.val(value ? value : '');
|
this.textareaAltDescription.val(value ? value : '');
|
||||||
|
|
||||||
|
value = props.asc_getRot();
|
||||||
|
this.spnAngle.setValue((value==undefined || value===null) ? '' : Math.floor(value*180/3.14159265358979+0.5), true);
|
||||||
|
this.chFlipHor.setValue(props.asc_getFlipH());
|
||||||
|
this.chFlipVert.setValue(props.asc_getFlipV());
|
||||||
|
|
||||||
this._changedProps = new Asc.asc_CShapeProperty();
|
this._changedProps = new Asc.asc_CShapeProperty();
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
@ -530,6 +558,10 @@ define([ 'text!presentationeditor/main/app/template/ShapeSettingsAdvanced.tem
|
||||||
if (this.isAltDescChanged)
|
if (this.isAltDescChanged)
|
||||||
this._changedProps.asc_putDescription(this.textareaAltDescription.val());
|
this._changedProps.asc_putDescription(this.textareaAltDescription.val());
|
||||||
|
|
||||||
|
this._changedProps.asc_putRot(this.spnAngle.getNumberValue() * 3.14159265358979 / 180);
|
||||||
|
this._changedProps.asc_putFlipH(this.chFlipHor.getValue()=='checked');
|
||||||
|
this._changedProps.asc_putFlipV(this.chFlipVert.getValue()=='checked');
|
||||||
|
|
||||||
Common.localStorage.setItem("pe-settings-shaperatio", (this.btnRatio.pressed) ? 1 : 0);
|
Common.localStorage.setItem("pe-settings-shaperatio", (this.btnRatio.pressed) ? 1 : 0);
|
||||||
return { shapeProps: this._changedProps} ;
|
return { shapeProps: this._changedProps} ;
|
||||||
},
|
},
|
||||||
|
|
@ -538,7 +570,7 @@ define([ 'text!presentationeditor/main/app/template/ShapeSettingsAdvanced.tem
|
||||||
if (props ){
|
if (props ){
|
||||||
var stroke = props.get_stroke();
|
var stroke = props.get_stroke();
|
||||||
if (stroke) {
|
if (stroke) {
|
||||||
this.btnsCategory[1].setDisabled(stroke.get_type() == Asc.c_oAscStrokeType.STROKE_NONE); // Weights & Arrows
|
this.btnsCategory[2].setDisabled(stroke.get_type() == Asc.c_oAscStrokeType.STROKE_NONE); // Weights & Arrows
|
||||||
|
|
||||||
var value = stroke.get_linejoin();
|
var value = stroke.get_linejoin();
|
||||||
for (var i=0; i<this._arrJoinType.length; i++) {
|
for (var i=0; i<this._arrJoinType.length; i++) {
|
||||||
|
|
@ -731,7 +763,12 @@ define([ 'text!presentationeditor/main/app/template/ShapeSettingsAdvanced.tem
|
||||||
textAltTip: 'The alternative text-based representation of the visual object information, which will be read to the people with vision or cognitive impairments to help them better understand what information there is in the image, autoshape, chart or table.',
|
textAltTip: 'The alternative text-based representation of the visual object information, which will be read to the people with vision or cognitive impairments to help them better understand what information there is in the image, autoshape, chart or table.',
|
||||||
strColumns: 'Columns',
|
strColumns: 'Columns',
|
||||||
textSpacing: 'Spacing between columns',
|
textSpacing: 'Spacing between columns',
|
||||||
textColNumber: 'Number of columns'
|
textColNumber: 'Number of columns',
|
||||||
|
textRotation: 'Rotation',
|
||||||
|
textAngle: 'Angle',
|
||||||
|
textFlipped: 'Flipped',
|
||||||
|
textHorizontally: 'Horizontally',
|
||||||
|
textVertically: 'Vertically'
|
||||||
|
|
||||||
}, PE.Views.ShapeSettingsAdvanced || {}));
|
}, PE.Views.ShapeSettingsAdvanced || {}));
|
||||||
});
|
});
|
||||||
|
|
@ -1037,6 +1037,13 @@
|
||||||
"PE.Views.ImageSettings.textOriginalSize": "Default Size",
|
"PE.Views.ImageSettings.textOriginalSize": "Default Size",
|
||||||
"PE.Views.ImageSettings.textSize": "Size",
|
"PE.Views.ImageSettings.textSize": "Size",
|
||||||
"PE.Views.ImageSettings.textWidth": "Width",
|
"PE.Views.ImageSettings.textWidth": "Width",
|
||||||
|
"PE.Views.ImageSettings.textRotation": "Rotation",
|
||||||
|
"PE.Views.ImageSettings.textRotate90": "Rotate 90°",
|
||||||
|
"PE.Views.ImageSettings.textFlip": "Flip",
|
||||||
|
"PE.Views.ImageSettings.textHint270": "Rotate Left 90°",
|
||||||
|
"PE.Views.ImageSettings.textHint90": "Rotate Right 90°",
|
||||||
|
"PE.Views.ImageSettings.textHintFlipV": "Flip Vertical",
|
||||||
|
"PE.Views.ImageSettings.textHintFlipH": "Flip Horizontal",
|
||||||
"PE.Views.ImageSettingsAdvanced.cancelButtonText": "Cancel",
|
"PE.Views.ImageSettingsAdvanced.cancelButtonText": "Cancel",
|
||||||
"PE.Views.ImageSettingsAdvanced.okButtonText": "OK",
|
"PE.Views.ImageSettingsAdvanced.okButtonText": "OK",
|
||||||
"PE.Views.ImageSettingsAdvanced.textAlt": "Alternative Text",
|
"PE.Views.ImageSettingsAdvanced.textAlt": "Alternative Text",
|
||||||
|
|
@ -1051,6 +1058,11 @@
|
||||||
"PE.Views.ImageSettingsAdvanced.textSize": "Size",
|
"PE.Views.ImageSettingsAdvanced.textSize": "Size",
|
||||||
"PE.Views.ImageSettingsAdvanced.textTitle": "Image - Advanced Settings",
|
"PE.Views.ImageSettingsAdvanced.textTitle": "Image - Advanced Settings",
|
||||||
"PE.Views.ImageSettingsAdvanced.textWidth": "Width",
|
"PE.Views.ImageSettingsAdvanced.textWidth": "Width",
|
||||||
|
"PE.Views.ImageSettingsAdvanced.textRotation": "Rotation",
|
||||||
|
"PE.Views.ImageSettingsAdvanced.textAngle": "Angle",
|
||||||
|
"PE.Views.ImageSettingsAdvanced.textFlipped": "Flipped",
|
||||||
|
"PE.Views.ImageSettingsAdvanced.textHorizontally": "Horizontally",
|
||||||
|
"PE.Views.ImageSettingsAdvanced.textVertically": "Vertically",
|
||||||
"PE.Views.LeftMenu.tipAbout": "About",
|
"PE.Views.LeftMenu.tipAbout": "About",
|
||||||
"PE.Views.LeftMenu.tipChat": "Chat",
|
"PE.Views.LeftMenu.tipChat": "Chat",
|
||||||
"PE.Views.LeftMenu.tipComments": "Comments",
|
"PE.Views.LeftMenu.tipComments": "Comments",
|
||||||
|
|
@ -1148,6 +1160,13 @@
|
||||||
"PE.Views.ShapeSettings.txtNoBorders": "No Line",
|
"PE.Views.ShapeSettings.txtNoBorders": "No Line",
|
||||||
"PE.Views.ShapeSettings.txtPapyrus": "Papyrus",
|
"PE.Views.ShapeSettings.txtPapyrus": "Papyrus",
|
||||||
"PE.Views.ShapeSettings.txtWood": "Wood",
|
"PE.Views.ShapeSettings.txtWood": "Wood",
|
||||||
|
"PE.Views.ShapeSettings.textRotation": "Rotation",
|
||||||
|
"PE.Views.ShapeSettings.textRotate90": "Rotate 90°",
|
||||||
|
"PE.Views.ShapeSettings.textFlip": "Flip",
|
||||||
|
"PE.Views.ShapeSettings.textHint270": "Rotate Left 90°",
|
||||||
|
"PE.Views.ShapeSettings.textHint90": "Rotate Right 90°",
|
||||||
|
"PE.Views.ShapeSettings.textHintFlipV": "Flip Vertical",
|
||||||
|
"PE.Views.ShapeSettings.textHintFlipH": "Flip Horizontal",
|
||||||
"PE.Views.ShapeSettingsAdvanced.cancelButtonText": "Cancel",
|
"PE.Views.ShapeSettingsAdvanced.cancelButtonText": "Cancel",
|
||||||
"PE.Views.ShapeSettingsAdvanced.okButtonText": "OK",
|
"PE.Views.ShapeSettingsAdvanced.okButtonText": "OK",
|
||||||
"PE.Views.ShapeSettingsAdvanced.strColumns": "Columns",
|
"PE.Views.ShapeSettingsAdvanced.strColumns": "Columns",
|
||||||
|
|
@ -1182,6 +1201,11 @@
|
||||||
"PE.Views.ShapeSettingsAdvanced.textWeightArrows": "Weights & Arrows",
|
"PE.Views.ShapeSettingsAdvanced.textWeightArrows": "Weights & Arrows",
|
||||||
"PE.Views.ShapeSettingsAdvanced.textWidth": "Width",
|
"PE.Views.ShapeSettingsAdvanced.textWidth": "Width",
|
||||||
"PE.Views.ShapeSettingsAdvanced.txtNone": "None",
|
"PE.Views.ShapeSettingsAdvanced.txtNone": "None",
|
||||||
|
"PE.Views.ShapeSettingsAdvanced.textRotation": "Rotation",
|
||||||
|
"PE.Views.ShapeSettingsAdvanced.textAngle": "Angle",
|
||||||
|
"PE.Views.ShapeSettingsAdvanced.textFlipped": "Flipped",
|
||||||
|
"PE.Views.ShapeSettingsAdvanced.textHorizontally": "Horizontally",
|
||||||
|
"PE.Views.ShapeSettingsAdvanced.textVertically": "Vertically",
|
||||||
"PE.Views.SignatureSettings.notcriticalErrorTitle": "Warning",
|
"PE.Views.SignatureSettings.notcriticalErrorTitle": "Warning",
|
||||||
"PE.Views.SignatureSettings.strDelete": "Remove Signature",
|
"PE.Views.SignatureSettings.strDelete": "Remove Signature",
|
||||||
"PE.Views.SignatureSettings.strDetails": "Signature Details",
|
"PE.Views.SignatureSettings.strDetails": "Signature Details",
|
||||||
|
|
|
||||||
|
|
@ -289,6 +289,11 @@
|
||||||
.toolbar-btn-icon(btn-save-coauth, 69, @toolbar-icon-size);
|
.toolbar-btn-icon(btn-save-coauth, 69, @toolbar-icon-size);
|
||||||
//.toolbar-btn-icon(btn-insertequation, 74, @toolbar-icon-size);
|
//.toolbar-btn-icon(btn-insertequation, 74, @toolbar-icon-size);
|
||||||
|
|
||||||
|
//.toolbar-btn-icon(rotate-90, 79, @toolbar-icon-size);
|
||||||
|
//.toolbar-btn-icon(rotate-270, 80, @toolbar-icon-size);
|
||||||
|
//.toolbar-btn-icon(flip-hor, 81, @toolbar-icon-size);
|
||||||
|
//.toolbar-btn-icon(flip-vert, 82, @toolbar-icon-size);
|
||||||
|
|
||||||
// add slide
|
// add slide
|
||||||
//.btn-toolbar .btn-addslide {background-position: 0 -120px;}
|
//.btn-toolbar .btn-addslide {background-position: 0 -120px;}
|
||||||
//.btn-toolbar.active > .btn-addslide,
|
//.btn-toolbar.active > .btn-addslide,
|
||||||
|
|
|
||||||
|
|
@ -1456,7 +1456,8 @@ define([
|
||||||
e.stopPropagation();
|
e.stopPropagation();
|
||||||
},
|
},
|
||||||
'command+k,ctrl+k': function (e) {
|
'command+k,ctrl+k': function (e) {
|
||||||
if (me.editMode && !me.toolbar.mode.isEditMailMerge && !me.toolbar.mode.isEditDiagram && !me.api.isCellEdited && !me._state.multiselect && !me._state.inpivot)
|
if (me.editMode && !me.toolbar.mode.isEditMailMerge && !me.toolbar.mode.isEditDiagram && !me.api.isCellEdited && !me._state.multiselect && !me._state.inpivot &&
|
||||||
|
!me.getApplication().getController('LeftMenu').leftMenu.menuFile.isVisible())
|
||||||
me.onHyperlink();
|
me.onHyperlink();
|
||||||
e.preventDefault();
|
e.preventDefault();
|
||||||
},
|
},
|
||||||
|
|
|
||||||
|
|
@ -29,6 +29,32 @@
|
||||||
<div class="separator horizontal"></div>
|
<div class="separator horizontal"></div>
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td colspan=2 class="padding-small">
|
||||||
|
<label class="header"><%= scope.textRotation %></label>
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td class="padding-small" width="50%">
|
||||||
|
<label class="input-label"><%= scope.textRotate90 %></label>
|
||||||
|
<div>
|
||||||
|
<div id="image-button-270" style="display: inline-block;margin-right: 4px;"></div>
|
||||||
|
<div id="image-button-90" style="display: inline-block;"></div>
|
||||||
|
</div>
|
||||||
|
</td>
|
||||||
|
<td class="padding-small" width="50%">
|
||||||
|
<label class="input-label"><%= scope.textFlip %></label>
|
||||||
|
<div>
|
||||||
|
<div id="image-button-fliph" style="display: inline-block;margin-right: 4px;"></div>
|
||||||
|
<div id="image-button-flipv" style="display: inline-block;"></div>
|
||||||
|
</div>
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td class="padding-small" colspan=2>
|
||||||
|
<div class="separator horizontal"></div>
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
<td colspan=2>
|
<td colspan=2>
|
||||||
<label class="header" id="image-lbl-replace"><%= scope.textInsert %></label>
|
<label class="header" id="image-lbl-replace"><%= scope.textInsert %></label>
|
||||||
|
|
|
||||||
|
|
@ -1,3 +1,29 @@
|
||||||
|
<div id="id-adv-image-rotate" class="settings-panel active">
|
||||||
|
<div class="inner-content padding-large">
|
||||||
|
<div style="width: 100%;">
|
||||||
|
<label class="input-label"><%= scope.textAngle %></label>
|
||||||
|
<div id="image-advanced-spin-angle" style="display: inline-block; margin-left: 5px;"></div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="separator horizontal padding-large"></div>
|
||||||
|
<div class="inner-content padding-large">
|
||||||
|
<table cols="2">
|
||||||
|
<tr>
|
||||||
|
<td rowspan="2" class="padding-small" style="vertical-align: top;">
|
||||||
|
<label class="input-label" style="margin-right: 15px;vertical-align: top;"><%= scope.textFlipped %></label>
|
||||||
|
</td>
|
||||||
|
<td class="padding-small">
|
||||||
|
<div id="image-advanced-checkbox-hor"></div>
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td class="padding-small">
|
||||||
|
<div id="image-advanced-checkbox-vert"></div>
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
</table>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
<div id="id-adv-image-alttext" class="settings-panel active">
|
<div id="id-adv-image-alttext" class="settings-panel active">
|
||||||
<div class="inner-content">
|
<div class="inner-content">
|
||||||
<table cols="1" width="100%">
|
<table cols="1" width="100%">
|
||||||
|
|
|
||||||
|
|
@ -116,6 +116,38 @@
|
||||||
</div>
|
</div>
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
|
<tr class="shape-only">
|
||||||
|
<td class="padding-small">
|
||||||
|
<div class="separator horizontal"></div>
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
<tr class="shape-only">
|
||||||
|
<td class="padding-small">
|
||||||
|
<label class="header"><%= scope.textRotation %></label>
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
<tr class="shape-only">
|
||||||
|
<td>
|
||||||
|
<table cols="2" style="width: 100%;">
|
||||||
|
<tr>
|
||||||
|
<td class="padding-small" width="50%">
|
||||||
|
<label class="input-label"><%= scope.textRotate90 %></label>
|
||||||
|
<div>
|
||||||
|
<div id="shape-button-270" style="display: inline-block;margin-right: 4px;"></div>
|
||||||
|
<div id="shape-button-90" style="display: inline-block;"></div>
|
||||||
|
</div>
|
||||||
|
</td>
|
||||||
|
<td class="padding-small" width="50%">
|
||||||
|
<label class="input-label"><%= scope.textFlip %></label>
|
||||||
|
<div>
|
||||||
|
<div id="shape-button-fliph" style="display: inline-block;margin-right: 4px;"></div>
|
||||||
|
<div id="shape-button-flipv" style="display: inline-block;"></div>
|
||||||
|
</div>
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
</table>
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
<tr class="change-type">
|
<tr class="change-type">
|
||||||
<td class="padding-small">
|
<td class="padding-small">
|
||||||
<div class="separator horizontal"></div>
|
<div class="separator horizontal"></div>
|
||||||
|
|
|
||||||
|
|
@ -17,6 +17,32 @@
|
||||||
</table>
|
</table>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
<div id="id-adv-shape-rotate" class="settings-panel active">
|
||||||
|
<div class="inner-content padding-large">
|
||||||
|
<div style="width: 100%;">
|
||||||
|
<label class="input-label"><%= scope.textAngle %></label>
|
||||||
|
<div id="shape-advanced-spin-angle" style="display: inline-block; margin-left: 5px;"></div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="separator horizontal padding-large"></div>
|
||||||
|
<div class="inner-content padding-large">
|
||||||
|
<table cols="2">
|
||||||
|
<tr>
|
||||||
|
<td rowspan="2" class="padding-small" style="vertical-align: top;">
|
||||||
|
<label class="input-label" style="margin-right: 15px;vertical-align: top;"><%= scope.textFlipped %></label>
|
||||||
|
</td>
|
||||||
|
<td class="padding-small">
|
||||||
|
<div id="shape-advanced-checkbox-hor"></div>
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td class="padding-small">
|
||||||
|
<div id="shape-advanced-checkbox-vert"></div>
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
</table>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
<div id="id-adv-shape-shape" class="settings-panel">
|
<div id="id-adv-shape-shape" class="settings-panel">
|
||||||
<div class="inner-content">
|
<div class="inner-content">
|
||||||
<table cols="2" style="width: 100%;">
|
<table cols="2" style="width: 100%;">
|
||||||
|
|
|
||||||
|
|
@ -195,6 +195,46 @@ define([
|
||||||
|
|
||||||
this.lblReplace = $('#image-lbl-replace');
|
this.lblReplace = $('#image-lbl-replace');
|
||||||
|
|
||||||
|
this.btnRotate270 = new Common.UI.Button({
|
||||||
|
cls: 'btn-toolbar',
|
||||||
|
iconCls: 'rotate-270',
|
||||||
|
value: 0,
|
||||||
|
hint: this.textHint270
|
||||||
|
});
|
||||||
|
this.btnRotate270.render( $('#image-button-270', me.$el));
|
||||||
|
this.btnRotate270.on('click', _.bind(this.onBtnRotateClick, this));
|
||||||
|
this.lockedControls.push(this.btnRotate270);
|
||||||
|
|
||||||
|
this.btnRotate90 = new Common.UI.Button({
|
||||||
|
cls: 'btn-toolbar',
|
||||||
|
iconCls: 'rotate-90',
|
||||||
|
value: 1,
|
||||||
|
hint: this.textHint90
|
||||||
|
});
|
||||||
|
this.btnRotate90.render( $('#image-button-90', me.$el));
|
||||||
|
this.btnRotate90.on('click', _.bind(this.onBtnRotateClick, this));
|
||||||
|
this.lockedControls.push(this.btnRotate90);
|
||||||
|
|
||||||
|
this.btnFlipV = new Common.UI.Button({
|
||||||
|
cls: 'btn-toolbar',
|
||||||
|
iconCls: 'flip-vert',
|
||||||
|
value: 0,
|
||||||
|
hint: this.textHintFlipV
|
||||||
|
});
|
||||||
|
this.btnFlipV.render( $('#image-button-flipv', me.$el));
|
||||||
|
this.btnFlipV.on('click', _.bind(this.onBtnFlipClick, this));
|
||||||
|
this.lockedControls.push(this.btnFlipV);
|
||||||
|
|
||||||
|
this.btnFlipH = new Common.UI.Button({
|
||||||
|
cls: 'btn-toolbar',
|
||||||
|
iconCls: 'flip-hor',
|
||||||
|
value: 1,
|
||||||
|
hint: this.textHintFlipH
|
||||||
|
});
|
||||||
|
this.btnFlipH.render( $('#image-button-fliph', me.$el));
|
||||||
|
this.btnFlipH.on('click', _.bind(this.onBtnFlipClick, this));
|
||||||
|
this.lockedControls.push(this.btnFlipH);
|
||||||
|
|
||||||
$(this.el).on('click', '#image-advanced-link', _.bind(this.openAdvancedSettings, this));
|
$(this.el).on('click', '#image-advanced-link', _.bind(this.openAdvancedSettings, this));
|
||||||
},
|
},
|
||||||
|
|
||||||
|
|
@ -366,6 +406,23 @@ define([
|
||||||
})).show();
|
})).show();
|
||||||
},
|
},
|
||||||
|
|
||||||
|
onBtnRotateClick: function(btn) {
|
||||||
|
var properties = new Asc.asc_CImgProperty();
|
||||||
|
properties.asc_putRot((btn.options.value==1 ? 90 : 270) * 3.14159265358979 / 180);
|
||||||
|
this.api.asc_setGraphicObjectProps(properties);
|
||||||
|
Common.NotificationCenter.trigger('edit:complete', this);
|
||||||
|
},
|
||||||
|
|
||||||
|
onBtnFlipClick: function(btn) {
|
||||||
|
var properties = new Asc.asc_CImgProperty();
|
||||||
|
if (btn.options.value==1)
|
||||||
|
properties.asc_putFlipH(true);
|
||||||
|
else
|
||||||
|
properties.asc_putFlipV(true);
|
||||||
|
this.api.asc_setGraphicObjectProps(properties);
|
||||||
|
Common.NotificationCenter.trigger('edit:complete', this);
|
||||||
|
},
|
||||||
|
|
||||||
setLocked: function (locked) {
|
setLocked: function (locked) {
|
||||||
this._locked = locked;
|
this._locked = locked;
|
||||||
},
|
},
|
||||||
|
|
@ -392,6 +449,13 @@ define([
|
||||||
textFromFile: 'From File',
|
textFromFile: 'From File',
|
||||||
textEditObject: 'Edit Object',
|
textEditObject: 'Edit Object',
|
||||||
textEdit: 'Edit',
|
textEdit: 'Edit',
|
||||||
textAdvanced: 'Show advanced settings'
|
textAdvanced: 'Show advanced settings',
|
||||||
|
textRotation: 'Rotation',
|
||||||
|
textRotate90: 'Rotate 90°',
|
||||||
|
textFlip: 'Flip',
|
||||||
|
textHint270: 'Rotate Left 90°',
|
||||||
|
textHint90: 'Rotate Right 90°',
|
||||||
|
textHintFlipV: 'Flip Vertical',
|
||||||
|
textHintFlipH: 'Flip Horizontal'
|
||||||
}, SSE.Views.ImageSettings || {}));
|
}, SSE.Views.ImageSettings || {}));
|
||||||
});
|
});
|
||||||
|
|
@ -40,7 +40,9 @@
|
||||||
|
|
||||||
define([ 'text!spreadsheeteditor/main/app/template/ImageSettingsAdvanced.template',
|
define([ 'text!spreadsheeteditor/main/app/template/ImageSettingsAdvanced.template',
|
||||||
'common/main/lib/view/AdvancedSettingsWindow',
|
'common/main/lib/view/AdvancedSettingsWindow',
|
||||||
'common/main/lib/component/InputField'
|
'common/main/lib/component/InputField',
|
||||||
|
'common/main/lib/component/MetricSpinner',
|
||||||
|
'common/main/lib/component/CheckBox'
|
||||||
], function (contentTemplate) {
|
], function (contentTemplate) {
|
||||||
'use strict';
|
'use strict';
|
||||||
|
|
||||||
|
|
@ -57,6 +59,7 @@ define([ 'text!spreadsheeteditor/main/app/template/ImageSettingsAdvanced.temp
|
||||||
_.extend(this.options, {
|
_.extend(this.options, {
|
||||||
title: this.textTitle,
|
title: this.textTitle,
|
||||||
items: [
|
items: [
|
||||||
|
{panelId: 'id-adv-image-rotate', panelCaption: this.textRotation},
|
||||||
{panelId: 'id-adv-image-alttext', panelCaption: this.textAlt}
|
{panelId: 'id-adv-image-alttext', panelCaption: this.textAlt}
|
||||||
],
|
],
|
||||||
contentTemplate: _.template(contentTemplate)({
|
contentTemplate: _.template(contentTemplate)({
|
||||||
|
|
@ -74,6 +77,27 @@ define([ 'text!spreadsheeteditor/main/app/template/ImageSettingsAdvanced.temp
|
||||||
|
|
||||||
var me = this;
|
var me = this;
|
||||||
|
|
||||||
|
// Rotation
|
||||||
|
this.spnAngle = new Common.UI.MetricSpinner({
|
||||||
|
el: $('#image-advanced-spin-angle'),
|
||||||
|
step: 1,
|
||||||
|
width: 80,
|
||||||
|
defaultUnit : "°",
|
||||||
|
value: '0 °',
|
||||||
|
maxValue: 3600,
|
||||||
|
minValue: -3600
|
||||||
|
});
|
||||||
|
|
||||||
|
this.chFlipHor = new Common.UI.CheckBox({
|
||||||
|
el: $('#image-advanced-checkbox-hor'),
|
||||||
|
labelText: this.textHorizontally
|
||||||
|
});
|
||||||
|
|
||||||
|
this.chFlipVert = new Common.UI.CheckBox({
|
||||||
|
el: $('#image-advanced-checkbox-vert'),
|
||||||
|
labelText: this.textVertically
|
||||||
|
});
|
||||||
|
|
||||||
// Alt Text
|
// Alt Text
|
||||||
|
|
||||||
this.inputAltTitle = new Common.UI.InputField({
|
this.inputAltTitle = new Common.UI.InputField({
|
||||||
|
|
@ -112,6 +136,11 @@ define([ 'text!spreadsheeteditor/main/app/template/ImageSettingsAdvanced.temp
|
||||||
value = props.asc_getDescription();
|
value = props.asc_getDescription();
|
||||||
this.textareaAltDescription.val(value ? value : '');
|
this.textareaAltDescription.val(value ? value : '');
|
||||||
|
|
||||||
|
value = props.asc_getRot();
|
||||||
|
this.spnAngle.setValue((value==undefined || value===null) ? '' : Math.floor(value*180/3.14159265358979+0.5), true);
|
||||||
|
this.chFlipHor.setValue(props.asc_getFlipH());
|
||||||
|
this.chFlipVert.setValue(props.asc_getFlipV());
|
||||||
|
|
||||||
this._changedProps = new Asc.asc_CImgProperty();
|
this._changedProps = new Asc.asc_CImgProperty();
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
@ -123,6 +152,10 @@ define([ 'text!spreadsheeteditor/main/app/template/ImageSettingsAdvanced.temp
|
||||||
if (this.isAltDescChanged)
|
if (this.isAltDescChanged)
|
||||||
this._changedProps.asc_putDescription(this.textareaAltDescription.val());
|
this._changedProps.asc_putDescription(this.textareaAltDescription.val());
|
||||||
|
|
||||||
|
this._changedProps.asc_putRot(this.spnAngle.getNumberValue() * 3.14159265358979 / 180);
|
||||||
|
this._changedProps.asc_putFlipH(this.chFlipHor.getValue()=='checked');
|
||||||
|
this._changedProps.asc_putFlipV(this.chFlipVert.getValue()=='checked');
|
||||||
|
|
||||||
return { imageProps: this._changedProps} ;
|
return { imageProps: this._changedProps} ;
|
||||||
},
|
},
|
||||||
|
|
||||||
|
|
@ -132,7 +165,12 @@ define([ 'text!spreadsheeteditor/main/app/template/ImageSettingsAdvanced.temp
|
||||||
textAlt: 'Alternative Text',
|
textAlt: 'Alternative Text',
|
||||||
textAltTitle: 'Title',
|
textAltTitle: 'Title',
|
||||||
textAltDescription: 'Description',
|
textAltDescription: 'Description',
|
||||||
textAltTip: 'The alternative text-based representation of the visual object information, which will be read to the people with vision or cognitive impairments to help them better understand what information there is in the image, autoshape, chart or table.'
|
textAltTip: 'The alternative text-based representation of the visual object information, which will be read to the people with vision or cognitive impairments to help them better understand what information there is in the image, autoshape, chart or table.',
|
||||||
|
textRotation: 'Rotation',
|
||||||
|
textAngle: 'Angle',
|
||||||
|
textFlipped: 'Flipped',
|
||||||
|
textHorizontally: 'Horizontally',
|
||||||
|
textVertically: 'Vertically'
|
||||||
|
|
||||||
}, SSE.Views.ImageSettingsAdvanced || {}));
|
}, SSE.Views.ImageSettingsAdvanced || {}));
|
||||||
});
|
});
|
||||||
|
|
@ -1314,6 +1314,46 @@ define([
|
||||||
this.btnChangeShape.render( $('#shape-btn-change')) ;
|
this.btnChangeShape.render( $('#shape-btn-change')) ;
|
||||||
this.lockedControls.push(this.btnChangeShape);
|
this.lockedControls.push(this.btnChangeShape);
|
||||||
|
|
||||||
|
this.btnRotate270 = new Common.UI.Button({
|
||||||
|
cls: 'btn-toolbar',
|
||||||
|
iconCls: 'rotate-270',
|
||||||
|
value: 0,
|
||||||
|
hint: this.textHint270
|
||||||
|
});
|
||||||
|
this.btnRotate270.render( $('#shape-button-270', me.$el));
|
||||||
|
this.btnRotate270.on('click', _.bind(this.onBtnRotateClick, this));
|
||||||
|
this.lockedControls.push(this.btnRotate270);
|
||||||
|
|
||||||
|
this.btnRotate90 = new Common.UI.Button({
|
||||||
|
cls: 'btn-toolbar',
|
||||||
|
iconCls: 'rotate-90',
|
||||||
|
value: 1,
|
||||||
|
hint: this.textHint90
|
||||||
|
});
|
||||||
|
this.btnRotate90.render( $('#shape-button-90', me.$el));
|
||||||
|
this.btnRotate90.on('click', _.bind(this.onBtnRotateClick, this));
|
||||||
|
this.lockedControls.push(this.btnRotate90);
|
||||||
|
|
||||||
|
this.btnFlipV = new Common.UI.Button({
|
||||||
|
cls: 'btn-toolbar',
|
||||||
|
iconCls: 'flip-vert',
|
||||||
|
value: 0,
|
||||||
|
hint: this.textHintFlipV
|
||||||
|
});
|
||||||
|
this.btnFlipV.render( $('#shape-button-flipv', me.$el));
|
||||||
|
this.btnFlipV.on('click', _.bind(this.onBtnFlipClick, this));
|
||||||
|
this.lockedControls.push(this.btnFlipV);
|
||||||
|
|
||||||
|
this.btnFlipH = new Common.UI.Button({
|
||||||
|
cls: 'btn-toolbar',
|
||||||
|
iconCls: 'flip-hor',
|
||||||
|
value: 1,
|
||||||
|
hint: this.textHintFlipH
|
||||||
|
});
|
||||||
|
this.btnFlipH.render( $('#shape-button-fliph', me.$el));
|
||||||
|
this.btnFlipH.on('click', _.bind(this.onBtnFlipClick, this));
|
||||||
|
this.lockedControls.push(this.btnFlipH);
|
||||||
|
|
||||||
$(this.el).on('click', '#shape-advanced-link', _.bind(this.openAdvancedSettings, this));
|
$(this.el).on('click', '#shape-advanced-link', _.bind(this.openAdvancedSettings, this));
|
||||||
this.linkAdvanced = $('#shape-advanced-link');
|
this.linkAdvanced = $('#shape-advanced-link');
|
||||||
},
|
},
|
||||||
|
|
@ -1463,6 +1503,25 @@ define([
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
|
onBtnRotateClick: function(btn) {
|
||||||
|
var props = new Asc.asc_CShapeProperty();
|
||||||
|
props.asc_putRot((btn.options.value==1 ? 90 : 270) * 3.14159265358979 / 180);
|
||||||
|
this.imgprops.asc_putShapeProperties(props);
|
||||||
|
this.api.asc_setGraphicObjectProps(this.imgprops);
|
||||||
|
Common.NotificationCenter.trigger('edit:complete', this);
|
||||||
|
},
|
||||||
|
|
||||||
|
onBtnFlipClick: function(btn) {
|
||||||
|
var props = new Asc.asc_CShapeProperty();
|
||||||
|
if (btn.options.value==1)
|
||||||
|
props.asc_putFlipH(true);
|
||||||
|
else
|
||||||
|
props.asc_putFlipV(true);
|
||||||
|
this.imgprops.asc_putShapeProperties(props);
|
||||||
|
this.api.asc_setGraphicObjectProps(this.imgprops);
|
||||||
|
Common.NotificationCenter.trigger('edit:complete', this);
|
||||||
|
},
|
||||||
|
|
||||||
UpdateThemeColors: function() {
|
UpdateThemeColors: function() {
|
||||||
if (!this.btnBackColor) {
|
if (!this.btnBackColor) {
|
||||||
this.btnBackColor = new Common.UI.ColorButton({
|
this.btnBackColor = new Common.UI.ColorButton({
|
||||||
|
|
@ -1668,6 +1727,13 @@ define([
|
||||||
textStyle: 'Style',
|
textStyle: 'Style',
|
||||||
textGradient: 'Gradient',
|
textGradient: 'Gradient',
|
||||||
textBorderSizeErr: 'The entered value is incorrect.<br>Please enter a value between 0 pt and 1584 pt.',
|
textBorderSizeErr: 'The entered value is incorrect.<br>Please enter a value between 0 pt and 1584 pt.',
|
||||||
strType: 'Type'
|
strType: 'Type',
|
||||||
|
textRotation: 'Rotation',
|
||||||
|
textRotate90: 'Rotate 90°',
|
||||||
|
textFlip: 'Flip',
|
||||||
|
textHint270: 'Rotate Left 90°',
|
||||||
|
textHint90: 'Rotate Right 90°',
|
||||||
|
textHintFlipV: 'Flip Vertical',
|
||||||
|
textHintFlipH: 'Flip Horizontal'
|
||||||
}, SSE.Views.ShapeSettings || {}));
|
}, SSE.Views.ShapeSettings || {}));
|
||||||
});
|
});
|
||||||
|
|
|
||||||
|
|
@ -41,7 +41,8 @@
|
||||||
define([ 'text!spreadsheeteditor/main/app/template/ShapeSettingsAdvanced.template',
|
define([ 'text!spreadsheeteditor/main/app/template/ShapeSettingsAdvanced.template',
|
||||||
'common/main/lib/view/AdvancedSettingsWindow',
|
'common/main/lib/view/AdvancedSettingsWindow',
|
||||||
'common/main/lib/component/ComboBox',
|
'common/main/lib/component/ComboBox',
|
||||||
'common/main/lib/component/MetricSpinner'
|
'common/main/lib/component/MetricSpinner',
|
||||||
|
'common/main/lib/component/CheckBox'
|
||||||
], function (contentTemplate) {
|
], function (contentTemplate) {
|
||||||
'use strict';
|
'use strict';
|
||||||
|
|
||||||
|
|
@ -61,6 +62,7 @@ define([ 'text!spreadsheeteditor/main/app/template/ShapeSettingsAdvanced.temp
|
||||||
title: this.textTitle,
|
title: this.textTitle,
|
||||||
items: [
|
items: [
|
||||||
{panelId: 'id-adv-shape-width', panelCaption: this.textSize},
|
{panelId: 'id-adv-shape-width', panelCaption: this.textSize},
|
||||||
|
{panelId: 'id-adv-shape-rotate', panelCaption: this.textRotation},
|
||||||
{panelId: 'id-adv-shape-shape', panelCaption: this.textWeightArrows},
|
{panelId: 'id-adv-shape-shape', panelCaption: this.textWeightArrows},
|
||||||
{panelId: 'id-adv-shape-margins', panelCaption: this.strMargins},
|
{panelId: 'id-adv-shape-margins', panelCaption: this.strMargins},
|
||||||
{panelId: 'id-adv-shape-columns', panelCaption: this.strColumns},
|
{panelId: 'id-adv-shape-columns', panelCaption: this.strColumns},
|
||||||
|
|
@ -246,6 +248,27 @@ define([ 'text!spreadsheeteditor/main/app/template/ShapeSettingsAdvanced.temp
|
||||||
}, this));
|
}, this));
|
||||||
this.spinners.push(this.spnMarginRight);
|
this.spinners.push(this.spnMarginRight);
|
||||||
|
|
||||||
|
// Rotation
|
||||||
|
this.spnAngle = new Common.UI.MetricSpinner({
|
||||||
|
el: $('#shape-advanced-spin-angle'),
|
||||||
|
step: 1,
|
||||||
|
width: 80,
|
||||||
|
defaultUnit : "°",
|
||||||
|
value: '0 °',
|
||||||
|
maxValue: 3600,
|
||||||
|
minValue: -3600
|
||||||
|
});
|
||||||
|
|
||||||
|
this.chFlipHor = new Common.UI.CheckBox({
|
||||||
|
el: $('#shape-advanced-checkbox-hor'),
|
||||||
|
labelText: this.textHorizontally
|
||||||
|
});
|
||||||
|
|
||||||
|
this.chFlipVert = new Common.UI.CheckBox({
|
||||||
|
el: $('#shape-advanced-checkbox-vert'),
|
||||||
|
labelText: this.textVertically
|
||||||
|
});
|
||||||
|
|
||||||
// Shape
|
// Shape
|
||||||
this._arrCapType = [
|
this._arrCapType = [
|
||||||
{displayValue: this.textFlat, value: Asc.c_oAscLineCapType.Flat},
|
{displayValue: this.textFlat, value: Asc.c_oAscLineCapType.Flat},
|
||||||
|
|
@ -533,10 +556,10 @@ define([ 'text!spreadsheeteditor/main/app/template/ShapeSettingsAdvanced.temp
|
||||||
val = margins.asc_getBottom();
|
val = margins.asc_getBottom();
|
||||||
this.spnMarginBottom.setValue((null !== val && undefined !== val) ? Common.Utils.Metric.fnRecalcFromMM(val) : '', true);
|
this.spnMarginBottom.setValue((null !== val && undefined !== val) ? Common.Utils.Metric.fnRecalcFromMM(val) : '', true);
|
||||||
}
|
}
|
||||||
this.btnsCategory[2].setDisabled(null === margins); // Margins
|
this.btnsCategory[3].setDisabled(null === margins); // Margins
|
||||||
|
|
||||||
var shapetype = shapeprops.asc_getType();
|
var shapetype = shapeprops.asc_getType();
|
||||||
this.btnsCategory[3].setDisabled(shapetype=='line' || shapetype=='bentConnector2' || shapetype=='bentConnector3'
|
this.btnsCategory[4].setDisabled(shapetype=='line' || shapetype=='bentConnector2' || shapetype=='bentConnector3'
|
||||||
|| shapetype=='bentConnector4' || shapetype=='bentConnector5' || shapetype=='curvedConnector2'
|
|| shapetype=='bentConnector4' || shapetype=='bentConnector5' || shapetype=='curvedConnector2'
|
||||||
|| shapetype=='curvedConnector3' || shapetype=='curvedConnector4' || shapetype=='curvedConnector5'
|
|| shapetype=='curvedConnector3' || shapetype=='curvedConnector4' || shapetype=='curvedConnector5'
|
||||||
|| shapetype=='straightConnector1');
|
|| shapetype=='straightConnector1');
|
||||||
|
|
@ -553,6 +576,11 @@ define([ 'text!spreadsheeteditor/main/app/template/ShapeSettingsAdvanced.temp
|
||||||
value = props.asc_getDescription();
|
value = props.asc_getDescription();
|
||||||
this.textareaAltDescription.val(value ? value : '');
|
this.textareaAltDescription.val(value ? value : '');
|
||||||
|
|
||||||
|
value = props.asc_getRot();
|
||||||
|
this.spnAngle.setValue((value==undefined || value===null) ? '' : Math.floor(value*180/3.14159265358979+0.5), true);
|
||||||
|
this.chFlipHor.setValue(props.asc_getFlipH());
|
||||||
|
this.chFlipVert.setValue(props.asc_getFlipV());
|
||||||
|
|
||||||
this._changedProps = new Asc.asc_CImgProperty();
|
this._changedProps = new Asc.asc_CImgProperty();
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
@ -564,6 +592,10 @@ define([ 'text!spreadsheeteditor/main/app/template/ShapeSettingsAdvanced.temp
|
||||||
if (this.isAltDescChanged)
|
if (this.isAltDescChanged)
|
||||||
this._changedProps.asc_putDescription(this.textareaAltDescription.val());
|
this._changedProps.asc_putDescription(this.textareaAltDescription.val());
|
||||||
|
|
||||||
|
this._changedProps.asc_putRot(this.spnAngle.getNumberValue() * 3.14159265358979 / 180);
|
||||||
|
this._changedProps.asc_putFlipH(this.chFlipHor.getValue()=='checked');
|
||||||
|
this._changedProps.asc_putFlipV(this.chFlipVert.getValue()=='checked');
|
||||||
|
|
||||||
return { shapeProps: this._changedProps} ;
|
return { shapeProps: this._changedProps} ;
|
||||||
},
|
},
|
||||||
|
|
||||||
|
|
@ -571,7 +603,7 @@ define([ 'text!spreadsheeteditor/main/app/template/ShapeSettingsAdvanced.temp
|
||||||
if (props ){
|
if (props ){
|
||||||
var stroke = props.asc_getStroke();
|
var stroke = props.asc_getStroke();
|
||||||
if (stroke) {
|
if (stroke) {
|
||||||
this.btnsCategory[1].setDisabled(stroke.asc_getType() == Asc.c_oAscStrokeType.STROKE_NONE); // Weights & Arrows
|
this.btnsCategory[2].setDisabled(stroke.asc_getType() == Asc.c_oAscStrokeType.STROKE_NONE); // Weights & Arrows
|
||||||
|
|
||||||
var value = stroke.asc_getLinejoin();
|
var value = stroke.asc_getLinejoin();
|
||||||
for (var i=0; i<this._arrJoinType.length; i++) {
|
for (var i=0; i<this._arrJoinType.length; i++) {
|
||||||
|
|
@ -775,7 +807,12 @@ define([ 'text!spreadsheeteditor/main/app/template/ShapeSettingsAdvanced.temp
|
||||||
textAltTip: 'The alternative text-based representation of the visual object information, which will be read to the people with vision or cognitive impairments to help them better understand what information there is in the image, autoshape, chart or table.',
|
textAltTip: 'The alternative text-based representation of the visual object information, which will be read to the people with vision or cognitive impairments to help them better understand what information there is in the image, autoshape, chart or table.',
|
||||||
strColumns: 'Columns',
|
strColumns: 'Columns',
|
||||||
textSpacing: 'Spacing between columns',
|
textSpacing: 'Spacing between columns',
|
||||||
textColNumber: 'Number of columns'
|
textColNumber: 'Number of columns',
|
||||||
|
textRotation: 'Rotation',
|
||||||
|
textAngle: 'Angle',
|
||||||
|
textFlipped: 'Flipped',
|
||||||
|
textHorizontally: 'Horizontally',
|
||||||
|
textVertically: 'Vertically'
|
||||||
|
|
||||||
}, SSE.Views.ShapeSettingsAdvanced || {}));
|
}, SSE.Views.ShapeSettingsAdvanced || {}));
|
||||||
});
|
});
|
||||||
|
|
@ -1395,6 +1395,13 @@
|
||||||
"SSE.Views.ImageSettings.textOriginalSize": "Default Size",
|
"SSE.Views.ImageSettings.textOriginalSize": "Default Size",
|
||||||
"SSE.Views.ImageSettings.textSize": "Size",
|
"SSE.Views.ImageSettings.textSize": "Size",
|
||||||
"SSE.Views.ImageSettings.textWidth": "Width",
|
"SSE.Views.ImageSettings.textWidth": "Width",
|
||||||
|
"SSE.Views.ImageSettings.textRotation": "Rotation",
|
||||||
|
"SSE.Views.ImageSettings.textRotate90": "Rotate 90°",
|
||||||
|
"SSE.Views.ImageSettings.textFlip": "Flip",
|
||||||
|
"SSE.Views.ImageSettings.textHint270": "Rotate Left 90°",
|
||||||
|
"SSE.Views.ImageSettings.textHint90": "Rotate Right 90°",
|
||||||
|
"SSE.Views.ImageSettings.textHintFlipV": "Flip Vertical",
|
||||||
|
"SSE.Views.ImageSettings.textHintFlipH": "Flip Horizontal",
|
||||||
"SSE.Views.ImageSettingsAdvanced.cancelButtonText": "Cancel",
|
"SSE.Views.ImageSettingsAdvanced.cancelButtonText": "Cancel",
|
||||||
"SSE.Views.ImageSettingsAdvanced.okButtonText": "Ok",
|
"SSE.Views.ImageSettingsAdvanced.okButtonText": "Ok",
|
||||||
"SSE.Views.ImageSettingsAdvanced.textAlt": "Alternative Text",
|
"SSE.Views.ImageSettingsAdvanced.textAlt": "Alternative Text",
|
||||||
|
|
@ -1402,6 +1409,11 @@
|
||||||
"SSE.Views.ImageSettingsAdvanced.textAltTip": "The alternative text-based representation of the visual object information, which will be read to the people with vision or cognitive impairments to help them better understand what information there is in the image, autoshape, chart or table.",
|
"SSE.Views.ImageSettingsAdvanced.textAltTip": "The alternative text-based representation of the visual object information, which will be read to the people with vision or cognitive impairments to help them better understand what information there is in the image, autoshape, chart or table.",
|
||||||
"SSE.Views.ImageSettingsAdvanced.textAltTitle": "Title",
|
"SSE.Views.ImageSettingsAdvanced.textAltTitle": "Title",
|
||||||
"SSE.Views.ImageSettingsAdvanced.textTitle": "Image - Advanced Settings",
|
"SSE.Views.ImageSettingsAdvanced.textTitle": "Image - Advanced Settings",
|
||||||
|
"SSE.Views.ImageSettingsAdvanced.textRotation": "Rotation",
|
||||||
|
"SSE.Views.ImageSettingsAdvanced.textAngle": "Angle",
|
||||||
|
"SSE.Views.ImageSettingsAdvanced.textFlipped": "Flipped",
|
||||||
|
"SSE.Views.ImageSettingsAdvanced.textHorizontally": "Horizontally",
|
||||||
|
"SSE.Views.ImageSettingsAdvanced.textVertically": "Vertically",
|
||||||
"SSE.Views.LeftMenu.tipAbout": "About",
|
"SSE.Views.LeftMenu.tipAbout": "About",
|
||||||
"SSE.Views.LeftMenu.tipChat": "Chat",
|
"SSE.Views.LeftMenu.tipChat": "Chat",
|
||||||
"SSE.Views.LeftMenu.tipComments": "Comments",
|
"SSE.Views.LeftMenu.tipComments": "Comments",
|
||||||
|
|
@ -1661,6 +1673,13 @@
|
||||||
"SSE.Views.ShapeSettings.txtNoBorders": "No Line",
|
"SSE.Views.ShapeSettings.txtNoBorders": "No Line",
|
||||||
"SSE.Views.ShapeSettings.txtPapyrus": "Papyrus",
|
"SSE.Views.ShapeSettings.txtPapyrus": "Papyrus",
|
||||||
"SSE.Views.ShapeSettings.txtWood": "Wood",
|
"SSE.Views.ShapeSettings.txtWood": "Wood",
|
||||||
|
"SSE.Views.ShapeSettings.textRotation": "Rotation",
|
||||||
|
"SSE.Views.ShapeSettings.textRotate90": "Rotate 90°",
|
||||||
|
"SSE.Views.ShapeSettings.textFlip": "Flip",
|
||||||
|
"SSE.Views.ShapeSettings.textHint270": "Rotate Left 90°",
|
||||||
|
"SSE.Views.ShapeSettings.textHint90": "Rotate Right 90°",
|
||||||
|
"SSE.Views.ShapeSettings.textHintFlipV": "Flip Vertical",
|
||||||
|
"SSE.Views.ShapeSettings.textHintFlipH": "Flip Horizontal",
|
||||||
"SSE.Views.ShapeSettingsAdvanced.cancelButtonText": "Cancel",
|
"SSE.Views.ShapeSettingsAdvanced.cancelButtonText": "Cancel",
|
||||||
"SSE.Views.ShapeSettingsAdvanced.okButtonText": "OK",
|
"SSE.Views.ShapeSettingsAdvanced.okButtonText": "OK",
|
||||||
"SSE.Views.ShapeSettingsAdvanced.strColumns": "Columns",
|
"SSE.Views.ShapeSettingsAdvanced.strColumns": "Columns",
|
||||||
|
|
@ -1694,6 +1713,11 @@
|
||||||
"SSE.Views.ShapeSettingsAdvanced.textTop": "Top",
|
"SSE.Views.ShapeSettingsAdvanced.textTop": "Top",
|
||||||
"SSE.Views.ShapeSettingsAdvanced.textWeightArrows": "Weights & Arrows",
|
"SSE.Views.ShapeSettingsAdvanced.textWeightArrows": "Weights & Arrows",
|
||||||
"SSE.Views.ShapeSettingsAdvanced.textWidth": "Width",
|
"SSE.Views.ShapeSettingsAdvanced.textWidth": "Width",
|
||||||
|
"SSE.Views.ShapeSettingsAdvanced.textRotation": "Rotation",
|
||||||
|
"SSE.Views.ShapeSettingsAdvanced.textAngle": "Angle",
|
||||||
|
"SSE.Views.ShapeSettingsAdvanced.textFlipped": "Flipped",
|
||||||
|
"SSE.Views.ShapeSettingsAdvanced.textHorizontally": "Horizontally",
|
||||||
|
"SSE.Views.ShapeSettingsAdvanced.textVertically": "Vertically",
|
||||||
"SSE.Views.SignatureSettings.notcriticalErrorTitle": "Warning",
|
"SSE.Views.SignatureSettings.notcriticalErrorTitle": "Warning",
|
||||||
"SSE.Views.SignatureSettings.strDelete": "Remove Signature",
|
"SSE.Views.SignatureSettings.strDelete": "Remove Signature",
|
||||||
"SSE.Views.SignatureSettings.strDetails": "Signature Details",
|
"SSE.Views.SignatureSettings.strDetails": "Signature Details",
|
||||||
|
|
|
||||||
|
|
@ -168,6 +168,11 @@
|
||||||
.toolbar-btn-icon(btn-subscript, 85, @toolbar-icon-size);
|
.toolbar-btn-icon(btn-subscript, 85, @toolbar-icon-size);
|
||||||
.toolbar-btn-icon(btn-superscript, 86, @toolbar-icon-size);
|
.toolbar-btn-icon(btn-superscript, 86, @toolbar-icon-size);
|
||||||
|
|
||||||
|
//.toolbar-btn-icon(rotate-90, 89, @toolbar-icon-size);
|
||||||
|
//.toolbar-btn-icon(rotate-270, 90, @toolbar-icon-size);
|
||||||
|
//.toolbar-btn-icon(flip-hor, 91, @toolbar-icon-size);
|
||||||
|
//.toolbar-btn-icon(flip-vert, 92, @toolbar-icon-size);
|
||||||
|
|
||||||
@menu-icon-size: 22px;
|
@menu-icon-size: 22px;
|
||||||
.menu-btn-icon(mnu-align-center, 0, @menu-icon-size);
|
.menu-btn-icon(mnu-align-center, 0, @menu-icon-size);
|
||||||
.menu-btn-icon(mnu-align-just, 1, @menu-icon-size);
|
.menu-btn-icon(mnu-align-just, 1, @menu-icon-size);
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue