diff --git a/plugins/bluetooth/componments/bluetoothadapteritem.cpp b/plugins/bluetooth/componments/bluetoothadapteritem.cpp index 88dfe1c29..1edc59883 100644 --- a/plugins/bluetooth/componments/bluetoothadapteritem.cpp +++ b/plugins/bluetooth/componments/bluetoothadapteritem.cpp @@ -117,8 +117,12 @@ QIcon BluetoothDeviceItem::getBatteryIcon(int percentage) } QString iconName = QString("battery-%1-symbolic").arg(percentageStr); + + auto themeType = DGuiApplicationHelper::instance()->themeType(); + bool isDarkTheme = themeType == DGuiApplicationHelper::DarkType; + QString iconNameFallback = isDarkTheme ? iconName + "-dark" : iconName; QIcon qrcIcon = DIconTheme::findQIcon(iconName, DIconTheme::DontFallbackToQIconFromTheme); - return DIconTheme::findQIcon(iconName, qrcIcon, DIconTheme::IgnoreBuiltinIcons); + return DIconTheme::findQIcon(iconNameFallback, qrcIcon, DIconTheme::IgnoreBuiltinIcons); } diff --git a/plugins/power/powerstatuswidget.cpp b/plugins/power/powerstatuswidget.cpp index 6c48ddf31..40a515fea 100644 --- a/plugins/power/powerstatuswidget.cpp +++ b/plugins/power/powerstatuswidget.cpp @@ -12,6 +12,7 @@ #include #include #include +#include DGUI_USE_NAMESPACE @@ -95,9 +96,15 @@ QPixmap PowerStatusWidget::getBatteryIcon(int themeType) .arg(plugged ? "plugged-symbolic" : "symbolic"); } + if (themeType == DGuiApplicationHelper::ColorType::DarkType) { + iconStr.append(PLUGIN_MIN_ICON_NAME); + } + const auto ratio = devicePixelRatioF(); QSize pixmapSize = QCoreApplication::testAttribute(Qt::AA_UseHighDpiPixmaps) ? QSize(20, 20) : (QSize(20, 20) * ratio); - QPixmap pix = QIcon::fromTheme(iconStr, QIcon::fromTheme(":/batteryicons/resources/batteryicons/" + iconStr + ".svg")).pixmap(pixmapSize); + QIcon qrcIcon = QIcon(":/batteryicons/resources/batteryicons/" + iconStr + ".svg"); + QIcon finalIcon = DIconTheme::findQIcon(iconStr, qrcIcon, DIconTheme::IgnoreBuiltinIcons); + QPixmap pix = finalIcon.pixmap(pixmapSize); pix.setDevicePixelRatio(ratio); return pix; diff --git a/plugins/power/resources/batteryicons/battery-000-plugged-symbolic-dark.svg b/plugins/power/resources/batteryicons/battery-000-plugged-symbolic-dark.svg index 53f4ca443..af6da44f7 100644 --- a/plugins/power/resources/batteryicons/battery-000-plugged-symbolic-dark.svg +++ b/plugins/power/resources/batteryicons/battery-000-plugged-symbolic-dark.svg @@ -1,5 +1,5 @@ - + diff --git a/plugins/power/resources/batteryicons/battery-000-plugged-symbolic.svg b/plugins/power/resources/batteryicons/battery-000-plugged-symbolic.svg index af6da44f7..53f4ca443 100644 --- a/plugins/power/resources/batteryicons/battery-000-plugged-symbolic.svg +++ b/plugins/power/resources/batteryicons/battery-000-plugged-symbolic.svg @@ -1,5 +1,5 @@ - + diff --git a/plugins/power/resources/batteryicons/battery-000-symbolic-dark.svg b/plugins/power/resources/batteryicons/battery-000-symbolic-dark.svg index 7200009d1..5e86fa7ee 100644 --- a/plugins/power/resources/batteryicons/battery-000-symbolic-dark.svg +++ b/plugins/power/resources/batteryicons/battery-000-symbolic-dark.svg @@ -1,3 +1,3 @@ - + diff --git a/plugins/power/resources/batteryicons/battery-000-symbolic.svg b/plugins/power/resources/batteryicons/battery-000-symbolic.svg index 5e86fa7ee..7200009d1 100644 --- a/plugins/power/resources/batteryicons/battery-000-symbolic.svg +++ b/plugins/power/resources/batteryicons/battery-000-symbolic.svg @@ -1,3 +1,3 @@ - + diff --git a/plugins/power/resources/batteryicons/battery-010-plugged-symbolic-dark.svg b/plugins/power/resources/batteryicons/battery-010-plugged-symbolic-dark.svg index 639274ba8..b37ecee25 100644 --- a/plugins/power/resources/batteryicons/battery-010-plugged-symbolic-dark.svg +++ b/plugins/power/resources/batteryicons/battery-010-plugged-symbolic-dark.svg @@ -1,7 +1,7 @@ - - + + diff --git a/plugins/power/resources/batteryicons/battery-010-plugged-symbolic.svg b/plugins/power/resources/batteryicons/battery-010-plugged-symbolic.svg index b37ecee25..639274ba8 100644 --- a/plugins/power/resources/batteryicons/battery-010-plugged-symbolic.svg +++ b/plugins/power/resources/batteryicons/battery-010-plugged-symbolic.svg @@ -1,7 +1,7 @@ - - + + diff --git a/plugins/power/resources/batteryicons/battery-010-symbolic-dark.svg b/plugins/power/resources/batteryicons/battery-010-symbolic-dark.svg index 570ea60c6..e56e848da 100644 --- a/plugins/power/resources/batteryicons/battery-010-symbolic-dark.svg +++ b/plugins/power/resources/batteryicons/battery-010-symbolic-dark.svg @@ -1,6 +1,6 @@ - + diff --git a/plugins/power/resources/batteryicons/battery-010-symbolic.svg b/plugins/power/resources/batteryicons/battery-010-symbolic.svg index e56e848da..570ea60c6 100644 --- a/plugins/power/resources/batteryicons/battery-010-symbolic.svg +++ b/plugins/power/resources/batteryicons/battery-010-symbolic.svg @@ -1,6 +1,6 @@ - + diff --git a/plugins/power/resources/batteryicons/battery-020-plugged-symbolic-dark.svg b/plugins/power/resources/batteryicons/battery-020-plugged-symbolic-dark.svg index a841e4cde..0a305366c 100644 --- a/plugins/power/resources/batteryicons/battery-020-plugged-symbolic-dark.svg +++ b/plugins/power/resources/batteryicons/battery-020-plugged-symbolic-dark.svg @@ -1,7 +1,7 @@ - - + + diff --git a/plugins/power/resources/batteryicons/battery-020-plugged-symbolic.svg b/plugins/power/resources/batteryicons/battery-020-plugged-symbolic.svg index 0a305366c..a841e4cde 100644 --- a/plugins/power/resources/batteryicons/battery-020-plugged-symbolic.svg +++ b/plugins/power/resources/batteryicons/battery-020-plugged-symbolic.svg @@ -1,7 +1,7 @@ - - + + diff --git a/plugins/power/resources/batteryicons/battery-020-symbolic-dark.svg b/plugins/power/resources/batteryicons/battery-020-symbolic-dark.svg index e5b1672b2..212281ebb 100644 --- a/plugins/power/resources/batteryicons/battery-020-symbolic-dark.svg +++ b/plugins/power/resources/batteryicons/battery-020-symbolic-dark.svg @@ -1,6 +1,6 @@ - + diff --git a/plugins/power/resources/batteryicons/battery-020-symbolic.svg b/plugins/power/resources/batteryicons/battery-020-symbolic.svg index 212281ebb..e5b1672b2 100644 --- a/plugins/power/resources/batteryicons/battery-020-symbolic.svg +++ b/plugins/power/resources/batteryicons/battery-020-symbolic.svg @@ -1,6 +1,6 @@ - + diff --git a/plugins/power/resources/batteryicons/battery-030-plugged-symbolic-dark.svg b/plugins/power/resources/batteryicons/battery-030-plugged-symbolic-dark.svg index 01279c80d..eddbd8724 100644 --- a/plugins/power/resources/batteryicons/battery-030-plugged-symbolic-dark.svg +++ b/plugins/power/resources/batteryicons/battery-030-plugged-symbolic-dark.svg @@ -1,7 +1,7 @@ - - + + diff --git a/plugins/power/resources/batteryicons/battery-030-plugged-symbolic.svg b/plugins/power/resources/batteryicons/battery-030-plugged-symbolic.svg index eddbd8724..01279c80d 100644 --- a/plugins/power/resources/batteryicons/battery-030-plugged-symbolic.svg +++ b/plugins/power/resources/batteryicons/battery-030-plugged-symbolic.svg @@ -1,7 +1,7 @@ - - + + diff --git a/plugins/power/resources/batteryicons/battery-030-symbolic-dark.svg b/plugins/power/resources/batteryicons/battery-030-symbolic-dark.svg index 2652a707a..d264f8dff 100644 --- a/plugins/power/resources/batteryicons/battery-030-symbolic-dark.svg +++ b/plugins/power/resources/batteryicons/battery-030-symbolic-dark.svg @@ -1,6 +1,6 @@ - + diff --git a/plugins/power/resources/batteryicons/battery-030-symbolic.svg b/plugins/power/resources/batteryicons/battery-030-symbolic.svg index d264f8dff..2652a707a 100644 --- a/plugins/power/resources/batteryicons/battery-030-symbolic.svg +++ b/plugins/power/resources/batteryicons/battery-030-symbolic.svg @@ -1,6 +1,6 @@ - + diff --git a/plugins/power/resources/batteryicons/battery-040-plugged-symbolic-dark.svg b/plugins/power/resources/batteryicons/battery-040-plugged-symbolic-dark.svg index 01279c80d..eddbd8724 100644 --- a/plugins/power/resources/batteryicons/battery-040-plugged-symbolic-dark.svg +++ b/plugins/power/resources/batteryicons/battery-040-plugged-symbolic-dark.svg @@ -1,7 +1,7 @@ - - + + diff --git a/plugins/power/resources/batteryicons/battery-040-plugged-symbolic.svg b/plugins/power/resources/batteryicons/battery-040-plugged-symbolic.svg index eddbd8724..01279c80d 100644 --- a/plugins/power/resources/batteryicons/battery-040-plugged-symbolic.svg +++ b/plugins/power/resources/batteryicons/battery-040-plugged-symbolic.svg @@ -1,7 +1,7 @@ - - + + diff --git a/plugins/power/resources/batteryicons/battery-040-symbolic-dark.svg b/plugins/power/resources/batteryicons/battery-040-symbolic-dark.svg index f6601f2a3..3491ab422 100644 --- a/plugins/power/resources/batteryicons/battery-040-symbolic-dark.svg +++ b/plugins/power/resources/batteryicons/battery-040-symbolic-dark.svg @@ -1,6 +1,6 @@ - + diff --git a/plugins/power/resources/batteryicons/battery-040-symbolic.svg b/plugins/power/resources/batteryicons/battery-040-symbolic.svg index 3491ab422..f6601f2a3 100644 --- a/plugins/power/resources/batteryicons/battery-040-symbolic.svg +++ b/plugins/power/resources/batteryicons/battery-040-symbolic.svg @@ -1,6 +1,6 @@ - + diff --git a/plugins/power/resources/batteryicons/battery-050-plugged-symbolic-dark.svg b/plugins/power/resources/batteryicons/battery-050-plugged-symbolic-dark.svg index e6dd91b1f..793d4e805 100644 --- a/plugins/power/resources/batteryicons/battery-050-plugged-symbolic-dark.svg +++ b/plugins/power/resources/batteryicons/battery-050-plugged-symbolic-dark.svg @@ -1,7 +1,7 @@ - - + + diff --git a/plugins/power/resources/batteryicons/battery-050-plugged-symbolic.svg b/plugins/power/resources/batteryicons/battery-050-plugged-symbolic.svg index 793d4e805..e6dd91b1f 100644 --- a/plugins/power/resources/batteryicons/battery-050-plugged-symbolic.svg +++ b/plugins/power/resources/batteryicons/battery-050-plugged-symbolic.svg @@ -1,7 +1,7 @@ - - + + diff --git a/plugins/power/resources/batteryicons/battery-050-symbolic-dark.svg b/plugins/power/resources/batteryicons/battery-050-symbolic-dark.svg index f4158de82..e215c8b7d 100644 --- a/plugins/power/resources/batteryicons/battery-050-symbolic-dark.svg +++ b/plugins/power/resources/batteryicons/battery-050-symbolic-dark.svg @@ -1,6 +1,6 @@ - + diff --git a/plugins/power/resources/batteryicons/battery-050-symbolic.svg b/plugins/power/resources/batteryicons/battery-050-symbolic.svg index e215c8b7d..f4158de82 100644 --- a/plugins/power/resources/batteryicons/battery-050-symbolic.svg +++ b/plugins/power/resources/batteryicons/battery-050-symbolic.svg @@ -1,6 +1,6 @@ - + diff --git a/plugins/power/resources/batteryicons/battery-060-plugged-symbolic-dark.svg b/plugins/power/resources/batteryicons/battery-060-plugged-symbolic-dark.svg index e6dd91b1f..793d4e805 100644 --- a/plugins/power/resources/batteryicons/battery-060-plugged-symbolic-dark.svg +++ b/plugins/power/resources/batteryicons/battery-060-plugged-symbolic-dark.svg @@ -1,7 +1,7 @@ - - + + diff --git a/plugins/power/resources/batteryicons/battery-060-plugged-symbolic.svg b/plugins/power/resources/batteryicons/battery-060-plugged-symbolic.svg index 793d4e805..e6dd91b1f 100644 --- a/plugins/power/resources/batteryicons/battery-060-plugged-symbolic.svg +++ b/plugins/power/resources/batteryicons/battery-060-plugged-symbolic.svg @@ -1,7 +1,7 @@ - - + + diff --git a/plugins/power/resources/batteryicons/battery-060-symbolic-dark.svg b/plugins/power/resources/batteryicons/battery-060-symbolic-dark.svg index b4df905b4..986c30c28 100644 --- a/plugins/power/resources/batteryicons/battery-060-symbolic-dark.svg +++ b/plugins/power/resources/batteryicons/battery-060-symbolic-dark.svg @@ -1,6 +1,6 @@ - + diff --git a/plugins/power/resources/batteryicons/battery-060-symbolic.svg b/plugins/power/resources/batteryicons/battery-060-symbolic.svg index 986c30c28..b4df905b4 100644 --- a/plugins/power/resources/batteryicons/battery-060-symbolic.svg +++ b/plugins/power/resources/batteryicons/battery-060-symbolic.svg @@ -1,6 +1,6 @@ - + diff --git a/plugins/power/resources/batteryicons/battery-070-plugged-symbolic-dark.svg b/plugins/power/resources/batteryicons/battery-070-plugged-symbolic-dark.svg index dd5e8306c..b0afba47a 100644 --- a/plugins/power/resources/batteryicons/battery-070-plugged-symbolic-dark.svg +++ b/plugins/power/resources/batteryicons/battery-070-plugged-symbolic-dark.svg @@ -1,7 +1,7 @@ - - + + diff --git a/plugins/power/resources/batteryicons/battery-070-plugged-symbolic.svg b/plugins/power/resources/batteryicons/battery-070-plugged-symbolic.svg index b0afba47a..dd5e8306c 100644 --- a/plugins/power/resources/batteryicons/battery-070-plugged-symbolic.svg +++ b/plugins/power/resources/batteryicons/battery-070-plugged-symbolic.svg @@ -1,7 +1,7 @@ - - + + diff --git a/plugins/power/resources/batteryicons/battery-070-symbolic-dark.svg b/plugins/power/resources/batteryicons/battery-070-symbolic-dark.svg index 2cd4ad427..fef261474 100644 --- a/plugins/power/resources/batteryicons/battery-070-symbolic-dark.svg +++ b/plugins/power/resources/batteryicons/battery-070-symbolic-dark.svg @@ -1,6 +1,6 @@ - + diff --git a/plugins/power/resources/batteryicons/battery-070-symbolic.svg b/plugins/power/resources/batteryicons/battery-070-symbolic.svg index fef261474..2cd4ad427 100644 --- a/plugins/power/resources/batteryicons/battery-070-symbolic.svg +++ b/plugins/power/resources/batteryicons/battery-070-symbolic.svg @@ -1,6 +1,6 @@ - + diff --git a/plugins/power/resources/batteryicons/battery-080-plugged-symbolic-dark.svg b/plugins/power/resources/batteryicons/battery-080-plugged-symbolic-dark.svg index 957285861..75c672b6c 100644 --- a/plugins/power/resources/batteryicons/battery-080-plugged-symbolic-dark.svg +++ b/plugins/power/resources/batteryicons/battery-080-plugged-symbolic-dark.svg @@ -1,7 +1,7 @@ - - + + diff --git a/plugins/power/resources/batteryicons/battery-080-plugged-symbolic.svg b/plugins/power/resources/batteryicons/battery-080-plugged-symbolic.svg index 75c672b6c..957285861 100644 --- a/plugins/power/resources/batteryicons/battery-080-plugged-symbolic.svg +++ b/plugins/power/resources/batteryicons/battery-080-plugged-symbolic.svg @@ -1,7 +1,7 @@ - - + + diff --git a/plugins/power/resources/batteryicons/battery-080-symbolic-dark.svg b/plugins/power/resources/batteryicons/battery-080-symbolic-dark.svg index c604bc725..c51847a02 100644 --- a/plugins/power/resources/batteryicons/battery-080-symbolic-dark.svg +++ b/plugins/power/resources/batteryicons/battery-080-symbolic-dark.svg @@ -1,6 +1,6 @@ - + diff --git a/plugins/power/resources/batteryicons/battery-080-symbolic.svg b/plugins/power/resources/batteryicons/battery-080-symbolic.svg index c51847a02..c604bc725 100644 --- a/plugins/power/resources/batteryicons/battery-080-symbolic.svg +++ b/plugins/power/resources/batteryicons/battery-080-symbolic.svg @@ -1,6 +1,6 @@ - + diff --git a/plugins/power/resources/batteryicons/battery-090-plugged-symbolic-dark.svg b/plugins/power/resources/batteryicons/battery-090-plugged-symbolic-dark.svg index 898999d47..5bf1e5453 100644 --- a/plugins/power/resources/batteryicons/battery-090-plugged-symbolic-dark.svg +++ b/plugins/power/resources/batteryicons/battery-090-plugged-symbolic-dark.svg @@ -1,7 +1,7 @@ - - + + diff --git a/plugins/power/resources/batteryicons/battery-090-plugged-symbolic.svg b/plugins/power/resources/batteryicons/battery-090-plugged-symbolic.svg index 5bf1e5453..898999d47 100644 --- a/plugins/power/resources/batteryicons/battery-090-plugged-symbolic.svg +++ b/plugins/power/resources/batteryicons/battery-090-plugged-symbolic.svg @@ -1,7 +1,7 @@ - - + + diff --git a/plugins/power/resources/batteryicons/battery-090-symbolic-dark.svg b/plugins/power/resources/batteryicons/battery-090-symbolic-dark.svg index 386b99462..1aad3eaa1 100644 --- a/plugins/power/resources/batteryicons/battery-090-symbolic-dark.svg +++ b/plugins/power/resources/batteryicons/battery-090-symbolic-dark.svg @@ -1,6 +1,6 @@ - + diff --git a/plugins/power/resources/batteryicons/battery-090-symbolic.svg b/plugins/power/resources/batteryicons/battery-090-symbolic.svg index 1aad3eaa1..386b99462 100644 --- a/plugins/power/resources/batteryicons/battery-090-symbolic.svg +++ b/plugins/power/resources/batteryicons/battery-090-symbolic.svg @@ -1,6 +1,6 @@ - + diff --git a/plugins/power/resources/batteryicons/battery-100-plugged-symbolic-dark.svg b/plugins/power/resources/batteryicons/battery-100-plugged-symbolic-dark.svg index ac4e2f993..9e211ccd7 100644 --- a/plugins/power/resources/batteryicons/battery-100-plugged-symbolic-dark.svg +++ b/plugins/power/resources/batteryicons/battery-100-plugged-symbolic-dark.svg @@ -1,7 +1,7 @@ - - + + diff --git a/plugins/power/resources/batteryicons/battery-100-plugged-symbolic.svg b/plugins/power/resources/batteryicons/battery-100-plugged-symbolic.svg index 9e211ccd7..ac4e2f993 100644 --- a/plugins/power/resources/batteryicons/battery-100-plugged-symbolic.svg +++ b/plugins/power/resources/batteryicons/battery-100-plugged-symbolic.svg @@ -1,7 +1,7 @@ - - + + diff --git a/plugins/power/resources/batteryicons/battery-100-symbolic-dark.svg b/plugins/power/resources/batteryicons/battery-100-symbolic-dark.svg index 6ac5c44f6..3126488bb 100644 --- a/plugins/power/resources/batteryicons/battery-100-symbolic-dark.svg +++ b/plugins/power/resources/batteryicons/battery-100-symbolic-dark.svg @@ -1,6 +1,6 @@ - + diff --git a/plugins/power/resources/batteryicons/battery-100-symbolic.svg b/plugins/power/resources/batteryicons/battery-100-symbolic.svg index 3126488bb..6ac5c44f6 100644 --- a/plugins/power/resources/batteryicons/battery-100-symbolic.svg +++ b/plugins/power/resources/batteryicons/battery-100-symbolic.svg @@ -1,6 +1,6 @@ - + diff --git a/plugins/power/resources/batteryicons/battery-full-charged-symbolic-dark.svg b/plugins/power/resources/batteryicons/battery-full-charged-symbolic-dark.svg index ac52137c0..d65bc72eb 100644 --- a/plugins/power/resources/batteryicons/battery-full-charged-symbolic-dark.svg +++ b/plugins/power/resources/batteryicons/battery-full-charged-symbolic-dark.svg @@ -1,3 +1,3 @@ - + diff --git a/plugins/power/resources/batteryicons/battery-full-charged-symbolic.svg b/plugins/power/resources/batteryicons/battery-full-charged-symbolic.svg index d65bc72eb..ac52137c0 100644 --- a/plugins/power/resources/batteryicons/battery-full-charged-symbolic.svg +++ b/plugins/power/resources/batteryicons/battery-full-charged-symbolic.svg @@ -1,3 +1,3 @@ - + diff --git a/plugins/power/resources/batteryicons/battery-unknow-symbolic-dark.svg b/plugins/power/resources/batteryicons/battery-unknow-symbolic-dark.svg index dd9536d31..0737573fb 100644 --- a/plugins/power/resources/batteryicons/battery-unknow-symbolic-dark.svg +++ b/plugins/power/resources/batteryicons/battery-unknow-symbolic-dark.svg @@ -1,6 +1,6 @@ - - + + diff --git a/plugins/power/resources/batteryicons/battery-unknow-symbolic.svg b/plugins/power/resources/batteryicons/battery-unknow-symbolic.svg index 0737573fb..dd9536d31 100644 --- a/plugins/power/resources/batteryicons/battery-unknow-symbolic.svg +++ b/plugins/power/resources/batteryicons/battery-unknow-symbolic.svg @@ -1,6 +1,6 @@ - - + +