diff --git a/src/vs/workbench/parts/tasks/electron-browser/media/task.contribution.css b/src/vs/workbench/parts/tasks/electron-browser/media/task.contribution.css index 620451d546b..b0acde0d340 100644 --- a/src/vs/workbench/parts/tasks/electron-browser/media/task.contribution.css +++ b/src/vs/workbench/parts/tasks/electron-browser/media/task.contribution.css @@ -86,87 +86,3 @@ .hc-black .monaco-workbench .quick-open-task-configure { background-image: url('configure-inverse.svg'); } - - -/* - * Task Panel styles - */ - -.task-panel-feedback-button { - width: 50px; - height: 50px; - display: inline-block; - vertical-align: middle; -} - -.task-panel-no-telemetry.light { - background-image: url('thumbs-down.svg'); -} - -.task-panel-no-telemetry.dark { - background-image: url('thumbs-down-inverse.svg'); -} - -.task-panel-yes-telemetry.light { - background-image: url('thumbs-up.svg'); -} - -.task-panel-yes-telemetry.dark { - background-image: url('thumbs-up-inverse.svg'); -} - -.task-panel { - padding-left: 10px; - padding-right: 10px; - overflow-y: scroll; -} - -.task-panel-container { - outline: grey dotted thin; - padding: 1px 17px; - margin: 10px auto 0px; - max-width: 800px; -} - -.task-panel-example-item { - outline: grey solid thin; - padding-left: 5px; - padding-right: 5px; - padding: 1px; - margin-bottom: 10px; -} - -.task-panel-mockup-button { - display: inline-block; - padding: 2px; - margin-right: 2px; - margin-left: 2px; -} - -.task-panel-oneliner { - text-align: left; - margin: 10px; -} - -.task-panel-right-aligned { - float: right; - /* cancel out 2px button padding */ - margin-top: -2px; -} - -.task-panel-centered { - text-align: center; - margin-top: 10px; -} - -.task-panel-header-item { - font-size: 19px; -} - -.task-panel-feedback { - font-size: smaller; -} - -.task-panel-hidden { - display: none; -} diff --git a/src/vs/workbench/parts/tasks/electron-browser/media/thumbs-down-inverse.svg b/src/vs/workbench/parts/tasks/electron-browser/media/thumbs-down-inverse.svg deleted file mode 100755 index 3773fc218b6..00000000000 --- a/src/vs/workbench/parts/tasks/electron-browser/media/thumbs-down-inverse.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/vs/workbench/parts/tasks/electron-browser/media/thumbs-down.svg b/src/vs/workbench/parts/tasks/electron-browser/media/thumbs-down.svg deleted file mode 100755 index 8dc97e70f34..00000000000 --- a/src/vs/workbench/parts/tasks/electron-browser/media/thumbs-down.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/vs/workbench/parts/tasks/electron-browser/media/thumbs-up-inverse.svg b/src/vs/workbench/parts/tasks/electron-browser/media/thumbs-up-inverse.svg deleted file mode 100755 index 2aa69be08c4..00000000000 --- a/src/vs/workbench/parts/tasks/electron-browser/media/thumbs-up-inverse.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/vs/workbench/parts/tasks/electron-browser/media/thumbs-up.svg b/src/vs/workbench/parts/tasks/electron-browser/media/thumbs-up.svg deleted file mode 100755 index 6f0ca08e9bd..00000000000 --- a/src/vs/workbench/parts/tasks/electron-browser/media/thumbs-up.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/vs/workbench/parts/tasks/electron-browser/taskPanel.ts b/src/vs/workbench/parts/tasks/electron-browser/taskPanel.ts deleted file mode 100644 index ac13e7f6949..00000000000 --- a/src/vs/workbench/parts/tasks/electron-browser/taskPanel.ts +++ /dev/null @@ -1,157 +0,0 @@ -/*--------------------------------------------------------------------------------------------- - * Copyright (c) Microsoft Corporation. All rights reserved. - * Licensed under the MIT License. See License.txt in the project root for license information. - *--------------------------------------------------------------------------------------------*/ -'use strict'; - -import * as nls from 'vs/nls'; -import dom = require('vs/base/browser/dom'); -import URI from 'vs/base/common/uri'; -import { Builder, Dimension } from 'vs/base/browser/builder'; -import { Panel, PanelRegistry, PanelDescriptor, Extensions } from 'vs/workbench/browser/panel'; -import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry'; -import { IThemeService, ITheme, DARK, HIGH_CONTRAST, LIGHT } from 'vs/platform/theme/common/themeService'; -import { ITaskService } from 'vs/workbench/parts/tasks/common/taskService'; -import { Registry } from 'vs/platform/registry/common/platform'; -import { TPromise } from 'vs/base/common/winjs.base'; -import { ICommandService } from 'vs/platform/commands/common/commands'; -import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; -import { buttonBackground, buttonForeground, textLinkForeground, selectBackground } from 'vs/platform/theme/common/colorRegistry'; -import { IStorageService, StorageScope } from 'vs/platform/storage/common/storage'; -import { IOpenerService } from 'vs/platform/opener/common/opener'; - -const TASK_PANEL_ID = 'workbench.panel.task'; - -export class TaskPanel extends Panel { - - private taskExperimentPart5 = 'workbench.tasks.feedbackAnswered'; - private _builder: Builder; - - constructor( - @ITelemetryService telemetryService: ITelemetryService, - @IThemeService protected themeService: IThemeService, - @ITaskService private taskService: ITaskService, - @IInstantiationService private _instantiationService: IInstantiationService, - @ICommandService private commandService: ICommandService, - @IStorageService private storageService: IStorageService, - @IOpenerService private openerService: IOpenerService, - ) { - super(TASK_PANEL_ID, telemetryService, themeService); - } - - public create(parent: Builder): TPromise { - super.create(parent); - dom.addClass(parent.getHTMLElement(), 'task-panel'); - - this._builder = parent.innerHtml(getHtml()); - const yesButton = this._builder.select('.task-panel-yes-telemetry'); - const noButton = this._builder.select('.task-panel-no-telemetry'); - const githubLink = this._builder.select('.task-panel-linkstyle'); - const clickFeedback = this._builder.select('.task-panel-header-item'); - const thanks = this._builder.select('.task-panel-thanks'); - - if (this.storageService.get(this.taskExperimentPart5)) { - clickFeedback.addClass('task-panel-hidden'); - thanks.removeClass('task-panel-hidden'); - } - - yesButton.on('click', e => { - if (!this.storageService.get(this.taskExperimentPart5)) { - this.telemetryService.publicLog('taskPanel.yes'); - this.storageService.store(this.taskExperimentPart5, true, StorageScope.GLOBAL); - } - clickFeedback.addClass('task-panel-hidden'); - thanks.removeClass('task-panel-hidden'); - }); - - noButton.on('click', e => { - if (!this.storageService.get(this.taskExperimentPart5)) { - this.telemetryService.publicLog('taskPanel.no'); - this.storageService.store(this.taskExperimentPart5, true, StorageScope.GLOBAL); - } - clickFeedback.addClass('task-panel-hidden'); - thanks.removeClass('task-panel-hidden'); - }); - - githubLink.on('click', e => { - const node = event.target as HTMLAnchorElement; - if (node.href) { - this.openerService.open(URI.parse(node.href)); - } - }); - this._register(this.themeService.onThemeChange(theme => this._updateTheme(theme))); - this._updateTheme(); - - return TPromise.as(void 0); - } - - public layout(dimension?: Dimension): void { } - - private _updateTheme(theme?: ITheme): void { - const githubLink = this._builder.select('.task-panel-linkstyle'); - const buttons = this._builder.select('.task-panel-mockup-button'); - const taskItems = this._builder.select('.task-panel-example-item'); - const thumbButtons = this._builder.select('.task-panel-feedback-button'); - - if (!theme) { - theme = this.themeService.getTheme(); - } - - if (theme.getColor(buttonBackground)) { - buttons.style('background-color', theme.getColor(buttonBackground).toString()); - } else { - buttons.style('background-color', null); - } - buttons.style('color', theme.getColor(buttonForeground).toString()); - githubLink.style('color', theme.getColor(textLinkForeground).toString()); - taskItems.style('background-color', theme.getColor(selectBackground).toString()); - - if ((theme.type === DARK || theme.type === HIGH_CONTRAST) && thumbButtons.hasClass('light')) { - thumbButtons.removeClass('light'); - thumbButtons.addClass('dark'); - } else if (theme.type === LIGHT && thumbButtons.hasClass('dark')) { - thumbButtons.removeClass('dark'); - thumbButtons.addClass('light'); - } - } -} - -(Registry.as(Extensions.Panels)).registerPanel(new PanelDescriptor( - 'vs/workbench/parts/tasks/electron-browser/taskPanel', - 'TaskPanel', - TASK_PANEL_ID, - nls.localize('tasks', "Tasks"), - 'task', - 50 -)); - -function getHtml() { - return ` -
-

