From 99695152f7c8a4d12b4bba7683da3014a41f3d13 Mon Sep 17 00:00:00 2001 From: maxkadushkin Date: Wed, 11 Jun 2025 16:51:42 +0300 Subject: [PATCH 1/2] [macos] fix bug 74972 --- .../Code/Controllers/Common/ASCThemesController.m | 7 +++++-- macos/ONLYOFFICE/Code/Utils/ASCConstants.h | 1 + 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/macos/ONLYOFFICE/Code/Controllers/Common/ASCThemesController.m b/macos/ONLYOFFICE/Code/Controllers/Common/ASCThemesController.m index 907cba726..bfb362061 100644 --- a/macos/ONLYOFFICE/Code/Controllers/Common/ASCThemesController.m +++ b/macos/ONLYOFFICE/Code/Controllers/Common/ASCThemesController.m @@ -114,11 +114,11 @@ NSString * theme = [[NSUserDefaults standardUserDefaults] valueForKey:ASCUserUITheme]; if ([uiThemeSystem isEqualToString:theme]) { return [self isSystemDarkMode]; - } else return [uiThemeDark isEqualToString:theme] || [uiThemeContrastDark isEqualToString:theme]; + } else return [uiThemeDark isEqualToString:theme] || [uiThemeContrastDark isEqualToString:theme] || [uiThemeNight isEqualToString:theme]; } + (NSString*)defaultThemeId:(BOOL)isdark { - return isdark ? uiThemeDark : uiThemeWhite; + return isdark ? uiThemeNight : uiThemeWhite; } + (NSColor*)currentThemeColor:(NSString*)name { @@ -136,6 +136,8 @@ } else if ([name isEqualToString:btnPortalActiveBackgroundColor]) { if ( [theme isEqualToString:uiThemeDark] ) return UIColorFromRGB(0x333333); else if ( [theme isEqualToString:uiThemeContrastDark] ) return UIColorFromRGB(0x1e1e1e); + else if ( [theme isEqualToString:uiThemeWhite] ) return UIColorFromRGB(0xf3f3f3); + else if ( [theme isEqualToString:uiThemeNight] ) return UIColorFromRGB(0x333333); else { if ( @available(macOS 10.13, *) ) return [NSColor colorNamed:@"tab-portal-activeColor"]; @@ -144,6 +146,7 @@ } else { if ( [theme isEqualToString:uiThemeDark] ) return UIColorFromRGB(0x2a2a2a); else if ( [theme isEqualToString:uiThemeContrastDark] ) return UIColorFromRGB(0x1e1e1e); + else if ( [theme isEqualToString:uiThemeNight] ) return UIColorFromRGB(0x222222); else if ( [theme isEqualToString:uiThemeGray] ) return UIColorFromRGB(0xf7f7f7); else if ( [theme isEqualToString:uiThemeWhite] ) return UIColorFromRGB(0xf3f3f3); else { diff --git a/macos/ONLYOFFICE/Code/Utils/ASCConstants.h b/macos/ONLYOFFICE/Code/Utils/ASCConstants.h index 09c95298b..1da24d9ef 100644 --- a/macos/ONLYOFFICE/Code/Utils/ASCConstants.h +++ b/macos/ONLYOFFICE/Code/Utils/ASCConstants.h @@ -70,6 +70,7 @@ static NSString * const uiThemeContrastDark = @"theme-contrast-dar static NSString * const uiThemeSystem = @"theme-system"; static NSString * const uiThemeGray = @"theme-gray"; static NSString * const uiThemeWhite = @"theme-white"; +static NSString * const uiThemeNight = @"theme-night"; // Custom schemes static NSString * const kSchemeApp = @"oo-office"; From c3203df5423a2e6959c06e8c1cf4309b7b2401d4 Mon Sep 17 00:00:00 2001 From: "konstantin.kireyev" Date: Thu, 12 Jun 2025 02:49:43 +0500 Subject: [PATCH 2/2] fix bug 75127 --- common/loginpage/locale/en-GB.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/common/loginpage/locale/en-GB.js b/common/loginpage/locale/en-GB.js index af9bb1e56..4c711ac33 100644 --- a/common/loginpage/locale/en-GB.js +++ b/common/loginpage/locale/en-GB.js @@ -1,6 +1,7 @@ l10n.en_GB = { welWelcome: 'Welcome to ONLYOFFICE!', - welDescr: 'Work on documents offline or connect the suite to your cloud: ONLYOFFICE, ownCloud, Nextcloud.', + welDescr: 'Create, edit, and collaborate on documents, spreadsheets, presentations, and PDFs — all in one place.
Powerful tools for documents, spreadsheets, and slides PDF editing, forms, and conversion Real-time cloud collaboration', + welNeedHelp: 'Need help? Visit our Help Center.', btnConnect: 'Connect now', textHavePortal: 'Already use a cloud?', btnCreatePortal: 'Create an ONLYOFFICE cloud', @@ -127,4 +128,6 @@ l10n.en_GB = { colFileName: "File name", colLocation: 'Location', colLastOpened: 'Last opened', + labelDropFile: 'Drag you files here or', + labelSelectFile: 'Select file', }