applications/calamares
2
0
Fork 0
mirror of https://github.com/parchlinux/calamares.git synced 2025-06-26 00:48:22 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Use new Labels view.

Browse source
This commit is contained in:
Teo Mrnjavac 2015-12-03 19:40:06 +01:00
parent eed8d3b83b
commit 1ad6c7e8ac
4 changed files with 36 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

23
src/modules/partition/gui/PartitionViewStep.cpp
View file

@ -29,6 +29,7 @@
#include "gui/AlongsidePage.h"
#include "gui/PartitionPage.h"
#include "gui/PartitionBarsView.h"
#include "gui/PartitionLabelsView.h"
#include "CalamaresVersion.h"
#include "utils/CalamaresUtilsGui.h"
@ -210,18 +211,32 @@ PartitionViewStep::createSummaryWidget() const
formLayout->addRow( diskInfoLabel );
PartitionBarsView* preview;
PartitionLabelsView* previewLabels;
QVBoxLayout* field;
preview = new PartitionBarsView;
preview->setLabelsVisible( true );
previewLabels = new PartitionLabelsView;
preview->setModel( info.partitionModelBefore );
previewLabels->setModel( info.partitionModelBefore );
info.partitionModelBefore->setParent( widget );
formLayout->addRow( tr( "Before:" ), preview );
field = new QVBoxLayout;
CalamaresUtils::unmarginLayout( field );
field->setSpacing( 6 );
field->addWidget( preview );
field->addWidget( previewLabels );
formLayout->addRow( tr( "Current state:" ), field );
preview = new PartitionBarsView;
preview->setLabelsVisible( true );
previewLabels = new PartitionLabelsView;
preview->setModel( info.partitionModelAfter );
previewLabels->setModel( info.partitionModelAfter );
info.partitionModelAfter->setParent( widget );
formLayout->addRow( tr( "After:" ), preview );
field = new QVBoxLayout;
CalamaresUtils::unmarginLayout( field );
field->setSpacing( 6 );
field->addWidget( preview );
field->addWidget( previewLabels );
formLayout->addRow( tr( "Your changes:" ), field );
}
QStringList jobsLines;
foreach ( const Calamares::job_ptr& job, jobs() )