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

Try to manage preview visibility.

Browse Source
This commit is contained in:
Teo Mrnjavac 2015-12-31 16:55:18 +01:00
parent 38b90560cf
commit 74ba1df25f
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -99,12 +99,13 @@ ChoicePage::ChoicePage( QWidget* parent )
CALAMARES_RETRANSLATE( CALAMARES_RETRANSLATE(
retranslateUi( this ); retranslateUi( this );
m_drivesLabel->setText( tr( "Pick a storage de&vice:" ) ); m_drivesLabel->setText( tr( "Pick a storage de&vice:" ) );
m_previewBeforeLabel->setText( tr( "Before:" ) ); m_previewBeforeLabel->setText( tr( "Device:" ) );
m_previewAfterLabel->setText( tr( "After:" ) ); m_previewAfterLabel->setText( tr( "After:" ) );
) )
m_previewBeforeFrame->setSizePolicy( QSizePolicy::Preferred, QSizePolicy::Expanding ); m_previewBeforeFrame->setSizePolicy( QSizePolicy::Preferred, QSizePolicy::Expanding );
m_previewAfterFrame->setSizePolicy( QSizePolicy::Preferred, QSizePolicy::Expanding ); m_previewAfterFrame->setSizePolicy( QSizePolicy::Preferred, QSizePolicy::Expanding );
m_previewAfterLabel->hide();
m_previewAfterFrame->hide(); m_previewAfterFrame->hide();
// end // end
} }
@ -586,6 +587,8 @@ ChoicePage::updateActionChoicePreview( ChoicePage::Choice choice )
switch ( choice ) switch ( choice )
{ {
case Alongside: case Alongside:
m_previewBeforeLabel->setText( tr( "Device:" ) );
m_previewAfterLabel->hide();
// split widget goes here // split widget goes here
//label->setText( tr( "Drag to split:" ) ); //label->setText( tr( "Drag to split:" ) );
m_selectLabel->hide(); m_selectLabel->hide();
@ -594,6 +597,7 @@ ChoicePage::updateActionChoicePreview( ChoicePage::Choice choice )
case Erase: case Erase:
case Replace: case Replace:
{ {
m_previewBeforeLabel->setText( tr( "Before:" ) );
m_afterPartitionBarsView = new PartitionBarsView( m_previewAfterFrame ); m_afterPartitionBarsView = new PartitionBarsView( m_previewAfterFrame );
m_afterPartitionLabelsView = new PartitionLabelsView( m_previewAfterFrame ); m_afterPartitionLabelsView = new PartitionLabelsView( m_previewAfterFrame );
m_afterPartitionLabelsView->setCustomNewRootLabel( Calamares::Branding::instance()-> m_afterPartitionLabelsView->setCustomNewRootLabel( Calamares::Branding::instance()->
@ -612,6 +616,7 @@ ChoicePage::updateActionChoicePreview( ChoicePage::Choice choice )
layout->addWidget( m_afterPartitionLabelsView ); layout->addWidget( m_afterPartitionLabelsView );
m_previewAfterFrame->show(); m_previewAfterFrame->show();
m_previewAfterLabel->show();
if ( m_choice == Erase ) if ( m_choice == Erase )
m_selectLabel->hide(); m_selectLabel->hide();
@ -627,6 +632,8 @@ ChoicePage::updateActionChoicePreview( ChoicePage::Choice choice )
case Manual: case Manual:
m_selectLabel->hide(); m_selectLabel->hide();
m_previewAfterFrame->hide(); m_previewAfterFrame->hide();
m_previewBeforeLabel->setText( tr( "Device:" ) );
m_previewAfterLabel->hide();
break; break;
} }