maxmustermann/vscode
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

use Codicon.close / Codicon.closeDirty / Codicon.removeClose

Browse source
This commit is contained in:
Martin Aeschlimann 2020-04-20 17:53:35 +02:00
parent a756ad5e9f
commit be256b54a1
12 changed files with 30 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/vs/editor/contrib/peekView/peekView.ts
View file

@ -187,7 +187,7 @@ export abstract class PeekViewWidget extends ZoneWidget {
this._actionbarWidget = new ActionBar(actionsContainer, actionBarOptions);
this._disposables.add(this._actionbarWidget);
this._actionbarWidget.push(new Action('peekview.close', nls.localize('label.close', "Close"), 'codicon-close', true, () => {
this._actionbarWidget.push(new Action('peekview.close', nls.localize('label.close', "Close"), Codicon.close.classNames, true, () => {
this.dispose();
return Promise.resolve();
}), { label: false, icon: true });

2
src/vs/editor/contrib/quickAccess/gotoSymbolQuickAccess.ts
View file

@ -304,7 +304,7 @@ export abstract class AbstractGotoSymbolQuickAccessProvider extends AbstractEdit
return [
{
iconClass: openSideBySideDirection === 'right' ? 'codicon-split-horizontal' : 'codicon-split-vertical',
iconClass: openSideBySideDirection === 'right' ? Codicon.splitHorizontal.classNames : Codicon.splitVertical.classNames,
tooltip: openSideBySideDirection === 'right' ? localize('openToSide', "Open to the Side") : localize('openToBottom', "Open to the Bottom")
}
];

5
src/vs/workbench/browser/actions/windowActions.ts
View file

@ -30,6 +30,7 @@ import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
import { inQuickPickContext, getQuickNavigateHandler } from 'vs/workbench/browser/quickaccess';
import { IHostService } from 'vs/workbench/services/host/browser/host';
import { ResourceMap } from 'vs/base/common/map';
import { Codicon } from 'vs/base/common/codicons';
export const inRecentFilesPickerContextKey = 'inRecentFilesPicker';
@ -41,12 +42,12 @@ interface IRecentlyOpenedPick extends IQuickPickItem {
abstract class BaseOpenRecentAction extends Action {
private readonly removeFromRecentlyOpened: IQuickInputButton = {
iconClass: 'codicon-close',
iconClass: Codicon.removeClose.classNames,
tooltip: nls.localize('remove', "Remove from Recently Opened")
};
private readonly dirtyRecentlyOpened: IQuickInputButton = {
iconClass: 'dirty-workspace codicon-circle-filled',
iconClass: 'dirty-workspace ' + Codicon.closeDirty.classNames,
tooltip: nls.localize('dirtyRecentlyOpened', "Workspace With Dirty Files"),
alwaysVisible: true
};

7
src/vs/workbench/browser/parts/editor/editorActions.ts
View file

@ -20,6 +20,7 @@ import { IFileDialogService, ConfirmResult } from 'vs/platform/dialogs/common/di
import { IWorkingCopyService } from 'vs/workbench/services/workingCopy/common/workingCopyService';
import { ItemActivation, IQuickInputService } from 'vs/platform/quickinput/common/quickInput';
import { AllEditorsByMostRecentlyUsedQuickAccess, ActiveGroupEditorsByMostRecentlyUsedQuickAccess, AllEditorsByAppearanceQuickAccess } from 'vs/workbench/browser/parts/editor/editorQuickAccess';
import { Codicon } from 'vs/base/common/codicons';
export class ExecuteCommandAction extends Action {
@ -395,7 +396,7 @@ export class CloseEditorAction extends Action {
label: string,
@ICommandService private readonly commandService: ICommandService
) {
super(id, label, 'codicon-close');
super(id, label, Codicon.close.classNames);
}
run(context?: IEditorCommandsContext): Promise<void> {
@ -413,7 +414,7 @@ export class CloseOneEditorAction extends Action {
label: string,
@IEditorGroupsService private readonly editorGroupService: IEditorGroupsService
) {
super(id, label, 'codicon-close');
super(id, label, Codicon.close.classNames);
}
async run(context?: IEditorCommandsContext): Promise<void> {
@ -609,7 +610,7 @@ export class CloseAllEditorsAction extends BaseCloseAllAction {
@IEditorGroupsService editorGroupService: IEditorGroupsService,
@IEditorService editorService: IEditorService
) {
super(id, label, 'codicon-close-all', workingCopyService, fileDialogService, editorGroupService, editorService);
super(id, label, Codicon.closeAll.classNames, workingCopyService, fileDialogService, editorGroupService, editorService);
}
protected async doCloseAll(): Promise<void> {

3
src/vs/workbench/browser/parts/editor/editorGroupView.ts
View file

@ -51,6 +51,7 @@ import { Schemas } from 'vs/base/common/network';
import { EditorActivation, EditorOpenContext } from 'vs/platform/editor/common/editor';
import { IDialogService, IFileDialogService, ConfirmResult } from 'vs/platform/dialogs/common/dialogs';
import { ILogService } from 'vs/platform/log/common/log';
import { Codicon } from 'vs/base/common/codicons';
export class EditorGroupView extends Themable implements IEditorGroupView {
@ -290,7 +291,7 @@ export class EditorGroupView extends Themable implements IEditorGroupView {
const removeGroupAction = this._register(new Action(
CLOSE_EDITOR_GROUP_COMMAND_ID,
localize('closeGroupAction', "Close"),
'codicon-close',
Codicon.close.classNames,
true,
async () => this.accessor.removeGroup(this)));

3
src/vs/workbench/browser/parts/editor/editorQuickAccess.ts
View file

@ -16,6 +16,7 @@ import { getIconClasses } from 'vs/editor/common/services/getIconClasses';
import { prepareQuery, scoreItemFuzzy, compareItemsByFuzzyScore, FuzzyScorerCache } from 'vs/base/common/fuzzyScorer';
import { CancellationToken } from 'vs/base/common/cancellation';
import { IDisposable } from 'vs/base/common/lifecycle';
import { Codicon } from 'vs/base/common/codicons';
interface IEditorQuickPickItem extends IQuickPickItemWithResource, IPickerQuickAccessItem {
groupId: GroupIdentifier;
@ -160,7 +161,7 @@ export abstract class BaseEditorQuickAccessProvider extends PickerQuickAccessPro
buttons: (() => {
return [
{
iconClass: isDirty ? 'dirty-editor codicon-circle-filled' : 'codicon-close',
iconClass: isDirty ? ('dirty-editor ' + Codicon.closeDirty.classNames) : Codicon.close.classNames,
tooltip: localize('closeEditor', "Close Editor"),
alwaysVisible: isDirty
}

3
src/vs/workbench/browser/parts/notifications/notificationsActions.ts
View file

@ -12,6 +12,7 @@ import { INotificationService } from 'vs/platform/notification/common/notificati
import { CLEAR_NOTIFICATION, EXPAND_NOTIFICATION, COLLAPSE_NOTIFICATION, CLEAR_ALL_NOTIFICATIONS, HIDE_NOTIFICATIONS_CENTER } from 'vs/workbench/browser/parts/notifications/notificationsCommands';
import { ICommandService } from 'vs/platform/commands/common/commands';
import { IClipboardService } from 'vs/platform/clipboard/common/clipboardService';
import { Codicon } from 'vs/base/common/codicons';
export class ClearNotificationAction extends Action {
@ -23,7 +24,7 @@ export class ClearNotificationAction extends Action {
label: string,
@ICommandService private readonly commandService: ICommandService
) {
super(id, label, 'codicon-close');
super(id, label, Codicon.close.classNames);
}
async run(notification: INotificationViewItem): Promise<void> {

3
src/vs/workbench/browser/parts/panel/panelActions.ts
View file

@ -18,6 +18,7 @@ import { IActivity } from 'vs/workbench/common/activity';
import { IEditorGroupsService } from 'vs/workbench/services/editor/common/editorGroupsService';
import { ActivePanelContext, PanelPositionContext } from 'vs/workbench/common/panel';
import { ContextKeyExpression } from 'vs/platform/contextkey/common/contextkey';
import { Codicon } from 'vs/base/common/codicons';
export class ClosePanelAction extends Action {
@ -29,7 +30,7 @@ export class ClosePanelAction extends Action {
name: string,
@IWorkbenchLayoutService private readonly layoutService: IWorkbenchLayoutService
) {
super(id, name, 'codicon-close');
super(id, name, Codicon.close.classNames);
}
async run(): Promise<void> {

3
src/vs/workbench/contrib/feedback/browser/feedback.ts
View file

@ -23,6 +23,7 @@ import { IProductService } from 'vs/platform/product/common/productService';
import { IOpenerService } from 'vs/platform/opener/common/opener';
import { StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent';
import { KeyCode } from 'vs/base/common/keyCodes';
import { Codicon } from 'vs/base/common/codicons';
export interface IFeedback {
feedback: string;
@ -115,7 +116,7 @@ export class FeedbackDropdown extends Dropdown {
dom.append(this.feedbackForm, dom.$('h2.title')).textContent = nls.localize("label.sendASmile", "Tweet us your feedback.");
// Close Button (top right)
const closeBtn = dom.append(this.feedbackForm, dom.$('div.cancel.codicon.codicon-close'));
const closeBtn = dom.append(this.feedbackForm, dom.$('div.cancel' + Codicon.close.cssSelector));
closeBtn.tabIndex = 0;
closeBtn.setAttribute('role', 'button');
closeBtn.title = nls.localize('close', "Close");

3
src/vs/workbench/contrib/files/browser/fileActions.ts
View file

@ -50,6 +50,7 @@ import { once } from 'vs/base/common/functional';
import { IEditorOptions } from 'vs/platform/editor/common/editor';
import { IEditorGroup } from 'vs/workbench/services/editor/common/editorGroupsService';
import { FileEditorInput } from 'vs/workbench/contrib/files/common/editors/fileEditorInput';
import { Codicon } from 'vs/base/common/codicons';
export const NEW_FILE_COMMAND_ID = 'explorer.newFile';
export const NEW_FILE_LABEL = nls.localize('newFile', "New File");
@ -694,7 +695,7 @@ export class CloseGroupAction extends Action {
static readonly LABEL = nls.localize('closeGroup', "Close Group");
constructor(id: string, label: string, @ICommandService private readonly commandService: ICommandService) {
super(id, label, 'codicon-close-all');
super(id, label, Codicon.closeAll.classNames);
}
run(context?: unknown): Promise<void> {

5
src/vs/workbench/electron-browser/actions/windowActions.ts
View file

@ -22,6 +22,7 @@ import { IConfigurationService } from 'vs/platform/configuration/common/configur
import { IElectronService } from 'vs/platform/electron/node/electron';
import { INativeWorkbenchEnvironmentService } from 'vs/workbench/services/environment/electron-browser/environmentService';
import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
import { Codicon } from 'vs/base/common/codicons';
export class CloseCurrentWindowAction extends Action {
@ -155,12 +156,12 @@ export class ReloadWindowWithExtensionsDisabledAction extends Action {
export abstract class BaseSwitchWindow extends Action {
private readonly closeWindowAction: IQuickInputButton = {
iconClass: 'codicon-close',
iconClass: Codicon.removeClose.classNames,
tooltip: nls.localize('close', "Close Window")
};
private readonly closeDirtyWindowAction: IQuickInputButton = {
iconClass: 'dirty-window codicon-circle-filled',
iconClass: 'dirty-window ' + Codicon.closeDirty,
tooltip: nls.localize('close', "Close Window"),
alwaysVisible: true
};

12
test/automation/src/search.ts
View file

@ -74,21 +74,21 @@ export class Search extends Viewlet {
await retry(
() => this.code.waitAndClick(fileMatch),
() => this.code.waitForElement(`${fileMatch} .action-label.codicon.codicon-close`, el => !!el && el.top > 0 && el.left > 0, 10)
() => this.code.waitForElement(`${fileMatch} .action-label.codicon.search-remove`, el => !!el && el.top > 0 && el.left > 0, 10)
);
// ¯\_(ツ)_/¯
await new Promise(c => setTimeout(c, 500));
await this.code.waitAndClick(`${fileMatch} .action-label.codicon.codicon-close`);
await this.code.waitAndClick(`${fileMatch} .action-label.codicon.search-remove`);
await this.code.waitForElement(fileMatch, el => !el);
}
async expandReplace(): Promise<void> {
await this.code.waitAndClick(`${VIEWLET} .search-widget .monaco-button.toggle-replace-button.codicon-chevron-right`);
await this.code.waitAndClick(`${VIEWLET} .search-widget .monaco-button.toggle-replace-button.codicon-search-hide-replace`);
}
async collapseReplace(): Promise<void> {
await this.code.waitAndClick(`${VIEWLET} .search-widget .monaco-button.toggle-replace-button.codicon-chevron-down`);
await this.code.waitAndClick(`${VIEWLET} .search-widget .monaco-button.toggle-replace-button.codicon-search-show-replace`);
}
async setReplaceText(text: string): Promise<void> {
@ -100,12 +100,12 @@ export class Search extends Viewlet {
await retry(
() => this.code.waitAndClick(fileMatch),
() => this.code.waitForElement(`${fileMatch} .action-label.codicon.codicon-replace-all`, el => !!el && el.top > 0 && el.left > 0, 10)
() => this.code.waitForElement(`${fileMatch} .action-label.codicon.codicon-search-replace-all`, el => !!el && el.top > 0 && el.left > 0, 10)
);
// ¯\_(ツ)_/¯
await new Promise(c => setTimeout(c, 500));
await this.code.waitAndClick(`${fileMatch} .action-label.codicon.codicon-replace-all`);
await this.code.waitAndClick(`${fileMatch} .action-label.codicon.codicon-search-replace-all`);
}
async waitForResultText(text: string): Promise<void> {