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

And always do that, please.

Browse Source
This commit is contained in:
Teo Mrnjavac 2016-02-12 16:48:29 +01:00
parent 12ec3bb74b
commit 485176d70d
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -851,6 +851,18 @@ ChoicePage::setupActions()
else else
m_deviceInfoWidget->setPartitionTableType( PartitionTable::unknownTableType ); m_deviceInfoWidget->setPartitionTableType( PartitionTable::unknownTableType );
bool atLeastOneCanBeResized = false;
for ( auto it = PartitionIterator::begin( currentDevice );
it != PartitionIterator::end( currentDevice ); ++it )
{
if ( PartUtils::canBeResized( *it ) )
{
atLeastOneCanBeResized = true;
break;
}
}
if ( osproberEntriesForCurrentDevice.count() == 0 ) if ( osproberEntriesForCurrentDevice.count() == 0 )
{ {
CALAMARES_RETRANSLATE( CALAMARES_RETRANSLATE(
@ -926,7 +938,7 @@ ChoicePage::setupActions()
m_replaceButton->show(); m_replaceButton->show();
if ( osproberEntriesForCurrentDevice.first().canBeResized ) if ( atLeastOneCanBeResized )
m_alongsideButton->show(); m_alongsideButton->show();
else else
{ {
@ -940,18 +952,6 @@ ChoicePage::setupActions()
{ {
// osproberEntriesForCurrentDevice has at least 2 items. // osproberEntriesForCurrentDevice has at least 2 items.
bool atLeastOneCanBeResized = false;
for ( auto it = PartitionIterator::begin( currentDevice );
it != PartitionIterator::end( currentDevice ); ++it )
{
if ( PartUtils::canBeResized( *it ) )
{
atLeastOneCanBeResized = true;
break;
}
}
CALAMARES_RETRANSLATE( CALAMARES_RETRANSLATE(
m_messageLabel->setText( tr( "This storage device has multiple operating systems on it. " m_messageLabel->setText( tr( "This storage device has multiple operating systems on it. "
"What would you like to do?<br/>" "What would you like to do?<br/>"