more progress with setting custom shortcut

flyingmachine · Sep 28, 2012 · 5cad4ee · 5cad4ee
1 parent 4f9725d
commit 5cad4ee
Show file tree

Hide file tree

Showing 3 changed files with 47 additions and 199 deletions.
diff --git a/Foreman.xcodeproj/project.pbxproj b/Foreman.xcodeproj/project.pbxproj
@@ -263,7 +263,6 @@
 			children = (
 				6556948F1615184600D08518 /* Preferences */,
 				651CDD8B15E794F400461C13 /* nibs */,
-				655694791615138100D08518 /* Supporting Files */,
 				65DE63BB15F17192007BF140 /* Resources */,
 				65956E691604BBD800FC6A70 /* Drawer */,
 				658EC5101602970F00DEB218 /* BaseViews */,
@@ -284,6 +283,7 @@
 		6517C0F715E149BD00135B11 /* Supporting Files */ = {
 			isa = PBXGroup;
 			children = (
+				6556947B161513A700D08518 /* PTHotKey */,
 				6517C0F815E149BD00135B11 /* Foreman-Info.plist */,
 				6517C0F915E149BD00135B11 /* InfoPlist.strings */,
 				6517C0FC15E149BD00135B11 /* main.m */,
@@ -332,14 +332,6 @@
 			path = DDHotKey;
 			sourceTree = "<group>";
 		};
-		655694791615138100D08518 /* Supporting Files */ = {
-			isa = PBXGroup;
-			children = (
-				6556947B161513A700D08518 /* PTHotKey */,
-			);
-			name = "Supporting Files";
-			sourceTree = "<group>";
-		};
 		6556947B161513A700D08518 /* PTHotKey */ = {
 			isa = PBXGroup;
 			children = (

diff --git a/Foreman/PreferencesController.m b/Foreman/PreferencesController.m
@@ -7,20 +7,14 @@
 //
 
 #import "PreferencesController.h"
+#import "Headers.h"
 
 @implementation PreferencesController
 
 - (id)init {
   self = [super init];
   if (self) {
     userDefaults = [NSUserDefaults standardUserDefaults];
-
-    //    [shortcutRecorder setCanCaptureGlobalHotKeys:YES]; // Defined in interface builder
-    //    [shortcutRecorderTwo setCanCaptureGlobalHotKeys:YES];
-
-    PTKeyCombo *keys = [[PTKeyCombo alloc] initWithPlistRepresentation:[userDefaults objectForKey:@"globalShortcut"]];
-    KeyCombo someKeyCombo = SRMakeKeyCombo([keys keyCode], SRCarbonToCocoaFlags([keys modifiers]));
-    [shortcutRecorder setKeyCombo:someKeyCombo];
   }
   return self;
 }
@@ -38,12 +32,13 @@ - (void)shortcutRecorder:(SRRecorderControl *)aRecorder keyComboDidChange:(KeyCo
   akeyCombo = [[PTKeyCombo alloc] initWithKeyCode:code modifiers:flags];
 
   if (aRecorder == shortcutRecorder) {
+    NSLog(@"yes");
     [hotKeyCenter unregisterHotKey:otherHotKey]; // The Key to happiness
 
-    otherHotKey = [[PTHotKey alloc] initWithIdentifier:[userDefaults objectForKey:@"hi"] keyCombo:akeyCombo];
-    [userDefaults setObject:[akeyCombo plistRepresentation] forKey:@"hi"];
-    [otherHotKey setTarget:self];
-    [otherHotKey setAction:@selector(sayBye)];
+    otherHotKey = [[PTHotKey alloc] initWithIdentifier:[userDefaults objectForKey:@"globalShortcut"] keyCombo:akeyCombo];
+    [userDefaults setObject:[akeyCombo plistRepresentation] forKey:@"globalShortcut"];
+    [otherHotKey setTarget:[App delegate]];
+    [otherHotKey setAction:@selector(toggle:)];
     [hotKeyCenter registerHotKey:otherHotKey];
   }
   //    if (newKeyCombo.code == ShortcutRecorderEmptyCode & newKeyCombo.flags == ShortcutRecorderEmptyFlags) {
@@ -72,4 +67,10 @@ + (BOOL)universalAccessNeedsToBeTurnedOn {
   }
 }
 
+
+- (void)windowDidBecomeKey:(NSNotification *)notification {
+  PTKeyCombo *keys = [[PTKeyCombo alloc] initWithPlistRepresentation:[userDefaults objectForKey:@"globalShortcut"]];
+  KeyCombo someKeyCombo = SRMakeKeyCombo([keys keyCode], SRCarbonToCocoaFlags([keys modifiers]));
+  [shortcutRecorder setKeyCombo:someKeyCombo];
+}
 @end