Add new key mappings, add alternate image for status bar icon

fe9lix · fe9lix · commit 09f8c83aa600 · 2013-11-19T19:13:53.000+01:00
diff --git a/CodingKeys/AppDelegate.h b/CodingKeys/AppDelegate.h
@@ -1,11 +1,3 @@
-//
-//  AppDelegate.h
-///  CodingKeys
- //
-//  Created by Felix on 08.11.13.
-//
-//
-
 #import <Cocoa/Cocoa.h>
 
 @interface AppDelegate : NSObject <NSApplicationDelegate>
diff --git a/CodingKeys/AppDelegate.m b/CodingKeys/AppDelegate.m
@@ -32,6 +32,7 @@ - (void)setupStatusBarItem {
     self.statusItem = [[NSStatusBar systemStatusBar] statusItemWithLength:NSVariableStatusItemLength];
     self.statusItem.menu = self.statusMenu;
     self.statusItem.image = [NSImage imageNamed:@"status_bar_icon"];
+    self.statusItem.alternateImage = [NSImage imageNamed:@"status_bar_icon_alternate"];
     self.statusItem.highlightMode = YES;
     
     BOOL isLaunchedAtStartup = [[LaunchService sharedService] isLaunchedAtStartup];
diff --git a/CodingKeys/HotKey.m b/CodingKeys/HotKey.m
@@ -67,7 +67,7 @@ - (void)parseKey {
     }
     
     self.modifiers = modifiers;
-    self.carbonModifiers = carbonModifiers;
+        self.carbonModifiers = carbonModifiers;
 }
 
 - (NSArray *)mappedHotKeysForAppWithName:(NSString *)appName {
diff --git a/CodingKeys/HotKeyService.m b/CodingKeys/HotKeyService.m
@@ -84,6 +84,7 @@ - (HotKey *)findHotKeyByID:(int)keyID {
 static OSStatus hotKeyHandler(EventHandlerCallRef nextHandler,
                               EventRef theEvent,
                               void *userData) {
+
     EventHotKeyID hotKeyID;
     GetEventParameter(theEvent,
                       kEventParamDirectObject,
diff --git a/CodingKeys/Images.xcassets/status_bar_icon_alternate.imageset/Contents.json b/CodingKeys/Images.xcassets/status_bar_icon_alternate.imageset/Contents.json
@@ -0,0 +1,13 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x",
+      "filename" : "status_bar_icon_alternate.png"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
diff --git a/CodingKeys/Images.xcassets/status_bar_icon_alternate.imageset/status_bar_icon_alternate.png b/CodingKeys/Images.xcassets/status_bar_icon_alternate.imageset/status_bar_icon_alternate.png
diff --git a/CodingKeys/data/keys.json b/CodingKeys/data/keys.json
@@ -66,14 +66,36 @@
     }
   },
   {
-    "command": "Find/Replace",
-    "key": "⌥ ⌘ F",
+    "command": "Toggle Comment",
+    "key": "⌘ ⇧ 7",
     "mapping": 
     {
-      "Xcode": "⌥ ⌘ F",
-      "Sublime Text": "⌥ ⌘ F",
-      "Eclipse": "⌘ F",
-      "Android Studio": "⌘ R"
+      "Xcode": "⌘ /",
+      "Sublime Text": "⌘ /",
+      "Eclipse": "⌘ 7",
+      "Android Studio": "⌘ /"
+    }
+  },
+  {
+    "command": "Quick Open",
+    "key": "⇧ ⌘ O",
+    "mapping": 
+    {
+      "Xcode": "⇧ ⌘ O",
+      "Sublime Text": "⌘ P",
+      "Eclipse": "⇧ ⌘ T",
+      "Android Studio": "⌘ O"
+    }
+  },
+  {
+    "command": "Run",
+    "key": "⌘ R",
+    "mapping": 
+    {
+      "Xcode": "⌘ R",
+      "Sublime Text": "⌘ B",
+      "Eclipse": "⇧ ⌘ F11",
+      "Android Studio": "⌃ R"
     }
   }
-]
+] 
diff --git a/Resources/StatusBarIcon.psd b/Resources/StatusBarIcon.psd

Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,7 @@ - (void)parseKey {`
`67`	`67`	`}`
`68`	`68`
`69`	`69`	`self.modifiers = modifiers;`
`70`		`- self.carbonModifiers = carbonModifiers;`
	`70`	`+ self.carbonModifiers = carbonModifiers;`
`71`	`71`	`}`
`72`	`72`
`73`	`73`	`- (NSArray )mappedHotKeysForAppWithName:(NSString )appName {`