|
|
|
@ -119,7 +119,7 @@ ChoicePage::ChoicePage( Config* config, QWidget* parent )
|
|
|
|
|
// Drive selector + preview
|
|
|
|
|
CALAMARES_RETRANSLATE( retranslateUi( this ); m_drivesLabel->setText( tr( "Select storage de&vice:" ) );
|
|
|
|
|
m_previewBeforeLabel->setText( tr( "Current:" ) );
|
|
|
|
|
m_previewAfterLabel->setText( tr( "After:" ) ); )
|
|
|
|
|
m_previewAfterLabel->setText( tr( "After:" ) ); );
|
|
|
|
|
|
|
|
|
|
m_previewBeforeFrame->setSizePolicy( QSizePolicy::Preferred, QSizePolicy::Expanding );
|
|
|
|
|
m_previewAfterFrame->setSizePolicy( QSizePolicy::Preferred, QSizePolicy::Expanding );
|
|
|
|
@ -298,7 +298,7 @@ ChoicePage::setupChoices()
|
|
|
|
|
|
|
|
|
|
CALAMARES_RETRANSLATE( m_somethingElseButton->setText( tr( "<strong>Manual partitioning</strong><br/>"
|
|
|
|
|
"You can create or resize partitions yourself." ) );
|
|
|
|
|
updateSwapChoicesTr( m_eraseSwapChoiceComboBox ); )
|
|
|
|
|
updateSwapChoicesTr( m_eraseSwapChoiceComboBox ); );
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@ -360,8 +360,7 @@ ChoicePage::applyDeviceChoice()
|
|
|
|
|
|
|
|
|
|
if ( m_core->isDirty() )
|
|
|
|
|
{
|
|
|
|
|
ScanningDialog::run(
|
|
|
|
|
QtConcurrent::run( [=] {
|
|
|
|
|
ScanningDialog::run( QtConcurrent::run( [=] {
|
|
|
|
|
QMutexLocker locker( &m_coreMutex );
|
|
|
|
|
m_core->revertAllDevices();
|
|
|
|
|
} ),
|
|
|
|
@ -453,8 +452,7 @@ ChoicePage::applyActionChoice( InstallChoice choice )
|
|
|
|
|
|
|
|
|
|
if ( m_core->isDirty() )
|
|
|
|
|
{
|
|
|
|
|
ScanningDialog::run(
|
|
|
|
|
QtConcurrent::run( [=] {
|
|
|
|
|
ScanningDialog::run( QtConcurrent::run( [=] {
|
|
|
|
|
QMutexLocker locker( &m_coreMutex );
|
|
|
|
|
m_core->revertDevice( selectedDevice() );
|
|
|
|
|
} ),
|
|
|
|
@ -474,8 +472,7 @@ ChoicePage::applyActionChoice( InstallChoice choice )
|
|
|
|
|
case InstallChoice::Replace:
|
|
|
|
|
if ( m_core->isDirty() )
|
|
|
|
|
{
|
|
|
|
|
ScanningDialog::run(
|
|
|
|
|
QtConcurrent::run( [=] {
|
|
|
|
|
ScanningDialog::run( QtConcurrent::run( [=] {
|
|
|
|
|
QMutexLocker locker( &m_coreMutex );
|
|
|
|
|
m_core->revertDevice( selectedDevice() );
|
|
|
|
|
} ),
|
|
|
|
@ -494,8 +491,7 @@ ChoicePage::applyActionChoice( InstallChoice choice )
|
|
|
|
|
case InstallChoice::Alongside:
|
|
|
|
|
if ( m_core->isDirty() )
|
|
|
|
|
{
|
|
|
|
|
ScanningDialog::run(
|
|
|
|
|
QtConcurrent::run( [=] {
|
|
|
|
|
ScanningDialog::run( QtConcurrent::run( [=] {
|
|
|
|
|
QMutexLocker locker( &m_coreMutex );
|
|
|
|
|
m_core->revertDevice( selectedDevice() );
|
|
|
|
|
} ),
|
|
|
|
@ -1037,8 +1033,7 @@ ChoicePage::updateActionChoicePreview( InstallChoice choice )
|
|
|
|
|
Calamares::restoreSelectedBootLoader( *m_bootloaderComboBox, m_core->bootLoaderInstallPath() );
|
|
|
|
|
}
|
|
|
|
|
} );
|
|
|
|
|
connect(
|
|
|
|
|
m_core,
|
|
|
|
|
connect( m_core,
|
|
|
|
|
&PartitionCoreModule::deviceReverted,
|
|
|
|
|
this,
|
|
|
|
|
[this]( Device* dev ) {
|
|
|
|
@ -1303,7 +1298,7 @@ ChoicePage::setupActions()
|
|
|
|
|
|
|
|
|
|
m_replaceButton->setText( tr( "<strong>Replace a partition</strong><br/>"
|
|
|
|
|
"Replaces a partition with %1." )
|
|
|
|
|
.arg( Calamares::Branding::instance()->shortVersionedName() ) ); )
|
|
|
|
|
.arg( Calamares::Branding::instance()->shortVersionedName() ) ); );
|
|
|
|
|
|
|
|
|
|
m_replaceButton->hide();
|
|
|
|
|
m_alongsideButton->hide();
|
|
|
|
@ -1337,7 +1332,7 @@ ChoicePage::setupActions()
|
|
|
|
|
|
|
|
|
|
m_replaceButton->setText( tr( "<strong>Replace a partition</strong><br/>"
|
|
|
|
|
"Replaces a partition with %1." )
|
|
|
|
|
.arg( Calamares::Branding::instance()->shortVersionedName() ) ); )
|
|
|
|
|
.arg( Calamares::Branding::instance()->shortVersionedName() ) ); );
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
@ -1358,7 +1353,7 @@ ChoicePage::setupActions()
|
|
|
|
|
|
|
|
|
|
m_replaceButton->setText( tr( "<strong>Replace a partition</strong><br/>"
|
|
|
|
|
"Replaces a partition with %1." )
|
|
|
|
|
.arg( Calamares::Branding::instance()->shortVersionedName() ) ); )
|
|
|
|
|
.arg( Calamares::Branding::instance()->shortVersionedName() ) ); );
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
@ -1383,7 +1378,7 @@ ChoicePage::setupActions()
|
|
|
|
|
|
|
|
|
|
m_replaceButton->setText( tr( "<strong>Replace a partition</strong><br/>"
|
|
|
|
|
"Replaces a partition with %1." )
|
|
|
|
|
.arg( Calamares::Branding::instance()->shortVersionedName() ) ); )
|
|
|
|
|
.arg( Calamares::Branding::instance()->shortVersionedName() ) ); );
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#ifdef DEBUG_PARTITION_UNSAFE
|
|
|
|
|