Use renameMapping in the input controller rather than setting the name directly when...

Fix some formatting issues.

diff --git a/Classes/EnjoyableApplicationDelegate.m b/Classes/EnjoyableApplicationDelegate.m
index 449f6ef..25b9937 100644 (file)
--- a/Classes/EnjoyableApplicationDelegate.m
+++ b/Classes/EnjoyableApplicationDelegate.m
@@ -301,8 +301,7 @@
 - (void)mappingsViewController:(NJMappingsViewController *)mvc
           renameMappingAtIndex:(NSInteger)index
                         toName:(NSString *)name {
 - (void)mappingsViewController:(NJMappingsViewController *)mvc
           renameMappingAtIndex:(NSInteger)index
                         toName:(NSString *)name {

-    [self.ic renameMapping:self.ic.mappings[index]
-                                        to:name];
+    [self.ic renameMapping:self.ic.mappings[index] to:name];

 }
 
 - (BOOL)mappingsViewController:(NJMappingsViewController *)mvc
 }
 
 - (BOOL)mappingsViewController:(NJMappingsViewController *)mvc

diff --git a/Classes/NJInputController.m b/Classes/NJInputController.m
index 5ba9828..3ee0884 100644 (file)
--- a/Classes/NJInputController.m
+++ b/Classes/NJInputController.m
@@ -295,8 +295,7 @@ static CVReturn displayLink_update_cb(CVDisplayLinkRef displayLink,
         if ([oldMapping.name.lowercaseString isEqualToString:@"@application"]
             || [oldMapping.name.lowercaseString isEqualToString:
                 NSLocalizedString(@"@Application", nil).lowercaseString]) {
         if ([oldMapping.name.lowercaseString isEqualToString:@"@application"]
             || [oldMapping.name.lowercaseString isEqualToString:
                 NSLocalizedString(@"@Application", nil).lowercaseString]) {

-                oldMapping.name = app.bestMappingName;
-                [self mappingsChanged];
+                [self renameMapping:oldMapping to:app.bestMappingName];

             }
     }
     _manualMapping = oldMapping;
             }
     }
     _manualMapping = oldMapping;


@@ -307,10 +306,10 @@ static CVReturn displayLink_update_cb(CVDisplayLinkRef displayLink,
     _currentMapping = mapping;
     NSUInteger idx = [self indexOfMapping:_currentMapping];
     [NSNotificationCenter.defaultCenter
     _currentMapping = mapping;
     NSUInteger idx = [self indexOfMapping:_currentMapping];
     [NSNotificationCenter.defaultCenter

-     postNotificationName:NJEventMappingChanged
-     object:self
-     userInfo:@{ NJMappingKey : _currentMapping,
-     NJMappingIndexKey: @(idx) }];
+        postNotificationName:NJEventMappingChanged
+        object:self
+        userInfo:@{ NJMappingKey : _currentMapping,
+                    NJMappingIndexKey: @(idx) }];

 }
 
 - (void)activateMapping:(NJMapping *)mapping {
 }
 
 - (void)activateMapping:(NJMapping *)mapping {

diff --git a/Info.plist b/Info.plist
index 1e6b7d9..24e0951 100644 (file)
--- a/Info.plist
+++ b/Info.plist
@@ -46,7 +46,7 @@
        <key>CFBundleSignature</key>
        <string>????</string>
        <key>CFBundleVersion</key>
        <key>CFBundleSignature</key>
        <string>????</string>
        <key>CFBundleVersion</key>

-       <string>605</string>
+       <string>607</string>

        <key>LSApplicationCategoryType</key>
        <string>public.app-category.utilities</string>
        <key>NSHumanReadableCopyright</key>
        <key>LSApplicationCategoryType</key>
        <string>public.app-category.utilities</string>
        <key>NSHumanReadableCopyright</key>