From b3943b592d3b50247161128c28707b47c5d21675 Mon Sep 17 00:00:00 2001
From: Julia Radzhabova <Julia.Radzhabova@onlyoffice.com>
Date: Tue, 10 Dec 2019 15:02:30 +0300
Subject: [PATCH] [PE] Fix icons for slideshow controls

---
 .../main/app/view/DocumentPreview.js          |  31 ++++++++-------
 ...en.png => btn-preview-exit-fullscreen.png} | Bin
 ...lscreen.png => btn-preview-fullscreen.png} | Bin
 ...reviwe-pause.png => btn-preview-pause.png} | Bin
 ...-previwe-play.png => btn-preview-play.png} | Bin
 ...en.png => btn-preview-exit-fullscreen.png} | Bin
 ...lscreen.png => btn-preview-fullscreen.png} | Bin
 ...reviwe-pause.png => btn-preview-pause.png} | Bin
 ...-previwe-play.png => btn-preview-play.png} | Bin
 ...en.png => btn-preview-exit-fullscreen.png} | Bin
 ...lscreen.png => btn-preview-fullscreen.png} | Bin
 ...reviwe-pause.png => btn-preview-pause.png} | Bin
 ...-previwe-play.png => btn-preview-play.png} | Bin
 .../main/resources/less/document-preview.less |  36 ------------------
 14 files changed, 18 insertions(+), 49 deletions(-)
 rename apps/presentationeditor/main/resources/img/toolbar/1.5x/{btn-previwe- exit-fullscreen.png => btn-preview-exit-fullscreen.png} (100%)
 rename apps/presentationeditor/main/resources/img/toolbar/1.5x/{btn-previwe-fullscreen.png => btn-preview-fullscreen.png} (100%)
 rename apps/presentationeditor/main/resources/img/toolbar/1.5x/{btn-previwe-pause.png => btn-preview-pause.png} (100%)
 rename apps/presentationeditor/main/resources/img/toolbar/1.5x/{btn-previwe-play.png => btn-preview-play.png} (100%)
 rename apps/presentationeditor/main/resources/img/toolbar/1x/{btn-previwe- exit-fullscreen.png => btn-preview-exit-fullscreen.png} (100%)
 rename apps/presentationeditor/main/resources/img/toolbar/1x/{btn-previwe-fullscreen.png => btn-preview-fullscreen.png} (100%)
 rename apps/presentationeditor/main/resources/img/toolbar/1x/{btn-previwe-pause.png => btn-preview-pause.png} (100%)
 rename apps/presentationeditor/main/resources/img/toolbar/1x/{btn-previwe-play.png => btn-preview-play.png} (100%)
 rename apps/presentationeditor/main/resources/img/toolbar/2x/{btn-previwe- exit-fullscreen.png => btn-preview-exit-fullscreen.png} (100%)
 rename apps/presentationeditor/main/resources/img/toolbar/2x/{btn-previwe-fullscreen.png => btn-preview-fullscreen.png} (100%)
 rename apps/presentationeditor/main/resources/img/toolbar/2x/{btn-previwe-pause.png => btn-preview-pause.png} (100%)
 rename apps/presentationeditor/main/resources/img/toolbar/2x/{btn-previwe-play.png => btn-preview-play.png} (100%)

