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

Alongside apply slot.

Browse Source
This commit is contained in:
Teo Mrnjavac 2016-01-13 17:43:59 +01:00
parent 9a127f582f
commit 27d69502a3
2 changed files with 69 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -41,6 +41,7 @@
#include "core/KPMHelpers.h"
#include "JobQueue.h"
#include "GlobalStorage.h"
#include "core/PartitionInfo.h"
#include <kpmcore/core/device.h>
#include <kpmcore/core/partition.h>
@ -514,8 +515,74 @@ ChoicePage::doAlongsideSetupSplitter( const QModelIndex& current,
Calamares::Branding::instance()->
string( Calamares::Branding::ProductName ) );
cDebug() << "Partition selected for Alongside.";
setNextEnabled( !m_beforePartitionBarsView->selectionModel()->selectedRows().isEmpty() );
cDebug() << "Partition selected for Alongside.";
}
void
ChoicePage::doAlongsideApply()
{
Q_ASSERT( m_afterPartitionSplitterWidget->splitPartitionSize() >= 0 );
Q_ASSERT( m_afterPartitionSplitterWidget->newPartitionSize() >= 0 );
QString path = m_beforePartitionBarsView->
selectionModel()->
currentIndex().data( PartitionModel::PartitionPathRole ).toString();
DeviceModel* dm = m_core->deviceModel();
for ( int i = 0; i < dm->rowCount(); ++i )
{
Device* dev = dm->deviceForIndex( dm->index( i ) );
Partition* candidate = KPMHelpers::findPartitionByPath( { dev }, path );
if ( candidate )
{
qint64 firstSector = candidate->firstSector();
qint64 oldLastSector = candidate->lastSector();
qint64 newLastSector = m_afterPartitionSplitterWidget->splitPartitionSize() /
dev->logicalSectorSize();
m_core->resizePartition( dev, candidate, firstSector, newLastSector );
Partition* newPartition = KPMHelpers::createNewPartition(
candidate->parent(),
*dev,
candidate->roles(),
FileSystem::Ext4,
newLastSector + 1,
oldLastSector );
PartitionInfo::setMountPoint( newPartition, "/" );
PartitionInfo::setFormat( newPartition, true );
m_core->createPartition( dev, newPartition );
m_core->setBootLoaderInstallPath( dev->deviceNode() );
/*if ( m_isEfi )
{
QList< Partition* > efiSystemPartitions = m_core->efiSystemPartitions();
if ( efiSystemPartitions.count() == 1 )
{
PartitionInfo::setMountPoint(
efiSystemPartitions.first(),
Calamares::JobQueue::instance()->
globalStorage()->
value( "efiSystemPartition" ).toString() );
}
else if ( efiSystemPartitions.count() > 1 )
{
PartitionInfo::setMountPoint(
efiSystemPartitions.at( m_efiComboBox->currentIndex() ),
Calamares::JobQueue::instance()->
globalStorage()->
value( "efiSystemPartition" ).toString() );
}
}*/
m_core->dumpQueue();
break;
}
}
}

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

@ -73,6 +73,7 @@ signals:
private slots:
void doReplaceSelectedPartition( const QModelIndex& current, const QModelIndex& previous );
void doAlongsideSetupSplitter( const QModelIndex& current, const QModelIndex& previous );
void doAlongsideApply();
private:
void setNextEnabled( bool enabled );