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

[partition] Deal with deprecations in QCheckBox

Browse Source
This commit is contained in:
Adriaan de Groot 2024-12-03 14:26:26 +01:00
parent 20e6d1d66c
commit b5533caece
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -60,7 +60,8 @@ EncryptWidget::EncryptWidget( QWidget* parent )
m_ui->m_encryptionUnsupportedLabel->show();
}
connect( m_ui->m_encryptCheckBox, &QCheckBox::stateChanged, this, &EncryptWidget::onCheckBoxStateChanged );
connect(
m_ui->m_encryptCheckBox, Calamares::checkBoxStateChangedSignal, this, &EncryptWidget::onCheckBoxStateChanged );
connect( m_ui->m_passphraseLineEdit, &QLineEdit::textEdited, this, &EncryptWidget::onPassphraseEdited );
connect( m_ui->m_confirmLineEdit, &QLineEdit::textEdited, this, &EncryptWidget::onPassphraseEdited );
@ -203,12 +204,12 @@ EncryptWidget::onPassphraseEdited()
}
void
EncryptWidget::onCheckBoxStateChanged( int checked )
EncryptWidget::onCheckBoxStateChanged( Calamares::checkBoxStateType checked )
{
// @p checked is a Qt::CheckState, 0 is "unchecked" and 2 is "checked"
m_ui->m_passphraseLineEdit->setVisible( checked );
m_ui->m_confirmLineEdit->setVisible( checked );
m_ui->m_iconLabel->setVisible( checked );
const bool visible = ( checked != Calamares::checkBoxUncheckedValue );
m_ui->m_passphraseLineEdit->setVisible( visible );
m_ui->m_confirmLineEdit->setVisible( visible );
m_ui->m_iconLabel->setVisible( visible );
m_ui->m_passphraseLineEdit->clear();
m_ui->m_confirmLineEdit->clear();
m_ui->m_iconLabel->clear();

6
src/modules/partition/gui/EncryptWidget.h
View File

@ -13,6 +13,8 @@
#ifndef ENCRYPTWIDGET_H
#define ENCRYPTWIDGET_H
#include "compat/CheckBox.h"
#include <QWidget>
#include <kpmcore/fs/filesystem.h>
@ -36,7 +38,7 @@ public:
explicit EncryptWidget( QWidget* parent = nullptr );
void setEncryptionCheckbox( bool preCheckEncrypt = false);
void setEncryptionCheckbox( bool preCheckEncrypt = false );
void reset( bool checkVisible = true );
bool isEncryptionCheckboxChecked();
@ -59,7 +61,7 @@ signals:
private:
void updateState( const bool notify = true );
void onPassphraseEdited();
void onCheckBoxStateChanged( int checked );
void onCheckBoxStateChanged( Calamares::checkBoxStateType checked );
Ui::EncryptWidget* m_ui;
Encryption m_state;