applications/calamares
2
0
Fork 0
mirror of https://github.com/parchlinux/calamares.git synced 2025-06-27 17:35: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

10
src/modules/partition/gui/ChoicePage.cpp
View file

@ -114,11 +114,9 @@ ChoicePage::~ChoicePage()
* @param osproberEntries the output of os-prober, cleaned up and structured.
*/
void
ChoicePage::init( PartitionCoreModule* core,
const OsproberEntryList& osproberEntries )
ChoicePage::init( PartitionCoreModule* core )
{
m_core = core;
m_osproberEntries = osproberEntries;
m_isEfi = QDir( "/sys/firmware/efi/efivars" ).exists();
setupChoices();
@ -489,7 +487,7 @@ ChoicePage::updateDeviceStatePreview( Device* currentDevice )
Device* deviceBefore = m_core->createImmutableDeviceCopy( currentDevice );
PartitionModel* model = new PartitionModel( preview );
model->init( deviceBefore );
model->init( deviceBefore, m_core->osproberEntries() );
// The QObject parents tree is meaningful for memory management here,
// see qDeleteAll above.
@ -539,7 +537,7 @@ ChoicePage::updateActionChoicePreview( Device* currentDevice, ChoicePage::Choice
PartitionLabelsView* previewLabels = new PartitionLabelsView( m_previewAfterFrame );
PartitionModel* model = new PartitionModel( preview );
model->init( currentDevice );
model->init( currentDevice, m_core->osproberEntries() );
// The QObject parents tree is meaningful for memory management here,
// see qDeleteAll above.
@ -733,7 +731,7 @@ OsproberEntryList
ChoicePage::getOsproberEntriesForDevice( Device* device ) const
{
OsproberEntryList eList;
foreach ( const OsproberEntry& entry, m_osproberEntries )
foreach ( const OsproberEntry& entry, m_core->osproberEntries() )
{
if ( entry.path.startsWith( device->deviceNode() ) )
eList.append( entry );