From ec02bcd1ccb387feeeb372208bfe741cc6de901b Mon Sep 17 00:00:00 2001 From: Martin Aeschlimann Date: Fri, 17 Apr 2020 13:39:54 +0200 Subject: [PATCH] codicon definitions in browser/ui/codicon/codicon --- build/gulpfile.editor.js | 2 +- build/gulpfile.vscode.js | 2 +- .../ui/breadcrumbs/breadcrumbsWidget.css | 2 +- .../ui/breadcrumbs/breadcrumbsWidget.ts | 5 +- src/vs/base/browser/ui/checkbox/checkbox.ts | 21 +- .../codicon/codicon-animations.css | 0 .../codicon/codicon-modifications.css | 0 .../codicon/codicon.css | 15 + .../codicon/codicon.ttf | Bin .../codiconLabel.ts | 3 - src/vs/base/browser/ui/codicons/codicons.ts | 435 ++++++++++++++++++ src/vs/base/browser/ui/dropdown/dropdown.ts | 2 +- .../ui/findinput/findInputCheckboxes.ts | 7 +- .../base/browser/ui/findinput/replaceInput.ts | 3 +- src/vs/base/browser/ui/menu/menu.ts | 8 +- src/vs/base/browser/ui/menu/menubar.ts | 5 +- .../ui/scrollbar/horizontalScrollbar.ts | 11 +- .../browser/ui/scrollbar/scrollbarArrow.ts | 5 + .../browser/ui/scrollbar/verticalScrollbar.ts | 10 +- src/vs/base/browser/ui/toolbar/toolbar.ts | 5 +- src/vs/base/browser/ui/tree/abstractTree.ts | 5 +- .../issue/issueReporterMain.ts | 2 +- .../editorScrollbar/editorScrollbar.ts | 4 +- src/vs/editor/contrib/find/findWidget.ts | 5 +- .../editor/contrib/suggest/suggestWidget.ts | 2 +- src/vs/platform/theme/common/iconRegistry.ts | 415 +---------------- .../browser/parts/statusbar/statusbarPart.ts | 2 +- .../preferences/browser/settingsTree.ts | 5 +- .../search/browser/patternInputWidget.ts | 4 +- .../contrib/search/browser/searchWidget.ts | 5 +- 30 files changed, 552 insertions(+), 438 deletions(-) rename src/vs/base/browser/ui/{codiconLabel => codicons}/codicon/codicon-animations.css (100%) rename src/vs/base/browser/ui/{codiconLabel => codicons}/codicon/codicon-modifications.css (100%) rename src/vs/base/browser/ui/{codiconLabel => codicons}/codicon/codicon.css (98%) rename src/vs/base/browser/ui/{codiconLabel => codicons}/codicon/codicon.ttf (100%) rename src/vs/base/browser/ui/{codiconLabel => codicons}/codiconLabel.ts (84%) create mode 100644 src/vs/base/browser/ui/codicons/codicons.ts diff --git a/build/gulpfile.editor.js b/build/gulpfile.editor.js index 21ba45a7360..f6106241ced 100644 --- a/build/gulpfile.editor.js +++ b/build/gulpfile.editor.js @@ -43,7 +43,7 @@ let editorEntryPoints = [ ]; let editorResources = [ - 'out-editor-build/vs/base/browser/ui/codiconLabel/**/*.ttf' + 'out-editor-build/vs/base/browser/ui/codicons/**/*.ttf' ]; let BUNDLED_FILE_HEADER = [ diff --git a/build/gulpfile.vscode.js b/build/gulpfile.vscode.js index 0e592c2fd48..04c168cb1a6 100644 --- a/build/gulpfile.vscode.js +++ b/build/gulpfile.vscode.js @@ -65,7 +65,7 @@ const vscodeResources = [ 'out-build/vs/base/common/performance.js', 'out-build/vs/base/node/languagePacks.js', 'out-build/vs/base/node/{stdForkStart.js,terminateProcess.sh,cpuUsage.sh,ps.sh}', - 'out-build/vs/base/browser/ui/codiconLabel/codicon/**', + 'out-build/vs/base/browser/ui/codicons/codicon/**', 'out-build/vs/workbench/browser/media/*-theme.css', 'out-build/vs/workbench/contrib/debug/**/*.json', 'out-build/vs/workbench/contrib/externalTerminal/**/*.scpt', diff --git a/src/vs/base/browser/ui/breadcrumbs/breadcrumbsWidget.css b/src/vs/base/browser/ui/breadcrumbs/breadcrumbsWidget.css index 65b207f0b04..50ad242acef 100644 --- a/src/vs/base/browser/ui/breadcrumbs/breadcrumbsWidget.css +++ b/src/vs/base/browser/ui/breadcrumbs/breadcrumbsWidget.css @@ -25,7 +25,7 @@ outline: none; } -.monaco-breadcrumbs .monaco-breadcrumb-item .codicon-chevron-right { +.monaco-breadcrumbs .monaco-breadcrumb-item .codicon-breadcrumb-separator { color: inherit; } diff --git a/src/vs/base/browser/ui/breadcrumbs/breadcrumbsWidget.ts b/src/vs/base/browser/ui/breadcrumbs/breadcrumbsWidget.ts index b1cffa15e90..6f49f8eca73 100644 --- a/src/vs/base/browser/ui/breadcrumbs/breadcrumbsWidget.ts +++ b/src/vs/base/browser/ui/breadcrumbs/breadcrumbsWidget.ts @@ -11,6 +11,7 @@ import { Color } from 'vs/base/common/color'; import { Emitter, Event } from 'vs/base/common/event'; import { dispose, IDisposable, DisposableStore } from 'vs/base/common/lifecycle'; import { ScrollbarVisibility } from 'vs/base/common/scrollable'; +import { Codicon, registerIcon } from 'vs/base/browser/ui/codicons/codicons'; import 'vs/css!./breadcrumbsWidget'; export abstract class BreadcrumbsItem { @@ -55,6 +56,8 @@ export interface IBreadcrumbsItemEvent { payload: any; } +const breadcrumbSeparatorIcon = registerIcon('breadcrumb-separator', Codicon.chevronRight); + export class BreadcrumbsWidget { private readonly _disposables = new DisposableStore(); @@ -336,7 +339,7 @@ export class BreadcrumbsWidget { container.tabIndex = -1; container.setAttribute('role', 'listitem'); dom.addClasses(container, 'monaco-breadcrumb-item'); - const iconContainer = dom.$('.codicon.codicon-chevron-right'); + const iconContainer = dom.$(breadcrumbSeparatorIcon.cssSelector); container.appendChild(iconContainer); } diff --git a/src/vs/base/browser/ui/checkbox/checkbox.ts b/src/vs/base/browser/ui/checkbox/checkbox.ts index 372119cfa19..8e56346242b 100644 --- a/src/vs/base/browser/ui/checkbox/checkbox.ts +++ b/src/vs/base/browser/ui/checkbox/checkbox.ts @@ -10,12 +10,13 @@ import { Widget } from 'vs/base/browser/ui/widget'; import { Color } from 'vs/base/common/color'; import { Emitter, Event } from 'vs/base/common/event'; import { KeyCode } from 'vs/base/common/keyCodes'; -import * as objects from 'vs/base/common/objects'; import { BaseActionViewItem } from 'vs/base/browser/ui/actionbar/actionbar'; import { DisposableStore } from 'vs/base/common/lifecycle'; +import { Codicon } from 'vs/base/browser/ui/codicons/codicons'; export interface ICheckboxOpts extends ICheckboxStyles { readonly actionClassName?: string; + readonly icon?: Codicon; readonly title: string; readonly isChecked: boolean; } @@ -93,13 +94,23 @@ export class Checkbox extends Widget { constructor(opts: ICheckboxOpts) { super(); - this._opts = objects.deepClone(opts); - objects.mixin(this._opts, defaultOpts, false); + this._opts = { ...defaultOpts, ...opts }; this._checked = this._opts.isChecked; + const classes = ['monaco-custom-checkbox']; + if (this._opts.icon) { + classes.push(this._opts.icon.className); + } else { + classes.push('codicon'); // todo: remove once codicon fully adopted + } + if (this._opts.actionClassName) { + classes.push(this._opts.actionClassName); + } + classes.push(this._checked ? 'checked' : 'unchecked'); + this.domNode = document.createElement('div'); this.domNode.title = this._opts.title; - this.domNode.className = 'monaco-custom-checkbox codicon ' + (this._opts.actionClassName || '') + ' ' + (this._checked ? 'checked' : 'unchecked'); + this.domNode.className = classes.join(' '); this.domNode.tabIndex = 0; this.domNode.setAttribute('role', 'checkbox'); this.domNode.setAttribute('aria-checked', String(this._checked)); @@ -192,7 +203,7 @@ export class SimpleCheckbox extends Widget { constructor(private title: string, private isChecked: boolean) { super(); - this.checkbox = new Checkbox({ title: this.title, isChecked: this.isChecked, actionClassName: 'monaco-simple-checkbox codicon-check' }); + this.checkbox = new Checkbox({ title: this.title, isChecked: this.isChecked, icon: Codicon.check, actionClassName: 'monaco-simple-checkbox' }); this.domNode = this.checkbox.domNode; diff --git a/src/vs/base/browser/ui/codiconLabel/codicon/codicon-animations.css b/src/vs/base/browser/ui/codicons/codicon/codicon-animations.css similarity index 100% rename from src/vs/base/browser/ui/codiconLabel/codicon/codicon-animations.css rename to src/vs/base/browser/ui/codicons/codicon/codicon-animations.css diff --git a/src/vs/base/browser/ui/codiconLabel/codicon/codicon-modifications.css b/src/vs/base/browser/ui/codicons/codicon/codicon-modifications.css similarity index 100% rename from src/vs/base/browser/ui/codiconLabel/codicon/codicon-modifications.css rename to src/vs/base/browser/ui/codicons/codicon/codicon-modifications.css diff --git a/src/vs/base/browser/ui/codiconLabel/codicon/codicon.css b/src/vs/base/browser/ui/codicons/codicon/codicon.css similarity index 98% rename from src/vs/base/browser/ui/codiconLabel/codicon/codicon.css rename to src/vs/base/browser/ui/codicons/codicon/codicon.css index 228bf3a4635..722e9580f6a 100644 --- a/src/vs/base/browser/ui/codiconLabel/codicon/codicon.css +++ b/src/vs/base/browser/ui/codicons/codicon/codicon.css @@ -82,6 +82,7 @@ .codicon-git-fork-private:before { content: "\ea75" } .codicon-lock:before { content: "\ea75" } .codicon-mirror-private:before { content: "\ea75" } +.codicon-list-close:before, .codicon-close:before { content: "\ea76" } .codicon-remove-close:before { content: "\ea76" } .codicon-x:before { content: "\ea76" } @@ -95,6 +96,8 @@ .codicon-device-desktop:before { content: "\ea7a" } .codicon-file:before { content: "\ea7b" } .codicon-file-text:before { content: "\ea7b" } +.codicon-toolbar-more:before, +.codicon-menubar-more:before, .codicon-more:before { content: "\ea7c" } .codicon-ellipsis:before { content: "\ea7c" } .codicon-kebab-horizontal:before { content: "\ea7c" } @@ -181,10 +184,15 @@ .codicon-bug:before { content: "\eaaf" } .codicon-calendar:before { content: "\eab0" } .codicon-case-sensitive:before { content: "\eab1" } + +.codicon-menu-selection:before, .codicon-check:before { content: "\eab2" } .codicon-checklist:before { content: "\eab3" } .codicon-chevron-down:before { content: "\eab4" } .codicon-chevron-left:before { content: "\eab5" } + +.codicon-menu-submenu:before, +.codicon-breadcrumb-separator:before, .codicon-chevron-right:before { content: "\eab6" } .codicon-chevron-up:before { content: "\eab7" } .codicon-chrome-close:before { content: "\eab8" } @@ -370,9 +378,13 @@ .codicon-thumbsdown:before { content: "\eb6b" } .codicon-thumbsup:before { content: "\eb6c" } .codicon-tools:before { content: "\eb6d" } +.codicon-scrollbar-button-down:before, .codicon-triangle-down:before { content: "\eb6e" } +.codicon-scrollbar-button-left:before, .codicon-triangle-left:before { content: "\eb6f" } +.codicon-scrollbar-button-right:before, .codicon-triangle-right:before { content: "\eb70" } +.codicon-scrollbar-button-up:before, .codicon-triangle-up:before { content: "\eb71" } .codicon-twitter:before { content: "\eb72" } .codicon-unfold:before { content: "\eb73" } @@ -393,7 +405,10 @@ .codicon-zoom-out:before { content: "\eb82" } .codicon-list-filter:before { content: "\eb83" } .codicon-list-flat:before { content: "\eb84" } +.codicon-search-show-context:before, .codicon-list-selection:before { content: "\eb85" } + +.codicon-find-selection:before, .codicon-selection:before { content: "\eb85" } .codicon-list-tree:before { content: "\eb86" } .codicon-debug-breakpoint-function-unverified:before { content: "\eb87" } diff --git a/src/vs/base/browser/ui/codiconLabel/codicon/codicon.ttf b/src/vs/base/browser/ui/codicons/codicon/codicon.ttf similarity index 100% rename from src/vs/base/browser/ui/codiconLabel/codicon/codicon.ttf rename to src/vs/base/browser/ui/codicons/codicon/codicon.ttf diff --git a/src/vs/base/browser/ui/codiconLabel/codiconLabel.ts b/src/vs/base/browser/ui/codicons/codiconLabel.ts similarity index 84% rename from src/vs/base/browser/ui/codiconLabel/codiconLabel.ts rename to src/vs/base/browser/ui/codicons/codiconLabel.ts index 2fce361f76d..5fd4d33ed44 100644 --- a/src/vs/base/browser/ui/codiconLabel/codiconLabel.ts +++ b/src/vs/base/browser/ui/codicons/codiconLabel.ts @@ -3,9 +3,6 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import 'vs/css!./codicon/codicon'; -import 'vs/css!./codicon/codicon-modifications'; -import 'vs/css!./codicon/codicon-animations'; import { escape } from 'vs/base/common/strings'; import { renderCodicons } from 'vs/base/common/codicons'; diff --git a/src/vs/base/browser/ui/codicons/codicons.ts b/src/vs/base/browser/ui/codicons/codicons.ts new file mode 100644 index 00000000000..33db7989b31 --- /dev/null +++ b/src/vs/base/browser/ui/codicons/codicons.ts @@ -0,0 +1,435 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ + +import 'vs/css!./codicon/codicon'; +import 'vs/css!./codicon/codicon-modifications'; +import 'vs/css!./codicon/codicon-animations'; + +const icons = new Map(); + +export class Codicon { + constructor(public readonly id: string, public readonly definition: Codicon | IconDefinition) { + if (icons.has(id)) { + console.log(`Duplicate registration of codicon ${id}`); + } + icons.set(id, this); + } + public get className() { return 'codicon codicon-' + this.id; } + public get cssSelector() { return '.codicon.codicon-' + this.id; } +} + +export interface IconDefinition { + character: string; +} + +export function registerIcon(id: string, def: Codicon) { + return new Codicon(id, def); +} + +export namespace Codicon { + // built-in characters + export const add = new Codicon('add', { character: '\ea60' }); + export const plus = new Codicon('plus', { character: '\ea60' }); + export const gistNew = new Codicon('gist-new', { character: '\ea60' }); + export const repoCreate = new Codicon('repo-create', { character: '\ea60' }); + export const lightbulb = new Codicon('lightbulb', { character: '\ea61' }); + export const lightBulb = new Codicon('light-bulb', { character: '\ea61' }); + export const repo = new Codicon('repo', { character: '\ea62' }); + export const repoDelete = new Codicon('repo-delete', { character: '\ea62' }); + export const gistFork = new Codicon('gist-fork', { character: '\ea63' }); + export const repoForked = new Codicon('repo-forked', { character: '\ea63' }); + export const gitPullRequest = new Codicon('git-pull-request', { character: '\ea64' }); + export const gitPullRequestAbandoned = new Codicon('git-pull-request-abandoned', { character: '\ea64' }); + export const recordKeys = new Codicon('record-keys', { character: '\ea65' }); + export const keyboard = new Codicon('keyboard', { character: '\ea65' }); + export const tag = new Codicon('tag', { character: '\ea66' }); + export const tagAdd = new Codicon('tag-add', { character: '\ea66' }); + export const tagRemove = new Codicon('tag-remove', { character: '\ea66' }); + export const person = new Codicon('person', { character: '\ea67' }); + export const personAdd = new Codicon('person-add', { character: '\ea67' }); + export const personFollow = new Codicon('person-follow', { character: '\ea67' }); + export const personOutline = new Codicon('person-outline', { character: '\ea67' }); + export const personFilled = new Codicon('person-filled', { character: '\ea67' }); + export const gitBranch = new Codicon('git-branch', { character: '\ea68' }); + export const gitBranchCreate = new Codicon('git-branch-create', { character: '\ea68' }); + export const gitBranchDelete = new Codicon('git-branch-delete', { character: '\ea68' }); + export const sourceControl = new Codicon('source-control', { character: '\ea68' }); + export const mirror = new Codicon('mirror', { character: '\ea69' }); + export const mirrorPublic = new Codicon('mirror-public', { character: '\ea69' }); + export const star = new Codicon('star', { character: '\ea6a' }); + export const starAdd = new Codicon('star-add', { character: '\ea6a' }); + export const starDelete = new Codicon('star-delete', { character: '\ea6a' }); + export const starEmpty = new Codicon('star-empty', { character: '\ea6a' }); + export const comment = new Codicon('comment', { character: '\ea6b' }); + export const commentAdd = new Codicon('comment-add', { character: '\ea6b' }); + export const alert = new Codicon('alert', { character: '\ea6c' }); + export const warning = new Codicon('warning', { character: '\ea6c' }); + export const search = new Codicon('search', { character: '\ea6d' }); + export const searchSave = new Codicon('search-save', { character: '\ea6d' }); + export const logOut = new Codicon('log-out', { character: '\ea6e' }); + export const signOut = new Codicon('sign-out', { character: '\ea6e' }); + export const logIn = new Codicon('log-in', { character: '\ea6f' }); + export const signIn = new Codicon('sign-in', { character: '\ea6f' }); + export const eye = new Codicon('eye', { character: '\ea70' }); + export const eyeUnwatch = new Codicon('eye-unwatch', { character: '\ea70' }); + export const eyeWatch = new Codicon('eye-watch', { character: '\ea70' }); + export const circleFilled = new Codicon('circle-filled', { character: '\ea71' }); + export const primitiveDot = new Codicon('primitive-dot', { character: '\ea71' }); + export const closeDirty = new Codicon('close-dirty', { character: '\ea71' }); + export const debugBreakpoint = new Codicon('debug-breakpoint', { character: '\ea71' }); + export const debugBreakpointDisabled = new Codicon('debug-breakpoint-disabled', { character: '\ea71' }); + export const debugHint = new Codicon('debug-hint', { character: '\ea71' }); + export const primitiveSquare = new Codicon('primitive-square', { character: '\ea72' }); + export const edit = new Codicon('edit', { character: '\ea73' }); + export const pencil = new Codicon('pencil', { character: '\ea73' }); + export const info = new Codicon('info', { character: '\ea74' }); + export const issueOpened = new Codicon('issue-opened', { character: '\ea74' }); + export const gistPrivate = new Codicon('gist-private', { character: '\ea75' }); + export const gitForkPrivate = new Codicon('git-fork-private', { character: '\ea75' }); + export const lock = new Codicon('lock', { character: '\ea75' }); + export const mirrorPrivate = new Codicon('mirror-private', { character: '\ea75' }); + export const close = new Codicon('close', { character: '\ea76' }); + export const removeClose = new Codicon('remove-close', { character: '\ea76' }); + export const x = new Codicon('x', { character: '\ea76' }); + export const repoSync = new Codicon('repo-sync', { character: '\ea77' }); + export const sync = new Codicon('sync', { character: '\ea77' }); + export const clone = new Codicon('clone', { character: '\ea78' }); + export const desktopDownload = new Codicon('desktop-download', { character: '\ea78' }); + export const beaker = new Codicon('beaker', { character: '\ea79' }); + export const microscope = new Codicon('microscope', { character: '\ea79' }); + export const vm = new Codicon('vm', { character: '\ea7a' }); + export const deviceDesktop = new Codicon('device-desktop', { character: '\ea7a' }); + export const file = new Codicon('file', { character: '\ea7b' }); + export const fileText = new Codicon('file-text', { character: '\ea7b' }); + export const more = new Codicon('more', { character: '\ea7c' }); + export const ellipsis = new Codicon('ellipsis', { character: '\ea7c' }); + export const kebabHorizontal = new Codicon('kebab-horizontal', { character: '\ea7c' }); + export const mailReply = new Codicon('mail-reply', { character: '\ea7d' }); + export const reply = new Codicon('reply', { character: '\ea7d' }); + export const organization = new Codicon('organization', { character: '\ea7e' }); + export const organizationFilled = new Codicon('organization-filled', { character: '\ea7e' }); + export const organizationOutline = new Codicon('organization-outline', { character: '\ea7e' }); + export const newFile = new Codicon('new-file', { character: '\ea7f' }); + export const fileAdd = new Codicon('file-add', { character: '\ea7f' }); + export const newFolder = new Codicon('new-folder', { character: '\ea80' }); + export const fileDirectoryCreate = new Codicon('file-directory-create', { character: '\ea80' }); + export const trash = new Codicon('trash', { character: '\ea81' }); + export const trashcan = new Codicon('trashcan', { character: '\ea81' }); + export const history = new Codicon('history', { character: '\ea82' }); + export const clock = new Codicon('clock', { character: '\ea82' }); + export const folder = new Codicon('folder', { character: '\ea83' }); + export const fileDirectory = new Codicon('file-directory', { character: '\ea83' }); + export const symbolFolder = new Codicon('symbol-folder', { character: '\ea83' }); + export const logoGithub = new Codicon('logo-github', { character: '\ea84' }); + export const markGithub = new Codicon('mark-github', { character: '\ea84' }); + export const github = new Codicon('github', { character: '\ea84' }); + export const terminal = new Codicon('terminal', { character: '\ea85' }); + export const console = new Codicon('console', { character: '\ea85' }); + export const repl = new Codicon('repl', { character: '\ea85' }); + export const zap = new Codicon('zap', { character: '\ea86' }); + export const symbolEvent = new Codicon('symbol-event', { character: '\ea86' }); + export const error = new Codicon('error', { character: '\ea87' }); + export const stop = new Codicon('stop', { character: '\ea87' }); + export const variable = new Codicon('variable', { character: '\ea88' }); + export const symbolVariable = new Codicon('symbol-variable', { character: '\ea88' }); + export const array = new Codicon('array', { character: '\ea8a' }); + export const symbolArray = new Codicon('symbol-array', { character: '\ea8a' }); + export const symbolModule = new Codicon('symbol-module', { character: '\ea8b' }); + export const symbolPackage = new Codicon('symbol-package', { character: '\ea8b' }); + export const symbolNamespace = new Codicon('symbol-namespace', { character: '\ea8b' }); + export const symbolObject = new Codicon('symbol-object', { character: '\ea8b' }); + export const symbolMethod = new Codicon('symbol-method', { character: '\ea8c' }); + export const symbolFunction = new Codicon('symbol-function', { character: '\ea8c' }); + export const symbolConstructor = new Codicon('symbol-constructor', { character: '\ea8c' }); + export const symbolBoolean = new Codicon('symbol-boolean', { character: '\ea8f' }); + export const symbolNull = new Codicon('symbol-null', { character: '\ea8f' }); + export const symbolNumeric = new Codicon('symbol-numeric', { character: '\ea90' }); + export const symbolNumber = new Codicon('symbol-number', { character: '\ea90' }); + export const symbolStructure = new Codicon('symbol-structure', { character: '\ea91' }); + export const symbolStruct = new Codicon('symbol-struct', { character: '\ea91' }); + export const symbolParameter = new Codicon('symbol-parameter', { character: '\ea92' }); + export const symbolTypeParameter = new Codicon('symbol-type-parameter', { character: '\ea92' }); + export const symbolKey = new Codicon('symbol-key', { character: '\ea93' }); + export const symbolText = new Codicon('symbol-text', { character: '\ea93' }); + export const symbolReference = new Codicon('symbol-reference', { character: '\ea94' }); + export const goToFile = new Codicon('go-to-file', { character: '\ea94' }); + export const symbolEnum = new Codicon('symbol-enum', { character: '\ea95' }); + export const symbolValue = new Codicon('symbol-value', { character: '\ea95' }); + export const symbolRuler = new Codicon('symbol-ruler', { character: '\ea96' }); + export const symbolUnit = new Codicon('symbol-unit', { character: '\ea96' }); + export const activateBreakpoints = new Codicon('activate-breakpoints', { character: '\ea97' }); + export const archive = new Codicon('archive', { character: '\ea98' }); + export const arrowBoth = new Codicon('arrow-both', { character: '\ea99' }); + export const arrowDown = new Codicon('arrow-down', { character: '\ea9a' }); + export const arrowLeft = new Codicon('arrow-left', { character: '\ea9b' }); + export const arrowRight = new Codicon('arrow-right', { character: '\ea9c' }); + export const arrowSmallDown = new Codicon('arrow-small-down', { character: '\ea9d' }); + export const arrowSmallLeft = new Codicon('arrow-small-left', { character: '\ea9e' }); + export const arrowSmallRight = new Codicon('arrow-small-right', { character: '\ea9f' }); + export const arrowSmallUp = new Codicon('arrow-small-up', { character: '\eaa0' }); + export const arrowUp = new Codicon('arrow-up', { character: '\eaa1' }); + export const bell = new Codicon('bell', { character: '\eaa2' }); + export const bold = new Codicon('bold', { character: '\eaa3' }); + export const book = new Codicon('book', { character: '\eaa4' }); + export const bookmark = new Codicon('bookmark', { character: '\eaa5' }); + export const debugBreakpointConditionalUnverified = new Codicon('debug-breakpoint-conditional-unverified', { character: '\eaa6' }); + export const debugBreakpointConditional = new Codicon('debug-breakpoint-conditional', { character: '\eaa7' }); + export const debugBreakpointConditionalDisabled = new Codicon('debug-breakpoint-conditional-disabled', { character: '\eaa7' }); + export const debugBreakpointDataUnverified = new Codicon('debug-breakpoint-data-unverified', { character: '\eaa8' }); + export const debugBreakpointData = new Codicon('debug-breakpoint-data', { character: '\eaa9' }); + export const debugBreakpointDataDisabled = new Codicon('debug-breakpoint-data-disabled', { character: '\eaa9' }); + export const debugBreakpointLogUnverified = new Codicon('debug-breakpoint-log-unverified', { character: '\eaaa' }); + export const debugBreakpointLog = new Codicon('debug-breakpoint-log', { character: '\eaab' }); + export const debugBreakpointLogDisabled = new Codicon('debug-breakpoint-log-disabled', { character: '\eaab' }); + export const briefcase = new Codicon('briefcase', { character: '\eaac' }); + export const broadcast = new Codicon('broadcast', { character: '\eaad' }); + export const browser = new Codicon('browser', { character: '\eaae' }); + export const bug = new Codicon('bug', { character: '\eaaf' }); + export const calendar = new Codicon('calendar', { character: '\eab0' }); + export const caseSensitive = new Codicon('case-sensitive', { character: '\eab1' }); + export const check = new Codicon('check', { character: '\eab2' }); + export const checklist = new Codicon('checklist', { character: '\eab3' }); + export const chevronDown = new Codicon('chevron-down', { character: '\eab4' }); + export const chevronLeft = new Codicon('chevron-left', { character: '\eab5' }); + export const chevronRight = new Codicon('chevron-right', { character: '\eab6' }); + export const chevronUp = new Codicon('chevron-up', { character: '\eab7' }); + export const chromeClose = new Codicon('chrome-close', { character: '\eab8' }); + export const chromeMaximize = new Codicon('chrome-maximize', { character: '\eab9' }); + export const chromeMinimize = new Codicon('chrome-minimize', { character: '\eaba' }); + export const chromeRestore = new Codicon('chrome-restore', { character: '\eabb' }); + export const circleOutline = new Codicon('circle-outline', { character: '\eabc' }); + export const debugBreakpointUnverified = new Codicon('debug-breakpoint-unverified', { character: '\eabc' }); + export const circleSlash = new Codicon('circle-slash', { character: '\eabd' }); + export const circuitBoard = new Codicon('circuit-board', { character: '\eabe' }); + export const clearAll = new Codicon('clear-all', { character: '\eabf' }); + export const clippy = new Codicon('clippy', { character: '\eac0' }); + export const closeAll = new Codicon('close-all', { character: '\eac1' }); + export const cloudDownload = new Codicon('cloud-download', { character: '\eac2' }); + export const cloudUpload = new Codicon('cloud-upload', { character: '\eac3' }); + export const code = new Codicon('code', { character: '\eac4' }); + export const collapseAll = new Codicon('collapse-all', { character: '\eac5' }); + export const colorMode = new Codicon('color-mode', { character: '\eac6' }); + export const commentDiscussion = new Codicon('comment-discussion', { character: '\eac7' }); + export const compareChanges = new Codicon('compare-changes', { character: '\eac8' }); + export const creditCard = new Codicon('credit-card', { character: '\eac9' }); + export const dash = new Codicon('dash', { character: '\eacc' }); + export const dashboard = new Codicon('dashboard', { character: '\eacd' }); + export const database = new Codicon('database', { character: '\eace' }); + export const debugContinue = new Codicon('debug-continue', { character: '\eacf' }); + export const debugDisconnect = new Codicon('debug-disconnect', { character: '\ead0' }); + export const debugPause = new Codicon('debug-pause', { character: '\ead1' }); + export const debugRestart = new Codicon('debug-restart', { character: '\ead2' }); + export const debugStart = new Codicon('debug-start', { character: '\ead3' }); + export const debugStepInto = new Codicon('debug-step-into', { character: '\ead4' }); + export const debugStepOut = new Codicon('debug-step-out', { character: '\ead5' }); + export const debugStepOver = new Codicon('debug-step-over', { character: '\ead6' }); + export const debugStop = new Codicon('debug-stop', { character: '\ead7' }); + export const debug = new Codicon('debug', { character: '\ead8' }); + export const deviceCameraVideo = new Codicon('device-camera-video', { character: '\ead9' }); + export const deviceCamera = new Codicon('device-camera', { character: '\eada' }); + export const deviceMobile = new Codicon('device-mobile', { character: '\eadb' }); + export const diffAdded = new Codicon('diff-added', { character: '\eadc' }); + export const diffIgnored = new Codicon('diff-ignored', { character: '\eadd' }); + export const diffModified = new Codicon('diff-modified', { character: '\eade' }); + export const diffRemoved = new Codicon('diff-removed', { character: '\eadf' }); + export const diffRenamed = new Codicon('diff-renamed', { character: '\eae0' }); + export const diff = new Codicon('diff', { character: '\eae1' }); + export const discard = new Codicon('discard', { character: '\eae2' }); + export const editorLayout = new Codicon('editor-layout', { character: '\eae3' }); + export const emptyWindow = new Codicon('empty-window', { character: '\eae4' }); + export const exclude = new Codicon('exclude', { character: '\eae5' }); + export const extensions = new Codicon('extensions', { character: '\eae6' }); + export const eyeClosed = new Codicon('eye-closed', { character: '\eae7' }); + export const fileBinary = new Codicon('file-binary', { character: '\eae8' }); + export const fileCode = new Codicon('file-code', { character: '\eae9' }); + export const fileMedia = new Codicon('file-media', { character: '\eaea' }); + export const filePdf = new Codicon('file-pdf', { character: '\eaeb' }); + export const fileSubmodule = new Codicon('file-submodule', { character: '\eaec' }); + export const fileSymlinkDirectory = new Codicon('file-symlink-directory', { character: '\eaed' }); + export const fileSymlinkFile = new Codicon('file-symlink-file', { character: '\eaee' }); + export const fileZip = new Codicon('file-zip', { character: '\eaef' }); + export const files = new Codicon('files', { character: '\eaf0' }); + export const filter = new Codicon('filter', { character: '\eaf1' }); + export const flame = new Codicon('flame', { character: '\eaf2' }); + export const foldDown = new Codicon('fold-down', { character: '\eaf3' }); + export const foldUp = new Codicon('fold-up', { character: '\eaf4' }); + export const fold = new Codicon('fold', { character: '\eaf5' }); + export const folderActive = new Codicon('folder-active', { character: '\eaf6' }); + export const folderOpened = new Codicon('folder-opened', { character: '\eaf7' }); + export const gear = new Codicon('gear', { character: '\eaf8' }); + export const gift = new Codicon('gift', { character: '\eaf9' }); + export const gistSecret = new Codicon('gist-secret', { character: '\eafa' }); + export const gist = new Codicon('gist', { character: '\eafb' }); + export const gitCommit = new Codicon('git-commit', { character: '\eafc' }); + export const gitCompare = new Codicon('git-compare', { character: '\eafd' }); + export const gitMerge = new Codicon('git-merge', { character: '\eafe' }); + export const githubAction = new Codicon('github-action', { character: '\eaff' }); + export const githubAlt = new Codicon('github-alt', { character: '\eb00' }); + export const globe = new Codicon('globe', { character: '\eb01' }); + export const grabber = new Codicon('grabber', { character: '\eb02' }); + export const graph = new Codicon('graph', { character: '\eb03' }); + export const gripper = new Codicon('gripper', { character: '\eb04' }); + export const heart = new Codicon('heart', { character: '\eb05' }); + export const home = new Codicon('home', { character: '\eb06' }); + export const horizontalRule = new Codicon('horizontal-rule', { character: '\eb07' }); + export const hubot = new Codicon('hubot', { character: '\eb08' }); + export const inbox = new Codicon('inbox', { character: '\eb09' }); + export const issueClosed = new Codicon('issue-closed', { character: '\eb0a' }); + export const issueReopened = new Codicon('issue-reopened', { character: '\eb0b' }); + export const issues = new Codicon('issues', { character: '\eb0c' }); + export const italic = new Codicon('italic', { character: '\eb0d' }); + export const jersey = new Codicon('jersey', { character: '\eb0e' }); + export const json = new Codicon('json', { character: '\eb0f' }); + export const kebabVertical = new Codicon('kebab-vertical', { character: '\eb10' }); + export const key = new Codicon('key', { character: '\eb11' }); + export const law = new Codicon('law', { character: '\eb12' }); + export const lightbulbAutofix = new Codicon('lightbulb-autofix', { character: '\eb13' }); + export const linkExternal = new Codicon('link-external', { character: '\eb14' }); + export const link = new Codicon('link', { character: '\eb15' }); + export const listOrdered = new Codicon('list-ordered', { character: '\eb16' }); + export const listUnordered = new Codicon('list-unordered', { character: '\eb17' }); + export const liveShare = new Codicon('live-share', { character: '\eb18' }); + export const loading = new Codicon('loading', { character: '\eb19' }); + export const location = new Codicon('location', { character: '\eb1a' }); + export const mailRead = new Codicon('mail-read', { character: '\eb1b' }); + export const mail = new Codicon('mail', { character: '\eb1c' }); + export const markdown = new Codicon('markdown', { character: '\eb1d' }); + export const megaphone = new Codicon('megaphone', { character: '\eb1e' }); + export const mention = new Codicon('mention', { character: '\eb1f' }); + export const milestone = new Codicon('milestone', { character: '\eb20' }); + export const mortarBoard = new Codicon('mortar-board', { character: '\eb21' }); + export const move = new Codicon('move', { character: '\eb22' }); + export const multipleWindows = new Codicon('multiple-windows', { character: '\eb23' }); + export const mute = new Codicon('mute', { character: '\eb24' }); + export const noNewline = new Codicon('no-newline', { character: '\eb25' }); + export const note = new Codicon('note', { character: '\eb26' }); + export const octoface = new Codicon('octoface', { character: '\eb27' }); + export const openPreview = new Codicon('open-preview', { character: '\eb28' }); + export const _package = new Codicon('package', { character: '\eb29' }); + export const paintcan = new Codicon('paintcan', { character: '\eb2a' }); + export const pin = new Codicon('pin', { character: '\eb2b' }); + export const play = new Codicon('play', { character: '\eb2c' }); + export const run = new Codicon('run', { character: '\eb2c' }); + export const plug = new Codicon('plug', { character: '\eb2d' }); + export const preserveCase = new Codicon('preserve-case', { character: '\eb2e' }); + export const preview = new Codicon('preview', { character: '\eb2f' }); + export const project = new Codicon('project', { character: '\eb30' }); + export const pulse = new Codicon('pulse', { character: '\eb31' }); + export const question = new Codicon('question', { character: '\eb32' }); + export const quote = new Codicon('quote', { character: '\eb33' }); + export const radioTower = new Codicon('radio-tower', { character: '\eb34' }); + export const reactions = new Codicon('reactions', { character: '\eb35' }); + export const references = new Codicon('references', { character: '\eb36' }); + export const refresh = new Codicon('refresh', { character: '\eb37' }); + export const regex = new Codicon('regex', { character: '\eb38' }); + export const remoteExplorer = new Codicon('remote-explorer', { character: '\eb39' }); + export const remote = new Codicon('remote', { character: '\eb3a' }); + export const remove = new Codicon('remove', { character: '\eb3b' }); + export const replaceAll = new Codicon('replace-all', { character: '\eb3c' }); + export const replace = new Codicon('replace', { character: '\eb3d' }); + export const repoClone = new Codicon('repo-clone', { character: '\eb3e' }); + export const repoForcePush = new Codicon('repo-force-push', { character: '\eb3f' }); + export const repoPull = new Codicon('repo-pull', { character: '\eb40' }); + export const repoPush = new Codicon('repo-push', { character: '\eb41' }); + export const report = new Codicon('report', { character: '\eb42' }); + export const requestChanges = new Codicon('request-changes', { character: '\eb43' }); + export const rocket = new Codicon('rocket', { character: '\eb44' }); + export const rootFolderOpened = new Codicon('root-folder-opened', { character: '\eb45' }); + export const rootFolder = new Codicon('root-folder', { character: '\eb46' }); + export const rss = new Codicon('rss', { character: '\eb47' }); + export const ruby = new Codicon('ruby', { character: '\eb48' }); + export const saveAll = new Codicon('save-all', { character: '\eb49' }); + export const saveAs = new Codicon('save-as', { character: '\eb4a' }); + export const save = new Codicon('save', { character: '\eb4b' }); + export const screenFull = new Codicon('screen-full', { character: '\eb4c' }); + export const screenNormal = new Codicon('screen-normal', { character: '\eb4d' }); + export const searchStop = new Codicon('search-stop', { character: '\eb4e' }); + export const server = new Codicon('server', { character: '\eb50' }); + export const settingsGear = new Codicon('settings-gear', { character: '\eb51' }); + export const settings = new Codicon('settings', { character: '\eb52' }); + export const shield = new Codicon('shield', { character: '\eb53' }); + export const smiley = new Codicon('smiley', { character: '\eb54' }); + export const sortPrecedence = new Codicon('sort-precedence', { character: '\eb55' }); + export const splitHorizontal = new Codicon('split-horizontal', { character: '\eb56' }); + export const splitVertical = new Codicon('split-vertical', { character: '\eb57' }); + export const squirrel = new Codicon('squirrel', { character: '\eb58' }); + export const starFull = new Codicon('star-full', { character: '\eb59' }); + export const starHalf = new Codicon('star-half', { character: '\eb5a' }); + export const symbolClass = new Codicon('symbol-class', { character: '\eb5b' }); + export const symbolColor = new Codicon('symbol-color', { character: '\eb5c' }); + export const symbolConstant = new Codicon('symbol-constant', { character: '\eb5d' }); + export const symbolEnumMember = new Codicon('symbol-enum-member', { character: '\eb5e' }); + export const symbolField = new Codicon('symbol-field', { character: '\eb5f' }); + export const symbolFile = new Codicon('symbol-file', { character: '\eb60' }); + export const symbolInterface = new Codicon('symbol-interface', { character: '\eb61' }); + export const symbolKeyword = new Codicon('symbol-keyword', { character: '\eb62' }); + export const symbolMisc = new Codicon('symbol-misc', { character: '\eb63' }); + export const symbolOperator = new Codicon('symbol-operator', { character: '\eb64' }); + export const symbolProperty = new Codicon('symbol-property', { character: '\eb65' }); + export const wrench = new Codicon('wrench', { character: '\eb65' }); + export const wrenchSubaction = new Codicon('wrench-subaction', { character: '\eb65' }); + export const symbolSnippet = new Codicon('symbol-snippet', { character: '\eb66' }); + export const tasklist = new Codicon('tasklist', { character: '\eb67' }); + export const telescope = new Codicon('telescope', { character: '\eb68' }); + export const textSize = new Codicon('text-size', { character: '\eb69' }); + export const threeBars = new Codicon('three-bars', { character: '\eb6a' }); + export const thumbsdown = new Codicon('thumbsdown', { character: '\eb6b' }); + export const thumbsup = new Codicon('thumbsup', { character: '\eb6c' }); + export const tools = new Codicon('tools', { character: '\eb6d' }); + export const triangleDown = new Codicon('triangle-down', { character: '\eb6e' }); + export const triangleLeft = new Codicon('triangle-left', { character: '\eb6f' }); + export const triangleRight = new Codicon('triangle-right', { character: '\eb70' }); + export const triangleUp = new Codicon('triangle-up', { character: '\eb71' }); + export const twitter = new Codicon('twitter', { character: '\eb72' }); + export const unfold = new Codicon('unfold', { character: '\eb73' }); + export const unlock = new Codicon('unlock', { character: '\eb74' }); + export const unmute = new Codicon('unmute', { character: '\eb75' }); + export const unverified = new Codicon('unverified', { character: '\eb76' }); + export const verified = new Codicon('verified', { character: '\eb77' }); + export const versions = new Codicon('versions', { character: '\eb78' }); + export const vmActive = new Codicon('vm-active', { character: '\eb79' }); + export const vmOutline = new Codicon('vm-outline', { character: '\eb7a' }); + export const vmRunning = new Codicon('vm-running', { character: '\eb7b' }); + export const watch = new Codicon('watch', { character: '\eb7c' }); + export const whitespace = new Codicon('whitespace', { character: '\eb7d' }); + export const wholeWord = new Codicon('whole-word', { character: '\eb7e' }); + export const window = new Codicon('window', { character: '\eb7f' }); + export const wordWrap = new Codicon('word-wrap', { character: '\eb80' }); + export const zoomIn = new Codicon('zoom-in', { character: '\eb81' }); + export const zoomOut = new Codicon('zoom-out', { character: '\eb82' }); + export const listFilter = new Codicon('list-filter', { character: '\eb83' }); + export const listFlat = new Codicon('list-flat', { character: '\eb84' }); + export const listSelection = new Codicon('list-selection', { character: '\eb85' }); + export const selection = new Codicon('selection', { character: '\eb85' }); + export const listTree = new Codicon('list-tree', { character: '\eb86' }); + export const debugBreakpointFunctionUnverified = new Codicon('debug-breakpoint-function-unverified', { character: '\eb87' }); + export const debugBreakpointFunction = new Codicon('debug-breakpoint-function', { character: '\eb88' }); + export const debugBreakpointFunctionDisabled = new Codicon('debug-breakpoint-function-disabled', { character: '\eb88' }); + export const debugStackframeActive = new Codicon('debug-stackframe-active', { character: '\eb89' }); + export const debugStackframeDot = new Codicon('debug-stackframe-dot', { character: '\eb8a' }); + export const debugStackframe = new Codicon('debug-stackframe', { character: '\eb8b' }); + export const debugStackframeFocused = new Codicon('debug-stackframe-focused', { character: '\eb8b' }); + export const debugBreakpointUnsupported = new Codicon('debug-breakpoint-unsupported', { character: '\eb8c' }); + export const symbolString = new Codicon('symbol-string', { character: '\eb8d' }); + export const debugReverseContinue = new Codicon('debug-reverse-continue', { character: '\eb8e' }); + export const debugStepBack = new Codicon('debug-step-back', { character: '\eb8f' }); + export const debugRestartFrame = new Codicon('debug-restart-frame', { character: '\eb90' }); + export const debugAlternate = new Codicon('debug-alternate', { character: '\eb91' }); + export const callIncoming = new Codicon('call-incoming', { character: '\eb92' }); + export const callOutgoing = new Codicon('call-outgoing', { character: '\eb93' }); + export const menu = new Codicon('menu', { character: '\eb94' }); + export const expandAll = new Codicon('expand-all', { character: '\eb95' }); + export const feedback = new Codicon('feedback', { character: '\eb96' }); + export const groupByRefType = new Codicon('group-by-ref-type', { character: '\eb97' }); + export const ungroupByRefType = new Codicon('ungroup-by-ref-type', { character: '\eb98' }); + export const bellDot = new Codicon('bell-dot', { character: '\f101' }); + export const debugAlt2 = new Codicon('debug-alt-2', { character: '\f102' }); + export const debugAlt = new Codicon('debug-alt', { character: '\f103' }); +} + + + + + diff --git a/src/vs/base/browser/ui/dropdown/dropdown.ts b/src/vs/base/browser/ui/dropdown/dropdown.ts index f54d01606cb..b58a5a0f8b4 100644 --- a/src/vs/base/browser/ui/dropdown/dropdown.ts +++ b/src/vs/base/browser/ui/dropdown/dropdown.ts @@ -295,7 +295,7 @@ export class DropdownMenuActionViewItem extends BaseActionViewItem { render(container: HTMLElement): void { const labelRenderer: ILabelRenderer = (el: HTMLElement): IDisposable | null => { - this.element = append(el, $('a.action-label.codicon')); + this.element = append(el, $('a.action-label.codicon')); // TODO: remove codicon, should come through `this.clazz` if (this.clazz) { addClasses(this.element, this.clazz); } diff --git a/src/vs/base/browser/ui/findinput/findInputCheckboxes.ts b/src/vs/base/browser/ui/findinput/findInputCheckboxes.ts index b7ca14b0d7a..76396a56ed5 100644 --- a/src/vs/base/browser/ui/findinput/findInputCheckboxes.ts +++ b/src/vs/base/browser/ui/findinput/findInputCheckboxes.ts @@ -6,6 +6,7 @@ import { Checkbox } from 'vs/base/browser/ui/checkbox/checkbox'; import { Color } from 'vs/base/common/color'; import * as nls from 'vs/nls'; +import { Codicon } from 'vs/base/browser/ui/codicons/codicons'; export interface IFindInputCheckboxOpts { readonly appendTitle: string; @@ -21,7 +22,7 @@ const NLS_REGEX_CHECKBOX_LABEL = nls.localize('regexDescription', "Use Regular E export class CaseSensitiveCheckbox extends Checkbox { constructor(opts: IFindInputCheckboxOpts) { super({ - actionClassName: 'codicon-case-sensitive', + icon: Codicon.caseSensitive, title: NLS_CASE_SENSITIVE_CHECKBOX_LABEL + opts.appendTitle, isChecked: opts.isChecked, inputActiveOptionBorder: opts.inputActiveOptionBorder, @@ -33,7 +34,7 @@ export class CaseSensitiveCheckbox extends Checkbox { export class WholeWordsCheckbox extends Checkbox { constructor(opts: IFindInputCheckboxOpts) { super({ - actionClassName: 'codicon-whole-word', + icon: Codicon.wholeWord, title: NLS_WHOLE_WORD_CHECKBOX_LABEL + opts.appendTitle, isChecked: opts.isChecked, inputActiveOptionBorder: opts.inputActiveOptionBorder, @@ -45,7 +46,7 @@ export class WholeWordsCheckbox extends Checkbox { export class RegexCheckbox extends Checkbox { constructor(opts: IFindInputCheckboxOpts) { super({ - actionClassName: 'codicon-regex', + icon: Codicon.regex, title: NLS_REGEX_CHECKBOX_LABEL + opts.appendTitle, isChecked: opts.isChecked, inputActiveOptionBorder: opts.inputActiveOptionBorder, diff --git a/src/vs/base/browser/ui/findinput/replaceInput.ts b/src/vs/base/browser/ui/findinput/replaceInput.ts index 5950e261de4..cc43ed389e3 100644 --- a/src/vs/base/browser/ui/findinput/replaceInput.ts +++ b/src/vs/base/browser/ui/findinput/replaceInput.ts @@ -17,6 +17,7 @@ import { KeyCode } from 'vs/base/common/keyCodes'; import { Color } from 'vs/base/common/color'; import { ICheckboxStyles, Checkbox } from 'vs/base/browser/ui/checkbox/checkbox'; import { IFindInputCheckboxOpts } from 'vs/base/browser/ui/findinput/findInputCheckboxes'; +import { Codicon } from 'vs/base/browser/ui/codicons/codicons'; export interface IReplaceInputOptions extends IReplaceInputStyles { readonly placeholder?: string; @@ -42,7 +43,7 @@ export class PreserveCaseCheckbox extends Checkbox { constructor(opts: IFindInputCheckboxOpts) { super({ // TODO: does this need its own icon? - actionClassName: 'codicon-preserve-case', + icon: Codicon.preserveCase, title: NLS_PRESERVE_CASE_LABEL + opts.appendTitle, isChecked: opts.isChecked, inputActiveOptionBorder: opts.inputActiveOptionBorder, diff --git a/src/vs/base/browser/ui/menu/menu.ts b/src/vs/base/browser/ui/menu/menu.ts index 90d828ba7c3..cb6909dbddf 100644 --- a/src/vs/base/browser/ui/menu/menu.ts +++ b/src/vs/base/browser/ui/menu/menu.ts @@ -20,10 +20,14 @@ import { Event } from 'vs/base/common/event'; import { AnchorAlignment } from 'vs/base/browser/ui/contextview/contextview'; import { isLinux, isMacintosh } from 'vs/base/common/platform'; import { stripCodicons } from 'vs/base/common/codicons'; +import { Codicon, registerIcon } from 'vs/base/browser/ui/codicons/codicons'; export const MENU_MNEMONIC_REGEX = /\(&([^\s&])\)|(^|[^&])&([^\s&])/; export const MENU_ESCAPED_MNEMONIC_REGEX = /(&)?(&)([^\s&])/g; +const menuSelectionIcon = registerIcon('menu-selection', Codicon.chevronRight); +const menuSubmenuIcon = registerIcon('menu-submenu', Codicon.check); + export enum Direction { Right, Left @@ -423,7 +427,7 @@ class BaseMenuActionViewItem extends BaseActionViewItem { } } - this.check = append(this.item, $('span.menu-item-check.codicon.codicon-check')); + this.check = append(this.item, $(menuSelectionIcon.cssSelector)); this.check.setAttribute('role', 'none'); this.label = append(this.item, $('span.action-label')); @@ -670,7 +674,7 @@ class SubmenuMenuActionViewItem extends BaseMenuActionViewItem { addClass(this.item, 'monaco-submenu-item'); this.item.setAttribute('aria-haspopup', 'true'); this.updateAriaExpanded('false'); - this.submenuIndicator = append(this.item, $('span.submenu-indicator.codicon.codicon-chevron-right')); + this.submenuIndicator = append(this.item, $('span.submenu-indicator' + menuSubmenuIcon.cssSelector)); this.submenuIndicator.setAttribute('aria-hidden', 'true'); } diff --git a/src/vs/base/browser/ui/menu/menubar.ts b/src/vs/base/browser/ui/menu/menubar.ts index 29e86602fd6..a4841357090 100644 --- a/src/vs/base/browser/ui/menu/menubar.ts +++ b/src/vs/base/browser/ui/menu/menubar.ts @@ -22,9 +22,12 @@ import { ScanCodeUtils, ScanCode } from 'vs/base/common/scanCode'; import { isMacintosh } from 'vs/base/common/platform'; import { StandardMouseEvent } from 'vs/base/browser/mouseEvent'; import { Separator } from 'vs/base/browser/ui/actionbar/actionbar'; +import { Codicon, registerIcon } from 'vs/base/browser/ui/codicons/codicons'; const $ = DOM.$; +const menuBarMoreIcon = registerIcon('menubar-more', Codicon.more); + export interface IMenuBarOptions { enableMnemonics?: boolean; disableAltFocus?: boolean; @@ -313,7 +316,7 @@ export class MenuBar extends Disposable { const label = this.options.compactMode !== undefined ? nls.localize('mAppMenu', 'Application Menu') : nls.localize('mMore', 'More'); const title = this.options.compactMode !== undefined ? label : undefined; const buttonElement = $('div.menubar-menu-button', { 'role': 'menuitem', 'tabindex': -1, 'aria-label': label, 'title': title, 'aria-haspopup': true }); - const titleElement = $('div.menubar-menu-title.toolbar-toggle-more.codicon.codicon-more', { 'role': 'none', 'aria-hidden': true }); + const titleElement = $('div.menubar-menu-title.toolbar-toggle-more' + menuBarMoreIcon.cssSelector, { 'role': 'none', 'aria-hidden': true }); buttonElement.appendChild(titleElement); this.container.appendChild(buttonElement); diff --git a/src/vs/base/browser/ui/scrollbar/horizontalScrollbar.ts b/src/vs/base/browser/ui/scrollbar/horizontalScrollbar.ts index 7a2049b74f1..43b6f6fdfa5 100644 --- a/src/vs/base/browser/ui/scrollbar/horizontalScrollbar.ts +++ b/src/vs/base/browser/ui/scrollbar/horizontalScrollbar.ts @@ -9,6 +9,11 @@ import { ScrollableElementResolvedOptions } from 'vs/base/browser/ui/scrollbar/s import { ARROW_IMG_SIZE } from 'vs/base/browser/ui/scrollbar/scrollbarArrow'; import { ScrollbarState } from 'vs/base/browser/ui/scrollbar/scrollbarState'; import { INewScrollPosition, ScrollEvent, Scrollable, ScrollbarVisibility } from 'vs/base/common/scrollable'; +import { Codicon, registerIcon } from 'vs/base/browser/ui/codicons/codicons'; + + +export const scrollbarButtonLeftIcon = registerIcon('scrollbar-button-left', Codicon.triangleLeft); +export const scrollbarButtonRightIcon = registerIcon('scrollbar-button-right', Codicon.triangleRight); export class HorizontalScrollbar extends AbstractScrollbar { @@ -36,7 +41,8 @@ export class HorizontalScrollbar extends AbstractScrollbar { let scrollbarDelta = (options.horizontalScrollbarSize - ARROW_IMG_SIZE) / 2; this._createArrow({ - className: 'scra codicon codicon-triangle-left', + className: 'scra', + icon: scrollbarButtonLeftIcon, top: scrollbarDelta, left: arrowDelta, bottom: undefined, @@ -47,7 +53,8 @@ export class HorizontalScrollbar extends AbstractScrollbar { }); this._createArrow({ - className: 'scra codicon codicon-triangle-right', + className: 'scra', + icon: scrollbarButtonRightIcon, top: scrollbarDelta, left: undefined, bottom: undefined, diff --git a/src/vs/base/browser/ui/scrollbar/scrollbarArrow.ts b/src/vs/base/browser/ui/scrollbar/scrollbarArrow.ts index fcde58933bf..85135d315a3 100644 --- a/src/vs/base/browser/ui/scrollbar/scrollbarArrow.ts +++ b/src/vs/base/browser/ui/scrollbar/scrollbarArrow.ts @@ -7,6 +7,8 @@ import { GlobalMouseMoveMonitor, IStandardMouseMoveEventData, standardMouseMoveM import { IMouseEvent } from 'vs/base/browser/mouseEvent'; import { Widget } from 'vs/base/browser/ui/widget'; import { IntervalTimer, TimeoutTimer } from 'vs/base/common/async'; +import { Codicon } from 'vs/base/browser/ui/codicons/codicons'; +import { addClasses } from 'vs/base/browser/dom'; /** * The arrow image size. @@ -16,6 +18,7 @@ export const ARROW_IMG_SIZE = 11; export interface ScrollbarArrowOptions { onActivate: () => void; className: string; + icon: Codicon; bgWidth: number; bgHeight: number; @@ -59,6 +62,8 @@ export class ScrollbarArrow extends Widget { this.domNode = document.createElement('div'); this.domNode.className = opts.className; + addClasses(this.domNode, opts.icon.className); + this.domNode.style.position = 'absolute'; this.domNode.style.width = ARROW_IMG_SIZE + 'px'; this.domNode.style.height = ARROW_IMG_SIZE + 'px'; diff --git a/src/vs/base/browser/ui/scrollbar/verticalScrollbar.ts b/src/vs/base/browser/ui/scrollbar/verticalScrollbar.ts index a6493164370..d4cc7c218cb 100644 --- a/src/vs/base/browser/ui/scrollbar/verticalScrollbar.ts +++ b/src/vs/base/browser/ui/scrollbar/verticalScrollbar.ts @@ -9,6 +9,10 @@ import { ScrollableElementResolvedOptions } from 'vs/base/browser/ui/scrollbar/s import { ARROW_IMG_SIZE } from 'vs/base/browser/ui/scrollbar/scrollbarArrow'; import { ScrollbarState } from 'vs/base/browser/ui/scrollbar/scrollbarState'; import { INewScrollPosition, ScrollEvent, Scrollable, ScrollbarVisibility } from 'vs/base/common/scrollable'; +import { Codicon, registerIcon } from 'vs/base/browser/ui/codicons/codicons'; + +export const scrollbarButtonUpIcon = registerIcon('scrollbar-button-up', Codicon.triangleUp); +export const scrollbarButtonDownIcon = registerIcon('scrollbar-button-down', Codicon.triangleDown); export class VerticalScrollbar extends AbstractScrollbar { @@ -37,7 +41,8 @@ export class VerticalScrollbar extends AbstractScrollbar { let scrollbarDelta = (options.verticalScrollbarSize - ARROW_IMG_SIZE) / 2; this._createArrow({ - className: 'scra codicon codicon-triangle-up', + className: 'scra', + icon: scrollbarButtonUpIcon, top: arrowDelta, left: scrollbarDelta, bottom: undefined, @@ -48,7 +53,8 @@ export class VerticalScrollbar extends AbstractScrollbar { }); this._createArrow({ - className: 'scra codicon codicon-triangle-down', + className: 'scra', + icon: scrollbarButtonDownIcon, top: undefined, left: scrollbarDelta, bottom: arrowDelta, diff --git a/src/vs/base/browser/ui/toolbar/toolbar.ts b/src/vs/base/browser/ui/toolbar/toolbar.ts index 8a7a9705228..c71916c9c71 100644 --- a/src/vs/base/browser/ui/toolbar/toolbar.ts +++ b/src/vs/base/browser/ui/toolbar/toolbar.ts @@ -12,9 +12,12 @@ import { ResolvedKeybinding } from 'vs/base/common/keyCodes'; import { Disposable, MutableDisposable } from 'vs/base/common/lifecycle'; import { AnchorAlignment } from 'vs/base/browser/ui/contextview/contextview'; import { withNullAsUndefined } from 'vs/base/common/types'; +import { Codicon, registerIcon } from 'vs/base/browser/ui/codicons/codicons'; export const CONTEXT = 'context.toolbar'; +const toolBarMoreIcon = registerIcon('toolbar-more', Codicon.more); + export interface IToolBarOptions { orientation?: ActionsOrientation; actionViewItemProvider?: IActionViewItemProvider; @@ -65,7 +68,7 @@ export class ToolBar extends Disposable { this.options.actionViewItemProvider, this.actionRunner, this.options.getKeyBinding, - 'codicon-more', + toolBarMoreIcon.className, this.options.anchorAlignmentProvider ); this.toggleMenuActionViewItem.value.setActionContext(this.actionBar.context); diff --git a/src/vs/base/browser/ui/tree/abstractTree.ts b/src/vs/base/browser/ui/tree/abstractTree.ts index 7eed596d098..0655034e80f 100644 --- a/src/vs/base/browser/ui/tree/abstractTree.ts +++ b/src/vs/base/browser/ui/tree/abstractTree.ts @@ -26,6 +26,9 @@ import { values } from 'vs/base/common/map'; import { clamp } from 'vs/base/common/numbers'; import { ScrollEvent } from 'vs/base/common/scrollable'; import { SetMap } from 'vs/base/common/collections'; +import { Codicon, registerIcon } from 'vs/base/browser/ui/codicons/codicons'; + +const listClearIcon = registerIcon('list-clear', Codicon.close); class TreeElementsDragAndDropData extends ElementsDragAndDropData { @@ -650,7 +653,7 @@ class TypeFilterController implements IDisposable { this.updateFilterOnTypeTitle(); domEvent(this.filterOnTypeDomNode, 'input')(this.onDidChangeFilterOnType, this, this.disposables); - this.clearDomNode = append(controls, $('button.clear.codicon.codicon-close')); + this.clearDomNode = append(controls, $('button.clear' + listClearIcon.cssSelector)); this.clearDomNode.tabIndex = -1; this.clearDomNode.title = localize('clear', "Clear"); diff --git a/src/vs/code/electron-browser/issue/issueReporterMain.ts b/src/vs/code/electron-browser/issue/issueReporterMain.ts index a517bafe66b..2593f8cc614 100644 --- a/src/vs/code/electron-browser/issue/issueReporterMain.ts +++ b/src/vs/code/electron-browser/issue/issueReporterMain.ts @@ -8,7 +8,7 @@ import * as os from 'os'; import * as browser from 'vs/base/browser/browser'; import { $ } from 'vs/base/browser/dom'; import { Button } from 'vs/base/browser/ui/button/button'; -import { CodiconLabel } from 'vs/base/browser/ui/codiconLabel/codiconLabel'; +import { CodiconLabel } from 'vs/base/browser/ui/codicons/codiconLabel'; import * as collections from 'vs/base/common/collections'; import { debounce } from 'vs/base/common/decorators'; import { Disposable } from 'vs/base/common/lifecycle'; diff --git a/src/vs/editor/browser/viewParts/editorScrollbar/editorScrollbar.ts b/src/vs/editor/browser/viewParts/editorScrollbar/editorScrollbar.ts index 58917246f7c..6400b462f53 100644 --- a/src/vs/editor/browser/viewParts/editorScrollbar/editorScrollbar.ts +++ b/src/vs/editor/browser/viewParts/editorScrollbar/editorScrollbar.ts @@ -44,8 +44,8 @@ export class EditorScrollbar extends ViewPart { vertical: scrollbar.vertical, horizontal: scrollbar.horizontal, - verticalHasArrows: scrollbar.verticalHasArrows, - horizontalHasArrows: scrollbar.horizontalHasArrows, + verticalHasArrows: true, //scrollbar.verticalHasArrows, + horizontalHasArrows: true, //scrollbar.horizontalHasArrows, verticalScrollbarSize: scrollbar.verticalScrollbarSize, verticalSliderSize: scrollbar.verticalSliderSize, horizontalScrollbarSize: scrollbar.horizontalScrollbarSize, diff --git a/src/vs/editor/contrib/find/findWidget.ts b/src/vs/editor/contrib/find/findWidget.ts index 613d0654c6b..0e687ff2fc9 100644 --- a/src/vs/editor/contrib/find/findWidget.ts +++ b/src/vs/editor/contrib/find/findWidget.ts @@ -37,6 +37,9 @@ import { AccessibilitySupport } from 'vs/platform/accessibility/common/accessibi import { IStorageService, StorageScope } from 'vs/platform/storage/common/storage'; import { INotificationService } from 'vs/platform/notification/common/notification'; import { IStorageKeysSyncRegistryService } from 'vs/platform/userDataSync/common/storageKeys'; +import { Codicon, registerIcon } from 'vs/base/browser/ui/codicons/codicons'; + +export const findSelectionIcon = registerIcon('find-selection', Codicon.selection); export interface IFindController { replace(): void; @@ -1017,7 +1020,7 @@ export class FindWidget extends Widget implements IOverlayWidget, IHorizontalSas // Toggle selection button this._toggleSelectionFind = this._register(new Checkbox({ - actionClassName: 'codicon codicon-selection', + icon: findSelectionIcon, title: NLS_TOGGLE_SELECTION_FIND_TITLE + this._keybindingLabelFor(FIND_IDS.ToggleSearchScopeCommand), isChecked: false })); diff --git a/src/vs/editor/contrib/suggest/suggestWidget.ts b/src/vs/editor/contrib/suggest/suggestWidget.ts index 0e3725fc5d4..af44abac1db 100644 --- a/src/vs/editor/contrib/suggest/suggestWidget.ts +++ b/src/vs/editor/contrib/suggest/suggestWidget.ts @@ -5,7 +5,7 @@ import 'vs/css!./media/suggest'; import 'vs/css!./media/suggestStatusBar'; -import 'vs/base/browser/ui/codiconLabel/codiconLabel'; // The codicon symbol styles are defined here and must be loaded +import 'vs/base/browser/ui/codicons/codicons'; // The codicon symbol styles are defined here and must be loaded import 'vs/editor/contrib/documentSymbols/outlineTree'; // The codicon symbol colors are defined here and must be loaded import * as nls from 'vs/nls'; import { createMatches } from 'vs/base/common/filters'; diff --git a/src/vs/platform/theme/common/iconRegistry.ts b/src/vs/platform/theme/common/iconRegistry.ts index f1d3ccec10a..8e2f25c5099 100644 --- a/src/vs/platform/theme/common/iconRegistry.ts +++ b/src/vs/platform/theme/common/iconRegistry.ts @@ -19,7 +19,9 @@ export const Extensions = { IconContribution: 'base.contributions.icons' }; -export interface IconDefaults { +export type IconDefaults = ThemeIcon | IconDefinition; + +export interface IconDefinition { fontId?: string; character: string; } @@ -92,14 +94,17 @@ class IconRegistry implements IIconRegistry { this.iconsById = {}; } - public registerIcon(id: string, defaults: IconDefaults, description: string, deprecationMessage?: string): ThemeIcon { + public registerIcon(id: string, defaults: IconDefaults, description?: string, deprecationMessage?: string): ThemeIcon { + if (!description) { + description = localize('icon.defaultDescription', 'Icon with identifier {0}', id); + } let iconContribution: IconContribution = { id, description, defaults, deprecationMessage }; this.iconsById[id] = iconContribution; - let propertySchema: IJSONSchema = { description, $ref: '#/definitions/icons' }; + let propertySchema: IJSONSchema = { $ref: '#/definitions/icons' }; if (deprecationMessage) { propertySchema.deprecationMessage = deprecationMessage; } - propertySchema.markdownDescription = localize('iconPreview', "Current icon: {0}", `$(${id})`); + propertySchema.markdownDescription = `${description}: $(${id})`; this.iconSchema.properties[id] = propertySchema; this.iconReferenceSchema.enum.push(id); this.iconReferenceSchema.enumDescriptions.push(description); @@ -150,7 +155,7 @@ class IconRegistry implements IIconRegistry { const iconRegistry = new IconRegistry(); platform.Registry.add(Extensions.IconContribution, iconRegistry); -export function registerIcon(id: string, defaults: IconDefaults, description: string, deprecationMessage?: string): ThemeIcon { +export function registerIcon(id: string, defaults: IconDefaults, description?: string, deprecationMessage?: string): ThemeIcon { return iconRegistry.registerIcon(id, defaults, description, deprecationMessage); } @@ -158,403 +163,9 @@ export function getIconRegistry(): IIconRegistry { return iconRegistry; } -registerIcon('add', { character: '\ea60' }, localize('add', '')); -registerIcon('plus', { character: '\ea60' }, localize('plus', '')); -registerIcon('gist-new', { character: '\ea60' }, localize('gist-new', '')); -registerIcon('repo-create', { character: '\ea60' }, localize('repo-create', '')); -registerIcon('lightbulb', { character: '\ea61' }, localize('lightbulb', '')); -registerIcon('light-bulb', { character: '\ea61' }, localize('light-bulb', '')); -registerIcon('repo', { character: '\ea62' }, localize('repo', '')); -registerIcon('repo-delete', { character: '\ea62' }, localize('repo-delete', '')); -registerIcon('gist-fork', { character: '\ea63' }, localize('gist-fork', '')); -registerIcon('repo-forked', { character: '\ea63' }, localize('repo-forked', '')); -registerIcon('git-pull-request', { character: '\ea64' }, localize('git-pull-request', '')); -registerIcon('git-pull-request-abandoned', { character: '\ea64' }, localize('git-pull-request-abandoned', '')); -registerIcon('record-keys', { character: '\ea65' }, localize('record-keys', '')); -registerIcon('keyboard', { character: '\ea65' }, localize('keyboard', '')); -registerIcon('tag', { character: '\ea66' }, localize('tag', '')); -registerIcon('tag-add', { character: '\ea66' }, localize('tag-add', '')); -registerIcon('tag-remove', { character: '\ea66' }, localize('tag-remove', '')); -registerIcon('person', { character: '\ea67' }, localize('person', '')); -registerIcon('person-add', { character: '\ea67' }, localize('person-add', '')); -registerIcon('person-follow', { character: '\ea67' }, localize('person-follow', '')); -registerIcon('person-outline', { character: '\ea67' }, localize('person-outline', '')); -registerIcon('person-filled', { character: '\ea67' }, localize('person-filled', '')); -registerIcon('git-branch', { character: '\ea68' }, localize('git-branch', '')); -registerIcon('git-branch-create', { character: '\ea68' }, localize('git-branch-create', '')); -registerIcon('git-branch-delete', { character: '\ea68' }, localize('git-branch-delete', '')); -registerIcon('source-control', { character: '\ea68' }, localize('source-control', '')); -registerIcon('mirror', { character: '\ea69' }, localize('mirror', '')); -registerIcon('mirror-public', { character: '\ea69' }, localize('mirror-public', '')); -registerIcon('star', { character: '\ea6a' }, localize('star', '')); -registerIcon('star-add', { character: '\ea6a' }, localize('star-add', '')); -registerIcon('star-delete', { character: '\ea6a' }, localize('star-delete', '')); -registerIcon('star-empty', { character: '\ea6a' }, localize('star-empty', '')); -registerIcon('comment', { character: '\ea6b' }, localize('comment', '')); -registerIcon('comment-add', { character: '\ea6b' }, localize('comment-add', '')); -registerIcon('alert', { character: '\ea6c' }, localize('alert', '')); -registerIcon('warning', { character: '\ea6c' }, localize('warning', '')); -registerIcon('search', { character: '\ea6d' }, localize('search', '')); -registerIcon('search-save', { character: '\ea6d' }, localize('search-save', '')); -registerIcon('log-out', { character: '\ea6e' }, localize('log-out', '')); -registerIcon('sign-out', { character: '\ea6e' }, localize('sign-out', '')); -registerIcon('log-in', { character: '\ea6f' }, localize('log-in', '')); -registerIcon('sign-in', { character: '\ea6f' }, localize('sign-in', '')); -registerIcon('eye', { character: '\ea70' }, localize('eye', '')); -registerIcon('eye-unwatch', { character: '\ea70' }, localize('eye-unwatch', '')); -registerIcon('eye-watch', { character: '\ea70' }, localize('eye-watch', '')); -registerIcon('circle-filled', { character: '\ea71' }, localize('circle-filled', '')); -registerIcon('primitive-dot', { character: '\ea71' }, localize('primitive-dot', '')); -registerIcon('close-dirty', { character: '\ea71' }, localize('close-dirty', '')); -registerIcon('debug-breakpoint', { character: '\ea71' }, localize('debug-breakpoint', '')); -registerIcon('debug-breakpoint-disabled', { character: '\ea71' }, localize('debug-breakpoint-disabled', '')); -registerIcon('debug-hint', { character: '\ea71' }, localize('debug-hint', '')); -registerIcon('primitive-square', { character: '\ea72' }, localize('primitive-square', '')); -registerIcon('edit', { character: '\ea73' }, localize('edit', '')); -registerIcon('pencil', { character: '\ea73' }, localize('pencil', '')); -registerIcon('info', { character: '\ea74' }, localize('info', '')); -registerIcon('issue-opened', { character: '\ea74' }, localize('issue-opened', '')); -registerIcon('gist-private', { character: '\ea75' }, localize('gist-private', '')); -registerIcon('git-fork-private', { character: '\ea75' }, localize('git-fork-private', '')); -registerIcon('lock', { character: '\ea75' }, localize('lock', '')); -registerIcon('mirror-private', { character: '\ea75' }, localize('mirror-private', '')); -registerIcon('close', { character: '\ea76' }, localize('close', '')); -registerIcon('remove-close', { character: '\ea76' }, localize('remove-close', '')); -registerIcon('x', { character: '\ea76' }, localize('x', '')); -registerIcon('repo-sync', { character: '\ea77' }, localize('repo-sync', '')); -registerIcon('sync', { character: '\ea77' }, localize('sync', '')); -registerIcon('clone', { character: '\ea78' }, localize('clone', '')); -registerIcon('desktop-download', { character: '\ea78' }, localize('desktop-download', '')); -registerIcon('beaker', { character: '\ea79' }, localize('beaker', '')); -registerIcon('microscope', { character: '\ea79' }, localize('microscope', '')); -registerIcon('vm', { character: '\ea7a' }, localize('vm', '')); -registerIcon('device-desktop', { character: '\ea7a' }, localize('device-desktop', '')); -registerIcon('file', { character: '\ea7b' }, localize('file', '')); -registerIcon('file-text', { character: '\ea7b' }, localize('file-text', '')); -registerIcon('more', { character: '\ea7c' }, localize('more', '')); -registerIcon('ellipsis', { character: '\ea7c' }, localize('ellipsis', '')); -registerIcon('kebab-horizontal', { character: '\ea7c' }, localize('kebab-horizontal', '')); -registerIcon('mail-reply', { character: '\ea7d' }, localize('mail-reply', '')); -registerIcon('reply', { character: '\ea7d' }, localize('reply', '')); -registerIcon('organization', { character: '\ea7e' }, localize('organization', '')); -registerIcon('organization-filled', { character: '\ea7e' }, localize('organization-filled', '')); -registerIcon('organization-outline', { character: '\ea7e' }, localize('organization-outline', '')); -registerIcon('new-file', { character: '\ea7f' }, localize('new-file', '')); -registerIcon('file-add', { character: '\ea7f' }, localize('file-add', '')); -registerIcon('new-folder', { character: '\ea80' }, localize('new-folder', '')); -registerIcon('file-directory-create', { character: '\ea80' }, localize('file-directory-create', '')); -registerIcon('trash', { character: '\ea81' }, localize('trash', '')); -registerIcon('trashcan', { character: '\ea81' }, localize('trashcan', '')); -registerIcon('history', { character: '\ea82' }, localize('history', '')); -registerIcon('clock', { character: '\ea82' }, localize('clock', '')); -registerIcon('folder', { character: '\ea83' }, localize('folder', '')); -registerIcon('file-directory', { character: '\ea83' }, localize('file-directory', '')); -registerIcon('symbol-folder', { character: '\ea83' }, localize('symbol-folder', '')); -registerIcon('logo-github', { character: '\ea84' }, localize('logo-github', '')); -registerIcon('mark-github', { character: '\ea84' }, localize('mark-github', '')); -registerIcon('github', { character: '\ea84' }, localize('github', '')); -registerIcon('terminal', { character: '\ea85' }, localize('terminal', '')); -registerIcon('console', { character: '\ea85' }, localize('console', '')); -registerIcon('repl', { character: '\ea85' }, localize('repl', '')); -registerIcon('zap', { character: '\ea86' }, localize('zap', '')); -registerIcon('symbol-event', { character: '\ea86' }, localize('symbol-event', '')); -registerIcon('error', { character: '\ea87' }, localize('error', '')); -registerIcon('stop', { character: '\ea87' }, localize('stop', '')); -registerIcon('variable', { character: '\ea88' }, localize('variable', '')); -registerIcon('symbol-variable', { character: '\ea88' }, localize('symbol-variable', '')); -registerIcon('array', { character: '\ea8a' }, localize('array', '')); -registerIcon('symbol-array', { character: '\ea8a' }, localize('symbol-array', '')); -registerIcon('symbol-module', { character: '\ea8b' }, localize('symbol-module', '')); -registerIcon('symbol-package', { character: '\ea8b' }, localize('symbol-package', '')); -registerIcon('symbol-namespace', { character: '\ea8b' }, localize('symbol-namespace', '')); -registerIcon('symbol-object', { character: '\ea8b' }, localize('symbol-object', '')); -registerIcon('symbol-method', { character: '\ea8c' }, localize('symbol-method', '')); -registerIcon('symbol-function', { character: '\ea8c' }, localize('symbol-function', '')); -registerIcon('symbol-constructor', { character: '\ea8c' }, localize('symbol-constructor', '')); -registerIcon('symbol-boolean', { character: '\ea8f' }, localize('symbol-boolean', '')); -registerIcon('symbol-null', { character: '\ea8f' }, localize('symbol-null', '')); -registerIcon('symbol-numeric', { character: '\ea90' }, localize('symbol-numeric', '')); -registerIcon('symbol-number', { character: '\ea90' }, localize('symbol-number', '')); -registerIcon('symbol-structure', { character: '\ea91' }, localize('symbol-structure', '')); -registerIcon('symbol-struct', { character: '\ea91' }, localize('symbol-struct', '')); -registerIcon('symbol-parameter', { character: '\ea92' }, localize('symbol-parameter', '')); -registerIcon('symbol-type-parameter', { character: '\ea92' }, localize('symbol-type-parameter', '')); -registerIcon('symbol-key', { character: '\ea93' }, localize('symbol-key', '')); -registerIcon('symbol-text', { character: '\ea93' }, localize('symbol-text', '')); -registerIcon('symbol-reference', { character: '\ea94' }, localize('symbol-reference', '')); -registerIcon('go-to-file', { character: '\ea94' }, localize('go-to-file', '')); -registerIcon('symbol-enum', { character: '\ea95' }, localize('symbol-enum', '')); -registerIcon('symbol-value', { character: '\ea95' }, localize('symbol-value', '')); -registerIcon('symbol-ruler', { character: '\ea96' }, localize('symbol-ruler', '')); -registerIcon('symbol-unit', { character: '\ea96' }, localize('symbol-unit', '')); -registerIcon('activate-breakpoints', { character: '\ea97' }, localize('activate-breakpoints', '')); -registerIcon('archive', { character: '\ea98' }, localize('archive', '')); -registerIcon('arrow-both', { character: '\ea99' }, localize('arrow-both', '')); -registerIcon('arrow-down', { character: '\ea9a' }, localize('arrow-down', '')); -registerIcon('arrow-left', { character: '\ea9b' }, localize('arrow-left', '')); -registerIcon('arrow-right', { character: '\ea9c' }, localize('arrow-right', '')); -registerIcon('arrow-small-down', { character: '\ea9d' }, localize('arrow-small-down', '')); -registerIcon('arrow-small-left', { character: '\ea9e' }, localize('arrow-small-left', '')); -registerIcon('arrow-small-right', { character: '\ea9f' }, localize('arrow-small-right', '')); -registerIcon('arrow-small-up', { character: '\eaa0' }, localize('arrow-small-up', '')); -registerIcon('arrow-up', { character: '\eaa1' }, localize('arrow-up', '')); -registerIcon('bell', { character: '\eaa2' }, localize('bell', '')); -registerIcon('bold', { character: '\eaa3' }, localize('bold', '')); -registerIcon('book', { character: '\eaa4' }, localize('book', '')); -registerIcon('bookmark', { character: '\eaa5' }, localize('bookmark', '')); -registerIcon('debug-breakpoint-conditional-unverified', { character: '\eaa6' }, localize('debug-breakpoint-conditional-unverified', '')); -registerIcon('debug-breakpoint-conditional', { character: '\eaa7' }, localize('debug-breakpoint-conditional', '')); -registerIcon('debug-breakpoint-conditional-disabled', { character: '\eaa7' }, localize('debug-breakpoint-conditional-disabled', '')); -registerIcon('debug-breakpoint-data-unverified', { character: '\eaa8' }, localize('debug-breakpoint-data-unverified', '')); -registerIcon('debug-breakpoint-data', { character: '\eaa9' }, localize('debug-breakpoint-data', '')); -registerIcon('debug-breakpoint-data-disabled', { character: '\eaa9' }, localize('debug-breakpoint-data-disabled', '')); -registerIcon('debug-breakpoint-log-unverified', { character: '\eaaa' }, localize('debug-breakpoint-log-unverified', '')); -registerIcon('debug-breakpoint-log', { character: '\eaab' }, localize('debug-breakpoint-log', '')); -registerIcon('debug-breakpoint-log-disabled', { character: '\eaab' }, localize('debug-breakpoint-log-disabled', '')); -registerIcon('briefcase', { character: '\eaac' }, localize('briefcase', '')); -registerIcon('broadcast', { character: '\eaad' }, localize('broadcast', '')); -registerIcon('browser', { character: '\eaae' }, localize('browser', '')); -registerIcon('bug', { character: '\eaaf' }, localize('bug', '')); -registerIcon('calendar', { character: '\eab0' }, localize('calendar', '')); -registerIcon('case-sensitive', { character: '\eab1' }, localize('case-sensitive', '')); -registerIcon('check', { character: '\eab2' }, localize('check', '')); -registerIcon('checklist', { character: '\eab3' }, localize('checklist', '')); -registerIcon('chevron-down', { character: '\eab4' }, localize('chevron-down', '')); -registerIcon('chevron-left', { character: '\eab5' }, localize('chevron-left', '')); -registerIcon('chevron-right', { character: '\eab6' }, localize('chevron-right', '')); -registerIcon('chevron-up', { character: '\eab7' }, localize('chevron-up', '')); -registerIcon('chrome-close', { character: '\eab8' }, localize('chrome-close', '')); -registerIcon('chrome-maximize', { character: '\eab9' }, localize('chrome-maximize', '')); -registerIcon('chrome-minimize', { character: '\eaba' }, localize('chrome-minimize', '')); -registerIcon('chrome-restore', { character: '\eabb' }, localize('chrome-restore', '')); -registerIcon('circle-outline', { character: '\eabc' }, localize('circle-outline', '')); -registerIcon('debug-breakpoint-unverified', { character: '\eabc' }, localize('debug-breakpoint-unverified', '')); -registerIcon('circle-slash', { character: '\eabd' }, localize('circle-slash', '')); -registerIcon('circuit-board', { character: '\eabe' }, localize('circuit-board', '')); -registerIcon('clear-all', { character: '\eabf' }, localize('clear-all', '')); -registerIcon('clippy', { character: '\eac0' }, localize('clippy', '')); -registerIcon('close-all', { character: '\eac1' }, localize('close-all', '')); -registerIcon('cloud-download', { character: '\eac2' }, localize('cloud-download', '')); -registerIcon('cloud-upload', { character: '\eac3' }, localize('cloud-upload', '')); -registerIcon('code', { character: '\eac4' }, localize('code', '')); -registerIcon('collapse-all', { character: '\eac5' }, localize('collapse-all', '')); -registerIcon('color-mode', { character: '\eac6' }, localize('color-mode', '')); -registerIcon('comment-discussion', { character: '\eac7' }, localize('comment-discussion', '')); -registerIcon('compare-changes', { character: '\eac8' }, localize('compare-changes', '')); -registerIcon('credit-card', { character: '\eac9' }, localize('credit-card', '')); -registerIcon('dash', { character: '\eacc' }, localize('dash', '')); -registerIcon('dashboard', { character: '\eacd' }, localize('dashboard', '')); -registerIcon('database', { character: '\eace' }, localize('database', '')); -registerIcon('debug-continue', { character: '\eacf' }, localize('debug-continue', '')); -registerIcon('debug-disconnect', { character: '\ead0' }, localize('debug-disconnect', '')); -registerIcon('debug-pause', { character: '\ead1' }, localize('debug-pause', '')); -registerIcon('debug-restart', { character: '\ead2' }, localize('debug-restart', '')); -registerIcon('debug-start', { character: '\ead3' }, localize('debug-start', '')); -registerIcon('debug-step-into', { character: '\ead4' }, localize('debug-step-into', '')); -registerIcon('debug-step-out', { character: '\ead5' }, localize('debug-step-out', '')); -registerIcon('debug-step-over', { character: '\ead6' }, localize('debug-step-over', '')); -registerIcon('debug-stop', { character: '\ead7' }, localize('debug-stop', '')); -registerIcon('debug', { character: '\ead8' }, localize('debug', '')); -registerIcon('device-camera-video', { character: '\ead9' }, localize('device-camera-video', '')); -registerIcon('device-camera', { character: '\eada' }, localize('device-camera', '')); -registerIcon('device-mobile', { character: '\eadb' }, localize('device-mobile', '')); -registerIcon('diff-added', { character: '\eadc' }, localize('diff-added', '')); -registerIcon('diff-ignored', { character: '\eadd' }, localize('diff-ignored', '')); -registerIcon('diff-modified', { character: '\eade' }, localize('diff-modified', '')); -registerIcon('diff-removed', { character: '\eadf' }, localize('diff-removed', '')); -registerIcon('diff-renamed', { character: '\eae0' }, localize('diff-renamed', '')); -registerIcon('diff', { character: '\eae1' }, localize('diff', '')); -registerIcon('discard', { character: '\eae2' }, localize('discard', '')); -registerIcon('editor-layout', { character: '\eae3' }, localize('editor-layout', '')); -registerIcon('empty-window', { character: '\eae4' }, localize('empty-window', '')); -registerIcon('exclude', { character: '\eae5' }, localize('exclude', '')); -registerIcon('extensions', { character: '\eae6' }, localize('extensions', '')); -registerIcon('eye-closed', { character: '\eae7' }, localize('eye-closed', '')); -registerIcon('file-binary', { character: '\eae8' }, localize('file-binary', '')); -registerIcon('file-code', { character: '\eae9' }, localize('file-code', '')); -registerIcon('file-media', { character: '\eaea' }, localize('file-media', '')); -registerIcon('file-pdf', { character: '\eaeb' }, localize('file-pdf', '')); -registerIcon('file-submodule', { character: '\eaec' }, localize('file-submodule', '')); -registerIcon('file-symlink-directory', { character: '\eaed' }, localize('file-symlink-directory', '')); -registerIcon('file-symlink-file', { character: '\eaee' }, localize('file-symlink-file', '')); -registerIcon('file-zip', { character: '\eaef' }, localize('file-zip', '')); -registerIcon('files', { character: '\eaf0' }, localize('files', '')); -registerIcon('filter', { character: '\eaf1' }, localize('filter', '')); -registerIcon('flame', { character: '\eaf2' }, localize('flame', '')); -registerIcon('fold-down', { character: '\eaf3' }, localize('fold-down', '')); -registerIcon('fold-up', { character: '\eaf4' }, localize('fold-up', '')); -registerIcon('fold', { character: '\eaf5' }, localize('fold', '')); -registerIcon('folder-active', { character: '\eaf6' }, localize('folder-active', '')); -registerIcon('folder-opened', { character: '\eaf7' }, localize('folder-opened', '')); -registerIcon('gear', { character: '\eaf8' }, localize('gear', '')); -registerIcon('gift', { character: '\eaf9' }, localize('gift', '')); -registerIcon('gist-secret', { character: '\eafa' }, localize('gist-secret', '')); -registerIcon('gist', { character: '\eafb' }, localize('gist', '')); -registerIcon('git-commit', { character: '\eafc' }, localize('git-commit', '')); -registerIcon('git-compare', { character: '\eafd' }, localize('git-compare', '')); -registerIcon('git-merge', { character: '\eafe' }, localize('git-merge', '')); -registerIcon('github-action', { character: '\eaff' }, localize('github-action', '')); -registerIcon('github-alt', { character: '\eb00' }, localize('github-alt', '')); -registerIcon('globe', { character: '\eb01' }, localize('globe', '')); -registerIcon('grabber', { character: '\eb02' }, localize('grabber', '')); -registerIcon('graph', { character: '\eb03' }, localize('graph', '')); -registerIcon('gripper', { character: '\eb04' }, localize('gripper', '')); -registerIcon('heart', { character: '\eb05' }, localize('heart', '')); -registerIcon('home', { character: '\eb06' }, localize('home', '')); -registerIcon('horizontal-rule', { character: '\eb07' }, localize('horizontal-rule', '')); -registerIcon('hubot', { character: '\eb08' }, localize('hubot', '')); -registerIcon('inbox', { character: '\eb09' }, localize('inbox', '')); -registerIcon('issue-closed', { character: '\eb0a' }, localize('issue-closed', '')); -registerIcon('issue-reopened', { character: '\eb0b' }, localize('issue-reopened', '')); -registerIcon('issues', { character: '\eb0c' }, localize('issues', '')); -registerIcon('italic', { character: '\eb0d' }, localize('italic', '')); -registerIcon('jersey', { character: '\eb0e' }, localize('jersey', '')); -registerIcon('json', { character: '\eb0f' }, localize('json', '')); -registerIcon('kebab-vertical', { character: '\eb10' }, localize('kebab-vertical', '')); -registerIcon('key', { character: '\eb11' }, localize('key', '')); -registerIcon('law', { character: '\eb12' }, localize('law', '')); -registerIcon('lightbulb-autofix', { character: '\eb13' }, localize('lightbulb-autofix', '')); -registerIcon('link-external', { character: '\eb14' }, localize('link-external', '')); -registerIcon('link', { character: '\eb15' }, localize('link', '')); -registerIcon('list-ordered', { character: '\eb16' }, localize('list-ordered', '')); -registerIcon('list-unordered', { character: '\eb17' }, localize('list-unordered', '')); -registerIcon('live-share', { character: '\eb18' }, localize('live-share', '')); -registerIcon('loading', { character: '\eb19' }, localize('loading', '')); -registerIcon('location', { character: '\eb1a' }, localize('location', '')); -registerIcon('mail-read', { character: '\eb1b' }, localize('mail-read', '')); -registerIcon('mail', { character: '\eb1c' }, localize('mail', '')); -registerIcon('markdown', { character: '\eb1d' }, localize('markdown', '')); -registerIcon('megaphone', { character: '\eb1e' }, localize('megaphone', '')); -registerIcon('mention', { character: '\eb1f' }, localize('mention', '')); -registerIcon('milestone', { character: '\eb20' }, localize('milestone', '')); -registerIcon('mortar-board', { character: '\eb21' }, localize('mortar-board', '')); -registerIcon('move', { character: '\eb22' }, localize('move', '')); -registerIcon('multiple-windows', { character: '\eb23' }, localize('multiple-windows', '')); -registerIcon('mute', { character: '\eb24' }, localize('mute', '')); -registerIcon('no-newline', { character: '\eb25' }, localize('no-newline', '')); -registerIcon('note', { character: '\eb26' }, localize('note', '')); -registerIcon('octoface', { character: '\eb27' }, localize('octoface', '')); -registerIcon('open-preview', { character: '\eb28' }, localize('open-preview', '')); -registerIcon('package', { character: '\eb29' }, localize('package', '')); -registerIcon('paintcan', { character: '\eb2a' }, localize('paintcan', '')); -registerIcon('pin', { character: '\eb2b' }, localize('pin', '')); -registerIcon('play', { character: '\eb2c' }, localize('play', '')); -registerIcon('run', { character: '\eb2c' }, localize('run', '')); -registerIcon('plug', { character: '\eb2d' }, localize('plug', '')); -registerIcon('preserve-case', { character: '\eb2e' }, localize('preserve-case', '')); -registerIcon('preview', { character: '\eb2f' }, localize('preview', '')); -registerIcon('project', { character: '\eb30' }, localize('project', '')); -registerIcon('pulse', { character: '\eb31' }, localize('pulse', '')); -registerIcon('question', { character: '\eb32' }, localize('question', '')); -registerIcon('quote', { character: '\eb33' }, localize('quote', '')); -registerIcon('radio-tower', { character: '\eb34' }, localize('radio-tower', '')); -registerIcon('reactions', { character: '\eb35' }, localize('reactions', '')); -registerIcon('references', { character: '\eb36' }, localize('references', '')); -registerIcon('refresh', { character: '\eb37' }, localize('refresh', '')); -registerIcon('regex', { character: '\eb38' }, localize('regex', '')); -registerIcon('remote-explorer', { character: '\eb39' }, localize('remote-explorer', '')); -registerIcon('remote', { character: '\eb3a' }, localize('remote', '')); -registerIcon('remove', { character: '\eb3b' }, localize('remove', '')); -registerIcon('replace-all', { character: '\eb3c' }, localize('replace-all', '')); -registerIcon('replace', { character: '\eb3d' }, localize('replace', '')); -registerIcon('repo-clone', { character: '\eb3e' }, localize('repo-clone', '')); -registerIcon('repo-force-push', { character: '\eb3f' }, localize('repo-force-push', '')); -registerIcon('repo-pull', { character: '\eb40' }, localize('repo-pull', '')); -registerIcon('repo-push', { character: '\eb41' }, localize('repo-push', '')); -registerIcon('report', { character: '\eb42' }, localize('report', '')); -registerIcon('request-changes', { character: '\eb43' }, localize('request-changes', '')); -registerIcon('rocket', { character: '\eb44' }, localize('rocket', '')); -registerIcon('root-folder-opened', { character: '\eb45' }, localize('root-folder-opened', '')); -registerIcon('root-folder', { character: '\eb46' }, localize('root-folder', '')); -registerIcon('rss', { character: '\eb47' }, localize('rss', '')); -registerIcon('ruby', { character: '\eb48' }, localize('ruby', '')); -registerIcon('save-all', { character: '\eb49' }, localize('save-all', '')); -registerIcon('save-as', { character: '\eb4a' }, localize('save-as', '')); -registerIcon('save', { character: '\eb4b' }, localize('save', '')); -registerIcon('screen-full', { character: '\eb4c' }, localize('screen-full', '')); -registerIcon('screen-normal', { character: '\eb4d' }, localize('screen-normal', '')); -registerIcon('search-stop', { character: '\eb4e' }, localize('search-stop', '')); -registerIcon('server', { character: '\eb50' }, localize('server', '')); -registerIcon('settings-gear', { character: '\eb51' }, localize('settings-gear', '')); -registerIcon('settings', { character: '\eb52' }, localize('settings', '')); -registerIcon('shield', { character: '\eb53' }, localize('shield', '')); -registerIcon('smiley', { character: '\eb54' }, localize('smiley', '')); -registerIcon('sort-precedence', { character: '\eb55' }, localize('sort-precedence', '')); -registerIcon('split-horizontal', { character: '\eb56' }, localize('split-horizontal', '')); -registerIcon('split-vertical', { character: '\eb57' }, localize('split-vertical', '')); -registerIcon('squirrel', { character: '\eb58' }, localize('squirrel', '')); -registerIcon('star-full', { character: '\eb59' }, localize('star-full', '')); -registerIcon('star-half', { character: '\eb5a' }, localize('star-half', '')); -registerIcon('symbol-class', { character: '\eb5b' }, localize('symbol-class', '')); -registerIcon('symbol-color', { character: '\eb5c' }, localize('symbol-color', '')); -registerIcon('symbol-constant', { character: '\eb5d' }, localize('symbol-constant', '')); -registerIcon('symbol-enum-member', { character: '\eb5e' }, localize('symbol-enum-member', '')); -registerIcon('symbol-field', { character: '\eb5f' }, localize('symbol-field', '')); -registerIcon('symbol-file', { character: '\eb60' }, localize('symbol-file', '')); -registerIcon('symbol-interface', { character: '\eb61' }, localize('symbol-interface', '')); -registerIcon('symbol-keyword', { character: '\eb62' }, localize('symbol-keyword', '')); -registerIcon('symbol-misc', { character: '\eb63' }, localize('symbol-misc', '')); -registerIcon('symbol-operator', { character: '\eb64' }, localize('symbol-operator', '')); -registerIcon('symbol-property', { character: '\eb65' }, localize('symbol-property', '')); -registerIcon('wrench', { character: '\eb65' }, localize('wrench', '')); -registerIcon('wrench-subaction', { character: '\eb65' }, localize('wrench-subaction', '')); -registerIcon('symbol-snippet', { character: '\eb66' }, localize('symbol-snippet', '')); -registerIcon('tasklist', { character: '\eb67' }, localize('tasklist', '')); -registerIcon('telescope', { character: '\eb68' }, localize('telescope', '')); -registerIcon('text-size', { character: '\eb69' }, localize('text-size', '')); -registerIcon('three-bars', { character: '\eb6a' }, localize('three-bars', '')); -registerIcon('thumbsdown', { character: '\eb6b' }, localize('thumbsdown', '')); -registerIcon('thumbsup', { character: '\eb6c' }, localize('thumbsup', '')); -registerIcon('tools', { character: '\eb6d' }, localize('tools', '')); -registerIcon('triangle-down', { character: '\eb6e' }, localize('triangle-down', '')); -registerIcon('triangle-left', { character: '\eb6f' }, localize('triangle-left', '')); -registerIcon('triangle-right', { character: '\eb70' }, localize('triangle-right', '')); -registerIcon('triangle-up', { character: '\eb71' }, localize('triangle-up', '')); -registerIcon('twitter', { character: '\eb72' }, localize('twitter', '')); -registerIcon('unfold', { character: '\eb73' }, localize('unfold', '')); -registerIcon('unlock', { character: '\eb74' }, localize('unlock', '')); -registerIcon('unmute', { character: '\eb75' }, localize('unmute', '')); -registerIcon('unverified', { character: '\eb76' }, localize('unverified', '')); -registerIcon('verified', { character: '\eb77' }, localize('verified', '')); -registerIcon('versions', { character: '\eb78' }, localize('versions', '')); -registerIcon('vm-active', { character: '\eb79' }, localize('vm-active', '')); -registerIcon('vm-outline', { character: '\eb7a' }, localize('vm-outline', '')); -registerIcon('vm-running', { character: '\eb7b' }, localize('vm-running', '')); -registerIcon('watch', { character: '\eb7c' }, localize('watch', '')); -registerIcon('whitespace', { character: '\eb7d' }, localize('whitespace', '')); -registerIcon('whole-word', { character: '\eb7e' }, localize('whole-word', '')); -registerIcon('window', { character: '\eb7f' }, localize('window', '')); -registerIcon('word-wrap', { character: '\eb80' }, localize('word-wrap', '')); -registerIcon('zoom-in', { character: '\eb81' }, localize('zoom-in', '')); -registerIcon('zoom-out', { character: '\eb82' }, localize('zoom-out', '')); -registerIcon('list-filter', { character: '\eb83' }, localize('list-filter', '')); -registerIcon('list-flat', { character: '\eb84' }, localize('list-flat', '')); -registerIcon('list-selection', { character: '\eb85' }, localize('list-selection', '')); -registerIcon('selection', { character: '\eb85' }, localize('selection', '')); -registerIcon('list-tree', { character: '\eb86' }, localize('list-tree', '')); -registerIcon('debug-breakpoint-function-unverified', { character: '\eb87' }, localize('debug-breakpoint-function-unverified', '')); -registerIcon('debug-breakpoint-function', { character: '\eb88' }, localize('debug-breakpoint-function', '')); -registerIcon('debug-breakpoint-function-disabled', { character: '\eb88' }, localize('debug-breakpoint-function-disabled', '')); -registerIcon('debug-stackframe-active', { character: '\eb89' }, localize('debug-stackframe-active', '')); -registerIcon('debug-stackframe-dot', { character: '\eb8a' }, localize('debug-stackframe-dot', '')); -registerIcon('debug-stackframe', { character: '\eb8b' }, localize('debug-stackframe', '')); -registerIcon('debug-stackframe-focused', { character: '\eb8b' }, localize('debug-stackframe-focused', '')); -registerIcon('debug-breakpoint-unsupported', { character: '\eb8c' }, localize('debug-breakpoint-unsupported', '')); -registerIcon('symbol-string', { character: '\eb8d' }, localize('symbol-string', '')); -registerIcon('debug-reverse-continue', { character: '\eb8e' }, localize('debug-reverse-continue', '')); -registerIcon('debug-step-back', { character: '\eb8f' }, localize('debug-step-back', '')); -registerIcon('debug-restart-frame', { character: '\eb90' }, localize('debug-restart-frame', '')); -registerIcon('debug-alternate', { character: '\eb91' }, localize('debug-alternate', '')); -registerIcon('call-incoming', { character: '\eb92' }, localize('call-incoming', '')); -registerIcon('call-outgoing', { character: '\eb93' }, localize('call-outgoing', '')); -registerIcon('menu', { character: '\eb94' }, localize('menu', '')); -registerIcon('expand-all', { character: '\eb95' }, localize('expand-all', '')); -registerIcon('feedback', { character: '\eb96' }, localize('feedback', '')); -registerIcon('group-by-ref-type', { character: '\eb97' }, localize('group-by-ref-type', '')); -registerIcon('ungroup-by-ref-type', { character: '\eb98' }, localize('ungroup-by-ref-type', '')); -registerIcon('bell-dot', { character: '\f101' }, localize('bell-dot', '')); -registerIcon('debug-alt-2', { character: '\f102' }, localize('debug-alt-2', '')); -registerIcon('debug-alt', { character: '\f103' }, localize('debug-alt', '')); + + + export const iconsSchemaId = 'vscode://schemas/icons'; diff --git a/src/vs/workbench/browser/parts/statusbar/statusbarPart.ts b/src/vs/workbench/browser/parts/statusbar/statusbarPart.ts index 3ea3367046a..914d7e77897 100644 --- a/src/vs/workbench/browser/parts/statusbar/statusbarPart.ts +++ b/src/vs/workbench/browser/parts/statusbar/statusbarPart.ts @@ -7,7 +7,7 @@ import 'vs/css!./media/statusbarpart'; import * as nls from 'vs/nls'; import { toErrorMessage } from 'vs/base/common/errorMessage'; import { dispose, IDisposable, Disposable, toDisposable, MutableDisposable } from 'vs/base/common/lifecycle'; -import { CodiconLabel } from 'vs/base/browser/ui/codiconLabel/codiconLabel'; +import { CodiconLabel } from 'vs/base/browser/ui/codicons/codiconLabel'; import { ICommandService } from 'vs/platform/commands/common/commands'; import { IEditorService } from 'vs/workbench/services/editor/common/editorService'; import { Part } from 'vs/workbench/browser/part'; diff --git a/src/vs/workbench/contrib/preferences/browser/settingsTree.ts b/src/vs/workbench/contrib/preferences/browser/settingsTree.ts index ec2d1aa938e..59e88f0440d 100644 --- a/src/vs/workbench/contrib/preferences/browser/settingsTree.ts +++ b/src/vs/workbench/contrib/preferences/browser/settingsTree.ts @@ -50,8 +50,9 @@ import { SETTINGS_EDITOR_COMMAND_SHOW_CONTEXT_MENU } from 'vs/workbench/contrib/ import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService'; import { ISetting, ISettingsGroup, SettingValueType } from 'vs/workbench/services/preferences/common/preferences'; import { IUserDataSyncEnablementService, getDefaultIgnoredSettings } from 'vs/platform/userDataSync/common/userDataSync'; -import { CodiconLabel } from 'vs/base/browser/ui/codiconLabel/codiconLabel'; import { getInvalidTypeError } from 'vs/workbench/services/preferences/common/preferencesValidation'; +import { Codicon } from 'vs/base/browser/ui/codicons/codicons'; +import { CodiconLabel } from 'vs/base/browser/ui/codicons/codiconLabel'; const $ = DOM.$; @@ -1151,7 +1152,7 @@ export class SettingBoolRenderer extends AbstractSettingRenderer implements ITre const deprecationWarningElement = DOM.append(container, $('.setting-item-deprecation-message')); const toDispose = new DisposableStore(); - const checkbox = new Checkbox({ actionClassName: 'codicon-check setting-value-checkbox', isChecked: true, title: '', inputActiveOptionBorder: undefined }); + const checkbox = new Checkbox({ icon: Codicon.check, actionClassName: 'setting-value-checkbox', isChecked: true, title: '', inputActiveOptionBorder: undefined }); controlElement.appendChild(checkbox.domNode); toDispose.add(checkbox); toDispose.add(checkbox.onChange(() => { diff --git a/src/vs/workbench/contrib/search/browser/patternInputWidget.ts b/src/vs/workbench/contrib/search/browser/patternInputWidget.ts index c015e1665f5..6c671c7db4a 100644 --- a/src/vs/workbench/contrib/search/browser/patternInputWidget.ts +++ b/src/vs/workbench/contrib/search/browser/patternInputWidget.ts @@ -17,6 +17,7 @@ import { attachInputBoxStyler, attachCheckboxStyler } from 'vs/platform/theme/co import { ContextScopedHistoryInputBox } from 'vs/platform/browser/contextScopedHistoryWidget'; import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey'; import type { IThemable } from 'vs/base/common/styler'; +import { Codicon } from 'vs/base/browser/ui/codicons/codicons'; export interface IOptions { placeholder?: string; @@ -206,7 +207,8 @@ export class ExcludePatternInputWidget extends PatternInputWidget { protected renderSubcontrols(controlsDiv: HTMLDivElement): void { this.useExcludesAndIgnoreFilesBox = this._register(new Checkbox({ - actionClassName: 'useExcludesAndIgnoreFiles codicon-exclude', + icon: Codicon.exclude, + actionClassName: 'useExcludesAndIgnoreFiles', title: nls.localize('useExcludesAndIgnoreFilesDescription', "Use Exclude Settings and Ignore Files"), isChecked: true, })); diff --git a/src/vs/workbench/contrib/search/browser/searchWidget.ts b/src/vs/workbench/contrib/search/browser/searchWidget.ts index f133d15905d..9ac6aaf489f 100644 --- a/src/vs/workbench/contrib/search/browser/searchWidget.ts +++ b/src/vs/workbench/contrib/search/browser/searchWidget.ts @@ -33,10 +33,13 @@ import { IAccessibilityService } from 'vs/platform/accessibility/common/accessib import { isMacintosh } from 'vs/base/common/platform'; import { Checkbox } from 'vs/base/browser/ui/checkbox/checkbox'; import { IViewsService } from 'vs/workbench/common/views'; +import { Codicon, registerIcon } from 'vs/base/browser/ui/codicons/codicons'; /** Specified in searchview.css */ export const SingleLineInputHeight = 24; +export const searchShowContextIcon = registerIcon('search-show-context', Codicon.listSelection); + export interface ISearchWidgetOptions { value?: string; replaceValue?: string; @@ -349,7 +352,7 @@ export class SearchWidget extends Widget { this._register(this.searchInputFocusTracker.onDidBlur(() => this.searchInputBoxFocused.set(false))); - this.showContextCheckbox = new Checkbox({ isChecked: false, title: nls.localize('showContext', "Show Context"), actionClassName: 'codicon-list-selection' }); + this.showContextCheckbox = new Checkbox({ isChecked: false, title: nls.localize('showContext', "Show Context"), icon: searchShowContextIcon }); this._register(this.showContextCheckbox.onChange(() => this.onContextLinesChanged())); if (options.showContextToggle) {