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

Move init logic into PartitionSplitterWidget.

Browse source
This commit is contained in:
Teo Mrnjavac 2016-01-11 15:10:50 +01:00
parent ca8b551fbd
commit 6a93f34c15
3 changed files with 41 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

26
src/modules/partition/gui/AlongsidePage.cpp
View file

@ -163,30 +163,6 @@ AlongsidePage::onPartitionSelected( int comboBoxIndex )
qint64 requiredStorageB = ( requiredStorageGB + 0.1 + 2.0 ) * 1024 * 1024 * 1024;
// set up splitter widget here, then set up the split position
QList< PartitionSplitterItem > allPartitionItems;
{
PartitionSplitterItem* extendedPartitionItem = nullptr;
for ( auto it = PartitionIterator::begin( dev );
it != PartitionIterator::end( dev ); ++it )
{
PartitionSplitterItem newItem = {
( *it )->partitionPath(),
ColorUtils::colorForPartition( *it ),
false,
( *it )->capacity(),
{}
};
if ( ( *it )->roles().has( PartitionRole::Logical ) && extendedPartitionItem )
extendedPartitionItem->children.append( newItem );
else
{
allPartitionItems.append( newItem );
if ( ( *it )->roles().has( PartitionRole::Extended ) )
extendedPartitionItem = &allPartitionItems.last();
}
}
}
Device* deviceBefore = m_core->createImmutableDeviceCopy( dev );
@ -197,7 +173,7 @@ AlongsidePage::onPartitionSelected( int comboBoxIndex )
m_previewWidget->setModel( partitionModelBefore );
m_previewLabels->setModel( partitionModelBefore );
m_splitterWidget->init( allPartitionItems );
m_splitterWidget->init( dev );
m_splitterWidget->setSplitPartition( candidate->partitionPath(),
candidate->used() * 1.1,