From 212b4e8fc4dcf8cacb56d2b00b407c7664c920fa Mon Sep 17 00:00:00 2001 From: waydabber <37590873+waydabber@users.noreply.github.com> Date: Fri, 6 Aug 2021 18:12:46 +0200 Subject: [PATCH] Fixing conflicts --- Apple Silicon.md | 8 +------- MonitorControl.xcodeproj/project.pbxproj | 18 ------------------ .../MainPrefsViewController.swift | 6 +++--- 3 files changed, 4 insertions(+), 28 deletions(-) diff --git a/Apple Silicon.md b/Apple Silicon.md index 2ab393a..533adb8 100644 --- a/Apple Silicon.md +++ b/Apple Silicon.md @@ -15,10 +15,4 @@ You need to have a *single*, *compatible* external display (aside from the inter - [x] Add proper checks to safeguard things. - [x] Fix issue with internal display brightness display control on Apple Slicon (relevant services moved to a different private framework) - [x] Better handling of mirrored displays to prepare for proper external multi monitor support -- [ ] Proper external multi monitor support - -### About multiple external displays - -Unfortunatelly proper external multi monitor support is rather difficult to achieve for several reasons (needs a complicated display matching logic based on various properties). It is doable but needs lots of work and testing to work really well. ~~Also other changes are needed (like fixing how MonitorControl handles mirrored displays - UPDATE: DONE).~~ For the M1 class devices this only affects the Mac mini when both HDMI and DP is connected. Even then the HDMI port will not work (which is a hard limitation as of now) so such users probably won't want use MonitorControl anyway. This issue will have to be resolved though for future Apple Silicon devices - -This does not affect MonitorControl's ability to handle the internal display alongside a single external display connected via USB-C. +- [ ] Proper external multi monitor support - 40% diff --git a/MonitorControl.xcodeproj/project.pbxproj b/MonitorControl.xcodeproj/project.pbxproj index c699022..94cab3e 100644 --- a/MonitorControl.xcodeproj/project.pbxproj +++ b/MonitorControl.xcodeproj/project.pbxproj @@ -69,16 +69,8 @@ 1E7ECF3F22A4552400E4E701 /* uk */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = uk; path = uk.lproj/Localizable.strings; sourceTree = ""; }; 1E7ECF4122A4553000E4E701 /* uk */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = uk; path = uk.lproj/MainMenu.strings; sourceTree = ""; }; 2894D9B72280B30500DF58DA /* CGDirectDisplayID+Extension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "CGDirectDisplayID+Extension.swift"; sourceTree = ""; }; - 28D1DDE2227FB7D0004CB494 /* MediaKeyTap.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MediaKeyTap.framework; path = Carthage/Build/Mac/MediaKeyTap.framework; sourceTree = ""; }; - 28D1DDE3227FB7D0004CB494 /* AMCoreAudio.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AMCoreAudio.framework; path = Carthage/Build/Mac/AMCoreAudio.framework; sourceTree = ""; }; - 28D1DDE4227FB7D0004CB494 /* MASPreferences.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MASPreferences.framework; path = Carthage/Build/Mac/MASPreferences.framework; sourceTree = ""; }; 28D1DDEC227FB8F2004CB494 /* EDID+Extension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "EDID+Extension.swift"; sourceTree = ""; }; - 28D1DDED227FB944004CB494 /* DDC.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = DDC.framework; path = Carthage/Build/Mac/DDC.framework; sourceTree = ""; }; 28D1DDF1227FBE71004CB494 /* NSScreen+Extension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "NSScreen+Extension.swift"; sourceTree = ""; }; - 28D1DE0E227FD005004CB494 /* MASPreferences.framework.dSYM */ = {isa = PBXFileReference; lastKnownFileType = wrapper.dsym; name = MASPreferences.framework.dSYM; path = Carthage/Build/Mac/MASPreferences.framework.dSYM; sourceTree = ""; }; - 28D1DE0F227FD006004CB494 /* MediaKeyTap.framework.dSYM */ = {isa = PBXFileReference; lastKnownFileType = wrapper.dsym; name = MediaKeyTap.framework.dSYM; path = Carthage/Build/Mac/MediaKeyTap.framework.dSYM; sourceTree = ""; }; - 28D1DE10227FD006004CB494 /* AMCoreAudio.framework.dSYM */ = {isa = PBXFileReference; lastKnownFileType = wrapper.dsym; name = AMCoreAudio.framework.dSYM; path = Carthage/Build/Mac/AMCoreAudio.framework.dSYM; sourceTree = ""; }; - 28D1DE11227FD006004CB494 /* DDC.framework.dSYM */ = {isa = PBXFileReference; lastKnownFileType = wrapper.dsym; name = DDC.framework.dSYM; path = Carthage/Build/Mac/DDC.framework.dSYM; sourceTree = ""; }; 2EAA5B7E24BF9E9A00937821 /* pl */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = pl; path = pl.lproj/MainMenu.strings; sourceTree = ""; }; 2EAA5B7F24BF9E9A00937821 /* pl */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = pl; path = pl.lproj/Localizable.strings; sourceTree = ""; }; 3CCA5F962442EFF800B4DB84 /* ja */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ja; path = ja.lproj/MainMenu.strings; sourceTree = ""; }; @@ -101,7 +93,6 @@ 6CBFE27923DB266000D1BC41 /* Display.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Display.swift; sourceTree = ""; }; 6CBFE27B23DB27A200D1BC41 /* InternalDisplay.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InternalDisplay.swift; sourceTree = ""; }; 6CC260F5256AD8F900613714 /* Preferences+Extension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Preferences+Extension.swift"; sourceTree = ""; }; - 6CC260F9256ADA7400613714 /* Preferences.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Preferences.framework; path = Carthage/Build/Mac/Preferences.framework; sourceTree = ""; }; 6CCB278522D5315200619B05 /* HideOsdCellView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HideOsdCellView.swift; sourceTree = ""; }; 6CD444C222D4FBB8005BFD3D /* LongerDelayCellView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LongerDelayCellView.swift; sourceTree = ""; }; 6CDA0FCB26485A7600F52125 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = MonitorControl/UI/Base.lproj/Main.storyboard; sourceTree = SOURCE_ROOT; }; @@ -181,15 +172,6 @@ AA9AE86E26B5BF3D00B6CA65 /* OSD.framework */, AA9AE87026B5BFB700B6CA65 /* CoreDisplay.framework */, AADB625926BC196900DFFAA5 /* DisplayServices.framework */, - 6CC260F9256ADA7400613714 /* Preferences.framework */, - 28D1DDE3227FB7D0004CB494 /* AMCoreAudio.framework */, - 28D1DE10227FD006004CB494 /* AMCoreAudio.framework.dSYM */, - 28D1DDED227FB944004CB494 /* DDC.framework */, - 28D1DE11227FD006004CB494 /* DDC.framework.dSYM */, - 28D1DDE4227FB7D0004CB494 /* MASPreferences.framework */, - 28D1DE0E227FD005004CB494 /* MASPreferences.framework.dSYM */, - 28D1DDE2227FB7D0004CB494 /* MediaKeyTap.framework */, - 28D1DE0F227FD006004CB494 /* MediaKeyTap.framework.dSYM */, ); name = Frameworks; sourceTree = ""; diff --git a/MonitorControl/View Controllers/MainPrefsViewController.swift b/MonitorControl/View Controllers/MainPrefsViewController.swift index 43debc6..c6bc241 100644 --- a/MonitorControl/View Controllers/MainPrefsViewController.swift +++ b/MonitorControl/View Controllers/MainPrefsViewController.swift @@ -26,7 +26,7 @@ class MainPrefsViewController: NSViewController, PreferencePane { override func viewDidLoad() { super.viewDidLoad() - self.setVersionNumber() + self.setAppInfo() } @available(macOS, deprecated: 10.10) @@ -101,7 +101,7 @@ class MainPrefsViewController: NSViewController, PreferencePane { #endif } - fileprivate func setVersionNumber() { + fileprivate func setAppInfo() { let versionName = NSLocalizedString("Version", comment: "Version") let buildName = NSLocalizedString("Build", comment: "Build") let versionNumber = Bundle.main.object(forInfoDictionaryKey: "CFBundleShortVersionString") ?? "error" @@ -117,6 +117,6 @@ class MainPrefsViewController: NSViewController, PreferencePane { #endif - self.versionLabel.stringValue = "\(versionName) \(versionNumber) (\(buildName) \(buildNumber)) \(arch)" + self.versionLabel.stringValue = "MonitorControl \(versionName) \(versionNumber) (\(buildName) \(buildNumber)) \(arch)" } }