Change "hide dock" to "always show dock"

This commit is contained in:
Hinton 2020-11-20 15:49:50 +01:00
parent 14181dc34d
commit ae5a5082db
3 changed files with 16 additions and 16 deletions

View File

@ -128,15 +128,15 @@
</div>
<small class="help-block">{{'startToTrayDesc' | i18n}}</small>
</div>
<div class="form-group" *ngIf="showHideDock">
<div class="form-group" *ngIf="showAlwaysShowDock">
<div class="checkbox">
<label for="hideDock">
<input id="hideDock" type="checkbox" name="HideDock" [(ngModel)]="hideDock"
(change)="saveHideDock()">
{{'hideDock' | i18n}}
<label for="alwaysShowDock">
<input id="alwaysShowDock" type="checkbox" name="AlwaysShowDock" [(ngModel)]="alwaysShowDock"
(change)="saveAlwaysShowDock()">
{{'alwaysShowDock' | i18n}}
</label>
</div>
<small class="help-block">{{'hideDockDesc' | i18n}}</small>
<small class="help-block">{{'alwaysShowDockDesc' | i18n}}</small>
</div>
<div class="form-group">
<label for="theme">{{'theme' | i18n}}</label>

View File

@ -51,8 +51,8 @@ export class SettingsComponent implements OnInit {
supportsBiometric: boolean;
biometric: boolean;
biometricText: string;
hideDock: boolean;
showHideDock: boolean = false;
alwaysShowDock: boolean;
showAlwaysShowDock: boolean = false;
constructor(private analytics: Angulartics2, private toasterService: ToasterService,
private i18nService: I18nService, private platformUtilsService: PlatformUtilsService,
@ -133,8 +133,8 @@ export class SettingsComponent implements OnInit {
this.supportsBiometric = await this.platformUtilsService.supportsBiometric();
this.biometric = await this.vaultTimeoutService.isBiometricLockSet();
this.biometricText = await this.storageService.get<string>(ConstantsService.biometricText);
this.hideDock = await this.storageService.get<boolean>(ElectronConstants.hideDock);
this.showHideDock = this.platformUtilsService.getDevice() === DeviceType.MacOsDesktop;
this.alwaysShowDock = await this.storageService.get<boolean>(ElectronConstants.alwaysShowDock);
this.showAlwaysShowDock = this.platformUtilsService.getDevice() === DeviceType.MacOsDesktop;
}
async saveVaultTimeoutOptions() {
@ -281,8 +281,8 @@ export class SettingsComponent implements OnInit {
});
}
async saveHideDock() {
await this.storageService.save(ElectronConstants.hideDock, this.hideDock);
async saveAlwaysShowDock() {
await this.storageService.save(ElectronConstants.alwaysShowDock, this.alwaysShowDock);
}
private callAnalytics(name: string, enabled: boolean) {

View File

@ -870,11 +870,11 @@
"startToTrayDesc": {
"message": "When the application is first started, only show an icon in the system tray."
},
"hideDock": {
"message": "Hide dock icon"
"alwaysShowDock": {
"message": "Always show in the Dock"
},
"hideDockDesc": {
"message": "Hide Bitwarden from the Dock when minimized to the menu bar."
"alwaysShowDockDesc": {
"message": "Show the Bitwarden icon in the Dock even when minimized to the menu bar."
},
"language": {
"message": "Language"