diff --git a/src/sql/base/browser/ui/table/media/table.css b/src/sql/base/browser/ui/table/media/table.css index cb43e5e1cc..48762b35d8 100644 --- a/src/sql/base/browser/ui/table/media/table.css +++ b/src/sql/base/browser/ui/table/media/table.css @@ -99,7 +99,7 @@ width: 200px; } -label { +.monaco-table label { display: block; margin-bottom: 5px; } diff --git a/src/sql/workbench/contrib/welcome/page/browser/az_data_welcome_page.ts b/src/sql/workbench/contrib/welcome/page/browser/az_data_welcome_page.ts new file mode 100644 index 0000000000..cc24899b67 --- /dev/null +++ b/src/sql/workbench/contrib/welcome/page/browser/az_data_welcome_page.ts @@ -0,0 +1,72 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the Source EULA. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ + +import { escape } from 'vs/base/common/strings'; +import { localize } from 'vs/nls'; + +export function used() { +} + +export default () => ` +
+
+
+

${escape(localize('welcomePage.azdata', "Azure Data Studio"))}

+

${escape(localize({ key: 'welcomePage.azdataTagline', comment: ['Shown as subtitle on the Welcome page.'] }, ""))}

+
+
+
+
+

${escape(localize('welcomePage.start', "Start"))}

+ +
+
+

${escape(localize('welcomePage.recent', "Recent"))}

+ +

${escape(localize('welcomePage.noRecentFolders', "No recent folders"))}

+
+
+

${escape(localize('welcomePage.help', "Help"))}

+ +
+

+
+
+
+

${escape(localize('welcomePage.customize', "Customize"))}

+
+
+
+
+
+
+
+

${escape(localize('welcomePage.learn', "Learn"))}

+
+
+
+
+
+
+
+
+
+
+`; \ No newline at end of file diff --git a/src/vs/workbench/contrib/welcome/page/browser/welcomePage.contribution.ts b/src/vs/workbench/contrib/welcome/page/browser/welcomePage.contribution.ts index c43fd7efc3..a0b7f4ee6d 100644 --- a/src/vs/workbench/contrib/welcome/page/browser/welcomePage.contribution.ts +++ b/src/vs/workbench/contrib/welcome/page/browser/welcomePage.contribution.ts @@ -36,23 +36,19 @@ Registry.as(ConfigurationExtensions.Configuration) } }); -// {{SQL CARBON EDIT}} - Disable welcome page -// Registry.as(WorkbenchExtensions.Workbench) -// .registerWorkbenchContribution(WelcomePageContribution, LifecyclePhase.Restored); +Registry.as(WorkbenchExtensions.Workbench) + .registerWorkbenchContribution(WelcomePageContribution, LifecyclePhase.Restored); -// Registry.as(ActionExtensions.WorkbenchActions) -// .registerWorkbenchAction(new SyncActionDescriptor(WelcomePageAction, WelcomePageAction.ID, WelcomePageAction.LABEL), 'Help: Welcome', localize('help', "Help")); +Registry.as(ActionExtensions.WorkbenchActions) + .registerWorkbenchAction(new SyncActionDescriptor(WelcomePageAction, WelcomePageAction.ID, WelcomePageAction.LABEL), 'Help: Welcome', localize('help', "Help")); -// Registry.as(EditorExtensions.EditorInputFactories).registerEditorInputFactory(WelcomeInputFactory.ID, WelcomeInputFactory); -// {{SQL CARBON EDIT}} - End +Registry.as(EditorExtensions.EditorInputFactories).registerEditorInputFactory(WelcomeInputFactory.ID, WelcomeInputFactory); -// {{SQL CARBON EDIT}} - Disable unused menu item -// MenuRegistry.appendMenuItem(MenuId.MenubarHelpMenu, { -// group: '1_welcome', -// command: { -// id: 'workbench.action.showWelcomePage', -// title: localize({ key: 'miWelcome', comment: ['&& denotes a mnemonic'] }, "&&Welcome") -// }, -// order: 1 -// }); -// {{SQL CARBON EDIT}} - End +MenuRegistry.appendMenuItem(MenuId.MenubarHelpMenu, { + group: '1_welcome', + command: { + id: 'workbench.action.showWelcomePage', + title: localize({ key: 'miWelcome', comment: ['&& denotes a mnemonic'] }, "&&Welcome") + }, + order: 1 +}); diff --git a/src/vs/workbench/contrib/welcome/page/browser/welcomePage.ts b/src/vs/workbench/contrib/welcome/page/browser/welcomePage.ts index 3d566bacd0..9104521bc0 100644 --- a/src/vs/workbench/contrib/welcome/page/browser/welcomePage.ts +++ b/src/vs/workbench/contrib/welcome/page/browser/welcomePage.ts @@ -23,7 +23,8 @@ import { Schemas } from 'vs/base/common/network'; import { IBackupFileService } from 'vs/workbench/services/backup/common/backup'; import { getInstalledExtensions, IExtensionStatus, onExtensionChanged, isKeymapExtension } from 'vs/workbench/contrib/extensions/common/extensionsUtils'; import { IExtensionEnablementService, IExtensionManagementService, IExtensionGalleryService, IExtensionTipsService, EnablementState, ILocalExtension } from 'vs/platform/extensionManagement/common/extensionManagement'; -import { used } from 'vs/workbench/contrib/welcome/page/browser/vs_code_welcome_page'; +// {{SQL CARBON EDIT}} - Redirect to ADS welcome page +import { used } from 'sql/workbench/contrib/welcome/page/browser/az_data_welcome_page'; import { ILifecycleService, StartupKind } from 'vs/platform/lifecycle/common/lifecycle'; import { IDisposable, dispose } from 'vs/base/common/lifecycle'; import { splitName } from 'vs/base/common/labels'; @@ -106,16 +107,14 @@ export class WelcomePageContribution implements IWorkbenchContribution { } function isWelcomePageEnabled(configurationService: IConfigurationService, contextService: IWorkspaceContextService) { - // {{SQL CARBON EDIT}} - Disable the welcome page - return false; - // const startupEditor = configurationService.inspect(configurationKey); - // if (!startupEditor.user && !startupEditor.workspace) { - // const welcomeEnabled = configurationService.inspect(oldConfigurationKey); - // if (welcomeEnabled.value !== undefined && welcomeEnabled.value !== null) { - // return welcomeEnabled.value; - // } - // } - // return startupEditor.value === 'welcomePage' || startupEditor.value === 'readme' || startupEditor.value === 'welcomePageInEmptyWorkbench' && contextService.getWorkbenchState() === WorkbenchState.EMPTY; + const startupEditor = configurationService.inspect(configurationKey); + if (!startupEditor.user && !startupEditor.workspace) { + const welcomeEnabled = configurationService.inspect(oldConfigurationKey); + if (welcomeEnabled.value !== undefined && welcomeEnabled.value !== null) { + return welcomeEnabled.value; + } + } + return startupEditor.value === 'welcomePage' || startupEditor.value === 'readme' || startupEditor.value === 'welcomePageInEmptyWorkbench' && contextService.getWorkbenchState() === WorkbenchState.EMPTY; } export class WelcomePageAction extends Action { @@ -273,10 +272,11 @@ class WelcomePage { const recentlyOpened = this.windowService.getRecentlyOpened(); const installedExtensions = this.instantiationService.invokeFunction(getInstalledExtensions); - const resource = URI.parse(require.toUrl('./vs_code_welcome_page')) + // {{SQL CARBON EDIT}} - Redirect to ADS welcome page + const resource = URI.parse(require.toUrl('./az_data_welcome_page')) .with({ scheme: Schemas.walkThrough, - query: JSON.stringify({ moduleId: 'vs/workbench/contrib/welcome/page/browser/vs_code_welcome_page' }) + query: JSON.stringify({ moduleId: 'sql/workbench/contrib/welcome/page/browser/az_data_welcome_page' }) }); this.editorInput = this.instantiationService.createInstance(WalkThroughInput, { typeId: welcomeInputTypeId,