diff --git a/App/SupportFiles/Info.plist b/App/SupportFiles/Info.plist index 54bf1ed46..00b1090a8 100644 --- a/App/SupportFiles/Info.plist +++ b/App/SupportFiles/Info.plist @@ -34,7 +34,7 @@ CFBundleVersion - 22356 + 22361 LSApplicationCategoryType public.app-category.utilities NSHumanReadableCopyright diff --git a/App/UI/Main/Tabs/GeneralTabController.swift b/App/UI/Main/Tabs/GeneralTabController.swift index 66d47ca4c..9d6b0e8f6 100644 --- a/App/UI/Main/Tabs/GeneralTabController.swift +++ b/App/UI/Main/Tabs/GeneralTabController.swift @@ -118,7 +118,7 @@ class GeneralTabController: NSViewController { enableTimeoutTimer?.cancel() }) - /// Set up a timer that fires after `enableTimeout` seconds + /// Set up a timer that fires `enableTimeout` seconds after the user clicked let timeSinceUserClick = CACurrentMediaTime() - userClickTS let timerFireTime = DispatchTime.now() + enableTimeout - timeSinceUserClick enableTimeoutTimer = DispatchSource.makeTimerSource(flags: [], queue: .main) /// Using main queue here since we're drawing UI from the callback @@ -139,7 +139,7 @@ class GeneralTabController: NSViewController { /// - The default duration `kMFToastDurationAutomatic` felt too short in this case. I wonder why that is? I think this toast is one of, if not the shortest toasts - maybe it has to do with that? Maybe it feels like it should display longer, because there's a delay until it shows up so it's harder to get back to? Maybe our tastes for how long the toasts should be changed? Maybe we should adjust the formula for `kMFToastDurationAutomatic`? if let window = NSApp.mainWindow { - let rawMessage = NSLocalizedString("enable-timeout-toast", comment: "First draft: If you have **problems enabling** the app, click [here](https://github.com/noah-nuebling/mac-mouse-fix/discussions/categories/guides).") + let rawMessage = NSLocalizedString("enable-timeout-toast", comment: "First draft: If you have **problems enabling** the app, click [here](https://github.com/noah-nuebling/mac-mouse-fix/discussions/861).") ToastNotificationController.attachNotification(withMessage: NSMutableAttributedString(coolMarkdown: rawMessage)!, to: window, forDuration: 10.0) } }) diff --git a/Helper/SupportFiles/Info.plist b/Helper/SupportFiles/Info.plist index 4ecb56011..9acfbafc8 100644 --- a/Helper/SupportFiles/Info.plist +++ b/Helper/SupportFiles/Info.plist @@ -19,7 +19,7 @@ CFBundleShortVersionString $(MARKETING_VERSION) CFBundleVersion - 22356 + 22361 LSApplicationCategoryType public.app-category.utilities LSBackgroundOnly diff --git a/Localization/de.lproj/Localizable.strings b/Localization/de.lproj/Localizable.strings index 66232cc00..b1bc9f260 100644 --- a/Localization/de.lproj/Localizable.strings +++ b/Localization/de.lproj/Localizable.strings @@ -245,8 +245,8 @@ /* First draft: Zoom in or out in Safari and other apps.\n \nWorks like a two-finger double tap on an Apple Trackpad. */ "effect.smart-zoom.hint" = "Zoome rein oder raus in Safari und anderen Apps.\n \nFunktioniert wie mit zwei Fingern doppelt tippen auf einem Apple Trackpad."; -/* First draft: If you have **problems enabling** the app, click [here](https://github.com/noah-nuebling/mac-mouse-fix/discussions/categories/guides). */ -"enable-timeout-toast" = "Wenn du **Probleme** hast, die App **einzuschalten**, klicke [hier](https://github.com/noah-nuebling/mac-mouse-fix/discussions/categories/guides)."; +/* First draft: If you have **problems enabling** the app, click [here](https://github.com/noah-nuebling/mac-mouse-fix/discussions/861). */ +"enable-timeout-toast" = "Wenn du **Probleme** hast, die App **einzuschalten**, klicke [hier](https://github.com/noah-nuebling/mac-mouse-fix/discussions/861)."; /* First draft: **Primary Mouse Button** can't be used\nPlease try another button */ "forbidden-capture-toast.1" = "**Primäre Maustaste** kann nicht verwendet werden\nBitte versuche eine andere Taste"; diff --git a/Localization/en.lproj/Localizable.strings b/Localization/en.lproj/Localizable.strings index ca9d95438..3f4e56099 100644 --- a/Localization/en.lproj/Localizable.strings +++ b/Localization/en.lproj/Localizable.strings @@ -245,8 +245,8 @@ /* First draft: Zoom in or out in Safari and other apps.\n \nWorks like a two-finger double tap on an Apple Trackpad. */ "effect.smart-zoom.hint" = "Zoom in or out in Safari and other apps.\n \nWorks like a two-finger double tap on an Apple Trackpad."; -/* First draft: If you have **problems enabling** the app, click [here](https://github.com/noah-nuebling/mac-mouse-fix/discussions/categories/guides). */ -"enable-timeout-toast" = "If you have **problems enabling** the app, click [here](https://github.com/noah-nuebling/mac-mouse-fix/discussions/categories/guides)."; +/* First draft: If you have **problems enabling** the app, click [here](https://github.com/noah-nuebling/mac-mouse-fix/discussions/861). */ +"enable-timeout-toast" = "If you have **problems enabling** the app, click [here](https://github.com/noah-nuebling/mac-mouse-fix/discussions/861)."; /* First draft: **Primary Mouse Button** can't be used\nPlease try another button */ "forbidden-capture-toast.1" = "**Primary Mouse Button** can't be used\nPlease try another button"; diff --git a/Localization/ko.lproj/Localizable.strings b/Localization/ko.lproj/Localizable.strings index 9357647c0..bcfc2bf87 100644 --- a/Localization/ko.lproj/Localizable.strings +++ b/Localization/ko.lproj/Localizable.strings @@ -245,7 +245,7 @@ /* First draft: Zoom in or out in Safari and other apps.\n \nWorks like a two-finger double tap on an Apple Trackpad. */ "effect.smart-zoom.hint" = "Safari 등의 앱에서 콘텐츠를 확대하거나 축소합니다.\n \n이는 Apple 트랙패드에서 두 손가락으로 이중 탭하는 것과 같습니다."; -/* First draft: If you have **problems enabling** the app, click [here](https://github.com/noah-nuebling/mac-mouse-fix/discussions/categories/guides). */ +/* First draft: If you have **problems enabling** the app, click [here](https://github.com/noah-nuebling/mac-mouse-fix/discussions/861). */ "enable-timeout-toast" = "enable-timeout-toast"; /* First draft: **Primary Mouse Button** can't be used\nPlease try another button */ diff --git a/Localization/vi.lproj/Localizable.strings b/Localization/vi.lproj/Localizable.strings index 4d9fbd199..f68715c79 100644 --- a/Localization/vi.lproj/Localizable.strings +++ b/Localization/vi.lproj/Localizable.strings @@ -245,7 +245,7 @@ /* First draft: Zoom in or out in Safari and other apps.\n \nWorks like a two-finger double tap on an Apple Trackpad. */ "effect.smart-zoom.hint" = "Phóng to hoặc thu nhỏ trong Safari và các ứng dụng khác.\n \nHoạt động như nhấp bằng hai ngón tay trên Apple Trackpad."; -/* First draft: If you have **problems enabling** the app, click [here](https://github.com/noah-nuebling/mac-mouse-fix/discussions/categories/guides). */ +/* First draft: If you have **problems enabling** the app, click [here](https://github.com/noah-nuebling/mac-mouse-fix/discussions/861). */ "enable-timeout-toast" = "enable-timeout-toast"; /* First draft: **Primary Mouse Button** can't be used\nPlease try another button */ diff --git a/Localization/zh-HK.lproj/Localizable.strings b/Localization/zh-HK.lproj/Localizable.strings index b7562972a..0fabc9b27 100644 --- a/Localization/zh-HK.lproj/Localizable.strings +++ b/Localization/zh-HK.lproj/Localizable.strings @@ -254,7 +254,7 @@ /* First draft: Zoom in or out in Safari and other apps.\n \nWorks like a two-finger double tap on an Apple Trackpad. */ "effect.smart-zoom.hint" = "在Safari和其他應用程式中放大或縮小。\n \n作用相當於在Apple觸控板上用兩指點兩下"; -/* First draft: If you have **problems enabling** the app, click [here](https://github.com/noah-nuebling/mac-mouse-fix/discussions/categories/guides). */ +/* First draft: If you have **problems enabling** the app, click [here](https://github.com/noah-nuebling/mac-mouse-fix/discussions/861). */ "enable-timeout-toast" = "enable-timeout-toast"; /* First draft: **Primary Mouse Button** can't be used\nPlease try another button */ diff --git a/Localization/zh-Hans.lproj/Localizable.strings b/Localization/zh-Hans.lproj/Localizable.strings index 0979333f5..960586818 100644 --- a/Localization/zh-Hans.lproj/Localizable.strings +++ b/Localization/zh-Hans.lproj/Localizable.strings @@ -254,7 +254,7 @@ /* First draft: Zoom in or out in Safari and other apps.\n \nWorks like a two-finger double tap on an Apple Trackpad. */ "effect.smart-zoom.hint" = "在Safari和其他应用程序中放大或缩小。\n \n作用相当于在Apple触控板上用双指轻点两下"; -/* First draft: If you have **problems enabling** the app, click [here](https://github.com/noah-nuebling/mac-mouse-fix/discussions/categories/guides). */ +/* First draft: If you have **problems enabling** the app, click [here](https://github.com/noah-nuebling/mac-mouse-fix/discussions/861). */ "enable-timeout-toast" = "enable-timeout-toast"; /* First draft: **Primary Mouse Button** can't be used\nPlease try another button */ diff --git a/Localization/zh-Hant.lproj/Localizable.strings b/Localization/zh-Hant.lproj/Localizable.strings index 04380b1c0..ae462516b 100644 --- a/Localization/zh-Hant.lproj/Localizable.strings +++ b/Localization/zh-Hant.lproj/Localizable.strings @@ -254,7 +254,7 @@ /* First draft: Zoom in or out in Safari and other apps.\n \nWorks like a two-finger double tap on an Apple Trackpad. */ "effect.smart-zoom.hint" = "在Safari和其他應用程式中放大或縮小。\n \n作用相當於在Apple觸控式軌跡板上用兩指點兩下"; -/* First draft: If you have **problems enabling** the app, click [here](https://github.com/noah-nuebling/mac-mouse-fix/discussions/categories/guides). */ +/* First draft: If you have **problems enabling** the app, click [here](https://github.com/noah-nuebling/mac-mouse-fix/discussions/861). */ "enable-timeout-toast" = "enable-timeout-toast"; /* First draft: **Primary Mouse Button** can't be used\nPlease try another button */