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

[partition] Switch to scoped Device enums.

Browse Source
This commit is contained in:
Andrius Štikonas 2018-04-18 23:59:15 +03:00 committed by Philip
parent a48b1eacdd
commit d56ec80794
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -68,11 +68,11 @@ CreatePartitionDialog::CreatePartitionDialog( Device* device, PartitionNode* par
m_ui->encryptWidget->setText( tr( "En&crypt" ) ); m_ui->encryptWidget->setText( tr( "En&crypt" ) );
m_ui->encryptWidget->hide(); m_ui->encryptWidget->hide();
if (m_device->type() == Device::Disk_Device) { if (m_device->type() == Device::Type::Disk_Device) {
m_ui->lvNameLabel->hide(); m_ui->lvNameLabel->hide();
m_ui->lvNameLineEdit->hide(); m_ui->lvNameLineEdit->hide();
} }
if (m_device->type() == Device::LVM_Device) { if (m_device->type() == Device::Type::LVM_Device) {
/* LVM logical volume name can consist of: letters numbers _ . - + /* LVM logical volume name can consist of: letters numbers _ . - +
* It cannot start with underscore _ and must not be equal to . or .. or any entry in /dev/ * It cannot start with underscore _ and must not be equal to . or .. or any entry in /dev/
* QLineEdit accepts QValidator::Intermediate, so we just disable . at the beginning */ * QLineEdit accepts QValidator::Intermediate, so we just disable . at the beginning */
@ -242,7 +242,7 @@ CreatePartitionDialog::createPartition()
); );
} }
if (m_device->type() == Device::LVM_Device) { if (m_device->type() == Device::Type::LVM_Device) {
partition->setPartitionPath(m_device->deviceNode() + QStringLiteral("/") + m_ui->lvNameLineEdit->text().trimmed()); partition->setPartitionPath(m_device->deviceNode() + QStringLiteral("/") + m_ui->lvNameLineEdit->text().trimmed());
} }

2
src/modules/partition/gui/PartitionPage.cpp
View File

@ -145,7 +145,7 @@ PartitionPage::updateButtons()
if ( m_ui->deviceComboBox->currentIndex() >= 0 ) if ( m_ui->deviceComboBox->currentIndex() >= 0 )
{ {
QModelIndex deviceIndex = m_core->deviceModel()->index( m_ui->deviceComboBox->currentIndex(), 0 ); QModelIndex deviceIndex = m_core->deviceModel()->index( m_ui->deviceComboBox->currentIndex(), 0 );
if ( m_core->deviceModel()->deviceForIndex( deviceIndex )->type() != Device::LVM_Device ) if ( m_core->deviceModel()->deviceForIndex( deviceIndex )->type() != Device::Type::LVM_Device )
createTable = true; createTable = true;
} }