From e550a6aac8ec6f76b51b8b9b99908154f652e0d9 Mon Sep 17 00:00:00 2001
From: vspader <unknown>
Date: Sun, 10 Sep 2006 21:27:20 +0000
Subject: [PATCH] Added hotkey preferences.

---
 AppController.h                               |   6 +
 AppController.m                               | 118 +++++++++---------
 Cog.xcodeproj/project.pbxproj                 |   8 ++
 .../English.lproj/Preferences.nib/classes.nib |  19 ++-
 .../English.lproj/Preferences.nib/info.nib    |   6 +-
 .../Preferences.nib/keyedobjects.nib          | Bin 1939 -> 6631 bytes
 .../General/General.xcodeproj/project.pbxproj |  22 ++++
 Preferences/General/HotKeyPane.h              |  12 +-
 Preferences/General/HotKeyPane.m              |  79 +++++++++++-
 Preferences/PreferencesController.m           |   2 +-
 10 files changed, 206 insertions(+), 66 deletions(-)

diff --git a/AppController.h b/AppController.h
index 94b3fad25..483bc517d 100644
--- a/AppController.h
+++ b/AppController.h
@@ -4,6 +4,8 @@
 
 #import "PlaylistController.h"
 #import "FileTreeController.h"
+#import "NDHotKeyEvent.h"
+
 
 @interface AppController : NSObject
 {
@@ -25,6 +27,10 @@
 	IBOutlet NSDrawer *fileDrawer;
 
 	IBOutlet FileTreeController *fileTreeController;
+	
+	NDHotKeyEvent *playHotKey;
+	NDHotKeyEvent *prevHotKey;
+	NDHotKeyEvent *nextHotKey;
 }
 
 - (IBAction)openFiles:(id)sender;
diff --git a/AppController.m b/AppController.m
index c165f86c7..d7d785c1a 100644
--- a/AppController.m
+++ b/AppController.m
@@ -206,75 +206,77 @@
 - (void)initDefaults
 {
 	NSMutableDictionary *userDefaultsValuesDict = [NSMutableDictionary dictionary];
-	[userDefaultsValuesDict setObject:[NSNumber numberWithInt:35] forKey:@"hotkeyCodePlay"];
-	[userDefaultsValuesDict setObject:[NSNumber numberWithInt:controlKey+cmdKey] forKey:@"hotkeyModifiersPlay"];
+	[userDefaultsValuesDict setObject:[NSNumber numberWithInt:35] forKey:@"hotKeyPlayKeyCode"];
+	[userDefaultsValuesDict setObject:[NSNumber numberWithInt:(NSControlKeyMask|NSCommandKeyMask)] forKey:@"hotKeyPlayModifiers"];
+	[userDefaultsValuesDict setObject:[NSNumber numberWithInt:'P'] forKey:@"hotKeyPlayCharacter"];
 	
-	[userDefaultsValuesDict setObject:[NSNumber numberWithInt:45] forKey:@"hotkeyCodeNext"];
-	[userDefaultsValuesDict setObject:[NSNumber numberWithInt:controlKey+cmdKey] forKey:@"hotkeyModifiersNext"];
-	
-	[userDefaultsValuesDict setObject:[NSNumber numberWithInt:15] forKey:@"hotkeyCodePrevious"];
-	[userDefaultsValuesDict setObject:[NSNumber numberWithInt:controlKey+cmdKey] forKey:@"hotkeyModifiersPrevious"];
+	[userDefaultsValuesDict setObject:[NSNumber numberWithInt:45] forKey:@"hotKeyNextKeyCode"];
+	[userDefaultsValuesDict setObject:[NSNumber numberWithInt:(NSControlKeyMask|NSCommandKeyMask)] forKey:@"hotKeyNextModifiers"];
+	[userDefaultsValuesDict setObject:[NSNumber numberWithInt:'N'] forKey:@"hotKeyNextCharacter"];
 	
+	[userDefaultsValuesDict setObject:[NSNumber numberWithInt:15] forKey:@"hotKeyPreviousKeyCode"];
+	[userDefaultsValuesDict setObject:[NSNumber numberWithInt:(NSControlKeyMask|NSCommandKeyMask)] forKey:@"hotKeyPreviousModifiers"];
+	[userDefaultsValuesDict setObject:[NSNumber numberWithInt:'R'] forKey:@"hotKeyPreviousCharacter"];
+
 	//Register and sync defaults
 	[[NSUserDefaults standardUserDefaults] registerDefaults:userDefaultsValuesDict];
 	[[NSUserDefaults standardUserDefaults] synchronize];
+
+	[[NSUserDefaultsController sharedUserDefaultsController] addObserver:self forKeyPath:@"values.hotKeyPlayKeyCode"		options:0 context:nil];
+	[[NSUserDefaultsController sharedUserDefaultsController] addObserver:self forKeyPath:@"values.hotKeyPreviousKeyCode"	options:0 context:nil];
+	[[NSUserDefaultsController sharedUserDefaultsController] addObserver:self forKeyPath:@"values.hotKeyNextKeyCode"		options:0 context:nil];
+}
+
+- (void) observeValueForKeyPath:(NSString *)keyPath
+					   ofObject:(id)object
+						 change:(NSDictionary *)change
+                        context:(void *)context
+{
+	if ([keyPath isEqualToString:@"values.hotKeyPlayKeyCode"]) {
+		[self registerHotKeys];
+	}
+	else if ([keyPath isEqualToString:@"values.hotKeyPreviousKeyCode"]) {
+		[self registerHotKeys];
+	}
+	else if ([keyPath isEqualToString:@"values.hotKeyNextKeyCode"]) {
+		[self registerHotKeys];
+	}
 }
 
