applications/calamares
2
0
Fork 0
mirror of https://github.com/parchlinux/calamares.git synced 2025-06-27 09:25:36 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Use PMUtils::findPartitionByPath in PVS + fix back button in Alongside.

Browse source
This commit is contained in:
Teo Mrnjavac 2014-09-25 16:51:57 +02:00
parent 2347ead200
commit 08a2ab94e7
1 changed files with 24 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

55
src/modules/partition/gui/PartitionViewStep.cpp
View file

@ -21,6 +21,7 @@
#include <core/DeviceModel.h> #include <core/DeviceModel.h>
#include <core/PartitionCoreModule.h> #include <core/PartitionCoreModule.h>
#include <core/PartitionModel.h> #include <core/PartitionModel.h>
#include <core/PMUtils.h>
#include "core/partition.h" #include "core/partition.h"
#include "core/device.h" #include "core/device.h"
#include <gui/ChoicePage.h> #include <gui/ChoicePage.h>
@ -113,6 +114,7 @@ PartitionViewStep::PartitionViewStep( QObject* parent )
m_widget->addWidget( m_choicePage ); m_widget->addWidget( m_choicePage );
m_widget->addWidget( m_manualPartitionPage ); m_widget->addWidget( m_manualPartitionPage );
m_widget->addWidget( m_alongsidePage );
m_widget->addWidget( m_erasePage ); m_widget->addWidget( m_erasePage );
m_widget->removeWidget( waitingWidget ); m_widget->removeWidget( waitingWidget );
waitingWidget->deleteLater(); waitingWidget->deleteLater();
@ -240,7 +242,8 @@ bool
PartitionViewStep::isAtBeginning() const PartitionViewStep::isAtBeginning() const
{ {
if ( m_widget->currentWidget() == m_manualPartitionPage || if ( m_widget->currentWidget() == m_manualPartitionPage ||
m_widget->currentWidget() == m_erasePage ) m_widget->currentWidget() == m_erasePage ||
m_widget->currentWidget() == m_alongsidePage )
return false; return false;
return true; return true;
} }
@ -275,42 +278,32 @@ PartitionViewStep::canBeResized( const QString& partitionPath )
for ( int i = 0; i < dm->rowCount(); ++i ) for ( int i = 0; i < dm->rowCount(); ++i )
{ {
Device* dev = dm->deviceForIndex( dm->index( i ) ); Device* dev = dm->deviceForIndex( dm->index( i ) );
PartitionModel* pm = m_core->partitionModelForDevice( dev ); Partition* candidate = PMUtils::findPartitionByPath( { dev }, partitionWithOs );
for ( int j = 0; j < pm->rowCount(); ++j ) if ( candidate )
{ {
QModelIndex index = pm->index( j, 0 ); cDebug() << "found Partition* for" << partitionWithOs;
Partition* candidate = pm->partitionForIndex( index ); bool ok = false;
if ( candidate->partitionPath() == partitionWithOs ) double requiredStorageGB = Calamares::JobQueue::instance()
->globalStorage()
->value( "requiredStorageGB" )
.toDouble( &ok );
qint64 availableStorageB = candidate->available() * dev->logicalSectorSize();
// We require a little more for partitioning overhead and swap file
// TODO: maybe make this configurable?
qint64 requiredStorageB = ( requiredStorageGB + 0.1 + 2.0 ) * 1024 * 1024 * 1024;
cDebug() << "Required storage B:" << requiredStorageB;
cDebug() << "Available storage B:" << availableStorageB;
if ( ok &&
availableStorageB > requiredStorageB )
{ {
cDebug() << "found Partition* for" << partitionWithOs; cDebug() << "Partition" << partitionWithOs << "authorized for resize + autopartition install.";
bool ok = false;
double requiredStorageGB = Calamares::JobQueue::instance()
->globalStorage()
->value( "requiredStorageGB" )
.toDouble( &ok );
qint64 availableStorageB = candidate->available() * dev->logicalSectorSize(); return true;
// We require a little more for partitioning overhead and swap file
// TODO: maybe make this configurable?
qint64 requiredStorageB = ( requiredStorageGB + 0.1 + 2.0 ) * 1024 * 1024 * 1024;
cDebug() << "Required storage B:" << requiredStorageB;
cDebug() << "Available storage B:" << availableStorageB;
if ( ok &&
availableStorageB > requiredStorageB )
{
canResize = true;
}
} }
if ( canResize )
break;
} }
if ( canResize )
break;
} }
cDebug() << "Partition" << partitionWithOs << "authorized for resize + autopartition install.";
return canResize;
} }
cDebug() << "Partition" << partitionWithOs << "CANNOT BE RESIZED FOR AUTOINSTALL."; cDebug() << "Partition" << partitionWithOs << "CANNOT BE RESIZED FOR AUTOINSTALL.";