From e6cac8cc141bada8ba44b25fdbe5d92b598327ba Mon Sep 17 00:00:00 2001 From: Kim Santiago <31145923+kisantia@users.noreply.github.com> Date: Wed, 25 Sep 2019 12:59:18 -0700 Subject: [PATCH] Fix missing schema compare icons (#7355) * move schema compare icons * use extensionContext.extensionPath --- .../{src => }/media/compare-inverse.svg | 0 .../{src => }/media/compare.svg | 0 .../media/generate-script-inverse.svg | 0 .../{src => }/media/generate-script.svg | 0 .../{src => }/media/open-scmp-inverse.svg | 0 .../{src => }/media/open-scmp.svg | 0 .../{src => }/media/options-inverse.svg | 0 .../{src => }/media/options.svg | 0 .../{src => }/media/save-scmp-inverse.svg | 0 .../{src => }/media/save-scmp.svg | 0 .../{src => }/media/start-inverse.svg | 0 .../schema-compare/{src => }/media/start.svg | 0 .../{src => }/media/stop-inverse.svg | 0 .../schema-compare/{src => }/media/stop.svg | 0 .../media/switch-directions-inverse.svg | 0 .../{src => }/media/switch-directions.svg | 0 .../src/controllers/mainController.ts | 2 +- .../src/schemaCompareMainWindow.ts | 34 +++++++++---------- 18 files changed, 18 insertions(+), 18 deletions(-) rename extensions/schema-compare/{src => }/media/compare-inverse.svg (100%) rename extensions/schema-compare/{src => }/media/compare.svg (100%) rename extensions/schema-compare/{src => }/media/generate-script-inverse.svg (100%) rename extensions/schema-compare/{src => }/media/generate-script.svg (100%) rename extensions/schema-compare/{src => }/media/open-scmp-inverse.svg (100%) rename extensions/schema-compare/{src => }/media/open-scmp.svg (100%) rename extensions/schema-compare/{src => }/media/options-inverse.svg (100%) rename extensions/schema-compare/{src => }/media/options.svg (100%) rename extensions/schema-compare/{src => }/media/save-scmp-inverse.svg (100%) rename extensions/schema-compare/{src => }/media/save-scmp.svg (100%) rename extensions/schema-compare/{src => }/media/start-inverse.svg (100%) rename extensions/schema-compare/{src => }/media/start.svg (100%) rename extensions/schema-compare/{src => }/media/stop-inverse.svg (100%) rename extensions/schema-compare/{src => }/media/stop.svg (100%) rename extensions/schema-compare/{src => }/media/switch-directions-inverse.svg (100%) rename extensions/schema-compare/{src => }/media/switch-directions.svg (100%) diff --git a/extensions/schema-compare/src/media/compare-inverse.svg b/extensions/schema-compare/media/compare-inverse.svg similarity index 100% rename from extensions/schema-compare/src/media/compare-inverse.svg rename to extensions/schema-compare/media/compare-inverse.svg diff --git a/extensions/schema-compare/src/media/compare.svg b/extensions/schema-compare/media/compare.svg similarity index 100% rename from extensions/schema-compare/src/media/compare.svg rename to extensions/schema-compare/media/compare.svg diff --git a/extensions/schema-compare/src/media/generate-script-inverse.svg b/extensions/schema-compare/media/generate-script-inverse.svg similarity index 100% rename from extensions/schema-compare/src/media/generate-script-inverse.svg rename to extensions/schema-compare/media/generate-script-inverse.svg diff --git a/extensions/schema-compare/src/media/generate-script.svg b/extensions/schema-compare/media/generate-script.svg similarity index 100% rename from extensions/schema-compare/src/media/generate-script.svg rename to extensions/schema-compare/media/generate-script.svg diff --git a/extensions/schema-compare/src/media/open-scmp-inverse.svg b/extensions/schema-compare/media/open-scmp-inverse.svg similarity index 100% rename from extensions/schema-compare/src/media/open-scmp-inverse.svg rename to extensions/schema-compare/media/open-scmp-inverse.svg diff --git a/extensions/schema-compare/src/media/open-scmp.svg b/extensions/schema-compare/media/open-scmp.svg similarity index 100% rename from extensions/schema-compare/src/media/open-scmp.svg rename to extensions/schema-compare/media/open-scmp.svg diff --git a/extensions/schema-compare/src/media/options-inverse.svg b/extensions/schema-compare/media/options-inverse.svg similarity index 100% rename from extensions/schema-compare/src/media/options-inverse.svg rename to extensions/schema-compare/media/options-inverse.svg diff --git a/extensions/schema-compare/src/media/options.svg b/extensions/schema-compare/media/options.svg similarity index 100% rename from extensions/schema-compare/src/media/options.svg rename to extensions/schema-compare/media/options.svg diff --git a/extensions/schema-compare/src/media/save-scmp-inverse.svg b/extensions/schema-compare/media/save-scmp-inverse.svg similarity index 100% rename from extensions/schema-compare/src/media/save-scmp-inverse.svg rename to extensions/schema-compare/media/save-scmp-inverse.svg diff --git a/extensions/schema-compare/src/media/save-scmp.svg b/extensions/schema-compare/media/save-scmp.svg similarity index 100% rename from extensions/schema-compare/src/media/save-scmp.svg rename to extensions/schema-compare/media/save-scmp.svg diff --git a/extensions/schema-compare/src/media/start-inverse.svg b/extensions/schema-compare/media/start-inverse.svg similarity index 100% rename from extensions/schema-compare/src/media/start-inverse.svg rename to extensions/schema-compare/media/start-inverse.svg diff --git a/extensions/schema-compare/src/media/start.svg b/extensions/schema-compare/media/start.svg similarity index 100% rename from extensions/schema-compare/src/media/start.svg rename to extensions/schema-compare/media/start.svg diff --git a/extensions/schema-compare/src/media/stop-inverse.svg b/extensions/schema-compare/media/stop-inverse.svg similarity index 100% rename from extensions/schema-compare/src/media/stop-inverse.svg rename to extensions/schema-compare/media/stop-inverse.svg diff --git a/extensions/schema-compare/src/media/stop.svg b/extensions/schema-compare/media/stop.svg similarity index 100% rename from extensions/schema-compare/src/media/stop.svg rename to extensions/schema-compare/media/stop.svg diff --git a/extensions/schema-compare/src/media/switch-directions-inverse.svg b/extensions/schema-compare/media/switch-directions-inverse.svg similarity index 100% rename from extensions/schema-compare/src/media/switch-directions-inverse.svg rename to extensions/schema-compare/media/switch-directions-inverse.svg diff --git a/extensions/schema-compare/src/media/switch-directions.svg b/extensions/schema-compare/media/switch-directions.svg similarity index 100% rename from extensions/schema-compare/src/media/switch-directions.svg rename to extensions/schema-compare/media/switch-directions.svg diff --git a/extensions/schema-compare/src/controllers/mainController.ts b/extensions/schema-compare/src/controllers/mainController.ts index 59638a40fd..ca794d4b05 100644 --- a/extensions/schema-compare/src/controllers/mainController.ts +++ b/extensions/schema-compare/src/controllers/mainController.ts @@ -32,7 +32,7 @@ export default class MainController implements vscode.Disposable { } private initializeSchemaCompareDialog(): void { - azdata.tasks.registerTask('schemaCompare.start', (profile: azdata.IConnectionProfile) => new SchemaCompareMainWindow().start(profile)); + azdata.tasks.registerTask('schemaCompare.start', (profile: azdata.IConnectionProfile) => new SchemaCompareMainWindow(null, this.extensionContext).start(profile)); } public dispose(): void { diff --git a/extensions/schema-compare/src/schemaCompareMainWindow.ts b/extensions/schema-compare/src/schemaCompareMainWindow.ts index c515ea6329..6d7424ecf7 100644 --- a/extensions/schema-compare/src/schemaCompareMainWindow.ts +++ b/extensions/schema-compare/src/schemaCompareMainWindow.ts @@ -73,7 +73,7 @@ export class SchemaCompareMainWindow { public sourceEndpointInfo: mssql.SchemaCompareEndpointInfo; public targetEndpointInfo: mssql.SchemaCompareEndpointInfo; - constructor(private schemaCompareService?: mssql.ISchemaCompareService) { + constructor(private schemaCompareService?: mssql.ISchemaCompareService, private extensionContext?: vscode.ExtensionContext) { this.SchemaCompareActionMap = new Map(); this.SchemaCompareActionMap[mssql.SchemaUpdateAction.Delete] = localize('schemaCompare.deleteAction', 'Delete'); this.SchemaCompareActionMap[mssql.SchemaUpdateAction.Change] = localize('schemaCompare.changeAction', 'Change'); @@ -543,8 +543,8 @@ export class SchemaCompareMainWindow { this.compareButton = view.modelBuilder.button().withProperties({ label: localize('schemaCompare.compareButton', 'Compare'), iconPath: { - light: path.join(__dirname, 'media', 'compare.svg'), - dark: path.join(__dirname, 'media', 'compare-inverse.svg') + light: path.join(this.extensionContext.extensionPath, 'media', 'compare.svg'), + dark: path.join(this.extensionContext.extensionPath, 'media', 'compare-inverse.svg') }, title: localize('schemaCompare.compareButtonTitle', 'Compare') }).component(); @@ -558,8 +558,8 @@ export class SchemaCompareMainWindow { this.cancelCompareButton = view.modelBuilder.button().withProperties({ label: localize('schemaCompare.cancelCompareButton', 'Stop'), iconPath: { - light: path.join(__dirname, 'media', 'stop.svg'), - dark: path.join(__dirname, 'media', 'stop-inverse.svg') + light: path.join(this.extensionContext.extensionPath, 'media', 'stop.svg'), + dark: path.join(this.extensionContext.extensionPath, 'media', 'stop-inverse.svg') }, title: localize('schemaCompare.cancelCompareButtonTitle', 'Stop') }).component(); @@ -606,8 +606,8 @@ export class SchemaCompareMainWindow { this.generateScriptButton = view.modelBuilder.button().withProperties({ label: localize('schemaCompare.generateScriptButton', 'Generate script'), iconPath: { - light: path.join(__dirname, 'media', 'generate-script.svg'), - dark: path.join(__dirname, 'media', 'generate-script-inverse.svg') + light: path.join(this.extensionContext.extensionPath, 'media', 'generate-script.svg'), + dark: path.join(this.extensionContext.extensionPath, 'media', 'generate-script-inverse.svg') }, }).component(); @@ -637,8 +637,8 @@ export class SchemaCompareMainWindow { this.optionsButton = view.modelBuilder.button().withProperties({ label: localize('schemaCompare.optionsButton', 'Options'), iconPath: { - light: path.join(__dirname, 'media', 'options.svg'), - dark: path.join(__dirname, 'media', 'options-inverse.svg') + light: path.join(this.extensionContext.extensionPath, 'media', 'options.svg'), + dark: path.join(this.extensionContext.extensionPath, 'media', 'options-inverse.svg') }, title: localize('schemaCompare.optionsButtonTitle', 'Options') }).component(); @@ -657,8 +657,8 @@ export class SchemaCompareMainWindow { this.applyButton = view.modelBuilder.button().withProperties({ label: localize('schemaCompare.updateButton', 'Apply'), iconPath: { - light: path.join(__dirname, 'media', 'start.svg'), - dark: path.join(__dirname, 'media', 'start-inverse.svg') + light: path.join(this.extensionContext.extensionPath, 'media', 'start.svg'), + dark: path.join(this.extensionContext.extensionPath, 'media', 'start-inverse.svg') }, }).component(); @@ -764,8 +764,8 @@ export class SchemaCompareMainWindow { this.switchButton = view.modelBuilder.button().withProperties({ label: localize('schemaCompare.switchDirectionButton', 'Switch direction'), iconPath: { - light: path.join(__dirname, 'media', 'switch-directions.svg'), - dark: path.join(__dirname, 'media', 'switch-directions-inverse.svg') + light: path.join(this.extensionContext.extensionPath, 'media', 'switch-directions.svg'), + dark: path.join(this.extensionContext.extensionPath, 'media', 'switch-directions-inverse.svg') }, title: localize('schemaCompare.switchButtonTitle', 'Switch source and target') }).component(); @@ -837,8 +837,8 @@ export class SchemaCompareMainWindow { this.openScmpButton = view.modelBuilder.button().withProperties({ label: localize('schemaCompare.openScmpButton', 'Open .scmp file'), iconPath: { - light: path.join(__dirname, 'media', 'open-scmp.svg'), - dark: path.join(__dirname, 'media', 'open-scmp-inverse.svg') + light: path.join(this.extensionContext.extensionPath, 'media', 'open-scmp.svg'), + dark: path.join(this.extensionContext.extensionPath, 'media', 'open-scmp-inverse.svg') }, title: localize('schemaCompare.openScmpButtonTitle', 'Load source, target, and options saved in an .scmp file') }).component(); @@ -934,8 +934,8 @@ export class SchemaCompareMainWindow { this.saveScmpButton = view.modelBuilder.button().withProperties({ label: localize('schemaCompare.saveScmpButton', 'Save .scmp file'), iconPath: { - light: path.join(__dirname, 'media', 'save-scmp.svg'), - dark: path.join(__dirname, 'media', 'save-scmp-inverse.svg') + light: path.join(this.extensionContext.extensionPath, 'media', 'save-scmp.svg'), + dark: path.join(this.extensionContext.extensionPath, 'media', 'save-scmp-inverse.svg') }, title: localize('schemaCompare.saveScmpButtonTitle', 'Save source and target, options, and excluded elements'), enabled: false