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

Enable resize+alongside radiobutton if osprober reports multiple lines.

Browse Source
This commit is contained in:
Teo Mrnjavac 2014-09-22 17:21:50 +02:00
parent 0801756cd1
commit faa39e1746
1 changed files with 30 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -169,6 +169,22 @@ ChoicePage::init( PartitionCoreModule* core, const QStringList& osproberLines )
alongsideButton->hide(); alongsideButton->hide();
} }
else else
{
// m_osproberLines has at least 2 items.
bool atLeastOneCanBeResized = false;
foreach ( QString line, m_osproberLines )
{
QStringList osLine = line.split( ':' );
if ( canBeResized( osLine ) )
{
atLeastOneCanBeResized = true;
break;
}
}
if ( atLeastOneCanBeResized )
{ {
m_messageLabel->setText( tr( "This computer currently has multiple operating systems on it. " m_messageLabel->setText( tr( "This computer currently has multiple operating systems on it. "
"What would you like to do?" ) ); "What would you like to do?" ) );
@ -183,7 +199,9 @@ ChoicePage::init( PartitionCoreModule* core, const QStringList& osproberLines )
"<font color=\"red\">Warning: </font>This will delete all of your Windows 7 programs, " "<font color=\"red\">Warning: </font>This will delete all of your Windows 7 programs, "
"documents, photos, music, and any other files." ) "documents, photos, music, and any other files." )
.arg( "$RELEASE" ) ); .arg( "$RELEASE" ) );
alongsideButton->hide(); //FIXME: allow this when we can }
else
alongsideButton->hide();
} }
m_itemsLayout->addStretch(); m_itemsLayout->addStretch();