From 49e7102f7b84f218bc5309ad62ecf3b5a6741123 Mon Sep 17 00:00:00 2001 From: "Mr. Athozus" Date: Mon, 1 Jul 2024 01:56:48 +0000 Subject: [PATCH] quicksettings: Use adaptative icons MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Personnaly, I don't like much those static icons which doesn't care about the situation in the quicksettings. This MR intends to use when possible and coherent what I call (not native English-speaking I recall) « adaptive » icon. List of modified quicksettings : - Wireless - Bluetooth - Flashlight - Audio - Airplane mode ~~Draft right now because I'm doing it quicksetting-by-quicksetting.~~ EDIT: Feel free to cherry-pick if you don't agree with all icons. --- quicksettings/airplanemode/contents/ui/main.qml | 2 +- quicksettings/audio/contents/ui/main.qml | 2 +- quicksettings/bluetooth/contents/ui/main.qml | 3 ++- quicksettings/flashlight/package/contents/ui/main.qml | 2 +- quicksettings/wifi/contents/ui/main.qml | 2 +- 5 files changed, 6 insertions(+), 5 deletions(-) diff --git a/quicksettings/airplanemode/contents/ui/main.qml b/quicksettings/airplanemode/contents/ui/main.qml index 14234abb..83e46bc5 100644 --- a/quicksettings/airplanemode/contents/ui/main.qml +++ b/quicksettings/airplanemode/contents/ui/main.qml @@ -10,7 +10,7 @@ import org.kde.plasma.private.mobileshell.quicksettingsplugin as QS QS.QuickSetting { text: i18n("Airplane Mode") - icon: "network-flightmode-on" + icon: PlasmaNM.Configuration.airplaneModeEnabled ? "network-flightmode-on" : "network-flightmode-off" status: "" enabled: PlasmaNM.Configuration.airplaneModeEnabled diff --git a/quicksettings/audio/contents/ui/main.qml b/quicksettings/audio/contents/ui/main.qml index 2be26304..a706fe0d 100644 --- a/quicksettings/audio/contents/ui/main.qml +++ b/quicksettings/audio/contents/ui/main.qml @@ -9,7 +9,7 @@ import org.kde.plasma.private.mobileshell.quicksettingsplugin as QS QS.QuickSetting { text: i18n("Sound") - icon: "audio-speakers-symbolic" + icon: MobileShell.AudioInfo.icon status: i18n("%1%", MobileShell.AudioInfo.volumeValue) enabled: false settingsCommand: "plasma-open-settings kcm_pulseaudio" diff --git a/quicksettings/bluetooth/contents/ui/main.qml b/quicksettings/bluetooth/contents/ui/main.qml index 830babe1..3b8728d9 100644 --- a/quicksettings/bluetooth/contents/ui/main.qml +++ b/quicksettings/bluetooth/contents/ui/main.qml @@ -4,6 +4,7 @@ import QtQuick 2.15 import org.kde.bluezqt 1.0 as BluezQt +import org.kde.plasma.private.mobileshell as MobileShell import org.kde.plasma.private.mobileshell.quicksettingsplugin as QS QS.QuickSetting { @@ -13,7 +14,7 @@ QS.QuickSetting { id: root text: i18n("Bluetooth") - icon: "network-bluetooth" + icon: MobileShell.BluetoothInfo.icon settingsCommand: "plasma-open-settings kcm_bluetooth" function toggle() { const enable = !btManager.bluetoothOperational; diff --git a/quicksettings/flashlight/package/contents/ui/main.qml b/quicksettings/flashlight/package/contents/ui/main.qml index c05dd7ac..c39576cd 100644 --- a/quicksettings/flashlight/package/contents/ui/main.qml +++ b/quicksettings/flashlight/package/contents/ui/main.qml @@ -8,7 +8,7 @@ import org.kde.plasma.private.mobileshell.quicksettingsplugin as QS QS.QuickSetting { text: i18n("Flashlight") - icon: "flashlight-on" + icon: FlashlightUtil.torchEnabled ? "flashlight-on" : "flashlight-off" enabled: FlashlightUtil.torchEnabled available: FlashlightUtil.available function toggle() { diff --git a/quicksettings/wifi/contents/ui/main.qml b/quicksettings/wifi/contents/ui/main.qml index dbf0a8bd..cb33dfa9 100644 --- a/quicksettings/wifi/contents/ui/main.qml +++ b/quicksettings/wifi/contents/ui/main.qml @@ -21,7 +21,7 @@ QS.QuickSetting { text: i18n("Wi-Fi") status: enabledConnections.wirelessEnabled ? wirelessStatus.wifiSSID : "" - icon: "network-wireless-signal" + icon: enabledConnections.wirelessEnabled ? "network-wireless" : "network-wireless-disconnected" settingsCommand: "plasma-open-settings kcm_mobile_wifi" function toggle() { nmHandler.enableWireless(!enabledConnections.wirelessEnabled)