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

Use the new Disk and Partition icons.

Browse Source
This commit is contained in:
Teo Mrnjavac 2015-04-03 12:19:27 +02:00
parent c9769dfd76
commit 6395b4c8ce
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/modules/partition/core/DeviceModel.cpp
View File

@ -81,7 +81,7 @@ DeviceModel::data( const QModelIndex& index, int role ) const
.arg( KFormat().formatByteSize( device->capacity() ) ) .arg( KFormat().formatByteSize( device->capacity() ) )
.arg( device->deviceNode() ); .arg( device->deviceNode() );
case Qt::DecorationRole: case Qt::DecorationRole:
return CalamaresUtils::defaultPixmap( CalamaresUtils::PartitionManual, return CalamaresUtils::defaultPixmap( CalamaresUtils::PartitionDisk,
CalamaresUtils::Original, CalamaresUtils::Original,
QSize( CalamaresUtils::defaultIconSize().width() * 3, QSize( CalamaresUtils::defaultIconSize().width() * 3,
CalamaresUtils::defaultIconSize().height() * 3 ) ); CalamaresUtils::defaultIconSize().height() * 3 ) );

4
src/modules/partition/gui/ReplacePage.cpp
View File

@ -105,7 +105,7 @@ ReplacePage::onPartitionSelected()
{ {
if ( m_ui->partitionTreeView->currentIndex() == QModelIndex() ) if ( m_ui->partitionTreeView->currentIndex() == QModelIndex() )
{ {
updateStatus( CalamaresUtils::PartitionReplaceOs, updateStatus( CalamaresUtils::PartitionPartition,
tr( "Select where to install %1.<br/>" tr( "Select where to install %1.<br/>"
"<font color=\"red\">Warning: </font>this will delete all files " "<font color=\"red\">Warning: </font>this will delete all files "
"on the selected partition." ) "on the selected partition." )
@ -216,7 +216,7 @@ ReplacePage::onPartitionSelected()
return; return;
} }
updateStatus( CalamaresUtils::PartitionReplaceOs, updateStatus( CalamaresUtils::PartitionPartition,
tr( "<b>%3</b><br/><br/>" tr( "<b>%3</b><br/><br/>"
"%1 will be installed on %2.<br/>" "%1 will be installed on %2.<br/>"
"<font color=\"red\">Warning: </font>all data on partition" "<font color=\"red\">Warning: </font>all data on partition"