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

implement https://calamares.io/bugs/browse/CAL-341

Browse Source
This commit is contained in:
demmm 2015-11-08 19:53:11 -05:00 committed by Teo Mrnjavac
parent e0b1290b8c
commit c89bd1db23
4 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -425,3 +425,9 @@ UsersPage::setAutologinDefault( bool checked )
{ {
ui->checkBoxAutoLogin->setChecked( checked ); ui->checkBoxAutoLogin->setChecked( checked );
} }
void
UsersPage::setBoxReusePassword( bool checked )
{
ui->checkBoxReusePassword->setChecked( checked );
}

1
src/modules/users/UsersPage.h
View File

@ -46,6 +46,7 @@ public:
void setShowRootPassword( bool show ); void setShowRootPassword( bool show );
void setAutologinDefault( bool checked ); void setAutologinDefault( bool checked );
void setBoxReusePassword( bool checked );
protected slots: protected slots:
void onFullNameTextEdited( const QString& ); void onFullNameTextEdited( const QString& );

6
src/modules/users/UsersViewStep.cpp
View File

@ -159,5 +159,11 @@ UsersViewStep::setConfigurationMap( const QVariantMap& configurationMap )
{ {
m_widget->setAutologinDefault( configurationMap.value( "doAutologin" ).toBool() ); m_widget->setAutologinDefault( configurationMap.value( "doAutologin" ).toBool() );
} }
if ( configurationMap.contains( "doReusePassword" ) &&
configurationMap.value( "doReusePassword" ).type() == QVariant::Bool )
{
m_widget->setBoxReusePassword( configurationMap.value( "doReusePassword" ).toBool() );
}
} }

1
src/modules/users/users.conf
View File

@ -11,3 +11,4 @@ autologinGroup: autologin
doAutologin: true doAutologin: true
sudoersGroup: wheel sudoersGroup: wheel
setRootPassword: true setRootPassword: true
doReusePassword: true