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

Add IsNewPartition role

Browse Source
This commit is contained in:
Aurélien Gâteau 2014-07-15 17:33:16 +02:00
parent fa30fe147f
commit 174114f09c
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/modules/partition/PartitionModel.cpp
View File

@ -92,7 +92,7 @@ PartitionModel::data( const QModelIndex& index, int role ) const
return prefix + tr( "Free Space" ); return prefix + tr( "Free Space" );
else else
{ {
return prefix + ( partition->partitionPath().isEmpty() return prefix + ( PMUtils::isPartitionNew( partition )
? tr( "New partition" ) ? tr( "New partition" )
: partition->partitionPath() ); : partition->partitionPath() );
} }
@ -112,6 +112,8 @@ PartitionModel::data( const QModelIndex& index, int role ) const
cDebug() << "Unknown column" << col; cDebug() << "Unknown column" << col;
return QVariant(); return QVariant();
} }
case IsNewPartitionRole:
return PMUtils::isPartitionNew( partition );
default: default:
return QVariant(); return QVariant();
} }

5
src/modules/partition/PartitionModel.h
View File

@ -46,6 +46,11 @@ public:
LastColumn = SizeColumn + 1 LastColumn = SizeColumn + 1
}; };
enum
{
IsNewPartitionRole = Qt::UserRole
};
PartitionModel( QObject* parent = 0 ); PartitionModel( QObject* parent = 0 );
/** /**
* device and infoForPartitions must remain alive for the life of * device and infoForPartitions must remain alive for the life of