From d7a853ee068f3c2b86be8df049847524bbb41837 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aur=C3=A9lien=20G=C3=A2teau?= Date: Thu, 17 Jul 2014 14:59:59 +0200 Subject: [PATCH] Scaffolding for exiting partition reformating --- src/modules/partition/EditExistingPartitionDialog.cpp | 7 ++++++- src/modules/partition/EditExistingPartitionDialog.ui | 11 +++++++---- src/modules/partition/PartitionCoreModule.cpp | 5 +++++ src/modules/partition/PartitionCoreModule.h | 2 ++ 4 files changed, 20 insertions(+), 5 deletions(-) diff --git a/src/modules/partition/EditExistingPartitionDialog.cpp b/src/modules/partition/EditExistingPartitionDialog.cpp index d58b4ce98..fdee1322b 100644 --- a/src/modules/partition/EditExistingPartitionDialog.cpp +++ b/src/modules/partition/EditExistingPartitionDialog.cpp @@ -18,6 +18,7 @@ #include +#include #include #include #include @@ -58,7 +59,11 @@ EditExistingPartitionDialog::mbSizeForSectorRange( qint64 first, qint64 last ) c } void -EditExistingPartitionDialog::applyChanges( PartitionCoreModule* module ) +EditExistingPartitionDialog::applyChanges( PartitionCoreModule* core ) { PartitionInfo::setMountPoint( m_partition, m_ui->mountPointComboBox->currentText() ); + if ( m_ui->formatRadioButton->isChecked() ) + core->formatPartition( m_device, m_partition ); + else + core->refresh( m_device ); } diff --git a/src/modules/partition/EditExistingPartitionDialog.ui b/src/modules/partition/EditExistingPartitionDialog.ui index 276a0aa7e..44ebaeb1a 100644 --- a/src/modules/partition/EditExistingPartitionDialog.ui +++ b/src/modules/partition/EditExistingPartitionDialog.ui @@ -47,10 +47,13 @@ Content: + + keepRadioButton + - + Keep @@ -60,7 +63,7 @@ - + Format @@ -142,8 +145,8 @@ sizeSpinBox - radioButton - radioButton_2 + keepRadioButton + formatRadioButton mountPointComboBox buttonBox diff --git a/src/modules/partition/PartitionCoreModule.cpp b/src/modules/partition/PartitionCoreModule.cpp index 55cc6f805..93f3ff6a6 100644 --- a/src/modules/partition/PartitionCoreModule.cpp +++ b/src/modules/partition/PartitionCoreModule.cpp @@ -265,6 +265,11 @@ PartitionCoreModule::deletePartition( Device* device, Partition* partition ) refresh( device ); } +void +PartitionCoreModule::formatPartition( Device* device, Partition* partition ) +{ +} + QList< Calamares::job_ptr > PartitionCoreModule::jobs() const { diff --git a/src/modules/partition/PartitionCoreModule.h b/src/modules/partition/PartitionCoreModule.h index 55410b007..b589d1003 100644 --- a/src/modules/partition/PartitionCoreModule.h +++ b/src/modules/partition/PartitionCoreModule.h @@ -55,6 +55,8 @@ public: void deletePartition( Device* device, Partition* partition ); + void formatPartition( Device* device, Partition* partition ); + QList< Calamares::job_ptr > jobs() const; bool hasRootMountPoint() const