From 88991ee63437788cce465f2a89f9e4c8c9199554 Mon Sep 17 00:00:00 2001 From: Arttu Tarkiainen Date: Tue, 8 Sep 2020 10:56:15 +0300 Subject: Page list widget enhancements - Add support for a configurable image shown on top of the page list. - Add missing object names for easier object reference, for example when using stylesheets. - Remove the vertical line separating side widget as this looks particularly ugly on custom styles. Task-number: QTIFW-1939 Change-Id: I16e17e72163068381f54491f7fbe965eb4c5295d Reviewed-by: Katja Marttila --- src/libs/installer/packagemanagergui.cpp | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) (limited to 'src/libs/installer/packagemanagergui.cpp') diff --git a/src/libs/installer/packagemanagergui.cpp b/src/libs/installer/packagemanagergui.cpp index 9c59987cc..d79c1762e 100644 --- a/src/libs/installer/packagemanagergui.cpp +++ b/src/libs/installer/packagemanagergui.cpp @@ -341,8 +341,10 @@ PackageManagerGui::PackageManagerGui(PackageManagerCore *core, QWidget *parent) if (m_core->settings().wizardShowPageList()) { QWidget *sideWidget = new QWidget(this); + sideWidget->setObjectName(QLatin1String("SideWidget")); m_pageListWidget = new QListWidget(sideWidget); + m_pageListWidget->setObjectName(QLatin1String("PageListWidget")); m_pageListWidget->viewport()->setAutoFillBackground(false); m_pageListWidget->setFrameShape(QFrame::NoFrame); m_pageListWidget->setMinimumWidth(200); @@ -354,13 +356,17 @@ PackageManagerGui::PackageManagerGui(PackageManagerCore *core, QWidget *parent) m_pageListWidget->setSelectionMode(QAbstractItemView::NoSelection); m_pageListWidget->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff); - QFrame *verticalLine = new QFrame(sideWidget); - verticalLine->setFrameShape(QFrame::VLine); - verticalLine->setFrameShadow(QFrame::Sunken); + QVBoxLayout *sideWidgetLayout = new QVBoxLayout(sideWidget); - QHBoxLayout *sideWidgetLayout = new QHBoxLayout(sideWidget); + const QString pageListPixmap = m_core->settings().pageListPixmap(); + if (!pageListPixmap.isEmpty()) { + QLabel *pageListPixmapLabel = new QLabel(sideWidget); + pageListPixmapLabel->setObjectName(QLatin1String("PageListPixmapLabel")); + pageListPixmapLabel->setPixmap(pageListPixmap); + pageListPixmapLabel->setMinimumWidth(QPixmap(pageListPixmap).width()); + sideWidgetLayout->addWidget(pageListPixmapLabel); + } sideWidgetLayout->addWidget(m_pageListWidget); - sideWidgetLayout->addWidget(verticalLine); sideWidget->setLayout(sideWidgetLayout); setSideWidget(sideWidget); -- cgit v1.2.3