diff --git a/modules/notifications/NotiServer.qml b/modules/notifications/NotiServer.qml index d2e3efe..d917aae 100644 --- a/modules/notifications/NotiServer.qml +++ b/modules/notifications/NotiServer.qml @@ -2,6 +2,7 @@ pragma ComponentBehavior: Bound pragma Singleton import Quickshell.Services.Notifications import QtQuick +import Quickshell.Io NotificationServer { bodyMarkupSupported: true diff --git a/modules/notifications/NotificationCard.qml b/modules/notifications/NotificationCard.qml index 3516309..aa86558 100644 --- a/modules/notifications/NotificationCard.qml +++ b/modules/notifications/NotificationCard.qml @@ -17,7 +17,9 @@ Rectangle { id: dismissTimer interval: 5000 running: true - onTriggered: notifyItem.modelData.dismiss() + onTriggered: { + parent.modelData.expire(); + } } RowLayout { diff --git a/modules/widgets/SettingsApp/MainWindow.qml b/modules/widgets/SettingsApp/MainWindow.qml index e4efa08..4bfcda1 100644 --- a/modules/widgets/SettingsApp/MainWindow.qml +++ b/modules/widgets/SettingsApp/MainWindow.qml @@ -11,6 +11,7 @@ import qs.reusables FloatingWindow { id: root color: Colors.surface + title: "qs-settings" implicitWidth: 800 implicitHeight: 600 ListModel { @@ -35,7 +36,6 @@ FloatingWindow { RowLayout { id: windowLayout anchors.fill: parent - spacing: 50 ClippingWrapperRectangle { id: pageWrapper @@ -82,7 +82,6 @@ FloatingWindow { } Loader { id: contentLoader - Layout.alignment: Qt.AlignCenter Layout.fillHeight: true Layout.fillWidth: true Layout.margins: 20 diff --git a/modules/widgets/SettingsApp/WelcomePage.qml b/modules/widgets/SettingsApp/WelcomePage.qml index 254771d..495afbc 100644 --- a/modules/widgets/SettingsApp/WelcomePage.qml +++ b/modules/widgets/SettingsApp/WelcomePage.qml @@ -1,12 +1,33 @@ import QtQuick import qs import qs.reusables +import Quickshell.Widgets +import QtQuick.Layouts -Item { +ClippingWrapperRectangle { id: root - implicitWidth: 300 - implicitHeight: 300 - CustomText { - text: "I am the welcome page" + anchors.centerIn: parent + clip: true + color: Colors.surfaceContainerHighest + radius: 12 + margin: 20 + ColumnLayout { + id: pageLayout + spacing: 0 + anchors.top: parent.top + CustomText { + + text: "Welcome!" + font.pixelSize: 24 + font.bold: true + } + CustomText { + + text: "we love women here" + } + Item { + id: sping + Layout.fillHeight: true + } } }