diff --git a/src/vs/workbench/contrib/void/browser/sidebarActions.ts b/src/vs/workbench/contrib/void/browser/sidebarActions.ts index 06f86b8e..3b544a83 100644 --- a/src/vs/workbench/contrib/void/browser/sidebarActions.ts +++ b/src/vs/workbench/contrib/void/browser/sidebarActions.ts @@ -161,22 +161,3 @@ registerAction2(class extends Action2 { } }) -// registerAction2(class extends Action2 { -// constructor() { -// super({ -// id: 'void.viewSettings', -// title: 'Void Settings', -// icon: { id: 'settings-gear' }, -// menu: [{ id: MenuId.ViewTitle, group: 'navigation', when: ContextKeyExpr.equals('view', VOID_VIEW_ID), }] -// }); -// } -// async run(accessor: ServicesAccessor): Promise { -// const stateService = accessor.get(IVoidSidebarStateService) -// const metricsService = accessor.get(IMetricsService) - -// metricsService.capture('Chat Navigation', { type: 'Settings' }) - -// stateService.setState({ isHistoryOpen: false, currentTab: stateService.state.currentTab === 'settings' ? 'chat' : 'settings' }) -// stateService.fireBlurChat() -// } -// }) diff --git a/src/vs/workbench/contrib/void/browser/sidebarViewPane.ts b/src/vs/workbench/contrib/void/browser/sidebarViewPane.ts index 8b778474..87d0872c 100644 --- a/src/vs/workbench/contrib/void/browser/sidebarViewPane.ts +++ b/src/vs/workbench/contrib/void/browser/sidebarViewPane.ts @@ -37,6 +37,10 @@ import { IHoverService } from '../../../../platform/hover/browser/hover.js'; import { mountSidebar } from './react/out/sidebar-tsx/index.js'; import { getReactServices } from './helpers/reactServicesHelper.js'; +import { Codicon } from '../../../../base/common/codicons.js'; +// import { Orientation } from '../../../../base/browser/ui/sash/sash.js'; +// import { Codicon } from '../../../../base/common/codicons.js'; +// import { Codicon } from '../../../../base/common/codicons.js'; // compare against search.contribution.ts and debug.contribution.ts, scm.contribution.ts (source control) @@ -90,17 +94,22 @@ class VoidSidebarViewPane extends ViewPane { // called VIEWLET_ID in other places for some reason export const VOID_VIEW_CONTAINER_ID = 'workbench.view.void' -export const VOID_VIEW_ID = VOID_VIEW_CONTAINER_ID // simplicity +export const VOID_VIEW_ID = VOID_VIEW_CONTAINER_ID // Register view container const viewContainerRegistry = Registry.as(ViewContainerExtensions.ViewContainersRegistry); -const viewContainer = viewContainerRegistry.registerViewContainer({ +const container = viewContainerRegistry.registerViewContainer({ id: VOID_VIEW_CONTAINER_ID, - title: nls.localize2('void chat', 'Void Chat'), // this is used to say "Void" (Ctrl + L) + title: nls.localize2('voidContainer', 'Void'), // this is used to say "Void" (Ctrl + L) ctorDescriptor: new SyncDescriptor(ViewPaneContainer, [VOID_VIEW_CONTAINER_ID, { mergeViewWithContainerWhenSingleView: true }]), hideIfEmpty: false, - // icon: voidViewIcon, order: 1, + + icon: Codicon.symbolMethod, + alwaysUseContainerInfo: true, + // alwaysUseContainerInfo: true, + // icon: , + }, ViewContainerLocation.AuxiliaryBar, { doNotRegisterOpenCommand: true, isDefault: true }); @@ -111,16 +120,19 @@ viewsRegistry.registerViews([{ id: VOID_VIEW_ID, hideByDefault: false, // start open // containerIcon: voidViewIcon, - name: nls.localize2('chat', 'Chat'), // this says ... : CHAT + name: nls.localize2('voidChat', 'Chat'), // this says ... : CHAT ctorDescriptor: new SyncDescriptor(VoidSidebarViewPane), canToggleVisibility: false, - canMoveView: true, + canMoveView: false, // can't move this out of its container + + // singleViewPaneContainerTitle: 'hi', + // openCommandActionDescriptor: { - // id: viewContainer.id, + // id: VOID_VIEW_CONTAINER_ID, // keybindings: { // primary: KeyMod.CtrlCmd | KeyCode.KeyL, // }, // order: 1 // }, -}], viewContainer); +}], container); diff --git a/src/vs/workbench/contrib/void/browser/void.contribution.ts b/src/vs/workbench/contrib/void/browser/void.contribution.ts index ee12a345..b7d3f8be 100644 --- a/src/vs/workbench/contrib/void/browser/void.contribution.ts +++ b/src/vs/workbench/contrib/void/browser/void.contribution.ts @@ -18,8 +18,8 @@ import './threadHistoryService.js' // register Autocomplete import './autocompleteService.js' -// register css -import './media/void.css' - // settings pane import './voidSettingsPane.js' + +// register css +import './media/void.css' diff --git a/src/vs/workbench/contrib/void/browser/voidSettingsPane.ts b/src/vs/workbench/contrib/void/browser/voidSettingsPane.ts index 2d638bf5..f94e9aff 100644 --- a/src/vs/workbench/contrib/void/browser/voidSettingsPane.ts +++ b/src/vs/workbench/contrib/void/browser/voidSettingsPane.ts @@ -49,7 +49,11 @@ class VoidSettingsInput extends EditorInput { } override getName(): string { - return nls.localize('voidSettingsInputsName', "Void Settings"); + return nls.localize('voidSettingsInputsName', 'Void Settings'); + } + + override getIcon() { + return Codicon.checklist // symbol for the actual editor pane } } @@ -90,7 +94,7 @@ class VoidSettingsPane extends EditorPane { } - +// register Settings pane Registry.as(EditorExtensions.EditorPane).registerEditorPane( EditorPaneDescriptor.create(VoidSettingsPane, VoidSettingsPane.ID, nls.localize('VoidSettingsPane', "Void Settings Pane")), [new SyncDescriptor(VoidSettingsInput)] @@ -98,14 +102,14 @@ Registry.as(EditorExtensions.EditorPane).registerEditorPane const OPEN_VOID_SETTINGS_ID = 'workbench.action.openVoidSettings' -// Register the gear +// register the gear on the top right registerAction2(class extends Action2 { constructor() { super({ id: OPEN_VOID_SETTINGS_ID, title: nls.localize2('voidSettings', "Void: Settings"), f1: true, - icon: Codicon.gear, + icon: Codicon.settingsGear, menu: [ { id: MenuId.LayoutControlMenuSubmenu,