applications/calamares
3
0
Fork 0
mirror of https://github.com/parchlinux/calamares.git synced 2025-02-24 19:05:46 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove EraseDiskPage from PartitionViewStep.

Browse source
This commit is contained in:
Teo Mrnjavac 2015-10-29 17:34:29 +01:00
parent 9167a34f2e
commit 2e9e1782cf
2 changed files with 2 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -26,7 +26,6 @@
#include "core/OsproberEntry.h"
#include "core/PartUtils.h"
#include "gui/ChoicePage.h"
#include "gui/EraseDiskPage.h"
#include "gui/AlongsidePage.h"
#include "gui/PartitionPage.h"
#include "gui/ReplacePage.h"
@ -58,7 +57,6 @@ PartitionViewStep::PartitionViewStep( QObject* parent )
, m_widget( new QStackedWidget() )
, m_core( new PartitionCoreModule( this ) )
, m_choicePage( nullptr )
, m_erasePage( new EraseDiskPage() )
, m_alongsidePage( new AlongsidePage() )
, m_manualPartitionPage( new PartitionPage( m_core ) )
, m_replacePage( new ReplacePage( m_core ) )
@ -83,13 +81,11 @@ PartitionViewStep::continueLoading()
m_choicePage = new ChoicePage( m_compactMode );
m_choicePage->init( m_core, osproberEntries );
m_erasePage->init( m_core );
m_alongsidePage->init( m_core, osproberEntries );
m_widget->addWidget( m_choicePage );
m_widget->addWidget( m_manualPartitionPage );
m_widget->addWidget( m_alongsidePage );
m_widget->addWidget( m_erasePage );
m_widget->addWidget( m_replacePage );
m_widget->removeWidget( m_waitingWidget );
m_waitingWidget->deleteLater();
@ -99,8 +95,6 @@ PartitionViewStep::continueLoading()
this, &PartitionViewStep::nextStatusChanged );
connect( m_choicePage, &ChoicePage::nextStatusChanged,
this, &PartitionViewStep::nextStatusChanged );
connect( m_erasePage, &EraseDiskPage::nextStatusChanged,
this, &PartitionViewStep::nextStatusChanged );
connect( m_alongsidePage, &AlongsidePage::nextStatusChanged,
this, &PartitionViewStep::nextStatusChanged );
connect( m_replacePage, &ReplacePage::nextStatusChanged,
@ -265,9 +259,8 @@ PartitionViewStep::next()
m_widget->setCurrentWidget( m_manualPartitionPage );
else if ( m_choicePage->currentChoice() == ChoicePage::Erase )
{
if ( m_core->isDirty() )
m_core->revert();
m_widget->setCurrentWidget( m_erasePage );
emit done();
return;
}
else if ( m_choicePage->currentChoice() == ChoicePage::Alongside )
{
@ -302,12 +295,6 @@ PartitionViewStep::isNextEnabled() const
if ( m_choicePage && m_choicePage == m_widget->currentWidget() )
return m_choicePage->isNextEnabled();
if ( m_erasePage && m_erasePage == m_widget->currentWidget() )
{
return m_erasePage->isNextEnabled() &&
m_core->hasRootMountPoint();
}
if ( m_alongsidePage && m_alongsidePage == m_widget->currentWidget() )
return m_alongsidePage->isNextEnabled();
@ -329,7 +316,6 @@ bool
PartitionViewStep::isAtBeginning() const
{
if ( m_widget->currentWidget() == m_manualPartitionPage ||
m_widget->currentWidget() == m_erasePage ||
m_widget->currentWidget() == m_alongsidePage ||
m_widget->currentWidget() == m_replacePage )
return false;

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

@ -28,7 +28,6 @@
#include <QObject>
class ChoicePage;
class EraseDiskPage;
class AlongsidePage;
class PartitionPage;
class ReplacePage;
@ -74,7 +73,6 @@ private:
PartitionCoreModule* m_core;
QStackedWidget* m_widget;
ChoicePage* m_choicePage;
EraseDiskPage* m_erasePage;
AlongsidePage* m_alongsidePage;
PartitionPage* m_manualPartitionPage;
ReplacePage* m_replacePage;