development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-09-13 21:55:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix labels & comments about icon themes

Browse source
This commit is contained in:
Martin Aeschlimann 2020-04-05 15:19:39 +02:00
parent fe36108236
commit 1aba0fb8e4
6 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/vs/vscode.d.ts vendored
View file

@ -7869,7 +7869,7 @@ declare module 'vscode' {
/** /**
* The icon path or [ThemeIcon](#ThemeIcon) for the tree item. * The icon path or [ThemeIcon](#ThemeIcon) for the tree item.
* When `falsy`, [Folder Theme Icon](#ThemeIcon.Folder) is assigned, if item is collapsible otherwise [File Theme Icon](#ThemeIcon.File). * When `falsy`, [Folder Theme Icon](#ThemeIcon.Folder) is assigned, if item is collapsible otherwise [File Theme Icon](#ThemeIcon.File).
* When a [ThemeIcon](#ThemeIcon) is specified, icon is derived from the current file icon theme for the specified theme icon using [resourceUri](#TreeItem.resourceUri) (if provided). * When a file or folder [ThemeIcon](#ThemeIcon) is specified, icon is derived from the current file icon theme for the specified theme icon using [resourceUri](#TreeItem.resourceUri) (if provided).
*/ */
iconPath?: string | Uri | { light: string | Uri; dark: string | Uri } | ThemeIcon; iconPath?: string | Uri | { light: string | Uri; dark: string | Uri } | ThemeIcon;
@ -7883,7 +7883,7 @@ declare module 'vscode' {
* The [uri](#Uri) of the resource representing this item. * The [uri](#Uri) of the resource representing this item.
* *
* Will be used to derive the [label](#TreeItem.label), when it is not provided. * Will be used to derive the [label](#TreeItem.label), when it is not provided.
* Will be used to derive the icon from current icon theme, when [iconPath](#TreeItem.iconPath) has [ThemeIcon](#ThemeIcon) value. * Will be used to derive the icon from current file icon theme, when [iconPath](#TreeItem.iconPath) has [ThemeIcon](#ThemeIcon) value.
*/ */
resourceUri?: Uri; resourceUri?: Uri;

2
src/vs/workbench/browser/workbench.contribution.ts
View file

@ -98,7 +98,7 @@ import { workbenchConfigurationNodeBase } from 'vs/workbench/common/configuratio
}, },
'workbench.editor.showIcons': { 'workbench.editor.showIcons': {
'type': 'boolean', 'type': 'boolean',
'description': nls.localize('showIcons', "Controls whether opened editors should show with an icon or not. This requires an icon theme to be enabled as well."), 'description': nls.localize('showIcons', "Controls whether opened editors should show with an icon or not. This requires an file icon theme to be enabled as well."),
'default': true 'default': true
}, },
'workbench.editor.enablePreview': { 'workbench.editor.enablePreview': {

2
src/vs/workbench/contrib/extensions/browser/extensionEditor.ts
View file

@ -1166,7 +1166,7 @@ export class ExtensionEditor extends BaseEditor {
} }
const details = $('details', { open: true, ontoggle: onDetailsToggle }, const details = $('details', { open: true, ontoggle: onDetailsToggle },
$('summary', { tabindex: '0' }, localize('iconThemes', "Icon Themes ({0})", contrib.length)), $('summary', { tabindex: '0' }, localize('iconThemes', "File Icon Themes ({0})", contrib.length)),
$('ul', undefined, ...contrib.map(theme => $('li', undefined, theme.label))) $('ul', undefined, ...contrib.map(theme => $('li', undefined, theme.label)))
); );

2
src/vs/workbench/services/themes/common/fileIconThemeSchema.ts
View file

@ -120,7 +120,7 @@ const schema: IJSONSchema = {
properties: { properties: {
path: { path: {
type: 'string', type: 'string',
description: nls.localize('schema.font-path', 'The font path, relative to the current icon theme file.'), description: nls.localize('schema.font-path', 'The font path, relative to the current file icon theme file.'),
}, },
format: { format: {
type: 'string', type: 'string',

2
src/vs/workbench/services/themes/common/productIconThemeSchema.ts
View file

@ -34,7 +34,7 @@ const schema: IJSONSchema = {
properties: { properties: {
path: { path: {
type: 'string', type: 'string',
description: nls.localize('schema.font-path', 'The font path, relative to the current workbench icon theme file.'), description: nls.localize('schema.font-path', 'The font path, relative to the current product icon theme file.'),
}, },
format: { format: {
type: 'string', type: 'string',

6
src/vs/workbench/services/themes/common/themeConfiguration.ts
View file

@ -89,10 +89,10 @@ const fileIconThemeSettingSchema: IConfigurationPropertySchema = {
const productIconThemeSettingSchema: IConfigurationPropertySchema = { const productIconThemeSettingSchema: IConfigurationPropertySchema = {
type: ['string', 'null'], type: ['string', 'null'],
default: DEFAULT_PRODUCT_ICON_THEME_SETTING_VALUE, default: DEFAULT_PRODUCT_ICON_THEME_SETTING_VALUE,
description: nls.localize('workbenchIconTheme', "Specifies the workbench icon theme used."), description: nls.localize('productIconTheme', "Specifies the product icon theme used."),
enum: [DEFAULT_PRODUCT_ICON_THEME_SETTING_VALUE], enum: [DEFAULT_PRODUCT_ICON_THEME_SETTING_VALUE],
enumDescriptions: [nls.localize('defaultWorkbenchIconThemeDesc', 'Default')], enumDescriptions: [nls.localize('defaultProductIconThemeDesc', 'Default')],
errorMessage: nls.localize('workbenchIconThemeError', "Workbench icon theme is unknown or not installed.") errorMessage: nls.localize('productIconThemeError', "Product icon theme is unknown or not installed.")
}; };
const themeSettingsConfiguration: IConfigurationNode = { const themeSettingsConfiguration: IConfigurationNode = {