diff --git a/apps/presentationeditor/main/app/template/ImageSettingsAdvanced.template b/apps/presentationeditor/main/app/template/ImageSettingsAdvanced.template
index d811bd244..337aff709 100644
--- a/apps/presentationeditor/main/app/template/ImageSettingsAdvanced.template
+++ b/apps/presentationeditor/main/app/template/ImageSettingsAdvanced.template
@@ -45,6 +45,32 @@
+
+
+
+
+
+
+
+
+
+
+
+ |
+
+ |
+
+
+ |
+
+
+ |
+
+ |
+
+
+
+
diff --git a/apps/presentationeditor/main/app/template/ShapeSettings.template b/apps/presentationeditor/main/app/template/ShapeSettings.template
index f86e7770a..f97d33753 100644
--- a/apps/presentationeditor/main/app/template/ShapeSettings.template
+++ b/apps/presentationeditor/main/app/template/ShapeSettings.template
@@ -116,6 +116,38 @@
+
+ |
+
+ |
+
+
+ |
+
+ |
+
+
+
+
+
+ |
+
+
+ |
+
+
+
+ |
+
+
+ |
+
|
diff --git a/apps/presentationeditor/main/app/template/ShapeSettingsAdvanced.template b/apps/presentationeditor/main/app/template/ShapeSettingsAdvanced.template
index 2b7149a8c..957639ea8 100644
--- a/apps/presentationeditor/main/app/template/ShapeSettingsAdvanced.template
+++ b/apps/presentationeditor/main/app/template/ShapeSettingsAdvanced.template
@@ -17,6 +17,32 @@
|
+
+
+
+
+
+
+
+
+
+
+
+ |
+
+ |
+
+
+ |
+
+
+ |
+
+ |
+
+
+
+
diff --git a/apps/presentationeditor/main/app/view/DocumentHolder.js b/apps/presentationeditor/main/app/view/DocumentHolder.js
index 0ff9ee452..b8b8aba62 100644
--- a/apps/presentationeditor/main/app/view/DocumentHolder.js
+++ b/apps/presentationeditor/main/app/view/DocumentHolder.js
@@ -583,7 +583,7 @@ define([
var onDialogAddHyperlink = function() {
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) {
if (result == 'ok') {
props = dlg.getSettings();
diff --git a/apps/presentationeditor/main/app/view/ImageSettings.js b/apps/presentationeditor/main/app/view/ImageSettings.js
index 189eb1188..4a13258f1 100644
--- a/apps/presentationeditor/main/app/view/ImageSettings.js
+++ b/apps/presentationeditor/main/app/view/ImageSettings.js
@@ -139,6 +139,46 @@ define([
this.fireEvent('editcomplete', 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.lblReplace = $('#image-lbl-replace');
$(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) {
this._locked = locked;
},
@@ -293,7 +350,14 @@ define([
textFromFile: 'From File',
textAdvanced: 'Show advanced settings',
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 || {}));
});
\ No newline at end of file
diff --git a/apps/presentationeditor/main/app/view/ImageSettingsAdvanced.js b/apps/presentationeditor/main/app/view/ImageSettingsAdvanced.js
index 1fd3b5887..b8066688b 100644
--- a/apps/presentationeditor/main/app/view/ImageSettingsAdvanced.js
+++ b/apps/presentationeditor/main/app/view/ImageSettingsAdvanced.js
@@ -40,7 +40,8 @@
define([ 'text!presentationeditor/main/app/template/ImageSettingsAdvanced.template',
'common/main/lib/view/AdvancedSettingsWindow',
- 'common/main/lib/component/MetricSpinner'
+ 'common/main/lib/component/MetricSpinner',
+ 'common/main/lib/component/CheckBox'
], function (contentTemplate) {
'use strict';
@@ -59,6 +60,7 @@ define([ 'text!presentationeditor/main/app/template/ImageSettingsAdvanced.tem
title: this.textTitle,
items: [
{panelId: 'id-adv-image-size', panelCaption: this.textPlacement},
+ {panelId: 'id-adv-image-rotate', panelCaption: this.textRotation},
{panelId: 'id-adv-image-alttext', panelCaption: this.textAlt}
],
contentTemplate: _.template(contentTemplate)({
@@ -171,6 +173,27 @@ define([ 'text!presentationeditor/main/app/template/ImageSettingsAdvanced.tem
});
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
this.inputAltTitle = new Common.UI.InputField({
@@ -225,6 +248,11 @@ define([ 'text!presentationeditor/main/app/template/ImageSettingsAdvanced.tem
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();
this.inputAltTitle.setValue(value ? value : '');
@@ -254,6 +282,10 @@ define([ 'text!presentationeditor/main/app/template/ImageSettingsAdvanced.tem
if (this.isAltDescChanged)
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 };
},
@@ -289,7 +321,12 @@ define([ 'text!presentationeditor/main/app/template/ImageSettingsAdvanced.tem
textAlt: 'Alternative Text',
textAltTitle: 'Title',
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 || {}));
});
\ No newline at end of file
diff --git a/apps/presentationeditor/main/app/view/ShapeSettings.js b/apps/presentationeditor/main/app/view/ShapeSettings.js
index ca5de8ee2..18079723b 100644
--- a/apps/presentationeditor/main/app/view/ShapeSettings.js
+++ b/apps/presentationeditor/main/app/view/ShapeSettings.js
@@ -1290,6 +1290,46 @@ define([
this.btnChangeShape.render( $('#shape-btn-change')) ;
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.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());
},
+ 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) {
return (value * 25.4 / 72.0);
},
@@ -1643,6 +1700,13 @@ define([
textStyle: 'Style',
textGradient: 'Gradient',
textBorderSizeErr: 'The entered value is incorrect.
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 || {}));
});
diff --git a/apps/presentationeditor/main/app/view/ShapeSettingsAdvanced.js b/apps/presentationeditor/main/app/view/ShapeSettingsAdvanced.js
index abe18a36c..3f4951f61 100644
--- a/apps/presentationeditor/main/app/view/ShapeSettingsAdvanced.js
+++ b/apps/presentationeditor/main/app/view/ShapeSettingsAdvanced.js
@@ -41,7 +41,8 @@
define([ 'text!presentationeditor/main/app/template/ShapeSettingsAdvanced.template',
'common/main/lib/view/AdvancedSettingsWindow',
'common/main/lib/component/ComboBox',
- 'common/main/lib/component/MetricSpinner'
+ 'common/main/lib/component/MetricSpinner',
+ 'common/main/lib/component/CheckBox'
], function (contentTemplate) {
'use strict';
@@ -61,6 +62,7 @@ define([ 'text!presentationeditor/main/app/template/ShapeSettingsAdvanced.tem
title: this.textTitle,
items: [
{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-margins', panelCaption: this.strMargins},
{panelId: 'id-adv-shape-columns', panelCaption: this.strColumns},
@@ -230,6 +232,27 @@ define([ 'text!presentationeditor/main/app/template/ShapeSettingsAdvanced.tem
}, this));
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
this._arrCapType = [
{displayValue: this.textFlat, value: Asc.c_oAscLineCapType.Flat},
@@ -499,10 +522,10 @@ define([ 'text!presentationeditor/main/app/template/ShapeSettingsAdvanced.tem
val = margins.get_Bottom();
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();
- 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=='curvedConnector3' || shapetype=='curvedConnector4' || shapetype=='curvedConnector5'
|| shapetype=='straightConnector1');
@@ -519,6 +542,11 @@ define([ 'text!presentationeditor/main/app/template/ShapeSettingsAdvanced.tem
value = props.asc_getDescription();
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();
}
},
@@ -530,6 +558,10 @@ define([ 'text!presentationeditor/main/app/template/ShapeSettingsAdvanced.tem
if (this.isAltDescChanged)
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);
return { shapeProps: this._changedProps} ;
},
@@ -538,7 +570,7 @@ define([ 'text!presentationeditor/main/app/template/ShapeSettingsAdvanced.tem
if (props ){
var stroke = props.get_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();
for (var i=0; i .btn-addslide,
diff --git a/apps/spreadsheeteditor/main/app/controller/Toolbar.js b/apps/spreadsheeteditor/main/app/controller/Toolbar.js
index 6606b5ff1..baee0fb5a 100644
--- a/apps/spreadsheeteditor/main/app/controller/Toolbar.js
+++ b/apps/spreadsheeteditor/main/app/controller/Toolbar.js
@@ -1437,7 +1437,8 @@ define([
e.stopPropagation();
},
'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();
e.preventDefault();
},
diff --git a/apps/spreadsheeteditor/main/app/template/ImageSettings.template b/apps/spreadsheeteditor/main/app/template/ImageSettings.template
index ce4c7e79d..bef0c6502 100644
--- a/apps/spreadsheeteditor/main/app/template/ImageSettings.template
+++ b/apps/spreadsheeteditor/main/app/template/ImageSettings.template
@@ -29,6 +29,32 @@
+
+ |
+
+ |
+
+
+ |
+
+
+ |
+
+
+
+ |
+
+
+ |
+
+ |
+
diff --git a/apps/spreadsheeteditor/main/app/template/ImageSettingsAdvanced.template b/apps/spreadsheeteditor/main/app/template/ImageSettingsAdvanced.template
index cb944530b..fea2f0c20 100644
--- a/apps/spreadsheeteditor/main/app/template/ImageSettingsAdvanced.template
+++ b/apps/spreadsheeteditor/main/app/template/ImageSettingsAdvanced.template
@@ -1,3 +1,29 @@
+
+
+
+
+
+
+
+
+
+
+
+ |
+
+ |
+
+
+ |
+
+
+ |
+
+ |
+
+
+
+
diff --git a/apps/spreadsheeteditor/main/app/template/ShapeSettings.template b/apps/spreadsheeteditor/main/app/template/ShapeSettings.template
index f86e7770a..f97d33753 100644
--- a/apps/spreadsheeteditor/main/app/template/ShapeSettings.template
+++ b/apps/spreadsheeteditor/main/app/template/ShapeSettings.template
@@ -116,6 +116,38 @@
+
+ |
+
+ |
+
+
+ |
+
+ |
+
+
+
+
+
+ |
+
+
+ |
+
+
+
+ |
+
+
+ |
+
|
diff --git a/apps/spreadsheeteditor/main/app/template/ShapeSettingsAdvanced.template b/apps/spreadsheeteditor/main/app/template/ShapeSettingsAdvanced.template
index 2ae9bfa02..8ed314425 100644
--- a/apps/spreadsheeteditor/main/app/template/ShapeSettingsAdvanced.template
+++ b/apps/spreadsheeteditor/main/app/template/ShapeSettingsAdvanced.template
@@ -17,6 +17,32 @@
|
+
+
+
+
+
+
+
+
+
+
+
+ |
+
+ |
+
+
+ |
+
+
+ |
+
+ |
+
+
+
+
diff --git a/apps/spreadsheeteditor/main/app/view/ImageSettings.js b/apps/spreadsheeteditor/main/app/view/ImageSettings.js
index cb61b7d20..266f160f8 100644
--- a/apps/spreadsheeteditor/main/app/view/ImageSettings.js
+++ b/apps/spreadsheeteditor/main/app/view/ImageSettings.js
@@ -195,6 +195,46 @@ define([
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));
},
@@ -366,6 +406,23 @@ define([
})).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) {
this._locked = locked;
},
@@ -392,6 +449,13 @@ define([
textFromFile: 'From File',
textEditObject: 'Edit Object',
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 || {}));
});
\ No newline at end of file
diff --git a/apps/spreadsheeteditor/main/app/view/ImageSettingsAdvanced.js b/apps/spreadsheeteditor/main/app/view/ImageSettingsAdvanced.js
index 74f43448a..b4bb98e96 100644
--- a/apps/spreadsheeteditor/main/app/view/ImageSettingsAdvanced.js
+++ b/apps/spreadsheeteditor/main/app/view/ImageSettingsAdvanced.js
@@ -40,7 +40,9 @@
define([ 'text!spreadsheeteditor/main/app/template/ImageSettingsAdvanced.template',
'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) {
'use strict';
@@ -57,6 +59,7 @@ define([ 'text!spreadsheeteditor/main/app/template/ImageSettingsAdvanced.temp
_.extend(this.options, {
title: this.textTitle,
items: [
+ {panelId: 'id-adv-image-rotate', panelCaption: this.textRotation},
{panelId: 'id-adv-image-alttext', panelCaption: this.textAlt}
],
contentTemplate: _.template(contentTemplate)({
@@ -74,6 +77,27 @@ define([ 'text!spreadsheeteditor/main/app/template/ImageSettingsAdvanced.temp
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
this.inputAltTitle = new Common.UI.InputField({
@@ -112,6 +136,11 @@ define([ 'text!spreadsheeteditor/main/app/template/ImageSettingsAdvanced.temp
value = props.asc_getDescription();
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();
}
},
@@ -123,6 +152,10 @@ define([ 'text!spreadsheeteditor/main/app/template/ImageSettingsAdvanced.temp
if (this.isAltDescChanged)
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} ;
},
@@ -132,7 +165,12 @@ define([ 'text!spreadsheeteditor/main/app/template/ImageSettingsAdvanced.temp
textAlt: 'Alternative Text',
textAltTitle: 'Title',
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 || {}));
});
\ No newline at end of file
diff --git a/apps/spreadsheeteditor/main/app/view/ShapeSettings.js b/apps/spreadsheeteditor/main/app/view/ShapeSettings.js
index f9a74e426..0b324d26e 100644
--- a/apps/spreadsheeteditor/main/app/view/ShapeSettings.js
+++ b/apps/spreadsheeteditor/main/app/view/ShapeSettings.js
@@ -1314,6 +1314,46 @@ define([
this.btnChangeShape.render( $('#shape-btn-change')) ;
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.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() {
if (!this.btnBackColor) {
this.btnBackColor = new Common.UI.ColorButton({
@@ -1668,6 +1727,13 @@ define([
textStyle: 'Style',
textGradient: 'Gradient',
textBorderSizeErr: 'The entered value is incorrect.
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 || {}));
});
diff --git a/apps/spreadsheeteditor/main/app/view/ShapeSettingsAdvanced.js b/apps/spreadsheeteditor/main/app/view/ShapeSettingsAdvanced.js
index b06b78d65..2d8ab3521 100644
--- a/apps/spreadsheeteditor/main/app/view/ShapeSettingsAdvanced.js
+++ b/apps/spreadsheeteditor/main/app/view/ShapeSettingsAdvanced.js
@@ -41,7 +41,8 @@
define([ 'text!spreadsheeteditor/main/app/template/ShapeSettingsAdvanced.template',
'common/main/lib/view/AdvancedSettingsWindow',
'common/main/lib/component/ComboBox',
- 'common/main/lib/component/MetricSpinner'
+ 'common/main/lib/component/MetricSpinner',
+ 'common/main/lib/component/CheckBox'
], function (contentTemplate) {
'use strict';
@@ -61,6 +62,7 @@ define([ 'text!spreadsheeteditor/main/app/template/ShapeSettingsAdvanced.temp
title: this.textTitle,
items: [
{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-margins', panelCaption: this.strMargins},
{panelId: 'id-adv-shape-columns', panelCaption: this.strColumns},
@@ -246,6 +248,27 @@ define([ 'text!spreadsheeteditor/main/app/template/ShapeSettingsAdvanced.temp
}, this));
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
this._arrCapType = [
{displayValue: this.textFlat, value: Asc.c_oAscLineCapType.Flat},
@@ -533,10 +556,10 @@ define([ 'text!spreadsheeteditor/main/app/template/ShapeSettingsAdvanced.temp
val = margins.asc_getBottom();
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();
- 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=='curvedConnector3' || shapetype=='curvedConnector4' || shapetype=='curvedConnector5'
|| shapetype=='straightConnector1');
@@ -553,6 +576,11 @@ define([ 'text!spreadsheeteditor/main/app/template/ShapeSettingsAdvanced.temp
value = props.asc_getDescription();
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();
}
},
@@ -564,6 +592,10 @@ define([ 'text!spreadsheeteditor/main/app/template/ShapeSettingsAdvanced.temp
if (this.isAltDescChanged)
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} ;
},
@@ -571,7 +603,7 @@ define([ 'text!spreadsheeteditor/main/app/template/ShapeSettingsAdvanced.temp
if (props ){
var stroke = props.asc_getStroke();
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();
for (var i=0; i | |