-//Register the Hotkeys.  Added by Chris Henderson, 21 May 2006
-//See http://www.dbachrach.com/blog/2005/11/program-global-hotkeys-in-cocoa-easily.html
 - (void)registerHotKeys
 {
-	EventHotKeyRef gMyHotKeyRef;
-	EventHotKeyID gMyHotKeyID;
-	EventTypeSpec eventType;
-	eventType.eventClass=kEventClassKeyboard;
-	eventType.eventKind=kEventHotKeyPressed;
-	InstallApplicationEventHandler(&handleHotKey,1,&eventType,self,NULL);
-	//Play
-	gMyHotKeyID.signature='htk1';
-	gMyHotKeyID.id=1;
-	if([[NSUserDefaults standardUserDefaults] integerForKey:@"hotkeyCodePlay"]!=-999)
-	{
-		RegisterEventHotKey([[NSUserDefaults standardUserDefaults] integerForKey:@"hotkeyCodePlay"], [[NSUserDefaults standardUserDefaults] integerForKey:@"hotkeyModifiersPlay"], gMyHotKeyID, GetApplicationEventTarget(), 0, &gMyHotKeyRef);
-	}
-	//Previous
-	gMyHotKeyID.signature='htk2';
-	gMyHotKeyID.id=2;
-	if([[NSUserDefaults standardUserDefaults] integerForKey:@"hotkeyCodePrevious"]!=-999)
-	{
-		NSLog(@"REGISTERING: %i", [[NSUserDefaults standardUserDefaults] integerForKey:@"hotkeyCodePrevious"]);
-		RegisterEventHotKey([[NSUserDefaults standardUserDefaults] integerForKey:@"hotkeyCodePrevious"], [[NSUserDefaults standardUserDefaults] integerForKey:@"hotkeyModifiersPrevious"], gMyHotKeyID, GetApplicationEventTarget(), 0, &gMyHotKeyRef);
-	}
-	//Next
-	gMyHotKeyID.signature='htk3';
-	gMyHotKeyID.id=3;
-	if([[NSUserDefaults standardUserDefaults] integerForKey:@"hotkeyCodeNext"]!=-999)
-	{
-		RegisterEventHotKey([[NSUserDefaults standardUserDefaults] integerForKey:@"hotkeyCodeNext"], [[NSUserDefaults standardUserDefaults] integerForKey:@"hotkeyModifiersNext"], gMyHotKeyID, GetApplicationEventTarget(), 0, &gMyHotKeyRef);
-	}
+	NSLog(@"REGISTERING HOTKEYS");
+	
+	[playHotKey release];
+	playHotKey = [[NDHotKeyEvent alloc]
+		initWithKeyCode: [[[[NSUserDefaultsController sharedUserDefaultsController] defaults] objectForKey:@"hotKeyPlayKeyCode"] intValue]
+			  character: [[[[NSUserDefaultsController sharedUserDefaultsController] defaults] objectForKey:@"hotKeyPlayCharacter"] intValue]
+		  modifierFlags: [[[[NSUserDefaultsController sharedUserDefaultsController] defaults] objectForKey:@"hotKeyPlayModifiers"] intValue]
+		];
+	
+	[prevHotKey release];
+	prevHotKey = [[NDHotKeyEvent alloc]
+		initWithKeyCode: [[NSUserDefaults standardUserDefaults] integerForKey:@"hotKeyPreviousKeyCode"]
+				character: [[NSUserDefaults standardUserDefaults] integerForKey:@"hotKeyPreviousCharacter"]
+			modifierFlags: [[NSUserDefaults standardUserDefaults] integerForKey:@"hotKeyPreviousModifiers"]
+		];
+	
+	[nextHotKey release];
+	nextHotKey = [[NDHotKeyEvent alloc]
+		initWithKeyCode: [[NSUserDefaults standardUserDefaults] integerForKey:@"hotKeyNextKeyCode"]
+				character: [[NSUserDefaults standardUserDefaults] integerForKey:@"hotKeyNextCharacter"]
+			modifierFlags: [[NSUserDefaults standardUserDefaults] integerForKey:@"hotKeyNextModifiers"]
+		];
+	
+	[playHotKey setTarget:self selector:@selector(clickPlay)];
+	[prevHotKey setTarget:self selector:@selector(clickPrev)];
+	[nextHotKey setTarget:self selector:@selector(clickNext)];
+	
+	[playHotKey setEnabled:YES];	
+	[prevHotKey setEnabled:YES];
+	[nextHotKey setEnabled:YES];
 }
 
