never/noctalia-shell
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix notification and other small fixes

Browse source
This commit is contained in:
Ly-sec 2025-08-05 20:15:11 +02:00
parent fb68300746
commit 69d84752f3
10 changed files with 366 additions and 338 deletions
Download patch file Download diff file Expand all files Collapse all files

17
Helpers/IPCHandlers.qml
View file

@ -6,7 +6,7 @@ IpcHandler {
property var appLauncherPanel
property var lockScreen
property IdleInhibitor idleInhibitor
property var notificationPopupVariants
property var notificationPopup
target: "globalIPC"
@ -17,18 +17,11 @@ IpcHandler {
function toggleNotificationPopup(): void {
console.log("[IPC] NotificationPopup toggle() called")
if (notificationPopupVariants) {
for (let i = 0; i < notificationPopupVariants.count; i++) {
let popup = notificationPopupVariants.objectAt(i);
if (popup) {
popup.togglePopup();
}
}
}
// Use the global toggle function from the notification manager
notificationPopup.togglePopup();
}
// Toggle Applauncher visibility
function toggleLauncher(): void {
if (!appLauncherPanel) {
console.warn("AppLauncherIpcHandler: appLauncherPanel not set!");
@ -42,7 +35,7 @@ IpcHandler {
}
}
// Toggle LockScreen
function toggleLock(): void {
if (!lockScreen) {
console.warn("LockScreenIpcHandler: lockScreen not set!");

4
Settings/Settings.qml
View file

@ -81,7 +81,7 @@ Singleton {
// Monitor/Display Settings
property var barMonitors: [] // Array of monitor names to show the bar on
property var dockMonitors: [] // Array of monitor names to show the dock on
property var notificationMonitors: [] // Array of monitor names to show notifications on
property var notificationMonitors: [] // Array of monitor names to show notifications on, "*" means all monitors
}
}
@ -90,5 +90,7 @@ Singleton {
function onRandomWallpaperChanged() { WallpaperManager.toggleRandomWallpaper() }
function onWallpaperIntervalChanged() { WallpaperManager.restartRandomWallpaperTimer() }
function onWallpaperFolderChanged() { WallpaperManager.loadWallpapers() }
function onNotificationMonitorsChanged() {
}
}
}

69
Widgets/Notification/NotificationPopup.qml
View file

@ -4,17 +4,63 @@ import Quickshell
import Quickshell.Widgets
import qs.Settings
// Main container that manages multiple notification popups for different monitors
Item {
id: notificationManager
anchors.fill: parent
// Get list of available monitors/screens
property var monitors: Quickshell.screens || []
// Global visibility state for all notification popups
property bool notificationsVisible: true
function togglePopup(): void {
console.log("[NotificationManager] Current state: " + notificationsVisible);
notificationsVisible = !notificationsVisible;
console.log("[NotificationManager] New state: " + notificationsVisible);
}
// Create a notification popup for each monitor
Repeater {
model: notificationManager.monitors
delegate: Item {
id: delegateItem
// Make addNotification accessible from the Item level
function addNotification(notification) {
if (panelWindow) {
panelWindow.addNotification(notification);
}
}
PanelWindow {
id: window
id: panelWindow
implicitWidth: 350
implicitHeight: notificationColumn.implicitHeight
implicitHeight: Math.max(notificationColumn.height, 0)
color: "transparent"
visible: notificationsVisible && notificationModel.count > 0
screen: (typeof modelData !== 'undefined' ? modelData : Quickshell.primaryScreen)
visible: notificationManager.notificationsVisible && notificationModel.count > 0 && shouldShowOnThisMonitor
screen: modelData
focusable: false
property bool barVisible: true
property bool notificationsVisible: true
property bool notificationsVisible: notificationManager.notificationsVisible
// Check if this monitor should show notifications - make it reactive to settings changes
property bool shouldShowOnThisMonitor: {
let notificationMonitors = Settings.settings.notificationMonitors || [];
let currentScreenName = modelData ? modelData.name : "";
return notificationMonitors.includes("*") ||
notificationMonitors.includes(currentScreenName);
}
// Watch for changes in notification monitors setting
Connections {
target: Settings.settings
function onNotificationMonitorsChanged() {
// Settings changed, visibility will update automatically
}
}
anchors.top: true
anchors.right: true
@ -28,12 +74,6 @@ PanelWindow {
property int maxVisible: 5
property int spacing: 5
function togglePopup(): void {
console.log("[NotificationPopup] Current state: " + notificationsVisible);
notificationsVisible = !notificationsVisible;
console.log("[NotificationPopup] New state: " + notificationsVisible);
}
function addNotification(notification) {
notificationModel.insert(0, {
id: notification.id,
@ -308,8 +348,11 @@ PanelWindow {
Connections {
target: Quickshell
function onScreensChanged() {
if (window.screen) {
x = window.screen.width - width - 20;
if (panelWindow.screen) {
x = panelWindow.screen.width - panelWindow.width - 20;
}
}
}
}
}
}

2
Widgets/SettingsWindow/Tabs/About.qml
View file

@ -255,7 +255,7 @@ Item {
font.pixelSize: 14
color: Theme.textSecondary
Layout.alignment: Qt.AlignCenter
Layout.topMargin: 16
Layout.topMargin: 24
}

17
Widgets/SettingsWindow/Tabs/Display.qml
View file

@ -14,6 +14,17 @@ ColumnLayout {
// Get list of available monitors/screens
property var monitors: Quickshell.screens || []
// Sorted monitors by name
property var sortedMonitors: {
let sorted = [...monitors];
sorted.sort((a, b) => {
let nameA = a.name || "Unknown";
let nameB = b.name || "Unknown";
return nameA.localeCompare(nameB);
});
return sorted;
}
Item {
Layout.fillWidth: true
Layout.preferredHeight: 0
@ -68,7 +79,7 @@ ColumnLayout {
spacing: 8
Repeater {
model: root.monitors
model: root.sortedMonitors
delegate: Rectangle {
id: barCheckbox
property bool isChecked: false
@ -171,7 +182,7 @@ ColumnLayout {
spacing: 8
Repeater {
model: root.monitors
model: root.sortedMonitors
delegate: Rectangle {
id: dockCheckbox
property bool isChecked: false
@ -277,7 +288,7 @@ ColumnLayout {
spacing: 8
Repeater {
model: root.monitors
model: root.sortedMonitors
delegate: Rectangle {
id: notificationCheckbox
property bool isChecked: false

6
Widgets/SettingsWindow/Tabs/General.qml
View file

@ -107,15 +107,11 @@ ColumnLayout {
}
}
Item {
Layout.fillWidth: true
Layout.preferredHeight: 16
}
ColumnLayout {
spacing: 4
Layout.fillWidth: true
Layout.topMargin: 58
Text {
text: "User Interface"

2
Widgets/SettingsWindow/Tabs/Network.qml
View file

@ -101,7 +101,7 @@ ColumnLayout {
ColumnLayout {
spacing: 16
Layout.fillWidth: true
Layout.topMargin: 16
Layout.topMargin: 58
Text {
text: "Bluetooth"

2
Widgets/SettingsWindow/Tabs/TimeWeather.qml
View file

@ -172,7 +172,7 @@ ColumnLayout {
ColumnLayout {
spacing: 4
Layout.fillWidth: true
Layout.topMargin: 16
Layout.topMargin: 58
Text {
text: "Weather"

47
shell.qml
View file

@ -22,17 +22,18 @@ Scope {
property var notificationHistoryWin: notificationHistoryWin
property bool pendingReload: false
// Round volume to nearest 5% increment for consistent control
// Helper function to round value to nearest step
function roundToStep(value, step) {
return Math.round(value / step) * step;
}
// Current audio volume (0-100), synced with system
// Volume property reflecting current audio volume in 0-100
// Will be kept in sync dynamically below
property int volume: (defaultAudioSink && defaultAudioSink.audio && !defaultAudioSink.audio.muted)
? Math.round(defaultAudioSink.audio.volume * 100)
: 0
// Update volume with 5-step increments and apply to audio sink
// Function to update volume with clamping, stepping, and applying to audio sink
function updateVolume(vol) {
var clamped = Math.max(0, Math.min(100, vol));
var stepped = roundToStep(clamped, 5);
@ -52,13 +53,8 @@ Scope {
property var notificationHistoryWin: notificationHistoryWin
}
// Create dock for each monitor (respects dockMonitors setting)
Variants {
model: Quickshell.screens
Dock {
property var modelData
}
id: dock
}
Applauncher {
@ -83,17 +79,16 @@ Scope {
NotificationServer {
id: notificationServer
onNotification: function (notification) {
console.log("Notification received:", notification.appName);
notification.tracked = true;
// Distribute notification to all visible notification popups
for (let i = 0; i < notificationPopupVariants.count; i++) {
let popup = notificationPopupVariants.objectAt(i);
if (popup && popup.notificationsVisible) {
popup.addNotification(notification);
if (notificationPopup.notificationsVisible) {
// Add notification to all popup instances
for (let i = 0; i < notificationPopup.children.length; i++) {
let child = notificationPopup.children[i];
if (child.addNotification) {
child.addNotification(notification);
}
}
}
if (notificationHistoryWin) {
notificationHistoryWin.addToHistory({
id: notification.id,
@ -107,19 +102,8 @@ Scope {
}
}
// Create notification popups for each selected monitor
Variants {
id: notificationPopupVariants
model: Quickshell.screens
NotificationPopup {
property var modelData
barVisible: bar.visible
screen: modelData
visible: notificationsVisible && notificationModel.count > 0 &&
(Settings.settings.notificationMonitors.includes(modelData.name) ||
(Settings.settings.notificationMonitors.length === 0)) // Show on all if none selected
}
id: notificationPopup
}
NotificationHistory {
@ -137,7 +121,7 @@ Scope {
appLauncherPanel: appLauncherPanel
lockScreen: lockScreen
idleInhibitor: idleInhibitor
notificationPopupVariants: notificationPopupVariants
notificationPopup: notificationPopup
}
Connections {
@ -154,12 +138,11 @@ Scope {
Timer {
id: reloadTimer
interval: 500
interval: 500 // ms
repeat: false
onTriggered: Quickshell.reload(true)
}
// Handle screen configuration changes (delay reload if locked)
Connections {
target: Quickshell
function onScreensChanged() {