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

[partition] Convenience for selecting default mount point

Browse Source 
- map blank to the "(no mount point)" string for UI purposes
This commit is contained in:
Adriaan de Groot 2018-05-15 06:13:19 -04:00
parent fda2e54e0f
commit a4997c4be8
3 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/modules/partition/gui/EditExistingPartitionDialog.cpp
View File

@ -56,13 +56,12 @@ EditExistingPartitionDialog::EditExistingPartitionDialog( Device* device, Partit
, m_usedMountPoints( usedMountPoints )
{
m_ui->setupUi( this );
standardMountPoints( *(m_ui->mountPointComboBox) );
standardMountPoints( *(m_ui->mountPointComboBox), PartitionInfo::mountPoint( partition ) );
QColor color = ColorUtils::colorForPartition( m_partition );
m_partitionSizeController->init( m_device, m_partition, color );
m_partitionSizeController->setSpinBox( m_ui->sizeSpinBox );
m_ui->mountPointComboBox->setCurrentText( PartitionInfo::mountPoint( partition ) );
connect( m_ui->mountPointComboBox, &QComboBox::currentTextChanged,
this, &EditExistingPartitionDialog::checkMountPointSelection );

9
src/modules/partition/gui/MountPoints.cpp
View File

@ -46,3 +46,12 @@ standardMountPoints(QComboBox& combo)
combo.addItems( standardMountPoints() );
}
void
standardMountPoints(QComboBox& combo, const QString& selected)
{
standardMountPoints( combo );
if ( selected.isEmpty() )
combo.setCurrentIndex( 0 );
else
combo.setCurrentText( selected );
}

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

@ -38,4 +38,10 @@ QStringList standardMountPoints();
*/
void standardMountPoints( QComboBox& );
/**
* As above, but also sets the displayed mount point to @p selected,
* unless it is empty, in which case "(no mount point)" is chosen.
*/
void standardMountPoints( QComboBox&, const QString& selected );
#endif