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

Remove m_preCheckEncryption variable from ChoicePage

Browse Source
This commit is contained in:
Penvern Vincent 2024-04-15 22:44:42 +02:00
parent cc835cee6f
commit 5ac23cd3d6
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -83,14 +83,12 @@ ChoicePage::ChoicePage( Config* config, QWidget* parent )
, m_beforePartitionLabelsView( nullptr ) , m_beforePartitionLabelsView( nullptr )
, m_bootloaderComboBox( nullptr ) , m_bootloaderComboBox( nullptr )
, m_enableEncryptionWidget( true ) , m_enableEncryptionWidget( true )
, m_preCheckEncryption( false )
{ {
setupUi( this ); setupUi( this );
auto gs = Calamares::JobQueue::instance()->globalStorage(); auto gs = Calamares::JobQueue::instance()->globalStorage();
m_enableEncryptionWidget = gs->value( "enableLuksAutomatedPartitioning" ).toBool(); m_enableEncryptionWidget = gs->value( "enableLuksAutomatedPartitioning" ).toBool();
m_preCheckEncryption = m_config->preCheckEncryption();
// Set up drives combo // Set up drives combo
m_mainLayout->setDirection( QBoxLayout::TopToBottom ); m_mainLayout->setDirection( QBoxLayout::TopToBottom );
@ -471,9 +469,9 @@ ChoicePage::onActionChanged()
m_encryptWidget->setFilesystem( FileSystem::typeForName( m_replaceFsTypesChoiceComboBox->currentText() ) ); m_encryptWidget->setFilesystem( FileSystem::typeForName( m_replaceFsTypesChoiceComboBox->currentText() ) );
} }
if ( m_preCheckEncryption ) if ( m_config->preCheckEncryption() )
{ {
m_encryptWidget->setEncryptionCheckbox( m_preCheckEncryption ); m_encryptWidget->setEncryptionCheckbox( m_config->preCheckEncryption() );
} }
} }

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

@ -170,7 +170,6 @@ private:
int m_lastSelectedDeviceIndex = -1; int m_lastSelectedDeviceIndex = -1;
bool m_enableEncryptionWidget = false; bool m_enableEncryptionWidget = false;
bool m_preCheckEncryption = false;
QMutex m_coreMutex; QMutex m_coreMutex;
}; };