We're thinking of adding a task panel in this space. If you would like to learn more about how to use tasks, click here.

-

Some things you might be able to do here:
-

    -
  • See a list of autodetected and manually configured tasks
    • -
  • Run/Restart/Stop tasks with a click of a button
    • -
  • Show a summary of each completed task (ie: execution time, exit code, foldable output)
    • -
  • Configure a task without touching the json file
    • -

-

Here's a rough idea of what a task item might look like. By no means is this the final layout so please do not judge the look.

-
-

Task1: tsc -watch Running (0 Errors)  - Show OutputStopRestart -

-
- -
-
-
Do you like the idea of a task panel? - - -
-
Thanks for the feedback! <3
-
-`; -}; \ No newline at end of file diff --git a/src/vs/workbench/workbench.main.ts b/src/vs/workbench/workbench.main.ts index ca856f6cee6..d9c253d4709 100644 --- a/src/vs/workbench/workbench.main.ts +++ b/src/vs/workbench/workbench.main.ts @@ -79,7 +79,6 @@ import 'vs/workbench/parts/trust/electron-browser/unsupportedWorkspaceSettings.c import 'vs/workbench/parts/relauncher/electron-browser/relauncher.contribution'; import 'vs/workbench/parts/tasks/electron-browser/task.contribution'; -import 'vs/workbench/parts/tasks/electron-browser/taskPanel'; // can be packaged separately import 'vs/workbench/parts/emmet/browser/emmet.browser.contribution'; import 'vs/workbench/parts/emmet/electron-browser/emmet.contribution';