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

AlongsidePage is not used any more.

Browse Source
This commit is contained in:
Teo Mrnjavac 2016-01-13 17:50:05 +01:00
parent 5242536b2a
commit b5882a75d1
2 changed files with 7 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -26,7 +26,6 @@
#include "core/OsproberEntry.h" #include "core/OsproberEntry.h"
#include "core/PartUtils.h" #include "core/PartUtils.h"
#include "gui/ChoicePage.h" #include "gui/ChoicePage.h"
#include "gui/AlongsidePage.h"
#include "gui/PartitionPage.h" #include "gui/PartitionPage.h"
#include "gui/PartitionBarsView.h" #include "gui/PartitionBarsView.h"
#include "gui/PartitionLabelsView.h" #include "gui/PartitionLabelsView.h"
@ -57,7 +56,6 @@ PartitionViewStep::PartitionViewStep( QObject* parent )
, m_widget( new QStackedWidget() ) , m_widget( new QStackedWidget() )
, m_core( new PartitionCoreModule( this ) ) , m_core( new PartitionCoreModule( this ) )
, m_choicePage( nullptr ) , m_choicePage( nullptr )
, m_alongsidePage( new AlongsidePage() )
, m_manualPartitionPage( new PartitionPage( m_core ) ) , m_manualPartitionPage( new PartitionPage( m_core ) )
, m_compactMode( true ) , m_compactMode( true )
{ {
@ -78,11 +76,9 @@ PartitionViewStep::continueLoading()
m_choicePage = new ChoicePage(); m_choicePage = new ChoicePage();
m_choicePage->init( m_core ); m_choicePage->init( m_core );
m_alongsidePage->init( m_core );
m_widget->addWidget( m_choicePage ); m_widget->addWidget( m_choicePage );
m_widget->addWidget( m_manualPartitionPage ); m_widget->addWidget( m_manualPartitionPage );
m_widget->addWidget( m_alongsidePage );
m_widget->removeWidget( m_waitingWidget ); m_widget->removeWidget( m_waitingWidget );
m_waitingWidget->deleteLater(); m_waitingWidget->deleteLater();
m_waitingWidget = nullptr; m_waitingWidget = nullptr;
@ -91,8 +87,6 @@ PartitionViewStep::continueLoading()
this, &PartitionViewStep::nextStatusChanged ); this, &PartitionViewStep::nextStatusChanged );
connect( m_choicePage, &ChoicePage::nextStatusChanged, connect( m_choicePage, &ChoicePage::nextStatusChanged,
this, &PartitionViewStep::nextStatusChanged ); this, &PartitionViewStep::nextStatusChanged );
connect( m_alongsidePage, &AlongsidePage::nextStatusChanged,
this, &PartitionViewStep::nextStatusChanged );
} }
@ -276,9 +270,9 @@ PartitionViewStep::next()
} }
else if ( m_choicePage->currentChoice() == ChoicePage::Alongside ) else if ( m_choicePage->currentChoice() == ChoicePage::Alongside )
{ {
if ( m_core->isDirty() ) m_choicePage->doAlongsideApply();
m_core->revert(); emit done();
m_widget->setCurrentWidget( m_alongsidePage ); return;
} }
else if ( m_choicePage->currentChoice() == ChoicePage::Replace ) else if ( m_choicePage->currentChoice() == ChoicePage::Replace )
{ {
@ -306,9 +300,6 @@ PartitionViewStep::isNextEnabled() const
if ( m_choicePage && m_choicePage == m_widget->currentWidget() ) if ( m_choicePage && m_choicePage == m_widget->currentWidget() )
return m_choicePage->isNextEnabled(); return m_choicePage->isNextEnabled();
if ( m_alongsidePage && m_alongsidePage == m_widget->currentWidget() )
return m_alongsidePage->isNextEnabled();
if ( m_manualPartitionPage && m_manualPartitionPage == m_widget->currentWidget() ) if ( m_manualPartitionPage && m_manualPartitionPage == m_widget->currentWidget() )
return m_core->hasRootMountPoint(); return m_core->hasRootMountPoint();
@ -326,8 +317,7 @@ PartitionViewStep::isBackEnabled() const
bool bool
PartitionViewStep::isAtBeginning() const PartitionViewStep::isAtBeginning() const
{ {
if ( m_widget->currentWidget() == m_manualPartitionPage || if ( m_widget->currentWidget() == m_manualPartitionPage )
m_widget->currentWidget() == m_alongsidePage )
return false; return false;
return true; return true;
} }
@ -339,7 +329,8 @@ PartitionViewStep::isAtEnd() const
if ( m_choicePage == m_widget->currentWidget() ) if ( m_choicePage == m_widget->currentWidget() )
{ {
if ( m_choicePage->currentChoice() == ChoicePage::Erase || if ( m_choicePage->currentChoice() == ChoicePage::Erase ||
m_choicePage->currentChoice() == ChoicePage::Replace ) m_choicePage->currentChoice() == ChoicePage::Replace ||
m_choicePage->currentChoice() == ChoicePage::Alongside )
return true; return true;
return false; return false;
} }
@ -362,10 +353,7 @@ PartitionViewStep::onActivate()
void void
PartitionViewStep::onLeave() PartitionViewStep::onLeave()
{ {
if ( m_widget->currentWidget() == m_alongsidePage )
{
m_alongsidePage->applyChanges();
}
} }

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

@ -28,7 +28,6 @@
#include <QObject> #include <QObject>
class ChoicePage; class ChoicePage;
class AlongsidePage;
class PartitionPage; class PartitionPage;
class PartitionCoreModule; class PartitionCoreModule;
class QStackedWidget; class QStackedWidget;
@ -72,7 +71,6 @@ private:
PartitionCoreModule* m_core; PartitionCoreModule* m_core;
QStackedWidget* m_widget; QStackedWidget* m_widget;
ChoicePage* m_choicePage; ChoicePage* m_choicePage;
AlongsidePage* m_alongsidePage;
PartitionPage* m_manualPartitionPage; PartitionPage* m_manualPartitionPage;
QWidget* m_waitingWidget; QWidget* m_waitingWidget;