applications/calamares
2
0
Fork 0
mirror of https://github.com/parchlinux/calamares.git synced 2025-06-28 18:05:36 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

[partition] Unmap mount-point special strings

Browse source 
- Reverse "(no mount point)" to the empty string
 - Provide convenience pointer-taking function
This commit is contained in:
Adriaan de Groot 2018-05-15 06:30:18 -04:00
parent a4997c4be8
commit a49c39bb53
4 changed files with 24 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -242,7 +242,7 @@ CreatePartitionDialog::createPartition()
partition->setPartitionPath(m_device->deviceNode() + QStringLiteral("/") + m_ui->lvNameLineEdit->text().trimmed());
}
PartitionInfo::setMountPoint( partition, m_ui->mountPointComboBox->currentText() );
PartitionInfo::setMountPoint( partition, selectedMountPoint( m_ui->mountPointComboBox ) );
PartitionInfo::setFormat( partition, true );
return partition;
@ -279,9 +279,7 @@ CreatePartitionDialog::updateMountPointUi()
void
CreatePartitionDialog::checkMountPointSelection()
{
const QString& selection = m_ui->mountPointComboBox->currentText();
if ( m_usedMountPoints.contains( selection ) )
if ( m_usedMountPoints.contains( selectedMountPoint( m_ui->mountPointComboBox ) ) )
{
m_ui->labelMountPoint->setText( tr( "Mountpoint already in use. Please select another one." ) );
m_ui->buttonBox->button( QDialogButtonBox::Ok )->setEnabled( false );