pengjunjie/web-apps
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/web-apps.git synced 2026-07-24 11:31:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

Add images

Browse Source
This commit is contained in:
OVSharova
2023-07-09 19:27:38 +03:00
parent 6b87a53598
commit 350dc545dd
9 changed files with 72 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

99
apps/presentationeditor/main/app/view/Transitions.js
View File

@ -129,9 +129,10 @@ define([
{title: this.textUnCover, imageUrl: "btn-transition-uncover", value: Asc.c_oAscSlideTransitionTypes.UnCover, id: Common.UI.getId()},
{title: this.textCover, imageUrl: "btn-transition-cover", value: Asc.c_oAscSlideTransitionTypes.Cover, id: Common.UI.getId()},
{title: this.textClock, imageUrl: "btn-transition-clock", value: Asc.c_oAscSlideTransitionTypes.Clock, id: Common.UI.getId()},
{title: this.textZoom, imageUrl: "btn-transition-zoom", value: Asc.c_oAscSlideTransitionTypes.Zoom, id: Common.UI.getId(), cls: 'last-item'}
{title: this.textZoom, imageUrl: "btn-transition-zoom", value: Asc.c_oAscSlideTransitionTypes.Zoom, id: Common.UI.getId()},
{title: this.textMorph, imageUrl: "btn-transition-morph", value: Asc.c_oAscSlideTransitionTypes.Morph, id: Common.UI.getId(),cls: 'last-item'}
];
this._arrEffectName.forEach(function(item) {
this._arrEffectName.forEach(function (item) {
item.tip = item.title;
});
@ -144,8 +145,8 @@ define([
style: 'min-width:108px;',
itemTemplate: _.template([
'<div class = "btn_item x-huge" id = "<%= id %>" style = "width: ' + itemWidth + 'px;height: ' + itemHeight + 'px;">',
'<div class = "icon toolbar__icon <%= imageUrl %>"></div>',
'<div class = "caption"><%= title %></div>',
'<div class = "icon toolbar__icon <%= imageUrl %>"></div>',
'<div class = "caption"><%= title %></div>',
'</div>'
].join('')),
enableKeyEvents: true,
@ -199,7 +200,8 @@ define([
iconCls: 'toolbar__icon icon btn-transition-none',
scaling: false,
menu: new Common.UI.Menu({
items: this.createParametersMenuItems()}),
items: this.createParametersMenuItems()
}),
lock: [_set.slideDeleted, _set.noSlides, _set.disableOnStart, _set.transitLock],
dataHint: '1',
dataHintDirection: 'bottom',
@ -288,39 +290,40 @@ define([
return this;
},
createParametersMenuItems: function()
{
createParametersMenuItems: function () {
var arrEffectType = [
{caption: this.textSmoothly, value: Asc.c_oAscSlideTransitionParams.Fade_Smoothly},
{caption: this.textBlack, value: Asc.c_oAscSlideTransitionParams.Fade_Through_Black},
{caption: this.textLeft, value: Asc.c_oAscSlideTransitionParams.Param_Left},
{caption: this.textTop, value: Asc.c_oAscSlideTransitionParams.Param_Top},
{caption: this.textRight, value: Asc.c_oAscSlideTransitionParams.Param_Right},
{caption: this.textBottom, value: Asc.c_oAscSlideTransitionParams.Param_Bottom},
{caption: this.textTopLeft, value: Asc.c_oAscSlideTransitionParams.Param_TopLeft},
{caption: this.textTopRight, value: Asc.c_oAscSlideTransitionParams.Param_TopRight},
{caption: this.textBottomLeft, value: Asc.c_oAscSlideTransitionParams.Param_BottomLeft},
{caption: this.textBottomRight, value: Asc.c_oAscSlideTransitionParams.Param_BottomRight},
{caption: this.textVerticalIn, value: Asc.c_oAscSlideTransitionParams.Split_VerticalIn},
{caption: this.textVerticalOut, value: Asc.c_oAscSlideTransitionParams.Split_VerticalOut},
{caption: this.textHorizontalIn, value: Asc.c_oAscSlideTransitionParams.Split_HorizontalIn},
{caption: this.textHorizontalOut, value: Asc.c_oAscSlideTransitionParams.Split_HorizontalOut},
{caption: this.textClockwise, value: Asc.c_oAscSlideTransitionParams.Clock_Clockwise},
{caption: this.textCounterclockwise, value: Asc.c_oAscSlideTransitionParams.Clock_Counterclockwise},
{caption: this.textWedge, value: Asc.c_oAscSlideTransitionParams.Clock_Wedge},
{caption: this.textZoomIn, value: Asc.c_oAscSlideTransitionParams.Zoom_In},
{caption: this.textZoomOut, value: Asc.c_oAscSlideTransitionParams.Zoom_Out},
{caption: this.textZoomRotate, value: Asc.c_oAscSlideTransitionParams.Zoom_AndRotate}
];
{caption: this.textSmoothly, value: Asc.c_oAscSlideTransitionParams.Fade_Smoothly},
{caption: this.textBlack, value: Asc.c_oAscSlideTransitionParams.Fade_Through_Black},
{caption: this.textLeft, value: Asc.c_oAscSlideTransitionParams.Param_Left},
{caption: this.textTop, value: Asc.c_oAscSlideTransitionParams.Param_Top},
{caption: this.textRight, value: Asc.c_oAscSlideTransitionParams.Param_Right},
{caption: this.textBottom, value: Asc.c_oAscSlideTransitionParams.Param_Bottom},
{caption: this.textTopLeft, value: Asc.c_oAscSlideTransitionParams.Param_TopLeft},
{caption: this.textTopRight, value: Asc.c_oAscSlideTransitionParams.Param_TopRight},
{caption: this.textBottomLeft, value: Asc.c_oAscSlideTransitionParams.Param_BottomLeft},
{caption: this.textBottomRight, value: Asc.c_oAscSlideTransitionParams.Param_BottomRight},
{caption: this.textVerticalIn, value: Asc.c_oAscSlideTransitionParams.Split_VerticalIn},
{caption: this.textVerticalOut, value: Asc.c_oAscSlideTransitionParams.Split_VerticalOut},
{caption: this.textHorizontalIn, value: Asc.c_oAscSlideTransitionParams.Split_HorizontalIn},
{caption: this.textHorizontalOut, value: Asc.c_oAscSlideTransitionParams.Split_HorizontalOut},
{caption: this.textClockwise, value: Asc.c_oAscSlideTransitionParams.Clock_Clockwise},
{caption: this.textCounterclockwise, value: Asc.c_oAscSlideTransitionParams.Clock_Counterclockwise},
{caption: this.textWedge, value: Asc.c_oAscSlideTransitionParams.Clock_Wedge},
{caption: this.textZoomIn, value: Asc.c_oAscSlideTransitionParams.Zoom_In},
{caption: this.textZoomOut, value: Asc.c_oAscSlideTransitionParams.Zoom_Out},
{caption: this.textZoomRotate, value: Asc.c_oAscSlideTransitionParams.Zoom_AndRotate},
{caption: this.textMorphObjects, value: Asc.c_oAscSlideTransitionParams.Morph_Objects},
{caption: this.textMorphWord, value: Asc.c_oAscSlideTransitionParams.Morph_Words},
{caption: this.textMorphLetters, value: Asc.c_oAscSlideTransitionParams.Morph_Letters}
];
var itemsMenu = [];
_.each(arrEffectType, function (item) {
itemsMenu.push({
caption: item.caption,
value: item.value,
checkable: true,
toggleGroup: 'effects'
});
caption: item.caption, value: item.value,
checkable: true,
toggleGroup: 'effects'
});
});
return itemsMenu;
},
@ -329,7 +332,7 @@ define([
var me = this;
(new Promise(function (accept, reject) {
accept();
})).then(function() {
})).then(function () {
setEvents.call(me);
});
@ -347,8 +350,7 @@ define([
return this.$el;
},
renderComponent: function (compid, obj)
{
renderComponent: function (compid, obj) {
var element = this.$el.find(compid);
element.parent().append(obj.el);
},
@ -366,12 +368,11 @@ define([
setDisabled: function (state) {
this.lockedControls && this.lockedControls.forEach(function (button) {
button.setDisabled(state);
button.setDisabled(state);
}, this);
},
setMenuParameters: function (effect, value)
{
setMenuParameters: function (effect, value) {
var minMax = [-1, -1];
switch (effect) {
case Asc.c_oAscSlideTransitionTypes.Fade:
@ -398,24 +399,26 @@ define([
case Asc.c_oAscSlideTransitionTypes.Zoom:
minMax = [17, 19];
break;
case Asc.c_oAscSlideTransitionTypes.Morph:
minMax = [20, 22];
break;
}
var selectedElement;
_.each(this.btnParameters.menu.items, function (element, index) {
if ((index >= minMax[0])&&(index <= minMax[1])) {
if ((index >= minMax[0]) && (index <= minMax[1])) {
element.setVisible(true);
if (value != undefined) {
if (value == element.value) selectedElement = element;
}
}
else
} else
element.setVisible(false);
});
if (selectedElement == undefined)
selectedElement = this.btnParameters.menu.items[minMax[0]];
if (effect != Asc.c_oAscSlideTransitionTypes.None)
selectedElement.setChecked(true);
@ -426,10 +429,9 @@ define([
this.numDuration.setDisabled(effect === Asc.c_oAscSlideTransitionTypes.None);
this.lblDuration.setDisabled(effect === Asc.c_oAscSlideTransitionTypes.None);
}
return (selectedElement)?selectedElement.value:-1;
return (selectedElement) ? selectedElement.value : -1;
},
txtSec: 's',
txtPreview: 'Preview',
txtParameters: 'Parameters',
@ -446,7 +448,7 @@ define([
textCover: 'Cover',
textClock: 'Clock',
textZoom: 'Zoom',
textMorph: 'Morph',
textSmoothly: 'Smoothly',
textBlack: 'Through Black',
textLeft: 'Left',
@ -466,7 +468,10 @@ define([
textWedge: 'Wedge',
textZoomIn: 'Zoom In',
textZoomOut: 'Zoom Out',
textZoomRotate: 'Zoom and Rotate'
textZoomRotate: 'Zoom and Rotate',
textMorphObjects: 'Objects',
textMorphWord: 'Words',
textMorphLetters: 'Letters'
}
}()), PE.Views.Transitions || {}));

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

@ -2712,6 +2712,10 @@
"PE.Views.Transitions.textHorizontalIn": "Horizontal In",
"PE.Views.Transitions.textHorizontalOut": "Horizontal Out",
"PE.Views.Transitions.textLeft": "From Left",
"PE.Views.Transitions.textMorph": "Morph",
"PE.Views.Transitions.textMorphLetters": "Letters",
"PE.Views.Transitions.textMorphObjects": "Objects",
"PE.Views.Transitions.textMorphWord": "Words",
"PE.Views.Transitions.textNone": "None",
"PE.Views.Transitions.textPush": "Push",
"PE.Views.Transitions.textRight": "From Right",

BIN
apps/presentationeditor/main/resources/img/toolbar/1.25x/big/btn-transition-morph.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 600 B

BIN
apps/presentationeditor/main/resources/img/toolbar/1.5x/big/btn-transition-morph.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 496 B

BIN
apps/presentationeditor/main/resources/img/toolbar/1.75x/big/btn-transition-morph.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 592 B

BIN
apps/presentationeditor/main/resources/img/toolbar/1x/big/btn-transition-morph.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 407 B

6
apps/presentationeditor/main/resources/img/toolbar/2.5x/big/btn-transition-morph.svg Normal file
View File

@ -0,0 +1,6 @@
<svg width="28" height="28" viewBox="0 0 28 28" fill="none" xmlns="http://www.w3.org/2000/svg">
<rect x="3.5" y="4.5" width="21" height="18" rx="0.5" stroke="black"/>
<path opacity="0.4" fill-rule="evenodd" clip-rule="evenodd" d="M14.9854 17.9999C14.9903 18 14.9951 18 15 18H22C22.5523 18 23 17.5523 23 17V10C23 9.44772 22.5523 9 22 9H15C14.9722 9 14.9447 9.00113 14.9175 9.00335L19.4498 13.5356L14.9854 17.9999ZM14 10.9142V10.5L14.5 10L18.0355 13.5356L14.5 17.0711L14 16.5711V16.1569L16.1213 14.0356L14 14.0356V13.5V13.0356L16.1213 13.0356L14 10.9142ZM13.9763 13.0356C13.992 13.1882 14 13.3432 14 13.5C14 13.6812 13.9893 13.8599 13.9685 14.0356L9 14.0356V13.0356L13.9763 13.0356ZM13 10.6713C12.175 9.65183 10.9136 9 9.5 9C7.01472 9 5 11.0147 5 13.5C5 15.9853 7.01472 18 9.5 18C10.9136 18 12.175 17.3482 13 16.3287V15L8 15.0356L8 12.0356L13 12V10.6713Z" fill="black"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M14.9854 17.9999C14.9903 18 14.9951 18 15 18H22C22.5523 18 23 17.5523 23 17V10C23 9.44772 22.5523 9 22 9H15C14.9722 9 14.9447 9.00113 14.9175 9.00335L15.9142 10H22V17H15.9853L14.9854 17.9999ZM15 10.5L14.5 10L14 10.5V10.9142L15 11.9142V10.5ZM15 13.0356L14 13.0356V13.5C14 13.3432 13.992 13.1882 13.9763 13.0356H12.9695C12.9896 13.1875 13 13.3425 13 13.5C13 13.6821 12.9861 13.861 12.9593 14.0356H13.9685C13.9893 13.8599 14 13.6812 14 13.5V14.0356L15 14.0356V13.0356ZM15 15.1569V16.5711L14.5 17.0711L14 16.5711V16.1569L15 15.1569ZM13.7435 15.0013C13.5714 15.4876 13.3182 15.9355 13 16.3287C12.175 17.3482 10.9136 18 9.5 18C7.01472 18 5 15.9853 5 13.5C5 11.0147 7.01472 9 9.5 9C10.9136 9 12.175 9.65183 13 10.6713C13.3187 11.0652 13.5723 11.514 13.7444 12.0013L12.6664 12.0068C12.1061 10.8207 10.8989 10 9.5 10C7.567 10 6 11.567 6 13.5C6 15.433 7.567 17 9.5 17C10.8935 17 12.0968 16.1856 12.6599 15.0068L13.7435 15.0013Z" fill="black"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M14.5 17.071L13.7929 16.3639L16.1213 14.0355L8.99998 14.0355L8.99998 13.0355L16.1213 13.0355L13.7929 10.7071L14.5 9.99998L17.3284 12.8284L18.0355 13.5355L17.3284 14.2426L14.5 17.071Z" fill="black"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 2.1 KiB

BIN
apps/presentationeditor/main/resources/img/toolbar/2x/big/btn-transition-morph.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 749 B

13
apps/presentationeditor/mobile/src/view/edit/EditSlide.jsx
View File

@ -133,7 +133,8 @@ const PageTransition = props => {
{displayValue: _t.textUnCover, value: Asc.c_oAscSlideTransitionTypes.UnCover},
{displayValue: _t.textCover, value: Asc.c_oAscSlideTransitionTypes.Cover},
{displayValue: _t.textClock, value: Asc.c_oAscSlideTransitionTypes.Clock},
{displayValue: _t.textZoom, value: Asc.c_oAscSlideTransitionTypes.Zoom}
{displayValue: _t.textZoom, value: Asc.c_oAscSlideTransitionTypes.Zoom},
{displayValue: _t.textZoom, value: Asc.c_oAscSlideTransitionTypes.Morph}
];
const _arrEffectType = [
{displayValue: _t.textSmoothly, value: Asc.c_oAscSlideTransitionParams.Fade_Smoothly},
@ -155,7 +156,10 @@ const PageTransition = props => {
{displayValue: _t.textWedge, value: Asc.c_oAscSlideTransitionParams.Clock_Wedge},
{displayValue: _t.textZoomIn, value: Asc.c_oAscSlideTransitionParams.Zoom_In},
{displayValue: _t.textZoomOut, value: Asc.c_oAscSlideTransitionParams.Zoom_Out},
{displayValue: _t.textZoomRotate, value: Asc.c_oAscSlideTransitionParams.Zoom_AndRotate}
{displayValue: _t.textZoomRotate, value: Asc.c_oAscSlideTransitionParams.Zoom_AndRotate},
{displayValue: _t.textMorphObjects, value: Asc.c_oAscSlideTransitionParams.Morph_Objects},
{displayValue: _t.textMorphWord, value: Asc.c_oAscSlideTransitionParams.Morph_Words},
{displayValue: _t.textMorphLetters, value: Asc.c_oAscSlideTransitionParams.Morph_Letters}
];
let _arrCurrentEffectTypes = [];
@ -185,7 +189,10 @@ const PageTransition = props => {
_arrCurrentEffectTypes = _arrEffectType.slice(14, 17);
break;
case Asc.c_oAscSlideTransitionTypes.Zoom:
_arrCurrentEffectTypes = _arrEffectType.slice(17);
_arrCurrentEffectTypes = _arrEffectType.slice(17,20);
break;
case Asc.c_oAscSlideTransitionTypes.Morph:
_arrCurrentEffectTypes = _arrEffectType.slice(20);
break;
}
return (_arrCurrentEffectTypes.length > 0) ? _arrCurrentEffectTypes[0].value : -1;