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

Make the Create Partition dialog obey the default FS type setting.

Browse Source
This commit is contained in:
Teo Mrnjavac 2016-06-10 15:37:11 +02:00
parent a00ebc01e7
commit 395fb340b7
1 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -77,11 +77,23 @@ CreatePartitionDialog::CreatePartitionDialog( Device* device, PartitionNode* par
initGptPartitionTypeUi(); initGptPartitionTypeUi();
// File system // File system
FileSystem::Type defaultFsType = FileSystem::typeForName(
Calamares::JobQueue::instance()->
globalStorage()->
value( "defaultFileSystemType" ).toString() );
int defaultFsIndex = -1;
int fsCounter = 0;
QStringList fsNames; QStringList fsNames;
for ( auto fs : FileSystemFactory::map() ) for ( auto fs : FileSystemFactory::map() )
{ {
if ( fs->supportCreate() != FileSystem::cmdSupportNone && fs->type() != FileSystem::Extended ) if ( fs->supportCreate() != FileSystem::cmdSupportNone &&
fs->type() != FileSystem::Extended )
{
fsNames << fs->name(); fsNames << fs->name();
if ( fs->type() == defaultFsType )
defaultFsIndex = fsCounter;
fsCounter++;
}
} }
m_ui->fsComboBox->addItems( fsNames ); m_ui->fsComboBox->addItems( fsNames );
@ -89,6 +101,9 @@ CreatePartitionDialog::CreatePartitionDialog( Device* device, PartitionNode* par
connect( m_ui->fsComboBox, SIGNAL( activated( int ) ), SLOT( updateMountPointUi() ) ); connect( m_ui->fsComboBox, SIGNAL( activated( int ) ), SLOT( updateMountPointUi() ) );
connect( m_ui->extendedRadioButton, SIGNAL( toggled( bool ) ), SLOT( updateMountPointUi() ) ); connect( m_ui->extendedRadioButton, SIGNAL( toggled( bool ) ), SLOT( updateMountPointUi() ) );
// Select a default
m_ui->fsComboBox->setCurrentIndex( defaultFsIndex );
setupFlagsList(); setupFlagsList();
} }