From 534fcfa2f0c277fa048f0abdbafdf41397dfd3ec Mon Sep 17 00:00:00 2001 From: Igor Sikachyna Date: Thu, 10 Jun 2021 14:15:07 +0300 Subject: [PATCH 1/7] SYNERGY-1006 - Added template mode for icons on Big Sur and higher --- src/gui/src/MainWindow.cpp | 18 ++++++++++++++---- src/gui/src/OSXHelpers.h | 8 +++++++- src/gui/src/OSXHelpers.mm | 15 +++++++-------- 3 files changed, 28 insertions(+), 13 deletions(-) diff --git a/src/gui/src/MainWindow.cpp b/src/gui/src/MainWindow.cpp index 30067ba8f..45d8d0850 100644 --- a/src/gui/src/MainWindow.cpp +++ b/src/gui/src/MainWindow.cpp @@ -343,10 +343,20 @@ void MainWindow::setIcon(qSynergyState state) const QIcon icon; #ifdef Q_OS_MAC - if (isOSXUseDarkIcons()) - icon.addFile(synergyDarkIconFiles[state]); - else - icon.addFile(synergyLightIconFiles[state]); + IconsTheme theme = getOSXIconsTheme(); + switch(getOSXIconsTheme()) { + case IconsTheme::ICONS_DARK: + icon.addFile(synergyDarkIconFiles[state]); + break; + case IconsTheme::ICONS_LIGHT: + icon.addFile(synergyLightIconFiles[state]); + break; + case IconsTheme::ICONS_TEMPLATE: + default: + icon.addFile(synergyDarkIconFiles[state]); + icon.setIsMask(true); + break; + } #else icon.addFile(synergyDefaultIconFiles[state]); #endif diff --git a/src/gui/src/OSXHelpers.h b/src/gui/src/OSXHelpers.h index 05643ad50..4d6c36c78 100644 --- a/src/gui/src/OSXHelpers.h +++ b/src/gui/src/OSXHelpers.h @@ -19,7 +19,13 @@ #define OSXHELPERS__H +enum IconsTheme { + ICONS_DARK, + ICONS_LIGHT, + ICONS_TEMPLATE +}; + bool isOSXInterfaceStyleDark(); -bool isOSXUseDarkIcons(); +IconsTheme getOSXIconsTheme(); #endif diff --git a/src/gui/src/OSXHelpers.mm b/src/gui/src/OSXHelpers.mm index ce5aa4592..a58d620a0 100644 --- a/src/gui/src/OSXHelpers.mm +++ b/src/gui/src/OSXHelpers.mm @@ -30,13 +30,12 @@ isOSXInterfaceStyleDark() return (style && [style isKindOfClass:[NSString class]] && NSOrderedSame == [style caseInsensitiveCompare:@"dark"]); } -bool -isOSXUseDarkIcons() +IconsTheme +getOSXIconsTheme() { - if (@available(macOS 11, *)) { - return true; - } - else { - return isOSXInterfaceStyleDark(); - } + if (@available(macOS 11, *)) + return IconsTheme::ICONS_TEMPLATE; + else if(isOSXInterfaceStyleDark()) + return IconsTheme::ICONS_DARK; + return IconsTheme::ICONS_LIGHT; } From afb622754211fa2dee7474f87893ea6a7dd4086a Mon Sep 17 00:00:00 2001 From: Igor Sikachyna Date: Thu, 10 Jun 2021 14:17:55 +0300 Subject: [PATCH 2/7] SYNERGY-1006 - Update changelog --- ChangeLog | 1 + 1 file changed, 1 insertion(+) diff --git a/ChangeLog b/ChangeLog index 23d39cfd8..e7d1acae0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -8,6 +8,7 @@ Bug fixes: - #7001 Add option to prevent computer from going to sleep - #7029 | #7033 Wrong encoding for text copied between linux and windows - #7015 Fix Windows service not starting up after sleep +- #7036 Fix tray icon not changing theme on Big Sur Enhancements: - #6998 Remove functionality related to the screen saver synchronisation From e340c0e852095c8f1559cf501b5086bfcdde374a Mon Sep 17 00:00:00 2001 From: Igor Sikachyna Date: Thu, 10 Jun 2021 15:04:10 +0300 Subject: [PATCH 3/7] SYNERGY-1006 - Resolve code smell --- src/gui/src/OSXHelpers.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gui/src/OSXHelpers.h b/src/gui/src/OSXHelpers.h index 4d6c36c78..6f79c5162 100644 --- a/src/gui/src/OSXHelpers.h +++ b/src/gui/src/OSXHelpers.h @@ -19,7 +19,7 @@ #define OSXHELPERS__H -enum IconsTheme { +enum class IconsTheme { ICONS_DARK, ICONS_LIGHT, ICONS_TEMPLATE From 1d84b52294d77e2409e87f0588aad5b0c40aaa34 Mon Sep 17 00:00:00 2001 From: Serhii Hadzhilov Date: Thu, 10 Jun 2021 15:40:56 +0300 Subject: [PATCH 4/7] Update ChangeLog --- ChangeLog | 1 + 1 file changed, 1 insertion(+) diff --git a/ChangeLog b/ChangeLog index e7d1acae0..355024bbb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -13,6 +13,7 @@ Bug fixes: Enhancements: - #6998 Remove functionality related to the screen saver synchronisation - #7026 Update the way we package OpenSSL for Windows build +- #7037 Add Ubuntu 21.04 build =========== v1.14.0-stable From 90b0f392abd93139d0a17ab5e42d2f758c947507 Mon Sep 17 00:00:00 2001 From: Serhii Hadzhilov Date: Thu, 10 Jun 2021 15:41:51 +0300 Subject: [PATCH 5/7] Revert "Update ChangeLog" This reverts commit 1d84b52294d77e2409e87f0588aad5b0c40aaa34. --- ChangeLog | 1 - 1 file changed, 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 355024bbb..e7d1acae0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -13,7 +13,6 @@ Bug fixes: Enhancements: - #6998 Remove functionality related to the screen saver synchronisation - #7026 Update the way we package OpenSSL for Windows build -- #7037 Add Ubuntu 21.04 build =========== v1.14.0-stable From f0940d29261e344e7d4331271820a1b52e502c0c Mon Sep 17 00:00:00 2001 From: SerhiiGadzhilov <71632867+SerhiiGadzhilov@users.noreply.github.com> Date: Thu, 10 Jun 2021 16:14:30 +0300 Subject: [PATCH 6/7] SYNERGY-1026 Add Ubuntu 21.04 (#7037) * SYNERGY-1026 Add Ubuntu 21.04 * Update ChangeLog --- .github/workflows/job-test-linux-ubuntu.yml | 1 + ChangeLog | 1 + azure-pipelines.yml | 6 +++++- 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/.github/workflows/job-test-linux-ubuntu.yml b/.github/workflows/job-test-linux-ubuntu.yml index cf781572a..44b3036ce 100644 --- a/.github/workflows/job-test-linux-ubuntu.yml +++ b/.github/workflows/job-test-linux-ubuntu.yml @@ -17,6 +17,7 @@ jobs: include: - distro: ubuntu20.04 - distro: ubuntu19.10 + - distro: ubuntu21.04 # - distro: ubuntu18.04 #Need to install git 2.18+ # - distro: ubuntu16.04 #Need to install git 2.18+ diff --git a/ChangeLog b/ChangeLog index 23d39cfd8..fc57a3f15 100644 --- a/ChangeLog +++ b/ChangeLog @@ -12,6 +12,7 @@ Bug fixes: Enhancements: - #6998 Remove functionality related to the screen saver synchronisation - #7026 Update the way we package OpenSSL for Windows build +- #7037 Add Ubuntu 21.04 build =========== v1.14.0-stable diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 09216f164..5cf97134b 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -6,7 +6,7 @@ jobs: - job: Linux pool: - vmImage: 'ubuntu-16.04' + vmImage: 'ubuntu-latest' strategy: matrix: @@ -27,6 +27,10 @@ jobs: image: symless/synergy-core:ubuntu20.04 packager: deb name: ubuntu20 + ubuntu2104: + image: symless/synergy-core:ubuntu21.04 + packager: deb + name: ubuntu21 debian9: image: symless/synergy-core:debian9 packager: deb From 42c1ce55d3895d7dc831f5da00d43500a24aade0 Mon Sep 17 00:00:00 2001 From: Igor Sikachyna Date: Thu, 10 Jun 2021 17:14:29 +0300 Subject: [PATCH 7/7] SYNERGY-1006 - Remove redundant temp variable --- src/gui/src/MainWindow.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/src/gui/src/MainWindow.cpp b/src/gui/src/MainWindow.cpp index 45d8d0850..58e08cc9c 100644 --- a/src/gui/src/MainWindow.cpp +++ b/src/gui/src/MainWindow.cpp @@ -343,7 +343,6 @@ void MainWindow::setIcon(qSynergyState state) const QIcon icon; #ifdef Q_OS_MAC - IconsTheme theme = getOSXIconsTheme(); switch(getOSXIconsTheme()) { case IconsTheme::ICONS_DARK: icon.addFile(synergyDarkIconFiles[state]);