-//Handle the Hotkeys.  Added by Chris Henderson, 21 May 2006
-OSStatus handleHotKey(EventHandlerCallRef nextHandler,EventRef theEvent,void *userData)
-{
-	EventHotKeyID hkID;
-	GetEventParameter(theEvent,kEventParamDirectObject,typeEventHotKeyID,NULL,sizeof(hkID),NULL,&hkID);
-	int i = hkID.id;
-
-	NSLog(@"Handling: %i", i);
-	switch (i) 
-	{
-		case 1: [userData clickPlay];
-			break;
-		case 2: [userData clickPrev];
-			break;
-		case 3: [userData clickNext];
-			break;
-	}
-	return noErr;
-}
-
-
 - (void)clickPlay
 {
 	[playButton performClick:nil];
diff --git a/Cog.xcodeproj/project.pbxproj b/Cog.xcodeproj/project.pbxproj
index 3d3d8d72b..6e7cb781a 100644
--- a/Cog.xcodeproj/project.pbxproj
+++ b/Cog.xcodeproj/project.pbxproj
@@ -112,6 +112,8 @@
 		8E7A0F2B0A8FEB4A00F27EE8 /* shuffle_on.png in Resources */ = {isa = PBXBuildFile; fileRef = 8E7A0F170A8FEB4A00F27EE8 /* shuffle_on.png */; };
 		8E7A0F2C0A8FEB4A00F27EE8 /* volume_high.png in Resources */ = {isa = PBXBuildFile; fileRef = 8E7A0F180A8FEB4A00F27EE8 /* volume_high.png */; };
 		8E7A0F2D0A8FEB4A00F27EE8 /* volume_low.png in Resources */ = {isa = PBXBuildFile; fileRef = 8E7A0F190A8FEB4A00F27EE8 /* volume_low.png */; };
+		8E7C2B160AACE0F2009B4EAD /* NDHotKeyEvent.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 8E7C2B140AACE0F2009B4EAD /* NDHotKeyEvent.h */; };
+		8E7C2B170AACE0F2009B4EAD /* NDHotKeyEvent.m in Sources */ = {isa = PBXBuildFile; fileRef = 8E7C2B150AACE0F2009B4EAD /* NDHotKeyEvent.m */; };
 		8EA917300A336CC30087CDE2 /* Shorten.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8EA9172F0A336CC30087CDE2 /* Shorten.framework */; };
 		8EB450080A2BB8B300AA711F /* Cog Help in Resources */ = {isa = PBXBuildFile; fileRef = 8EB44FF90A2BB8B300AA711F /* Cog Help */; };
 		8EB971790A44B74A009803E3 /* MAD.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 8E1849C40A43DB5C0084C69D /* MAD.framework */; };
@@ -180,6 +182,7 @@
 				8E07AAF10AAC910500A4B32F /* SS_PreferencePaneProtocol.h in CopyFiles */,
 				8E07AAF20AAC910500A4B32F /* SS_PrefsController.h in CopyFiles */,
 				8E07AB780AAC930B00A4B32F /* PreferencesController.h in CopyFiles */,
