diff --git a/apps/presentationeditor/main/app/controller/Transitions.js b/apps/presentationeditor/main/app/controller/Transitions.js
index 14de270383..2975292e26 100644
--- a/apps/presentationeditor/main/app/controller/Transitions.js
+++ b/apps/presentationeditor/main/app/controller/Transitions.js
@@ -179,13 +179,15 @@ define([
onEffectSelect: function (combo, record) {
var type = record.get('value');
var parameter = this._state.EffectType;
+ var prismId = (type === Asc.c_oAscSlideTransitionTypes.Prism) ? record.get('prismId') : undefined;
- if (this._state.Effect !== type &&
+ if ((this._state.Effect !== type || (type === Asc.c_oAscSlideTransitionTypes.Prism && this._state.prismId !== prismId)) &&
!((this._state.Effect === Asc.c_oAscSlideTransitionTypes.Wipe || this._state.Effect === Asc.c_oAscSlideTransitionTypes.UnCover || this._state.Effect === Asc.c_oAscSlideTransitionTypes.Cover)&&
(type === Asc.c_oAscSlideTransitionTypes.Wipe || type === Asc.c_oAscSlideTransitionTypes.UnCover || type === Asc.c_oAscSlideTransitionTypes.Cover)))
- parameter = this.view.setMenuParameters(type);
+ parameter = this.view.setMenuParameters(type, this._state.EffectType, prismId);
this._state.Effect = type;
+ this._state.prismId = prismId;
this.onParameterClick(parameter);
Common.NotificationCenter.trigger('edit:complete', this.view);
},
@@ -223,6 +225,11 @@ define([
if (transition) {
this._state.Effect = transition.get_TransitionType();
this._state.EffectType = transition.get_TransitionOption();
+ if (this._state.Effect === Asc.c_oAscSlideTransitionTypes.Prism) {
+ var effectRecord = this.view && this.view.getEffect(this._state.Effect, this._state.EffectType);
+ this._state.prismId = effectRecord ? effectRecord.get('prismId') : undefined;
+ } else this._state.prismId = undefined;
+
var value = transition.get_TransitionDuration();
if (Math.abs(this._state.Duration - value) > 0.001 ||
@@ -265,12 +272,16 @@ define([
var me = this.view;
if (this._state.Effect !== undefined) {
var item = me.listEffects.store.findWhere({value: this._state.Effect});
+ if (this._state.Effect === Asc.c_oAscSlideTransitionTypes.Prism)
+ item = me.getEffect(this._state.Effect, this._state.EffectType) || item;
+
me.listEffects.menuPicker.selectRecord(item ? item : me.listEffects.menuPicker.items[0]);
this.view.btnParameters.setIconCls('toolbar__icon ' + item.get('imageUrl'));
+ this._state.prismId = this._state.Effect === Asc.c_oAscSlideTransitionTypes.Prism ? item.get('prismId') : undefined;
}
if (me.btnParameters.menu.getItemsLength() > 0 && this._state.EffectType !== undefined)
- me.setMenuParameters(this._state.Effect, this._state.EffectType);
+ me.setMenuParameters(this._state.Effect, this._state.EffectType, this._state.prismId);
me.numDuration.setValue((this._state.Duration !== null && this._state.Duration !== undefined) ? this._state.Duration / 1000. : '', true);
me.numDelay.setValue((this._state.Delay !== null && this._state.Delay !== undefined) ? this._state.Delay / 1000. : '', true);
diff --git a/apps/presentationeditor/main/app/view/Transitions.js b/apps/presentationeditor/main/app/view/Transitions.js
index 527f1ba7e0..002b7d108b 100644
--- a/apps/presentationeditor/main/app/view/Transitions.js
+++ b/apps/presentationeditor/main/app/view/Transitions.js
@@ -120,17 +120,40 @@ define([
this.lockedControls = [];
this._arrEffectName = [
- {title: this.textNone, imageUrl: "btn-transition-none", value: Asc.c_oAscSlideTransitionTypes.None, id: Common.UI.getId()},
- {title: this.textMorph, imageUrl: "btn-transition-morph", value: Asc.c_oAscSlideTransitionTypes.Morph, id: Common.UI.getId()},
- {title: this.textFade, imageUrl: "btn-transition-fade", value: Asc.c_oAscSlideTransitionTypes.Fade, id: Common.UI.getId()},
- {title: this.textPush, imageUrl: "btn-transition-push", value: Asc.c_oAscSlideTransitionTypes.Push, id: Common.UI.getId()},
- {title: this.textWipe, imageUrl: "btn-transition-wipe", value: Asc.c_oAscSlideTransitionTypes.Wipe, id: Common.UI.getId()},
- {title: this.textSplit, imageUrl: "btn-transition-split", value: Asc.c_oAscSlideTransitionTypes.Split, id: Common.UI.getId()},
- {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()},
- {title: this.textRandom, imageUrl: "btn-transition-random", value: Asc.c_oAscSlideTransitionTypes.Random, id: Common.UI.getId(), cls: 'last-item'}
+ {group: 'subtle', title: this.textNone, imageUrl: "btn-transition-none", value: Asc.c_oAscSlideTransitionTypes.None, id: Common.UI.getId()},
+ {group: 'subtle', title: this.textMorph, imageUrl: "btn-transition-morph", value: Asc.c_oAscSlideTransitionTypes.Morph, id: Common.UI.getId()},
+ {group: 'subtle', title: this.textFade, imageUrl: "btn-transition-fade", value: Asc.c_oAscSlideTransitionTypes.Fade, id: Common.UI.getId()},
+ {group: 'subtle', title: this.textPush, imageUrl: "btn-transition-push", value: Asc.c_oAscSlideTransitionTypes.Push, id: Common.UI.getId()},
+ {group: 'subtle', title: this.textWipe, imageUrl: "btn-transition-wipe", value: Asc.c_oAscSlideTransitionTypes.Wipe, id: Common.UI.getId()},
+ {group: 'subtle', title: this.textSplit, imageUrl: "btn-transition-split", value: Asc.c_oAscSlideTransitionTypes.Split, id: Common.UI.getId()},
+ {group: 'subtle', title: this.textCut, imageUrl: "btn-transition-cut", value: Asc.c_oAscSlideTransitionTypes.Cut, id: Common.UI.getId()},
+ {group: 'subtle', title: this.textRandomBars, imageUrl: "btn-transition-randombars", value: Asc.c_oAscSlideTransitionTypes.RandomBar, id: Common.UI.getId()},
+ {group: 'subtle', title: this.textUnCover, imageUrl: "btn-transition-uncover", value: Asc.c_oAscSlideTransitionTypes.UnCover, id: Common.UI.getId()},
+ {group: 'subtle', title: this.textCover, imageUrl: "btn-transition-cover", value: Asc.c_oAscSlideTransitionTypes.Cover, id: Common.UI.getId()},
+ {group: 'subtle', title: this.textCircle, imageUrl: "btn-transition-circle", value: Asc.c_oAscSlideTransitionTypes.Circle, id: Common.UI.getId()},
+ {group: 'subtle', title: this.textDiamond, imageUrl: "btn-transition-diamond", value: Asc.c_oAscSlideTransitionTypes.Diamond, id: Common.UI.getId()},
+ {group: 'subtle', title: this.textPlus, imageUrl: "btn-transition-plus", value: Asc.c_oAscSlideTransitionTypes.Plus, id: Common.UI.getId()},
+ {group: 'exciting', title: this.textDissolve, imageUrl: "btn-transition-dissolve", value: Asc.c_oAscSlideTransitionTypes.Dissolve, id: Common.UI.getId()},
+ {group: 'exciting', title: this.textChecker, imageUrl: "btn-transition-checker", value: Asc.c_oAscSlideTransitionTypes.Checker, id: Common.UI.getId()},
+ {group: 'exciting', title: this.textBlinds, imageUrl: "btn-transition-blinds", value: Asc.c_oAscSlideTransitionTypes.Blinds, id: Common.UI.getId()},
+ {group: 'exciting', title: this.textClock, imageUrl: "btn-transition-clock", value: Asc.c_oAscSlideTransitionTypes.Clock, id: Common.UI.getId()},
+ {group: 'exciting', title: this.textRipple, imageUrl: "btn-transition-ripple", value: Asc.c_oAscSlideTransitionTypes.Ripple, id: Common.UI.getId()},
+ {group: 'exciting', title: this.textHoneycomb, imageUrl: "btn-transition-honeycomb", value: Asc.c_oAscSlideTransitionTypes.Honeycomb, id: Common.UI.getId()},
+ {group: 'exciting', title: this.textVortex, imageUrl: "btn-transition-vortex", value: Asc.c_oAscSlideTransitionTypes.Vortex, id: Common.UI.getId()},
+ {group: 'exciting', title: this.textSwitch, imageUrl: "btn-transition-switch", value: Asc.c_oAscSlideTransitionTypes.Switch, id: Common.UI.getId()},
+ {group: 'exciting', title: this.textFlip, imageUrl: "btn-transition-flip", value: Asc.c_oAscSlideTransitionTypes.Flip, id: Common.UI.getId()},
+ {group: 'exciting', title: this.textGallery, imageUrl: "btn-transition-gallery", value: Asc.c_oAscSlideTransitionTypes.Gallery, id: Common.UI.getId()},
+ {group: 'exciting', title: this.textCube, imageUrl: "btn-transition-cube", prismId: 'prism-cube', value: Asc.c_oAscSlideTransitionTypes.Prism, id: Common.UI.getId()},
+ {group: 'exciting', title: this.textBoxZoom, imageUrl: "btn-transition-boxzoom", value: Asc.c_oAscSlideTransitionTypes.BoxZoom, id: Common.UI.getId()},
+ {group: 'exciting', title: this.textDoors, imageUrl: "btn-transition-doors", value: Asc.c_oAscSlideTransitionTypes.Doors, id: Common.UI.getId()},
+ {group: 'exciting', title: this.textBox, imageUrl: "btn-transition-box", prismId: 'prism-box', value: Asc.c_oAscSlideTransitionTypes.Prism, id: Common.UI.getId()},
+ {group: 'exciting', title: this.textComb, imageUrl: "btn-transition-comb", value: Asc.c_oAscSlideTransitionTypes.Comb, id: Common.UI.getId()},
+ {group: 'exciting', title: this.textZoom, imageUrl: "btn-transition-zoom", value: Asc.c_oAscSlideTransitionTypes.Zoom, id: Common.UI.getId()},
+ {group: 'exciting', title: this.textRandom, imageUrl: "btn-transition-random", value: Asc.c_oAscSlideTransitionTypes.Random, id: Common.UI.getId()},
+ {group: 'dynamic-content', title: this.textFerris, imageUrl: "btn-transition-ferris", value: Asc.c_oAscSlideTransitionTypes.Ferris, id: Common.UI.getId()},
+ {group: 'dynamic-content', title: this.textRotate, imageUrl: "btn-transition-rotate", prismId: 'prism-rotate', value: Asc.c_oAscSlideTransitionTypes.Prism, id: Common.UI.getId()},
+ {group: 'dynamic-content', title: this.textWindow, imageUrl: "btn-transition-window", value: Asc.c_oAscSlideTransitionTypes.Window, id: Common.UI.getId()},
+ {group: 'dynamic-content', title: this.textOrbit, imageUrl: "btn-transition-orbit", prismId: 'prism-orbit', value: Asc.c_oAscSlideTransitionTypes.Prism, id: Common.UI.getId(), cls: 'last-item'}
];
this._arrEffectName.forEach(function (item) {
item.tip = item.title;
@@ -142,6 +165,7 @@ define([
cls: 'combo-transitions',
itemWidth: itemWidth,
itemHeight: itemHeight,
+ menuMaxHeight: 350,
style: 'min-width:115px;',
autoWidth: true,
itemTemplate: _.template([
@@ -150,6 +174,11 @@ define([
'
<%= title %>
',
''
].join('')),
+ groups: new Common.UI.DataViewGroupStore([
+ {id: 'subtle', caption: this.textSubtle},
+ {id: 'exciting', caption: this.textExciting},
+ {id: 'dynamic-content', caption: this.textDynamicContent}
+ ]),
enableKeyEvents: true,
lock: [_set.slideDeleted, _set.noSlides, _set.disableOnStart, _set.transitLock],
dataHint: '1',
@@ -314,7 +343,56 @@ define([
{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}
+ {caption: this.textMorphLetters, value: Asc.c_oAscSlideTransitionParams.Morph_Letters},
+ {caption: this.textSmoothly, value: Asc.c_oAscSlideTransitionParams.Cut_Default},
+ {caption: this.textBlack, value: Asc.c_oAscSlideTransitionParams.Cut_ThroughBlack},
+ {caption: this.textHorizontal, value: Asc.c_oAscSlideTransitionParams.Blinds_Horizontal},
+ {caption: this.textVertical, value: Asc.c_oAscSlideTransitionParams.Blinds_Vertical},
+ {caption: this.textHorizontal, value: Asc.c_oAscSlideTransitionParams.Checker_Horizontal},
+ {caption: this.textVertical, value: Asc.c_oAscSlideTransitionParams.Checker_Vertical},
+ {caption: this.textHorizontal, value: Asc.c_oAscSlideTransitionParams.Comb_Horizontal},
+ {caption: this.textVertical, value: Asc.c_oAscSlideTransitionParams.Comb_Vertical},
+ {caption: this.textHorizontal, value: Asc.c_oAscSlideTransitionParams.RandomBar_Horizontal},
+ {caption: this.textVertical, value: Asc.c_oAscSlideTransitionParams.RandomBar_Vertical},
+ {caption: this.textIn, value: Asc.c_oAscSlideTransitionParams.BoxZoom_In},
+ {caption: this.textOut, value: Asc.c_oAscSlideTransitionParams.BoxZoom_Out},
+ {caption: this.textLeft, value: Asc.c_oAscSlideTransitionParams.Vortex_Left},
+ {caption: this.textRight, value: Asc.c_oAscSlideTransitionParams.Vortex_Right},
+ {caption: this.textTop, value: Asc.c_oAscSlideTransitionParams.Vortex_Up},
+ {caption: this.textBottom, value: Asc.c_oAscSlideTransitionParams.Vortex_Down},
+ {caption: this.textLeftShort, value: Asc.c_oAscSlideTransitionParams.Switch_Left},
+ {caption: this.textRightShort, value: Asc.c_oAscSlideTransitionParams.Switch_Right},
+ {caption: this.textLeftShort, value: Asc.c_oAscSlideTransitionParams.Flip_Left},
+ {caption: this.textRightShort, value: Asc.c_oAscSlideTransitionParams.Flip_Right},
+ {caption: this.textCenter, value: Asc.c_oAscSlideTransitionParams.Ripple_Center},
+ {caption: this.textTopLeft, value: Asc.c_oAscSlideTransitionParams.Ripple_LeftUp},
+ {caption: this.textTopRight, value: Asc.c_oAscSlideTransitionParams.Ripple_RightUp},
+ {caption: this.textBottomLeft, value: Asc.c_oAscSlideTransitionParams.Ripple_LeftDown},
+ {caption: this.textBottomRight, value: Asc.c_oAscSlideTransitionParams.Ripple_RightDown},
+ {caption: this.textLeft, value: Asc.c_oAscSlideTransitionParams.Prism_Left},
+ {caption: this.textRight, value: Asc.c_oAscSlideTransitionParams.Prism_Right},
+ {caption: this.textTop, value: Asc.c_oAscSlideTransitionParams.Prism_Up},
+ {caption: this.textBottom, value: Asc.c_oAscSlideTransitionParams.Prism_Down},
+ {caption: this.textLeft, value: Asc.c_oAscSlideTransitionParams.Prism_Left_Inverted},
+ {caption: this.textRight, value: Asc.c_oAscSlideTransitionParams.Prism_Right_Inverted},
+ {caption: this.textTop, value: Asc.c_oAscSlideTransitionParams.Prism_Up_Inverted},
+ {caption: this.textBottom, value: Asc.c_oAscSlideTransitionParams.Prism_Down_Inverted},
+ {caption: this.textLeft, value: Asc.c_oAscSlideTransitionParams.Prism_Left_Content},
+ {caption: this.textRight, value: Asc.c_oAscSlideTransitionParams.Prism_Right_Content},
+ {caption: this.textTop, value: Asc.c_oAscSlideTransitionParams.Prism_Up_Content},
+ {caption: this.textBottom, value: Asc.c_oAscSlideTransitionParams.Prism_Down_Content},
+ {caption: this.textLeft, value: Asc.c_oAscSlideTransitionParams.Prism_Left_ContentInv},
+ {caption: this.textRight, value: Asc.c_oAscSlideTransitionParams.Prism_Right_ContentInv},
+ {caption: this.textTop, value: Asc.c_oAscSlideTransitionParams.Prism_Up_ContentInv},
+ {caption: this.textBottom, value: Asc.c_oAscSlideTransitionParams.Prism_Down_ContentInv},
+ {caption: this.textHorizontal, value: Asc.c_oAscSlideTransitionParams.Doors_Horizontal},
+ {caption: this.textVertical, value: Asc.c_oAscSlideTransitionParams.Doors_Vertical},
+ {caption: this.textHorizontal, value: Asc.c_oAscSlideTransitionParams.Window_Horizontal},
+ {caption: this.textVertical, value: Asc.c_oAscSlideTransitionParams.Window_Vertical},
+ {caption: this.textLeftShort, value: Asc.c_oAscSlideTransitionParams.Ferris_Left},
+ {caption: this.textRightShort, value: Asc.c_oAscSlideTransitionParams.Ferris_Right},
+ {caption: this.textLeftShort, value: Asc.c_oAscSlideTransitionParams.Gallery_Left},
+ {caption: this.textRightShort, value: Asc.c_oAscSlideTransitionParams.Gallery_Right}
];
var itemsMenu = [];
@@ -372,7 +450,26 @@ define([
}, this);
},
- setMenuParameters: function (effect, value) {
+ getPrismId: function (value) {
+ var prismId = 'prism-cube';
+ if (value >= Asc.c_oAscSlideTransitionParams.Prism_Left_Inverted && value <= Asc.c_oAscSlideTransitionParams.Prism_Down_Inverted)
+ prismId = 'prism-box';
+ else if (value >= Asc.c_oAscSlideTransitionParams.Prism_Left_Content && value <= Asc.c_oAscSlideTransitionParams.Prism_Down_Content)
+ prismId = 'prism-rotate';
+ else if (value >= Asc.c_oAscSlideTransitionParams.Prism_Left_ContentInv && value <= Asc.c_oAscSlideTransitionParams.Prism_Down_ContentInv)
+ prismId = 'prism-orbit';
+ return prismId;
+ },
+
+ getEffect: function (effect, value) {
+ if (effect === Asc.c_oAscSlideTransitionTypes.Prism) {
+ var prism = this.getPrismId(value);
+ return this.listEffects.store.findWhere({prismId: prism});
+ }
+ return this.listEffects.store.findWhere({value: effect});
+ },
+
+ setMenuParameters: function (effect, value, prismId) {
var minMax = [-1, -1];
switch (effect) {
case Asc.c_oAscSlideTransitionTypes.Fade:
@@ -402,6 +499,65 @@ define([
case Asc.c_oAscSlideTransitionTypes.Morph:
minMax = [20, 22];
break;
+ case Asc.c_oAscSlideTransitionTypes.Cut:
+ minMax = [23, 24];
+ break;
+ case Asc.c_oAscSlideTransitionTypes.Blinds:
+ minMax = [25, 26];
+ break;
+ case Asc.c_oAscSlideTransitionTypes.Checker:
+ minMax = [27, 28];
+ break;
+ case Asc.c_oAscSlideTransitionTypes.Comb:
+ minMax = [29, 30];
+ break;
+ case Asc.c_oAscSlideTransitionTypes.RandomBar:
+ minMax = [31, 32];
+ break;
+ case Asc.c_oAscSlideTransitionTypes.BoxZoom:
+ minMax = [33, 34];
+ break;
+ case Asc.c_oAscSlideTransitionTypes.Vortex:
+ minMax = [35, 38];
+ break;
+ case Asc.c_oAscSlideTransitionTypes.Switch:
+ minMax = [39, 40];
+ break;
+ case Asc.c_oAscSlideTransitionTypes.Flip:
+ minMax = [41, 42];
+ break;
+ case Asc.c_oAscSlideTransitionTypes.Ripple:
+ minMax = [43, 47];
+ break;
+ case Asc.c_oAscSlideTransitionTypes.Prism:
+ var prism = prismId || this.getPrismId(value);
+ switch (prism) {
+ case 'prism-box':
+ minMax = [52, 55];
+ break;
+ case 'prism-rotate':
+ minMax = [56, 59];
+ break;
+ case 'prism-orbit':
+ minMax = [60, 63];
+ break;
+ default:
+ minMax = [48, 51];
+ break;
+ }
+ break;
+ case Asc.c_oAscSlideTransitionTypes.Doors:
+ minMax = [64, 65];
+ break;
+ case Asc.c_oAscSlideTransitionTypes.Window:
+ minMax = [66, 67];
+ break;
+ case Asc.c_oAscSlideTransitionTypes.Ferris:
+ minMax = [68, 69];
+ break;
+ case Asc.c_oAscSlideTransitionTypes.Gallery:
+ minMax = [70, 71];
+ break;
}
var selectedElement;
@@ -423,11 +579,16 @@ define([
selectedElement.setChecked(true);
if (!this.listEffects.isDisabled()) {
+ var noParameters = effect === Asc.c_oAscSlideTransitionTypes.None ||
+ effect === Asc.c_oAscSlideTransitionTypes.Random ||
+ effect === Asc.c_oAscSlideTransitionTypes.Circle ||
+ effect === Asc.c_oAscSlideTransitionTypes.Diamond ||
+ effect === Asc.c_oAscSlideTransitionTypes.Dissolve ||
+ effect === Asc.c_oAscSlideTransitionTypes.Plus ||
+ effect === Asc.c_oAscSlideTransitionTypes.Honeycomb;
+
this.numDelay.setDisabled(this.chDelay.getValue() !== 'checked');
- this.btnParameters.setDisabled(
- effect === Asc.c_oAscSlideTransitionTypes.None ||
- effect === Asc.c_oAscSlideTransitionTypes.Random
- );
+ this.btnParameters.setDisabled(noParameters);
this.btnPreview.setDisabled(effect === Asc.c_oAscSlideTransitionTypes.None);
this.numDuration.setDisabled(effect === Asc.c_oAscSlideTransitionTypes.None);
this.lblDuration.setDisabled(effect === Asc.c_oAscSlideTransitionTypes.None);
@@ -437,4 +598,4 @@ define([
}
}()), PE.Views.Transitions || {}));
- });
\ No newline at end of file
+ });
diff --git a/apps/presentationeditor/main/locale/en.json b/apps/presentationeditor/main/locale/en.json
index ab183410dc..79d8747b87 100644
--- a/apps/presentationeditor/main/locale/en.json
+++ b/apps/presentationeditor/main/locale/en.json
@@ -3616,6 +3616,39 @@
"PE.Views.Transitions.txtParameters": "Options",
"PE.Views.Transitions.txtPreview": "Preview",
"PE.Views.Transitions.txtSec": "s",
+ "PE.Views.Transitions.textCut": "Cut",
+ "PE.Views.Transitions.textCube": "Cube",
+ "PE.Views.Transitions.textCenter": "From Center",
+ "PE.Views.Transitions.textDynamicContent": "Dynamic Content",
+ "PE.Views.Transitions.textDiamond": "Diamond",
+ "PE.Views.Transitions.textDissolve": "Dissolve",
+ "PE.Views.Transitions.textDoors": "Doors",
+ "PE.Views.Transitions.textExciting": "Exciting",
+ "PE.Views.Transitions.textFerris": "Ferris",
+ "PE.Views.Transitions.textFlip": "Flip",
+ "PE.Views.Transitions.textGallery": "Gallery",
+ "PE.Views.Transitions.textHorizontal": "Horizontal",
+ "PE.Views.Transitions.textHoneycomb": "Honeycomb",
+ "PE.Views.Transitions.textIn": "In",
+ "PE.Views.Transitions.textChecker": "Checker",
+ "PE.Views.Transitions.textLeftShort": "Left",
+ "PE.Views.Transitions.textBox": "Box",
+ "PE.Views.Transitions.textBoxZoom": "Box Zoom",
+ "PE.Views.Transitions.textBlinds": "Blinds",
+ "PE.Views.Transitions.textOrbit": "Orbit",
+ "PE.Views.Transitions.textOut": "Out",
+ "PE.Views.Transitions.textPlus": "Plus",
+ "PE.Views.Transitions.textRandomBars": "Random Bars",
+ "PE.Views.Transitions.textRipple": "Ripple",
+ "PE.Views.Transitions.textRightShort": "Right",
+ "PE.Views.Transitions.textRotate": "Rotate",
+ "PE.Views.Transitions.textSubtle": "Subtle",
+ "PE.Views.Transitions.textSwitch": "Switch",
+ "PE.Views.Transitions.textVertical": "Vertical",
+ "PE.Views.Transitions.textVortex": "Vortex",
+ "PE.Views.Transitions.textComb": "Comb",
+ "PE.Views.Transitions.textCircle": "Circle",
+ "PE.Views.Transitions.textWindow": "Window",
"PE.Views.ViewTab.capBtnHand": "Hand",
"PE.Views.ViewTab.capBtnSelect": "Select",
"PE.Views.ViewTab.textAddHGuides": "Add horizontal guide",
diff --git a/apps/presentationeditor/main/locale/ru.json b/apps/presentationeditor/main/locale/ru.json
index 291e6d26fb..55f0a793ce 100644
--- a/apps/presentationeditor/main/locale/ru.json
+++ b/apps/presentationeditor/main/locale/ru.json
@@ -3607,6 +3607,13 @@
"PE.Views.Transitions.txtParameters": "Опции",
"PE.Views.Transitions.txtPreview": "Просмотр",
"PE.Views.Transitions.txtSec": "сек",
+ "PE.Views.Transitions.textCenter": "Из центра",
+ "PE.Views.Transitions.textHorizontal": "По горизонтали",
+ "PE.Views.Transitions.textIn": "Внутрь",
+ "PE.Views.Transitions.textLeftShort": "Влево",
+ "PE.Views.Transitions.textOut": "Наружу",
+ "PE.Views.Transitions.textRightShort": "Вправо",
+ "PE.Views.Transitions.textVertical": "По вертикали",
"PE.Views.ViewTab.capBtnHand": "Рука",
"PE.Views.ViewTab.capBtnSelect": "Выделить",
"PE.Views.ViewTab.textAddHGuides": "Добавить горизонтальную направляющую",
diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/btn-transition-blinds.png b/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/btn-transition-blinds.png
new file mode 100644
index 0000000000..2f0dfbc5a4
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/btn-transition-blinds.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/btn-transition-box.png b/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/btn-transition-box.png
new file mode 100644
index 0000000000..2f0dfbc5a4
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/btn-transition-box.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/btn-transition-boxzoom.png b/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/btn-transition-boxzoom.png
new file mode 100644
index 0000000000..2f0dfbc5a4
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/btn-transition-boxzoom.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/btn-transition-checker.png b/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/btn-transition-checker.png
new file mode 100644
index 0000000000..2f0dfbc5a4
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/btn-transition-checker.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/btn-transition-circle.png b/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/btn-transition-circle.png
new file mode 100644
index 0000000000..2f0dfbc5a4
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/btn-transition-circle.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/btn-transition-comb.png b/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/btn-transition-comb.png
new file mode 100644
index 0000000000..2f0dfbc5a4
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/btn-transition-comb.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/btn-transition-cube.png b/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/btn-transition-cube.png
new file mode 100644
index 0000000000..2f0dfbc5a4
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/btn-transition-cube.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/btn-transition-cut.png b/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/btn-transition-cut.png
new file mode 100644
index 0000000000..2f0dfbc5a4
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/btn-transition-cut.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/btn-transition-diamond.png b/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/btn-transition-diamond.png
new file mode 100644
index 0000000000..2f0dfbc5a4
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/btn-transition-diamond.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/btn-transition-dissolve.png b/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/btn-transition-dissolve.png
new file mode 100644
index 0000000000..2f0dfbc5a4
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/btn-transition-dissolve.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/btn-transition-doors.png b/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/btn-transition-doors.png
new file mode 100644
index 0000000000..2f0dfbc5a4
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/btn-transition-doors.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/btn-transition-ferris.png b/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/btn-transition-ferris.png
new file mode 100644
index 0000000000..2f0dfbc5a4
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/btn-transition-ferris.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/btn-transition-flip.png b/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/btn-transition-flip.png
new file mode 100644
index 0000000000..2f0dfbc5a4
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/btn-transition-flip.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/btn-transition-gallery.png b/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/btn-transition-gallery.png
new file mode 100644
index 0000000000..2f0dfbc5a4
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/btn-transition-gallery.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/btn-transition-honeycomb.png b/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/btn-transition-honeycomb.png
new file mode 100644
index 0000000000..2f0dfbc5a4
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/btn-transition-honeycomb.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/btn-transition-orbit.png b/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/btn-transition-orbit.png
new file mode 100644
index 0000000000..2f0dfbc5a4
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/btn-transition-orbit.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/btn-transition-plus.png b/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/btn-transition-plus.png
new file mode 100644
index 0000000000..2f0dfbc5a4
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/btn-transition-plus.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/btn-transition-randombars.png b/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/btn-transition-randombars.png
new file mode 100644
index 0000000000..2f0dfbc5a4
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/btn-transition-randombars.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/btn-transition-ripple.png b/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/btn-transition-ripple.png
new file mode 100644
index 0000000000..2f0dfbc5a4
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/btn-transition-ripple.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/btn-transition-rotate.png b/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/btn-transition-rotate.png
new file mode 100644
index 0000000000..2f0dfbc5a4
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/btn-transition-rotate.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/btn-transition-switch.png b/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/btn-transition-switch.png
new file mode 100644
index 0000000000..2f0dfbc5a4
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/btn-transition-switch.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/btn-transition-vortex.png b/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/btn-transition-vortex.png
new file mode 100644
index 0000000000..2f0dfbc5a4
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/btn-transition-vortex.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/btn-transition-window.png b/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/btn-transition-window.png
new file mode 100644
index 0000000000..2f0dfbc5a4
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/btn-transition-window.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/btn-transition-blinds.png b/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/btn-transition-blinds.png
new file mode 100644
index 0000000000..2f0dfbc5a4
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/btn-transition-blinds.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/btn-transition-box.png b/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/btn-transition-box.png
new file mode 100644
index 0000000000..2f0dfbc5a4
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/btn-transition-box.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/btn-transition-boxzoom.png b/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/btn-transition-boxzoom.png
new file mode 100644
index 0000000000..2f0dfbc5a4
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/btn-transition-boxzoom.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/btn-transition-checker.png b/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/btn-transition-checker.png
new file mode 100644
index 0000000000..2f0dfbc5a4
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/btn-transition-checker.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/btn-transition-circle.png b/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/btn-transition-circle.png
new file mode 100644
index 0000000000..2f0dfbc5a4
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/btn-transition-circle.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/btn-transition-comb.png b/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/btn-transition-comb.png
new file mode 100644
index 0000000000..2f0dfbc5a4
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/btn-transition-comb.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/btn-transition-cube.png b/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/btn-transition-cube.png
new file mode 100644
index 0000000000..2f0dfbc5a4
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/btn-transition-cube.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/btn-transition-cut.png b/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/btn-transition-cut.png
new file mode 100644
index 0000000000..2f0dfbc5a4
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/btn-transition-cut.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/btn-transition-diamond.png b/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/btn-transition-diamond.png
new file mode 100644
index 0000000000..2f0dfbc5a4
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/btn-transition-diamond.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/btn-transition-dissolve.png b/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/btn-transition-dissolve.png
new file mode 100644
index 0000000000..2f0dfbc5a4
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/btn-transition-dissolve.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/btn-transition-doors.png b/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/btn-transition-doors.png
new file mode 100644
index 0000000000..2f0dfbc5a4
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/btn-transition-doors.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/btn-transition-ferris.png b/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/btn-transition-ferris.png
new file mode 100644
index 0000000000..2f0dfbc5a4
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/btn-transition-ferris.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/btn-transition-flip.png b/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/btn-transition-flip.png
new file mode 100644
index 0000000000..2f0dfbc5a4
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/btn-transition-flip.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/btn-transition-gallery.png b/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/btn-transition-gallery.png
new file mode 100644
index 0000000000..2f0dfbc5a4
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/btn-transition-gallery.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/btn-transition-honeycomb.png b/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/btn-transition-honeycomb.png
new file mode 100644
index 0000000000..2f0dfbc5a4
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/btn-transition-honeycomb.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/btn-transition-orbit.png b/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/btn-transition-orbit.png
new file mode 100644
index 0000000000..2f0dfbc5a4
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/btn-transition-orbit.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/btn-transition-plus.png b/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/btn-transition-plus.png
new file mode 100644
index 0000000000..2f0dfbc5a4
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/btn-transition-plus.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/btn-transition-randombars.png b/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/btn-transition-randombars.png
new file mode 100644
index 0000000000..2f0dfbc5a4
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/btn-transition-randombars.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/btn-transition-ripple.png b/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/btn-transition-ripple.png
new file mode 100644
index 0000000000..2f0dfbc5a4
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/btn-transition-ripple.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/btn-transition-rotate.png b/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/btn-transition-rotate.png
new file mode 100644
index 0000000000..2f0dfbc5a4
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/btn-transition-rotate.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/btn-transition-switch.png b/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/btn-transition-switch.png
new file mode 100644
index 0000000000..2f0dfbc5a4
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/btn-transition-switch.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/btn-transition-vortex.png b/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/btn-transition-vortex.png
new file mode 100644
index 0000000000..2f0dfbc5a4
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/btn-transition-vortex.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/btn-transition-window.png b/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/btn-transition-window.png
new file mode 100644
index 0000000000..2f0dfbc5a4
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/btn-transition-window.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/btn-transition-blinds.png b/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/btn-transition-blinds.png
new file mode 100644
index 0000000000..2f0dfbc5a4
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/btn-transition-blinds.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/btn-transition-box.png b/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/btn-transition-box.png
new file mode 100644
index 0000000000..2f0dfbc5a4
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/btn-transition-box.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/btn-transition-boxzoom.png b/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/btn-transition-boxzoom.png
new file mode 100644
index 0000000000..2f0dfbc5a4
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/btn-transition-boxzoom.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/btn-transition-checker.png b/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/btn-transition-checker.png
new file mode 100644
index 0000000000..2f0dfbc5a4
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/btn-transition-checker.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/btn-transition-circle.png b/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/btn-transition-circle.png
new file mode 100644
index 0000000000..2f0dfbc5a4
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/btn-transition-circle.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/btn-transition-comb.png b/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/btn-transition-comb.png
new file mode 100644
index 0000000000..2f0dfbc5a4
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/btn-transition-comb.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/btn-transition-cube.png b/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/btn-transition-cube.png
new file mode 100644
index 0000000000..2f0dfbc5a4
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/btn-transition-cube.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/btn-transition-cut.png b/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/btn-transition-cut.png
new file mode 100644
index 0000000000..2f0dfbc5a4
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/btn-transition-cut.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/btn-transition-diamond.png b/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/btn-transition-diamond.png
new file mode 100644
index 0000000000..2f0dfbc5a4
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/btn-transition-diamond.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/btn-transition-dissolve.png b/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/btn-transition-dissolve.png
new file mode 100644
index 0000000000..2f0dfbc5a4
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/btn-transition-dissolve.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/btn-transition-doors.png b/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/btn-transition-doors.png
new file mode 100644
index 0000000000..2f0dfbc5a4
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/btn-transition-doors.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/btn-transition-ferris.png b/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/btn-transition-ferris.png
new file mode 100644
index 0000000000..2f0dfbc5a4
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/btn-transition-ferris.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/btn-transition-flip.png b/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/btn-transition-flip.png
new file mode 100644
index 0000000000..2f0dfbc5a4
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/btn-transition-flip.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/btn-transition-gallery.png b/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/btn-transition-gallery.png
new file mode 100644
index 0000000000..2f0dfbc5a4
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/btn-transition-gallery.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/btn-transition-honeycomb.png b/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/btn-transition-honeycomb.png
new file mode 100644
index 0000000000..2f0dfbc5a4
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/btn-transition-honeycomb.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/btn-transition-orbit.png b/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/btn-transition-orbit.png
new file mode 100644
index 0000000000..2f0dfbc5a4
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/btn-transition-orbit.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/btn-transition-plus.png b/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/btn-transition-plus.png
new file mode 100644
index 0000000000..2f0dfbc5a4
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/btn-transition-plus.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/btn-transition-randombars.png b/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/btn-transition-randombars.png
new file mode 100644
index 0000000000..2f0dfbc5a4
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/btn-transition-randombars.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/btn-transition-ripple.png b/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/btn-transition-ripple.png
new file mode 100644
index 0000000000..2f0dfbc5a4
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/btn-transition-ripple.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/btn-transition-rotate.png b/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/btn-transition-rotate.png
new file mode 100644
index 0000000000..2f0dfbc5a4
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/btn-transition-rotate.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/btn-transition-switch.png b/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/btn-transition-switch.png
new file mode 100644
index 0000000000..2f0dfbc5a4
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/btn-transition-switch.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/btn-transition-vortex.png b/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/btn-transition-vortex.png
new file mode 100644
index 0000000000..2f0dfbc5a4
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/btn-transition-vortex.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/btn-transition-window.png b/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/btn-transition-window.png
new file mode 100644
index 0000000000..2f0dfbc5a4
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/btn-transition-window.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/1x/big/btn-transition-blinds.png b/apps/presentationeditor/main/resources/img/toolbar/1x/big/btn-transition-blinds.png
new file mode 100644
index 0000000000..2f0dfbc5a4
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/1x/big/btn-transition-blinds.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/1x/big/btn-transition-box.png b/apps/presentationeditor/main/resources/img/toolbar/1x/big/btn-transition-box.png
new file mode 100644
index 0000000000..2f0dfbc5a4
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/1x/big/btn-transition-box.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/1x/big/btn-transition-boxzoom.png b/apps/presentationeditor/main/resources/img/toolbar/1x/big/btn-transition-boxzoom.png
new file mode 100644
index 0000000000..2f0dfbc5a4
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/1x/big/btn-transition-boxzoom.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/1x/big/btn-transition-checker.png b/apps/presentationeditor/main/resources/img/toolbar/1x/big/btn-transition-checker.png
new file mode 100644
index 0000000000..2f0dfbc5a4
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/1x/big/btn-transition-checker.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/1x/big/btn-transition-circle.png b/apps/presentationeditor/main/resources/img/toolbar/1x/big/btn-transition-circle.png
new file mode 100644
index 0000000000..2f0dfbc5a4
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/1x/big/btn-transition-circle.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/1x/big/btn-transition-comb.png b/apps/presentationeditor/main/resources/img/toolbar/1x/big/btn-transition-comb.png
new file mode 100644
index 0000000000..2f0dfbc5a4
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/1x/big/btn-transition-comb.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/1x/big/btn-transition-cube.png b/apps/presentationeditor/main/resources/img/toolbar/1x/big/btn-transition-cube.png
new file mode 100644
index 0000000000..2f0dfbc5a4
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/1x/big/btn-transition-cube.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/1x/big/btn-transition-cut.png b/apps/presentationeditor/main/resources/img/toolbar/1x/big/btn-transition-cut.png
new file mode 100644
index 0000000000..2f0dfbc5a4
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/1x/big/btn-transition-cut.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/1x/big/btn-transition-diamond.png b/apps/presentationeditor/main/resources/img/toolbar/1x/big/btn-transition-diamond.png
new file mode 100644
index 0000000000..2f0dfbc5a4
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/1x/big/btn-transition-diamond.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/1x/big/btn-transition-dissolve.png b/apps/presentationeditor/main/resources/img/toolbar/1x/big/btn-transition-dissolve.png
new file mode 100644
index 0000000000..2f0dfbc5a4
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/1x/big/btn-transition-dissolve.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/1x/big/btn-transition-doors.png b/apps/presentationeditor/main/resources/img/toolbar/1x/big/btn-transition-doors.png
new file mode 100644
index 0000000000..2f0dfbc5a4
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/1x/big/btn-transition-doors.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/1x/big/btn-transition-ferris.png b/apps/presentationeditor/main/resources/img/toolbar/1x/big/btn-transition-ferris.png
new file mode 100644
index 0000000000..2f0dfbc5a4
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/1x/big/btn-transition-ferris.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/1x/big/btn-transition-flip.png b/apps/presentationeditor/main/resources/img/toolbar/1x/big/btn-transition-flip.png
new file mode 100644
index 0000000000..2f0dfbc5a4
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/1x/big/btn-transition-flip.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/1x/big/btn-transition-gallery.png b/apps/presentationeditor/main/resources/img/toolbar/1x/big/btn-transition-gallery.png
new file mode 100644
index 0000000000..2f0dfbc5a4
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/1x/big/btn-transition-gallery.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/1x/big/btn-transition-honeycomb.png b/apps/presentationeditor/main/resources/img/toolbar/1x/big/btn-transition-honeycomb.png
new file mode 100644
index 0000000000..2f0dfbc5a4
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/1x/big/btn-transition-honeycomb.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/1x/big/btn-transition-orbit.png b/apps/presentationeditor/main/resources/img/toolbar/1x/big/btn-transition-orbit.png
new file mode 100644
index 0000000000..2f0dfbc5a4
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/1x/big/btn-transition-orbit.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/1x/big/btn-transition-plus.png b/apps/presentationeditor/main/resources/img/toolbar/1x/big/btn-transition-plus.png
new file mode 100644
index 0000000000..2f0dfbc5a4
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/1x/big/btn-transition-plus.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/1x/big/btn-transition-randombars.png b/apps/presentationeditor/main/resources/img/toolbar/1x/big/btn-transition-randombars.png
new file mode 100644
index 0000000000..2f0dfbc5a4
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/1x/big/btn-transition-randombars.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/1x/big/btn-transition-ripple.png b/apps/presentationeditor/main/resources/img/toolbar/1x/big/btn-transition-ripple.png
new file mode 100644
index 0000000000..2f0dfbc5a4
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/1x/big/btn-transition-ripple.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/1x/big/btn-transition-rotate.png b/apps/presentationeditor/main/resources/img/toolbar/1x/big/btn-transition-rotate.png
new file mode 100644
index 0000000000..2f0dfbc5a4
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/1x/big/btn-transition-rotate.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/1x/big/btn-transition-switch.png b/apps/presentationeditor/main/resources/img/toolbar/1x/big/btn-transition-switch.png
new file mode 100644
index 0000000000..2f0dfbc5a4
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/1x/big/btn-transition-switch.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/1x/big/btn-transition-vortex.png b/apps/presentationeditor/main/resources/img/toolbar/1x/big/btn-transition-vortex.png
new file mode 100644
index 0000000000..2f0dfbc5a4
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/1x/big/btn-transition-vortex.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/1x/big/btn-transition-window.png b/apps/presentationeditor/main/resources/img/toolbar/1x/big/btn-transition-window.png
new file mode 100644
index 0000000000..2f0dfbc5a4
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/1x/big/btn-transition-window.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/2.5x/big/btn-transition-blinds.svg b/apps/presentationeditor/main/resources/img/toolbar/2.5x/big/btn-transition-blinds.svg
new file mode 100644
index 0000000000..2cab3765d6
--- /dev/null
+++ b/apps/presentationeditor/main/resources/img/toolbar/2.5x/big/btn-transition-blinds.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/apps/presentationeditor/main/resources/img/toolbar/2.5x/big/btn-transition-box.svg b/apps/presentationeditor/main/resources/img/toolbar/2.5x/big/btn-transition-box.svg
new file mode 100644
index 0000000000..2cab3765d6
--- /dev/null
+++ b/apps/presentationeditor/main/resources/img/toolbar/2.5x/big/btn-transition-box.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/apps/presentationeditor/main/resources/img/toolbar/2.5x/big/btn-transition-boxzoom.svg b/apps/presentationeditor/main/resources/img/toolbar/2.5x/big/btn-transition-boxzoom.svg
new file mode 100644
index 0000000000..2cab3765d6
--- /dev/null
+++ b/apps/presentationeditor/main/resources/img/toolbar/2.5x/big/btn-transition-boxzoom.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/apps/presentationeditor/main/resources/img/toolbar/2.5x/big/btn-transition-checker.svg b/apps/presentationeditor/main/resources/img/toolbar/2.5x/big/btn-transition-checker.svg
new file mode 100644
index 0000000000..2cab3765d6
--- /dev/null
+++ b/apps/presentationeditor/main/resources/img/toolbar/2.5x/big/btn-transition-checker.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/apps/presentationeditor/main/resources/img/toolbar/2.5x/big/btn-transition-circle.svg b/apps/presentationeditor/main/resources/img/toolbar/2.5x/big/btn-transition-circle.svg
new file mode 100644
index 0000000000..2cab3765d6
--- /dev/null
+++ b/apps/presentationeditor/main/resources/img/toolbar/2.5x/big/btn-transition-circle.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/apps/presentationeditor/main/resources/img/toolbar/2.5x/big/btn-transition-comb.svg b/apps/presentationeditor/main/resources/img/toolbar/2.5x/big/btn-transition-comb.svg
new file mode 100644
index 0000000000..2cab3765d6
--- /dev/null
+++ b/apps/presentationeditor/main/resources/img/toolbar/2.5x/big/btn-transition-comb.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/apps/presentationeditor/main/resources/img/toolbar/2.5x/big/btn-transition-cube.svg b/apps/presentationeditor/main/resources/img/toolbar/2.5x/big/btn-transition-cube.svg
new file mode 100644
index 0000000000..2cab3765d6
--- /dev/null
+++ b/apps/presentationeditor/main/resources/img/toolbar/2.5x/big/btn-transition-cube.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/apps/presentationeditor/main/resources/img/toolbar/2.5x/big/btn-transition-cut.svg b/apps/presentationeditor/main/resources/img/toolbar/2.5x/big/btn-transition-cut.svg
new file mode 100644
index 0000000000..2cab3765d6
--- /dev/null
+++ b/apps/presentationeditor/main/resources/img/toolbar/2.5x/big/btn-transition-cut.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/apps/presentationeditor/main/resources/img/toolbar/2.5x/big/btn-transition-diamond.svg b/apps/presentationeditor/main/resources/img/toolbar/2.5x/big/btn-transition-diamond.svg
new file mode 100644
index 0000000000..2cab3765d6
--- /dev/null
+++ b/apps/presentationeditor/main/resources/img/toolbar/2.5x/big/btn-transition-diamond.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/apps/presentationeditor/main/resources/img/toolbar/2.5x/big/btn-transition-dissolve.svg b/apps/presentationeditor/main/resources/img/toolbar/2.5x/big/btn-transition-dissolve.svg
new file mode 100644
index 0000000000..2cab3765d6
--- /dev/null
+++ b/apps/presentationeditor/main/resources/img/toolbar/2.5x/big/btn-transition-dissolve.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/apps/presentationeditor/main/resources/img/toolbar/2.5x/big/btn-transition-doors.svg b/apps/presentationeditor/main/resources/img/toolbar/2.5x/big/btn-transition-doors.svg
new file mode 100644
index 0000000000..2cab3765d6
--- /dev/null
+++ b/apps/presentationeditor/main/resources/img/toolbar/2.5x/big/btn-transition-doors.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/apps/presentationeditor/main/resources/img/toolbar/2.5x/big/btn-transition-ferris.svg b/apps/presentationeditor/main/resources/img/toolbar/2.5x/big/btn-transition-ferris.svg
new file mode 100644
index 0000000000..2cab3765d6
--- /dev/null
+++ b/apps/presentationeditor/main/resources/img/toolbar/2.5x/big/btn-transition-ferris.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/apps/presentationeditor/main/resources/img/toolbar/2.5x/big/btn-transition-flip.svg b/apps/presentationeditor/main/resources/img/toolbar/2.5x/big/btn-transition-flip.svg
new file mode 100644
index 0000000000..2cab3765d6
--- /dev/null
+++ b/apps/presentationeditor/main/resources/img/toolbar/2.5x/big/btn-transition-flip.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/apps/presentationeditor/main/resources/img/toolbar/2.5x/big/btn-transition-gallery.svg b/apps/presentationeditor/main/resources/img/toolbar/2.5x/big/btn-transition-gallery.svg
new file mode 100644
index 0000000000..2cab3765d6
--- /dev/null
+++ b/apps/presentationeditor/main/resources/img/toolbar/2.5x/big/btn-transition-gallery.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/apps/presentationeditor/main/resources/img/toolbar/2.5x/big/btn-transition-honeycomb.svg b/apps/presentationeditor/main/resources/img/toolbar/2.5x/big/btn-transition-honeycomb.svg
new file mode 100644
index 0000000000..2cab3765d6
--- /dev/null
+++ b/apps/presentationeditor/main/resources/img/toolbar/2.5x/big/btn-transition-honeycomb.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/apps/presentationeditor/main/resources/img/toolbar/2.5x/big/btn-transition-orbit.svg b/apps/presentationeditor/main/resources/img/toolbar/2.5x/big/btn-transition-orbit.svg
new file mode 100644
index 0000000000..2cab3765d6
--- /dev/null
+++ b/apps/presentationeditor/main/resources/img/toolbar/2.5x/big/btn-transition-orbit.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/apps/presentationeditor/main/resources/img/toolbar/2.5x/big/btn-transition-plus.svg b/apps/presentationeditor/main/resources/img/toolbar/2.5x/big/btn-transition-plus.svg
new file mode 100644
index 0000000000..2cab3765d6
--- /dev/null
+++ b/apps/presentationeditor/main/resources/img/toolbar/2.5x/big/btn-transition-plus.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/apps/presentationeditor/main/resources/img/toolbar/2.5x/big/btn-transition-randombars.svg b/apps/presentationeditor/main/resources/img/toolbar/2.5x/big/btn-transition-randombars.svg
new file mode 100644
index 0000000000..2cab3765d6
--- /dev/null
+++ b/apps/presentationeditor/main/resources/img/toolbar/2.5x/big/btn-transition-randombars.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/apps/presentationeditor/main/resources/img/toolbar/2.5x/big/btn-transition-ripple.svg b/apps/presentationeditor/main/resources/img/toolbar/2.5x/big/btn-transition-ripple.svg
new file mode 100644
index 0000000000..2cab3765d6
--- /dev/null
+++ b/apps/presentationeditor/main/resources/img/toolbar/2.5x/big/btn-transition-ripple.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/apps/presentationeditor/main/resources/img/toolbar/2.5x/big/btn-transition-rotate.svg b/apps/presentationeditor/main/resources/img/toolbar/2.5x/big/btn-transition-rotate.svg
new file mode 100644
index 0000000000..2cab3765d6
--- /dev/null
+++ b/apps/presentationeditor/main/resources/img/toolbar/2.5x/big/btn-transition-rotate.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/apps/presentationeditor/main/resources/img/toolbar/2.5x/big/btn-transition-switch.svg b/apps/presentationeditor/main/resources/img/toolbar/2.5x/big/btn-transition-switch.svg
new file mode 100644
index 0000000000..2cab3765d6
--- /dev/null
+++ b/apps/presentationeditor/main/resources/img/toolbar/2.5x/big/btn-transition-switch.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/apps/presentationeditor/main/resources/img/toolbar/2.5x/big/btn-transition-vortex.svg b/apps/presentationeditor/main/resources/img/toolbar/2.5x/big/btn-transition-vortex.svg
new file mode 100644
index 0000000000..2cab3765d6
--- /dev/null
+++ b/apps/presentationeditor/main/resources/img/toolbar/2.5x/big/btn-transition-vortex.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/apps/presentationeditor/main/resources/img/toolbar/2.5x/big/btn-transition-window.svg b/apps/presentationeditor/main/resources/img/toolbar/2.5x/big/btn-transition-window.svg
new file mode 100644
index 0000000000..2cab3765d6
--- /dev/null
+++ b/apps/presentationeditor/main/resources/img/toolbar/2.5x/big/btn-transition-window.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/apps/presentationeditor/main/resources/img/toolbar/2x/big/btn-transition-blinds.png b/apps/presentationeditor/main/resources/img/toolbar/2x/big/btn-transition-blinds.png
new file mode 100644
index 0000000000..2f0dfbc5a4
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/2x/big/btn-transition-blinds.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/2x/big/btn-transition-box.png b/apps/presentationeditor/main/resources/img/toolbar/2x/big/btn-transition-box.png
new file mode 100644
index 0000000000..2f0dfbc5a4
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/2x/big/btn-transition-box.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/2x/big/btn-transition-boxzoom.png b/apps/presentationeditor/main/resources/img/toolbar/2x/big/btn-transition-boxzoom.png
new file mode 100644
index 0000000000..2f0dfbc5a4
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/2x/big/btn-transition-boxzoom.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/2x/big/btn-transition-checker.png b/apps/presentationeditor/main/resources/img/toolbar/2x/big/btn-transition-checker.png
new file mode 100644
index 0000000000..2f0dfbc5a4
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/2x/big/btn-transition-checker.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/2x/big/btn-transition-circle.png b/apps/presentationeditor/main/resources/img/toolbar/2x/big/btn-transition-circle.png
new file mode 100644
index 0000000000..2f0dfbc5a4
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/2x/big/btn-transition-circle.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/2x/big/btn-transition-comb.png b/apps/presentationeditor/main/resources/img/toolbar/2x/big/btn-transition-comb.png
new file mode 100644
index 0000000000..2f0dfbc5a4
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/2x/big/btn-transition-comb.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/2x/big/btn-transition-cube.png b/apps/presentationeditor/main/resources/img/toolbar/2x/big/btn-transition-cube.png
new file mode 100644
index 0000000000..2f0dfbc5a4
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/2x/big/btn-transition-cube.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/2x/big/btn-transition-cut.png b/apps/presentationeditor/main/resources/img/toolbar/2x/big/btn-transition-cut.png
new file mode 100644
index 0000000000..2f0dfbc5a4
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/2x/big/btn-transition-cut.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/2x/big/btn-transition-diamond.png b/apps/presentationeditor/main/resources/img/toolbar/2x/big/btn-transition-diamond.png
new file mode 100644
index 0000000000..2f0dfbc5a4
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/2x/big/btn-transition-diamond.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/2x/big/btn-transition-dissolve.png b/apps/presentationeditor/main/resources/img/toolbar/2x/big/btn-transition-dissolve.png
new file mode 100644
index 0000000000..2f0dfbc5a4
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/2x/big/btn-transition-dissolve.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/2x/big/btn-transition-doors.png b/apps/presentationeditor/main/resources/img/toolbar/2x/big/btn-transition-doors.png
new file mode 100644
index 0000000000..2f0dfbc5a4
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/2x/big/btn-transition-doors.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/2x/big/btn-transition-ferris.png b/apps/presentationeditor/main/resources/img/toolbar/2x/big/btn-transition-ferris.png
new file mode 100644
index 0000000000..2f0dfbc5a4
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/2x/big/btn-transition-ferris.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/2x/big/btn-transition-flip.png b/apps/presentationeditor/main/resources/img/toolbar/2x/big/btn-transition-flip.png
new file mode 100644
index 0000000000..2f0dfbc5a4
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/2x/big/btn-transition-flip.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/2x/big/btn-transition-gallery.png b/apps/presentationeditor/main/resources/img/toolbar/2x/big/btn-transition-gallery.png
new file mode 100644
index 0000000000..2f0dfbc5a4
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/2x/big/btn-transition-gallery.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/2x/big/btn-transition-honeycomb.png b/apps/presentationeditor/main/resources/img/toolbar/2x/big/btn-transition-honeycomb.png
new file mode 100644
index 0000000000..2f0dfbc5a4
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/2x/big/btn-transition-honeycomb.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/2x/big/btn-transition-orbit.png b/apps/presentationeditor/main/resources/img/toolbar/2x/big/btn-transition-orbit.png
new file mode 100644
index 0000000000..2f0dfbc5a4
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/2x/big/btn-transition-orbit.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/2x/big/btn-transition-plus.png b/apps/presentationeditor/main/resources/img/toolbar/2x/big/btn-transition-plus.png
new file mode 100644
index 0000000000..2f0dfbc5a4
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/2x/big/btn-transition-plus.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/2x/big/btn-transition-randombars.png b/apps/presentationeditor/main/resources/img/toolbar/2x/big/btn-transition-randombars.png
new file mode 100644
index 0000000000..2f0dfbc5a4
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/2x/big/btn-transition-randombars.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/2x/big/btn-transition-ripple.png b/apps/presentationeditor/main/resources/img/toolbar/2x/big/btn-transition-ripple.png
new file mode 100644
index 0000000000..2f0dfbc5a4
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/2x/big/btn-transition-ripple.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/2x/big/btn-transition-rotate.png b/apps/presentationeditor/main/resources/img/toolbar/2x/big/btn-transition-rotate.png
new file mode 100644
index 0000000000..2f0dfbc5a4
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/2x/big/btn-transition-rotate.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/2x/big/btn-transition-switch.png b/apps/presentationeditor/main/resources/img/toolbar/2x/big/btn-transition-switch.png
new file mode 100644
index 0000000000..2f0dfbc5a4
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/2x/big/btn-transition-switch.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/2x/big/btn-transition-vortex.png b/apps/presentationeditor/main/resources/img/toolbar/2x/big/btn-transition-vortex.png
new file mode 100644
index 0000000000..2f0dfbc5a4
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/2x/big/btn-transition-vortex.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/2x/big/btn-transition-window.png b/apps/presentationeditor/main/resources/img/toolbar/2x/big/btn-transition-window.png
new file mode 100644
index 0000000000..2f0dfbc5a4
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/2x/big/btn-transition-window.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/v2/1.25x/big/btn-transition-blinds.png b/apps/presentationeditor/main/resources/img/toolbar/v2/1.25x/big/btn-transition-blinds.png
new file mode 100644
index 0000000000..2f0dfbc5a4
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/v2/1.25x/big/btn-transition-blinds.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/v2/1.25x/big/btn-transition-box.png b/apps/presentationeditor/main/resources/img/toolbar/v2/1.25x/big/btn-transition-box.png
new file mode 100644
index 0000000000..2f0dfbc5a4
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/v2/1.25x/big/btn-transition-box.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/v2/1.25x/big/btn-transition-boxzoom.png b/apps/presentationeditor/main/resources/img/toolbar/v2/1.25x/big/btn-transition-boxzoom.png
new file mode 100644
index 0000000000..2f0dfbc5a4
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/v2/1.25x/big/btn-transition-boxzoom.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/v2/1.25x/big/btn-transition-checker.png b/apps/presentationeditor/main/resources/img/toolbar/v2/1.25x/big/btn-transition-checker.png
new file mode 100644
index 0000000000..2f0dfbc5a4
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/v2/1.25x/big/btn-transition-checker.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/v2/1.25x/big/btn-transition-circle.png b/apps/presentationeditor/main/resources/img/toolbar/v2/1.25x/big/btn-transition-circle.png
new file mode 100644
index 0000000000..2f0dfbc5a4
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/v2/1.25x/big/btn-transition-circle.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/v2/1.25x/big/btn-transition-comb.png b/apps/presentationeditor/main/resources/img/toolbar/v2/1.25x/big/btn-transition-comb.png
new file mode 100644
index 0000000000..2f0dfbc5a4
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/v2/1.25x/big/btn-transition-comb.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/v2/1.25x/big/btn-transition-cube.png b/apps/presentationeditor/main/resources/img/toolbar/v2/1.25x/big/btn-transition-cube.png
new file mode 100644
index 0000000000..2f0dfbc5a4
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/v2/1.25x/big/btn-transition-cube.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/v2/1.25x/big/btn-transition-cut.png b/apps/presentationeditor/main/resources/img/toolbar/v2/1.25x/big/btn-transition-cut.png
new file mode 100644
index 0000000000..2f0dfbc5a4
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/v2/1.25x/big/btn-transition-cut.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/v2/1.25x/big/btn-transition-diamond.png b/apps/presentationeditor/main/resources/img/toolbar/v2/1.25x/big/btn-transition-diamond.png
new file mode 100644
index 0000000000..2f0dfbc5a4
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/v2/1.25x/big/btn-transition-diamond.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/v2/1.25x/big/btn-transition-dissolve.png b/apps/presentationeditor/main/resources/img/toolbar/v2/1.25x/big/btn-transition-dissolve.png
new file mode 100644
index 0000000000..2f0dfbc5a4
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/v2/1.25x/big/btn-transition-dissolve.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/v2/1.25x/big/btn-transition-doors.png b/apps/presentationeditor/main/resources/img/toolbar/v2/1.25x/big/btn-transition-doors.png
new file mode 100644
index 0000000000..2f0dfbc5a4
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/v2/1.25x/big/btn-transition-doors.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/v2/1.25x/big/btn-transition-ferris.png b/apps/presentationeditor/main/resources/img/toolbar/v2/1.25x/big/btn-transition-ferris.png
new file mode 100644
index 0000000000..2f0dfbc5a4
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/v2/1.25x/big/btn-transition-ferris.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/v2/1.25x/big/btn-transition-flip.png b/apps/presentationeditor/main/resources/img/toolbar/v2/1.25x/big/btn-transition-flip.png
new file mode 100644
index 0000000000..2f0dfbc5a4
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/v2/1.25x/big/btn-transition-flip.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/v2/1.25x/big/btn-transition-gallery.png b/apps/presentationeditor/main/resources/img/toolbar/v2/1.25x/big/btn-transition-gallery.png
new file mode 100644
index 0000000000..2f0dfbc5a4
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/v2/1.25x/big/btn-transition-gallery.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/v2/1.25x/big/btn-transition-honeycomb.png b/apps/presentationeditor/main/resources/img/toolbar/v2/1.25x/big/btn-transition-honeycomb.png
new file mode 100644
index 0000000000..2f0dfbc5a4
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/v2/1.25x/big/btn-transition-honeycomb.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/v2/1.25x/big/btn-transition-orbit.png b/apps/presentationeditor/main/resources/img/toolbar/v2/1.25x/big/btn-transition-orbit.png
new file mode 100644
index 0000000000..2f0dfbc5a4
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/v2/1.25x/big/btn-transition-orbit.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/v2/1.25x/big/btn-transition-plus.png b/apps/presentationeditor/main/resources/img/toolbar/v2/1.25x/big/btn-transition-plus.png
new file mode 100644
index 0000000000..2f0dfbc5a4
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/v2/1.25x/big/btn-transition-plus.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/v2/1.25x/big/btn-transition-randombars.png b/apps/presentationeditor/main/resources/img/toolbar/v2/1.25x/big/btn-transition-randombars.png
new file mode 100644
index 0000000000..2f0dfbc5a4
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/v2/1.25x/big/btn-transition-randombars.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/v2/1.25x/big/btn-transition-ripple.png b/apps/presentationeditor/main/resources/img/toolbar/v2/1.25x/big/btn-transition-ripple.png
new file mode 100644
index 0000000000..2f0dfbc5a4
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/v2/1.25x/big/btn-transition-ripple.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/v2/1.25x/big/btn-transition-rotate.png b/apps/presentationeditor/main/resources/img/toolbar/v2/1.25x/big/btn-transition-rotate.png
new file mode 100644
index 0000000000..2f0dfbc5a4
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/v2/1.25x/big/btn-transition-rotate.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/v2/1.25x/big/btn-transition-switch.png b/apps/presentationeditor/main/resources/img/toolbar/v2/1.25x/big/btn-transition-switch.png
new file mode 100644
index 0000000000..2f0dfbc5a4
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/v2/1.25x/big/btn-transition-switch.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/v2/1.25x/big/btn-transition-vortex.png b/apps/presentationeditor/main/resources/img/toolbar/v2/1.25x/big/btn-transition-vortex.png
new file mode 100644
index 0000000000..2f0dfbc5a4
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/v2/1.25x/big/btn-transition-vortex.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/v2/1.25x/big/btn-transition-window.png b/apps/presentationeditor/main/resources/img/toolbar/v2/1.25x/big/btn-transition-window.png
new file mode 100644
index 0000000000..2f0dfbc5a4
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/v2/1.25x/big/btn-transition-window.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/v2/1.5x/big/btn-transition-blinds.png b/apps/presentationeditor/main/resources/img/toolbar/v2/1.5x/big/btn-transition-blinds.png
new file mode 100644
index 0000000000..2f0dfbc5a4
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/v2/1.5x/big/btn-transition-blinds.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/v2/1.5x/big/btn-transition-box.png b/apps/presentationeditor/main/resources/img/toolbar/v2/1.5x/big/btn-transition-box.png
new file mode 100644
index 0000000000..2f0dfbc5a4
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/v2/1.5x/big/btn-transition-box.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/v2/1.5x/big/btn-transition-boxzoom.png b/apps/presentationeditor/main/resources/img/toolbar/v2/1.5x/big/btn-transition-boxzoom.png
new file mode 100644
index 0000000000..2f0dfbc5a4
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/v2/1.5x/big/btn-transition-boxzoom.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/v2/1.5x/big/btn-transition-checker.png b/apps/presentationeditor/main/resources/img/toolbar/v2/1.5x/big/btn-transition-checker.png
new file mode 100644
index 0000000000..2f0dfbc5a4
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/v2/1.5x/big/btn-transition-checker.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/v2/1.5x/big/btn-transition-circle.png b/apps/presentationeditor/main/resources/img/toolbar/v2/1.5x/big/btn-transition-circle.png
new file mode 100644
index 0000000000..2f0dfbc5a4
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/v2/1.5x/big/btn-transition-circle.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/v2/1.5x/big/btn-transition-comb.png b/apps/presentationeditor/main/resources/img/toolbar/v2/1.5x/big/btn-transition-comb.png
new file mode 100644
index 0000000000..2f0dfbc5a4
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/v2/1.5x/big/btn-transition-comb.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/v2/1.5x/big/btn-transition-cube.png b/apps/presentationeditor/main/resources/img/toolbar/v2/1.5x/big/btn-transition-cube.png
new file mode 100644
index 0000000000..2f0dfbc5a4
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/v2/1.5x/big/btn-transition-cube.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/v2/1.5x/big/btn-transition-cut.png b/apps/presentationeditor/main/resources/img/toolbar/v2/1.5x/big/btn-transition-cut.png
new file mode 100644
index 0000000000..2f0dfbc5a4
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/v2/1.5x/big/btn-transition-cut.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/v2/1.5x/big/btn-transition-diamond.png b/apps/presentationeditor/main/resources/img/toolbar/v2/1.5x/big/btn-transition-diamond.png
new file mode 100644
index 0000000000..2f0dfbc5a4
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/v2/1.5x/big/btn-transition-diamond.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/v2/1.5x/big/btn-transition-dissolve.png b/apps/presentationeditor/main/resources/img/toolbar/v2/1.5x/big/btn-transition-dissolve.png
new file mode 100644
index 0000000000..2f0dfbc5a4
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/v2/1.5x/big/btn-transition-dissolve.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/v2/1.5x/big/btn-transition-doors.png b/apps/presentationeditor/main/resources/img/toolbar/v2/1.5x/big/btn-transition-doors.png
new file mode 100644
index 0000000000..2f0dfbc5a4
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/v2/1.5x/big/btn-transition-doors.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/v2/1.5x/big/btn-transition-ferris.png b/apps/presentationeditor/main/resources/img/toolbar/v2/1.5x/big/btn-transition-ferris.png
new file mode 100644
index 0000000000..2f0dfbc5a4
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/v2/1.5x/big/btn-transition-ferris.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/v2/1.5x/big/btn-transition-flip.png b/apps/presentationeditor/main/resources/img/toolbar/v2/1.5x/big/btn-transition-flip.png
new file mode 100644
index 0000000000..2f0dfbc5a4
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/v2/1.5x/big/btn-transition-flip.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/v2/1.5x/big/btn-transition-gallery.png b/apps/presentationeditor/main/resources/img/toolbar/v2/1.5x/big/btn-transition-gallery.png
new file mode 100644
index 0000000000..2f0dfbc5a4
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/v2/1.5x/big/btn-transition-gallery.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/v2/1.5x/big/btn-transition-honeycomb.png b/apps/presentationeditor/main/resources/img/toolbar/v2/1.5x/big/btn-transition-honeycomb.png
new file mode 100644
index 0000000000..2f0dfbc5a4
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/v2/1.5x/big/btn-transition-honeycomb.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/v2/1.5x/big/btn-transition-orbit.png b/apps/presentationeditor/main/resources/img/toolbar/v2/1.5x/big/btn-transition-orbit.png
new file mode 100644
index 0000000000..2f0dfbc5a4
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/v2/1.5x/big/btn-transition-orbit.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/v2/1.5x/big/btn-transition-plus.png b/apps/presentationeditor/main/resources/img/toolbar/v2/1.5x/big/btn-transition-plus.png
new file mode 100644
index 0000000000..2f0dfbc5a4
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/v2/1.5x/big/btn-transition-plus.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/v2/1.5x/big/btn-transition-randombars.png b/apps/presentationeditor/main/resources/img/toolbar/v2/1.5x/big/btn-transition-randombars.png
new file mode 100644
index 0000000000..2f0dfbc5a4
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/v2/1.5x/big/btn-transition-randombars.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/v2/1.5x/big/btn-transition-ripple.png b/apps/presentationeditor/main/resources/img/toolbar/v2/1.5x/big/btn-transition-ripple.png
new file mode 100644
index 0000000000..2f0dfbc5a4
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/v2/1.5x/big/btn-transition-ripple.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/v2/1.5x/big/btn-transition-rotate.png b/apps/presentationeditor/main/resources/img/toolbar/v2/1.5x/big/btn-transition-rotate.png
new file mode 100644
index 0000000000..2f0dfbc5a4
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/v2/1.5x/big/btn-transition-rotate.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/v2/1.5x/big/btn-transition-switch.png b/apps/presentationeditor/main/resources/img/toolbar/v2/1.5x/big/btn-transition-switch.png
new file mode 100644
index 0000000000..2f0dfbc5a4
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/v2/1.5x/big/btn-transition-switch.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/v2/1.5x/big/btn-transition-vortex.png b/apps/presentationeditor/main/resources/img/toolbar/v2/1.5x/big/btn-transition-vortex.png
new file mode 100644
index 0000000000..2f0dfbc5a4
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/v2/1.5x/big/btn-transition-vortex.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/v2/1.5x/big/btn-transition-window.png b/apps/presentationeditor/main/resources/img/toolbar/v2/1.5x/big/btn-transition-window.png
new file mode 100644
index 0000000000..2f0dfbc5a4
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/v2/1.5x/big/btn-transition-window.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/v2/1.75x/big/btn-transition-blinds.png b/apps/presentationeditor/main/resources/img/toolbar/v2/1.75x/big/btn-transition-blinds.png
new file mode 100644
index 0000000000..2f0dfbc5a4
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/v2/1.75x/big/btn-transition-blinds.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/v2/1.75x/big/btn-transition-box.png b/apps/presentationeditor/main/resources/img/toolbar/v2/1.75x/big/btn-transition-box.png
new file mode 100644
index 0000000000..2f0dfbc5a4
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/v2/1.75x/big/btn-transition-box.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/v2/1.75x/big/btn-transition-boxzoom.png b/apps/presentationeditor/main/resources/img/toolbar/v2/1.75x/big/btn-transition-boxzoom.png
new file mode 100644
index 0000000000..2f0dfbc5a4
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/v2/1.75x/big/btn-transition-boxzoom.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/v2/1.75x/big/btn-transition-checker.png b/apps/presentationeditor/main/resources/img/toolbar/v2/1.75x/big/btn-transition-checker.png
new file mode 100644
index 0000000000..2f0dfbc5a4
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/v2/1.75x/big/btn-transition-checker.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/v2/1.75x/big/btn-transition-circle.png b/apps/presentationeditor/main/resources/img/toolbar/v2/1.75x/big/btn-transition-circle.png
new file mode 100644
index 0000000000..2f0dfbc5a4
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/v2/1.75x/big/btn-transition-circle.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/v2/1.75x/big/btn-transition-comb.png b/apps/presentationeditor/main/resources/img/toolbar/v2/1.75x/big/btn-transition-comb.png
new file mode 100644
index 0000000000..2f0dfbc5a4
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/v2/1.75x/big/btn-transition-comb.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/v2/1.75x/big/btn-transition-cube.png b/apps/presentationeditor/main/resources/img/toolbar/v2/1.75x/big/btn-transition-cube.png
new file mode 100644
index 0000000000..2f0dfbc5a4
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/v2/1.75x/big/btn-transition-cube.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/v2/1.75x/big/btn-transition-cut.png b/apps/presentationeditor/main/resources/img/toolbar/v2/1.75x/big/btn-transition-cut.png
new file mode 100644
index 0000000000..2f0dfbc5a4
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/v2/1.75x/big/btn-transition-cut.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/v2/1.75x/big/btn-transition-diamond.png b/apps/presentationeditor/main/resources/img/toolbar/v2/1.75x/big/btn-transition-diamond.png
new file mode 100644
index 0000000000..2f0dfbc5a4
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/v2/1.75x/big/btn-transition-diamond.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/v2/1.75x/big/btn-transition-dissolve.png b/apps/presentationeditor/main/resources/img/toolbar/v2/1.75x/big/btn-transition-dissolve.png
new file mode 100644
index 0000000000..2f0dfbc5a4
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/v2/1.75x/big/btn-transition-dissolve.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/v2/1.75x/big/btn-transition-doors.png b/apps/presentationeditor/main/resources/img/toolbar/v2/1.75x/big/btn-transition-doors.png
new file mode 100644
index 0000000000..2f0dfbc5a4
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/v2/1.75x/big/btn-transition-doors.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/v2/1.75x/big/btn-transition-ferris.png b/apps/presentationeditor/main/resources/img/toolbar/v2/1.75x/big/btn-transition-ferris.png
new file mode 100644
index 0000000000..2f0dfbc5a4
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/v2/1.75x/big/btn-transition-ferris.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/v2/1.75x/big/btn-transition-flip.png b/apps/presentationeditor/main/resources/img/toolbar/v2/1.75x/big/btn-transition-flip.png
new file mode 100644
index 0000000000..2f0dfbc5a4
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/v2/1.75x/big/btn-transition-flip.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/v2/1.75x/big/btn-transition-gallery.png b/apps/presentationeditor/main/resources/img/toolbar/v2/1.75x/big/btn-transition-gallery.png
new file mode 100644
index 0000000000..2f0dfbc5a4
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/v2/1.75x/big/btn-transition-gallery.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/v2/1.75x/big/btn-transition-honeycomb.png b/apps/presentationeditor/main/resources/img/toolbar/v2/1.75x/big/btn-transition-honeycomb.png
new file mode 100644
index 0000000000..2f0dfbc5a4
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/v2/1.75x/big/btn-transition-honeycomb.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/v2/1.75x/big/btn-transition-orbit.png b/apps/presentationeditor/main/resources/img/toolbar/v2/1.75x/big/btn-transition-orbit.png
new file mode 100644
index 0000000000..2f0dfbc5a4
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/v2/1.75x/big/btn-transition-orbit.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/v2/1.75x/big/btn-transition-plus.png b/apps/presentationeditor/main/resources/img/toolbar/v2/1.75x/big/btn-transition-plus.png
new file mode 100644
index 0000000000..2f0dfbc5a4
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/v2/1.75x/big/btn-transition-plus.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/v2/1.75x/big/btn-transition-randombars.png b/apps/presentationeditor/main/resources/img/toolbar/v2/1.75x/big/btn-transition-randombars.png
new file mode 100644
index 0000000000..2f0dfbc5a4
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/v2/1.75x/big/btn-transition-randombars.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/v2/1.75x/big/btn-transition-ripple.png b/apps/presentationeditor/main/resources/img/toolbar/v2/1.75x/big/btn-transition-ripple.png
new file mode 100644
index 0000000000..2f0dfbc5a4
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/v2/1.75x/big/btn-transition-ripple.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/v2/1.75x/big/btn-transition-rotate.png b/apps/presentationeditor/main/resources/img/toolbar/v2/1.75x/big/btn-transition-rotate.png
new file mode 100644
index 0000000000..2f0dfbc5a4
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/v2/1.75x/big/btn-transition-rotate.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/v2/1.75x/big/btn-transition-switch.png b/apps/presentationeditor/main/resources/img/toolbar/v2/1.75x/big/btn-transition-switch.png
new file mode 100644
index 0000000000..2f0dfbc5a4
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/v2/1.75x/big/btn-transition-switch.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/v2/1.75x/big/btn-transition-vortex.png b/apps/presentationeditor/main/resources/img/toolbar/v2/1.75x/big/btn-transition-vortex.png
new file mode 100644
index 0000000000..2f0dfbc5a4
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/v2/1.75x/big/btn-transition-vortex.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/v2/1.75x/big/btn-transition-window.png b/apps/presentationeditor/main/resources/img/toolbar/v2/1.75x/big/btn-transition-window.png
new file mode 100644
index 0000000000..2f0dfbc5a4
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/v2/1.75x/big/btn-transition-window.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/v2/1x/big/btn-transition-blinds.png b/apps/presentationeditor/main/resources/img/toolbar/v2/1x/big/btn-transition-blinds.png
new file mode 100644
index 0000000000..2f0dfbc5a4
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/v2/1x/big/btn-transition-blinds.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/v2/1x/big/btn-transition-box.png b/apps/presentationeditor/main/resources/img/toolbar/v2/1x/big/btn-transition-box.png
new file mode 100644
index 0000000000..2f0dfbc5a4
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/v2/1x/big/btn-transition-box.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/v2/1x/big/btn-transition-boxzoom.png b/apps/presentationeditor/main/resources/img/toolbar/v2/1x/big/btn-transition-boxzoom.png
new file mode 100644
index 0000000000..2f0dfbc5a4
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/v2/1x/big/btn-transition-boxzoom.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/v2/1x/big/btn-transition-checker.png b/apps/presentationeditor/main/resources/img/toolbar/v2/1x/big/btn-transition-checker.png
new file mode 100644
index 0000000000..2f0dfbc5a4
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/v2/1x/big/btn-transition-checker.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/v2/1x/big/btn-transition-circle.png b/apps/presentationeditor/main/resources/img/toolbar/v2/1x/big/btn-transition-circle.png
new file mode 100644
index 0000000000..2f0dfbc5a4
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/v2/1x/big/btn-transition-circle.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/v2/1x/big/btn-transition-comb.png b/apps/presentationeditor/main/resources/img/toolbar/v2/1x/big/btn-transition-comb.png
new file mode 100644
index 0000000000..2f0dfbc5a4
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/v2/1x/big/btn-transition-comb.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/v2/1x/big/btn-transition-cube.png b/apps/presentationeditor/main/resources/img/toolbar/v2/1x/big/btn-transition-cube.png
new file mode 100644
index 0000000000..2f0dfbc5a4
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/v2/1x/big/btn-transition-cube.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/v2/1x/big/btn-transition-cut.png b/apps/presentationeditor/main/resources/img/toolbar/v2/1x/big/btn-transition-cut.png
new file mode 100644
index 0000000000..2f0dfbc5a4
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/v2/1x/big/btn-transition-cut.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/v2/1x/big/btn-transition-diamond.png b/apps/presentationeditor/main/resources/img/toolbar/v2/1x/big/btn-transition-diamond.png
new file mode 100644
index 0000000000..2f0dfbc5a4
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/v2/1x/big/btn-transition-diamond.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/v2/1x/big/btn-transition-dissolve.png b/apps/presentationeditor/main/resources/img/toolbar/v2/1x/big/btn-transition-dissolve.png
new file mode 100644
index 0000000000..2f0dfbc5a4
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/v2/1x/big/btn-transition-dissolve.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/v2/1x/big/btn-transition-doors.png b/apps/presentationeditor/main/resources/img/toolbar/v2/1x/big/btn-transition-doors.png
new file mode 100644
index 0000000000..2f0dfbc5a4
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/v2/1x/big/btn-transition-doors.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/v2/1x/big/btn-transition-ferris.png b/apps/presentationeditor/main/resources/img/toolbar/v2/1x/big/btn-transition-ferris.png
new file mode 100644
index 0000000000..2f0dfbc5a4
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/v2/1x/big/btn-transition-ferris.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/v2/1x/big/btn-transition-flip.png b/apps/presentationeditor/main/resources/img/toolbar/v2/1x/big/btn-transition-flip.png
new file mode 100644
index 0000000000..2f0dfbc5a4
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/v2/1x/big/btn-transition-flip.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/v2/1x/big/btn-transition-gallery.png b/apps/presentationeditor/main/resources/img/toolbar/v2/1x/big/btn-transition-gallery.png
new file mode 100644
index 0000000000..2f0dfbc5a4
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/v2/1x/big/btn-transition-gallery.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/v2/1x/big/btn-transition-honeycomb.png b/apps/presentationeditor/main/resources/img/toolbar/v2/1x/big/btn-transition-honeycomb.png
new file mode 100644
index 0000000000..2f0dfbc5a4
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/v2/1x/big/btn-transition-honeycomb.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/v2/1x/big/btn-transition-orbit.png b/apps/presentationeditor/main/resources/img/toolbar/v2/1x/big/btn-transition-orbit.png
new file mode 100644
index 0000000000..2f0dfbc5a4
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/v2/1x/big/btn-transition-orbit.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/v2/1x/big/btn-transition-plus.png b/apps/presentationeditor/main/resources/img/toolbar/v2/1x/big/btn-transition-plus.png
new file mode 100644
index 0000000000..2f0dfbc5a4
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/v2/1x/big/btn-transition-plus.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/v2/1x/big/btn-transition-randombars.png b/apps/presentationeditor/main/resources/img/toolbar/v2/1x/big/btn-transition-randombars.png
new file mode 100644
index 0000000000..2f0dfbc5a4
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/v2/1x/big/btn-transition-randombars.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/v2/1x/big/btn-transition-ripple.png b/apps/presentationeditor/main/resources/img/toolbar/v2/1x/big/btn-transition-ripple.png
new file mode 100644
index 0000000000..2f0dfbc5a4
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/v2/1x/big/btn-transition-ripple.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/v2/1x/big/btn-transition-rotate.png b/apps/presentationeditor/main/resources/img/toolbar/v2/1x/big/btn-transition-rotate.png
new file mode 100644
index 0000000000..2f0dfbc5a4
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/v2/1x/big/btn-transition-rotate.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/v2/1x/big/btn-transition-switch.png b/apps/presentationeditor/main/resources/img/toolbar/v2/1x/big/btn-transition-switch.png
new file mode 100644
index 0000000000..2f0dfbc5a4
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/v2/1x/big/btn-transition-switch.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/v2/1x/big/btn-transition-vortex.png b/apps/presentationeditor/main/resources/img/toolbar/v2/1x/big/btn-transition-vortex.png
new file mode 100644
index 0000000000..2f0dfbc5a4
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/v2/1x/big/btn-transition-vortex.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/v2/1x/big/btn-transition-window.png b/apps/presentationeditor/main/resources/img/toolbar/v2/1x/big/btn-transition-window.png
new file mode 100644
index 0000000000..2f0dfbc5a4
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/v2/1x/big/btn-transition-window.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/v2/2.5x/big/btn-transition-blinds.svg b/apps/presentationeditor/main/resources/img/toolbar/v2/2.5x/big/btn-transition-blinds.svg
new file mode 100644
index 0000000000..2cab3765d6
--- /dev/null
+++ b/apps/presentationeditor/main/resources/img/toolbar/v2/2.5x/big/btn-transition-blinds.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/apps/presentationeditor/main/resources/img/toolbar/v2/2.5x/big/btn-transition-box.svg b/apps/presentationeditor/main/resources/img/toolbar/v2/2.5x/big/btn-transition-box.svg
new file mode 100644
index 0000000000..2cab3765d6
--- /dev/null
+++ b/apps/presentationeditor/main/resources/img/toolbar/v2/2.5x/big/btn-transition-box.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/apps/presentationeditor/main/resources/img/toolbar/v2/2.5x/big/btn-transition-boxzoom.svg b/apps/presentationeditor/main/resources/img/toolbar/v2/2.5x/big/btn-transition-boxzoom.svg
new file mode 100644
index 0000000000..2cab3765d6
--- /dev/null
+++ b/apps/presentationeditor/main/resources/img/toolbar/v2/2.5x/big/btn-transition-boxzoom.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/apps/presentationeditor/main/resources/img/toolbar/v2/2.5x/big/btn-transition-checker.svg b/apps/presentationeditor/main/resources/img/toolbar/v2/2.5x/big/btn-transition-checker.svg
new file mode 100644
index 0000000000..2cab3765d6
--- /dev/null
+++ b/apps/presentationeditor/main/resources/img/toolbar/v2/2.5x/big/btn-transition-checker.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/apps/presentationeditor/main/resources/img/toolbar/v2/2.5x/big/btn-transition-circle.svg b/apps/presentationeditor/main/resources/img/toolbar/v2/2.5x/big/btn-transition-circle.svg
new file mode 100644
index 0000000000..2cab3765d6
--- /dev/null
+++ b/apps/presentationeditor/main/resources/img/toolbar/v2/2.5x/big/btn-transition-circle.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/apps/presentationeditor/main/resources/img/toolbar/v2/2.5x/big/btn-transition-comb.svg b/apps/presentationeditor/main/resources/img/toolbar/v2/2.5x/big/btn-transition-comb.svg
new file mode 100644
index 0000000000..2cab3765d6
--- /dev/null
+++ b/apps/presentationeditor/main/resources/img/toolbar/v2/2.5x/big/btn-transition-comb.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/apps/presentationeditor/main/resources/img/toolbar/v2/2.5x/big/btn-transition-cube.svg b/apps/presentationeditor/main/resources/img/toolbar/v2/2.5x/big/btn-transition-cube.svg
new file mode 100644
index 0000000000..2cab3765d6
--- /dev/null
+++ b/apps/presentationeditor/main/resources/img/toolbar/v2/2.5x/big/btn-transition-cube.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/apps/presentationeditor/main/resources/img/toolbar/v2/2.5x/big/btn-transition-cut.svg b/apps/presentationeditor/main/resources/img/toolbar/v2/2.5x/big/btn-transition-cut.svg
new file mode 100644
index 0000000000..2cab3765d6
--- /dev/null
+++ b/apps/presentationeditor/main/resources/img/toolbar/v2/2.5x/big/btn-transition-cut.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/apps/presentationeditor/main/resources/img/toolbar/v2/2.5x/big/btn-transition-diamond.svg b/apps/presentationeditor/main/resources/img/toolbar/v2/2.5x/big/btn-transition-diamond.svg
new file mode 100644
index 0000000000..2cab3765d6
--- /dev/null
+++ b/apps/presentationeditor/main/resources/img/toolbar/v2/2.5x/big/btn-transition-diamond.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/apps/presentationeditor/main/resources/img/toolbar/v2/2.5x/big/btn-transition-dissolve.svg b/apps/presentationeditor/main/resources/img/toolbar/v2/2.5x/big/btn-transition-dissolve.svg
new file mode 100644
index 0000000000..2cab3765d6
--- /dev/null
+++ b/apps/presentationeditor/main/resources/img/toolbar/v2/2.5x/big/btn-transition-dissolve.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/apps/presentationeditor/main/resources/img/toolbar/v2/2.5x/big/btn-transition-doors.svg b/apps/presentationeditor/main/resources/img/toolbar/v2/2.5x/big/btn-transition-doors.svg
new file mode 100644
index 0000000000..2cab3765d6
--- /dev/null
+++ b/apps/presentationeditor/main/resources/img/toolbar/v2/2.5x/big/btn-transition-doors.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/apps/presentationeditor/main/resources/img/toolbar/v2/2.5x/big/btn-transition-ferris.svg b/apps/presentationeditor/main/resources/img/toolbar/v2/2.5x/big/btn-transition-ferris.svg
new file mode 100644
index 0000000000..2cab3765d6
--- /dev/null
+++ b/apps/presentationeditor/main/resources/img/toolbar/v2/2.5x/big/btn-transition-ferris.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/apps/presentationeditor/main/resources/img/toolbar/v2/2.5x/big/btn-transition-flip.svg b/apps/presentationeditor/main/resources/img/toolbar/v2/2.5x/big/btn-transition-flip.svg
new file mode 100644
index 0000000000..2cab3765d6
--- /dev/null
+++ b/apps/presentationeditor/main/resources/img/toolbar/v2/2.5x/big/btn-transition-flip.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/apps/presentationeditor/main/resources/img/toolbar/v2/2.5x/big/btn-transition-gallery.svg b/apps/presentationeditor/main/resources/img/toolbar/v2/2.5x/big/btn-transition-gallery.svg
new file mode 100644
index 0000000000..2cab3765d6
--- /dev/null
+++ b/apps/presentationeditor/main/resources/img/toolbar/v2/2.5x/big/btn-transition-gallery.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/apps/presentationeditor/main/resources/img/toolbar/v2/2.5x/big/btn-transition-honeycomb.svg b/apps/presentationeditor/main/resources/img/toolbar/v2/2.5x/big/btn-transition-honeycomb.svg
new file mode 100644
index 0000000000..2cab3765d6
--- /dev/null
+++ b/apps/presentationeditor/main/resources/img/toolbar/v2/2.5x/big/btn-transition-honeycomb.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/apps/presentationeditor/main/resources/img/toolbar/v2/2.5x/big/btn-transition-orbit.svg b/apps/presentationeditor/main/resources/img/toolbar/v2/2.5x/big/btn-transition-orbit.svg
new file mode 100644
index 0000000000..2cab3765d6
--- /dev/null
+++ b/apps/presentationeditor/main/resources/img/toolbar/v2/2.5x/big/btn-transition-orbit.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/apps/presentationeditor/main/resources/img/toolbar/v2/2.5x/big/btn-transition-plus.svg b/apps/presentationeditor/main/resources/img/toolbar/v2/2.5x/big/btn-transition-plus.svg
new file mode 100644
index 0000000000..2cab3765d6
--- /dev/null
+++ b/apps/presentationeditor/main/resources/img/toolbar/v2/2.5x/big/btn-transition-plus.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/apps/presentationeditor/main/resources/img/toolbar/v2/2.5x/big/btn-transition-randombars.svg b/apps/presentationeditor/main/resources/img/toolbar/v2/2.5x/big/btn-transition-randombars.svg
new file mode 100644
index 0000000000..2cab3765d6
--- /dev/null
+++ b/apps/presentationeditor/main/resources/img/toolbar/v2/2.5x/big/btn-transition-randombars.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/apps/presentationeditor/main/resources/img/toolbar/v2/2.5x/big/btn-transition-ripple.svg b/apps/presentationeditor/main/resources/img/toolbar/v2/2.5x/big/btn-transition-ripple.svg
new file mode 100644
index 0000000000..2cab3765d6
--- /dev/null
+++ b/apps/presentationeditor/main/resources/img/toolbar/v2/2.5x/big/btn-transition-ripple.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/apps/presentationeditor/main/resources/img/toolbar/v2/2.5x/big/btn-transition-rotate.svg b/apps/presentationeditor/main/resources/img/toolbar/v2/2.5x/big/btn-transition-rotate.svg
new file mode 100644
index 0000000000..2cab3765d6
--- /dev/null
+++ b/apps/presentationeditor/main/resources/img/toolbar/v2/2.5x/big/btn-transition-rotate.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/apps/presentationeditor/main/resources/img/toolbar/v2/2.5x/big/btn-transition-switch.svg b/apps/presentationeditor/main/resources/img/toolbar/v2/2.5x/big/btn-transition-switch.svg
new file mode 100644
index 0000000000..2cab3765d6
--- /dev/null
+++ b/apps/presentationeditor/main/resources/img/toolbar/v2/2.5x/big/btn-transition-switch.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/apps/presentationeditor/main/resources/img/toolbar/v2/2.5x/big/btn-transition-vortex.svg b/apps/presentationeditor/main/resources/img/toolbar/v2/2.5x/big/btn-transition-vortex.svg
new file mode 100644
index 0000000000..2cab3765d6
--- /dev/null
+++ b/apps/presentationeditor/main/resources/img/toolbar/v2/2.5x/big/btn-transition-vortex.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/apps/presentationeditor/main/resources/img/toolbar/v2/2.5x/big/btn-transition-window.svg b/apps/presentationeditor/main/resources/img/toolbar/v2/2.5x/big/btn-transition-window.svg
new file mode 100644
index 0000000000..2cab3765d6
--- /dev/null
+++ b/apps/presentationeditor/main/resources/img/toolbar/v2/2.5x/big/btn-transition-window.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/apps/presentationeditor/main/resources/img/toolbar/v2/2x/big/btn-transition-blinds.png b/apps/presentationeditor/main/resources/img/toolbar/v2/2x/big/btn-transition-blinds.png
new file mode 100644
index 0000000000..2f0dfbc5a4
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/v2/2x/big/btn-transition-blinds.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/v2/2x/big/btn-transition-box.png b/apps/presentationeditor/main/resources/img/toolbar/v2/2x/big/btn-transition-box.png
new file mode 100644
index 0000000000..2f0dfbc5a4
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/v2/2x/big/btn-transition-box.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/v2/2x/big/btn-transition-boxzoom.png b/apps/presentationeditor/main/resources/img/toolbar/v2/2x/big/btn-transition-boxzoom.png
new file mode 100644
index 0000000000..2f0dfbc5a4
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/v2/2x/big/btn-transition-boxzoom.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/v2/2x/big/btn-transition-checker.png b/apps/presentationeditor/main/resources/img/toolbar/v2/2x/big/btn-transition-checker.png
new file mode 100644
index 0000000000..2f0dfbc5a4
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/v2/2x/big/btn-transition-checker.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/v2/2x/big/btn-transition-circle.png b/apps/presentationeditor/main/resources/img/toolbar/v2/2x/big/btn-transition-circle.png
new file mode 100644
index 0000000000..2f0dfbc5a4
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/v2/2x/big/btn-transition-circle.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/v2/2x/big/btn-transition-comb.png b/apps/presentationeditor/main/resources/img/toolbar/v2/2x/big/btn-transition-comb.png
new file mode 100644
index 0000000000..2f0dfbc5a4
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/v2/2x/big/btn-transition-comb.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/v2/2x/big/btn-transition-cube.png b/apps/presentationeditor/main/resources/img/toolbar/v2/2x/big/btn-transition-cube.png
new file mode 100644
index 0000000000..2f0dfbc5a4
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/v2/2x/big/btn-transition-cube.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/v2/2x/big/btn-transition-cut.png b/apps/presentationeditor/main/resources/img/toolbar/v2/2x/big/btn-transition-cut.png
new file mode 100644
index 0000000000..2f0dfbc5a4
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/v2/2x/big/btn-transition-cut.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/v2/2x/big/btn-transition-diamond.png b/apps/presentationeditor/main/resources/img/toolbar/v2/2x/big/btn-transition-diamond.png
new file mode 100644
index 0000000000..2f0dfbc5a4
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/v2/2x/big/btn-transition-diamond.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/v2/2x/big/btn-transition-dissolve.png b/apps/presentationeditor/main/resources/img/toolbar/v2/2x/big/btn-transition-dissolve.png
new file mode 100644
index 0000000000..2f0dfbc5a4
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/v2/2x/big/btn-transition-dissolve.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/v2/2x/big/btn-transition-doors.png b/apps/presentationeditor/main/resources/img/toolbar/v2/2x/big/btn-transition-doors.png
new file mode 100644
index 0000000000..2f0dfbc5a4
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/v2/2x/big/btn-transition-doors.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/v2/2x/big/btn-transition-ferris.png b/apps/presentationeditor/main/resources/img/toolbar/v2/2x/big/btn-transition-ferris.png
new file mode 100644
index 0000000000..2f0dfbc5a4
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/v2/2x/big/btn-transition-ferris.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/v2/2x/big/btn-transition-flip.png b/apps/presentationeditor/main/resources/img/toolbar/v2/2x/big/btn-transition-flip.png
new file mode 100644
index 0000000000..2f0dfbc5a4
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/v2/2x/big/btn-transition-flip.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/v2/2x/big/btn-transition-gallery.png b/apps/presentationeditor/main/resources/img/toolbar/v2/2x/big/btn-transition-gallery.png
new file mode 100644
index 0000000000..2f0dfbc5a4
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/v2/2x/big/btn-transition-gallery.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/v2/2x/big/btn-transition-honeycomb.png b/apps/presentationeditor/main/resources/img/toolbar/v2/2x/big/btn-transition-honeycomb.png
new file mode 100644
index 0000000000..2f0dfbc5a4
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/v2/2x/big/btn-transition-honeycomb.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/v2/2x/big/btn-transition-orbit.png b/apps/presentationeditor/main/resources/img/toolbar/v2/2x/big/btn-transition-orbit.png
new file mode 100644
index 0000000000..2f0dfbc5a4
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/v2/2x/big/btn-transition-orbit.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/v2/2x/big/btn-transition-plus.png b/apps/presentationeditor/main/resources/img/toolbar/v2/2x/big/btn-transition-plus.png
new file mode 100644
index 0000000000..2f0dfbc5a4
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/v2/2x/big/btn-transition-plus.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/v2/2x/big/btn-transition-randombars.png b/apps/presentationeditor/main/resources/img/toolbar/v2/2x/big/btn-transition-randombars.png
new file mode 100644
index 0000000000..2f0dfbc5a4
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/v2/2x/big/btn-transition-randombars.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/v2/2x/big/btn-transition-ripple.png b/apps/presentationeditor/main/resources/img/toolbar/v2/2x/big/btn-transition-ripple.png
new file mode 100644
index 0000000000..2f0dfbc5a4
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/v2/2x/big/btn-transition-ripple.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/v2/2x/big/btn-transition-rotate.png b/apps/presentationeditor/main/resources/img/toolbar/v2/2x/big/btn-transition-rotate.png
new file mode 100644
index 0000000000..2f0dfbc5a4
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/v2/2x/big/btn-transition-rotate.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/v2/2x/big/btn-transition-switch.png b/apps/presentationeditor/main/resources/img/toolbar/v2/2x/big/btn-transition-switch.png
new file mode 100644
index 0000000000..2f0dfbc5a4
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/v2/2x/big/btn-transition-switch.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/v2/2x/big/btn-transition-vortex.png b/apps/presentationeditor/main/resources/img/toolbar/v2/2x/big/btn-transition-vortex.png
new file mode 100644
index 0000000000..2f0dfbc5a4
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/v2/2x/big/btn-transition-vortex.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/v2/2x/big/btn-transition-window.png b/apps/presentationeditor/main/resources/img/toolbar/v2/2x/big/btn-transition-window.png
new file mode 100644
index 0000000000..2f0dfbc5a4
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/v2/2x/big/btn-transition-window.png differ
diff --git a/apps/presentationeditor/mobile/locale/en.json b/apps/presentationeditor/mobile/locale/en.json
index 32d4cf0919..96ee375d05 100644
--- a/apps/presentationeditor/mobile/locale/en.json
+++ b/apps/presentationeditor/mobile/locale/en.json
@@ -509,7 +509,44 @@
"textZoomOut": "Zoom Out",
"textZoomRotate": "Zoom and Rotate",
"txtHeight": "Height",
- "txtWidth": "Width"
+ "txtWidth": "Width",
+ "textBlinds": "Blinds",
+ "textBox": "Box",
+ "textBoxZoom": "Box Zoom",
+ "textCenter": "From Center",
+ "textChecker": "Checker",
+ "textCircle": "Circle",
+ "textComb": "Comb",
+ "textCube": "Cube",
+ "textCut": "Cut",
+ "textDiamond": "Diamond",
+ "textDissolve": "Dissolve",
+ "textDoors": "Doors",
+ "textFerris": "Ferris",
+ "textFlip": "Flip",
+ "textGallery": "Gallery",
+ "textHoneycomb": "Honeycomb",
+ "textHorizontal": "Horizontal",
+ "textIn": "In",
+ "textOrbit": "Orbit",
+ "textOut": "Out",
+ "textPlus": "Plus",
+ "textRandomBars": "Random Bars",
+ "textRandom": "Random",
+ "textRipple": "Ripple",
+ "textRotate": "Rotate",
+ "textSwitch": "Switch",
+ "textVertical": "Vertical",
+ "textVortex": "Vortex",
+ "textWindow": "Window",
+ "textFromLeft": "From Left",
+ "textFromRight": "From Right",
+ "textFromTop": "From Top",
+ "textFromBottom": "From Bottom",
+ "textFromTopLeft": "From Top-Left",
+ "textFromTopRight": "From Top-Right",
+ "textFromBottomLeft": "From Bottom-Left",
+ "textFromBottomRight": "From Bottom-Right"
},
"Settings": {
"mniSlideStandard": "Standard (4:3)",
diff --git a/apps/presentationeditor/mobile/locale/ru.json b/apps/presentationeditor/mobile/locale/ru.json
index 38859ad325..6dcc66fe08 100644
--- a/apps/presentationeditor/mobile/locale/ru.json
+++ b/apps/presentationeditor/mobile/locale/ru.json
@@ -509,7 +509,20 @@
"textZoomOut": "Уменьшение",
"textZoomRotate": "Увеличение с поворотом",
"txtHeight": "Высота",
- "txtWidth": "Ширина"
+ "txtWidth": "Ширина",
+ "textCenter": "Из центра",
+ "textHorizontal": "По горизонтали",
+ "textIn": "Внутрь",
+ "textOut": "Наружу",
+ "textVertical": "По вертикали",
+ "textFromLeft": "Слева",
+ "textFromRight": "Справа",
+ "textFromTop": "Сверху",
+ "textFromBottom": "Снизу",
+ "textFromTopLeft": "Из верхнего левого",
+ "textFromTopRight": "Из верхнего правого",
+ "textFromBottomLeft": "Из нижнего левого",
+ "textFromBottomRight": "Из нижнего правого"
},
"Settings": {
"mniSlideStandard": "Стандартный (4:3)",
diff --git a/apps/presentationeditor/mobile/src/view/edit/EditSlide.jsx b/apps/presentationeditor/mobile/src/view/edit/EditSlide.jsx
index 05dc71fb2b..cbb125af2f 100644
--- a/apps/presentationeditor/mobile/src/view/edit/EditSlide.jsx
+++ b/apps/presentationeditor/mobile/src/view/edit/EditSlide.jsx
@@ -135,21 +135,56 @@ const PageLayout = props => {
);
};
+const getPrismId = value => {
+ var prismId = 'prism-cube';
+ if (value >= Asc.c_oAscSlideTransitionParams.Prism_Left_Inverted && value <= Asc.c_oAscSlideTransitionParams.Prism_Down_Inverted)
+ prismId = 'prism-box';
+ else if (value >= Asc.c_oAscSlideTransitionParams.Prism_Left_Content && value <= Asc.c_oAscSlideTransitionParams.Prism_Down_Content)
+ prismId = 'prism-rotate';
+ else if (value >= Asc.c_oAscSlideTransitionParams.Prism_Left_ContentInv && value <= Asc.c_oAscSlideTransitionParams.Prism_Down_ContentInv)
+ prismId = 'prism-orbit';
+ return prismId;
+};
+
const PageTransition = props => {
const { t } = useTranslation();
const _t = t("View.Edit", { returnObjects: true });
const isAndroid = Device.android;
const _arrEffect = [
{displayValue: _t.textNone, value: Asc.c_oAscSlideTransitionTypes.None},
+ {displayValue: _t.textMorph, value: Asc.c_oAscSlideTransitionTypes.Morph},
{displayValue: _t.textFade, value: Asc.c_oAscSlideTransitionTypes.Fade},
{displayValue: _t.textPush, value: Asc.c_oAscSlideTransitionTypes.Push},
{displayValue: _t.textWipe, value: Asc.c_oAscSlideTransitionTypes.Wipe},
{displayValue: _t.textSplit, value: Asc.c_oAscSlideTransitionTypes.Split},
+ {displayValue: _t.textCut, value: Asc.c_oAscSlideTransitionTypes.Cut},
+ {displayValue: _t.textRandomBars, value: Asc.c_oAscSlideTransitionTypes.RandomBar},
{displayValue: _t.textUnCover, value: Asc.c_oAscSlideTransitionTypes.UnCover},
{displayValue: _t.textCover, value: Asc.c_oAscSlideTransitionTypes.Cover},
+ {displayValue: _t.textCircle, value: Asc.c_oAscSlideTransitionTypes.Circle},
+ {displayValue: _t.textDiamond, value: Asc.c_oAscSlideTransitionTypes.Diamond},
+ {displayValue: _t.textPlus, value: Asc.c_oAscSlideTransitionTypes.Plus},
+ {displayValue: _t.textDissolve, value: Asc.c_oAscSlideTransitionTypes.Dissolve},
+ {displayValue: _t.textChecker, value: Asc.c_oAscSlideTransitionTypes.Checker},
+ {displayValue: _t.textBlinds, value: Asc.c_oAscSlideTransitionTypes.Blinds},
{displayValue: _t.textClock, value: Asc.c_oAscSlideTransitionTypes.Clock},
+ {displayValue: _t.textRipple, value: Asc.c_oAscSlideTransitionTypes.Ripple},
+ {displayValue: _t.textHoneycomb, value: Asc.c_oAscSlideTransitionTypes.Honeycomb},
+ {displayValue: _t.textVortex, value: Asc.c_oAscSlideTransitionTypes.Vortex},
+ {displayValue: _t.textSwitch, value: Asc.c_oAscSlideTransitionTypes.Switch},
+ {displayValue: _t.textFlip, value: Asc.c_oAscSlideTransitionTypes.Flip},
+ {displayValue: _t.textGallery, value: Asc.c_oAscSlideTransitionTypes.Gallery},
+ {displayValue: _t.textCube, value: Asc.c_oAscSlideTransitionTypes.Prism, prismId: 'prism-cube'},
+ {displayValue: _t.textBoxZoom, value: Asc.c_oAscSlideTransitionTypes.BoxZoom},
+ {displayValue: _t.textDoors, value: Asc.c_oAscSlideTransitionTypes.Doors},
+ {displayValue: _t.textBox, value: Asc.c_oAscSlideTransitionTypes.Prism, prismId: 'prism-box'},
+ {displayValue: _t.textComb, value: Asc.c_oAscSlideTransitionTypes.Comb},
{displayValue: _t.textZoom, value: Asc.c_oAscSlideTransitionTypes.Zoom},
- {displayValue: _t.textMorph, value: Asc.c_oAscSlideTransitionTypes.Morph}
+ {displayValue: _t.textRandom, value: Asc.c_oAscSlideTransitionTypes.Random},
+ {displayValue: _t.textFerris, value: Asc.c_oAscSlideTransitionTypes.Ferris},
+ {displayValue: _t.textRotate, value: Asc.c_oAscSlideTransitionTypes.Prism, prismId: 'prism-rotate'},
+ {displayValue: _t.textWindow, value: Asc.c_oAscSlideTransitionTypes.Window},
+ {displayValue: _t.textOrbit, value: Asc.c_oAscSlideTransitionTypes.Prism, prismId: 'prism-orbit'}
];
const _arrEffectType = [
{displayValue: _t.textSmoothly, value: Asc.c_oAscSlideTransitionParams.Fade_Smoothly},
@@ -173,13 +208,62 @@ const PageTransition = props => {
{displayValue: _t.textZoomOut, value: Asc.c_oAscSlideTransitionParams.Zoom_Out},
{displayValue: _t.textZoomRotate, value: Asc.c_oAscSlideTransitionParams.Zoom_AndRotate},
{displayValue: _t.textMorphObjects, value: Asc.c_oAscSlideTransitionParams.Morph_Objects},
- {displayValue: _t.textMorphWords, value: Asc.c_oAscSlideTransitionParams.Morph_Words},
- {displayValue: _t.textMorphLetters, value: Asc.c_oAscSlideTransitionParams.Morph_Letters}
+ {displayValue: _t.textMorphWords, value: Asc.c_oAscSlideTransitionParams.Morph_Words},
+ {displayValue: _t.textMorphLetters, value: Asc.c_oAscSlideTransitionParams.Morph_Letters},
+ {displayValue: _t.textSmoothly, value: Asc.c_oAscSlideTransitionParams.Cut_Default},
+ {displayValue: _t.textBlack, value: Asc.c_oAscSlideTransitionParams.Cut_ThroughBlack},
+ {displayValue: _t.textHorizontal, value: Asc.c_oAscSlideTransitionParams.Blinds_Horizontal},
+ {displayValue: _t.textVertical, value: Asc.c_oAscSlideTransitionParams.Blinds_Vertical},
+ {displayValue: _t.textHorizontal, value: Asc.c_oAscSlideTransitionParams.Checker_Horizontal},
+ {displayValue: _t.textVertical, value: Asc.c_oAscSlideTransitionParams.Checker_Vertical},
+ {displayValue: _t.textHorizontal, value: Asc.c_oAscSlideTransitionParams.Comb_Horizontal},
+ {displayValue: _t.textVertical, value: Asc.c_oAscSlideTransitionParams.Comb_Vertical},
+ {displayValue: _t.textHorizontal, value: Asc.c_oAscSlideTransitionParams.RandomBar_Horizontal},
+ {displayValue: _t.textVertical, value: Asc.c_oAscSlideTransitionParams.RandomBar_Vertical},
+ {displayValue: _t.textIn, value: Asc.c_oAscSlideTransitionParams.BoxZoom_In},
+ {displayValue: _t.textOut, value: Asc.c_oAscSlideTransitionParams.BoxZoom_Out},
+ {displayValue: _t.textFromLeft, value: Asc.c_oAscSlideTransitionParams.Vortex_Left},
+ {displayValue: _t.textFromRight, value: Asc.c_oAscSlideTransitionParams.Vortex_Right},
+ {displayValue: _t.textFromTop, value: Asc.c_oAscSlideTransitionParams.Vortex_Up},
+ {displayValue: _t.textFromBottom, value: Asc.c_oAscSlideTransitionParams.Vortex_Down},
+ {displayValue: _t.textLeft, value: Asc.c_oAscSlideTransitionParams.Switch_Left},
+ {displayValue: _t.textRight, value: Asc.c_oAscSlideTransitionParams.Switch_Right},
+ {displayValue: _t.textLeft, value: Asc.c_oAscSlideTransitionParams.Flip_Left},
+ {displayValue: _t.textRight, value: Asc.c_oAscSlideTransitionParams.Flip_Right},
+ {displayValue: _t.textCenter, value: Asc.c_oAscSlideTransitionParams.Ripple_Center},
+ {displayValue: _t.textFromTopLeft, value: Asc.c_oAscSlideTransitionParams.Ripple_LeftUp},
+ {displayValue: _t.textFromTopRight, value: Asc.c_oAscSlideTransitionParams.Ripple_RightUp},
+ {displayValue: _t.textFromBottomLeft, value: Asc.c_oAscSlideTransitionParams.Ripple_LeftDown},
+ {displayValue: _t.textFromBottomRight, value: Asc.c_oAscSlideTransitionParams.Ripple_RightDown},
+ {displayValue: _t.textFromLeft, value: Asc.c_oAscSlideTransitionParams.Prism_Left},
+ {displayValue: _t.textFromRight, value: Asc.c_oAscSlideTransitionParams.Prism_Right},
+ {displayValue: _t.textFromTop, value: Asc.c_oAscSlideTransitionParams.Prism_Up},
+ {displayValue: _t.textFromBottom, value: Asc.c_oAscSlideTransitionParams.Prism_Down},
+ {displayValue: _t.textFromLeft, value: Asc.c_oAscSlideTransitionParams.Prism_Left_Inverted},
+ {displayValue: _t.textFromRight, value: Asc.c_oAscSlideTransitionParams.Prism_Right_Inverted},
+ {displayValue: _t.textFromTop, value: Asc.c_oAscSlideTransitionParams.Prism_Up_Inverted},
+ {displayValue: _t.textFromBottom, value: Asc.c_oAscSlideTransitionParams.Prism_Down_Inverted},
+ {displayValue: _t.textFromLeft, value: Asc.c_oAscSlideTransitionParams.Prism_Left_Content},
+ {displayValue: _t.textFromRight, value: Asc.c_oAscSlideTransitionParams.Prism_Right_Content},
+ {displayValue: _t.textFromTop, value: Asc.c_oAscSlideTransitionParams.Prism_Up_Content},
+ {displayValue: _t.textFromBottom, value: Asc.c_oAscSlideTransitionParams.Prism_Down_Content},
+ {displayValue: _t.textFromLeft, value: Asc.c_oAscSlideTransitionParams.Prism_Left_ContentInv},
+ {displayValue: _t.textFromRight, value: Asc.c_oAscSlideTransitionParams.Prism_Right_ContentInv},
+ {displayValue: _t.textFromTop, value: Asc.c_oAscSlideTransitionParams.Prism_Up_ContentInv},
+ {displayValue: _t.textFromBottom, value: Asc.c_oAscSlideTransitionParams.Prism_Down_ContentInv},
+ {displayValue: _t.textHorizontal, value: Asc.c_oAscSlideTransitionParams.Doors_Horizontal},
+ {displayValue: _t.textVertical, value: Asc.c_oAscSlideTransitionParams.Doors_Vertical},
+ {displayValue: _t.textHorizontal, value: Asc.c_oAscSlideTransitionParams.Window_Horizontal},
+ {displayValue: _t.textVertical, value: Asc.c_oAscSlideTransitionParams.Window_Vertical},
+ {displayValue: _t.textLeft, value: Asc.c_oAscSlideTransitionParams.Ferris_Left},
+ {displayValue: _t.textRight, value: Asc.c_oAscSlideTransitionParams.Ferris_Right},
+ {displayValue: _t.textLeft, value: Asc.c_oAscSlideTransitionParams.Gallery_Left},
+ {displayValue: _t.textRight, value: Asc.c_oAscSlideTransitionParams.Gallery_Right}
];
let _arrCurrentEffectTypes = [];
- const fillEffectTypes = type => {
+ const fillEffectTypes = (type, prismId) => {
_arrCurrentEffectTypes = [];
switch (type) {
case Asc.c_oAscSlideTransitionTypes.Fade:
@@ -207,15 +291,75 @@ const PageTransition = props => {
_arrCurrentEffectTypes = _arrEffectType.slice(17,20);
break;
case Asc.c_oAscSlideTransitionTypes.Morph:
- _arrCurrentEffectTypes = _arrEffectType.slice(20);
+ _arrCurrentEffectTypes = _arrEffectType.slice(20, 23);
+ break;
+ case Asc.c_oAscSlideTransitionTypes.Cut:
+ _arrCurrentEffectTypes = _arrEffectType.slice(23, 25);
+ break;
+ case Asc.c_oAscSlideTransitionTypes.Blinds:
+ _arrCurrentEffectTypes = _arrEffectType.slice(25, 27);
+ break;
+ case Asc.c_oAscSlideTransitionTypes.Checker:
+ _arrCurrentEffectTypes = _arrEffectType.slice(27, 29);
+ break;
+ case Asc.c_oAscSlideTransitionTypes.Comb:
+ _arrCurrentEffectTypes = _arrEffectType.slice(29, 31);
+ break;
+ case Asc.c_oAscSlideTransitionTypes.RandomBar:
+ _arrCurrentEffectTypes = _arrEffectType.slice(31, 33);
+ break;
+ case Asc.c_oAscSlideTransitionTypes.BoxZoom:
+ _arrCurrentEffectTypes = _arrEffectType.slice(33, 35);
+ break;
+ case Asc.c_oAscSlideTransitionTypes.Vortex:
+ _arrCurrentEffectTypes = _arrEffectType.slice(35, 39);
+ break;
+ case Asc.c_oAscSlideTransitionTypes.Switch:
+ _arrCurrentEffectTypes = _arrEffectType.slice(39, 41);
+ break;
+ case Asc.c_oAscSlideTransitionTypes.Flip:
+ _arrCurrentEffectTypes = _arrEffectType.slice(41, 43);
+ break;
+ case Asc.c_oAscSlideTransitionTypes.Ripple:
+ _arrCurrentEffectTypes = _arrEffectType.slice(43, 48);
+ break;
+ case Asc.c_oAscSlideTransitionTypes.Prism:
+ var currentPrismId = prismId || 'prism-cube';
+ switch (currentPrismId) {
+ case 'prism-box':
+ _arrCurrentEffectTypes = _arrEffectType.slice(52, 56);
+ break;
+ case 'prism-rotate':
+ _arrCurrentEffectTypes = _arrEffectType.slice(56, 60);
+ break;
+ case 'prism-orbit':
+ _arrCurrentEffectTypes = _arrEffectType.slice(60, 64);
+ break;
+ default:
+ _arrCurrentEffectTypes = _arrEffectType.slice(48, 52);
+ break;
+ }
+ break;
+ case Asc.c_oAscSlideTransitionTypes.Doors:
+ _arrCurrentEffectTypes = _arrEffectType.slice(64, 66);
+ break;
+ case Asc.c_oAscSlideTransitionTypes.Window:
+ _arrCurrentEffectTypes = _arrEffectType.slice(66, 68);
+ break;
+ case Asc.c_oAscSlideTransitionTypes.Ferris:
+ _arrCurrentEffectTypes = _arrEffectType.slice(68, 70);
+ break;
+ case Asc.c_oAscSlideTransitionTypes.Gallery:
+ _arrCurrentEffectTypes = _arrEffectType.slice(70, 72);
break;
}
return (_arrCurrentEffectTypes.length > 0) ? _arrCurrentEffectTypes[0].value : -1;
};
- const getEffectName = effect => {
+ const getEffectName = (effect, prismId) => {
for (var i=0; i < _arrEffect.length; i++) {
- if (_arrEffect[i].value == effect) return _arrEffect[i].displayValue;
+ if (_arrEffect[i].value == effect &&
+ (effect != Asc.c_oAscSlideTransitionTypes.Prism || _arrEffect[i].prismId == prismId)) return _arrEffect[i].displayValue;
}
return '';
};
@@ -237,13 +381,20 @@ const PageTransition = props => {
const isStartOnClick = transitionObj.get_SlideAdvanceOnMouseClick();
const _effect = transitionObj.get_TransitionType();
- const nameEffect = getEffectName(_effect);
- if(_effect != Asc.c_oAscSlideTransitionTypes.None) fillEffectTypes(_effect);
-
const _effectType = transitionObj.get_TransitionOption();
+ const prismId = getPrismId(_effectType);
+ const nameEffect = getEffectName(_effect, prismId);
+ if(_effect != Asc.c_oAscSlideTransitionTypes.None) fillEffectTypes(_effect, prismId);
const nameEffectType = getEffectTypeName(_effectType);
const _effectDuration = transitionObj.get_TransitionDuration();
+ const noParameters = _effect == Asc.c_oAscSlideTransitionTypes.None ||
+ _effect == Asc.c_oAscSlideTransitionTypes.Random ||
+ _effect == Asc.c_oAscSlideTransitionTypes.Circle ||
+ _effect == Asc.c_oAscSlideTransitionTypes.Diamond ||
+ _effect == Asc.c_oAscSlideTransitionTypes.Dissolve ||
+ _effect == Asc.c_oAscSlideTransitionTypes.Plus ||
+ _effect == Asc.c_oAscSlideTransitionTypes.Honeycomb;
useEffect(() => {
changeRange((_effectDelay !== null && _effectDelay !== undefined) ? parseInt(_effectDelay / 1000.) : 0);
@@ -269,10 +420,11 @@ const PageTransition = props => {
onEffectClick: props.onEffectClick,
fillEffectTypes,
_effect,
+ _prismId: prismId
}}>
{
const { t } = useTranslation();
const _t = t("View.Edit", { returnObjects: true });
const [currentEffect, setEffect] = useState(props._effect);
+ const [currentPrismId, setPrismId] = useState(props._prismId);
const _arrEffect = props._arrEffect;
return (
@@ -362,11 +515,15 @@ const PageEffect = props => {
{_arrEffect.length ? (
{_arrEffect.map((elem, index) => {
+ const prismId = elem.value == Asc.c_oAscSlideTransitionTypes.Prism ? elem.prismId : undefined;
+ const checked = elem.value == currentEffect && (elem.value != Asc.c_oAscSlideTransitionTypes.Prism || prismId == currentPrismId);
return (
{
+ checked={checked} onChange={() => {
+ const selectedPrismId = elem.value == Asc.c_oAscSlideTransitionTypes.Prism ? prismId : undefined;
setEffect(elem.value);
- let valueEffectTypes = props.fillEffectTypes(elem.value);
+ setPrismId(selectedPrismId);
+ let valueEffectTypes = props.fillEffectTypes(elem.value, selectedPrismId);
props.onEffectClick(elem.value, valueEffectTypes);
}}>
)