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

Trigger core reset when advancing to manual partitioning.

Browse Source
This commit is contained in:
Teo Mrnjavac 2015-12-29 12:33:24 +01:00
parent 66d378d338
commit 86399ece26
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/modules/partition/gui/PartitionPage.h
View File

@ -42,11 +42,12 @@ public:
explicit PartitionPage( PartitionCoreModule* core, QWidget* parent = nullptr ); explicit PartitionPage( PartitionCoreModule* core, QWidget* parent = nullptr );
~PartitionPage(); ~PartitionPage();
void onRevertClicked();
private: private:
QScopedPointer< Ui_PartitionPage > m_ui; QScopedPointer< Ui_PartitionPage > m_ui;
PartitionCoreModule* m_core; PartitionCoreModule* m_core;
void updateButtons(); void updateButtons();
void onRevertClicked();
void onNewPartitionTableClicked(); void onNewPartitionTableClicked();
void onCreateClicked(); void onCreateClicked();
void onEditClicked(); void onEditClicked();

4
src/modules/partition/gui/PartitionViewStep.cpp
View File

@ -264,7 +264,11 @@ PartitionViewStep::next()
if ( m_choicePage == m_widget->currentWidget() ) if ( m_choicePage == m_widget->currentWidget() )
{ {
if ( m_choicePage->currentChoice() == ChoicePage::Manual ) if ( m_choicePage->currentChoice() == ChoicePage::Manual )
{
m_widget->setCurrentWidget( m_manualPartitionPage ); m_widget->setCurrentWidget( m_manualPartitionPage );
if ( m_core->isDirty() )
m_manualPartitionPage->onRevertClicked();
}
else if ( m_choicePage->currentChoice() == ChoicePage::Erase ) else if ( m_choicePage->currentChoice() == ChoicePage::Erase )
{ {
emit done(); emit done();