+				8E7C2B160AACE0F2009B4EAD /* NDHotKeyEvent.h in CopyFiles */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -331,6 +334,8 @@
 		8E7A0F170A8FEB4A00F27EE8 /* shuffle_on.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = shuffle_on.png; sourceTree = "<group>"; };
 		8E7A0F180A8FEB4A00F27EE8 /* volume_high.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = volume_high.png; sourceTree = "<group>"; };
 		8E7A0F190A8FEB4A00F27EE8 /* volume_low.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = volume_low.png; sourceTree = "<group>"; };
+		8E7C2B140AACE0F2009B4EAD /* NDHotKeyEvent.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = NDHotKeyEvent.h; sourceTree = "<group>"; };
+		8E7C2B150AACE0F2009B4EAD /* NDHotKeyEvent.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = NDHotKeyEvent.m; sourceTree = "<group>"; };
 		8EA9172F0A336CC30087CDE2 /* Shorten.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Shorten.framework; path = Libraries/Shorten/build/Release/Shorten.framework; sourceTree = "<group>"; };
 		8EB44FF90A2BB8B300AA711F /* Cog Help */ = {isa = PBXFileReference; lastKnownFileType = folder; path = "Cog Help"; sourceTree = "<group>"; };
 		8EFFCD420AA093AF00C458A5 /* DirectoryNode.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = DirectoryNode.h; sourceTree = "<group>"; };
@@ -522,6 +527,8 @@
 				8E75752209F31D5A0080F1EE /* TrackingSlider.m */,
 				8E4C7F060A0509FC003BE25F /* DragScrollView.h */,
 				8E4C7F070A0509FC003BE25F /* DragScrollView.m */,
+				8E7C2B140AACE0F2009B4EAD /* NDHotKeyEvent.h */,
+				8E7C2B150AACE0F2009B4EAD /* NDHotKeyEvent.m */,
 			);
 			path = Custom;
 			sourceTree = "<group>";
@@ -870,6 +877,7 @@
 				8EFFCD780AA093AF00C458A5 /* UKMainThreadProxy.m in Sources */,
 				8E07AAF30AAC910500A4B32F /* SS_PrefsController.m in Sources */,
 				8E07AB790AAC930B00A4B32F /* PreferencesController.m in Sources */,
