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

Reapply the action choice instead.

Browse Source
This commit is contained in:
Teo Mrnjavac 2016-06-29 18:46:02 +02:00
parent b2b202d190
commit 2c68802446
3 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/modules/partition/gui/ChoicePage.cpp
View File

@ -556,11 +556,6 @@ ChoicePage::doAlongsideApply()
QMutexLocker locker( &m_coreMutex );
if ( m_core->isDirty() )
{
m_core->revert();
}
QString path = m_beforePartitionBarsView->
selectionModel()->
currentIndex().data( PartitionModel::PartitionPathRole ).toString();

2
src/modules/partition/gui/ChoicePage.h
View File

@ -65,6 +65,7 @@ public:
Choice currentChoice() const;
void onLeave();
void applyActionChoice( ChoicePage::Choice choice );
signals:
void nextStatusChanged( bool );
@ -84,7 +85,6 @@ private:
void applyDeviceChoice();
void continueApplyDeviceChoice();
void updateDeviceStatePreview();
void applyActionChoice( ChoicePage::Choice choice );
void updateActionChoicePreview( ChoicePage::Choice choice );
void setupActions();
OsproberEntryList getOsproberEntriesForDevice( Device* device ) const;

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

@ -368,8 +368,10 @@ void
PartitionViewStep::onActivate()
{
// if we're coming back to PVS from the next VS
if ( m_widget->currentWidget() == m_choicePage )
if ( m_widget->currentWidget() == m_choicePage &&
m_choicePage->currentChoice() == ChoicePage::Alongside )
{
m_choicePage->applyActionChoice( ChoicePage::Alongside );
// m_choicePage->reset();
//FIXME: ReplaceWidget should be reset maybe?
}