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

Show preview widget for unknown disklabels or no disklabel.

Browse Source
This commit is contained in:
Teo Mrnjavac 2015-10-22 17:48:02 +02:00
parent 7adaa65795
commit 8858ea7854
1 changed files with 46 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
src/modules/partition/gui/PartitionPreview.cpp
View File

@ -19,9 +19,14 @@
#include <gui/PartitionPreview.h> #include <gui/PartitionPreview.h>
#include <core/PartitionModel.h> #include <core/PartitionModel.h>
#include <core/ColorUtils.h>
#include <kpmcore/core/device.h>
#include "utils/CalamaresUtilsGui.h" #include "utils/CalamaresUtilsGui.h"
#include <KFormat>
// Qt // Qt
#include <QDebug> #include <QDebug>
#include <QPainter> #include <QPainter>
@ -35,6 +40,13 @@ static const int EXTENDED_PARTITION_MARGIN = 4;
static const int LABELS_MARGIN = 40; static const int LABELS_MARGIN = 40;
static const int LABEL_PARTITION_SQUARE_MARGIN = 18; static const int LABEL_PARTITION_SQUARE_MARGIN = 18;
QStringList
buildUnknownDisklabelTexts( Device* dev )
{
QStringList texts = { QObject::tr( "Unpartitioned space or unknown partition table" ),
KFormat().formatByteSize( dev->totalSectors() * dev->logicalSectorSize() ) };
return texts;
}
PartitionPreview::PartitionPreview( QWidget* parent ) PartitionPreview::PartitionPreview( QWidget* parent )
: m_showLabels( false ) : m_showLabels( false )
@ -92,8 +104,12 @@ PartitionPreview::paintEvent( QPaintEvent* event )
static void static void
drawSection( QPainter* painter, const QRect& rect_, int x, int width, const QModelIndex& index ) drawSection( QPainter* painter, const QRect& rect_, int x, int width, const QModelIndex& index )
{ {
QColor color = index.data( Qt::DecorationRole ).value< QColor >(); QColor color = index.isValid() ?
bool isFreeSpace = index.data( PartitionModel::IsFreeSpaceRole ).toBool(); index.data( Qt::DecorationRole ).value< QColor >() :
ColorUtils::unknownDisklabelColor();
bool isFreeSpace = index.isValid() ?
index.data( PartitionModel::IsFreeSpaceRole ).toBool() :
true;
QRect rect = rect_; QRect rect = rect_;
const int y = rect.y(); const int y = rect.y();
@ -129,11 +145,12 @@ drawSection( QPainter* painter, const QRect& rect_, int x, int width, const QMod
void void
PartitionPreview::drawPartitions( QPainter* painter, const QRect& rect, const QModelIndex& parent ) PartitionPreview::drawPartitions( QPainter* painter, const QRect& rect, const QModelIndex& parent )
{ {
QAbstractItemModel* modl = model(); PartitionModel* modl = qobject_cast< PartitionModel* >( model() );
if ( !modl ) if ( !modl )
return; return;
const int count = modl->rowCount( parent ); const int count = modl->rowCount( parent );
const int totalWidth = rect.width(); const int totalWidth = rect.width();
qDebug() << "count:" << count << "totalWidth:" << totalWidth;
struct Item struct Item
{ {
qreal size; qreal size;
@ -173,6 +190,13 @@ PartitionPreview::drawPartitions( QPainter* painter, const QRect& rect, const QM
} }
x += width; x += width;
} }
if ( !count &&
!modl->device()->partitionTable() ) // No disklabel or unknown
{
int width = rect.right() - rect.x() + 1;
drawSection( painter, rect, rect.x(), width, QModelIndex() );
}
} }
@ -212,7 +236,7 @@ PartitionPreview::getIndexesToDraw( const QModelIndex& parent ) const
void void
PartitionPreview::drawLabels( QPainter* painter, const QRect& rect, const QModelIndex& parent ) PartitionPreview::drawLabels( QPainter* painter, const QRect& rect, const QModelIndex& parent )
{ {
QAbstractItemModel* modl = model(); PartitionModel* modl = qobject_cast< PartitionModel* >( model() );
if ( !modl ) if ( !modl )
return; return;
@ -231,20 +255,29 @@ PartitionPreview::drawLabels( QPainter* painter, const QRect& rect, const QModel
if ( label_x + labelSize.width() > rect.width() ) //wrap to new line if overflow if ( label_x + labelSize.width() > rect.width() ) //wrap to new line if overflow
{ {
label_x = 0; label_x = rect.x();
label_y += labelSize.height(); label_y += labelSize.height();
} }
drawLabel( painter, texts, labelColor, QPoint( label_x, label_y ) ); drawLabel( painter, texts, labelColor, QPoint( label_x, label_y ) );
label_x += labelSize.width() + LABELS_MARGIN; label_x += labelSize.width() + LABELS_MARGIN;
} }
if ( !modl->rowCount() &&
!modl->device()->partitionTable() ) // No disklabel or unknown
{
QStringList texts = buildUnknownDisklabelTexts( modl->device() );
QSize labelSize = sizeForLabel( texts );
QColor labelColor = ColorUtils::unknownDisklabelColor();
drawLabel( painter, texts, labelColor, QPoint( rect.x(), rect.y() ) );
}
} }
QSize QSize
PartitionPreview::sizeForAllLabels( int maxLineWidth ) const PartitionPreview::sizeForAllLabels( int maxLineWidth ) const
{ {
QAbstractItemModel* modl = model(); PartitionModel* modl = qobject_cast< PartitionModel* >( model() );
if ( !modl ) if ( !modl )
return QSize(); return QSize();
@ -272,6 +305,13 @@ PartitionPreview::sizeForAllLabels( int maxLineWidth ) const
singleLabelHeight = qMax( singleLabelHeight, labelSize.height() ); singleLabelHeight = qMax( singleLabelHeight, labelSize.height() );
} }
if ( !modl->rowCount() &&
!modl->device()->partitionTable() ) // Unknown or no disklabel
{
singleLabelHeight = sizeForLabel( buildUnknownDisklabelTexts( modl->device() ) )
.height();
}
int totalHeight = numLines * singleLabelHeight; int totalHeight = numLines * singleLabelHeight;
return QSize( maxLineWidth, totalHeight ); return QSize( maxLineWidth, totalHeight );