Add notification, Use font.pointSize
This commit is contained in:
parent
5fd3c4a53e
commit
b2d3f401c4
8 changed files with 361 additions and 18 deletions
11
Bin/test_notifications.sh
Executable file
11
Bin/test_notifications.sh
Executable file
|
|
@ -0,0 +1,11 @@
|
|||
#!/bin/bash
|
||||
|
||||
echo "Sending 8 test notifications..."
|
||||
|
||||
# Send 8 notifications with numbers
|
||||
for i in {1..8}; do
|
||||
notify-send "Notification $i" "This is test notification number $i of 8"
|
||||
sleep 1
|
||||
done
|
||||
|
||||
echo "All notifications sent!"
|
||||
192
Modules/Notification/Notification.qml
Normal file
192
Modules/Notification/Notification.qml
Normal file
|
|
@ -0,0 +1,192 @@
|
|||
import QtQuick
|
||||
import QtQuick.Layouts
|
||||
import Quickshell
|
||||
import Quickshell.Widgets
|
||||
import Quickshell.Wayland
|
||||
import Quickshell.Services.Notifications
|
||||
import qs.Services
|
||||
import qs.Widgets
|
||||
|
||||
// Simple notification popup - displays multiple notifications
|
||||
PanelWindow {
|
||||
id: root
|
||||
|
||||
readonly property real scaling: Scaling.scale(screen)
|
||||
|
||||
color: "transparent"
|
||||
visible: notificationService.notificationModel.count > 0
|
||||
anchors.top: true
|
||||
anchors.right: true
|
||||
margins.top: (Style.barHeight + 10) * scaling
|
||||
margins.right: 10 * scaling
|
||||
implicitWidth: 360 * scaling
|
||||
implicitHeight: Math.min(notificationStack.implicitHeight, (notificationService.maxVisible * 120) * scaling)
|
||||
WlrLayershell.layer: WlrLayer.Overlay
|
||||
WlrLayershell.exclusionMode: ExclusionMode.Ignore
|
||||
|
||||
// Use the notification service
|
||||
property var notificationService: NotificationService { }
|
||||
|
||||
// Access the notification model from the service
|
||||
property ListModel notificationModel: notificationService.notificationModel
|
||||
|
||||
// Track notifications being removed for animation
|
||||
property var removingNotifications: ({})
|
||||
|
||||
// Connect to animation signal from service
|
||||
Component.onCompleted: {
|
||||
notificationService.animateAndRemove.connect(function(notification, index) {
|
||||
// Find the delegate and trigger its animation
|
||||
if (notificationStack.children && notificationStack.children[index]) {
|
||||
let delegate = notificationStack.children[index]
|
||||
if (delegate && delegate.animateOut) {
|
||||
delegate.animateOut()
|
||||
}
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
|
||||
|
||||
// Main notification container
|
||||
Column {
|
||||
id: notificationStack
|
||||
anchors.top: parent.top
|
||||
anchors.right: parent.right
|
||||
spacing: 8 * scaling
|
||||
width: 360 * scaling
|
||||
visible: true
|
||||
|
||||
|
||||
|
||||
// Multiple notifications display
|
||||
Repeater {
|
||||
model: notificationModel
|
||||
delegate: Rectangle {
|
||||
width: 360 * scaling
|
||||
height: Math.max(80 * scaling, contentColumn.implicitHeight + (Style.marginMedium * 2 * scaling))
|
||||
clip: true
|
||||
color: Colors.backgroundPrimary
|
||||
radius: Style.radiusMedium * scaling
|
||||
border.color: Colors.backgroundTertiary
|
||||
border.width: Math.min(1, Style.borderThin * scaling)
|
||||
|
||||
// Animation properties
|
||||
property real scaleValue: 0.8
|
||||
property real opacityValue: 0.0
|
||||
property bool isRemoving: false
|
||||
|
||||
// Scale and fade-in animation
|
||||
scale: scaleValue
|
||||
opacity: opacityValue
|
||||
|
||||
// Animate in when the item is created
|
||||
Component.onCompleted: {
|
||||
scaleValue = 1.0
|
||||
opacityValue = 1.0
|
||||
}
|
||||
|
||||
// Animate out when being removed
|
||||
function animateOut() {
|
||||
isRemoving = true
|
||||
scaleValue = 0.8
|
||||
opacityValue = 0.0
|
||||
}
|
||||
|
||||
// Timer for delayed removal after animation
|
||||
Timer {
|
||||
id: removalTimer
|
||||
interval: Style.animationSlow
|
||||
repeat: false
|
||||
onTriggered: {
|
||||
notificationService.forceRemoveNotification(model.rawNotification)
|
||||
}
|
||||
}
|
||||
|
||||
// Check if this notification is being removed
|
||||
onIsRemovingChanged: {
|
||||
if (isRemoving) {
|
||||
// Remove from model after animation completes
|
||||
removalTimer.start()
|
||||
}
|
||||
}
|
||||
|
||||
// Animation behaviors
|
||||
Behavior on scale {
|
||||
NumberAnimation {
|
||||
duration: Style.animationSlow
|
||||
easing.type: Easing.OutBack
|
||||
}
|
||||
}
|
||||
|
||||
Behavior on opacity {
|
||||
NumberAnimation {
|
||||
duration: Style.animationNormal
|
||||
easing.type: Easing.OutQuad
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
Column {
|
||||
id: contentColumn
|
||||
anchors.fill: parent
|
||||
anchors.margins: Style.marginMedium * scaling
|
||||
spacing: Style.marginSmall * scaling
|
||||
|
||||
RowLayout {
|
||||
spacing: Style.marginSmall * scaling
|
||||
NText {
|
||||
text: (model.appName || model.desktopEntry) || "Unknown App"
|
||||
color: Colors.accentSecondary
|
||||
font.pointSize: Style.fontSizeSmall
|
||||
}
|
||||
Rectangle {
|
||||
width: 6 * scaling; height: 6 * scaling; radius: 3 * scaling
|
||||
color: (model.urgency === NotificationUrgency.Critical) ? Colors.error :
|
||||
(model.urgency === NotificationUrgency.Low) ? Colors.textSecondary : Colors.accentPrimary
|
||||
Layout.alignment: Qt.AlignVCenter
|
||||
}
|
||||
Item { Layout.fillWidth: true }
|
||||
NText {
|
||||
text: notificationService.formatTimestamp(model.timestamp)
|
||||
color: Colors.textSecondary
|
||||
font.pointSize: Style.fontSizeSmall
|
||||
}
|
||||
}
|
||||
|
||||
NText {
|
||||
text: model.summary || "No summary"
|
||||
font.pointSize: Style.fontSizeLarge
|
||||
font.bold: true
|
||||
color: Colors.textPrimary
|
||||
wrapMode: Text.Wrap
|
||||
width: 300 * scaling
|
||||
maximumLineCount: 3
|
||||
elide: Text.ElideRight
|
||||
}
|
||||
|
||||
NText {
|
||||
text: model.body || ""
|
||||
font.pointSize: Style.fontSizeSmall
|
||||
color: Colors.textSecondary
|
||||
wrapMode: Text.Wrap
|
||||
width: 300 * scaling
|
||||
maximumLineCount: 5
|
||||
elide: Text.ElideRight
|
||||
}
|
||||
}
|
||||
|
||||
NIconButton {
|
||||
anchors.top: parent.top
|
||||
anchors.right: parent.right
|
||||
anchors.margins: Style.marginSmall * scaling
|
||||
icon: "close"
|
||||
onClicked: function() {
|
||||
animateOut()
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -19,12 +19,10 @@ NBox {
|
|||
anchors.left: parent.left
|
||||
anchors.right: parent.right
|
||||
anchors.top: parent.top
|
||||
anchors.margins: Style.marginXL * scaling
|
||||
spacing: Style.marginSmall * scaling
|
||||
anchors.margins: Style.marginMedium * scaling
|
||||
spacing: Style.marginMedium * scaling
|
||||
|
||||
Item {
|
||||
height: 36 * scaling
|
||||
}
|
||||
Item { height: Style.marginLarge * scaling }
|
||||
|
||||
Text {
|
||||
text: "music_note"
|
||||
|
|
@ -40,8 +38,6 @@ NBox {
|
|||
anchors.horizontalCenter: parent.horizontalCenter
|
||||
}
|
||||
|
||||
Item {
|
||||
height: 36 * scaling
|
||||
}
|
||||
Item { height: Style.marginLarge * scaling }
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -25,8 +25,8 @@ NBox {
|
|||
|
||||
Item {
|
||||
id: avatarBox
|
||||
width: 40 * scaling
|
||||
height: 40 * scaling
|
||||
width: Style.baseWidgetSize * 1.25 * scaling
|
||||
height: Style.baseWidgetSize * 1.25 * scaling
|
||||
|
||||
Image {
|
||||
id: avatarImage
|
||||
|
|
@ -69,11 +69,11 @@ NBox {
|
|||
}
|
||||
NIconButton {
|
||||
icon: "settings"
|
||||
sizeMultiplier: 0.8
|
||||
sizeMultiplier: 0.9
|
||||
}
|
||||
NIconButton {
|
||||
icon: "power_settings_new"
|
||||
sizeMultiplier: 0.8
|
||||
sizeMultiplier: 0.9
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -35,7 +35,7 @@ NLoader {
|
|||
|
||||
readonly property real scaling: Scaling.scale(screen)
|
||||
// Single source of truth for spacing between cards (both axes)
|
||||
property real cardSpacing: Style.marginLarge * scaling
|
||||
property real cardSpacing: Style.spacingLarge * scaling
|
||||
// X coordinate from the bar to align this panel under
|
||||
property real anchorX: root.anchorX
|
||||
// Ensure this panel attaches to the intended screen
|
||||
|
|
|
|||
|
|
@ -18,8 +18,8 @@ NBox {
|
|||
anchors.left: parent.left
|
||||
anchors.right: parent.right
|
||||
anchors.top: parent.top
|
||||
anchors.margins: Style.marginLarge * scaling
|
||||
spacing: Style.marginSmall * scaling
|
||||
anchors.margins: Style.marginMedium * scaling
|
||||
spacing: Style.marginMedium * scaling
|
||||
|
||||
RowLayout {
|
||||
spacing: Style.marginSmall * scaling
|
||||
|
|
@ -46,9 +46,9 @@ NBox {
|
|||
color: Colors.backgroundTertiary
|
||||
}
|
||||
|
||||
RowLayout {
|
||||
Layout.fillWidth: true
|
||||
spacing: Style.marginLarge * scaling
|
||||
RowLayout {
|
||||
Layout.fillWidth: true
|
||||
spacing: Style.marginMedium * scaling
|
||||
Repeater {
|
||||
model: 5
|
||||
delegate: ColumnLayout {
|
||||
|
|
|
|||
139
Services/NotificationService.qml
Normal file
139
Services/NotificationService.qml
Normal file
|
|
@ -0,0 +1,139 @@
|
|||
import QtQuick
|
||||
import qs.Services
|
||||
import Quickshell.Services.Notifications
|
||||
|
||||
|
||||
QtObject {
|
||||
id: root
|
||||
|
||||
// Notification server instance
|
||||
property NotificationServer server: NotificationServer {
|
||||
id: notificationServer
|
||||
|
||||
// Server capabilities
|
||||
keepOnReload: false
|
||||
imageSupported: true
|
||||
actionsSupported: true
|
||||
actionIconsSupported: true
|
||||
bodyMarkupSupported: true
|
||||
bodySupported: true
|
||||
persistenceSupported: true
|
||||
inlineReplySupported: true
|
||||
bodyHyperlinksSupported: true
|
||||
bodyImagesSupported: true
|
||||
|
||||
// Signal when notification is received
|
||||
onNotification: function(notification) {
|
||||
|
||||
// Track the notification
|
||||
notification.tracked = true
|
||||
|
||||
// Connect to closed signal for cleanup
|
||||
notification.closed.connect(function() {
|
||||
root.removeNotification(notification)
|
||||
})
|
||||
|
||||
// Add to our model
|
||||
root.addNotification(notification)
|
||||
}
|
||||
}
|
||||
|
||||
// List model to hold notifications
|
||||
property ListModel notificationModel: ListModel { }
|
||||
|
||||
// Maximum visible notifications
|
||||
property int maxVisible: 5
|
||||
|
||||
// Auto-hide timer
|
||||
property Timer hideTimer: Timer {
|
||||
interval: 5000 // 5 seconds
|
||||
repeat: true
|
||||
running: notificationModel.count > 0
|
||||
|
||||
onTriggered: {
|
||||
if (notificationModel.count === 0) {
|
||||
return
|
||||
}
|
||||
|
||||
// Always remove the oldest notification (last in the list)
|
||||
let oldestNotification = notificationModel.get(notificationModel.count - 1).rawNotification
|
||||
if (oldestNotification && !oldestNotification.transient) {
|
||||
// Trigger animation signal instead of direct dismiss
|
||||
animateAndRemove(oldestNotification, notificationModel.count - 1)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Function to add notification to model
|
||||
function addNotification(notification) {
|
||||
notificationModel.insert(0, {
|
||||
rawNotification: notification,
|
||||
summary: notification.summary,
|
||||
body: notification.body,
|
||||
appName: notification.appName,
|
||||
urgency: notification.urgency,
|
||||
timestamp: new Date()
|
||||
})
|
||||
|
||||
// Remove oldest notifications if we exceed maxVisible
|
||||
while (notificationModel.count > maxVisible) {
|
||||
let oldestNotification = notificationModel.get(notificationModel.count - 1).rawNotification
|
||||
if (oldestNotification) {
|
||||
oldestNotification.dismiss()
|
||||
}
|
||||
notificationModel.remove(notificationModel.count - 1)
|
||||
}
|
||||
}
|
||||
|
||||
// Signal to trigger animation before removal
|
||||
signal animateAndRemove(var notification, int index)
|
||||
|
||||
// Function to remove notification from model
|
||||
function removeNotification(notification) {
|
||||
for (let i = 0; i < notificationModel.count; i++) {
|
||||
if (notificationModel.get(i).rawNotification === notification) {
|
||||
// Emit signal to trigger animation first
|
||||
animateAndRemove(notification, i)
|
||||
break
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Function to actually remove notification after animation
|
||||
function forceRemoveNotification(notification) {
|
||||
for (let i = 0; i < notificationModel.count; i++) {
|
||||
if (notificationModel.get(i).rawNotification === notification) {
|
||||
notificationModel.remove(i)
|
||||
break
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Function to format timestamp
|
||||
function formatTimestamp(timestamp) {
|
||||
if (!timestamp) return ""
|
||||
|
||||
const now = new Date()
|
||||
const diff = now - timestamp
|
||||
|
||||
// Less than 1 minute
|
||||
if (diff < 60000) {
|
||||
return "now"
|
||||
}
|
||||
// Less than 1 hour
|
||||
else if (diff < 3600000) {
|
||||
const minutes = Math.floor(diff / 60000)
|
||||
return `${minutes}m ago`
|
||||
}
|
||||
// Less than 24 hours
|
||||
else if (diff < 86400000) {
|
||||
const hours = Math.floor(diff / 3600000)
|
||||
return `${hours}h ago`
|
||||
}
|
||||
// More than 24 hours
|
||||
else {
|
||||
const days = Math.floor(diff / 86400000)
|
||||
return `${days}d ago`
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -9,6 +9,7 @@ import qs.Modules.Bar
|
|||
import qs.Modules.DemoPanel
|
||||
import qs.Modules.Background
|
||||
import qs.Modules.SidePanel
|
||||
import qs.Modules.Notification
|
||||
import qs.Services
|
||||
|
||||
ShellRoot {
|
||||
|
|
@ -26,4 +27,8 @@ ShellRoot {
|
|||
SidePanel {
|
||||
id: sidePanel
|
||||
}
|
||||
|
||||
Notification {
|
||||
id: notification
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue