amaro/Quickbar
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

change some colors and styling, fix a issue with activeAsync in notifications Window

Browse Source
This commit is contained in:
Amaro Lopes
2025-10-12 21:57:14 -03:00
parent 5cdc0d3c1e
commit e4087938a5
4 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Common/CalendarComponent.qml
View File

@@ -1,6 +1,5 @@
// CalendarComponent.qml (For one month) // CalendarComponent.qml (For one month)
import QtQuick import QtQuick
import QtQuick.Controls
import qs.Common import qs.Common
import qs.Common.Styled import qs.Common.Styled
@@ -93,7 +92,7 @@ Item {
let isCurrentMonth = root.targetYear === root.currentDate.getFullYear() && root.targetMonth === root.currentDate.getMonth(); let isCurrentMonth = root.targetYear === root.currentDate.getFullYear() && root.targetMonth === root.currentDate.getMonth();
let isCurrentDay = isCurrentMonth && modelData === root.currentDate.getDate(); let isCurrentDay = isCurrentMonth && modelData === root.currentDate.getDate();
return isCurrentDay ? Theme.color6Bright : Theme.textColor; return isCurrentDay ? Theme.color5Bright : Theme.textColor;
} }
} }
} }

20
NotificationsWidget.qml
View File

@@ -23,28 +23,28 @@ Item {
name: "MuteActive" name: "MuteActive"
when: NotificationService.notificationsMuted && NotificationService.notificationsNumber when: NotificationService.notificationsMuted && NotificationService.notificationsNumber
PropertyChanges { PropertyChanges {
root.notificationIcon : "\udb80\udc9b " + NotificationService.notificationsNumber root.notificationIcon: "\udb80\udc9b " + NotificationService.notificationsNumber
} }
}, },
State { State {
name: "Active" name: "Active"
when: !NotificationService.notificationsMuted && NotificationService.notificationsNumber when: !NotificationService.notificationsMuted && NotificationService.notificationsNumber
PropertyChanges { PropertyChanges {
root.notificationIcon : "\udb80\udc9a " + NotificationService.notificationsNumber root.notificationIcon: "\udb80\udc9a " + NotificationService.notificationsNumber
} }
}, },
State { State {
name: "MuteEmpty" name: "MuteEmpty"
when: NotificationService.notificationsMuted when: NotificationService.notificationsMuted
PropertyChanges { PropertyChanges {
root.notificationIcon : "\uec08" root.notificationIcon: "\uec08"
} }
}, },
State { State {
name: "Empty" name: "Empty"
when: !NotificationService.notificationsMuted && !NotificationService.notificationsNumber when: !NotificationService.notificationsMuted && !NotificationService.notificationsNumber
PropertyChanges { PropertyChanges {
root.notificationIcon : "\ueaa2" root.notificationIcon: "\ueaa2"
} }
} }
] ]
@@ -65,7 +65,7 @@ Item {
id: notifText id: notifText
anchors.fill: parent anchors.fill: parent
text: root.notificationIcon text: root.notificationIcon
} }
MouseArea { MouseArea {
@@ -74,9 +74,10 @@ Item {
onClicked: mouse => { onClicked: mouse => {
if (mouse.button === Qt.RightButton) { if (mouse.button === Qt.RightButton) {
NotificationService.manualNotificationsMuted = !NotificationService.manualNotificationsMuted NotificationService.manualNotificationsMuted = !NotificationService.manualNotificationsMuted;
return; return;
} }
console.log(root.createWindow);
root.createWindow = !root.createWindow; root.createWindow = !root.createWindow;
} }
} }
@@ -85,11 +86,10 @@ Item {
LazyLoader { LazyLoader {
id: windowLoader id: windowLoader
activeAsync: NotificationService.notificationsNumber ? createWindow : false active: NotificationService.notificationsNumber ? root.createWindow : false
component: NotificationWindow { component: NotificationWindow {
onClear: root.createWindow = false onClear: root.createWindow = false
} }
} }
} }

9
Widgets/NotificationWindow.qml
View File

@@ -8,7 +8,7 @@ import qs.Services
import qs.Widgets import qs.Widgets
import qs.Common.Styled import qs.Common.Styled
import qs.Common import qs.Common
import Quickshell.Wayland import Quickshell.Wayland
PanelWindow { PanelWindow {
id: notificationRoot id: notificationRoot
@@ -32,7 +32,8 @@ PanelWindow {
contentItem { contentItem {
focus: true focus: true
Keys.onPressed: event => { Keys.onPressed: event => {
if (event.key == Qt.Key_Escape) notificationRoot.clear(); if (event.key == Qt.Key_Escape)
notificationRoot.clear();
} }
} }
MouseArea { MouseArea {
@@ -43,7 +44,7 @@ PanelWindow {
Rectangle { Rectangle {
id: notifWindow id: notifWindow
anchors{ anchors {
top: parent.top top: parent.top
left: parent.left left: parent.left
} }
@@ -68,7 +69,7 @@ PanelWindow {
anchors.fill: parent anchors.fill: parent
onClicked: { onClicked: {
while (NotificationService.notificationsNumber != 0) { while (NotificationService.notificationsNumber != 0) {
NotificationService.notificationDismiss(NotificationService.trackedNotifications.get(0).notif) NotificationService.notificationDismiss(NotificationService.trackedNotifications.get(0).notif);
} }
} }
} }

2
Workspaces.qml
View File

@@ -65,7 +65,7 @@ WrapperMouseArea {
when: workspacesRectangle.workspaceActive when: workspacesRectangle.workspaceActive
PropertyChanges { PropertyChanges {
workspacesRectangle { workspacesRectangle {
color: Theme.color6 color: Theme.color5
implicitWidth: Theme.barSize * 1.5 implicitWidth: Theme.barSize * 1.5
} }
} }