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 Osprober to PCM and add Osprober roles to PartitionModel.

Browse source
This commit is contained in:
Teo Mrnjavac 2015-12-15 14:00:34 +01:00
parent 7b66514bf5
commit 0224811bf6
9 changed files with 63 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -104,7 +104,7 @@ AlongsidePage::AlongsidePage( QWidget* parent )
void
AlongsidePage::init( PartitionCoreModule* core , const OsproberEntryList& osproberEntries )
AlongsidePage::init( PartitionCoreModule* core )
{
if ( m_core != core )
m_core = core;
@ -129,7 +129,7 @@ AlongsidePage::init( PartitionCoreModule* core , const OsproberEntryList& osprob
string( Calamares::Branding::ProductName ) ) );
} );
foreach ( const OsproberEntry& e, osproberEntries )
foreach ( const OsproberEntry& e, m_core->osproberEntries() )
{
if ( e.canBeResized )
m_partitionsComboBox->addItem( e.prettyName + " (" + e.path + ")", e.path );
@ -191,7 +191,7 @@ AlongsidePage::onPartitionSelected( int comboBoxIndex )
Device* deviceBefore = m_core->createImmutableDeviceCopy( dev );
PartitionModel* partitionModelBefore = new PartitionModel;
partitionModelBefore->init( deviceBefore );
partitionModelBefore->init( deviceBefore, m_core->osproberEntries() );
deviceBefore->setParent( partitionModelBefore );
partitionModelBefore->setParent( m_previewWidget );