Compare commits
15
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
47562185f1 | ||
|
|
4f49575069 | ||
|
|
8c6662871a | ||
|
|
b2d5c0d5fb | ||
|
|
f1d01cadf8 | ||
|
|
ecf00de898 | ||
|
|
f488f22def | ||
|
|
1bf0f0bfc1 | ||
|
|
504c5ac484 | ||
|
|
bd59a8e457 | ||
|
|
095839c45a | ||
|
|
8352ba5a56 | ||
|
|
f2e8d8a144 | ||
|
|
3cd6807681 | ||
|
|
0b20e8eb85 |
+2
-1
@@ -2,4 +2,5 @@
|
||||
Colors.qml
|
||||
modules/wlogout/scripts/helper.sh
|
||||
config/path/ConfigPath.qml
|
||||
config/path/WallpaperPath.qml
|
||||
config/path/WallpaperPath.qml
|
||||
modules/notification/assets/notification.ogg
|
||||
@@ -20,6 +20,11 @@ QtObject {
|
||||
function font_size_small(spaceHeight) { return Math.floor(spaceHeight * 0.625) }
|
||||
function font_size_tiny(spaceHeight) { return Math.floor(spaceHeight * 0.4) }
|
||||
|
||||
function screen_height_to_font_tiny(screenHeight) {return Math.round(9 * screenHeight / 1080)}
|
||||
function screen_height_to_font_small(screenHeight) {return Math.round(12 * screenHeight / 1080)}
|
||||
function screen_height_to_font_medium(screenHeight) {return Math.round(16 * screenHeight / 1080)}
|
||||
function screen_height_to_font_big(screenHeight) {return Math.round(22 * screenHeight / 1080)}
|
||||
|
||||
readonly property int small_radius: 8
|
||||
readonly property int radius: 16
|
||||
function small_radius_fun(barHeight) { return Math.floor(barHeight / 8) }
|
||||
@@ -69,4 +74,6 @@ QtObject {
|
||||
|
||||
return maxWidth;
|
||||
}
|
||||
|
||||
property string debug: "Notification"
|
||||
}
|
||||
@@ -105,6 +105,15 @@ download \
|
||||
"$SCRIPT_DIR/modules/jl/assets/correct.svg" \
|
||||
"correct.svg"
|
||||
|
||||
# ----------------------------
|
||||
# Sounds
|
||||
# ----------------------------
|
||||
|
||||
download \
|
||||
"https://raw.githubusercontent.com/akx/Notifications/master/OGG/Chord.ogg" \
|
||||
"$SCRIPT_DIR/modules/notification/assets/notification.ogg" \
|
||||
"notification.ogg"
|
||||
|
||||
# ----------------------------
|
||||
# Nerd Font
|
||||
# ----------------------------
|
||||
|
||||
@@ -73,6 +73,7 @@ PanelWindow {
|
||||
|
||||
// TODO: Add bluetooth, network, audio, power, maybe HW monitor
|
||||
Tray{}
|
||||
NotificationButton {}
|
||||
// AudioSource{}
|
||||
AudioSink{}
|
||||
Battery{}
|
||||
|
||||
@@ -7,20 +7,20 @@ import Quickshell.Services.Pipewire
|
||||
Item {
|
||||
id: root
|
||||
|
||||
PwObjectTracker {
|
||||
objects: [ Pipewire.defaultAudioSource ]
|
||||
}
|
||||
|
||||
property var audioSource: Pipewire.defaultAudioSource
|
||||
|
||||
property bool exists: audioSource != null
|
||||
property bool exists: audioSource != null && audioSource.ready
|
||||
property bool mute: audioSource?.audio?.muted ?? false
|
||||
property real volume: Math.round((audioSource?.audio?.volume ?? 0) * 1000) / 10
|
||||
|
||||
property bool volumeChanged: false
|
||||
|
||||
PwObjectTracker {
|
||||
objects: [ root.audioSource ]
|
||||
}
|
||||
|
||||
Connections {
|
||||
target: audioSource?.audio
|
||||
target: root.audioSource?.audio
|
||||
|
||||
function onVolumeChanged() {
|
||||
root.volumeChanged = true;
|
||||
|
||||
@@ -0,0 +1,41 @@
|
||||
import QtQuick
|
||||
import Quickshell
|
||||
import Quickshell.Widgets
|
||||
import Quickshell.Io
|
||||
import "../../notification/notificationServer/"
|
||||
import "../../../config"
|
||||
|
||||
MouseArea {
|
||||
id: notificationButton
|
||||
width: Math.max(bar.height, notificationText.width + Config.spacing)
|
||||
height: bar.height
|
||||
hoverEnabled: true
|
||||
cursorShape: Qt.PointingHandCursor
|
||||
|
||||
onClicked: {
|
||||
NotificationS.soundEnabled = !NotificationS.soundEnabled
|
||||
}
|
||||
|
||||
Rectangle {
|
||||
anchors.fill: parent
|
||||
color: "transparent"
|
||||
radius: Config.radius_fun(notificationButton.height)
|
||||
|
||||
Text {
|
||||
id: notificationText
|
||||
anchors.centerIn: parent
|
||||
// text: Quickshell.iconPath("discord")
|
||||
text: NotificationS.soundEnabled ? "" : ""
|
||||
font.pixelSize: Config.bigIconSize(bar.height)
|
||||
font.family: Config.font
|
||||
color: Colors.secondaryContainer_fg
|
||||
}
|
||||
|
||||
// Image{
|
||||
// id: iconImage
|
||||
// source: Quickshell.iconPath("discord")
|
||||
// width: Config.bigIconSize(notificationButton.height)
|
||||
// height: Config.bigIconSize(notificationButton.height)
|
||||
// }
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,105 @@
|
||||
import QtQuick
|
||||
import Quickshell
|
||||
import Quickshell.Hyprland
|
||||
import Quickshell.Services.Notifications
|
||||
import "../../config"
|
||||
import "./notificationServer"
|
||||
|
||||
PanelWindow {
|
||||
// mask: Region {}
|
||||
|
||||
id: notificationWindow
|
||||
|
||||
focusable: true
|
||||
|
||||
anchors.top: true
|
||||
anchors.left: true
|
||||
|
||||
// implicitHeight: screen.height/6
|
||||
implicitHeight: Math.max(contentHeight+(content.spacing*(notificationListModel.count-1)), 0)
|
||||
implicitWidth: contentWidth
|
||||
|
||||
|
||||
color: "transparent"
|
||||
|
||||
ListModel {
|
||||
id: notificationListModel
|
||||
}
|
||||
|
||||
Connections {
|
||||
target: NotificationS
|
||||
|
||||
function onNotificationReceived(notification) {
|
||||
if (!NotificationS.correctMonitor(screen))
|
||||
return
|
||||
if (NotificationS.correctMonitor(screen)) {
|
||||
Config.debug == "Notification" && console.log("[NotificationWindow " + Hyprland.monitorFor(screen).activeWorkspace.id + "]: This notification belongs to me! ")
|
||||
notificationListModel.append({notificationData: notification})
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Rectangle {
|
||||
anchors.fill: parent
|
||||
|
||||
border.width: Config.border_width
|
||||
border.color: Colors.primary
|
||||
color: "transparent"
|
||||
|
||||
Column {
|
||||
id: content
|
||||
anchors.fill: parent
|
||||
spacing: -2
|
||||
|
||||
Repeater {
|
||||
id: notificationRepeater
|
||||
model: notificationListModel
|
||||
|
||||
delegate: NotificationBody {
|
||||
required property int index
|
||||
required property var notificationData
|
||||
screen: notificationWindow.screen
|
||||
|
||||
notification: notificationData
|
||||
|
||||
onDismissed: function(notification, dismiss) {
|
||||
const appName = notification.appName
|
||||
const id = notification.id
|
||||
const summary = notification.summary
|
||||
if (dismiss) {
|
||||
Config.debug == "Notification" && console.log("[NotificationWindow " + Hyprland.monitorFor(screen).activeWorkspace.id + "]: Dissmiss: " + appName + " " + id + " - " + summary)
|
||||
if (notification.tracked) {notification.dismiss()}
|
||||
notificationListModel.remove(index)
|
||||
} else {
|
||||
Config.debug == "Notification" && console.log("[NotificationWindow " + Hyprland.monitorFor(screen).activeWorkspace.id + "]: Close: " + appName + " " + id + " - " + summary)
|
||||
notificationListModel.remove(index)
|
||||
}
|
||||
}
|
||||
}
|
||||
onItemAdded: updateContentSize()
|
||||
onItemRemoved: updateContentSize()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
property real contentWidth: 0
|
||||
property real contentHeight: 0
|
||||
|
||||
function updateContentSize() {
|
||||
let width = 0
|
||||
let height = 0
|
||||
|
||||
for (let i = 0; i < notificationRepeater.count; ++i) {
|
||||
let item = notificationRepeater.itemAt(i)
|
||||
|
||||
if (item) {
|
||||
width = Math.max(width, item.width)
|
||||
height += item.height
|
||||
}
|
||||
}
|
||||
|
||||
contentWidth = width
|
||||
contentHeight = height
|
||||
Config.debug == "Notification" && console.log("[updateContentSize] contentWidth:", contentWidth, "contentHeight:", contentHeight)
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,399 @@
|
||||
import QtQuick
|
||||
import Quickshell
|
||||
import "../../config"
|
||||
import QtQuick.Layouts
|
||||
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 real duration: (
|
||||
notification.expireTimeout > 0 ? notification.expireTimeout*1000 :
|
||||
urgency ? urgency * 2000 :
|
||||
5000
|
||||
)
|
||||
|
||||
signal dismissed(var notification, bool dismiss)
|
||||
|
||||
implicitWidth: screen.width/7
|
||||
// implicitHeight: screen.height/7
|
||||
implicitHeight: contentRowRectangle.height+(actionRowRectangle.visible?actionRowRectangle.height:0)+(inlineReplyRectangle.visible?inlineReplyRectangle.height:0)+(progressBar.visible?progressBar.height:0)
|
||||
|
||||
color: textBGColor
|
||||
border.width: Config.border_width
|
||||
border.color: textColor
|
||||
|
||||
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)
|
||||
|
||||
function closeNotification(dismiss){
|
||||
if (closing) {
|
||||
return
|
||||
}
|
||||
closing = true
|
||||
root.dismissed(root.notification, dismiss)
|
||||
}
|
||||
|
||||
Connections {
|
||||
target: root.notification
|
||||
function onClosed(reason){
|
||||
// It is known that it can be triggered twice and delete multiple Index but since it is only temporary display and the chance is low it is ignored
|
||||
root.closeNotification(false)
|
||||
}
|
||||
}
|
||||
|
||||
MouseArea {
|
||||
id: mouseArea
|
||||
anchors.fill: parent
|
||||
hoverEnabled: true
|
||||
onClicked: {
|
||||
root.closeNotification(false)
|
||||
}
|
||||
}
|
||||
Column {
|
||||
id: contentColumn
|
||||
anchors.fill: parent
|
||||
spacing: 0
|
||||
// spacing: Config.spacing
|
||||
Rectangle{
|
||||
id: contentRowRectangle
|
||||
height: Math.max(iconRectangle.height, contentRectangle.height)+contentRow.anchors.margins*2
|
||||
width: parent.width
|
||||
color: "transparent"
|
||||
border.width: Config.border_width
|
||||
border.color: textColor
|
||||
|
||||
MouseArea {
|
||||
id: closingMouseArea
|
||||
anchors.top: parent.top
|
||||
anchors.right: parent.right
|
||||
anchors.margins: Config.spacing
|
||||
|
||||
width: closeIconText.implicitHeight + Config.spacing
|
||||
height: closeIconText.implicitHeight + Config.spacing
|
||||
|
||||
hoverEnabled: true
|
||||
cursorShape: Qt.PointingHandCursor
|
||||
Rectangle {
|
||||
anchors.fill: parent
|
||||
radius: Config.radius
|
||||
color: parent.containsMouse ? Colors.errorContainer : "transparent"
|
||||
|
||||
border.width: Config.border_width
|
||||
border.color: parent.containsMouse ? Colors.error : textColor
|
||||
|
||||
Text {
|
||||
id: closeIconText
|
||||
anchors.centerIn: parent
|
||||
text: "✕"; // or "✕"
|
||||
font.family: Config.font
|
||||
font.pixelSize: Config.screen_height_to_font_small(screen.height)
|
||||
color: parent.parent.containsMouse ? Colors.error_fg : textColor
|
||||
}
|
||||
}
|
||||
onClicked: function(mouse){
|
||||
mouse.accepted=true
|
||||
root.closeNotification(true)
|
||||
}
|
||||
}
|
||||
|
||||
Row {
|
||||
id: contentRow
|
||||
anchors.fill: parent
|
||||
anchors.margins: 10
|
||||
spacing: Config.spacing*4
|
||||
width: parent.width
|
||||
|
||||
// Left side: icon + icon information
|
||||
Rectangle{
|
||||
id: iconRectangle
|
||||
width: childrenRect.width
|
||||
height: childrenRect.height
|
||||
color: "transparent"
|
||||
Column {
|
||||
id: iconColumn
|
||||
// height: Math.max(childrenRect.height, contentBodyColumn.height)
|
||||
width: 1.25*iconImage.width
|
||||
spacing: Config.spacing
|
||||
|
||||
Image {
|
||||
id: iconImage
|
||||
|
||||
width: screen.width/30
|
||||
height: iconImage.width
|
||||
anchors.horizontalCenter: parent.horizontalCenter
|
||||
|
||||
source: (
|
||||
notification.appIcon ? Quickshell.iconPath(notification.appIcon) :
|
||||
notification.image ? notification.image :
|
||||
Quickshell.iconPath(DesktopEntries.byId(notification.desktopEntry).icon) ? Quickshell.iconPath(DesktopEntries.byId(notification.desktopEntry).icon) :
|
||||
Quickshell.iconPath("notifications")
|
||||
)
|
||||
|
||||
fillMode: Image.PreserveAspectFit
|
||||
asynchronous: true
|
||||
}
|
||||
|
||||
Text {
|
||||
id: summaryText
|
||||
// height: implicitHeight + font.pixelSize + Config.spacing
|
||||
|
||||
text: root.notification.summary
|
||||
visible: root.notification.summary ? true : false
|
||||
width: iconColumn.width
|
||||
font.family: Config.font
|
||||
font.pixelSize: Config.screen_height_to_font_small(screen.height)
|
||||
color: textColor
|
||||
|
||||
wrapMode: Text.Wrap
|
||||
horizontalAlignment: Text.AlignHCenter
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Right side: notification information
|
||||
Rectangle{
|
||||
id: contentRectangle
|
||||
width: childrenRect.width
|
||||
height: childrenRect.height
|
||||
color: "transparent"
|
||||
|
||||
Column {
|
||||
id: contentBodyColumn
|
||||
width: root.width - iconColumn.width
|
||||
spacing: Config.spacing
|
||||
|
||||
Text {
|
||||
id: bodyText
|
||||
text: root.notification.body
|
||||
visible: root.notification.body ? true : false
|
||||
|
||||
width: contentBodyColumn.width
|
||||
font.family: Config.font
|
||||
font.pixelSize: Config.screen_height_to_font_tiny(screen.height)
|
||||
color: textColor
|
||||
wrapMode: Text.Wrap
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Rectangle{
|
||||
id: actionRowRectangle
|
||||
width: root.width
|
||||
height: Config.screen_height_to_font_tiny(screen.height)+2*Config.spacing
|
||||
border.width: Config.border_width
|
||||
border.color: textColor
|
||||
color: "transparent"
|
||||
visible: notification.actions.length > 0
|
||||
Row{
|
||||
id: actionsRow
|
||||
spacing: Config.spacing
|
||||
anchors.fill: parent
|
||||
anchors.margins: Config.spacing
|
||||
|
||||
Repeater {
|
||||
id: notificationActionRepeater
|
||||
model: notification.actions
|
||||
|
||||
delegate: MouseArea{
|
||||
id: actionMouseArea
|
||||
width: actionsRow.width/notification.actions.length
|
||||
height: actionRectangle.height
|
||||
anchors.verticalCenter: parent.verticalCenter
|
||||
|
||||
hoverEnabled: true
|
||||
cursorShape: Qt.PointingHandCursor
|
||||
|
||||
Rectangle {
|
||||
id: actionRectangle
|
||||
width: parent.width
|
||||
height: actionRow.height
|
||||
color: actionMouseArea.containsMouse ? Colors.secondaryContainer_fg : Colors.secondaryContainer
|
||||
border.color: actionMouseArea.containsMouse ? Colors.secondary_fg : Colors.secondary
|
||||
border.width: Config.border_width
|
||||
radius: Config.radius_fun(actionRectangle.height)*2
|
||||
|
||||
Row{
|
||||
id: actionRow
|
||||
width: childrenRect.width
|
||||
height: childrenRect.height
|
||||
anchors.centerIn: parent
|
||||
|
||||
Image{
|
||||
id: actionIcon
|
||||
visible: notification.hasActionIcons
|
||||
}
|
||||
|
||||
Text {
|
||||
text: modelData.text
|
||||
width: Math.min(actionRectangle.width - (actionIcon.visible ? actionIcon.width : 0), implicitWidth)
|
||||
font.family: Config.font
|
||||
font.pixelSize: Config.screen_height_to_font_tiny(screen.height)
|
||||
color: actionMouseArea.containsMouse ? Colors.secondary_fg : Colors.secondary
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
onClicked: function(mouse){
|
||||
mouse.accepted=true
|
||||
modelData.invoke()
|
||||
// resident check is allready in .invoke()
|
||||
root.closeNotification(false)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Rectangle {
|
||||
id: inlineReplyRectangle
|
||||
width: root.width
|
||||
height: Config.screen_height_to_font_small(screen.height)+2*Config.spacing
|
||||
border.width: Config.border_width
|
||||
border.color: textColor
|
||||
color: "transparent"
|
||||
visible: notification.hasInlineReply
|
||||
|
||||
function sendReply(message) {
|
||||
notification.sendInlineReply(message)
|
||||
inlineReplyTextField.focus = false
|
||||
// resident check is allready in .invoke()
|
||||
root.closeNotification(false)
|
||||
}
|
||||
|
||||
Row {
|
||||
id: inlineReplyRow
|
||||
spacing: Config.spacing
|
||||
anchors.fill: parent
|
||||
anchors.margins: Config.spacing
|
||||
TextField {
|
||||
id: inlineReplyTextField
|
||||
width: parent.width - inlineReplyButtonMouseArea.width
|
||||
height: inlineReplyButtonText.height
|
||||
anchors.verticalCenter: parent.verticalCenter
|
||||
|
||||
placeholderText: notification.hints["x-kde-reply-placeholder-text"] != null ? notification.hints["x-kde-reply-placeholder-text"] : notification.inlineReplyPlaceholder
|
||||
placeholderTextColor: inlineReplyTextField.activeFocus ? Colors.secondary_fg : Colors.secondary
|
||||
font.family: Config.font
|
||||
leftPadding: Config.spacing
|
||||
|
||||
background: Rectangle {
|
||||
radius: Config.radius
|
||||
color: inlineReplyTextField.activeFocus ? Colors.tertiary_fg : Colors.primary_fg
|
||||
border.color: inlineReplyTextField.activeFocus ? Colors.tertiary : Colors.primary
|
||||
border.width: Config.border_width
|
||||
}
|
||||
|
||||
onAccepted: {
|
||||
console.log("[NotificationBodyInlineReply]: Enter pressed:", inlineReplyTextField.text)
|
||||
inlineReplyRectangle.sendReply(inlineReplyTextField.text)
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
MouseArea {
|
||||
id: inlineReplyButtonMouseArea
|
||||
width: inlineReplyButtonText.width + 2*Config.spacing
|
||||
height: inlineReplyButtonText.height
|
||||
anchors.verticalCenter: parent.verticalCenter
|
||||
|
||||
hoverEnabled: true
|
||||
cursorShape: Qt.PointingHandCursor
|
||||
Rectangle {
|
||||
id: inlineReplyButtonRectangle
|
||||
width: inlineReplyButtonText.width + 2*Config.spacing
|
||||
height: inlineReplyButtonText.height
|
||||
color: inlineReplyButtonMouseArea.containsMouse ? Colors.secondaryContainer_fg : Colors.secondaryContainer
|
||||
border.color: inlineReplyButtonMouseArea.containsMouse ? Colors.secondary_fg : Colors.secondary
|
||||
border.width: Config.border_width
|
||||
radius: inlineReplyButtonRectangle.height*0.5
|
||||
Text {
|
||||
id: inlineReplyButtonText
|
||||
text: "SEND"
|
||||
font.family: Config.font
|
||||
font.pixelSize: Config.screen_height_to_font_small(screen.height)
|
||||
color: inlineReplyButtonMouseArea.containsMouse ? Colors.secondary_fg : Colors.secondary
|
||||
anchors.centerIn: parent
|
||||
}
|
||||
}
|
||||
onClicked: function(mouse){
|
||||
mouse.accepted=true;
|
||||
console.log("[NotificationBodyInlineReply]: Pressed SEND:", inlineReplyTextField.text)
|
||||
inlineReplyRectangle.sendReply(inlineReplyTextField.text)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Timeout progress bar
|
||||
Rectangle {
|
||||
id: progressBar
|
||||
// anchors.bottom: parent.bottom
|
||||
// anchors.left: parent.left
|
||||
height: Config.screen_height_to_font_tiny(screen.height)
|
||||
color: textColor
|
||||
visible: root.duration > 0
|
||||
|
||||
property real progress: 1.0
|
||||
width: parent.width * progress
|
||||
|
||||
NumberAnimation on progress {
|
||||
id: anim
|
||||
running: root.duration > 0
|
||||
from: 1.0
|
||||
to: 0.0
|
||||
duration: root.duration
|
||||
paused: mouseArea.containsMouse || closingMouseArea.containsMouse || inlineReplyButtonMouseArea.containsMouse
|
||||
|
||||
onFinished: root.closeNotification(false)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Component.onCompleted: {
|
||||
if(Config.debug == "Notification"){
|
||||
console.log("\x1b[31m[NotificationBody]:"+"\x1b[0m")
|
||||
console.log("\x1b[31m\t"+"notification.inlineReplyPlaceholder: " + notification.inlineReplyPlaceholder +"\x1b[0m")
|
||||
console.log("\x1b[31m\t"+"notification.body: " + notification.body+"\x1b[0m")
|
||||
console.log("\x1b[31m\t"+"notification.lastGeneration: " + notification.lastGeneration+"\x1b[0m")
|
||||
console.log("\x1b[31m\t"+"notification.appName: " + notification.appName+"\x1b[0m")
|
||||
console.log("\x1b[31m\t"+"notification.image: " + notification.image+"\x1b[0m")
|
||||
console.log("\x1b[31m\t"+"notification.expireTimeout: " + notification.expireTimeout+"\x1b[0m")
|
||||
console.log("\x1b[31m\t"+"notification.resident: " + notification.resident+"\x1b[0m")
|
||||
console.log("\x1b[31m\t"+"notification.id: " + notification.id+"\x1b[0m")
|
||||
console.log("\x1b[31m\t"+"notification.actions: " + notification.actions+"\x1b[0m")
|
||||
if (notification.actions != []) {
|
||||
for (const notificationAction of notification.actions) {
|
||||
console.log("\x1b[31m\t"+"notification.actions: "+ notificationAction+"\x1b[0m")
|
||||
console.log("\x1b[31m\t"+"notification.actions.text: "+ notificationAction.text+"\x1b[0m")
|
||||
console.log("\x1b[31m\t"+"notification.actions.identifier: "+ notificationAction.identifier+"\x1b[0m")
|
||||
}
|
||||
}
|
||||
console.log("\x1b[31m\t"+"notification.urgency: " + notification.urgency+"\x1b[0m")
|
||||
console.log("\x1b[31m\t"+"notification.appIcon: " + notification.appIcon + " | " + Quickshell.iconPath(notification.appIcon)+"\x1b[0m")
|
||||
console.log("\x1b[31m\t"+"notification.desktopEntry: " + notification.desktopEntry+"\x1b[0m")
|
||||
console.log("\x1b[31m\t"+"notification.hints: " + notification.hints+"\x1b[0m")
|
||||
for (const item of Object.keys(notification.hints)) {
|
||||
console.log("\x1b[31m\t"+"notification.hints[\""+ item +"\"]: " + notification.hints[item]+"\x1b[0m")
|
||||
}
|
||||
console.log("\x1b[31m\t"+"notification.summary: " + notification.summary+"\x1b[0m")
|
||||
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")
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,19 @@
|
||||
import QtQuick
|
||||
import Quickshell
|
||||
import "./notificationServer"
|
||||
|
||||
|
||||
Item {
|
||||
id: notification_root
|
||||
Repeater { // Bars
|
||||
model: Quickshell.screens
|
||||
delegate: Loader {
|
||||
active: true // loads object
|
||||
sourceComponent: Notification {screen: modelData} // creates instance of bar component
|
||||
}
|
||||
}
|
||||
|
||||
Component.onCompleted: {
|
||||
console.log("[NotificationLoader]:", NotificationS)
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,98 @@
|
||||
pragma Singleton
|
||||
|
||||
import QtQuick
|
||||
import Quickshell
|
||||
import Quickshell.Io
|
||||
import Quickshell.Hyprland
|
||||
import Quickshell.Services.Notifications
|
||||
import "../../../config"
|
||||
|
||||
Item {
|
||||
id: notificationServerState
|
||||
|
||||
property var focusedMonitor: null
|
||||
property var newestNotification: null
|
||||
property bool soundEnabled: true
|
||||
|
||||
signal notificationReceived(var notification)
|
||||
|
||||
function correctMonitor(screen) {
|
||||
return (Hyprland.monitorFor(screen) === focusedMonitor)
|
||||
}
|
||||
|
||||
Process {
|
||||
id: notificationSound
|
||||
command: ["pw-play", "--volume", "0.25", Config.configDir + "/modules/notification/assets/notification.ogg"]
|
||||
function play() {
|
||||
if (running)
|
||||
return
|
||||
Config.debug == "Notification" && console.log(
|
||||
"[NotificationSound] Playing:", Config.configDir + "/modules/notification/assets/notification.ogg"
|
||||
)
|
||||
notificationSound.startDetached()
|
||||
}
|
||||
}
|
||||
|
||||
NotificationServer {
|
||||
id: notificationServer
|
||||
|
||||
actionsSupported: true
|
||||
bodyHyperlinksSupported: true
|
||||
bodyImagesSupported: true
|
||||
actionIconsSupported: true
|
||||
imageSupported: true
|
||||
persistenceSupported: true
|
||||
bodyMarkupSupported: true
|
||||
inlineReplySupported: true
|
||||
|
||||
onNotification: function(notification) {
|
||||
// if(notification.lastGeneration){
|
||||
// console.log(
|
||||
// "[NotificationServer] Closing Notification:",
|
||||
// notification.appName, notification.id, notification.summary, notification.body
|
||||
// )
|
||||
// notification.dismiss()
|
||||
// return
|
||||
// }
|
||||
notification.tracked = true
|
||||
Config.debug == "Notification" && console.log(
|
||||
"[NotificationServer] Notification received:",
|
||||
notification.appName, notification.id, notification.summary, notification.body
|
||||
)
|
||||
|
||||
let timer = notificationTimerComponent.createObject(
|
||||
notificationServerState,
|
||||
{ notification: notification }
|
||||
)
|
||||
|
||||
Hyprland.refreshMonitors()
|
||||
timer.start()
|
||||
}
|
||||
}
|
||||
|
||||
Component {
|
||||
id: notificationTimerComponent
|
||||
|
||||
Timer {
|
||||
required property var notification
|
||||
|
||||
interval: 2000
|
||||
repeat: false
|
||||
|
||||
onTriggered: {
|
||||
focusedMonitor = Hyprland.focusedMonitor
|
||||
notificationReceived(notification)
|
||||
if(!notification.lastGeneration && notificationServerState.soundEnabled){
|
||||
notificationSound.play()
|
||||
}
|
||||
|
||||
destroy()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Component.onCompleted: {
|
||||
focusedMonitor = Hyprland.focusedMonitor
|
||||
Config.debug == "Notification" && console.log("[NotificationServer]: Component completed")
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1 @@
|
||||
singleton NotificationS NotificationServer.qml
|
||||
@@ -62,7 +62,7 @@ Variants {
|
||||
MouseArea {
|
||||
anchors.fill: parent
|
||||
onClicked: {
|
||||
console.log("clicked ???, closing Wallpaper Picker")
|
||||
console.log("clicked Background, closing Wallpaper Picker")
|
||||
wlogoutLoader.active = false
|
||||
}
|
||||
GridLayout {
|
||||
|
||||
@@ -55,6 +55,7 @@ PanelWindow {
|
||||
|
||||
color: "white"
|
||||
placeholderTextColor: "#888"
|
||||
font.family: Config.font
|
||||
|
||||
background: Rectangle {
|
||||
|
||||
@@ -67,7 +68,7 @@ PanelWindow {
|
||||
Keys.onReleased: (event) => {
|
||||
if (event.key === Qt.Key_Escape) {
|
||||
console.log("Escape pressed inside TextField")
|
||||
console.log("Pressed Escape, closing Wallpaper Picker")
|
||||
// console.log("Pressed Escape, closing Wallpaper Picker")
|
||||
// wallpaperLoader.active = false
|
||||
filterText.text = ""
|
||||
filterText.focus = false
|
||||
@@ -75,6 +76,13 @@ PanelWindow {
|
||||
pickerScope.focus = true
|
||||
}
|
||||
}
|
||||
onAccepted: {
|
||||
console.log("Enter pressed inside TextField")
|
||||
filterText.text = ""
|
||||
filterText.focus = false
|
||||
event.accepted = true
|
||||
pickerScope.focus = true
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
@@ -4,6 +4,7 @@ import Quickshell //for PanelWindow
|
||||
import Quickshell.Hyprland
|
||||
import QtQuick //for Text
|
||||
import "./modules/bar"
|
||||
import "./modules/notification"
|
||||
import "./modules/wp"
|
||||
import "./modules/wlogout"
|
||||
import "./modules/jl"
|
||||
@@ -16,6 +17,9 @@ ShellRoot {
|
||||
// Bar
|
||||
BarLoader {}
|
||||
|
||||
// Notifications
|
||||
NotificationLoader {}
|
||||
|
||||
//Wallpaper picker
|
||||
WallpaperPickerLoader {}
|
||||
|
||||
@@ -36,4 +40,12 @@ ShellRoot {
|
||||
function openWlogout() {
|
||||
wlLoader.openWlogout()
|
||||
}
|
||||
|
||||
GlobalShortcut {
|
||||
name: "QsReload"
|
||||
|
||||
onPressed: {
|
||||
Quickshell.reload(false)
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user