+				8E7C2B170AACE0F2009B4EAD /* NDHotKeyEvent.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
diff --git a/Preferences/General/English.lproj/Preferences.nib/classes.nib b/Preferences/General/English.lproj/Preferences.nib/classes.nib
index ec6441322..f955ac163 100644
--- a/Preferences/General/English.lproj/Preferences.nib/classes.nib
+++ b/Preferences/General/English.lproj/Preferences.nib/classes.nib
@@ -2,7 +2,24 @@
     IBClasses = (
         {CLASS = FileDrawerPane; LANGUAGE = ObjC; SUPERCLASS = PreferencePane; }, 
         {CLASS = FirstResponder; LANGUAGE = ObjC; SUPERCLASS = NSObject; }, 
-        {CLASS = HotKeyPane; LANGUAGE = ObjC; SUPERCLASS = PreferencePane; }, 
+        {CLASS = HotKeyControl; LANGUAGE = ObjC; SUPERCLASS = NDHotKeyControl; }, 
+        {
+            ACTIONS = {
+                grabNextHotKey = id; 
+                grabPlayHotKey = id; 
+                grabPrevHotKey = id; 
+                hotKeyChanged = id; 
+            }; 
+            CLASS = HotKeyPane; 
+            LANGUAGE = ObjC; 
+            OUTLETS = {
+                nextHotKeyControl = HotKeyControl; 
+                playHotKeyControl = HotKeyControl; 
+                prevHotKeyControl = HotKeyControl; 
+            }; 
+            SUPERCLASS = PreferencePane; 
+        }, 
+        {CLASS = NDHotKeyControl; LANGUAGE = ObjC; SUPERCLASS = NSTextField; }, 
         {
             CLASS = PrefPaneController; 
             LANGUAGE = ObjC; 
diff --git a/Preferences/General/English.lproj/Preferences.nib/info.nib b/Preferences/General/English.lproj/Preferences.nib/info.nib
index 72f7bc250..a8ff62dd3 100644
--- a/Preferences/General/English.lproj/Preferences.nib/info.nib
+++ b/Preferences/General/English.lproj/Preferences.nib/info.nib
@@ -7,16 +7,16 @@
 	<key>IBEditorPositions</key>
 	<dict>
 		<key>10</key>
-		<string>-9 537 668 209 0 0 1024 746 </string>
+		<string>178 415 668 209 0 0 1024 746 </string>
 		<key>11</key>
-		<string>155 171 241 464 0 0 1024 746 </string>
+		<string>290 507 273 151 0 0 1024 746 </string>
 	</dict>
 	<key>IBFramework Version</key>
 	<string>446.1</string>
 	<key>IBOpenObjects</key>
 	<array>
-		<integer>11</integer>
 		<integer>10</integer>
+		<integer>11</integer>
 	</array>
 	<key>IBSystem Version</key>
 	<string>8J135</string>
diff --git a/Preferences/General/English.lproj/Preferences.nib/keyedobjects.nib b/Preferences/General/English.lproj/Preferences.nib/keyedobjects.nib
index d5763a9621ba8fec832b2e3972270a0cdbd060e3..8eb2ab49e99d9d7a96299a5068141bd38a3440fe 100644
GIT binary patch
literal 6631
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

delta 1433
zcmYk53s96*6oCJG@3|<i-5*(26jV?UK_1KU*j0-Z5qY^HzY?wpF7P8u%cATmD(W5|
z*{EY?i`BSk#KXo+Q7fxSt!c_>GJBw8rXoXTidjuHjWvzazw2h+JM*7&|8vhd-#Pc*
zA2Zx)v1WzM>Tv3G7YSv+14itLobDPKxU?`gwYjEIu65Q~oE9X#;<Vt9^sMa19-lR*
zWZ{z)mYVv;r|iv+HEruRZ)tpb$Ij>W?0xw_&ylxJzVq(;XFmJp(zlntyK?o~!1bXY
zZY_$lud>;$i=#qSYB6k7xF$k7I&#d|sOWLyC&a`~oD>&7Iblj-($wUX)HGeSs5ZSB
zLp3B}B4%MCCgCKUf(D$50cgaL7>6;KjT{A0MB1m-XSl0b!dQcG+VqOJTARh;kR9d+
zirvyAcTRU7WGTft+9zh3O_IMNM+c7RGZ=Gccg@b5QE8Iqt#VpwY_cRf7nvmG+n1xw
zFYcaOP*{Y4sKF>4hZ8Q&Gim3SE+~`S%VDBx6ozAvH+eY%2Ad0-oyGFnQj1;gUu<5Y
z)mJV}tzNdoB+Xgll<f{{vt7~iTNE70x=!{MD4FCn&NA7tqS;<2x1fljC}0?>%x!vo
zdU8yrUcaHQR$C`8R+t^m7OQ=Exk)Ow%B`qYz?VZqSA*5PEHFAk3H&gOVzD)KH`O(|
zXR0(K48|2JyH>WiYgAKQUUuh#vQ`|8Uh)Vp`8tJMTa|CM$$2f7R=MSW`VAXXt2g0T
zjPx;$F}G!B8k1wvvkecJQ0?o5^h}u!gD_f&N6ifn8{o6G?ow<KINocks<&z$&7n{}
z@9uK9yNN2&rF8lQPj{(PYQ+!*E=X~TRW|Hz?`)r;*k18;>y&}iKVy}D2R%K?e%*f#
z)aR0;J?iP{Jyw2V9meBi48{c1VyypMynTD5Q17zRTX%xP6*IrpF1ILA-}7`RnRB$K
z{PF|OA*ZfTDk><Q>+Kp<E<uoT4Kxa7pg-d|&!NxHfAQs4U-w<Oh{>3OshEa3Oh-Lt
zU?#?jK_U@VVt}X?L&ab*MC3~R!Qu{_pvdoid0aW#n?A*0ygl4GJfq4a73R+Oy}CT*
z)d?eoFd<5a6A}fzkS7!hC4yO~6kZYz2%iX-gx?7#B8etRB%es6o-~m*vYot0j+4{m
z9O)-l$p9H7L*xdzNp6v0@)P-){7QZ!e~>@PJ@PmChq&%jfpQu~!)XLfqG{AfXVZMT
zh*r^+bT!>XH`A?jJKaV1(GJ=}U#D--qx2X(LEoaM={b6VUZn$ckPgus^ftXi@6vmW
zF*S=~DJ+epvkaES3@n$;WeZpZGqY+|%T}?CYzN!T+S#k@po<-5z3eROX9H}I4Y3>S
zCcDG#vR~MJ2!vn=1vP|0IE;r$5D%%K13hFyHq3$|C;=0cLK#?~9vWdSY=UjD6L!IF
z*aL3Z3;SR{bi!+J2oA#$=!N5O5>CMx_z*sVkKrtQ3g^Lf0s7$*T!t%f4X(p5{KW%!
zFc0A>9?msf%cFQaPvD7sDo^2QJe_CoEN<Y_cn&Y%MZAQYcquRA3wb%O;AURQtN1cr
u!|QlGZ{UsG#_im}oqRQK<LmiGzJ+h)+xSlYtl%4zL_Sc2JAUaGeE+|C@xvJa

diff --git a/Preferences/General/General.xcodeproj/project.pbxproj b/Preferences/General/General.xcodeproj/project.pbxproj
index dabfd3a46..4217ca10d 100644
--- a/Preferences/General/General.xcodeproj/project.pbxproj
+++ b/Preferences/General/General.xcodeproj/project.pbxproj
@@ -16,6 +16,10 @@
 		8E07ABDC0AAC95BC00A4B32F /* file_drawer.png in Resources */ = {isa = PBXBuildFile; fileRef = 8E07ABDA0AAC95BC00A4B32F /* file_drawer.png */; };
 		8E07ABDD0AAC95BC00A4B32F /* hot_keys.png in Resources */ = {isa = PBXBuildFile; fileRef = 8E07ABDB0AAC95BC00A4B32F /* hot_keys.png */; };
 		8E07AC050AAC968C00A4B32F /* Preferences.nib in Resources */ = {isa = PBXBuildFile; fileRef = 8E07AC030AAC968C00A4B32F /* Preferences.nib */; };
