Salastil/DankMaterialShell
1
0
Fork 0
mirror of https://github.com/AvengeMedia/DankMaterialShell.git synced 2025-12-07 05:55:37 -05:00
Code Packages Releases Activity

Migrate DankIcon stragglers

Browse Source
This commit is contained in:
bbedward
2025-07-18 20:02:57 -04:00
parent 1d9477bea3
commit f34ecf786a
8 changed files with 64 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
Modules/ClipboardHistory.qml
View File

@@ -5,6 +5,7 @@ import Quickshell.Io
import Quickshell.Wayland import Quickshell.Wayland
import Quickshell.Widgets import Quickshell.Widgets
import qs.Common import qs.Common
import qs.Widgets
PanelWindow { PanelWindow {
id: clipboardHistory id: clipboardHistory
@@ -225,11 +226,10 @@ PanelWindow {
color: clearArea.containsMouse ? Qt.rgba(activeTheme.primary.r, activeTheme.primary.g, activeTheme.primary.b, 0.12) : "transparent" color: clearArea.containsMouse ? Qt.rgba(activeTheme.primary.r, activeTheme.primary.g, activeTheme.primary.b, 0.12) : "transparent"
visible: clipboardHistory.totalCount > 0 visible: clipboardHistory.totalCount > 0
Text { DankIcon {
anchors.centerIn: parent anchors.centerIn: parent
text: "delete_sweep" name: "delete_sweep"
font.family: activeTheme.iconFont size: activeTheme.iconSize
font.pixelSize: activeTheme.iconSize
color: clearArea.containsMouse ? activeTheme.primary : activeTheme.surfaceText color: clearArea.containsMouse ? activeTheme.primary : activeTheme.surfaceText
} }
@@ -258,11 +258,10 @@ PanelWindow {
radius: activeTheme.cornerRadius radius: activeTheme.cornerRadius
color: closeArea.containsMouse ? Qt.rgba(activeTheme.primary.r, activeTheme.primary.g, activeTheme.primary.b, 0.12) : "transparent" color: closeArea.containsMouse ? Qt.rgba(activeTheme.primary.r, activeTheme.primary.g, activeTheme.primary.b, 0.12) : "transparent"
Text { DankIcon {
anchors.centerIn: parent anchors.centerIn: parent
text: "close" name: "close"
font.family: activeTheme.iconFont size: activeTheme.iconSize
font.pixelSize: activeTheme.iconSize
color: closeArea.containsMouse ? activeTheme.primary : activeTheme.surfaceText color: closeArea.containsMouse ? activeTheme.primary : activeTheme.surfaceText
} }
@@ -303,10 +302,9 @@ PanelWindow {
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
spacing: activeTheme.spacingM spacing: activeTheme.spacingM
Text { DankIcon {
text: "search" name: "search"
font.family: activeTheme.iconFont size: activeTheme.iconSize
font.pixelSize: activeTheme.iconSize
color: searchField.focus ? activeTheme.primary : Qt.rgba(activeTheme.surfaceText.r, activeTheme.surfaceText.g, activeTheme.surfaceText.b, 0.6) color: searchField.focus ? activeTheme.primary : Qt.rgba(activeTheme.surfaceText.r, activeTheme.surfaceText.g, activeTheme.surfaceText.b, 0.6)
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
} }
@@ -487,11 +485,10 @@ PanelWindow {
} }
// Fallback icon when image fails to load or is loading // Fallback icon when image fails to load or is loading
Text { DankIcon {
anchors.centerIn: parent anchors.centerIn: parent
text: imagePreview.status === Image.Loading ? "hourglass_empty" : imagePreview.status === Image.Error ? "broken_image" : "photo" name: imagePreview.status === Image.Loading ? "hourglass_empty" : imagePreview.status === Image.Error ? "broken_image" : "photo"
font.family: activeTheme.iconFont size: imagePreview.status === Image.Loading ? 14 : 18
font.pixelSize: imagePreview.status === Image.Loading ? 14 : 18
color: imagePreview.status === Image.Error ? activeTheme.error : activeTheme.primary color: imagePreview.status === Image.Error ? activeTheme.error : activeTheme.primary
visible: imagePreview.status !== Image.Ready 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" 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 z: 100 // Ensure it's above other elements
Text { DankIcon {
anchors.centerIn: parent anchors.centerIn: parent
text: "delete" name: "delete"
font.family: activeTheme.iconFont size: activeTheme.iconSize - 4
font.pixelSize: activeTheme.iconSize - 4
color: deleteArea.containsMouse ? activeTheme.primary : activeTheme.surfaceText color: deleteArea.containsMouse ? activeTheme.primary : activeTheme.surfaceText
} }
@@ -627,11 +623,10 @@ PanelWindow {
spacing: activeTheme.spacingL spacing: activeTheme.spacingL
visible: clipboardHistory.totalCount === 0 visible: clipboardHistory.totalCount === 0
Text { DankIcon {
anchors.horizontalCenter: parent.horizontalCenter anchors.horizontalCenter: parent.horizontalCenter
text: "content_paste_off" name: "content_paste_off"
font.family: activeTheme.iconFont size: activeTheme.iconSizeLarge + 16
font.pixelSize: activeTheme.iconSizeLarge + 16
color: Qt.rgba(activeTheme.surfaceText.r, activeTheme.surfaceText.g, activeTheme.surfaceText.b, 0.3) color: Qt.rgba(activeTheme.surfaceText.r, activeTheme.surfaceText.g, activeTheme.surfaceText.b, 0.3)
} }
@@ -691,11 +686,10 @@ PanelWindow {
height: activeTheme.spacingM height: activeTheme.spacingM
} }
Text { DankIcon {
anchors.horizontalCenter: parent.horizontalCenter anchors.horizontalCenter: parent.horizontalCenter
text: "warning" name: "warning"
font.family: activeTheme.iconFont size: activeTheme.iconSizeLarge
font.pixelSize: activeTheme.iconSizeLarge
color: activeTheme.error color: activeTheme.error
} }

15
Modules/InputDialog.qml
View File

@@ -4,6 +4,7 @@ import Quickshell
import Quickshell.Wayland import Quickshell.Wayland
import Quickshell.Widgets import Quickshell.Widgets
import qs.Common import qs.Common
import qs.Widgets
PanelWindow { PanelWindow {
id: inputDialog id: inputDialog
@@ -127,11 +128,10 @@ PanelWindow {
radius: 16 radius: 16
color: closeDialogArea.containsMouse ? Qt.rgba(Theme.error.r, Theme.error.g, Theme.error.b, 0.12) : "transparent" color: closeDialogArea.containsMouse ? Qt.rgba(Theme.error.r, Theme.error.g, Theme.error.b, 0.12) : "transparent"
Text { DankIcon {
anchors.centerIn: parent anchors.centerIn: parent
text: "close" name: "close"
font.family: Theme.iconFont size: Theme.iconSize - 4
font.pixelSize: Theme.iconSize - 4
color: closeDialogArea.containsMouse ? Theme.error : Theme.surfaceText 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.color: checked ? Theme.primary : Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.5)
border.width: 2 border.width: 2
Text { DankIcon {
anchors.centerIn: parent anchors.centerIn: parent
text: "check" name: "check"
font.family: Theme.iconFont size: 12
font.pixelSize: 12
color: Theme.background color: Theme.background
visible: parent.checked visible: parent.checked
} }

36
Modules/PowerMenuPopup.qml
View File

@@ -5,6 +5,7 @@ import Quickshell.Io
import Quickshell.Wayland import Quickshell.Wayland
import Quickshell.Widgets import Quickshell.Widgets
import qs.Common import qs.Common
import qs.Widgets
PanelWindow { PanelWindow {
id: root id: root
@@ -83,11 +84,10 @@ PanelWindow {
radius: 16 radius: 16
color: closePowerArea.containsMouse ? Qt.rgba(Theme.error.r, Theme.error.g, Theme.error.b, 0.12) : "transparent" color: closePowerArea.containsMouse ? Qt.rgba(Theme.error.r, Theme.error.g, Theme.error.b, 0.12) : "transparent"
Text { DankIcon {
anchors.centerIn: parent anchors.centerIn: parent
text: "close" name: "close"
font.family: Theme.iconFont size: Theme.iconSize - 4
font.pixelSize: Theme.iconSize - 4
color: closePowerArea.containsMouse ? Theme.error : Theme.surfaceText color: closePowerArea.containsMouse ? Theme.error : Theme.surfaceText
} }
@@ -124,10 +124,9 @@ PanelWindow {
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
spacing: Theme.spacingM spacing: Theme.spacingM
Text { DankIcon {
text: "logout" name: "logout"
font.family: Theme.iconFont size: Theme.iconSize
font.pixelSize: Theme.iconSize
color: Theme.surfaceText color: Theme.surfaceText
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
} }
@@ -172,10 +171,9 @@ PanelWindow {
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
spacing: Theme.spacingM spacing: Theme.spacingM
Text { DankIcon {
text: "bedtime" name: "bedtime"
font.family: Theme.iconFont size: Theme.iconSize
font.pixelSize: Theme.iconSize
color: Theme.surfaceText color: Theme.surfaceText
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
} }
@@ -220,10 +218,9 @@ PanelWindow {
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
spacing: Theme.spacingM spacing: Theme.spacingM
Text { DankIcon {
text: "restart_alt" name: "restart_alt"
font.family: Theme.iconFont size: Theme.iconSize
font.pixelSize: Theme.iconSize
color: rebootArea.containsMouse ? Theme.warning : Theme.surfaceText color: rebootArea.containsMouse ? Theme.warning : Theme.surfaceText
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
} }
@@ -268,10 +265,9 @@ PanelWindow {
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
spacing: Theme.spacingM spacing: Theme.spacingM
Text { DankIcon {
text: "power_settings_new" name: "power_settings_new"
font.family: Theme.iconFont size: Theme.iconSize
font.pixelSize: Theme.iconSize
color: powerOffArea.containsMouse ? Theme.error : Theme.surfaceText color: powerOffArea.containsMouse ? Theme.error : Theme.surfaceText
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
} }

8
Modules/SettingsSection.qml
View File

@@ -1,5 +1,6 @@
import QtQuick import QtQuick
import qs.Common import qs.Common
import qs.Widgets
Column { Column {
id: root id: root
@@ -16,10 +17,9 @@ Column {
width: parent.width width: parent.width
spacing: Theme.spacingS spacing: Theme.spacingS
Text { DankIcon {
text: iconName name: iconName
font.family: Theme.iconFont size: Theme.iconSize - 2
font.pixelSize: Theme.iconSize - 2
color: Theme.primary color: Theme.primary
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
} }

9
Modules/ThemePicker.qml
View File

@@ -1,6 +1,7 @@
import QtQuick import QtQuick
import qs.Common import qs.Common
import qs.Services import qs.Services
import qs.Widgets
Column { Column {
id: themePicker id: themePicker
@@ -223,22 +224,20 @@ Column {
anchors.centerIn: parent anchors.centerIn: parent
spacing: Theme.spacingS spacing: Theme.spacingS
Text { DankIcon {
text: { name: {
if (ToastService.wallpaperErrorStatus === "error" || ToastService.wallpaperErrorStatus === "matugen_missing") if (ToastService.wallpaperErrorStatus === "error" || ToastService.wallpaperErrorStatus === "matugen_missing")
return "error"; return "error";
else else
return "palette"; return "palette";
} }
font.family: Theme.iconFont size: 16
font.pixelSize: 16
color: { color: {
if (ToastService.wallpaperErrorStatus === "error" || ToastService.wallpaperErrorStatus === "matugen_missing") if (ToastService.wallpaperErrorStatus === "error" || ToastService.wallpaperErrorStatus === "matugen_missing")
return Theme.error; return Theme.error;
else else
return Theme.surfaceText; return Theme.surfaceText;
} }
font.weight: Theme.iconFontWeight
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
} }

8
Modules/Toast.qml
View File

@@ -5,6 +5,7 @@ import Quickshell.Wayland
import Quickshell.Widgets import Quickshell.Widgets
import qs.Common import qs.Common
import qs.Services import qs.Services
import qs.Widgets
PanelWindow { PanelWindow {
id: root id: root
@@ -52,8 +53,8 @@ PanelWindow {
anchors.centerIn: parent anchors.centerIn: parent
spacing: Theme.spacingM spacing: Theme.spacingM
Text { DankIcon {
text: { name: {
switch (ToastService.currentLevel) { switch (ToastService.currentLevel) {
case ToastService.levelError: case ToastService.levelError:
return "error"; return "error";
@@ -65,8 +66,7 @@ PanelWindow {
return "info"; return "info";
} }
} }
font.family: Theme.iconFont size: Theme.iconSize
font.pixelSize: Theme.iconSize
color: Theme.background color: Theme.background
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
} }

1
Modules/TopBar/LauncherButton.qml
View File

@@ -24,7 +24,6 @@ Rectangle {
text: OSDetectorService.osLogo text: OSDetectorService.osLogo
font.family: "Symbols Nerd Font" font.family: "Symbols Nerd Font"
font.pixelSize: Theme.iconSize - 6 font.pixelSize: Theme.iconSize - 6
font.weight: Theme.iconFontWeight
color: Theme.surfaceText color: Theme.surfaceText
} }

15
Modules/WifiPasswordDialog.qml
View File

@@ -5,6 +5,7 @@ import Quickshell.Wayland
import Quickshell.Widgets import Quickshell.Widgets
import qs.Common import qs.Common
import qs.Services import qs.Services
import qs.Widgets
PanelWindow { PanelWindow {
id: root id: root
@@ -101,11 +102,10 @@ PanelWindow {
radius: 16 radius: 16
color: closeDialogArea.containsMouse ? Qt.rgba(Theme.error.r, Theme.error.g, Theme.error.b, 0.12) : "transparent" color: closeDialogArea.containsMouse ? Qt.rgba(Theme.error.r, Theme.error.g, Theme.error.b, 0.12) : "transparent"
Text { DankIcon {
anchors.centerIn: parent anchors.centerIn: parent
text: "close" name: "close"
font.family: Theme.iconFont size: Theme.iconSize - 4
font.pixelSize: Theme.iconSize - 4
color: closeDialogArea.containsMouse ? Theme.error : Theme.surfaceText 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.color: checked ? Theme.primary : Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.5)
border.width: 2 border.width: 2
Text { DankIcon {
anchors.centerIn: parent anchors.centerIn: parent
text: "check" name: "check"
font.family: Theme.iconFont size: 12
font.pixelSize: 12
color: Theme.background color: Theme.background
visible: parent.checked visible: parent.checked
} }