From 953b3de82b97c49e6fa95240adaddd41d37b4752 Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Thu, 17 Oct 2019 17:28:07 +0200 Subject: [PATCH] New icons, plus MAC Command key --- Canvas.js | 10 +++++----- Spaces/StrategySpace.js | 17 +++++++++++------ 2 files changed, 16 insertions(+), 11 deletions(-) diff --git a/Canvas.js b/Canvas.js index 3db233a5c..5d41e1bc4 100644 --- a/Canvas.js +++ b/Canvas.js @@ -230,22 +230,22 @@ function newCanvas () { return } - if (event.ctrlKey === true && event.code === 'ArrowLeft') { + if ((event.ctrlKey === true || event.metaKey === true) && event.code === 'ArrowLeft') { canvas.floatingSpace.oneScreenLeft() return } - if (event.ctrlKey === true && event.code === 'ArrowRight') { + if ((event.ctrlKey === true || event.metaKey === true) && event.code === 'ArrowRight') { canvas.floatingSpace.oneScreenRight() return } - if (event.ctrlKey === true && event.code === 'ArrowUp') { + if ((event.ctrlKey === true || event.metaKey === true) && event.code === 'ArrowUp') { canvas.floatingSpace.oneScreenUp() return } - if (event.ctrlKey === true && event.code === 'ArrowDown') { + if ((event.ctrlKey === true || event.metaKey === true) && event.code === 'ArrowDown') { canvas.floatingSpace.oneScreenDown() return } @@ -257,7 +257,7 @@ function newCanvas () { } } - if (event.ctrlKey === true) { + if ((event.ctrlKey === true || event.metaKey === true)) { if (event.keyCode >= 65 && event.keyCode <= 90) { let nodeUsingThisKey = canvas.strategySpace.workspace.getNodeByShortcutKey(event.key) diff --git a/Spaces/StrategySpace.js b/Spaces/StrategySpace.js index 97631485c..f1d23c5f3 100644 --- a/Spaces/StrategySpace.js +++ b/Spaces/StrategySpace.js @@ -42,14 +42,14 @@ function newStrategySpace () { ['Definition', 'text'], ['Network', 'network'], ['Network Node', 'network-node'], - ['Layer Manager', 'video-player'], + ['Layer Manager', 'layer-manager'], ['Layer', 'attractive'], ['Task Manager', 'task'], ['Task', 'timeline'], - ['Sensor', 'pipette'], - ['Indicator', 'vector'], - ['Trading Engine', 'brainstorming'], - ['Process', 'grid'], + ['Sensor', 'bot-sensor'], + ['Indicator', 'bot-indicator'], + ['Trading Engine', 'trading-engine'], + ['Process', 'process'], ['Backtesting Session', 'session-backtesting'], ['Live Trading Session', 'session-live-trading'], ['Fordward Testing Session', 'session-forward-testing'], @@ -174,7 +174,12 @@ function newStrategySpace () { 'session-backtesting', 'session-forward-testing', 'network', - 'network-node' + 'network-node', + 'trading-engine', + 'layer-manager', + 'process', + 'bot-indicator', + 'bot-sensor' ] for (let i = 0; i < iconsNames.length; i++) {