diff options
Diffstat (limited to 'accounts/gkleen@sif/shell/quickshell')
24 files changed, 2168 insertions, 422 deletions
diff --git a/accounts/gkleen@sif/shell/quickshell/ActiveWindowDisplay.qml b/accounts/gkleen@sif/shell/quickshell/ActiveWindowDisplay.qml index 57ade488..883f9001 100644 --- a/accounts/gkleen@sif/shell/quickshell/ActiveWindowDisplay.qml +++ b/accounts/gkleen@sif/shell/quickshell/ActiveWindowDisplay.qml | |||
@@ -22,72 +22,144 @@ Item { | |||
22 | width: activeWindowDisplayContent.width | 22 | width: activeWindowDisplayContent.width |
23 | height: parent.height | 23 | height: parent.height |
24 | 24 | ||
25 | Row { | 25 | WrapperMouseArea { |
26 | id: activeWindowDisplayContent | 26 | id: widgetMouseArea |
27 | 27 | ||
28 | width: childrenRect.width | 28 | anchors.fill: parent |
29 | height: parent.height | ||
30 | anchors.verticalCenter: parent.verticalCenter | ||
31 | spacing: 8 | ||
32 | 29 | ||
33 | IconImage { | 30 | hoverEnabled: true |
34 | id: activeWindowIcon | ||
35 | 31 | ||
36 | height: 14 | 32 | Item { |
37 | width: 14 | 33 | anchors.fill: parent |
38 | 34 | ||
39 | anchors.verticalCenter: parent.verticalCenter | 35 | Row { |
36 | id: activeWindowDisplayContent | ||
40 | 37 | ||
41 | source: { | 38 | width: childrenRect.width |
42 | let icon = activeWindowDisplay.windowEntry?.icon | 39 | height: parent.height |
43 | if (typeof icon === 'string' || icon instanceof String) { | 40 | anchors.verticalCenter: parent.verticalCenter |
44 | if (icon.includes("?path=")) { | 41 | spacing: 8 |
45 | const split = icon.split("?path=") | 42 | |
46 | if (split.length !== 2) | 43 | IconImage { |
44 | id: activeWindowIcon | ||
45 | |||
46 | implicitSize: 14 | ||
47 | |||
48 | anchors.verticalCenter: parent.verticalCenter | ||
49 | |||
50 | source: { | ||
51 | let icon = activeWindowDisplay.windowEntry?.icon | ||
52 | if (typeof icon === 'string' || icon instanceof String) { | ||
53 | if (icon.includes("?path=")) { | ||
54 | const split = icon.split("?path=") | ||
55 | if (split.length !== 2) | ||
56 | return icon | ||
57 | const name = split[0] | ||
58 | const path = split[1] | ||
59 | const fileName = name.substring( | ||
60 | name.lastIndexOf("/") + 1) | ||
61 | return `file://${path}/${fileName}` | ||
62 | } else | ||
63 | icon = Quickshell.iconPath(icon); | ||
47 | return icon | 64 | return icon |
48 | const name = split[0] | 65 | } |
49 | const path = split[1] | 66 | return "" |
50 | const fileName = name.substring( | 67 | } |
51 | name.lastIndexOf("/") + 1) | 68 | asynchronous: true |
52 | return `file://${path}/${fileName}` | 69 | smooth: true |
53 | } else | 70 | mipmap: true |
54 | icon = Quickshell.iconPath(icon); | 71 | } |
55 | return icon | 72 | |
73 | Text { | ||
74 | id: windowTitle | ||
75 | |||
76 | width: Math.min(implicitWidth, activeWindowDisplay.maxWidth - activeWindowIcon.width - activeWindowDisplayContent.spacing) | ||
77 | |||
78 | property var appAliases: { "Firefox": "Mozilla Firefox", "mpv Media Player": "mpv", "Thunderbird": "Mozilla Thunderbird", "Thunderbird (LMU)": "Mozilla Thunderbird" } | ||
79 | |||
80 | elide: Text.ElideRight | ||
81 | maximumLineCount: 1 | ||
82 | color: "white" | ||
83 | anchors.verticalCenter: parent.verticalCenter | ||
84 | text: { | ||
85 | if (!activeWindowDisplay.activeWindow) | ||
86 | return ""; | ||
87 | |||
88 | var title = activeWindowDisplay.activeWindow.title; | ||
89 | var appName = activeWindowDisplay.windowEntry?.name; | ||
90 | if (appAliases[appName]) | ||
91 | appName = appAliases[appName]; | ||
92 | if (appName && title.endsWith(appName)) { | ||
93 | const oldTitle = title; | ||
94 | title = title.substring(0, title.length - appName.length); | ||
95 | title = title.replace(/\s*(—|-)\s*$/, ""); | ||
96 | if (!title) | ||
97 | title = oldTitle; | ||
98 | } | ||
99 | return title; | ||
100 | } | ||
56 | } | 101 | } |
57 | return "" | ||
58 | } | 102 | } |
59 | asynchronous: true | ||
60 | smooth: true | ||
61 | mipmap: true | ||
62 | } | 103 | } |
104 | } | ||
105 | |||
106 | Loader { | ||
107 | id: tooltipLoader | ||
108 | |||
109 | active: false | ||
110 | |||
111 | Connections { | ||
112 | target: widgetMouseArea | ||
113 | function onContainsMouseChanged() { | ||
114 | if (widgetMouseArea.containsMouse) | ||
115 | tooltipLoader.active = true; | ||
116 | } | ||
117 | } | ||
118 | |||
119 | PopupWindow { | ||
120 | id: tooltip | ||
121 | |||
122 | property bool nextVisible: widgetMouseArea.containsMouse || tooltipMouseArea.containsMouse | ||
123 | |||
124 | anchor { | ||
125 | item: widgetMouseArea | ||
126 | edges: Edges.Bottom | Edges.Left | ||
127 | } | ||
128 | visible: false | ||
129 | |||
130 | onNextVisibleChanged: hangTimer.restart() | ||
131 | |||
132 | Timer { | ||
133 | id: hangTimer | ||
134 | interval: tooltip.visible ? 100 : 500 | ||
135 | onTriggered: { | ||
136 | tooltip.visible = tooltip.nextVisible; | ||
137 | if (!tooltip.visible) | ||
138 | tooltipLoader.active = false; | ||
139 | } | ||
140 | } | ||
141 | |||
142 | implicitWidth: widgetTooltipText.contentWidth + 16 | ||
143 | implicitHeight: widgetTooltipText.contentHeight + 16 | ||
144 | color: "black" | ||
145 | |||
146 | WrapperMouseArea { | ||
147 | id: tooltipMouseArea | ||
148 | |||
149 | hoverEnabled: true | ||
150 | enabled: true | ||
151 | |||
152 | anchors.centerIn: parent | ||
153 | |||
154 | Text { | ||
155 | id: widgetTooltipText | ||
156 | |||
157 | font.pointSize: 10 | ||
158 | font.family: "Fira Mono" | ||
159 | color: "white" | ||
63 | 160 | ||
64 | Text { | 161 | text: JSON.stringify(Object.assign({}, activeWindowDisplay.activeWindow), null, 2) |
65 | id: windowTitle | ||
66 | |||
67 | width: Math.min(implicitWidth, activeWindowDisplay.maxWidth - activeWindowIcon.width - activeWindowDisplayContent.spacing) | ||
68 | |||
69 | property var appAliases: { "Firefox": "Mozilla Firefox", "mpv Media Player": "mpv", "Thunderbird": "Mozilla Thunderbird", "Thunderbird (LMU)": "Mozilla Thunderbird" } | ||
70 | |||
71 | elide: Text.ElideRight | ||
72 | maximumLineCount: 1 | ||
73 | color: "white" | ||
74 | anchors.verticalCenter: parent.verticalCenter | ||
75 | text: { | ||
76 | if (!activeWindowDisplay.activeWindow) | ||
77 | return ""; | ||
78 | |||
79 | var title = activeWindowDisplay.activeWindow.title; | ||
80 | var appName = activeWindowDisplay.windowEntry?.name; | ||
81 | if (appAliases[appName]) | ||
82 | appName = appAliases[appName]; | ||
83 | if (appName && title.endsWith(appName)) { | ||
84 | const oldTitle = title; | ||
85 | title = title.substring(0, title.length - appName.length); | ||
86 | title = title.replace(/\s*(—|-)\s*$/, ""); | ||
87 | if (!title) | ||
88 | title = oldTitle; | ||
89 | } | 162 | } |
90 | return title; | ||
91 | } | 163 | } |
92 | } | 164 | } |
93 | } | 165 | } |
diff --git a/accounts/gkleen@sif/shell/quickshell/Bar.qml b/accounts/gkleen@sif/shell/quickshell/Bar.qml index aab1607f..f8092604 100644 --- a/accounts/gkleen@sif/shell/quickshell/Bar.qml +++ b/accounts/gkleen@sif/shell/quickshell/Bar.qml | |||
@@ -1,14 +1,11 @@ | |||
1 | import Quickshell | 1 | import Quickshell |
2 | import QtQuick | 2 | import QtQuick |
3 | 3 | ||
4 | |||
5 | PanelWindow { | 4 | PanelWindow { |
6 | id: bar | 5 | id: bar |
7 | 6 | ||
8 | required property var screen | 7 | required property var screen |
9 | 8 | ||
10 | property var calendarMouseArea: clock.calendarMouseArea | ||
11 | |||
12 | anchors { | 9 | anchors { |
13 | top: true | 10 | top: true |
14 | left: true | 11 | left: true |
@@ -66,22 +63,43 @@ PanelWindow { | |||
66 | anchors.verticalCenter: parent.verticalCenter | 63 | anchors.verticalCenter: parent.verticalCenter |
67 | spacing: 0 | 64 | spacing: 0 |
68 | 65 | ||
69 | SystemTray {} | 66 | KeyboardLayout {} |
70 | 67 | ||
71 | Item { | 68 | Item { |
69 | visible: privacy.visible | ||
72 | height: parent.height | 70 | height: parent.height |
73 | width: 4 | 71 | width: 8 - 4 |
74 | } | 72 | } |
75 | 73 | ||
76 | KeyboardLayout {} | 74 | PrivacyWidget { |
75 | id: privacy | ||
76 | } | ||
77 | 77 | ||
78 | Item { | 78 | Item { |
79 | visible: privacy.visible | ||
79 | height: parent.height | 80 | height: parent.height |
80 | width: 4 | 81 | width: 8 - 4 |
81 | } | 82 | } |
82 | 83 | ||
83 | Clock { | 84 | SystemTray {} |
84 | id: clock | 85 | |
86 | PipewireWidget {} | ||
87 | |||
88 | BrightnessWidget {} | ||
89 | |||
90 | BatteryWidget {} | ||
91 | |||
92 | WaylandInhibitorWidget { | ||
93 | window: bar | ||
94 | } | ||
95 | |||
96 | LidSwitchInhibitorWidget {} | ||
97 | |||
98 | Item { | ||
99 | height: parent.height | ||
100 | width: 8 - 4 | ||
85 | } | 101 | } |
102 | |||
103 | Clock {} | ||
86 | } | 104 | } |
87 | } \ No newline at end of file | 105 | } \ No newline at end of file |
diff --git a/accounts/gkleen@sif/shell/quickshell/BatteryWidget.qml b/accounts/gkleen@sif/shell/quickshell/BatteryWidget.qml new file mode 100644 index 00000000..fd031627 --- /dev/null +++ b/accounts/gkleen@sif/shell/quickshell/BatteryWidget.qml | |||
@@ -0,0 +1,130 @@ | |||
1 | import QtQuick | ||
2 | import Quickshell | ||
3 | import Quickshell.Widgets | ||
4 | import Quickshell.Services.UPower | ||
5 | |||
6 | Item { | ||
7 | id: root | ||
8 | |||
9 | height: parent.height | ||
10 | width: batteryIcon.width + 8 | ||
11 | anchors.verticalCenter: parent.verticalCenter | ||
12 | |||
13 | property var batteryDevice: Array.from(UPower.devices.values).find(dev => dev.isLaptopBattery) | ||
14 | |||
15 | WrapperMouseArea { | ||
16 | id: widgetMouseArea | ||
17 | |||
18 | anchors.fill: parent | ||
19 | |||
20 | hoverEnabled: true | ||
21 | |||
22 | Item { | ||
23 | anchors.fill: parent | ||
24 | |||
25 | MaterialDesignIcon { | ||
26 | id: batteryIcon | ||
27 | |||
28 | implicitSize: 14 | ||
29 | anchors.centerIn: parent | ||
30 | |||
31 | icon: { | ||
32 | if (!root.batteryDevice?.ready) | ||
33 | return "battery-unknown"; | ||
34 | |||
35 | if (root.batteryDevice.state == UPowerDeviceState.FullyCharged) | ||
36 | return "power-plug-battery"; | ||
37 | |||
38 | const perdec = 10 * Math.max(1, Math.ceil(root.batteryDevice.percentage * 10)); | ||
39 | if (root.batteryDevice.state == UPowerDeviceState.Charging) | ||
40 | return `battery-charging-${perdec}`; | ||
41 | if (perdec == 100) | ||
42 | return "battery"; | ||
43 | return `battery-${perdec}`; | ||
44 | } | ||
45 | color: { | ||
46 | if (!root.batteryDevice?.ready) | ||
47 | return "#555"; | ||
48 | |||
49 | if (root.batteryDevice.state != UPowerDeviceState.FullyCharged && root.batteryDevice.state != UPowerDeviceState.Charging && root.batteryDevice.timeToEmpty < 20 * 60) | ||
50 | return "#f2201f"; | ||
51 | if (root.batteryDevice.state != UPowerDeviceState.FullyCharged && root.batteryDevice.state != UPowerDeviceState.Charging && root.batteryDevice.timeToEmpty < 40 * 60) | ||
52 | return "#f28a21"; | ||
53 | if (root.batteryDevice.state != UPowerDeviceState.FullyCharged) | ||
54 | return "#fff"; | ||
55 | return "#555"; | ||
56 | } | ||
57 | } | ||
58 | } | ||
59 | } | ||
60 | |||
61 | PopupWindow { | ||
62 | id: tooltip | ||
63 | |||
64 | property bool nextVisible: widgetMouseArea.containsMouse || tooltipMouseArea.containsMouse | ||
65 | |||
66 | anchor { | ||
67 | item: widgetMouseArea | ||
68 | edges: Edges.Bottom | Edges.Left | ||
69 | } | ||
70 | visible: false | ||
71 | |||
72 | onNextVisibleChanged: hangTimer.restart() | ||
73 | |||
74 | Timer { | ||
75 | id: hangTimer | ||
76 | interval: 100 | ||
77 | onTriggered: tooltip.visible = tooltip.nextVisible | ||
78 | } | ||
79 | |||
80 | implicitWidth: widgetTooltipText.contentWidth + 16 | ||
81 | implicitHeight: widgetTooltipText.contentHeight + 16 | ||
82 | color: "black" | ||
83 | |||
84 | WrapperMouseArea { | ||
85 | id: tooltipMouseArea | ||
86 | |||
87 | hoverEnabled: true | ||
88 | enabled: true | ||
89 | |||
90 | anchors.centerIn: parent | ||
91 | |||
92 | Text { | ||
93 | id: widgetTooltipText | ||
94 | |||
95 | font.pointSize: 10 | ||
96 | font.family: "Fira Sans" | ||
97 | color: "white" | ||
98 | |||
99 | text: { | ||
100 | const stateStr = UPowerDeviceState.toString(root.batteryDevice.state); | ||
101 | var outStr = stateStr; | ||
102 | if (root.batteryDevice.state != UPowerDeviceState.FullyCharged) | ||
103 | outStr += ` ${Math.round(root.batteryDevice.percentage * 100)}%`; | ||
104 | |||
105 | function formatTime(t) { | ||
106 | var res = ""; | ||
107 | for (const unit of [{ "s": "h", "v": 3600 }, { "s": "m", "v": 60 }, { "s": "s", "v": 1 }]) { | ||
108 | if (t < unit.v) | ||
109 | continue; | ||
110 | res += Math.floor(t / unit.v) + unit.s; | ||
111 | t %= unit.v; | ||
112 | } | ||
113 | return res; | ||
114 | } | ||
115 | if (root.batteryDevice.timeToEmpty != 0) { | ||
116 | const tStr = formatTime(Math.floor(root.batteryDevice.timeToEmpty / 60) * 60); | ||
117 | if (tStr) | ||
118 | outStr += " " + tStr; | ||
119 | } else if (root.batteryDevice.timeToFull != 0) { | ||
120 | const tStr = formatTime(Math.ceil(root.batteryDevice.timeToFull / 60) * 60); | ||
121 | if (tStr) | ||
122 | outStr += " " + tStr; | ||
123 | } | ||
124 | |||
125 | return outStr; | ||
126 | } | ||
127 | } | ||
128 | } | ||
129 | } | ||
130 | } | ||
diff --git a/accounts/gkleen@sif/shell/quickshell/BrightnessOSD.qml b/accounts/gkleen@sif/shell/quickshell/BrightnessOSD.qml new file mode 100644 index 00000000..a432179e --- /dev/null +++ b/accounts/gkleen@sif/shell/quickshell/BrightnessOSD.qml | |||
@@ -0,0 +1,117 @@ | |||
1 | import QtQuick | ||
2 | import QtQuick.Layouts | ||
3 | import Quickshell | ||
4 | import Quickshell.Widgets | ||
5 | import qs.Services | ||
6 | |||
7 | Scope { | ||
8 | id: root | ||
9 | |||
10 | property bool show: false | ||
11 | property bool inhibited: true | ||
12 | |||
13 | Connections { | ||
14 | target: Brightness | ||
15 | |||
16 | function onCurrBrightnessChanged() { | ||
17 | root.show = true; | ||
18 | hideTimer.restart(); | ||
19 | } | ||
20 | } | ||
21 | |||
22 | onShowChanged: { | ||
23 | if (show) | ||
24 | hideTimer.restart(); | ||
25 | } | ||
26 | |||
27 | Timer { | ||
28 | id: hideTimer | ||
29 | interval: 1000 | ||
30 | onTriggered: root.show = false | ||
31 | } | ||
32 | |||
33 | Timer { | ||
34 | id: startInhibit | ||
35 | interval: 100 | ||
36 | running: true | ||
37 | onTriggered: { | ||
38 | root.show = false; | ||
39 | root.inhibited = false; | ||
40 | } | ||
41 | } | ||
42 | |||
43 | LazyLoader { | ||
44 | active: root.show && !root.inhibited | ||
45 | |||
46 | Variants { | ||
47 | model: Quickshell.screens | ||
48 | |||
49 | delegate: Scope { | ||
50 | id: screenScope | ||
51 | |||
52 | required property var modelData | ||
53 | |||
54 | PanelWindow { | ||
55 | id: window | ||
56 | |||
57 | screen: screenScope.modelData | ||
58 | |||
59 | anchors.top: true | ||
60 | margins.top: screen.height / 2 - 50 + 3.5 | ||
61 | exclusiveZone: 0 | ||
62 | exclusionMode: ExclusionMode.Ignore | ||
63 | |||
64 | implicitWidth: 400 | ||
65 | implicitHeight: 50 | ||
66 | |||
67 | mask: Region {} | ||
68 | |||
69 | color: "transparent" | ||
70 | |||
71 | Rectangle { | ||
72 | anchors.fill: parent | ||
73 | color: Qt.rgba(0, 0, 0, 0.75) | ||
74 | } | ||
75 | |||
76 | RowLayout { | ||
77 | id: layout | ||
78 | |||
79 | anchors.centerIn: parent | ||
80 | |||
81 | height: 50 - 8*2 | ||
82 | width: 400 - 8*2 | ||
83 | |||
84 | MaterialDesignIcon { | ||
85 | id: volumeIcon | ||
86 | |||
87 | implicitWidth: parent.height | ||
88 | implicitHeight: parent.height | ||
89 | |||
90 | icon: `brightness-${Math.min(7, Math.floor(Brightness.currBrightness * 7) + 1)}` | ||
91 | } | ||
92 | |||
93 | Rectangle { | ||
94 | Layout.fillWidth: true | ||
95 | |||
96 | implicitHeight: 10 | ||
97 | |||
98 | color: "#50ffffff" | ||
99 | |||
100 | Rectangle { | ||
101 | anchors { | ||
102 | left: parent.left | ||
103 | top: parent.top | ||
104 | bottom: parent.bottom | ||
105 | } | ||
106 | |||
107 | color: "white" | ||
108 | |||
109 | implicitWidth: parent.width * Brightness.currBrightness | ||
110 | } | ||
111 | } | ||
112 | } | ||
113 | } | ||
114 | } | ||
115 | } | ||
116 | } | ||
117 | } | ||
diff --git a/accounts/gkleen@sif/shell/quickshell/BrightnessWidget.qml b/accounts/gkleen@sif/shell/quickshell/BrightnessWidget.qml new file mode 100644 index 00000000..7f9c1ad0 --- /dev/null +++ b/accounts/gkleen@sif/shell/quickshell/BrightnessWidget.qml | |||
@@ -0,0 +1,78 @@ | |||
1 | import QtQuick | ||
2 | import Quickshell | ||
3 | import Quickshell.Widgets | ||
4 | import qs.Services | ||
5 | |||
6 | Item { | ||
7 | height: parent.height | ||
8 | width: brightnessIcon.width + 8 | ||
9 | anchors.verticalCenter: parent.verticalCenter | ||
10 | |||
11 | WrapperMouseArea { | ||
12 | id: widgetMouseArea | ||
13 | |||
14 | anchors.fill: parent | ||
15 | |||
16 | hoverEnabled: true | ||
17 | |||
18 | property real sensitivity: (1 / 50) / 120 | ||
19 | onWheel: event => Brightness.currBrightness += event.angleDelta.y * sensitivity | ||
20 | |||
21 | Item { | ||
22 | anchors.fill: parent | ||
23 | |||
24 | MaterialDesignIcon { | ||
25 | id: brightnessIcon | ||
26 | |||
27 | implicitSize: 14 | ||
28 | anchors.centerIn: parent | ||
29 | |||
30 | icon: `brightness-${Math.min(7, Math.floor(Brightness.currBrightness * 7) + 1)}` | ||
31 | color: "#555" | ||
32 | } | ||
33 | } | ||
34 | } | ||
35 | |||
36 | PopupWindow { | ||
37 | id: tooltip | ||
38 | |||
39 | property bool nextVisible: widgetMouseArea.containsMouse || tooltipMouseArea.containsMouse | ||
40 | |||
41 | anchor { | ||
42 | item: widgetMouseArea | ||
43 | edges: Edges.Bottom | Edges.Left | ||
44 | } | ||
45 | visible: false | ||
46 | |||
47 | onNextVisibleChanged: hangTimer.restart() | ||
48 | |||
49 | Timer { | ||
50 | id: hangTimer | ||
51 | interval: 100 | ||
52 | onTriggered: tooltip.visible = tooltip.nextVisible | ||
53 | } | ||
54 | |||
55 | implicitWidth: widgetTooltipText.contentWidth + 16 | ||
56 | implicitHeight: widgetTooltipText.contentHeight + 16 | ||
57 | color: "black" | ||
58 | |||
59 | WrapperMouseArea { | ||
60 | id: tooltipMouseArea | ||
61 | |||
62 | hoverEnabled: true | ||
63 | enabled: true | ||
64 | |||
65 | anchors.centerIn: parent | ||
66 | |||
67 | Text { | ||
68 | id: widgetTooltipText | ||
69 | |||
70 | font.pointSize: 10 | ||
71 | font.family: "Fira Sans" | ||
72 | color: "white" | ||
73 | |||
74 | text: `${Math.round(Brightness.currBrightness * 100)}%` | ||
75 | } | ||
76 | } | ||
77 | } | ||
78 | } | ||
diff --git a/accounts/gkleen@sif/shell/quickshell/Clock.qml b/accounts/gkleen@sif/shell/quickshell/Clock.qml index d0c9178b..bb618f6a 100644 --- a/accounts/gkleen@sif/shell/quickshell/Clock.qml +++ b/accounts/gkleen@sif/shell/quickshell/Clock.qml | |||
@@ -22,18 +22,6 @@ Item { | |||
22 | hoverEnabled: true | 22 | hoverEnabled: true |
23 | enabled: clockItem.calendarPopup | 23 | enabled: clockItem.calendarPopup |
24 | 24 | ||
25 | property real angleRem: 0 | ||
26 | property real sensitivity: 1 / 120 | ||
27 | |||
28 | function scrollYear(event) { | ||
29 | angleRem += event.angleDelta.y; | ||
30 | const d = Math.round(angleRem * sensitivity); | ||
31 | yearCalendar.year += d; | ||
32 | angleRem -= d / sensitivity; | ||
33 | } | ||
34 | |||
35 | onWheel: event => scrollYear(event) | ||
36 | |||
37 | Item { | 25 | Item { |
38 | anchors.fill: parent | 26 | anchors.fill: parent |
39 | 27 | ||
@@ -56,204 +44,238 @@ Item { | |||
56 | } | 44 | } |
57 | } | 45 | } |
58 | 46 | ||
59 | PopupWindow { | 47 | Loader { |
60 | id: tooltip | 48 | id: tooltipLoader |
61 | 49 | ||
62 | property bool nextVisible: clockMouseArea.containsMouse || tooltipMouseArea.containsMouse | 50 | active: false |
63 | 51 | ||
64 | anchor { | 52 | Connections { |
65 | item: clockMouseArea | 53 | target: clockMouseArea |
66 | edges: Edges.Bottom | Edges.Left | 54 | function onContainsMouseChanged() { |
55 | if (clockMouseArea.containsMouse) | ||
56 | tooltipLoader.active = true; | ||
57 | } | ||
67 | } | 58 | } |
68 | visible: false | ||
69 | 59 | ||
70 | onNextVisibleChanged: hangTimer.restart() | 60 | sourceComponent: PopupWindow { |
61 | id: tooltip | ||
71 | 62 | ||
72 | Timer { | 63 | property bool nextVisible: clockMouseArea.containsMouse || tooltipMouseArea.containsMouse |
73 | id: hangTimer | ||
74 | interval: 100 | ||
75 | onTriggered: tooltip.visible = tooltip.nextVisible | ||
76 | } | ||
77 | 64 | ||
78 | implicitWidth: clockTooltipContent.width | 65 | anchor { |
79 | implicitHeight: clockTooltipContent.height | 66 | item: clockMouseArea |
80 | color: "black" | 67 | edges: Edges.Bottom | Edges.Left |
68 | } | ||
69 | visible: false | ||
81 | 70 | ||
82 | onVisibleChanged: { | 71 | onNextVisibleChanged: hangTimer.restart() |
83 | yearCalendar.year = chrono.date.getFullYear(); | ||
84 | clockMouseArea.angleRem = 0; | ||
85 | } | ||
86 | 72 | ||
87 | WrapperMouseArea { | 73 | Timer { |
88 | id: tooltipMouseArea | 74 | id: hangTimer |
75 | interval: 100 | ||
76 | onTriggered: { | ||
77 | tooltip.visible = tooltip.nextVisible; | ||
78 | if (!tooltip.visible) | ||
79 | tooltipLoader.active = false; | ||
80 | } | ||
81 | } | ||
89 | 82 | ||
90 | hoverEnabled: true | 83 | implicitWidth: clockTooltipContent.width |
91 | enabled: true | 84 | implicitHeight: clockTooltipContent.height |
85 | color: "black" | ||
92 | 86 | ||
93 | onWheel: event => clockMouseArea.scrollYear(event) | 87 | onVisibleChanged: { |
88 | yearCalendar.year = chrono.date.getFullYear(); | ||
89 | yearCalendar.angleRem = 0; | ||
90 | } | ||
94 | 91 | ||
95 | anchors.fill: parent | 92 | WrapperMouseArea { |
93 | id: tooltipMouseArea | ||
96 | 94 | ||
97 | WrapperItem { | 95 | hoverEnabled: true |
98 | id: clockTooltipContent | 96 | enabled: true |
99 | 97 | ||
100 | margin: 8 | 98 | onWheel: event => yearCalendar.scrollYear(event) |
101 | leftMargin: 0 | ||
102 | 99 | ||
103 | ColumnLayout { | 100 | anchors.fill: parent |
104 | Text { | ||
105 | id: yearLabel | ||
106 | 101 | ||
107 | horizontalAlignment: Text.AlignHCenter | 102 | WrapperItem { |
103 | id: clockTooltipContent | ||
108 | 104 | ||
109 | font.pointSize: 14 | 105 | margin: 8 |
110 | font.family: "Fira Sans" | ||
111 | font.features: { "tnum": 1 } | ||
112 | color: "white" | ||
113 | 106 | ||
114 | text: yearCalendar.year | 107 | ColumnLayout { |
108 | anchors.centerIn: parent | ||
115 | 109 | ||
116 | Layout.fillWidth: true | 110 | Text { |
117 | Layout.bottomMargin: 8 | 111 | id: yearLabel |
118 | } | ||
119 | 112 | ||
120 | GridLayout { | 113 | horizontalAlignment: Text.AlignHCenter |
121 | property int year: chrono.date.getFullYear() | ||
122 | 114 | ||
123 | id: yearCalendar | 115 | font.pointSize: 14 |
116 | font.family: "Fira Sans" | ||
117 | font.features: { "tnum": 1 } | ||
118 | color: "white" | ||
124 | 119 | ||
125 | columns: 3 | 120 | text: yearCalendar.year |
126 | columnSpacing: 16 | ||
127 | rowSpacing: 16 | ||
128 | 121 | ||
129 | Layout.alignment: Qt.AlignHCenter | 122 | Layout.fillWidth: true |
130 | Layout.fillWidth: false | 123 | Layout.bottomMargin: 8 |
124 | } | ||
131 | 125 | ||
132 | Repeater { | 126 | GridLayout { |
133 | model: 12 | 127 | property int year: chrono.date.getFullYear() |
134 | 128 | ||
135 | GridLayout { | 129 | id: yearCalendar |
136 | columns: 2 | ||
137 | 130 | ||
138 | required property int index | 131 | columns: 3 |
139 | property int month: index | 132 | columnSpacing: 16 |
133 | rowSpacing: 16 | ||
140 | 134 | ||
141 | id: monthCalendar | 135 | Layout.alignment: Qt.AlignHCenter |
136 | Layout.fillWidth: false | ||
142 | 137 | ||
143 | Layout.alignment: Qt.AlignTop | Qt.AlignRight | 138 | property real angleRem: 0 |
144 | Layout.fillWidth: false | 139 | property real sensitivity: 1 / 120 |
145 | 140 | ||
146 | Text { | 141 | function scrollYear(event) { |
147 | Layout.column: 1 | 142 | angleRem += event.angleDelta.y; |
148 | Layout.fillWidth: true | 143 | const d = Math.round(angleRem * sensitivity); |
144 | yearCalendar.year += d; | ||
145 | angleRem -= d / sensitivity; | ||
146 | } | ||
149 | 147 | ||
150 | horizontalAlignment: Text.AlignHCenter | 148 | Connections { |
149 | target: clockMouseArea | ||
150 | function onWheel(event) { yearCalendar.scrollYear(event); } | ||
151 | } | ||
151 | 152 | ||
152 | font.pointSize: 10 | 153 | Repeater { |
153 | font.family: "Fira Sans" | 154 | model: 12 |
154 | 155 | ||
155 | text: new Date(yearCalendar.year, monthCalendar.month, 1).toLocaleString(Qt.locale("en_DK"), "MMMM") | 156 | GridLayout { |
157 | columns: 2 | ||
156 | 158 | ||
157 | color: "#ffead3" | 159 | required property int index |
158 | } | 160 | property int month: index |
159 | 161 | ||
160 | DayOfWeekRow { | 162 | id: monthCalendar |
161 | locale: grid.locale | ||
162 | 163 | ||
163 | Layout.row: 1 | 164 | Layout.alignment: Qt.AlignTop | Qt.AlignRight |
164 | Layout.column: 1 | 165 | Layout.fillWidth: false |
165 | Layout.fillWidth: true | ||
166 | 166 | ||
167 | delegate: WrapperItem { | 167 | Text { |
168 | required property string shortName | 168 | Layout.column: 1 |
169 | Layout.fillWidth: true | ||
169 | 170 | ||
170 | width: dowLabel.contentWidth + 6 | 171 | horizontalAlignment: Text.AlignHCenter |
171 | 172 | ||
172 | Text { | 173 | font.pointSize: 10 |
173 | id: dowLabel | 174 | font.family: "Fira Sans" |
174 | 175 | ||
175 | anchors.fill: parent | 176 | text: new Date(yearCalendar.year, monthCalendar.month, 1).toLocaleString(Qt.locale("en_DK"), "MMMM") |
176 | 177 | ||
177 | font.pointSize: 10 | 178 | color: "#ffead3" |
178 | font.family: "Fira Sans" | 179 | } |
179 | 180 | ||
180 | text: parent.shortName | 181 | DayOfWeekRow { |
181 | color: "#ffcc66" | 182 | locale: grid.locale |
182 | 183 | ||
183 | horizontalAlignment: Text.AlignHCenter | 184 | Layout.row: 1 |
184 | verticalAlignment: Text.AlignVCenter | 185 | Layout.column: 1 |
185 | } | 186 | Layout.fillWidth: true |
186 | } | ||
187 | } | ||
188 | 187 | ||
189 | WeekNumberColumn { | 188 | delegate: WrapperItem { |
190 | month: grid.month | 189 | required property string shortName |
191 | year: grid.year | ||
192 | locale: grid.locale | ||
193 | 190 | ||
194 | Layout.fillHeight: true | 191 | width: dowLabel.contentWidth + 6 |
195 | 192 | ||
196 | delegate: Text { | 193 | Text { |
197 | required property int weekNumber | 194 | id: dowLabel |
198 | 195 | ||
199 | opacity: { | 196 | anchors.fill: parent |
200 | const simple = new Date(weekNumber == 1 && monthCalendar.month == 12 ? yearCalendar.year + 1 : yearCalendar.year, 0, 1 + (weekNumber - 1) * 7); | ||
201 | const dayOfWeek = simple.getDay(); | ||
202 | const isoWeekStart = simple; | ||
203 | 197 | ||
204 | isoWeekStart.setDate(simple.getDate() - dayOfWeek + 1); | 198 | font.pointSize: 10 |
205 | if (dayOfWeek > 4) { | 199 | font.family: "Fira Sans" |
206 | isoWeekStart.setDate(isoWeekStart.getDate() + 7); | ||
207 | } | ||
208 | 200 | ||
209 | for (let i = 0; i < 7; i++) { | 201 | text: parent.shortName |
210 | const dayInWeek = new Date(isoWeekStart); | 202 | color: "#ffcc66" |
211 | dayInWeek.setDate(dayInWeek.getDate() + i); | ||
212 | if (dayInWeek.getMonth() == monthCalendar.month) | ||
213 | return 1; | ||
214 | } | ||
215 | 203 | ||
216 | return 0; | 204 | horizontalAlignment: Text.AlignHCenter |
205 | verticalAlignment: Text.AlignVCenter | ||
206 | } | ||
217 | } | 207 | } |
208 | } | ||
218 | 209 | ||
219 | font.pointSize: 10 | 210 | WeekNumberColumn { |
220 | font.family: "Fira Sans" | 211 | month: grid.month |
221 | font.features: { "tnum": 1 } | 212 | year: grid.year |
222 | 213 | locale: grid.locale | |
223 | text: weekNumber | ||
224 | color: "#99ffdd" | ||
225 | 214 | ||
226 | horizontalAlignment: Text.AlignRight | 215 | Layout.fillHeight: true |
227 | verticalAlignment: Text.AlignVCenter | ||
228 | } | ||
229 | } | ||
230 | 216 | ||
231 | MonthGrid { | 217 | delegate: Text { |
232 | id: grid | 218 | required property int weekNumber |
233 | 219 | ||
234 | year: yearCalendar.year | 220 | opacity: { |
235 | month: monthCalendar.month | 221 | const simple = new Date(weekNumber == 1 && monthCalendar.month == 12 ? yearCalendar.year + 1 : yearCalendar.year, 0, 1 + (weekNumber - 1) * 7); |
236 | locale: Qt.locale("en_DK") | 222 | const dayOfWeek = simple.getDay(); |
223 | const isoWeekStart = simple; | ||
237 | 224 | ||
238 | Layout.fillWidth: true | 225 | isoWeekStart.setDate(simple.getDate() - dayOfWeek + 1); |
239 | Layout.fillHeight: true | 226 | if (dayOfWeek > 4) { |
227 | isoWeekStart.setDate(isoWeekStart.getDate() + 7); | ||
228 | } | ||
240 | 229 | ||
241 | delegate: Text { | 230 | for (let i = 0; i < 7; i++) { |
242 | required property var model | 231 | const dayInWeek = new Date(isoWeekStart); |
232 | dayInWeek.setDate(dayInWeek.getDate() + i); | ||
233 | if (dayInWeek.getMonth() == monthCalendar.month) | ||
234 | return 1; | ||
235 | } | ||
243 | 236 | ||
244 | opacity: model.month === monthCalendar.month ? 1 : 0 | 237 | return 0; |
238 | } | ||
245 | 239 | ||
246 | font.pointSize: 10 | 240 | font.pointSize: 10 |
247 | font.family: "Fira Sans" | 241 | font.family: "Fira Sans" |
248 | font.features: { "tnum": 1 } | 242 | font.features: { "tnum": 1 } |
249 | 243 | ||
250 | property bool today: chrono.date.getFullYear() == model.year && chrono.date.getMonth() == model.month && chrono.date.getDate() == model.day | 244 | text: weekNumber |
251 | 245 | color: "#99ffdd" | |
252 | text: model.day | ||
253 | color: today ? "#ff6699" : "white" | ||
254 | 246 | ||
255 | horizontalAlignment: Text.AlignRight | 247 | horizontalAlignment: Text.AlignRight |
256 | verticalAlignment: Text.AlignVCenter | 248 | verticalAlignment: Text.AlignVCenter |
249 | } | ||
250 | } | ||
251 | |||
252 | MonthGrid { | ||
253 | id: grid | ||
254 | |||
255 | year: yearCalendar.year | ||
256 | month: monthCalendar.month | ||
257 | locale: Qt.locale("en_DK") | ||
258 | |||
259 | Layout.fillWidth: true | ||
260 | Layout.fillHeight: true | ||
261 | |||
262 | delegate: Text { | ||
263 | required property var model | ||
264 | |||
265 | opacity: model.month === monthCalendar.month ? 1 : 0 | ||
266 | |||
267 | font.pointSize: 10 | ||
268 | font.family: "Fira Sans" | ||
269 | font.features: { "tnum": 1 } | ||
270 | |||
271 | property bool today: chrono.date.getFullYear() == model.year && chrono.date.getMonth() == model.month && chrono.date.getDate() == model.day | ||
272 | |||
273 | text: model.day | ||
274 | color: today ? "#ff6699" : "white" | ||
275 | |||
276 | horizontalAlignment: Text.AlignRight | ||
277 | verticalAlignment: Text.AlignVCenter | ||
278 | } | ||
257 | } | 279 | } |
258 | } | 280 | } |
259 | } | 281 | } |
diff --git a/accounts/gkleen@sif/shell/quickshell/LidSwitchInhibitorWidget.qml b/accounts/gkleen@sif/shell/quickshell/LidSwitchInhibitorWidget.qml new file mode 100644 index 00000000..2be0692a --- /dev/null +++ b/accounts/gkleen@sif/shell/quickshell/LidSwitchInhibitorWidget.qml | |||
@@ -0,0 +1,46 @@ | |||
1 | import Quickshell | ||
2 | import QtQuick | ||
3 | import Quickshell.Widgets | ||
4 | import qs.Services | ||
5 | |||
6 | Item { | ||
7 | id: root | ||
8 | |||
9 | width: icon.width + 8 | ||
10 | height: parent.height | ||
11 | anchors.verticalCenter: parent.verticalCenter | ||
12 | |||
13 | WrapperMouseArea { | ||
14 | id: widgetMouseArea | ||
15 | |||
16 | anchors.fill: parent | ||
17 | |||
18 | hoverEnabled: true | ||
19 | |||
20 | onClicked: InhibitorState.lidSwitchInhibited = !InhibitorState.lidSwitchInhibited | ||
21 | |||
22 | Rectangle { | ||
23 | anchors.fill: parent | ||
24 | color: { | ||
25 | if (widgetMouseArea.containsMouse) { | ||
26 | return "#33808080"; | ||
27 | } | ||
28 | return "transparent"; | ||
29 | } | ||
30 | |||
31 | Item { | ||
32 | anchors.fill: parent | ||
33 | |||
34 | MaterialDesignIcon { | ||
35 | id: icon | ||
36 | |||
37 | implicitSize: 14 | ||
38 | anchors.centerIn: parent | ||
39 | |||
40 | icon: InhibitorState.lidSwitchInhibited ? "laptop-off" : "laptop" | ||
41 | color: InhibitorState.lidSwitchInhibited ? "#f28a21" : "#555" | ||
42 | } | ||
43 | } | ||
44 | } | ||
45 | } | ||
46 | } | ||
diff --git a/accounts/gkleen@sif/shell/quickshell/LockSurface.qml b/accounts/gkleen@sif/shell/quickshell/LockSurface.qml new file mode 100644 index 00000000..18698725 --- /dev/null +++ b/accounts/gkleen@sif/shell/quickshell/LockSurface.qml | |||
@@ -0,0 +1,223 @@ | |||
1 | import Quickshell.Widgets | ||
2 | import QtQuick.Effects | ||
3 | import QtQuick.Layouts | ||
4 | import QtQuick | ||
5 | import QtQuick.Controls | ||
6 | import QtQuick.Controls.Fusion | ||
7 | import qs.Services | ||
8 | import QtQml | ||
9 | |||
10 | Item { | ||
11 | id: lockSurface | ||
12 | |||
13 | property var screen | ||
14 | property list<var> messages: [] | ||
15 | property bool responseRequired: false | ||
16 | property bool responseVisible: false | ||
17 | property string currentText: "" | ||
18 | property bool authRunning: false | ||
19 | |||
20 | signal response(string responseText) | ||
21 | |||
22 | anchors.fill: parent | ||
23 | |||
24 | Item { | ||
25 | id: background | ||
26 | |||
27 | anchors.fill: parent | ||
28 | |||
29 | property Img current: one | ||
30 | property string source: selector.selected | ||
31 | |||
32 | WallpaperSelector { | ||
33 | id: selector | ||
34 | seed: lockSurface.screen?.name || "" | ||
35 | } | ||
36 | |||
37 | onSourceChanged: { | ||
38 | if (!source) | ||
39 | current = null; | ||
40 | else if (current === one) | ||
41 | two.update() | ||
42 | else | ||
43 | one.update() | ||
44 | } | ||
45 | |||
46 | Img { id: one } | ||
47 | Img { id: two } | ||
48 | |||
49 | component Img: Item { | ||
50 | id: img | ||
51 | |||
52 | property string source | ||
53 | |||
54 | function update() { | ||
55 | source = background.source || "" | ||
56 | } | ||
57 | |||
58 | anchors.fill: parent | ||
59 | |||
60 | Image { | ||
61 | id: imageSource | ||
62 | |||
63 | source: img.source | ||
64 | sourceSize: Qt.size(parent.width, parent.height) | ||
65 | fillMode: Image.PreserveAspectCrop | ||
66 | smooth: true | ||
67 | visible: false | ||
68 | asynchronous: true | ||
69 | cache: false | ||
70 | |||
71 | onStatusChanged: { | ||
72 | if (status === Image.Ready) { | ||
73 | background.current = img | ||
74 | } | ||
75 | } | ||
76 | } | ||
77 | |||
78 | MultiEffect { | ||
79 | id: imageEffect | ||
80 | |||
81 | source: imageSource | ||
82 | anchors.fill: parent | ||
83 | blurEnabled: true | ||
84 | blur: 1 | ||
85 | blurMax: 64 | ||
86 | blurMultiplier: 2 | ||
87 | |||
88 | opacity: 0 | ||
89 | |||
90 | states: State { | ||
91 | name: "visible" | ||
92 | when: background.current === img | ||
93 | |||
94 | PropertyChanges { | ||
95 | imageEffect.opacity: 1 | ||
96 | } | ||
97 | StateChangeScript { | ||
98 | name: "unloadOther" | ||
99 | script: { | ||
100 | if (img === one) | ||
101 | two.source = "" | ||
102 | if (img === two) | ||
103 | one.source = "" | ||
104 | } | ||
105 | } | ||
106 | } | ||
107 | |||
108 | transitions: Transition { | ||
109 | SequentialAnimation { | ||
110 | NumberAnimation { | ||
111 | target: imageEffect | ||
112 | properties: "opacity" | ||
113 | duration: 5000 | ||
114 | easing.type: Easing.OutCubic | ||
115 | } | ||
116 | ScriptAction { | ||
117 | scriptName: "unloadOther" | ||
118 | } | ||
119 | } | ||
120 | } | ||
121 | } | ||
122 | } | ||
123 | } | ||
124 | |||
125 | Item { | ||
126 | anchors { | ||
127 | top: lockSurface.top | ||
128 | left: lockSurface.left | ||
129 | right: lockSurface.right | ||
130 | } | ||
131 | |||
132 | implicitWidth: lockSurface.width | ||
133 | implicitHeight: 21 | ||
134 | |||
135 | Rectangle { | ||
136 | anchors.fill: parent | ||
137 | color: Qt.rgba(0, 0, 0, 0.75) | ||
138 | } | ||
139 | |||
140 | Clock { | ||
141 | anchors.centerIn: parent | ||
142 | calendarPopup: false | ||
143 | } | ||
144 | } | ||
145 | |||
146 | WrapperRectangle { | ||
147 | id: unlockUi | ||
148 | |||
149 | Keys.onPressed: event => { | ||
150 | if (!lockSurface.authRunning) { | ||
151 | event.accepted = true; | ||
152 | lockSurface.authRunning = true; | ||
153 | } | ||
154 | } | ||
155 | focus: !passwordBox.visible | ||
156 | |||
157 | visible: lockSurface.authRunning | ||
158 | |||
159 | color: Qt.rgba(0, 0, 0, 0.75) | ||
160 | margin: 8 | ||
161 | |||
162 | anchors.centerIn: parent | ||
163 | |||
164 | ColumnLayout { | ||
165 | spacing: 4 | ||
166 | |||
167 | BusyIndicator { | ||
168 | visible: running | ||
169 | running: !Array.from(lockSurface.messages).length && !lockSurface.responseRequired | ||
170 | } | ||
171 | |||
172 | Repeater { | ||
173 | model: lockSurface.messages | ||
174 | |||
175 | Text { | ||
176 | required property var modelData | ||
177 | |||
178 | font.pointSize: 10 | ||
179 | font.family: "Fira Sans" | ||
180 | color: modelData.error ? "#f28a21" : "#ffffff" | ||
181 | |||
182 | text: String(modelData.text).trim() | ||
183 | |||
184 | Layout.fillWidth: true | ||
185 | horizontalAlignment: Text.AlignHCenter | ||
186 | } | ||
187 | } | ||
188 | |||
189 | TextField { | ||
190 | id: passwordBox | ||
191 | |||
192 | visible: lockSurface.responseRequired | ||
193 | echoMode: lockSurface.responseVisible ? TextInput.Normal : TextInput.Password | ||
194 | inputMethodHints: Qt.ImhSensitiveData | ||
195 | |||
196 | onTextChanged: lockSurface.currentText = passwordBox.text | ||
197 | onAccepted: { | ||
198 | passwordBox.readOnly = true; | ||
199 | lockSurface.response(lockSurface.currentText); | ||
200 | } | ||
201 | |||
202 | Connections { | ||
203 | target: lockSurface | ||
204 | function onCurrentTextChanged() { | ||
205 | passwordBox.text = lockSurface.currentText | ||
206 | } | ||
207 | } | ||
208 | Connections { | ||
209 | target: lockSurface | ||
210 | function onResponseRequiredChanged() { | ||
211 | if (lockSurface.responseRequired) | ||
212 | passwordBox.readOnly = false; | ||
213 | passwordBox.focus = true; | ||
214 | passwordBox.selectAll(); | ||
215 | } | ||
216 | } | ||
217 | |||
218 | Layout.topMargin: 4 | ||
219 | Layout.fillWidth: true | ||
220 | } | ||
221 | } | ||
222 | } | ||
223 | } | ||
diff --git a/accounts/gkleen@sif/shell/quickshell/Lockscreen.qml b/accounts/gkleen@sif/shell/quickshell/Lockscreen.qml index 7cb1cc67..e4f8e1c9 100644 --- a/accounts/gkleen@sif/shell/quickshell/Lockscreen.qml +++ b/accounts/gkleen@sif/shell/quickshell/Lockscreen.qml | |||
@@ -2,14 +2,10 @@ import Quickshell | |||
2 | import Quickshell.Wayland | 2 | import Quickshell.Wayland |
3 | import Quickshell.Io | 3 | import Quickshell.Io |
4 | import Quickshell.Services.Pam | 4 | import Quickshell.Services.Pam |
5 | import Quickshell.Widgets | 5 | import Quickshell.Services.Mpris |
6 | import QtQuick.Effects | 6 | import Custom as Custom |
7 | import QtQuick.Layouts | ||
8 | import QtQuick | ||
9 | import QtQuick.Controls | ||
10 | import QtQuick.Controls.Fusion | ||
11 | import qs.Services | 7 | import qs.Services |
12 | // import QtQml.Models | 8 | import QtQml |
13 | 9 | ||
14 | Scope { | 10 | Scope { |
15 | id: lockscreen | 11 | id: lockscreen |
@@ -42,216 +38,85 @@ Scope { | |||
42 | function getLocked(): bool { return lock.locked; } | 38 | function getLocked(): bool { return lock.locked; } |
43 | } | 39 | } |
44 | 40 | ||
45 | WlSessionLock { | 41 | Connections { |
46 | id: lock | 42 | target: Custom.Systemd |
47 | 43 | function onSleep(before: bool) { | |
48 | onLockedChanged: { | 44 | console.log(`received prepare for sleep ${before}`); |
49 | if (!locked && pam.active) | 45 | if (before) |
50 | pam.abort(); | 46 | lock.locked = true; |
51 | } | 47 | } |
48 | function onLock() { lock.locked = true; } | ||
49 | function onUnlock() { lock.locked = false; } | ||
50 | } | ||
52 | 51 | ||
53 | WlSessionLockSurface { | 52 | IdleMonitor { |
54 | id: lockSurface | 53 | id: idleMonitor |
55 | 54 | enabled: !lock.secure | |
56 | color: "#000000" | 55 | timeout: 600 |
57 | 56 | respectInhibitors: true | |
58 | Item { | ||
59 | id: background | ||
60 | |||
61 | anchors.fill: parent | ||
62 | |||
63 | property Img current: one | ||
64 | property string source: selector.selected | ||
65 | |||
66 | WallpaperSelector { | ||
67 | id: selector | ||
68 | seed: lockSurface.screen?.name || "" | ||
69 | } | ||
70 | |||
71 | onSourceChanged: { | ||
72 | if (!source) | ||
73 | current = null; | ||
74 | else if (current === one) | ||
75 | two.update() | ||
76 | else | ||
77 | one.update() | ||
78 | } | ||
79 | |||
80 | Img { id: one } | ||
81 | Img { id: two } | ||
82 | |||
83 | component Img: Item { | ||
84 | id: img | ||
85 | |||
86 | property string source | ||
87 | |||
88 | function update() { | ||
89 | source = background.source || "" | ||
90 | } | ||
91 | |||
92 | anchors.fill: parent | ||
93 | |||
94 | Image { | ||
95 | id: imageSource | ||
96 | |||
97 | source: img.source | ||
98 | sourceSize: Qt.size(parent.width, parent.height) | ||
99 | fillMode: Image.PreserveAspectCrop | ||
100 | smooth: true | ||
101 | visible: false | ||
102 | asynchronous: true | ||
103 | cache: false | ||
104 | |||
105 | onStatusChanged: { | ||
106 | if (status === Image.Ready) { | ||
107 | background.current = img | ||
108 | } | ||
109 | } | ||
110 | } | ||
111 | 57 | ||
112 | MultiEffect { | 58 | onIsIdleChanged: { |
113 | id: imageEffect | 59 | if (idleMonitor.isIdle) |
60 | lock.locked = true; | ||
61 | } | ||
62 | } | ||
114 | 63 | ||
115 | source: imageSource | 64 | Custom.SystemdInhibitor { |
116 | anchors.fill: parent | 65 | enabled: !lock.secure |
117 | blurEnabled: true | ||
118 | blur: 1 | ||
119 | blurMax: 64 | ||
120 | blurMultiplier: 2 | ||
121 | 66 | ||
122 | opacity: 0 | 67 | what: Custom.SystemdInhibitorParams.Sleep |
68 | who: "quickshell" | ||
69 | why: "Lock session" | ||
70 | mode: Custom.SystemdInhibitorParams.Delay | ||
71 | } | ||
123 | 72 | ||
124 | states: State { | 73 | WlSessionLock { |
125 | name: "visible" | 74 | id: lock |
126 | when: background.current === img | ||
127 | 75 | ||
128 | PropertyChanges { | 76 | onLockStateChanged: { |
129 | imageEffect.opacity: 1 | 77 | if (!locked && pam.active) |
130 | } | 78 | pam.abort(); |
131 | StateChangeScript { | ||
132 | name: "unloadOther" | ||
133 | script: { | ||
134 | if (img === one) | ||
135 | two.source = "" | ||
136 | if (img === two) | ||
137 | one.source = "" | ||
138 | } | ||
139 | } | ||
140 | } | ||
141 | 79 | ||
142 | transitions: Transition { | 80 | if (locked) { |
143 | SequentialAnimation { | 81 | Custom.KeePassXC.lockAllDatabases(); |
144 | NumberAnimation { | 82 | Array.from(Mpris.players.values).forEach(player => { |
145 | target: imageEffect | 83 | if (player.canPause && player.isPlaying) |
146 | properties: "opacity" | 84 | player.pause(); |
147 | duration: 5000 | 85 | }); |
148 | easing.type: Easing.OutCubic | 86 | // Custom.Systemd.stopUserUnit("gpg-agent.service", "replace"); |
149 | } | 87 | GpgAgent.reloadAgent(); |
150 | ScriptAction { | ||
151 | scriptName: "unloadOther" | ||
152 | } | ||
153 | } | ||
154 | } | ||
155 | } | ||
156 | } | ||
157 | } | 88 | } |
89 | } | ||
158 | 90 | ||
159 | Item { | 91 | onSecureStateChanged: Custom.Systemd.lockedHint = lock.secure |
160 | anchors { | ||
161 | top: lockSurface.top | ||
162 | left: lockSurface.left | ||
163 | right: lockSurface.right | ||
164 | } | ||
165 | |||
166 | implicitWidth: lockSurface.width | ||
167 | implicitHeight: 21 | ||
168 | 92 | ||
169 | Rectangle { | 93 | WlSessionLockSurface { |
170 | anchors.fill: parent | 94 | id: lockSurface |
171 | color: Qt.rgba(0, 0, 0, 0.75) | ||
172 | } | ||
173 | 95 | ||
174 | Clock { | 96 | color: "black" |
175 | anchors.centerIn: parent | ||
176 | calendarPopup: false | ||
177 | } | ||
178 | } | ||
179 | 97 | ||
180 | WrapperRectangle { | 98 | LockSurface { |
181 | id: unlockUi | 99 | id: surfaceContent |
182 | 100 | ||
183 | Keys.onPressed: event => { | 101 | onResponse: responseText => pam.respond(responseText) |
184 | if (!pam.active) { | 102 | onAuthRunningChanged: { |
185 | event.accepted = true; | 103 | if (authRunning) |
186 | pam.start(); | 104 | pam.start(); |
187 | } | ||
188 | } | 105 | } |
189 | focus: !passwordBox.visible | 106 | Connections { |
190 | 107 | target: pam | |
191 | visible: pam.active | 108 | function onMessagesChanged() { surfaceContent.messages = pam.messages; } |
192 | 109 | function onResponseRequiredChanged() { surfaceContent.responseRequired = pam.responseRequired; } | |
193 | color: Qt.rgba(0, 0, 0, 0.75) | 110 | function onActiveChanged() { surfaceContent.authRunning = pam.active; } |
194 | margin: 8 | 111 | } |
195 | 112 | onCurrentTextChanged: lockscreen.currentText = currentText | |
196 | anchors.centerIn: parent | 113 | Connections { |
197 | 114 | target: lockscreen | |
198 | ColumnLayout { | 115 | function onCurrentTextChanged() { surfaceContent.currentText = lockscreen.currentText; } |
199 | spacing: 4 | 116 | } |
200 | 117 | Connections { | |
201 | BusyIndicator { | 118 | target: lockSurface |
202 | visible: running | 119 | function onScreenChanged() { surfaceContent.screen = lockSurface.screen; } |
203 | running: !Array.from(pam.messages).length && !pam.responseRequired | ||
204 | } | ||
205 | |||
206 | Repeater { | ||
207 | model: pam.messages | ||
208 | |||
209 | Text { | ||
210 | required property var modelData | ||
211 | |||
212 | font.pointSize: 10 | ||
213 | font.family: "Fira Sans" | ||
214 | color: modelData.error ? "#f28a21" : "#ffffff" | ||
215 | |||
216 | text: modelData.text | ||
217 | |||
218 | Layout.fillWidth: true | ||
219 | horizontalAlignment: Text.AlignHCenter | ||
220 | } | ||
221 | } | ||
222 | |||
223 | TextField { | ||
224 | id: passwordBox | ||
225 | |||
226 | visible: pam.responseRequired | ||
227 | echoMode: pam.responseVisible ? TextInput.Normal : TextInput.Password | ||
228 | inputMethodHints: Qt.ImhSensitiveData | ||
229 | |||
230 | onTextChanged: lockscreen.currentText = passwordBox.text | ||
231 | onAccepted: { | ||
232 | passwordBox.readOnly = true; | ||
233 | pam.respond(lockscreen.currentText); | ||
234 | } | ||
235 | |||
236 | Connections { | ||
237 | target: lockscreen | ||
238 | function onCurrentTextChanged() { | ||
239 | passwordBox.text = lockscreen.currentText | ||
240 | } | ||
241 | } | ||
242 | Connections { | ||
243 | target: pam | ||
244 | function onResponseRequiredChanged() { | ||
245 | if (pam.responseRequired) | ||
246 | passwordBox.readOnly = false; | ||
247 | passwordBox.focus = true; | ||
248 | passwordBox.selectAll(); | ||
249 | } | ||
250 | } | ||
251 | |||
252 | Layout.topMargin: 4 | ||
253 | Layout.fillWidth: true | ||
254 | } | ||
255 | } | 120 | } |
256 | } | 121 | } |
257 | } | 122 | } |
diff --git a/accounts/gkleen@sif/shell/quickshell/MaterialDesignIcon.qml b/accounts/gkleen@sif/shell/quickshell/MaterialDesignIcon.qml new file mode 100644 index 00000000..155a009e --- /dev/null +++ b/accounts/gkleen@sif/shell/quickshell/MaterialDesignIcon.qml | |||
@@ -0,0 +1,35 @@ | |||
1 | import QtQuick | ||
2 | import QtQuick.Effects | ||
3 | |||
4 | Item { | ||
5 | id: root | ||
6 | |||
7 | required property string icon | ||
8 | property color color: "white" | ||
9 | |||
10 | property real implicitSize: 0 | ||
11 | |||
12 | readonly property real actualSize: Math.min(root.width, root.height) | ||
13 | |||
14 | implicitWidth: root.implicitSize | ||
15 | implicitHeight: root.implicitSize | ||
16 | |||
17 | Image { | ||
18 | id: sourceImage | ||
19 | source: "file://" + @mdi@ + "/svg/" + root.icon + ".svg" | ||
20 | anchors.fill: parent | ||
21 | fillMode: Image.PreserveAspectFit | ||
22 | |||
23 | sourceSize.width: root.actualSize | ||
24 | sourceSize.height: root.actualSize | ||
25 | |||
26 | layer.enabled: true | ||
27 | layer.effect: MultiEffect { | ||
28 | id: effect | ||
29 | |||
30 | brightness: 1 | ||
31 | colorization: 1 | ||
32 | colorizationColor: root.color | ||
33 | } | ||
34 | } | ||
35 | } | ||
diff --git a/accounts/gkleen@sif/shell/quickshell/NiriIdle.qml b/accounts/gkleen@sif/shell/quickshell/NiriIdle.qml new file mode 100644 index 00000000..faa77c3f --- /dev/null +++ b/accounts/gkleen@sif/shell/quickshell/NiriIdle.qml | |||
@@ -0,0 +1,30 @@ | |||
1 | import QtQml | ||
2 | import Quickshell | ||
3 | import Quickshell.Wayland | ||
4 | import qs.Services | ||
5 | import Custom as Custom | ||
6 | |||
7 | Scope { | ||
8 | IdleMonitor { | ||
9 | id: idleMonitor30 | ||
10 | timeout: 30 | ||
11 | |||
12 | onIsIdleChanged: Custom.Systemd.setIdleHint(idleMonitor30.isIdle) | ||
13 | } | ||
14 | IdleMonitor { | ||
15 | id: idleMonitor540 | ||
16 | timeout: 540 | ||
17 | |||
18 | onIsIdleChanged: { | ||
19 | if (idleMonitor540.isIdle) | ||
20 | NiriService.sendCommand({ "Action": "PowerOffMonitors" }); | ||
21 | } | ||
22 | } | ||
23 | Connections { | ||
24 | target: Custom.Systemd | ||
25 | function onSleep(before: bool) { | ||
26 | if (!before) | ||
27 | NiriService.sendCommand({ "Action": "PowerOnMonitors" }); | ||
28 | } | ||
29 | } | ||
30 | } | ||
diff --git a/accounts/gkleen@sif/shell/quickshell/PipewireWidget.qml b/accounts/gkleen@sif/shell/quickshell/PipewireWidget.qml new file mode 100644 index 00000000..3e0b8fd9 --- /dev/null +++ b/accounts/gkleen@sif/shell/quickshell/PipewireWidget.qml | |||
@@ -0,0 +1,471 @@ | |||
1 | import QtQuick | ||
2 | import QtQuick.Layouts | ||
3 | import QtQuick.Controls.Fusion | ||
4 | import Quickshell | ||
5 | import Quickshell.Services.Pipewire | ||
6 | import Quickshell.Widgets | ||
7 | |||
8 | Item { | ||
9 | height: parent.height | ||
10 | width: volumeIcon.width + 8 | ||
11 | anchors.verticalCenter: parent.verticalCenter | ||
12 | |||
13 | PwObjectTracker { | ||
14 | objects: [Pipewire.defaultAudioSink] | ||
15 | } | ||
16 | |||
17 | WrapperMouseArea { | ||
18 | id: widgetMouseArea | ||
19 | |||
20 | anchors.fill: parent | ||
21 | hoverEnabled: true | ||
22 | cursorShape: Qt.PointingHandCursor | ||
23 | |||
24 | onClicked: { | ||
25 | if (!Pipewire.defaultAudioSink) | ||
26 | return; | ||
27 | Pipewire.defaultAudioSink.audio.muted = !Pipewire.defaultAudioSink.audio.muted; | ||
28 | } | ||
29 | |||
30 | property real sensitivity: (1 / 40) / 120 | ||
31 | onWheel: event => { | ||
32 | if (!Pipewire.defaultAudioSink) | ||
33 | return; | ||
34 | Pipewire.defaultAudioSink.audio.volume += event.angleDelta.y * sensitivity; | ||
35 | } | ||
36 | |||
37 | Rectangle { | ||
38 | id: volumeWidget | ||
39 | |||
40 | anchors.fill: parent | ||
41 | color: { | ||
42 | if (widgetMouseArea.containsMouse) | ||
43 | return "#33808080"; | ||
44 | return "transparent"; | ||
45 | } | ||
46 | |||
47 | Item { | ||
48 | anchors.fill: parent | ||
49 | |||
50 | MaterialDesignIcon { | ||
51 | id: volumeIcon | ||
52 | |||
53 | implicitSize: 14 | ||
54 | anchors.centerIn: parent | ||
55 | |||
56 | icon: { | ||
57 | if (!Pipewire.defaultAudioSink || Pipewire.defaultAudioSink.audio.muted) | ||
58 | return "volume-off"; | ||
59 | if (Pipewire.defaultAudioSink.audio.volume <= 0.33) | ||
60 | return "volume-low"; | ||
61 | if (Pipewire.defaultAudioSink.audio.volume <= 0.67) | ||
62 | return "volume-medium"; | ||
63 | return "volume-high"; | ||
64 | } | ||
65 | color: "#555" | ||
66 | } | ||
67 | } | ||
68 | } | ||
69 | } | ||
70 | |||
71 | Loader { | ||
72 | id: tooltipLoader | ||
73 | |||
74 | active: false | ||
75 | |||
76 | Connections { | ||
77 | target: widgetMouseArea | ||
78 | function onContainsMouseChanged() { | ||
79 | if (widgetMouseArea.containsMouse) | ||
80 | tooltipLoader.active = true; | ||
81 | } | ||
82 | } | ||
83 | |||
84 | PwObjectTracker { | ||
85 | objects: Pipewire.devices | ||
86 | } | ||
87 | PwObjectTracker { | ||
88 | objects: Pipewire.nodes | ||
89 | } | ||
90 | |||
91 | sourceComponent: PopupWindow { | ||
92 | id: tooltip | ||
93 | |||
94 | property bool openPopup: false | ||
95 | property bool nextVisible: widgetMouseArea.containsMouse || tooltipMouseArea.containsMouse || openPopup | ||
96 | |||
97 | anchor { | ||
98 | item: widgetMouseArea | ||
99 | edges: Edges.Bottom | Edges.Left | ||
100 | } | ||
101 | visible: false | ||
102 | |||
103 | onNextVisibleChanged: hangTimer.restart() | ||
104 | |||
105 | Timer { | ||
106 | id: hangTimer | ||
107 | interval: 100 | ||
108 | onTriggered: { | ||
109 | tooltip.visible = tooltip.nextVisible; | ||
110 | if (!tooltip.visible) | ||
111 | tooltipLoader.active = false; | ||
112 | } | ||
113 | } | ||
114 | |||
115 | implicitWidth: tooltipContent.width | ||
116 | implicitHeight: tooltipContent.height | ||
117 | color: "transparent" | ||
118 | |||
119 | Rectangle { | ||
120 | width: tooltip.width | ||
121 | height: tooltipLayout.childrenRect.height + 16 | ||
122 | color: "black" | ||
123 | } | ||
124 | |||
125 | WrapperItem { | ||
126 | id: tooltipContent | ||
127 | |||
128 | bottomMargin: Math.max(0, 200 - tooltipLayout.implicitHeight) | ||
129 | |||
130 | WrapperMouseArea { | ||
131 | id: tooltipMouseArea | ||
132 | |||
133 | hoverEnabled: true | ||
134 | enabled: true | ||
135 | |||
136 | WrapperItem { | ||
137 | margin: 8 | ||
138 | bottomMargin: 8 | ||
139 | |||
140 | GridLayout { | ||
141 | id: tooltipLayout | ||
142 | |||
143 | columns: 4 | ||
144 | |||
145 | Repeater { | ||
146 | model: Array.from(Pipewire.devices.values).filter(dev => dev.type == "Audio/Device") | ||
147 | |||
148 | Item { | ||
149 | id: descItem | ||
150 | |||
151 | required property var modelData | ||
152 | required property int index | ||
153 | |||
154 | Layout.column: 0 | ||
155 | Layout.row: index | ||
156 | |||
157 | implicitWidth: descText.contentWidth | ||
158 | implicitHeight: descText.contentHeight | ||
159 | |||
160 | Text { | ||
161 | id: descText | ||
162 | |||
163 | color: "white" | ||
164 | font.pointSize: 10 | ||
165 | font.family: "Fira Sans" | ||
166 | |||
167 | text: descItem.modelData.description | ||
168 | } | ||
169 | } | ||
170 | } | ||
171 | |||
172 | Repeater { | ||
173 | id: defaultSinkRepeater | ||
174 | |||
175 | model: { | ||
176 | Array.from(Pipewire.devices.values) | ||
177 | .filter(dev => dev.type == "Audio/Device") | ||
178 | .map(device => Array.from(Pipewire.nodes.values).find(node => node.type == PwNodeType.AudioSink && node.device?.id == device.id )); | ||
179 | } | ||
180 | |||
181 | Item { | ||
182 | id: defaultSinkItem | ||
183 | |||
184 | required property var modelData | ||
185 | required property int index | ||
186 | |||
187 | visible: Boolean(modelData) | ||
188 | |||
189 | PwObjectTracker { | ||
190 | objects: [defaultSinkItem.modelData] | ||
191 | } | ||
192 | |||
193 | Layout.column: 1 | ||
194 | Layout.row: index | ||
195 | |||
196 | Layout.fillHeight: true | ||
197 | |||
198 | implicitWidth: 16 + 8 | ||
199 | |||
200 | WrapperMouseArea { | ||
201 | id: defaultSinkMouseArea | ||
202 | |||
203 | anchors.fill: parent | ||
204 | hoverEnabled: true | ||
205 | cursorShape: Qt.PointingHandCursor | ||
206 | |||
207 | onClicked: { | ||
208 | Pipewire.preferredDefaultAudioSink = defaultSinkItem.modelData | ||
209 | } | ||
210 | |||
211 | onWheel: event => scrollVolume(event); | ||
212 | property real sensitivity: (1 / 40) / 120 | ||
213 | function scrollVolume(event) { | ||
214 | defaultSinkItem.modelData.audio.volume += event.angleDelta.y * sensitivity; | ||
215 | } | ||
216 | |||
217 | Rectangle { | ||
218 | id: defaultSinkWidget | ||
219 | |||
220 | anchors.fill: parent | ||
221 | color: { | ||
222 | if (defaultSinkMouseArea.containsMouse) | ||
223 | return "#33808080"; | ||
224 | return "transparent"; | ||
225 | } | ||
226 | |||
227 | MaterialDesignIcon { | ||
228 | width: 16 | ||
229 | height: 16 | ||
230 | anchors.centerIn: parent | ||
231 | |||
232 | icon: { | ||
233 | if (defaultSinkItem.modelData?.id == Pipewire.defaultAudioSink?.id) | ||
234 | return "speaker"; | ||
235 | return "speaker-off"; | ||
236 | } | ||
237 | color: icon == "speaker" ? "white" : "#555" | ||
238 | } | ||
239 | } | ||
240 | } | ||
241 | |||
242 | PopupWindow { | ||
243 | id: volumeTooltip | ||
244 | |||
245 | property bool nextVisible: defaultSinkMouseArea.containsMouse || volumeTooltipMouseArea.containsMouse | ||
246 | |||
247 | anchor { | ||
248 | item: defaultSinkMouseArea | ||
249 | edges: Edges.Bottom | Edges.Left | ||
250 | } | ||
251 | visible: false | ||
252 | |||
253 | onNextVisibleChanged: volumeHangTimer.restart() | ||
254 | |||
255 | onVisibleChanged: tooltip.openPopup = volumeTooltip.visible | ||
256 | |||
257 | Timer { | ||
258 | id: volumeHangTimer | ||
259 | interval: 100 | ||
260 | onTriggered: volumeTooltip.visible = volumeTooltip.nextVisible | ||
261 | } | ||
262 | |||
263 | implicitWidth: volumeTooltipText.contentWidth + 16 | ||
264 | implicitHeight: volumeTooltipText.contentHeight + 16 | ||
265 | color: "black" | ||
266 | |||
267 | WrapperMouseArea { | ||
268 | id: volumeTooltipMouseArea | ||
269 | |||
270 | hoverEnabled: true | ||
271 | enabled: true | ||
272 | |||
273 | onWheel: event => defaultSinkMouseArea.scrollVolume(event); | ||
274 | |||
275 | anchors.centerIn: parent | ||
276 | |||
277 | Text { | ||
278 | id: volumeTooltipText | ||
279 | |||
280 | font.pointSize: 10 | ||
281 | font.family: "Fira Sans" | ||
282 | color: "white" | ||
283 | |||
284 | text: `${Math.round(defaultSinkItem.modelData?.audio?.volume * 100)}%` | ||
285 | } | ||
286 | } | ||
287 | } | ||
288 | } | ||
289 | } | ||
290 | |||
291 | Repeater { | ||
292 | id: defaultSourceRepeater | ||
293 | |||
294 | model: { | ||
295 | Array.from(Pipewire.devices.values) | ||
296 | .filter(dev => dev.type == "Audio/Device") | ||
297 | .map(device => Array.from(Pipewire.nodes.values).find(node => node.type == PwNodeType.AudioSource && node.device?.id == device.id )); | ||
298 | } | ||
299 | |||
300 | Item { | ||
301 | id: defaultSourceItem | ||
302 | |||
303 | required property var modelData | ||
304 | required property int index | ||
305 | |||
306 | visible: Boolean(modelData) | ||
307 | |||
308 | PwObjectTracker { | ||
309 | objects: [defaultSourceItem.modelData] | ||
310 | } | ||
311 | |||
312 | Layout.column: 2 | ||
313 | Layout.row: index | ||
314 | |||
315 | Layout.fillHeight: true | ||
316 | |||
317 | implicitWidth: 16 + 8 | ||
318 | |||
319 | WrapperMouseArea { | ||
320 | id: defaultSourceMouseArea | ||
321 | |||
322 | anchors.fill: parent | ||
323 | hoverEnabled: true | ||
324 | cursorShape: Qt.PointingHandCursor | ||
325 | |||
326 | onClicked: { | ||
327 | Pipewire.preferredDefaultAudioSource = defaultSourceItem.modelData | ||
328 | } | ||
329 | |||
330 | onWheel: event => scrollVolume(event); | ||
331 | property real sensitivity: (1 / 40) / 120 | ||
332 | function scrollVolume(event) { | ||
333 | defaultSourceItem.modelData.audio.volume += event.angleDelta.y * sensitivity; | ||
334 | } | ||
335 | |||
336 | Rectangle { | ||
337 | id: defaultSourceWidget | ||
338 | |||
339 | anchors.fill: parent | ||
340 | color: { | ||
341 | if (defaultSourceMouseArea.containsMouse) | ||
342 | return "#33808080"; | ||
343 | return "transparent"; | ||
344 | } | ||
345 | |||
346 | MaterialDesignIcon { | ||
347 | width: 16 | ||
348 | height: 16 | ||
349 | anchors.centerIn: parent | ||
350 | |||
351 | icon: { | ||
352 | if (defaultSourceItem.modelData?.id == Pipewire.defaultAudioSource?.id) | ||
353 | return "microphone"; | ||
354 | return "microphone-off"; | ||
355 | } | ||
356 | color: icon == "microphone" ? "white" : "#555" | ||
357 | } | ||
358 | } | ||
359 | } | ||
360 | |||
361 | PopupWindow { | ||
362 | id: volumeTooltip | ||
363 | |||
364 | property bool nextVisible: defaultSourceMouseArea.containsMouse || volumeTooltipMouseArea.containsMouse | ||
365 | |||
366 | anchor { | ||
367 | item: defaultSourceMouseArea | ||
368 | edges: Edges.Bottom | Edges.Left | ||
369 | } | ||
370 | visible: false | ||
371 | |||
372 | onNextVisibleChanged: volumeHangTimer.restart() | ||
373 | |||
374 | onVisibleChanged: tooltip.openPopup = volumeTooltip.visible | ||
375 | |||
376 | Timer { | ||
377 | id: volumeHangTimer | ||
378 | interval: 100 | ||
379 | onTriggered: volumeTooltip.visible = volumeTooltip.nextVisible | ||
380 | } | ||
381 | |||
382 | implicitWidth: volumeTooltipText.contentWidth + 16 | ||
383 | implicitHeight: volumeTooltipText.contentHeight + 16 | ||
384 | color: "black" | ||
385 | |||
386 | WrapperMouseArea { | ||
387 | id: volumeTooltipMouseArea | ||
388 | |||
389 | hoverEnabled: true | ||
390 | enabled: true | ||
391 | |||
392 | onWheel: event => defaultSourceMouseArea.scrollVolume(event); | ||
393 | |||
394 | anchors.centerIn: parent | ||
395 | |||
396 | Text { | ||
397 | id: volumeTooltipText | ||
398 | |||
399 | font.pointSize: 10 | ||
400 | font.family: "Fira Sans" | ||
401 | color: "white" | ||
402 | |||
403 | text: `${Math.round(defaultSourceItem.modelData?.audio?.volume * 100)}%` | ||
404 | } | ||
405 | } | ||
406 | } | ||
407 | } | ||
408 | } | ||
409 | |||
410 | Repeater { | ||
411 | id: profileRepeater | ||
412 | |||
413 | model: Array.from(Pipewire.devices.values).filter(dev => dev.type == "Audio/Device") | ||
414 | |||
415 | Item { | ||
416 | id: profileItem | ||
417 | |||
418 | required property var modelData | ||
419 | required property int index | ||
420 | |||
421 | PwObjectTracker { | ||
422 | objects: [profileItem.modelData] | ||
423 | } | ||
424 | |||
425 | Layout.column: 3 | ||
426 | Layout.row: index | ||
427 | |||
428 | Layout.fillWidth: true | ||
429 | |||
430 | implicitWidth: Math.max(profileBox.implicitWidth, 300) | ||
431 | implicitHeight: profileBox.height | ||
432 | |||
433 | ComboBox { | ||
434 | id: profileBox | ||
435 | |||
436 | model: profileItem.modelData.profiles | ||
437 | |||
438 | textRole: "description" | ||
439 | valueRole: "index" | ||
440 | onActivated: profileItem.modelData.setProfile(currentValue) | ||
441 | |||
442 | anchors.fill: parent | ||
443 | |||
444 | implicitContentWidthPolicy: ComboBox.WidestText | ||
445 | |||
446 | Connections { | ||
447 | target: profileItem.modelData | ||
448 | function onCurrentProfileChanged() { | ||
449 | profileBox.currentIndex = Array.from(profileItem.modelData.profiles).findIndex(profile => profile.index == profileItem.modelData.currentProfile); | ||
450 | } | ||
451 | } | ||
452 | Component.onCompleted: { | ||
453 | profileBox.currentIndex = Array.from(profileItem.modelData.profiles).findIndex(profile => profile.index == profileItem.modelData.currentProfile); | ||
454 | } | ||
455 | |||
456 | Connections { | ||
457 | target: profileBox.popup | ||
458 | function onVisibleChanged() { | ||
459 | tooltip.openPopup = profileBox.popup.visible | ||
460 | } | ||
461 | } | ||
462 | } | ||
463 | } | ||
464 | } | ||
465 | } | ||
466 | } | ||
467 | } | ||
468 | } | ||
469 | } | ||
470 | } | ||
471 | } | ||
diff --git a/accounts/gkleen@sif/shell/quickshell/PrivacyWidget.qml b/accounts/gkleen@sif/shell/quickshell/PrivacyWidget.qml new file mode 100644 index 00000000..d7ffadfe --- /dev/null +++ b/accounts/gkleen@sif/shell/quickshell/PrivacyWidget.qml | |||
@@ -0,0 +1,49 @@ | |||
1 | import QtQuick | ||
2 | import QtQuick.Layouts | ||
3 | import Quickshell | ||
4 | import Quickshell.Widgets | ||
5 | import qs.Services | ||
6 | |||
7 | Item { | ||
8 | height: parent.height | ||
9 | width: layout.childrenRect.width | ||
10 | anchors.verticalCenter: parent.verticalCenter | ||
11 | |||
12 | visible: Array.from(Privacy.activeItems).length > 0 | ||
13 | |||
14 | RowLayout { | ||
15 | id: layout | ||
16 | |||
17 | anchors.fill: parent | ||
18 | |||
19 | spacing: 8 | ||
20 | |||
21 | Repeater { | ||
22 | model: Privacy.activeItems | ||
23 | |||
24 | Item { | ||
25 | id: privacyItem | ||
26 | |||
27 | required property var modelData; | ||
28 | |||
29 | height: parent.height | ||
30 | width: icon.width | ||
31 | |||
32 | MaterialDesignIcon { | ||
33 | id: icon | ||
34 | |||
35 | implicitSize: 14 | ||
36 | anchors.centerIn: parent | ||
37 | |||
38 | icon: { | ||
39 | if (privacyItem.modelData == Privacy.Item.Microphone) | ||
40 | return "microphone"; | ||
41 | if (privacyItem.modelData == Privacy.Item.Screensharing) | ||
42 | return "monitor-share"; | ||
43 | } | ||
44 | color: "#f2201f" | ||
45 | } | ||
46 | } | ||
47 | } | ||
48 | } | ||
49 | } | ||
diff --git a/accounts/gkleen@sif/shell/quickshell/Services/Brightness.qml b/accounts/gkleen@sif/shell/quickshell/Services/Brightness.qml new file mode 100644 index 00000000..8318df50 --- /dev/null +++ b/accounts/gkleen@sif/shell/quickshell/Services/Brightness.qml | |||
@@ -0,0 +1,75 @@ | |||
1 | pragma Singleton | ||
2 | |||
3 | import QtQml | ||
4 | import Quickshell | ||
5 | import Quickshell.Io | ||
6 | import Custom as Custom | ||
7 | |||
8 | Singleton { | ||
9 | id: root | ||
10 | |||
11 | property string subsystem: "backlight" | ||
12 | property string device: "intel_backlight" | ||
13 | |||
14 | property real currBrightness | ||
15 | property real exponent: 4 | ||
16 | |||
17 | function calcCurrBrightness() { | ||
18 | if (!currFile.loaded || !maxFile.loaded) | ||
19 | return undefined; | ||
20 | const curr = Number(currFile.text()); | ||
21 | const max = Number(maxFile.text()); | ||
22 | const val = Math.pow(curr / max, 1 / root.exponent); | ||
23 | return val; | ||
24 | } | ||
25 | |||
26 | Connections { | ||
27 | target: currFile | ||
28 | function onLoaded() { | ||
29 | const b = root.calcCurrBrightness(); | ||
30 | if (typeof b !== 'undefined') | ||
31 | root.currBrightness = b; | ||
32 | } | ||
33 | } | ||
34 | Connections { | ||
35 | target: maxFile | ||
36 | function onLoaded() { | ||
37 | const b = root.calcCurrBrightness(); | ||
38 | if (typeof b !== 'undefined') | ||
39 | root.currBrightness = b; | ||
40 | } | ||
41 | } | ||
42 | |||
43 | onCurrBrightnessChanged: { | ||
44 | root.currBrightness = Math.max(0, Math.min(1, root.currBrightness)); | ||
45 | |||
46 | const prev = root.calcCurrBrightness(); | ||
47 | if (typeof prev === 'undefined' || Math.abs(root.currBrightness - prev) < 0.01) | ||
48 | return; | ||
49 | |||
50 | const max = Number(maxFile.text()); | ||
51 | const actual = Number(currFile.text()); | ||
52 | let curr = Math.max(0, Math.min(max, Math.pow(root.currBrightness, root.exponent) * max)); | ||
53 | if (Math.round(curr) == actual && curr < actual) | ||
54 | curr = Math.max(0, actual - 1); | ||
55 | else if (Math.round(curr) == actual && curr > actual) | ||
56 | curr = Math.min(max, actual + 1); | ||
57 | // root.currBrightness = Math.pow(curr / max, 1 / root.exponent); | ||
58 | Custom.Systemd.setBrightness(root.subsystem, root.device, Math.round(curr)); | ||
59 | } | ||
60 | |||
61 | FileView { | ||
62 | id: currFile | ||
63 | path: `/sys/class/${root.subsystem}/${root.device}/brightness` | ||
64 | blockAllReads: true | ||
65 | watchChanges: true | ||
66 | onFileChanged: reload() | ||
67 | } | ||
68 | FileView { | ||
69 | id: maxFile | ||
70 | path: `/sys/class/${root.subsystem}/${root.device}/max_brightness` | ||
71 | blockAllReads: true | ||
72 | watchChanges: true | ||
73 | onFileChanged: reload() | ||
74 | } | ||
75 | } | ||
diff --git a/accounts/gkleen@sif/shell/quickshell/Services/GpgAgent.qml b/accounts/gkleen@sif/shell/quickshell/Services/GpgAgent.qml new file mode 100644 index 00000000..3de69535 --- /dev/null +++ b/accounts/gkleen@sif/shell/quickshell/Services/GpgAgent.qml | |||
@@ -0,0 +1,18 @@ | |||
1 | pragma Singleton | ||
2 | |||
3 | import Quickshell | ||
4 | import Quickshell.Io | ||
5 | |||
6 | Singleton { | ||
7 | id: root | ||
8 | |||
9 | Socket { | ||
10 | id: agentSocket | ||
11 | connected: true | ||
12 | path: `${Quickshell.env("XDG_RUNTIME_DIR")}/gnupg/S.gpg-agent` | ||
13 | } | ||
14 | |||
15 | function reloadAgent() { | ||
16 | agentSocket.write("RELOADAGENT\n") | ||
17 | } | ||
18 | } | ||
diff --git a/accounts/gkleen@sif/shell/quickshell/Services/InhibitorState.qml b/accounts/gkleen@sif/shell/quickshell/Services/InhibitorState.qml new file mode 100644 index 00000000..fe48fd7f --- /dev/null +++ b/accounts/gkleen@sif/shell/quickshell/Services/InhibitorState.qml | |||
@@ -0,0 +1,22 @@ | |||
1 | pragma Singleton | ||
2 | |||
3 | import Quickshell | ||
4 | import Custom as Custom | ||
5 | |||
6 | Singleton { | ||
7 | id: inhibitorState | ||
8 | |||
9 | property bool waylandIdleInhibited: false | ||
10 | property alias lidSwitchInhibited: lidSwitchInhibitor.enabled | ||
11 | |||
12 | Custom.SystemdInhibitor { | ||
13 | id: lidSwitchInhibitor | ||
14 | |||
15 | enabled: false | ||
16 | |||
17 | what: Custom.SystemdInhibitorParams.HandleLidSwitch | ||
18 | who: "quickshell" | ||
19 | why: "User request" | ||
20 | mode: Custom.SystemdInhibitorParams.BlockWeak | ||
21 | } | ||
22 | } | ||
diff --git a/accounts/gkleen@sif/shell/quickshell/Services/Privacy.qml b/accounts/gkleen@sif/shell/quickshell/Services/Privacy.qml new file mode 100644 index 00000000..9c813e49 --- /dev/null +++ b/accounts/gkleen@sif/shell/quickshell/Services/Privacy.qml | |||
@@ -0,0 +1,63 @@ | |||
1 | pragma Singleton | ||
2 | |||
3 | import QtQml | ||
4 | import Quickshell | ||
5 | import Quickshell.Services.Pipewire | ||
6 | |||
7 | Singleton { | ||
8 | id: root | ||
9 | |||
10 | PwObjectTracker { | ||
11 | objects: Pipewire.nodes.values | ||
12 | } | ||
13 | |||
14 | enum Item { | ||
15 | Microphone, | ||
16 | Screensharing | ||
17 | } | ||
18 | |||
19 | readonly property list<var> activeItems: { | ||
20 | var items = []; | ||
21 | if (microphoneActive) | ||
22 | items.push(Privacy.Item.Microphone); | ||
23 | if (screensharingActive) | ||
24 | items.push(Privacy.Item.Screensharing); | ||
25 | return items; | ||
26 | } | ||
27 | |||
28 | readonly property bool microphoneActive: { | ||
29 | if (!Pipewire.ready || !Pipewire.nodes?.values) { | ||
30 | return false | ||
31 | } | ||
32 | |||
33 | for (const node of Pipewire.nodes.values) { | ||
34 | if (!node || (node.type & PwNodeType.AudioInStream) != PwNodeType.AudioInStream) | ||
35 | continue; | ||
36 | |||
37 | if (node.properties?.["stream.monitor"] === "true") | ||
38 | continue; | ||
39 | |||
40 | if (node.audio?.muted) | ||
41 | continue; | ||
42 | |||
43 | return true; | ||
44 | } | ||
45 | |||
46 | return false; | ||
47 | } | ||
48 | |||
49 | readonly property bool screensharingActive: { | ||
50 | if (!Pipewire.ready || !Pipewire.nodes?.values) { | ||
51 | return false | ||
52 | } | ||
53 | |||
54 | for (const node of Pipewire.nodes.values) { | ||
55 | if (!node || (node.type & PwNodeType.VideoInStream) != PwNodeType.VideoInStream) | ||
56 | continue; | ||
57 | |||
58 | return true; | ||
59 | } | ||
60 | |||
61 | return false; | ||
62 | } | ||
63 | } | ||
diff --git a/accounts/gkleen@sif/shell/quickshell/SystemTray.qml b/accounts/gkleen@sif/shell/quickshell/SystemTray.qml index 55b1690e..6f70be29 100644 --- a/accounts/gkleen@sif/shell/quickshell/SystemTray.qml +++ b/accounts/gkleen@sif/shell/quickshell/SystemTray.qml | |||
@@ -47,7 +47,7 @@ Item { | |||
47 | return "" | 47 | return "" |
48 | } | 48 | } |
49 | 49 | ||
50 | width: 16 | 50 | width: icon.width + 6 |
51 | height: parent.height | 51 | height: parent.height |
52 | anchors.verticalCenter: parent.verticalCenter | 52 | anchors.verticalCenter: parent.verticalCenter |
53 | 53 | ||
@@ -83,14 +83,24 @@ Item { | |||
83 | } | 83 | } |
84 | } | 84 | } |
85 | 85 | ||
86 | IconImage { | 86 | Rectangle { |
87 | anchors.centerIn: parent | 87 | anchors.fill: parent |
88 | width: parent.width | 88 | color: { |
89 | height: parent.width | 89 | if (trayItemArea.containsMouse) |
90 | source: trayItemWrapper.iconSource | 90 | return "#33808080"; |
91 | asynchronous: true | 91 | return "transparent"; |
92 | smooth: true | 92 | } |
93 | mipmap: true | 93 | |
94 | IconImage { | ||
95 | id: icon | ||
96 | |||
97 | anchors.centerIn: parent | ||
98 | implicitSize: 16 | ||
99 | source: trayItemWrapper.iconSource | ||
100 | asynchronous: true | ||
101 | smooth: true | ||
102 | mipmap: true | ||
103 | } | ||
94 | } | 104 | } |
95 | } | 105 | } |
96 | 106 | ||
@@ -116,7 +126,7 @@ Item { | |||
116 | color: "black" | 126 | color: "black" |
117 | 127 | ||
118 | implicitWidth: Math.max(tooltipTitle.contentWidth, tooltipDescription.contentWidth) + 16 | 128 | implicitWidth: Math.max(tooltipTitle.contentWidth, tooltipDescription.contentWidth) + 16 |
119 | implicitHeight: tooltipTitle.contentHeight + tooltipDescription.contentHeight + 16 | 129 | implicitHeight: (trayItem.tooltipTitle ? tooltipTitle.contentHeight : 0) + (trayItem.tooltipDescription ? tooltipDescription.contentHeight : 0) + 16 |
120 | 130 | ||
121 | WrapperMouseArea { | 131 | WrapperMouseArea { |
122 | id: tooltipMouseArea | 132 | id: tooltipMouseArea |
@@ -130,6 +140,8 @@ Item { | |||
130 | Text { | 140 | Text { |
131 | id: tooltipTitle | 141 | id: tooltipTitle |
132 | 142 | ||
143 | enabled: trayItem.tooltipTitle | ||
144 | |||
133 | font.pointSize: 10 | 145 | font.pointSize: 10 |
134 | font.family: "Fira Sans" | 146 | font.family: "Fira Sans" |
135 | font.bold: true | 147 | font.bold: true |
@@ -141,6 +153,8 @@ Item { | |||
141 | Text { | 153 | Text { |
142 | id: tooltipDescription | 154 | id: tooltipDescription |
143 | 155 | ||
156 | enabled: trayItem.tooltipDescription | ||
157 | |||
144 | font.pointSize: 10 | 158 | font.pointSize: 10 |
145 | font.family: "Fira Sans" | 159 | font.family: "Fira Sans" |
146 | color: "white" | 160 | color: "white" |
diff --git a/accounts/gkleen@sif/shell/quickshell/UnixIPC.qml b/accounts/gkleen@sif/shell/quickshell/UnixIPC.qml new file mode 100644 index 00000000..742ef4f5 --- /dev/null +++ b/accounts/gkleen@sif/shell/quickshell/UnixIPC.qml | |||
@@ -0,0 +1,59 @@ | |||
1 | import Quickshell | ||
2 | import Quickshell.Io | ||
3 | import Quickshell.Services.Pipewire | ||
4 | import qs.Services | ||
5 | |||
6 | Scope { | ||
7 | id: root | ||
8 | |||
9 | SocketServer { | ||
10 | active: true | ||
11 | path: `${Quickshell.env("XDG_RUNTIME_DIR")}/shell.sock` | ||
12 | handler: Socket { | ||
13 | parser: SplitParser { | ||
14 | onRead: line => { | ||
15 | try { | ||
16 | const command = JSON.parse(line); | ||
17 | |||
18 | if (command.Volume) | ||
19 | root.onCommandVolume(command.Volume); | ||
20 | else if (command.Brightness) | ||
21 | root.onCommandBrightness(command.Brightness); | ||
22 | else | ||
23 | console.warn("UnixIPC: Command not handled:", JSON.stringify(command)); | ||
24 | } catch (e) { | ||
25 | console.warn("UnixIPC: Failed to parse command:", line, e); | ||
26 | } | ||
27 | } | ||
28 | } | ||
29 | |||
30 | onError: e => { | ||
31 | if (e == 1) | ||
32 | return; | ||
33 | console.warn("QLocalSocket::LocalSocketError", e); | ||
34 | } | ||
35 | } | ||
36 | } | ||
37 | |||
38 | PwObjectTracker { | ||
39 | objects: [ Pipewire.defaultAudioSink, Pipewire.defaultAudioSource ] | ||
40 | } | ||
41 | function onCommandVolume(command) { | ||
42 | if (command.muted === "toggle") | ||
43 | Pipewire.defaultAudioSink.audio.muted = !Pipewire.defaultAudioSink.audio.muted; | ||
44 | if (command.volume === "up") | ||
45 | Pipewire.defaultAudioSink.audio.volume += 0.02; | ||
46 | if (command.volume === "down") | ||
47 | Pipewire.defaultAudioSink.audio.volume -= 0.02; | ||
48 | |||
49 | if (command["mic-muted"] === "toggle") | ||
50 | Pipewire.defaultAudioSource.audio.muted = !Pipewire.defaultAudioSource.audio.muted; | ||
51 | } | ||
52 | |||
53 | function onCommandBrightness(command) { | ||
54 | if (command === "up") | ||
55 | Brightness.currBrightness += 0.02 | ||
56 | if (command === "down") | ||
57 | Brightness.currBrightness -= 0.02 | ||
58 | } | ||
59 | } | ||
diff --git a/accounts/gkleen@sif/shell/quickshell/VolumeOSD.qml b/accounts/gkleen@sif/shell/quickshell/VolumeOSD.qml new file mode 100644 index 00000000..653f4763 --- /dev/null +++ b/accounts/gkleen@sif/shell/quickshell/VolumeOSD.qml | |||
@@ -0,0 +1,163 @@ | |||
1 | import QtQuick | ||
2 | import QtQuick.Layouts | ||
3 | import Quickshell | ||
4 | import Quickshell.Services.Pipewire | ||
5 | import Quickshell.Widgets | ||
6 | |||
7 | Scope { | ||
8 | id: root | ||
9 | |||
10 | property string show: "" | ||
11 | property bool inhibited: true | ||
12 | |||
13 | PwObjectTracker { | ||
14 | objects: [ Pipewire.defaultAudioSink, Pipewire.defaultAudioSource ] | ||
15 | } | ||
16 | |||
17 | Connections { | ||
18 | enabled: Pipewire.defaultAudioSink | ||
19 | target: Pipewire.defaultAudioSink?.audio | ||
20 | |||
21 | function onVolumeChanged() { | ||
22 | root.show = "sink"; | ||
23 | hideTimer.restart(); | ||
24 | } | ||
25 | function onMutedChanged() { | ||
26 | root.show = "sink"; | ||
27 | hideTimer.restart(); | ||
28 | } | ||
29 | } | ||
30 | |||
31 | Connections { | ||
32 | enabled: Pipewire.defaultAudioSource | ||
33 | target: Pipewire.defaultAudioSource?.audio | ||
34 | |||
35 | function onVolumeChanged() { | ||
36 | root.show = "source"; | ||
37 | hideTimer.restart(); | ||
38 | } | ||
39 | function onMutedChanged() { | ||
40 | root.show = "source"; | ||
41 | hideTimer.restart(); | ||
42 | } | ||
43 | } | ||
44 | |||
45 | onShowChanged: { | ||
46 | if (show) | ||
47 | hideTimer.restart(); | ||
48 | } | ||
49 | |||
50 | Timer { | ||
51 | id: hideTimer | ||
52 | interval: 1000 | ||
53 | onTriggered: root.show = "" | ||
54 | } | ||
55 | |||
56 | Timer { | ||
57 | id: startInhibit | ||
58 | interval: 100 | ||
59 | running: true | ||
60 | onTriggered: { | ||
61 | root.show = ""; | ||
62 | root.inhibited = false; | ||
63 | } | ||
64 | } | ||
65 | |||
66 | LazyLoader { | ||
67 | active: root.show && !root.inhibited | ||
68 | |||
69 | Variants { | ||
70 | model: Quickshell.screens | ||
71 | |||
72 | delegate: Scope { | ||
73 | id: screenScope | ||
74 | |||
75 | required property var modelData | ||
76 | |||
77 | PanelWindow { | ||
78 | id: window | ||
79 | |||
80 | screen: screenScope.modelData | ||
81 | |||
82 | anchors.top: true | ||
83 | margins.top: screen.height / 2 - 50 + 3.5 | ||
84 | exclusiveZone: 0 | ||
85 | exclusionMode: ExclusionMode.Ignore | ||
86 | |||
87 | implicitWidth: 400 | ||
88 | implicitHeight: 50 | ||
89 | |||
90 | mask: Region {} | ||
91 | |||
92 | color: "transparent" | ||
93 | |||
94 | Rectangle { | ||
95 | anchors.fill: parent | ||
96 | color: Qt.rgba(0, 0, 0, 0.75) | ||
97 | } | ||
98 | |||
99 | RowLayout { | ||
100 | id: layout | ||
101 | |||
102 | anchors.centerIn: parent | ||
103 | |||
104 | height: 50 - 8*2 | ||
105 | width: 400 - 8*2 | ||
106 | |||
107 | MaterialDesignIcon { | ||
108 | id: volumeIcon | ||
109 | |||
110 | implicitWidth: parent.height | ||
111 | implicitHeight: parent.height | ||
112 | |||
113 | icon: { | ||
114 | if (root.show == "sink") { | ||
115 | if (!Pipewire.defaultAudioSink || Pipewire.defaultAudioSink.audio.muted) | ||
116 | return "volume-off"; | ||
117 | if (Pipewire.defaultAudioSink.audio.volume <= 0.33) | ||
118 | return "volume-low"; | ||
119 | if (Pipewire.defaultAudioSink.audio.volume <= 0.67) | ||
120 | return "volume-medium"; | ||
121 | return "volume-high"; | ||
122 | } else if (root.show == "source") { | ||
123 | if (!Pipewire.defaultAudioSource || Pipewire.defaultAudioSource.audio.muted) | ||
124 | return "microphone-off"; | ||
125 | if (Pipewire.defaultAudioSource.audio.volume > 1) | ||
126 | return "microphone-plus"; | ||
127 | return "microphone"; | ||
128 | } | ||
129 | return "volume-high"; | ||
130 | } | ||
131 | } | ||
132 | |||
133 | Rectangle { | ||
134 | Layout.fillWidth: true | ||
135 | |||
136 | implicitHeight: 10 | ||
137 | |||
138 | color: "#50ffffff" | ||
139 | |||
140 | Rectangle { | ||
141 | anchors { | ||
142 | left: parent.left | ||
143 | top: parent.top | ||
144 | bottom: parent.bottom | ||
145 | } | ||
146 | |||
147 | color: Pipewire.defaultAudioSink?.audio.muted ? "#70ffffff" : "white" | ||
148 | |||
149 | implicitWidth: { | ||
150 | if (root.show == "sink") | ||
151 | return parent.width * (Pipewire.defaultAudioSink?.audio.volume ?? 0); | ||
152 | else if (root.show == "source") | ||
153 | return parent.width * Math.min(1, (Pipewire.defaultAudioSource?.audio.volume ?? 0)); | ||
154 | return 0; | ||
155 | } | ||
156 | } | ||
157 | } | ||
158 | } | ||
159 | } | ||
160 | } | ||
161 | } | ||
162 | } | ||
163 | } | ||
diff --git a/accounts/gkleen@sif/shell/quickshell/WaylandInhibitorWidget.qml b/accounts/gkleen@sif/shell/quickshell/WaylandInhibitorWidget.qml new file mode 100644 index 00000000..0633f350 --- /dev/null +++ b/accounts/gkleen@sif/shell/quickshell/WaylandInhibitorWidget.qml | |||
@@ -0,0 +1,55 @@ | |||
1 | import Quickshell | ||
2 | import QtQuick | ||
3 | import Quickshell.Widgets | ||
4 | import Quickshell.Wayland | ||
5 | import qs.Services | ||
6 | |||
7 | Item { | ||
8 | id: root | ||
9 | |||
10 | required property var window | ||
11 | |||
12 | width: icon.width + 8 | ||
13 | height: parent.height | ||
14 | anchors.verticalCenter: parent.verticalCenter | ||
15 | |||
16 | IdleInhibitor { | ||
17 | id: inhibitor | ||
18 | enabled: InhibitorState.waylandIdleInhibited | ||
19 | window: root.window | ||
20 | } | ||
21 | |||
22 | WrapperMouseArea { | ||
23 | id: widgetMouseArea | ||
24 | |||
25 | anchors.fill: parent | ||
26 | |||
27 | hoverEnabled: true | ||
28 | |||
29 | onClicked: InhibitorState.waylandIdleInhibited = !InhibitorState.waylandIdleInhibited | ||
30 | |||
31 | Rectangle { | ||
32 | anchors.fill: parent | ||
33 | color: { | ||
34 | if (widgetMouseArea.containsMouse) { | ||
35 | return "#33808080"; | ||
36 | } | ||
37 | return "transparent"; | ||
38 | } | ||
39 | |||
40 | Item { | ||
41 | anchors.fill: parent | ||
42 | |||
43 | MaterialDesignIcon { | ||
44 | id: icon | ||
45 | |||
46 | implicitSize: 14 | ||
47 | anchors.centerIn: parent | ||
48 | |||
49 | icon: inhibitor.enabled ? "eye" : "eye-off" | ||
50 | color: inhibitor.enabled ? "white" : "#555" | ||
51 | } | ||
52 | } | ||
53 | } | ||
54 | } | ||
55 | } | ||
diff --git a/accounts/gkleen@sif/shell/quickshell/WorkspaceSwitcher.qml b/accounts/gkleen@sif/shell/quickshell/WorkspaceSwitcher.qml index c8c017c3..4cbebcc9 100644 --- a/accounts/gkleen@sif/shell/quickshell/WorkspaceSwitcher.qml +++ b/accounts/gkleen@sif/shell/quickshell/WorkspaceSwitcher.qml | |||
@@ -48,7 +48,7 @@ Row { | |||
48 | cursorShape: Qt.PointingHandCursor | 48 | cursorShape: Qt.PointingHandCursor |
49 | enabled: true | 49 | enabled: true |
50 | onClicked: { | 50 | onClicked: { |
51 | NiriService.sendCommand({ "Action": { "FocusWorkspace": { "reference": { "Id": workspaceData.id } } } }, _ => {}) | 51 | NiriService.sendCommand({ "Action": { "FocusWorkspace": { "reference": { "Id": workspaceData.id } } } }, _ => {}); |
52 | } | 52 | } |
53 | 53 | ||
54 | Rectangle { | 54 | Rectangle { |
diff --git a/accounts/gkleen@sif/shell/quickshell/displaymanager.qml b/accounts/gkleen@sif/shell/quickshell/displaymanager.qml new file mode 100644 index 00000000..b452c03d --- /dev/null +++ b/accounts/gkleen@sif/shell/quickshell/displaymanager.qml | |||
@@ -0,0 +1,115 @@ | |||
1 | //@ pragma UseQApplication | ||
2 | |||
3 | import Quickshell | ||
4 | import Quickshell.Wayland | ||
5 | import Quickshell.Io | ||
6 | import Quickshell.Services.Greetd | ||
7 | import QtQml | ||
8 | |||
9 | |||
10 | ShellRoot { | ||
11 | id: displaymanager | ||
12 | |||
13 | settings.watchFiles: false | ||
14 | |||
15 | property string currentText: "" | ||
16 | property string username: @username@ | ||
17 | property list<string> command: @niri_session@ | ||
18 | property list<var> messages: [] | ||
19 | property bool responseRequired: false | ||
20 | property bool responseVisible: false | ||
21 | |||
22 | signal startAuth() | ||
23 | |||
24 | onStartAuth: { | ||
25 | if (Greetd.state !== GreetdState.Inactive) | ||
26 | Greetd.cancelSession(); | ||
27 | displaymanager.messages = []; | ||
28 | Greetd.createSession(displaymanager.username); | ||
29 | } | ||
30 | |||
31 | Connections { | ||
32 | target: Greetd | ||
33 | function onStateChanged() { | ||
34 | console.log("greetd state: ", GreetdState.toString(Greetd.state)); | ||
35 | if (Greetd.state === GreetdState.ReadyToLaunch) | ||
36 | Greetd.launch(displaymanager.command); | ||
37 | } | ||
38 | function onAuthMessage(message: string, error: bool, responseRequired: bool, echoResponse: bool) { | ||
39 | displaymanager.responseVisible = echoResponse; | ||
40 | displaymanager.responseRequired = responseRequired; | ||
41 | displaymanager.messages = Array.from(displaymanager.messages).concat([{ "text": message, "error": error }]); | ||
42 | } | ||
43 | function onAuthFailure(message: string) { | ||
44 | displaymanager.responseRequired = false; | ||
45 | displaymanager.messages = Array.from(displaymanager.messages).concat([{ "text": message, "error": true }]); | ||
46 | } | ||
47 | } | ||
48 | |||
49 | Component.onCompleted: { | ||
50 | if (Greetd.state !== GreetdState.Inactive) | ||
51 | Greetd.cancelSession(); | ||
52 | } | ||
53 | |||
54 | Variants { | ||
55 | model: Quickshell.screens | ||
56 | |||
57 | delegate: Scope { | ||
58 | id: screenScope | ||
59 | |||
60 | required property var modelData | ||
61 | |||
62 | PanelWindow { | ||
63 | color: "black" | ||
64 | |||
65 | screen: screenScope.modelData | ||
66 | |||
67 | WlrLayershell.keyboardFocus: WlrKeyboardFocus.Exclusive | ||
68 | |||
69 | anchors.top: true | ||
70 | anchors.bottom: true | ||
71 | anchors.left: true | ||
72 | anchors.right: true | ||
73 | |||
74 | LockSurface { | ||
75 | id: surfaceContent | ||
76 | |||
77 | screen: screenScope.modelData | ||
78 | |||
79 | onCurrentTextChanged: displaymanager.currentText = currentText | ||
80 | Connections { | ||
81 | target: displaymanager | ||
82 | function onCurrentTextChanged() { surfaceContent.currentText = displaymanager.currentText; } | ||
83 | function onMessagesChanged() { surfaceContent.messages = Array.from(displaymanager.messages); } | ||
84 | function onResponseRequiredChanged() { surfaceContent.responseRequired = displaymanager.responseRequired; } | ||
85 | function onResponseVisibleChanged() { surfaceContent.responseVisible = displaymanager.responseVisible; } | ||
86 | } | ||
87 | |||
88 | onResponse: responseText => Greetd.respond(responseText); | ||
89 | Connections { | ||
90 | target: Greetd | ||
91 | function onStateChanged() { | ||
92 | if (Greetd.state === GreetdState.Authenticating) { | ||
93 | surfaceContent.authRunning = true; | ||
94 | } else { | ||
95 | surfaceContent.authRunning = false; | ||
96 | } | ||
97 | } | ||
98 | } | ||
99 | |||
100 | onAuthRunningChanged: { | ||
101 | if (surfaceContent.authRunning && Greetd.state !== GreetdState.Authenticating) | ||
102 | displaymanager.startAuth(); | ||
103 | } | ||
104 | Component.onCompleted: { | ||
105 | surfaceContent.authRunning = Greetd.state === GreetdState.Authenticating | ||
106 | surfaceContent.messages = Array.from(displaymanager.messages); | ||
107 | surfaceContent.responseVisible = displaymanager.responseVisible; | ||
108 | surfaceContent.responseRequired = displaymanager.responseRequired; | ||
109 | surfaceContent.currentText = displaymanager.currentText; | ||
110 | } | ||
111 | } | ||
112 | } | ||
113 | } | ||
114 | } | ||
115 | } | ||
diff --git a/accounts/gkleen@sif/shell/quickshell/shell.qml b/accounts/gkleen@sif/shell/quickshell/shell.qml index 1da9457d..693d741f 100644 --- a/accounts/gkleen@sif/shell/quickshell/shell.qml +++ b/accounts/gkleen@sif/shell/quickshell/shell.qml | |||
@@ -41,4 +41,10 @@ ShellRoot { | |||
41 | } | 41 | } |
42 | 42 | ||
43 | Lockscreen {} | 43 | Lockscreen {} |
44 | NiriIdle {} | ||
45 | |||
46 | VolumeOSD {} | ||
47 | BrightnessOSD {} | ||
48 | |||
49 | UnixIPC {} | ||
44 | } | 50 | } |