diff --git a/apps/presentationeditor/main/app/view/DocumentPreview.js b/apps/presentationeditor/main/app/view/DocumentPreview.js
index f701805d0..c47749871 100644
--- a/apps/presentationeditor/main/app/view/DocumentPreview.js
+++ b/apps/presentationeditor/main/app/view/DocumentPreview.js
@@ -72,9 +72,9 @@ define([
                 '<div id="presentation-preview" style="width:100%; height:100%"></div>',
                 '<div id="preview-controls-panel" class="preview-controls" style="position: absolute; bottom: 0;">',
                     '<div class="preview-group" style="">',
-                        '<button id="btn-preview-prev" type="button" class="btn small btn-toolbar"><span class="icon">&nbsp;</span></button>',
-                        '<button id="btn-preview-play" type="button" class="btn small btn-toolbar"><span class="icon">&nbsp;</span></button>',
-                        '<button id="btn-preview-next" type="button" class="btn small btn-toolbar"><span class="icon">&nbsp;</span></button>',
+                        '<button id="btn-preview-prev" type="button" class="btn small btn-toolbar"><span class="icon toolbar__icon btn-previtem">&nbsp;</span></button>',
+                        '<button id="btn-preview-play" type="button" class="btn small btn-toolbar"><span class="icon toolbar__icon btn-preview-play">&nbsp;</span></button>',
+                        '<button id="btn-preview-next" type="button" class="btn small btn-toolbar"><span class="icon toolbar__icon btn-nextitem">&nbsp;</span></button>',
                     '<div class="separator"/>',
                     '</div>',
                     '<div class="preview-group dropup">',
@@ -86,9 +86,9 @@ define([
                     '</div>',
                     '<div class="preview-group" style="">',
                         '<div class="separator"/>',
-                        '<button id="btn-preview-fullscreen" type="button" class="btn small btn-toolbar"><span class="icon">&nbsp;</span></button>',
+                        '<button id="btn-preview-fullscreen" type="button" class="btn small btn-toolbar"><span class="icon toolbar__icon btn-preview-fullscreen">&nbsp;</span></button>',
                         '<div class="separator fullscreen"/>',
-                        '<button id="btn-preview-close" type="button" class="btn small btn-toolbar"><span class="icon">&nbsp;</span></button>',
+                        '<button id="btn-preview-close" type="button" class="btn small btn-toolbar"><span class="icon toolbar__icon btn-close">&nbsp;</span></button>',
                     '</div>',
                 '</div>'
             ].join('');
@@ -129,13 +129,15 @@ define([
             });
             this.btnPlay.on('click', _.bind(function(btn) {
                 var iconEl = $('.icon', this.btnPlay.cmpEl);
-                if (iconEl.hasClass('btn-pause')) {
-                    iconEl.removeClass('btn-pause');
+                if (iconEl.hasClass('btn-preview-pause')) {
+                    iconEl.removeClass('btn-preview-pause');
+                    iconEl.addClass('btn-preview-play');
                     this.btnPlay.updateHint(this.txtPlay);
                     if (this.api)
                         this.api.DemonstrationPause();
                 } else {
-                    iconEl.addClass('btn-pause');
+                    iconEl.addClass('btn-preview-pause');
+                    iconEl.removeClass('btn-preview-play');
                     this.btnPlay.updateHint(this.txtPause);
                     if (this.api)
                         this.api.DemonstrationPlay ();
@@ -232,7 +234,8 @@ define([
 
             $(document).on("webkitfullscreenchange mozfullscreenchange fullscreenchange MSFullscreenChange",function(){
                 var fselem = (document.fullscreenElement || document.mozFullScreenElement || document.webkitFullscreenElement || document.msFullscreenElement );
-                me.btnFullScreen.cmpEl.toggleClass('fullscreen', fselem !== undefined && fselem !== null);
+                $('.icon', me.btnFullScreen.cmpEl).toggleClass('btn-preview-exit-fullscreen', fselem !== undefined && fselem !== null);
+                $('.icon', me.btnFullScreen.cmpEl).toggleClass('btn-preview-fullscreen', fselem == undefined || fselem == null);
 
                 setTimeout( function() {
                     me.previewControls.css('display', '');
@@ -242,7 +245,7 @@ define([
                 if (Common.Utils.isIE) { // for tooltips in IE
                     me.btnFullScreen.updateHint( fselem ? '' : me.txtFullScreen);
                     me.btnPrev.updateHint( fselem ? '' : me.txtPrev);
-                    me.btnPlay.updateHint( fselem ? '' : ($('.icon', me.btnPlay.cmpEl).hasClass('btn-pause') ? me.txtPause : me.txtPlay));
+                    me.btnPlay.updateHint( fselem ? '' : ($('.icon', me.btnPlay.cmpEl).hasClass('btn-preview-pause') ? me.txtPause : me.txtPlay));
                     me.btnNext.updateHint( fselem ? '' : me.txtNext);
                     me.btnClose.updateHint( fselem ? '' : me.txtClose);
                 } else
@@ -275,8 +278,9 @@ define([
             Common.UI.BaseView.prototype.show.call(this,arguments);
 
             var iconEl = $('.icon', this.btnPlay.cmpEl);
-            if (!iconEl.hasClass('btn-pause')) {
-                iconEl.addClass('btn-pause');
+            if (!iconEl.hasClass('btn-preview-pause')) {
+                iconEl.addClass('btn-preview-pause');
+                iconEl.removeClass('btn-preview-play');
                 this.btnPlay.updateHint(this.txtPause);
             }
 
@@ -367,7 +371,8 @@ define([
 
         onDemonstrationStatus: function(status) {
             var iconEl = $('.icon', this.btnPlay.cmpEl);
-            iconEl.toggleClass('btn-pause', status=="play");
+            iconEl.toggleClass('btn-preivew-pause', status=="play");
+            iconEl.toggleClass('btn-preivew-play', status!=="play");
             this.btnPlay.updateHint((status=="play") ? this.txtPause : this.txtPlay);
         },
 
diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.5x/btn-previwe- exit-fullscreen.png b/apps/presentationeditor/main/resources/img/toolbar/1.5x/btn-preview-exit-fullscreen.png
similarity index 100%
rename from apps/presentationeditor/main/resources/img/toolbar/1.5x/btn-previwe- exit-fullscreen.png
rename to apps/presentationeditor/main/resources/img/toolbar/1.5x/btn-preview-exit-fullscreen.png
diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.5x/btn-previwe-fullscreen.png b/apps/presentationeditor/main/resources/img/toolbar/1.5x/btn-preview-fullscreen.png
similarity index 100%
rename from apps/presentationeditor/main/resources/img/toolbar/1.5x/btn-previwe-fullscreen.png
rename to apps/presentationeditor/main/resources/img/toolbar/1.5x/btn-preview-fullscreen.png
diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.5x/btn-previwe-pause.png b/apps/presentationeditor/main/resources/img/toolbar/1.5x/btn-preview-pause.png
similarity index 100%
rename from apps/presentationeditor/main/resources/img/toolbar/1.5x/btn-previwe-pause.png
rename to apps/presentationeditor/main/resources/img/toolbar/1.5x/btn-preview-pause.png
diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.5x/btn-previwe-play.png b/apps/presentationeditor/main/resources/img/toolbar/1.5x/btn-preview-play.png
similarity index 100%
rename from apps/presentationeditor/main/resources/img/toolbar/1.5x/btn-previwe-play.png
rename to apps/presentationeditor/main/resources/img/toolbar/1.5x/btn-preview-play.png
diff --git a/apps/presentationeditor/main/resources/img/toolbar/1x/btn-previwe- exit-fullscreen.png b/apps/presentationeditor/main/resources/img/toolbar/1x/btn-preview-exit-fullscreen.png
similarity index 100%
rename from apps/presentationeditor/main/resources/img/toolbar/1x/btn-previwe- exit-fullscreen.png
rename to apps/presentationeditor/main/resources/img/toolbar/1x/btn-preview-exit-fullscreen.png
diff --git a/apps/presentationeditor/main/resources/img/toolbar/1x/btn-previwe-fullscreen.png b/apps/presentationeditor/main/resources/img/toolbar/1x/btn-preview-fullscreen.png
similarity index 100%
rename from apps/presentationeditor/main/resources/img/toolbar/1x/btn-previwe-fullscreen.png
rename to apps/presentationeditor/main/resources/img/toolbar/1x/btn-preview-fullscreen.png
diff --git a/apps/presentationeditor/main/resources/img/toolbar/1x/btn-previwe-pause.png b/apps/presentationeditor/main/resources/img/toolbar/1x/btn-preview-pause.png
similarity index 100%
rename from apps/presentationeditor/main/resources/img/toolbar/1x/btn-previwe-pause.png
rename to apps/presentationeditor/main/resources/img/toolbar/1x/btn-preview-pause.png
diff --git a/apps/presentationeditor/main/resources/img/toolbar/1x/btn-previwe-play.png b/apps/presentationeditor/main/resources/img/toolbar/1x/btn-preview-play.png
similarity index 100%
rename from apps/presentationeditor/main/resources/img/toolbar/1x/btn-previwe-play.png
rename to apps/presentationeditor/main/resources/img/toolbar/1x/btn-preview-play.png
diff --git a/apps/presentationeditor/main/resources/img/toolbar/2x/btn-previwe- exit-fullscreen.png b/apps/presentationeditor/main/resources/img/toolbar/2x/btn-preview-exit-fullscreen.png
similarity index 100%
rename from apps/presentationeditor/main/resources/img/toolbar/2x/btn-previwe- exit-fullscreen.png
rename to apps/presentationeditor/main/resources/img/toolbar/2x/btn-preview-exit-fullscreen.png
diff --git a/apps/presentationeditor/main/resources/img/toolbar/2x/btn-previwe-fullscreen.png b/apps/presentationeditor/main/resources/img/toolbar/2x/btn-preview-fullscreen.png
similarity index 100%
rename from apps/presentationeditor/main/resources/img/toolbar/2x/btn-previwe-fullscreen.png
rename to apps/presentationeditor/main/resources/img/toolbar/2x/btn-preview-fullscreen.png
diff --git a/apps/presentationeditor/main/resources/img/toolbar/2x/btn-previwe-pause.png b/apps/presentationeditor/main/resources/img/toolbar/2x/btn-preview-pause.png
similarity index 100%
rename from apps/presentationeditor/main/resources/img/toolbar/2x/btn-previwe-pause.png
rename to apps/presentationeditor/main/resources/img/toolbar/2x/btn-preview-pause.png
diff --git a/apps/presentationeditor/main/resources/img/toolbar/2x/btn-previwe-play.png b/apps/presentationeditor/main/resources/img/toolbar/2x/btn-preview-play.png
similarity index 100%
rename from apps/presentationeditor/main/resources/img/toolbar/2x/btn-previwe-play.png
rename to apps/presentationeditor/main/resources/img/toolbar/2x/btn-preview-play.png
diff --git a/apps/presentationeditor/main/resources/less/document-preview.less b/apps/presentationeditor/main/resources/less/document-preview.less
index dc6160cfb..8587861dc 100644
--- a/apps/presentationeditor/main/resources/less/document-preview.less
+++ b/apps/presentationeditor/main/resources/less/document-preview.less
@@ -27,39 +27,9 @@
 
     #btn-preview-prev {
         margin-left: 10px;
-        .btn-tpl(-1240px);
-    }
-    #btn-preview-next {
-        .btn-tpl(-1260px);
-    }
-    #btn-preview-play {
-        .btn-tpl(-1280px);
-
-        .icon.btn-pause {
-            background-position: 0 -1320px;
-
-            &:active {
-                background-position: -20px -1320px;
-            }
-        }
-
-        &[disabled] .icon.btn-pause {
-            background-position: -60px -1320px;
-        }
-
-        &.active {
-            .icon.btn-pause {
-                background-position: -20px -1320px;
-            }
-        }
     }
     #btn-preview-close {
         margin-right: 10px;
-        .btn-tpl(-1300px);
-    }
-
-    #btn-preview-fullscreen {
-        .btn-tpl(-1440px);
     }
 
     .separator {
@@ -86,9 +56,3 @@
           }
     }
 }
-
-:-webkit-full-screen #btn-preview-fullscreen{ .btn-tpl(-1420px); }
-:-moz-full-screen #btn-preview-fullscreen   { .btn-tpl(-1420px); }
-:-ms-fullscreen #btn-preview-fullscreen     { .btn-tpl(-1420px); }
-:fullscreen #btn-preview-fullscreen         { .btn-tpl(-1420px); }
-#btn-preview-fullscreen.fullscreen     { .btn-tpl(-1420px); }