diff --git a/CMakeLists.txt b/CMakeLists.txt --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -42,7 +42,6 @@ DBusAddons DocTools I18n - IconThemes ItemModels KIO Service diff --git a/kerfuffle/CMakeLists.txt b/kerfuffle/CMakeLists.txt --- a/kerfuffle/CMakeLists.txt +++ b/kerfuffle/CMakeLists.txt @@ -57,7 +57,6 @@ target_link_libraries(kerfuffle PUBLIC - KF5::IconThemes KF5::Pty KF5::I18n KF5::WidgetsAddons diff --git a/kerfuffle/extractiondialog.cpp b/kerfuffle/extractiondialog.cpp --- a/kerfuffle/extractiondialog.cpp +++ b/kerfuffle/extractiondialog.cpp @@ -31,7 +31,6 @@ #include #include -#include #include #include #include @@ -83,7 +82,7 @@ m_ui = new ExtractionDialogUI(this); hlayout->addWidget(m_ui); - m_ui->iconLabel->setPixmap(QIcon::fromTheme(QStringLiteral("archive-extract")).pixmap(IconSize(KIconLoader::Desktop), IconSize(KIconLoader::Desktop))); + m_ui->iconLabel->setPixmap(QIcon::fromTheme(QStringLiteral("archive-extract")).pixmap(48)); m_ui->filesToExtractGroupBox->hide(); m_ui->allFilesButton->setChecked(true); diff --git a/kerfuffle/propertiesdialog.cpp b/kerfuffle/propertiesdialog.cpp --- a/kerfuffle/propertiesdialog.cpp +++ b/kerfuffle/propertiesdialog.cpp @@ -37,7 +37,6 @@ #include #include -#include #include namespace Kerfuffle @@ -102,7 +101,7 @@ // Show an icon representing the mimetype of the archive. QIcon icon = QIcon::fromTheme(archive->mimeType().iconName()); - m_ui->lblIcon->setPixmap(icon.pixmap(IconSize(KIconLoader::Desktop), IconSize(KIconLoader::Desktop))); + m_ui->lblIcon->setPixmap(icon.pixmap(48)); m_ui->lblMD5->setText(i18n("Calculating...")); m_ui->lblSHA1->setText(i18n("Calculating...")); diff --git a/part/arkviewer.cpp b/part/arkviewer.cpp --- a/part/arkviewer.cpp +++ b/part/arkviewer.cpp @@ -24,7 +24,6 @@ #include #include -#include #include #include #include @@ -35,6 +34,7 @@ #include #include #include +#include #include @@ -172,7 +172,7 @@ setWindowFilePath(fileName); // Set icon and comment for the mimetype. - m_iconLabel->setPixmap(QIcon::fromTheme(mimeType.iconName()).pixmap(IconSize(KIconLoader::Small), IconSize(KIconLoader::Small))); + m_iconLabel->setPixmap(QIcon::fromTheme(mimeType.iconName()).pixmap(style()->pixelMetric(QStyle::PixelMetric::PM_SmallIconSize))); m_commentLabel->setText(mimeType.comment()); // Create the ReadOnlyPart instance. diff --git a/part/infopanel.h b/part/infopanel.h --- a/part/infopanel.h +++ b/part/infopanel.h @@ -65,6 +65,8 @@ void showMetaDataFor(const QModelIndex &index); + QPixmap getPixmap(const QString& name); + ArchiveModel *m_model; QString m_prettyFileName; }; diff --git a/part/infopanel.cpp b/part/infopanel.cpp --- a/part/infopanel.cpp +++ b/part/infopanel.cpp @@ -24,17 +24,16 @@ #include #include -#include #include #include #include using namespace Kerfuffle; -static QPixmap getDesktopIconForName(const QString& name) +QPixmap InfoPanel::getPixmap(const QString& name) { - return QIcon::fromTheme(name).pixmap(IconSize(KIconLoader::Desktop), IconSize(KIconLoader::Desktop)); + return QIcon::fromTheme(name).pixmap(48); } InfoPanel::InfoPanel(ArchiveModel *model, QWidget *parent) @@ -60,7 +59,7 @@ void InfoPanel::updateWithDefaults() { - iconLabel->setPixmap(getDesktopIconForName(QStringLiteral("utilities-file-archiver"))); + iconLabel->setPixmap(getPixmap(QStringLiteral("utilities-file-archiver"))); const QString currentFileName = prettyFileName(); @@ -109,7 +108,7 @@ mimeType = db.mimeTypeForFile(entry->fullPath(), QMimeDatabase::MatchExtension); } - iconLabel->setPixmap(getDesktopIconForName(mimeType.iconName())); + iconLabel->setPixmap(getPixmap(mimeType.iconName())); if (entry->isDir()) { uint dirs; uint files; @@ -141,7 +140,7 @@ } else if (list.size() == 1) { setIndex(list[ 0 ]); } else { - iconLabel->setPixmap(getDesktopIconForName(QStringLiteral("utilities-file-archiver"))); + iconLabel->setPixmap(getPixmap(QStringLiteral("utilities-file-archiver"))); fileName->setText(i18np("One file selected", "%1 files selected", list.size())); quint64 totalSize = 0; for (const QModelIndex& index : list) {