Remove icon from PageContainer header (#4332)
This commit is contained in:
@@ -160,7 +160,6 @@ void PageContainer::createUI()
|
|||||||
m_pageStack = new QStackedLayout;
|
m_pageStack = new QStackedLayout;
|
||||||
m_pageList = new PageView;
|
m_pageList = new PageView;
|
||||||
m_header = new QLabel();
|
m_header = new QLabel();
|
||||||
m_iconHeader = new IconLabel(this, QIcon(), QSize(24, 24));
|
|
||||||
|
|
||||||
QFont headerLabelFont = m_header->font();
|
QFont headerLabelFont = m_header->font();
|
||||||
headerLabelFont.setBold(true);
|
headerLabelFont.setBold(true);
|
||||||
@@ -173,10 +172,6 @@ void PageContainer::createUI()
|
|||||||
const int leftMargin = APPLICATION->style()->pixelMetric(QStyle::PM_LayoutLeftMargin);
|
const int leftMargin = APPLICATION->style()->pixelMetric(QStyle::PM_LayoutLeftMargin);
|
||||||
headerHLayout->addSpacerItem(new QSpacerItem(leftMargin, 0, QSizePolicy::Fixed, QSizePolicy::Ignored));
|
headerHLayout->addSpacerItem(new QSpacerItem(leftMargin, 0, QSizePolicy::Fixed, QSizePolicy::Ignored));
|
||||||
headerHLayout->addWidget(m_header);
|
headerHLayout->addWidget(m_header);
|
||||||
headerHLayout->addSpacerItem(new QSpacerItem(0, 0, QSizePolicy::Expanding, QSizePolicy::Ignored));
|
|
||||||
headerHLayout->addWidget(m_iconHeader);
|
|
||||||
const int rightMargin = APPLICATION->style()->pixelMetric(QStyle::PM_LayoutRightMargin);
|
|
||||||
headerHLayout->addSpacerItem(new QSpacerItem(rightMargin, 0, QSizePolicy::Fixed, QSizePolicy::Ignored));
|
|
||||||
headerHLayout->setContentsMargins(0, 6, 0, 0);
|
headerHLayout->setContentsMargins(0, 6, 0, 0);
|
||||||
|
|
||||||
m_pageStack->setContentsMargins(0, 0, 0, 0);
|
m_pageStack->setContentsMargins(0, 0, 0, 0);
|
||||||
@@ -223,12 +218,10 @@ void PageContainer::showPage(int row)
|
|||||||
if (m_currentPage) {
|
if (m_currentPage) {
|
||||||
m_pageStack->setCurrentIndex(m_currentPage->stackIndex);
|
m_pageStack->setCurrentIndex(m_currentPage->stackIndex);
|
||||||
m_header->setText(m_currentPage->displayName());
|
m_header->setText(m_currentPage->displayName());
|
||||||
m_iconHeader->setIcon(m_currentPage->icon());
|
|
||||||
m_currentPage->opened();
|
m_currentPage->opened();
|
||||||
} else {
|
} else {
|
||||||
m_pageStack->setCurrentIndex(0);
|
m_pageStack->setCurrentIndex(0);
|
||||||
m_header->setText(QString());
|
m_header->setText(QString());
|
||||||
m_iconHeader->setIcon(QIcon::fromTheme("bug"));
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -112,6 +112,5 @@ class PageContainer : public QWidget, public BasePageContainer {
|
|||||||
QStackedLayout* m_pageStack;
|
QStackedLayout* m_pageStack;
|
||||||
QListView* m_pageList;
|
QListView* m_pageList;
|
||||||
QLabel* m_header;
|
QLabel* m_header;
|
||||||
IconLabel* m_iconHeader;
|
|
||||||
QGridLayout* m_layout;
|
QGridLayout* m_layout;
|
||||||
};
|
};
|
||||||
|
|||||||
Reference in New Issue
Block a user