+		8E6C12160AACAE4100819171 /* NDHotKeyControl.m in Sources */ = {isa = PBXBuildFile; fileRef = 8E6C12130AACAE4100819171 /* NDHotKeyControl.m */; };
+		8E6C12170AACAE4100819171 /* NDHotKeyEvent.m in Sources */ = {isa = PBXBuildFile; fileRef = 8E6C12150AACAE4100819171 /* NDHotKeyEvent.m */; };
+		8E6C123A0AACAEF200819171 /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8E6C12390AACAEF200819171 /* Carbon.framework */; };
+		8E6C13A00AACBAB500819171 /* HotKeyControl.m in Sources */ = {isa = PBXBuildFile; fileRef = 8E6C139F0AACBAB500819171 /* HotKeyControl.m */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
@@ -38,6 +42,13 @@
 		8E07ABDA0AAC95BC00A4B32F /* file_drawer.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = file_drawer.png; path = Icons/file_drawer.png; sourceTree = "<group>"; };
 		8E07ABDB0AAC95BC00A4B32F /* hot_keys.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = hot_keys.png; path = Icons/hot_keys.png; sourceTree = "<group>"; };
 		8E07AC040AAC968C00A4B32F /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = English.lproj/Preferences.nib; sourceTree = "<group>"; };
+		8E6C12120AACAE4100819171 /* NDHotKeyControl.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = NDHotKeyControl.h; sourceTree = "<group>"; };
+		8E6C12130AACAE4100819171 /* NDHotKeyControl.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = NDHotKeyControl.m; sourceTree = "<group>"; };
+		8E6C12140AACAE4100819171 /* NDHotKeyEvent.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = NDHotKeyEvent.h; sourceTree = "<group>"; };
+		8E6C12150AACAE4100819171 /* NDHotKeyEvent.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = NDHotKeyEvent.m; sourceTree = "<group>"; };
+		8E6C12390AACAEF200819171 /* Carbon.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Carbon.framework; path = /System/Library/Frameworks/Carbon.framework; sourceTree = "<absolute>"; };
+		8E6C139E0AACBAB500819171 /* HotKeyControl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HotKeyControl.h; sourceTree = "<group>"; };
+		8E6C139F0AACBAB500819171 /* HotKeyControl.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HotKeyControl.m; sourceTree = "<group>"; };
 		D2F7E65807B2D6F200F64583 /* CoreData.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreData.framework; path = /System/Library/Frameworks/CoreData.framework; sourceTree = "<absolute>"; };
 /* End PBXFileReference section */
 
@@ -47,6 +58,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				8D5B49B4048680CD000E48DA /* Cocoa.framework in Frameworks */,
+				8E6C123A0AACAEF200819171 /* Carbon.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -97,6 +109,12 @@
 				8E07AA7F0AAC8EA200A4B32F /* FileDrawerPane.m */,
 				8E07AA800AAC8EA200A4B32F /* HotKeyPane.h */,
 				8E07AA810AAC8EA200A4B32F /* HotKeyPane.m */,
+				8E6C12120AACAE4100819171 /* NDHotKeyControl.h */,
+				8E6C12130AACAE4100819171 /* NDHotKeyControl.m */,
+				8E6C12140AACAE4100819171 /* NDHotKeyEvent.h */,
+				8E6C12150AACAE4100819171 /* NDHotKeyEvent.m */,
+				8E6C139E0AACBAB500819171 /* HotKeyControl.h */,
+				8E6C139F0AACBAB500819171 /* HotKeyControl.m */,
 			);
 			name = Classes;
 			sourceTree = "<group>";
