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

[partition] Apply coding style

Browse Source 
- This isn't particularly related to the change at hand, though.
This commit is contained in:
Adriaan de Groot 2020-03-24 22:21:56 +01:00
parent b6228d137c
commit b57e198c29
1 changed files with 125 additions and 90 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -22,16 +22,16 @@
#include "gui/PartitionViewStep.h" #include "gui/PartitionViewStep.h"
#include "core/DeviceModel.h" #include "core/DeviceModel.h"
#include "core/PartitionActions.h"
#include "core/PartitionCoreModule.h"
#include "core/PartitionModel.h"
#include "core/KPMHelpers.h" #include "core/KPMHelpers.h"
#include "core/OsproberEntry.h" #include "core/OsproberEntry.h"
#include "core/PartUtils.h" #include "core/PartUtils.h"
#include "core/PartitionActions.h"
#include "core/PartitionCoreModule.h"
#include "core/PartitionModel.h"
#include "gui/ChoicePage.h" #include "gui/ChoicePage.h"
#include "gui/PartitionPage.h"
#include "gui/PartitionBarsView.h" #include "gui/PartitionBarsView.h"
#include "gui/PartitionLabelsView.h" #include "gui/PartitionLabelsView.h"
#include "gui/PartitionPage.h"
#include "Branding.h" #include "Branding.h"
#include "CalamaresVersion.h" #include "CalamaresVersion.h"
@ -55,13 +55,13 @@
#include <QApplication> #include <QApplication>
#include <QDir> #include <QDir>
#include <QFormLayout> #include <QFormLayout>
#include <QFutureWatcher>
#include <QLabel> #include <QLabel>
#include <QMessageBox> #include <QMessageBox>
#include <QProcess> #include <QProcess>
#include <QStackedWidget> #include <QStackedWidget>
#include <QTimer> #include <QTimer>
#include <QtConcurrent/QtConcurrent> #include <QtConcurrent/QtConcurrent>
#include <QFutureWatcher>
PartitionViewStep::PartitionViewStep( QObject* parent ) PartitionViewStep::PartitionViewStep( QObject* parent )
: Calamares::ViewStep( parent ) : Calamares::ViewStep( parent )
@ -108,20 +108,22 @@ PartitionViewStep::continueLoading()
m_waitingWidget->deleteLater(); m_waitingWidget->deleteLater();
m_waitingWidget = nullptr; m_waitingWidget = nullptr;
connect( m_core, &PartitionCoreModule::hasRootMountPointChanged, connect( m_core, &PartitionCoreModule::hasRootMountPointChanged, this, &PartitionViewStep::nextStatusChanged );
this, &PartitionViewStep::nextStatusChanged ); connect( m_choicePage, &ChoicePage::nextStatusChanged, this, &PartitionViewStep::nextStatusChanged );
connect( m_choicePage, &ChoicePage::nextStatusChanged,
this, &PartitionViewStep::nextStatusChanged );
} }
PartitionViewStep::~PartitionViewStep() PartitionViewStep::~PartitionViewStep()
{ {
if ( m_choicePage && m_choicePage->parent() == nullptr ) if ( m_choicePage && m_choicePage->parent() == nullptr )
{
m_choicePage->deleteLater(); m_choicePage->deleteLater();
}
if ( m_manualPartitionPage && m_manualPartitionPage->parent() == nullptr ) if ( m_manualPartitionPage && m_manualPartitionPage->parent() == nullptr )
{
m_manualPartitionPage->deleteLater(); m_manualPartitionPage->deleteLater();
} }
}
QString QString
@ -168,12 +170,12 @@ PartitionViewStep::createSummaryWidget() const
.arg( *Calamares::Branding::ShortVersionedName ); .arg( *Calamares::Branding::ShortVersionedName );
break; break;
case ChoicePage::Erase: case ChoicePage::Erase:
modeText = tr( "<strong>Erase</strong> disk and install %1." ) modeText
.arg( *Calamares::Branding::ShortVersionedName ); = tr( "<strong>Erase</strong> disk and install %1." ).arg( *Calamares::Branding::ShortVersionedName );
break; break;
case ChoicePage::Replace: case ChoicePage::Replace:
modeText = tr( "<strong>Replace</strong> a partition with %1." ) modeText
.arg( *Calamares::Branding::ShortVersionedName ); = tr( "<strong>Replace</strong> a partition with %1." ).arg( *Calamares::Branding::ShortVersionedName );
break; break;
case ChoicePage::NoChoice: case ChoicePage::NoChoice:
case ChoicePage::Manual: case ChoicePage::Manual:
@ -190,7 +192,8 @@ PartitionViewStep::createSummaryWidget() const
switch ( choice ) switch ( choice )
{ {
case ChoicePage::Alongside: case ChoicePage::Alongside:
modeText = tr( "Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3)." ) modeText = tr( "Install %1 <strong>alongside</strong> another operating system on disk "
"<strong>%2</strong> (%3)." )
.arg( *Calamares::Branding::ShortVersionedName ) .arg( *Calamares::Branding::ShortVersionedName )
.arg( info.deviceNode ) .arg( info.deviceNode )
.arg( info.deviceName ); .arg( info.deviceName );
@ -217,9 +220,8 @@ PartitionViewStep::createSummaryWidget() const
} }
else // multiple disk previews! else // multiple disk previews!
{ {
diskInfoLabel->setText( tr( "Disk <strong>%1</strong> (%2)" ) diskInfoLabel->setText(
.arg( info.deviceNode ) tr( "Disk <strong>%1</strong> (%2)" ).arg( info.deviceNode ).arg( info.deviceName ) );
.arg( info.deviceName ) );
} }
formLayout->addRow( diskInfoLabel ); formLayout->addRow( diskInfoLabel );
@ -227,10 +229,10 @@ PartitionViewStep::createSummaryWidget() const
PartitionLabelsView* previewLabels; PartitionLabelsView* previewLabels;
QVBoxLayout* field; QVBoxLayout* field;
PartitionBarsView::NestedPartitionsMode mode = Calamares::JobQueue::instance()->globalStorage()-> PartitionBarsView::NestedPartitionsMode mode
value( "drawNestedPartitions" ).toBool() ? = Calamares::JobQueue::instance()->globalStorage()->value( "drawNestedPartitions" ).toBool()
PartitionBarsView::DrawNestedPartitions : ? PartitionBarsView::DrawNestedPartitions
PartitionBarsView::NoNestedPartitions; : PartitionBarsView::NoNestedPartitions;
preview = new PartitionBarsView; preview = new PartitionBarsView;
preview->setNestedPartitionsMode( mode ); preview->setNestedPartitionsMode( mode );
previewLabels = new PartitionLabelsView; previewLabels = new PartitionLabelsView;
@ -268,8 +270,10 @@ PartitionViewStep::createSummaryWidget() const
foreach ( const Calamares::job_ptr& job, jobs() ) foreach ( const Calamares::job_ptr& job, jobs() )
{ {
if ( !job->prettyDescription().isEmpty() ) if ( !job->prettyDescription().isEmpty() )
{
jobsLines.append( job->prettyDescription() ); jobsLines.append( job->prettyDescription() );
} }
}
if ( !jobsLines.isEmpty() ) if ( !jobsLines.isEmpty() )
{ {
QLabel* jobsLabel = new QLabel( widget ); QLabel* jobsLabel = new QLabel( widget );
@ -301,8 +305,10 @@ PartitionViewStep::next()
m_widget->setCurrentWidget( m_manualPartitionPage ); m_widget->setCurrentWidget( m_manualPartitionPage );
m_manualPartitionPage->selectDeviceByIndex( m_choicePage->lastSelectedDeviceIndex() ); m_manualPartitionPage->selectDeviceByIndex( m_choicePage->lastSelectedDeviceIndex() );
if ( m_core->isDirty() ) if ( m_core->isDirty() )
{
m_manualPartitionPage->onRevertClicked(); m_manualPartitionPage->onRevertClicked();
} }
}
cDebug() << "Choice applied: " << m_choicePage->currentChoice(); cDebug() << "Choice applied: " << m_choicePage->currentChoice();
} }
} }
@ -329,10 +335,14 @@ bool
PartitionViewStep::isNextEnabled() const PartitionViewStep::isNextEnabled() const
{ {
if ( m_choicePage && m_widget->currentWidget() == m_choicePage ) if ( m_choicePage && m_widget->currentWidget() == m_choicePage )
{
return m_choicePage->isNextEnabled(); return m_choicePage->isNextEnabled();
}
if ( m_manualPartitionPage && m_widget->currentWidget() == m_manualPartitionPage ) if ( m_manualPartitionPage && m_widget->currentWidget() == m_manualPartitionPage )
{
return m_core->hasRootMountPoint(); return m_core->hasRootMountPoint();
}
return false; return false;
} }
@ -349,7 +359,9 @@ bool
PartitionViewStep::isAtBeginning() const PartitionViewStep::isAtBeginning() const
{ {
if ( m_widget->currentWidget() != m_choicePage ) if ( m_widget->currentWidget() != m_choicePage )
{
return false; return false;
}
return true; return true;
} }
@ -359,10 +371,11 @@ PartitionViewStep::isAtEnd() const
{ {
if ( m_widget->currentWidget() == m_choicePage ) if ( m_widget->currentWidget() == m_choicePage )
{ {
if ( m_choicePage->currentChoice() == ChoicePage::Erase || if ( m_choicePage->currentChoice() == ChoicePage::Erase || m_choicePage->currentChoice() == ChoicePage::Replace
m_choicePage->currentChoice() == ChoicePage::Replace || || m_choicePage->currentChoice() == ChoicePage::Alongside )
m_choicePage->currentChoice() == ChoicePage::Alongside ) {
return true; return true;
}
return false; return false;
} }
return true; return true;
@ -381,8 +394,7 @@ PartitionViewStep::onActivate()
} }
// if we're coming back to PVS from the next VS // if we're coming back to PVS from the next VS
if ( m_widget->currentWidget() == m_choicePage && if ( m_widget->currentWidget() == m_choicePage && m_choicePage->currentChoice() == ChoicePage::Alongside )
m_choicePage->currentChoice() == ChoicePage::Alongside )
{ {
m_choicePage->applyActionChoice( ChoicePage::Alongside ); m_choicePage->applyActionChoice( ChoicePage::Alongside );
// m_choicePage->reset(); // m_choicePage->reset();
@ -404,12 +416,14 @@ PartitionViewStep::onLeave()
{ {
bool isEfi = false; bool isEfi = false;
if ( PartUtils::isEfiSystem() ) if ( PartUtils::isEfiSystem() )
{
isEfi = true; isEfi = true;
}
if ( isEfi ) if ( isEfi )
{ {
QString espMountPoint = Calamares::JobQueue::instance()->globalStorage()-> QString espMountPoint
value( "efiSystemPartition" ).toString(); = Calamares::JobQueue::instance()->globalStorage()->value( "efiSystemPartition" ).toString();
Partition* esp = m_core->findPartitionByMountPoint( espMountPoint ); Partition* esp = m_core->findPartitionByMountPoint( espMountPoint );
QString message; QString message;
@ -447,9 +461,7 @@ PartitionViewStep::onLeave()
if ( !message.isEmpty() ) if ( !message.isEmpty() )
{ {
cWarning() << message; cWarning() << message;
QMessageBox::warning( m_manualPartitionPage, QMessageBox::warning( m_manualPartitionPage, message, description );
message,
description );
} }
} }
@ -474,14 +486,11 @@ PartitionViewStep::onLeave()
"<strong>bios_grub</strong> flag enabled.<br/><br/>" "<strong>bios_grub</strong> flag enabled.<br/><br/>"
"An unformatted 8 MB partition is necessary " "An unformatted 8 MB partition is necessary "
"to start %1 on a BIOS system with GPT." ) "to start %1 on a BIOS system with GPT." )
.arg( Calamares::Branding::instance()-> .arg( Calamares::Branding::instance()->string( Calamares::Branding::ShortProductName ) );
string( Calamares::Branding::ShortProductName ) );
if ( !message.isEmpty() ) if ( !message.isEmpty() )
{ {
QMessageBox::information( m_manualPartitionPage, QMessageBox::information( m_manualPartitionPage, message, description );
message,
description );
} }
} }
@ -495,8 +504,7 @@ PartitionViewStep::onLeave()
// If the root partition is encrypted, and there's a separate boot // If the root partition is encrypted, and there's a separate boot
// partition which is not encrypted // partition which is not encrypted
if ( root_p->fileSystem().type() == FileSystem::Luks && if ( root_p->fileSystem().type() == FileSystem::Luks && boot_p->fileSystem().type() != FileSystem::Luks )
boot_p->fileSystem().type() != FileSystem::Luks )
{ {
message = tr( "Boot partition not encrypted" ); message = tr( "Boot partition not encrypted" );
description = tr( "A separate boot partition was set up together with " description = tr( "A separate boot partition was set up together with "
@ -512,9 +520,7 @@ PartitionViewStep::onLeave()
"recreate it, selecting <strong>Encrypt</strong> " "recreate it, selecting <strong>Encrypt</strong> "
"in the partition creation window." ); "in the partition creation window." );
QMessageBox::warning( m_manualPartitionPage, QMessageBox::warning( m_manualPartitionPage, message, description );
message,
description );
} }
} }
} }
@ -529,7 +535,9 @@ PartitionViewStep::setConfigurationMap( const QVariantMap& configurationMap )
Calamares::GlobalStorage* gs = Calamares::JobQueue::instance()->globalStorage(); Calamares::GlobalStorage* gs = Calamares::JobQueue::instance()->globalStorage();
QString efiSP = CalamaresUtils::getString( configurationMap, "efiSystemPartition" ); QString efiSP = CalamaresUtils::getString( configurationMap, "efiSystemPartition" );
if ( efiSP.isEmpty() ) if ( efiSP.isEmpty() )
{
efiSP = QStringLiteral( "/boot/efi" ); efiSP = QStringLiteral( "/boot/efi" );
}
gs->insert( "efiSystemPartition", efiSP ); gs->insert( "efiSystemPartition", efiSP );
// Set up firmwareType global storage entry. This is used, e.g. by the bootloader module. // Set up firmwareType global storage entry. This is used, e.g. by the bootloader module.
@ -547,16 +555,22 @@ PartitionViewStep::setConfigurationMap( const QVariantMap& configurationMap )
// //
// This is a bit convoluted because there's legacy settings to handle as well // This is a bit convoluted because there's legacy settings to handle as well
// as the new-style list of choices, with mapping back-and-forth. // as the new-style list of choices, with mapping back-and-forth.
if ( configurationMap.contains( "userSwapChoices" ) && if ( configurationMap.contains( "userSwapChoices" )
( configurationMap.contains( "ensureSuspendToDisk" ) || configurationMap.contains( "neverCreateSwap" ) ) ) && ( configurationMap.contains( "ensureSuspendToDisk" ) || configurationMap.contains( "neverCreateSwap" ) ) )
{
cError() << "Partition-module configuration mixes old- and new-style swap settings."; cError() << "Partition-module configuration mixes old- and new-style swap settings.";
}
if ( configurationMap.contains( "ensureSuspendToDisk" ) ) if ( configurationMap.contains( "ensureSuspendToDisk" ) )
{
cWarning() << "Partition-module setting *ensureSuspendToDisk* is deprecated."; cWarning() << "Partition-module setting *ensureSuspendToDisk* is deprecated.";
}
bool ensureSuspendToDisk = CalamaresUtils::getBool( configurationMap, "ensureSuspendToDisk", true ); bool ensureSuspendToDisk = CalamaresUtils::getBool( configurationMap, "ensureSuspendToDisk", true );
if ( configurationMap.contains( "neverCreateSwap" ) ) if ( configurationMap.contains( "neverCreateSwap" ) )
{
cWarning() << "Partition-module setting *neverCreateSwap* is deprecated."; cWarning() << "Partition-module setting *neverCreateSwap* is deprecated.";
}
bool neverCreateSwap = CalamaresUtils::getBool( configurationMap, "neverCreateSwap", false ); bool neverCreateSwap = CalamaresUtils::getBool( configurationMap, "neverCreateSwap", false );
QSet< PartitionActions::Choices::SwapChoice > choices; // Available swap choices QSet< PartitionActions::Choices::SwapChoice > choices; // Available swap choices
@ -571,8 +585,10 @@ PartitionViewStep::setConfigurationMap( const QVariantMap& configurationMap )
bool ok = false; bool ok = false;
auto v = PartitionActions::Choices::nameToChoice( item, ok ); auto v = PartitionActions::Choices::nameToChoice( item, ok );
if ( ok ) if ( ok )
{
choices.insert( v ); choices.insert( v );
} }
}
if ( choices.isEmpty() ) if ( choices.isEmpty() )
{ {
@ -589,19 +605,28 @@ PartitionViewStep::setConfigurationMap( const QVariantMap& configurationMap )
{ {
// Convert the legacy settings into a single setting for now. // Convert the legacy settings into a single setting for now.
if ( neverCreateSwap ) if ( neverCreateSwap )
{
choices.insert( PartitionActions::Choices::SwapChoice::NoSwap ); choices.insert( PartitionActions::Choices::SwapChoice::NoSwap );
}
else if ( ensureSuspendToDisk ) else if ( ensureSuspendToDisk )
{
choices.insert( PartitionActions::Choices::SwapChoice::FullSwap ); choices.insert( PartitionActions::Choices::SwapChoice::FullSwap );
}
else else
{
choices.insert( PartitionActions::Choices::SwapChoice::SmallSwap ); choices.insert( PartitionActions::Choices::SwapChoice::SmallSwap );
} }
}
// Not all are supported right now // FIXME // Not all are supported right now // FIXME
static const char unsupportedSetting[] = "Partition-module does not support *userSwapChoices* setting"; static const char unsupportedSetting[] = "Partition-module does not support *userSwapChoices* setting";
#define COMPLAIN_UNSUPPORTED( x ) \ #define COMPLAIN_UNSUPPORTED( x ) \
if ( choices.contains( x ) ) \ if ( choices.contains( x ) ) \
{ cWarning() << unsupportedSetting << PartitionActions::Choices::choiceToName( x ); choices.remove( x ); } { \
cWarning() << unsupportedSetting << PartitionActions::Choices::choiceToName( x ); \
choices.remove( x ); \
}
COMPLAIN_UNSUPPORTED( PartitionActions::Choices::SwapChoice::SwapFile ) COMPLAIN_UNSUPPORTED( PartitionActions::Choices::SwapChoice::SwapFile )
COMPLAIN_UNSUPPORTED( PartitionActions::Choices::SwapChoice::ReuseSwap ) COMPLAIN_UNSUPPORTED( PartitionActions::Choices::SwapChoice::ReuseSwap )
@ -620,23 +645,35 @@ PartitionViewStep::setConfigurationMap( const QVariantMap& configurationMap )
// OTHER SETTINGS // OTHER SETTINGS
// //
gs->insert( "drawNestedPartitions", CalamaresUtils::getBool( configurationMap, "drawNestedPartitions", false ) ); gs->insert( "drawNestedPartitions", CalamaresUtils::getBool( configurationMap, "drawNestedPartitions", false ) );
gs->insert( "alwaysShowPartitionLabels", CalamaresUtils::getBool( configurationMap, "alwaysShowPartitionLabels", true ) ); gs->insert( "alwaysShowPartitionLabels",
gs->insert( "enableLuksAutomatedPartitioning", CalamaresUtils::getBool( configurationMap, "enableLuksAutomatedPartitioning", true ) ); CalamaresUtils::getBool( configurationMap, "alwaysShowPartitionLabels", true ) );
gs->insert( "allowManualPartitioning", CalamaresUtils::getBool( configurationMap, "allowManualPartitioning", true ) ); gs->insert( "enableLuksAutomatedPartitioning",
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)
QString fsName = CalamaresUtils::getString( configurationMap, "defaultFileSystemType" ); QString fsName = CalamaresUtils::getString( configurationMap, "defaultFileSystemType" );
FileSystem::Type fsType; FileSystem::Type fsType;
if ( fsName.isEmpty() ) if ( fsName.isEmpty() )
{
cWarning() << "Partition-module setting *defaultFileSystemType* is missing, will use ext4"; cWarning() << "Partition-module setting *defaultFileSystemType* is missing, will use ext4";
}
QString fsRealName = PartUtils::findFS( fsName, &fsType ); QString fsRealName = PartUtils::findFS( fsName, &fsType );
if ( fsRealName == fsName ) if ( fsRealName == fsName )
{
cDebug() << "Partition-module setting *defaultFileSystemType*" << fsRealName; cDebug() << "Partition-module setting *defaultFileSystemType*" << fsRealName;
}
else if ( fsType != FileSystem::Unknown ) else if ( fsType != FileSystem::Unknown )
{
cWarning() << "Partition-module setting *defaultFileSystemType* changed" << fsRealName; cWarning() << "Partition-module setting *defaultFileSystemType* changed" << fsRealName;
}
else else
cWarning() << "Partition-module setting *defaultFileSystemType* is bad (" << fsName << ") using" << fsRealName << "instead."; {
cWarning() << "Partition-module setting *defaultFileSystemType* is bad (" << fsName << ") using" << fsRealName
<< "instead.";
}
gs->insert( "defaultFileSystemType", fsRealName ); gs->insert( "defaultFileSystemType", fsRealName );
@ -644,16 +681,13 @@ PartitionViewStep::setConfigurationMap( const QVariantMap& configurationMap )
// because it could take a while. Then when it's done, we can set up the widgets // because it could take a while. Then when it's done, we can set up the widgets
// and remove the spinner. // and remove the spinner.
m_future = new QFutureWatcher< void >(); m_future = new QFutureWatcher< void >();
connect( m_future, &QFutureWatcher< void >::finished, connect( m_future, &QFutureWatcher< void >::finished, this, [this] {
this, [ this ]
{
continueLoading(); continueLoading();
this->m_future->deleteLater(); this->m_future->deleteLater();
this->m_future = nullptr; this->m_future = nullptr;
} ); } );
QFuture< void > future = QFuture< void > future = QtConcurrent::run( this, &PartitionViewStep::initPartitionCoreModule );
QtConcurrent::run( this, &PartitionViewStep::initPartitionCoreModule );
m_future->setFuture( future ); m_future->setFuture( future );
if ( configurationMap.contains( "partitionLayout" ) ) if ( configurationMap.contains( "partitionLayout" ) )
@ -677,11 +711,12 @@ Calamares::RequirementsList
PartitionViewStep::checkRequirements() PartitionViewStep::checkRequirements()
{ {
if ( m_future ) if ( m_future )
{
m_future->waitForFinished(); m_future->waitForFinished();
}
Calamares::RequirementsList l; Calamares::RequirementsList l;
l.append( l.append( {
{
QLatin1String( "partitions" ), QLatin1String( "partitions" ),
[] { return tr( "has at least one disk device available." ); }, [] { return tr( "has at least one disk device available." ); },
[] { return tr( "There are no partitions to install on." ); }, [] { return tr( "There are no partitions to install on." ); },