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

New Partitioning icons, still being fixed up.

Browse Source
This commit is contained in:
Teo Mrnjavac 2015-04-02 14:21:14 +02:00
parent b095982830
commit ffc65fa07e
3 changed files with 7 additions and 7 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::Partitions, return CalamaresUtils::defaultPixmap( CalamaresUtils::PartitionManual,
CalamaresUtils::Original, CalamaresUtils::Original,
QSize( CalamaresUtils::defaultIconSize().width() * 3, QSize( CalamaresUtils::defaultIconSize().width() * 3,
CalamaresUtils::defaultIconSize().height() * 3 ) ); CalamaresUtils::defaultIconSize().height() * 3 ) );

8
src/modules/partition/gui/ChoicePage.cpp
View File

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

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::Partitions, updateStatus( CalamaresUtils::PartitionReplaceOs,
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::Partitions, updateStatus( CalamaresUtils::PartitionReplaceOs,
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"