diff --git a/src/detailDialog.cpp b/src/detailDialog.cpp --- a/src/detailDialog.cpp +++ b/src/detailDialog.cpp @@ -76,7 +76,7 @@ return; } - icon->setPixmap(item->logLine()->logLevel()->icon()); + icon->setPixmap(item->logLine()->logLevel()->icon().pixmap(style()->pixelMetric(QStyle::PM_LargeIconSize))); header->setText(item->logLine()->formattedText()); diff --git a/src/lib/logLevel.h b/src/lib/logLevel.h --- a/src/lib/logLevel.h +++ b/src/lib/logLevel.h @@ -38,11 +38,9 @@ int id() const; QString name() const; - QString icon() const; - QColor color() const; - QPixmap pixmap() const; + QIcon icon() const; private: LogLevelPrivate *const d; diff --git a/src/lib/logLevel.cpp b/src/lib/logLevel.cpp --- a/src/lib/logLevel.cpp +++ b/src/lib/logLevel.cpp @@ -29,21 +29,18 @@ int id; QString name; - QString icon; - QColor color; - QPixmap pixmap; + QIcon icon; }; LogLevel::LogLevel(int id, const QString &nm, const QString &ic, const QColor &col, QObject *parent) : QObject(parent), d(new LogLevelPrivate()) { d->id = id; d->name = nm; - d->icon = ic; d->color = col; - d->pixmap = QIcon::fromTheme(ic).pixmap(KIconLoader::SizeSmall); + d->icon = QIcon::fromTheme(ic); } LogLevel::~LogLevel() @@ -61,17 +58,12 @@ return d->name; } -QString LogLevel::icon() const -{ - return d->icon; -} - QColor LogLevel::color() const { return d->color; } -QPixmap LogLevel::pixmap() const +QIcon LogLevel::icon() const { - return d->pixmap; + return d->icon; } diff --git a/src/lib/logModeItemBuilder.cpp b/src/lib/logModeItemBuilder.cpp --- a/src/lib/logModeItemBuilder.cpp +++ b/src/lib/logModeItemBuilder.cpp @@ -57,7 +57,7 @@ i++; } - item->setIcon(0, line->logLevel()->pixmap()); + item->setIcon(0, line->logLevel()->icon()); } QString LogModeItemBuilder::createFormattedText(LogLine *line) const diff --git a/src/loggerDialog.cpp b/src/loggerDialog.cpp --- a/src/loggerDialog.cpp +++ b/src/loggerDialog.cpp @@ -144,21 +144,21 @@ // Fill the priority icon map d->priorityIcons[Globals::instance().debugLogLevel()->name()] - = Globals::instance().debugLogLevel()->icon(); + = Globals::instance().debugLogLevel()->icon().name(); d->priorityIcons[Globals::instance().informationLogLevel()->name()] - = Globals::instance().informationLogLevel()->icon(); + = Globals::instance().informationLogLevel()->icon().name(); d->priorityIcons[Globals::instance().noticeLogLevel()->name()] - = Globals::instance().noticeLogLevel()->icon(); + = Globals::instance().noticeLogLevel()->icon().name(); d->priorityIcons[Globals::instance().warningLogLevel()->name()] - = Globals::instance().warningLogLevel()->icon(); + = Globals::instance().warningLogLevel()->icon().name(); d->priorityIcons[Globals::instance().errorLogLevel()->name()] - = Globals::instance().errorLogLevel()->icon(); + = Globals::instance().errorLogLevel()->icon().name(); d->priorityIcons[Globals::instance().criticalLogLevel()->name()] - = Globals::instance().criticalLogLevel()->icon(); + = Globals::instance().criticalLogLevel()->icon().name(); d->priorityIcons[Globals::instance().alertLogLevel()->name()] - = Globals::instance().alertLogLevel()->icon(); + = Globals::instance().alertLogLevel()->icon().name(); d->priorityIcons[Globals::instance().emergencyLogLevel()->name()] - = Globals::instance().emergencyLogLevel()->icon(); + = Globals::instance().emergencyLogLevel()->icon().name(); } void LoggerDialog::textChanged() diff --git a/src/modes/base/logLevelFileList.cpp b/src/modes/base/logLevelFileList.cpp --- a/src/modes/base/logLevelFileList.cpp +++ b/src/modes/base/logLevelFileList.cpp @@ -85,7 +85,7 @@ void LogLevelFileList::insertItem(LogLevel *level, const QString &itemText, bool missing) { - QListWidgetItem *item = new QListWidgetItem(QIcon(level->pixmap()), itemText, fileList); + QListWidgetItem *item = new QListWidgetItem(level->icon(), itemText, fileList); if (missing) item->setForeground(Qt::red); item->setData(LogLevelFileList::LogLevelRole, level->id()); @@ -120,7 +120,7 @@ QListWidget *logLevels = logLevelSelectionDialog.logLevels(); foreach (LogLevel *level, Globals::instance().logLevels()) { - logLevels->addItem(new QListWidgetItem(QIcon(level->pixmap()), level->name())); + logLevels->addItem(new QListWidgetItem(level->icon(), level->name())); } int choice = logLevelSelectionDialog.exec(); diff --git a/src/modes/xorg/xorgItemBuilder.h b/src/modes/xorg/xorgItemBuilder.h --- a/src/modes/xorg/xorgItemBuilder.h +++ b/src/modes/xorg/xorgItemBuilder.h @@ -55,7 +55,7 @@ i++; } - item->setIcon(0, line->logLevel()->pixmap()); + item->setIcon(0, line->logLevel()->icon()); } QString createToolTipText(LogLine *line) const override diff --git a/src/modes/xsession/xsessionItemBuilder.h b/src/modes/xsession/xsessionItemBuilder.h --- a/src/modes/xsession/xsessionItemBuilder.h +++ b/src/modes/xsession/xsessionItemBuilder.h @@ -55,7 +55,7 @@ i++; } - item->setIcon(0, QIcon(line->logLevel()->pixmap())); + item->setIcon(0, line->logLevel()->icon()); } QString createToolTipText(LogLine *line) const override