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

Allow users to set/edit filesystem labels.

Browse source 
When creating or editing a new formatted partition, allow
to set a filesystem label (16 chars maximum). Modify
the KPMHelpers to accept it as a new parameter. Partitions
created by default may get a meaningful label too.
This commit is contained in:
shainer 2016-07-21 13:33:35 +01:00 • committed by Adriaan de Groot
parent 1cfdc8044c
commit b602d423c7
8 changed files with 86 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -70,6 +70,9 @@ EditExistingPartitionDialog::EditExistingPartitionDialog( Device* device,
m_ui->fileSystemLabel->setEnabled( doFormat );
m_ui->fileSystemComboBox->setEnabled( doFormat );
m_ui->fileSystemLabelEdit->setEnabled( doFormat );
m_ui->fileSystemLabelEdit->setText( m_partition->fileSystem().label() );
if ( !doFormat )
{
m_ui->fileSystemComboBox->setCurrentText( userVisibleFS( m_partition->fileSystem() ) );
@ -146,6 +149,7 @@ EditExistingPartitionDialog::applyChanges( PartitionCoreModule* core )
? FileSystem::Extended
: FileSystem::typeForName( m_ui->fileSystemComboBox->currentText() );
}
const QString fsLabel = m_ui->fileSystemLabelEdit->text();
const auto resultFlags = newFlags();
const auto currentFlags = PartitionInfo::flags( m_partition );
@ -158,6 +162,7 @@ EditExistingPartitionDialog::applyChanges( PartitionCoreModule* core )
*m_device,
m_partition->roles(),
fsType,
fsLabel,
newFirstSector,
newLastSector,
resultFlags );
@ -197,6 +202,7 @@ EditExistingPartitionDialog::applyChanges( PartitionCoreModule* core )
*m_device,
m_partition->roles(),
fsType,
fsLabel,
m_partition->firstSector(),
m_partition->lastSector(),
resultFlags );