From 8eb3a3f10269f2df30841369ea1d2c614e2a9c46 Mon Sep 17 00:00:00 2001
From: Julia Radzhabova <julia.radzhabova@onlyoffice.com>
Date: Fri, 30 Jul 2021 18:57:45 +0300
Subject: [PATCH] [PE] For Bug 40447

---
 apps/presentationeditor/main/app/controller/Main.js     | 4 +++-
 apps/presentationeditor/main/app/controller/Toolbar.js  | 4 +++-
 apps/presentationeditor/main/app/view/FileMenuPanels.js | 8 ++++++--
 apps/presentationeditor/main/index.html                 | 2 ++
 apps/presentationeditor/main/index.html.deploy          | 2 ++
 apps/presentationeditor/main/index_loader.html          | 2 ++
 apps/presentationeditor/main/index_loader.html.deploy   | 2 ++
 7 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/apps/presentationeditor/main/app/controller/Main.js b/apps/presentationeditor/main/app/controller/Main.js
index 0b7835d15..07987991c 100644
--- a/apps/presentationeditor/main/app/controller/Main.js
+++ b/apps/presentationeditor/main/app/controller/Main.js
@@ -480,7 +480,9 @@ define([
                         Asc.c_oAscFileType.PDFA,
                         Asc.c_oAscFileType.POTX,
                         Asc.c_oAscFileType.OTP,
-                        Asc.c_oAscFileType.PPTM
+                        Asc.c_oAscFileType.PPTM,
+                        Asc.c_oAscFileType.PNG,
+                        Asc.c_oAscFileType.JPG
                     ];
 
                 if ( !_format || _supported.indexOf(_format) < 0 )
diff --git a/apps/presentationeditor/main/app/controller/Toolbar.js b/apps/presentationeditor/main/app/controller/Toolbar.js
index 85bbdc40a..4b273319f 100644
--- a/apps/presentationeditor/main/app/controller/Toolbar.js
+++ b/apps/presentationeditor/main/app/controller/Toolbar.js
@@ -161,7 +161,9 @@ define([
                             Asc.c_oAscFileType.PDFA,
                             Asc.c_oAscFileType.POTX,
                             Asc.c_oAscFileType.OTP,
-                            Asc.c_oAscFileType.PPTM
+                            Asc.c_oAscFileType.PPTM,
+                            Asc.c_oAscFileType.PNG,
+                            Asc.c_oAscFileType.JPG
                         ];
 
                         if ( !_format || _supported.indexOf(_format) < 0 )
diff --git a/apps/presentationeditor/main/app/view/FileMenuPanels.js b/apps/presentationeditor/main/app/view/FileMenuPanels.js
index bb76447f0..789ee973f 100644
--- a/apps/presentationeditor/main/app/view/FileMenuPanels.js
+++ b/apps/presentationeditor/main/app/view/FileMenuPanels.js
@@ -62,7 +62,9 @@ define([
             {name: 'PDFA',  imgCls: 'pdfa',  type: Asc.c_oAscFileType.PDFA},
             {name: 'OTP',   imgCls: 'otp',   type: Asc.c_oAscFileType.OTP}
         ], [
-            {name: 'PPTM',  imgCls: 'pptm',  type: Asc.c_oAscFileType.PPTM}
+            {name: 'PPTM',  imgCls: 'pptm',  type: Asc.c_oAscFileType.PPTM},
+            {name: 'PNG',   imgCls: 'png',  type: Asc.c_oAscFileType.PNG},
+            {name: 'JPG',   imgCls: 'jpg',  type: Asc.c_oAscFileType.JPG}
         ]],
 
 
@@ -130,7 +132,9 @@ define([
             {name: 'PDFA',  imgCls: 'pdfa',  type: Asc.c_oAscFileType.PDFA, ext: '.pdf'},
             {name: 'OTP',   imgCls: 'otp',   type: Asc.c_oAscFileType.OTP,  ext: '.otp'}
         ], [
-            {name: 'PPTM',  imgCls: 'pptm',  type: Asc.c_oAscFileType.PPTM, ext: '.pptm'}
+            {name: 'PPTM',  imgCls: 'pptm',  type: Asc.c_oAscFileType.PPTM, ext: '.pptm'},
+            {name: 'PNG',   imgCls: 'png',   type: Asc.c_oAscFileType.PNG, ext: '.png'},
+            {name: 'JPG',   imgCls: 'jpg',   type: Asc.c_oAscFileType.JPG, ext: '.jpg'}
         ]],
 
         template: _.template([
diff --git a/apps/presentationeditor/main/index.html b/apps/presentationeditor/main/index.html
index 3e531f313..1b84c63ee 100644
--- a/apps/presentationeditor/main/index.html
+++ b/apps/presentationeditor/main/index.html
@@ -333,6 +333,8 @@
     <img class="inline-svg" src="../../common/main/resources/img/doc-formats/odp.svg">
     <img class="inline-svg" src="../../common/main/resources/img/doc-formats/otp.svg">
     <img class="inline-svg" src="../../common/main/resources/img/doc-formats/pptm.svg">
+    <img class="inline-svg" src="../../common/main/resources/img/doc-formats/png.svg">
+    <img class="inline-svg" src="../../common/main/resources/img/doc-formats/jpg.svg">
     <img class="inline-svg" src="../../common/main/resources/img/doc-formats/blank.svg">
     <img class="inline-svg" src="../../common/main/resources/img/toolbar/shapetypes.svg">
     <img class="inline-svg" src="../../common/main/resources/img/toolbar/charttypes.svg">
diff --git a/apps/presentationeditor/main/index.html.deploy b/apps/presentationeditor/main/index.html.deploy
index 72862076f..b795b5ef9 100644
--- a/apps/presentationeditor/main/index.html.deploy
+++ b/apps/presentationeditor/main/index.html.deploy
@@ -355,6 +355,8 @@
     <inline src="resources/img/doc-formats/odp.svg" />
     <inline src="resources/img/doc-formats/otp.svg" />
     <inline src="resources/img/doc-formats/pptm.svg" />
+    <inline src="resources/img/doc-formats/png.svg" />
+    <inline src="resources/img/doc-formats/jpg.svg" />
     <inline src="resources/img/doc-formats/blank.svg" />
     <inline src="resources/img/toolbar/shapetypes.svg" />
     <inline src="resources/img/toolbar/charttypes.svg" />
diff --git a/apps/presentationeditor/main/index_loader.html b/apps/presentationeditor/main/index_loader.html
index 3bf55daad..8da6cbf44 100644
--- a/apps/presentationeditor/main/index_loader.html
+++ b/apps/presentationeditor/main/index_loader.html
@@ -256,6 +256,8 @@
 <img class="inline-svg" src="../../common/main/resources/img/doc-formats/odp.svg">
 <img class="inline-svg" src="../../common/main/resources/img/doc-formats/otp.svg">
 <img class="inline-svg" src="../../common/main/resources/img/doc-formats/pptm.svg">
+<img class="inline-svg" src="../../common/main/resources/img/doc-formats/png.svg">
+<img class="inline-svg" src="../../common/main/resources/img/doc-formats/jpg.svg">
 <img class="inline-svg" src="../../common/main/resources/img/doc-formats/blank.svg">
 <img class="inline-svg" src="../../common/main/resources/img/toolbar/shapetypes.svg">
 <img class="inline-svg" src="../../common/main/resources/img/toolbar/charttypes.svg">
diff --git a/apps/presentationeditor/main/index_loader.html.deploy b/apps/presentationeditor/main/index_loader.html.deploy
index 5966e043e..694fe75cd 100644
--- a/apps/presentationeditor/main/index_loader.html.deploy
+++ b/apps/presentationeditor/main/index_loader.html.deploy
@@ -310,6 +310,8 @@
     <inline src="resources/img/doc-formats/odp.svg" />
     <inline src="resources/img/doc-formats/otp.svg" />
     <inline src="resources/img/doc-formats/pptm.svg" />
+    <inline src="resources/img/doc-formats/png.svg" />
+    <inline src="resources/img/doc-formats/jpg.svg" />
     <inline src="resources/img/doc-formats/blank.svg" />
     <inline src="resources/img/toolbar/shapetypes.svg" />
     <inline src="resources/img/toolbar/charttypes.svg" />