From c89bd1db23a6f525f285cacd7b4ee55c08138f2e Mon Sep 17 00:00:00 2001 From: demmm Date: Sun, 8 Nov 2015 19:53:11 -0500 Subject: [PATCH] implement https://calamares.io/bugs/browse/CAL-341 --- src/modules/users/UsersPage.cpp | 6 ++++++ src/modules/users/UsersPage.h | 1 + src/modules/users/UsersViewStep.cpp | 6 ++++++ src/modules/users/users.conf | 1 + 4 files changed, 14 insertions(+) diff --git a/src/modules/users/UsersPage.cpp b/src/modules/users/UsersPage.cpp index eae856ed9..b15e5dfc3 100644 --- a/src/modules/users/UsersPage.cpp +++ b/src/modules/users/UsersPage.cpp @@ -425,3 +425,9 @@ UsersPage::setAutologinDefault( bool checked ) { ui->checkBoxAutoLogin->setChecked( checked ); } + +void +UsersPage::setBoxReusePassword( bool checked ) +{ + ui->checkBoxReusePassword->setChecked( checked ); +} diff --git a/src/modules/users/UsersPage.h b/src/modules/users/UsersPage.h index 176753392..27e0d4425 100644 --- a/src/modules/users/UsersPage.h +++ b/src/modules/users/UsersPage.h @@ -46,6 +46,7 @@ public: void setShowRootPassword( bool show ); void setAutologinDefault( bool checked ); + void setBoxReusePassword( bool checked ); protected slots: void onFullNameTextEdited( const QString& ); diff --git a/src/modules/users/UsersViewStep.cpp b/src/modules/users/UsersViewStep.cpp index 24f0fce0c..6d20d5a97 100644 --- a/src/modules/users/UsersViewStep.cpp +++ b/src/modules/users/UsersViewStep.cpp @@ -159,5 +159,11 @@ UsersViewStep::setConfigurationMap( const QVariantMap& configurationMap ) { m_widget->setAutologinDefault( configurationMap.value( "doAutologin" ).toBool() ); } + + if ( configurationMap.contains( "doReusePassword" ) && + configurationMap.value( "doReusePassword" ).type() == QVariant::Bool ) + { + m_widget->setBoxReusePassword( configurationMap.value( "doReusePassword" ).toBool() ); + } } diff --git a/src/modules/users/users.conf b/src/modules/users/users.conf index 38c2cac3e..34a5fcfc9 100644 --- a/src/modules/users/users.conf +++ b/src/modules/users/users.conf @@ -11,3 +11,4 @@ autologinGroup: autologin doAutologin: true sudoersGroup: wheel setRootPassword: true +doReusePassword: true