vinzenz/nova-shell
0
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

power menu: add confirmation dialog for shutdown and reboot

Browse source
This commit is contained in:
Damocles 2026-04-22 20:06:09 +02:00
parent 621ec3bfc5
commit 4b5272c124
1 changed files with 200 additions and 70 deletions
Download patch file Download diff file Expand all files Collapse all files

152
shell/modules/PowerMenu.qml
View file

@ -13,42 +13,67 @@ M.HoverPanel {
readonly property bool _isNiri: Quickshell.env("NIRI_SOCKET") !== "" readonly property bool _isNiri: Quickshell.env("NIRI_SOCKET") !== ""
// Confirmation state: null = normal menu, object = pending confirm
property var _confirmItem: null
function _run(cmd) { function _run(cmd) {
runCommand(cmd); runCommand(cmd);
dismiss(); dismiss();
} }
function _requestAction(item) {
if (item.confirm) {
_confirmItem = item;
} else {
_run(item.cmd);
}
}
function _cancelConfirm() {
_confirmItem = null;
}
// Normal menu entries
Column {
visible: !menuWindow._confirmItem
width: menuWindow.contentWidth
Repeater { Repeater {
model: [ model: [
{ {
label: "Lock", label: "Lock",
icon: "\uF023", icon: "\uF023",
cmd: ["loginctl", "lock-session"], cmd: ["loginctl", "lock-session"],
color: S.Theme.base0D color: S.Theme.base0D,
confirm: false
}, },
{ {
label: "Suspend", label: "Suspend",
icon: "\uF186", icon: "\uF186",
cmd: ["systemctl", "suspend"], cmd: ["systemctl", "suspend"],
color: S.Theme.base0E color: S.Theme.base0E,
confirm: false
}, },
{ {
label: "Logout", label: "Logout",
icon: "\uF2F5", icon: "\uF2F5",
cmd: menuWindow._isNiri ? ["niri", "msg", "action", "quit"] : ["loginctl", "terminate-user", ""], cmd: menuWindow._isNiri ? ["niri", "msg", "action", "quit"] : ["loginctl", "terminate-user", ""],
color: S.Theme.base0A color: S.Theme.base0A,
confirm: false
}, },
{ {
label: "Reboot", label: "Reboot",
icon: "\uF021", icon: "\uF021",
cmd: ["systemctl", "reboot"], cmd: ["systemctl", "reboot"],
color: S.Theme.base09 color: S.Theme.base09,
confirm: true
}, },
{ {
label: "Shutdown", label: "Shutdown",
icon: "\uF011", icon: "\uF011",
cmd: ["systemctl", "poweroff"], cmd: ["systemctl", "poweroff"],
color: S.Theme.base08 color: S.Theme.base08,
confirm: true
} }
] ]
@ -65,7 +90,7 @@ M.HoverPanel {
anchors.fill: parent anchors.fill: parent
anchors.leftMargin: 4 anchors.leftMargin: 4
anchors.rightMargin: 4 anchors.rightMargin: 4
color: entryArea.containsMouse ? S.Theme.base02 : "transparent" color: entryHover.hovered ? S.Theme.base02 : "transparent"
radius: S.Theme.radius radius: S.Theme.radius
} }
@ -90,12 +115,117 @@ M.HoverPanel {
font.family: S.Theme.fontFamily font.family: S.Theme.fontFamily
} }
MouseArea { HoverHandler {
id: entryArea id: entryHover
anchors.fill: parent cursorShape: Qt.PointingHandCursor
hoverEnabled: true
onClicked: menuWindow._run(entry.modelData.cmd)
} }
TapHandler {
onTapped: menuWindow._requestAction(entry.modelData)
}
}
}
}
// Confirmation view
Column {
visible: !!menuWindow._confirmItem
width: menuWindow.contentWidth
spacing: 4
Item {
width: parent.width
height: 28
Text {
anchors.centerIn: parent
text: menuWindow._confirmItem ? menuWindow._confirmItem.label + "?" : ""
color: menuWindow._confirmItem ? menuWindow._confirmItem.color : S.Theme.base05
font.pixelSize: S.Theme.fontSize
font.family: S.Theme.fontFamily
font.bold: true
}
}
Row {
anchors.horizontalCenter: parent.horizontalCenter
spacing: 8
// Cancel
Item {
width: 72
height: 28
Rectangle {
anchors.fill: parent
color: cancelHover.hovered ? S.Theme.base02 : S.Theme.base01
radius: S.Theme.radius
border.width: 1
border.color: S.Theme.base03
}
Text {
anchors.centerIn: parent
text: "Cancel"
color: S.Theme.base05
font.pixelSize: S.Theme.fontSize
font.family: S.Theme.fontFamily
}
HoverHandler {
id: cancelHover
cursorShape: Qt.PointingHandCursor
}
TapHandler {
onTapped: menuWindow._cancelConfirm()
}
}
// Confirm
Item {
width: 72
height: 28
Rectangle {
anchors.fill: parent
color: {
if (!menuWindow._confirmItem)
return S.Theme.base02;
const c = menuWindow._confirmItem.color;
return confirmHover.hovered ? Qt.rgba(c.r, c.g, c.b, 0.3) : Qt.rgba(c.r, c.g, c.b, 0.15);
}
radius: S.Theme.radius
border.width: 1
border.color: menuWindow._confirmItem ? menuWindow._confirmItem.color : S.Theme.base03
}
Text {
anchors.centerIn: parent
text: "Confirm"
color: menuWindow._confirmItem ? menuWindow._confirmItem.color : S.Theme.base05
font.pixelSize: S.Theme.fontSize
font.family: S.Theme.fontFamily
font.bold: true
}
HoverHandler {
id: confirmHover
cursorShape: Qt.PointingHandCursor
}
TapHandler {
onTapped: {
if (menuWindow._confirmItem)
menuWindow._run(menuWindow._confirmItem.cmd);
}
}
}
}
Item {
width: 1
height: 4
} }
} }
} }