applications/calamares
2
0
Fork 0
mirror of https://github.com/parchlinux/calamares.git synced 2025-06-27 09:25:36 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add page for erase+install operation.

Browse source
This commit is contained in:
Teo Mrnjavac 2014-09-04 19:37:30 +02:00
parent dab5a05116
commit ef703b0859
6 changed files with 174 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -22,6 +22,7 @@
#include <core/PartitionCoreModule.h>
#include <core/PartitionModel.h>
#include <gui/ChoicePage.h>
#include <gui/EraseDiskPage.h>
#include <gui/PartitionPage.h>
#include <gui/PartitionPreview.h>
@ -43,6 +44,7 @@ PartitionViewStep::PartitionViewStep( QObject* parent )
, m_widget( new QStackedWidget() )
, m_core( new PartitionCoreModule( this ) )
, m_choicePage( new ChoicePage() )
, m_erasePage( new EraseDiskPage() )
, m_manualPartitionPage( new PartitionPage( m_core ) )
{
m_widget->setContentsMargins( 0, 0, 0, 0 );
@ -78,9 +80,11 @@ PartitionViewStep::PartitionViewStep( QObject* parent )
QStringList osproberLines = osproberOutput.split( '\n' );
m_choicePage->init( m_core, osproberLines );
m_erasePage->init( m_core );
m_widget->addWidget( m_choicePage );
m_widget->addWidget( m_manualPartitionPage );
m_widget->addWidget( m_erasePage );
m_widget->removeWidget( waitingWidget );
waitingWidget->deleteLater();
@ -88,10 +92,12 @@ PartitionViewStep::PartitionViewStep( QObject* parent )
} );
timer->start( 0 );
connect( m_core, &PartitionCoreModule::hasRootMountPointChanged,
this, &PartitionViewStep::nextStatusChanged );
connect( m_choicePage, &ChoicePage::nextStatusChanged,
this, &PartitionViewStep::nextStatusChanged );
connect( m_core, &PartitionCoreModule::hasRootMountPointChanged,
this, &PartitionViewStep::nextStatusChanged );
connect( m_choicePage, &ChoicePage::nextStatusChanged,
this, &PartitionViewStep::nextStatusChanged );
connect( m_erasePage, &EraseDiskPage::nextStatusChanged,
this, &PartitionViewStep::nextStatusChanged );
}
@ -151,7 +157,14 @@ PartitionViewStep::next()
{
if ( m_choicePage == m_widget->currentWidget() )
{
m_widget->setCurrentWidget( m_manualPartitionPage );
if ( m_choicePage->currentChoice() == ChoicePage::Manual )
m_widget->setCurrentWidget( m_manualPartitionPage );
else if ( m_choicePage->currentChoice() == ChoicePage::Erase )
{
if ( m_core->isDirty() )
m_core->revert();
m_widget->setCurrentWidget( m_erasePage );
}
cDebug() << "Choice applied: " << m_choicePage->currentChoice();
}
else
@ -173,6 +186,9 @@ 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(); //FIXME: also check for mount point
return m_core->hasRootMountPoint();
}