- Corrected use of "Force Touch" in UI strings where it should be "Fo…

…rce click". - Re-enabled Click actions that are also available through the Click and Drag for "Spaces & Mission Control" feature like "Move left a Space" or "Mission Control" as requested in these GitHub Issues: - #473 - #479 - In the last commit I re-enabled the Scroll to switch Spaces feature. There was a request for this, too but I can't find it right now.
noah-nuebling · Jan 28, 2023 · f419244 · f419244
1 parent af9b00c
commit f419244
Show file tree

Hide file tree

Showing 8 changed files with 30 additions and 30 deletions.
diff --git a/App/SupportFiles/Info.plist b/App/SupportFiles/Info.plist
@@ -34,7 +34,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>21668</string>
+	<string>21674</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.utilities</string>
 	<key>NSHumanReadableCopyright</key>

diff --git a/App/UI/Main/Tabs/ButtonTab/RemapTable/RemapTableTranslator.m b/App/UI/Main/Tabs/ButtonTab/RemapTable/RemapTableTranslator.m
@@ -131,7 +131,7 @@ + (NSArray *)groupedDataModel {
     NSDictionary *effectDict = rowDict[kMFRemapsKeyEffect];
 
     NSMutableArray *oneShotEffectsTable = @[
-        @{@"ui": NSLocalizedString(@"effect.look-up", @"First draft: Look Up & Quick Look"), @"tool": NSLocalizedString(@"effect.look-up.hint", @"First draft: Look up words in the Dictionary, Quick Look files in Finder, and more.\n \nWorks like Force Touch on an Apple Trackpad."), @"dict": @{
+        @{@"ui": NSLocalizedString(@"effect.look-up", @"First draft: Look Up & Quick Look"), @"tool": NSLocalizedString(@"effect.look-up.hint", @"First draft: Look up words in the Dictionary, Quick Look files in Finder, and more.\n \nWorks like a Force click on an Apple Trackpad."), @"dict": @{
                   kMFActionDictKeyType: kMFActionDictTypeSymbolicHotkey,
                   kMFActionDictKeyGenericVariant: @(kMFSHLookUp)
         }},
@@ -156,32 +156,32 @@ + (NSArray *)groupedDataModel {
                   kMFActionDictKeyGenericVariant: kMFNavigationSwipeVariantRight
         }},
         separatorEffectsTableEntry(),
-//        @{@"ui": NSLocalizedString(@"effect.mission-control", @"First draft: Mission Control"), @"tool": NSLocalizedString(@"effect.mission-control.hint", @"First draft: Show Mission Control"), @"dict": @{
-//                  kMFActionDictKeyType: kMFActionDictTypeSymbolicHotkey,
-//                  kMFActionDictKeyGenericVariant: @(kMFSHMissionControl)
-//        }},
-//        @{@"ui": NSLocalizedString(@"effect.app-expose", @"First draft: Application Windows"), @"tool": NSLocalizedString(@"effect.app-expose.hint", @"First draft: Show all windows of the active app"), @"dict": @{
-//                  kMFActionDictKeyType: kMFActionDictTypeSymbolicHotkey,
-//                  kMFActionDictKeyGenericVariant: @(kMFSHAppExpose)
-//        }},
+        @{@"ui": NSLocalizedString(@"effect.mission-control", @"First draft: Mission Control"), @"tool": NSLocalizedString(@"effect.mission-control.hint", @"First draft: Show Mission Control"), @"dict": @{
+                  kMFActionDictKeyType: kMFActionDictTypeSymbolicHotkey,
+                  kMFActionDictKeyGenericVariant: @(kMFSHMissionControl)
+        }},
+        @{@"ui": NSLocalizedString(@"effect.app-expose", @"First draft: Application Windows"), @"tool": NSLocalizedString(@"effect.app-expose.hint", @"First draft: Show all windows of the active app"), @"dict": @{
+                  kMFActionDictKeyType: kMFActionDictTypeSymbolicHotkey,
+                  kMFActionDictKeyGenericVariant: @(kMFSHAppExpose)
+        }},
         @{@"ui": NSLocalizedString(@"effect.desktop", @"First draft: Show Desktop"), @"tool": NSLocalizedString(@"effect.desktop.hint", @"First draft: Show the desktop"), @"dict": @{
                   kMFActionDictKeyType: kMFActionDictTypeSymbolicHotkey,
                   kMFActionDictKeyGenericVariant: @(kMFSHShowDesktop)
         }},
-//        separatorEffectsTableEntry(),
+        separatorEffectsTableEntry(),
         @{@"ui": NSLocalizedString(@"effect.launchpad", @"First draft: Launchpad"), @"tool": NSLocalizedString(@"effect.launchpad.hint", @"First draft: Open Launchpad"), @"dict": @{
                   kMFActionDictKeyType: kMFActionDictTypeSymbolicHotkey,
                   kMFActionDictKeyGenericVariant: @(kMFSHLaunchpad)
         }},
-//        separatorEffectsTableEntry(),
-//        @{@"ui": NSLocalizedString(@"effect.left-space", @"First draft: Move Left a Space"), @"tool": NSLocalizedString(@"effect.left-space.hint", @"First draft: Move one Space to the left"), @"dict": @{
-//                  kMFActionDictKeyType: kMFActionDictTypeSymbolicHotkey,
-//                  kMFActionDictKeyGenericVariant: @(kMFSHMoveLeftASpace)
-//        }},
-//        @{@"ui": NSLocalizedString(@"effect.right-space", @"First draft: Move Right a Space"), @"tool": NSLocalizedString(@"effect.right-space.hint", @"First draft: Move one Space to the right"), @"dict": @{
-//                  kMFActionDictKeyType: kMFActionDictTypeSymbolicHotkey,
-//                  kMFActionDictKeyGenericVariant: @(kMFSHMoveRightASpace)
-//        }},
+        separatorEffectsTableEntry(),
+        @{@"ui": NSLocalizedString(@"effect.left-space", @"First draft: Move Left a Space"), @"tool": NSLocalizedString(@"effect.left-space.hint", @"First draft: Move one Space to the left"), @"dict": @{
+                  kMFActionDictKeyType: kMFActionDictTypeSymbolicHotkey,
+                  kMFActionDictKeyGenericVariant: @(kMFSHMoveLeftASpace)
+        }},
+        @{@"ui": NSLocalizedString(@"effect.right-space", @"First draft: Move Right a Space"), @"tool": NSLocalizedString(@"effect.right-space.hint", @"First draft: Move one Space to the right"), @"dict": @{
+                  kMFActionDictKeyType: kMFActionDictTypeSymbolicHotkey,
+                  kMFActionDictKeyGenericVariant: @(kMFSHMoveRightASpace)
+        }},
         separatorEffectsTableEntry(),
         @{@"ui": NSLocalizedString(@"effect.record-shortcut", @"First draft: Keyboard Shortcut..."), @"tool": NSLocalizedString(@"effect.record-shortcut.hint", @"First draft: Type a keyboard shortcut, then use it from your mouse"), @"keyCaptureEntry": @YES},
     ].mutableCopy;
@@ -242,7 +242,7 @@ + (NSArray *)groupedDataModel {
 
     int separator = -1;
 
-    MFSystemDefinedEventType systemEventTypes[] =  {
+    MFSystemDefinedEventType systemEventTypes[] = {
         kMFSystemEventTypeBrightnessDown,
         kMFSystemEventTypeBrightnessUp,
         separator,
@@ -268,7 +268,7 @@ + (NSArray *)groupedDataModel {
                 kMFActionDictKeyType: kMFActionDictTypeSystemDefinedEvent,
                 kMFActionDictKeySystemDefinedEventVariantType: @(type),
                 kMFActionDictKeySystemDefinedEventVariantModifierFlags: @(0),
-    };
+            };
 
             NSAttributedString *shortcutString = getShortcutString(actionDict, NO);
             NSString *shortcutStringRaw = [shortcutString stringWithAttachmentDescriptions];
@@ -744,7 +744,7 @@ + (NSTableCellView *)getTriggerCellWithRowDict:(NSDictionary *)rowDict row:(NSIn
 
     /// Validate
 
-    NSAssert(tr != nil && ![tr.string isEqual:@""], @"Trigger string is empty. This is probably because there are missing translations. Translate strings starting with trigger. to fix this.");
+    NSAssert(tr != nil && ![tr.string isEqual:@""], @"Trigger string is empty. This is probably because there are missing translations. Translate strings starting with `trigger.` to fix this.");
 
     ///
     /// Build button modifier string

diff --git a/Helper/SupportFiles/Info.plist b/Helper/SupportFiles/Info.plist
@@ -19,7 +19,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>$(MARKETING_VERSION)</string>
 	<key>CFBundleVersion</key>
-	<string>21668</string>
+	<string>21674</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.utilities</string>
 	<key>LSBackgroundOnly</key>

diff --git a/Localization/de.lproj/Localizable.strings b/Localization/de.lproj/Localizable.strings
@@ -73,7 +73,7 @@
 /* First draft: Look Up & Quick Look */
 "effect.look-up" = "Quick Look & Nachschlagen";
 
-/* First draft: Look up words in the Dictionary, Quick Look files in Finder, and more.\n \nWorks like Force Touch on an Apple Trackpad. */
+/* First draft: Look up words in the Dictionary, Quick Look files in Finder, and more.\n \nWorks like a Force click on an Apple Trackpad. */
 "effect.look-up.hint" = "Schlage Wörter im Wörterbuch nach, werfe einen schnellen Blick auf Dateien im Finder, und mehr\n \nFunktioniert wie ein kräftiger Klick bei einem Apple Trackpad";
 
 /* First draft: Middle Click */

diff --git a/Localization/en.lproj/Localizable.strings b/Localization/en.lproj/Localizable.strings
@@ -175,8 +175,8 @@
 /* First draft: Look Up & Quick Look */
 "effect.look-up" = "Look Up & Quick Look";
 
-/* First draft: Look up words in the Dictionary, Quick Look files in Finder, and more.\n \nWorks like Force Touch on an Apple Trackpad. */
-"effect.look-up.hint" = "Look up words in the Dictionary, Quick Look files in Finder, and more.\n \nWorks like Force Touch on an Apple Trackpad.";
+/* First draft: Look up words in the Dictionary, Quick Look files in Finder, and more.\n \nWorks like a Force click on an Apple Trackpad. */
+"effect.look-up.hint" = "Look up words in the Dictionary, Quick Look files in Finder, and more.\n \nWorks like a Force click on an Apple Trackpad.";
 
 /* First draft: Middle Click */
 "effect.middle-click" = "Middle Click";

diff --git a/Localization/zh-HK.lproj/Localizable.strings b/Localization/zh-HK.lproj/Localizable.strings
@@ -181,7 +181,7 @@
 /* First draft: Look Up & Quick Look */
 "effect.look-up" = "查詢與快速查看";
 
-/* First draft: Look up words in the Dictionary, Quick Look files in Finder, and more.\n \nWorks like Force Touch on an Apple Trackpad. */
+/* First draft: Look up words in the Dictionary, Quick Look files in Finder, and more.\n \nWorks like a Force click on an Apple Trackpad. */
 "effect.look-up.hint" = "查詢辭典、在Finder「快速查看」等。\n \n作用相當於在Apple觸控板上用一指用力長按。";
 
 /* First draft: Middle Click */

diff --git a/Localization/zh-Hans.lproj/Localizable.strings b/Localization/zh-Hans.lproj/Localizable.strings
@@ -181,7 +181,7 @@
 /* First draft: Look Up & Quick Look */
 "effect.look-up" = "查询与快速查看";
 
-/* First draft: Look up words in the Dictionary, Quick Look files in Finder, and more.\n \nWorks like Force Touch on an Apple Trackpad. */
+/* First draft: Look up words in the Dictionary, Quick Look files in Finder, and more.\n \nWorks like a Force click on an Apple Trackpad. */
 "effect.look-up.hint" = "查询词典、在Finder中“快速查看”等。\n \n作用相当于在Apple触控板上用单指用力点按。";
 
 /* First draft: Middle Click */

diff --git a/Localization/zh-Hant.lproj/Localizable.strings b/Localization/zh-Hant.lproj/Localizable.strings
@@ -181,7 +181,7 @@
 /* First draft: Look Up & Quick Look */
 "effect.look-up" = "查詢與快速查看";
 
-/* First draft: Look up words in the Dictionary, Quick Look files in Finder, and more.\n \nWorks like Force Touch on an Apple Trackpad. */
+/* First draft: Look up words in the Dictionary, Quick Look files in Finder, and more.\n \nWorks like a Force click on an Apple Trackpad. */
 "effect.look-up.hint" = "查詢辭典、於Finder中「快速查看」等。\n \n作用相當於在Apple觸控式軌跡板上用一指用力長按。";
 
 /* First draft: Middle Click */