From f1e79e9ada3dcbf8274e6b26f77287cd9f7689dc Mon Sep 17 00:00:00 2001
From: pinpin <igorsmikulovs@MacBook-Pro.local>
Date: Tue, 17 Nov 2020 09:14:05 +0200
Subject: [PATCH] Fixes based on PR reviews

---
 terminus-core/src/components/baseTab.component.ts   |  2 --
 .../src/components/tabHeader.component.pug          |  4 ++--
 terminus-core/src/components/tabHeader.component.ts | 13 ++-----------
 .../components/appearanceSettingsTab.component.pug  |  8 ++++----
 4 files changed, 8 insertions(+), 19 deletions(-)

diff --git a/terminus-core/src/components/baseTab.component.ts b/terminus-core/src/components/baseTab.component.ts
index 355f8002..fea8b950 100644
--- a/terminus-core/src/components/baseTab.component.ts
+++ b/terminus-core/src/components/baseTab.component.ts
@@ -45,8 +45,6 @@ export abstract class BaseTabComponent {
     color: string|null = null
 
     hasFocus = false
-    showIndex = true
-    showCloseButton = true
 
     /**
      * Ping this if your recovery state has been changed and you want
diff --git a/terminus-core/src/components/tabHeader.component.pug b/terminus-core/src/components/tabHeader.component.pug
index 889c7ec9..676a495a 100644
--- a/terminus-core/src/components/tabHeader.component.pug
+++ b/terminus-core/src/components/tabHeader.component.pug
@@ -1,7 +1,7 @@
 .progressbar([style.width]='progress + "%"', *ngIf='progress != null')
-.index(*ngIf='tab.showIndex==true',
+.index(*ngIf='!config.store.terminal.disableTabIndex',
     #handle,
     [style.background-color]='tab.color',
 ) {{index + 1}}
 .name([title]='tab.customTitle || tab.title') {{tab.customTitle || tab.title}}
-button(*ngIf='tab.showCloseButton==true',(click)='app.closeTab(tab, true)') &times;
+button(*ngIf='!config.store.terminal.disableCloseButton',(click)='app.closeTab(tab, true)') &times;
diff --git a/terminus-core/src/components/tabHeader.component.ts b/terminus-core/src/components/tabHeader.component.ts
index 9cccbf1b..3df6a932 100644
--- a/terminus-core/src/components/tabHeader.component.ts
+++ b/terminus-core/src/components/tabHeader.component.ts
@@ -32,13 +32,13 @@ export class TabHeaderComponent {
 
     private constructor (
         public app: AppService,
+        public config: ConfigService,
         private electron: ElectronService,
         private hostApp: HostAppService,
         private ngbModal: NgbModal,
         private hotkeys: HotkeysService,
-        private config: ConfigService,
         @Inject(SortableComponent) private parentDraggable: SortableComponentProxy,
-        @Optional() @Inject(TabContextMenuItemProvider) protected contextMenuProviders: TabContextMenuItemProvider[],        
+        @Optional() @Inject(TabContextMenuItemProvider) protected contextMenuProviders: TabContextMenuItemProvider[],
     ) {
         this.hotkeys.matchedHotkey.subscribe((hotkey) => {
             if (this.app.activeTab === this.tab) {
@@ -54,15 +54,6 @@ export class TabHeaderComponent {
         this.tab.progress$.subscribe(progress => {
             this.progress = progress
         })
-
-        if (this.config.store.terminal.disableTabIndex) {
-            this.tab.showIndex = false;            
-        }
-
-        if (this.config.store.terminal.disableCloseButton) {
-            this.tab.showCloseButton = false;
-        }        
-
     }
 
     ngAfterViewInit () {
diff --git a/terminus-terminal/src/components/appearanceSettingsTab.component.pug b/terminus-terminal/src/components/appearanceSettingsTab.component.pug
index aeda0d5c..d4b7c5a9 100644
--- a/terminus-terminal/src/components/appearanceSettingsTab.component.pug
+++ b/terminus-terminal/src/components/appearanceSettingsTab.component.pug
@@ -111,20 +111,20 @@ h3.mb-3 Appearance
 
 .form-line
     .header
-        .title Disable Tab Index
+        .title Disable tab index
 
     toggle(
         [(ngModel)]='config.store.terminal.disableTabIndex',
-        (ngModelChange)='config.save(); config.requestRestart()',
+        (ngModelChange)='config.save();',
     )
 
 .form-line
     .header
-        .title Disable Tab Close Button
+        .title Disable tab close button
 
     toggle(
         [(ngModel)]='config.store.terminal.disableCloseButton',
-        (ngModelChange)='config.save(); config.requestRestart()',
+        (ngModelChange)='config.save();',
     )
 
 .form-line