Git-Mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2024-10-01 01:26:01 -04:00
Code Issues Packages Projects Releases Wiki Activity

Moved locking checkboxes into security settings

Browse Source
This commit is contained in:
Jonathan White 2017-05-06 22:34:12 -04:00 committed by thez3ro
parent 147c000ef1
commit 3218cb9ace
No known key found for this signature in database
GPG Key ID: F628F9E41DD7C073
2 changed files with 34 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/gui/SettingsWidgetGeneral.ui
View File

@ -367,13 +367,6 @@
</widget> </widget>
</widget> </widget>
</item> </item>
<item row="15" column="0">
<widget class="QCheckBox" name="autoCloseOnScreenLockCheckBox">
<property name="text">
<string>Close database when session is locked or lid is closed</string>
</property>
</widget>
</item>
</layout> </layout>
</widget> </widget>
<customwidgets> <customwidgets>

62
src/gui/SettingsWidgetSecurity.ui
View File

@ -28,7 +28,14 @@
<property name="title"> <property name="title">
<string>Timeouts</string> <string>Timeouts</string>
</property> </property>
<layout class="QGridLayout" name="gridLayout"> <layout class="QFormLayout" name="formLayout">
<item row="0" column="0">
<widget class="QCheckBox" name="clearClipboardCheckBox">
<property name="text">
<string>Clear clipboard after</string>
</property>
</widget>
</item>
<item row="0" column="1"> <item row="0" column="1">
<widget class="QSpinBox" name="clearClipboardSpinBox"> <widget class="QSpinBox" name="clearClipboardSpinBox">
<property name="enabled"> <property name="enabled">
@ -54,7 +61,20 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="2" column="1"> <item row="1" column="0">
<widget class="QCheckBox" name="lockDatabaseIdleCheckBox">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Lock databases after inactivity of</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QSpinBox" name="lockDatabaseIdleSpinBox"> <widget class="QSpinBox" name="lockDatabaseIdleSpinBox">
<property name="enabled"> <property name="enabled">
<bool>false</bool> <bool>false</bool>
@ -79,20 +99,6 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="0" alignment="Qt::AlignRight">
<widget class="QCheckBox" name="clearClipboardCheckBox">
<property name="text">
<string>Clear clipboard after</string>
</property>
</widget>
</item>
<item row="2" column="0" alignment="Qt::AlignRight">
<widget class="QCheckBox" name="lockDatabaseIdleCheckBox">
<property name="text">
<string>Lock databases after inactivity of</string>
</property>
</widget>
</item>
</layout> </layout>
</widget> </widget>
</item> </item>
@ -101,18 +107,11 @@
<property name="title"> <property name="title">
<string>Convenience</string> <string>Convenience</string>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout_3"> <layout class="QVBoxLayout" name="verticalLayout_2">
<item> <item>
<widget class="QCheckBox" name="passwordRepeatCheckBox"> <widget class="QCheckBox" name="lockDatabaseOnScreenLockCheckBox">
<property name="text"> <property name="text">
<string>Don't require password repeat when it is visible</string> <string>Lock databases when session is locked or lid is closed</string>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="passwordCleartextCheckBox">
<property name="text">
<string>Show passwords in cleartext by default</string>
</property> </property>
</widget> </widget>
</item> </item>
@ -124,9 +123,16 @@
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QCheckBox" name="lockDatabaseOnScreenLockCheckBox"> <widget class="QCheckBox" name="passwordRepeatCheckBox">
<property name="text"> <property name="text">
<string>Lock databases when session is locked or lid is closed</string> <string>Don't require password repeat when it is visible</string>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="passwordCleartextCheckBox">
<property name="text">
<string>Show passwords in cleartext by default</string>
</property> </property>
</widget> </widget>
</item> </item>