move Theme, SystemStats, Modules to shell/services/
This commit is contained in:
parent
197f6976e0
commit
989182d603
59 changed files with 432 additions and 388 deletions
|
|
@ -1,6 +1,7 @@
|
|||
import QtQuick
|
||||
import Quickshell
|
||||
import "." as M
|
||||
import "../services" as S
|
||||
|
||||
M.HoverPanel {
|
||||
id: menuWindow
|
||||
|
|
@ -18,9 +19,9 @@ M.HoverPanel {
|
|||
anchors.leftMargin: 12
|
||||
anchors.verticalCenter: parent.verticalCenter
|
||||
text: "Notifications"
|
||||
color: M.Theme.base05
|
||||
font.pixelSize: M.Theme.fontSize + 1
|
||||
font.family: M.Theme.fontFamily
|
||||
color: S.Theme.base05
|
||||
font.pixelSize: S.Theme.fontSize + 1
|
||||
font.family: S.Theme.fontFamily
|
||||
font.bold: true
|
||||
}
|
||||
|
||||
|
|
@ -33,9 +34,9 @@ M.HoverPanel {
|
|||
// DND toggle
|
||||
Text {
|
||||
text: M.NotifService.dnd ? "\uDB82\uDE93" : "\uDB80\uDC9C"
|
||||
color: M.NotifService.dnd ? M.Theme.base09 : M.Theme.base04
|
||||
font.pixelSize: M.Theme.fontSize
|
||||
font.family: M.Theme.iconFontFamily
|
||||
color: M.NotifService.dnd ? S.Theme.base09 : S.Theme.base04
|
||||
font.pixelSize: S.Theme.fontSize
|
||||
font.family: S.Theme.iconFontFamily
|
||||
anchors.verticalCenter: parent.verticalCenter
|
||||
|
||||
MouseArea {
|
||||
|
|
@ -48,9 +49,9 @@ M.HoverPanel {
|
|||
// Clear all
|
||||
Text {
|
||||
text: "\uF1F8"
|
||||
color: clearArea.containsMouse ? M.Theme.base08 : M.Theme.base04
|
||||
font.pixelSize: M.Theme.fontSize
|
||||
font.family: M.Theme.iconFontFamily
|
||||
color: clearArea.containsMouse ? S.Theme.base08 : S.Theme.base04
|
||||
font.pixelSize: S.Theme.fontSize
|
||||
font.family: S.Theme.iconFontFamily
|
||||
anchors.verticalCenter: parent.verticalCenter
|
||||
visible: M.NotifService.count > 0
|
||||
|
||||
|
|
@ -219,14 +220,14 @@ M.HoverPanel {
|
|||
width: menuWindow.contentWidth - 16
|
||||
height: 1
|
||||
anchors.horizontalCenter: parent.horizontalCenter
|
||||
color: M.Theme.base03
|
||||
color: S.Theme.base03
|
||||
}
|
||||
|
||||
// Notification list (scrollable)
|
||||
ListView {
|
||||
id: notifList
|
||||
width: menuWindow.contentWidth
|
||||
height: Math.min(contentHeight, 60 * (M.Modules.notifications.maxVisible || 10))
|
||||
height: Math.min(contentHeight, 60 * (S.Modules.notifications.maxVisible || 10))
|
||||
clip: true
|
||||
boundsBehavior: Flickable.StopAtBounds
|
||||
model: menuWindow._flatModel
|
||||
|
|
@ -253,7 +254,7 @@ M.HoverPanel {
|
|||
|
||||
readonly property real _targetHeight: {
|
||||
if (_type === "header")
|
||||
return modelData.collapsed ? (28 + modelData.count * (M.Theme.fontSize + 4)) : 28;
|
||||
return modelData.collapsed ? (28 + modelData.count * (S.Theme.fontSize + 4)) : 28;
|
||||
return _notifCard.implicitHeight;
|
||||
}
|
||||
|
||||
|
|
@ -323,8 +324,8 @@ M.HoverPanel {
|
|||
anchors.leftMargin: 10
|
||||
anchors.top: parent.top
|
||||
anchors.topMargin: (28 - height) / 2
|
||||
width: M.Theme.fontSize + 2
|
||||
height: M.Theme.fontSize + 2
|
||||
width: S.Theme.fontSize + 2
|
||||
height: S.Theme.fontSize + 2
|
||||
source: {
|
||||
if (notifDelegate._type !== "header")
|
||||
return "";
|
||||
|
|
@ -335,7 +336,7 @@ M.HoverPanel {
|
|||
}
|
||||
visible: status === Image.Ready
|
||||
fillMode: Image.PreserveAspectFit
|
||||
sourceSize: Qt.size(M.Theme.fontSize + 2, M.Theme.fontSize + 2)
|
||||
sourceSize: Qt.size(S.Theme.fontSize + 2, S.Theme.fontSize + 2)
|
||||
asynchronous: true
|
||||
}
|
||||
|
||||
|
|
@ -348,9 +349,9 @@ M.HoverPanel {
|
|||
height: 28
|
||||
verticalAlignment: Text.AlignVCenter
|
||||
text: notifDelegate._type === "header" && notifDelegate.modelData.collapsed ? "\u25B8" : "\u25BE"
|
||||
color: M.Theme.base04
|
||||
font.pixelSize: M.Theme.fontSize - 2
|
||||
font.family: M.Theme.fontFamily
|
||||
color: S.Theme.base04
|
||||
font.pixelSize: S.Theme.fontSize - 2
|
||||
font.family: S.Theme.fontFamily
|
||||
opacity: _headerHover.hovered ? 1 : 0
|
||||
}
|
||||
|
||||
|
|
@ -364,9 +365,9 @@ M.HoverPanel {
|
|||
height: 28
|
||||
verticalAlignment: Text.AlignVCenter
|
||||
text: notifDelegate._type === "header" ? (notifDelegate.modelData.appName || "Unknown") : ""
|
||||
color: M.Theme.base05
|
||||
font.pixelSize: M.Theme.fontSize - 1
|
||||
font.family: M.Theme.fontFamily
|
||||
color: S.Theme.base05
|
||||
font.pixelSize: S.Theme.fontSize - 1
|
||||
font.family: S.Theme.fontFamily
|
||||
font.bold: true
|
||||
elide: Text.ElideRight
|
||||
}
|
||||
|
|
@ -380,9 +381,9 @@ M.HoverPanel {
|
|||
height: 28
|
||||
verticalAlignment: Text.AlignVCenter
|
||||
text: "\uF1F8"
|
||||
color: _groupDismissHover.hovered ? M.Theme.base08 : M.Theme.base04
|
||||
font.pixelSize: M.Theme.fontSize - 1
|
||||
font.family: M.Theme.iconFontFamily
|
||||
color: _groupDismissHover.hovered ? S.Theme.base08 : S.Theme.base04
|
||||
font.pixelSize: S.Theme.fontSize - 1
|
||||
font.family: S.Theme.iconFontFamily
|
||||
opacity: _headerHover.hovered ? 1 : 0
|
||||
|
||||
HoverHandler {
|
||||
|
|
@ -409,14 +410,14 @@ M.HoverPanel {
|
|||
anchors.leftMargin: 10
|
||||
anchors.right: parent.right
|
||||
anchors.rightMargin: 10
|
||||
y: 28 + index * (M.Theme.fontSize + 4)
|
||||
height: M.Theme.fontSize + 4
|
||||
y: 28 + index * (S.Theme.fontSize + 4)
|
||||
height: S.Theme.fontSize + 4
|
||||
verticalAlignment: Text.AlignVCenter
|
||||
text: modelData
|
||||
elide: Text.ElideRight
|
||||
font.pixelSize: M.Theme.fontSize - 2
|
||||
font.family: M.Theme.fontFamily
|
||||
color: M.Theme.base04
|
||||
font.pixelSize: S.Theme.fontSize - 2
|
||||
font.family: S.Theme.fontFamily
|
||||
color: S.Theme.base04
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -479,8 +480,8 @@ M.HoverPanel {
|
|||
horizontalAlignment: Text.AlignHCenter
|
||||
verticalAlignment: Text.AlignVCenter
|
||||
text: "No notifications"
|
||||
color: M.Theme.base04
|
||||
font.pixelSize: M.Theme.fontSize
|
||||
font.family: M.Theme.fontFamily
|
||||
color: S.Theme.base04
|
||||
font.pixelSize: S.Theme.fontSize
|
||||
font.family: S.Theme.fontFamily
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue