From b5d0e8e9e88f6b4810ced6f7985f2baf62fb3d74 Mon Sep 17 00:00:00 2001
From: Joni Van Roost <joni.VR@hotmail.com>
Date: Sat, 9 Sep 2023 15:58:32 +0200
Subject: [PATCH] chore: increase version and build numbers for 4.2.0 (#1424)

---
 MonitorControl.xcodeproj/project.pbxproj             |  4 ++--
 MonitorControl/Info.plist                            |  2 +-
 MonitorControl/Support/AppDelegate.swift             |  2 +-
 MonitorControl/Support/DisplayManager.swift          |  6 +++---
 .../Support/KeyboardShortcutsManager.swift           | 12 ++++++------
 MonitorControlHelper/Info.plist                      |  2 +-
 6 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/MonitorControl.xcodeproj/project.pbxproj b/MonitorControl.xcodeproj/project.pbxproj
index 666fef7..bb0d8ce 100644
--- a/MonitorControl.xcodeproj/project.pbxproj
+++ b/MonitorControl.xcodeproj/project.pbxproj
@@ -843,7 +843,7 @@
 					"@executable_path/../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 10.14;
-				MARKETING_VERSION = 4.1.0;
+				MARKETING_VERSION = 4.2.0;
 				PRODUCT_BUNDLE_IDENTIFIER = me.guillaumeb.MonitorControl;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -878,7 +878,7 @@
 					"@executable_path/../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 10.14;
-				MARKETING_VERSION = 4.1.0;
+				MARKETING_VERSION = 4.2.0;
 				PRODUCT_BUNDLE_IDENTIFIER = me.guillaumeb.MonitorControl;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
diff --git a/MonitorControl/Info.plist b/MonitorControl/Info.plist
index 508171f..f055581 100644
--- a/MonitorControl/Info.plist
+++ b/MonitorControl/Info.plist
@@ -19,7 +19,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>$(MARKETING_VERSION)</string>
 	<key>CFBundleVersion</key>
-	<string>7045</string>
+	<string>7048</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.utilities</string>
 	<key>LSMinimumSystemVersion</key>
diff --git a/MonitorControl/Support/AppDelegate.swift b/MonitorControl/Support/AppDelegate.swift
index 7e6ea15..e6df6e6 100644
--- a/MonitorControl/Support/AppDelegate.swift
+++ b/MonitorControl/Support/AppDelegate.swift
@@ -41,7 +41,7 @@ class AppDelegate: NSObject, NSApplicationDelegate {
         displaysPrefsVc!,
         aboutPrefsVc!,
       ],
-      style: preferencePaneStyle,
+      style: self.preferencePaneStyle,
       animated: true
     )
   }()
diff --git a/MonitorControl/Support/DisplayManager.swift b/MonitorControl/Support/DisplayManager.swift
index b828125..c09be41 100644
--- a/MonitorControl/Support/DisplayManager.swift
+++ b/MonitorControl/Support/DisplayManager.swift
@@ -40,8 +40,8 @@ class DisplayManager {
     self.gammaActivityEnforcer.orderFrontRegardless()
   }
 
-  internal var shades: [CGDirectDisplayID: NSWindow] = [:]
-  internal var shadeGrave: [NSWindow] = []
+  var shades: [CGDirectDisplayID: NSWindow] = [:]
+  var shadeGrave: [NSWindow] = []
 
   func isDisqualifiedFromShade(_ displayID: CGDirectDisplayID) -> Bool {
     if CGDisplayIsInHWMirrorSet(displayID) != 0 || CGDisplayIsInMirrorSet(displayID) != 0 {
@@ -61,7 +61,7 @@ class DisplayManager {
     return false
   }
 
-  internal func createShadeOnDisplay(displayID: CGDirectDisplayID) -> NSWindow? {
+  func createShadeOnDisplay(displayID: CGDirectDisplayID) -> NSWindow? {
     if let screen = DisplayManager.getByDisplayID(displayID: displayID) {
       let shade = NSWindow(contentRect: .init(origin: NSPoint(x: 0, y: 0), size: .init(width: 10, height: 1)), styleMask: [], backing: .buffered, defer: false)
       shade.title = "Monitor Control Window Shade for Display " + String(displayID)
diff --git a/MonitorControl/Support/KeyboardShortcutsManager.swift b/MonitorControl/Support/KeyboardShortcutsManager.swift
index 0a7ab1c..8a837eb 100644
--- a/MonitorControl/Support/KeyboardShortcutsManager.swift
+++ b/MonitorControl/Support/KeyboardShortcutsManager.swift
@@ -37,22 +37,22 @@ class KeyboardShortcutsManager {
       self.mute()
     }
     KeyboardShortcuts.onKeyUp(for: .brightnessUp) { [self] in
-      disengage()
+      self.disengage()
     }
     KeyboardShortcuts.onKeyUp(for: .brightnessDown) { [self] in
-      disengage()
+      self.disengage()
     }
     KeyboardShortcuts.onKeyUp(for: .contrastUp) { [self] in
-      disengage()
+      self.disengage()
     }
     KeyboardShortcuts.onKeyUp(for: .contrastDown) { [self] in
-      disengage()
+      self.disengage()
     }
     KeyboardShortcuts.onKeyUp(for: .volumeUp) { [self] in
-      disengage()
+      self.disengage()
     }
     KeyboardShortcuts.onKeyUp(for: .volumeDown) { [self] in
-      disengage()
+      self.disengage()
     }
   }
 
diff --git a/MonitorControlHelper/Info.plist b/MonitorControlHelper/Info.plist
index 22f71a2..5b9f772 100644
--- a/MonitorControlHelper/Info.plist
+++ b/MonitorControlHelper/Info.plist
@@ -19,7 +19,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>$(MARKETING_VERSION)</string>
 	<key>CFBundleVersion</key>
-	<string>7036</string>
+	<string>7048</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.utilities</string>
 	<key>LSBackgroundOnly</key>