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

[partition] Be explicit about user-visible FS names, CreatePartitionDialog

Browse Source
This commit is contained in:
Adriaan de Groot 2020-02-13 11:45:04 +01:00
parent 88cff387c3
commit 05dfc24af6
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2,7 +2,7 @@
* *
* Copyright 2014, Aurélien Gâteau <agateau@kde.org> * Copyright 2014, Aurélien Gâteau <agateau@kde.org>
* Copyright 2016, Teo Mrnjavac <teo@kde.org> * Copyright 2016, Teo Mrnjavac <teo@kde.org>
* Copyright 2018, Adriaan de Groot <groot@kde.org> * Copyright 2018, 2020, Adriaan de Groot <groot@kde.org>
* Copyright 2018, Andrius Štikonas <andrius@stikonas.eu> * Copyright 2018, Andrius Štikonas <andrius@stikonas.eu>
* Copyright 2018, Caio Carvalho <caiojcarvalho@gmail.com> * Copyright 2018, Caio Carvalho <caiojcarvalho@gmail.com>
* *
@ -106,7 +106,7 @@ CreatePartitionDialog::CreatePartitionDialog( Device* device, PartitionNode* par
if ( fs->supportCreate() != FileSystem::cmdSupportNone && if ( fs->supportCreate() != FileSystem::cmdSupportNone &&
fs->type() != FileSystem::Extended ) fs->type() != FileSystem::Extended )
{ {
fsNames << fs->name(); fsNames << KPMHelpers::userVisibleFS( fs ); // This is put into the combobox
if ( fs->type() == defaultFsType ) if ( fs->type() == defaultFsType )
defaultFsIndex = fsCounter; defaultFsIndex = fsCounter;
fsCounter++; fsCounter++;
@ -232,6 +232,7 @@ CreatePartitionDialog::updateMountPointUi()
bool enabled = m_ui->primaryRadioButton->isChecked(); bool enabled = m_ui->primaryRadioButton->isChecked();
if ( enabled ) if ( enabled )
{ {
// This maps translated (user-visible) FS names to a type
FileSystem::Type type = FileSystem::typeForName( m_ui->fsComboBox->currentText() ); FileSystem::Type type = FileSystem::typeForName( m_ui->fsComboBox->currentText() );
enabled = !s_unmountableFS.contains( type ); enabled = !s_unmountableFS.contains( type );