From 2a1a7599a2facbd5d0024fa870c525f4572a4f94 Mon Sep 17 00:00:00 2001 From: michael starke Date: Mon, 27 Oct 2014 22:08:21 +0100 Subject: [PATCH] Using modified DDHotKeyTextField to be notified about changes --- DDHotKey | 2 +- MacPass.xcodeproj/project.pbxproj | 4 ++-- MacPass/MPIntegrationSettingsController.h | 2 +- MacPass/MPIntegrationSettingsController.m | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/DDHotKey b/DDHotKey index 6e52b1f4..207a3b87 160000 --- a/DDHotKey +++ b/DDHotKey @@ -1 +1 @@ -Subproject commit 6e52b1f4753d8363c4ced6dd779ac92716e49fb0 +Subproject commit 207a3b87321f47f2de4e5a8e0ef2fc2bc8db27b9 diff --git a/MacPass.xcodeproj/project.pbxproj b/MacPass.xcodeproj/project.pbxproj index 53a0e0b4..b3edd1bf 100644 --- a/MacPass.xcodeproj/project.pbxproj +++ b/MacPass.xcodeproj/project.pbxproj @@ -359,7 +359,7 @@ /* Begin PBXCopyFilesBuildPhase section */ 4CC5D36618A1332000AF7FA8 /* CopyFiles */ = { isa = PBXCopyFilesBuildPhase; - buildActionMask = 2147483647; + buildActionMask = 12; dstPath = ""; dstSubfolderSpec = 10; files = ( @@ -583,7 +583,7 @@ 4C4B7EF117A467FC000234C7 /* MPEntryInspectorViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPEntryInspectorViewController.m; sourceTree = ""; }; 4C4B7EF617A4B335000234C7 /* MPUniqueCharactersFormatter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPUniqueCharactersFormatter.h; sourceTree = ""; }; 4C4B7EF717A4B335000234C7 /* MPUniqueCharactersFormatter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPUniqueCharactersFormatter.m; sourceTree = ""; }; - 4C4F72CF18DF704400E8D378 /* DDHotKeyTextField.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = DDHotKeyTextField.m; path = DDHotKey/DDHotKeyTextField.m; sourceTree = ""; }; + 4C4F72CF18DF704400E8D378 /* DDHotKeyTextField.m */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.objc; name = DDHotKeyTextField.m; path = DDHotKey/DDHotKeyTextField.m; sourceTree = ""; tabWidth = 4; }; 4C4F72D018DF704400E8D378 /* DDHotKeyTextField.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DDHotKeyTextField.h; path = DDHotKey/DDHotKeyTextField.h; sourceTree = ""; }; 4C4FCE13177CFE6B00BBF7AE /* MPCustomFieldTableCellView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPCustomFieldTableCellView.h; sourceTree = ""; }; 4C4FCE14177CFE6B00BBF7AE /* MPCustomFieldTableCellView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPCustomFieldTableCellView.m; sourceTree = ""; }; diff --git a/MacPass/MPIntegrationSettingsController.h b/MacPass/MPIntegrationSettingsController.h index f22a31ee..1ea4b9a0 100644 --- a/MacPass/MPIntegrationSettingsController.h +++ b/MacPass/MPIntegrationSettingsController.h @@ -11,7 +11,7 @@ @class DDHotKeyTextField; -@interface MPIntegrationSettingsController : MPViewController +@interface MPIntegrationSettingsController : MPViewController @property (weak) IBOutlet NSButton *enableServerCheckbutton; @property (weak) IBOutlet NSButton *enableGlobalAutotypeCheckbutton; diff --git a/MacPass/MPIntegrationSettingsController.m b/MacPass/MPIntegrationSettingsController.m index 322cf485..0cc30b86 100644 --- a/MacPass/MPIntegrationSettingsController.m +++ b/MacPass/MPIntegrationSettingsController.m @@ -50,6 +50,7 @@ [self.enableQuicklookCheckbutton bind:NSValueBinding toObject:defaultsController withKeyPath:quicklookKeyPath options:nil]; [self.hotKeyTextField bind:NSEnabledBinding toObject:defaultsController withKeyPath:enableGlobalAutotypeKeyPath options:nil]; self.hotKeyTextField.hotKey = self.hotKey; + self.hotKeyTextField.delegate = self; } - (void)setHotKey:(DDHotKey *)hotKey { @@ -65,4 +66,8 @@ _hotKey = hotKey; } +- (void)controlTextDidChange:(NSNotification *)obj { + NSLog(@"controlTextDidChange:"); +} + @end