ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-01-18 09:35:39 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge from vscode 1eb87b0e9ce9886afeaecec22b31abd0d9b7939f (#7282)

Browse Source 
* Merge from vscode 1eb87b0e9ce9886afeaecec22b31abd0d9b7939f

* fix various icon issues

* fix preview features
This commit is contained in:
Anthony Dresser
2019-09-19 21:50:52 -07:00
committed by GitHub
parent 9d3d64eef3
commit db498db0a8
459 changed files with 10195 additions and 7528 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
src/sql/base/browser/ui/table/media/slickColorTheme.css
View File

@@ -87,42 +87,42 @@
}
/* icons */
.vs .icon.extendFullScreen {
.vs .codicon.extendFullScreen {
/* ExtendToFullScreen_16x_vscode */
background-image: url("extendFullScreen.svg");
}
.vs .icon.exitFullScreen {
.vs .codicon.exitFullScreen {
/* ExitFullScreen_16x_vscode */
background-image: url("exitFullScreen.svg");
}
.vs .icon.saveJson {
.vs .codicon.saveJson {
/* ResultToJSON_16x_vscode */
background-image: url("saveJson.svg");
}
.vs .icon.saveCsv {
.vs .codicon.saveCsv {
/* ResultToCSV_16x_vscode */
background-image: url("saveCsv.svg");
}
.vs .icon.saveExcel {
.vs .codicon.saveExcel {
/* ResultToXlsx_16x_vscode */
background-image: url("saveExcel.svg");
}
.vs .icon.saveXml {
.vs .codicon.saveXml {
/* ResultToXML_16x_vscode */
background-image: url("saveXml.svg");
}
.vs .icon.viewChart {
.vs .codicon.viewChart {
/* ResultToXlsx_16x_vscode */
background-image: url("viewChart.svg");
}
.vs .icon.viewVisualizer {
.vs .codicon.viewVisualizer {
background-image: url("viewVisualizer.svg");
}
@@ -222,54 +222,54 @@
}
/* icons */
.vs-dark .icon.extendFullScreen,
.hc-black .icon.extendFullScreen {
.vs-dark .codicon.extendFullScreen,
.hc-black .codicon.extendFullScreen {
/* ExtendToFullScreen_16x_vscode_inverse.svg */
background-image: url("extendFullScreen_inverse.svg");
}
.vs-dark .icon.exitFullScreen,
.hc-black .icon.exitFullScreen {
.vs-dark .codicon.exitFullScreen,
.hc-black .codicon.exitFullScreen {
/* ExitFullScreen_16x_vscode_inverse.svg */
background-image: url("exitFullScreen_inverse.svg");
}
.vs-dark .icon.saveJson,
.hc-black .icon.saveJson {
.vs-dark .codicon.saveJson,
.hc-black .codicon.saveJson {
/* ResultToJSON_16x_vscode_inverse.svg */
background-image: url("saveJson_inverse.svg");
}
.vs-dark .icon.saveCsv,
.hc-black .icon.saveCsv {
.vs-dark .codicon.saveCsv,
.hc-black .codicon.saveCsv {
/* ResultToCSV_16x_vscode_inverse.svg */
background-image: url("saveCsv_inverse.svg");
}
.vs-dark .icon.saveExcel,
.hc-black .icon.saveExcel {
.vs-dark .codicon.saveExcel,
.hc-black .codicon.saveExcel {
/* ResultToXlsx_16x_vscode_inverse.svg */
background-image: url("saveExcel_inverse.svg");
}
.vs-dark .icon.saveXml,
.hc-black .icon.saveXml {
.vs-dark .codicon.saveXml,
.hc-black .codicon.saveXml {
/* ResultToXml_16x_vscode_inverse.svg */
background-image: url("saveXml_inverse.svg");
}
.vs-dark .icon.viewChart,
.hc-black .icon.viewChart {
.vs-dark .codicon.viewChart,
.hc-black .codicon.viewChart {
/* ResultToXlsx_16x_vscode */
background-image: url("viewChart_inverse.svg");
}
.vs-dark .icon.viewVisualizer,
.hc-black .icon.viewVisualizer {
.vs-dark .codicon.viewVisualizer,
.hc-black .codicon.viewVisualizer {
background-image: url("viewVisualizer_inverse.svg");
}
.grid-panel .action-label.icon {
.grid-panel .action-label.codicon {
height: 16px;
min-width: 28px;
background-size: 16px;

78
src/sql/base/browser/ui/taskbar/media/icons.css
View File

@@ -12,109 +12,109 @@
background-image: url('ellipsis-inverse.svg');
}
.vs .icon.start,
.vs-dark .icon.start,
.hc-black .icon.start {
.vs .codicon.start,
.vs-dark .codicon.start,
.hc-black .codicon.start {
background-image: url('start.svg');
}
.vs .icon.add,
.vs-dark .icon.add,
.hc-black .icon.add {
.vs .codicon.add,
.vs-dark .codicon.add,
.hc-black .codicon.add {
background-image: url('add.svg');
}
.vs .icon.stop,
.vs-dark .icon.stop,
.hc-black .icon.stop {
.vs .codicon.stop,
.vs-dark .codicon.stop,
.hc-black .codicon.stop {
background-image: url('stop.svg');
}
.vs .icon.disconnect {
.vs .codicon.disconnect {
background-image: url('disconnect.svg');
}
.vs-dark .icon.disconnect,
.hc-black .icon.disconnect {
.vs-dark .codicon.disconnect,
.hc-black .codicon.disconnect {
background-image: url('disconnect_inverse.svg');
background-repeat: no-repeat;
}
.vs .icon.connect {
.vs .codicon.connect {
background-image: url('connect.svg');
}
.vs-dark .icon.connect,
.hc-black .icon.connect {
.vs-dark .codicon.connect,
.hc-black .codicon.connect {
background-image: url('connect_inverse.svg');
background-repeat: no-repeat;
}
.vs .icon.changeConnection {
.vs .codicon.changeConnection {
background-image: url('change_connection.svg');
}
.vs-dark .icon.changeConnection,
.hc-black .icon.changeConnection {
.vs-dark .codicon.changeConnection,
.hc-black .codicon.changeConnection {
background-image: url('change_connection_inverse.svg');
background-repeat: no-repeat;
}
.vs .icon.estimatedQueryPlan,
.vs .icon.actualQueryPlan {
.vs .codicon.estimatedQueryPlan,
.vs .codicon.actualQueryPlan {
background-image: url('query-plan.svg');
}
.vs-dark .icon.estimatedQueryPlan,
.hc-black .icon.estimatedQueryPlan,
.vs-dark .icon.actualQueryPlan,
.hc-black .icon.actualQueryPlan {
.vs-dark .codicon.estimatedQueryPlan,
.hc-black .codicon.estimatedQueryPlan,
.vs-dark .codicon.actualQueryPlan,
.hc-black .codicon.actualQueryPlan {
background-image: url('query-plan-inverse.svg');
}
.vs .icon.createInsight {
.vs .codicon.createInsight {
background-image: url('create_insight.svg');
}
.vs-dark .icon.createInsight,
.hc-black .icon.createInsight {
.vs-dark .codicon.createInsight,
.hc-black .codicon.createInsight {
background-image: url('create_insight_inverse.svg');
}
.vs .icon.copyImage {
.vs .codicon.copyImage {
background-image: url('copy_image.svg');
}
.vs-dark .icon.copyImage,
.hc-black .icon.copyImage {
.vs-dark .codicon.copyImage,
.hc-black .codicon.copyImage {
background-image: url('copy_image_inverse.svg');
}
.vs .icon.saveAsImage {
.vs .codicon.saveAsImage {
background-image: url('save_as_image.svg');
}
.vs-dark .icon.saveAsImage,
.hc-black .icon.saveAsImage {
.vs-dark .codicon.saveAsImage,
.hc-black .codicon.saveAsImage {
background-image: url('save_as_image_inverse.svg');
}
.vs .icon.enablesqlcmd {
.vs .codicon.enablesqlcmd {
background-image: url('enable_sqlcmd.svg');
}
.vs-dark .icon.enablesqlcmd,
.hc-black .icon.enablesqlcmd {
.vs-dark .codicon.enablesqlcmd,
.hc-black .codicon.enablesqlcmd {
background-image: url('enable_sqlcmd_inverse.svg');
background-repeat: no-repeat;
}
.vs .icon.disablesqlcmd {
.vs .codicon.disablesqlcmd {
background-image: url('disable_sqlcmd.svg');
}
.vs-dark .icon.disablesqlcmd,
.hc-black .icon.disablesqlcmd {
.vs-dark .codicon.disablesqlcmd,
.hc-black .codicon.disablesqlcmd {
background-image: url('disable_sqlcmd_inverse.svg');
background-repeat: no-repeat;
}

2
src/sql/base/browser/ui/taskbar/media/taskbar.css
View File

@@ -83,6 +83,6 @@
/* Taskbar Icons */
.carbon-taskbar .icon {
.carbon-taskbar .codicon {
background-size: 11px;
}

4
src/sql/workbench/browser/modelComponents/queryTextEditor.ts
View File

@@ -112,14 +112,14 @@ export class QueryTextEditor extends BaseTextEditor {
public setWidth(width: number) {
if (this._dimension) {
this._dimension.width = width;
this._dimension = new DOM.Dimension(width, this._dimension.height);
this.layout();
}
}
public setHeight(height: number) {
if (this._dimension) {
this._dimension.height = height;
this._dimension = new DOM.Dimension(this._dimension.width, height);
this.layout(this._dimension);
}
}

11
src/sql/workbench/common/enablePreviewFeatures.ts
View File

@@ -5,13 +5,12 @@
import { IWorkbenchContribution } from 'vs/workbench/common/contributions';
import { IStorageService, StorageScope } from 'vs/platform/storage/common/storage';
import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
import { IOpenerService } from 'vs/platform/opener/common/opener';
import { INotificationService, Severity } from 'vs/platform/notification/common/notification';
import { localize } from 'vs/nls';
import { onUnexpectedError } from 'vs/base/common/errors';
import { IWindowService, IWindowsService } from 'vs/platform/windows/common/windows';
import { IWindowService } from 'vs/platform/windows/common/windows';
import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
import { IHostService } from 'vs/workbench/services/host/browser/host';
export class EnablePreviewFeatures implements IWorkbenchContribution {
@@ -19,11 +18,9 @@ export class EnablePreviewFeatures implements IWorkbenchContribution {
constructor(
@IStorageService storageService: IStorageService,
@IOpenerService openerService: IOpenerService,
@INotificationService notificationService: INotificationService,
@IWindowService windowService: IWindowService,
@IWindowsService windowsService: IWindowsService,
@ITelemetryService telemetryService: ITelemetryService,
@IHostService hostService: IHostService,
@IConfigurationService configurationService: IConfigurationService
) {
let previewFeaturesEnabled = configurationService.getValue('workbench')['enablePreviewFeatures'];
@@ -32,7 +29,7 @@ export class EnablePreviewFeatures implements IWorkbenchContribution {
}
Promise.all([
windowService.isFocused(),
windowsService.getWindowCount()
hostService.windowCount
]).then(([focused, count]) => {
if (!focused && count > 1) {
return null;

7
src/sql/workbench/common/workspaceActions.ts
View File

@@ -5,16 +5,17 @@
import { Action } from 'vs/base/common/actions';
import { IWindowsService } from 'vs/platform/windows/common/windows';
import { URI } from 'vs/base/common/uri';
//tslint:disable-next-line:layering
import { ElectronMainService } from 'vs/platform/electron/electron-main/electronMainService';
export class ShowFileInFolderAction extends Action {
constructor(private path: string, label: string, private windowsService: IWindowsService) {
constructor(private path: string, label: string, private windowsService: ElectronMainService) {
super('showItemInFolder.action.id', label);
}
run(): Promise<void> {
return this.windowsService.showItemInFolder(URI.file(this.path));
return this.windowsService.showItemInFolder(this.path);
}
}

3
src/sql/workbench/contrib/welcome/page/browser/az_data_welcome_page.ts
View File

@@ -6,9 +6,6 @@
import { escape } from 'vs/base/common/strings';
import { localize } from 'vs/nls';
export function used() {
}
let productQuality: string;
export function setProductQuality(quality: string): void {

2
src/sql/workbench/parts/query/browser/queryEditor.ts
View File

@@ -22,7 +22,7 @@ import { IStorageService } from 'vs/platform/storage/common/storage';
import { IEditorGroup, IEditorGroupsService } from 'vs/workbench/services/editor/common/editorGroupsService';
import { SplitView, Sizing } from 'vs/base/browser/ui/splitview/splitview';
import { Event } from 'vs/base/common/event';
import { dispose, IDisposable, DisposableStore } from 'vs/base/common/lifecycle';
import { DisposableStore } from 'vs/base/common/lifecycle';
import { ISelectionData } from 'azdata';
import { Action, IActionViewItem } from 'vs/base/common/actions';
import { IConfigurationService } from 'vs/platform/configuration/common/configuration';

12
src/sql/workbench/parts/query/common/resultSerializer.ts
View File

@@ -4,14 +4,13 @@
*--------------------------------------------------------------------------------------------*/
import * as ConnectionConstants from 'sql/platform/connection/common/constants';
import * as Constants from 'sql/workbench/parts/query/common/constants';
import * as LocalizedConstants from 'sql/workbench/parts/query/common/localizedConstants';
import { SaveResultsRequestParams } from 'azdata';
import { IQueryManagementService } from 'sql/platform/query/common/queryManagement';
import { ISaveRequest, SaveFormat } from 'sql/workbench/parts/grid/common/interfaces';
import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
import { IWindowsService, FileFilter } from 'vs/platform/windows/common/windows';
import { FileFilter } from 'vs/platform/windows/common/windows';
import { Registry } from 'vs/platform/registry/common/platform';
import { URI } from 'vs/base/common/uri';
import * as path from 'vs/base/common/path';
@@ -26,6 +25,7 @@ import { getRootPath, resolveCurrentDirectory, resolveFilePath } from 'sql/platf
import { IOutputService, IOutputChannelRegistry, IOutputChannel, Extensions as OutputExtensions } from 'vs/workbench/contrib/output/common/output';
import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
import { IFileDialogService } from 'vs/platform/dialogs/common/dialogs';
import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
let prevSavePath: string;
@@ -60,9 +60,9 @@ export class ResultSerializer {
@IConfigurationService private _configurationService: IConfigurationService,
@IEditorService private _editorService: IEditorService,
@IWorkspaceContextService private _contextService: IWorkspaceContextService,
@IWindowsService private _windowsService: IWindowsService,
@IFileDialogService private readonly fileDialogService: IFileDialogService,
@INotificationService private _notificationService: INotificationService
@INotificationService private _notificationService: INotificationService,
@IInstantiationService private readonly _instantiationService: IInstantiationService
) { }
/**
@@ -313,14 +313,14 @@ export class ResultSerializer {
[{
label: nls.localize('openLocation', "Open file location"),
run: () => {
let action = new ShowFileInFolderAction(savedFilePath, label || path.sep, this._windowsService);
let action = this._instantiationService.createInstance(ShowFileInFolderAction, savedFilePath, label || path.sep);
action.run();
action.dispose();
}
}, {
label: nls.localize('openFile', "Open file"),
run: () => {
let action = new OpenFileInFolderAction(savedFilePath, label || path.sep, this._windowsService);
let action = this._instantiationService.createInstance(OpenFileInFolderAction, savedFilePath, label || path.sep);
action.run();
action.dispose();
}

6
src/sql/workbench/services/connection/browser/media/connectionDialog.css
View File

@@ -106,9 +106,9 @@
height: 100%;
}
.vs-dark .connection-dialog .connection-history-actions .action-label.icon,
.hc-black .connection-dialog .connection-history-actions .action-label.icon,
.connection-dialog .connection-history-actions .action-label.icon {
.vs-dark .connection-dialog .connection-history-actions .action-label.codicon,
.hc-black .connection-dialog .connection-history-actions .action-label.codicon,
.connection-dialog .connection-history-actions .action-label.codicon {
display: block;
height: 20px;
line-height: 20px;

2
src/sql/workbench/services/insights/test/electron-browser/insightsUtils.test.ts
View File

@@ -25,6 +25,8 @@ import { getRandomTestPath } from 'vs/base/test/node/testUtils';
import { IWorkbenchConstructionOptions } from 'vs/workbench/workbench.web.api';
class TestEnvironmentService implements IWorkbenchEnvironmentService {
settingsSyncPreviewResource: URI;
webviewExternalEndpoint: string;
logFile: URI;
options?: IWorkbenchConstructionOptions;
galleryMachineIdResource?: URI;

5
src/sql/workbench/update/electron-browser/releaseNotes.ts
View File

@@ -5,8 +5,7 @@
import nls = require('vs/nls');
import { Action } from 'vs/base/common/actions';
import pkg from 'vs/platform/product/node/package';
import product from 'vs/platform/product/node/product';
import product from 'vs/platform/product/common/product';
import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
import { URI } from 'vs/base/common/uri';
import { IOpenerService } from 'vs/platform/opener/common/opener';
@@ -37,7 +36,7 @@ export class ShowCurrentReleaseNotesAction extends AbstractShowReleaseNotesActio
label = ShowCurrentReleaseNotesAction.LABEL,
@IInstantiationService instantiationService: IInstantiationService
) {
super(id, label, pkg.version, instantiationService);
super(id, label, product.version, instantiationService);
}
}