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

[partition] Move is-manual-partitioning-allowed to the Config object

Browse Source
This commit is contained in:
Adriaan de Groot 2020-10-02 13:04:12 +02:00
parent f79fbd4105
commit 6e30a7b8f6
5 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -192,6 +192,14 @@ Config::setSwapChoice( Config::SwapChoice c )
} }
} }
bool
Config::allowManualPartitioning() const
{
Calamares::GlobalStorage* gs = Calamares::JobQueue::instance()->globalStorage();
return gs->value( "allowManualPartitioning" ).toBool();
}
void void
Config::setConfigurationMap( const QVariantMap& configurationMap ) Config::setConfigurationMap( const QVariantMap& configurationMap )
{ {
@ -212,6 +220,10 @@ Config::setConfigurationMap( const QVariantMap& configurationMap )
m_initialSwapChoice = pickOne( m_swapChoices ); m_initialSwapChoice = pickOne( m_swapChoices );
} }
setSwapChoice( m_initialSwapChoice ); setSwapChoice( m_initialSwapChoice );
Calamares::GlobalStorage* gs = Calamares::JobQueue::instance()->globalStorage();
gs->insert( "allowManualPartitioning",
CalamaresUtils::getBool( configurationMap, "allowManualPartitioning", true ) );
} }
void void

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

@ -24,6 +24,8 @@ 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 )
Q_PROPERTY( bool allowManualPartitioning READ allowManualPartitioning CONSTANT FINAL )
public: public:
Config( QObject* parent ); Config( QObject* parent );
virtual ~Config() = default; virtual ~Config() = default;
@ -86,6 +88,9 @@ public:
*/ */
SwapChoice swapChoice() const { return m_swapChoice; } SwapChoice swapChoice() const { return m_swapChoice; }
///@brief Is manual partitioning allowed (not explicitly disnabled in the config file)?
bool allowManualPartitioning() const;
public Q_SLOTS: public Q_SLOTS:
void setInstallChoice( int ); ///< Translates a button ID or so to InstallChoice void setInstallChoice( int ); ///< Translates a button ID or so to InstallChoice
void setInstallChoice( InstallChoice ); void setInstallChoice( InstallChoice );

4
src/modules/partition/gui/ChoicePage.cpp
View File

@ -86,7 +86,6 @@ ChoicePage::ChoicePage( Config* config, QWidget* parent )
, m_enableEncryptionWidget( true ) , m_enableEncryptionWidget( true )
, m_availableSwapChoices( config->swapChoices() ) , m_availableSwapChoices( config->swapChoices() )
, m_eraseSwapChoice( config->initialSwapChoice() ) , m_eraseSwapChoice( config->initialSwapChoice() )
, m_allowManualPartitioning( true )
{ {
setupUi( this ); setupUi( this );
@ -94,7 +93,6 @@ ChoicePage::ChoicePage( Config* config, QWidget* parent )
m_defaultFsType = gs->value( "defaultFileSystemType" ).toString(); m_defaultFsType = gs->value( "defaultFileSystemType" ).toString();
m_enableEncryptionWidget = gs->value( "enableLuksAutomatedPartitioning" ).toBool(); m_enableEncryptionWidget = gs->value( "enableLuksAutomatedPartitioning" ).toBool();
m_allowManualPartitioning = gs->value( "allowManualPartitioning" ).toBool();
if ( FileSystem::typeForName( m_defaultFsType ) == FileSystem::Unknown ) if ( FileSystem::typeForName( m_defaultFsType ) == FileSystem::Unknown )
{ {
@ -1241,7 +1239,7 @@ ChoicePage::setupActions()
m_deviceInfoWidget->setPartitionTableType( PartitionTable::unknownTableType ); m_deviceInfoWidget->setPartitionTableType( PartitionTable::unknownTableType );
} }
if ( m_allowManualPartitioning ) if ( m_config->allowManualPartitioning() )
{ {
m_somethingElseButton->show(); m_somethingElseButton->show();
} }

2
src/modules/partition/gui/ChoicePage.h
View File

@ -159,8 +159,6 @@ private:
SwapChoiceSet m_availableSwapChoices; // What is available SwapChoiceSet m_availableSwapChoices; // What is available
Config::SwapChoice m_eraseSwapChoice; // what is selected Config::SwapChoice m_eraseSwapChoice; // what is selected
bool m_allowManualPartitioning;
QMutex m_coreMutex; QMutex m_coreMutex;
}; };

2
src/modules/partition/gui/PartitionViewStep.cpp
View File

@ -549,8 +549,6 @@ PartitionViewStep::setConfigurationMap( const QVariantMap& configurationMap )
CalamaresUtils::getBool( configurationMap, "alwaysShowPartitionLabels", true ) ); CalamaresUtils::getBool( configurationMap, "alwaysShowPartitionLabels", true ) );
gs->insert( "enableLuksAutomatedPartitioning", gs->insert( "enableLuksAutomatedPartitioning",
CalamaresUtils::getBool( configurationMap, "enableLuksAutomatedPartitioning", true ) ); CalamaresUtils::getBool( configurationMap, "enableLuksAutomatedPartitioning", true ) );
gs->insert( "allowManualPartitioning",
CalamaresUtils::getBool( configurationMap, "allowManualPartitioning", true ) );
// The defaultFileSystemType setting needs a bit more processing, // The defaultFileSystemType setting needs a bit more processing,
// as we want to cover various cases (such as different cases) // as we want to cover various cases (such as different cases)