Add sections for shortcutsets per platform. jbaron#130

Author: fasterthanlime

lib/main.js

@@ -719,25 +719,22 @@ var Cats;
         Ide.prototype.loadShortCuts = function () {
             var fileName = Cats.OS.File.join(this.catsHomeDir, "resource/shortcuts.json");
             var c = Cats.OS.File.readTextFile(fileName);
-            var shortCuts = JSON.parse(c);
-            for (var shortCut in shortCuts) {
-                var catsCommand = shortCuts[shortCut];
-                this.addShortCut(shortCut, catsCommand);
+            var shortCutSets = JSON.parse(c);
+            var os = "linux";
+            if (Cats.OS.File.isWindows()) {
+                os = "win";
             }
-        };
-        Ide.prototype.addShortCut = function (shortCut, catsCommand) {
-            if (/^Cmd-/.test(shortCut)) {
-                if (process.platform === "darwin") {
-                    shortCut = shortCut.replace(/^Cmd-/, "Meta-");
-                }
-                else {
-                    shortCut = shortCut.replace(/^Cmd-/, "Ctrl-");
-                }
+            else if (Cats.OS.File.isOSX()) {
+                os = "osx";
+            }
+            var shortCuts = shortCutSets[os];
+            for (var shortCut in shortCuts) {
+                var commandName = shortCuts[shortCut];
+                var cmd = new qx.ui.core.Command(shortCut);
+                cmd.addListener("execute", (function (commandName) {
+                    Cats.Commands.CMDS[commandName].command();
+                }).bind(null, commandName));
             }
-            var cmd = new qx.ui.core.Command(shortCut);
-            cmd.addListener("execute", function () {
-                Cats.Commands.CMDS[catsCommand].command();
-            });
         };
         /**
          * Load the icons map from the file.

resource/shortcuts.json

@@ -1,7 +1,20 @@
 {
-    "Cmd-W" : "file_close",
-    "Cmd-Shift-W" : "file_closeAll",
-    "Cmd-B": "project_build",
-    "Cmd-F11": "project_run",
-    "Cmd-R": "project_run"
+  "osx": {
+    "Meta-W" : "file_close",
+    "Meta-Shift-W" : "file_closeAll",
+    "Meta-B": "project_build",
+    "Meta-R": "project_run"
+  },
+  "win": {
+    "Ctrl-W" : "file_close",
+    "Ctrl-Shift-W" : "file_closeAll",
+    "Ctrl-B": "project_build",
+    "Ctrl-R": "project_run"
+  },
+  "linux": {
+    "Ctrl-W" : "file_close",
+    "Ctrl-Shift-W" : "file_closeAll",
+    "Ctrl-B": "project_build",
+    "Ctrl-R": "project_run"
+  }
 }

src/cats/ide.ts

@@ -81,30 +81,23 @@ module Cats {
         private loadShortCuts() {
             var fileName = OS.File.join(this.catsHomeDir, "resource/shortcuts.json");
             var c = OS.File.readTextFile(fileName);
-            var shortCuts:{} = JSON.parse(c);
+            var shortCutSets:{} = JSON.parse(c);
+            var os = "linux";
+            if (Cats.OS.File.isWindows()) {
+              os = "win";
+            } else if (Cats.OS.File.isOSX()) {
+              os = "osx";
+            }
+            var shortCuts = shortCutSets[os];
             for (var shortCut in shortCuts) {
-                var catsCommand = shortCuts[shortCut];
-                this.addShortCut(shortCut, catsCommand);
+                var commandName = shortCuts[shortCut];
+                var cmd = new qx.ui.core.Command(shortCut);
+                cmd.addListener("execute", (function(commandName: string) {
+                  Cats.Commands.CMDS[commandName].command();
+                }).bind(null, commandName));
             }
 
         }
-       
-        private addShortCut(shortCut: string, catsCommand: string) {
-            if (/^Cmd-/.test(shortCut)) {
-                if (process.platform === "darwin") {
-                    shortCut = shortCut.replace(/^Cmd-/, "Meta-");
-                } else {
-                    shortCut = shortCut.replace(/^Cmd-/, "Ctrl-");
-                }
-            }
-
-            var cmd = new qx.ui.core.Command(shortCut);
-            cmd.addListener("execute", () => {
-                Cats.Commands.CMDS[catsCommand].command();
-            });
-        }
-        
-
 
         /**
          * Load the icons map from the file.