applications/calamares
2
0
Fork 0
mirror of https://github.com/parchlinux/calamares.git synced 2025-06-29 18:35:37 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

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
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 ); QMutexLocker locker( &m_coreMutex );
if ( m_core->isDirty() )
{
m_core->revert();
}
QString path = m_beforePartitionBarsView-> QString path = m_beforePartitionBarsView->
selectionModel()-> selectionModel()->
currentIndex().data( PartitionModel::PartitionPathRole ).toString(); currentIndex().data( PartitionModel::PartitionPathRole ).toString();

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

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

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

@ -368,8 +368,10 @@ void
PartitionViewStep::onActivate() PartitionViewStep::onActivate()
{ {
// if we're coming back to PVS from the next VS // 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(); // m_choicePage->reset();
//FIXME: ReplaceWidget should be reset maybe? //FIXME: ReplaceWidget should be reset maybe?
} }