Adjusting command pallet

microsoft · Feb 18, 2020 · 294e82a · 294e82a
1 parent ce37920
commit 294e82a
Show file tree

Hide file tree

Showing 5 changed files with 113 additions and 159 deletions.
diff --git a/locales/en/package.i18n.json b/locales/en/package.i18n.json
@@ -1,17 +1,16 @@
 {
-  "deviceSimulatorExpressExtension.commands.changeBaudRate": "Change Baud Rate",
-  "deviceSimulatorExpressExtension.commands.closeSerialMonitor": "Close Serial Monitor",
-  "deviceSimulatorExpressExtension.commands.installDependencies": "Install Extension Dependencies",
-  "deviceSimulatorExpressExtension.commands.label": "Device Simulator Express",
-  "deviceSimulatorExpressExtension.commands.openSerialMonitor": "Open Serial Monitor",
-  "deviceSimulatorExpressExtension.commands.openSimulator": "Open Simulator",
-  "deviceSimulatorExpressExtension.commands.runSimulator": "Run Simulator",
-  "deviceSimulatorExpressExtension.commands.newFile": "New File",
-  "deviceSimulatorExpressExtension.commands.runDevice": "Deploy to Device",
-  "deviceSimulatorExpressExtension.commands.selectSerialPort": "Select Serial Port",
+  "deviceSimulatorExpressExtension.commands.common.installDependencies": "Install Extension Dependencies",
+  "deviceSimulatorExpressExtension.commands.common.label": "Device Simulator Express",
+  "deviceSimulatorExpressExtension.commands.common.runSimulator": "Run Simulator",
+  "deviceSimulatorExpressExtension.commands.cpx.changeBaudRate": "[Circuit Playground Express] Change Baud Rate",
+  "deviceSimulatorExpressExtension.commands.cpx.closeSerialMonitor": "[Circuit Playground Express] Close Serial Monitor",
+  "deviceSimulatorExpressExtension.commands.cpx.openSerialMonitor": "[Circuit Playground Express] Open Serial Monitor",
+  "deviceSimulatorExpressExtension.commands.cpx.openSimulator": "[Circuit Playground Express] Open Simulator",
+  "deviceSimulatorExpressExtension.commands.cpx.newFile": "[Circuit Playground Express] New File",
+  "deviceSimulatorExpressExtension.commands.cpx.deployToDevice": "[Circuit Playground Express] Deploy to Device",
+  "deviceSimulatorExpressExtension.commands.cpx.selectSerialPort": "[Circuit Playground Express] Select Serial Port",
+  "deviceSimulatorExpressExtension.commands.microbit.openSimulator": "[micro:bit] Open Simulator",
+  "deviceSimulatorExpressExtension.commands.microbit.newFile": "[micro:bit] New File",
   "deviceSimulatorExpressExtension.configuration.title": "Device Simulator Express configuration",
-  "deviceSimulatorExpressExtension.configuration.properties.open": "Whether to show 'Open Simulator' icon in editor title menu.",
-  "deviceSimulatorExpressExtension.configuration.properties.device": "Whether to show 'Run Device' icon in editor title menu.",
-  "deviceSimulatorExpressExtension.configuration.properties.simulator": "Whether to show 'Run Simulator' icon in editor title menu.",
   "deviceSimulatorExpressExtension.configuration.properties.debuggerPort": "The port the Server will listen on for communication with the debugger."
-}
+}
diff --git a/package.json b/package.json
@@ -30,86 +30,74 @@
         "MicroPython"
     ],
     "activationEvents": [
-        "onCommand:deviceSimulatorExpress.installDependencies",
-        "onCommand:deviceSimulatorExpress.openSerialMonitor",
-        "onCommand:deviceSimulatorExpress.openSimulator",
-        "onCommand:deviceSimulatorExpress.runSimulator",
-        "onCommand:deviceSimulatorExpress.newFileCPX",
-        "onCommand:deviceSimulatorExpress.newFileMicrobit",
-        "onCommand:deviceSimulatorExpress.runDevice",
-        "onCommand:deviceSimulatorExpress.runSimulatorEditorButton",
-        "onCommand:deviceSimulatorExpress.selectSerialPort",
+        "onCommand:deviceSimulatorExpress.common.installDependencies",
+        "onCommand:deviceSimulatorExpress.common.runSimulator",
+        "onCommand:deviceSimulatorExpress.cpx.deployToDevice",
+        "onCommand:deviceSimulatorExpress.cpx.newFile",
+        "onCommand:deviceSimulatorExpress.cpx.openSerialMonitor",
+        "onCommand:deviceSimulatorExpress.cpx.openSimulator",
+        "onCommand:deviceSimulatorExpress.cpx.selectSerialPort",
+        "onCommand:deviceSimulatorExpress.microbit.newFile",
+        "onCommand:deviceSimulatorExpress.microbit.openSimulator",
         "onDebug"
     ],
     "main": "./out/extension.js",
     "contributes": {
         "commands": [
             {
-                "command": "deviceSimulatorExpress.changeBaudRate",
-                "title": "%deviceSimulatorExpressExtension.commands.changeBaudRate%",
-                "category": "%deviceSimulatorExpressExtension.commands.label%"
+                "command": "deviceSimulatorExpress.common.installDependencies",
+                "title": "%deviceSimulatorExpressExtension.commands.common.installDependencies%",
+                "category": "%deviceSimulatorExpressExtension.commands.common.label%"
             },
             {
-                "command": "deviceSimulatorExpress.closeSerialMonitor",
-                "title": "%deviceSimulatorExpressExtension.commands.closeSerialMonitor%",
-                "category": "%deviceSimulatorExpressExtension.commands.label%"
+                "command": "deviceSimulatorExpress.common.runSimulator",
+                "title": "%deviceSimulatorExpressExtension.commands.common.runSimulator%",
+                "category": "%deviceSimulatorExpressExtension.commands.common.label%"
             },
             {
-                "command": "deviceSimulatorExpress.openSerialMonitor",
-                "title": "%deviceSimulatorExpressExtension.commands.openSerialMonitor%",
-                "category": "%deviceSimulatorExpressExtension.commands.label%"
+                "command": "deviceSimulatorExpress.cpx.changeBaudRate",
+                "title": "%deviceSimulatorExpressExtension.commands.cpx.changeBaudRate%",
+                "category": "%deviceSimulatorExpressExtension.commands.common.label%"
             },
             {
-                "command": "deviceSimulatorExpress.installDependencies",
-                "title": "%deviceSimulatorExpressExtension.commands.installDependencies%",
-                "category": "%deviceSimulatorExpressExtension.commands.label%"
+                "command": "deviceSimulatorExpress.cpx.closeSerialMonitor",
+                "title": "%deviceSimulatorExpressExtension.commands.cpx.closeSerialMonitor%",
+                "category": "%deviceSimulatorExpressExtension.commands.common.label%"
             },
             {
-                "command": "deviceSimulatorExpress.openSimulator",
-                "title": "%deviceSimulatorExpressExtension.commands.openSimulator%",
-                "category": "%deviceSimulatorExpressExtension.commands.label%",
-                "icon": {
-                    "light": "./assets/light-theme/open-simulator.svg",
-                    "dark": "./assets/dark-theme/open-simulator.svg"
-                }
+                "command": "deviceSimulatorExpress.cpx.deployToDevice",
+                "title": "%deviceSimulatorExpressExtension.commands.cpx.deployToDevice%",
+                "category": "%deviceSimulatorExpressExtension.commands.common.label%"
             },
             {
-                "command": "deviceSimulatorExpress.runSimulator",
-                "title": "%deviceSimulatorExpressExtension.commands.runSimulator%",
-                "category": "%deviceSimulatorExpressExtension.commands.label%"
+                "command": "deviceSimulatorExpress.cpx.newFile",
+                "title": "%deviceSimulatorExpressExtension.commands.cpx.newFile%",
+                "category": "%deviceSimulatorExpressExtension.commands.common.label%"
             },
             {
-                "command": "deviceSimulatorExpress.runSimulatorEditorButton",
-                "title": "%deviceSimulatorExpressExtension.commands.runSimulator%",
-                "category": "%deviceSimulatorExpressExtension.commands.label%",
-                "icon": {
-                    "light": "./assets/light-theme/run-on-simulator.svg",
-                    "dark": "./assets/dark-theme/run-on-simulator.svg"
-                }
+                "command": "deviceSimulatorExpress.cpx.openSerialMonitor",
+                "title": "%deviceSimulatorExpressExtension.commands.cpx.openSerialMonitor%",
+                "category": "%deviceSimulatorExpressExtension.commands.common.label%"
             },
             {
-                "command": "deviceSimulatorExpress.newFileCPX",
-                "title": "%deviceSimulatorExpressExtension.commands.newFileCPX%",
-                "category": "%deviceSimulatorExpressExtension.commands.label%"
+                "command": "deviceSimulatorExpress.cpx.openSimulator",
+                "title": "%deviceSimulatorExpressExtension.commands.cpx.openSimulator%",
+                "category": "%deviceSimulatorExpressExtension.commands.common.label%"
             },
             {
-                "command": "deviceSimulatorExpress.newFileMicrobit",
-                "title": "%deviceSimulatorExpressExtension.commands.newFileMicrobit%",
-                "category": "%deviceSimulatorExpressExtension.commands.label%"
+                "command": "deviceSimulatorExpress.cpx.selectSerialPort",
+                "title": "%deviceSimulatorExpressExtension.commands.cpx.selectSerialPort%",
+                "category": "%deviceSimulatorExpressExtension.commands.common.label%"
             },
             {
-                "command": "deviceSimulatorExpress.runDevice",
-                "title": "%deviceSimulatorExpressExtension.commands.runDevice%",
-                "category": "%deviceSimulatorExpressExtension.commands.label%",
-                "icon": {
-                    "light": "./assets/light-theme/save-to-board.svg",
-                    "dark": "./assets/dark-theme/save-to-board.svg"
-                }
+                "command": "deviceSimulatorExpress.microbit.openSimulator",
+                "title": "%deviceSimulatorExpressExtension.commands.microbit.openSimulator%",
+                "category": "%deviceSimulatorExpressExtension.commands.common.label%"
             },
             {
-                "command": "deviceSimulatorExpress.selectSerialPort",
-                "title": "%deviceSimulatorExpressExtension.commands.selectSerialPort%",
-                "category": "%deviceSimulatorExpressExtension.commands.label%"
+                "command": "deviceSimulatorExpress.microbit.newFile",
+                "title": "%deviceSimulatorExpressExtension.commands.microbit.newFile%",
+                "category": "%deviceSimulatorExpressExtension.commands.common.label%"
             }
         ],
         "colors": [
@@ -132,31 +120,6 @@
                 }
             }
         ],
-        "menus": {
-            "commandPalette": [
-                {
-                    "command": "deviceSimulatorExpress.runSimulatorEditorButton",
-                    "when": "false"
-                }
-            ],
-            "editor/title": [
-                {
-                    "when": "editorLangId==python  && config.deviceSimulatorExpress.showOpenIconInEditorTitleMenu",
-                    "command": "deviceSimulatorExpress.openSimulator",
-                    "group": "navigation@1"
-                },
-                {
-                    "when": "editorLangId==python && config.deviceSimulatorExpress.showSimulatorIconInEditorTitleMenu",
-                    "command": "deviceSimulatorExpress.runSimulatorEditorButton",
-                    "group": "navigation@2"
-                },
-                {
-                    "when": "editorLangId==python && config.deviceSimulatorExpress.showDeviceIconInEditorTitleMenu",
-                    "command": "deviceSimulatorExpress.runDevice",
-                    "group": "navigation@3"
-                }
-            ]
-        },
         "configuration": {
             "type": "object",
             "title": "%deviceSimulatorExpressExtension.configuration.title%",
@@ -165,24 +128,6 @@
                     "type": "boolean",
                     "default": true
                 },
-                "deviceSimulatorExpress.showOpenIconInEditorTitleMenu": {
-                    "type": "boolean",
-                    "default": true,
-                    "description": "%deviceSimulatorExpressExtension.configuration.properties.open%",
-                    "scope": "resource"
-                },
-                "deviceSimulatorExpress.showSimulatorIconInEditorTitleMenu": {
-                    "type": "boolean",
-                    "default": true,
-                    "description": "%deviceSimulatorExpressExtension.configuration.properties.simulator%",
-                    "scope": "resource"
-                },
-                "deviceSimulatorExpress.showDeviceIconInEditorTitleMenu": {
-                    "type": "boolean",
-                    "default": true,
-                    "description": "%deviceSimulatorExpressExtension.configuration.properties.device%",
-                    "scope": "resource"
-                },
                 "deviceSimulatorExpress.showDependencyInstall": {
                     "type": "boolean",
                     "default": true,

diff --git a/package.nls.json b/package.nls.json
@@ -12,8 +12,5 @@
   "deviceSimulatorExpressExtension.commands.microbit.openSimulator": "[micro:bit] Open Simulator",
   "deviceSimulatorExpressExtension.commands.microbit.newFile": "[micro:bit] New File",
   "deviceSimulatorExpressExtension.configuration.title": "Device Simulator Express configuration",
-  "deviceSimulatorExpressExtension.configuration.properties.open": "Whether to show 'Open Simulator' icon in editor title menu.", // How will these work with new command pallet user flow
-  "deviceSimulatorExpressExtension.configuration.properties.device": "Whether to show 'Deploy to Device' icon in editor title menu.",
-  "deviceSimulatorExpressExtension.configuration.properties.simulator": "Whether to show 'Run Simulator' icon in editor title menu.",
   "deviceSimulatorExpressExtension.configuration.properties.debuggerPort": "The port the Server will listen on for communication with the debugger."
 }