pengjunjie/desktop-apps
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/desktop-apps.git synced 2026-04-07 14:09:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

[macos] for bug 36551

Browse Source
This commit is contained in:
maxkadushkin
2025-01-17 13:34:24 +03:00
parent caa3f1f887
commit f9607d2987
3 changed files with 49 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
macos/ONLYOFFICE/Code/Controllers/Common/ASCCommonViewController.mm
View File

@ -445,16 +445,22 @@
@"terminate" : @(YES)
}];
NSMutableArray * locked_uuids = [NSMutableArray array];
for (ASCTabView * tab in self.tabsControl.tabs) {
if (tab.changed) {
unsaved++;
}
// Blockchain check
if (NSCefView * cefView = [self cefViewWithTab:tab]) {
// Blockchain check
if ([cefView checkCloudCryptoNeedBuild]) {
self.shouldTerminateApp = YES;
return NO;
} else {
if ([cefView isSaveLocked]) {
unsaved++;
[locked_uuids addObject:tab.uuid];
}
}
}
}
@ -479,7 +485,7 @@
NSArray * tabs = [NSArray arrayWithArray:self.tabsControl.tabs];
for (ASCTabView * tab in tabs) {
if (tab.changed) {
if (tab.changed || [locked_uuids containsObject:tab.uuid]) {
[self.tabsWithChanges addObject:tab];
} else {
[self.tabsControl removeTab:tab selected:NO];
@ -701,33 +707,36 @@
}
- (void)requestSaveChangesForTab:(ASCTabView *)tab {
if (tab && tab.changed) {
NSAlert *alert = [[NSAlert alloc] init];
[alert addButtonWithTitle:NSLocalizedString(@"Save", nil)];
[alert addButtonWithTitle:NSLocalizedString(@"Don't Save", nil)];
[[alert addButtonWithTitle:NSLocalizedString(@"Cancel", nil)] setKeyEquivalent:@"\e"];
[alert setMessageText:[NSString stringWithFormat:NSLocalizedString(@"Do you want to save the changes made to the document \"%@\"?", nil), tab.title]];
[alert setInformativeText:NSLocalizedString(@"Your changes will be lost if you don’t save them.", nil)];
[alert setAlertStyle:NSAlertStyleWarning];
if (tab) {
NSCefView * cefView = [self cefViewWithTab:tab];
if (tab.changed || (cefView && [cefView isSaveLocked])) {
NSAlert *alert = [[NSAlert alloc] init];
[alert addButtonWithTitle:NSLocalizedString(@"Save", nil)];
[alert addButtonWithTitle:NSLocalizedString(@"Don't Save", nil)];
[[alert addButtonWithTitle:NSLocalizedString(@"Cancel", nil)] setKeyEquivalent:@"\e"];
[alert setMessageText:[NSString stringWithFormat:NSLocalizedString(@"Do you want to save the changes made to the document \"%@\"?", nil), tab.title]];
[alert setInformativeText:NSLocalizedString(@"Your changes will be lost if you don’t save them.", nil)];
[alert setAlertStyle:NSAlertStyleWarning];
[self.tabsControl selectTab:tab];
[self.tabsControl selectTab:tab];
NSInteger returnCode = [alert runModalSheet];
NSInteger returnCode = [alert runModalSheet];
if(returnCode == NSAlertFirstButtonReturn) {
NSCefView * cefView = [self cefViewWithTab:tab];
if(returnCode == NSAlertFirstButtonReturn) {
NSCefView * cefView = [self cefViewWithTab:tab];
tab.params[@"shouldClose"] = @(YES);
tab.params[@"shouldClose"] = @(YES);
if (cefView) {
NSEditorApi::CAscMenuEvent * pEvent = new NSEditorApi::CAscMenuEvent(ASC_MENU_EVENT_TYPE_CEF_SAVE);
[cefView apply:pEvent];
if (cefView) {
NSEditorApi::CAscMenuEvent * pEvent = new NSEditorApi::CAscMenuEvent(ASC_MENU_EVENT_TYPE_CEF_SAVE);
[cefView apply:pEvent];
}
} else if (returnCode == NSAlertSecondButtonReturn) {
[self.tabsControl removeTab:tab];
} else if (returnCode == NSAlertThirdButtonReturn) {
self.shouldTerminateApp = NO;
self.shouldLogoutPortal = NO;
}
} else if (returnCode == NSAlertSecondButtonReturn) {
[self.tabsControl removeTab:tab];
} else if (returnCode == NSAlertThirdButtonReturn) {
self.shouldTerminateApp = NO;
self.shouldLogoutPortal = NO;
}
}
}
@ -1333,6 +1342,7 @@
};
NSMutableArray * portalTabs = [NSMutableArray array];
NSMutableArray * saveLockedTabs = [NSMutableArray array];
NSInteger unsaved = 0;
for (ASCTabView * tab in self.tabsControl.tabs) {
@ -1348,15 +1358,17 @@
}
if ( _is_array_contains_url(portals, tabVirtualUrl) ) {
NSCefView * cefView = [self cefViewWithTab:tab];
if ( isReload ) {
if ( NSCefView * cefView = [self cefViewWithTab:tab] ) {
if ( cefView ) {
[cefView reload];
}
} else {
[portalTabs addObject:tab];
if (tab.changed) {
if (tab.changed || (cefView && [cefView isSaveLocked])) {
unsaved++;
[saveLockedTabs addObject:tab.uuid];
}
}
}
@ -1380,7 +1392,7 @@
// "Review Changes..." clicked
for (ASCTabView * tab in portalTabs) {
if (tab.changed) {
if (tab.changed || [saveLockedTabs containsObject:tab.uuid]) {
[self.tabsWithChanges addObject:tab];
} else {
[self.tabsControl removeTab:tab selected:NO];
@ -2011,7 +2023,7 @@
return NO;
}
if (tab.changed) {
if (tab.changed || (cefView && [cefView isSaveLocked])) {
[self requestSaveChangesForTab:tab];
return NO;
}

1
macos/ONLYOFFICE/Code/Views/NSCefView.h
View File

@ -54,6 +54,7 @@
- (BOOL)checkCloudCryptoNeedBuild;
- (BOOL)checkBuilding;
- (NSString *)originalUrl;
- (BOOL)isSaveLocked;
- (void)loadWithUrl:(NSString *)url;
- (void)createFileWithName:(NSString *)name type:(AscEditorType)type;

9
macos/ONLYOFFICE/Code/Views/NSCefView.mm
View File

@ -236,6 +236,15 @@
return NO;
}
- (BOOL)isSaveLocked {
if (m_pCefView && m_pCefView->GetCefView()) {
if (m_pCefView->GetCefView()->GetType() == cvwtEditor) {
return ((CCefViewEditor *)m_pCefView->GetCefView())->IsSaveLocked();
}
}
return NO;
}
- (NSString *)originalUrl {
if (m_pCefView && m_pCefView->GetCefView()) {
return [NSString stringWithstdwstring:m_pCefView->GetCefView()->GetOriginalUrl()];