Merge branch 'add_deactivate_keyboard_control_button' into 'upcoming-release'

Add deactivate keyboard control button

See merge request tuxedocomputers/development/tuxedo-control-center!97

Author: tuxedoxt

src/common/models/TccSettings.ts

@@ -48,6 +48,7 @@ export interface ITccSettings {
     shutdownTime: string | null;
     cpuSettingsEnabled: boolean;
     fanControlEnabled: boolean;
+    keyboardBacklightControlEnabled: boolean;
     ycbcr420Workaround: Array<Object>;
     chargingProfile: string | null;
     chargingPriority: string | null;
@@ -64,6 +65,7 @@ export const defaultSettings: ITccSettings = {
     shutdownTime: null,
     cpuSettingsEnabled: true,
     fanControlEnabled: true,
+    keyboardBacklightControlEnabled: true,
     ycbcr420Workaround: [],
     chargingProfile: null,
     chargingPriority: null,
@@ -80,6 +82,7 @@ export const defaultSettingsXP1508UHD: ITccSettings = {
     shutdownTime: null,
     cpuSettingsEnabled: true,
     fanControlEnabled: true,
+    keyboardBacklightControlEnabled: true,
     ycbcr420Workaround: [],
     chargingProfile: null,
     chargingPriority: null,

src/ng-app/app/config.service.ts

@@ -123,6 +123,10 @@ export class ConfigService implements OnDestroy {
         return $localize `:@@messageFanControlOff:Fan control deactivated in Tools→Global\u00A0Settings`;
     }
 
+    get keyboardBacklightControlDisabledMessage(): string {
+        return $localize `:@@messageKeyboardBacklightControlOff:Keyboard backlight control deactivated in Tools→Global\u00A0Settings`;
+    }
+
     public getCustomProfiles(): ITccProfile[] {
         return this.customProfiles;
     }

src/ng-app/app/global-settings/global-settings.component.html

@@ -77,6 +77,26 @@
                 </mat-grid-tile>
             </mat-grid-list>
             <div i18n>On deactivate, the default automatic fan control is restored directly.</div>
+
+            <mat-grid-list [cols]="gridParams.cols" rowHeight="3em" class="global-settings-grid">
+                <mat-grid-tile [colspan]="gridParams.headerSpan"><header i18n="@@cGlobalSettingsKeyboardBacklightControlLabel">Keyboard Backlight Control</header></mat-grid-tile>
+                <mat-grid-tile [colspan]="gridParams.valueSpan">
+                    <content class="value">
+                        <span [hidden]="!inputKeyboardBacklightControl.checked" i18n="@@cGlobalSettingsKeyboardBacklightControlActivated">activated</span>
+                        <span [hidden]="inputKeyboardBacklightControl.checked" i18n="@@cGlobalSettingsKeyboardBacklightControlDeactivated">deactivated</span>
+                    </content>
+                </mat-grid-tile>
+                <mat-grid-tile [colspan]="gridParams.inputSpan">
+                    <content class="input">
+                        <mat-checkbox #inputKeyboardBacklightControl
+                            color="primary"
+                            [(ngModel)]="keyboardBacklightControlEnabled"
+                            (change)="onKeyboardBacklightControlEnabledChanged($event)">
+                        </mat-checkbox>
+                    </content>
+                </mat-grid-tile>
+            </mat-grid-list>
+            <div i18n>On deactivate, keyboard backlight settings are <strong>not</strong> reset to default. Default settings need to be restored by hand or a system reboot.</div>
         </div>
     </mat-expansion-panel>
 

src/ng-app/app/global-settings/global-settings.component.ts

@@ -42,6 +42,7 @@ export class GlobalSettingsComponent implements OnInit {
 
     public cpuSettingsEnabled: boolean = true;
     public fanControlEnabled: boolean = true;
+    public keyboardBacklightControlEnabled: boolean = true;
     public forceYUV420OutputSwitchAvailable: boolean = false;
     public ycbcr420Workaround: Array<Object> = [];
 
@@ -66,6 +67,7 @@ export class GlobalSettingsComponent implements OnInit {
 
         this.cpuSettingsEnabled = this.config.getSettings().cpuSettingsEnabled;
         this.fanControlEnabled = this.config.getSettings().fanControlEnabled;
+        this.keyboardBacklightControlEnabled = this.config.getSettings().keyboardBacklightControlEnabled;
         for (let card = 0; card < this.config.getSettings().ycbcr420Workaround.length; card++) {
             this.ycbcr420Workaround[card] = {};
             for (let port in this.config.getSettings().ycbcr420Workaround[card]) {
@@ -108,6 +110,22 @@ export class GlobalSettingsComponent implements OnInit {
         });
     }
 
+    onKeyboardBacklightControlEnabledChanged(event: any) {
+        this.utils.pageDisabled = true;
+
+        this.config.getSettings().keyboardBacklightControlEnabled = event.checked;
+        
+        this.config.saveSettings().then(success => {
+            if (!success) {
+                this.config.getSettings().keyboardBacklightControlEnabled = !event.checked;
+            }
+
+            this.keyboardBacklightControlEnabled = this.config.getSettings().keyboardBacklightControlEnabled;
+
+            this.utils.pageDisabled = false;
+        });
+    }
+
     onYCbCr420WorkaroundChanged(event: any, card: number, port: string) {
         if (this.config.getSettings().ycbcr420Workaround.length > card && port in this.config.getSettings().ycbcr420Workaround[card]) {
             this.utils.pageDisabled = true;

src/ng-app/app/keyboard-backlight/keyboard-backlight.component.html

@@ -31,7 +31,11 @@
         <p i18n="@@cKeyboardBacklightNotSupported">Your device has no keyboard backlight or is not (yet) supported by this control interface.</p>
     </div>
 
-    <div class="keyboard-backlight-content content" *ngIf="keyboardBacklightCapabilities !== undefined">
+    <div class="keyboard-backlight-content content" *ngIf="keyboardBacklightCapabilities !== undefined"
+        [ngClass]="{'not-available': !this.config.getSettings().keyboardBacklightControlEnabled }"
+        [matTooltip]="!this.config.getSettings().keyboardBacklightControlEnabled ? this.config.keyboardBacklightControlDisabledMessage : ''"
+        matTooltipClass="wider-tooltip">
+
         <div *ngIf="keyboardBacklightCapabilities.maxRed > 0 && keyboardBacklightCapabilities.maxGreen > 0 && keyboardBacklightCapabilities.maxBlue > 0">
             <div *ngIf="keyboardBacklightCapabilities.zones >= 1">
                 <mat-grid-list [cols]="9" rowHeight="1227:2709" class="keyboard-color-grid">

src/ng-app/app/keyboard-backlight/keyboard-backlight.component.scss

@@ -45,4 +45,8 @@ content.value {
             stroke:LightGrey;
         }
     }
+}
+
+.wider-tooltip {
+    max-width: 275px !important;
 }

src/ng-app/app/keyboard-backlight/keyboard-backlight.component.ts

@@ -17,7 +17,7 @@
  * along with TUXEDO Control Center.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-import { Component, OnInit } from '@angular/core';
+import { Component, OnInit, ViewEncapsulation } from '@angular/core';
 import { ConfigService } from '../config.service';
 import { Subscription } from 'rxjs';
 import { TccDBusClientService } from '../tcc-dbus-client.service';
@@ -26,7 +26,8 @@ import { KeyboardBacklightCapabilitiesInterface, KeyboardBacklightColorModes, Ke
 @Component({
     selector: 'app-keyboard-backlight',
     templateUrl: './keyboard-backlight.component.html',
-    styleUrls: ['./keyboard-backlight.component.scss']
+    styleUrls: ['./keyboard-backlight.component.scss'],
+    encapsulation: ViewEncapsulation.None
 })
 export class KeyboardBacklightComponent implements OnInit {
     Object = Object;