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

Handle selection behavior on current state preview views.

Browse Source
This commit is contained in:
Teo Mrnjavac 2015-12-17 13:45:11 +01:00
parent 7102596729
commit d0ee43172c
1 changed files with 42 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -496,9 +496,24 @@ ChoicePage::updateDeviceStatePreview( Device* currentDevice )
model->setParent( preview ); model->setParent( preview );
preview->setModel( model ); preview->setModel( model );
preview->setSelectionMode( QAbstractItemView::NoSelection );
previewLabels->setModel( model ); previewLabels->setModel( model );
previewLabels->setSelectionMode( QAbstractItemView::NoSelection );
// Make the bars and labels view use the same selectionModel.
auto sm = previewLabels->selectionModel();
previewLabels->setSelectionModel( preview->selectionModel() );
sm->deleteLater();
switch ( m_choice )
{
case Replace:
case Alongside:
preview->setSelectionMode( QAbstractItemView::SingleSelection );
previewLabels->setSelectionMode( QAbstractItemView::SingleSelection );
break;
default:
preview->setSelectionMode( QAbstractItemView::NoSelection );
previewLabels->setSelectionMode( QAbstractItemView::NoSelection );
}
layout->addWidget( preview ); layout->addWidget( preview );
layout->addWidget( previewLabels ); layout->addWidget( previewLabels );
@ -516,6 +531,7 @@ void
ChoicePage::updateActionChoicePreview( Device* currentDevice, ChoicePage::Choice choice ) ChoicePage::updateActionChoicePreview( Device* currentDevice, ChoicePage::Choice choice )
{ {
Q_ASSERT( currentDevice ); Q_ASSERT( currentDevice );
QMutexLocker locker( &m_previewsMutex ); QMutexLocker locker( &m_previewsMutex );
cDebug() << "Updating partitioning preview widgets."; cDebug() << "Updating partitioning preview widgets.";
@ -550,17 +566,8 @@ ChoicePage::updateActionChoicePreview( Device* currentDevice, ChoicePage::Choice
model->setParent( preview ); model->setParent( preview );
preview->setModel( model ); preview->setModel( model );
previewLabels->setModel( model ); previewLabels->setModel( model );
preview->setSelectionMode( QAbstractItemView::NoSelection );
// Make the bars and labels view use the same selectionModel. previewLabels->setSelectionMode( QAbstractItemView::NoSelection );
auto sm = previewLabels->selectionModel();
previewLabels->setSelectionModel( preview->selectionModel() );
sm->deleteLater();
if ( choice == Erase )
{
preview->setSelectionMode( QAbstractItemView::NoSelection );
previewLabels->setSelectionMode( QAbstractItemView::NoSelection );
}
layout->addWidget( preview ); layout->addWidget( preview );
layout->addWidget( previewLabels ); layout->addWidget( previewLabels );
@ -573,6 +580,28 @@ ChoicePage::updateActionChoicePreview( Device* currentDevice, ChoicePage::Choice
m_previewAfterFrame->hide(); m_previewAfterFrame->hide();
break; break;
} }
// Also handle selection behavior on beforeFrame.
QAbstractItemView::SelectionMode previewSelectionMode;
switch ( m_choice )
{
case Replace:
case Alongside:
previewSelectionMode = QAbstractItemView::SingleSelection;
break;
default:
previewSelectionMode = QAbstractItemView::NoSelection;
}
foreach ( QObject* child, m_previewBeforeFrame->children() )
{
PartitionBarsView* pbv = qobject_cast< PartitionBarsView* >( child );
if ( pbv )
pbv->setSelectionMode( previewSelectionMode );
PartitionLabelsView* plv = qobject_cast< PartitionLabelsView* >( child );
if ( plv )
plv->setSelectionMode( previewSelectionMode );
}
} }