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

[DE PE SSE] Hide or disable controls for smart arts in right panel and advanced settings

Browse source
This commit is contained in:
JuliaSvinareva 2021-10-30 22:47:44 +03:00
parent d6920073de
commit 598e20d973
11 changed files with 108 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
apps/documenteditor/main/app/view/ImageSettingsAdvanced.js
View file

@ -1546,6 +1546,15 @@ define([ 'text!documenteditor/main/app/template/ImageSettingsAdvanced.templat
_setShapeDefaults: function(props) { _setShapeDefaults: function(props) {
if (props ){ if (props ){
if (props.get_FromSmartArt()) {
this.radioHSizePc.setDisabled(true);
this.radioVSizePc.setDisabled(true);
this.btnsCategory[2].setDisabled(true);
}
if (props.get_FromSmartArtInternal()) {
this.chAutofit.setDisabled(true);
}
var stroke = props.get_stroke(); var stroke = props.get_stroke();
if (stroke) { if (stroke) {
var value = stroke.get_linejoin(); var value = stroke.get_linejoin();

6
apps/presentationeditor/main/app/template/ShapeSettings.template
View file

@ -142,17 +142,17 @@
</div> </div>
</td> </td>
</tr> </tr>
<tr class="shape-only"> <tr class="shape-only shape-rotation">
<td class="padding-small"> <td class="padding-small">
<div class="separator horizontal"></div> <div class="separator horizontal"></div>
</td> </td>
</tr> </tr>
<tr class="shape-only"> <tr class="shape-only shape-rotation">
<td class="padding-small"> <td class="padding-small">
<label class="header"><%= scope.textRotation %></label> <label class="header"><%= scope.textRotation %></label>
</td> </td>
</tr> </tr>
<tr class="shape-only"> <tr class="shape-only shape-rotation">
<td> <td>
<table cols="2" style="width: 100%;"> <table cols="2" style="width: 100%;">
<tr> <tr>

6
apps/presentationeditor/main/app/template/TextArtSettings.template
View file

@ -160,17 +160,17 @@
</div> </div>
</td> </td>
</tr> </tr>
<tr> <tr class="textart-transform">
<td class="padding-small"> <td class="padding-small">
<div class="separator horizontal"></div> <div class="separator horizontal"></div>
</td> </td>
</tr> </tr>
<tr> <tr class="textart-transform">
<td> <td>
<label class="header"><%= scope.textTransform %></label> <label class="header"><%= scope.textTransform %></label>
</td> </td>
</tr> </tr>
<tr> <tr class="textart-transform">
<td class="padding-small"> <td class="padding-small">
<div class="" id="textart-combo-transform" style="width: 100%; height: 42px;"></div> <div class="" id="textart-combo-transform" style="width: 100%; height: 42px;"></div>
</td> </td>

24
apps/presentationeditor/main/app/view/ShapeSettings.js
View file

@ -97,7 +97,9 @@ define([
DisabledControls: false, DisabledControls: false,
HideShapeOnlySettings: false, HideShapeOnlySettings: false,
HideChangeTypeSettings: false, HideChangeTypeSettings: false,
isFromImage: false HideRotationSettings: false,
isFromImage: false,
isFromSmartArtInternal: false
}; };
this.lockedControls = []; this.lockedControls = [];
this._locked = false; this._locked = false;
@ -133,6 +135,7 @@ define([
this.TransparencyContainer = $('#shape-panel-transparent-fill'); this.TransparencyContainer = $('#shape-panel-transparent-fill');
this.ShapeOnlySettings = $('.shape-only'); this.ShapeOnlySettings = $('.shape-only');
this.CanChangeType = $('.change-type'); this.CanChangeType = $('.change-type');
this.RotationSettings = $('.shape-rotation');
}, },
render: function () { render: function () {
@ -763,16 +766,18 @@ define([
this.disableControls(this._locked==true, props.get_CanFill() !== true); this.disableControls(this._locked==true, props.get_CanFill() !== true);
this.hideShapeOnlySettings(props.get_FromChart() || props.get_FromImage()); this.hideShapeOnlySettings(props.get_FromChart() || props.get_FromImage());
this.hideRotationSettings(props.get_FromSmartArt());
var hidechangetype = props.get_FromChart() || shapetype=='line' || shapetype=='bentConnector2' || shapetype=='bentConnector3' var hidechangetype = props.get_FromChart() || props.get_FromSmartArt() || 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';
this.hideChangeTypeSettings(hidechangetype); this.hideChangeTypeSettings(hidechangetype);
this._state.isFromImage = !!props.get_FromImage(); this._state.isFromImage = !!props.get_FromImage();
this._state.isFromSmartArtInternal = !!props.get_FromSmartArtInternal();
if (!hidechangetype && this.btnChangeShape.menu.items.length) { if (!hidechangetype && this.btnChangeShape.menu.items.length) {
this.btnChangeShape.menu.items[0].setVisible(props.get_FromImage()); this.btnChangeShape.menu.items[0].setVisible(props.get_FromImage() || props.get_FromSmartArtInternal());
this.btnChangeShape.menu.items[1].setVisible(!props.get_FromImage()); this.btnChangeShape.menu.items[1].setVisible(!props.get_FromImage() && !props.get_FromSmartArtInternal());
} }
// background colors // background colors
@ -1708,8 +1713,8 @@ define([
}); });
} }
me.btnChangeShape.menu.items[0].setVisible(me._state.isFromImage); me.btnChangeShape.menu.items[0].setVisible(me._state.isFromImage || me._state.isFromSmartArtInternal);
me.btnChangeShape.menu.items[1].setVisible(!me._state.isFromImage); me.btnChangeShape.menu.items[1].setVisible(!me._state.isFromImage && !me._state.isFromSmartArtInternal);
}, },
UpdateThemeColors: function() { UpdateThemeColors: function() {
@ -1855,6 +1860,13 @@ define([
} }
}, },
hideRotationSettings: function(value) {
if (this._state.HideRotationSettings !== value) {
this._state.HideRotationSettings = value;
this.RotationSettings.toggleClass('hidden', value==true);
}
},
onPositionChange: function(btn) { onPositionChange: function(btn) {
var pos = btn.getNumberValue(), var pos = btn.getNumberValue(),
minValue = (this.GradColor.currentIdx-1<0) ? 0 : this.GradColor.values[this.GradColor.currentIdx-1], minValue = (this.GradColor.currentIdx-1<0) ? 0 : this.GradColor.values[this.GradColor.currentIdx-1],

12
apps/presentationeditor/main/app/view/ShapeSettingsAdvanced.js
View file

@ -569,6 +569,15 @@ define([ 'text!presentationeditor/main/app/template/ShapeSettingsAdvanced.tem
_setDefaults: function(props) { _setDefaults: function(props) {
if (props ){ if (props ){
if (props.get_FromSmartArt()) {
this.btnsCategory[1].setDisabled(true);
}
if (props.get_FromSmartArtInternal()) {
this.radioNofit.setDisabled(true);
this.radioShrink.setDisabled(true);
this.radioFit.setDisabled(true);
}
this.spnWidth.setValue(Common.Utils.Metric.fnRecalcFromMM(props.get_Width()).toFixed(2), true); this.spnWidth.setValue(Common.Utils.Metric.fnRecalcFromMM(props.get_Width()).toFixed(2), true);
this.spnHeight.setValue(Common.Utils.Metric.fnRecalcFromMM(props.get_Height()).toFixed(2), true); this.spnHeight.setValue(Common.Utils.Metric.fnRecalcFromMM(props.get_Height()).toFixed(2), true);
@ -606,7 +615,8 @@ define([ 'text!presentationeditor/main/app/template/ShapeSettingsAdvanced.tem
this.btnsCategory[3].setDisabled(null === margins); // Margins this.btnsCategory[3].setDisabled(null === margins); // Margins
var shapetype = props.asc_getType(); var shapetype = props.asc_getType();
this.btnsCategory[4].setDisabled(shapetype=='line' || shapetype=='bentConnector2' || shapetype=='bentConnector3' this.btnsCategory[4].setDisabled(props.get_FromSmartArtInternal()
|| 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');

16
apps/presentationeditor/main/app/view/TextArtSettings.js
View file

@ -94,7 +94,9 @@ define([
GradFillType: Asc.c_oAscFillGradType.GRAD_LINEAR, GradFillType: Asc.c_oAscFillGradType.GRAD_LINEAR,
FormId: null, FormId: null,
DisabledControls: false, DisabledControls: false,
applicationPixelRatio: Common.Utils.applicationPixelRatio() applicationPixelRatio: Common.Utils.applicationPixelRatio(),
isFromSmartArtInternal: false,
HideTransformSettings: false
}; };
this.lockedControls = []; this.lockedControls = [];
this._locked = false; this._locked = false;
@ -125,6 +127,8 @@ define([
this.FillGradientContainer = $('#textart-panel-gradient-fill'); this.FillGradientContainer = $('#textart-panel-gradient-fill');
this.TransparencyContainer = $('#textart-panel-transparent-fill'); this.TransparencyContainer = $('#textart-panel-transparent-fill');
this.TransformSettings = $('.textart-transform');
PE.getCollection('Common.Collections.TextArt').bind({ PE.getCollection('Common.Collections.TextArt').bind({
reset: this.fillTextArt.bind(this) reset: this.fillTextArt.bind(this)
}); });
@ -691,6 +695,9 @@ define([
if (this._initSettings) if (this._initSettings)
this.createDelayedElements(); this.createDelayedElements();
this._state.isFromSmartArtInternal = props.get_FromSmartArtInternal();
this.hideTransformSettings(this._state.isFromSmartArtInternal);
if (props && props.get_TextArtProperties()) if (props && props.get_TextArtProperties())
{ {
var shapeprops = props.get_TextArtProperties(); var shapeprops = props.get_TextArtProperties();
@ -1788,6 +1795,13 @@ define([
this._state.applicationPixelRatio = Common.Utils.applicationPixelRatio(); this._state.applicationPixelRatio = Common.Utils.applicationPixelRatio();
}, },
hideTransformSettings: function(value) {
if (this._state.HideTransformSettings !== value) {
this._state.HideTransformSettings = value;
this.TransformSettings.toggleClass('hidden', value === true);
}
},
txtNoBorders : 'No Line', txtNoBorders : 'No Line',
strStroke : 'Stroke', strStroke : 'Stroke',
strColor : 'Color', strColor : 'Color',

6
apps/spreadsheeteditor/main/app/template/ShapeSettings.template
View file

@ -142,17 +142,17 @@
</div> </div>
</td> </td>
</tr> </tr>
<tr class="shape-only"> <tr class="shape-only shape-rotation">
<td class="padding-small"> <td class="padding-small">
<div class="separator horizontal"></div> <div class="separator horizontal"></div>
</td> </td>
</tr> </tr>
<tr class="shape-only"> <tr class="shape-only shape-rotation">
<td class="padding-small"> <td class="padding-small">
<label class="header"><%= scope.textRotation %></label> <label class="header"><%= scope.textRotation %></label>
</td> </td>
</tr> </tr>
<tr class="shape-only"> <tr class="shape-only shape-rotation">
<td> <td>
<table cols="2" style="width: 100%;"> <table cols="2" style="width: 100%;">
<tr> <tr>

6
apps/spreadsheeteditor/main/app/template/TextArtSettings.template
View file

@ -160,17 +160,17 @@
</div> </div>
</td> </td>
</tr> </tr>
<tr> <tr class="textart-transform">
<td class="padding-small"> <td class="padding-small">
<div class="separator horizontal"></div> <div class="separator horizontal"></div>
</td> </td>
</tr> </tr>
<tr> <tr class="textart-transform">
<td> <td>
<label class="header"><%= scope.textTransform %></label> <label class="header"><%= scope.textTransform %></label>
</td> </td>
</tr> </tr>
<tr> <tr class="textart-transform">
<td class="padding-small"> <td class="padding-small">
<div class="" id="textart-combo-transform" style="width: 100%; height: 42px;"></div> <div class="" id="textart-combo-transform" style="width: 100%; height: 42px;"></div>
</td> </td>

24
apps/spreadsheeteditor/main/app/view/ShapeSettings.js
View file

@ -98,7 +98,9 @@ define([
DisabledControls: false, DisabledControls: false,
HideShapeOnlySettings: false, HideShapeOnlySettings: false,
HideChangeTypeSettings: false, HideChangeTypeSettings: false,
isFromImage: false HideRotationSettings: false,
isFromImage: false,
isFromSmartArtInternal: false
}; };
this.lockedControls = []; this.lockedControls = [];
this._locked = false; this._locked = false;
@ -134,6 +136,7 @@ define([
this.TransparencyContainer = $('#shape-panel-transparent-fill'); this.TransparencyContainer = $('#shape-panel-transparent-fill');
this.ShapeOnlySettings = $('.shape-only'); this.ShapeOnlySettings = $('.shape-only');
this.CanChangeType = $('.change-type'); this.CanChangeType = $('.change-type');
this.RotationSettings = $('.shape-rotation');
}, },
render: function () { render: function () {
@ -759,16 +762,18 @@ define([
this.disableControls(this._locked, !shapeprops.asc_getCanFill()); this.disableControls(this._locked, !shapeprops.asc_getCanFill());
this.hideShapeOnlySettings(shapeprops.asc_getFromChart() || shapeprops.asc_getFromImage()); this.hideShapeOnlySettings(shapeprops.asc_getFromChart() || shapeprops.asc_getFromImage());
this.hideRotationSettings(shapeprops.asc_getFromSmartArt());
var hidechangetype = shapeprops.get_FromChart() || shapetype=='line' || shapetype=='bentConnector2' || shapetype=='bentConnector3' var hidechangetype = shapeprops.get_FromChart() || shapeprops.asc_getFromSmartArt() || 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';
this.hideChangeTypeSettings(hidechangetype); this.hideChangeTypeSettings(hidechangetype);
this._state.isFromImage = !!shapeprops.get_FromImage(); this._state.isFromImage = !!shapeprops.get_FromImage();
this._state.isFromSmartArtInternal = !!shapeprops.asc_getFromSmartArtInternal();
if (!hidechangetype && this.btnChangeShape.menu.items.length) { if (!hidechangetype && this.btnChangeShape.menu.items.length) {
this.btnChangeShape.menu.items[0].setVisible(shapeprops.get_FromImage()); this.btnChangeShape.menu.items[0].setVisible(shapeprops.get_FromImage() || shapeprops.asc_getFromSmartArtInternal());
this.btnChangeShape.menu.items[1].setVisible(!shapeprops.get_FromImage()); this.btnChangeShape.menu.items[1].setVisible(!shapeprops.get_FromImage() && !shapeprops.asc_getFromSmartArtInternal());
} }
// background colors // background colors
@ -1715,8 +1720,8 @@ define([
me.btnChangeShape.menu.hide(); me.btnChangeShape.menu.hide();
}); });
} }
me.btnChangeShape.menu.items[0].setVisible(me._state.isFromImage); me.btnChangeShape.menu.items[0].setVisible(me._state.isFromImage || me._state.isFromSmartArtInternal);
me.btnChangeShape.menu.items[1].setVisible(!me._state.isFromImage); me.btnChangeShape.menu.items[1].setVisible(!me._state.isFromImage && !me._state.isFromSmartArtInternal);
}, },
onBtnRotateClick: function(btn) { onBtnRotateClick: function(btn) {
@ -1874,6 +1879,13 @@ define([
} }
}, },
hideRotationSettings: function(value) {
if (this._state.HideRotationSettings !== value) {
this._state.HideRotationSettings = value;
this.RotationSettings.toggleClass('hidden', value==true);
}
},
onPositionChange: function(btn) { onPositionChange: function(btn) {
var pos = btn.getNumberValue(), var pos = btn.getNumberValue(),
minValue = (this.GradColor.currentIdx-1<0) ? 0 : this.GradColor.values[this.GradColor.currentIdx-1], minValue = (this.GradColor.currentIdx-1<0) ? 0 : this.GradColor.values[this.GradColor.currentIdx-1],

11
apps/spreadsheeteditor/main/app/view/ShapeSettingsAdvanced.js
View file

@ -629,6 +629,14 @@ define([ 'text!spreadsheeteditor/main/app/template/ShapeSettingsAdvanced.temp
if (props && props.asc_getShapeProperties()){ if (props && props.asc_getShapeProperties()){
var shapeprops = props.asc_getShapeProperties(); var shapeprops = props.asc_getShapeProperties();
if (shapeprops.asc_getFromSmartArt()) {
this.btnsCategory[1].setDisabled(true);
}
if (shapeprops.asc_getFromSmartArtInternal()) {
this.chAutofit.setDisabled(true);
this.chOverflow.setDisabled(true);
}
this.spnWidth.setValue(Common.Utils.Metric.fnRecalcFromMM(props.asc_getWidth()).toFixed(2), true); this.spnWidth.setValue(Common.Utils.Metric.fnRecalcFromMM(props.asc_getWidth()).toFixed(2), true);
this.spnHeight.setValue(Common.Utils.Metric.fnRecalcFromMM(props.asc_getHeight()).toFixed(2), true); this.spnHeight.setValue(Common.Utils.Metric.fnRecalcFromMM(props.asc_getHeight()).toFixed(2), true);
@ -657,7 +665,8 @@ define([ 'text!spreadsheeteditor/main/app/template/ShapeSettingsAdvanced.temp
this.chOverflow.setValue(shapeprops.asc_getVertOverflowType()==AscFormat.nOTOwerflow); this.chOverflow.setValue(shapeprops.asc_getVertOverflowType()==AscFormat.nOTOwerflow);
var shapetype = shapeprops.asc_getType(); var shapetype = shapeprops.asc_getType();
this.btnsCategory[4].setDisabled(shapetype=='line' || shapetype=='bentConnector2' || shapetype=='bentConnector3' this.btnsCategory[4].setDisabled(shapeprops.asc_getFromSmartArtInternal()
|| 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');

16
apps/spreadsheeteditor/main/app/view/TextArtSettings.js
View file

@ -95,7 +95,9 @@ define([
GradFillType: Asc.c_oAscFillGradType.GRAD_LINEAR, GradFillType: Asc.c_oAscFillGradType.GRAD_LINEAR,
FormId: null, FormId: null,
DisabledControls: false, DisabledControls: false,
applicationPixelRatio: Common.Utils.applicationPixelRatio() applicationPixelRatio: Common.Utils.applicationPixelRatio(),
isFromSmartArtInternal: false,
HideTransformSettings: false
}; };
this.lockedControls = []; this.lockedControls = [];
this._locked = false; this._locked = false;
@ -126,6 +128,8 @@ define([
this.FillGradientContainer = $('#textart-panel-gradient-fill'); this.FillGradientContainer = $('#textart-panel-gradient-fill');
this.TransparencyContainer = $('#textart-panel-transparent-fill'); this.TransparencyContainer = $('#textart-panel-transparent-fill');
this.TransformSettings = $('.textart-transform');
SSE.getCollection('Common.Collections.TextArt').bind({ SSE.getCollection('Common.Collections.TextArt').bind({
reset: this.fillTextArt.bind(this) reset: this.fillTextArt.bind(this)
}); });
@ -694,6 +698,9 @@ define([
if (this._initSettings) if (this._initSettings)
this.createDelayedElements(); this.createDelayedElements();
this._state.isFromSmartArtInternal = props.asc_getShapeProperties() && props.asc_getShapeProperties().asc_getFromSmartArtInternal();
this.hideTransformSettings(this._state.isFromSmartArtInternal);
if (props && props.asc_getShapeProperties() && props.asc_getShapeProperties().get_TextArtProperties()) if (props && props.asc_getShapeProperties() && props.asc_getShapeProperties().get_TextArtProperties())
{ {
var shapeprops = props.asc_getShapeProperties().get_TextArtProperties(); var shapeprops = props.asc_getShapeProperties().get_TextArtProperties();
@ -1791,6 +1798,13 @@ define([
this._state.applicationPixelRatio = Common.Utils.applicationPixelRatio(); this._state.applicationPixelRatio = Common.Utils.applicationPixelRatio();
}, },
hideTransformSettings: function(value) {
if (this._state.HideTransformSettings !== value) {
this._state.HideTransformSettings = value;
this.TransformSettings.toggleClass('hidden', value === true);
}
},
txtNoBorders : 'No Line', txtNoBorders : 'No Line',
strStroke : 'Stroke', strStroke : 'Stroke',
strColor : 'Color', strColor : 'Color',