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

There is no prepare phase any more.

Browse Source
This commit is contained in:
Teo Mrnjavac 2015-09-09 19:06:04 +02:00
parent 5e87e01374
commit 490875cdb4
1 changed files with 1 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/calamares/progresstree/ProgressTreeModel.cpp
View File

@ -132,30 +132,10 @@ ProgressTreeModel::setupModelData()
m_rootItem = new ProgressTreeRoot(); m_rootItem = new ProgressTreeRoot();
const Calamares::ViewManager* vm = Calamares::ViewManager::instance(); const Calamares::ViewManager* vm = Calamares::ViewManager::instance();
foreach ( const Calamares::ViewStep* step, vm->prepareSteps() ) foreach ( const Calamares::ViewStep* step, vm->viewSteps() )
{ {
m_rootItem->appendChild( new ViewStepItem( step, m_rootItem ) ); m_rootItem->appendChild( new ViewStepItem( step, m_rootItem ) );
} }
m_rootItem->appendChild( new ViewStepItem(
[]() -> QString
{
return tr( "Install" );
},
[vm]() -> const Calamares::ViewStep*
{
return vm->installationStep();
}, m_rootItem ) );
m_rootItem->appendChild( new ViewStepItem(
[]() -> QString
{
return tr( "Finish" );
},
[vm]() -> const Calamares::ViewStep*
{
return vm->finishedStep();
}, m_rootItem ) );
} }