diff --git a/apps/common/main/lib/controller/Desktop.js b/apps/common/main/lib/controller/Desktop.js index 82021f9d8c..fef2a75b43 100644 --- a/apps/common/main/lib/controller/Desktop.js +++ b/apps/common/main/lib/controller/Desktop.js @@ -736,6 +736,7 @@ define([ FILE_DOCUMENT_DOC_FLAT: FILE_DOCUMENT + 0x0010, FILE_DOCUMENT_OFORM: FILE_DOCUMENT + 0x0015, FILE_DOCUMENT_DOCXF: FILE_DOCUMENT + 0x0016, + FILE_DOCUMENT_XML: FILE_DOCUMENT + 0x0030, FILE_PRESENTATION: FILE_PRESENTATION, FILE_PRESENTATION_PPTX: FILE_PRESENTATION + 0x0001, @@ -776,14 +777,18 @@ define([ case utils.defines.FileFormat.FILE_DOCUMENT_ODT: return 'odt'; case utils.defines.FileFormat.FILE_DOCUMENT_RTF: return 'rtf'; case utils.defines.FileFormat.FILE_DOCUMENT_TXT: return 'txt'; - case utils.defines.FileFormat.FILE_DOCUMENT_HTML: return 'htm'; + case utils.defines.FileFormat.FILE_DOCUMENT_HTML: return 'html'; case utils.defines.FileFormat.FILE_DOCUMENT_MHT: return 'mht'; case utils.defines.FileFormat.FILE_DOCUMENT_EPUB: return 'epub'; case utils.defines.FileFormat.FILE_DOCUMENT_FB2: return 'fb2'; + case utils.defines.FileFormat.FILE_DOCUMENT_DOCM: return 'docm'; case utils.defines.FileFormat.FILE_DOCUMENT_DOTX: return 'dotx'; case utils.defines.FileFormat.FILE_DOCUMENT_OTT: return 'ott'; case utils.defines.FileFormat.FILE_DOCUMENT_OFORM: return 'oform'; case utils.defines.FileFormat.FILE_DOCUMENT_DOCXF: return 'docxf'; + case utils.defines.FileFormat.FILE_DOCUMENT_ODT_FLAT: return 'fodt'; + case utils.defines.FileFormat.FILE_DOCUMENT_DOTM: return 'dotm'; + case utils.defines.FileFormat.FILE_DOCUMENT_XML: return 'xml'; case utils.defines.FileFormat.FILE_SPREADSHEET_XLS: return 'xls'; case utils.defines.FileFormat.FILE_SPREADSHEET_XLTX: return 'xltx'; @@ -792,6 +797,9 @@ define([ case utils.defines.FileFormat.FILE_SPREADSHEET_ODS: return 'ods'; case utils.defines.FileFormat.FILE_SPREADSHEET_CSV: return 'csv'; case utils.defines.FileFormat.FILE_SPREADSHEET_OTS: return 'ots'; + case utils.defines.FileFormat.FILE_SPREADSHEET_XLTM: return 'xltm'; + case utils.defines.FileFormat.FILE_SPREADSHEET_XLSM: return 'xlsm'; + case utils.defines.FileFormat.FILE_SPREADSHEET_ODS_FLAT:return 'fods'; case utils.defines.FileFormat.FILE_PRESENTATION_PPT: return 'ppt'; case utils.defines.FileFormat.FILE_PRESENTATION_POTX: return 'potx'; @@ -799,6 +807,10 @@ define([ case utils.defines.FileFormat.FILE_PRESENTATION_ODP: return 'odp'; case utils.defines.FileFormat.FILE_PRESENTATION_PPSX: return 'ppsx'; case utils.defines.FileFormat.FILE_PRESENTATION_OTP: return 'otp'; + case utils.defines.FileFormat.FILE_PRESENTATION_PPTM: return 'pptm'; + case utils.defines.FileFormat.FILE_PRESENTATION_PPSM: return 'ppsm'; + case utils.defines.FileFormat.FILE_PRESENTATION_POTM: return 'potm'; + case utils.defines.FileFormat.FILE_PRESENTATION_ODP_FLAT: return 'fodp'; case utils.defines.FileFormat.FILE_CROSSPLATFORM_PDFA: case utils.defines.FileFormat.FILE_CROSSPLATFORM_PDF: return 'pdf'; diff --git a/apps/common/main/resources/img/doc-formats/doc.svg b/apps/common/main/resources/img/doc-formats/doc.svg new file mode 100644 index 0000000000..09f9ca2fd2 --- /dev/null +++ b/apps/common/main/resources/img/doc-formats/doc.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/apps/common/main/resources/img/doc-formats/dotm.svg b/apps/common/main/resources/img/doc-formats/dotm.svg new file mode 100644 index 0000000000..c6abf07c20 --- /dev/null +++ b/apps/common/main/resources/img/doc-formats/dotm.svg @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff --git a/apps/common/main/resources/img/doc-formats/fodp.svg b/apps/common/main/resources/img/doc-formats/fodp.svg new file mode 100644 index 0000000000..66ded0b19c --- /dev/null +++ b/apps/common/main/resources/img/doc-formats/fodp.svg @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + diff --git a/apps/common/main/resources/img/doc-formats/fods.svg b/apps/common/main/resources/img/doc-formats/fods.svg new file mode 100644 index 0000000000..0923aa015c --- /dev/null +++ b/apps/common/main/resources/img/doc-formats/fods.svg @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff --git a/apps/common/main/resources/img/doc-formats/fodt.svg b/apps/common/main/resources/img/doc-formats/fodt.svg new file mode 100644 index 0000000000..b214921be6 --- /dev/null +++ b/apps/common/main/resources/img/doc-formats/fodt.svg @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff --git a/apps/common/main/resources/img/doc-formats/formats.png b/apps/common/main/resources/img/doc-formats/formats.png index 2bd88312fe..dec3812b04 100644 Binary files a/apps/common/main/resources/img/doc-formats/formats.png and b/apps/common/main/resources/img/doc-formats/formats.png differ diff --git a/apps/common/main/resources/img/doc-formats/formats@1.25x.png b/apps/common/main/resources/img/doc-formats/formats@1.25x.png index be137768bd..f46cc0d2eb 100644 Binary files a/apps/common/main/resources/img/doc-formats/formats@1.25x.png and b/apps/common/main/resources/img/doc-formats/formats@1.25x.png differ diff --git a/apps/common/main/resources/img/doc-formats/formats@1.5x.png b/apps/common/main/resources/img/doc-formats/formats@1.5x.png index 27e2f68fec..9c113f72a3 100644 Binary files a/apps/common/main/resources/img/doc-formats/formats@1.5x.png and b/apps/common/main/resources/img/doc-formats/formats@1.5x.png differ diff --git a/apps/common/main/resources/img/doc-formats/formats@1.75x.png b/apps/common/main/resources/img/doc-formats/formats@1.75x.png index 167cea3748..1dc51251b0 100644 Binary files a/apps/common/main/resources/img/doc-formats/formats@1.75x.png and b/apps/common/main/resources/img/doc-formats/formats@1.75x.png differ diff --git a/apps/common/main/resources/img/doc-formats/formats@2x.png b/apps/common/main/resources/img/doc-formats/formats@2x.png index 26bd78d162..7fa409c9e4 100644 Binary files a/apps/common/main/resources/img/doc-formats/formats@2x.png and b/apps/common/main/resources/img/doc-formats/formats@2x.png differ diff --git a/apps/common/main/resources/img/doc-formats/md.svg b/apps/common/main/resources/img/doc-formats/md.svg new file mode 100644 index 0000000000..ae8d222663 --- /dev/null +++ b/apps/common/main/resources/img/doc-formats/md.svg @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff --git a/apps/common/main/resources/img/doc-formats/mht.svg b/apps/common/main/resources/img/doc-formats/mht.svg new file mode 100644 index 0000000000..0b39dc71d4 --- /dev/null +++ b/apps/common/main/resources/img/doc-formats/mht.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/apps/common/main/resources/img/doc-formats/neutral@1.svg b/apps/common/main/resources/img/doc-formats/neutral@1.svg new file mode 100644 index 0000000000..8fc7a69dea --- /dev/null +++ b/apps/common/main/resources/img/doc-formats/neutral@1.svg @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/apps/common/main/resources/img/doc-formats/potm.svg b/apps/common/main/resources/img/doc-formats/potm.svg new file mode 100644 index 0000000000..2273a016bf --- /dev/null +++ b/apps/common/main/resources/img/doc-formats/potm.svg @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + diff --git a/apps/common/main/resources/img/doc-formats/pps.svg b/apps/common/main/resources/img/doc-formats/pps.svg new file mode 100644 index 0000000000..f995c11de3 --- /dev/null +++ b/apps/common/main/resources/img/doc-formats/pps.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/apps/common/main/resources/img/doc-formats/ppsm.svg b/apps/common/main/resources/img/doc-formats/ppsm.svg new file mode 100644 index 0000000000..06973c9a06 --- /dev/null +++ b/apps/common/main/resources/img/doc-formats/ppsm.svg @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + diff --git a/apps/common/main/resources/img/doc-formats/ppt.svg b/apps/common/main/resources/img/doc-formats/ppt.svg new file mode 100644 index 0000000000..399a124d41 --- /dev/null +++ b/apps/common/main/resources/img/doc-formats/ppt.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/apps/common/main/resources/img/doc-formats/xls.svg b/apps/common/main/resources/img/doc-formats/xls.svg new file mode 100644 index 0000000000..1d36d63fa3 --- /dev/null +++ b/apps/common/main/resources/img/doc-formats/xls.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/apps/common/main/resources/img/doc-formats/xltm.svg b/apps/common/main/resources/img/doc-formats/xltm.svg new file mode 100644 index 0000000000..dd9a6dd18a --- /dev/null +++ b/apps/common/main/resources/img/doc-formats/xltm.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/apps/common/main/resources/img/doc-formats/xml.svg b/apps/common/main/resources/img/doc-formats/xml.svg new file mode 100644 index 0000000000..feb7633e27 --- /dev/null +++ b/apps/common/main/resources/img/doc-formats/xml.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/apps/documenteditor/main/resources/less/filemenu.less b/apps/documenteditor/main/resources/less/filemenu.less index 4b3b3e3416..3d39c22176 100644 --- a/apps/documenteditor/main/resources/less/filemenu.less +++ b/apps/documenteditor/main/resources/less/filemenu.less @@ -432,7 +432,7 @@ height: 100%; div{ background: ~"url(@{common-image-const-path}/doc-formats/formats.png)"; - background-size: 768px 30px; + background-size: 1056px 30px; &:not(.svg-file-recent) { .pixel-ratio__1_25 & { background-image: ~"url(@{common-image-const-path}/doc-formats/formats@1.25x.png)"; @@ -500,12 +500,30 @@ &xps { .format-from-index(16); } + &xml { + .format-from-index(17); + } &djvu { .format-from-index(15); } &mht { .format-from-index(18); } + &docm { + .format-from-index(32); + } + &dotm { + .format-from-index(33); + } + &fodt { + .format-from-index(34); + } + &md { + .format-from-index(42); + } + &neutral { + .format-from-index(43); + } } .svg-file-recent { background: ~"url(@{app-image-const-path}/recent-file.svg) no-repeat top"; diff --git a/apps/presentationeditor/main/resources/less/leftmenu.less b/apps/presentationeditor/main/resources/less/leftmenu.less index 26be460929..e023052e88 100644 --- a/apps/presentationeditor/main/resources/less/leftmenu.less +++ b/apps/presentationeditor/main/resources/less/leftmenu.less @@ -422,7 +422,7 @@ height: 100%; div{ background: ~"url(@{common-image-const-path}/doc-formats/formats.png)"; - background-size: 768px 30px; + background-size: 1056px 30px; &:not(.svg-file-recent) { .pixel-ratio__1_25 & { background-image: ~"url(@{common-image-const-path}/doc-formats/formats@1.25x.png)"; @@ -472,6 +472,21 @@ &ppt { .format-from-index(11); } + &pptm { + .format-from-index(38); + } + &ppsm { + .format-from-index(39); + } + &potm { + .format-from-index(40); + } + &fodp { + .format-from-index(41); + } + &.neutral { + .format-from-index(43); + } } .svg-file-recent { background: ~"url(@{app-image-const-path}/recent-file.svg) no-repeat top"; diff --git a/apps/spreadsheeteditor/main/resources/less/leftmenu.less b/apps/spreadsheeteditor/main/resources/less/leftmenu.less index 84b28ac27a..8e40c9451e 100644 --- a/apps/spreadsheeteditor/main/resources/less/leftmenu.less +++ b/apps/spreadsheeteditor/main/resources/less/leftmenu.less @@ -514,7 +514,7 @@ height: 100%; div{ background: ~"url(@{common-image-const-path}/doc-formats/formats.png)"; - background-size: 768px 30px; + background-size: 1056px 30px; &:not(.svg-file-recent) { .pixel-ratio__1_25 & { background-image: ~"url(@{common-image-const-path}/doc-formats/formats@1.25x.png)"; @@ -564,6 +564,18 @@ &xlsb { .format-from-index(31); } + &xltm { + .format-from-index(35); + } + &xlsm { + .format-from-index(36); + } + &fods { + .format-from-index(37); + } + &.neutral { + .format-from-index(43); + } } .svg-file-recent { background: ~"url(@{app-image-const-path}/recent-file.svg) no-repeat top";