From ceec70e014db629aa8ba3472839cc42781d73d4c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= Date: Sun, 1 Mar 2015 22:20:57 +0100 Subject: GH-796 Icon theme loading workaround Replacing the Qt machinery with other Qt machinery under our control --- gui/widgets/PageContainer.cpp | 3 ++- gui/widgets/ServerStatus.cpp | 8 ++++---- 2 files changed, 6 insertions(+), 5 deletions(-) (limited to 'gui/widgets') diff --git a/gui/widgets/PageContainer.cpp b/gui/widgets/PageContainer.cpp index b84594c1..59b800cc 100644 --- a/gui/widgets/PageContainer.cpp +++ b/gui/widgets/PageContainer.cpp @@ -32,6 +32,7 @@ #include "gui/widgets/IconLabel.h" #include "gui/Platform.h" #include "PageContainer_p.h" +#include class PageEntryFilterModel : public QSortFilterProxyModel { @@ -174,7 +175,7 @@ void PageContainer::showPage(int row) { m_pageStack->setCurrentIndex(0); m_header->setText(QString()); - m_iconHeader->setIcon(QIcon::fromTheme("bug")); + m_iconHeader->setIcon(MMC->getThemedIcon("bug")); } } diff --git a/gui/widgets/ServerStatus.cpp b/gui/widgets/ServerStatus.cpp index 3b02fd24..93781e1c 100644 --- a/gui/widgets/ServerStatus.cpp +++ b/gui/widgets/ServerStatus.cpp @@ -16,9 +16,9 @@ ServerStatus::ServerStatus(QWidget *parent, Qt::WindowFlags f) : QWidget(parent, { layout = new QHBoxLayout(this); layout->setContentsMargins(0, 0, 0, 0); - goodIcon = QIcon::fromTheme("status-good"); - yellowIcon = QIcon::fromTheme("status-yellow"); - badIcon = QIcon::fromTheme("status-bad"); + goodIcon = MMC->getThemedIcon("status-good"); + yellowIcon = MMC->getThemedIcon("status-yellow"); + badIcon = MMC->getThemedIcon("status-bad"); addStatus("minecraft.net", tr("Web")); addLine(); @@ -33,7 +33,7 @@ ServerStatus::ServerStatus(QWidget *parent, Qt::WindowFlags f) : QWidget(parent, m_statusRefresh = new QToolButton(this); m_statusRefresh->setCheckable(true); m_statusRefresh->setToolButtonStyle(Qt::ToolButtonIconOnly); - m_statusRefresh->setIcon(QIcon::fromTheme("refresh")); + m_statusRefresh->setIcon(MMC->getThemedIcon("refresh")); layout->addWidget(m_statusRefresh); setLayout(layout); -- cgit v1.2.3