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

Store current boot loader install path in PartitionCoreModule

Browse Source
This commit is contained in:
Aurélien Gâteau 2014-07-23 18:15:46 +02:00
parent ab4604258c
commit 06a13637b6
4 changed files with 28 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/modules/partition/PartitionCoreModule.cpp
View File

@ -283,3 +283,9 @@ PartitionCoreModule::findPartitionByMountPoint( const QString& mountPoint ) cons
} }
return nullptr; return nullptr;
} }
void
PartitionCoreModule::setBootLoaderInstallPath( const QString& path )
{
m_bootLoaderInstallPath = path;
}

3
src/modules/partition/PartitionCoreModule.h
View File

@ -62,6 +62,8 @@ public:
void formatPartition( Device* device, Partition* partition ); void formatPartition( Device* device, Partition* partition );
void setBootLoaderInstallPath( const QString& path );
QList< Calamares::job_ptr > jobs() const; QList< Calamares::job_ptr > jobs() const;
bool hasRootMountPoint() const bool hasRootMountPoint() const
@ -93,6 +95,7 @@ private:
DeviceModel* m_deviceModel; DeviceModel* m_deviceModel;
BootLoaderModel* m_bootLoaderModel; BootLoaderModel* m_bootLoaderModel;
bool m_hasRootMountPoint = false; bool m_hasRootMountPoint = false;
QString m_bootLoaderInstallPath;
void listDevices(); void listDevices();
void updateHasRootMountPoint(); void updateHasRootMountPoint();

18
src/modules/partition/PartitionPage.cpp
View File

@ -19,6 +19,7 @@
#include "PartitionPage.h" #include "PartitionPage.h"
// Local // Local
#include <BootLoaderModel.h>
#include <CreatePartitionDialog.h> #include <CreatePartitionDialog.h>
#include <EditExistingPartitionDialog.h> #include <EditExistingPartitionDialog.h>
#include <DeviceModel.h> #include <DeviceModel.h>
@ -48,6 +49,7 @@ PartitionPage::PartitionPage( PartitionCoreModule* core, QWidget* parent )
m_ui->deviceComboBox->setModel( m_core->deviceModel() ); m_ui->deviceComboBox->setModel( m_core->deviceModel() );
m_ui->bootLoaderComboBox->setModel( m_core->bootLoaderModel() ); m_ui->bootLoaderComboBox->setModel( m_core->bootLoaderModel() );
updateButtons(); updateButtons();
updateBootLoaderInstallPath();
connect( m_ui->deviceComboBox, &QComboBox::currentTextChanged, connect( m_ui->deviceComboBox, &QComboBox::currentTextChanged,
[ this ]( const QString& /* text */ ) [ this ]( const QString& /* text */ )
@ -74,6 +76,13 @@ PartitionPage::PartitionPage( PartitionCoreModule* core, QWidget* parent )
connect( model, &QAbstractItemModel::modelReset, this, &PartitionPage::updateButtons ); connect( model, &QAbstractItemModel::modelReset, this, &PartitionPage::updateButtons );
} ); } );
connect( m_ui->bootLoaderComboBox, &QComboBox::currentTextChanged,
[ this ]( const QString& /* text */ )
{
updateBootLoaderInstallPath();
} );
connect( m_ui->newPartitionTableButton, &QAbstractButton::clicked, this, &PartitionPage::onNewPartitionTableClicked ); connect( m_ui->newPartitionTableButton, &QAbstractButton::clicked, this, &PartitionPage::onNewPartitionTableClicked );
connect( m_ui->createButton, &QAbstractButton::clicked, this, &PartitionPage::onCreateClicked ); connect( m_ui->createButton, &QAbstractButton::clicked, this, &PartitionPage::onCreateClicked );
connect( m_ui->editButton, &QAbstractButton::clicked, this, &PartitionPage::onEditClicked ); connect( m_ui->editButton, &QAbstractButton::clicked, this, &PartitionPage::onEditClicked );
@ -203,3 +212,12 @@ PartitionPage::editExistingPartition( Device* device, Partition* partition )
dlg->applyChanges( m_core ); dlg->applyChanges( m_core );
delete dlg; delete dlg;
} }
void
PartitionPage::updateBootLoaderInstallPath()
{
QVariant var = m_ui->bootLoaderComboBox->currentData( BootLoaderModel::BootLoaderPathRole );
if ( !var.isValid() )
return;
m_core->setBootLoaderInstallPath( var.toString() );
}

1
src/modules/partition/PartitionPage.h
View File

@ -51,6 +51,7 @@ private:
void updatePartitionToCreate( Device*, Partition* ); void updatePartitionToCreate( Device*, Partition* );
void editExistingPartition( Device*, Partition* ); void editExistingPartition( Device*, Partition* );
void updateBootLoaderInstallPath();
}; };
#endif // PARTITIONPAGE_H #endif // PARTITIONPAGE_H