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

Check first selection of mountpoint too.

Browse Source 
When opening the dialog.
This commit is contained in:
shainer 2016-11-20 23:05:44 +00:00
parent f51b05e8aa
commit 8c1199df2d
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -110,6 +110,8 @@ CreatePartitionDialog::CreatePartitionDialog( Device* device, PartitionNode* par
updateMountPointUi(); updateMountPointUi();
setupFlagsList(); setupFlagsList();
// Checks the initial selection.
checkMountPointSelection();
} }
CreatePartitionDialog::~CreatePartitionDialog() CreatePartitionDialog::~CreatePartitionDialog()
@ -257,10 +259,12 @@ CreatePartitionDialog::updateMountPointUi()
} }
void void
CreatePartitionDialog::checkMountPointSelection(const QString& selection) CreatePartitionDialog::checkMountPointSelection()
{ {
const QString& selection = m_ui->mountPointComboBox->currentText();
if (m_usedMountPoints.contains(selection)) { if (m_usedMountPoints.contains(selection)) {
m_ui->labelMountPoint->setText("Mountpoint already used. Please select another one."); m_ui->labelMountPoint->setText("Mountpoint already in use. Please select another one.");
m_ui->buttonBox->button(QDialogButtonBox::Ok)->setEnabled(false); m_ui->buttonBox->button(QDialogButtonBox::Ok)->setEnabled(false);
} else { } else {
m_ui->labelMountPoint->setText( QString() ); m_ui->labelMountPoint->setText( QString() );

2
src/modules/partition/gui/CreatePartitionDialog.h
View File

@ -61,7 +61,7 @@ public:
private Q_SLOTS: private Q_SLOTS:
void updateMountPointUi(); void updateMountPointUi();
void checkMountPointSelection(const QString &); void checkMountPointSelection();
private: private:
void setupFlagsList(); void setupFlagsList();