diff --git a/SaneSideButtons.xcodeproj/project.pbxproj b/SaneSideButtons.xcodeproj/project.pbxproj index 683f4d3..0e362e6 100644 --- a/SaneSideButtons.xcodeproj/project.pbxproj +++ b/SaneSideButtons.xcodeproj/project.pbxproj @@ -330,7 +330,7 @@ CODE_SIGN_IDENTITY = "-"; CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; - CURRENT_PROJECT_VERSION = 18; + CURRENT_PROJECT_VERSION = 20; DEAD_CODE_STRIPPING = YES; DEVELOPMENT_TEAM = B7HSFEB698; ENABLE_HARDENED_RUNTIME = YES; @@ -365,7 +365,7 @@ CODE_SIGN_IDENTITY = "-"; CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; - CURRENT_PROJECT_VERSION = 18; + CURRENT_PROJECT_VERSION = 20; DEAD_CODE_STRIPPING = YES; DEVELOPMENT_TEAM = B7HSFEB698; ENABLE_HARDENED_RUNTIME = YES; diff --git a/SaneSideButtons/SwipeSimulator.swift b/SaneSideButtons/SwipeSimulator.swift index 0239158..3c78580 100644 --- a/SaneSideButtons/SwipeSimulator.swift +++ b/SaneSideButtons/SwipeSimulator.swift @@ -37,14 +37,16 @@ final class SwipeSimulator { private init() { } fileprivate func SBFFakeSwipe(direction: TLInfoSwipeDirection) { - let eventBegin: CGEvent = tl_CGEventCreateFromGesture(swipeBegin as CFDictionary, + let eventBegin: CGEvent = tl_CGEventCreateFromGesture(self.swipeBegin as CFDictionary, [] as CFArray).takeRetainedValue() var eventSwipe: CGEvent? if direction == TLInfoSwipeDirection(kTLInfoSwipeLeft) { - eventSwipe = tl_CGEventCreateFromGesture(swipeLeft as CFDictionary, [] as CFArray).takeRetainedValue() + eventSwipe = tl_CGEventCreateFromGesture(self.swipeLeft as CFDictionary, + [] as CFArray).takeRetainedValue() } else if direction == TLInfoSwipeDirection(kTLInfoSwipeRight) { - eventSwipe = tl_CGEventCreateFromGesture(swipeRight as CFDictionary, [] as CFArray).takeRetainedValue() + eventSwipe = tl_CGEventCreateFromGesture(self.swipeRight as CFDictionary, + [] as CFArray).takeRetainedValue() } guard let eventSwipe else { return } @@ -72,7 +74,7 @@ final class SwipeSimulator { } func setupEventTap() throws { - guard !eventTapIsRunning else { return } + guard !self.eventTapIsRunning else { return } let eventMask = CGEventMask(1 << CGEventType.otherMouseDown.rawValue | 1 << CGEventType.otherMouseUp.rawValue) guard let eventTap = CGEvent.tapCreate(tap: .cghidEventTap, place: .headInsertEventTap, diff --git a/SaneSideButtons/en.lproj/Localizable.strings b/SaneSideButtons/en.lproj/Localizable.strings index 79862eb..4b2e542 100644 --- a/SaneSideButtons/en.lproj/Localizable.strings +++ b/SaneSideButtons/en.lproj/Localizable.strings @@ -6,7 +6,8 @@ */ -// Menu Bar +// MARK: - Menu Bar + "hide" = "Hide Menu Bar Icon"; "hideInfo" = "Relaunch App to Show Again"; "ignore" = "Ignore %@"; @@ -14,7 +15,8 @@ "about" = "About"; "quit" = "Quit"; -// Permission Window +// MARK: - Permissions Window + "authorize_title" = "Authorize SaneSideButtons"; "authorize_subtitle" = "We'll have you up and running in just a minute!"; "authorize_description" = "SaneSideButtons needs your permission to detect mouse events and trigger actions in applications. Follow these steps to authorize it:";