applications/calamares
2
0
Fork 0
mirror of https://github.com/parchlinux/calamares.git synced 2025-06-27 17:35:37 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/raurodse-branding'

Browse source 
FIXES #961
This commit is contained in:
Adriaan de Groot 2019-04-23 16:41:22 -04:00
commit 08e4090354
11 changed files with 59 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/modules/partition/gui/BootInfoWidget.cpp
View file

@ -32,6 +32,8 @@ BootInfoWidget::BootInfoWidget( QWidget* parent )
, m_bootIcon( new QLabel )
, m_bootLabel( new QLabel )
{
m_bootIcon->setObjectName("bootInfoIcon");
m_bootLabel->setObjectName("bootInfoLabel");
QHBoxLayout* mainLayout = new QHBoxLayout;
setLayout( mainLayout );
@ -47,7 +49,7 @@ BootInfoWidget::BootInfoWidget( QWidget* parent )
m_bootIcon->setPixmap( CalamaresUtils::defaultPixmap( CalamaresUtils::BootEnvironment,
CalamaresUtils::Original,
iconSize ) );
QFontMetrics fm = QFontMetrics( QFont() );
m_bootLabel->setMinimumWidth( fm.boundingRect( "BIOS" ).width() + CalamaresUtils::defaultFontHeight() / 2 );
m_bootLabel->setAlignment( Qt::AlignCenter );

3
src/modules/partition/gui/DeviceInfoWidget.cpp
View file

@ -39,7 +39,8 @@ DeviceInfoWidget::DeviceInfoWidget( QWidget* parent )
setLayout( mainLayout );
CalamaresUtils::unmarginLayout( mainLayout );
m_ptLabel->setObjectName("deviceInfoLabel");
m_ptIcon->setObjectName("deviceInfoIcon");
mainLayout->addWidget( m_ptIcon );
mainLayout->addWidget( m_ptLabel );

1
src/modules/partition/gui/PartitionBarsView.cpp
View file

@ -57,6 +57,7 @@ PartitionBarsView::PartitionBarsView( QWidget* parent )
, canBeSelected( []( const QModelIndex& ) { return true; } )
, m_hoveredIndex( QModelIndex() )
{
this->setObjectName("partitionBarView");
setSizePolicy( QSizePolicy::Expanding, QSizePolicy::Fixed );
setFrameStyle( QFrame::NoFrame );
setSelectionBehavior( QAbstractItemView::SelectRows );

2
src/modules/partition/gui/PartitionLabelsView.cpp
View file

@ -61,7 +61,7 @@ PartitionLabelsView::PartitionLabelsView( QWidget* parent )
setFrameStyle( QFrame::NoFrame );
setSelectionBehavior( QAbstractItemView::SelectRows );
setSelectionMode( QAbstractItemView::SingleSelection );
this->setObjectName("partitionLabel");
// Debug
connect( this, &PartitionLabelsView::clicked,
this, [=]( const QModelIndex& index )