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

Test out a way to make the rescan asynchronous.

Browse Source
This commit is contained in:
Teo Mrnjavac 2015-12-23 16:35:26 +01:00
parent 16d10afcde
commit 5f282d50dc
1 changed files with 28 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -46,6 +46,8 @@
#include <QDir>
#include <QLabel>
#include <QListView>
#include <QFutureWatcher>
#include <QtConcurrent/QtConcurrent>
@ -437,21 +439,35 @@ ChoicePage::applyActionChoice( ChoicePage::Choice choice )
connect( m_beforePartitionBarsView->selectionModel(), &QItemSelectionModel::currentRowChanged,
this, [ this ]( const QModelIndex& current, const QModelIndex& previous )
{
auto doReplace = [=]
{
// 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,
selectedDevice(),
partition );
};
if ( m_core->isDirty() )
{
m_core->revertDevice( selectedDevice() );
m_core->clearJobs();
}
QFutureWatcher< void > watcher;
connect( &watcher, &QFutureWatcher< void >::finished,
this, doReplace );
QFuture< void > future = QtConcurrent::run( [=]
{
m_core->revertDevice( selectedDevice() );
m_core->clearJobs();
} );
watcher.setFuture( future );
}
else
doReplace();
// 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,
selectedDevice(),
partition );
} );
break;
case NoChoice: