Skip to content

Commit d83eabb

Browse files
bpaserobpasero
committed
💄 - move some more things over to web
1 parent 209e792 commit d83eabb

File tree

3 files changed

+50
-37
lines changed

3 files changed

+50
-37
lines changed

‎src/vs/workbench/browser/actions/developerActions.ts

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ import { IWorkbenchActionRegistry, Extensions } from 'vs/workbench/common/action
2525
import { IStorageService } from 'vs/platform/storage/common/storage';
2626
import { clamp } from 'vs/base/common/numbers';
2727
import { KeyCode } from 'vs/base/common/keyCodes';
28+
import { IConfigurationRegistry, Extensions as ConfigurationExtensions } from 'vs/platform/configuration/common/configurationRegistry';
2829

2930
export class InspectContextKeysAction extends Action {
3031

@@ -215,8 +216,35 @@ export class LogStorageAction extends Action {
215216
}
216217
}
217218

219+
// --- Actions Registration
220+
218221
const developerCategory = nls.localize('developer', "Developer");
219222
const registry = Registry.as<IWorkbenchActionRegistry>(Extensions.WorkbenchActions);
220223
registry.registerWorkbenchAction(new SyncActionDescriptor(InspectContextKeysAction, InspectContextKeysAction.ID, InspectContextKeysAction.LABEL), 'Developer: Inspect Context Keys', developerCategory);
221224
registry.registerWorkbenchAction(new SyncActionDescriptor(ToggleScreencastModeAction, ToggleScreencastModeAction.ID, ToggleScreencastModeAction.LABEL), 'Developer: Toggle Screencast Mode', developerCategory);
222225
registry.registerWorkbenchAction(new SyncActionDescriptor(LogStorageAction, LogStorageAction.ID, LogStorageAction.LABEL), 'Developer: Log Storage Database Contents', developerCategory);
226+
227+
// --- Menu Registration
228+
229+
// Screencast Mode
230+
const configurationRegistry = Registry.as<IConfigurationRegistry>(ConfigurationExtensions.Configuration);
231+
configurationRegistry.registerConfiguration({
232+
id: 'screencastMode',
233+
order: 9,
234+
title: nls.localize('screencastModeConfigurationTitle', "Screencast Mode"),
235+
type: 'object',
236+
properties: {
237+
'screencastMode.verticalOffset': {
238+
type: 'number',
239+
default: 20,
240+
minimum: 0,
241+
maximum: 90,
242+
description: nls.localize('screencastMode.location.verticalPosition', "Controls the vertical offset of the screencast mode overlay from the bottom as a percentage of the workbench height.")
243+
},
244+
'screencastMode.onlyKeyboardShortcuts': {
245+
type: 'boolean',
246+
description: nls.localize('screencastMode.onlyKeyboardShortcuts', "Only show keyboard shortcuts in Screencast Mode."),
247+
default: false
248+
}
249+
}
250+
});

‎src/vs/workbench/browser/actions/workspaceActions.ts

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import { IWorkspaceContextService, WorkbenchState, IWorkspaceFolder } from 'vs/p
1111
import { IWorkspaceEditingService } from 'vs/workbench/services/workspace/common/workspaceEditing';
1212
import { IWorkspacesService } from 'vs/platform/workspaces/common/workspaces';
1313
import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
14-
import { ICommandService, ICommandHandler } from 'vs/platform/commands/common/commands';
14+
import { ICommandService, ICommandHandler, CommandsRegistry } from 'vs/platform/commands/common/commands';
1515
import { ADD_ROOT_FOLDER_COMMAND_ID, ADD_ROOT_FOLDER_LABEL, PICK_WORKSPACE_FOLDER_COMMAND_ID } from 'vs/workbench/browser/actions/workspaceCommands';
1616
import { IFileDialogService } from 'vs/platform/dialogs/common/dialogs';
1717
import { INotificationService } from 'vs/platform/notification/common/notification';
@@ -20,6 +20,9 @@ import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/
2020
import { ITextFileService, ISaveOptions } from 'vs/workbench/services/textfile/common/textfiles';
2121
import { toResource } from 'vs/workbench/common/editor';
2222
import { URI } from 'vs/base/common/uri';
23+
import { MenuRegistry, MenuId } from 'vs/platform/actions/common/actions';
24+
import { WorkbenchStateContext } from 'vs/workbench/browser/contextkeys';
25+
import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
2326

2427
export class OpenFileAction extends Action {
2528

@@ -305,3 +308,19 @@ export class DuplicateWorkspaceInNewWindowAction extends Action {
305308
return this.windowService.openWindow([{ workspaceUri: newWorkspace.configPath }], { forceNewWindow: true });
306309
}
307310
}
311+
312+
// --- Menu Registration
313+
314+
const workspacesCategory = nls.localize('workspaces', "Workspaces");
315+
316+
CommandsRegistry.registerCommand(OpenWorkspaceConfigFileAction.ID, serviceAccessor => {
317+
serviceAccessor.get(IInstantiationService).createInstance(OpenWorkspaceConfigFileAction, OpenWorkspaceConfigFileAction.ID, OpenWorkspaceConfigFileAction.LABEL).run();
318+
});
319+
320+
MenuRegistry.appendMenuItem(MenuId.CommandPalette, {
321+
command: {
322+
id: OpenWorkspaceConfigFileAction.ID,
323+
title: { value: `${workspacesCategory}: ${OpenWorkspaceConfigFileAction.LABEL}`, original: 'Workspaces: Open Workspace Configuration File' },
324+
},
325+
when: WorkbenchStateContext.isEqualTo('workspace')
326+
});

