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

Preliminary implementation of a summary queue for partitioning jobs.

Browse Source
This commit is contained in:
Teo Mrnjavac 2015-04-09 15:05:04 +02:00
parent d45d436161
commit bf0296e155
1 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/modules/partition/gui/PartitionViewStep.cpp
View File

@ -40,6 +40,7 @@
#include "widgets/WaitingWidget.h" #include "widgets/WaitingWidget.h"
#include "GlobalStorage.h" #include "GlobalStorage.h"
#include "JobQueue.h" #include "JobQueue.h"
#include "Job.h"
// Qt // Qt
#include <QApplication> #include <QApplication>
@ -172,26 +173,40 @@ QWidget*
PartitionViewStep::createSummaryWidget() const PartitionViewStep::createSummaryWidget() const
{ {
QWidget* widget = new QWidget; QWidget* widget = new QWidget;
QFormLayout* layout = new QFormLayout( widget ); QVBoxLayout* mainLayout = new QVBoxLayout;
layout->setMargin( 0 ); widget->setLayout( mainLayout );
mainLayout->setMargin( 0 );
QFormLayout* formLayout = new QFormLayout( widget );
formLayout->setMargin( 0 );
mainLayout->addLayout( formLayout );
QList< PartitionCoreModule::SummaryInfo > list = m_core->createSummaryInfo(); QList< PartitionCoreModule::SummaryInfo > list = m_core->createSummaryInfo();
for ( const auto& info : list ) for ( const auto& info : list )
{ {
PartitionPreview* preview; PartitionPreview* preview;
layout->addRow( new QLabel( info.deviceName ) ); formLayout->addRow( new QLabel( info.deviceName ) );
preview = new PartitionPreview; preview = new PartitionPreview;
preview->setModel( info.partitionModelBefore ); preview->setModel( info.partitionModelBefore );
info.partitionModelBefore->setParent( widget ); info.partitionModelBefore->setParent( widget );
layout->addRow( tr( "Before:" ), preview ); formLayout->addRow( tr( "Before:" ), preview );
preview = new PartitionPreview; preview = new PartitionPreview;
preview->setModel( info.partitionModelAfter ); preview->setModel( info.partitionModelAfter );
info.partitionModelAfter->setParent( widget ); info.partitionModelAfter->setParent( widget );
layout->addRow( tr( "After:" ), preview ); formLayout->addRow( tr( "After:" ), preview );
} }
QLabel* jobsLabel = new QLabel( widget );
mainLayout->addWidget( jobsLabel );
QStringList jobsLines;
foreach ( const Calamares::job_ptr& job, jobs() )
{
if ( !job->prettyDescription().isEmpty() )
jobsLines.append( job->prettyDescription() );
}
jobsLabel->setText( tr( "Operations:<br/>%1" )
.arg( jobsLines.join( "<br/>" ) ) );
return widget; return widget;
} }