@@ -104,6 +122,7 @@
 		1058C7ACFEA557BF11CA2CBB /* Linked Frameworks */ = {
 			isa = PBXGroup;
 			children = (
+				8E6C12390AACAEF200819171 /* Carbon.framework */,
 				1058C7ADFEA557BF11CA2CBB /* Cocoa.framework */,
 			);
 			name = "Linked Frameworks";
@@ -203,6 +222,9 @@
 				8E07AA880AAC8EA200A4B32F /* HotKeyPane.m in Sources */,
 				8E07AA890AAC8EA200A4B32F /* PreferencePane.m in Sources */,
 				8E07AA8A0AAC8EA200A4B32F /* PrefPaneController.m in Sources */,
+				8E6C12160AACAE4100819171 /* NDHotKeyControl.m in Sources */,
+				8E6C12170AACAE4100819171 /* NDHotKeyEvent.m in Sources */,
+				8E6C13A00AACBAB500819171 /* HotKeyControl.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
diff --git a/Preferences/General/HotKeyPane.h b/Preferences/General/HotKeyPane.h
index a2feec602..4402d243b 100644
--- a/Preferences/General/HotKeyPane.h
+++ b/Preferences/General/HotKeyPane.h
@@ -8,10 +8,18 @@
 
 #import <Cocoa/Cocoa.h>
 #import "PreferencePane.h"
-
+#import "HotKeyControl.h"
 
 @interface HotKeyPane : PreferencePane {
-
+	IBOutlet HotKeyControl *playHotKeyControl;
+	IBOutlet HotKeyControl *prevHotKeyControl;
+	IBOutlet HotKeyControl *nextHotKeyControl;
 }
 
+- (IBAction) grabPlayHotKey:(id)sender;
+- (IBAction) grabPrevHotKey:(id)sender;
+- (IBAction) grabNextHotKey:(id)sender;
+
+- (IBAction) hotKeyChanged:(id)sender;
+
 @end
diff --git a/Preferences/General/HotKeyPane.m b/Preferences/General/HotKeyPane.m
index 92665e80f..664af8ecb 100644
--- a/Preferences/General/HotKeyPane.m
+++ b/Preferences/General/HotKeyPane.m
@@ -7,7 +7,7 @@
 //
 
 #import "HotKeyPane.h"
-
+#import "NDHotKeyEvent.h"
 
 @implementation HotKeyPane
 
@@ -15,6 +15,83 @@
 {
 	[self setName:@"Hot Keys"];
 	[self setIcon:@"hot_keys"];	
+
+//	[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(windowDidBecomeKey:) name:NSWindowDidBecomeKeyNotification object: [view window]];
+	[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(windowDidResignKey:) name:NSWindowDidResignKeyNotification object: [view window]];
+	
+	[prevHotKeyControl setKeyCode: [[NSUserDefaults standardUserDefaults] integerForKey:@"hotKeyPreviousKeyCode"] ];
+	[prevHotKeyControl setCharacter: [[NSUserDefaults standardUserDefaults] integerForKey:@"hotKeyPreviousCharacter"] ];
+	[prevHotKeyControl setModifierFlags: [[NSUserDefaults standardUserDefaults] integerForKey:@"hotKeyPreviousModifiers"] ];
+	
+	[prevHotKeyControl updateStringValue];
+	
+	[nextHotKeyControl setKeyCode: [[NSUserDefaults standardUserDefaults] integerForKey:@"hotKeyNextKeyCode"] ];
+	[nextHotKeyControl setCharacter: [[NSUserDefaults standardUserDefaults] integerForKey:@"hotKeyNextCharacter"] ];
+	[nextHotKeyControl setModifierFlags: [[NSUserDefaults standardUserDefaults] integerForKey:@"hotKeyNextModifiers"] ];
+	
+	[nextHotKeyControl updateStringValue];
+	
+	[playHotKeyControl setKeyCode: [[NSUserDefaults standardUserDefaults] integerForKey:@"hotKeyPlayKeyCode"] ];
+	[playHotKeyControl setCharacter: [[NSUserDefaults standardUserDefaults] integerForKey:@"hotKeyPlayCharacter"] ];
+	[playHotKeyControl setModifierFlags: [[NSUserDefaults standardUserDefaults] integerForKey:@"hotKeyPlayModifiers"] ];
+	
+	[playHotKeyControl updateStringValue];
+}
+
+/*- (void)windowDidBecomeKey:(id)notification
+{
+	if ([notification object] == [view window]) {
+		NSLog(@"BECAME KEY: %@", notification);
+		[playHotKeyControl startObserving];
+		[prevHotKeyControl startObserving];
+		[nextHotKeyControl startObserving];
+	}
+}
+*/
+- (void)windowDidResignKey:(id)notification
+{
+	if ([notification object] == [view window]) {
+		NSLog(@"RESIGNED KEY: %@", notification);
+		[playHotKeyControl stopObserving];
+		[prevHotKeyControl stopObserving];
+		[nextHotKeyControl stopObserving];
+	}
+}
+
+- (IBAction) grabPlayHotKey:(id)sender
+{
+	[playHotKeyControl startObserving];
+}
+
+- (IBAction) grabPrevHotKey:(id)sender
+{
+	[prevHotKeyControl startObserving];
+}
+
+- (IBAction) grabNextHotKey:(id)sender
+{
+	[nextHotKeyControl startObserving];
+}
+
+- (IBAction) hotKeyChanged:(id)sender
+{
+	if (sender == playHotKeyControl) {
+		[[NSUserDefaults standardUserDefaults] setInteger:[playHotKeyControl character] forKey:@"hotKeyPlayCharacter"];
+		[[NSUserDefaults standardUserDefaults] setInteger:[playHotKeyControl modifierFlags] forKey:@"hotKeyPlayModifiers"];
+		[[NSUserDefaults standardUserDefaults] setInteger:[playHotKeyControl keyCode] forKey:@"hotKeyPlayKeyCode"];
+	}
+	else if (sender == prevHotKeyControl) {
+		[[NSUserDefaults standardUserDefaults] setInteger:[prevHotKeyControl character] forKey:@"hotKeyPreviousCharacter"];
+		[[NSUserDefaults standardUserDefaults] setInteger:[prevHotKeyControl modifierFlags] forKey:@"hotKeyPreviousModifiers"];
+		[[NSUserDefaults standardUserDefaults] setInteger:[prevHotKeyControl keyCode] forKey:@"hotKeyPreviousKeyCode"];
+	}
+	else if (sender == nextHotKeyControl) {
+		[[NSUserDefaults standardUserDefaults] setInteger:[nextHotKeyControl character] forKey:@"hotKeyNextCharacter"];
+		[[NSUserDefaults standardUserDefaults] setInteger:[nextHotKeyControl modifierFlags] forKey:@"hotKeyNextModifiers"];
+		[[NSUserDefaults standardUserDefaults] setInteger:[nextHotKeyControl keyCode] forKey:@"hotKeyNextKeyCode"];
+	}
+	
+	[sender stopObserving];
 }
 
 @end
diff --git a/Preferences/PreferencesController.m b/Preferences/PreferencesController.m
index b01dd821d..3170adb54 100644
--- a/Preferences/PreferencesController.m
+++ b/Preferences/PreferencesController.m
@@ -22,7 +22,7 @@
 		[prefs setDebug:YES];
 		
         // Set which panes are included, and their order.
-//        [prefs setPanesOrder:[NSArray arrayWithObjects:@"General", @"Updating", @"A Non-Existent Preference Pane", nil]];
+        //[prefs setPanesOrder:[NSArray arrayWithObjects:@"General", @"Updating", @"A Non-Existent Preference Pane", nil]];
     }
     
     // Show the preferences window.