diff --git a/apps/presentationeditor/main/app/template/Toolbar.template b/apps/presentationeditor/main/app/template/Toolbar.template index 31c63d63e..4aa8ec630 100644 --- a/apps/presentationeditor/main/app/template/Toolbar.template +++ b/apps/presentationeditor/main/app/template/Toolbar.template @@ -242,8 +242,7 @@
- - +
@@ -253,7 +252,8 @@
-
+ +
diff --git a/apps/presentationeditor/main/app/view/Animation.js b/apps/presentationeditor/main/app/view/Animation.js index a510e159b..1879f62b7 100644 --- a/apps/presentationeditor/main/app/view/Animation.js +++ b/apps/presentationeditor/main/app/view/Animation.js @@ -237,7 +237,7 @@ define([ cls: 'btn-toolbar x-huge icon-top', // x-huge icon-top', caption: this.txtPreview, split: false, - iconCls: 'toolbar__icon transition-fade', + iconCls: 'toolbar__icon animation-preview', lock: [_set.slideDeleted, _set.noSlides, _set.noAnimationPreview], dataHint: '1', dataHintDirection: 'bottom', @@ -248,7 +248,7 @@ define([ this.btnParameters = new Common.UI.Button({ cls: 'btn-toolbar x-huge icon-top', caption: this.txtParameters, - iconCls: 'toolbar__icon icon transition-none', + iconCls: 'toolbar__icon icon animation-none', menu: new Common.UI.Menu({items: []}), lock: [_set.slideDeleted, _set.noSlides, _set.noGraphic, _set.noAnimation, _set.noAnimationParam], dataHint: '1', @@ -272,7 +272,7 @@ define([ this.btnAddAnimation = new Common.UI.Button({ cls: 'btn-toolbar x-huge icon-top', caption: this.txtAddEffect, - iconCls: 'toolbar__icon icon btn-addslide', + iconCls: 'toolbar__icon icon add-animation', menu: true, lock: [_set.slideDeleted, _set.noSlides, _set.noGraphic], dataHint: '1', @@ -305,7 +305,7 @@ define([ this.cmbTrigger = new Common.UI.Button({ parentEl: $('#animation-trigger'), cls: 'btn-toolbar', - iconCls: 'toolbar__icon btn-contents', + iconCls: 'toolbar__icon btn-trigger', caption: this.strTrigger, lock: [_set.slideDeleted, _set.noSlides, _set.noGraphic, _set.noAnimation, _set.noTriggerObjects], menu : new Common.UI.Menu({ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/add-animation.png b/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/add-animation.png new file mode 100644 index 000000000..f170ad76c Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/add-animation.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-preview.png b/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-preview.png new file mode 100644 index 000000000..4f6b06a87 Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-preview.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.25x/btn-trigger.png b/apps/presentationeditor/main/resources/img/toolbar/1.25x/btn-trigger.png new file mode 100644 index 000000000..0831be766 Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/1.25x/btn-trigger.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/add-animation.png b/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/add-animation.png new file mode 100644 index 000000000..118924b7e Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/add-animation.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-preview.png b/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-preview.png new file mode 100644 index 000000000..e9c0c1019 Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-preview.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.5x/btn-trigger.png b/apps/presentationeditor/main/resources/img/toolbar/1.5x/btn-trigger.png new file mode 100644 index 000000000..3bb92d576 Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/1.5x/btn-trigger.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/add-animation.png b/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/add-animation.png new file mode 100644 index 000000000..ec0cc4944 Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/add-animation.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-preview.png b/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-preview.png new file mode 100644 index 000000000..f5e6918c9 Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-preview.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.75x/btn-trigger.png b/apps/presentationeditor/main/resources/img/toolbar/1.75x/btn-trigger.png new file mode 100644 index 000000000..cbf7ec679 Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/1.75x/btn-trigger.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1x/big/add-animation.png b/apps/presentationeditor/main/resources/img/toolbar/1x/big/add-animation.png new file mode 100644 index 000000000..be91e4fe3 Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/1x/big/add-animation.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-preview.png b/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-preview.png new file mode 100644 index 000000000..3418c612c Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-preview.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1x/btn-trigger.png b/apps/presentationeditor/main/resources/img/toolbar/1x/btn-trigger.png new file mode 100644 index 000000000..2186745af Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/1x/btn-trigger.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/2x/big/add-animation.png b/apps/presentationeditor/main/resources/img/toolbar/2x/big/add-animation.png new file mode 100644 index 000000000..1ea0355a1 Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/2x/big/add-animation.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-preview.png b/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-preview.png new file mode 100644 index 000000000..81fd79996 Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-preview.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/2x/btn-trigger.png b/apps/presentationeditor/main/resources/img/toolbar/2x/btn-trigger.png new file mode 100644 index 000000000..1c5e69323 Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/2x/btn-trigger.png differ