From 1bfdce96429cbdc4524bb0aa38d9245d4a2e11b9 Mon Sep 17 00:00:00 2001
From: Anthony Dresser <andresse@microsoft.com>
Date: Thu, 2 May 2019 14:31:58 -0700
Subject: [PATCH] fix icons for various status; move menu entry to the other
 panels (#5319)

---
 src/sql/media/icons/common-icons.css                        | 6 +++---
 src/sql/workbench/parts/tasks/browser/media/tasksPanel.css  | 4 ++--
 src/sql/workbench/parts/tasks/browser/tasks.contribution.ts | 2 +-
 src/sql/workbench/parts/tasks/common/tasksAction.ts         | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/sql/media/icons/common-icons.css b/src/sql/media/icons/common-icons.css
index ca4a85d028..82ae2e413f 100644
--- a/src/sql/media/icons/common-icons.css
+++ b/src/sql/media/icons/common-icons.css
@@ -105,16 +105,16 @@
 .vs .icon.canceled,
 .vs-dark .icon.canceled,
 .hc-black .icon.canceled {
-	content: url("status_cancelled.svg");
+	background-image: url("status_cancelled.svg");
 }
 
 .vs .icon.in-progress {
-	content: url("loading.svg");
+	background-image: url("loading.svg");
 }
 
 .vs-dark .icon.in-progress,
 .hc-black .icon.in-progress {
-	content: url("loading_inverse.svg");
+	background-image: url("loading_inverse.svg");
 }
 
 .vs .icon.scriptToClipboard,
diff --git a/src/sql/workbench/parts/tasks/browser/media/tasksPanel.css b/src/sql/workbench/parts/tasks/browser/media/tasksPanel.css
index c37ea8b673..221b3ec86e 100644
--- a/src/sql/workbench/parts/tasks/browser/media/tasksPanel.css
+++ b/src/sql/workbench/parts/tasks/browser/media/tasksPanel.css
@@ -46,10 +46,10 @@
 }
 
 .monaco-tree .monaco-tree-rows > .monaco-tree-row > .content > .task-group > .task-icon.not-started {
-	content: url('status_queuedtask.svg');
+	background-image: url('status_queuedtask.svg');
 }
 
 .vs-dark .monaco-tree .monaco-tree-rows > .monaco-tree-row > .content > .task-group > .task-icon.not-started,
 .hc-black .monaco-tree .monaco-tree-rows > .monaco-tree-row > .content > .task-group > .task-icon.not-started {
-	content: url('status_queuedtask_inverse.svg');
+	background-image: url('status_queuedtask_inverse.svg');
 }
diff --git a/src/sql/workbench/parts/tasks/browser/tasks.contribution.ts b/src/sql/workbench/parts/tasks/browser/tasks.contribution.ts
index cf378e225a..cd4c1a4196 100644
--- a/src/sql/workbench/parts/tasks/browser/tasks.contribution.ts
+++ b/src/sql/workbench/parts/tasks/browser/tasks.contribution.ts
@@ -85,7 +85,7 @@ Registry.as<PanelRegistry>(PanelExtensions.Panels).registerPanel(new PanelDescri
 (<ext.IWorkbenchContributionsRegistry>Registry.as(ext.Extensions.Workbench)).registerWorkbenchContribution(StatusUpdater, LifecyclePhase.Restored);
 
 MenuRegistry.appendMenuItem(MenuId.MenubarViewMenu, {
-	group: '3_views',
+	group: '4_panels',
 	command: {
 		id: TASKS_PANEL_ID,
 		title: localize({ key: 'miViewTasks', comment: ['&& denotes a mnemonic'] }, "&&Tasks")
diff --git a/src/sql/workbench/parts/tasks/common/tasksAction.ts b/src/sql/workbench/parts/tasks/common/tasksAction.ts
index 94c03ecb9b..f1688f5960 100644
--- a/src/sql/workbench/parts/tasks/common/tasksAction.ts
+++ b/src/sql/workbench/parts/tasks/common/tasksAction.ts
@@ -6,7 +6,7 @@
 import { localize } from 'vs/nls';
 import { Action } from 'vs/base/common/actions';
 import { ITaskService } from 'sql/platform/tasks/common/tasksService';
-import { TaskNode } from 'sql/platform/tasks/common/tasksNode';
+import { TaskNode, TaskExecutionMode, TaskStatus } from 'sql/platform/tasks/common/tasksNode';
 import { IQueryEditorService } from 'sql/workbench/services/queryEditor/common/queryEditorService';
 import Severity from 'vs/base/common/severity';
 import { IErrorMessageService } from 'sql/platform/errorMessage/common/errorMessageService';