ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-16 10:58:30 -05:00
Code Issues Packages Projects Releases Wiki Activity

Refresh master with initial release/0.24 snapshot (#332)

Browse Source 
* Initial port of release/0.24 source code

* Fix additional headers

* Fix a typo in launch.json
This commit is contained in:
Karl Burtram
2017-12-15 15:38:57 -08:00
committed by GitHub
parent 271b3a0b82
commit 6ad0df0e3e
7118 changed files with 107999 additions and 56466 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/sql/parts/taskHistory/common/taskHistory.contribution.ts
View File

@@ -9,17 +9,17 @@ import { KeyMod, KeyCode } from 'vs/base/common/keyCodes';
import { localize } from 'vs/nls';
import { SyncActionDescriptor } from 'vs/platform/actions/common/actions';
import { ViewletRegistry, Extensions as ViewletExtensions, ViewletDescriptor, ToggleViewletAction } from 'vs/workbench/browser/viewlet';
import { IWorkbenchActionRegistry, Extensions as ActionExtensions } from 'vs/workbench/common/actionRegistry';
import { IWorkbenchActionRegistry, Extensions as ActionExtensions } from 'vs/workbench/common/actions';
import { IWorkbenchEditorService } from 'vs/workbench/services/editor/common/editorService';
import { IViewlet } from 'vs/workbench/common/viewlet';
import { IViewletService } from 'vs/workbench/services/viewlet/browser/viewlet';
import { Registry } from 'vs/platform/registry/common/platform';
import { Extensions, IConfigurationRegistry } from 'vs/platform/configuration/common/configurationRegistry';
import { VIEWLET_ID } from 'sql/parts/taskHistory/viewlet/taskHistoryViewlet';
import { VIEWLET_ID, TaskHistoryViewlet } from 'sql/parts/taskHistory/viewlet/taskHistoryViewlet';
import lifecycle = require('vs/base/common/lifecycle');
import ext = require('vs/workbench/common/contributions');
import { ITaskService } from 'sql/parts/taskHistory/common/taskService';
import { IActivityBarService, NumberBadge } from 'vs/workbench/services/activity/common/activityBarService';
import { IActivityService, NumberBadge } from 'vs/workbench/services/activity/common/activity';
export class StatusUpdater implements ext.IWorkbenchContribution {
static ID = 'data.taskhistory.statusUpdater';
@@ -28,7 +28,7 @@ export class StatusUpdater implements ext.IWorkbenchContribution {
private toDispose: lifecycle.IDisposable[];
constructor(
@IActivityBarService private activityBarService: IActivityBarService,
@IActivityService private activityBarService: IActivityService,
@ITaskService private _taskService: ITaskService,
@IViewletService private _viewletService: IViewletService
) {
@@ -87,8 +87,7 @@ export class TaskHistoryViewletAction extends ToggleViewletAction {
// Viewlet
const viewletDescriptor = new ViewletDescriptor(
'sql/parts/taskHistory/viewlet/taskHistoryViewlet',
'TaskHistoryViewlet',
TaskHistoryViewlet,
VIEWLET_ID,
'Task History',
'taskHistoryViewlet',

2
src/sql/parts/taskHistory/viewlet/taskHistoryView.ts
View File

@@ -143,7 +143,7 @@ export class TaskHistoryView {
if (isDoubleClick) {
if (task.status === TaskStatus.failed) {
var err = task.taskName + ': ' + task.message;
this._errorMessageService.showDialog(Severity.Error, nls.localize('taskError','Task Error'), err);
this._errorMessageService.showDialog(Severity.Error, nls.localize('taskError','Task error'), err);
}
}
}