‎src/vs/workbench/electron-browser/main.contribution.ts

Lines changed: 2 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@ import { isWindows, isLinux, isMacintosh } from 'vs/base/common/platform';
1414
import { KeybindingsReferenceAction, OpenDocumentationUrlAction, OpenIntroductoryVideosUrlAction, OpenTipsAndTricksUrlAction, OpenTwitterUrlAction, OpenRequestFeatureUrlAction, OpenPrivacyStatementUrlAction, OpenLicenseUrlAction, OpenNewsletterSignupUrlAction } from 'vs/workbench/electron-browser/actions/helpActions';
1515
import { ToggleSharedProcessAction, ToggleDevToolsAction } from 'vs/workbench/electron-browser/actions/developerActions';
1616
import { ZoomResetAction, ZoomOutAction, ZoomInAction, CloseCurrentWindowAction, SwitchWindow, NewWindowAction, QuickSwitchWindow, ReloadWindowWithExtensionsDisabledAction, NewWindowTabHandler, ShowPreviousWindowTabHandler, ShowNextWindowTabHandler, MoveWindowTabToNewWindowHandler, MergeWindowTabsHandlerHandler, ToggleWindowTabsBarHandler } from 'vs/workbench/electron-browser/actions/windowActions';
17-
import { AddRootFolderAction, GlobalRemoveRootFolderAction, SaveWorkspaceAsAction, OpenWorkspaceConfigFileAction, DuplicateWorkspaceInNewWindowAction, CloseWorkspaceAction } from 'vs/workbench/browser/actions/workspaceActions';
17+
import { AddRootFolderAction, GlobalRemoveRootFolderAction, SaveWorkspaceAsAction, DuplicateWorkspaceInNewWindowAction, CloseWorkspaceAction } from 'vs/workbench/browser/actions/workspaceActions';
1818
import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
1919
import { KeybindingsRegistry, KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
2020
import { CommandsRegistry } from 'vs/platform/commands/common/commands';
21-
import { IInstantiationService, ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
21+
import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
2222
import { ADD_ROOT_FOLDER_COMMAND_ID } from 'vs/workbench/browser/actions/workspaceCommands';
2323
import { SupportsWorkspacesContext, IsMacContext, HasMacNativeTabsContext, IsDevelopmentContext, WorkbenchStateContext, WorkspaceFolderCountContext } from 'vs/workbench/browser/contextkeys';
2424
import { NoEditorsVisibleContext, SingleEditorGroupsContext } from 'vs/workbench/common/editor';
@@ -83,18 +83,6 @@ import { IWindowService, IWindowsService } from 'vs/platform/windows/common/wind
8383
registry.registerWorkbenchAction(new SyncActionDescriptor(GlobalRemoveRootFolderAction, GlobalRemoveRootFolderAction.ID, GlobalRemoveRootFolderAction.LABEL), 'Workspaces: Remove Folder from Workspace...', workspacesCategory);
8484
registry.registerWorkbenchAction(new SyncActionDescriptor(SaveWorkspaceAsAction, SaveWorkspaceAsAction.ID, SaveWorkspaceAsAction.LABEL), 'Workspaces: Save Workspace As...', workspacesCategory, SupportsWorkspacesContext);
8585
registry.registerWorkbenchAction(new SyncActionDescriptor(DuplicateWorkspaceInNewWindowAction, DuplicateWorkspaceInNewWindowAction.ID, DuplicateWorkspaceInNewWindowAction.LABEL), 'Workspaces: Duplicate Workspace in New Window', workspacesCategory);
86-
87-
CommandsRegistry.registerCommand(OpenWorkspaceConfigFileAction.ID, serviceAccessor => {
88-
serviceAccessor.get(IInstantiationService).createInstance(OpenWorkspaceConfigFileAction, OpenWorkspaceConfigFileAction.ID, OpenWorkspaceConfigFileAction.LABEL).run();
89-
});
90-
91-
MenuRegistry.appendMenuItem(MenuId.CommandPalette, {
92-
command: {
93-
id: OpenWorkspaceConfigFileAction.ID,
94-
title: { value: `${workspacesCategory}: ${OpenWorkspaceConfigFileAction.LABEL}`, original: 'Workspaces: Open Workspace Configuration File' },
95-
},
96-
when: WorkbenchStateContext.isEqualTo('workspace')
97-
});
9886
})();
9987

10088
// Actions: macOS Native Tabs
@@ -505,28 +493,6 @@ import { IWindowService, IWindowsService } from 'vs/platform/windows/common/wind
505493
}
506494
});
507495

508-
// Screencast Mode
509-
registry.registerConfiguration({
510-
id: 'screencastMode',
511-
order: 9,
512-
title: nls.localize('screencastModeConfigurationTitle', "Screencast Mode"),
513-
type: 'object',
514-
properties: {
515-
'screencastMode.verticalOffset': {
516-
type: 'number',
517-
default: 20,
518-
minimum: 0,
519-
maximum: 90,
520-
description: nls.localize('screencastMode.location.verticalPosition', "Controls the vertical offset of the screencast mode overlay from the bottom as a percentage of the workbench height.")
521-
},
522-
'screencastMode.onlyKeyboardShortcuts': {
523-
type: 'boolean',
524-
description: nls.localize('screencastMode.onlyKeyboardShortcuts', "Only show keyboard shortcuts in Screencast Mode."),
525-
default: false
526-
}
527-
}
528-
});
529-
530496
// Telemetry
531497
registry.registerConfiguration({
532498
'id': 'telemetry',

0 commit comments

Comments
 (0)