New Partitioning icons, still being fixed up.

main
Teo Mrnjavac 10 years ago
parent b095982830
commit ffc65fa07e

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

@ -85,21 +85,21 @@ ChoicePage::init( PartitionCoreModule* core, const OsproberEntryList& osproberEn
PrettyRadioButton* alongsideButton = new PrettyRadioButton;
alongsideButton->setIconSize( iconSize );
alongsideButton->setIcon( CalamaresUtils::defaultPixmap( CalamaresUtils::Information,
alongsideButton->setIcon( CalamaresUtils::defaultPixmap( CalamaresUtils::PartitionAlongside,
CalamaresUtils::Original,
iconSize ) );
grp->addButton( alongsideButton->buttonWidget() );
PrettyRadioButton* eraseButton = new PrettyRadioButton;
eraseButton->setIconSize( iconSize );
eraseButton->setIcon( CalamaresUtils::defaultPixmap( CalamaresUtils::Magic,
eraseButton->setIcon( CalamaresUtils::defaultPixmap( CalamaresUtils::PartitionEraseAuto,
CalamaresUtils::Original,
iconSize ) );
grp->addButton( eraseButton->buttonWidget() );
PrettyRadioButton* replaceButton = new PrettyRadioButton;
replaceButton->setIconSize( iconSize );
replaceButton->setIcon( CalamaresUtils::defaultPixmap( CalamaresUtils::Replace,
replaceButton->setIcon( CalamaresUtils::defaultPixmap( CalamaresUtils::PartitionReplaceOs,
CalamaresUtils::Original,
iconSize ) );
grp->addButton( replaceButton->buttonWidget() );
@ -265,7 +265,7 @@ ChoicePage::init( PartitionCoreModule* core, const OsproberEntryList& osproberEn
string( Calamares::Branding::ShortVersionedName ) ) );
)
somethingElseButton->setIconSize( iconSize );
somethingElseButton->setIcon( CalamaresUtils::defaultPixmap( CalamaresUtils::Partitions,
somethingElseButton->setIcon( CalamaresUtils::defaultPixmap( CalamaresUtils::PartitionManual,
CalamaresUtils::Original,
iconSize ) );
m_itemsLayout->addWidget( somethingElseButton );

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

Loading…
Cancel
Save