.

terminus-settings/package.json

@@ -16,6 +16,7 @@
     "@types/webpack-env": "1.13.0",
     "awesome-typescript-loader": "3.1.2",
     "css-loader": "^0.28.0",
+    "ng2-filter-pipe": "^0.1.7",
     "node-sass": "^4.5.2",
     "pug": "^2.0.0-beta3",
     "pug-loader": "^2.3.0",

terminus-settings/src/components/settingsTab.pug

@@ -143,16 +143,21 @@ ngb-tabset.vertical(type='tabs')
         template(ngbTabTitle)
             | Hotkeys
         template(ngbTabContent)
+            input.form-control(type='search', placeholder='Search hotkeys', [(ngModel)]='hotkeyFilter.name')
             .form-group
-                table
+                table.hotkeys-table
                     tr
-                        th Toggle terminal window
+                        th Name
+                        th ID
+                        th Hotkey 
+                    tr(*ngFor='let hotkey of hotkeyDescriptions|filterBy:hotkeyFilter')
+                        td {{hotkey.name}}
+                        td {{hotkey.id}}
                         td
-                            hotkey-input('[(model)]'='globalHotkey')                    
-                    tr(*ngFor='let hotkey of hotkeyDescriptions')
-                        th {{hotkey.name}}
-                        td
-                            multi-hotkey-input('[(model)]'='config.store.hotkeys[hotkey.id]')
+                            multi-hotkey-input(
+                                '[(model)]'='config.store.hotkeys[hotkey.id]'
+                                '(modelChange)'='config.save(); docking.dock()'
+                            )
                     
     ngb-tab(*ngFor='let provider of settingsProviders')
         template(ngbTabTitle)

terminus-settings/src/components/settingsTab.scss

@@ -9,7 +9,11 @@
         flex: none;
     }
 
-    >.modal-body {
-        padding: 0 0 20px !important;
+    .hotkeys-table {
+        margin-top: 30px;
+
+        td, th {
+            padding: 5px 10px;
+        }
     }
 }

terminus-settings/src/components/settingsTab.ts

@@ -13,7 +13,7 @@ import { SettingsTabProvider } from '../api'
   ],
 })
 export class SettingsTabComponent extends BaseTabComponent {
-    globalHotkey = ['Ctrl+Shift+G']
+    hotkeyFilter = { name: null }
     private hotkeyDescriptions: IHotkeyDescription[]
 
     constructor(

terminus-settings/src/index.ts

@@ -2,6 +2,8 @@ import { NgModule } from '@angular/core'
 import { BrowserModule } from '@angular/platform-browser'
 import { FormsModule } from '@angular/forms'
 import { NgbModule } from '@ng-bootstrap/ng-bootstrap'
+import { Ng2FilterPipeModule } from 'ng2-filter-pipe'
+
 import { ToolbarButtonProvider, TabRecoveryProvider } from 'terminus-core'
 
 import { HotkeyInputComponent } from './components/hotkeyInput'
@@ -20,6 +22,7 @@ import { RecoveryProvider } from './recoveryProvider'
         BrowserModule,
         FormsModule,
         NgbModule,
+        Ng2FilterPipeModule,
     ],
     providers: [
         { provide: ToolbarButtonProvider, useClass: ButtonProvider, multi: true },