fix #422: better lock or sleep message

This commit is contained in:
antelle 2017-06-03 21:09:03 +02:00
parent bcafbde0d6
commit e5bfa59c50
3 changed files with 8 additions and 4 deletions

View File

@ -358,7 +358,8 @@
"setGenLockMinimize": "When the app is minimized",
"setGenLockCopy": "On password copy",
"setGenLockAutoType": "On auto-type",
"setGenLockOsLock": "When the computer is locked or put to sleep",
"setGenLockOsSleep": "When the computer is put to sleep",
"setGenLockOsLockSleep": "When the computer is locked or put to sleep",
"setGenStorage": "Storage",
"setGenShowAdvanced": "Show advanced settings",
"setGenDevTools": "Show dev tools",

View File

@ -80,7 +80,8 @@ const SettingsGeneralView = Backbone.View.extend({
canAutoUpdate: Updater.enabled,
canMinimize: Launcher && Launcher.canMinimize(),
canDetectMinimize: !!Launcher,
canDetectOsLock: !!Launcher,
canDetectOsSleep: !!Launcher,
canDetectOsLock: !!Launcher && FeatureDetector.isWindows,
canAutoType: AutoType.enabled,
lockOnMinimize: Launcher && AppSettingsModel.instance.get('lockOnMinimize'),
lockOnCopy: AppSettingsModel.instance.get('lockOnCopy'),

View File

@ -155,11 +155,13 @@
<label for="settings__general-lock-on-auto-type">{{res 'setGenLockAutoType'}}</label>
</div>
{{/if}}
{{#if canDetectOsLock}}
{{#if canDetectOsSleep}}
<div>
<input type="checkbox" class="settings__input input-base settings__general-lock-on-os-lock" id="settings__general-lock-on-os-lock"
{{#if lockOnOsLock}}checked{{/if}} />
<label for="settings__general-lock-on-os-lock">{{res 'setGenLockOsLock'}}</label>
<label for="settings__general-lock-on-os-lock">
{{~#if canDetectOsLock}}{{res 'setGenLockOsLockSleep'}}{{else}}{{res 'setGenLockOsSleep'}}{{/if~}}
</label>
</div>
{{/if}}
<h2>{{res 'setGenStorage'}}</h2>