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

Merge pull request #2376 from ArrayBolt3/calamares

Browse Source 
Partition module fixes for encryption checkbox
This commit is contained in:
Adriaan de Groot 2024-10-21 21:34:11 +02:00 committed by GitHub
commit 1814b7fd41
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/modules/partition/gui/ChoicePage.cpp
View File

@ -1031,9 +1031,10 @@ ChoicePage::updateActionChoicePreview( InstallChoice choice )
if ( m_enableEncryptionWidget ) if ( m_enableEncryptionWidget )
{ {
m_encryptWidget->show(); m_encryptWidget->show();
if ( m_config->preCheckEncryption() ) if ( m_config->preCheckEncryption() && ! m_preCheckActivated )
{ {
m_encryptWidget->setEncryptionCheckbox( true ); m_encryptWidget->setEncryptionCheckbox( true );
m_preCheckActivated = true;
} }
} }
m_previewBeforeLabel->setText( tr( "Current:", "@label" ) ); m_previewBeforeLabel->setText( tr( "Current:", "@label" ) );
@ -1090,9 +1091,10 @@ ChoicePage::updateActionChoicePreview( InstallChoice choice )
if ( shouldShowEncryptWidget( choice ) ) if ( shouldShowEncryptWidget( choice ) )
{ {
m_encryptWidget->show(); m_encryptWidget->show();
if ( m_config->preCheckEncryption() ) if ( m_config->preCheckEncryption() && ! m_preCheckActivated )
{ {
m_encryptWidget->setEncryptionCheckbox( true ); m_encryptWidget->setEncryptionCheckbox( true );
m_preCheckActivated = true;
} }
} }
m_previewBeforeLabel->setText( tr( "Current:", "@label" ) ); m_previewBeforeLabel->setText( tr( "Current:", "@label" ) );

1
src/modules/partition/gui/ChoicePage.h
View File

@ -173,6 +173,7 @@ private:
QString m_osproberOneEntryName; QString m_osproberOneEntryName;
bool m_enableEncryptionWidget = false; bool m_enableEncryptionWidget = false;
bool m_preCheckActivated = false;
QMutex m_coreMutex; QMutex m_coreMutex;
}; };

3
src/modules/partition/gui/EncryptWidget.cpp
View File

@ -184,15 +184,12 @@ EncryptWidget::updateState( const bool notify )
Encryption newState = state(); Encryption newState = state();
if ( newState != m_state )
{
m_state = newState; m_state = newState;
if ( notify ) if ( notify )
{ {
Q_EMIT stateChanged( m_state ); Q_EMIT stateChanged( m_state );
} }
} }
}
void void
EncryptWidget::onPassphraseEdited() EncryptWidget::onPassphraseEdited()