Merge branch release/v9.1.0 into develop

common/loginpage/providers/seafile/config.json

@@ -4,7 +4,8 @@
     "check": {
         "url": "/api2/server-info/"
     },
-    "editorPage": "regex:\/lib\/(?:[\w-]{32,})\/file\/.*\.(docx|pptx|xlsx|doc|ppt|xls|odt|fodt|odp|fodp|fods)$",
+    "editorPage": "regex:\/lib\/(?:[\w-]{32,})\/file\/.*\.(docx|pptx|xlsx|doc|ppt|xls|odt|fodt|odp|fodp|fods)",
+    "editorFrameSize": "finite",
     "cryptoSupport": "true",
     "icons": {
         "themeLight":{

common/loginpage/src/panelexternal.js

@@ -133,7 +133,9 @@
             if ( panel_id.includes('\{B17BDC61\-') ) {
                 _encrype_workaround(_panel);
             } else
-            if ( panel_id.includes('F2402876-659F-47FB-A646-67B49F2B5AAA') ) {
+            if ( panel_id.includes('F2402876-659F-47FB-A646-67B49F2B5AAA') ||
+                    panel_id.includes('9DC93CDB-B576-4F0C-B55E-FCC9C48DD777') )
+            {
                 const $svgicon = _panel.$menuitem.find('svg.icon');
                 if ( $svgicon.length ) {
                     $svgicon.data('iconname', 'aichat');

common/loginpage/src/panelrecent.js

@@ -328,7 +328,7 @@
         };
 
         var _on_recovers = function(params) {
-            if ( true )
+            if ( false )
                 window.sdk.command("recovery:update", JSON.stringify(params));
             else {
                 collectionRecovers.empty();

macos/ONLYOFFICE/Code/Controllers/Common/ASCCommonViewController.h

@@ -42,7 +42,7 @@
 #import "ASCTabView.h"
 #import "NSCefView.h"
 
-@interface ASCCommonViewController : NSViewController
+@interface ASCCommonViewController : NSViewController <NSTabViewDelegate>
 - (BOOL)shouldTerminateApplication;
 - (BOOL)shouldCloseMainWindow;
 
@@ -53,4 +53,3 @@
 - (void)openEULA;
 - (void)openPreferences;
 @end
-

macos/ONLYOFFICE/Code/Controllers/Common/ASCThemesController.h

@@ -51,6 +51,7 @@ static NSString * const tabSlideActiveBackgroundColor   = @"tab-slide-background
 static NSString * const tabPdfActiveBackgroundColor     = @"tab-pdf-background-active-color";
 static NSString * const tabDrawActiveBackgroundColor    = @"tab-draw-background-active-color";
 static NSString * const tabActiveTextColor              = @"tab-editor-text-active-color";
+static NSString * const windowBackgroundColor           = @"window-background-color";
 
 @interface ASCThemesController : NSObject
 

macos/ONLYOFFICE/Code/Controllers/Common/ASCThemesController.m

@@ -146,6 +146,15 @@
                 return [NSColor colorNamed:@"tab-portal-activeColor"];
             else return kColorRGBA(255, 255, 255, 1.0);
         }
+    } else if ( [name isEqualToString:windowBackgroundColor] ) {
+        if ( [theme isEqualToString:uiThemeDark] ) return UIColorFromRGB(0x282828);
+        else if ( [theme isEqualToString:uiThemeContrastDark] ) return UIColorFromRGB(0x181818);
+        else if ( [theme isEqualToString:uiThemeGray] ) return UIColorFromRGB(0xd9d9d9);
+        else if ( [theme isEqualToString:uiThemeNight] ) return UIColorFromRGB(0x383838);
+        else if ( [theme isEqualToString:uiThemeWhite] ) return UIColorFromRGB(0xeaeaea);
+        else {
+            return UIColorFromRGB(0xe4e4e4);
+        }
     } else {
         if ( [theme isEqualToString:uiThemeDark] ) return UIColorFromRGB(0x2a2a2a);
         else if ( [theme isEqualToString:uiThemeContrastDark] ) return UIColorFromRGB(0x1e1e1e);

macos/ONLYOFFICE/Code/Controllers/PresentationReporter/ASCPresentationReporter.mm

@@ -138,7 +138,7 @@
         return;
     }
     
-    [_controller close];
+    [_controller.window performClose:nil];
     _isDisplay = false;
 }
 

macos/ONLYOFFICE/Code/Extensions/NSView+Extensions.h

@@ -59,5 +59,7 @@
 - (instancetype)duplicate;
 - (void)shake;
 - (NSImage *)imageRepresentation;
+- (NSImage *)windowScreenshot;
+- (nullable NSView *)subviewOfClassName:(NSString * _Nonnull)className;
 
 @end

macos/ONLYOFFICE/Code/Extensions/NSView+Extensions.m

@@ -265,4 +265,54 @@ static NSString * const kASCUuidPropertyKey = @"ascUuidPropertyKey";
     return image;
 }
 
+- (nullable NSImage *)windowScreenshot {
+    if (self.window) {
+        NSRect viewFrameInWindow = [self convertRect:self.bounds toView:nil];
+        NSRect windowFrame = [self.window convertRectToScreen:viewFrameInWindow];
+        CGRect mainDisplayBounds = CGDisplayBounds(CGMainDisplayID());
+        
+        CGFloat cgX = windowFrame.origin.x;
+        CGFloat cgY = mainDisplayBounds.size.height - windowFrame.origin.y - windowFrame.size.height;
+        
+        CGImageRef cgImage = CGWindowListCreateImage
+        (
+         CGRectMake(cgX, cgY, windowFrame.size.width, windowFrame.size.height),
+         kCGWindowListOptionIncludingWindow,
+         (CGWindowID)[self.window windowNumber],
+         kCGWindowImageBoundsIgnoreFraming | kCGWindowImageShouldBeOpaque
+         );
+        
+        NSImage *snapshot = nil;
+        if (cgImage) {
+            snapshot = [[NSImage alloc] initWithCGImage:cgImage size:viewFrameInWindow.size];
+            CGImageRelease(cgImage);
+        }
+        
+        return snapshot;
+    }
+    
+    return nil;
+}
+
+- (nullable NSView *)subviewOfClassName:(NSString * _Nonnull)className {
+    Class cls = NSClassFromString(className);
+    
+    if (!cls) {
+        return nil;
+    }
+
+    for (NSView *subview in self.subviews) {
+        if ([subview isKindOfClass:cls]) {
+            return subview;
+        }
+        
+        NSView *found = [subview subviewOfClassName:className];
+        
+        if (found) {
+            return found;
+        }
+    }
+    return nil;
+}
+
 @end

macos/ONLYOFFICE/Code/Views/NSCefView.h

@@ -48,6 +48,7 @@
 - (void)create:(CAscApplicationManager *)manager withType:(CefViewWrapperType)type;
 - (void)apply:(NSEditorApi::CAscMenuEvent *)event;
 - (void)setExternalCloud:(NSString *)provider;
+- (void)setBackgroundColor:(NSColor *)color;
 - (void)internalClean;
 - (void)focus;
 - (void)reload;

macos/ONLYOFFICE/Code/Views/NSCefView.mm

@@ -56,7 +56,11 @@
     self = [super initWithFrame:frame];
     if (self) {
         CALayer *viewLayer = [CALayer layer];
-        [viewLayer setBackgroundColor:CGColorCreateGenericRGB(1.0, 1.0, 1.0, 1.0)]; //RGB plus Alpha Channel
+        
+        CGColorRef backColor = CGColorCreateGenericRGB(1.0, 1.0, 1.0, 1.0); //RGB plus Alpha Channel
+        [viewLayer setBackgroundColor:backColor];
+        CGColorRelease(backColor);
+        
         [self setWantsLayer:YES]; // view's backing store is using a Core Animation Layer
         [self setLayer:viewLayer];
 
@@ -107,6 +111,19 @@
     }
 }
 
+- (void)setBackgroundColor:(NSColor *)color {
+    CGFloat red, green, blue, alpha;
+    [color getRed:&red green:&green blue:&blue alpha:&alpha];
+    
+    CGColorRef backColor = CGColorCreateGenericRGB(red, green, blue, 1.0); //RGB plus Alpha Channel
+    [self.layer setBackgroundColor:backColor];
+    CGColorRelease(backColor);
+    
+    if (m_pCefView) {
+        return m_pCefView->SetBackgroundCefColor(255 * red, 255 * green, 255 * blue);
+    }
+}
+
 - (NSInteger)uuid {
     if (m_pCefView) {
         return m_pCefView->GetCefView()->GetId();

macos/ONLYOFFICE/Resources/ONLYOFFICE-arm/Info.plist

@@ -689,5 +689,7 @@
 	<string>N2LfKoNN6LkD5qNMjt+lEh6LYrQMEFNCEXQ3Kk6nTlM=</string>
 	<key>SUScheduledCheckInterval</key>
 	<integer>86400</integer>
+	<key>UIDesignRequiresCompatibility</key>
+	<true/>
 </dict>
 </plist>

macos/ONLYOFFICE/update/updates/ONLYOFFICE/changes/9.1.0/changes.html

@@ -0,0 +1,163 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8">
+    <title>ONLYOFFICE Release Notes</title>
+    <style type="text/css">
+        /* variables */
+        :root {
+            --color-black: #141923;
+            --color-white: #fff;
+            --color-gray-100: #f7fafc;
+            --color-gray-200: #edf2f7;
+            --color-gray-300: #e2e8f0;
+            --color-gray-400: #cbd5e0;
+            --color-gray-500: #a0aec0;
+            --color-gray-600: #718096;
+            --color-gray-700: #4a5568;
+            --color-gray-800: #2d3748;
+            --color-gray-900: #1a202c;
+        }
+        body {
+            background: var(--color-white);
+            color: var(--color-gray-800);
+            font: 12px "Lucida Grande", "Lucida Sans Unicode", Verdana, Lucida, Helvetica, sans-serif;
+        }
+        h1, h2, h3 {
+            color: var(--color-gray-800);
+            font-weight: normal;
+            font-style: normal;
+        }
+        h1 {
+            font-size: 1.7em;
+        }
+        h2 {
+            font-size: 1.4em;
+            font-weight: lighter;
+        }
+        h4 {
+            font-size: 1.2em;
+            font-weight: lighter;
+        }
+        code {
+            background: var(--color-gray-200);
+            font-family: monospace;
+            padding: 1px 5px;
+        }
+        ul {
+            padding: 8.1.3 20px;
+        }
+        li {
+            margin-left: 20px;
+            margin-bottom: 0.2em;
+            padding: 0;
+        }
+        hr {
+            margin: 20px 0;
+            border: var(--color-gray-400) solid 0.5px;
+        }
+        .releasedate {
+            color: var(--color-gray-600);
+            font-weight: lighter;
+        }
+
+        /* prefers light mode */
+        @media (prefers-color-scheme: dark) {
+            body {
+                background: var(--color-gray-900);
+                color: var(--color-gray-200);
+            }
+
+            h1, h2, h3 {
+                color: var(--color-white);
+            }
+
+            code {
+                background: var(--color-gray-800);
+                color: var(--color-gray-200);
+            }
+
+            .releasedate {
+                color: var(--color-gray-600);
+            }
+        }
+    </style>
+</head>
+<body>
+    <div class="version">
+        <h1>ONLYOFFICE 9.1.0<span class="releasedate"> - {{DATE}}</span></h1>
+
+        <h2>New features</h2>
+
+        <h4>All Editors</h4>
+        <ul>
+            <li>Added external data for charts. When copying between editors, it's possible to select either an embedded file or a link to the source</li>
+            <li>Added the ability to enable/disable chart elements</li>
+            <li>Added support for the Explosion option (separating a segment of pie and doughnut 2d charts) for opening</li>
+            <li>Added support for the <code>HEIF</code> images</li>
+            <li>Added the ability to configure the display of resolved/open comments in the left panel</li>
+            <li>Added preview for cloud templates</li>
+            <li>Added the "Spelling language detection" option on the application settings page</li>
+        </ul>
+
+        <h4>Document Editor</h4>
+        <ul>
+            <li>Added support for breaking sections within block content controls with any nesting level</li>
+            <li>Added a full-featured chart editor. Embedded <code>XLSX</code> files are now opened instead of loading values from the chart cache</li>
+            <li>Added support for the <code>HWPML</code> text document format for viewing</li>
+            <li>Added support for inserting mathematical formulas from the MathML format</li>
+        </ul>
+
+        <h4>Spreadsheet Editor</h4>
+        <ul>
+            <li>Added a setting for a general text direction in a cell</li>
+            <li>Added support for date filters in pivot tables</li>
+            <li>Added some Form Controls (Check Box, Combo Box, List Box, Spin Button, Scroll Bar, Button) for opening</li>
+            <li>Improved the logic of formulas for mixed data types</li>
+            <li>Reduced memory consumption during formula calculations</li>
+            <li>Optimized calculation of the <code>VLOOKUP</code> and <code>XLOOKUP</code> formulas </li>
+            <li>Added highlighting of active arguments when entering a formula</li>
+            <li>Added translation of formulas into Serbian (Cyrillic), Serbian (Latin) and Chinese (Traditional)</li>
+            <li>Added support for inserting mathematical formulas from the MathML format</li>
+            <li>Moved formatted table settings from the right panel to the Table Design tab of the top toolbar. The tab appears only when we are working within a table</li>
+            <li>Added the ability to rename a sheet by double-clicking on its name without opening additional windows</li>
+        </ul>
+
+        <h4>Presentation Editor</h4>
+        <ul>
+            <li>Added a full-featured chart editor. Embedded <code>XLSX</code> files are now opened instead of loading values from the chart cache</li>
+            <li>Moved Master Slide settings from the Insert tab to a separate tab of the top toolbar</li>
+            <li>Added an audio/video player</li>
+        </ul>
+
+        <h4>Forms</h4>
+        <ul>
+            <li>Improved user experience when working with fields</li>
+            <li>Renamed the View Form and Manage Roles buttons to Preview and Manage Recipient Roles</li>
+            <li>Added support for inserting mathematical formulas from the MathML format</li>
+        </ul>
+
+        <h4>PDF Editor</h4>
+        <ul>
+            <li>Added functionality for hiding confidential information - Redact</li>
+            <li>Added new annotation types to the Comment section</li>
+            <li>Implemented work with Smart Art</li>
+            <li>Added support for charts</li>
+            <li>Implemented copying and pasting graphic elements and forms</li>
+        </ul>
+
+        <h4>Convert</h4>
+        <ul>
+            <li>Added the ability to convert <code>PDF</code> and <code>PPTX</code> to <code>TXT</code> directly</li>
+        </ul>
+
+        <h2>Fixes</h2>
+
+        <h4>Security</h4>
+        <ul>
+            <li>Fixed the XSS vulnerability when processing hyperlinks in documents</li>
+        </ul>
+
+    </div>
+</body>
+</html>

macos/ONLYOFFICE/update/updates/ONLYOFFICE/changes/9.1.0/changes.ru.html

@@ -0,0 +1,163 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8">
+    <title>История изменений ONLYOFFICE</title>
+    <style type="text/css">
+        /* variables */
+        :root {
+            --color-black: #141923;
+            --color-white: #fff;
+            --color-gray-100: #f7fafc;
+            --color-gray-200: #edf2f7;
+            --color-gray-300: #e2e8f0;
+            --color-gray-400: #cbd5e0;
+            --color-gray-500: #a0aec0;
+            --color-gray-600: #718096;
+            --color-gray-700: #4a5568;
+            --color-gray-800: #2d3748;
+            --color-gray-900: #1a202c;
+        }
+        body {
+            background: var(--color-white);
+            color: var(--color-gray-800);
+            font: 12px "Lucida Grande", "Lucida Sans Unicode", Verdana, Lucida, Helvetica, sans-serif;
+        }
+        h1, h2, h3 {
+            color: var(--color-gray-800);
+            font-weight: normal;
+            font-style: normal;
+        }
+        h1 {
+            font-size: 1.7em;
+        }
+        h2 {
+            font-size: 1.4em;
+            font-weight: lighter;
+        }
+        h4 {
+            font-size: 1.2em;
+            font-weight: lighter;
+        }
+        code {
+            background: var(--color-gray-200);
+            font-family: monospace;
+            padding: 1px 5px;
+        }
+        ul {
+            padding: 8.1.3 20px;
+        }
+        li {
+            margin-left: 20px;
+            margin-bottom: 0.2em;
+            padding: 0;
+        }
+        hr {
+            margin: 20px 0;
+            border: var(--color-gray-400) solid 0.5px;
+        }
+        .releasedate {
+            color: var(--color-gray-600);
+            font-weight: lighter;
+        }
+
+        /* prefers light mode */
+        @media (prefers-color-scheme: dark) {
+            body {
+                background: var(--color-gray-900);
+                color: var(--color-gray-200);
+            }
+
+            h1, h2, h3 {
+                color: var(--color-white);
+            }
+
+            code {
+                background: var(--color-gray-800);
+                color: var(--color-gray-200);
+            }
+
+            .releasedate {
+                color: var(--color-gray-600);
+            }
+        }
+    </style>
+</head>
+<body>
+    <div class="version">
+        <h1>ONLYOFFICE 9.1.0<span class="releasedate"> - {{DATE}}</span></h1>
+
+        <h2>New features</h2>
+
+        <h4>All Editors</h4>
+        <ul>
+            <li>Added external data for charts. When copying between editors, it's possible to select either an embedded file or a link to the source</li>
+            <li>Added the ability to enable/disable chart elements</li>
+            <li>Added support for the Explosion option (separating a segment of pie and doughnut 2d charts) for opening</li>
+            <li>Added support for the <code>HEIF</code> images</li>
+            <li>Added the ability to configure the display of resolved/open comments in the left panel</li>
+            <li>Added preview for cloud templates</li>
+            <li>Added the "Spelling language detection" option on the application settings page</li>
+        </ul>
+
+        <h4>Document Editor</h4>
+        <ul>
+            <li>Added support for breaking sections within block content controls with any nesting level</li>
+            <li>Added a full-featured chart editor. Embedded <code>XLSX</code> files are now opened instead of loading values from the chart cache</li>
+            <li>Added support for the <code>HWPML</code> text document format for viewing</li>
+            <li>Added support for inserting mathematical formulas from the MathML format</li>
+        </ul>
+
+        <h4>Spreadsheet Editor</h4>
+        <ul>
+            <li>Added a setting for a general text direction in a cell</li>
+            <li>Added support for date filters in pivot tables</li>
+            <li>Added some Form Controls (Check Box, Combo Box, List Box, Spin Button, Scroll Bar, Button) for opening</li>
+            <li>Improved the logic of formulas for mixed data types</li>
+            <li>Reduced memory consumption during formula calculations</li>
+            <li>Optimized calculation of the <code>VLOOKUP</code> and <code>XLOOKUP</code> formulas </li>
+            <li>Added highlighting of active arguments when entering a formula</li>
+            <li>Added translation of formulas into Serbian (Cyrillic), Serbian (Latin) and Chinese (Traditional)</li>
+            <li>Added support for inserting mathematical formulas from the MathML format</li>
+            <li>Moved formatted table settings from the right panel to the Table Design tab of the top toolbar. The tab appears only when we are working within a table</li>
+            <li>Added the ability to rename a sheet by double-clicking on its name without opening additional windows</li>
+        </ul>
+
+        <h4>Presentation Editor</h4>
+        <ul>
+            <li>Added a full-featured chart editor. Embedded <code>XLSX</code> files are now opened instead of loading values from the chart cache</li>
+            <li>Moved Master Slide settings from the Insert tab to a separate tab of the top toolbar</li>
+            <li>Added an audio/video player</li>
+        </ul>
+
+        <h4>Forms</h4>
+        <ul>
+            <li>Improved user experience when working with fields</li>
+            <li>Renamed the View Form and Manage Roles buttons to Preview and Manage Recipient Roles</li>
+            <li>Added support for inserting mathematical formulas from the MathML format</li>
+        </ul>
+
+        <h4>PDF Editor</h4>
+        <ul>
+            <li>Added functionality for hiding confidential information - Redact</li>
+            <li>Added new annotation types to the Comment section</li>
+            <li>Implemented work with Smart Art</li>
+            <li>Added support for charts</li>
+            <li>Implemented copying and pasting graphic elements and forms</li>
+        </ul>
+
+        <h4>Convert</h4>
+        <ul>
+            <li>Added the ability to convert <code>PDF</code> and <code>PPTX</code> to <code>TXT</code> directly</li>
+        </ul>
+
+        <h2>Fixes</h2>
+
+        <h4>Security</h4>
+        <ul>
+            <li>Fixed the XSS vulnerability when processing hyperlinks in documents</li>
+        </ul>
+
+    </div>
+</body>
+</html>