Merge branch 'branding' of https://github.com/raurodse/calamares into raurodse-branding

src/calamares/CalamaresWindow.cpp

@@ -34,6 +34,8 @@
 #include <QDesktopWidget>
 #include <QLabel>
 #include <QTreeView>
+#include <QFile>
+#include <QFileInfo>
 
 CalamaresWindow::CalamaresWindow( QWidget* parent )
     : QWidget( parent )
@@ -51,6 +53,7 @@ CalamaresWindow::CalamaresWindow( QWidget* parent )
     using CalamaresUtils::windowPreferredWidth;
 
     QSize availableSize = qApp->desktop()->availableGeometry( this ).size();
+    this->setObjectName("mainApp");
 
     cDebug() << "Available size" << availableSize;
 
@@ -71,10 +74,12 @@ CalamaresWindow::CalamaresWindow( QWidget* parent )
     setLayout( mainLayout );
 
     QWidget* sideBox = new QWidget( this );
+    sideBox->setObjectName("sidebarApp");
     mainLayout->addWidget( sideBox );
 
     QBoxLayout* sideLayout = new QVBoxLayout;
     sideBox->setLayout( sideLayout );
+    // Set this attribute into qss file
     sideBox->setFixedWidth( qBound( 100, CalamaresUtils::defaultFontHeight() * 12, w < windowPreferredWidth ? 100 : 190 ) );
     sideBox->setSizePolicy( QSizePolicy::Expanding, QSizePolicy::Expanding );
 
@@ -82,6 +87,8 @@ CalamaresWindow::CalamaresWindow( QWidget* parent )
     sideLayout->addLayout( logoLayout );
     logoLayout->addStretch();
     QLabel* logoLabel = new QLabel( sideBox );
+    logoLabel->setObjectName("logoApp");
+    //Define all values into qss file
     {
         QPalette plt = sideBox->palette();
         sideBox->setAutoFillBackground( true );
@@ -142,6 +149,28 @@ CalamaresWindow::CalamaresWindow( QWidget* parent )
     connect( m_viewManager, &Calamares::ViewManager::enlarge, this, &CalamaresWindow::enlarge );
 
     mainLayout->addWidget( m_viewManager->centralWidget() );
+
+
+
+    QString brandingComponentName = Calamares::Settings::instance()->brandingComponentName();
+    if ( brandingComponentName.simplified().isEmpty() )
+    {
+        cError() << "FATAL: branding component not set in settings.conf";
+        ::exit( EXIT_FAILURE );
+    }
+
+    QString brandingQSSDescriptorPath = QString( "/etc/calamares/branding/%1/stylesheet.qss" )
+                                        .arg( brandingComponentName );
+
+    QFileInfo importQSSPath = QFileInfo( brandingQSSDescriptorPath );
+    if ( importQSSPath.exists() && importQSSPath.isReadable() )
+    {
+        QFile File(brandingQSSDescriptorPath);
+        File.open(QFile::ReadOnly);
+        QString StyleSheet = QLatin1String(File.readAll());
+        this->setStyleSheet(StyleSheet);
+    }
+
 }
 
 void

src/calamares/progresstree/ProgressTreeView.cpp

@@ -35,6 +35,7 @@ ProgressTreeView::ProgressTreeView( QWidget* parent )
 {
     s_instance = this; //FIXME: should assert when s_instance gets written and it wasn't nullptr
 
+    this->setObjectName("sidebarMenuApp");
     setFrameShape( QFrame::NoFrame );
     setContentsMargins( 0, 0, 0, 0 );
 

src/modules/partition/gui/BootInfoWidget.cpp

@@ -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 );

src/modules/partition/gui/DeviceInfoWidget.cpp

@@ -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 );
 

src/modules/partition/gui/PartitionBarsView.cpp

@@ -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 );

src/modules/partition/gui/PartitionLabelsView.cpp

@@ -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 )

src/modules/summary/SummaryPage.cpp

@@ -39,6 +39,7 @@ SummaryPage::SummaryPage( const SummaryViewStep* thisViewStep, QWidget* parent )
     , m_contentWidget( nullptr )
     , m_scrollArea( new QScrollArea( this ) )
 {
+    this->setObjectName("summaryStep");
     Q_UNUSED( parent );
     Q_ASSERT( m_thisViewStep );
     QVBoxLayout* layout = new QVBoxLayout( this );