diff --git a/Modules/ClipboardHistory.qml b/Modules/ClipboardHistory.qml index 53fcf424..f9185685 100644 --- a/Modules/ClipboardHistory.qml +++ b/Modules/ClipboardHistory.qml @@ -5,6 +5,7 @@ import Quickshell.Io import Quickshell.Wayland import Quickshell.Widgets import qs.Common +import qs.Widgets PanelWindow { id: clipboardHistory @@ -225,11 +226,10 @@ PanelWindow { color: clearArea.containsMouse ? Qt.rgba(activeTheme.primary.r, activeTheme.primary.g, activeTheme.primary.b, 0.12) : "transparent" visible: clipboardHistory.totalCount > 0 - Text { + DankIcon { anchors.centerIn: parent - text: "delete_sweep" - font.family: activeTheme.iconFont - font.pixelSize: activeTheme.iconSize + name: "delete_sweep" + size: activeTheme.iconSize color: clearArea.containsMouse ? activeTheme.primary : activeTheme.surfaceText } @@ -258,11 +258,10 @@ PanelWindow { radius: activeTheme.cornerRadius color: closeArea.containsMouse ? Qt.rgba(activeTheme.primary.r, activeTheme.primary.g, activeTheme.primary.b, 0.12) : "transparent" - Text { + DankIcon { anchors.centerIn: parent - text: "close" - font.family: activeTheme.iconFont - font.pixelSize: activeTheme.iconSize + name: "close" + size: activeTheme.iconSize color: closeArea.containsMouse ? activeTheme.primary : activeTheme.surfaceText } @@ -303,10 +302,9 @@ PanelWindow { anchors.verticalCenter: parent.verticalCenter spacing: activeTheme.spacingM - Text { - text: "search" - font.family: activeTheme.iconFont - font.pixelSize: activeTheme.iconSize + DankIcon { + name: "search" + size: activeTheme.iconSize color: searchField.focus ? activeTheme.primary : Qt.rgba(activeTheme.surfaceText.r, activeTheme.surfaceText.g, activeTheme.surfaceText.b, 0.6) anchors.verticalCenter: parent.verticalCenter } @@ -487,11 +485,10 @@ PanelWindow { } // Fallback icon when image fails to load or is loading - Text { + DankIcon { anchors.centerIn: parent - text: imagePreview.status === Image.Loading ? "hourglass_empty" : imagePreview.status === Image.Error ? "broken_image" : "photo" - font.family: activeTheme.iconFont - font.pixelSize: imagePreview.status === Image.Loading ? 14 : 18 + name: imagePreview.status === Image.Loading ? "hourglass_empty" : imagePreview.status === Image.Error ? "broken_image" : "photo" + size: imagePreview.status === Image.Loading ? 14 : 18 color: imagePreview.status === Image.Error ? activeTheme.error : activeTheme.primary visible: imagePreview.status !== Image.Ready @@ -566,11 +563,10 @@ PanelWindow { color: deleteArea.containsMouse ? Qt.rgba(activeTheme.primary.r, activeTheme.primary.g, activeTheme.primary.b, 0.12) : "transparent" z: 100 // Ensure it's above other elements - Text { + DankIcon { anchors.centerIn: parent - text: "delete" - font.family: activeTheme.iconFont - font.pixelSize: activeTheme.iconSize - 4 + name: "delete" + size: activeTheme.iconSize - 4 color: deleteArea.containsMouse ? activeTheme.primary : activeTheme.surfaceText } @@ -627,11 +623,10 @@ PanelWindow { spacing: activeTheme.spacingL visible: clipboardHistory.totalCount === 0 - Text { + DankIcon { anchors.horizontalCenter: parent.horizontalCenter - text: "content_paste_off" - font.family: activeTheme.iconFont - font.pixelSize: activeTheme.iconSizeLarge + 16 + name: "content_paste_off" + size: activeTheme.iconSizeLarge + 16 color: Qt.rgba(activeTheme.surfaceText.r, activeTheme.surfaceText.g, activeTheme.surfaceText.b, 0.3) } @@ -691,11 +686,10 @@ PanelWindow { height: activeTheme.spacingM } - Text { + DankIcon { anchors.horizontalCenter: parent.horizontalCenter - text: "warning" - font.family: activeTheme.iconFont - font.pixelSize: activeTheme.iconSizeLarge + name: "warning" + size: activeTheme.iconSizeLarge color: activeTheme.error } diff --git a/Modules/InputDialog.qml b/Modules/InputDialog.qml index 6e36835f..32dd3c77 100644 --- a/Modules/InputDialog.qml +++ b/Modules/InputDialog.qml @@ -4,6 +4,7 @@ import Quickshell import Quickshell.Wayland import Quickshell.Widgets import qs.Common +import qs.Widgets PanelWindow { id: inputDialog @@ -127,11 +128,10 @@ PanelWindow { radius: 16 color: closeDialogArea.containsMouse ? Qt.rgba(Theme.error.r, Theme.error.g, Theme.error.b, 0.12) : "transparent" - Text { + DankIcon { anchors.centerIn: parent - text: "close" - font.family: Theme.iconFont - font.pixelSize: Theme.iconSize - 4 + name: "close" + size: Theme.iconSize - 4 color: closeDialogArea.containsMouse ? Theme.error : Theme.surfaceText } @@ -222,11 +222,10 @@ PanelWindow { border.color: checked ? Theme.primary : Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.5) border.width: 2 - Text { + DankIcon { anchors.centerIn: parent - text: "check" - font.family: Theme.iconFont - font.pixelSize: 12 + name: "check" + size: 12 color: Theme.background visible: parent.checked } diff --git a/Modules/PowerMenuPopup.qml b/Modules/PowerMenuPopup.qml index 7479ccf7..80d55e04 100644 --- a/Modules/PowerMenuPopup.qml +++ b/Modules/PowerMenuPopup.qml @@ -5,6 +5,7 @@ import Quickshell.Io import Quickshell.Wayland import Quickshell.Widgets import qs.Common +import qs.Widgets PanelWindow { id: root @@ -83,11 +84,10 @@ PanelWindow { radius: 16 color: closePowerArea.containsMouse ? Qt.rgba(Theme.error.r, Theme.error.g, Theme.error.b, 0.12) : "transparent" - Text { + DankIcon { anchors.centerIn: parent - text: "close" - font.family: Theme.iconFont - font.pixelSize: Theme.iconSize - 4 + name: "close" + size: Theme.iconSize - 4 color: closePowerArea.containsMouse ? Theme.error : Theme.surfaceText } @@ -124,10 +124,9 @@ PanelWindow { anchors.verticalCenter: parent.verticalCenter spacing: Theme.spacingM - Text { - text: "logout" - font.family: Theme.iconFont - font.pixelSize: Theme.iconSize + DankIcon { + name: "logout" + size: Theme.iconSize color: Theme.surfaceText anchors.verticalCenter: parent.verticalCenter } @@ -172,10 +171,9 @@ PanelWindow { anchors.verticalCenter: parent.verticalCenter spacing: Theme.spacingM - Text { - text: "bedtime" - font.family: Theme.iconFont - font.pixelSize: Theme.iconSize + DankIcon { + name: "bedtime" + size: Theme.iconSize color: Theme.surfaceText anchors.verticalCenter: parent.verticalCenter } @@ -220,10 +218,9 @@ PanelWindow { anchors.verticalCenter: parent.verticalCenter spacing: Theme.spacingM - Text { - text: "restart_alt" - font.family: Theme.iconFont - font.pixelSize: Theme.iconSize + DankIcon { + name: "restart_alt" + size: Theme.iconSize color: rebootArea.containsMouse ? Theme.warning : Theme.surfaceText anchors.verticalCenter: parent.verticalCenter } @@ -268,10 +265,9 @@ PanelWindow { anchors.verticalCenter: parent.verticalCenter spacing: Theme.spacingM - Text { - text: "power_settings_new" - font.family: Theme.iconFont - font.pixelSize: Theme.iconSize + DankIcon { + name: "power_settings_new" + size: Theme.iconSize color: powerOffArea.containsMouse ? Theme.error : Theme.surfaceText anchors.verticalCenter: parent.verticalCenter } diff --git a/Modules/SettingsSection.qml b/Modules/SettingsSection.qml index 56d42b51..9ad869b4 100644 --- a/Modules/SettingsSection.qml +++ b/Modules/SettingsSection.qml @@ -1,5 +1,6 @@ import QtQuick import qs.Common +import qs.Widgets Column { id: root @@ -16,10 +17,9 @@ Column { width: parent.width spacing: Theme.spacingS - Text { - text: iconName - font.family: Theme.iconFont - font.pixelSize: Theme.iconSize - 2 + DankIcon { + name: iconName + size: Theme.iconSize - 2 color: Theme.primary anchors.verticalCenter: parent.verticalCenter } diff --git a/Modules/ThemePicker.qml b/Modules/ThemePicker.qml index 31737c90..f0a1bd76 100644 --- a/Modules/ThemePicker.qml +++ b/Modules/ThemePicker.qml @@ -1,6 +1,7 @@ import QtQuick import qs.Common import qs.Services +import qs.Widgets Column { id: themePicker @@ -223,22 +224,20 @@ Column { anchors.centerIn: parent spacing: Theme.spacingS - Text { - text: { + DankIcon { + name: { if (ToastService.wallpaperErrorStatus === "error" || ToastService.wallpaperErrorStatus === "matugen_missing") return "error"; else return "palette"; } - font.family: Theme.iconFont - font.pixelSize: 16 + size: 16 color: { if (ToastService.wallpaperErrorStatus === "error" || ToastService.wallpaperErrorStatus === "matugen_missing") return Theme.error; else return Theme.surfaceText; } - font.weight: Theme.iconFontWeight anchors.verticalCenter: parent.verticalCenter } diff --git a/Modules/Toast.qml b/Modules/Toast.qml index d350f4c9..42cd3f3f 100644 --- a/Modules/Toast.qml +++ b/Modules/Toast.qml @@ -5,6 +5,7 @@ import Quickshell.Wayland import Quickshell.Widgets import qs.Common import qs.Services +import qs.Widgets PanelWindow { id: root @@ -52,8 +53,8 @@ PanelWindow { anchors.centerIn: parent spacing: Theme.spacingM - Text { - text: { + DankIcon { + name: { switch (ToastService.currentLevel) { case ToastService.levelError: return "error"; @@ -65,8 +66,7 @@ PanelWindow { return "info"; } } - font.family: Theme.iconFont - font.pixelSize: Theme.iconSize + size: Theme.iconSize color: Theme.background anchors.verticalCenter: parent.verticalCenter } diff --git a/Modules/TopBar/LauncherButton.qml b/Modules/TopBar/LauncherButton.qml index f3198b3f..e068378d 100644 --- a/Modules/TopBar/LauncherButton.qml +++ b/Modules/TopBar/LauncherButton.qml @@ -24,7 +24,6 @@ Rectangle { text: OSDetectorService.osLogo font.family: "Symbols Nerd Font" font.pixelSize: Theme.iconSize - 6 - font.weight: Theme.iconFontWeight color: Theme.surfaceText } diff --git a/Modules/WifiPasswordDialog.qml b/Modules/WifiPasswordDialog.qml index 93d98544..2f909378 100644 --- a/Modules/WifiPasswordDialog.qml +++ b/Modules/WifiPasswordDialog.qml @@ -5,6 +5,7 @@ import Quickshell.Wayland import Quickshell.Widgets import qs.Common import qs.Services +import qs.Widgets PanelWindow { id: root @@ -101,11 +102,10 @@ PanelWindow { radius: 16 color: closeDialogArea.containsMouse ? Qt.rgba(Theme.error.r, Theme.error.g, Theme.error.b, 0.12) : "transparent" - Text { + DankIcon { anchors.centerIn: parent - text: "close" - font.family: Theme.iconFont - font.pixelSize: Theme.iconSize - 4 + name: "close" + size: Theme.iconSize - 4 color: closeDialogArea.containsMouse ? Theme.error : Theme.surfaceText } @@ -194,11 +194,10 @@ PanelWindow { border.color: checked ? Theme.primary : Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.5) border.width: 2 - Text { + DankIcon { anchors.centerIn: parent - text: "check" - font.family: Theme.iconFont - font.pixelSize: 12 + name: "check" + size: 12 color: Theme.background visible: parent.checked }