napcok/calamares
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[users] Improve naming of widget

Browse Source
This commit is contained in:
Adriaan de Groot 2020-08-28 22:19:26 +02:00
parent 3ae545c8b1
commit d584a96335
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/modules/users/UsersPage.cpp
View File

@ -87,8 +87,8 @@ UsersPage::UsersPage( Config* config, QWidget* parent )
ui->checkBoxReusePassword->setVisible( m_config->writeRootPassword() );
ui->checkBoxReusePassword->setChecked( m_config->reuseUserPasswordForRoot() );
ui->checkBoxValidatePassword->setVisible( m_config->permitWeakPasswords() );
ui->checkBoxValidatePassword->setChecked( m_config->requireStrongPasswords() );
ui->checkBoxRequireStrongPassword->setVisible( m_config->permitWeakPasswords() );
ui->checkBoxRequireStrongPassword->setChecked( m_config->requireStrongPasswords() );
// Connect signals and slots
ui->textBoxUserPassword->setText( config->userPassword() );
@ -107,7 +107,7 @@ UsersPage::UsersPage( Config* config, QWidget* parent )
connect( config, &Config::rootPasswordSecondaryChanged, ui->textBoxVerifiedRootPassword, &QLineEdit::setText );
connect( config, &Config::rootPasswordStatusChanged, this, &UsersPage::reportRootPasswordStatus );
connect( ui->checkBoxValidatePassword, &QCheckBox::stateChanged, this, [this]( int checked ) {
connect( ui->checkBoxRequireStrongPassword, &QCheckBox::stateChanged, this, [this]( int checked ) {
m_config->setRequireStrongPasswords( checked != Qt::Unchecked );
} );
@ -138,10 +138,10 @@ UsersPage::UsersPage( Config* config, QWidget* parent )
if ( m_config->permitWeakPasswords() )
{
connect( ui->checkBoxValidatePassword, &QCheckBox::stateChanged, this, [this]( int checked ) {
connect( ui->checkBoxRequireStrongPassword, &QCheckBox::stateChanged, this, [this]( int checked ) {
m_config->setRequireStrongPasswords( checked != Qt::Unchecked );
} );
connect( config, &Config::requireStrongPasswordsChanged, ui->checkBoxValidatePassword, &QCheckBox::setChecked );
connect( config, &Config::requireStrongPasswordsChanged, ui->checkBoxRequireStrongPassword, &QCheckBox::setChecked );
}
CALAMARES_RETRANSLATE_SLOT( &UsersPage::retranslate )

2
src/modules/users/page_usersetup.ui
View File

@ -450,7 +450,7 @@ SPDX-License-Identifier: GPL-3.0-or-later
</spacer>
</item>
<item>
<widget class="QCheckBox" name="checkBoxValidatePassword">
<widget class="QCheckBox" name="checkBoxRequireStrongPassword">
<property name="toolTip">
<string>When this box is checked, password-strength checking is done and you will not be able to use a weak password.</string>
</property>