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

Select partition to replace from the current DeviceModel.

Browse Source
This commit is contained in:
Teo Mrnjavac 2015-12-17 16:14:01 +01:00
parent 5655b4f1da
commit b767f0b18f
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -36,6 +36,7 @@
#include "utils/Logger.h" #include "utils/Logger.h"
#include "utils/Retranslator.h" #include "utils/Retranslator.h"
#include "Branding.h" #include "Branding.h"
#include "core/KPMHelpers.h"
#include <kpmcore/core/device.h> #include <kpmcore/core/device.h>
@ -438,9 +439,15 @@ ChoicePage::applyActionChoice( Device* currentDevice, ChoicePage::Choice choice
if ( m_core->isDirty() ) if ( m_core->isDirty() )
m_core->clearJobs(); m_core->clearJobs();
// We can't use the PartitionPtrRole because we need to make changes to the
// main DeviceModel, not the immutable copy.
QString partPath = current.data( PartitionModel::PartitionPathRole ).toString();
Partition* partition = KPMHelpers::findPartitionByPath( { selectedDevice() },
partPath );
if ( partition )
PartitionActions::doReplacePartition( m_core, PartitionActions::doReplacePartition( m_core,
selectedDevice(), selectedDevice(),
( Partition* )( current.data( PartitionModel::PartitionPtrRole ).value< void* >() ) ); partition );
} ); } );
case NoChoice: case NoChoice: