Update application name to Azure Data Studio (#24510)
This commit is contained in:
Cheena Malhotra
GitHub
Родитель
306eb42ae7
Коммит
dce130c5af
Различия файлов скрыты, потому что одна или несколько строк слишком длинны
|
|
@ -92,21 +92,24 @@ async function main(buildDir?: string): Promise<void> {
|
|||
'-insert',
|
||||
'NSAppleEventsUsageDescription',
|
||||
'-string',
|
||||
'An application in Visual Studio Code wants to use AppleScript.',
|
||||
// ${{SQL CARBON EDIT}} Update application name to Azure Data Studio
|
||||
'An application in Azure Data Studio wants to use AppleScript.',
|
||||
`${infoPlistPath}`
|
||||
]);
|
||||
await spawn('plutil', [
|
||||
'-replace',
|
||||
'NSMicrophoneUsageDescription',
|
||||
'-string',
|
||||
'An application in Visual Studio Code wants to use the Microphone.',
|
||||
// ${{SQL CARBON EDIT}} Update application name to Azure Data Studio
|
||||
'An application in Azure Data Studio wants to use the Microphone.',
|
||||
`${infoPlistPath}`
|
||||
]);
|
||||
await spawn('plutil', [
|
||||
'-replace',
|
||||
'NSCameraUsageDescription',
|
||||
'-string',
|
||||
'An application in Visual Studio Code wants to use the Camera.',
|
||||
// ${{SQL CARBON EDIT}} Update application name to Azure Data Studio
|
||||
'An application in Azure Data Studio wants to use the Camera.',
|
||||
`${infoPlistPath}`
|
||||
]);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
# Git static contributions and remote repository picker
|
||||
|
||||
**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.
|
||||
**Notice:** This extension is bundled with Azure Data Studio. It can be disabled but not uninstalled.
|
||||
|
||||
## Features
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
# Git integration for Visual Studio Code
|
||||
# Git integration for Azure Data Studio
|
||||
|
||||
**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.
|
||||
**Notice:** This extension is bundled with Azure Data Studio. It can be disabled but not uninstalled.
|
||||
|
||||
## Features
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
# GitHub for Visual Studio Code
|
||||
# GitHub for Azure Data Studio
|
||||
|
||||
**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.
|
||||
**Notice:** This extension is bundled with Azure Data Studio. It can be disabled but not uninstalled.
|
||||
|
||||
## Features
|
||||
|
||||
|
|
|
|||
|
|
@ -10,8 +10,9 @@
|
|||
</head>
|
||||
|
||||
<body>
|
||||
<a class="branding" href="https://code.visualstudio.com/">
|
||||
Visual Studio Code
|
||||
<!-- {{SQL CARBON EDIT}} Update application name and URL to Azure Data Studio -->
|
||||
<a class="branding" href="https://aka.ms/azuredatastudio/">
|
||||
Azure Data Studio
|
||||
</a>
|
||||
<div class="message-container">
|
||||
<div class="message">
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
# Language Features for Search Result files
|
||||
|
||||
**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.
|
||||
**Notice:** This extension is bundled with Azure Data Studio. It can be disabled but not uninstalled.
|
||||
|
||||
This extension provides Syntax Highlighting, Symbol Information, Result Highlighting, and Go to Definition capabilities for the Search Results Editor.
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
# Simple Browser
|
||||
|
||||
**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.
|
||||
**Notice:** This extension is bundled with Azure Data Studio. It can be disabled but not uninstalled.
|
||||
|
||||
Provides a very basic browser preview using an iframe embedded in a [webview](). This extension is primarily meant to be used by other extensions for showing simple web content.
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
{
|
||||
"displayName": "Abyss Theme",
|
||||
"description": "Abyss theme for Visual Studio Code",
|
||||
"description": "Abyss theme for Azure Data Studio",
|
||||
"themeLabel": "Abyss"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -9,5 +9,5 @@
|
|||
"lightColorThemeLabel": "Light (Visual Studio)",
|
||||
"hcColorThemeLabel": "Dark High Contrast",
|
||||
"lightHcColorThemeLabel": "Light High Contrast",
|
||||
"minimalIconThemeLabel": "Minimal (Visual Studio Code)"
|
||||
"minimalIconThemeLabel": "Minimal (Azure Data Studio)"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
{
|
||||
"displayName": "Kimbie Dark Theme",
|
||||
"description": "Kimbie dark theme for Visual Studio Code",
|
||||
"description": "Kimbie dark theme for Azure Data Studio",
|
||||
"themeLabel": "Kimbie Dark"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
{
|
||||
"displayName": "Monokai Dimmed Theme",
|
||||
"description": "Monokai dimmed theme for Visual Studio Code",
|
||||
"description": "Monokai dimmed theme for Azure Data Studio",
|
||||
"themeLabel": "Monokai Dimmed"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
{
|
||||
"displayName": "Monokai Theme",
|
||||
"description": "Monokai theme for Visual Studio Code",
|
||||
"description": "Monokai theme for Azure Data Studio",
|
||||
"themeLabel": "Monokai"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
{
|
||||
"displayName": "Quiet Light Theme",
|
||||
"description": "Quiet light theme for Visual Studio Code",
|
||||
"description": "Quiet light theme for Azure Data Studio",
|
||||
"themeLabel": "Quiet Light"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
{
|
||||
"displayName": "Red Theme",
|
||||
"description": "Red theme for Visual Studio Code",
|
||||
"description": "Red theme for Azure Data Studio",
|
||||
"themeLabel": "Red"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
{
|
||||
"displayName": "Seti File Icon Theme",
|
||||
"description": "A file icon theme made out of the Seti UI file icons",
|
||||
"themeLabel": "Seti (Visual Studio Code)"
|
||||
"themeLabel": "Seti (Azure Data Studio)"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
{
|
||||
"displayName": "Solarized Dark Theme",
|
||||
"description": "Solarized dark theme for Visual Studio Code",
|
||||
"description": "Solarized dark theme for Azure Data Studio",
|
||||
"themeLabel": "Solarized Dark"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
{
|
||||
"displayName": "Solarized Light Theme",
|
||||
"description": "Solarized light theme for Visual Studio Code",
|
||||
"description": "Solarized light theme for Azure Data Studio", /* {SQL CARBON EDIT} */
|
||||
"themeLabel": "Solarized Light"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
{
|
||||
"displayName": "Tomorrow Night Blue Theme",
|
||||
"description": "Tomorrow night blue theme for Visual Studio Code",
|
||||
"description": "Tomorrow night blue theme for Azure Data Studio",
|
||||
"themeLabel": "Tomorrow Night Blue"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,12 +1,12 @@
|
|||
Name: @@NAME@@
|
||||
Version: @@VERSION@@
|
||||
Release: @@RELEASE@@.el7
|
||||
Summary: Code editing. Redefined.
|
||||
Summary: Azure Data connectivity.
|
||||
Group: Development/Tools
|
||||
Vendor: Microsoft Corporation
|
||||
Packager: Visual Studio Code Team <vscode-linux@microsoft.com>
|
||||
Packager: Azure Data Studio Team
|
||||
License: @@LICENSE@@
|
||||
URL: https://code.visualstudio.com/
|
||||
URL: https://aka.ms/azuredatastudio
|
||||
Icon: @@NAME@@.xpm
|
||||
Requires: @@DEPENDENCIES@@
|
||||
AutoReq: 0
|
||||
|
|
@ -14,10 +14,10 @@ AutoReq: 0
|
|||
%global __provides_exclude_from ^%{_datadir}/%{name}/.*\\.so.*$
|
||||
|
||||
%description
|
||||
Visual Studio Code is a new choice of tool that combines the simplicity of a code editor with what developers need for the core edit-build-debug cycle. See https://code.visualstudio.com/docs/setup/linux for installation instructions and FAQ.
|
||||
Azure Data Studio is a lightweight, cross-platform data management and development tool with connectivity to popular cloud and on-premises databases. For more information, visit https://aka.ms/azuredatastudio.
|
||||
|
||||
# Don't generate build_id links to prevent conflicts when installing multiple
|
||||
# versions of VS Code alongside each other (e.g. `code` and `code-insiders`)
|
||||
# versions of ADS alongside each other (e.g. `azuredatastudio` and `azuredatastudio-insiders`)
|
||||
%define _build_id_links none
|
||||
|
||||
%install
|
||||
|
|
|
|||
|
|
@ -1,10 +1,9 @@
|
|||
name: @@NAME@@
|
||||
version: @@VERSION@@
|
||||
summary: Code editing. Redefined.
|
||||
summary: Azure Data connectivity.
|
||||
description: |
|
||||
Visual Studio Code is a new choice of tool that combines the
|
||||
simplicity of a code editor with what developers need for the core
|
||||
edit-build-debug cycle.
|
||||
Azure Data Studio is a lightweight, cross-platform data management
|
||||
and development tool with connectivity to popular cloud and on-premises databases.
|
||||
|
||||
architectures:
|
||||
- build-on: amd64
|
||||
|
|
|
|||
|
|
@ -95,4 +95,11 @@ export const experimentalCustomizationDescription = localize('notebook.editorOpt
|
|||
export const download = localize('azuredatastudio.download', 'Download');
|
||||
export const downloadTooltip = localize('azuredatastudio.downloadTooltip', "Download this extension from an external source");
|
||||
export const installTooltip = localize('azuredatastudio.installTooltip', "Install this extension");
|
||||
export function getThemeUpdatedNotification(label: string): string {
|
||||
return localize({ key: 'azuredatastudio.themeUpdatedNotification', comment: ['{0} is the name of the new default theme'] }, "Azure Data Studio now ships with a new default theme '{0}'. If you prefer, you can switch back to the old theme or try one of the many other color themes available.", label);
|
||||
}
|
||||
export function getNewThemeNotification(label: string): string {
|
||||
return localize({ key: 'newThemeNotification', comment: ['{0} is the name of the new default theme'] }, "Azure Data Studio now ships with a new default theme '{0}'. Do you want to give it a try?", label);
|
||||
}
|
||||
|
||||
//#endregion
|
||||
|
|
|
|||
|
|
@ -131,16 +131,18 @@ suite('Labels', () => {
|
|||
|
||||
// real world example (other)
|
||||
t = '${dirty}${activeEditorShort}${separator}${rootName}${separator}${appName}';
|
||||
// {{SQL CARBON EDIT}} Update application name to Azure Data Studio
|
||||
assert.strictEqual(labels.template(t, { dirty: '', activeEditorShort: '', rootName: '', appName: '', separator: { label: ' - ' } }), '');
|
||||
assert.strictEqual(labels.template(t, { dirty: '', activeEditorShort: '', rootName: '', appName: 'Visual Studio Code', separator: { label: ' - ' } }), 'Visual Studio Code');
|
||||
assert.strictEqual(labels.template(t, { dirty: '', activeEditorShort: 'Untitled-1', rootName: '', appName: 'Visual Studio Code', separator: { label: ' - ' } }), 'Untitled-1 - Visual Studio Code');
|
||||
assert.strictEqual(labels.template(t, { dirty: '', activeEditorShort: '', rootName: 'monaco', appName: 'Visual Studio Code', separator: { label: ' - ' } }), 'monaco - Visual Studio Code');
|
||||
assert.strictEqual(labels.template(t, { dirty: '', activeEditorShort: 'somefile.txt', rootName: 'monaco', appName: 'Visual Studio Code', separator: { label: ' - ' } }), 'somefile.txt - monaco - Visual Studio Code');
|
||||
assert.strictEqual(labels.template(t, { dirty: '* ', activeEditorShort: 'somefile.txt', rootName: 'monaco', appName: 'Visual Studio Code', separator: { label: ' - ' } }), '* somefile.txt - monaco - Visual Studio Code');
|
||||
assert.strictEqual(labels.template(t, { dirty: '', activeEditorShort: '', rootName: '', appName: 'Azure Data Studio', separator: { label: ' - ' } }), 'Azure Data Studio');
|
||||
assert.strictEqual(labels.template(t, { dirty: '', activeEditorShort: 'Untitled-1', rootName: '', appName: 'Azure Data Studio', separator: { label: ' - ' } }), 'Untitled-1 - Azure Data Studio');
|
||||
assert.strictEqual(labels.template(t, { dirty: '', activeEditorShort: '', rootName: 'monaco', appName: 'Azure Data Studio', separator: { label: ' - ' } }), 'monaco - Azure Data Studio');
|
||||
assert.strictEqual(labels.template(t, { dirty: '', activeEditorShort: 'somefile.txt', rootName: 'monaco', appName: 'Azure Data Studio', separator: { label: ' - ' } }), 'somefile.txt - monaco - Azure Data Studio');
|
||||
assert.strictEqual(labels.template(t, { dirty: '* ', activeEditorShort: 'somefile.txt', rootName: 'monaco', appName: 'Azure Data Studio', separator: { label: ' - ' } }), '* somefile.txt - monaco - Azure Data Studio');
|
||||
|
||||
// real world example (other)
|
||||
t = '${dirty}${activeEditorShort}${separator}${rootNameShort}${separator}${appName}';
|
||||
assert.strictEqual(labels.template(t, { dirty: '', activeEditorShort: '', rootName: 'monaco (Workspace)', rootNameShort: 'monaco', appName: 'Visual Studio Code', separator: { label: ' - ' } }), 'monaco - Visual Studio Code');
|
||||
// {{SQL CARBON EDIT}} Update application name to Azure Data Studio
|
||||
assert.strictEqual(labels.template(t, { dirty: '', activeEditorShort: '', rootName: 'monaco (Workspace)', rootNameShort: 'monaco', appName: 'Azure Data Studio', separator: { label: ' - ' } }), 'monaco - Azure Data Studio');
|
||||
});
|
||||
|
||||
test('mnemonicButtonLabel', () => {
|
||||
|
|
|
|||
|
|
@ -7,7 +7,8 @@
|
|||
<!-- Disable pinch zooming -->
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0, user-scalable=no">
|
||||
|
||||
<title>Visual Studio Code</title>
|
||||
<!-- {{SQL CARBON EDIT}} Update application name to Azure Data Studio -->
|
||||
<title>Azure Data Studio</title>
|
||||
|
||||
<!-- Scripts -->
|
||||
<script>
|
||||
|
|
@ -111,8 +112,9 @@
|
|||
</style>
|
||||
</head>
|
||||
<body>
|
||||
<!-- {{SQL CARBON EDIT}} Update application name to Azure Data Studio -->
|
||||
<span class="branding">
|
||||
Visual Studio Code
|
||||
Azure Data Studio
|
||||
</span>
|
||||
<div class="message-container">
|
||||
<div class="message">
|
||||
|
|
|
|||
|
|
@ -44,6 +44,7 @@ import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storag
|
|||
import { isWeb } from 'vs/base/common/platform';
|
||||
import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
|
||||
import { IHostService } from 'vs/workbench/services/host/browser/host';
|
||||
import { getNewThemeNotification, getThemeUpdatedNotification } from 'sql/base/common/locConstants';
|
||||
|
||||
export const manageExtensionIcon = registerIcon('theme-selection-manage-extension', Codicon.gear, localize('manageExtensionIcon', 'Icon for the \'Manage\' action in the theme selection quick pick.'));
|
||||
|
||||
|
|
@ -768,7 +769,8 @@ class DefaultThemeUpdatedNotificationContribution implements IWorkbenchContribut
|
|||
];
|
||||
await this._notificationService.prompt(
|
||||
Severity.Info,
|
||||
localize({ key: 'themeUpdatedNotification', comment: ['{0} is the name of the new default theme'] }, "Visual Studio Code now ships with a new default theme '{0}'. If you prefer, you can switch back to the old theme or try one of the many other color themes available.", newTheme.label),
|
||||
// {{SQL CARBON EDIT}} Update application name to Azure Data Studio, use custom localized string.
|
||||
getThemeUpdatedNotification(newTheme.label),
|
||||
choices,
|
||||
{
|
||||
onCancel: () => this._writeTelemetry('cancel')
|
||||
|
|
@ -796,7 +798,8 @@ class DefaultThemeUpdatedNotificationContribution implements IWorkbenchContribut
|
|||
}];
|
||||
await this._notificationService.prompt(
|
||||
Severity.Info,
|
||||
localize({ key: 'newThemeNotification', comment: ['{0} is the name of the new default theme'] }, "Visual Studio Code now ships with a new default theme '{0}'. Do you want to give it a try?", theme.label),
|
||||
// {{SQL CARBON EDIT}} Update application name to Azure Data Studio, use custom localized string.
|
||||
getNewThemeNotification(theme.label),
|
||||
choices,
|
||||
{ onCancel: () => this._writeTelemetry('cancel') }
|
||||
);
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче