Compare commits

..
4 Commits
22 changed files with 424 additions and 936 deletions
+9 -3
View File
@@ -12,9 +12,13 @@ QtObject {
readonly property int small_spacing: 4 readonly property int small_spacing: 4
readonly property int spacing: 8 readonly property int spacing: 8
function small_spacing_fun(screenHeight) { return Math.floor(barHeight(screenHeight) / 16) } function bar_small_bar_spacing_fun(barH) { return Math.floor(barHeight(barH) / 16) }
function spacing_fun(barH) { return Math.floor(barH / 8) } function bar_spacing_fun(barH) { return Math.floor(barH / 8) }
function big_spacing_fun(barH) { return Math.floor(barH / 6) } function bar_big_spacing_fun(barH) { return Math.floor(barH / 6) }
function screen_small_bar_spacing_fun(screenHeight) { return Math.floor((screenHeight / 1080)*2) }
function screen_spacing_fun(screenHeight) { return Math.floor((screenHeight / 1080)*4) }
function screen_big_spacing_fun(screenHeight) { return Math.floor((screenHeight / 1080)*8) }
function font_size(spaceHeight) { return Math.floor(spaceHeight * 0.75) } function font_size(spaceHeight) { return Math.floor(spaceHeight * 0.75) }
function font_size_small(spaceHeight) { return Math.floor(spaceHeight * 0.625) } function font_size_small(spaceHeight) { return Math.floor(spaceHeight * 0.625) }
@@ -29,6 +33,8 @@ QtObject {
readonly property int radius: 16 readonly property int radius: 16
function small_radius_fun(barHeight) { return Math.floor(barHeight / 8) } function small_radius_fun(barHeight) { return Math.floor(barHeight / 8) }
function radius_fun(barHeight) { return Math.floor(barHeight / 4) } function radius_fun(barHeight) { return Math.floor(barHeight / 4) }
function screen_radius_fun(screenHeight) { return Math.floor((screenHeight / 1080)*4) }
function screen_big_radius_fun(screenHeight) { return Math.floor((screenHeight / 1080)*6) }
readonly property int big_radius: 10 readonly property int big_radius: 10
readonly property int border_width: 2 readonly property int border_width: 2
+5 -5
View File
@@ -14,7 +14,7 @@ PanelWindow {
anchors.left: true anchors.left: true
anchors.right: true anchors.right: true
implicitHeight: Math.floor(screen.height * Config.barHeightRatio(screen.height)) implicitHeight: Config.barHeight(screen.height)
exclusiveZone: height // this is so context menus don't clip into the bar exclusiveZone: height // this is so context menus don't clip into the bar
@@ -40,8 +40,8 @@ PanelWindow {
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
anchors.left: parent.left anchors.left: parent.left
anchors.leftMargin: Config.big_spacing_fun(height) anchors.leftMargin: Config.bar_big_spacing_fun(height)
spacing: Config.big_spacing_fun(height) spacing: Config.bar_big_spacing_fun(height)
MenuButton {} MenuButton {}
@@ -57,7 +57,7 @@ PanelWindow {
Row { // bar widgets center Row { // bar widgets center
id: widgetsCenter id: widgetsCenter
anchors.centerIn: parent anchors.centerIn: parent
spacing: Config.big_spacing_fun(height) spacing: Config.bar_big_spacing_fun(height)
Clock {} Clock {}
@@ -69,7 +69,7 @@ PanelWindow {
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
anchors.right: parent.right anchors.right: parent.right
anchors.rightMargin: 0 anchors.rightMargin: 0
spacing: Config.big_spacing_fun(height) spacing: Config.bar_big_spacing_fun(height)
// TODO: Add bluetooth, network, audio, power, maybe HW monitor // TODO: Add bluetooth, network, audio, power, maybe HW monitor
Tray{} Tray{}
+5 -1
View File
@@ -1,5 +1,6 @@
import QtQuick import QtQuick
import Quickshell import Quickshell
import Quickshell.Hyprland
Item { Item {
@@ -8,7 +9,10 @@ Item {
model: Quickshell.screens model: Quickshell.screens
delegate: Loader { delegate: Loader {
active: true // loads object active: true // loads object
sourceComponent: Bar {screen: modelData} // creates instance of bar component sourceComponent: Bar {
screen: modelData
visible: !Hyprland.monitorFor(modelData).activeWorkspace.hasFullscreen
} // creates instance of bar component
} }
} }
} }
+4 -4
View File
@@ -6,7 +6,7 @@ import Quickshell.Hyprland
MouseArea { MouseArea {
id: audioButton id: audioButton
width: Math.max(audioRow.width + Config.spacing_fun(height)*3.5, height) width: Math.max(audioRow.width + Config.bar_spacing_fun(height)*3.5, height)
height: bar.height height: bar.height
hoverEnabled: true hoverEnabled: true
cursorShape: Qt.PointingHandCursor cursorShape: Qt.PointingHandCursor
@@ -22,9 +22,9 @@ MouseArea {
Row { Row {
id: audioRow id: audioRow
width: audioSourceText.width + audioSinkText.width + audioPercentageText.width + Config.spacing_fun(height)*2 width: audioSourceText.width + audioSinkText.width + audioPercentageText.width + Config.bar_spacing_fun(height)*2
height: parent.height height: parent.height
spacing: Config.spacing_fun(height)/2 spacing: Config.bar_spacing_fun(height)/2
anchors.centerIn: parent anchors.centerIn: parent
Text { Text {
@@ -35,7 +35,7 @@ MouseArea {
font.pixelSize: Config.iconSize(bar.height) font.pixelSize: Config.iconSize(bar.height)
font.family: Config.font font.family: Config.font
color: audioButton.containsMouse ? Colors.tertiary_fg : Colors.primary color: audioButton.containsMouse ? Colors.tertiary_fg : Colors.primary
rightPadding: Config.spacing_fun(height)*1.5 rightPadding: Config.bar_spacing_fun(height)*1.5
} }
Text { Text {
+1 -1
View File
@@ -5,7 +5,7 @@ import "../states/Audio"
MouseArea { MouseArea {
id: audioButton id: audioButton
width: Math.max(audioText.width + Config.spacing_fun(height)*2, height) width: Math.max(audioText.width + Config.bar_spacing_fun(height)*2, height)
height: bar.height height: bar.height
hoverEnabled: true hoverEnabled: true
cursorShape: Qt.PointingHandCursor cursorShape: Qt.PointingHandCursor
+3 -3
View File
@@ -6,7 +6,7 @@ import "../states/Battery"
MouseArea { MouseArea {
id: batteryButton id: batteryButton
width: expanded ? Math.max(expandedRow.width + Config.spacing_fun(height)*3, bar.height) : Math.max(batteryText.width + Config.spacing_fun(height)*2, bar.height) width: expanded ? Math.max(expandedRow.width + Config.bar_spacing_fun(height)*3, bar.height) : Math.max(batteryText.width + Config.bar_spacing_fun(height)*2, bar.height)
height: bar.height height: bar.height
hoverEnabled: true hoverEnabled: true
cursorShape: Qt.PointingHandCursor cursorShape: Qt.PointingHandCursor
@@ -63,7 +63,7 @@ MouseArea {
id: expandedRow id: expandedRow
visible: expanded visible: expanded
anchors.centerIn: parent anchors.centerIn: parent
spacing: Config.spacing_fun(batteryButton.height) spacing: Config.bar_spacing_fun(batteryButton.height)
Text { Text {
id: batteryPercentageSymbol id: batteryPercentageSymbol
@@ -121,7 +121,7 @@ MouseArea {
id: batteryPopup id: batteryPopup
anchorItem: batteryButton anchorItem: batteryButton
anchorHovered: batteryButton.containsMouse anchorHovered: batteryButton.containsMouse
spacingValue: Config.spacing_fun(batteryButton.height) spacingValue: Config.bar_spacing_fun(batteryButton.height)
radiusValue: Config.radius_fun(batteryButton.height) radiusValue: Config.radius_fun(batteryButton.height)
Column { Column {
+2 -2
View File
@@ -6,7 +6,7 @@ import "../states/Clock"
Rectangle { //workspace Rectangle { //workspace
id: clockRect id: clockRect
width: ClockState.expanded ? Math.max(dateText.width + timeText.width + Config.spacing_fun(height)*3, bar.height) : Math.max(timeText.width + Config.spacing_fun(height)*2, bar.height) width: ClockState.expanded ? Math.max(dateText.width + timeText.width + Config.bar_spacing_fun(height)*3, bar.height) : Math.max(timeText.width + Config.bar_spacing_fun(height)*2, bar.height)
height: bar.height height: bar.height
radius: Config.radius_fun(height) radius: Config.radius_fun(height)
color: clockArea.containsMouse ? Colors.tertiaryContainer : Colors.primaryContainer color: clockArea.containsMouse ? Colors.tertiaryContainer : Colors.primaryContainer
@@ -61,7 +61,7 @@ Rectangle { //workspace
id: clockPopup id: clockPopup
anchorItem: clockRect anchorItem: clockRect
anchorHovered: clockArea.containsMouse anchorHovered: clockArea.containsMouse
spacingValue: Config.spacing_fun(clockRect.height) spacingValue: Config.bar_spacing_fun(clockRect.height)
radiusValue: Config.radius_fun(clockRect.height) radiusValue: Config.radius_fun(clockRect.height)
Column { Column {
+1 -1
View File
@@ -7,7 +7,7 @@ import "../states/Idle"
MouseArea { MouseArea {
id: idleButton id: idleButton
width: Math.max(idleText.width + Config.spacing_fun(height)*2, height) width: Math.max(idleText.width + Config.bar_spacing_fun(height)*2, height)
height: bar.height height: bar.height
hoverEnabled: true hoverEnabled: true
cursorShape: Qt.PointingHandCursor cursorShape: Qt.PointingHandCursor
+2 -2
View File
@@ -5,7 +5,7 @@ import "../states/Network"
MouseArea { MouseArea {
id: networkButton id: networkButton
width: Math.max(networkText.width + Config.spacing_fun(height)*2, height) width: Math.max(networkText.width + Config.bar_spacing_fun(height)*2, height)
height: bar.height height: bar.height
hoverEnabled: true hoverEnabled: true
cursorShape: Qt.PointingHandCursor cursorShape: Qt.PointingHandCursor
@@ -37,7 +37,7 @@ MouseArea {
id: clockPopup id: clockPopup
anchorItem: networkButton anchorItem: networkButton
anchorHovered: networkButton.containsMouse anchorHovered: networkButton.containsMouse
spacingValue: Config.spacing_fun(networkButton.height) spacingValue: Config.bar_spacing_fun(networkButton.height)
radiusValue: Config.radius_fun(networkButton.height) radiusValue: Config.radius_fun(networkButton.height)
Column { Column {
+27 -46
View File
@@ -13,63 +13,44 @@ MouseArea {
cursorShape: Qt.PointingHandCursor cursorShape: Qt.PointingHandCursor
onClicked: { onClicked: {
NotificationS.toggleOverview() // 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 { Rectangle {
anchors.fill: parent anchors.fill: parent
color: notificationButton.containsMouse || NotificationS.overviewVisible ? Colors.tertiary : "transparent" color: "transparent"
radius: Config.radius_fun(notificationButton.height) radius: Config.radius_fun(notificationButton.height)
border.width: Config.border_width
border.color: notificationButton.containsMouse || NotificationS.overviewVisible ? Colors.tertiary_fg : "transparent"
Text { Text {
id: notificationText id: notificationText
anchors.centerIn: parent anchors.centerIn: parent
text: "󰂚" // text: Quickshell.iconPath("discord")
text: NotificationS.soundEnabled ? "󰂚" : "󰂛"
font.pixelSize: Config.bigIconSize(bar.height) font.pixelSize: Config.bigIconSize(bar.height)
font.family: Config.font font.family: Config.font
color: NotificationS.overviewVisible ? Colors.tertiary_fg : Colors.secondaryContainer_fg color: Colors.secondaryContainer_fg
}
// count badge
Rectangle {
id: badge
visible: NotificationS.trackedNotifications.values.length > 0
width: badgeText.implicitWidth + 6
height: badgeText.implicitHeight + 4
radius: height / 2
color: Colors.errorContainer
border.width: 1
border.color: Colors.error
anchors.top: parent.top
anchors.right: parent.right
anchors.topMargin: 2
anchors.rightMargin: 2
Text {
id: badgeText
anchors.centerIn: parent
text: NotificationS.trackedNotifications.values.length > 99 ? "99+" : NotificationS.trackedNotifications.values.length
font.family: Config.font
font.pixelSize: Config.labelSize(bar.height) * 0.6
font.bold: true
color: Colors.error_fg
}
}
// muted indicator dot
Rectangle {
visible: !NotificationS.soundEnabled
width: 8
height: 8
radius: 4
color: Colors.error
border.width: 1
border.color: Colors.error_fg
anchors.bottom: parent.bottom
anchors.right: parent.right
anchors.bottomMargin: 3
anchors.rightMargin: 3
} }
// Image{ // Image{
+1 -1
View File
@@ -4,7 +4,7 @@ import "../../../config"
MouseArea { MouseArea {
id: powerButton id: powerButton
width: Math.max(powerText.width + Config.spacing_fun(height), height) width: Math.max(powerText.width + Config.bar_spacing_fun(height), height)
height: bar.height height: bar.height
hoverEnabled: true hoverEnabled: true
cursorShape: Qt.PointingHandCursor cursorShape: Qt.PointingHandCursor
+3 -3
View File
@@ -7,7 +7,7 @@ import "../../../config"
Row { // Workspace Row Row { // Workspace Row
id: trayRow id: trayRow
spacing: Config.small_spacing_fun(height) spacing: Config.bar_small_bar_spacing_fun(height)
Repeater { Repeater {
model: SystemTray.items model: SystemTray.items
@@ -19,8 +19,8 @@ Row { // Workspace Row
Rectangle { //trayItem Rectangle { //trayItem
id: trayItem id: trayItem
width: iconImage.width + Config.spacing_fun(bar.height) width: iconImage.width + Config.bar_spacing_fun(bar.height)
height: iconImage.height + Config.spacing_fun(bar.height) height: iconImage.height + Config.bar_spacing_fun(bar.height)
radius: Config.radius_fun(trayRow.height) radius: Config.radius_fun(trayRow.height)
color: trayArea.containsMouse ? Colors.tertiaryContainer color: trayArea.containsMouse ? Colors.tertiaryContainer
: modelData.active ? Colors.primaryContainer : modelData.active ? Colors.primaryContainer
+2 -2
View File
@@ -7,7 +7,7 @@ import "../states/Apps"
Item { Item {
id: root id: root
property real pad: Config.spacing_fun(bar.height) * 1.5 property real pad: Config.bar_spacing_fun(bar.height) * 1.5
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
@@ -39,7 +39,7 @@ Item {
Row { Row {
id: contentRow id: contentRow
spacing: Config.spacing_fun(bar.height) * 1.25 spacing: Config.bar_spacing_fun(bar.height) * 1.25
anchors.centerIn: parent anchors.centerIn: parent
Text { Text {
+9 -9
View File
@@ -8,8 +8,8 @@ Rectangle {
id: workspacesContainer id: workspacesContainer
required property HyprlandMonitor thisMonitor required property HyprlandMonitor thisMonitor
height: bar.height - (Config.spacing_fun(bar.height) * 1.5) height: bar.height - (Config.bar_spacing_fun(bar.height) * 1.5)
width: workspacesRow.width + (Config.spacing_fun(bar.height) * 2) width: workspacesRow.width + (Config.bar_spacing_fun(bar.height) * 2)
radius: height / 2 radius: height / 2
@@ -20,7 +20,7 @@ Rectangle {
Row { Row {
id: workspacesRow id: workspacesRow
anchors.centerIn: parent anchors.centerIn: parent
spacing: Config.spacing_fun(bar.height) / 2 spacing: Config.bar_spacing_fun(bar.height) / 2
Repeater { Repeater {
model: Hyprland.workspaces model: Hyprland.workspaces
@@ -30,9 +30,9 @@ Rectangle {
id: wsItem id: wsItem
property var workspaceData: modelData property var workspaceData: modelData
width: Math.max(40, wsIconsRow.width==0 ? wsNum.width + 2*Config.spacing_fun(bar.height) : wsNum.width + wsIconsRow.width + 3*Config.spacing_fun(bar.height)+Config.spacing_fun(bar.height)) width: Math.max(40, wsIconsRow.width==0 ? wsNum.width + 2*Config.bar_spacing_fun(bar.height) : wsNum.width + wsIconsRow.width + 3*Config.bar_spacing_fun(bar.height)+Config.bar_spacing_fun(bar.height))
// width: { // width: {
// var spacing = Config.spacing_fun(bar.height) // var spacing = Config.bar_spacing_fun(bar.height)
// var cw = wsNum.width // var cw = wsNum.width
// if (wsIconsRow.children.length > 0) { // if (wsIconsRow.children.length > 0) {
// cw += spacing + wsIconsRow.width + spacing // cw += spacing + wsIconsRow.width + spacing
@@ -47,7 +47,7 @@ Rectangle {
Rectangle { Rectangle {
anchors.centerIn: parent anchors.centerIn: parent
width: parent.width width: parent.width
height: parent.height - (Config.spacing_fun(bar.height) * 1.5) height: parent.height - (Config.bar_spacing_fun(bar.height) * 1.5)
radius: height / 2 radius: height / 2
@@ -79,9 +79,9 @@ Rectangle {
Row { Row {
anchors.left: parent.left anchors.left: parent.left
anchors.leftMargin: wsIconsRow.width==0 ? (wsItem.width-wsNum.width)/2 : (wsItem.width-wsNum.width-wsIconsRow.width-Config.spacing_fun(bar.height))/2 anchors.leftMargin: wsIconsRow.width==0 ? (wsItem.width-wsNum.width)/2 : (wsItem.width-wsNum.width-wsIconsRow.width-Config.bar_spacing_fun(bar.height))/2
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
spacing: Config.spacing_fun(bar.height) spacing: Config.bar_spacing_fun(bar.height)
Text { Text {
id: wsNum id: wsNum
@@ -97,7 +97,7 @@ Rectangle {
Row { Row {
id: wsIconsRow id: wsIconsRow
spacing: Config.spacing_fun(workspacesContainer.height) spacing: Config.bar_spacing_fun(workspacesContainer.height)
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
Repeater { Repeater {
+1
View File
@@ -58,6 +58,7 @@ PanelWindow {
delegate: NotificationBody { delegate: NotificationBody {
required property int index required property int index
required property var notificationData required property var notificationData
implicitWidth: screen.width/7
screen: notificationWindow.screen screen: notificationWindow.screen
notification: notificationData notification: notificationData
+9 -5
View File
@@ -7,16 +7,16 @@ import QtQuick.Controls
Rectangle { Rectangle {
id: root id: root
//TODO: urgency, expireTimeoutText, ...
required property var notification required property var notification
required property var screen required property var screen
property var urgency: (notification.urgency ?? notification.hints["urgency"]) != null ? (notification.urgency ?? notification.hints["urgency"]) + 1 : 0 property var urgency: (notification.urgency ?? notification.hints["urgency"]) != null ? (notification.urgency ?? notification.hints["urgency"]) + 1 : 0
property bool closing: false property bool closing: false
property int _hoveredActionCount: 0 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 : notification.expireTimeout > 0 ? notification.expireTimeout*1000 :
urgency ? urgency * 2000 : urgency ? urgency * 2000 :
5000 5000
@@ -31,9 +31,11 @@ Rectangle {
color: textBGColor color: textBGColor
border.width: Config.border_width border.width: Config.border_width
border.color: textColor border.color: textColor
radius: isHistory ? Config.small_radius : 0
clip: isHistory
property string textColor: urgency != 3 ? Colors.primary : Colors.tertiary property color 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 textBGColor: urgency != 3 ? Qt.alpha(Colors.primaryContainer, 0.75) : Qt.alpha(Colors.tertiaryContainer, 0.75)
function closeNotification(dismiss){ function closeNotification(dismiss){
if (closing) { if (closing) {
@@ -55,6 +57,8 @@ Rectangle {
id: mouseArea id: mouseArea
anchors.fill: parent anchors.fill: parent
hoverEnabled: true hoverEnabled: true
enabled: !root.isHistory
visible: !root.isHistory
onClicked: { onClicked: {
root.closeNotification(false) root.closeNotification(false)
} }
@@ -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
}
}
}
}
}
}
@@ -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)
}
}
@@ -1,795 +0,0 @@
import QtQuick
import Quickshell
import Quickshell.Wayland
import Quickshell.Hyprland
import Quickshell.Services.Notifications
import QtQuick.Layouts
import QtQuick.Controls
import "../../config"
import "./notificationServer"
PanelWindow {
id: root
required property var screen
anchors {
top: true
left: true
right: true
bottom: true
}
exclusiveZone: 0
color: "transparent"
WlrLayershell.layer: WlrLayer.Overlay
WlrLayershell.keyboardFocus: WlrKeyboardFocus.Exclusive
// state for expanded groups: appName -> bool
property var expandedGroups: ({})
// reactive grouped model: depends on trackedNotifications count
property var grouped: {
// establish binding dependency on trackedNotifications
const vals = NotificationS.trackedNotifications.values
// touch length to trigger re-evaluation
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] })
}
// sort alphabetically for stable order; could sort by most recent instead
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) {
// dismiss tracked notification
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) {
const n = vals[i]
if (n.tracked) n.dismiss()
}
// also collapse all
expandedGroups = ({})
}
// close handling
function closeOverview() {
NotificationS.overviewVisible = false
}
// keyboard handling via contentItem
contentItem {
focus: true
Keys.onPressed: event => {
if (event.key === Qt.Key_Escape) {
closeOverview()
event.accepted = true
}
}
}
// background dim + click to close
MouseArea {
id: bgMouse
anchors.fill: parent
onClicked: function(mouse) { root.closeOverview() }
// eat wheel to prevent flickable behind?
}
// main panel container
Rectangle {
id: panel
// panel size: constrained by screen
width: Math.min(520, Math.max(380, root.screen.width * 0.32))
property real maxPanelHeight: root.screen.height * 0.72
height: maxPanelHeight
anchors.top: parent.top
anchors.right: parent.right
anchors.topMargin: Config.barHeight(root.screen.height) + Config.spacing
anchors.rightMargin: Config.spacing
radius: Config.radius
color: Qt.alpha(Colors.surfaceContainer, 0.96)
border.width: Config.border_width
border.color: Colors.outlineVariant
clip: true
// prevent bg click when clicking panel
MouseArea {
anchors.fill: parent
hoverEnabled: false
onClicked: function(mouse) { mouse.accepted = true }
}
Column {
id: panelColumn
anchors.fill: parent
anchors.margins: Config.spacing
spacing: Config.spacing
// ───── Header ─────
Rectangle {
id: header
width: parent.width
implicitHeight: headerRow.implicitHeight + Config.spacing*2
radius: Config.small_radius
color: Colors.surfaceContainerHigh
border.width: Config.border_width
border.color: Colors.outlineVariant
RowLayout {
id: headerRow
anchors.fill: parent
anchors.margins: Config.spacing
spacing: Config.spacing
// title + count
Text {
id: titleText
Layout.alignment: Qt.AlignVCenter
text: "Notifications"
font.family: Config.font
font.pixelSize: Config.screen_height_to_font_small(root.screen.height)
font.bold: true
color: Colors.primary
}
Rectangle {
id: countBadge
Layout.alignment: Qt.AlignVCenter
visible: NotificationS.trackedNotifications.values.length > 0
Layout.preferredWidth: countText.implicitWidth + Config.spacing
Layout.preferredHeight: countText.implicitHeight + Config.small_spacing
radius: height/2
color: Colors.primaryContainer
border.width: Config.border_width
border.color: Colors.primary
Text {
id: countText
anchors.centerIn: parent
text: NotificationS.trackedNotifications.values.length
font.family: Config.font
font.pixelSize: Config.screen_height_to_font_tiny(root.screen.height)
font.bold: true
color: Colors.primaryContainer_fg
}
}
Item { Layout.preferredWidth: Config.spacing; Layout.preferredHeight: 1; Layout.alignment: Qt.AlignVCenter }
// mute toggle (moved from NotificationButton)
Rectangle {
id: muteBtn
Layout.preferredWidth: muteText.implicitWidth + Config.spacing*2
Layout.preferredHeight: muteText.implicitHeight + Config.spacing
Layout.alignment: Qt.AlignVCenter
radius: Config.radius_fun(height)*2
color: muteArea.containsMouse ? Colors.tertiaryContainer : (NotificationS.soundEnabled ? Colors.secondaryContainer : Colors.errorContainer)
border.width: Config.border_width
border.color: muteArea.containsMouse ? Colors.tertiary : (NotificationS.soundEnabled ? Colors.secondary : Colors.error)
Text {
id: muteText
anchors.centerIn: parent
text: NotificationS.soundEnabled ? "󰂚" : "󰂛"
font.family: Config.font
font.pixelSize: Config.screen_height_to_font_small(root.screen.height)
color: muteArea.containsMouse ? Colors.tertiary_fg : (NotificationS.soundEnabled ? Colors.secondary : Colors.error_fg)
}
MouseArea {
id: muteArea
anchors.fill: parent
hoverEnabled: true
cursorShape: Qt.PointingHandCursor
onClicked: function(mouse) {
NotificationS.soundEnabled = !NotificationS.soundEnabled
mouse.accepted = true
}
}
}
// clear all
Rectangle {
id: clearAllBtn
Layout.preferredWidth: clearAllText.implicitWidth + Config.spacing*2
Layout.preferredHeight: muteText.implicitHeight + Config.spacing
Layout.alignment: Qt.AlignVCenter
radius: Config.radius_fun(height)*2
visible: NotificationS.trackedNotifications.values.length > 0
color: clearAllArea.containsMouse ? Colors.errorContainer : Colors.surfaceContainerHighest
border.width: Config.border_width
border.color: clearAllArea.containsMouse ? Colors.error : Colors.outline
Text {
id: clearAllText
anchors.centerIn: parent
text: "Clear all"
font.family: Config.font
font.pixelSize: Config.screen_height_to_font_tiny(root.screen.height)
color: clearAllArea.containsMouse ? Colors.error_fg : Colors.primary
}
MouseArea {
id: clearAllArea
anchors.fill: parent
hoverEnabled: true
cursorShape: Qt.PointingHandCursor
onClicked: function(mouse) {
root.clearAll()
mouse.accepted = true
}
}
}
Item { Layout.fillWidth: true; Layout.preferredWidth: 8; Layout.preferredHeight: 1 }
// close X
Rectangle {
id: closeBtn
Layout.preferredWidth: closeText.implicitHeight + Config.spacing
Layout.preferredHeight: closeText.implicitHeight + Config.spacing
Layout.alignment: Qt.AlignVCenter
radius: Config.radius
color: closeArea.containsMouse ? Colors.errorContainer : "transparent"
border.width: Config.border_width
border.color: closeArea.containsMouse ? Colors.error : Colors.outlineVariant
Text {
id: closeText
anchors.centerIn: parent
text: "✕"
font.family: Config.font
font.pixelSize: Config.screen_height_to_font_small(root.screen.height)
color: closeArea.containsMouse ? Colors.error_fg : Colors.primary
}
MouseArea {
id: closeArea
anchors.fill: parent
hoverEnabled: true
cursorShape: Qt.PointingHandCursor
onClicked: function(mouse) {
root.closeOverview()
mouse.accepted = true
}
}
}
}
}
// ───── Scrollable grouped list ─────
Flickable {
id: flick
width: parent.width
height: panel.height - header.height - panelColumn.spacing - Config.spacing*2
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
// empty placeholder
Rectangle {
width: parent.width
height: 80
radius: Config.small_radius
color: Qt.alpha(Colors.surfaceContainerLow, 0.6)
border.width: Config.border_width
border.color: Colors.outlineVariant
visible: NotificationS.trackedNotifications.values.length === 0
Text {
anchors.centerIn: parent
text: "No notifications"
font.family: Config.font
font.pixelSize: Config.screen_height_to_font_small(root.screen.height)
color: Colors.outline
}
}
Repeater {
id: groupRepeater
model: root.grouped
delegate: Column {
id: groupColumn
required property var modelData
required property int index
property string appName: modelData.appName
property var notes: modelData.notes
property bool isExpanded: root.expandedGroups[appName] === true
property int count: notes.length
// pick representative icon from first notification
property var repNote: notes.length > 0 ? notes[0] : null
width: contentColumn.width
spacing: Config.spacing / 2
// ── Group header ──
Rectangle {
id: groupHeader
width: parent.width
height: Math.max(headerContent.implicitHeight + Config.spacing*2, 48)
radius: Config.small_radius
color: groupHeaderArea.containsMouse ? Colors.secondaryContainer : Colors.surfaceContainerHigh
border.width: Config.border_width
border.color: groupColumn.isExpanded ? Colors.primary : Colors.outlineVariant
Row {
id: headerContent
anchors.fill: parent
anchors.margins: Config.spacing
spacing: Config.spacing
anchors.verticalCenter: parent.verticalCenter
// app icon
Image {
id: groupIcon
width: 28
height: 28
anchors.verticalCenter: parent.verticalCenter
asynchronous: true
fillMode: Image.PreserveAspectFit
source: {
if (!groupColumn.repNote) return Quickshell.iconPath("notifications")
if (groupColumn.repNote.image) return groupColumn.repNote.image
if (groupColumn.repNote.appIcon) return Quickshell.iconPath(groupColumn.repNote.appIcon)
const entry = groupColumn.repNote.desktopEntry ? DesktopEntries.byId(groupColumn.repNote.desktopEntry) : null
if (entry && entry.icon) {
const p = Quickshell.iconPath(entry.icon)
if (p && p !== "") return p
}
return Quickshell.iconPath("notifications")
}
}
Column {
anchors.verticalCenter: parent.verticalCenter
spacing: 2
width: groupHeader.width - groupIcon.width - expandArrow.width - clearGroupBtn.width - badge.width - headerContent.spacing*4 - Config.spacing*2
Text {
text: groupColumn.appName
width: parent.width
elide: Text.ElideRight
font.family: Config.font
font.pixelSize: Config.screen_height_to_font_small(root.screen.height)
font.bold: true
color: Colors.primary
}
Text {
text: groupColumn.count + (groupColumn.count === 1 ? " notification" : " notifications")
font.family: Config.font
font.pixelSize: Config.screen_height_to_font_tiny(root.screen.height)
color: Colors.outline
}
}
Rectangle {
id: badge
width: badgeText.implicitWidth + Config.spacing
height: badgeText.implicitHeight + 4
anchors.verticalCenter: parent.verticalCenter
radius: height/2
color: groupColumn.isExpanded ? Colors.primary : Colors.secondaryContainer
border.width: Config.border_width
border.color: groupColumn.isExpanded ? Colors.primary_fg : Colors.outlineVariant
Text {
id: badgeText
anchors.centerIn: parent
text: groupColumn.count
font.family: Config.font
font.pixelSize: Config.screen_height_to_font_tiny(root.screen.height)
font.bold: true
color: groupColumn.isExpanded ? Colors.primary_fg : Colors.secondary
}
}
Text {
id: expandArrow
anchors.verticalCenter: parent.verticalCenter
text: groupColumn.isExpanded ? "▼" : "▶"
font.family: Config.font
font.pixelSize: Config.screen_height_to_font_tiny(root.screen.height)
color: Colors.primary
}
// clear group button
Rectangle {
id: clearGroupBtn
width: clearGroupText.implicitWidth + Config.spacing
height: clearGroupText.implicitHeight + Config.spacing/2
anchors.verticalCenter: parent.verticalCenter
radius: Config.radius_fun(height)
color: clearGroupArea.containsMouse ? Colors.errorContainer : Qt.alpha(Colors.surfaceContainerHighest, 0.8)
border.width: Config.border_width
border.color: clearGroupArea.containsMouse ? Colors.error : Colors.outlineVariant
Text {
id: clearGroupText
anchors.centerIn: parent
text: "✕"
font.family: Config.font
font.pixelSize: Config.screen_height_to_font_tiny(root.screen.height)
color: clearGroupArea.containsMouse ? Colors.error_fg : Colors.outline
}
MouseArea {
id: clearGroupArea
anchors.fill: parent
hoverEnabled: true
cursorShape: Qt.PointingHandCursor
onClicked: function(mouse) {
mouse.accepted = true
root.clearGroup(groupColumn.appName)
}
}
}
}
MouseArea {
id: groupHeaderArea
anchors.fill: parent
hoverEnabled: true
cursorShape: Qt.PointingHandCursor
// don't steal click when hitting clear button
onClicked: function(mouse) {
// if clear button contains mouse, ignore
if (clearGroupArea.containsMouse) return
mouse.accepted = true
root.toggleGroup(groupColumn.appName)
}
}
}
// ── Group notifications (collapsed by default) ──
Column {
id: groupNotesColumn
width: parent.width
spacing: Config.spacing/2
visible: groupColumn.isExpanded
// keep clipped and animate? simple visible
Repeater {
id: notesRepeater
model: groupColumn.notes
delegate: Rectangle {
id: histCard
required property var modelData
required property int index
property var notification: modelData
property int urgency: (notification.urgency ?? notification.hints["urgency"]) != null ? (notification.urgency ?? notification.hints["urgency"]) + 1 : 0
property color textColor: urgency !== 3 ? Colors.primary : Colors.tertiary
property color textBGColor: urgency !== 3 ? Qt.alpha(Colors.primaryContainer, 0.92) : Qt.alpha(Colors.tertiaryContainer, 0.92)
width: groupNotesColumn.width
// height determined by content
implicitHeight: cardInnerColumn.implicitHeight + Config.spacing*2
radius: Config.small_radius
color: textBGColor
border.width: Config.border_width
border.color: textColor
clip: true
Column {
id: cardInnerColumn
width: parent.width
spacing: 0
// content row
Rectangle {
id: cardContentRect
width: parent.width
// height based on max of icon vs text
implicitHeight: Math.max(iconCol.implicitHeight, bodyCol.implicitHeight) + Config.spacing*2
color: "transparent"
// close per-notification
MouseArea {
id: cardCloseArea
anchors.top: parent.top
anchors.right: parent.right
anchors.margins: Config.spacing/2
width: cardCloseText.implicitHeight + Config.spacing
height: width
hoverEnabled: true
cursorShape: Qt.PointingHandCursor
Rectangle {
anchors.fill: parent
radius: Config.small_radius
color: cardCloseArea.containsMouse ? Colors.errorContainer : "transparent"
border.width: Config.border_width
border.color: cardCloseArea.containsMouse ? Colors.error : histCard.textColor
Text {
id: cardCloseText
anchors.centerIn: parent
text: "✕"
font.family: Config.font
font.pixelSize: Config.screen_height_to_font_tiny(root.screen.height)
color: cardCloseArea.containsMouse ? Colors.error_fg : histCard.textColor
}
}
onClicked: function(mouse) {
mouse.accepted = true
if (histCard.notification.tracked) histCard.notification.dismiss()
else histCard.notification.close()
}
}
Row {
id: cardRow
anchors.fill: parent
anchors.margins: Config.spacing
anchors.rightMargin: cardCloseArea.width + Config.spacing
spacing: Config.spacing
// icon side
Rectangle {
id: iconColWrapper
width: 1.25 * iconImg.width
height: Math.max(iconCol.implicitHeight, bodyCol.implicitHeight)
color: "transparent"
Column {
id: iconCol
width: parent.width
spacing: Config.spacing/2
Image {
id: iconImg
width: root.screen.width / 32
height: width
anchors.horizontalCenter: parent.horizontalCenter
asynchronous: true
fillMode: Image.PreserveAspectFit
source: {
if (histCard.notification.image) return histCard.notification.image
if (histCard.notification.appIcon) return Quickshell.iconPath(histCard.notification.appIcon)
const entry = histCard.notification.desktopEntry ? DesktopEntries.byId(histCard.notification.desktopEntry) : null
if (entry && entry.icon) {
const p = Quickshell.iconPath(entry.icon)
if (p && p !== "") return p
}
return Quickshell.iconPath("notifications")
}
}
Text {
id: histSummary
text: histCard.notification.summary
visible: histCard.notification.summary ? true : false
width: parent.width
font.family: Config.font
font.pixelSize: Config.screen_height_to_font_tiny(root.screen.height)
font.bold: true
color: histCard.textColor
wrapMode: Text.Wrap
horizontalAlignment: Text.AlignHCenter
}
}
}
// body side
Rectangle {
id: bodyWrapper
width: parent.width - iconColWrapper.width - cardRow.spacing
height: Math.max(iconCol.implicitHeight, bodyCol.implicitHeight)
color: "transparent"
Column {
id: bodyCol
width: parent.width
spacing: Config.spacing/2
Text {
id: bodyTitle
text: {
if (histCard.notification.image) return histCard.notification.appName.charAt(0).toUpperCase() + histCard.notification.appName.slice(1)
return histCard.notification.appName ? histCard.notification.appName : "Message:"
}
font.family: Config.font
font.bold: true
font.pixelSize: Config.screen_height_to_font_tiny(root.screen.height)
color: histCard.textColor
elide: Text.ElideRight
width: parent.width
}
Text {
id: bodyText
text: histCard.notification.body
visible: histCard.notification.body ? true : false
width: parent.width
font.family: Config.font
font.pixelSize: Config.screen_height_to_font_tiny(root.screen.height)
color: histCard.textColor
wrapMode: Text.Wrap
textFormat: Text.RichText
}
Text {
text: {
// time hint if available, else empty
if (histCard.notification.hints["x-dunst-stack-tag"]) return ""
return ""
}
visible: false
font.family: Config.font
font.pixelSize: Config.screen_height_to_font_tiny(root.screen.height)
color: Colors.outline
}
}
}
}
}
// actions row
Rectangle {
id: histActionRowRect
width: parent.width
height: Config.screen_height_to_font_tiny(root.screen.height)+2*Config.spacing
color: "transparent"
border.width: Config.border_width
border.color: histCard.textColor
visible: histCard.notification.actions.length > 0
Row {
id: histActionsRow
spacing: Config.spacing
anchors.fill: parent
anchors.margins: Config.spacing
property var cardRoot: histCard
Repeater {
id: histActionRepeater
model: histCard.notification.actions
delegate: MouseArea {
required property var modelData
id: histActionArea
width: histActionsRow.width / histActionsRow.cardRoot.notification.actions.length
height: histActionRect.height
anchors.verticalCenter: parent.verticalCenter
hoverEnabled: true
cursorShape: Qt.PointingHandCursor
Rectangle {
id: histActionRect
width: parent.width
height: histActionRow.height + Config.spacing
color: histActionArea.containsMouse ? Colors.secondaryContainer_fg : Colors.secondaryContainer
border.color: histActionArea.containsMouse ? Colors.secondary_fg : Colors.secondary
border.width: Config.border_width
radius: Config.radius_fun(histActionRect.height)*2
Row {
id: histActionRow
anchors.centerIn: parent
spacing: Config.spacing/2
Text {
text: modelData.text
width: Math.min(histActionRect.width - Config.spacing*2, implicitWidth)
elide: Text.ElideRight
font.family: Config.font
font.pixelSize: Config.screen_height_to_font_tiny(root.screen.height)
color: histActionArea.containsMouse ? Colors.secondary_fg : Colors.secondary
}
}
}
onClicked: function(mouse) {
mouse.accepted = true
modelData.invoke()
// after invoke, dismiss if not resident handled by server
if (histCard.notification.tracked && !histCard.notification.resident) {
// optionally keep in history; don't auto dismiss
}
}
}
}
}
}
// inline reply
Rectangle {
id: histInlineRect
width: parent.width
height: Config.screen_height_to_font_small(root.screen.height)+2*Config.spacing
color: "transparent"
border.width: Config.border_width
border.color: histCard.textColor
visible: histCard.notification.hasInlineReply
function sendReply(message) {
histCard.notification.sendInlineReply(message)
inlineField.focus = false
// keep notification in history; optionally dismiss?
}
Row {
id: histInlineRow
spacing: Config.spacing
anchors.fill: parent
anchors.margins: Config.spacing
TextField {
id: inlineField
width: parent.width - inlineSendArea.width - Config.spacing
height: inlineSendText.height + Config.spacing
anchors.verticalCenter: parent.verticalCenter
hoverEnabled: true
activeFocusOnTab: true
placeholderText: histCard.notification.hints["x-kde-reply-placeholder-text"] != null ? histCard.notification.hints["x-kde-reply-placeholder-text"] : histCard.notification.inlineReplyPlaceholder
placeholderTextColor: inlineField.activeFocus ? Colors.secondary_fg : Colors.secondary
font.family: Config.font
leftPadding: Config.spacing
background: Rectangle {
radius: Config.radius
color: inlineField.activeFocus ? Colors.tertiary_fg : Colors.primary_fg
border.color: inlineField.activeFocus ? Colors.tertiary : Colors.primary
border.width: Config.border_width
}
onAccepted: {
histInlineRect.sendReply(text)
}
}
MouseArea {
id: inlineSendArea
width: inlineSendText.width + 2*Config.spacing
height: inlineSendText.height + Config.spacing
anchors.verticalCenter: parent.verticalCenter
hoverEnabled: true
cursorShape: Qt.PointingHandCursor
Rectangle {
anchors.fill: parent
radius: height*0.5
color: inlineSendArea.containsMouse ? Colors.secondaryContainer_fg : Colors.secondaryContainer
border.color: inlineSendArea.containsMouse ? Colors.secondary_fg : Colors.secondary
border.width: Config.border_width
Text {
id: inlineSendText
text: "SEND"
anchors.centerIn: parent
font.family: Config.font
font.pixelSize: Config.screen_height_to_font_tiny(root.screen.height)
color: inlineSendArea.containsMouse ? Colors.secondary_fg : Colors.secondary
}
}
onClicked: function(mouse) {
mouse.accepted = true
histInlineRect.sendReply(inlineField.text)
}
}
}
}
}
}
}
}
}
}
}
}
}
}
// debug
Component.onCompleted: {
Config.debug == "Notification" && console.log("[NotificationOverview " + Hyprland.monitorFor(screen).activeWorkspace.id + "] completed")
}
}
@@ -1,42 +0,0 @@
import QtQuick
import Quickshell
import Quickshell.Hyprland
import "./notificationServer"
Item {
id: overviewLoaderRoot
// Per-screen PanelWindows for the overview.
// Uses Loader so windows are only created when overviewVisible is true.
Repeater {
model: Quickshell.screens
delegate: Loader {
id: screenLoader
required property var modelData
active: NotificationS.overviewVisible
sourceComponent: NotificationOverview {
screen: modelData
}
// optional: hide on screen removed
onActiveChanged: {
if (active) {
console.log("[NotificationOverviewLoader] opening overview on screen", Hyprland.monitorFor(modelData).activeWorkspace.id)
}
}
}
}
// Global shortcut to toggle overview (optional)
GlobalShortcut {
name: "NotificationOverview"
description: "Toggle notification history overview"
onPressed: {
NotificationS.toggleOverview()
console.log("[NotificationOverviewLoader] shortcut toggle, now", NotificationS.overviewVisible)
}
}
Component.onCompleted: {
console.log("[NotificationOverviewLoader] completed, overviewVisible:", NotificationS.overviewVisible)
}
}
@@ -13,15 +13,12 @@ Item {
property var focusedMonitor: null property var focusedMonitor: null
property var newestNotification: null property var newestNotification: null
property bool soundEnabled: true property bool soundEnabled: true
property bool overviewVisible: false
property alias trackedNotifications: notificationServer.trackedNotifications property alias trackedNotifications: notificationServer.trackedNotifications
property int notificationNum: trackedNotifications.values.length
signal notificationReceived(var notification) signal notificationReceived(var notification)
function toggleOverview() {
overviewVisible = !overviewVisible
}
function correctMonitor(screen) { function correctMonitor(screen) {
return (Hyprland.monitorFor(screen) === focusedMonitor) return (Hyprland.monitorFor(screen) === focusedMonitor)
} }
@@ -61,7 +58,7 @@ Item {
// return // return
// } // }
notification.tracked = true notification.tracked = true
Config.debug == "Notification" && console.log( !notification.lastGeneration && Config.debug == "Notification" && console.log(
"[NotificationServer] Notification received:", "[NotificationServer] Notification received:",
notification.appName, notification.id, notification.summary, notification.body notification.appName, notification.id, notification.summary, notification.body
) )
@@ -86,9 +83,9 @@ Item {
repeat: false repeat: false
onTriggered: { onTriggered: {
focusedMonitor = Hyprland.focusedMonitor
notificationReceived(notification)
if(!notification.lastGeneration && notificationServerState.soundEnabled){ if(!notification.lastGeneration && notificationServerState.soundEnabled){
focusedMonitor = Hyprland.focusedMonitor
notificationReceived(notification)
notificationSound.play() notificationSound.play()
} }
+7 -1
View File
@@ -19,7 +19,9 @@ ShellRoot {
// Notifications // Notifications
NotificationLoader {} NotificationLoader {}
NotificationOverviewLoader {} NotificationHistoryLoader {
id: nHistoryLoader
}
//Wallpaper picker //Wallpaper picker
WallpaperPickerLoader {} WallpaperPickerLoader {}
@@ -42,6 +44,10 @@ ShellRoot {
wlLoader.openWlogout() wlLoader.openWlogout()
} }
function toggleNotificationHistory() {
nHistoryLoader.toggleNHistory()
}
GlobalShortcut { GlobalShortcut {
name: "QsReload" name: "QsReload"