zach/z-bar-qt
1
1
Fork 0
Code Issues 23 Pull Requests 3 Actions Packages Projects 1 Releases Wiki Activity

feat: dashboard show on hover, media and weather tabs added

Browse Source
This commit is contained in:
zach
2026-09-30 14:22:22 +02:00
parent d259c6ffbe
commit 2c90339c77
97 changed files with 4480 additions and 990 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Modules/Notifications/Sidebar/Content.qml
+2 -4
View File
@@ -7,8 +7,7 @@ import qs.Services
Item {
id: root
required property Props props
required property var visibilities
required property ScreenState screenState
ColumnLayout {
id: layout
@@ -23,8 +22,7 @@ Item {
radius: Tokens.rounding.small
NotifDock {
props: root.props
visibilities: root.visibilities
screenState: root.screenState
}
}
Modules/Notifications/Sidebar/Notif.qml
+2 -3
View File
@@ -15,8 +15,7 @@ CustomRect {
required property bool expanded
required property NotifServer.Notif modelData
readonly property real nonAnimHeight: expanded ? summary.implicitHeight + expandedContent.implicitHeight + expandedContent.anchors.topMargin + Tokens.padding.medium * 2 : summaryHeightMetrics.height
required property Props props
required property PersistentProperties visibilities
required property ScreenState screenState
color: {
const c = root.modelData?.urgency === "critical" ? Colors.palette.m3secondaryContainer : Colors.layer(Colors.palette.m3surfaceContainerHigh, 2);
@@ -137,7 +136,7 @@ CustomRect {
onLinkActivated: link => {
Qt.openUrlExternally(link);
root.visibilities.sidebar = false;
root.screenState.sidebar = false;
}
}
Modules/Notifications/Sidebar/NotifDock.qml
+2 -4
View File
@@ -14,8 +14,7 @@ Item {
id: root
readonly property int notifCount: NotifServer.list.reduce((acc, n) => n.closed ? acc : acc + 1, 0)
required property Props props
required property var visibilities
required property ScreenState screenState
anchors.fill: parent
anchors.margins: Tokens.padding.small
@@ -120,8 +119,7 @@ Item {
id: notifList
container: view
props: root.props
visibilities: root.visibilities
screenState: root.screenState
}
}
}
Modules/Notifications/Sidebar/NotifDockList.qml
+2 -4
View File
@@ -12,8 +12,7 @@ LazyListView {
id: root
required property Flickable container
required property Props props
required property PersistentProperties visibilities
required property ScreenState screenState
anchors.left: parent?.left
anchors.right: parent?.right
@@ -118,8 +117,7 @@ LazyListView {
container: root.container
modelData: notif.modelData
props: root.props
visibilities: root.visibilities
screenState: root.screenState
}
}
}
Modules/Notifications/Sidebar/NotifGroup.qml
+6 -8
View File
@@ -16,7 +16,7 @@ CustomRect {
readonly property list<var> activeNotifs: notifs.filter(n => !n.closed)
readonly property string appIcon: activeNotifs.find(n => n.appIcon.length > 0)?.appIcon ?? ""
required property Flickable container
readonly property bool expanded: props.expandedNotifs.includes(modelData)
readonly property bool expanded: screenState.expandedNotifs.includes(modelData)
readonly property string image: activeNotifs.find(n => n.image.length > 0)?.image ?? ""
required property string modelData
readonly property int nonAnimHeight: {
@@ -26,7 +26,7 @@ CustomRect {
}
readonly property int notifCount: activeNotifs.length
readonly property list<var> notifs: NotifServer.list.filter(n => n.appName === modelData)
required property Props props
required property ScreenState screenState
readonly property int urgency: {
if (activeNotifs.find(n => n.urgency === NotificationUrgency.Critical))
return NotificationUrgency.Critical;
@@ -34,14 +34,13 @@ CustomRect {
return NotificationUrgency.Normal;
return NotificationUrgency.Low;
}
required property PersistentProperties visibilities
function toggleExpand(expand: bool): void {
if (expand) {
if (!expanded)
props.expandedNotifs.push(modelData);
screenState.expandedNotifs.push(modelData);
} else if (expanded) {
props.expandedNotifs.splice(props.expandedNotifs.indexOf(modelData), 1);
screenState.expandedNotifs.splice(screenState.expandedNotifs.indexOf(modelData), 1);
}
}
@@ -59,7 +58,7 @@ CustomRect {
Component.onDestruction: {
if (notifCount === 0 && expanded)
props.expandedNotifs.splice(props.expandedNotifs.indexOf(modelData), 1);
screenState.expandedNotifs.splice(screenState.expandedNotifs.indexOf(modelData), 1);
}
RowLayout {
@@ -233,8 +232,7 @@ CustomRect {
container: root.container
expanded: root.expanded
notifs: root.notifs
props: root.props
visibilities: root.visibilities
screenState: root.screenState
onRequestToggleExpand: expand => root.toggleExpand(expand)
}
Modules/Notifications/Sidebar/NotifGroupList.qml
+2 -4
View File
@@ -14,8 +14,7 @@ LazyListView {
required property Flickable container
required property bool expanded
required property list<var> notifs
required property Props props
required property PersistentProperties visibilities
required property ScreenState screenState
signal requestToggleExpand(expand: bool)
@@ -122,8 +121,7 @@ LazyListView {
anchors.fill: parent
expanded: root.expanded
modelData: notif.modelData
props: root.props
visibilities: root.visibilities
screenState: root.screenState
}
}
}
Modules/Notifications/Sidebar/Props.qml
-7
View File
@@ -1,7 +0,0 @@
import Quickshell
PersistentProperties {
property list<string> expandedNotifs: []
reloadableId: "sidebar"
}
Modules/Notifications/Sidebar/Utils/Cards/Record.qml
+5 -6
View File
@@ -11,8 +11,8 @@ import qs.Services
CustomRect {
id: root
required property var props
required property PersistentProperties visibilities
required property ScreenState screenState
Layout.fillWidth: true
color: Colors.tPalette.m3surfaceContainer
@@ -72,7 +72,7 @@ CustomRect {
}
SplitButton {
active: menuItems.find(m => root.props.recordingMode === m.icon + m.text) ?? menuItems[0]
active: menuItems.find(m => root.screenState.recordingMode === m.icon + m.text) ?? menuItems[0]
enabled: !Recorder.running
menuOnTop: true
@@ -107,7 +107,7 @@ CustomRect {
}
]
menu.onItemSelected: item => root.props.recordingMode = item.icon + item.text
menu.onItemSelected: item => root.screenState.recordingMode = item.icon + item.text
}
}
@@ -190,8 +190,7 @@ CustomRect {
id: recordingList
RecordingList {
props: root.props
visibilities: root.visibilities
screenState: root.screenState
}
}
Modules/Notifications/Sidebar/Utils/Cards/RecordingList.qml
+21 -16
View File
@@ -14,8 +14,7 @@ import qs.Services
ColumnLayout {
id: root
required property var props
required property PersistentProperties visibilities
required property ScreenState screenState
spacing: 0
@@ -23,7 +22,7 @@ ColumnLayout {
Layout.fillWidth: true
cursorShape: Qt.PointingHandCursor
onClicked: root.props.recordingListExpanded = !root.props.recordingListExpanded
onClicked: root.screenState.recordingListExpanded = !root.screenState.recordingListExpanded
RowLayout {
spacing: Tokens.spacing.small
@@ -42,11 +41,11 @@ ColumnLayout {
}
IconButton {
icon: root.props.recordingListExpanded ? "unfold_less" : "unfold_more"
icon: root.screenState.recordingListExpanded ? "unfold_less" : "unfold_more"
label.animate: true
type: IconButton.Text
onClicked: root.props.recordingListExpanded = !root.props.recordingListExpanded
onClicked: root.screenState.recordingListExpanded = !root.screenState.recordingListExpanded
}
}
}
@@ -57,7 +56,7 @@ ColumnLayout {
Layout.fillWidth: true
Layout.rightMargin: -Tokens.spacing.small
clip: true
implicitHeight: (Tokens.font.size.larger + Tokens.padding.extraSmall) * (root.props.recordingListExpanded ? 10 : 3)
implicitHeight: (Tokens.font.size.larger + Tokens.padding.extraSmall) * (root.screenState.recordingListExpanded ? 10 : 3)
CustomScrollBar.vertical: CustomScrollBar {
flickable: list
@@ -109,8 +108,11 @@ ColumnLayout {
type: IconButton.Text
onClicked: {
root.visibilities.sidebar = false;
Quickshell.execDetached(["app2unit", "--", ...Config.general.apps.playback, recording.modelData.path]);
root.screenState.sidebar = false;
if (Config.launcher.uwsm)
Quickshell.execDetached(["app2unit", "--", ...Config.general.apps.playback, recording.modelData.path]);
else
Quickshell.execDetached([...Config.general.apps.playback, recording.modelData.path]);
}
}
@@ -119,8 +121,11 @@ ColumnLayout {
type: IconButton.Text
onClicked: {
root.visibilities.sidebar = false;
Quickshell.execDetached(["app2unit", "--", ...Config.general.apps.explorer, recording.modelData.path]);
root.screenState.sidebar = false;
if (Config.launcher.uwsm)
Quickshell.execDetached(["app2unit", "--", ...Config.general.apps.explorer, recording.modelData.path]);
else
Quickshell.execDetached([...Config.general.apps.explorer, recording.modelData.path]);
}
}
}
@@ -170,11 +175,11 @@ ColumnLayout {
MaterialIcon {
Layout.alignment: Qt.AlignHCenter
Layout.preferredHeight: root.props.recordingListExpanded ? implicitHeight : 0
Layout.preferredHeight: root.screenState.recordingListExpanded ? implicitHeight : 0
color: Colors.palette.m3outline
font.pointSize: Tokens.font.size.extraLarge
opacity: root.props.recordingListExpanded ? 1 : 0
scale: root.props.recordingListExpanded ? 1 : 0
opacity: root.screenState.recordingListExpanded ? 1 : 0
scale: root.screenState.recordingListExpanded ? 1 : 0
text: "scan_delete"
Behavior on Layout.preferredHeight {
@@ -196,10 +201,10 @@ ColumnLayout {
MaterialIcon {
Layout.alignment: Qt.AlignHCenter
Layout.preferredWidth: !root.props.recordingListExpanded ? implicitWidth : 0
Layout.preferredWidth: !root.screenState.recordingListExpanded ? implicitWidth : 0
color: Colors.palette.m3outline
opacity: !root.props.recordingListExpanded ? 1 : 0
scale: !root.props.recordingListExpanded ? 1 : 0
opacity: !root.screenState.recordingListExpanded ? 1 : 0
scale: !root.screenState.recordingListExpanded ? 1 : 0
text: "scan_delete"
Behavior on Layout.preferredWidth {
Modules/Notifications/Sidebar/Utils/Cards/Toggles.qml
+3 -5
View File
@@ -12,13 +12,11 @@ import qs.Services
import qs.Helpers
import qs.Daemons
import qs.Modules.Settings
import qs.Modules.Bar.Popouts as BarPopouts
CustomRect {
id: root
readonly property bool needExtraRow: quickToggles.length > 6
required property BarPopouts.Wrapper popouts
readonly property var quickToggles: {
const seenIds = new Set();
@@ -40,8 +38,8 @@ CustomRect {
return true;
});
}
required property ScreenState screenState
readonly property int splitIndex: Math.ceil(quickToggles.length / 2)
required property PersistentProperties visibilities
color: Colors.tPalette.m3surfaceContainer
implicitHeight: layout.implicitHeight + Tokens.padding.extraLargeIncreased
@@ -168,8 +166,8 @@ CustomRect {
isToggle: false
onClicked: {
root.visibilities.sidebar = false;
root.visibilities.settings = true;
root.screenState.sidebar = false;
root.screenState.settings = true;
}
}
}
Modules/Notifications/Sidebar/Utils/Content.qml
+4 -8
View File
@@ -1,16 +1,14 @@
import Quickshell
import QtQuick
import QtQuick.Layouts
import qs.Modules.Bar.Popouts as BarPopouts
import qs.Components
import qs.Modules.Notifications.Sidebar.Utils.Cards
import ZShell.Config
Item {
id: root
required property BarPopouts.Wrapper popouts
required property PersistentProperties props
required property var visibilities
required property ScreenState screenState
implicitHeight: layout.implicitHeight
implicitWidth: layout.implicitWidth
@@ -25,15 +23,13 @@ Item {
}
Record {
props: root.props
visibilities: root.visibilities
screenState: root.screenState
z: 1
}
Toggles {
Layout.fillWidth: true
popouts: root.popouts
visibilities: root.visibilities
screenState: root.screenState
}
}
}
Modules/Notifications/Sidebar/Utils/Wrapper.qml
+3 -13
View File
@@ -10,17 +10,9 @@ Item {
id: root
property real offsetScale: shouldBeActive ? 0 : 1
required property BarPopouts.Wrapper popouts
readonly property PersistentProperties props: PersistentProperties {
property string recordingConfirmDelete
property bool recordingListExpanded: false
property string recordingMode
reloadableId: "utilities"
}
readonly property bool shouldBeActive: visibilities.sidebar
required property ScreenState screenState
readonly property bool shouldBeActive: screenState.sidebar && !sidebar.chatActive
required property Item sidebar
required property var visibilities
anchors.bottomMargin: (-implicitHeight - 5) * offsetScale
implicitHeight: content.implicitHeight + 8 * 2
@@ -45,9 +37,7 @@ Item {
sourceComponent: Content {
implicitWidth: root.implicitWidth - 8 * 2
popouts: root.popouts
props: root.props
visibilities: root.visibilities
screenState: root.screenState
}
}
}
Modules/Notifications/Sidebar/Wrapper.qml
+4 -6
View File
@@ -7,12 +7,11 @@ import QtQuick
Item {
id: root
readonly property bool chatActive: screenState.sidebarTab === 1
property real offsetScale: shouldBeActive ? 0 : 1
required property var panels
readonly property Props props: Props {
}
readonly property bool shouldBeActive: root.visibilities.sidebar && Config.sidebar.enabled
required property var visibilities
required property ScreenState screenState
readonly property bool shouldBeActive: root.screenState.sidebar && Config.sidebar.enabled
anchors.rightMargin: (-implicitWidth - 5) * offsetScale
implicitWidth: Config.sidebar.sizes.width
@@ -38,8 +37,7 @@ Item {
sourceComponent: Content {
implicitWidth: Config.sidebar.sizes.width - Tokens.padding.small * 2
props: root.props
visibilities: root.visibilities
screenState: root.screenState
}
}
}