honney/quickshell
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: Introduce NotificationHistoryLoader to manage opening and closing the NotificationHistory panel.

Browse Source
This commit is contained in:
Hannes
2026-09-01 22:41:34 +02:00
parent 94d9dd6fac
commit 9788529f55
7 changed files with 372 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/bar/widgets/NotificationButton.qml
+23 -1
View File
@@ -13,7 +13,29 @@ MouseArea {
cursorShape: Qt.PointingHandCursor
onClicked: {
NotificationS.soundEnabled = !NotificationS.soundEnabled
// NotificationS.soundEnabled = !NotificationS.soundEnabled
console.log("[NotificationButton] Opening NotificationHistory")
root.toggleNotificationHistory()
}
Item {
anchors.top: parent.topBar
anchors.right: parent.right
anchors.topMargin: Config.spacing
anchors.rightMargin: Config.spacing
width: Config.screen_height_to_font_tiny(screen.height)
height: Config.screen_height_to_font_tiny(screen.height)
visible: NotificationS.notificationNum > 0
Text{
anchors.centerIn: parent
text: NotificationS.notificationNum
font.family: Config.font
font.pixelSize: Config.screen_height_to_font_tiny(screen.height)
color: Colors.secondaryContainer_fg
}
}
Rectangle {
modules/notification/Notification.qml
+1
View File
@@ -58,6 +58,7 @@ PanelWindow {
delegate: NotificationBody {
required property int index
required property var notificationData
implicitWidth: screen.width/7
screen: notificationWindow.screen
notification: notificationData
modules/notification/NotificationBody.qml
+11 -7
View File
@@ -7,16 +7,16 @@ import QtQuick.Controls
Rectangle {
id: root
//TODO: urgency, expireTimeoutText, ...
required property var notification
required property var screen
property var urgency: (notification.urgency ?? notification.hints["urgency"]) != null ? (notification.urgency ?? notification.hints["urgency"]) + 1 : 0
property bool closing: false
property int _hoveredActionCount: 0
// When used in history overview we don't want auto-timeout or click-to-close
property bool isHistory: false
property real duration: (
property real duration: isHistory ? 0 : (
notification.expireTimeout > 0 ? notification.expireTimeout*1000 :
urgency ? urgency * 2000 :
5000
@@ -31,9 +31,11 @@ Rectangle {
color: textBGColor
border.width: Config.border_width
border.color: textColor
radius: isHistory ? Config.small_radius : 0
clip: isHistory
property string textColor: urgency != 3 ? Colors.primary : Colors.tertiary
property string textBGColor: urgency != 3 ? Qt.alpha(Colors.primaryContainer, 0.75) : Qt.alpha(Colors.tertiaryContainer, 0.75)
property color textColor: urgency != 3 ? Colors.primary : Colors.tertiary
property color textBGColor: urgency != 3 ? Qt.alpha(Colors.primaryContainer, 0.75) : Qt.alpha(Colors.tertiaryContainer, 0.75)
function closeNotification(dismiss){
if (closing) {
@@ -55,6 +57,8 @@ Rectangle {
id: mouseArea
anchors.fill: parent
hoverEnabled: true
enabled: !root.isHistory
visible: !root.isHistory
onClicked: {
root.closeNotification(false)
}
@@ -389,7 +393,7 @@ Rectangle {
running: root.duration > 0
from: 1.0
to: 0.0
duration: root.duration
duration: root.duration
paused: mouseArea.containsMouse || closingMouseArea.containsMouse || inlineReplyButtonMouseArea.containsMouse || root._hoveredActionCount > 0 || inlineReplyTextField.hovered || inlineReplyTextField.activeFocus
onFinished: root.closeNotification(false)
@@ -427,7 +431,7 @@ Rectangle {
console.log("\x1b[31m\t"+"notification.transient: " + notification.transient+"\x1b[0m")
console.log("\x1b[31m\t"+"notification.hasInlineReply: " + notification.hasInlineReply+"\x1b[0m")
console.log("\x1b[31m\t"+"notification.hasActionIcons: " + notification.hasActionIcons+"\x1b[0m")
console.log("\x1b[31m\t"+"image.source: " + iconImage.source+"\x1b[0m")
console.log("\x1b[31m\t"+"urgency: " + urgency+"\x1b[0m")
console.log("\x1b[31m\t"+"duration: " + duration+"\x1b[0m")
modules/notification/NotificationHistory.qml
+276
View File
@@ -0,0 +1,276 @@
import QtQuick
import Quickshell
import QtQuick.Controls
import Quickshell.Wayland
import Quickshell.Hyprland
import Quickshell.Services.Notifications
import "../../config"
import "./notificationServer"
PanelWindow {
id: root
implicitWidth: screen.width/5
implicitHeight: screen.height - Config.barHeight(screen.height)*2
color: "transparent"
visible: true
focusable: true
anchors {
top: true
right: true
}
property string textColor: Colors.primary
property string textBGColor: Qt.alpha(Colors.primaryContainer, 0.75)
property string bGColor: Qt.alpha(Colors.primaryContainer, 0.5)
property real bigFontSize: Config.screen_height_to_font_medium(screen.height)
property real fontSize: Config.screen_height_to_font_small(screen.height)
property var expandedGroups: ({})
property var grouped: {
const vals = NotificationS.trackedNotifications.values
const len = vals.length
if (len < 0) return []
let map = {}
for (let i = 0; i < vals.length; ++i) {
const n = vals[i]
const key = (n && n.appName && n.appName !== "") ? n.appName : "Unknown"
if (!map[key]) map[key] = []
map[key].push(n)
}
let result = []
for (const k in map) result.push({ appName: k, notes: map[k] })
result.sort((a,b)=>a.appName.localeCompare(b.appName))
return result
}
function toggleGroup(appName) {
let copy = Object.assign({}, expandedGroups)
copy[appName] = !(copy[appName] === true)
expandedGroups = copy
}
function clearGroup(appName) {
const vals = NotificationS.trackedNotifications.values.slice()
for (let i=0;i<vals.length;++i){
const n=vals[i]
const key = (n && n.appName && n.appName !== "") ? n.appName : "Unknown"
if (key===appName) { if (n.tracked) n.dismiss(); else if (n.close) n.close() }
}
}
function clearAll() {
const vals = NotificationS.trackedNotifications.values.slice()
for (let i=0;i<vals.length;++i) if (vals[i].tracked) vals[i].dismiss()
expandedGroups = ({})
}
FocusScope {
id: nHistoryScope
focus: true
Keys.onReleased: function(event) {
if (event.key === Qt.Key_Escape) {
console.log("Pressed Escape, closing JLearner")
notifificationHistoryLoader.active = false
}
}
Rectangle {
anchors.fill: parent
color: "lightblue"
}
}
Rectangle {
id: background
color: bGColor
// opacity: 0.5
anchors.fill: parent
border.width: Config.border_width
border.color: textColor
radius: Config.screen_big_radius_fun(screen.height)
// Text {
// anchors.centerIn: parent
// font.family: Config.font
// font.pixelSize: bigFontSize
// color: textColor
// wrapMode: Text.Wrap
// text: NotificationS.trackedNotifications.values[0]
// }
Component.onCompleted: {
for (var notification in NotificationS.trackedNotifications.values) {
console.log("[NotificationHistory]: " + notification.appName + " Notifications")
}
for (var i =0; i < NotificationS.notificationNum; i++) {
console.log("[NotificationHistory]: " + NotificationS.trackedNotifications.values[i].appName + " Notifications")
}
}
Column{
id: bgColumn
anchors.fill: parent
anchors.margins: Config.screen_spacing_fun(screen.height)
spacing: Config.screen_spacing_fun(screen.height)
Rectangle {
id: topBar
width: parent.width
height: bigFontSize*1.25
color: textBGColor
radius: Config.screen_big_radius_fun(screen.height)
border.width: Config.border_width
border.color: textColor
Row{
id: backgroundLeft
anchors.verticalCenter: parent.verticalCenter
anchors.left: parent.left
anchors.leftMargin: Config.screen_spacing_fun(screen.height)
spacing: Config.screen_spacing_fun(screen.height)
Text{
text: "Notifications:"
font.family: Config.font
font.pixelSize: bigFontSize
color: textColor
}
}
Row{
id: backgroundCenter
anchors.centerIn: parent
spacing: Config.screen_small_bar_spacing_fun(screen.height)
Text{
text: NotificationS.soundEnabled ? "󰂚" : "󰂛"
font.family: Config.font
font.pixelSize: bigFontSize
color: textColor
}
Switch {
id: notificationVolumeSwitch
implicitWidth: notificationVolumeSwitch.height*2
implicitHeight: bigFontSize
anchors.verticalCenter: parent.verticalCenter
checked: NotificationS.soundEnabled
indicator: Rectangle {
implicitWidth: notificationVolumeSwitch.width
implicitHeight: notificationVolumeSwitch.height
radius: height / 2
color: notificationVolumeSwitch.checked ? Colors.secondary : Colors.secondaryContainer
Behavior on color {
ColorAnimation { duration: 150 }
}
Rectangle {
width: parent.height*0.8
height: parent.height*0.8
radius: width / 2
anchors.verticalCenter: parent.verticalCenter
x: notificationVolumeSwitch.checked ? parent.width - width - 3 : 3
color: notificationVolumeSwitch.checked ? Colors.secondaryContainer : Colors.secondary
Behavior on x {
NumberAnimation {
duration: 180
easing.type: Easing.OutCubic
}
}
Behavior on color {
ColorAnimation { duration: 150 }
}
}
}
onCheckedChanged: {
NotificationS.soundEnabled = notificationVolumeSwitch.checked
console.log("NotificationS.soundEnabled:", NotificationS.soundEnabled)
}
}
}
Row{
id: backgroundRight
anchors.verticalCenter: parent.verticalCenter
anchors.right: parent.right
anchors.rightMargin: Config.screen_spacing_fun(screen.height)
spacing: Config.screen_spacing_fun(screen.height)
MouseArea {
id: closeArea
width: bigFontSize
height: bigFontSize
hoverEnabled: true
cursorShape: Qt.PointingHandCursor
Rectangle{
anchors.fill: parent
color: closeArea.containsMouse ? "red" : textBGColor
radius: Config.screen_big_radius_fun(screen.height)
border.width: Config.border_width
border.color: closeArea.containsMouse ? "white" : textColor
Text{
text: ""
anchors.centerIn: parent
font.family: Config.font
font.pixelSize: bigFontSize
color: closeArea.containsMouse ? "white" : textColor
}
}
onClicked: {
closeNHistory()
}
}
}
}
Rectangle {
width: parent.width
height: parent.height - topBar.height - bgColumn.spacing //- bgColumn.anchors.margins*2
color: textBGColor
radius: Config.screen_big_radius_fun(screen.height)
border.width: Config.border_width
border.color: textColor
Text {
id: noNotificationText
anchors.centerIn: parent
visible: NotificationS.notificationNum == 0
text: "No notifications"
font.family: Config.font
font.pixelSize: bigFontSize
color: textColor
}
Flickable {
id: flick
width: parent.width
// height: Math.min(root.maxContentHeight, contentColumn.implicitHeight)
contentWidth: width
contentHeight: contentColumn.implicitHeight
clip: true
boundsBehavior: Flickable.StopAtBounds
flickableDirection: Flickable.VerticalFlick
ScrollBar.vertical: ScrollBar { policy: ScrollBar.AsNeeded }
Column {
id: contentColumn
width: flick.width
spacing: Config.spacing
}
}
}
}
}
}
modules/notification/NotificationHistoryLoader.qml
+50
View File
@@ -0,0 +1,50 @@
import QtQuick
import Quickshell
import Quickshell.Hyprland
import Quickshell.Io
import "../../config"
import "./notificationServer"
Item { // container, invisible
id: nHistoryLoader
LazyLoader {
id: notifificationHistoryLoader
// active: true
active: false
NotificationHistory {
id: nHistory
function closeNHistory() {
nHistoryLoader.closeNHistory()
}
}
}
GlobalShortcut {
name: "NotificationHistory"
description: "Open Notification History"
onPressed: {
console.log("Pressed Meta+Shift+N (Hyprland global shortcut)")
notifificationHistoryLoader.active = !notifificationHistoryLoader.active
}
}
function openNHistory() {
notifificationHistoryLoader.active = true
}
function closeNHistory() {
notifificationHistoryLoader.active = false
}
function toggleNHistory() {
notifificationHistoryLoader.active = !notifificationHistoryLoader.active
}
Component.onCompleted: {
console.log("[NotificationHistoryLoader]:", NotificationS)
}
}
modules/notification/notificationServer/NotificationServer.qml
+4 -1
View File
@@ -14,6 +14,9 @@ Item {
property var newestNotification: null
property bool soundEnabled: true
property alias trackedNotifications: notificationServer.trackedNotifications
property int notificationNum: trackedNotifications.values.length
signal notificationReceived(var notification)
function correctMonitor(screen) {
@@ -55,7 +58,7 @@ Item {
// return
// }
notification.tracked = true
Config.debug == "Notification" && console.log(
!notification.lastGeneration && Config.debug == "Notification" && console.log(
"[NotificationServer] Notification received:",
notification.appName, notification.id, notification.summary, notification.body
)