More workspace explorer feedback

Author: jeanp413

package.json

@@ -126,43 +126,68 @@
 			{
 				"command": "gitpod.workspaces.connectInNewWindow",
 				"category": "Gitpod",
-				"title": "Open in New Window...",
-				"icon": "$(empty-window)"
+				"title": "Open Workspace in New Window"
+			},
+			{
+				"command": "gitpod.workspaces.connectInNewWindow_context",
+				"category": "Gitpod",
+				"title": "Open in New Window"
 			},
 			{
 				"command": "gitpod.workspaces.connectInCurrentWindow",
 				"category": "Gitpod",
-				"title": "Open...",
-				"icon": "$(arrow-right)"
+				"title": "Connect to Workspace"
+			},
+			{
+				"command": "gitpod.workspaces.connectInCurrentWindow_context",
+				"category": "Gitpod",
+				"title": "Start and Connect"
+			},
+			{
+				"command": "gitpod.workspaces.connectInCurrentWindow_context@1",
+				"category": "Gitpod",
+				"title": "Connect"
 			},
 			{
 				"command": "gitpod.workspaces.connectInCurrentWindow_inline",
 				"category": "Gitpod",
-				"title": "Open...",
+				"title": "Start and Connect",
+				"icon": "$(arrow-right)"
+			},
+			{
+				"command": "gitpod.workspaces.connectInCurrentWindow_inline@1",
+				"category": "Gitpod",
+				"title": "Connect",
 				"icon": "$(arrow-right)"
 			},
 			{
 				"command": "gitpod.workspaces.stopWorkspace",
 				"category": "Gitpod",
-				"title": "Stop Workspace...",
+				"title": "Stop Workspace",
+				"icon": "$(primitive-square)"
+			},
+			{
+				"command": "gitpod.workspaces.stopWorkspace_context",
+				"category": "Gitpod",
+				"title": "Stop",
 				"icon": "$(primitive-square)"
 			},
 			{
 				"command": "gitpod.workspaces.stopWorkspace_inline",
 				"category": "Gitpod",
-				"title": "Stop Workspace...",
+				"title": "Stop",
 				"icon": "$(primitive-square)"
 			},
 			{
 				"command": "gitpod.workspaces.stopCurrentWorkspace",
 				"category": "Gitpod",
-				"title": "Stop Current Workspace",
+				"title": "Disconnect and Stop",
 				"icon": "$(primitive-square)"
 			},
 			{
 				"command": "gitpod.workspaces.openInBrowser",
 				"category": "Gitpod",
-				"title": "Open in Browser..."
+				"title": "Open in Browser"
 			},
 			{
 				"command": "gitpod.workspaces.openContext",
@@ -172,12 +197,17 @@
 			{
 				"command": "gitpod.workspaces.deleteWorkspace",
 				"category": "Gitpod",
-				"title": "Delete Workspace..."
+				"title": "Delete Workspace"
+			},
+			{
+				"command": "gitpod.workspaces.deleteWorkspace_context",
+				"category": "Gitpod",
+				"title": "Delete"
 			},
 			{
 				"command": "gitpod.workspaces.disconnect",
 				"category": "Gitpod",
-				"title": "Close Remote Connection",
+				"title": "Disconnect",
 				"icon": "$(debug-disconnect)"
 			}
 		],
@@ -199,7 +229,12 @@
 			"view/item/context": [
 				{
 					"command": "gitpod.workspaces.connectInCurrentWindow_inline",
-					"when": "viewItem =~ /^gitpod-workspaces.workspace(?:.running)?$/",
+					"when": "viewItem =~ /^gitpod-workspaces.workspace$/",
+					"group": "inline@1"
+				},
+				{
+					"command": "gitpod.workspaces.connectInCurrentWindow_inline@1",
+					"when": "viewItem =~ /^gitpod-workspaces.workspace.running$/",
 					"group": "inline@1"
 				},
 				{
@@ -213,12 +248,22 @@
 					"group": "inline@3"
 				},
 				{
-					"command": "gitpod.workspaces.connectInCurrentWindow",
-					"when": "viewItem =~ /^gitpod-workspaces.workspace/",
+					"command": "gitpod.workspaces.stopCurrentWorkspace",
+					"when": "viewItem =~ /^gitpod-workspaces.workspace.+connected$/",
+					"group": "inline@4"
+				},
+				{
+					"command": "gitpod.workspaces.connectInCurrentWindow_context",
+					"when": "viewItem =~ /^gitpod-workspaces.workspace$/",
 					"group": "navigation@1"
 				},
 				{
-					"command": "gitpod.workspaces.connectInNewWindow",
+					"command": "gitpod.workspaces.connectInCurrentWindow_context@1",
+					"when": "viewItem =~ /^gitpod-workspaces.workspace.running$/",
+					"group": "navigation@1"
+				},
+				{
+					"command": "gitpod.workspaces.connectInNewWindow_context",
 					"when": "viewItem =~ /^gitpod-workspaces.workspace/",
 					"group": "navigation@2"
 				},
@@ -233,12 +278,12 @@
 					"group": "navigation@4"
 				},
 				{
-					"command": "gitpod.workspaces.stopWorkspace",
+					"command": "gitpod.workspaces.stopWorkspace_context",
 					"when": "viewItem =~ /^gitpod-workspaces.workspace.running$/",
 					"group": "navigation@5"
 				},
 				{
-					"command": "gitpod.workspaces.deleteWorkspace",
+					"command": "gitpod.workspaces.deleteWorkspace_context",
 					"when": "viewItem =~ /^gitpod-workspaces.workspace/",
 					"group": "destruction@1"
 				}
@@ -256,29 +301,49 @@
 					"command": "gitpod.workspaces.connectInNewWindow",
 					"when": "gitpod.authenticated == true"
 				},
+				{
+					"command": "gitpod.workspaces.connectInNewWindow_context",
+					"when": "false"
+				},
 				{
 					"command": "gitpod.workspaces.connectInCurrentWindow",
 					"when": "gitpod.authenticated == true"
 				},
+				{
+					"command": "gitpod.workspaces.connectInCurrentWindow_context",
+					"when": "false"
+				},
+				{
+					"command": "gitpod.workspaces.connectInCurrentWindow_context@1",
+					"when": "false"
+				},
 				{
 					"command": "gitpod.workspaces.connectInCurrentWindow_inline",
 					"when": "false"
 				},
+				{
+					"command": "gitpod.workspaces.connectInCurrentWindow_inline@1",
+					"when": "false"
+				},
 				{
 					"command": "gitpod.workspaces.stopWorkspace",
 					"when": "gitpod.authenticated == true"
 				},
+				{
+					"command": "gitpod.workspaces.stopWorkspace_context",
+					"when": "false"
+				},
 				{
 					"command": "gitpod.workspaces.stopWorkspace_inline",
 					"when": "false"
 				},
 				{
 					"command": "gitpod.workspaces.stopCurrentWorkspace",
-					"when": "gitpod.authenticated == true && gitpod.inWorkspace == true"
+					"when": "false"
 				},
 				{
 					"command": "gitpod.workspaces.openInBrowser",
-					"when": "gitpod.authenticated == true"
+					"when": "gitpod.authenticated == true && gitpod.inWorkspace == true"
 				},
 				{
 					"command": "gitpod.workspaces.openContext",
@@ -288,6 +353,10 @@
 					"command": "gitpod.workspaces.deleteWorkspace",
 					"when": "gitpod.authenticated == true"
 				},
+				{
+					"command": "gitpod.workspaces.deleteWorkspace_context",
+					"when": "false"
+				},
 				{
 					"command": "gitpod.workspaces.disconnect",
 					"when": "false"