diff --git a/CMakeLists.txt b/CMakeLists.txt --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -10,7 +10,7 @@ SET(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules" ${CMAKE_MODULE_PATH}) find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS Core Widgets DBus) -find_package(KF5 ${KF5_MIN_VERSION} REQUIRED WidgetsAddons CoreAddons I18n Config ConfigWidgets KCMUtils KIO IconThemes Auth) +find_package(KF5 ${KF5_MIN_VERSION} REQUIRED WidgetsAddons CoreAddons I18n Config ConfigWidgets KCMUtils KIO Auth) find_package(PWQuality REQUIRED) include(FeatureSummary) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -50,7 +50,6 @@ KF5::ConfigWidgets KF5::KCMUtils KF5::KIOCore - KF5::IconThemes ${PWQUALITY_LIBRARY} ) diff --git a/src/accountinfo.cpp b/src/accountinfo.cpp --- a/src/accountinfo.cpp +++ b/src/accountinfo.cpp @@ -36,7 +36,6 @@ #include "user_manager_debug.h" #include #include -#include #include #include @@ -78,7 +77,7 @@ menu->addAction(openAvatar); menu->addAction(editClear); - int iconSizeX = IconSize(KIconLoader::Dialog); + int iconSizeX = style()->pixelMetric(QStyle::PM_LargeIconSize); QSize iconSize(iconSizeX, iconSizeX); m_info->face->setIconSize(iconSize); m_info->face->setMinimumSize(iconSize); @@ -458,7 +457,6 @@ void AccountInfo::clearAvatar() { - QSize icon(IconSize(KIconLoader::Dialog), IconSize(KIconLoader::Dialog)); m_info->face->setIcon(QIcon::fromTheme(QStringLiteral("user-identity")).pixmap(48, 48)); m_infoToSave.insert(AccountModel::Face, QString()); Q_EMIT changed(true); diff --git a/src/lib/accountmodel.cpp b/src/lib/accountmodel.cpp --- a/src/lib/accountmodel.cpp +++ b/src/lib/accountmodel.cpp @@ -23,11 +23,12 @@ #include "accounts_interface.h" #include "user_interface.h" +#include #include +#include #include "user_manager_debug.h" #include -#include #include #include @@ -145,7 +146,7 @@ case Qt::DecorationRole || AccountModel::Face: { QFile file(acc->iconFile()); - int size = IconSize(KIconLoader::Dialog); + int size = QApplication::style()->pixelMetric(QStyle::PM_LargeIconSize); if (!file.exists()) { return QIcon::fromTheme(QStringLiteral("user-identity")).pixmap(size, size); } @@ -297,7 +298,7 @@ case Qt::DisplayRole || AccountModel::FriendlyName: return i18n("New User"); case Qt::DecorationRole || AccountModel::Face: - return QIcon::fromTheme(QStringLiteral("list-add-user")).pixmap(IconSize(KIconLoader::Dialog), IconSize(KIconLoader::Dialog)); + return QIcon::fromTheme(QStringLiteral("list-add-user")); case AccountModel::Created: return false; } diff --git a/src/usermanager.cpp b/src/usermanager.cpp --- a/src/usermanager.cpp +++ b/src/usermanager.cpp @@ -31,7 +31,6 @@ #include #include #include -#include K_PLUGIN_FACTORY(UserManagerFactory, registerPlugin();) @@ -54,7 +53,8 @@ m_ui->userList->setModel(m_model); m_ui->userList->setSelectionModel(m_selectionModel); - m_ui->userList->setIconSize(QSize(IconSize(KIconLoader::Dialog), IconSize(KIconLoader::Dialog))); + const auto iconSize = style()->pixelMetric(QStyle::PM_LargeIconSize); + m_ui->userList->setIconSize(QSize(iconSize, iconSize)); ModelTest* test = new ModelTest(m_model, nullptr); Q_UNUSED(test)