From 83758cbc460562410d4aa5e9e18198a4b76906ce Mon Sep 17 00:00:00 2001 From: Martin Aeschlimann Date: Mon, 20 Apr 2020 20:46:09 +0200 Subject: [PATCH] update codicons --- src/vs/base/common/codicons.ts | 14 +++++++++++--- src/vs/workbench/browser/actions/layoutActions.ts | 3 ++- .../browser/parts/activitybar/activitybarPart.ts | 7 ++++--- .../browser/parts/compositeBarActions.ts | 3 ++- .../codeEditor/browser/find/simpleFindWidget.ts | 1 - .../parts/titlebar/titlebarPart.ts | 15 ++++++++------- 6 files changed, 27 insertions(+), 16 deletions(-) diff --git a/src/vs/base/common/codicons.ts b/src/vs/base/common/codicons.ts index 047214f8455..d0867fb2db6 100644 --- a/src/vs/base/common/codicons.ts +++ b/src/vs/base/common/codicons.ts @@ -456,9 +456,17 @@ export namespace Codicon { 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' }); + export const account = new Codicon('account', { character: '\\eb99' }); + export const bellDot = new Codicon('bell-dot', { character: '\\eb9a' }); + export const debugConsole = new Codicon('debug-console', { character: '\\eb9b' }); + export const library = new Codicon('library', { character: '\\eb9c' }); + export const output = new Codicon('output', { character: '\\eb9d' }); + export const runAll = new Codicon('run-all', { character: '\\eb9e' }); + export const syncIgnored = new Codicon('sync-ignored', { character: '\\eb9f' }); + export const pinned = new Codicon('pinned', { character: '\\eba0' }); + export const githubInverted = new Codicon('github-inverted', { character: '\\eba1' }); + export const debugAlt2 = new Codicon('debug-alt-2', { character: '\\f101' }); + export const debugAlt = new Codicon('debug-alt', { character: '\\f102' }); } diff --git a/src/vs/workbench/browser/actions/layoutActions.ts b/src/vs/workbench/browser/actions/layoutActions.ts index 5ad55ee2b3a..7cc07cc6f04 100644 --- a/src/vs/workbench/browser/actions/layoutActions.ts +++ b/src/vs/workbench/browser/actions/layoutActions.ts @@ -27,6 +27,7 @@ import { IQuickInputService, IQuickPickItem, IQuickPickSeparator } from 'vs/plat import { INotificationService } from 'vs/platform/notification/common/notification'; import { IActivityBarService } from 'vs/workbench/services/activityBar/browser/activityBarService'; import { IPanelService } from 'vs/workbench/services/panel/common/panelService'; +import { Codicon } from 'vs/base/common/codicons'; const registry = Registry.as(WorkbenchExtensions.WorkbenchActions); const viewCategory = nls.localize('view', "View"); @@ -144,7 +145,7 @@ export class ToggleEditorLayoutAction extends Action { ) { super(id, label); - this.class = 'codicon-editor-layout'; + this.class = Codicon.editorLayout.classNames; this.updateEnablement(); this.registerListeners(); diff --git a/src/vs/workbench/browser/parts/activitybar/activitybarPart.ts b/src/vs/workbench/browser/parts/activitybar/activitybarPart.ts index 9630c534b18..e178007c6d0 100644 --- a/src/vs/workbench/browser/parts/activitybar/activitybarPart.ts +++ b/src/vs/workbench/browser/parts/activitybar/activitybarPart.ts @@ -43,6 +43,7 @@ import { IStorageKeysSyncRegistryService } from 'vs/platform/userDataSync/common import { getUserDataSyncStore } from 'vs/platform/userDataSync/common/userDataSync'; import { IProductService } from 'vs/platform/product/common/productService'; import { Before2D } from 'vs/workbench/browser/dnd'; +import { Codicon } from 'vs/base/common/codicons'; interface IPlaceholderViewlet { id: string; @@ -397,14 +398,14 @@ export class ActivitybarPart extends Part implements IActivityBarService { this.globalActivityAction = new ActivityAction({ id: 'workbench.actions.manage', name: nls.localize('manage', "Manage"), - cssClass: 'codicon-settings-gear' + cssClass: Codicon.gear.classNames }); if (getUserDataSyncStore(this.productService, this.configurationService)) { const profileAction = new ActivityAction({ id: 'workbench.actions.accounts', name: nls.localize('accounts', "Accounts"), - cssClass: 'codicon-account' + cssClass: Codicon.account.classNames }); this.globalActivityActionBar.push(profileAction); @@ -484,7 +485,7 @@ export class ActivitybarPart extends Part implements IActivityBarService { const activity: IActivity = { id: viewlet.id, name: shouldUseViewletIcon ? viewlet.name : viewDescriptor.name, - cssClass: shouldUseViewletIcon ? viewlet.cssClass : (isString(viewDescriptor.containerIcon) ? viewDescriptor.containerIcon : (viewDescriptor.containerIcon === undefined ? 'codicon-window' : undefined)), + cssClass: shouldUseViewletIcon ? viewlet.cssClass : (isString(viewDescriptor.containerIcon) ? viewDescriptor.containerIcon : (viewDescriptor.containerIcon === undefined ? Codicon.window : undefined)), iconUrl: shouldUseViewletIcon ? viewlet.iconUrl : (viewDescriptor.containerIcon instanceof URI ? viewDescriptor.containerIcon : undefined), keybindingId: viewlet.keybindingId }; diff --git a/src/vs/workbench/browser/parts/compositeBarActions.ts b/src/vs/workbench/browser/parts/compositeBarActions.ts index 1047d83bb3a..ea14ea76d46 100644 --- a/src/vs/workbench/browser/parts/compositeBarActions.ts +++ b/src/vs/workbench/browser/parts/compositeBarActions.ts @@ -20,6 +20,7 @@ import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding'; import { Emitter } from 'vs/base/common/event'; import { CompositeDragAndDropObserver, ICompositeDragAndDrop, Before2D } from 'vs/workbench/browser/dnd'; import { Color } from 'vs/base/common/color'; +import { Codicon } from 'vs/base/common/codicons'; export interface ICompositeActivity { badge: IBadge; @@ -362,7 +363,7 @@ export class CompositeOverflowActivityAction extends ActivityAction { super({ id: 'additionalComposites.action', name: nls.localize('additionalViews', "Additional Views"), - cssClass: 'codicon-more' + cssClass: Codicon.more.classNames }); } diff --git a/src/vs/workbench/contrib/codeEditor/browser/find/simpleFindWidget.ts b/src/vs/workbench/contrib/codeEditor/browser/find/simpleFindWidget.ts index 94ce07b7cdb..4c5dec43974 100644 --- a/src/vs/workbench/contrib/codeEditor/browser/find/simpleFindWidget.ts +++ b/src/vs/workbench/contrib/codeEditor/browser/find/simpleFindWidget.ts @@ -18,7 +18,6 @@ import { IContextViewService } from 'vs/platform/contextview/browser/contextView import { editorWidgetBackground, inputActiveOptionBorder, inputActiveOptionBackground, inputBackground, inputBorder, inputForeground, inputValidationErrorBackground, inputValidationErrorBorder, inputValidationErrorForeground, inputValidationInfoBackground, inputValidationInfoBorder, inputValidationInfoForeground, inputValidationWarningBackground, inputValidationWarningBorder, inputValidationWarningForeground, widgetShadow, editorWidgetForeground } from 'vs/platform/theme/common/colorRegistry'; import { IColorTheme, registerThemingParticipant } from 'vs/platform/theme/common/themeService'; import { ContextScopedFindInput } from 'vs/platform/browser/contextScopedHistoryWidget'; -import { Codicon } from 'vs/base/common/codicons'; const NLS_FIND_INPUT_LABEL = nls.localize('label.find', "Find"); const NLS_FIND_INPUT_PLACEHOLDER = nls.localize('placeholder.find', "Find"); diff --git a/src/vs/workbench/electron-browser/parts/titlebar/titlebarPart.ts b/src/vs/workbench/electron-browser/parts/titlebar/titlebarPart.ts index 05d911cc4b6..66a5283bd04 100644 --- a/src/vs/workbench/electron-browser/parts/titlebar/titlebarPart.ts +++ b/src/vs/workbench/electron-browser/parts/titlebar/titlebarPart.ts @@ -23,6 +23,7 @@ import { IProductService } from 'vs/platform/product/common/productService'; import { IElectronService } from 'vs/platform/electron/node/electron'; import { getTitleBarStyle } from 'vs/platform/windows/common/windows'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; +import { Codicon } from 'vs/base/common/codicons'; export class TitlebarPart extends BrowserTitleBarPart { private appIcon: HTMLElement | undefined; @@ -63,11 +64,11 @@ export class TitlebarPart extends BrowserTitleBarPart { private onDidChangeMaximized(maximized: boolean) { if (this.maxRestoreControl) { if (maximized) { - DOM.removeClass(this.maxRestoreControl, 'codicon-chrome-maximize'); - DOM.addClass(this.maxRestoreControl, 'codicon-chrome-restore'); + DOM.removeClasses(this.maxRestoreControl, Codicon.chromeMaximize.classNames); + DOM.addClasses(this.maxRestoreControl, Codicon.chromeRestore.classNames); } else { - DOM.removeClass(this.maxRestoreControl, 'codicon-chrome-restore'); - DOM.addClass(this.maxRestoreControl, 'codicon-chrome-maximize'); + DOM.removeClasses(this.maxRestoreControl, Codicon.chromeRestore.classNames); + DOM.addClasses(this.maxRestoreControl, Codicon.chromeMaximize.classNames); } } @@ -170,13 +171,13 @@ export class TitlebarPart extends BrowserTitleBarPart { this.windowControls = DOM.append(this.element, DOM.$('div.window-controls-container')); // Minimize - const minimizeIcon = DOM.append(this.windowControls, DOM.$('div.window-icon.window-minimize.codicon.codicon-chrome-minimize')); + const minimizeIcon = DOM.append(this.windowControls, DOM.$('div.window-icon.window-minimize' + Codicon.chromeMinimize.cssSelector)); this._register(DOM.addDisposableListener(minimizeIcon, DOM.EventType.CLICK, e => { this.electronService.minimizeWindow(); })); // Restore - this.maxRestoreControl = DOM.append(this.windowControls, DOM.$('div.window-icon.window-max-restore.codicon')); + this.maxRestoreControl = DOM.append(this.windowControls, DOM.$('div.window-icon.window-max-restore')); this._register(DOM.addDisposableListener(this.maxRestoreControl, DOM.EventType.CLICK, async e => { const maximized = await this.electronService.isMaximized(); if (maximized) { @@ -187,7 +188,7 @@ export class TitlebarPart extends BrowserTitleBarPart { })); // Close - const closeIcon = DOM.append(this.windowControls, DOM.$('div.window-icon.window-close.codicon.codicon-chrome-close')); + const closeIcon = DOM.append(this.windowControls, DOM.$('div.window-icon.window-close' + Codicon.chromeClose.cssSelector)); this._register(DOM.addDisposableListener(closeIcon, DOM.EventType.CLICK, e => { this.electronService.closeWindow(); })); -- GitLab