Sfoglia il codice sorgente

Merge branch 'master' of github.com:Eugeny/tabby

Eugene Pankov 2 anni fa
parent
commit
0a2011acba

+ 1 - 0
tabby-core/src/index.ts

@@ -258,6 +258,7 @@ export default class AppModule { // eslint-disable-line @typescript-eslint/no-ex
 
 export { AppRootComponent as bootstrap }
 export * from './api'
+export { AppHotkeyProvider }
 
 // Deprecations
 export { ToolbarButton as IToolbarButton } from './api'

+ 8 - 1
tabby-settings/src/components/profilesSettingsTab.component.ts

@@ -4,7 +4,7 @@ import slugify from 'slugify'
 import deepClone from 'clone-deep'
 import { Component, Inject } from '@angular/core'
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap'
-import { ConfigService, HostAppService, Profile, SelectorService, ProfilesService, PromptModalComponent, PlatformService, BaseComponent, PartialProfile, ProfileProvider, TranslateService, Platform } from 'tabby-core'
+import { ConfigService, HostAppService, Profile, SelectorService, ProfilesService, PromptModalComponent, PlatformService, BaseComponent, PartialProfile, ProfileProvider, TranslateService, Platform, AppHotkeyProvider } from 'tabby-core'
 import { EditProfileModalComponent } from './editProfileModal.component'
 
 interface ProfileGroup {
@@ -146,6 +146,13 @@ export class ProfilesSettingsTabComponent extends BaseComponent {
             this.profilesService.providerForProfile(profile)?.deleteProfile(
                 this.profilesService.getConfigProxyForProfile(profile))
             this.config.store.profiles = this.config.store.profiles.filter(x => x !== profile)
+            const profileHotkeyName = AppHotkeyProvider.getProfileHotkeyName(profile)
+            if (this.config.store.hotkeys.profile.hasOwnProperty(profileHotkeyName)) {
+                const profileHotkeys = deepClone(this.config.store.hotkeys.profile)
+                // eslint-disable-next-line @typescript-eslint/no-dynamic-delete
+                delete profileHotkeys[profileHotkeyName]
+                this.config.store.hotkeys.profile = profileHotkeys
+            }
             await this.config.save()
         }
     }