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

[partition] Make the fs type used for erase, a config property

Browse Source
This commit is contained in:
Adriaan de Groot 2021-06-18 11:29:36 +02:00
parent 9fa5ab04e5
commit 4fa61249a8
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/modules/partition/core/Config.cpp
View File

@ -212,7 +212,9 @@ Config::setEraseFsTypeChoice( const QString& choice )
{ {
if ( choice != m_eraseFsTypeChoice ) if ( choice != m_eraseFsTypeChoice )
{ {
// FIXME: shouldn't this be a canonical fs name?
m_eraseFsTypeChoice = choice; m_eraseFsTypeChoice = choice;
Q_EMIT eraseModeFilesystemChanged( choice );
} }
} }

6
src/modules/partition/core/Config.h
View File

@ -24,6 +24,9 @@ class Config : public QObject
///@brief The swap choice (None, Small, Hibernate, ...) which only makes sense when Erase is chosen ///@brief The swap choice (None, Small, Hibernate, ...) which only makes sense when Erase is chosen
Q_PROPERTY( SwapChoice swapChoice READ swapChoice WRITE setSwapChoice NOTIFY swapChoiceChanged ) Q_PROPERTY( SwapChoice swapChoice READ swapChoice WRITE setSwapChoice NOTIFY swapChoiceChanged )
///@brief Name of the FS that will be used when erasing type disk (e.g. "default filesystem")
Q_PROPERTY( QString eraseModeFilesystem READ eraseFsType WRITE setEraseFsTypeChoice NOTIFY eraseModeFilesystemChanged )
Q_PROPERTY( bool allowManualPartitioning READ allowManualPartitioning CONSTANT FINAL ) Q_PROPERTY( bool allowManualPartitioning READ allowManualPartitioning CONSTANT FINAL )
public: public:
@ -109,11 +112,12 @@ public Q_SLOTS:
void setInstallChoice( InstallChoice ); void setInstallChoice( InstallChoice );
void setSwapChoice( int ); ///< Translates a button ID or so to SwapChoice void setSwapChoice( int ); ///< Translates a button ID or so to SwapChoice
void setSwapChoice( SwapChoice ); void setSwapChoice( SwapChoice );
void setEraseFsTypeChoice( const QString& ); void setEraseFsTypeChoice( const QString& filesystemName ); ///< See property eraseModeFilesystem
Q_SIGNALS: Q_SIGNALS:
void installChoiceChanged( InstallChoice ); void installChoiceChanged( InstallChoice );
void swapChoiceChanged( SwapChoice ); void swapChoiceChanged( SwapChoice );
void eraseModeFilesystemChanged( const QString& );
private: private:
SwapChoiceSet m_swapChoices; SwapChoiceSet m_swapChoices;