Skip to content

Commit d2441c5

Browse files
sandy081sandy081
authored
rename to Profile (microsoft#166030)
1 parent 436a45e commit d2441c5

File tree

21 files changed

+110
-112
lines changed

21 files changed

+110
-112
lines changed

‎extensions/theme-abyss/themes/abyss-color-theme.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -409,7 +409,7 @@
409409
// "activityBar.foreground": "",
410410
// "activityBarBadge.background": "",
411411
// "activityBarBadge.foreground": "",
412-
"activityBarItem.settingsProfilesBackground": "#082877",
412+
"activityBarItem.profilesBackground": "#082877",
413413

414414
// Workbench: Panel
415415
// "panel.background": "",

‎extensions/theme-defaults/themes/light_vs.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"$schema": "vscode://schemas/color-theme",
33
"name": "Light (Visual Studio)",
44
"colors": {
5-
"activityBarItem.settingsProfilesBackground": "#4d4d4d",
5+
"activityBarItem.profilesBackground": "#4d4d4d",
66
"editor.background": "#FFFFFF",
77
"editor.foreground": "#000000",
88
"editor.inactiveSelectionBackground": "#E5EBF1",

‎extensions/theme-kimbie-dark/themes/kimbie-dark-color-theme.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
"ports.iconRunningProcessForeground": "#369432",
3333
"activityBar.background": "#221a0f",
3434
"activityBar.foreground": "#d3af86",
35-
"activityBarItem.settingsProfilesBackground": "#47351d",
35+
"activityBarItem.profilesBackground": "#47351d",
3636
"sideBar.background": "#362712",
3737
"menu.background": "#362712",
3838
"menu.foreground": "#CCCCCC",

‎extensions/theme-tomorrow-night-blue/themes/tomorrow-night-blue-color-theme.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
"statusBar.noFolderBackground": "#001126",
3737
"statusBar.debuggingBackground": "#001126",
3838
"activityBar.background": "#001733",
39-
"activityBarItem.settingsProfilesBackground": "#003271",
39+
"activityBarItem.profilesBackground": "#003271",
4040
"progressBar.background": "#bbdaffcc",
4141
"badge.background": "#bbdaffcc",
4242
"badge.foreground": "#001733",

‎src/vs/platform/environment/node/argv.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ export const OPTIONS: OptionDescriptions<Required<NativeParsedArgs>> = {
7777
'waitMarkerFilePath': { type: 'string' },
7878
'locale': { type: 'string', cat: 'o', args: 'locale', description: localize('locale', "The locale to use (e.g. en-US or zh-TW).") },
7979
'user-data-dir': { type: 'string', cat: 'o', args: 'dir', description: localize('userDataDir', "Specifies the directory that user data is kept in. Can be used to open multiple distinct instances of Code.") },
80-
'profile': { type: 'string', 'cat': 'o', args: 'settingsProfileName', description: localize('settingsProfileName', "Opens the provided folder or workspace with the given profile and associates the profile with the workspace. If the profile does not exist, a new empty one is created. A folder or workspace must be provided for the profile to take effect.") },
80+
'profile': { type: 'string', 'cat': 'o', args: 'profileName', description: localize('profileName', "Opens the provided folder or workspace with the given profile and associates the profile with the workspace. If the profile does not exist, a new empty one is created. A folder or workspace must be provided for the profile to take effect.") },
8181
'help': { type: 'boolean', cat: 'o', alias: 'h', description: localize('help', "Print usage.") },
8282

8383
'extensions-dir': { type: 'string', deprecates: ['extensionHomePath'], cat: 'e', args: 'dir', description: localize('extensionHomePath', "Set the root path for extensions.") },

‎src/vs/platform/userDataProfile/common/userDataProfile.ts‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -275,7 +275,7 @@ export class UserDataProfilesService extends Disposable implements IUserDataProf
275275

276276
async createProfile(id: string, name: string, options?: IUserDataProfileOptions, workspaceIdentifier?: WorkspaceIdentifier): Promise<IUserDataProfile> {
277277
if (!this.enabled) {
278-
throw new Error(`Settings Profiles are disabled. Enable them via the '${PROFILES_ENABLEMENT_CONFIG}' setting.`);
278+
throw new Error(`Profiles are disabled. Enable them via the '${PROFILES_ENABLEMENT_CONFIG}' setting.`);
279279
}
280280

281281
const profile = await this.doCreateProfile(id, name, options);
@@ -322,7 +322,7 @@ export class UserDataProfilesService extends Disposable implements IUserDataProf
322322

323323
async updateProfile(profileToUpdate: IUserDataProfile, options: IUserDataProfileUpdateOptions): Promise<IUserDataProfile> {
324324
if (!this.enabled) {
325-
throw new Error(`Settings Profiles are disabled. Enable them via the '${PROFILES_ENABLEMENT_CONFIG}' setting.`);
325+
throw new Error(`Profiles are disabled. Enable them via the '${PROFILES_ENABLEMENT_CONFIG}' setting.`);
326326
}
327327

328328
let profile = this.profiles.find(p => p.id === profileToUpdate.id);
@@ -338,7 +338,7 @@ export class UserDataProfilesService extends Disposable implements IUserDataProf
338338

339339
async removeProfile(profileToRemove: IUserDataProfile): Promise<void> {
340340
if (!this.enabled) {
341-
throw new Error(`Settings Profiles are disabled. Enable them via the '${PROFILES_ENABLEMENT_CONFIG}' setting.`);
341+
throw new Error(`Profiles are disabled. Enable them via the '${PROFILES_ENABLEMENT_CONFIG}' setting.`);
342342
}
343343
if (profileToRemove.isDefault) {
344344
throw new Error('Cannot remove default profile');
@@ -408,7 +408,7 @@ export class UserDataProfilesService extends Disposable implements IUserDataProf
408408

409409
setProfileForWorkspaceSync(workspaceIdentifier: WorkspaceIdentifier, profileToSet: IUserDataProfile): void {
410410
if (!this.enabled) {
411-
throw new Error(`Settings Profiles are disabled. Enable them via the '${PROFILES_ENABLEMENT_CONFIG}' setting.`);
411+
throw new Error(`Profiles are disabled. Enable them via the '${PROFILES_ENABLEMENT_CONFIG}' setting.`);
412412
}
413413

414414
const profile = this.profiles.find(p => p.id === profileToSet.id);
@@ -421,7 +421,7 @@ export class UserDataProfilesService extends Disposable implements IUserDataProf
421421

422422
unsetWorkspace(workspaceIdentifier: WorkspaceIdentifier, transient?: boolean): void {
423423
if (!this.enabled) {
424-
throw new Error(`Settings Profiles are disabled. Enable them via the '${PROFILES_ENABLEMENT_CONFIG}' setting.`);
424+
throw new Error(`Profiles are disabled. Enable them via the '${PROFILES_ENABLEMENT_CONFIG}' setting.`);
425425
}
426426

427427
this.updateWorkspaceAssociation(workspaceIdentifier, undefined, transient);

‎src/vs/platform/userDataSync/common/userDataSyncService.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,7 @@ export class UserDataSyncService extends Disposable implements IUserDataSyncServ
218218
}
219219
const profile = this.userDataProfilesService.profiles.find(p => p.id === syncProfile.id);
220220
if (!profile) {
221-
this.logService.error(`Settings Profile with id:${syncProfile.id} and name: ${syncProfile.name} does not exist locally to sync.`);
221+
this.logService.error(`Profile with id:${syncProfile.id} and name: ${syncProfile.name} does not exist locally to sync.`);
222222
continue;
223223
}
224224
this.logService.info('Syncing profile.', syncProfile.name);

‎src/vs/workbench/browser/parts/activitybar/activitybarActions.ts‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import { IColorTheme, IThemeService, registerThemingParticipant } from 'vs/platf
1919
import { ActivityAction, ActivityActionViewItem, IActivityActionViewItemOptions, IActivityHoverOptions, ICompositeBar, ICompositeBarColors, ToggleCompositePinnedAction } from 'vs/workbench/browser/parts/compositeBarActions';
2020
import { Categories } from 'vs/platform/action/common/actionCommonCategories';
2121
import { IActivity } from 'vs/workbench/common/activity';
22-
import { ACTIVITY_BAR_FOREGROUND, ACTIVITY_BAR_ACTIVE_BORDER, ACTIVITY_BAR_ACTIVE_FOCUS_BORDER, ACTIVITY_BAR_ACTIVE_BACKGROUND, ACTIVITY_BAR_SETTINGS_PROFILE_BACKGROUND, ACTIVITY_BAR_SETTINGS_PROFILE_HOVER_FOREGROUND } from 'vs/workbench/common/theme';
22+
import { ACTIVITY_BAR_FOREGROUND, ACTIVITY_BAR_ACTIVE_BORDER, ACTIVITY_BAR_ACTIVE_FOCUS_BORDER, ACTIVITY_BAR_ACTIVE_BACKGROUND, ACTIVITY_BAR_PROFILE_BACKGROUND, ACTIVITY_BAR_PROFILE_HOVER_FOREGROUND } from 'vs/workbench/common/theme';
2323
import { IWorkbenchLayoutService, Parts } from 'vs/workbench/services/layout/browser/layoutService';
2424
import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
2525
import { createAndFillInActionBarActions } from 'vs/platform/actions/browser/menuEntryActionViewItem';
@@ -381,7 +381,7 @@ export class ProfilesActivityActionViewItem extends MenuActivityActionViewItem {
381381
}
382382

383383
protected override computeTitle(): string {
384-
return localize('profiles', "{0} (Settings Profile)", this.userDataProfileService.currentProfile.name);
384+
return localize('profiles', "{0} (Profile)", this.userDataProfileService.currentProfile.name);
385385
}
386386

387387
}
@@ -510,24 +510,24 @@ registerThemingParticipant((theme, collector) => {
510510
`);
511511
}
512512

513-
const activityBarSettingsProfileBgColor = theme.getColor(ACTIVITY_BAR_SETTINGS_PROFILE_BACKGROUND);
514-
if (activityBarSettingsProfileBgColor) {
513+
const activityBarProfileBgColor = theme.getColor(ACTIVITY_BAR_PROFILE_BACKGROUND);
514+
if (activityBarProfileBgColor) {
515515
collector.addRule(`
516516
.monaco-workbench .activitybar > .content :not(.monaco-menu) > .monaco-action-bar .action-item .action-label.profile-activity-item,
517517
.monaco-workbench .activitybar > .content :not(.monaco-menu) > .monaco-action-bar .action-item .action-label.profile-activity-item,
518518
.monaco-workbench .activitybar > .content :not(.monaco-menu) > .monaco-action-bar .action-item .action-label.profile-activity-item {
519-
background-color: ${activityBarSettingsProfileBgColor} !important;
519+
background-color: ${activityBarProfileBgColor} !important;
520520
}
521521
`);
522522
}
523523

524-
const activityBarSettingsProfileHoverFgColor = theme.getColor(ACTIVITY_BAR_SETTINGS_PROFILE_HOVER_FOREGROUND);
525-
if (activityBarSettingsProfileHoverFgColor) {
524+
const activityBarProfileHoverFgColor = theme.getColor(ACTIVITY_BAR_PROFILE_HOVER_FOREGROUND);
525+
if (activityBarProfileHoverFgColor) {
526526
collector.addRule(`
527527
.monaco-workbench .activitybar > .content :not(.monaco-menu) > .monaco-action-bar .action-item.active .action-label.profile-activity-item,
528528
.monaco-workbench .activitybar > .content :not(.monaco-menu) > .monaco-action-bar .action-item:focus .action-label.profile-activity-item,
529529
.monaco-workbench .activitybar > .content :not(.monaco-menu) > .monaco-action-bar .action-item:hover .action-label.profile-activity-item {
530-
color: ${activityBarSettingsProfileHoverFgColor} !important;
530+
color: ${activityBarProfileHoverFgColor} !important;
531531
}
532532
`);
533533
}

‎src/vs/workbench/browser/parts/activitybar/activitybarPart.ts‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import { IDisposable, toDisposable, DisposableStore, Disposable } from 'vs/base/
1616
import { Event } from 'vs/base/common/event';
1717
import { ToggleActivityBarVisibilityAction, ToggleSidebarPositionAction } from 'vs/workbench/browser/actions/layoutActions';
1818
import { IThemeService, IColorTheme, ThemeIcon } from 'vs/platform/theme/common/themeService';
19-
import { ACTIVITY_BAR_BACKGROUND, ACTIVITY_BAR_BORDER, ACTIVITY_BAR_FOREGROUND, ACTIVITY_BAR_ACTIVE_BORDER, ACTIVITY_BAR_BADGE_BACKGROUND, ACTIVITY_BAR_BADGE_FOREGROUND, ACTIVITY_BAR_INACTIVE_FOREGROUND, ACTIVITY_BAR_ACTIVE_BACKGROUND, ACTIVITY_BAR_DRAG_AND_DROP_BORDER, ACTIVITY_BAR_SETTINGS_PROFILE_FOREGROUND } from 'vs/workbench/common/theme';
19+
import { ACTIVITY_BAR_BACKGROUND, ACTIVITY_BAR_BORDER, ACTIVITY_BAR_FOREGROUND, ACTIVITY_BAR_ACTIVE_BORDER, ACTIVITY_BAR_BADGE_BACKGROUND, ACTIVITY_BAR_BADGE_FOREGROUND, ACTIVITY_BAR_INACTIVE_FOREGROUND, ACTIVITY_BAR_ACTIVE_BACKGROUND, ACTIVITY_BAR_DRAG_AND_DROP_BORDER, ACTIVITY_BAR_PROFILE_FOREGROUND } from 'vs/workbench/common/theme';
2020
import { contrastBorder } from 'vs/platform/theme/common/colorRegistry';
2121
import { CompositeBar, ICompositeBarItem, CompositeDragAndDrop } from 'vs/workbench/browser/parts/compositeBar';
2222
import { Dimension, createCSSRule, asCSSUrl, addDisposableListener, EventType, isAncestor } from 'vs/base/browser/dom';
@@ -535,7 +535,7 @@ export class ActivitybarPart extends Part implements IPaneCompositeSelectorPart
535535
}
536536

537537
if (action.id === 'workbench.actions.profiles') {
538-
return this.instantiationService.createInstance(ProfilesActivityActionViewItem, action as ActivityAction, () => this.compositeBar.getContextMenuActions(), (theme: IColorTheme) => this.getSettingsProfileItemColors(theme), this.getActivityHoverOptions());
538+
return this.instantiationService.createInstance(ProfilesActivityActionViewItem, action as ActivityAction, () => this.compositeBar.getContextMenuActions(), (theme: IColorTheme) => this.getProfileItemColors(theme), this.getActivityHoverOptions());
539539
}
540540

541541
throw new Error(`No view item for action '${action.id}'`);
@@ -847,11 +847,11 @@ export class ActivitybarPart extends Part implements IPaneCompositeSelectorPart
847847
};
848848
}
849849

850-
private getSettingsProfileItemColors(theme: IColorTheme): ICompositeBarColors {
850+
private getProfileItemColors(theme: IColorTheme): ICompositeBarColors {
851851
return {
852852
...this.getActivitybarItemColors(theme),
853-
activeForegroundColor: theme.getColor(ACTIVITY_BAR_SETTINGS_PROFILE_FOREGROUND),
854-
inactiveForegroundColor: theme.getColor(ACTIVITY_BAR_SETTINGS_PROFILE_FOREGROUND),
853+
activeForegroundColor: theme.getColor(ACTIVITY_BAR_PROFILE_FOREGROUND),
854+
inactiveForegroundColor: theme.getColor(ACTIVITY_BAR_PROFILE_FOREGROUND),
855855
};
856856
}
857857

‎src/vs/workbench/common/theme.ts‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -625,26 +625,26 @@ export const ACTIVITY_BAR_BADGE_FOREGROUND = registerColor('activityBarBadge.for
625625
hcLight: Color.white
626626
}, localize('activityBarBadgeForeground', "Activity notification badge foreground color. The activity bar is showing on the far left or right and allows to switch between views of the side bar."));
627627

628-
export const ACTIVITY_BAR_SETTINGS_PROFILE_FOREGROUND = registerColor('activityBarItem.settingsProfilesForeground', {
628+
export const ACTIVITY_BAR_PROFILE_FOREGROUND = registerColor('activityBarItem.profilesForeground', {
629629
dark: ACTIVITY_BAR_INACTIVE_FOREGROUND,
630630
light: ACTIVITY_BAR_INACTIVE_FOREGROUND,
631631
hcDark: ACTIVITY_BAR_INACTIVE_FOREGROUND,
632632
hcLight: ACTIVITY_BAR_INACTIVE_FOREGROUND
633-
}, localize('statusBarItemSettingsProfileForeground', "Foreground color for the settings profile entry on the activity bar."));
633+
}, localize('activityBarItem.profilesForeground', "Foreground color for the profile entry on the activity bar."));
634634

635-
export const ACTIVITY_BAR_SETTINGS_PROFILE_HOVER_FOREGROUND = registerColor('activityBarItem.settingsProfilesHoverForeground', {
635+
export const ACTIVITY_BAR_PROFILE_HOVER_FOREGROUND = registerColor('activityBarItem.profilesHoverForeground', {
636636
dark: ACTIVITY_BAR_FOREGROUND,
637637
light: ACTIVITY_BAR_FOREGROUND,
638638
hcDark: ACTIVITY_BAR_FOREGROUND,
639639
hcLight: ACTIVITY_BAR_FOREGROUND
640-
}, localize('activityBarItem.settingsProfilesHoverForeground', "Foreground color for the settings profile entry on the activity bar when hovering."));
640+
}, localize('activityBarItem.profilesHoverForeground', "Foreground color for the profile entry on the activity bar when hovering."));
641641

642-
export const ACTIVITY_BAR_SETTINGS_PROFILE_BACKGROUND = registerColor('activityBarItem.settingsProfilesBackground', {
642+
export const ACTIVITY_BAR_PROFILE_BACKGROUND = registerColor('activityBarItem.profilesBackground', {
643643
dark: lighten(ACTIVITY_BAR_BACKGROUND, 0.5),
644644
light: darken(ACTIVITY_BAR_BACKGROUND, 0.12),
645645
hcDark: null,
646646
hcLight: null
647-
}, localize('statusBarItemSettingsProfileBackground', "Background color for the settings profile entry on the activity bar."));
647+
}, localize('activityBarItem.profilesBackground', "Background color for the profile entry on the activity bar."));
648648

649649
// < --- Remote --- >
650650

0 commit comments

Comments
 (0)